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.

Sign up for GitHub

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

Jump to bottom

Big Red PMC Crash Changes (feat. Surv Goon M41 Fix) #3777

Merged
merged 2 commits into from
Jul 19, 2023
Merged

Big Red PMC Crash Changes (feat. Surv Goon M41 Fix) #3777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a14cbc9
i love WY
toolmind Jul 1, 2023
eb9a45e
lightpacks
toolmind Jul 11, 2023
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
26 changes: 26 additions & 0 deletions code/datums/skills.dm
View file
Open in desktop
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
View file
Open in desktop
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/pmc/synth
Expand Down
37 changes: 35 additions & 2 deletions code/modules/gear_presets/survivors.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,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 @@ -1215,11 +1215,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
View file
Open in desktop
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
Loading