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.

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

Added a USCMC Recruiter Survivor on Solaris. #5474

Merged
merged 6 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 18 additions & 2 deletions code/modules/gear_presets/survivors/solaris/preset_solaris.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,25 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET)
..()

/datum/equipment_preset/survivor/uscm/solaris
name = "Survivor - Solaris United States Colonial Marine Corps Recruiter"
assignment = "USCM Recruiter"
paygrade = PAY_SHORT_ME5

/datum/equipment_preset/survivor/uscm/solaris/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/ranks/marine/e5(new_human), WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/service(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/full(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE)
..()
Birdtalon marked this conversation as resolved.
Show resolved Hide resolved

/datum/equipment_preset/survivor/corporate/solaris
name = "Survivor - Solaris Ridge Corporate Liaison"
assignment = "Solaris Ridge Corporate Liaison"
name = "Survivor - Solaris Corporate Liaison"
assignment = "Solaris Corporate Liaison"

/datum/equipment_preset/survivor/corporate/solaris/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/outing/red(new_human), WEAR_BODY)
Expand Down
27 changes: 27 additions & 0 deletions code/modules/gear_presets/survivors/survivors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -452,3 +452,30 @@ Everything bellow is a parent used as a base for one or multiple maps.
add_random_cl_survivor_loot(new_human)

..()

// ----- USCM Survivor

// Used for Solaris Ridge.
/datum/equipment_preset/survivor/uscm
name = "Survivor - USCM Remnant"
assignment = "USCM Survivor"
skills = /datum/skills/civilian/survivor/marshal
idtype = /obj/item/card/id/dogtag
paygrade = PAY_SHORT_ME2
flags = EQUIPMENT_PRESET_START_OF_ROUND
access = list(ACCESS_CIVILIAN_PUBLIC)

/datum/equipment_preset/survivor/uscm/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(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/accessory/ranks/marine/e2(new_human), WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare(new_human), WEAR_R_STORE)
add_survivor_weapon_security(new_human)
..()

3 changes: 2 additions & 1 deletion maps/bigredv2.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"/datum/equipment_preset/survivor/engineer/solaris",
"/datum/equipment_preset/survivor/trucker/solaris",
"/datum/equipment_preset/survivor/security/solaris",
"/datum/equipment_preset/survivor/uscm/solaris",
"/datum/equipment_preset/survivor/colonial_marshal/solaris",
"/datum/equipment_preset/survivor/corporate/solaris",
"/datum/equipment_preset/survivor/flight_control_operator",
Expand All @@ -25,7 +26,7 @@
0.0
],
"map_item_type": "/obj/item/map/big_red_map",
"announce_text": "We've lost contact with Weyland-Yutani's research facility, Solaris Ridge. The ###SHIPNAME### has been dispatched to assist.",
"announce_text": "Weyland-Yutani has lost contact with one of its Biological Storage Facilities, Solaris Ridge, on the planet of LV-1413. The ###SHIPNAME### has been requested to look into the blackout by Weyland-Yutani.",
"monkey_types": [
"neaera"
],
Expand Down
Loading