Skip to content

Commit

Permalink
Adds both the surv CLs and the USCM CL to the WY Faction (#5819)
Browse files Browse the repository at this point in the history
# About the pull request

Title

# Explain why it's good for the game

The CLs (and the ICC CL) are members of the Company yet does not have WY
IFF... kinda weird....

Made a new faction group to accomodate the survs who are members of
Wey-Yu.

Also changed the Traffic Control guys suit. (legacy uniform bad)

# Changelog
:cl:
add: Added a new uniform to the Flight Control Operator.
add: Added a new faction IFF grouping for WY Survs.
add: Added the ICC and the CL survs to the WY IFF System.
add: Added the USCM CL to the WY IFF System.
/:cl:

---------

Co-authored-by: Jeff Watchson <[email protected]>
  • Loading branch information
BadAtThisGame302 and Jeff Watchson committed Feb 29, 2024
1 parent a9245b7 commit 5b7a2ca
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/mode.dm
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ DEFINE_BITFIELD(whitelist_status, list(
#define FACTION_LIST_MERCENARY list(FACTION_MERCENARY)
#define FACTION_LIST_MARSHAL list(FACTION_MARSHAL)
#define FACTION_LIST_DUTCH list(FACTION_DUTCH)
#define FACTION_LIST_SURVIVOR_WY list(FACTION_SURVIVOR, FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
#define FACTION_LIST_MARINE_WY list(FACTION_MARINE, FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
#define FACTION_LIST_MARINE_UPP list(FACTION_MARINE, FACTION_UPP)
#define FACTION_LIST_MARINE_TWE list(FACTION_MARINE, FACTION_TWE)
Expand Down
8 changes: 5 additions & 3 deletions code/modules/gear_presets/survivors/survivors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ Everything bellow is a parent used as a base for one or multiple maps.
skills = /datum/skills/civilian/survivor
flags = EQUIPMENT_PRESET_START_OF_ROUND
paygrade = PAY_SHORT_WYC2
faction_group = FACTION_LIST_SURVIVOR_WY
idtype = /obj/item/card/id/silver/clearance_badge/cl
access = list(
ACCESS_CIVILIAN_PUBLIC,
Expand Down Expand Up @@ -381,7 +382,7 @@ Everything bellow is a parent used as a base for one or multiple maps.
access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_LOGISTICS,ACCESS_WY_FLIGHT)

/datum/equipment_preset/survivor/flight_control_operator/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/lawyer/bluesuit(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/khaki(new_human), WEAR_BODY)
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
add_ice_colony_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_brown(new_human), WEAR_JACKET)
Expand Down Expand Up @@ -425,10 +426,11 @@ Everything bellow is a parent used as a base for one or multiple maps.
name = "Survivor - Interstellar Commerce Commission Liaison"
assignment = "Interstellar Commerce Commission Corporate Liaison"
skills = /datum/skills/civilian/survivor
idtype = /obj/item/card/id/silver/cl
flags = EQUIPMENT_PRESET_START_OF_ROUND
paygrade = PAY_SHORT_ICCL
faction_group = FACTION_LIST_SURVIVOR_WY
idtype = /obj/item/card/id/silver/cl
role_comm_title = "ICC Rep."
flags = EQUIPMENT_PRESET_START_OF_ROUND

survivor_variant = CORPORATE_SURVIVOR

Expand Down
1 change: 1 addition & 0 deletions code/modules/gear_presets/uscm_ship.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

/datum/equipment_preset/uscm_ship/liaison
name = "USCM Corporate Liaison (CL)"
faction_group = FACTION_LIST_MARINE_WY
flags = EQUIPMENT_PRESET_START_OF_ROUND

idtype = /obj/item/card/id/silver/cl
Expand Down

0 comments on commit 5b7a2ca

Please sign in to comment.