Skip to content

Commit

Permalink
Liason typo fix and Goon construction buff. (#5227)
Browse files Browse the repository at this point in the history
# About the pull request

Liason is not spelt like that, fixes the USS Almayer area and the ICC
path.

Goon could not build cades due to skills = and not additional_skills
allowing the parent, survivor, to give construction one to it's
subpaths.

# Explain why it's good for the game

Spell check good

I am pretty sure that the Goon is the only survivor not being able to
build basic cades, I don't see why we restrict that considering that all
the other security survivors are able to build them.


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
balance: rebalanced goon skillset to include construction 1
spellcheck: fixed Liason area typos to Liaison
spellcheck: fixed the ICC Liason to ICC Liaison typo
/:cl:

---------

Co-authored-by: Jeff Watchson <[email protected]>
  • Loading branch information
BadAtThisGame302 and Jeff Watchson committed Dec 22, 2023
1 parent 9c6b56b commit 706901a
Show file tree
Hide file tree
Showing 12 changed files with 102 additions and 102 deletions.
2 changes: 1 addition & 1 deletion code/datums/skills/civilian.dm
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
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
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
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
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
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
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
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
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
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

0 comments on commit 706901a

Please sign in to comment.