Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Liason typo fix and Goon construction buff. #5227

Merged
merged 3 commits into from
Dec 22, 2023
Merged

Liason typo fix and Goon construction buff. #5227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5baa9af
Goon can now build barricades
Dec 16, 2023
87c7ec1
Liason to Liaison fixes
Dec 16, 2023
f20fff8
Area fixes
Dec 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/datums/skills/civilian.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ CIVILIAN

/datum/skills/civilian/survivor/goon
name = "Survivor Goon"
skills = list(
additional_skills = list(
SKILL_CQC = SKILL_CQC_TRAINED,
SKILL_POLICE = SKILL_POLICE_SKILLED,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
Expand Down
2 changes: 1 addition & 1 deletion code/game/area/almayer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
fake_zlevel = 1 // upperdeck
flags_area = AREA_NOTUNNEL

/area/almayer/command/corporateliason
/area/almayer/command/corporateliaison
name = "\improper Corporate Liaison Office"
icon_state = "corporatespace"
fake_zlevel = 1 // upperdeck
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/doors/shutters.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@

//make a subtype for CL office so it as a proper name.
/obj/structure/machinery/door/poddoor/shutters/almayer/cl
name = "\improper Corporate Liason Privacy Shutters"
name = "\improper Corporate Liaison Privacy Shutters"
//adding a subtype for CL office to use to secure access to cl office.
/obj/structure/machinery/door/poddoor/shutters/almayer/cl/office
/obj/structure/machinery/door/poddoor/shutters/almayer/cl/office/door
Expand Down
4 changes: 2 additions & 2 deletions code/modules/gear_presets/survivors/corsat/preset_corsat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET)
..()

/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/corsat
/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/corsat
name = "Survivor - Interstellar Commerce Commission Liaison CORSAT"
assignment = "Interstellar Commerce Commission Corporate Liaison"

/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/corsat/load_gear(mob/living/carbon/human/new_human)
/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/corsat/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/gear_presets/survivors/new_varadero/preset_new_varadero.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
..()

/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/nv
/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/nv
name = "Survivor - Interstellar Commerce Commission Liaison New Varadero"
assignment = "Interstellar Commerce Commission Corporate Liaison"

/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/nv/load_gear(mob/living/carbon/human/new_human)
/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/nv/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/black(new_human), WEAR_JACKET)
Expand Down
6 changes: 3 additions & 3 deletions code/modules/gear_presets/survivors/survivors.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ Everything bellow is a parent used as a base for one or multiple maps.
// ----- Interstellar Commerce Commission Survivor

// Used in Trijent Dam and New Varadero.
/datum/equipment_preset/survivor/interstellar_commerce_commission_liason
/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison
name = "Survivor - Interstellar Commerce Commission Liaison"
assignment = "Interstellar Commerce Commission Corporate Liaison"
skills = /datum/skills/civilian/survivor
Expand All @@ -431,11 +431,11 @@ Everything bellow is a parent used as a base for one or multiple maps.

survivor_variant = CORPORATE_SURVIVOR

/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/New()
/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/New()
. = ..()
access = get_access(ACCESS_LIST_CIVIL_LIAISON)

/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/load_gear(mob/living/carbon/human/new_human)
/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR)

Expand Down
2 changes: 1 addition & 1 deletion maps/corsat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"/datum/equipment_preset/survivor/goon",
"/datum/equipment_preset/survivor/doctor/corsat",
"/datum/equipment_preset/survivor/security/corsat",
"/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/corsat",
"/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/corsat",
"/datum/equipment_preset/survivor/engineer/corsat",
"/datum/equipment_preset/survivor/clf",
"/datum/equipment_preset/survivor/civilian"
Expand Down
2 changes: 1 addition & 1 deletion maps/desert_dam.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"/datum/equipment_preset/survivor/doctor/trijent",
"/datum/equipment_preset/survivor/roughneck",
"/datum/equipment_preset/survivor/chaplain/trijent",
"/datum/equipment_preset/survivor/interstellar_commerce_commission_liason",
"/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison",
"/datum/equipment_preset/survivor/colonial_marshal",
"/datum/equipment_preset/survivor/engineer/trijent",
"/datum/equipment_preset/survivor/engineer/trijent/hydro",
Expand Down
2 changes: 1 addition & 1 deletion maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62142,7 +62142,7 @@
/area/lv522/indoors/c_block/casino)
"xHz" = (
/obj/structure/machinery/door/airlock/almayer/generic{
name = "\improper Corporate Liason Office "
name = "\improper Corporate Liaison Office "
},
/turf/open/floor/corsat{
icon_state = "marked"
Expand Down
4 changes: 2 additions & 2 deletions maps/map_files/LV624/LV624.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12485,7 +12485,7 @@
"bnz" = (
/obj/structure/machinery/door/airlock/almayer/generic{
dir = 1;
name = "\improper Corporate Liason"
name = "\improper Corporate Liaison"
},
/turf/open/floor{
icon_state = "white"
Expand Down Expand Up @@ -20011,7 +20011,7 @@
"pQn" = (
/obj/structure/machinery/door/airlock/almayer/generic{
locked = 1;
name = "\improper Corporate Liason"
name = "\improper Corporate Liaison"
},
/turf/open/floor{
icon_state = "white"
Expand Down
Loading