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 2 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 xenomorph threat.</span>",\
"<span class='danger'>Your primary objective is to survive the infestation.</span>")
story_text = "You are a Deputy of the Colonial Marshals Bureau. Your dispatcher received a distress signal from the infamous Fiorina Maximum Penitentiary. This happens often enough, as more and more UA Security Officers are dispatched elsewhere in the Galaxy, the prison frequently has minor riots which the remaining security can't handle, thus calling the CMB for help. And the CMB in-turn often calls on the UA to send some Riot Control Officers to assist the CMB. Unfortunately, this was not a 'minor' riot as you expected it to be, loaded up with beanbags and with nobody to greet you on the LZ, you and the team head toward the Armory to speak to the Quartermaster, but only find corpses of both prisoners and security littered around. After a bit of discussion, you drop the non-lethals and arm yourselfs, afraid of more armed prisoners. Then some sort of huge alien jumps out from the shadows and snatches Jerry, he was alone praying while the rest were investigating the Security Office for any clues. No luck, the thing is too fast to catch and his screams quiet down, bastards.. You must decide to either defend the Security Offices or move elsewhere, before it's too late and more members of your team die..."

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 xenomorph 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 beacon from the local CMB Outpost, requesting some men to intervene along with CMB Deputy oversight to the Fiorina riot. This happens often enough, as more and more CMB Deputies and Marshals are dispatched elsewhere in the Galaxy, the prison frequently has minor riots which the remaining security can't handle, thus the CMB is called to help. And they then call you to basically yet again do their jobs... Unfortunately, this was not a 'minor' riot as you were told it would be, loaded up with beanbags and with nobody to greet you on the LZ, you and the team head toward the Armory to speak to the Quartermaster, but only find corpses of both prisoners and security littered around. After a bit of discussion, you drop the non-lethals and arm yourselfs, afraid of more armed prisoners. Then some sort of huge alien jumps out from the shadows and snatches Jerry, he was alone praying while the rest were investigating the Security Office for any clues. No luck, the thing is too fast to catch and his screams quiet down, bastards.. You must decide to either defend the Security Offices or move elsewhere, before it's too late and more members of your team die..."

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" } }
]
}
]
8 changes: 7 additions & 1 deletion 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
Loading
Loading