[MIRROR] Varedit cleanup mk4 (#2833)

* Varedit cleanup mk4 (#30794)

* Cleans up and corrects a bunch of varedits

* Plant varedits

* More layers

* Adjusted plant name/description

* Varedit cleanup mk4

_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

_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" = (

_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;

_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;

_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

_maps/RandomZLevels/snowdin.dmm

@@ -3909,10 +3909,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';

_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;

_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,
@@ -56052,8 +56011,6 @@
 	dir = 8
 	},
 /obj/machinery/status_display{
-	density = 0;
-	layer = 3;
 	pixel_y = 32
 	},
 /turf/open/floor/mineral/titanium/blue,
@@ -56982,8 +56939,6 @@
 	dir = 4
 	},
 /obj/machinery/status_display{
-	density = 0;
-	layer = 3;
 	pixel_y = 32
 	},
 /turf/open/floor/mineral/titanium/blue,

_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
@@ -46749,9 +46734,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";
@@ -58758,9 +58741,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{
@@ -64260,8 +64241,6 @@
 	dir = 1
 	},
 /obj/machinery/status_display{
-	density = 0;
-	layer = 4;
 	pixel_y = 32
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -68491,8 +68470,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
@@ -70025,6 +70003,8 @@
 /area/maintenance/port)
 "cEW" = (
 /obj/structure/cable/white{
+	d1 = 4;
+	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -71405,9 +71385,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
 	},
@@ -78902,6 +78880,8 @@
 	dir = 8
 	},
 /obj/structure/cable/white{
+	d1 = 4;
+	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/open/floor/plating,
@@ -79635,9 +79615,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)
@@ -79658,9 +79636,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
@@ -81002,6 +80978,8 @@
 /area/maintenance/port)
 "daZ" = (
 /obj/structure/cable/white{
+	d1 = 4;
+	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -81025,6 +81003,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{
@@ -81046,6 +81026,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{
@@ -81609,9 +81591,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)
@@ -83367,9 +83347,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
@@ -94045,9 +94023,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
@@ -98139,6 +98115,7 @@
 /area/security/checkpoint/customs)
 "dJd" = (
 /obj/structure/cable/white{
+	d2 = 2;
 	icon_state = "0-2"
 	},
 /obj/effect/spawner/structure/window/reinforced,
@@ -98723,6 +98700,7 @@
 /area/medical/virology)
 "dKq" = (
 /obj/structure/cable/white{
+	d2 = 2;
 	icon_state = "0-2"
 	},
 /obj/effect/spawner/structure/window/reinforced,
@@ -98805,9 +98783,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,
@@ -105598,10 +105574,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" = (
@@ -105930,6 +105903,7 @@
 /area/security/checkpoint/checkpoint2)
 "dYE" = (
 /obj/structure/cable/white{
+	d2 = 2;
 	icon_state = "0-2"
 	},
 /obj/effect/spawner/structure/window/reinforced,
@@ -109670,24 +109644,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,
@@ -109793,6 +109775,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,
@@ -109816,6 +109800,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{

_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,

_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{
@@ -1927,7 +1937,6 @@
 /area/quartermaster/storage)
 "adp" = (
 /obj/machinery/status_display{
-	density = 0;
 	name = "cargo display";
 	supply_display = 1
 	},
@@ -2814,7 +2823,6 @@
 /area/crew_quarters/heads/hop)
 "aeP" = (
 /obj/machinery/status_display{
-	density = 0;
 	name = "cargo display";
 	pixel_x = -32;
 	supply_display = 1
@@ -3033,8 +3041,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;
@@ -4521,9 +4528,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";
@@ -4598,9 +4603,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";
@@ -5745,8 +5748,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";
@@ -6946,8 +6948,7 @@
 	})
 "alm" = (
 /obj/item/twohanded/required/kirbyplants{
-	icon_state = "plant-21";
-	layer = 4.1
+	icon_state = "plant-21"
 	},
 /obj/machinery/light{
 	dir = 8
@@ -7722,8 +7723,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)
@@ -8372,8 +8372,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";
@@ -10387,8 +10386,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;
@@ -11332,8 +11330,7 @@
 	})
 "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{
@@ -12515,7 +12512,6 @@
 	},
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
-	layer = 4.1;
 	pixel_x = -3;
 	pixel_y = 3
 	},
@@ -13633,8 +13629,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{
@@ -14375,8 +14370,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{
@@ -16500,7 +16494,6 @@
 "aBl" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
-	layer = 4.1;
 	pixel_x = -3;
 	pixel_y = 3
 	},
@@ -17647,7 +17640,6 @@
 "aDm" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
-	layer = 4.1;
 	pixel_x = -3;
 	pixel_y = 3
 	},
@@ -17776,8 +17768,7 @@
 	})
 "aDB" = (
 /obj/item/twohanded/required/kirbyplants{
-	icon_state = "plant-21";
-	layer = 4.1
+	icon_state = "plant-21"
 	},
 /turf/open/floor/plasteel/caution{
 	dir = 5
@@ -18468,8 +18459,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
@@ -19855,6 +19845,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{
@@ -19901,8 +19893,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
@@ -20486,8 +20477,7 @@
 	})
 "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
@@ -20538,8 +20528,7 @@
 	})
 "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,
@@ -21210,7 +21199,6 @@
 "aJg" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
-	layer = 4.1;
 	pixel_x = -3;
 	pixel_y = 3
 	},
@@ -22835,8 +22823,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
@@ -23081,8 +23068,7 @@
 	})
 "aMz" = (
 /obj/item/twohanded/required/kirbyplants{
-	icon_state = "plant-21";
-	layer = 4.1
+	icon_state = "plant-21"
 	},
 /turf/open/floor/plasteel/brown{
 	dir = 8
@@ -24113,8 +24099,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
@@ -25281,8 +25266,7 @@
 	})
 "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
@@ -25584,8 +25568,7 @@
 	})
 "aQA" = (
 /obj/item/twohanded/required/kirbyplants{
-	icon_state = "plant-21";
-	layer = 4.1
+	icon_state = "plant-21"
 	},
 /obj/machinery/newscaster{
 	pixel_y = -32
@@ -26414,8 +26397,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";
@@ -28648,7 +28630,6 @@
 "aWR" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
-	layer = 4.1;
 	pixel_x = -3;
 	pixel_y = 3
 	},
@@ -28919,8 +28900,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.";
@@ -29443,8 +29423,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
@@ -31152,8 +31131,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)
@@ -33085,6 +33063,8 @@
 /area/maintenance/port)
 "beX" = (
 /obj/structure/cable/white{
+	d1 = 4;
+	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -34031,7 +34011,6 @@
 "bgy" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
-	layer = 4.1;
 	pixel_x = -3;
 	pixel_y = 3
 	},
@@ -34698,7 +34677,6 @@
 "bhL" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
-	layer = 4.1;
 	pixel_x = -3;
 	pixel_y = 3
 	},
@@ -34786,7 +34764,6 @@
 "bhU" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
-	layer = 4.1;
 	pixel_x = -3;
 	pixel_y = 3
 	},
@@ -36136,7 +36113,6 @@
 "bkq" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
-	layer = 4.1;
 	pixel_x = -3;
 	pixel_y = 3
 	},
@@ -36157,7 +36133,6 @@
 "bks" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
-	layer = 4.1;
 	pixel_x = -3;
 	pixel_y = 3
 	},
@@ -36247,7 +36222,6 @@
 "bkE" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
-	layer = 4.1;
 	pixel_x = -3;
 	pixel_y = 3
 	},
@@ -36269,7 +36243,6 @@
 "bkH" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
-	layer = 4.1;
 	pixel_x = -3;
 	pixel_y = 3
 	},
@@ -36295,7 +36268,6 @@
 "bkK" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
-	layer = 4.1;
 	pixel_x = -3;
 	pixel_y = 3
 	},
@@ -36578,6 +36550,8 @@
 	network = list("SS13")
 	},
 /obj/structure/cable/white{
+	d1 = 2;
+	d2 = 8;
 	icon_state = "2-8"
 	},
 /turf/open/floor/plasteel/neutral/corner{
@@ -36831,8 +36805,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{
@@ -36875,8 +36848,7 @@
 	})
 "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{
@@ -38465,6 +38437,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,
@@ -38542,8 +38516,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;
@@ -38571,6 +38544,8 @@
 	dir = 4
 	},
 /obj/structure/cable/white{
+	d1 = 4;
+	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel,
@@ -38582,6 +38557,8 @@
 	dir = 4
 	},
 /obj/structure/cable/white{
+	d1 = 4;
+	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel,
@@ -38593,6 +38570,8 @@
 	dir = 4
 	},
 /obj/structure/cable/white{
+	d1 = 4;
+	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel,
@@ -38604,6 +38583,8 @@
 	dir = 4
 	},
 /obj/structure/cable/white{
+	d1 = 4;
+	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel,
@@ -38632,6 +38613,8 @@
 	dir = 4
 	},
 /obj/structure/cable/white{
+	d1 = 4;
+	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel,
@@ -38643,6 +38626,8 @@
 	dir = 4
 	},
 /obj/structure/cable/white{
+	d1 = 4;
+	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel,
@@ -38770,6 +38755,8 @@
 	})
 "bsU" = (
 /obj/structure/cable/white{
+	d1 = 1;
+	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel,
@@ -38787,6 +38774,8 @@
 	})
 "bsW" = (
 /obj/structure/cable/white{
+	d1 = 1;
+	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel,

_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{
@@ -4074,8 +4070,6 @@
 "ajo" = (
 /obj/machinery/vending/coffee,
 /obj/machinery/status_display{
-	density = 0;
-	layer = 4;
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel/red/side{
@@ -4413,8 +4407,6 @@
 /obj/structure/table/wood,
 /obj/machinery/recharger,
 /obj/machinery/status_display{
-	density = 0;
-	layer = 4;
 	pixel_y = 32
 	},
 /obj/machinery/light{
@@ -4715,9 +4707,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
 	},
@@ -6582,8 +6572,6 @@
 	dir = 4
 	},
 /obj/machinery/status_display{
-	density = 0;
-	layer = 3;
 	pixel_x = -32
 	},
 /turf/open/floor/mineral/titanium/blue,
@@ -6596,8 +6584,6 @@
 	dir = 8
 	},
 /obj/machinery/status_display{
-	density = 0;
-	layer = 3;
 	pixel_x = 32
 	},
 /turf/open/floor/mineral/titanium/blue,
@@ -7483,12 +7469,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)
@@ -7947,8 +7930,6 @@
 /area/bridge)
 "arK" = (
 /obj/machinery/status_display{
-	density = 0;
-	layer = 4;
 	pixel_y = 32
 	},
 /obj/item/folder/yellow{
@@ -9402,22 +9383,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,
@@ -10202,8 +10177,6 @@
 	dir = 4
 	},
 /obj/machinery/status_display{
-	density = 0;
-	layer = 4;
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel/arrival{
@@ -10237,8 +10210,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;
@@ -10560,12 +10532,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
@@ -10725,8 +10694,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)
@@ -10921,12 +10889,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
@@ -11951,8 +11916,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
@@ -12292,7 +12256,6 @@
 	},
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-20";
-	layer = 4.1;
 	pixel_y = 3
 	},
 /turf/open/floor/plasteel/black,
@@ -12484,8 +12447,6 @@
 /area/crew_quarters/heads/hop)
 "aBF" = (
 /obj/machinery/status_display{
-	density = 0;
-	layer = 4;
 	pixel_y = 32
 	},
 /obj/structure/bed/dogbed/ian,
@@ -12632,8 +12593,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)
@@ -12744,7 +12704,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,
@@ -13836,7 +13795,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;
@@ -14057,8 +14015,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;
@@ -14382,13 +14339,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)
@@ -14693,13 +14647,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,
@@ -14979,7 +14928,6 @@
 "aHa" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
-	layer = 4.1;
 	pixel_y = 3
 	},
 /turf/open/floor/plasteel/vault{
@@ -15715,8 +15663,6 @@
 "aID" = (
 /obj/structure/chair,
 /obj/machinery/status_display{
-	density = 0;
-	layer = 4;
 	pixel_y = 30
 	},
 /turf/open/floor/plasteel/red/side{
@@ -16589,8 +16535,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)";
@@ -17246,8 +17191,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)
@@ -17382,8 +17326,6 @@
 	},
 /obj/effect/spawner/lootdrop/maintenance,
 /obj/machinery/status_display{
-	density = 0;
-	layer = 4;
 	pixel_y = 30;
 	supply_display = 1
 	},
@@ -17426,9 +17368,7 @@
 	dir = 4;
 	id = "packageSort2"
 	},
-/obj/structure/plasticflaps{
-	opacity = 0
-	},
+/obj/structure/plasticflaps,
 /obj/machinery/light/small{
 	dir = 1
 	},
@@ -17647,8 +17587,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
@@ -17689,7 +17628,6 @@
 "aMP" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
-	layer = 4.1;
 	pixel_y = 3
 	},
 /obj/structure/extinguisher_cabinet{
@@ -18368,8 +18306,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;
@@ -20657,8 +20594,6 @@
 	id = "QMLoad"
 	},
 /obj/machinery/status_display{
-	density = 0;
-	layer = 4;
 	pixel_y = 30;
 	supply_display = 1
 	},
@@ -21659,7 +21594,6 @@
 	id = "barshutters";
 	name = "Bar Lockdown";
 	pixel_x = 28;
-	pixel_y = 0;
 	req_access_txt = "28"
 	},
 /obj/item/device/radio/intercom{
@@ -22363,8 +22297,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
@@ -22766,7 +22699,6 @@
 "aXD" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
-	layer = 4.1;
 	pixel_y = 3
 	},
 /turf/open/floor/plasteel/escape{
@@ -22782,8 +22714,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
@@ -22814,13 +22745,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,
@@ -22986,7 +22914,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{
@@ -23020,7 +22947,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{
@@ -23380,8 +23306,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)
@@ -24369,8 +24294,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)
@@ -24699,13 +24623,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,
@@ -26186,8 +26107,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";
@@ -26270,8 +26190,6 @@
 	d2 = 2
 	},
 /obj/machinery/status_display{
-	density = 0;
-	layer = 4;
 	pixel_y = 30
 	},
 /turf/open/floor/plasteel/black,
@@ -26688,8 +26606,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
@@ -27873,8 +27790,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)
@@ -27885,8 +27801,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
@@ -27979,8 +27894,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)
@@ -28004,8 +27918,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)
@@ -28994,7 +28907,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,
@@ -29005,7 +28917,6 @@
 	light_color = "#c1caff"
 	},
 /obj/structure/sign/poster/random{
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel/black/telecomms/server/walkway,
@@ -29013,7 +28924,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,
@@ -29339,8 +29249,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
@@ -29739,8 +29648,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{
@@ -29992,8 +29900,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
@@ -30313,8 +30220,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
@@ -30569,8 +30475,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)
@@ -30845,8 +30750,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
@@ -33074,9 +32978,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{
@@ -33093,9 +32995,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{
@@ -33138,8 +33038,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)
@@ -33811,7 +33710,6 @@
 	dir = 1
 	},
 /obj/structure/extinguisher_cabinet{
-	pixel_x = 0;
 	pixel_y = 30
 	},
 /turf/open/floor/plasteel/darkpurple/side{
@@ -33854,8 +33752,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
@@ -34297,9 +34194,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" = (
@@ -35491,9 +35386,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,
@@ -35869,8 +35762,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)
@@ -35967,8 +35859,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)
@@ -36114,8 +36005,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)
@@ -36768,7 +36658,6 @@
 "bBB" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-20";
-	layer = 4.1;
 	pixel_y = 3
 	},
 /turf/open/floor/plasteel/vault{
@@ -38203,8 +38092,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)
@@ -38323,8 +38211,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
@@ -38368,7 +38255,6 @@
 /obj/item/pen,
 /obj/item/stamp/rd,
 /obj/machinery/status_display{
-	density = 0;
 	pixel_y = -30;
 	supply_display = 0
 	},
@@ -39397,8 +39283,6 @@
 "bHc" = (
 /obj/machinery/computer/med_data,
 /obj/machinery/status_display{
-	density = 0;
-	layer = 4;
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel/freezer,
@@ -39610,7 +39494,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"
@@ -39808,7 +39691,6 @@
 	frequency = 1485;
 	listening = 1;
 	name = "Station Intercom (Medbay)";
-	pixel_x = 0;
 	pixel_y = 28
 	},
 /turf/open/floor/plasteel/whitegreen/side{
@@ -40607,7 +40489,6 @@
 	},
 /obj/machinery/space_heater,
 /obj/structure/sign/poster/random{
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /turf/open/floor/plasteel/green/side,
@@ -40628,7 +40509,6 @@
 	pixel_x = 32
 	},
 /obj/structure/sign/poster/random{
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /turf/open/floor/plasteel/green/side{
@@ -40978,9 +40858,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" = (
@@ -41557,8 +41435,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
@@ -41906,7 +41783,6 @@
 	},
 /obj/item/storage/box/syringes,
 /obj/structure/reagent_dispensers/virusfood{
-	density = 0;
 	pixel_x = 32
 	},
 /obj/item/reagent_containers/spray/cleaner,
@@ -46901,7 +46777,6 @@
 	dir = 1;
 	name = "Auxillary Base Monitor";
 	network = list("AuxBase");
-	pixel_x = 0;
 	pixel_y = -28
 	},
 /obj/machinery/computer/shuttle/mining,
@@ -48291,8 +48166,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
@@ -48780,7 +48654,6 @@
 /obj/structure/table/wood,
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-18";
-	layer = 4.1;
 	pixel_y = 8
 	},
 /obj/machinery/camera{
@@ -49469,7 +49342,6 @@
 	icon_state = "space";
 	layer = 4;
 	name = "EXTERNAL AIRLOCK";
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/open/floor/plating,
@@ -49576,8 +49448,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
@@ -50091,8 +49962,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)
@@ -54122,7 +53992,6 @@
 /obj/machinery/button/door{
 	id = "barshutters";
 	name = "Bar Lockdown";
-	pixel_x = 0;
 	pixel_y = 26;
 	req_access_txt = "28"
 	},
@@ -55115,7 +54984,6 @@
 /obj/structure/table/wood,
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-18";
-	layer = 4.1;
 	pixel_y = 8
 	},
 /turf/open/floor/carpet,
@@ -55690,8 +55558,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)
@@ -55756,8 +55623,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)
@@ -56449,8 +56315,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)
@@ -56556,8 +56421,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
@@ -57883,7 +57747,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{
@@ -57928,7 +57791,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{

_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)
@@ -5883,8 +5866,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
@@ -5924,6 +5906,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
+	d2 = 4;
 	icon_state = "0-4"
 	},
 /obj/effect/turf_decal/stripes/line,
@@ -5961,6 +5944,7 @@
 	icon_state = "0-2"
 	},
 /obj/structure/cable/white{
+	d2 = 8;
 	icon_state = "0-8"
 	},
 /obj/effect/turf_decal/stripes/line,
@@ -6025,8 +6009,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
@@ -6229,6 +6212,8 @@
 	dir = 4
 	},
 /obj/structure/cable/white{
+	d1 = 2;
+	d2 = 4;
 	icon_state = "2-4"
 	},
 /turf/open/floor/wood,
@@ -6241,6 +6226,8 @@
 	dir = 4
 	},
 /obj/structure/cable/white{
+	d1 = 4;
+	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/vault{
@@ -6253,6 +6240,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,
@@ -6262,6 +6251,8 @@
 	dir = 4
 	},
 /obj/structure/cable/white{
+	d1 = 4;
+	d2 = 8;
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/grimy,
@@ -6275,6 +6266,8 @@
 	dir = 4
 	},
 /obj/structure/cable/white{
+	d1 = 4;
+	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -6288,9 +6281,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{
@@ -6305,9 +6302,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{
@@ -6324,12 +6323,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{
@@ -6616,6 +6621,8 @@
 	dir = 4
 	},
 /obj/structure/cable/white{
+	d1 = 1;
+	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/open/floor/wood,
@@ -6663,6 +6670,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{
@@ -6677,9 +6686,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{
@@ -6697,6 +6710,8 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
+	d1 = 1;
+	d2 = 8;
 	icon_state = "1-8"
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -6784,8 +6799,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
@@ -6805,8 +6819,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
@@ -6970,6 +6983,8 @@
 /area/centcom/ferry)
 "sn" = (
 /obj/structure/cable/white{
+	d1 = 1;
+	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/open/floor/wood,
@@ -7164,8 +7179,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
@@ -7895,8 +7909,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,
@@ -7934,8 +7947,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
@@ -7943,8 +7955,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
@@ -8344,8 +8355,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
@@ -8696,8 +8706,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
@@ -8871,8 +8880,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,
@@ -9269,8 +9277,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
@@ -9517,8 +9524,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
@@ -9778,8 +9784,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
@@ -10260,8 +10265,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)
@@ -10338,8 +10342,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)
@@ -10391,8 +10394,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
@@ -10503,8 +10505,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
@@ -10512,8 +10513,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
@@ -10543,8 +10543,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
@@ -10552,8 +10551,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
@@ -11264,8 +11262,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)
@@ -11318,8 +11315,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;
@@ -11937,8 +11933,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;
@@ -11958,8 +11953,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

_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
 	},

_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)

_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)

_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
 	},

_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
 	},

_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)

_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"

code/game/objects/structures/flora.dm

@@ -301,6 +301,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

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"