From 61697790d678ddf61ba487bba24652752b57f860 Mon Sep 17 00:00:00 2001
From: Zenith <109559450+Zenith00000@users.noreply.github.com>
Date: Sun, 23 Jun 2024 12:22:58 +0100
Subject: [PATCH] layering fixes

---
 code/game/machinery/hybrisa_lights.dm         |   6 +-
 .../LV759_Hybrisa_Prospera.dmm                | 522 ++++--------------
 2 files changed, 110 insertions(+), 418 deletions(-)

diff --git a/code/game/machinery/hybrisa_lights.dm b/code/game/machinery/hybrisa_lights.dm
index 1c6a948ec3f2..7a6274156d5e 100644
--- a/code/game/machinery/hybrisa_lights.dm
+++ b/code/game/machinery/hybrisa_lights.dm
@@ -48,7 +48,7 @@
 	name = "colony streetlight"
 	icon = 'icons/obj/structures/props/64x64_hybrisarandomprops.dmi'
 	icon_state = "street_off"
-	layer = ABOVE_XENO_LAYER
+	layer = BILLBOARD_LAYER
 
 /obj/structure/machinery/colony_floodlight/street/update_icon()
 	if(damaged)
@@ -69,7 +69,7 @@
 	bound_height = 32
 	density = TRUE
 	health = 200
-	layer = ABOVE_XENO_LAYER
+	layer = BILLBOARD_LAYER
 
 /obj/structure/machinery/colony_floodlight/traffic/update_icon()
 	if(damaged)
@@ -89,7 +89,7 @@
 	bound_height = 32
 	density = TRUE
 	health = 200
-	layer = ABOVE_XENO_LAYER
+	layer = BILLBOARD_LAYER
 
 /obj/structure/machinery/colony_floodlight/traffic_alt/update_icon()
 	if(damaged)
diff --git a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
index 5a11cedbc5b4..17c8046167c4 100644
--- a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
+++ b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
@@ -325,6 +325,11 @@
 	},
 /turf/open/floor/hybrisa/tile/tilebeigecheckered,
 /area/lv759/indoors/apartment/northfoyer)
+"acy" = (
+/obj/structure/platform/hybrisa/metalplatform6,
+/obj/structure/prop/hybrisa/fakeplatforms/platform4,
+/turf/open/hybrisa/street/sidewalk,
+/area/lv759/outdoors/colony_streets/east_central_street)
 "acB" = (
 /turf/open/floor/plating/plating_catwalk/prison,
 /area/lv759/indoors/casino/casino_vault)
@@ -1758,8 +1763,6 @@
 	pixel_y = 13
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/cement1,
@@ -4344,8 +4347,6 @@
 /area/lv759/indoors/landing_zone_2/kmcc_hub_cargo)
 "aFn" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -9061,8 +9062,6 @@
 /area/lv759/outdoors/colony_streets/central_streets)
 "bnX" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/effect/hybrisa/decal/dirt,
@@ -13942,8 +13941,6 @@
 /area/lv759/indoors/mining_outpost/northeast)
 "bZF" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/barricade/handrail/hybrisa/road/plastic/black{
@@ -14068,8 +14065,6 @@
 /area/lv759/indoors/landing_zone_2/kmcc_hub_flight_control_room)
 "cak" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -14993,10 +14988,6 @@
 /obj/effect/hybrisa/decal/trash{
 	icon_state = "trash_3"
 	},
-/obj/structure/prop/hybrisa/misc/deco_edging{
-	dir = 8;
-	color = "#7e7d72"
-	},
 /turf/open/hybrisa/street/sidewalk{
 	dir = 8
 	},
@@ -16003,8 +15994,6 @@
 /area/lv759/outdoors/colony_streets/south_east_street)
 "coF" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -17881,8 +17870,6 @@
 /area/lv759/outdoors/colony_streets/central_streets)
 "cDg" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/barricade/handrail/hybrisa/road/metal/metaltan{
@@ -21724,8 +21711,6 @@
 	dir = 8
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -24211,8 +24196,6 @@
 "dtR" = (
 /obj/effect/hybrisa/decal/dirt,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -24955,10 +24938,6 @@
 	dir = 4;
 	color = "#7e7d72"
 	},
-/obj/structure/prop/hybrisa/misc/deco_edging/corner{
-	dir = 1;
-	color = "#7e7d72"
-	},
 /turf/open/hybrisa/street/sidewalk,
 /area/lv759/outdoors/colony_streets/east_central_street)
 "dAs" = (
@@ -27157,8 +27136,6 @@
 "dQW" = (
 /obj/effect/hybrisa/decal/dirt,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -27299,8 +27276,6 @@
 /area/lv759/indoors/colonial_marshals/armory_foyer)
 "dSA" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/effect/hybrisa/decal/trash{
@@ -28599,10 +28574,6 @@
 	dir = 4;
 	color = "#7e7d72"
 	},
-/obj/structure/prop/hybrisa/misc/deco_edging/corner{
-	dir = 1;
-	color = "#7e7d72"
-	},
 /turf/open/hybrisa/street/sidewalkfull,
 /area/lv759/outdoors/colony_streets/east_central_street)
 "ebx" = (
@@ -29077,8 +29048,6 @@
 	dir = 4
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/cement1,
@@ -29663,8 +29632,6 @@
 /area/lv759/outdoors/colony_streets/south_east_street)
 "eje" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -32515,8 +32482,6 @@
 	dir = 8
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk,
@@ -33179,8 +33144,6 @@
 "eKQ" = (
 /obj/effect/hybrisa/decal/dirt,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -36078,8 +36041,6 @@
 	dir = 8
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/cement1,
@@ -37589,9 +37550,9 @@
 	pixel_y = 4
 	},
 /obj/structure/largecrate/random/mini{
-	layer = 4;
 	pixel_x = 9;
-	pixel_y = 12
+	pixel_y = 12;
+	layer = 3.1
 	},
 /obj/structure/largecrate/random/barrel/purewhite{
 	layer = 4
@@ -37862,12 +37823,10 @@
 /turf/open/hybrisa/street/asphalt,
 /area/lv759/outdoors/colony_streets/south_east_street)
 "fuO" = (
-/obj/structure/platform/hybrisa/metalplatform6{
-	layer = 3.1
-	},
+/obj/structure/platform/hybrisa/metalplatform6,
 /obj/structure/prop/hybrisa/vehicles/Meridian/Orange{
 	dir = 8;
-	layer = 3
+	pixel_y = 2
 	},
 /turf/open/hybrisa/street/sidewalk{
 	dir = 1
@@ -39859,8 +39818,6 @@
 	layer = 2.9
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/floor/prison{
@@ -40621,7 +40578,7 @@
 	dir = 1;
 	pixel_x = 5;
 	pixel_y = 5;
-	layer = 4.1
+	layer = 4.12
 	},
 /turf/open/hybrisa/street/sidewalk{
 	dir = 8
@@ -41483,8 +41440,6 @@
 /area/lv759/indoors/caves/central_caves)
 "fVM" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -43087,8 +43042,6 @@
 /area/lv759/outdoors/colony_streets/north_west_street)
 "ghC" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalkfull,
@@ -43968,8 +43921,6 @@
 	dir = 4
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/effect/hybrisa/decal/dirt,
@@ -44616,9 +44567,6 @@
 	dir = 8;
 	color = "#7e7d72"
 	},
-/obj/structure/prop/hybrisa/misc/deco_edging/corner{
-	color = "#7e7d72"
-	},
 /turf/open/hybrisa/street/sidewalk,
 /area/lv759/outdoors/colony_streets/east_central_street)
 "gtD" = (
@@ -44674,8 +44622,6 @@
 /area/lv759/indoors/hospital/morgue)
 "gtY" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -45117,9 +45063,6 @@
 	},
 /area/lv759/indoors/mining_outpost/north_maint)
 "gwS" = (
-/obj/structure/platform/hybrisa/metalplatform2{
-	dir = 1
-	},
 /obj/structure/machinery/power/apc{
 	dir = 1;
 	start_charge = 10
@@ -45154,8 +45097,6 @@
 /area/lv759/outdoors/caveplateau)
 "gxo" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -48728,8 +48669,6 @@
 /area/lv759/outdoors/colony_streets/north_west_street)
 "gWX" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -49021,13 +48960,9 @@
 /area/lv759/indoors/weyyu_office)
 "gZf" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 18
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 18
 	},
 /obj/item/tool/warning_cone{
@@ -49229,8 +49164,6 @@
 /area/lv759/indoors/landing_zone_2/kmcc_hub_cargo)
 "haz" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/pipes/standard/simple/hidden/cyan{
@@ -50707,8 +50640,6 @@
 	pixel_y = -6
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/cement3,
@@ -52658,8 +52589,6 @@
 /area/lv759/indoors/spaceport/flight_control_room)
 "hAa" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/barricade/handrail/hybrisa/road/metal/metaltan{
@@ -53036,8 +52965,6 @@
 /area/lv759/indoors/wy_research_complex/researchanddevelopment)
 "hCb" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -53047,8 +52974,6 @@
 "hCc" = (
 /obj/effect/hybrisa/decal/dirt,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -53180,8 +53105,6 @@
 /area/lv759/indoors/wy_security/checkpoint_central)
 "hCY" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -54055,20 +53978,6 @@
 	dir = 8
 	},
 /area/lv759/indoors/meridian/meridian_office)
-"hJd" = (
-/obj/structure/platform/hybrisa/metalplatform2{
-	dir = 1
-	},
-/obj/structure/machinery/door/poddoor/almayer/locked{
-	dir = 4;
-	id = "hybrisacheckpoint_west";
-	name = "\improper Lockdown"
-	},
-/turf/open/floor/prison{
-	dir = 8;
-	icon_state = "cell_stripe"
-	},
-/area/lv759/indoors/wy_security/checkpoint_west)
 "hJe" = (
 /obj/structure/prop/hybrisa/vehicles/Meridian/Turquoise,
 /turf/open/hybrisa/street/sidewalk{
@@ -54146,8 +54055,6 @@
 /area/lv759/indoors/landing_zone_2/kmcc_hub_lounge_hallway)
 "hJz" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -56149,8 +56056,6 @@
 "hYT" = (
 /obj/effect/hybrisa/decal/dirt,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -56574,15 +56479,6 @@
 	dir = 4
 	},
 /area/lv759/outdoors/colony_streets/north_street)
-"icb" = (
-/obj/structure/platform/hybrisa/metalplatform2{
-	dir = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W"
-	},
-/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/wy_security/checkpoint_west)
 "icp" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 26
@@ -58322,8 +58218,6 @@
 "ipf" = (
 /obj/effect/hybrisa/decal/dirt,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/effect/hybrisa/decal/dirt,
@@ -59275,8 +59169,6 @@
 /area/lv759/indoors/colonial_marshals/holding_cells)
 "iwg" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/barricade/handrail/hybrisa/road/metal/metaltan{
@@ -60675,8 +60567,6 @@
 /area/lv759/indoors/weyyu_office)
 "iFF" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk,
@@ -60861,9 +60751,8 @@
 "iHJ" = (
 /obj/effect/hybrisa/decal/dirt,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
-	pixel_y = 12
+	pixel_y = 12;
+	layer = 4.12
 	},
 /turf/open/hybrisa/street/sidewalk{
 	dir = 4
@@ -60899,6 +60788,13 @@
 /obj/structure/surface/table/almayer{
 	color = "#848484"
 	},
+/obj/item/reagent_container/food/drinks/coffee/cuppa_joes{
+	pixel_x = -10;
+	pixel_y = 8
+	},
+/obj/item/reagent_container/food/drinks/coffeecup/wy{
+	pixel_x = 12
+	},
 /turf/open/floor/almayer{
 	allow_construction = 0;
 	icon_state = "plate"
@@ -61453,8 +61349,6 @@
 	dir = 8
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/cement1,
@@ -62441,7 +62335,7 @@
 	},
 /obj/structure/prop/hybrisa/vehicles/Meridian/WeylandYutani{
 	dir = 8;
-	layer = 3
+	pixel_y = 3
 	},
 /turf/open/hybrisa/street/sidewalk{
 	dir = 1
@@ -62639,6 +62533,7 @@
 	pixel_y = 12
 	},
 /obj/effect/hybrisa/decal/dirt,
+/obj/structure/prop/hybrisa/misc/trash/green,
 /turf/open/floor/prison{
 	dir = 10;
 	icon_state = "floor_plate"
@@ -63108,8 +63003,6 @@
 /area/lv759/indoors/landing_zone_2/kmcc_hub_cargo)
 "iZo" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 6
 	},
 /turf/open/hybrisa/street/cement2,
@@ -63964,8 +63857,6 @@
 /area/lv759/indoors/wy_research_complex/xenobiology)
 "jfY" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -65732,6 +65623,10 @@
 	},
 /turf/open/floor/plating,
 /area/lv759/indoors/landing_zone_2/kmcc_hub_lounge_hallway)
+"jsW" = (
+/obj/structure/prop/hybrisa/fakeplatforms/platform4,
+/turf/open/hybrisa/street/sidewalk,
+/area/lv759/outdoors/colony_streets/east_central_street)
 "jsZ" = (
 /obj/structure/bed/hybrisa/prisonbed{
 	dir = 4
@@ -67669,8 +67564,6 @@
 /area/lv759/indoors/spaceport/docking_bay_1)
 "jHR" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk,
@@ -69373,8 +69266,6 @@
 	dir = 4
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/cement1,
@@ -70477,7 +70368,8 @@
 /obj/structure/prop/hybrisa/vehicles/Meridian/Red{
 	icon_state = "meridian_red_damage_2";
 	health = 1750;
-	dir = 1
+	dir = 1;
+	layer = 4.12
 	},
 /turf/open/hybrisa/street/sidewalk{
 	dir = 1
@@ -71796,8 +71688,6 @@
 /area/lv759/indoors/mining_outpost/vehicledeployment)
 "kmO" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -72329,8 +72219,6 @@
 /area/lv759/outdoors/caveplateau)
 "kql" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -73425,8 +73313,6 @@
 /area/lv759/indoors/spaceport/heavyequip)
 "kwo" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/floor/hybrisa/metal/grated{
@@ -75278,7 +75164,7 @@
 /obj/structure/machinery/colony_floodlight/street{
 	pixel_y = -8
 	},
-/turf/open/hybrisa/street/cement2,
+/turf/open/hybrisa/street/sidewalkfull,
 /area/lv759/outdoors/colony_streets/east_central_street)
 "kKc" = (
 /obj/structure/bed/sofa{
@@ -77184,8 +77070,6 @@
 /area/lv759/indoors/power_plant)
 "kYO" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalkfull,
@@ -77336,8 +77220,8 @@
 	dir = 4
 	},
 /obj/effect/hybrisa/decal/dirt,
-/obj/structure/platform/hybrisa/metalplatform6,
-/obj/structure/platform/hybrisa/metalplatform6{
+/obj/structure/prop/hybrisa/fakeplatforms/platform4,
+/obj/structure/prop/hybrisa/fakeplatforms/platform4{
 	dir = 4
 	},
 /turf/open/floor/corsat{
@@ -77395,8 +77279,6 @@
 /area/lv759/indoors/casino)
 "kZV" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/platform/hybrisa/metalplatform6,
@@ -78370,10 +78252,10 @@
 	},
 /area/lv759/indoors/caves/central_caves)
 "lgO" = (
-/obj/structure/platform/hybrisa/metalplatform6{
+/obj/item/trash/candy,
+/obj/structure/prop/hybrisa/fakeplatforms/platform4{
 	dir = 4
 	},
-/obj/item/trash/candy,
 /turf/open/auto_turf/sand_white/layer0{
 	icon = 'icons/turf/floors/hybrisa_dirt.dmi'
 	},
@@ -79858,8 +79740,6 @@
 	pixel_y = 21
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/pipes/standard/simple/hidden/cyan{
@@ -80101,8 +79981,6 @@
 /area/lv759/outdoors/landing_zone_1)
 "ltg" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/effect/hybrisa/decal/dirt,
@@ -80186,12 +80064,12 @@
 	},
 /area/lv759/indoors/meridian/meridian_factory)
 "ltW" = (
-/obj/structure/platform/hybrisa/metalplatform6{
-	dir = 4
-	},
 /obj/structure/barricade/handrail/hybrisa/road/plastic/red{
 	dir = 8
 	},
+/obj/structure/prop/hybrisa/fakeplatforms/platform4{
+	dir = 4
+	},
 /turf/open/hybrisa/street/cement3,
 /area/lv759/outdoors/colony_streets/north_street)
 "ltX" = (
@@ -80506,9 +80384,6 @@
 /turf/open/hybrisa/street/asphalt,
 /area/lv759/outdoors/colony_streets/north_street)
 "lwa" = (
-/obj/structure/platform_decoration/hybrisa/metalplatformdeco2{
-	dir = 8
-	},
 /obj/item/tool/warning_cone{
 	pixel_x = 5;
 	pixel_y = 13
@@ -80532,8 +80407,6 @@
 	dir = 8
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -80542,8 +80415,6 @@
 /area/lv759/outdoors/colony_streets/north_street)
 "lwj" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -80799,8 +80670,6 @@
 	},
 /obj/structure/prop/hybrisa/fakeplatforms/platform4,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/cement1,
@@ -81664,6 +81533,9 @@
 	dir = 1
 	},
 /obj/effect/hybrisa/decal/dirt,
+/obj/effect/hybrisa/decal/trash{
+	icon_state = "trash_4"
+	},
 /turf/open/hybrisa/street/sidewalk{
 	dir = 8
 	},
@@ -81920,8 +81792,6 @@
 /area/lv759/indoors/wy_research_complex/hangarbay)
 "lGg" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -82020,8 +81890,6 @@
 /area/lv759/indoors/apartment/northfoyer)
 "lGw" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk,
@@ -88027,8 +87895,6 @@
 	pixel_x = -20
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk,
@@ -88776,8 +88642,6 @@
 	color = "#5d524b"
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -90291,8 +90155,6 @@
 /area/lv759/outdoors/colony_streets/south_east_street)
 "mRn" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk,
@@ -91785,8 +91647,6 @@
 /area/lv759/outdoors/colony_streets/central_streets)
 "nch" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/effect/hybrisa/decal/dirt,
@@ -97701,8 +97561,6 @@
 /area/lv759/indoors/weymart)
 "nXc" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/pipes/standard/simple/hidden/cyan{
@@ -99254,8 +99112,6 @@
 	},
 /obj/item/shard,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/cement1,
@@ -100040,8 +99896,6 @@
 /area/lv759/indoors/apartment/northapartments)
 "onI" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/prop/hybrisa/misc/deco_edging/corner{
@@ -100183,8 +100037,6 @@
 	},
 /obj/effect/hybrisa/decal/dirt_2,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/cement1,
@@ -101105,8 +100957,6 @@
 	dir = 8
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/effect/hybrisa/decal/dirt,
@@ -102147,16 +101997,6 @@
 /obj/structure/machinery/light,
 /turf/open/hybrisa/street/sidewalk,
 /area/lv759/outdoors/colony_streets/north_west_street)
-"oDh" = (
-/obj/structure/machinery/colony_floodlight/street{
-	layer = 10;
-	level = 10;
-	pixel_y = 12
-	},
-/turf/open/hybrisa/street/sidewalk{
-	dir = 4
-	},
-/area/lv759/outdoors/colony_streets/central_streets)
 "oDs" = (
 /obj/item/prop/colony/canister{
 	pixel_x = 4;
@@ -102739,8 +102579,6 @@
 /area/lv759/outdoors/colony_streets/north_street)
 "oIb" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/item/tool/warning_cone{
@@ -102898,6 +102736,13 @@
 	icon_state = "floor_marked"
 	},
 /area/lv759/indoors/wy_research_complex/weaponresearchlabtesting)
+"oJr" = (
+/obj/structure/barricade/handrail/strata{
+	dir = 8;
+	layer = 3
+	},
+/turf/open/floor/plating/plating_catwalk/prison,
+/area/lv759/outdoors/colony_streets/east_central_street)
 "oJs" = (
 /obj/item/roller,
 /obj/item/reagent_container/glass/bucket/mopbucket{
@@ -104296,8 +104141,6 @@
 /area/lv759/indoors/wy_research_complex/xenobiology)
 "oSG" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -104440,8 +104283,6 @@
 /area/lv759/oob)
 "oTy" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/floor/prison{
@@ -105819,10 +105660,6 @@
 	pixel_x = -10;
 	pixel_y = 7
 	},
-/obj/structure/prop/hybrisa/misc/deco_edging{
-	dir = 4;
-	color = "#7e7d72"
-	},
 /turf/open/hybrisa/street/sidewalk{
 	dir = 4
 	},
@@ -106192,6 +106029,14 @@
 	desc = "A small inscription reads - The laws of Earth stretch beyond the Sol. To live, to serve, wherever humanity roams."
 	},
 /area/lv759/outdoors/colony_streets/east_central_street)
+"pha" = (
+/obj/structure/barricade/handrail/strata{
+	dir = 4;
+	layer = 4;
+	pixel_x = -2
+	},
+/turf/open/floor/plating/plating_catwalk/prison,
+/area/lv759/outdoors/colony_streets/east_central_street)
 "phf" = (
 /obj/structure/surface/rack,
 /obj/item/ammo_magazine/smg/nailgun,
@@ -107360,16 +107205,6 @@
 /obj/effect/decal/cleanable/blood/oil,
 /turf/open/hybrisa/street/asphalt,
 /area/lv759/outdoors/colony_streets/north_east_street)
-"ppt" = (
-/obj/effect/hybrisa/decal/dirt,
-/obj/structure/prop/hybrisa/misc/deco_edging{
-	dir = 8;
-	color = "#7e7d72"
-	},
-/turf/open/hybrisa/street/sidewalk{
-	dir = 8
-	},
-/area/lv759/outdoors/colony_streets/east_central_street)
 "ppu" = (
 /obj/effect/hybrisa/decal/dirt,
 /turf/open/floor/hybrisa/metal/stripe_red,
@@ -108430,9 +108265,6 @@
 	},
 /area/lv759/indoors/caves/east_caves)
 "pxh" = (
-/obj/structure/platform/hybrisa/metalplatform2{
-	dir = 1
-	},
 /obj/structure/machinery/light/spot/blue{
 	dir = 1;
 	pixel_y = 22
@@ -108534,8 +108366,6 @@
 /area/lv759/outdoors/colony_streets/north_street)
 "pxU" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/effect/hybrisa/decal/trash{
@@ -109385,12 +109215,12 @@
 /area/lv759/indoors/hospital/central_hallway)
 "pEf" = (
 /obj/effect/hybrisa/decal/dirt,
-/obj/structure/platform/hybrisa/metalplatform6,
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
 	pixel_x = 1;
 	pixel_y = -1
 	},
+/obj/structure/prop/hybrisa/fakeplatforms/platform4,
 /turf/open/floor/corsat{
 	icon_state = "officesquares"
 	},
@@ -109534,8 +109364,6 @@
 /area/lv759/indoors/casino/casino_vault)
 "pFf" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/effect/hybrisa/decal/dirt,
@@ -109693,8 +109521,6 @@
 /area/lv759/outdoors/landing_zone_2/kmcc_hub_cargo_entrance_south)
 "pGn" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/barricade/handrail/hybrisa/road/metal/metaltan{
@@ -111364,18 +111190,17 @@
 "pRY" = (
 /obj/item/trash/cigbutt,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/barricade/handrail/strata{
 	dir = 8;
 	layer = 4
 	},
-/obj/structure/barricade/handrail/strata{
-	layer = 9
-	},
 /obj/effect/hybrisa/decal/dirt,
+/obj/structure/barricade/handrail/hybrisa/handrail{
+	dir = 1;
+	pixel_y = -16
+	},
 /turf/open/floor/corsat{
 	icon_state = "spiralplate"
 	},
@@ -111444,8 +111269,6 @@
 /area/lv759/indoors/caves/east_caves)
 "pSu" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/effect/hybrisa/decal/dirt,
@@ -112121,8 +111944,6 @@
 /area/lv759/indoors/meridian/meridian_office)
 "pWV" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/effect/hybrisa/decal/dirt,
@@ -112512,7 +112333,7 @@
 	pixel_y = -8;
 	pixel_x = -2;
 	health = 250;
-	layer = 4.2
+	layer = 4.12
 	},
 /obj/effect/decal/cleanable/dirt/greenglow{
 	color = "#140400";
@@ -114240,9 +114061,6 @@
 	layer = 4
 	},
 /obj/structure/largecrate/random/case/double,
-/obj/structure/platform/hybrisa/metalplatform2{
-	dir = 4
-	},
 /turf/open/floor/prison{
 	dir = 10;
 	icon_state = "floor_plate"
@@ -114483,8 +114301,6 @@
 /area/lv759/outdoors/colony_streets/central_streets)
 "qqI" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -114951,8 +114767,6 @@
 /area/lv759/indoors/weyyu_office/floor)
 "quf" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/platform_decoration/hybrisa/metalplatformdeco6{
@@ -115687,8 +115501,6 @@
 /area/lv759/indoors/caves/central_caves)
 "qyY" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk,
@@ -118799,8 +118611,6 @@
 	icon_state = "2"
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/pipes/standard/simple/hidden/cyan{
@@ -121950,8 +121760,6 @@
 /area/lv759/outdoors/colony_streets/south_east_street)
 "rsr" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/cement3,
@@ -122917,16 +122725,6 @@
 	icon = 'icons/turf/floors/hybrisa_dirt.dmi'
 	},
 /area/lv759/indoors/caves/south_east_caves)
-"rzy" = (
-/obj/structure/platform/hybrisa/metalplatform2{
-	dir = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/wy_security/checkpoint_west)
 "rzB" = (
 /obj/effect/hybrisa/decal/road/lines3,
 /obj/effect/hybrisa/decal/road/lines4,
@@ -123185,10 +122983,6 @@
 	icon_state = "trash_6"
 	},
 /obj/item/paper/crumpled,
-/obj/structure/prop/hybrisa/misc/deco_edging{
-	dir = 4;
-	color = "#7e7d72"
-	},
 /turf/open/hybrisa/street/sidewalk{
 	dir = 4
 	},
@@ -123686,9 +123480,6 @@
 /obj/structure/platform/hybrisa/metalplatform2{
 	dir = 1
 	},
-/obj/structure/platform/hybrisa/metalplatform2{
-	dir = 8
-	},
 /obj/structure/machinery/light{
 	dir = 8
 	},
@@ -124738,8 +124529,6 @@
 "rLo" = (
 /obj/effect/hybrisa/decal/dirt,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk,
@@ -124806,9 +124595,6 @@
 /turf/open/floor/corsat,
 /area/lv759/indoors/power_plant/fusion_generators)
 "rLU" = (
-/obj/structure/prop/hybrisa/misc/deco_edging{
-	color = "#7e7d72"
-	},
 /obj/structure/prop/hybrisa/misc/deco_edging{
 	dir = 1;
 	color = "#7e7d72"
@@ -127371,8 +127157,6 @@
 "seG" = (
 /obj/effect/hybrisa/decal/dirt,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk,
@@ -127916,8 +127700,6 @@
 /area/lv759/indoors/caves/south_east_caves)
 "sjh" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/effect/hybrisa/decal/dirt,
@@ -129160,8 +128942,6 @@
 /area/lv759/indoors/spaceport/security)
 "ssd" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/effect/hybrisa/decal/trash{
@@ -130651,8 +130431,7 @@
 "sBS" = (
 /obj/structure/machinery/colony_floodlight/traffic{
 	pixel_x = 2;
-	pixel_y = 5;
-	layer = 9
+	pixel_y = 5
 	},
 /turf/open/hybrisa/street/sidewalk{
 	dir = 4
@@ -130704,8 +130483,6 @@
 	pixel_x = 4
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/effect/hybrisa/decal/dirt,
@@ -130873,18 +130650,16 @@
 "sDX" = (
 /obj/item/trash/cigbutt,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/barricade/handrail/strata{
 	dir = 8;
 	layer = 4
 	},
+/obj/effect/hybrisa/decal/dirt,
 /obj/structure/barricade/handrail/strata{
-	dir = 1
+	pixel_y = 16
 	},
-/obj/effect/hybrisa/decal/dirt,
 /turf/open/floor/corsat{
 	icon_state = "spiralplate"
 	},
@@ -132949,8 +132724,6 @@
 /area/lv759/indoors/wy_research_complex/vehicledeploymentbay)
 "sUD" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/effect/hybrisa/decal/dirt,
@@ -133779,9 +133552,6 @@
 	dir = 8;
 	color = "#7e7d72"
 	},
-/obj/structure/prop/hybrisa/misc/deco_edging/corner{
-	color = "#7e7d72"
-	},
 /turf/open/hybrisa/street/sidewalkfull,
 /area/lv759/outdoors/colony_streets/east_central_street)
 "taA" = (
@@ -134751,8 +134521,6 @@
 /area/lv759/outdoors/colony_streets/east_central_street)
 "tfR" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -135290,10 +135058,6 @@
 	dir = 5
 	},
 /area/lv759/indoors/meridian/meridian_factory)
-"tkw" = (
-/obj/effect/hybrisa/decal/dirt,
-/turf/open/hybrisa/street/cement2,
-/area/lv759/outdoors/colony_streets/east_central_street)
 "tky" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
@@ -137371,8 +137135,6 @@
 	dir = 4
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 6
 	},
 /turf/open/floor/corsat{
@@ -138750,7 +138512,7 @@
 	dir = 1;
 	pixel_x = -8
 	},
-/turf/open/hybrisa/street/cement2,
+/turf/open/hybrisa/street/sidewalkfull,
 /area/lv759/outdoors/colony_streets/east_central_street)
 "tKy" = (
 /obj/structure/machinery/door/airlock/multi_tile/hybrisa/generic/autoname,
@@ -140212,7 +139974,7 @@
 	dir = 1;
 	pixel_x = -8
 	},
-/turf/open/hybrisa/street/cement2,
+/turf/open/hybrisa/street/sidewalkfull,
 /area/lv759/outdoors/colony_streets/east_central_street)
 "tVM" = (
 /obj/structure/platform/strata/metal{
@@ -142894,6 +142656,18 @@
 	dir = 4
 	},
 /obj/effect/hybrisa/decal/dirt,
+/obj/effect/hybrisa/decal/trash{
+	icon_state = "trash_13"
+	},
+/obj/effect/hybrisa/decal/trash{
+	icon_state = "trash_17";
+	pixel_y = 12
+	},
+/obj/item/trash/hotdog,
+/obj/item/hybrisa/misc/trash_bag_full_prop{
+	pixel_x = -6;
+	pixel_y = 20
+	},
 /turf/open/floor/prison{
 	dir = 10;
 	icon_state = "floor_plate"
@@ -145606,8 +145380,6 @@
 /area/lv759/indoors/wy_research_complex/hallwaynorth)
 "uJs" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -145965,8 +145737,6 @@
 /area/lv759/indoors/caves/wy_research_complex_entrance)
 "uMg" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/pipes/standard/simple/hidden/cyan{
@@ -146220,8 +145990,6 @@
 /area/lv759/indoors/caves/north_west_caves)
 "uNO" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/machinery/light/double/blue,
@@ -147687,9 +147455,6 @@
 	},
 /area/lv759/oob)
 "uXS" = (
-/obj/structure/platform/hybrisa/metalplatform2{
-	dir = 8
-	},
 /obj/structure/machinery/sentry_holder/wy{
 	dir = 4;
 	pixel_x = -24;
@@ -147772,8 +147537,6 @@
 "uYJ" = (
 /obj/effect/hybrisa/decal/dirt,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk,
@@ -149025,8 +148788,6 @@
 /area/lv759/indoors/caves/south_caves)
 "vjN" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -149844,8 +149605,6 @@
 	dir = 4
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/cement1,
@@ -151497,8 +151256,6 @@
 /area/lv759/indoors/wy_security/checkpoint_northwest)
 "vBj" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 18
 	},
 /turf/open/hybrisa/street/cement3,
@@ -152484,8 +152241,6 @@
 /area/lv759/indoors/meridian/meridian_factory)
 "vIs" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -152510,7 +152265,7 @@
 /obj/structure/machinery/light/double/blue{
 	dir = 4
 	},
-/turf/open/hybrisa/street/cement2,
+/turf/open/hybrisa/street/cement3,
 /area/lv759/outdoors/colony_streets/east_central_street)
 "vIE" = (
 /obj/structure/pipes/standard/manifold/hidden/cyan{
@@ -153767,8 +153522,6 @@
 /area/lv759/indoors/weyyu_office/floor)
 "vRF" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/cement1,
@@ -154074,7 +153827,9 @@
 	},
 /area/lv759/indoors/power_plant/geothermal_generators)
 "vTz" = (
-/obj/structure/cargo_container/hybrisa/containersextended/blueleft,
+/obj/structure/cargo_container/hybrisa/containersextended/blueleft{
+	layer = 3
+	},
 /turf/open/floor/prison{
 	dir = 10;
 	icon_state = "floor_plate"
@@ -155941,12 +155696,6 @@
 /obj/structure/surface/table,
 /turf/open/floor/hybrisa/tile/tilewhite,
 /area/lv759/indoors/hospital/patient_ward)
-"wgT" = (
-/obj/structure/platform/hybrisa/metalplatform2{
-	dir = 1
-	},
-/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/wy_security/checkpoint_west)
 "whb" = (
 /obj/structure/surface/rack,
 /obj/structure/platform,
@@ -156204,8 +155953,6 @@
 /area/lv759/indoors/power_plant/gas_generators)
 "wjr" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -157337,8 +157084,6 @@
 /area/lv759/indoors/spaceport/cuppajoes)
 "wrH" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalkfull,
@@ -159144,8 +158889,6 @@
 /area/lv759/indoors/spaceport/starglider)
 "wEI" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/effect/hybrisa/decal/trash{
@@ -159832,8 +159575,6 @@
 /area/lv759/indoors/landing_zone_2/kmcc_hub_cargo)
 "wKs" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 6
 	},
 /turf/open/floor/prison{
@@ -160239,8 +159980,6 @@
 /area/lv759/outdoors/colony_streets/north_west_street)
 "wNw" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/barricade/handrail/hybrisa/road/plastic/blue{
@@ -161518,8 +161257,6 @@
 /area/lv759/indoors/caves/west_caves)
 "wWV" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/cement3,
@@ -161727,8 +161464,6 @@
 /area/lv759/indoors/landing_zone_2/kmcc_hub_cargo)
 "wYq" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 18
 	},
 /turf/open/hybrisa/street/cement2,
@@ -161780,8 +161515,6 @@
 "wYE" = (
 /obj/effect/hybrisa/decal/dirt,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/cement1,
@@ -163532,8 +163265,6 @@
 	},
 /obj/effect/hybrisa/decal/dirt,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/effect/hybrisa/decal/dirt,
@@ -163897,8 +163628,6 @@
 "xpB" = (
 /obj/effect/hybrisa/decal/dirt,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/barricade/handrail/hybrisa/road/plastic/red{
@@ -165372,20 +165101,6 @@
 	icon_state = "platingdmg1"
 	},
 /area/lv759/indoors/caves/west_caves)
-"xyV" = (
-/obj/structure/platform/hybrisa/metalplatform2{
-	dir = 1
-	},
-/obj/structure/machinery/door/poddoor/almayer/locked{
-	dir = 4;
-	id = "hybrisacheckpoint_west";
-	name = "\improper Lockdown"
-	},
-/turf/open/floor/prison{
-	dir = 4;
-	icon_state = "cell_stripe"
-	},
-/area/lv759/indoors/wy_security/checkpoint_west)
 "xyX" = (
 /obj/item/prop/colony/usedbandage{
 	dir = 10
@@ -165603,8 +165318,6 @@
 	pixel_x = 2
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/floor/prison{
@@ -166483,8 +166196,6 @@
 /area/lv759/indoors/wy_research_complex/vehicledeploymentbay)
 "xGc" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -167899,8 +167610,6 @@
 	pixel_y = -2
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/cement1,
@@ -168114,10 +167823,10 @@
 /obj/structure/platform/hybrisa/metalplatform6{
 	dir = 1
 	},
-/obj/structure/platform/hybrisa/metalplatform6{
+/obj/structure/prop/hybrisa/misc/trash/green,
+/obj/structure/prop/hybrisa/fakeplatforms/platform4{
 	dir = 4
 	},
-/obj/structure/prop/hybrisa/misc/trash/green,
 /turf/open/hybrisa/street/cement3,
 /area/lv759/outdoors/colony_streets/central_streets)
 "xTN" = (
@@ -168691,8 +168400,6 @@
 	dir = 8
 	},
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -168874,8 +168581,6 @@
 /area/lv759/indoors/wy_research_complex/mainlabs)
 "xZk" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/sidewalk{
@@ -168954,14 +168659,6 @@
 	icon_state = "plating_striped"
 	},
 /area/lv759/indoors/spaceport/baggagehandling)
-"xZU" = (
-/obj/structure/platform/hybrisa/metalplatform6{
-	layer = 3.1
-	},
-/turf/open/hybrisa/street/sidewalk{
-	dir = 1
-	},
-/area/lv759/outdoors/colony_streets/north_street)
 "xZV" = (
 /obj/effect/hybrisa/decal/road/road_edge{
 	icon_state = "road_edge_decal2"
@@ -170150,8 +169847,6 @@
 /area/lv759/indoors/landing_zone_2/kmcc_hub_lounge_south)
 "yio" = (
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /obj/structure/platform/hybrisa/metalplatform6,
@@ -170230,8 +169925,7 @@
 /obj/structure/machinery/colony_floodlight/traffic_alt{
 	dir = 1;
 	pixel_x = 8;
-	pixel_y = 15;
-	layer = 4.3
+	pixel_y = 15
 	},
 /obj/effect/decal/cleanable/dirt/greenglow{
 	color = "#140400";
@@ -170645,8 +170339,6 @@
 "ykN" = (
 /obj/effect/hybrisa/decal/dirt,
 /obj/structure/machinery/colony_floodlight/street{
-	layer = 7;
-	level = 7;
 	pixel_y = 12
 	},
 /turf/open/hybrisa/street/cement3,
@@ -183015,7 +182707,7 @@ fQT
 bVH
 xAL
 tfm
-hJd
+hQb
 hQb
 hQb
 hQb
@@ -183267,7 +182959,7 @@ wzS
 lnG
 xAL
 tfm
-icb
+cPM
 eEA
 sSr
 sSr
@@ -183771,7 +183463,7 @@ xiF
 htm
 xAL
 tfm
-wgT
+tjy
 khh
 rCG
 mny
@@ -184275,7 +183967,7 @@ fNq
 utp
 xAL
 tfm
-wgT
+tjy
 khh
 rCG
 rCG
@@ -184779,7 +184471,7 @@ yjW
 kIz
 xAL
 tfm
-rzy
+cnK
 dRE
 vYT
 vYT
@@ -185031,7 +184723,7 @@ kIX
 sQX
 xAL
 tfm
-xyV
+oYS
 oYS
 oYS
 oYS
@@ -190770,7 +190462,7 @@ uVe
 jdY
 nsh
 odz
-xZU
+kFE
 yad
 yad
 psj
@@ -199364,7 +199056,7 @@ tHD
 gCI
 gCI
 gHS
-lGw
+nvP
 fkJ
 mmb
 mmb
@@ -199616,7 +199308,7 @@ pBu
 bwC
 bwC
 xcZ
-nvP
+lGw
 bas
 dQU
 dQU
@@ -199626,7 +199318,7 @@ miD
 pls
 dhM
 miD
-oDh
+kql
 miD
 ooC
 miD
@@ -209239,12 +208931,12 @@ nGC
 xUi
 jNR
 goh
-cbY
+wbj
 kJX
-cbY
+wbj
 tKk
 rLU
-cbY
+voq
 cuw
 sfO
 sfO
@@ -209497,7 +209189,7 @@ bHd
 wlY
 ebu
 chL
-ppt
+oVP
 uRz
 kjb
 mRz
@@ -209749,7 +209441,7 @@ lHt
 uzl
 dpG
 riz
-tkw
+cbY
 rqd
 lmj
 dAf
@@ -210499,9 +210191,9 @@ nGC
 xUi
 xWt
 qqK
-cbY
+wbj
 kJX
-cbY
+wbj
 tVL
 rLU
 cbY
@@ -211970,7 +211662,7 @@ xQs
 bif
 sSv
 kht
-rtJ
+jsW
 ewo
 dSA
 yew
@@ -214238,7 +213930,7 @@ skg
 mbe
 gdA
 eui
-rtJ
+jsW
 bXx
 fIV
 aAz
@@ -215750,8 +215442,8 @@ mrq
 xUi
 wYB
 kht
-rtJ
-ffR
+jsW
+oJr
 wWV
 bit
 lWc
@@ -216002,7 +215694,7 @@ tIT
 bif
 ejj
 kht
-rtJ
+acy
 tpx
 tpx
 mog
@@ -218522,8 +218214,8 @@ nGC
 xUi
 sSv
 kht
-rtJ
-rqa
+jsW
+pha
 wWV
 kht
 jEy