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

Fiorina Nightmare Insert #5857

Merged
merged 6 commits into from
Mar 7, 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
21 changes: 21 additions & 0 deletions code/game/objects/effects/landmarks/survivor_spawner.dm
BadAtThisGame302 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,27 @@

spawn_priority = SPAWN_PRIORITY_MEDIUM

//CMB Survivors//

/obj/effect/landmark/survivor_spawner/fiorina_armory_cmb
equipment = /datum/equipment_preset/survivor/colonial_marshal
synth_equipment = /datum/equipment_preset/synth/survivor/cmb_synth
intro_text = list("<h2>You are a CMB Deputy!</h2>",\
"<span class='notice'>You are aware of the 'alien' threat.</span>",\
"<span class='danger'>Your primary objective is to survive the infestation.</span>")
story_text = "You are a Deputy of the Office of the Colonial Marshals. Your dispatcher received a distress signal from the infamous Fiorina Maximum Penitentiary. You figured it was just another typical case of the prison dealing with a riot their understaffed security force couldn't handle, with more and more of its personnel getting dispatched elsewhere in the galaxy. This wasn't the first time OCM officers were called in to assist, but unfortunately for you, this time it also wasn't the 'minor riot' you expected it to be. Loaded up with only beanbags and finding nobody to greet you on the LZ after being dropped off, you and the rest of your team had gone towards the armory to speak to the Quartermaster, but only found corpses of both prisoners and security littered around on the way. Worried about armed prisoners, your team was in the process of switching to lethals in the armory when some sort of huge alien jumped out from the shadows and snatched Jerry away while he was off praying. The thing dragged him off too fast to catch and his screams faded away down the halls, poor bastard. Now, you'll need to decide whether to look for more clues about what the hell happened here, hunt whatever's out there, or hold a position and hope someone else will respond to the distress signal before it's too late..."

spawn_priority = SPAWN_PRIORITY_VERY_HIGH

/obj/effect/landmark/survivor_spawner/fiorina_armory_riot_control
equipment = /datum/equipment_preset/survivor/colonial_marshal/fiorina
synth_equipment = /datum/equipment_preset/synth/survivor/cmb_synth
intro_text = list("<h2>You are a United Americas Riot Control Officer!</h2>",\
"<span class='notice'>You are aware of the 'alien' threat.</span>",\
"<span class='danger'>Your primary objective is to survive the infestation.</span>")
story_text = "You are a United Americas Riot Control Officer. Your dispatcher received a request from the local OCM Outpost, requesting some men to intervene assist a Deputy with handling a riot at Fiorina. The prison was an understaffed mess so you weren't too surprised they had sent out a distress signal, calling you in to do their jobs yet again. Unfortunately for you, this time it also wasn't the 'minor riot' you expected it to be. Loaded up with only beanbags and finding nobody to greet you on the LZ after being dropped off, you and the rest of your team had gone towards the armory to speak to the Quartermaster, but only found corpses of both prisoners and security littered around on the way. Worried about armed prisoners, your team was in the process of switching to lethals in the armory when some sort of huge alien jumped out from the shadows and snatched Jerry away while he was off praying. The thing dragged him off too fast to catch and his screams faded away down the halls, poor bastard. Now, you'll need to decide whether to look for more clues about what the hell happened here, hunt whatever's out there, or hold a position and hope someone else will respond to the distress signal before it's too late..."

spawn_priority = SPAWN_PRIORITY_HIGH

//Military Survivors//

Expand Down
9 changes: 8 additions & 1 deletion maps/Nightmare/maps/FOP_v3_Sciannex/nightmare.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
[
{ "type": "map_sprinkle", "path": "sprinkles/" }
{ "type": "map_sprinkle", "path": "sprinkles/" },
{
"type": "map_insert",
"landmark": "riot_control",
"chance": 0.5,
"path": "standalone/riot_in_progress.dmm",
"when": { "riot_in_progress": "true" }
}
]
10 changes: 9 additions & 1 deletion maps/Nightmare/maps/FOP_v3_Sciannex/scenario.json
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
[]
[
{
"type": "pick", "name": "Riot Control",
"choices": [
{ "weight": 4, "type": "def", "values": { "riot_in_progress": "none" } },
{ "weight": 2, "type": "def", "values": { "riot_in_progress": "true" } }
]
}
]
42 changes: 24 additions & 18 deletions maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -27463,6 +27463,12 @@
/obj/effect/spawner/random/tool,
/turf/open/floor/prison,
/area/fiorina/station/civres_blue)
"qHi" = (
/obj/effect/landmark/nightmare{
insert_tag = "riot_control"
},
/turf/open/floor/prison,
/area/fiorina/station/security)
"qHG" = (
/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{
pixel_y = 25
Expand Down Expand Up @@ -68528,7 +68534,7 @@ uGY
ihB
ihB
ubP
ubP
qHi
gag
sbF
sbF
Expand Down Expand Up @@ -69572,12 +69578,12 @@ ihB
ceC
obh
obh
nqN
ceC
bxc
jbF
bBK
ceC
uGY
ceC
uGY
uGY
uGY
Expand Down Expand Up @@ -69996,7 +70002,7 @@ stw
wQg
qet
mKp
nqN
ceC
qJv
bqF
tNF
Expand Down Expand Up @@ -70203,15 +70209,15 @@ kjX
ueP
gag
hQj
nqN
nqN
nqN
nqN
nqN
nqN
uGY
uGY
uGY
uGY
uGY
ceC
ceC
ceC
ceC
nqN
nqN
ceC
unz
gag
Expand Down Expand Up @@ -70644,7 +70650,7 @@ uGY
ppq
ubP
ihB
nqN
uGY
lJx
fAf
fAf
Expand Down Expand Up @@ -71054,7 +71060,7 @@ qdE
uGY
ltQ
ltQ
nqN
uGY
ltQ
ayo
uGY
Expand Down Expand Up @@ -71266,7 +71272,7 @@ uGY
uGY
fRq
fRq
nqN
uGY
fRq
ygr
xGt
Expand Down Expand Up @@ -71704,7 +71710,7 @@ uGY
ceC
uGY
uGY
nqN
uGY
qQd
jwK
jwK
Expand Down Expand Up @@ -71897,8 +71903,8 @@ dCM
dCM
dCM
nqN
nqN
nqN
uGY
uGY
uxv
ceC
ceC
Expand Down
Loading
Loading