From e679b6251665fa894c49cc3f38e2fcf867b28314 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Sun, 17 Sep 2017 01:11:18 -0400 Subject: [PATCH] Varedit cleanup mk4 (#30794) * Cleans up and corrects a bunch of varedits * Plant varedits * More layers * Adjusted plant name/description --- .../lavaland_surface_syndicate_base1.dmm | 15 +- _maps/RandomRuins/SpaceRuins/abandonedzoo.dmm | 10 +- _maps/RandomRuins/SpaceRuins/onehalf.dmm | 5 +- _maps/RandomZLevels/moonoutpost19.dmm | 50 +-- _maps/RandomZLevels/research.dmm | 20 +- _maps/RandomZLevels/snowdin.dmm | 5 +- _maps/RandomZLevels/undergroundoutpost45.dmm | 12 +- _maps/map_files/BoxStation/BoxStation.dmm | 57 +-- .../map_files/Deltastation/DeltaStation2.dmm | 110 +++-- _maps/map_files/MetaStation/MetaStation.dmm | 403 ++++-------------- _maps/map_files/Mining/Lavaland.dmm | 2 - _maps/map_files/OmegaStation/OmegaStation.dmm | 145 +++---- _maps/map_files/PubbyStation/PubbyStation.dmm | 272 +++--------- _maps/map_files/generic/CentCom.dmm | 214 +++++----- _maps/shuttles/emergency_bar.dmm | 3 - _maps/shuttles/emergency_birdboat.dmm | 3 +- _maps/shuttles/emergency_cere.dmm | 6 +- _maps/shuttles/emergency_delta.dmm | 11 +- _maps/shuttles/emergency_luxury.dmm | 3 - _maps/shuttles/ferry_lighthouse.dmm | 10 +- _maps/shuttles/whiteship_meta.dmm | 4 +- code/game/objects/structures/flora.dm | 7 + code/modules/reagents/reagent_dispenser.dm | 1 + 23 files changed, 420 insertions(+), 948 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 3c7cb364c6e..5d192d2a7ce 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -76,8 +76,7 @@ /area/ruin/powered/syndicate_lava_base) "al" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/vault, /area/ruin/powered/syndicate_lava_base) @@ -320,8 +319,7 @@ /area/ruin/powered/syndicate_lava_base) "aS" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -413,8 +411,7 @@ /area/ruin/powered/syndicate_lava_base) "bd" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/machinery/light/small, /turf/open/floor/plasteel/black, @@ -702,8 +699,7 @@ /area/ruin/powered/syndicate_lava_base) "bK" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/vault{ dir = 8 @@ -969,8 +965,7 @@ /area/ruin/powered/syndicate_lava_base) "cq" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/podhatch{ dir = 5 diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm index 819e11bb0e6..66c738fb778 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -743,10 +743,7 @@ /turf/open/floor/plasteel/darkgreen, /area/ruin/space/has_grav/abandonedzoo) "bN" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/item/shard{ icon_state = "small" }, @@ -799,10 +796,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/abandonedzoo) "bU" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/abandonedzoo) "bV" = ( diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm index 16d0d808877..dd653c39476 100644 --- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm @@ -1225,10 +1225,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/onehalf/bridge) "dc" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/structure/cable{ d1 = 1; d2 = 2; diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 44c5d01da5b..4c9a9958641 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -1922,11 +1922,7 @@ name = "Syndicate Outpost" }) "cG" = ( -/obj/structure/grille{ - density = 0; - broken = 1; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/item/stack/rods, /obj/item/stack/rods, /obj/item/shard, @@ -4885,11 +4881,7 @@ name = "MO19 Research" }) "gE" = ( -/obj/structure/grille{ - density = 0; - broken = 1; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/item/stack/rods, /obj/item/stack/rods, /obj/item/shard, @@ -5523,11 +5515,7 @@ name = "MO19 Research" }) "hx" = ( -/obj/structure/grille{ - density = 0; - broken = 1; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/item/stack/rods, /obj/item/stack/rods, /obj/item/shard{ @@ -6778,7 +6766,6 @@ "jq" = ( /obj/item/twohanded/required/kirbyplants{ desc = "A plastic potted plant."; - layer = 4.1; pixel_y = 3 }, /turf/open/floor/plasteel{ @@ -7787,11 +7774,7 @@ }) "kP" = ( /obj/item/stack/rods, -/obj/structure/grille{ - density = 0; - broken = 1; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/item/stack/rods, /obj/item/shard{ icon_state = "medium" @@ -7805,11 +7788,7 @@ name = "MO19 Arrivals" }) "kQ" = ( -/obj/structure/grille{ - density = 0; - broken = 1; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/item/stack/rods, /turf/open/floor/plating{ broken = 1; @@ -9320,11 +9299,7 @@ name = "MO19 Arrivals" }) "ns" = ( -/obj/structure/grille{ - density = 0; - broken = 1; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/item/stack/rods, /turf/open/floor/plating{ heat_capacity = 1e+006 @@ -9470,11 +9445,7 @@ poweralm = 0 }) "nD" = ( -/obj/structure/grille{ - density = 0; - broken = 1; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/item/stack/rods, /obj/item/shard, /obj/effect/decal/cleanable/blood/tracks{ @@ -9809,7 +9780,6 @@ "ob" = ( /obj/item/twohanded/required/kirbyplants{ desc = "A plastic potted plant."; - layer = 4.1; pixel_y = 3 }, /turf/open/floor/plasteel/neutral/side{ @@ -9933,11 +9903,7 @@ poweralm = 0 }) "oj" = ( -/obj/structure/grille{ - density = 0; - broken = 1; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /turf/open/floor/mineral/titanium, /area/awaycontent/a3{ always_unpowered = 1; diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 0841c32e242..9a85544ca92 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -119,7 +119,6 @@ "ax" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-20"; - layer = 4.1; pixel_y = 3 }, /turf/open/floor/plasteel/whiteyellow/corner{ @@ -1317,8 +1316,7 @@ /area/awaymission/research/interior/secure) "dN" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-16"; - layer = 4.1 + icon_state = "plant-16" }, /turf/open/floor/plasteel/darkpurple, /area/awaymission/research/interior/genetics) @@ -2824,8 +2822,7 @@ /area/awaymission/research/interior/genetics) "hV" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-10"; - layer = 4.1 + icon_state = "plant-10" }, /turf/open/floor/plasteel/darkpurple, /area/awaymission/research/interior/genetics) @@ -3306,8 +3303,7 @@ /area/awaymission/research/interior/dorm) "jm" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-14"; - layer = 4.1 + icon_state = "plant-14" }, /turf/open/floor/plasteel/yellowsiding{ dir = 9 @@ -4053,8 +4049,7 @@ /area/awaymission/research/interior/medbay) "ly" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-16"; - layer = 4.1 + icon_state = "plant-16" }, /turf/open/floor/plasteel/yellowsiding{ dir = 10 @@ -4459,9 +4454,7 @@ }, /area/awaymission/research/interior/escapepods) "mJ" = ( -/obj/item/twohanded/required/kirbyplants{ - layer = 4.1 - }, +/obj/item/twohanded/required/kirbyplants, /turf/open/floor/plasteel/whitegreen/side{ dir = 8 }, @@ -4495,8 +4488,7 @@ /area/awaymission/research/interior/escapepods) "mN" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "applebush"; - layer = 4.1 + icon_state = "applebush" }, /turf/open/floor/plasteel/whitegreen/side{ dir = 4 diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 07f6530dade..e77a80ec671 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -3899,10 +3899,7 @@ }, /area/awaymission/snowdin) "kA" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow; icon = 'icons/turf/snow.dmi'; diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index a1ddd715b15..bdf5091d25e 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -14188,8 +14188,7 @@ /obj/machinery/atmospherics/components/trinary/filter{ dir = 4; filter_type = "n2"; - on = 1; - req_access = null + on = 1 }, /turf/open/floor/plasteel/red/side{ dir = 10; @@ -14238,8 +14237,7 @@ /obj/machinery/atmospherics/components/trinary/filter{ dir = 4; filter_type = "o2"; - on = 1; - req_access = null + on = 1 }, /turf/open/floor/plasteel/blue/side{ dir = 10; @@ -17520,11 +17518,7 @@ poweralm = 0 }) "yN" = ( -/obj/structure/grille{ - density = 0; - broken = 1; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /turf/open/floor/mineral/titanium/blue, /area/awaycontent/a7{ always_unpowered = 1; diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 61fcef89ccd..1736b64fb73 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -2422,8 +2422,6 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_y = 32 }, /turf/open/floor/mineral/titanium/blue, @@ -3244,9 +3242,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /obj/item/reagent_containers/blood/empty, /turf/open/floor/plasteel/whitered/side{ dir = 5 @@ -8057,8 +8053,6 @@ /area/lawoffice) "asa" = ( /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_x = 32 }, /turf/open/floor/plasteel/red/corner{ @@ -14799,8 +14793,6 @@ /area/shuttle/arrival) "aHu" = ( /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_x = 32 }, /turf/open/floor/plasteel/white/corner{ @@ -17310,8 +17302,6 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_x = 32 }, /turf/open/floor/plasteel/bar, @@ -18091,10 +18081,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/locker) "aPE" = ( -/obj/machinery/status_display{ - density = 0; - layer = 4 - }, +/obj/machinery/status_display, /turf/closed/wall, /area/crew_quarters/locker) "aPF" = ( @@ -18206,10 +18193,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/status_display{ - density = 0; - layer = 4 - }, +/obj/machinery/status_display, /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; @@ -18248,10 +18232,7 @@ icon_state = "0-4"; d2 = 4 }, -/obj/machinery/status_display{ - density = 0; - layer = 4 - }, +/obj/machinery/status_display, /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; @@ -19445,8 +19426,6 @@ "aTr" = ( /obj/machinery/door/firedoor, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_x = 32 }, /turf/open/floor/plasteel, @@ -23450,8 +23429,6 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_x = -32 }, /turf/open/floor/plasteel/blue/corner{ @@ -24399,10 +24376,7 @@ /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload) "bfw" = ( -/obj/machinery/status_display{ - density = 0; - layer = 4 - }, +/obj/machinery/status_display, /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload) "bfx" = ( @@ -26461,8 +26435,6 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_x = 32 }, /obj/machinery/aug_manipulator, @@ -26546,7 +26518,6 @@ /area/quartermaster/office) "bkx" = ( /obj/machinery/status_display{ - density = 0; pixel_y = 2; supply_display = 1 }, @@ -27431,8 +27402,6 @@ }, /obj/machinery/door/firedoor, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_x = -32 }, /turf/open/floor/plasteel/brown/corner{ @@ -30353,8 +30322,6 @@ /area/medical/medbay/central) "bsz" = ( /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_x = -32 }, /turf/open/floor/plasteel/white/side{ @@ -31908,7 +31875,6 @@ }, /obj/machinery/light, /obj/machinery/status_display{ - density = 0; pixel_y = -30; supply_display = 1 }, @@ -34176,7 +34142,6 @@ pixel_y = -35 }, /obj/machinery/status_display{ - density = 0; pixel_x = -32; supply_display = 1 }, @@ -37437,8 +37402,6 @@ "bIe" = ( /obj/structure/disposalpipe/segment, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -40580,7 +40543,6 @@ "bOP" = ( /obj/structure/table/glass, /obj/structure/reagent_dispensers/virusfood{ - density = 0; pixel_x = -30 }, /obj/item/book/manual/wiki/infections{ @@ -41444,8 +41406,7 @@ /area/science/misc_lab) "bQV" = ( /obj/machinery/atmospherics/components/trinary/filter{ - dir = 4; - req_access = null + dir = 4 }, /turf/open/floor/engine, /area/science/misc_lab) @@ -52694,8 +52655,6 @@ dir = 8 }, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_y = 32 }, /turf/open/floor/mineral/titanium/blue, @@ -56032,8 +55991,6 @@ dir = 8 }, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_y = 32 }, /turf/open/floor/mineral/titanium/blue, @@ -56962,8 +56919,6 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_y = 32 }, /turf/open/floor/mineral/titanium/blue, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index c85ef776798..124074c038d 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -186,8 +186,6 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_x = 32 }, /obj/machinery/computer/shuttle/pod{ @@ -208,8 +206,6 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_x = 32 }, /obj/machinery/computer/shuttle/pod{ @@ -3514,6 +3510,8 @@ "ahP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -6351,6 +6349,8 @@ req_access_txt = "12" }, /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -9542,7 +9542,6 @@ /area/quartermaster/storage) "aut" = ( /obj/machinery/status_display{ - density = 0; name = "cargo display"; supply_display = 1 }, @@ -18930,7 +18929,6 @@ /area/quartermaster/storage) "aNe" = ( /obj/machinery/status_display{ - density = 0; name = "cargo display"; supply_display = 1 }, @@ -19935,12 +19933,9 @@ }, /area/security/prison) "aOV" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "permacell3"; - name = "Cell Shutters"; - opacity = 0 + name = "Cell Shutters" }, /obj/machinery/door/airlock/glass{ id_tag = "permabolt3"; @@ -19956,12 +19951,9 @@ /turf/open/floor/plasteel, /area/security/prison) "aOW" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "permacell2"; - name = "Cell Shutters"; - opacity = 0 + name = "Cell Shutters" }, /obj/machinery/door/airlock/glass{ id_tag = "permabolt2"; @@ -19981,12 +19973,9 @@ /turf/open/floor/plasteel, /area/security/prison) "aOX" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "permacell1"; - name = "Cell Shutters"; - opacity = 0 + name = "Cell Shutters" }, /obj/machinery/door/airlock/glass{ id_tag = "permabolt1"; @@ -24309,8 +24298,7 @@ /area/quartermaster/office) "aWW" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-18"; - layer = 4.1 + icon_state = "plant-18" }, /turf/open/floor/plasteel/brown, /area/quartermaster/office) @@ -24726,8 +24714,6 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_y = 32 }, /obj/machinery/computer/shuttle/pod{ @@ -24804,8 +24790,7 @@ icon_state = "pipe-c" }, /obj/structure/fireaxecabinet{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/plasteel/caution{ dir = 8 @@ -46748,9 +46733,7 @@ /turf/open/floor/carpet, /area/security/detectives_office) "bMX" = ( -/obj/machinery/computer/security/wooden_tv{ - density = 0 - }, +/obj/machinery/computer/security/wooden_tv, /obj/structure/table/wood, /obj/machinery/button/door{ id = "detectivewindows"; @@ -58719,9 +58702,7 @@ icon_state = "1-2" }, /obj/structure/table/reinforced, -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-07"; - name = "Photosynthetic Potted plant"; +/obj/item/twohanded/required/kirbyplants/photosynthetic{ pixel_y = 10 }, /turf/open/floor/plasteel/vault{ @@ -64221,8 +64202,6 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/effect/decal/cleanable/dirt, @@ -68441,8 +68420,7 @@ /area/crew_quarters/locker) "cCc" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-18"; - layer = 4.1 + icon_state = "plant-18" }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -69975,6 +69953,8 @@ /area/maintenance/port) "cEW" = ( /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -71355,9 +71335,7 @@ "cHm" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/blue/corner{ dir = 4 }, @@ -78854,6 +78832,8 @@ dir = 8 }, /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/open/floor/plating, @@ -79587,9 +79567,7 @@ /area/medical/abandoned) "cYb" = ( /obj/structure/bed/roller, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/medical/abandoned) @@ -79610,9 +79588,7 @@ /area/medical/abandoned) "cYd" = ( /obj/structure/bed/roller, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 @@ -80954,6 +80930,8 @@ /area/maintenance/port) "daZ" = ( /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -80977,6 +80955,8 @@ "dbb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -80998,6 +80978,8 @@ "dbd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -81561,9 +81543,7 @@ /turf/open/floor/plating, /area/medical/abandoned) "dcm" = ( -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/medical/abandoned) @@ -83327,9 +83307,7 @@ /area/science/explab) "dfZ" = ( /obj/machinery/atmospherics/components/trinary/filter{ - density = 0; - dir = 8; - req_access = "0" + dir = 8 }, /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 @@ -94015,9 +93993,7 @@ /area/science/mixing) "dBf" = ( /obj/machinery/atmospherics/components/trinary/filter{ - density = 0; - dir = 8; - req_access = "0" + dir = 8 }, /turf/open/floor/plasteel/neutral/side{ dir = 1 @@ -98109,6 +98085,7 @@ /area/security/checkpoint/customs) "dJd" = ( /obj/structure/cable/white{ + d2 = 2; icon_state = "0-2" }, /obj/effect/spawner/structure/window/reinforced, @@ -98693,6 +98670,7 @@ /area/medical/virology) "dKq" = ( /obj/structure/cable/white{ + d2 = 2; icon_state = "0-2" }, /obj/effect/spawner/structure/window/reinforced, @@ -98775,9 +98753,7 @@ /area/maintenance/port/aft) "dKD" = ( /obj/machinery/atmospherics/components/trinary/filter{ - density = 0; - dir = 8; - req_access = "0" + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral, @@ -105565,10 +105541,7 @@ /area/shuttle/escape) "dYc" = ( /obj/structure/lattice, -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /turf/open/space, /area/space) "dYd" = ( @@ -105897,6 +105870,7 @@ /area/security/checkpoint/checkpoint2) "dYE" = ( /obj/structure/cable/white{ + d2 = 2; icon_state = "0-2" }, /obj/effect/spawner/structure/window/reinforced, @@ -109637,24 +109611,32 @@ /area/hallway/primary/aft) "eiL" = ( /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/open/floor/plasteel/neutral, /area/hallway/primary/aft) "eiM" = ( /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/open/floor/plasteel/neutral, /area/hallway/primary/aft) "eiN" = ( /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/open/floor/plasteel/neutral, /area/hallway/primary/aft) "eiO" = ( /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/open/floor/plasteel/neutral, @@ -109760,6 +109742,8 @@ /area/crew_quarters/dorms) "ejb" = ( /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, @@ -109783,6 +109767,8 @@ /area/crew_quarters/dorms) "ejd" = ( /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index e9964afcc42..bba6c0d3d93 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -216,8 +216,7 @@ icon_state = "1-2" }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-03"; - layer = 4.1 + icon_state = "plant-03" }, /turf/open/floor/plasteel/floorgrime, /area/security/prison) @@ -237,9 +236,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/twohanded/required/kirbyplants{ - layer = 4.1 - }, +/obj/item/twohanded/required/kirbyplants, /turf/open/floor/plasteel/floorgrime, /area/security/prison) "aaE" = ( @@ -583,8 +580,6 @@ /area/security/prison) "abr" = ( /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /turf/open/floor/plasteel/barber{ @@ -1488,12 +1483,9 @@ /turf/closed/wall/r_wall, /area/security/prison) "adb" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "permacell3"; - name = "Cell Shutters"; - opacity = 0 + name = "Cell Shutters" }, /obj/machinery/door/airlock/glass{ id_tag = "permabolt3"; @@ -1506,12 +1498,9 @@ /turf/closed/wall, /area/security/prison) "add" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "permacell2"; - name = "Cell Shutters"; - opacity = 0 + name = "Cell Shutters" }, /obj/machinery/door/airlock/glass{ id_tag = "permabolt2"; @@ -1526,12 +1515,9 @@ /turf/open/floor/plasteel/floorgrime, /area/security/prison) "ade" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "permacell1"; - name = "Cell Shutters"; - opacity = 0 + name = "Cell Shutters" }, /obj/machinery/door/airlock/glass{ id_tag = "permabolt1"; @@ -1787,8 +1773,6 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_x = 32 }, /obj/machinery/computer/shuttle/pod{ @@ -1953,13 +1937,9 @@ "adX" = ( /obj/structure/bed/roller, /obj/structure/bed/roller, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/whitered/side{ dir = 2 }, @@ -2667,8 +2647,7 @@ dir = 9 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-16"; - layer = 4.1 + icon_state = "plant-16" }, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'WARNING: Criminally Insane Inmates', describing the possible hazards of those contained within."; @@ -2744,8 +2723,6 @@ /area/crew_quarters/heads/hos) "afj" = ( /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_x = -32; pixel_y = 32 }, @@ -2777,8 +2754,6 @@ /area/crew_quarters/heads/hos) "afn" = ( /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_x = 32; pixel_y = 32 }, @@ -2922,8 +2897,7 @@ /area/maintenance/solars/port/fore) "afF" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "applebush"; - layer = 4.1 + icon_state = "applebush" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -3848,35 +3822,26 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "Prison Gate"; - name = "Security Blast Door"; - opacity = 0 + name = "Security Blast Door" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/security/brig) "ahz" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "Prison Gate"; - name = "Security Blast Door"; - opacity = 0 + name = "Security Blast Door" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/security/brig) "ahA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "Prison Gate"; - name = "Security Blast Door"; - opacity = 0 + name = "Security Blast Door" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -7360,9 +7325,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/whitered/side, /area/security/brig) "aoq" = ( @@ -13186,7 +13149,6 @@ "azl" = ( /obj/structure/closet/emcloset, /obj/machinery/status_display{ - density = 0; pixel_y = 32; supply_display = 1 }, @@ -13580,7 +13542,6 @@ /area/security/detectives_office) "azU" = ( /obj/machinery/computer/security/wooden_tv{ - density = 0; pixel_x = 3; pixel_y = 2 }, @@ -14517,7 +14478,6 @@ /obj/effect/decal/cleanable/cobweb, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-20"; - layer = 4.1; pixel_y = 3 }, /obj/effect/turf_decal/bot{ @@ -15473,8 +15433,6 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /turf/open/floor/plasteel/red/corner{ @@ -18050,7 +18008,6 @@ pixel_y = 23 }, /obj/machinery/status_display{ - density = 0; pixel_y = 32; supply_display = 1 }, @@ -18549,8 +18506,6 @@ name = "Judge" }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/machinery/light{ @@ -18641,8 +18596,7 @@ pixel_y = 24 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/wood, /area/lawoffice) @@ -19661,9 +19615,7 @@ c_tag = "AI Upload Chamber - Fore"; network = list("SS13","RD","AIUpload") }, -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-07"; - name = "Photosynthetic Potted plant"; +/obj/item/twohanded/required/kirbyplants/photosynthetic{ pixel_y = 10 }, /turf/open/floor/plasteel/black, @@ -19810,8 +19762,6 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/machinery/portable_atmospherics/scrubber, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 30 }, /obj/effect/turf_decal/delivery, @@ -21846,8 +21796,6 @@ icon_state = "0-4" }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/machinery/camera{ @@ -21916,8 +21864,6 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_y = 32 }, /obj/machinery/computer/shuttle/pod{ @@ -22041,7 +21987,6 @@ /obj/item/clipboard, /obj/item/stamp/qm, /obj/machinery/status_display{ - density = 0; pixel_x = 32; supply_display = 1 }, @@ -22173,8 +22118,6 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_x = 32 }, /obj/machinery/flasher{ @@ -22239,8 +22182,7 @@ pixel_x = -27 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-03"; - layer = 4.1 + icon_state = "plant-03" }, /turf/open/floor/plasteel/neutral/corner{ dir = 1 @@ -23357,7 +23299,6 @@ dir = 8 }, /obj/machinery/status_display{ - density = 0; pixel_x = 32; supply_display = 1 }, @@ -24563,8 +24504,6 @@ /area/ai_monitored/turret_protected/ai) "aVm" = ( /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, @@ -24597,8 +24536,6 @@ /area/ai_monitored/turret_protected/ai) "aVq" = ( /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/machinery/atmospherics/components/unary/vent_pump/on, @@ -24616,8 +24553,7 @@ /area/hallway/secondary/entry) "aVt" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-13"; - layer = 4.1 + icon_state = "plant-13" }, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -24667,8 +24603,6 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/effect/turf_decal/stripes/line{ @@ -24772,7 +24706,6 @@ /area/hallway/secondary/entry) "aVG" = ( /obj/machinery/status_display{ - density = 0; supply_display = 1 }, /turf/closed/wall, @@ -24943,8 +24876,7 @@ pixel_y = 23 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "applebush"; - layer = 4.1 + icon_state = "applebush" }, /turf/open/floor/plasteel/neutral/side{ dir = 9 @@ -24965,8 +24897,6 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /turf/open/floor/plasteel/neutral/side{ @@ -25036,8 +24966,7 @@ pixel_x = 27 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-16"; - layer = 4.1 + icon_state = "plant-16" }, /obj/item/device/radio/intercom{ freerange = 0; @@ -25158,8 +25087,6 @@ pixel_y = 25 }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/structure/extinguisher_cabinet{ @@ -26292,8 +26219,7 @@ /area/hallway/secondary/entry) "aYF" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-05"; - layer = 4.1 + icon_state = "plant-05" }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -27436,7 +27362,6 @@ "baA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/machinery/status_display{ - density = 0; pixel_y = 32; supply_display = 1 }, @@ -28225,7 +28150,6 @@ "bbS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/machinery/status_display{ - density = 0; pixel_y = 32; supply_display = 1 }, @@ -28304,8 +28228,6 @@ pixel_x = -29 }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_x = -32 }, /turf/open/floor/plasteel/neutral/corner{ @@ -29060,8 +28982,6 @@ /area/crew_quarters/heads/captain/private) "bdI" = ( /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -30251,12 +30171,9 @@ /turf/open/floor/plasteel/black, /area/aisat) "bfT" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "Engineering"; - name = "Engineering Security Doors"; - opacity = 0 + name = "Engineering Security Doors" }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -30650,7 +30567,6 @@ /area/quartermaster/sorting) "bgL" = ( /obj/machinery/status_display{ - density = 0; pixel_y = 32; supply_display = 1 }, @@ -30963,8 +30879,6 @@ /area/bridge) "bhk" = ( /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/item/folder/yellow{ @@ -31582,8 +31496,6 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = -32 }, /turf/open/floor/plasteel/black, @@ -33311,8 +33223,6 @@ "blC" = ( /obj/machinery/teleport/station, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /turf/open/floor/plasteel/vault{ @@ -33396,8 +33306,6 @@ "blK" = ( /obj/machinery/recharge_station, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/structure/cable/yellow{ @@ -33959,8 +33867,6 @@ "bmJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_x = -32 }, /obj/structure/disposalpipe/segment, @@ -34959,8 +34865,6 @@ pixel_y = 5 }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /turf/open/floor/wood, @@ -35283,12 +35187,9 @@ /turf/open/floor/plasteel, /area/engine/break_room) "bpm" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "transittube"; - name = "Transit Tube Blast Door"; - opacity = 0 + name = "Transit Tube Blast Door" }, /obj/structure/cable{ d1 = 4; @@ -36101,8 +36002,6 @@ /area/crew_quarters/heads/hop) "bqF" = ( /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /turf/open/floor/plasteel/darkblue/corner{ @@ -37005,8 +36904,6 @@ /area/ai_monitored/turret_protected/aisat_interior) "bse" = ( /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/machinery/porta_turret/ai{ @@ -37277,8 +37174,6 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = -32 }, /turf/open/floor/plasteel/neutral/corner{ @@ -37395,8 +37290,6 @@ /area/crew_quarters/heads/hop) "bsP" = ( /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/structure/bed/dogbed/ian, @@ -37941,8 +37834,7 @@ /area/hallway/secondary/entry) "btR" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-18"; - layer = 4.1 + icon_state = "plant-18" }, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -37971,8 +37863,7 @@ /area/hallway/secondary/entry) "btU" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-08"; - layer = 4.1 + icon_state = "plant-08" }, /turf/open/floor/plasteel/grimy, /area/hallway/primary/port) @@ -37984,8 +37875,7 @@ /area/hallway/primary/port) "btW" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-03"; - layer = 4.1 + icon_state = "plant-03" }, /turf/open/floor/plasteel/grimy, /area/hallway/primary/port) @@ -38602,23 +38492,17 @@ /turf/open/floor/plating, /area/engine/break_room) "bvj" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "atmos"; - name = "Atmos Blast Door"; - opacity = 0 + name = "Atmos Blast Door" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/break_room) "bvk" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "atmos"; - name = "Atmos Blast Door"; - opacity = 0 + name = "Atmos Blast Door" }, /obj/structure/cable/yellow{ d1 = 1; @@ -38632,12 +38516,9 @@ /turf/open/floor/plasteel, /area/engine/break_room) "bvl" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "atmos"; - name = "Atmos Blast Door"; - opacity = 0 + name = "Atmos Blast Door" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -38795,8 +38676,7 @@ /area/tcommsat/computer) "bvB" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-20"; - layer = 4.1 + icon_state = "plant-20" }, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -39205,8 +39085,6 @@ "bwu" = ( /obj/machinery/holopad, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/machinery/light{ @@ -39749,8 +39627,6 @@ network = list("SS13") }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = -32 }, /obj/effect/turf_decal/stripes/line, @@ -39903,8 +39779,6 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = -32 }, /turf/open/floor/plasteel/neutral/side, @@ -40124,13 +39998,10 @@ name = "Reception Window"; req_access_txt = "0" }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "hop"; layer = 3.1; - name = "privacy shutters"; - opacity = 0 + name = "privacy shutters" }, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) @@ -40397,12 +40268,9 @@ /turf/open/floor/carpet, /area/crew_quarters/theatre) "byK" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "Engineering"; - name = "Engineering Security Doors"; - opacity = 0 + name = "Engineering Security Doors" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -40496,8 +40364,6 @@ /area/engine/atmos) "byS" = ( /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/machinery/light{ @@ -40996,8 +40862,6 @@ /area/hallway/secondary/command) "bzN" = ( /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/effect/turf_decal/bot, @@ -41338,12 +41202,9 @@ /area/hallway/primary/starboard) "bAA" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "atmos"; - name = "Atmos Blast Door"; - opacity = 0 + name = "Atmos Blast Door" }, /obj/structure/cable/yellow{ d2 = 2; @@ -41521,8 +41382,6 @@ /obj/structure/table/wood, /obj/item/folder/blue, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 31 }, /obj/item/folder/blue, @@ -41866,13 +41725,10 @@ /area/hallway/primary/port) "bBH" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "council blast"; layer = 2.9; - name = "Council Blast Doors"; - opacity = 0 + name = "Council Blast Doors" }, /obj/structure/cable/yellow{ d2 = 4; @@ -41882,13 +41738,10 @@ /area/bridge) "bBI" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "council blast"; layer = 2.9; - name = "Council Blast Doors"; - opacity = 0 + name = "Council Blast Doors" }, /obj/structure/cable/yellow{ d2 = 4; @@ -41902,13 +41755,10 @@ /area/bridge) "bBJ" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "council blast"; layer = 2.9; - name = "Council Blast Doors"; - opacity = 0 + name = "Council Blast Doors" }, /obj/structure/cable/yellow{ d2 = 2; @@ -41926,13 +41776,10 @@ /area/bridge) "bBK" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "council blast"; layer = 2.9; - name = "Council Blast Doors"; - opacity = 0 + name = "Council Blast Doors" }, /obj/structure/cable/yellow{ d2 = 8; @@ -41946,13 +41793,10 @@ /area/bridge) "bBL" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "council blast"; layer = 2.9; - name = "Council Blast Doors"; - opacity = 0 + name = "Council Blast Doors" }, /obj/structure/cable/yellow{ d2 = 8; @@ -42134,8 +41978,7 @@ density = 0; icon_state = "pdoor0"; id = "atmos"; - name = "Atmos Blast Door"; - opacity = 0 + name = "Atmos Blast Door" }, /obj/machinery/door/window/northleft{ dir = 4; @@ -42147,12 +41990,9 @@ /obj/item/folder/yellow, /obj/item/pen, /obj/machinery/door/firedoor, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "atmos"; - name = "Atmos Blast Door"; - opacity = 0 + name = "Atmos Blast Door" }, /obj/effect/turf_decal/delivery, /obj/structure/cable/yellow{ @@ -42632,8 +42472,6 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, @@ -42775,8 +42613,6 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, @@ -43142,8 +42978,6 @@ icon_state = "1-2" }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_x = 32 }, /turf/open/floor/plasteel/arrival{ @@ -44119,12 +43953,9 @@ freq = 1400; location = "Atmospherics" }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "atmos"; - name = "Atmos Blast Door"; - opacity = 0 + name = "Atmos Blast Door" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -45723,8 +45554,7 @@ /area/tcommsat/server) "bJh" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) @@ -46189,8 +46019,6 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /turf/open/floor/plasteel/vault{ @@ -46555,8 +46383,7 @@ /area/aisat) "bKS" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-06"; - level = 4.1 + icon_state = "plant-06" }, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -46971,8 +46798,6 @@ "bLH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_x = -32 }, /obj/machinery/camera{ @@ -47436,8 +47261,7 @@ pixel_y = -32 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-03"; - layer = 4.1 + icon_state = "plant-03" }, /turf/open/floor/plasteel/arrival{ dir = 6 @@ -48819,9 +48643,7 @@ /turf/open/floor/plating, /area/maintenance/starboard) "bPn" = ( -/obj/machinery/atmospherics/components/trinary/filter{ - req_access = "0" - }, +/obj/machinery/atmospherics/components/trinary/filter, /turf/open/floor/plating, /area/maintenance/starboard) "bPo" = ( @@ -51167,8 +50989,6 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /turf/open/floor/plasteel/neutral/corner{ @@ -51224,8 +51044,6 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /turf/open/floor/plasteel/neutral/corner{ @@ -53237,8 +53055,7 @@ pixel_x = -27 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "applebush"; - layer = 4.1 + icon_state = "applebush" }, /turf/open/floor/plasteel/blue/corner{ dir = 8 @@ -53339,8 +53156,7 @@ pixel_x = 24 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-10"; - layer = 4.1 + icon_state = "plant-10" }, /turf/open/floor/plasteel/purple/corner{ dir = 2 @@ -54591,8 +54407,6 @@ }, /obj/item/pen, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/machinery/light/small{ @@ -56948,8 +56762,7 @@ pixel_y = -30 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-08"; - layer = 4.1 + icon_state = "plant-08" }, /turf/open/floor/plasteel/whitepurple/side{ dir = 2 @@ -60150,9 +59963,7 @@ /area/medical/medbay/central) "clo" = ( /obj/structure/bed/roller, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/whiteblue/side{ dir = 2 }, @@ -61293,8 +61104,6 @@ /area/medical/medbay/central) "cnC" = ( /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/structure/table/glass, @@ -61652,8 +61461,7 @@ /area/science/research) "coj" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-10"; - layer = 4.1 + icon_state = "plant-10" }, /turf/open/floor/plasteel/whitepurple/corner{ dir = 2 @@ -61849,9 +61657,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/white, /area/medical/surgery) "coE" = ( @@ -63401,9 +63207,7 @@ /area/medical/surgery) "cro" = ( /obj/structure/bed/roller, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/white, /area/medical/surgery) "crp" = ( @@ -63818,9 +63622,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "csc" = ( -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /obj/item/roller, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -63940,9 +63742,7 @@ /obj/structure/sign/nosmoking_2{ pixel_x = -28 }, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/whiteblue/side{ dir = 2 }, @@ -64447,8 +64247,6 @@ /area/crew_quarters/heads/hor) "ctc" = ( /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/effect/landmark/xmastree/rdrod, @@ -67423,8 +67221,6 @@ /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /turf/open/floor/plasteel/white/side{ @@ -67795,9 +67591,7 @@ /area/science/mixing) "czz" = ( /obj/machinery/atmospherics/components/trinary/filter{ - density = 0; - dir = 8; - req_access = "0" + dir = 8 }, /turf/open/floor/plasteel/white, /area/science/mixing) @@ -69972,7 +69766,6 @@ /obj/item/device/healthanalyzer, /obj/item/clothing/glasses/hud/health, /obj/structure/reagent_dispensers/virusfood{ - density = 0; pixel_y = 30 }, /obj/structure/table/glass, @@ -71162,9 +70955,7 @@ dir = 2; pixel_y = 24 }, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/whitegreen/side{ dir = 8 }, @@ -71193,7 +70984,6 @@ "cFQ" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -72818,12 +72608,8 @@ "cIA" = ( /obj/structure/bed/roller, /obj/structure/bed/roller, -/obj/machinery/iv_drip{ - density = 0 - }, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/floorgrime, /area/maintenance/aft) "cIB" = ( @@ -73499,8 +73285,7 @@ /area/science/research) "cJQ" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-10"; - layer = 4.1 + icon_state = "plant-10" }, /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 @@ -74791,8 +74576,7 @@ pixel_x = 27 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-14"; - layer = 4.1 + icon_state = "plant-14" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -75154,7 +74938,6 @@ /area/hallway/secondary/exit/departure_lounge) "cMU" = ( /obj/machinery/status_display{ - density = 0; layer = 4 }, /turf/closed/wall, @@ -76551,8 +76334,7 @@ pixel_x = -27 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-04"; - layer = 4.1 + icon_state = "plant-04" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -76621,8 +76403,7 @@ pixel_x = 29 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-16"; - layer = 4.1 + icon_state = "plant-16" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -78066,8 +77847,6 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_x = 32 }, /obj/machinery/computer/shuttle/pod{ @@ -78256,8 +78035,6 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_y = 32 }, /obj/machinery/computer/shuttle/pod{ @@ -80817,9 +80594,7 @@ req_access_txt = "0"; use_power = 0 }, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -85466,8 +85241,6 @@ "diD" = ( /obj/machinery/vending/cigarette, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/structure/sign/poster/official/random{ @@ -85692,8 +85465,7 @@ network = list("SS13") }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-24"; - layer = 4.1 + icon_state = "plant-24" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -89819,12 +89591,9 @@ /area/engine/atmos) "dBK" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "atmos"; - name = "Atmos Blast Door"; - opacity = 0 + name = "Atmos Blast Door" }, /obj/structure/cable/yellow, /turf/open/floor/plating, diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 3e53168c2e6..90e8ab96bf1 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -358,8 +358,6 @@ /area/mine/laborcamp) "bj" = ( /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /turf/open/floor/plasteel, diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 4e35173d400..12b64d970e5 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -27,10 +27,7 @@ /area/space) "aag" = ( /obj/structure/lattice, -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /turf/open/space, /area/space) "aah" = ( @@ -235,6 +232,8 @@ "aaz" = ( /obj/machinery/computer/card, /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/open/floor/plasteel/darkred/side{ @@ -374,6 +373,8 @@ "aaL" = ( /obj/machinery/computer/monitor, /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/open/floor/plasteel/darkyellow/side{ @@ -398,6 +399,8 @@ name = "command camera" }, /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/open/floor/plasteel/vault{ @@ -436,7 +439,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -493,6 +495,8 @@ name = "command camera" }, /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/open/floor/plasteel/vault{ @@ -524,6 +528,8 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/open/floor/plasteel/vault{ @@ -581,6 +587,8 @@ /area/bridge) "abb" = ( /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -698,6 +706,8 @@ dir = 10 }, /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/open/floor/plasteel/vault{ @@ -1911,7 +1921,6 @@ /area/quartermaster/storage) "adp" = ( /obj/machinery/status_display{ - density = 0; name = "cargo display"; supply_display = 1 }, @@ -2806,7 +2815,6 @@ /area/crew_quarters/heads/hop) "aeP" = ( /obj/machinery/status_display{ - density = 0; name = "cargo display"; pixel_x = -32; supply_display = 1 @@ -3028,8 +3036,7 @@ /area/crew_quarters/heads/captain/private) "afo" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/item/device/radio/intercom{ dir = 8; @@ -4526,9 +4533,7 @@ /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "ahE" = ( -/obj/machinery/computer/security/wooden_tv{ - density = 0 - }, +/obj/machinery/computer/security/wooden_tv, /obj/structure/table/wood, /obj/machinery/button/door{ id = "detectivewindows"; @@ -4600,9 +4605,7 @@ /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) "ahK" = ( -/obj/machinery/computer/security/wooden_tv{ - density = 0 - }, +/obj/machinery/computer/security/wooden_tv, /obj/structure/table/wood, /obj/machinery/button/door{ id = "captainhall"; @@ -5671,8 +5674,7 @@ dir = 10 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/machinery/camera{ c_tag = "Central Hallway North-East"; @@ -6789,8 +6791,7 @@ /area/hallway/primary/central) "alm" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/machinery/light{ dir = 8 @@ -7489,8 +7490,7 @@ }, /obj/machinery/light, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/brown, /area/quartermaster/storage) @@ -8103,8 +8103,7 @@ /area/security/brig) "anF" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/machinery/door_timer{ id = "brig2"; @@ -9990,8 +9989,7 @@ /area/security/brig) "aqP" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/machinery/firealarm{ dir = 4; @@ -10913,8 +10911,7 @@ /area/crew_quarters/bar/atrium) "ase" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) @@ -12050,7 +12047,6 @@ }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -13084,8 +13080,7 @@ pixel_x = 24 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/neutral/corner, /area/hallway/primary/central) @@ -13794,8 +13789,7 @@ pixel_y = 32 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -15815,7 +15809,6 @@ "aBl" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -16918,7 +16911,6 @@ "aDm" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -17035,8 +17027,7 @@ /area/hallway/primary/central) "aDB" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/caution{ dir = 5 @@ -17683,8 +17674,7 @@ /area/crew_quarters/dorms) "aEL" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/machinery/status_display{ pixel_y = -32 @@ -18988,6 +18978,8 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/open/floor/plasteel/neutral/corner{ @@ -19032,8 +19024,7 @@ req_access_txt = "10" }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -19605,8 +19596,7 @@ /area/crew_quarters/bar/atrium) "aHU" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/structure/sign/poster/random{ pixel_x = 32 @@ -19653,8 +19643,7 @@ /area/hallway/primary/central) "aHZ" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -20303,7 +20292,6 @@ "aJg" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -21900,8 +21888,7 @@ icon_state = "1-4" }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/yellow/side{ dir = 4 @@ -22140,8 +22127,7 @@ /area/hallway/primary/central) "aMz" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/brown{ dir = 8 @@ -23144,8 +23130,7 @@ /area/hallway/primary/central) "aOm" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/redyellow/side{ dir = 9 @@ -24270,8 +24255,7 @@ /area/hallway/primary/central) "aPX" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -24545,8 +24529,7 @@ /area/hallway/primary/central) "aQA" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/machinery/newscaster{ pixel_y = -32 @@ -25370,8 +25353,7 @@ icon_state = "0-2" }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/machinery/camera{ c_tag = "Chemistry"; @@ -27606,7 +27588,6 @@ "aWR" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -27877,8 +27858,7 @@ /area/medical/medbay/zone3) "aXu" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/machinery/button/door{ desc = "A remote control switch for the medbay foyer."; @@ -28401,8 +28381,7 @@ /area/science/research) "aYp" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/structure/extinguisher_cabinet{ pixel_x = 24 @@ -30110,8 +30089,7 @@ /area/medical/medbay/zone3) "bbs" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/whiteblue/corner, /area/medical/medbay/zone3) @@ -32043,6 +32021,8 @@ /area/maintenance/port) "beX" = ( /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -32986,7 +32966,6 @@ "bgy" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -33653,7 +33632,6 @@ "bhL" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -33741,7 +33719,6 @@ "bhU" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -35088,7 +35065,6 @@ "bkq" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -35109,7 +35085,6 @@ "bks" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -35199,7 +35174,6 @@ "bkE" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -35221,7 +35195,6 @@ "bkH" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -35247,7 +35220,6 @@ "bkK" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -35521,6 +35493,8 @@ network = list("SS13") }, /obj/structure/cable/white{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /turf/open/floor/plasteel/neutral/corner{ @@ -35764,8 +35738,7 @@ dir = 1 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) @@ -35796,8 +35769,7 @@ /area/hallway/secondary/exit) "bmw" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) @@ -37374,6 +37346,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/bot, /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/open/floor/plasteel, @@ -37441,8 +37415,7 @@ dir = 4 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/structure/cable/white{ d1 = 4; @@ -37466,6 +37439,8 @@ dir = 4 }, /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/open/floor/plasteel, @@ -37475,6 +37450,8 @@ dir = 4 }, /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/open/floor/plasteel, @@ -37484,6 +37461,8 @@ dir = 4 }, /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/open/floor/plasteel, @@ -37493,6 +37472,8 @@ dir = 4 }, /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/open/floor/plasteel, @@ -37517,6 +37498,8 @@ dir = 4 }, /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/open/floor/plasteel, @@ -37526,6 +37509,8 @@ dir = 4 }, /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/open/floor/plasteel, @@ -37635,6 +37620,8 @@ /area/hallway/secondary/exit) "bsU" = ( /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/open/floor/plasteel, @@ -37650,6 +37637,8 @@ /area/hallway/secondary/exit) "bsW" = ( /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/open/floor/plasteel, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index db85b3ba568..f431805fd91 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -2168,9 +2168,7 @@ /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/aisat_interior) "afe" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-09"; - name = "Photosynthetic Potted plant"; +/obj/item/twohanded/required/kirbyplants/photosynthetic{ pixel_y = 10 }, /obj/structure/cable/yellow{ @@ -2198,9 +2196,7 @@ }, /area/ai_monitored/turret_protected/aisat_interior) "afg" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-09"; - name = "Photosynthetic Potted plant"; +/obj/item/twohanded/required/kirbyplants/photosynthetic{ pixel_y = 10 }, /obj/structure/cable/yellow{ @@ -4069,8 +4065,6 @@ "ajo" = ( /obj/machinery/vending/coffee, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /turf/open/floor/plasteel/red/side{ @@ -4408,8 +4402,6 @@ /obj/structure/table/wood, /obj/machinery/recharger, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/machinery/light{ @@ -4710,9 +4702,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/whitered/side{ dir = 5 }, @@ -6577,8 +6567,6 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_x = -32 }, /turf/open/floor/mineral/titanium/blue, @@ -6591,8 +6579,6 @@ dir = 8 }, /obj/machinery/status_display{ - density = 0; - layer = 3; pixel_x = 32 }, /turf/open/floor/mineral/titanium/blue, @@ -7478,12 +7464,9 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "bridgespace"; - name = "bridge external shutters"; - opacity = 0 + name = "bridge external shutters" }, /turf/open/floor/plating, /area/bridge) @@ -7942,8 +7925,6 @@ /area/bridge) "arK" = ( /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/item/folder/yellow{ @@ -9397,22 +9378,16 @@ /turf/open/floor/plating, /area/maintenance/fore) "auK" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "bridgespace"; - name = "bridge external shutters"; - opacity = 0 + name = "bridge external shutters" }, /turf/open/floor/plasteel/black, /area/bridge) "auL" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "bridgespace"; - name = "bridge external shutters"; - opacity = 0 + name = "bridge external shutters" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/black, @@ -10197,8 +10172,6 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /turf/open/floor/plasteel/arrival{ @@ -10232,8 +10205,7 @@ /area/crew_quarters/fitness/recreation) "awC" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-05"; - layer = 4.1 + icon_state = "plant-05" }, /obj/machinery/power/apc{ dir = 1; @@ -10555,12 +10527,9 @@ /area/bridge) "axf" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "bridgespace"; - name = "bridge external shutters"; - opacity = 0 + name = "bridge external shutters" }, /turf/open/floor/plasteel/vault{ dir = 8 @@ -10720,8 +10689,7 @@ /area/security/brig) "axF" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-10"; - layer = 4.1 + icon_state = "plant-10" }, /turf/open/floor/plasteel, /area/hallway/primary/fore) @@ -10916,12 +10884,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "bridgespace"; - name = "bridge external shutters"; - opacity = 0 + name = "bridge external shutters" }, /turf/open/floor/plasteel/vault{ dir = 8 @@ -11946,8 +11911,7 @@ /area/hallway/primary/fore) "aAo" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-14"; - layer = 4.1 + icon_state = "plant-14" }, /turf/open/floor/plasteel/red/side{ dir = 4 @@ -12287,7 +12251,6 @@ }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-20"; - layer = 4.1; pixel_y = 3 }, /turf/open/floor/plasteel/black, @@ -12479,8 +12442,6 @@ /area/crew_quarters/heads/hop) "aBF" = ( /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /obj/structure/bed/dogbed/ian, @@ -12627,8 +12588,7 @@ /area/crew_quarters/fitness/recreation) "aBY" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-05"; - layer = 4.1 + icon_state = "plant-05" }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) @@ -12739,7 +12699,6 @@ /obj/structure/table/wood, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-18"; - layer = 4.1; pixel_y = 12 }, /turf/open/floor/plasteel/grimy, @@ -13831,7 +13790,6 @@ pixel_y = 9 }, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ - pixel_y = 0 }, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ pixel_x = 7; @@ -14052,8 +14010,7 @@ /area/crew_quarters/heads/hop) "aEM" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-24"; - layer = 4.1 + icon_state = "plant-24" }, /obj/structure/cable{ d1 = 1; @@ -14377,13 +14334,10 @@ name = "Reception Window"; req_access_txt = "0" }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "hop"; layer = 3.1; - name = "privacy shutters"; - opacity = 0 + name = "privacy shutters" }, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) @@ -14688,13 +14642,8 @@ }, /area/crew_quarters/heads/captain) "aGn" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-09"; - layer = 3.1; - light_color = "#2cb2e8"; - light_range = 3; - name = "Photosynthetic Potted plant"; - pixel_y = 0 +/obj/item/twohanded/required/kirbyplants/photosynthetic{ + layer = 3.1 }, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, @@ -14974,7 +14923,6 @@ "aHa" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_y = 3 }, /turf/open/floor/plasteel/vault{ @@ -15710,8 +15658,6 @@ "aID" = ( /obj/structure/chair, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 30 }, /turf/open/floor/plasteel/red/side{ @@ -16584,8 +16530,7 @@ /area/hallway/primary/central) "aKg" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-04"; - layer = 4.1 + icon_state = "plant-04" }, /turf/open/floor/plasteel/white/corner{ tag = "icon-whitecorner (EAST)"; @@ -17241,8 +17186,7 @@ pixel_y = 22 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-14"; - layer = 4.1 + icon_state = "plant-14" }, /turf/open/floor/plasteel, /area/teleporter) @@ -17377,8 +17321,6 @@ }, /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 30; supply_display = 1 }, @@ -17421,9 +17363,7 @@ dir = 4; id = "packageSort2" }, -/obj/structure/plasticflaps{ - opacity = 0 - }, +/obj/structure/plasticflaps, /obj/machinery/light/small{ dir = 1 }, @@ -17642,8 +17582,7 @@ /area/shuttle/escape) "aMK" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-10"; - layer = 4.1 + icon_state = "plant-10" }, /turf/open/floor/plasteel/escape{ dir = 9 @@ -17684,7 +17623,6 @@ "aMP" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_y = 3 }, /obj/structure/extinguisher_cabinet{ @@ -18363,8 +18301,7 @@ /area/hallway/secondary/exit/departure_lounge) "aOr" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-16"; - layer = 4.1 + icon_state = "plant-16" }, /obj/machinery/firealarm{ dir = 1; @@ -20652,8 +20589,6 @@ id = "QMLoad" }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 30; supply_display = 1 }, @@ -21654,7 +21589,6 @@ id = "barshutters"; name = "Bar Lockdown"; pixel_x = 28; - pixel_y = 0; req_access_txt = "28" }, /obj/item/device/radio/intercom{ @@ -22358,8 +22292,7 @@ /area/hallway/secondary/exit/departure_lounge) "aWL" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-14"; - layer = 4.1 + icon_state = "plant-14" }, /turf/open/floor/plasteel/escape{ dir = 6 @@ -22761,7 +22694,6 @@ "aXD" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_y = 3 }, /turf/open/floor/plasteel/escape{ @@ -22777,8 +22709,7 @@ /area/hallway/secondary/exit/departure_lounge) "aXF" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-10"; - layer = 4.1 + icon_state = "plant-10" }, /obj/structure/extinguisher_cabinet{ pixel_x = 27 @@ -22809,13 +22740,10 @@ name = "Security Checkpoint"; req_access_txt = "1" }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "papersplease"; layer = 3.1; - name = "privacy shutters"; - opacity = 0 + name = "privacy shutters" }, /obj/item/folder/red, /obj/item/pen, @@ -22981,7 +22909,6 @@ /obj/structure/table/reinforced, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-18"; - layer = 4.1; pixel_y = 10 }, /turf/open/floor/plasteel/darkred/side{ @@ -23015,7 +22942,6 @@ /obj/structure/disposalpipe/segment, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-18"; - layer = 4.1; pixel_y = 10 }, /turf/open/floor/plasteel/darkred/side{ @@ -23375,8 +23301,7 @@ /area/crew_quarters/kitchen) "aYY" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-05"; - layer = 4.1 + icon_state = "plant-05" }, /turf/open/floor/plasteel/black, /area/crew_quarters/bar) @@ -24364,8 +24289,7 @@ /area/hydroponics) "bbd" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-10"; - layer = 4.1 + icon_state = "plant-10" }, /turf/open/floor/plasteel/green/corner, /area/hydroponics) @@ -24694,13 +24618,10 @@ req_access_txt = "1" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; +/obj/machinery/door/poddoor/preopen{ id = "papersplease"; layer = 3.1; - name = "privacy shutters"; - opacity = 0 + name = "privacy shutters" }, /obj/item/crowbar, /obj/effect/turf_decal/delivery, @@ -26181,8 +26102,7 @@ /area/hallway/primary/central) "bfp" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/machinery/button/door{ id = "kitchenwindowshutters"; @@ -26265,8 +26185,6 @@ d2 = 2 }, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 30 }, /turf/open/floor/plasteel/black, @@ -26683,8 +26601,7 @@ /area/crew_quarters/bar) "bgv" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-14"; - layer = 4.1 + icon_state = "plant-14" }, /turf/open/floor/plasteel/neutral/corner{ dir = 4 @@ -27868,8 +27785,7 @@ /area/hallway/primary/central) "biQ" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-05"; - layer = 4.1 + icon_state = "plant-05" }, /turf/open/floor/plasteel/blue/side, /area/hallway/primary/central) @@ -27880,8 +27796,7 @@ dir = 1 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-05"; - layer = 4.1 + icon_state = "plant-05" }, /turf/open/floor/plasteel/blue/corner{ dir = 8 @@ -27974,8 +27889,7 @@ /area/medical/medbay/central) "bji" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-10"; - layer = 4.1 + icon_state = "plant-10" }, /turf/open/floor/plasteel/blue/side, /area/hallway/primary/central) @@ -27999,8 +27913,7 @@ /area/hallway/primary/central) "bjn" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-10"; - layer = 4.1 + icon_state = "plant-10" }, /turf/open/floor/plasteel/purple/side, /area/hallway/primary/central) @@ -28989,7 +28902,6 @@ "blM" = ( /obj/machinery/r_n_d/server/core, /obj/structure/sign/poster/random{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/circuit/telecomms/server, @@ -29000,7 +28912,6 @@ light_color = "#c1caff" }, /obj/structure/sign/poster/random{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/black/telecomms/server/walkway, @@ -29008,7 +28919,6 @@ "blO" = ( /obj/machinery/r_n_d/server/robotics, /obj/structure/sign/poster/random{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/circuit/telecomms/server, @@ -29331,8 +29241,7 @@ /area/security/checkpoint/medical) "bmw" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-05"; - layer = 4.1 + icon_state = "plant-05" }, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 @@ -29731,8 +29640,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/firealarm{ dir = 8; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/structure/table, /obj/item/storage/box/gloves{ @@ -29984,8 +29892,7 @@ /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel/whitepurple/side{ dir = 1 @@ -30305,8 +30212,7 @@ }, /obj/machinery/light, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-10"; - layer = 4.1 + icon_state = "plant-10" }, /turf/open/floor/plasteel/vault{ dir = 8 @@ -30561,8 +30467,7 @@ frequency = 1485; listening = 1; name = "Station Intercom (Medbay)"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /turf/open/floor/plasteel/blue, /area/medical/genetics) @@ -30837,8 +30742,7 @@ "bqa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/sign/directions/engineering{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/yellow/corner{ dir = 4 @@ -33072,9 +32976,7 @@ /area/science/robotics/lab) "buw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-07"; - name = "Photosynthetic Potted plant"; +/obj/item/twohanded/required/kirbyplants/photosynthetic{ pixel_y = 10 }, /turf/open/floor/plasteel/darkpurple/side{ @@ -33091,9 +32993,7 @@ /turf/open/floor/plasteel/black, /area/science/server) "buy" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-07"; - name = "Photosynthetic Potted plant"; +/obj/item/twohanded/required/kirbyplants/photosynthetic{ pixel_y = 10 }, /turf/open/floor/plasteel/darkpurple/side{ @@ -33136,8 +33036,7 @@ dir = 8 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-14"; - layer = 4.1 + icon_state = "plant-14" }, /turf/open/floor/plasteel/white, /area/science/xenobiology) @@ -33809,7 +33708,6 @@ dir = 1 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = 30 }, /turf/open/floor/plasteel/darkpurple/side{ @@ -33852,8 +33750,7 @@ /area/science/research) "bvU" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-18"; - layer = 4.1 + icon_state = "plant-18" }, /turf/open/floor/plasteel/darkpurple/side{ dir = 1 @@ -34295,9 +34192,7 @@ dir = 4 }, /obj/structure/bed/roller, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/whiteblue/corner, /area/medical/medbay/central) "bwQ" = ( @@ -35489,9 +35384,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-09"; - name = "Photosynthetic Potted plant"; +/obj/item/twohanded/required/kirbyplants/photosynthetic{ pixel_y = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -35867,8 +35760,7 @@ dir = 8; name = "Monastery Monitor"; network = list("Monastery"); - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/plasteel/black, /area/hallway/secondary/entry) @@ -35965,8 +35857,7 @@ dir = 5 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-10"; - layer = 4.1 + icon_state = "plant-10" }, /turf/open/floor/plasteel/whitegreen/side, /area/medical/medbay/zone3) @@ -36112,8 +36003,7 @@ /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /obj/machinery/keycard_auth{ - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/cmo, /area/crew_quarters/heads/cmo) @@ -36766,7 +36656,6 @@ "bBB" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-20"; - layer = 4.1; pixel_y = 3 }, /turf/open/floor/plasteel/vault{ @@ -38201,8 +38090,7 @@ /area/crew_quarters/heads/cmo) "bEH" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-16"; - layer = 4.1 + icon_state = "plant-16" }, /turf/open/floor/plasteel/cmo, /area/crew_quarters/heads/cmo) @@ -38321,8 +38209,7 @@ /area/hallway/primary/aft) "bEQ" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-03"; - layer = 4.1 + icon_state = "plant-03" }, /turf/open/floor/plasteel/vault{ dir = 8 @@ -38366,7 +38253,6 @@ /obj/item/pen, /obj/item/stamp/rd, /obj/machinery/status_display{ - density = 0; pixel_y = -30; supply_display = 0 }, @@ -39395,8 +39281,6 @@ "bHc" = ( /obj/machinery/computer/med_data, /obj/machinery/status_display{ - density = 0; - layer = 4; pixel_y = 32 }, /turf/open/floor/plasteel/freezer, @@ -39608,7 +39492,6 @@ /obj/machinery/button/door{ id = "toxvent"; name = "Aft Vent Control"; - pixel_x = 0; pixel_y = -24; req_access_txt = "0"; req_one_access_txt = "8;24" @@ -39806,7 +39689,6 @@ frequency = 1485; listening = 1; name = "Station Intercom (Medbay)"; - pixel_x = 0; pixel_y = 28 }, /turf/open/floor/plasteel/whitegreen/side{ @@ -40605,7 +40487,6 @@ }, /obj/machinery/space_heater, /obj/structure/sign/poster/random{ - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/plasteel/green/side, @@ -40626,7 +40507,6 @@ pixel_x = 32 }, /obj/structure/sign/poster/random{ - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/plasteel/green/side{ @@ -40976,9 +40856,7 @@ /area/medical/medbay/central) "bKB" = ( /obj/structure/bed/roller, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/freezer, /area/medical/surgery) "bKC" = ( @@ -41555,8 +41433,7 @@ /area/hallway/primary/aft) "bLT" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "applebush"; - layer = 4.1 + icon_state = "applebush" }, /obj/machinery/airalarm{ pixel_y = 22 @@ -41904,7 +41781,6 @@ }, /obj/item/storage/box/syringes, /obj/structure/reagent_dispensers/virusfood{ - density = 0; pixel_x = 32 }, /obj/item/reagent_containers/spray/cleaner, @@ -46899,7 +46775,6 @@ dir = 1; name = "Auxillary Base Monitor"; network = list("AuxBase"); - pixel_x = 0; pixel_y = -28 }, /obj/machinery/computer/shuttle/mining, @@ -48289,8 +48164,7 @@ dir = 4; name = "turbine vent monitor"; network = list("Turbine"); - pixel_x = -29; - pixel_y = 0 + pixel_x = -29 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -48778,7 +48652,6 @@ /obj/structure/table/wood, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-18"; - layer = 4.1; pixel_y = 8 }, /obj/machinery/camera{ @@ -49467,7 +49340,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plating, @@ -49574,8 +49446,7 @@ /area/chapel/main/monastery) "cdz" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-08"; - layer = 4.1 + icon_state = "plant-08" }, /turf/open/floor/plasteel/chapel{ dir = 4 @@ -50089,8 +49960,7 @@ /area/chapel/main/monastery) "ceK" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-08"; - layer = 4.1 + icon_state = "plant-08" }, /turf/open/floor/plasteel/black, /area/chapel/main/monastery) @@ -54120,7 +53990,6 @@ /obj/machinery/button/door{ id = "barshutters"; name = "Bar Lockdown"; - pixel_x = 0; pixel_y = 26; req_access_txt = "28" }, @@ -55113,7 +54982,6 @@ /obj/structure/table/wood, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-18"; - layer = 4.1; pixel_y = 8 }, /turf/open/floor/carpet, @@ -55688,8 +55556,7 @@ dir = 8 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-10"; - layer = 4.1 + icon_state = "plant-10" }, /turf/open/floor/plasteel/black, /area/chapel/main/monastery) @@ -55754,8 +55621,7 @@ dir = 4 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/black, /area/chapel/main/monastery) @@ -56447,8 +56313,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/black, /area/chapel/main/monastery) @@ -56554,8 +56419,7 @@ /area/chapel/main/monastery) "cvM" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-10"; - layer = 4.1 + icon_state = "plant-10" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -57881,7 +57745,6 @@ /obj/structure/table/wood, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-05"; - layer = 4.1; pixel_y = 10 }, /turf/open/floor/plasteel/vault{ @@ -57926,7 +57789,6 @@ /obj/structure/table/wood, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-05"; - layer = 4.1; pixel_y = 10 }, /turf/open/floor/plasteel/vault{ diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index b6c0b13a53d..1a0434c7bbe 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -66,7 +66,6 @@ }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-05"; - layer = 4.1; pixel_y = 4 }, /turf/open/floor/holofloor{ @@ -292,7 +291,6 @@ /obj/structure/table/wood, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-05"; - layer = 4.1; pixel_y = 10 }, /turf/open/floor/holofloor{ @@ -415,14 +413,14 @@ /obj/structure/table/glass, /obj/item/surgicaldrill, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "br" = ( /obj/structure/table/glass, /obj/item/hemostat, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "bs" = ( @@ -432,14 +430,14 @@ }, /obj/item/circular_saw, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "bt" = ( /obj/structure/table/glass, /obj/item/retractor, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "bu" = ( @@ -447,7 +445,7 @@ /obj/item/stack/medical/gauze, /obj/item/cautery, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "bv" = ( @@ -528,7 +526,7 @@ /obj/item/surgical_drapes, /obj/item/razor, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "bJ" = ( @@ -538,7 +536,7 @@ /area/holodeck/rec_center/medical) "bK" = ( /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "bL" = ( @@ -604,19 +602,19 @@ /area/holodeck/rec_center/pet_lounge) "bX" = ( /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "bZ" = ( /obj/structure/table/optable, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "ca" = ( /obj/machinery/computer/operating, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "cb" = ( @@ -625,7 +623,7 @@ /obj/item/clothing/suit/apron/surgical, /obj/item/clothing/mask/surgical, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "cc" = ( @@ -668,7 +666,7 @@ dir = 1 }, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "cj" = ( @@ -680,12 +678,12 @@ /obj/structure/table/glass, /obj/machinery/reagentgrinder, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "cl" = ( /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "cm" = ( @@ -696,13 +694,13 @@ }, /obj/item/storage/box/beakers, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "cn" = ( /obj/machinery/washing_machine, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "co" = ( @@ -776,25 +774,25 @@ "cy" = ( /obj/machinery/chem_master, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "cz" = ( /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "cA" = ( /obj/structure/table/glass, /obj/item/device/healthanalyzer, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "cB" = ( /obj/structure/closet/wardrobe/white, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "cC" = ( @@ -910,7 +908,7 @@ dir = 1 }, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "cW" = ( @@ -923,7 +921,7 @@ dir = 1 }, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "cX" = ( @@ -932,7 +930,7 @@ }, /obj/machinery/computer/pandemic, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "cY" = ( @@ -964,7 +962,7 @@ /area/holodeck/rec_center/pet_lounge) "de" = ( /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "df" = ( @@ -976,12 +974,12 @@ "dg" = ( /obj/machinery/door/window/westleft, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "dh" = ( /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "di" = ( @@ -990,11 +988,9 @@ "dj" = ( /obj/structure/bed, /obj/item/bedsheet/medical, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "dk" = ( @@ -1003,11 +999,9 @@ }, /obj/structure/bed, /obj/item/bedsheet/medical, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "dl" = ( @@ -1018,15 +1012,13 @@ dir = 1 }, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "dm" = ( -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "dn" = ( @@ -1034,7 +1026,7 @@ dir = 1 }, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/medical) "do" = ( @@ -1228,7 +1220,7 @@ dir = 8 }, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/firingrange) "dR" = ( @@ -1236,7 +1228,7 @@ dir = 1 }, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/firingrange) "dS" = ( @@ -1247,7 +1239,7 @@ dir = 4 }, /turf/open/floor/holofloor{ - icon_state = "white"; + icon_state = "white" }, /area/holodeck/rec_center/firingrange) "dT" = ( @@ -2923,7 +2915,6 @@ /area/centcom/control) "iQ" = ( /obj/machinery/status_display{ - density = 0; name = "cargo display"; supply_display = 1 }, @@ -3508,8 +3499,7 @@ /area/centcom/control) "kh" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/vault{ dir = 8 @@ -3664,8 +3654,7 @@ dir = 4 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/grimy, /area/centcom/control) @@ -3716,8 +3705,7 @@ dir = 8 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/grimy, /area/centcom/control) @@ -4067,8 +4055,7 @@ /area/centcom/control) "ly" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/machinery/firealarm{ dir = 1; @@ -4208,7 +4195,6 @@ "lS" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -4877,7 +4863,6 @@ "nz" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -5121,8 +5106,7 @@ /area/centcom/ferry) "oe" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/machinery/light{ dir = 4 @@ -5440,8 +5424,7 @@ /area/centcom/ferry) "oM" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/wood, /area/centcom/ferry) @@ -5882,8 +5865,7 @@ /area/centcom/ferry) "pQ" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/machinery/light{ dir = 1 @@ -5923,6 +5905,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ + d2 = 4; icon_state = "0-4" }, /obj/effect/turf_decal/stripes/line, @@ -5960,6 +5943,7 @@ icon_state = "0-2" }, /obj/structure/cable/white{ + d2 = 8; icon_state = "0-8" }, /obj/effect/turf_decal/stripes/line, @@ -6024,8 +6008,7 @@ /area/centcom/control) "qd" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/structure/extinguisher_cabinet{ pixel_x = -24 @@ -6228,6 +6211,8 @@ dir = 4 }, /obj/structure/cable/white{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /turf/open/floor/wood, @@ -6240,6 +6225,8 @@ dir = 4 }, /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/open/floor/plasteel/vault{ @@ -6252,6 +6239,8 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/open/floor/plasteel/grimy, @@ -6261,6 +6250,8 @@ dir = 4 }, /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/open/floor/plasteel/grimy, @@ -6274,6 +6265,8 @@ dir = 4 }, /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ @@ -6287,9 +6280,13 @@ }, /obj/machinery/meter, /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/cable/white{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /turf/open/floor/plasteel/vault{ @@ -6304,9 +6301,11 @@ dir = 1 }, /obj/structure/cable/white{ + d2 = 8; icon_state = "0-8" }, /obj/structure/cable/white{ + d2 = 4; icon_state = "0-4" }, /obj/structure/cable/white{ @@ -6323,12 +6322,18 @@ }, /obj/machinery/meter, /obj/structure/cable/white{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/cable/white{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /turf/open/floor/plasteel/vault{ @@ -6615,6 +6620,8 @@ dir = 4 }, /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/open/floor/wood, @@ -6662,6 +6669,8 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/portable_atmospherics/canister/air, /obj/structure/cable/white{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/effect/turf_decal/stripes/line{ @@ -6676,9 +6685,13 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/cable/white{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/effect/turf_decal/stripes/line{ @@ -6696,6 +6709,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/effect/turf_decal/stripes/line{ @@ -6783,8 +6798,7 @@ /area/centcom/control) "rQ" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/green/corner{ dir = 4 @@ -6804,8 +6818,7 @@ /area/centcom/control) "rT" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -6969,6 +6982,8 @@ /area/centcom/ferry) "sn" = ( /obj/structure/cable/white{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/open/floor/wood, @@ -7163,8 +7178,7 @@ /area/centcom/ferry) "sN" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/vault{ dir = 10 @@ -7894,8 +7908,7 @@ /area/centcom/ferry) "uG" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -7933,8 +7946,7 @@ /area/centcom/control) "uN" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/green/side{ dir = 8 @@ -7942,8 +7954,7 @@ /area/centcom/control) "uO" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/green/side{ dir = 4 @@ -8343,8 +8354,7 @@ /area/centcom/ferry) "vU" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/vault{ dir = 8 @@ -8695,8 +8705,7 @@ /area/centcom/ferry) "wP" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/red/corner{ dir = 8 @@ -8870,8 +8879,7 @@ /area/centcom/evac) "xt" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -9268,8 +9276,7 @@ /area/centcom/ferry) "ym" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/structure/extinguisher_cabinet{ pixel_y = -32 @@ -9516,8 +9523,7 @@ /area/centcom/evac) "yL" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/structure/extinguisher_cabinet{ pixel_x = -24 @@ -9777,8 +9783,7 @@ /area/centcom/control) "zq" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/green/corner{ dir = 8 @@ -10259,8 +10264,7 @@ /area/tdome/tdomeobserve) "AK" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/green/corner, /area/tdome/tdomeobserve) @@ -10337,8 +10341,7 @@ /area/tdome/tdomeobserve) "AW" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/red/corner, /area/tdome/tdomeobserve) @@ -10390,8 +10393,7 @@ /area/tdome/tdomeobserve) "Bg" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/green/corner{ dir = 8 @@ -10502,8 +10504,7 @@ /area/tdome/tdomeobserve) "Bw" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/red/corner{ dir = 1 @@ -10511,8 +10512,7 @@ /area/tdome/tdomeobserve) "Bx" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/red/side{ dir = 10 @@ -10542,8 +10542,7 @@ /area/tdome/tdomeobserve) "BD" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/green/side{ dir = 6 @@ -10551,8 +10550,7 @@ /area/tdome/tdomeobserve) "BE" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/green/corner{ dir = 4 @@ -11259,8 +11257,7 @@ /area/tdome/tdomeobserve) "Dl" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/neutral/corner, /area/tdome/tdomeobserve) @@ -11313,8 +11310,7 @@ /area/tdome/tdomeobserve) "Ds" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/neutral/corner{ dir = 8; @@ -11932,8 +11928,7 @@ /area/tdome/tdomeadmin) "Fd" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/machinery/firealarm{ dir = 8; @@ -11953,8 +11948,7 @@ /area/tdome/tdomeadmin) "Fg" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/vault{ dir = 8 diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm index 19b6a85ea94..ed55f33322e 100644 --- a/_maps/shuttles/emergency_bar.dmm +++ b/_maps/shuttles/emergency_bar.dmm @@ -148,7 +148,6 @@ }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -307,7 +306,6 @@ "bc" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -480,7 +478,6 @@ "bG" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, diff --git a/_maps/shuttles/emergency_birdboat.dmm b/_maps/shuttles/emergency_birdboat.dmm index 76df9030029..aefccced65f 100644 --- a/_maps/shuttles/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency_birdboat.dmm @@ -144,8 +144,7 @@ /area/shuttle/escape) "aB" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index 90d205d88e5..8a280916e2e 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -680,8 +680,7 @@ /area/shuttle/escape) "ca" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel, /area/shuttle/escape) @@ -703,8 +702,7 @@ dir = 4 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm index 35ed87fb24d..6ed6c2619b4 100644 --- a/_maps/shuttles/emergency_delta.dmm +++ b/_maps/shuttles/emergency_delta.dmm @@ -153,7 +153,6 @@ "an" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -168,7 +167,6 @@ "ap" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -689,8 +687,7 @@ /area/shuttle/escape) "bz" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /obj/machinery/button/flasher{ id = "shuttleflash"; @@ -703,8 +700,7 @@ /area/shuttle/escape) "bA" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - layer = 4.1 + icon_state = "plant-21" }, /turf/open/floor/plasteel/neutral/corner{ dir = 4 @@ -883,7 +879,6 @@ "cb" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -1050,7 +1045,6 @@ "cA" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -1083,7 +1077,6 @@ "cE" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm index e6ab6ef49de..cffad6bf584 100644 --- a/_maps/shuttles/emergency_luxury.dmm +++ b/_maps/shuttles/emergency_luxury.dmm @@ -304,7 +304,6 @@ "bg" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -359,7 +358,6 @@ "bp" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, @@ -369,7 +367,6 @@ "bq" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; - layer = 4.1; pixel_x = -3; pixel_y = 3 }, diff --git a/_maps/shuttles/ferry_lighthouse.dmm b/_maps/shuttles/ferry_lighthouse.dmm index 87f3d30e0e4..a1707145430 100644 --- a/_maps/shuttles/ferry_lighthouse.dmm +++ b/_maps/shuttles/ferry_lighthouse.dmm @@ -46,10 +46,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/transport) "am" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /turf/open/floor/plating/airless, /area/shuttle/transport) "an" = ( @@ -114,10 +111,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/transport) "aB" = ( -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, +/obj/structure/grille/broken, /obj/structure/window/fulltile, /turf/open/floor/mineral/titanium/blue, /area/shuttle/transport) diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index 7ac0a05c541..046f6999116 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -1478,9 +1478,7 @@ req_access_txt = "0"; use_power = 0 }, -/obj/machinery/iv_drip{ - density = 0 - }, +/obj/machinery/iv_drip, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 51e53e37d13..f3b34ffc967 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -300,6 +300,13 @@ desc = "A gift from the botanical staff, presented after the RD's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..." icon_state = "plant-25" +/obj/item/twohanded/required/kirbyplants/photosynthetic + name = "photosynthetic potted plant" + desc = "A bioluminescent plant." + icon_state = "plant-09" + light_color = "#2cb2e8" + light_range = 3 + //a rock is flora according to where the icon file is //and now these defines diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 1364766f446..67d15f7240e 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -175,4 +175,5 @@ desc = "A dispenser of low-potency virus mutagenic." icon_state = "virus_food" anchored = TRUE + density = FALSE reagent_id = "virusfood" \ No newline at end of file