From c0a83c837fa5ab320487bb84ec5a2de92bf5fd12 Mon Sep 17 00:00:00 2001 From: "Superxpdude@gmail.com" Date: Sun, 10 Jul 2011 03:28:39 +0000 Subject: [PATCH] Fixed a bug with the chicken suit. Firecage, watch what you make the file paths next time. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1820 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/clothing/suit.dm | 2 +- maps/tgstation.2.0.7.dmm | 52 +++++++++++++++---------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/code/defines/obj/clothing/suit.dm b/code/defines/obj/clothing/suit.dm index 0eba5e9b10c..3efaf09045d 100644 --- a/code/defines/obj/clothing/suit.dm +++ b/code/defines/obj/clothing/suit.dm @@ -604,7 +604,7 @@ body_parts_covered = UPPER_TORSO|ARMS armor = list(melee = 5, bullet = 2, laser = 2, taser = 2, bomb = 0, bio = 0, rad = 0) -/obj/item/clothing/suit/suit +/obj/item/clothing/suit/chickensuit name = "Chicken Suit" desc = "A suit made long ago by the ancient empire KFC." icon_state = "chickensuit" diff --git a/maps/tgstation.2.0.7.dmm b/maps/tgstation.2.0.7.dmm index e6475d9811d..18c99751f4d 100644 --- a/maps/tgstation.2.0.7.dmm +++ b/maps/tgstation.2.0.7.dmm @@ -881,12 +881,12 @@ "aqW" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "aqX" = (/obj/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "aqY" = (/obj/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) -"aqZ" = (/obj/rack{dir = 8; layer = 4},/obj/item/weapon/storage/briefcase,/obj/machinery/light_switch{pixel_y = 28},/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) +"aqZ" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/briefcase,/obj/machinery/light_switch{pixel_y = 28},/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "ara" = (/obj/machinery/atmospherics/pipe/simple,/turf/simulated/floor/plating,/area/maintenance/fpmaint) "arb" = (/obj/machinery/power/apc{dir = 1; name = "Law Office APC"; pixel_y = 24},/obj/machinery/light_switch{pixel_x = -20; pixel_y = 0},/obj/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor{icon_state = "wood"},/area/lawoffice) "arc" = (/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor{icon_state = "wood"},/area/lawoffice) "ard" = (/turf/simulated/floor{icon_state = "wood"},/area/lawoffice) -"are" = (/obj/rack{dir = 8; layer = 4},/obj/item/weapon/storage/briefcase,/obj/machinery/requests_console{department = "Law office"; pixel_y = 30},/turf/simulated/floor{icon_state = "wood"},/area/lawoffice) +"are" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/briefcase,/obj/machinery/requests_console{department = "Law office"; pixel_y = 30},/turf/simulated/floor{icon_state = "wood"},/area/lawoffice) "arf" = (/obj/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "arg" = (/obj/machinery/atmospherics/pipe/manifold{dir = 8},/obj/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "arh" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/machinery/atmospherics/pipe/simple,/obj/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint) @@ -1042,9 +1042,9 @@ "aub" = (/obj/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "auc" = (/obj/grille,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "aud" = (/obj/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating/airless,/area/solar/auxport) -"aue" = (/obj/rack{dir = 8; layer = 4},/obj/machinery/light{dir = 1},/obj/item/weapon/circuitboard/teleporter,/turf/simulated/floor,/area/storage/tech) +"aue" = (/obj/rack{dir = 8; layer = 2.9},/obj/machinery/light{dir = 1},/obj/item/weapon/circuitboard/teleporter,/turf/simulated/floor,/area/storage/tech) "auf" = (/turf/simulated/floor,/area/storage/tech) -"aug" = (/obj/rack{dir = 8; layer = 4},/obj/item/weapon/circuitboard/communications,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/storage/tech) +"aug" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/communications,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/storage/tech) "auh" = (/obj/machinery/atmospherics/pipe/simple{dir = 5},/turf/simulated/wall,/area/security/detectives_office) "aui" = (/obj/machinery/atmospherics/pipe/manifold{dir = 1},/turf/simulated/wall,/area/security/detectives_office) "auj" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/wall,/area/security/detectives_office) @@ -1080,8 +1080,8 @@ "auN" = (/obj/grille,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 8},/obj/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "auO" = (/obj/machinery/door/airlock/external{name = "West Auxillary Solar Maintenance"; req_access = null; req_access_txt = "13"},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "auP" = (/obj/grille,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/storage/tech) -"auQ" = (/obj/rack{dir = 8; layer = 4},/obj/item/weapon/circuitboard/borgupload{pixel_x = -1; pixel_y = 1},/obj/item/weapon/circuitboard/aiupload{pixel_x = 2; pixel_y = -2},/turf/simulated/floor,/area/storage/tech) -"auR" = (/obj/rack{dir = 8; layer = 4},/obj/item/weapon/circuitboard/robotics{pixel_x = -2; pixel_y = 2},/obj/item/weapon/circuitboard/mecha_control{pixel_x = 1; pixel_y = -1},/turf/simulated/floor,/area/storage/tech) +"auQ" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/borgupload{pixel_x = -1; pixel_y = 1},/obj/item/weapon/circuitboard/aiupload{pixel_x = 2; pixel_y = -2},/turf/simulated/floor,/area/storage/tech) +"auR" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/robotics{pixel_x = -2; pixel_y = 2},/obj/item/weapon/circuitboard/mecha_control{pixel_x = 1; pixel_y = -1},/turf/simulated/floor,/area/storage/tech) "auS" = (/obj/machinery/atmospherics/pipe/simple{dir = 9},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "auT" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "auU" = (/obj/machinery/atmospherics/pipe/simple,/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) @@ -1231,9 +1231,9 @@ "axI" = (/obj/stool{pixel_y = 8},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "axJ" = (/obj/cable,/obj/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "axK" = (/obj/machinery/light/small{dir = 4},/obj/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/terminal,/turf/simulated/floor/plating,/area/maintenance/auxsolarport) -"axL" = (/obj/rack{dir = 8; layer = 4},/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/item/clothing/gloves/yellow,/obj/item/device/t_scanner,/obj/item/clothing/glasses/meson,/turf/simulated/floor/plating,/area/storage/tech) -"axM" = (/obj/rack{dir = 8; layer = 4},/obj/item/weapon/circuitboard/scan_consolenew{pixel_x = -3; pixel_y = 3},/obj/item/weapon/circuitboard/cloning{pixel_x = 0},/obj/item/weapon/circuitboard/med_data{pixel_x = 3; pixel_y = -3},/turf/simulated/floor/plating,/area/storage/tech) -"axN" = (/obj/rack{dir = 8; layer = 4},/obj/item/weapon/circuitboard/pandemic{pixel_x = -3; pixel_y = 3},/obj/item/weapon/circuitboard/rdconsole,/obj/item/weapon/circuitboard/rdserver{pixel_x = 3; pixel_y = -3},/turf/simulated/floor/plating,/area/storage/tech) +"axL" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/item/clothing/gloves/yellow,/obj/item/device/t_scanner,/obj/item/clothing/glasses/meson,/turf/simulated/floor/plating,/area/storage/tech) +"axM" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/scan_consolenew{pixel_x = -3; pixel_y = 3},/obj/item/weapon/circuitboard/cloning{pixel_x = 0},/obj/item/weapon/circuitboard/med_data{pixel_x = 3; pixel_y = -3},/turf/simulated/floor/plating,/area/storage/tech) +"axN" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/pandemic{pixel_x = -3; pixel_y = 3},/obj/item/weapon/circuitboard/rdconsole,/obj/item/weapon/circuitboard/rdserver{pixel_x = 3; pixel_y = -3},/turf/simulated/floor/plating,/area/storage/tech) "axO" = (/obj/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/storage/tech) "axP" = (/obj/machinery/power/apc{dir = 4; name = "Tech. Storage APC"; pixel_x = 24; pixel_y = 0},/obj/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/storage/tech) "axQ" = (/obj/machinery/atmospherics/pipe/manifold{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint) @@ -1242,7 +1242,7 @@ "axT" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/embedded_controller/radio/airlock_controller{airpump_tag = "EVA_airlock_pump"; exterior_door_tag = "EVA_airlock_exterior"; id_tag = "EVA_airlock_control"; interior_door_tag = "EVA_airlock_interior"; pixel_x = -24; pixel_y = 0; sensor_tag = "EVA_airlock_sensor"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "axU" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/simulated/floor,/area/ai_monitored/storage/eva) "axV" = (/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/ai_monitored/storage/eva) -"axW" = (/obj/rack{dir = 8; layer = 4},/obj/item/weapon/tank/jetpack,/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) +"axW" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/jetpack,/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "axX" = (/obj/rack{dir = 4},/obj/item/clothing/suit/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/mask/breath,/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "axY" = (/obj/rack{dir = 4},/obj/item/clothing/shoes/magboots,/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "axZ" = (/obj/table,/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/rods{amount = 50},/turf/simulated/floor,/area/ai_monitored/storage/eva) @@ -1268,9 +1268,9 @@ "ayt" = (/obj/cable{icon_state = "0-4"; d2 = 4},/obj/cable{d2 = 8; icon_state = "0-8"},/obj/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "ayu" = (/obj/machinery/camera{c_tag = "Port Auxiliary Solars"; dir = 1},/obj/machinery/power/smes,/obj/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "ayv" = (/turf/simulated/wall/r_wall,/area/storage/primary) -"ayw" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/rack{dir = 8; layer = 4},/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/item/device/multitool,/obj/item/clothing/glasses/meson,/turf/simulated/floor/plating,/area/storage/tech) -"ayx" = (/obj/rack{dir = 8; layer = 4},/obj/item/weapon/circuitboard/secure_data{pixel_x = -2; pixel_y = 2},/obj/item/weapon/circuitboard/security{pixel_x = 1; pixel_y = -1},/turf/simulated/floor/plating,/area/storage/tech) -"ayy" = (/obj/rack{dir = 8; layer = 4},/obj/item/weapon/circuitboard/card,/turf/simulated/floor/plating,/area/storage/tech) +"ayw" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/item/device/multitool,/obj/item/clothing/glasses/meson,/turf/simulated/floor/plating,/area/storage/tech) +"ayx" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/secure_data{pixel_x = -2; pixel_y = 2},/obj/item/weapon/circuitboard/security{pixel_x = 1; pixel_y = -1},/turf/simulated/floor/plating,/area/storage/tech) +"ayy" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/card,/turf/simulated/floor/plating,/area/storage/tech) "ayz" = (/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/storage/tech) "ayA" = (/obj/table,/obj/item/device/analyzer,/obj/item/device/healthanalyzer,/turf/simulated/floor/plating,/area/storage/tech) "ayB" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/meter,/turf/simulated/floor/plating,/area/maintenance/fpmaint) @@ -1278,7 +1278,7 @@ "ayD" = (/obj/machinery/atmospherics/pipe/tank/air{dir = 1; initialize_directions = 0; level = 1},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "ayE" = (/obj/machinery/camera{c_tag = "Fore Port Maintenance"; dir = 8; network = "SS13"},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "ayF" = (/obj/closet/extinguisher{pixel_x = -27},/turf/simulated/floor,/area/ai_monitored/storage/eva) -"ayG" = (/obj/rack{dir = 8; layer = 4},/obj/landmark{name = "ExplorationPack"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) +"ayG" = (/obj/rack{dir = 8; layer = 2.9},/obj/landmark{name = "ExplorationPack"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "ayH" = (/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "ayI" = (/obj/rack{dir = 4},/obj/landmark{name = "ExplorationPack"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "ayJ" = (/obj/table,/obj/item/stack/sheet/rglass{amount = 50},/turf/simulated/floor,/area/ai_monitored/storage/eva) @@ -1334,8 +1334,8 @@ "azH" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/requests_console{department = "Assistant Storage"; departmentType = 0; pixel_y = 30},/turf/simulated/floor,/area/storage/primary) "azI" = (/obj/machinery/atmospherics/pipe/simple,/turf/simulated/wall/r_wall,/area/storage/tech) "azJ" = (/obj/machinery/requests_console{department = "Tech storage"; pixel_x = -30},/turf/simulated/floor/plating,/area/storage/tech) -"azK" = (/obj/rack{dir = 8; layer = 4},/obj/item/weapon/circuitboard/powermonitor{pixel_x = -2; pixel_y = 2},/obj/item/weapon/circuitboard/stationalert{pixel_x = 1; pixel_y = -1},/turf/simulated/floor/plating,/area/storage/tech) -"azL" = (/obj/rack{dir = 8; layer = 4},/obj/item/weapon/circuitboard/arcade,/turf/simulated/floor/plating,/area/storage/tech) +"azK" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/powermonitor{pixel_x = -2; pixel_y = 2},/obj/item/weapon/circuitboard/stationalert{pixel_x = 1; pixel_y = -1},/turf/simulated/floor/plating,/area/storage/tech) +"azL" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/arcade,/turf/simulated/floor/plating,/area/storage/tech) "azM" = (/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = 27},/obj/table,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor/plating,/area/storage/tech) "azN" = (/obj/machinery/atmospherics/valve,/turf/simulated/floor/plating,/area/maintenance/fpmaint) "azO" = (/obj/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) @@ -1347,7 +1347,7 @@ "azU" = (/obj/disposalpipe/segment{dir = 4},/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva) "azV" = (/obj/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/ai_monitored/storage/eva) "azW" = (/obj/disposalpipe/segment{dir = 4},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/ai_monitored/storage/eva) -"azX" = (/obj/rack{dir = 8; layer = 4},/obj/item/weapon/tank/jetpack,/obj/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) +"azX" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/jetpack,/obj/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "azY" = (/obj/rack{dir = 4},/obj/item/clothing/suit/space,/obj/item/clothing/head/helmet/space,/obj/disposalpipe/segment{dir = 4},/obj/item/clothing/mask/breath,/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "azZ" = (/obj/rack{dir = 4},/obj/item/clothing/shoes/magboots,/obj/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "aAa" = (/obj/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor,/area/ai_monitored/storage/eva) @@ -1955,7 +1955,7 @@ "aLE" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/machinery/light/small{dir = 8},/obj/disposalpipe/segment{dir = 1},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "aLF" = (/obj/landmark/start{name = "Clown"},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/theatre) "aLG" = (/obj/landmark/start{name = "Mime"},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/theatre) -"aLH" = (/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/rack,/obj/item/clothing/suit/suit,/turf/simulated/floor,/area/crew_quarters/theatre) +"aLH" = (/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/rack,/obj/item/clothing/suit/chickensuit,/turf/simulated/floor,/area/crew_quarters/theatre) "aLI" = (/obj/machinery/atmospherics/pipe/manifold{dir = 8},/turf/simulated/floor,/area/crew_quarters/theatre) "aLJ" = (/obj/rack,/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/item/clothing/suit/judgerobe,/obj/item/clothing/head/powdered_wig,/obj/machinery/camera{c_tag = "Theatre Storage"; dir = 8; network = "SS13"},/turf/simulated/floor,/area/crew_quarters/theatre) "aLK" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/crew_quarters/theatre) @@ -4430,7 +4430,7 @@ "bHj" = (/obj/machinery/light{dir = 1},/obj/grille,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/assembly/chargebay) "bHk" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/aft) "bHl" = (/obj/machinery/camera{c_tag = "Aft Primary Hallway 2"; dir = 8; network = "SS13"},/turf/simulated/floor,/area/hallway/primary/aft) -"bHm" = (/obj/machinery/light/small{dir = 8},/obj/rack{dir = 8; layer = 4},/obj/item/weapon/tank/air,/obj/item/weapon/tank/air,/obj/item/weapon/tank/air,/turf/simulated/floor,/area/atmos) +"bHm" = (/obj/machinery/light/small{dir = 8},/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/air,/obj/item/weapon/tank/air,/obj/item/weapon/tank/air,/turf/simulated/floor,/area/atmos) "bHn" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b"; level = 2},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "atmos"; name = "Airlock Window Shield"; opacity = 0},/obj/machinery/door/airlock/maintenance{name = "Atmospherics Maintenance"; req_access_txt = "12;24"},/turf/simulated/floor,/area/atmos) "bHo" = (/obj/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor,/area/atmos) "bHp" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/atmos) @@ -4479,7 +4479,7 @@ "bIg" = (/obj/showcase{icon_state = "showcase_5"; pixel_x = -2},/turf/simulated/floor{icon_state = "showroomfloor"},/area/assembly/chargebay) "bIh" = (/obj/grille,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/assembly/chargebay) "bIi" = (/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/hallway/primary/aft) -"bIj" = (/obj/rack{dir = 8; layer = 4},/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/turf/simulated/floor,/area/atmos) +"bIj" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/turf/simulated/floor,/area/atmos) "bIk" = (/obj/machinery/vending/coffee,/turf/simulated/floor,/area/atmos) "bIl" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/atmos) "bIm" = (/obj/table,/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor,/area/atmos) @@ -5285,7 +5285,7 @@ "bXG" = (/obj/machinery/computer/atmos_alert,/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor,/area/engine/chiefs_office) "bXH" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor,/area/engine/chiefs_office) "bXI" = (/obj/machinery/alarm{pixel_y = 23},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/portable_atmospherics/canister/oxygen,/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor,/area/engine/chiefs_office) -"bXJ" = (/obj/rack{dir = 8; layer = 4},/obj/machinery/light{dir = 1},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig,/obj/item/clothing/head/helmet/space/rig,/obj/item/clothing/mask/breath,/obj/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor,/area/engine/chiefs_office) +"bXJ" = (/obj/rack{dir = 8; layer = 2.9},/obj/machinery/light{dir = 1},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig,/obj/item/clothing/head/helmet/space/rig,/obj/item/clothing/mask/breath,/obj/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor,/area/engine/chiefs_office) "bXK" = (/obj/machinery/power/apc{dir = 1; name = "CE office APC"; pixel_x = 0; pixel_y = 25},/obj/secure_closet/engineering_chief{req_access_txt = "0"},/obj/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor,/area/engine/chiefs_office) "bXL" = (/obj/grille,/obj/window/reinforced{dir = 4},/obj/window/reinforced,/obj/window/reinforced{dir = 8},/obj/cable{d2 = 8; icon_state = "0-8"},/obj/cable,/turf/simulated/floor/plating,/area/engine/chiefs_office) "bXM" = (/turf/simulated/floor,/area/engine/engineering) @@ -5410,7 +5410,7 @@ "cab" = (/obj/machinery/power/apc{dir = 8; name = "Aft Maintenance APC"; pixel_x = -25; pixel_y = 0},/obj/cable,/turf/simulated/floor/plating,/area/maintenance/aft) "cac" = (/obj/table,/obj/machinery/cell_charger,/obj/machinery/camera{c_tag = "Engineering SMES Room"; dir = 4; network = "SS13"},/turf/simulated/floor,/area/engine/engineering) "cad" = (/obj/table,/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/module/power_control,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/engine/engineering) -"cae" = (/obj/rack{dir = 8; layer = 4},/obj/item/clothing/suit/space/rig,/obj/item/clothing/head/helmet/space/rig,/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/item/clothing/mask/breath,/turf/simulated/floor,/area/engine/engineering) +"cae" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/clothing/suit/space/rig,/obj/item/clothing/head/helmet/space/rig,/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/item/clothing/mask/breath,/turf/simulated/floor,/area/engine/engineering) "caf" = (/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/table,/obj/item/weapon/book/manual/engineering_singularity_safety,/obj/item/clothing/gloves/yellow,/turf/simulated/floor,/area/engine/engineering) "cag" = (/obj/machinery/dispenser,/turf/simulated/floor,/area/engine/engineering) "cah" = (/obj/grille,/obj/window/reinforced{dir = 8},/obj/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/manifold{dir = 8},/turf/simulated/floor/plating,/area/engine/engineering) @@ -5487,8 +5487,8 @@ "cbA" = (/turf/simulated/floor{dir = 1; icon_state = "yellowcorner"},/area/engine/engineering) "cbB" = (/obj/landmark/start{name = "Station Engineer"},/turf/simulated/floor{dir = 4; icon_state = "yellowcorner"},/area/engine/engineering) "cbC" = (/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/engineering) -"cbD" = (/obj/rack{dir = 8; layer = 4},/obj/item/weapon/storage/utilitybelt,/obj/item/weapon/wrench,/obj/item/weapon/weldingtool,/obj/item/clothing/head/helmet/welding{pixel_x = -3; pixel_y = 5},/turf/simulated/floor{dir = 4; icon_state = "yellowcorner"},/area/engine/engineering) -"cbE" = (/obj/rack{dir = 8; layer = 4},/obj/item/clothing/gloves/yellow,/obj/item/weapon/storage/utilitybelt,/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/engineering) +"cbD" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/utilitybelt,/obj/item/weapon/wrench,/obj/item/weapon/weldingtool,/obj/item/clothing/head/helmet/welding{pixel_x = -3; pixel_y = 5},/turf/simulated/floor{dir = 4; icon_state = "yellowcorner"},/area/engine/engineering) +"cbE" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/clothing/gloves/yellow,/obj/item/weapon/storage/utilitybelt,/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/engineering) "cbF" = (/obj/secure_closet/engineering_personal,/obj/machinery/light{dir = 1},/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/engineering) "cbG" = (/obj/secure_closet/engineering_personal,/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/engineering) "cbH" = (/obj/machinery/door/poddoor{id = "mixingwaste"; name = "Waste Vent"},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing) @@ -5559,7 +5559,7 @@ "ccU" = (/obj/grille,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/engine/engineering) "ccV" = (/obj/table,/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/weapon/cable_coil,/turf/simulated/floor,/area/engine/engineering) "ccW" = (/obj/table,/obj/item/weapon/book/manual/engineering_hacking{pixel_x = 3; pixel_y = 3},/obj/item/weapon/book/manual/engineering_construction,/turf/simulated/floor,/area/engine/engineering) -"ccX" = (/obj/rack{dir = 8; layer = 4},/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/weapon/extinguisher{pixel_x = 8},/turf/simulated/floor,/area/engine/engineering) +"ccX" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/weapon/extinguisher{pixel_x = 8},/turf/simulated/floor,/area/engine/engineering) "ccY" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Singularity"; layer = 2.8; name = "Singularity Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/engineering) "ccZ" = (/obj/reagent_dispensers/fueltank,/turf/simulated/floor{dir = 9; icon_state = "warning"},/area/engine/engineering) "cda" = (/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/engine/engineering) @@ -5567,7 +5567,7 @@ "cdc" = (/turf/simulated/floor{dir = 5; icon_state = "warning"},/area/engine/engineering) "cdd" = (/obj/table,/obj/item/weapon/crowbar,/obj/item/device/flashlight{pixel_y = 5},/obj/item/clothing/ears/earmuffs{pixel_x = -5; pixel_y = 6},/turf/simulated/floor,/area/engine/engineering) "cde" = (/obj/table,/obj/item/weapon/storage/lightbox/tubes,/turf/simulated/floor,/area/engine/engineering) -"cdf" = (/obj/rack{dir = 8; layer = 4},/obj/item/clothing/suit/fire/firefighter,/obj/item/clothing/head/helmet/hardhat,/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/engine/engineering) +"cdf" = (/obj/rack{dir = 8; layer = 2.9},/obj/item/clothing/suit/fire/firefighter,/obj/item/clothing/head/helmet/hardhat,/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/engine/engineering) "cdg" = (/obj/table,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "cdh" = (/obj/machinery/atmospherics/pipe/simple{icon_state = "intact"; level = 2},/obj/machinery/meter,/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "cdi" = (/mob/living/carbon/monkey{name = "Don"},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)