From 424ac968dca52053f24b7917cd4b9996eddf8d6f Mon Sep 17 00:00:00 2001 From: ddorou Date: Thu, 11 Apr 2024 18:23:35 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maps/sierra/z1-z5_sierra.dmm | 77 ++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index f873be4d62c62..282851b79e1c3 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -10113,6 +10113,10 @@ /obj/floor_decal/techfloor{ dir = 9 }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) "byQ" = ( @@ -44763,10 +44767,6 @@ /obj/item/inflatable_dispenser, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_eva) -"gDy" = ( -/obj/machinery/suit_storage_unit/explorer/engineer, -/turf/simulated/floor/tiled/techfloor, -/area/quartermaster/exploration/eva) "gDD" = ( /obj/structure/closet/secure_closet/el, /obj/floor_decal/borderfloor{ @@ -45857,7 +45857,7 @@ /turf/simulated/floor/reinforced{ map_airless = 1 }, -/area/space) +/area/engineering/engine_room) "gLh" = ( /obj/structure/table/woodentable/walnut, /obj/random/single/playing_cards, @@ -52571,14 +52571,6 @@ /obj/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/white, /area/medical/infirmreception) -"hKO" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 4 - }, -/obj/structure/railing/mapped, -/obj/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "hKY" = ( /turf/simulated/wall/prepainted, /area/bridge/adjutants/cobed) @@ -57179,6 +57171,11 @@ id = "bridge_windows" }, /obj/structure/cable/green, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id_tag = "bridge_ent"; + name = "Bridge Lockdown" + }, /turf/simulated/floor/plating, /area/bridge) "iyb" = ( @@ -64365,6 +64362,10 @@ /obj/floor_decal/techfloor{ dir = 5 }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) "jBY" = ( @@ -71280,6 +71281,9 @@ }, /obj/floor_decal/corner/paleblue, /obj/floor_decal/industrial/hatch/yellow, +/obj/structure/fireaxecabinet{ + pixel_y = -30 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) "kBk" = ( @@ -74250,6 +74254,10 @@ /obj/machinery/computer/modular/preset/engineering{ dir = 1 }, +/obj/machinery/camera/network/engine{ + c_tag = "Engine - R-UST - Control"; + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/vacant/prototype/control) "kXN" = ( @@ -93883,6 +93891,11 @@ d2 = 2; icon_state = "0-2" }, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id_tag = "bridge_ent"; + name = "Bridge Lockdown" + }, /turf/simulated/floor/plating, /area/bridge) "nVh" = ( @@ -95801,6 +95814,7 @@ /obj/machinery/light/spot{ dir = 1 }, +/obj/item/reagent_containers/spray/sterilizine, /turf/simulated/floor/tiled/white/monotile, /area/medical/surgery) "okx" = ( @@ -122577,7 +122591,11 @@ }, /area/space) "sgt" = ( -/obj/machinery/suit_storage_unit/explorer/medic, +/obj/machinery/suit_storage_unit/explorer, +/obj/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/quartermaster/exploration/eva) "sgv" = ( @@ -124860,10 +124878,6 @@ /turf/simulated/floor/tiled/monotile, /area/rnd/entry) "sxH" = ( -/obj/machinery/camera/network/engine{ - c_tag = "Engine - R-UST - Control"; - dir = 8 - }, /obj/floor_decal/industrial/warning{ dir = 1 }, @@ -124872,6 +124886,10 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled/steel_grid, /area/vacant/prototype/control) "sxI" = ( @@ -131487,9 +131505,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/fore) "tvu" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/spray/sterilizine, /obj/floor_decal/industrial/outline/yellow, +/obj/structure/closet/secure_closet/personal/patient, /turf/simulated/floor/tiled/white/monotile, /area/medical/surgery) "tvE" = ( @@ -141410,6 +141427,10 @@ /obj/structure/table/glass, /obj/item/storage/secure/briefcase, /obj/floor_decal/spline/fancy/black, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/dark/monotile, /area/bridge) "uVt" = ( @@ -142948,16 +142969,6 @@ /obj/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration_shuttle/power) -"vfK" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 4 - }, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "vfQ" = ( /obj/structure/bed/chair/padded/red{ dir = 1 @@ -184926,7 +184937,7 @@ plv wBb xYO xyI -gDy +oWS sgt szw lJL @@ -229372,10 +229383,10 @@ pIb lJq pNe rIZ -vfK wUn wUn -hKO +wUn +wUn gab oYi iIr From f5869e2d42524be208d27d1a62fa1a265b8ba6bc Mon Sep 17 00:00:00 2001 From: ddorou Date: Thu, 11 Apr 2024 18:27:23 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB?= =?UTF-8?q?=20=D0=B4=D0=BE=20=D0=B0=D0=BA=D1=82=D1=83=D0=B0=D0=BB=D0=BE?= =?UTF-8?q?=D1=87=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maps/sierra/z1-z5_sierra.dmm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index 282851b79e1c3..a323cdd9c201a 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -96222,6 +96222,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/firstdeck) +"onw" = ( +/obj/machinery/suit_storage_unit/explorer, +/obj/floor_decal/industrial/outline/yellow, +/obj/machinery/suit_storage_unit/explorer/engineer, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/exploration/eva) "onC" = ( /obj/structure/cable/green{ d1 = 4; @@ -122596,6 +122602,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/suit_storage_unit/explorer/medic, /turf/simulated/floor/tiled/techfloor, /area/quartermaster/exploration/eva) "sgv" = ( @@ -184937,7 +184944,7 @@ plv wBb xYO xyI -oWS +onw sgt szw lJL From 78ff9bf1e3b4e3198522f017e77c76d109fa8405 Mon Sep 17 00:00:00 2001 From: ddorou Date: Fri, 12 Apr 2024 23:08:42 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=B5=D1=89=D0=B5=20=D0=BE=D0=B4=D0=B8?= =?UTF-8?q?=D0=BD=20=D0=B0=D0=BF=D0=B4=D0=B5=D0=B9=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- baystation12.dme | 2 +- maps/sierra/z1-z5_sierra.dmm | 40 +++++++++++++++++++++++++++++++----- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index 1b6e27c25f736..716ed6a874146 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -3455,9 +3455,9 @@ #include "mods\_master_files\code\modules\mob\new_player\new_player.dm" #include "mods\_master_files\code\modules\power\gravitygenerator.dm" #include "mods\_master_files\code\modules\projectiles\projectile\bullets.dm" -#include "mods\_master_files\code\modules\species\station\adherent.dm" #include "mods\_master_files\code\modules\sounds\connector.dm" #include "mods\_master_files\code\modules\sounds\throw.dm" +#include "mods\_master_files\code\modules\species\station\adherent.dm" #include "mods\_master_files\code\modules\species\station\machine.dm" #include "mods\_master_files\maps\sierra\sierra_ranks.dm" #include "mods\_master_files\maps\sierra\items\rigs.dm" diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index a323cdd9c201a..90fe43645c97a 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -75060,8 +75060,37 @@ /obj/floor_decal/corner/darkblue/border{ dir = 4 }, -/obj/machinery/light/spot{ - dir = 4 +/obj/machinery/button/blast_door{ + id_tag = "infimary_hall_lockdown"; + name = "Infirmary Public Hallway Lockdown"; + pixel_x = 24; + req_access = list("ACCESS_MEDICAL"); + pixel_y = 8; + dir = 8 + }, +/obj/machinery/button/blast_door{ + id_tag = "infimary_window_lockdown"; + name = "Infirmary Staging lockdown"; + pixel_x = 24; + pixel_y = -8; + req_access = list("ACCESS_MEDICAL"); + dir = 8 + }, +/obj/machinery/button/blast_door{ + id_tag = "infimary_storage_lockdown"; + name = "Infirmary Storage Lockdown"; + pixel_x = 32; + pixel_y = 8; + req_access = list("ACCESS_MEDICAL"); + dir = 8 + }, +/obj/machinery/button/blast_door{ + id_tag = "infimary_staging_lockdown"; + name = "Infirmary Critical Wing Lockdown"; + pixel_x = 32; + pixel_y = -8; + req_access = list("ACCESS_MEDICAL"); + dir = 8 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/office/cmo) @@ -96223,7 +96252,6 @@ /turf/simulated/floor/plating, /area/maintenance/substation/firstdeck) "onw" = ( -/obj/machinery/suit_storage_unit/explorer, /obj/floor_decal/industrial/outline/yellow, /obj/machinery/suit_storage_unit/explorer/engineer, /turf/simulated/floor/tiled/techfloor, @@ -122597,7 +122625,6 @@ }, /area/space) "sgt" = ( -/obj/machinery/suit_storage_unit/explorer, /obj/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -145211,13 +145238,13 @@ /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/galley) "vwI" = ( -/obj/structure/flora/pottedplant/orientaltree, /obj/floor_decal/corner/blue/three_quarters{ dir = 4 }, /obj/floor_decal/corner/darkblue/border{ dir = 6 }, +/obj/structure/flora/pottedplant/orientaltree, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/office/cmo) "vwP" = ( @@ -157548,6 +157575,9 @@ /obj/floor_decal/corner/darkblue/border{ dir = 4 }, +/obj/machinery/light/spot{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/office/cmo) "xsa" = (