From c98a6f8c58d2355b10d777bb84758553be4dd4d7 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Tue, 8 Sep 2020 08:14:56 +0100 Subject: [PATCH] assorted polish & tweaks decals galore, shield config document, etc. --- maps/submaps/admin_use_vr/ert.dm | 14 ++ maps/submaps/admin_use_vr/ert.dmm | 393 ++++++++++++++++++++++-------- 2 files changed, 308 insertions(+), 99 deletions(-) diff --git a/maps/submaps/admin_use_vr/ert.dm b/maps/submaps/admin_use_vr/ert.dm index fed9581426..2a98ac49c5 100644 --- a/maps/submaps/admin_use_vr/ert.dm +++ b/maps/submaps/admin_use_vr/ert.dm @@ -187,4 +187,18 @@ Some fancy new micro-RTG cells or something, I think?
\
\ Point is they're fairly expensive and probably prototypes or something, so for the love of God and your own career don't lose any of them and put them back when you return from a sortie.
\
\ +Lt. Cmdr. Sykes"} + +/obj/item/weapon/paper/vonbraun_shields + name = "NRV Von Braun Shield Configuration Documentation" + info = {"To All Current ERT Members,
\ +Be advised that use of the NRV Von Braun's shield generator (located adjacent to this document) is strongly recommended when responding to calls, but also that it is not impervious, nor is the ship's point defense system flawless. Recommended settings as follows:
\ +Photonic: Off (PD will not work with it enabled!)
\ +EM: On
\ +Humanoids: Off
\ +Atmospheric: Off
\ +Hull Shield: On
\ +Radius: 26
\ +The shield generator will tax the Von Braun's reserves greatly so try to use it sparingly. Do not be afraid to use it however, as the Von Braun represents the Company making a significant investment in this sector's future. I can bail you out if the occasional intern goes missing or you break something minor, but if you go flying this thing through an asteroid belt and get massive holes blown in it Central will make everyone involved disappear permanently.
\ +
\ Lt. Cmdr. Sykes"} \ No newline at end of file diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index 648109ae36..722514fb8f 100644 --- a/maps/submaps/admin_use_vr/ert.dmm +++ b/maps/submaps/admin_use_vr/ert.dmm @@ -62,6 +62,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/sign/vacuum{ + pixel_x = -32 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_port) "am" = ( @@ -85,20 +88,23 @@ /obj/machinery/light/no_nightshift{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "ao" = ( /obj/structure/table/rack/steel, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/weapon/tank/jetpack/oxygen, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "ap" = ( /obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "ax" = ( @@ -186,12 +192,13 @@ /area/ship/ert/atmos) "br" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "bt" = ( @@ -212,15 +219,16 @@ /area/ship/ert/bridge) "bI" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, /obj/machinery/light/no_nightshift{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "bJ" = ( @@ -269,8 +277,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_port) +"cu" = ( +/obj/machinery/shipsensors, +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/engineering) "cv" = ( /obj/machinery/shield_gen, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "cC" = ( @@ -312,6 +325,9 @@ d2 = 2; icon_state = "0-2" }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_port) "cY" = ( @@ -359,12 +375,13 @@ /area/ship/ert/dock_port) "do" = ( /obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "dp" = ( @@ -375,6 +392,7 @@ /obj/item/weapon/rig/ert/assetprotection, /obj/item/weapon/rig/ert/assetprotection, /obj/item/weapon/rig/ert/assetprotection, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "dr" = ( @@ -383,6 +401,7 @@ desc = "A small, cute and loveable squid friend. This one is blue. Despite the name, it seems no more or less deadly than your regular plush squid."; name = "NT 'Deathsquid' Plushie" }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "ds" = ( @@ -436,6 +455,7 @@ /obj/item/clothing/head/helmet/space/deathsquad{ name = "swat helmet" }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "dT" = ( @@ -461,6 +481,7 @@ /obj/item/clothing/glasses/thermal, /obj/item/clothing/glasses/thermal, /obj/item/clothing/glasses/thermal, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "dW" = ( @@ -503,6 +524,7 @@ /obj/machinery/firealarm/alarms_hidden{ pixel_y = 26 }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "eg" = ( @@ -517,6 +539,7 @@ pixel_x = 0; pixel_y = 26 }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "es" = ( @@ -534,6 +557,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_dl) "et" = ( @@ -616,6 +640,9 @@ pixel_y = -24 }, /obj/structure/cable/yellow, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_star) "fx" = ( @@ -633,6 +660,9 @@ dir = 4; pixel_x = -23 }, +/obj/item/rig_module/sprinter, +/obj/item/rig_module/sprinter, +/obj/item/rig_module/rescue_pharm, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "fE" = ( @@ -640,6 +670,9 @@ /obj/item/rig_module/mounted, /obj/item/rig_module/mounted/egun, /obj/item/rig_module/mounted/egun, +/obj/item/rig_module/mounted, +/obj/item/rig_module/mounted/egun, +/obj/item/rig_module/mounted/egun, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "fP" = ( @@ -650,6 +683,8 @@ /obj/item/rig_module/chem_dispenser/injector, /obj/item/rig_module/device/healthscanner, /obj/item/rig_module/device/healthscanner, +/obj/item/rig_module/device/healthscanner, +/obj/item/rig_module/device/healthscanner, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "fU" = ( @@ -658,6 +693,10 @@ /obj/item/rig_module/device/rcd, /obj/item/rig_module/device/plasmacutter, /obj/item/rig_module/device/plasmacutter, +/obj/item/rig_module/device/rcd, +/obj/item/rig_module/device/rcd, +/obj/item/rig_module/device/plasmacutter, +/obj/item/rig_module/device/plasmacutter, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "fZ" = ( @@ -666,6 +705,10 @@ /obj/item/rig_module/device/drill, /obj/item/rig_module/maneuvering_jets, /obj/item/rig_module/maneuvering_jets, +/obj/item/rig_module/maneuvering_jets, +/obj/item/rig_module/maneuvering_jets, +/obj/item/rig_module/maneuvering_jets, +/obj/item/rig_module/maneuvering_jets, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "ga" = ( @@ -687,10 +730,12 @@ dir = 8 }, /obj/mecha/combat/gygax/serenity, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "gk" = ( /obj/machinery/shieldwallgen, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "gn" = ( @@ -714,6 +759,7 @@ /obj/item/mecha_parts/mecha_equipment/tool/sleeper, /obj/item/mecha_parts/mecha_equipment/tool/sleeper, /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "gx" = ( @@ -730,11 +776,13 @@ /obj/item/weapon/cell/device/weapon/recharge, /obj/item/weapon/cell/device/weapon/recharge, /obj/item/weapon/cell/device/weapon/recharge, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "gy" = ( /obj/machinery/mech_recharger, /obj/mecha/combat/gygax, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "gA" = ( @@ -754,6 +802,7 @@ d2 = 2; icon_state = "0-2" }, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "gN" = ( @@ -792,12 +841,14 @@ /obj/machinery/firealarm/alarms_hidden{ pixel_y = 26 }, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "gX" = ( /obj/structure/table/rack/steel, /obj/item/weapon/storage/box/emps, /obj/item/weapon/storage/box/emps, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "gZ" = ( @@ -827,6 +878,7 @@ /obj/item/mecha_parts/mecha_equipment/repair_droid, /obj/item/mecha_parts/mecha_equipment/repair_droid, /obj/item/mecha_parts/mecha_equipment/repair_droid, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "hk" = ( @@ -836,6 +888,7 @@ }, /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse, /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "hs" = ( @@ -877,21 +930,11 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_port) "hN" = ( -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/machinery/power/apc/hyper{ - alarms_hidden = 1; - dir = 4; - name = "VB APC - East"; - pixel_x = 24 - }, /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 }, @@ -919,6 +962,7 @@ dir = 1; pixel_y = -23 }, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med_surg) "hU" = ( @@ -965,6 +1009,7 @@ /obj/item/clothing/accessory/holster/leg, /obj/item/clothing/accessory/holster/leg, /obj/item/clothing/accessory/holster/leg, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "ib" = ( @@ -994,6 +1039,16 @@ "ip" = ( /turf/simulated/floor/tiled/techmaint, /area/ship/ert/barracks) +"ix" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass{ + req_one_access = list(103) + }, +/obj/structure/sign/warning/airlock{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_star) "iy" = ( /obj/machinery/alarm/alarms_hidden{ dir = 1; @@ -1020,6 +1075,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "iO" = ( @@ -1119,6 +1175,7 @@ /obj/item/ammo_magazine/m9mml, /obj/item/ammo_magazine/m9mml, /obj/item/ammo_magazine/m9mml, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "kh" = ( @@ -1162,6 +1219,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/mortar, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "kt" = ( @@ -1200,6 +1258,7 @@ /obj/item/weapon/plastique, /obj/item/weapon/plastique, /obj/item/weapon/plastique, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_dl) "kG" = ( @@ -1268,23 +1327,10 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) "lm" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 9 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/ship/ert/bridge) +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide/engine_setup, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) "lq" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -1297,6 +1343,7 @@ dir = 8 }, /obj/machinery/portable_atmospherics/canister/empty, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) "lu" = ( @@ -1308,6 +1355,7 @@ /obj/item/weapon/storage/box/survival/comp{ starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "lx" = ( @@ -1394,6 +1442,7 @@ /obj/item/clothing/glasses/sunglasses/sechud/tactical, /obj/item/clothing/glasses/sunglasses/sechud/tactical, /obj/item/clothing/glasses/sunglasses/sechud/tactical, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "mh" = ( @@ -1406,6 +1455,7 @@ /obj/item/weapon/reagent_containers/blood/OMinus, /obj/item/weapon/reagent_containers/blood/OMinus, /obj/item/weapon/reagent_containers/blood/OMinus, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med_surg) "mj" = ( @@ -1425,15 +1475,18 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "mt" = ( +/obj/structure/cable/green, /obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" }, /obj/structure/cable/green{ - d1 = 4; d2 = 8; - icon_state = "4-8" + icon_state = "0-8" }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engineering) @@ -1602,6 +1655,7 @@ dir = 1; pixel_y = -26 }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "nc" = ( @@ -1753,6 +1807,12 @@ "nC" = ( /turf/simulated/floor/reinforced/airless, /area/ship/ert/dock_star) +"nM" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/engineering) "nP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -1764,6 +1824,8 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser, /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/clusterbang, +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/clusterbang, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "nX" = ( @@ -1836,6 +1898,7 @@ /area/ship/ert/atmos) "oC" = ( /obj/machinery/portable_atmospherics/canister/air, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "oN" = ( @@ -1903,6 +1966,7 @@ pixel_x = 24 }, /obj/structure/cable/yellow, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "oX" = ( @@ -1913,6 +1977,7 @@ /obj/item/clothing/suit/space/void/responseteam/engineer, /obj/item/clothing/suit/space/void/responseteam/engineer, /obj/item/clothing/suit/space/void/responseteam/engineer, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "pa" = ( @@ -1954,6 +2019,7 @@ /obj/item/clothing/suit/space/void/responseteam/medical, /obj/item/clothing/suit/space/void/responseteam/medical, /obj/machinery/light/no_nightshift, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "pf" = ( @@ -1974,6 +2040,7 @@ /obj/item/clothing/suit/space/void/responseteam/medical, /obj/item/clothing/suit/space/void/responseteam/medical, /obj/item/clothing/suit/space/void/responseteam/medical, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "po" = ( @@ -2089,6 +2156,7 @@ /obj/item/ammo_magazine/m545/ap/ext, /obj/item/ammo_magazine/m545/ap/ext, /obj/item/ammo_magazine/m545/ap/ext, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "pK" = ( @@ -2109,6 +2177,9 @@ dir = 1; pixel_y = -26 }, +/obj/item/rig_module/mounted/taser, +/obj/item/rig_module/mounted/taser, +/obj/item/rig_module/mounted/taser, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "pN" = ( @@ -2135,6 +2206,7 @@ /obj/item/weapon/gun/energy/plasmastun, /obj/item/weapon/cell/device/weapon/recharge, /obj/item/weapon/cell/device/weapon/recharge, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "pY" = ( @@ -2152,7 +2224,9 @@ /obj/item/weapon/cell/hyper, /obj/item/weapon/cell/hyper, /obj/item/weapon/cell/hyper, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/weapon/tool/screwdriver, +/obj/item/weapon/tool/wrench, +/obj/item/weapon/tool/crowbar, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "qa" = ( @@ -2214,6 +2288,7 @@ /obj/machinery/light/no_nightshift{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "qA" = ( @@ -2239,6 +2314,7 @@ /obj/item/mecha_parts/mecha_equipment/tool/powertool/screwdriver, /obj/item/mecha_parts/mecha_equipment/tool/powertool/welding, /obj/item/mecha_parts/mecha_equipment/speedboost, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "qE" = ( @@ -2248,6 +2324,7 @@ pixel_y = -26 }, /obj/mecha/combat/durand, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "qF" = ( @@ -2260,6 +2337,7 @@ /obj/structure/table/rack/steel, /obj/item/mecha_parts/mecha_equipment/gravcatapult, /obj/item/mecha_parts/mecha_equipment/wormhole_generator, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "qS" = ( @@ -2268,12 +2346,14 @@ /obj/item/mecha_parts/mecha_equipment/tool/jetpack, /obj/item/mecha_parts/mecha_equipment/tool/jetpack, /obj/item/mecha_parts/mecha_equipment/tool/jetpack, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "qT" = ( /obj/structure/table/rack/steel, /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion, /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "ra" = ( @@ -2299,12 +2379,14 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray, /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray, /obj/machinery/light/no_nightshift, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "rr" = ( /obj/structure/table/rack/steel, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/frag, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/frag, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "rs" = ( @@ -2371,6 +2453,7 @@ dir = 4 }, /obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) "rV" = ( @@ -2416,6 +2499,7 @@ /obj/item/clothing/suit/space/void/responseteam/security, /obj/item/clothing/suit/space/void/responseteam/security, /obj/machinery/light/no_nightshift, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "sp" = ( @@ -2433,6 +2517,7 @@ /area/ship/ert/dock_port) "sr" = ( /obj/machinery/vending/food, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "sw" = ( @@ -2448,6 +2533,7 @@ starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) }, /obj/machinery/light/no_nightshift, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "sA" = ( @@ -2495,6 +2581,7 @@ /obj/item/clothing/glasses/graviton, /obj/item/clothing/glasses/graviton, /obj/item/clothing/glasses/graviton, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "sH" = ( @@ -2519,6 +2606,7 @@ dir = 1; pixel_y = -26 }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "sS" = ( @@ -2526,6 +2614,7 @@ /obj/machinery/light/no_nightshift{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "sT" = ( @@ -2686,6 +2775,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "uh" = ( @@ -2750,6 +2840,9 @@ }, /obj/effect/map_helper/airlock/atmos/chamber_pump, /obj/effect/floor_decal/industrial/warning, +/obj/structure/sign/vacuum{ + pixel_x = -32 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_star) "uG" = ( @@ -2908,6 +3001,7 @@ /obj/item/weapon/cell/device/weapon/recharge, /obj/item/weapon/gun/energy/gun, /obj/item/weapon/gun/energy/gun, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "wn" = ( @@ -2929,11 +3023,11 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med_surg) "wr" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 8 +/obj/machinery/shipsensors{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/bridge) +/turf/simulated/floor/reinforced/airless, +/area/ship/ert/atmos) "wt" = ( /obj/structure/table/steel_reinforced, /obj/item/weapon/storage/firstaid/bonemed, @@ -3003,6 +3097,7 @@ /obj/structure/table/rack/steel, /obj/item/weapon/storage/box/anti_photons, /obj/item/weapon/storage/box/anti_photons, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "xh" = ( @@ -3012,18 +3107,21 @@ /obj/machinery/light_switch{ pixel_y = 23 }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "xi" = ( /obj/item/weapon/storage/box/teargas, /obj/item/weapon/storage/box/teargas, /obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "xr" = ( /obj/structure/table/rack/steel, /obj/item/weapon/storage/box/empslite, /obj/item/weapon/storage/box/empslite, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "xt" = ( @@ -3036,6 +3134,7 @@ /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "xv" = ( @@ -3062,6 +3161,7 @@ d2 = 2; icon_state = "0-2" }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "xx" = ( @@ -3095,11 +3195,13 @@ /obj/item/clothing/shoes/magboots/adv, /obj/item/clothing/shoes/magboots/adv, /obj/item/clothing/shoes/magboots/adv, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "xC" = ( /obj/machinery/portable_atmospherics/powered/scrubber, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "xG" = ( @@ -3111,6 +3213,7 @@ dir = 4; pixel_x = -23 }, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) "xM" = ( @@ -3144,6 +3247,7 @@ /obj/structure/table/rack/steel, /obj/item/weapon/gun/launcher/grenade, /obj/item/weapon/gun/launcher/grenade, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "ya" = ( @@ -3412,6 +3516,19 @@ }, /turf/simulated/floor/plating, /area/ship/ert/hallways) +"zB" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/blue{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) "zP" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/wood, @@ -3528,6 +3645,7 @@ /area/ship/ert/armoury_dl) "AI" = ( /obj/machinery/power/thermoregulator, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "AK" = ( @@ -3609,6 +3727,7 @@ /area/ship/ert/hallways) "Bj" = ( /obj/machinery/shieldgen, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "Bo" = ( @@ -3637,6 +3756,7 @@ dir = 1; pixel_y = -23 }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Bq" = ( @@ -3861,6 +3981,7 @@ /obj/structure/railing/grey{ dir = 4 }, +/obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) "Du" = ( @@ -3876,6 +3997,16 @@ }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/ert_ship_boat) +"Dx" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass{ + req_one_access = list(103) + }, +/obj/structure/sign/warning/airlock{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/dock_port) "DJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3938,6 +4069,7 @@ d2 = 2; icon_state = "0-2" }, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "DS" = ( @@ -3955,6 +4087,7 @@ dir = 1; pixel_y = -26 }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "Ed" = ( @@ -3966,6 +4099,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/sign/warning/engineering_access{ + pixel_x = -32 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hallways_aft) "Ee" = ( @@ -4048,6 +4184,7 @@ dir = 4; pixel_x = -23 }, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) "EC" = ( @@ -4091,6 +4228,7 @@ /obj/item/weapon/storage/box/gloves, /obj/item/weapon/storage/box/freezer, /obj/item/weapon/storage/box/masks, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "Fd" = ( @@ -4131,6 +4269,7 @@ pixel_x = 24 }, /obj/structure/cable/yellow, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Fz" = ( @@ -4218,6 +4357,7 @@ /obj/structure/closet/crate{ dir = 2 }, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_st) "FW" = ( @@ -4259,10 +4399,12 @@ /obj/item/weapon/gun/projectile/heavysniper, /obj/item/weapon/storage/box/sniperammo, /obj/item/weapon/storage/box/sniperammo, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Gr" = ( /obj/machinery/power/emitter, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "Gv" = ( @@ -4279,6 +4421,7 @@ /obj/machinery/light/no_nightshift{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "GI" = ( @@ -4298,6 +4441,7 @@ /obj/structure/closet/crate{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_st) "GM" = ( @@ -4348,6 +4492,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) "GZ" = ( @@ -4409,6 +4554,7 @@ /obj/item/weapon/cell/device/weapon/recharge, /obj/item/weapon/cell/device/weapon/recharge, /obj/item/weapon/cell/device/weapon/recharge, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "HC" = ( @@ -4437,6 +4583,7 @@ dir = 8; pixel_x = 23 }, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "HE" = ( @@ -4524,6 +4671,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engine) "Io" = ( @@ -4579,13 +4727,9 @@ /area/ship/ert/barracks) "IF" = ( /obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) -"IG" = ( -/obj/machinery/power/smes/buildable/point_of_interest, -/obj/structure/cable/yellow, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/engineering) "IK" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -4722,6 +4866,7 @@ /obj/effect/floor_decal/corner/red{ dir = 4 }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/hallways) "Jx" = ( @@ -4759,6 +4904,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engineering) "JJ" = ( @@ -4837,6 +4983,7 @@ dir = 1; pixel_y = -26 }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Kb" = ( @@ -4846,6 +4993,8 @@ /obj/structure/railing/grey{ dir = 1 }, +/obj/item/weapon/paper/vonbraun_shields, +/obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) "Kf" = ( @@ -4872,6 +5021,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engine) "Kr" = ( @@ -4951,6 +5101,7 @@ pixel_x = 3; pixel_y = 3 }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "KJ" = ( @@ -4960,6 +5111,7 @@ /obj/structure/railing/grey{ dir = 1 }, +/obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) "KM" = ( @@ -5031,6 +5183,7 @@ /obj/item/taperoll/engineering, /obj/item/taperoll/engineering, /obj/item/taperoll/engineering, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "Lh" = ( @@ -5055,6 +5208,7 @@ /obj/item/weapon/material/knife/tacknife/combatknife, /obj/item/weapon/material/knife/tacknife/combatknife, /obj/item/weapon/material/knife/tacknife/combatknife, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/hallways) "Lq" = ( @@ -5083,6 +5237,7 @@ }, /obj/item/weapon/cell/device/weapon/recharge, /obj/item/weapon/cell/device/weapon/recharge, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "LA" = ( @@ -5098,6 +5253,7 @@ /obj/item/weapon/storage/box/beanbags/large, /obj/item/weapon/storage/box/beanbags/large, /obj/item/weapon/storage/box/stunshells/large, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "LB" = ( @@ -5127,11 +5283,13 @@ /obj/item/weapon/gun/energy/laser, /obj/item/weapon/cell/device/weapon/recharge, /obj/item/weapon/cell/device/weapon/recharge, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "LH" = ( /obj/machinery/shield_gen/external, /obj/effect/floor_decal/corner/white, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "LJ" = ( @@ -5181,6 +5339,7 @@ /obj/item/weapon/cell/device/weapon/recharge, /obj/item/weapon/cell/device/weapon/recharge, /obj/item/weapon/cell/device/weapon/recharge, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "Me" = ( @@ -5196,6 +5355,7 @@ /obj/item/weapon/storage/box/beanbags/large, /obj/item/weapon/storage/box/beanbags/large, /obj/item/weapon/storage/box/stunshells/large, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Mm" = ( @@ -5214,6 +5374,7 @@ /obj/item/weapon/cell/device/weapon/recharge, /obj/item/weapon/cell/device/weapon/recharge, /obj/item/weapon/cell/device/weapon/recharge, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "Mv" = ( @@ -5224,12 +5385,19 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/teleporter) "My" = ( -/obj/machinery/power/terminal{ - dir = 1 +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + dir = 4; + name = "VB APC - East"; + pixel_x = 24 }, /obj/structure/cable/green{ d2 = 8; - dir = 2; icon_state = "0-8" }, /turf/simulated/floor/tiled/techfloor, @@ -5249,6 +5417,7 @@ dir = 1 }, /obj/structure/reagent_dispensers/watertank/high, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) "MK" = ( @@ -5639,6 +5808,7 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/bridge) "OH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engineering) "OO" = ( @@ -5653,6 +5823,7 @@ /obj/item/weapon/cell/device/weapon/recharge, /obj/item/weapon/cell/device/weapon/recharge, /obj/item/weapon/cell/device/weapon/recharge, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "OR" = ( @@ -5839,11 +6010,8 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med_surg) "PH" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, +/obj/machinery/power/smes/buildable/point_of_interest, +/obj/structure/cable/yellow, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engineering) "PJ" = ( @@ -5866,6 +6034,7 @@ /area/ship/ert/armoury_dl) "PS" = ( /obj/machinery/shield_capacitor, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "PX" = ( @@ -6136,9 +6305,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engineering) "Sj" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 1 - }, /obj/machinery/light_switch{ dir = 4; pixel_x = -23 @@ -6150,6 +6316,7 @@ dir = 8 }, /obj/structure/railing/grey, +/obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) "Sp" = ( @@ -6175,6 +6342,7 @@ /obj/item/device/flash, /obj/item/device/flash, /obj/item/device/flash, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/hallways) "Sx" = ( @@ -6203,6 +6371,7 @@ /obj/item/ammo_magazine/m9mmp90, /obj/item/ammo_magazine/m9mmp90, /obj/item/ammo_magazine/m9mmp90, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Sy" = ( @@ -6213,6 +6382,7 @@ /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Sz" = ( @@ -6275,6 +6445,7 @@ "SI" = ( /obj/machinery/portable_atmospherics/powered/scrubber, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "SJ" = ( @@ -6292,6 +6463,7 @@ /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 }, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "SZ" = ( @@ -6316,14 +6488,11 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9; pixel_y = 0 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engineering) "TF" = ( @@ -6465,6 +6634,7 @@ /obj/structure/window/reinforced, /obj/effect/floor_decal/industrial/warning, /obj/structure/cable/yellow, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/teleporter) "UY" = ( @@ -6558,6 +6728,7 @@ /obj/item/device/radio/off, /obj/item/device/radio/off, /obj/item/device/radio/off, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/hallways) "Wa" = ( @@ -6595,6 +6766,17 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) +"Wq" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/blue, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/bridge) "Wu" = ( /obj/machinery/door/airlock/glass_security{ req_one_access = list(103) @@ -6723,8 +6905,8 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) "Xu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/blood/oil, +/obj/structure/cable/yellow, +/obj/machinery/power/smes/buildable/point_of_interest, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engineering) "Xx" = ( @@ -6768,12 +6950,14 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/machinery/firealarm/alarms_hidden{ pixel_y = 26 }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engineering) "XW" = ( @@ -6829,6 +7013,7 @@ req_access = list(103); state = 1 }, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/teleporter) "Yt" = ( @@ -6851,7 +7036,11 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) "YN" = ( -/obj/structure/sign/warning/radioactive, +/obj/structure/sign/warning/radioactive{ + desc = "WARNING: VON BRAUN PTTOS EMIT RADIATION WHILST OPERATIONAL."; + name = "\improper RADIOACTIVE GENERATORS BEHIND THESE DOORS"; + pixel_x = -16 + }, /turf/simulated/wall/rshull, /area/ship/ert/engineering) "YP" = ( @@ -6928,12 +7117,17 @@ pixel_y = 12 }, /obj/machinery/light/no_nightshift, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "ZI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/power/terminal{ dir = 1 }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engineering) "ZL" = ( @@ -6969,6 +7163,7 @@ pixel_y = -26 }, /obj/machinery/power/port_gen/pacman/mrs, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "ZW" = ( @@ -13338,7 +13533,7 @@ ry Xg Sc Nb -YN +XW XW XW XW @@ -13478,7 +13673,7 @@ yR RQ TB OH -OH +nM qt YN XW @@ -13747,7 +13942,7 @@ yz yz yz yz -bO +wr kJ kJ ls @@ -13762,14 +13957,14 @@ NZ XW hN PH -IG +ZI My XW XW XW XW XW -YR +cu yz yz yz @@ -15319,9 +15514,9 @@ KW KW KW YU -KW +Wq OE -KW +zB YU KW KW @@ -15453,7 +15648,7 @@ JB JB JB JB -Na +Dx JB JB JB @@ -15471,7 +15666,7 @@ ZM Sz Sz Sz -Un +ix Sz Sz Sz @@ -15603,8 +15798,8 @@ ZM us ED Ao -wr -lm +us +Oi Sj zg ED @@ -17864,7 +18059,7 @@ yz yz Ye yY -ap +lm WH eX iX @@ -20135,7 +20330,7 @@ yz yz yz yz -ah +af bM bM gh @@ -20161,7 +20356,7 @@ SB aQ MZ MZ -ci +Jg yz yz yz