Skip to content

Commit

Permalink
Big Red PMC Crash Changes (feat. Surv Goon M41 Fix) (#3777)
Browse files Browse the repository at this point in the history
# About the pull request
This PR adds a PMC medic and PMC engineer to the crash on Big Red, and
also makes unique equipment presets + skill presets for them so they
don't spawn in with the overpowered PMC ERT gear or skills. It also
gives the goon survivors (the ones on LV) their awesome white M41As
back. I tested the presets and the goons, both worked fine. Haven't
tested the insert itself, but it should work perfectly fine.

my gbp is so fucked
# Explain why it's good for the game
I promised I'd get around to doing this for this insert like 2 months
ago. My reasoning is basically the same as for the CLF ship. Not having
a medic or an engineer on the team means you're forced to mindlessly
roam with no options for strategizing with your team. Lacking anyone
that can revive you or make barricades/hack doors to protect you
discourages teamwork and encourages just running off to go hide in a
locker somewhere. Super minor change but I also gave the regular PMC
survivors five-slot lightweight packs because they look cooler than the
leather satchels and fit with the PMC outfit more. There's no gameplay
advantage between the two.

I'm 99% sure the goon survivors' corporate M41As were removed by
mistake. They looked cool (snow camo is awesome) and provided 0
advantages besides that, in fact it had DISadvantages because it spawned
without a UGL. Could I atomize it into its own PR? Sure. Is it really
worth its own PR? Not really.
# 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:IowaPotatoFarmer
add: The PMC Crash on Solaris Ridge now spawns one PMC medic survivor
and one PMC engineer survivor.
fix: The Wey-Yu goon survivors now have their unique corporate white
camo M41A MK2 back.
/:cl:
  • Loading branch information
toolmind authored Jul 19, 2023
1 parent 2bd9e6e commit 39cf164
Show file tree
Hide file tree
Showing 4 changed files with 107 additions and 4 deletions.
26 changes: 26 additions & 0 deletions code/datums/skills.dm
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,32 @@ CIVILIAN
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
)

/datum/skills/civilian/survivor/pmc/medic
name = "Survivor PMC Medic"
additional_skills = list(
SKILL_POLICE = SKILL_POLICE_SKILLED,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
SKILL_SURGERY = SKILL_SURGERY_NOVICE,
SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
)

/datum/skills/civilian/survivor/pmc/engineer
name = "Survivor PMC Engineer"
additional_skills = list(
SKILL_POLICE = SKILL_POLICE_SKILLED,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
)

/datum/skills/civilian/survivor/doctor
name = "Survivor Doctor"
additional_skills = list(
Expand Down
26 changes: 26 additions & 0 deletions code/game/objects/effects/landmarks/survivor_spawner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,32 @@

spawn_priority = SPAWN_PRIORITY_HIGH

/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_medic
equipment = /datum/equipment_preset/survivor/pmc/medic
synth_equipment = /datum/equipment_preset/pmc/synth
intro_text = list("<h2>You are a survivor of a crash landing!</h2>",\
"You are NOT aware of the xenomorph threat.",\
"Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.")
story_text = "You are a PMC medic from Weyland-Yutani. Your ship was enroute to Solaris Ridge to escort an Assistant Manager. On the way, your ship received a distress signal from the colony about an attack. Worried that it might be a CLF attack, your pilot set full speed for the colony. However, during atmospheric entry the engine failed and you fell unconcious from the G-Forces. You wake up wounded... and see that the ship has crashed onto the colony. Your squadmates lie dead beside you, but there's some missing. Perhaps they survived and moved elsewhere? You need to find out what happened to the colony, see if you can find any of your squadmates, and find a way to contact Weyland-Yutani."
roundstart_damage_min = 3
roundstart_damage_max = 10
roundstart_damage_times = 2

spawn_priority = SPAWN_PRIORITY_VERY_HIGH

/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_engineer
equipment = /datum/equipment_preset/survivor/pmc/engineer
synth_equipment = /datum/equipment_preset/pmc/synth
intro_text = list("<h2>You are a survivor of a crash landing!</h2>",\
"You are NOT aware of the xenomorph threat.",\
"Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.")
story_text = "You are a PMC engineer from Weyland-Yutani. Your ship was enroute to Solaris Ridge to escort an Assistant Manager. On the way, your ship received a distress signal from the colony about an attack. Worried that it might be a CLF attack, your pilot set full speed for the colony. However, during atmospheric entry the engine failed and you fell unconcious from the G-Forces. You wake up wounded... and see that the ship has crashed onto the colony. Your squadmates lie dead beside you, but there's some missing. Perhaps they survived and moved elsewhere? You need to find out what happened to the colony, see if you can find any of your squadmates, and find a way to contact Weyland-Yutani."
roundstart_damage_min = 3
roundstart_damage_max = 10
roundstart_damage_times = 2

spawn_priority = SPAWN_PRIORITY_VERY_HIGH

/obj/effect/landmark/survivor_spawner/bigred_crashed_cl
equipment = /datum/equipment_preset/survivor/wy/manager
synth_equipment = /datum/equipment_preset/synth/survivor/pmc
Expand Down
37 changes: 35 additions & 2 deletions code/modules/gear_presets/survivors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1315,7 +1315,7 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88_near_empty, WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE)

new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a, WEAR_J_STORE)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/corporate/no_lock, WEAR_J_STORE)

new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE)
Expand All @@ -1341,11 +1341,44 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE)

..()

/datum/equipment_preset/survivor/pmc/medic
name = "Survivor - PMC Medic"
assignment = JOB_PMC_MEDIC
rank = JOB_PMC_MEDIC
paygrade = "PMC-MS"
skills = /datum/skills/civilian/survivor/pmc/medic

/datum/equipment_preset/survivor/pmc/medic/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human), WEAR_IN_BACK)
if(new_human.disabilities & NEARSIGHTED)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES)
else
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES)
new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_R_HAND)

..()

/datum/equipment_preset/survivor/pmc/engineer
name = "Survivor - PMC Engineer"
assignment = JOB_PMC_ENGINEER
rank = JOB_PMC_ENGINEER
paygrade = "PMC-TECH"
skills = /datum/skills/civilian/survivor/pmc/engineer

/datum/equipment_preset/survivor/pmc/engineer/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES)
new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/med_small_stack(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_R_HAND)

..()

/datum/equipment_preset/survivor/wy/manager
name = "Survivor - Corporate Supervisor"
Expand Down
22 changes: 20 additions & 2 deletions maps/map_files/BigRed/standalone/crashlanding-offices.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1425,6 +1425,15 @@
icon_state = "rasputin15"
},
/area/bigredv2/outside/office_complex)
"hN" = (
/obj/structure/bed/chair/dropship/passenger{
dir = 4
},
/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_medic,
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/area/bigredv2/outside/office_complex)
"id" = (
/obj/structure/bed/chair/dropship/passenger{
dir = 4
Expand Down Expand Up @@ -1632,6 +1641,15 @@
icon_state = "floor8"
},
/area/bigredv2/outside/office_complex)
"XH" = (
/obj/structure/bed/chair/dropship/passenger{
dir = 4
},
/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_engineer,
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/area/bigredv2/outside/office_complex)

(1,1,1) = {"
ac
Expand Down Expand Up @@ -1911,7 +1929,7 @@ cX
cX
by
aN
id
XH
AB
yS
aV
Expand Down Expand Up @@ -2078,7 +2096,7 @@ od
yS
yS
cu
id
hN
yS
yS
yS
Expand Down

0 comments on commit 39cf164

Please sign in to comment.