From 5e541d1552322ea782253b758ff84fee8882cf4b Mon Sep 17 00:00:00 2001 From: gl0ck Date: Sun, 16 Feb 2025 01:36:40 -0500 Subject: [PATCH 1/2] adds execution room --- code/game/area/rostock.dm | 10 + maps/templates/ssv_rostock.dmm | 494 +++++++++++++++++++++++---------- 2 files changed, 355 insertions(+), 149 deletions(-) diff --git a/code/game/area/rostock.dm b/code/game/area/rostock.dm index d75347ac545a..fa208a26d2d3 100644 --- a/code/game/area/rostock.dm +++ b/code/game/area/rostock.dm @@ -117,6 +117,16 @@ icon_state = "brigcells" fake_zlevel = 1 //upperdeck +/area/rostock/security/execution_room + name = "SSV Rostock - Execution Room" + icon_state = "brigcells" + fake_zlevel = 1 //upperdeck + +/area/rostock/security/execution_storage + name = "SSV Rostock - Execution Storage Room" + icon_state = "brigcells" + fake_zlevel = 1 //upperdeck + /area/rostock/security/brig_office name = "SSV Rostock - Brig Office" icon_state = "brig" diff --git a/maps/templates/ssv_rostock.dmm b/maps/templates/ssv_rostock.dmm index 2c8f98e6bf4e..307b67081795 100644 --- a/maps/templates/ssv_rostock.dmm +++ b/maps/templates/ssv_rostock.dmm @@ -686,6 +686,176 @@ }, /turf/open/floor/corsat/spiralplate, /area/rostock/lower_deck/prep) +"acj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/generic, +/obj/structure/largecrate/random/case/small, +/obj/effect/decal/strata_decals/grime/grime2{ + dir = 4 + }, +/turf/open/floor/corsat/spiralplate, +/area/rostock/upperdeck_maint/p_m) +"ack" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/corsat/spiralplate, +/area/rostock/upperdeck_maint/p_f) +"acl" = ( +/turf/closed/wall/upp_ship/reinforced, +/area/rostock/security/execution_room) +"acm" = ( +/obj/structure/window/framed/upp_ship/reinforced, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 1; + id = "uppbrig1"; + name = "Brig Lockdown" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 1; + id = s; + name = "\improper Entrance Shutters" + }, +/turf/open/floor/plating, +/area/rostock/security/execution_room) +"acn" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "rostock camera"; + network = list("Rostock"); + dir = 1 + }, +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1; + dir = 8 + }, +/turf/open/floor/strata, +/area/rostock/security/execution_room) +"aco" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/strata/red3/east, +/area/rostock/security/execution_room) +"acp" = ( +/obj/structure/bed/chair/wood/normal{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/almayer/cargo, +/area/rostock/security/execution_room) +"acq" = ( +/turf/open/floor/strata/red3/west, +/area/rostock/security/execution_room) +"acr" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1; + dir = 4 + }, +/turf/open/floor/strata, +/area/rostock/security/execution_room) +"acs" = ( +/turf/closed/wall/upp_ship/reinforced, +/area/rostock/security/execution_storage) +"act" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/corsat/spiralplate, +/area/rostock/upperdeck_maint/p_f) +"acu" = ( +/turf/open/floor/strata, +/area/rostock/security/execution_room) +"acv" = ( +/turf/open/floor/strata/red3/southeast, +/area/rostock/security/execution_room) +"acw" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/strata/red3/south, +/area/rostock/security/execution_room) +"acx" = ( +/turf/open/floor/strata/red3/southwest, +/area/rostock/security/execution_room) +"acy" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/strata, +/area/rostock/security/execution_room) +"acz" = ( +/obj/structure/closet/secure_closet{ + name = "\improper Lethal Injection Locker" + }, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/corsat/spiralplate, +/area/rostock/security/execution_storage) +"acA" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "rostock camera"; + network = list("Rostock"); + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/rostock/security/execution_storage) +"acB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet{ + name = "\improper Lethal Injection Locker" + }, +/obj/item/ammo_box/magazine/type71, +/obj/item/weapon/gun/rifle/type71, +/obj/item/weapon/gun/rifle/type71, +/obj/item/weapon/gun/rifle/type71, +/turf/open/floor/corsat/spiralplate, +/area/rostock/security/execution_storage) +"acC" = ( +/obj/structure/machinery/door_control{ + pixel_x = -25; + pixel_y = 0; + id = "upp_brig_execution"; + name = "Entrance Shutter"; + req_one_access = list(230, 240) + }, +/turf/open/floor/strata, +/area/rostock/security/execution_room) +"acD" = ( +/turf/open/floor/strata/red3/north, +/area/rostock/security/execution_room) +"acE" = ( +/obj/structure/sign/safety/ammunition{ + pixel_x = 32; + pixel_y = 6 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 32; + pixel_y = -8 + }, +/turf/open/floor/strata, +/area/rostock/security/execution_room) +"acF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/item/storage/box/bodybags{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/box/bodybags, +/turf/open/floor/corsat/spiralplate, +/area/rostock/security/execution_storage) +"acG" = ( +/turf/open/floor/plating/plating_catwalk/prison, +/area/rostock/security/execution_storage) +"acH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/drinks/bottle/vodka, +/obj/item/reagent_container/food/drinks/bottle/vodka{ + pixel_y = 6; + pixel_x = 10 + }, +/obj/item/clothing/glasses/sunglasses/blindfold, +/turf/open/floor/corsat/spiralplate, +/area/rostock/security/execution_storage) "acI" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/rods, @@ -694,6 +864,33 @@ }, /turf/open/floor/corsat/spiralplate, /area/rostock/upperdeck_maint/p_f) +"acJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/random/barrel/brown, +/turf/open/floor/corsat/spiralplate, +/area/rostock/upperdeck_maint/p_f) +"acK" = ( +/obj/structure/machinery/power/apc/power/west, +/turf/open/floor/strata, +/area/rostock/security/execution_room) +"acL" = ( +/obj/structure/sign/safety/firingrange{ + pixel_x = 1; + pixel_y = 24 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = 24 + }, +/turf/open/floor/almayer/cargo, +/area/rostock/security/execution_room) +"acM" = ( +/obj/structure/machinery/light{ + dir = 1; + invisibility = 101 + }, +/turf/open/floor/almayer/cargo, +/area/rostock/security/execution_room) "acN" = ( /obj/structure/surface/table/almayer, /obj/item/device/defibrillator, @@ -703,6 +900,36 @@ }, /turf/open/floor/strata/floor2, /area/rostock/req) +"acO" = ( +/turf/open/floor/almayer/cargo, +/area/rostock/security/execution_room) +"acP" = ( +/obj/structure/machinery/door/airlock/upp/sec/solid/autoname, +/turf/open/floor/corsat/marked, +/area/rostock/security/execution_storage) +"acQ" = ( +/obj/structure/machinery/light/small{ + light_color = "#ffd4d4"; + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/rostock/security/execution_storage) +"acR" = ( +/obj/structure/machinery/power/apc/power/east, +/turf/open/floor/plating/plating_catwalk/prison, +/area/rostock/security/execution_storage) +"acS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/random, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/corsat/spiralplate, +/area/rostock/upperdeck_maint/p_f) +"acT" = ( +/obj/structure/machinery/door/airlock/upp/sec/autoname{ + dir = 2 + }, +/turf/open/floor/corsat/marked, +/area/rostock/security/execution_room) "acX" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/rostock/upperdeck_maint/p_f) @@ -1338,7 +1565,7 @@ /turf/open/floor/almayer/sterile_green, /area/rostock/medical/chemistry) "azM" = ( -/obj/structure/closet/firecloset, +/obj/effect/decal/heavy_cable/node_n_e_s, /turf/open/floor/plating/plating_catwalk/prison, /area/rostock/upperdeck_maint/p_m) "azT" = ( @@ -3576,10 +3803,6 @@ /obj/effect/decal/cleanable/dirt, /obj/item/stack/rods, /obj/structure/disposalpipe/segment, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 32; - pixel_y = 6 - }, /turf/open/floor/corsat/spiralplate, /area/rostock/upperdeck_maint/p_m) "cpt" = ( @@ -3685,14 +3908,6 @@ }, /turf/open/floor/corsat/plate, /area/rostock/railgun/starboard) -"cvl" = ( -/obj/effect/decal/heavy_cable/cable_vertical, -/obj/structure/machinery/door/airlock/upp/generic/solid{ - dir = 8; - name = "\improper Maintenance Hatch" - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/rostock/upperdeck_maint/p_m) "cvr" = ( /obj/structure/machinery/landinglight/upp_ds2, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -4691,13 +4906,6 @@ }, /turf/open/floor/strata, /area/rostock/upper_deck/hallway) -"dpB" = ( -/obj/structure/machinery/door/airlock/upp/generic/solid{ - dir = 8; - name = "\improper Maintenance Hatch" - }, -/turf/open/floor/corsat/spiralplate, -/area/rostock/upperdeck_maint/p_m) "dpC" = ( /obj/structure/bed{ icon_state = "psychbed" @@ -8372,15 +8580,6 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/rostock/lower_deck/m_hallway) -"gij" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/generic, -/obj/structure/largecrate/random/case/small, -/obj/effect/decal/strata_decals/grime/grime2{ - dir = 4 - }, -/turf/open/floor/corsat/spiralplate, -/area/rostock/upperdeck_maint/p_f) "giO" = ( /obj/structure/machinery/light/small{ dir = 8; @@ -12428,6 +12627,11 @@ name = "Entrance Shutter"; req_one_access = list(230, 240) }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "rostock camera"; + network = list("Rostock"); + dir = 1 + }, /turf/open/floor/strata/red2, /area/rostock/security/brig_entryway) "jiF" = ( @@ -21404,14 +21608,6 @@ }, /turf/open/floor/corsat/plate, /area/rostock/lower_deck/p_hallway) -"qzI" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "rostock camera"; - network = list("Rostock"); - dir = 1 - }, -/turf/open/floor/strata/red3/east, -/area/rostock/security/brig_entryway) "qzQ" = ( /obj/structure/surface/rack{ density = 0; @@ -21810,8 +22006,8 @@ /turf/open/floor/plating/plating_catwalk/strata, /area/rostock/lower_deck/bunk) "qPl" = ( -/obj/item/stack/rods, /obj/effect/decal/heavy_cable/cable_vertical, +/obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk/prison, /area/rostock/upperdeck_maint/p_m) "qPy" = ( @@ -22447,10 +22643,10 @@ /turf/open/floor/corsat/plate, /area/rostock/hangar/hangarbay) "rnx" = ( -/obj/structure/machinery/vending/cigarette/free{ +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/machinery/vending/cigarette/koorlander/free{ pixel_y = -16 }, -/obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk/strata, /area/rostock/security/brig_holding_area) "rnD" = ( @@ -44615,7 +44811,7 @@ rUr gzc gzc cMv -lzF +djY qPl xoG iFa @@ -44790,14 +44986,14 @@ ubj tax gwb gwb -cvl -hIM -dpB +gqt +wPR +wPR hIM -djY +vIk azM -lzF -jXB +vIk +wPR jXB jXB iFa @@ -44972,13 +45168,14 @@ lPy lPy lPy lPy -pZW -gij -vrv -sNZ -jXB -jXB -jXB +wPR +wPR +wPR +wPR +wPR +gqt +acj +piQ jXB iFa iFa @@ -44989,7 +45186,6 @@ iFa iFa iFa iFa -iFa jtG ofW ofW @@ -45153,7 +45349,12 @@ cIO lPy sBO pmO -lPy +acl +acl +acl +acl +acl +acl aSi acX eLO @@ -45167,11 +45368,6 @@ iFa iFa iFa iFa -iFa -iFa -iFa -iFa -iFa jtG ofW ofW @@ -45334,10 +45530,15 @@ pqq tBC tzo mGL -qzI -lPy +mGL +acT +acK +acC +acu +acn +acl acc -acX +toe gAs sNZ sNZ @@ -45349,11 +45550,6 @@ iFa iFa iFa iFa -iFa -iFa -iFa -iFa -iFa jtG ofW ofW @@ -45517,7 +45713,12 @@ kSD pjY oRz jiy -lPy +acl +acL +acD +acv +aco +acm spy bjo wlm @@ -45531,11 +45732,6 @@ iFa iFa iFa iFa -iFa -iFa -iFa -iFa -iFa jtG ofW ofW @@ -45699,7 +45895,12 @@ lPy lPy eKA gYI -lPy +acl +acM +acD +acw +acp +acm gAs gAs gAs @@ -45713,11 +45914,6 @@ iFa iFa iFa iFa -iFa -iFa -iFa -iFa -iFa gec ofW ofW @@ -45882,6 +46078,11 @@ dDA jeg cLx guf +acO +acD +acx +acq +acm rmS qtB qtB @@ -45894,11 +46095,6 @@ iFa iFa iFa iFa -iFa -iFa -iFa -iFa -iFa jtG ofW ofW @@ -46064,6 +46260,11 @@ kmP vlM unb guf +acu +acE +acy +acr +acl aZc gAs trE @@ -46076,11 +46277,6 @@ iFa iFa iFa iFa -iFa -iFa -iFa -iFa -iFa jtG ofW ofW @@ -46246,9 +46442,14 @@ ogL ogL ddO guf +acP +acs +acs +acs +acl tzY uHv -gAs +lNv sNZ iFa iFa @@ -46258,11 +46459,6 @@ iFa iFa iFa sZn -sZn -sZn -sZn -sZn -sZn gec ofW ofW @@ -46428,8 +46624,13 @@ hBm ogL stL guf +acG +acF +acz +acs hnn -acX +gAs +pZW dvX sNZ iFa @@ -46445,11 +46646,6 @@ ofW ofW ofW ofW -ofW -ofW -ofW -ofW -ofW dKd ofW ofW @@ -46610,8 +46806,13 @@ ogL ogL ddO guf +acQ +acG +acA +acs vgp -acX +gAs +pZW gAs sNZ iFa @@ -46627,11 +46828,6 @@ ofW ofW ofW ofW -ofW -ofW -ofW -ofW -ofW dKd ofW ofW @@ -46792,8 +46988,13 @@ kmP vlM rnx guf +acR +acH +acB +acs xqn -acX +gAs +pZW acX sNZ iFa @@ -46809,11 +47010,6 @@ ofW ofW ofW ofW -ofW -ofW -ofW -ofW -ofW dKd ofW ofW @@ -46974,6 +47170,11 @@ rKv ouX uFI guf +acs +acs +acs +acs +tet gAs cHd gak @@ -46991,11 +47192,6 @@ ofW ofW ofW ofW -ofW -ofW -ofW -ofW -ofW dKd ofW ofW @@ -47156,8 +47352,13 @@ guf guf bJd guf -tet +acS +acJ gAs +act +gAs +gAs +pZW gAs acX tOQ @@ -47173,11 +47374,6 @@ ofW ofW ofW ofW -ofW -ofW -ofW -ofW -ofW dKd ofW ofW @@ -47338,8 +47534,13 @@ adA guf wcu guf -lNv +acJ gAs +toe +toe +gAs +gAs +acb gAs kly dZs @@ -47355,11 +47556,6 @@ ofW ofW ofW ofW -ofW -ofW -ofW -ofW -ofW dKd ofW ofW @@ -47520,20 +47716,20 @@ msL guf guf guf -tgF gAs +gAs +gAs +gAs +gAs +tgF +ack rFR sNZ sNZ sNZ iFa -iFa -jtG -ofW -ofW -ofW -ofW -ofW +sZn +gec ofW ofW ofW @@ -47705,15 +47901,15 @@ cVK jHK gAs gAs +gAs sNZ -iFa -iFa -iFa -iFa -jtG -ofW -ofW -ofW +sNZ +sNZ +sNZ +sNZ +sZn +sZn +gec ofW ofW ofW @@ -47887,7 +48083,7 @@ cVK pZW acX gAs -sNZ +gAs sNZ iFa iFa From 6f79a74e7ce44c9efcfbdb34fc84e9c4a3fb1d3b Mon Sep 17 00:00:00 2001 From: gl0ck Date: Sun, 16 Feb 2025 01:57:56 -0500 Subject: [PATCH 2/2] koorlander not default --- maps/templates/ssv_rostock.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maps/templates/ssv_rostock.dmm b/maps/templates/ssv_rostock.dmm index 307b67081795..df7197c4e9c6 100644 --- a/maps/templates/ssv_rostock.dmm +++ b/maps/templates/ssv_rostock.dmm @@ -6393,7 +6393,7 @@ /turf/open/floor/corsat/plate, /area/rostock/stair_clone) "ewT" = ( -/obj/structure/machinery/vending/cigarette, +/obj/structure/machinery/vending/cigarette/koorlander, /obj/structure/disposalpipe/junction{ dir = 4; icon_state = "pipe-j2" @@ -10932,7 +10932,7 @@ /turf/open/floor/strata/floor3, /area/rostock/hangar/hangarbay) "hUG" = ( -/obj/structure/machinery/vending/cigarette/free, +/obj/structure/machinery/vending/cigarette/koorlander, /turf/open/floor/strata/green3/east, /area/rostock/command/hallway) "hUJ" = (