Skip to content

Commit

Permalink
Fiorina Nightmare Insert (#5857)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->

# About the pull request

The Fiorina Prison has seen more and more unrest the last few years,
quelling it down with the dwindling manpower. One such instance, the CMB
picked up a beacon that was sent from the Prison. Thinking it was
another riot, they asked for some Riot Control officers and sent them
with a CMB Deputy to oversee the pacification of the station.

With no greetings at the LZ, they headed to the Armory to speak to
someone in command. What they did not account for was that.. this was no
riot, not anymore at least. The Security Hub is littered with both
prisoner and Security forces corpses. Some sort of green blood and heavy
fortifications. A team member snatched in the darkness and his screams
silencing after a couple of seconds prove that... there's nobody left.

You must survive until the CMB or some other force finds you.. and saves
you before it's too late.

# Explain why it's good for the game

Woohooo nightmare insert baby yeayh


# Testing Photographs and Procedure
<!-- Include any screenshots/videos/debugging steps of the modified code
functioning successfully, ideally including edge cases. -->

<!-- !! If you are modifying sprites, you **must** include one or more
in-game screenshots or videos of the new sprites. !! -->

<details>
<summary>Screenshots & Videos</summary>


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/b3d5cad0-a136-4c5a-bf3e-12a315c5eebd)

</details>


# Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
label your changes in the changelog. Please note that maintainers freely
reserve the right to remove and add tags should they deem it
appropriate. You can attempt to finagle the system all you want, but
it's best to shoot for clear communication right off the bat. -->
<!-- If you add a name after the ':cl', that name will be used in the
changelog. You must add your CKEY after the CL if your GitHub name
doesn't match. Maintainers freely reserve the right to remove and add
tags should they deem it appropriate. -->

:cl:
mapadd: added a new Fiorina nightmare insert with CMB and UA Officers
responding to the distress signal.
/:cl:
<!-- Both :cl:'s are required for the changelog to work! -->

---------

Co-authored-by: Jeff Watchson <[email protected]>
  • Loading branch information
BadAtThisGame302 and Jeff Watchson authored Mar 7, 2024
1 parent 20f4243 commit 4ad592d
Show file tree
Hide file tree
Showing 5 changed files with 2,331 additions and 20 deletions.
21 changes: 21 additions & 0 deletions code/game/objects/effects/landmarks/survivor_spawner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,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

0 comments on commit 4ad592d

Please sign in to comment.