diff --git a/maps/submaps/engine_submaps_vr/tether/engine_rust.dmm b/maps/submaps/engine_submaps_vr/tether/engine_rust.dmm index 5a10696352f..e6b8ed1c956 100644 --- a/maps/submaps/engine_submaps_vr/tether/engine_rust.dmm +++ b/maps/submaps/engine_submaps_vr/tether/engine_rust.dmm @@ -12,11 +12,9 @@ "ad" = ( /obj/machinery/computer/general_air_control/supermatter_core{ dir = 1; - frequency = 1438; input_tag = "cooling_in"; name = "Engine Cooling Control"; output_tag = "cooling_out"; - pressure_setting = 100; sensors = list("engine_sensor" = "Engine Core"); throwpass = 1 }, @@ -35,7 +33,6 @@ desc = "A remote control-switch for the engine control room blast doors."; id = "EngineBlast"; name = "Engine Monitoring Room Blast Doors"; - pixel_x = 0; pixel_y = -3; req_access = list(10) }, @@ -83,10 +80,8 @@ "al" = ( /obj/machinery/door/blast/regular{ dir = 4; - icon_state = "pdoor1"; id = "EngineVent"; - name = "Reactor Vent"; - p_open = 0 + name = "Reactor Vent" }, /turf/simulated/floor/reinforced, /area/engineering/engine_room) @@ -94,9 +89,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/engineering/engine_room) @@ -179,7 +172,6 @@ /area/engineering/engine_room) "aB" = ( /obj/machinery/light{ - icon_state = "tube1"; dir = 8 }, /turf/simulated/floor, @@ -256,8 +248,7 @@ "aM" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor, /area/engineering/engine_room) @@ -284,7 +275,6 @@ /area/engineering/engine_room) "aR" = ( /obj/machinery/atmospherics/unary/outlet_injector{ - unacidable = 1; use_power = 1 }, /turf/simulated/floor/reinforced, @@ -498,28 +488,24 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor, /area/engineering/engine_room) "bv" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - icon_state = "intact"; dir = 5 }, /turf/simulated/floor, /area/engineering/engine_room) "bw" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - icon_state = "intact"; dir = 4 }, /turf/simulated/floor, /area/engineering/engine_room) "bx" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - icon_state = "intact"; dir = 10 }, /turf/simulated/floor, @@ -570,7 +556,6 @@ id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutters"; pixel_x = -25; - pixel_y = 0; req_access = list(10) }, /turf/simulated/floor, @@ -648,10 +633,6 @@ "bM" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -663,6 +644,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor, /area/engineering/engine_room) "bN" = ( @@ -709,9 +693,7 @@ /area/engineering/engine_room) "bT" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 10; - icon_state = "intact"; - + dir = 10 }, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor, @@ -723,9 +705,7 @@ "bV" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 8; - icon_state = "map"; - + dir = 8 }, /turf/simulated/floor, /area/engineering/engine_room) @@ -767,10 +747,6 @@ "bZ" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -782,6 +758,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor, /area/engineering/engine_room) "ca" = ( @@ -806,7 +785,6 @@ "cd" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 4 }, /turf/simulated/floor, @@ -863,10 +841,6 @@ "ck" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -875,6 +849,9 @@ opacity = 0 }, /obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor, /area/engineering/engine_room) "cl" = ( @@ -1023,7 +1000,6 @@ /area/engineering/engine_room) "cB" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ - icon_state = "intact"; dir = 5 }, /obj/effect/floor_decal/industrial/warning/corner, @@ -1031,7 +1007,6 @@ /area/engineering/engine_room) "cC" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - icon_state = "intact"; dir = 6 }, /obj/effect/floor_decal/industrial/warning, @@ -1039,7 +1014,6 @@ /area/engineering/engine_room) "cD" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ - icon_state = "map"; dir = 4 }, /obj/machinery/meter, @@ -1078,7 +1052,6 @@ desc = "A remote control-switch for the engine control room blast doors."; id = "EngineEmitterPortWest"; name = "Engine Room Blast Doors"; - pixel_x = 0; pixel_y = -25; req_access = null; req_one_access = list(11,24) @@ -1104,7 +1077,6 @@ /area/engineering/engine_room) "cM" = ( /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 4 }, /turf/simulated/floor, @@ -1119,7 +1091,6 @@ id_tag = "eng_al_int_snsr"; master_tag = "engine_room_airlock"; pixel_x = 22; - pixel_y = 0; req_access = list(10) }, /turf/simulated/floor, @@ -1127,7 +1098,6 @@ "cO" = ( /obj/machinery/door/blast/regular{ dir = 4; - icon_state = "pdoor1"; id = "EngineEmitterPortWest"; layer = 3.3; name = "Engine Gas Storage" @@ -1193,7 +1163,6 @@ desc = "A remote control-switch for the engine control room blast doors."; id = "EngineEmitterPortWest"; name = "Engine Room Blast Doors"; - pixel_x = 0; pixel_y = 25; req_access = null; req_one_access = list(11,24) @@ -1206,8 +1175,7 @@ /obj/structure/extinguisher_cabinet{ dir = 1; icon_state = "extinguisher_closed"; - pixel_y = 32; - + pixel_y = 32 }, /turf/simulated/floor, /area/engineering/engine_gas) @@ -1219,7 +1187,6 @@ /obj/machinery/button/remote/blast_door{ id = "EngineVent"; name = "Reactor Ventillatory Control"; - pixel_x = 0; pixel_y = -25; req_access = list(10) }, @@ -1245,7 +1212,6 @@ /area/engineering/engine_room) "dc" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - icon_state = "intact"; dir = 4 }, /obj/machinery/alarm{ @@ -1257,14 +1223,12 @@ /area/engineering/engine_room) "dd" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - icon_state = "intact"; dir = 9 }, /turf/simulated/floor, /area/engineering/engine_room) "de" = ( /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /turf/simulated/floor, @@ -1294,13 +1258,11 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor, /area/engineering/engine_gas) @@ -1308,8 +1270,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/simulated/wall/r_wall, /area/engineering/engine_room) @@ -1317,8 +1278,7 @@ /obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/portable_atmospherics/canister/phoron, /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor, /area/engineering/engine_gas) @@ -1393,7 +1353,6 @@ id = "EngineEmitterPortWest2"; name = "Engine Room Blast Doors"; pixel_x = 25; - pixel_y = 0; req_access = null; req_one_access = list(11,24) }, @@ -1403,9 +1362,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/template_noop) @@ -1413,7 +1370,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ dir = 4; - icon_state = "pdoor1"; id = "EngineEmitterPortWest2"; layer = 3.3; name = "Engine Gas Storage" @@ -1431,7 +1387,6 @@ }, /obj/machinery/door/blast/regular{ dir = 4; - icon_state = "pdoor1"; id = "EngineEmitterPortWest2"; layer = 3.3; name = "Engine Gas Storage" @@ -1480,7 +1435,6 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 4 }, /turf/simulated/floor, diff --git a/maps/submaps/engine_submaps_vr/tether/engine_singulo.dmm b/maps/submaps/engine_submaps_vr/tether/engine_singulo.dmm index 805e0d6396b..fa74a3912bd 100644 --- a/maps/submaps/engine_submaps_vr/tether/engine_singulo.dmm +++ b/maps/submaps/engine_submaps_vr/tether/engine_singulo.dmm @@ -33,9 +33,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact"; - + dir = 10 }, /turf/simulated/floor, /area/engineering/engine_gas) @@ -86,10 +84,8 @@ "ao" = ( /obj/structure/closet/emcloset, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1379; id_tag = "eng_north_airlock"; pixel_x = 24; - pixel_y = 0; req_one_access = list(10,11); tag_airpump = "eng_north_pump"; tag_chamber_sensor = "eng_north_sensor"; @@ -101,9 +97,7 @@ "ap" = ( /obj/machinery/portable_atmospherics/canister/phoron, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map"; - + dir = 4 }, /turf/simulated/floor, /area/engineering/engine_gas) @@ -165,9 +159,7 @@ }, /obj/machinery/light/small, /obj/machinery/airlock_sensor{ - frequency = 1379; id_tag = "eng_north_sensor"; - pixel_x = 0; pixel_y = -25 }, /obj/structure/cable/cyan{ @@ -215,13 +207,10 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact"; - + dir = 10 }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -256,7 +245,6 @@ /area/engineering/engine_room) "ay" = ( /obj/structure/cable/cyan{ - d1 = 0; d2 = 4; icon_state = "0-4" }, @@ -300,20 +288,16 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/engineering/engine_room) "aD" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/floor_decal/industrial/warning/corner{ - icon_state = "warningcorner"; dir = 1 }, /obj/effect/floor_decal/industrial/warning/corner{ - icon_state = "warningcorner"; dir = 8 }, /turf/simulated/floor/tiled, @@ -347,8 +331,7 @@ /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/glass, /obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 + dir = 8 }, /turf/simulated/floor, /area/engineering/engine_room) @@ -434,10 +417,7 @@ }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0; - + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 1 @@ -539,9 +519,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact"; - + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/engine_room) @@ -579,7 +557,6 @@ icon_state = "4-8" }, /obj/effect/floor_decal/steeldecal/steel_decals_central5{ - icon_state = "steel_decals_central5"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -611,9 +588,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map"; - + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/engine_room) @@ -734,11 +709,10 @@ /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/glass, /obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 + dir = 1 }, /obj/structure/window/reinforced{ - dir = 1 + dir = 8 }, /turf/simulated/floor, /area/submap/pa_room) @@ -759,9 +733,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/submap/pa_room) @@ -798,9 +770,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -822,10 +792,6 @@ "bn" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -834,6 +800,9 @@ opacity = 0 }, /obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor, /area/submap/pa_room) "bo" = ( @@ -910,7 +879,6 @@ /area/template_noop) "bw" = ( /obj/effect/floor_decal/techfloor/orange/corner{ - icon_state = "techfloororange_corners"; dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, @@ -1090,22 +1058,18 @@ req_access = list(10) }, /obj/machinery/button/remote/blast_door{ - name = "Engine Monitoring Room Blast Doors"; desc = "A remote control-switch for the engine control room blast doors."; + id = "EngineBlast"; + name = "Engine Monitoring Room Blast Doors"; pixel_x = 5; pixel_y = 7; - req_access = list(10); - id = "EngineBlast" + req_access = list(10) }, /turf/template_noop, /area/template_noop) "bP" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -1115,6 +1079,9 @@ }, /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/techfloor/orange/corner, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor, /area/submap/pa_room) "bQ" = ( @@ -1139,7 +1106,6 @@ /area/submap/pa_room) "bU" = ( /obj/effect/floor_decal/techfloor/orange{ - icon_state = "techfloororange_edges"; dir = 6 }, /turf/simulated/floor/tiled/techfloor, @@ -1152,7 +1118,6 @@ /area/submap/pa_room) "bW" = ( /obj/effect/floor_decal/techfloor/orange{ - icon_state = "techfloororange_edges"; dir = 6 }, /turf/simulated/floor/tiled/techfloor/grid, @@ -1173,8 +1138,7 @@ "bY" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/effect/floor_decal/steeldecal/steel_decals8, /turf/simulated/floor/tiled, @@ -1183,11 +1147,10 @@ /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor, /area/submap/pa_room) "ca" = ( @@ -1201,9 +1164,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -1315,7 +1276,6 @@ icon_state = "4-8" }, /obj/effect/floor_decal/steeldecal/steel_decals_central5{ - icon_state = "steel_decals_central5"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1336,16 +1296,13 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact"; - + dir = 9 }, /turf/simulated/floor/tiled, /area/engineering/engine_room) @@ -1486,9 +1443,7 @@ id_tag = "eng_south_pump" }, /obj/machinery/airlock_sensor{ - frequency = 1379; id_tag = "eng_south_sensor"; - pixel_x = 0; pixel_y = 25 }, /obj/structure/cable/cyan{ @@ -1539,13 +1494,10 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact"; - + dir = 9 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -1603,10 +1555,8 @@ "cB" = ( /obj/structure/closet/emcloset, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1379; id_tag = "eng_south_airlock"; pixel_x = 24; - pixel_y = 0; req_one_access = list(10,11); tag_airpump = "eng_south_pump"; tag_chamber_sensor = "eng_south_sensor"; diff --git a/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm b/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm index 9aa7ed41fec..0b831f3f23c 100644 --- a/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm +++ b/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm @@ -832,10 +832,6 @@ "bP" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -847,6 +843,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor, /area/engineering/engine_room) "bQ" = ( @@ -954,10 +953,6 @@ "ce" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -969,6 +964,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor, /area/engineering/engine_room) "cf" = ( @@ -1049,10 +1047,6 @@ "cp" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -1061,6 +1055,9 @@ opacity = 0 }, /obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor, /area/engineering/engine_room) "cq" = ( diff --git a/maps/submaps/engine_submaps_vr/tether/engine_tesla.dmm b/maps/submaps/engine_submaps_vr/tether/engine_tesla.dmm index c4b683b2215..d77345121a4 100644 --- a/maps/submaps/engine_submaps_vr/tether/engine_tesla.dmm +++ b/maps/submaps/engine_submaps_vr/tether/engine_tesla.dmm @@ -35,8 +35,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /turf/simulated/floor, /area/engineering/engine_gas) @@ -87,10 +86,8 @@ "ao" = ( /obj/structure/closet/emcloset, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1379; id_tag = "eng_north_airlock"; pixel_x = 24; - pixel_y = 0; req_one_access = list(10,11); tag_airpump = "eng_north_pump"; tag_chamber_sensor = "eng_north_sensor"; @@ -101,8 +98,7 @@ /area/engineering/engine_room) "ap" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor, /area/engineering/engine_gas) @@ -168,9 +164,7 @@ }, /obj/machinery/light/small, /obj/machinery/airlock_sensor{ - frequency = 1379; id_tag = "eng_north_sensor"; - pixel_x = 0; pixel_y = -25 }, /obj/structure/cable/cyan{ @@ -218,12 +212,10 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -258,7 +250,6 @@ /area/engineering/engine_room) "ay" = ( /obj/structure/cable/cyan{ - d1 = 0; d2 = 4; icon_state = "0-4" }, @@ -305,17 +296,14 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/engineering/engine_room) "aD" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/engine_room) @@ -422,9 +410,7 @@ }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 1 @@ -497,8 +483,7 @@ /area/space) "aQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/engine_room) @@ -532,8 +517,7 @@ /area/engineering/engine_room) "aU" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central5{ - dir = 8; - icon_state = "steel_decals_central5" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -559,8 +543,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/engine_room) @@ -593,10 +576,6 @@ /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/window/reinforced{ dir = 1 }, @@ -607,6 +586,9 @@ name = "Engine Radiator Viewport Shutter"; opacity = 0 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor, /area/submap/pa_room) "aZ" = ( @@ -650,10 +632,6 @@ /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/window/reinforced, /obj/machinery/door/blast/regular{ density = 0; @@ -662,6 +640,9 @@ name = "Engine Radiator Viewport Shutter"; opacity = 0 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor, /area/submap/pa_room) "be" = ( @@ -688,9 +669,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/submap/pa_room) @@ -704,7 +683,6 @@ icon_state = "0-4" }, /obj/structure/cable/yellow{ - d1 = 0; d2 = 8; icon_state = "0-8" }, @@ -731,9 +709,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -755,10 +731,6 @@ "bn" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -767,6 +739,9 @@ opacity = 0 }, /obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor, /area/submap/pa_room) "bo" = ( @@ -848,8 +823,7 @@ /area/template_noop) "bw" = ( /obj/effect/floor_decal/techfloor/orange/corner{ - dir = 4; - icon_state = "techfloororange_corners" + dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, /area/submap/pa_room) @@ -918,10 +892,6 @@ "bF" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -935,6 +905,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor, /area/submap/pa_room) "bG" = ( @@ -1088,8 +1061,7 @@ /area/submap/pa_room) "bU" = ( /obj/effect/floor_decal/techfloor/orange{ - dir = 6; - icon_state = "techfloororange_edges" + dir = 6 }, /turf/simulated/floor/tiled/techfloor, /area/submap/pa_room) @@ -1110,8 +1082,7 @@ /area/submap/pa_room) "bX" = ( /obj/effect/floor_decal/techfloor/orange{ - dir = 6; - icon_state = "techfloororange_edges" + dir = 6 }, /obj/structure/cable/yellow{ d1 = 1; @@ -1123,8 +1094,7 @@ "bY" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/effect/floor_decal/steeldecal/steel_decals8, /obj/structure/table/standard, @@ -1159,9 +1129,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -1246,8 +1214,7 @@ "ci" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/engine_room) @@ -1258,8 +1225,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/steeldecal/steel_decals_central5{ - dir = 8; - icon_state = "steel_decals_central5" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -1279,15 +1245,13 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled, /area/engineering/engine_room) @@ -1422,9 +1386,7 @@ id_tag = "eng_south_pump" }, /obj/machinery/airlock_sensor{ - frequency = 1379; id_tag = "eng_south_sensor"; - pixel_x = 0; pixel_y = 25 }, /obj/structure/cable/cyan{ @@ -1475,12 +1437,10 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -1538,10 +1498,8 @@ "cB" = ( /obj/structure/closet/emcloset, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1379; id_tag = "eng_south_airlock"; pixel_x = 24; - pixel_y = 0; req_one_access = list(10,11); tag_airpump = "eng_south_pump"; tag_chamber_sensor = "eng_south_sensor"; @@ -1565,7 +1523,6 @@ dir = 2; icon_state = "pdoor0"; id = "SupermatterPort"; - layer = 2.7; name = "Reactor Blast Door"; opacity = 0 }, @@ -1573,8 +1530,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 + dir = 8 }, /turf/simulated/floor, /area/engineering/engine_room) diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index f2cff1bcb71..d2fb9d46353 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -121,10 +121,6 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/centralhall) "aak" = ( @@ -20230,10 +20226,6 @@ /obj/machinery/door/firedoor, /obj/structure/grille, /obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -29994,10 +29986,6 @@ /area/rnd/outpost/xenobiology/outpost_slimepens) "bel" = ( /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -30014,6 +30002,9 @@ name = "Pen 1 Blast Doors"; opacity = 0 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "bem" = ( @@ -30260,10 +30251,6 @@ /area/rnd/outpost/xenobiology/outpost_slimepens) "bfl" = ( /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -30283,6 +30270,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "bfm" = ( @@ -30509,10 +30499,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -30520,19 +30506,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/reinforced, -/area/rnd/outpost/xenobiology/outpost_slimepens) -"bgm" = ( -/obj/machinery/disposal, -/obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/obj/structure/disposalpipe/trunk{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "bgn" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -30580,10 +30557,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -30591,6 +30564,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "bgs" = ( @@ -30841,11 +30817,10 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "bhL" = ( @@ -30884,11 +30859,10 @@ dir = 1 }, /obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "bhQ" = ( @@ -31132,10 +31106,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -31143,6 +31113,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "biN" = ( @@ -31168,10 +31141,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -31179,6 +31148,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "biR" = ( @@ -31380,12 +31352,11 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/structure/grille, +/obj/structure/grille, /obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 + dir = 8 }, -/obj/structure/grille, -/obj/structure/grille, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "bjH" = ( @@ -31612,10 +31583,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -31623,18 +31590,20 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "bkv" = ( /obj/machinery/disposal, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/window/reinforced, /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "bkw" = ( @@ -31651,10 +31620,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -31779,11 +31744,10 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "bkQ" = ( @@ -32215,10 +32179,6 @@ "bmc" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -32233,6 +32193,9 @@ opacity = 0 }, /obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "bmd" = ( @@ -32270,10 +32233,6 @@ }, /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -32281,6 +32240,9 @@ dir = 1 }, /obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "bmi" = ( @@ -32314,10 +32276,6 @@ "bml" = ( /obj/structure/window/reinforced/full, /obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -32330,6 +32288,9 @@ opacity = 0 }, /obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "bmm" = ( @@ -32359,10 +32320,6 @@ "bmp" = ( /obj/structure/window/reinforced/full, /obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -32375,6 +32332,9 @@ opacity = 0 }, /obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "bmq" = ( @@ -40721,11 +40681,11 @@ bem beI bfm bfK -bgm +bkv bgY bhL bin -bgm +bkv bjm bhL bjV diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index dc4620fa0a1..653eccfe256 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -27,8 +27,7 @@ open_layer = 1 }, /obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 + dir = 8 }, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/uppernorthstairwell{ @@ -223,11 +222,10 @@ open_layer = 1 }, /obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 + dir = 4 }, /obj/structure/window/reinforced{ - dir = 4 + dir = 8 }, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/uppernorthstairwell{ @@ -974,10 +972,6 @@ req_access = list(); req_one_access = list(5,24) }, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "aby" = ( @@ -1513,8 +1507,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) @@ -3402,8 +3395,7 @@ open_layer = 1 }, /obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 + dir = 8 }, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/triage) @@ -3888,11 +3880,10 @@ open_layer = 1 }, /obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 + dir = 4 }, /obj/structure/window/reinforced{ - dir = 4 + dir = 8 }, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/triage) @@ -7657,11 +7648,10 @@ "alH" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_hallway) "alI" = ( @@ -19454,10 +19444,6 @@ /obj/structure/window/reinforced/full, /obj/structure/grille, /obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -30870,12 +30856,11 @@ name = "Colony Director's Storage"; req_access = list(20) }, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/item/clothing/head/helmet/space/void/captain, /obj/item/clothing/suit/space/void/captain, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "bag" = ( @@ -42027,8 +42012,7 @@ open_layer = 1 }, /obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 + dir = 8 }, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) @@ -44588,6 +44572,24 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"xan" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora_storage) "xaU" = ( /obj/machinery/power/apc{ dir = 4; @@ -61307,7 +61309,7 @@ aaq afS ack aeF -ack +xan afS afS afS diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 0becc13304f..259c1085dde 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -7695,11 +7695,10 @@ /obj/effect/floor_decal/corner_techfloor_grid, /obj/effect/floor_decal/techfloor/corner, /obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 + dir = 1 }, /obj/structure/window/reinforced{ - dir = 1 + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) @@ -10521,16 +10520,6 @@ "aAW" = ( /turf/simulated/wall, /area/crew_quarters/sleep/engi_wash) -"aBa" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/gravity_gen) "aBe" = ( /turf/simulated/wall, /area/quartermaster/warehouse) @@ -13593,11 +13582,10 @@ dir = 4 }, /obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) "aYF" = ( @@ -14919,8 +14907,8 @@ }, /obj/structure/table/rack/shelf, /obj/item/device/radio/headset/explorer{ - pixel_y = -5; - pixel_x = -5 + pixel_x = -5; + pixel_y = -5 }, /obj/item/device/radio/headset/explorer{ pixel_x = -5; @@ -14930,20 +14918,20 @@ pixel_y = 5 }, /obj/item/device/radio/headset/explorer{ - pixel_y = 5; - pixel_x = 5 + pixel_x = 5; + pixel_y = 5 }, /obj/item/device/radio/headset/explorer{ - pixel_y = 5; - pixel_x = 11 + pixel_x = 11; + pixel_y = 5 }, /obj/item/device/radio/headset/explorer{ - pixel_y = -5; - pixel_x = 11 + pixel_x = 11; + pixel_y = -5 }, /obj/item/device/radio/headset/explorer{ - pixel_y = -5; - pixel_x = 5 + pixel_x = 5; + pixel_y = -5 }, /obj/item/device/radio/headset/explorer{ pixel_y = -5 @@ -42752,11 +42740,11 @@ aac ank aox arc -aBa -aBa aHe -aBa -aBa +aHe +aHe +aHe +aHe aYA bqT akA diff --git a/maps/tether/tether-07-solars.dmm b/maps/tether/tether-07-solars.dmm index e2f98cd0448..74d262bf7c7 100644 --- a/maps/tether/tether-07-solars.dmm +++ b/maps/tether/tether-07-solars.dmm @@ -6950,8 +6950,7 @@ pixel_x = 1 }, /obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) @@ -7109,8 +7108,7 @@ "nj" = ( /obj/structure/filingcabinet/chestdrawer, /obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab)