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

Adds a new Nightmare Insert on LV-624 #5652

Merged
merged 6 commits into from
Feb 23, 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
22 changes: 22 additions & 0 deletions code/game/objects/effects/landmarks/survivor_spawner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,28 @@

spawn_priority = SPAWN_PRIORITY_VERY_HIGH

//Weyland-Yutani Survivors//

/obj/effect/landmark/survivor_spawner/lv624_corporate_dome_cl
equipment = /datum/equipment_preset/survivor/wy/executive
synth_equipment = /datum/equipment_preset/synth/survivor/wy/security_synth
intro_text = list("<h2>You are the last alive Executive of Lazarus Landing!</h2>",\
"<span class='notice'>You are aware of the xenomorph threat.</span>",\
"<span class='danger'>Your primary objective is to survive the outbreak.</span>")
story_text = "You are a Corporate Liaison stationed on LV-624 from Weyland-Yutani. You were tipped off about some very peculiar looking eggs recovered from the alien temple North-East of the colony. Being the smart Executive the Company hired you to be, you decided to prepare your office for the worst when the first 'facehugger' was born in the vats of the Research Dome. Turned out, you were right, everyone who called you crazy and called these the new 'synthetics' is now dead, you along with your Corporate Security detail are the only survivors due to your paranoia. The xenomorph onslaught was relentless, a fuel tank was shot by one of the Officers, leading to the destruction of a part of the dome, along with alot of the defences being melted. You must survive and find a way to contact Weyland-Yutani."

spawn_priority = SPAWN_PRIORITY_VERY_HIGH

/obj/effect/landmark/survivor_spawner/lv624_corporate_dome_goon
equipment = /datum/equipment_preset/survivor/goon
synth_equipment = /datum/equipment_preset/synth/survivor/wy/security_synth
intro_text = list("<h2>You are a Corporate Security Officer!</h2>",\
"<span class='notice'>You are aware of the xenomorph threat.</span>",\
"<span class='danger'>Your primary objective is to survive the outbreak.</span>")
story_text = "You are a Corporate Security Officer stationed on LV-624 from Weyland-Yutani. Suddenly one day you were pulled aside by the Corporate Liaison and told to bring supplies from both Engineering and the Marshals Offices to their office, and fast. You began fortifying the Corporate Dome and was told by the Executive that something big will ravage the entire colony, excluding you. Turns out, the Liaison was right, these so called 'xenomorphs' broke containment from the Research Dome and began destroying the entire colony. Once they came for the Dome and tried to kill all of you, you barely managed to hold them off even after losing one Officer and alot of the defences. The Liaison said they will soon find a way to contact Weyland-Yutani and to remain steadfast until rescue arrives."

spawn_priority = SPAWN_PRIORITY_HIGH

/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc
equipment = /datum/equipment_preset/survivor/pmc
synth_equipment = /datum/equipment_preset/synth/survivor/pmc
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
// /obj/effect/landmark/survivor_spawner/lv624_corporate_dome/cl
// corporatedomehold.dmm

/datum/equipment_preset/survivor/wy/executive
name = "Survivor - LV-624 Paranoid Corporate Liaison"
flags = EQUIPMENT_PRESET_START_OF_ROUND
paygrade = PAY_SHORT_WYC5
skills = /datum/skills/civilian/survivor/manager
assignment = "LV-624 Corporate Liaison"
idtype = /obj/item/card/id/silver/clearance_badge/cl
faction_group = list(FACTION_WY, FACTION_SURVIVOR)
access = list(
ACCESS_WY_GENERAL,
ACCESS_WY_COLONIAL,
ACCESS_WY_MEDICAL,
ACCESS_WY_SECURITY,
ACCESS_WY_RESEARCH,
ACCESS_WY_ARMORY,
ACCESS_CIVILIAN_PUBLIC,
ACCESS_CIVILIAN_RESEARCH,
ACCESS_CIVILIAN_ENGINEERING,
ACCESS_CIVILIAN_LOGISTICS,
ACCESS_CIVILIAN_BRIG,
ACCESS_CIVILIAN_MEDBAY,
ACCESS_CIVILIAN_COMMAND,
)
languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_RUSSIAN)

survivor_variant = CORPORATE_SURVIVOR

/datum/equipment_preset/survivor/wy/executive/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/field(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/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD)
if(new_human.disabilities & NEARSIGHTED)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/prescription(new_human), WEAR_EYES)
else
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/storage/secure/briefcase(new_human), WEAR_L_HAND)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/med_small_stack(new_human), WEAR_IN_BACK)
add_random_cl_survivor_loot(new_human)
add_random_cl_survivor_loot(new_human)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to call this twice?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to call this twice?

Yes, replaced the pistol (which I forgot I already gave him one) to yet another research loot spawner, didn't want a static so I put two there.

new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/document(new_human), WEAR_R_STORE)
1 change: 1 addition & 0 deletions colonialmarines.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1762,6 +1762,7 @@
#include "code\modules\gear_presets\survivors\kutjevo\preset_kutjevo.dm"
#include "code\modules\gear_presets\survivors\lv_522\forcon_survivors.dm"
#include "code\modules\gear_presets\survivors\lv_624\clfship_insert_lv624.dm"
#include "code\modules\gear_presets\survivors\lv_624\corporate_dome_insert_lv624.dm"
#include "code\modules\gear_presets\survivors\lv_624\preset_lv.dm"
#include "code\modules\gear_presets\survivors\new_varadero\preset_new_varadero.dm"
#include "code\modules\gear_presets\survivors\shivas_snowball\preset_shivas_snowball.dm"
Expand Down
7 changes: 7 additions & 0 deletions maps/Nightmare/maps/LV624/nightmare.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@
"path": "standalone/clfship.dmm",
"when": { "lvevent": "fallen_ship" }
},
{
"type": "map_insert",
"landmark": "corporatedome",
"chance": 0.5,
"path": "standalone/corporatedome.dmm",
"when": { "lvevent": "asset_protection" }
},
{
"type": "map_insert",
"landmark": "lv-skylight",
Expand Down
3 changes: 2 additions & 1 deletion maps/Nightmare/maps/LV624/scenario.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
{ "weight": 2, "type": "def", "values": { "lvevent": "none" } },
{ "weight": 4, "type": "def", "values": { "lvevent": "last_stand" } },
{ "weight": 2, "type": "def", "values": { "lvevent": "fallen_ship", "mainpath": "bridge" } },
{ "weight": 2, "type": "def", "values": { "lvevent": "fallen_ship", "mainpath": "right" } }
{ "weight": 2, "type": "def", "values": { "lvevent": "fallen_ship", "mainpath": "right" } },
{ "weight": 2, "type": "def", "values": { "lvevent": "asset_protection", "mainpath": "left" } }
]
}
]
11 changes: 10 additions & 1 deletion maps/map_files/LV624/LV624.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -15851,6 +15851,15 @@
"hSn" = (
/turf/open/gm/grass/grass1,
/area/lv624/ground/colony/west_nexus_road)
"hSp" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 9
},
/obj/effect/landmark/nightmare{
insert_tag = "corporatedome"
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/colony/west_tcomms_road)
"hSz" = (
/obj/effect/landmark/hunter_secondary,
/turf/open/gm/grass/grass1,
Expand Down Expand Up @@ -34624,7 +34633,7 @@ aXh
wTC
kjp
kjp
ply
hSp
efp
efp
uSq
Expand Down
Loading
Loading