Skip to content

Commit

Permalink
Added a USCMC Recruiter Survivor on Solaris. (#5474)
Browse files Browse the repository at this point in the history
# About the pull request

Adds a USCMC Recruiter survivor to Solaris and a USCMC Survivor template
to the code

Changed the Solaris 'Ridge' CL and fluffed up the ARES announcement text
when everyone wakes up

# Explain why it's good for the game

Well, everything being standardised is good, due to every other surv
having no 'Ridge' next to Solaris in their assignments, unlike the CL
which he does, so this changes it to make him fit with everyone else.
(Or the opposite can be done, giving everyone else Ridge next to
Solaris. Whatever maintainers want.)

More survivor roles which are different and unique I hope are greatly
appriciated and I saw an opportunity due to the map having some sort of
USCMC insert, I think it'll add more Roleplay, which is never a bad
thing.

Also a template to have and to use incase there are any more USCMC
future survivors. (Currently using the security skills, perhaps this
should change in the future.)


# 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:
add: Added a USCMC Recruiter to the Solaris surv pool.
add: Added a USCM Survivor template anycase anyone wants to add USCM
Survivors to other maps.
fix: Every other surv has no 'Ridge' next to Solaris in their
assignments, only the CL. Fixes this.
spellcheck: Embellished the Solaris Ridge announce text, to make it so
the Company and more fluff about it's actual role like the wiki states.
/:cl:

---------

Co-authored-by: Jeff Watchson <[email protected]>
  • Loading branch information
BadAtThisGame302 and Jeff Watchson authored Feb 1, 2024
1 parent 98ef6f3 commit ff8679d
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 3 deletions.
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)
..()

/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/ivy(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

0 comments on commit ff8679d

Please sign in to comment.