From d9cc7ac41bf25f2b01f146040ca1ab2333cfb97c Mon Sep 17 00:00:00 2001 From: LordNest Date: Sat, 28 Dec 2024 08:32:30 +0400 Subject: [PATCH] Robo fix --- maps/sierra/areas/z5_sierra_bridge.dm | 1 + maps/sierra/z1-z5_sierra.dmm | 182 ++++++++++++++++++++++---- 2 files changed, 154 insertions(+), 29 deletions(-) diff --git a/maps/sierra/areas/z5_sierra_bridge.dm b/maps/sierra/areas/z5_sierra_bridge.dm index 7fa3590aa05cd..316322575d7c3 100644 --- a/maps/sierra/areas/z5_sierra_bridge.dm +++ b/maps/sierra/areas/z5_sierra_bridge.dm @@ -49,6 +49,7 @@ /area/crew_quarters/heads/captain req_access = list(access_captain) + name = "Bridge - Command - Captain's Cabin" icon_state = "heads_cap" holomap_color = HOLOMAP_AREACOLOR_COMMAND diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index 5714921e7f81f..021f0eae18c6b 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -460,7 +460,7 @@ "adA" = ( /obj/machinery/atmospherics/unary/outlet_injector{ dir = 1; - frequency = 1443; + frequency = 1441; id = "toxin_in"; use_power = 1 }, @@ -671,6 +671,11 @@ /obj/structure/table/standard, /obj/item/trash/cigbutt, /obj/machinery/light/small, +/obj/structure/sign/warning/smoking{ + dir = 1; + pixel_y = -40; + pixel_x = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/seconddeck/port) "aeU" = ( @@ -685,9 +690,12 @@ name = "Engine Room Airlock Controlls"; pixel_y = 24; req_access = list("ACCESS_ENGINE_EQUIP"); - tag_interior_door = "engine_airlock_inner"; - tag_exterior_door = "engine_airlock_outer"; - tag_airpump = "engine_atmos_airlock_vent" + tag_interior_door = "engine_atmos_airlock_inner"; + tag_exterior_door = "engine_atmos_airlock_outer"; + tag_airpump = "engine_atmos_airlock_vent"; + tag_exterior_sensor = "engine_atmos_airlock_sensor_out"; + tag_chamber_sensor = "engine_atmos_airlock_chamber"; + tag_interior_sensor = "engine_atmos_airlock_sensor_in" }, /obj/structure/catwalk, /obj/structure/hygiene/drain, @@ -2580,12 +2588,6 @@ /turf/simulated/floor/tiled/dark/monotile, /area/medical/staging) "atw" = ( -/obj/machinery/airlock_sensor/airlock_interior{ - id_tag = "engine_airlock"; - master_tag = "engine_airlock_interior_sensor"; - pixel_x = -24; - pixel_y = -24 - }, /obj/machinery/light/spot{ dir = 8 }, @@ -17274,9 +17276,12 @@ name = "Engine Room Airlock Controlls"; pixel_y = 24; req_access = list("ACCESS_ENGINE_EQUIP"); - tag_interior_door = "engine_airlock_inner"; - tag_exterior_door = "engine_airlock_outer"; - tag_airpump = "engine_atmos_airlock_vent" + tag_interior_door = "engine_atmos_airlock_inner"; + tag_exterior_door = "engine_atmos_airlock_outer"; + tag_airpump = "engine_atmos_airlock_vent"; + tag_exterior_sensor = "engine_atmos_airlock_sensor_out"; + tag_interior_sensor = "engine_atmos_airlock_sensor_in"; + tag_chamber_sensor = "engine_atmos_airlock_chamber" }, /obj/floor_decal/techfloor{ dir = 1 @@ -21479,6 +21484,18 @@ /obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) +"dfY" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/aftport) "dgc" = ( /obj/machinery/computer/modular/preset/security{ dir = 4 @@ -23408,6 +23425,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/structure/sign/warning/nosmoking_1{ + desc = "A warning sign which reads 'NO SMOKING'. Someone has scratched a variety of crude words in gutter across the entire sign."; + pixel_y = 32 + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/toxins) "duG" = ( @@ -24801,6 +24822,7 @@ icon_state = "2-4" }, /obj/structure/catwalk, +/obj/random/trash, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftport) "dDG" = ( @@ -28366,10 +28388,13 @@ name = "Engine Room Airlock Controlls"; pixel_y = -26; req_access = list("ACCESS_ENGINE_EQUIP"); - tag_interior_door = "engine_airlock_inner"; - tag_exterior_door = "engine_airlock_outer"; + tag_interior_door = "engine_atmos_airlock_inner"; + tag_exterior_door = "engine_atmos_airlock_outer"; tag_airpump = "engine_atmos_airlock_vent"; - dir = 1 + dir = 1; + tag_exterior_sensor = "engine_atmos_airlock_sensor_out"; + tag_interior_sensor = "engine_atmos_airlock_sensor_in"; + tag_chamber_sensor = "engine_atmos_airlock_chamber" }, /obj/floor_decal/techfloor{ dir = 6 @@ -33865,6 +33890,16 @@ /obj/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/firstdeck/forestarboard) +"eTP" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/foreport) "eUc" = ( /obj/machinery/suit_storage_unit/atmos/alt, /obj/floor_decal/borderfloor{ @@ -40670,6 +40705,18 @@ }, /turf/simulated/floor/plating, /area/maintenance/solar) +"fTC" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/forestarboard) "fTU" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -66495,8 +66542,8 @@ /obj/machinery/button/windowtint{ pixel_y = -21; dir = 1; - id_tag = "rbtk_office"; - pixel_x = 2 + pixel_x = 2; + id = "rbtk_office" }, /obj/machinery/button/alternate/door{ id_tag = "rbtk_door"; @@ -72064,6 +72111,10 @@ dir = 1 }, /obj/machinery/atmospherics/portables_connector, +/obj/structure/sign/warning/nosmoking_1{ + dir = 8; + pixel_x = 32 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/toxins) "kEJ" = ( @@ -90159,6 +90210,10 @@ /obj/floor_decal/industrial/warning/cee{ dir = 8 }, +/obj/structure/sign/warning/nosmoking_1{ + dir = 4; + pixel_x = -32 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/toxins) "nnP" = ( @@ -108947,6 +109002,20 @@ /obj/machinery/atmospherics/binary/pump{ dir = 1 }, +/obj/machinery/button/alternate/door/bolts{ + desc = "Danger! Maintenance may only be performed if there are no hazardous gases or excess pressure in the chamber."; + dir = 4; + id_tag = "engine_access_hatch"; + name = "Test Chamber Bolt Control"; + pixel_x = -22; + pixel_y = -8; + req_access = list("ACCESS_TOX_STORAGE") + }, +/obj/structure/sign/warning/internals_required{ + dir = 4; + pixel_x = -32; + pixel_y = 6 + }, /turf/simulated/floor/reinforced{ map_airless = 1 }, @@ -109111,6 +109180,10 @@ name = "south bump"; pixel_y = -24 }, +/obj/structure/sign/warning/nosmoking_2{ + pixel_x = 32; + pixel_y = -32 + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/toxins/storage) "qbZ" = ( @@ -111787,6 +111860,11 @@ }, /turf/simulated/floor/plating, /area/maintenance/seconddeck/aftstarboard) +"qxo" = ( +/obj/structure/catwalk, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/forestarboard) "qxv" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/portables_connector{ @@ -117804,6 +117882,11 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/security/sierra/forensic/lab) +"rro" = ( +/obj/structure/catwalk, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/starboard) "rrs" = ( /obj/structure/cable{ d1 = 2; @@ -140012,6 +140095,16 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/hangar) +"uDT" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/aftport) "uDW" = ( /turf/simulated/wall/r_wall/prepainted, /area/storage/tech/high_risk) @@ -140352,6 +140445,10 @@ dir = 9 }, /obj/machinery/portable_atmospherics/powered/scrubber, +/obj/structure/sign/warning/compressed_gas{ + dir = 1; + pixel_y = -32 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/toxins) "uGM" = ( @@ -142263,6 +142360,18 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/escape_pod/escape_pod11/station) +"uVm" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/foreport) "uVs" = ( /obj/floor_decal/corner/darkblue/mono, /obj/floor_decal/industrial/outline/yellow, @@ -145214,6 +145323,11 @@ }, /turf/simulated/floor/carpet/purple, /area/chapel/main) +"vpO" = ( +/obj/structure/catwalk, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/port) "vpQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -160934,6 +161048,16 @@ /obj/item/clothing/mask/plunger, /turf/simulated/floor/plating, /area/maintenance/bridgedeck/port) +"xKW" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/aftport) "xLe" = ( /obj/structure/catwalk, /obj/floor_decal/borderfloor{ @@ -213970,7 +214094,7 @@ kHm dVs dVs dVs -dVs +fTC ujv jYx dVs @@ -214803,7 +214927,7 @@ pwH pwH pwH gxm -pwH +uVm pwH cgh pwH @@ -216022,7 +216146,7 @@ nRO ofb nht aHM -xiD +eTP aLQ uMu nCI @@ -217603,7 +217727,7 @@ aVS gFS aRo qrw -jZl +qxo faw qVv sln @@ -219013,7 +219137,7 @@ tch xjZ wWI mmo -pvb +rro eUR dCc pAW @@ -219039,7 +219163,7 @@ dtd dtd dtd dtd -gPE +vpO uyf qNr weM @@ -221066,7 +221190,7 @@ ptM wtM wtM gDo -gPE +vpO mtR nyY sqV @@ -227747,7 +227871,7 @@ jWo fBT ppE cxr -cmh +xKW dfl fvM kKR @@ -228696,7 +228820,7 @@ tXe sbr sbr ttL -rfa +abX rfa kEC xLV @@ -229338,7 +229462,7 @@ oCW uOV uOV cge -uOV +dfY eon atp uOV @@ -231579,7 +231703,7 @@ mHe oyp xsl rDH -mHe +uDT mHe mHe mHe