diff --git a/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm b/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm index 0685cdb39eb..dc0aad02f00 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm @@ -141,7 +141,7 @@ /turf/simulated/floor/plating/burnt/airless, /area/space) "U" = ( -/obj/effect/spawner/random_barrier/wall_probably, +/obj/effect/spawner/random/barrier/wall_probably, /turf/space, /area/space) "V" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm b/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm index 70119730e7b..56d8b0a3d02 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm @@ -1725,7 +1725,7 @@ /turf/simulated/floor/catwalk, /area/ruin/space/telecomms/powercontrol) "Aj" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/engine, /area/ruin/space/telecomms/computer) "Ay" = ( diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 0e84283fe62..4a92fd3b2ca 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -2697,7 +2697,7 @@ icon_state = "1-2" }, /obj/effect/spawner/random_spawners/dirt_maybe, -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "gu" = ( @@ -6170,7 +6170,7 @@ /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "yR" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/spawner/random_spawners/dirt_maybe, /obj/effect/decal/cleanable/spiderling_remains, /turf/simulated/floor/plating, @@ -7005,7 +7005,7 @@ /turf/simulated/wall, /area/mine/outpost/airlock) "DA" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /obj/effect/spawner/random_spawners/dirt_maybe, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/east) @@ -8085,7 +8085,7 @@ /turf/simulated/wall, /area/mine/outpost/maintenance/south) "KH" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "KI" = ( diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 33e69861416..efc65bc62cd 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -5014,11 +5014,11 @@ /turf/space, /area/station/engineering/solar/fore_port) "asc" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plating, /area/station/maintenance/fore) "asf" = ( -/obj/effect/spawner/random_barrier/possibly_welded_airlock, +/obj/effect/spawner/random/barrier/possibly_welded_airlock, /turf/simulated/floor/plating, /area/station/maintenance/fore) "asg" = ( @@ -10563,7 +10563,7 @@ /area/station/maintenance/fpmaint) "aIS" = ( /obj/structure/grille, -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aIT" = ( @@ -11343,7 +11343,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aLt" = ( @@ -11807,7 +11807,7 @@ /area/station/maintenance/fsmaint) "aML" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aMM" = ( @@ -12286,7 +12286,7 @@ /turf/simulated/wall, /area/station/maintenance/fpmaint) "aOs" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aOt" = ( @@ -12626,7 +12626,7 @@ }, /area/station/maintenance/fpmaint) "aPv" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aPw" = ( @@ -12859,7 +12859,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aQe" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -13220,7 +13220,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aRm" = ( @@ -14702,7 +14702,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aVF" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -19981,7 +19981,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bkE" = ( @@ -23207,7 +23207,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/port) "btM" = ( @@ -26479,7 +26479,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "bGH" = ( -/obj/effect/spawner/random_barrier/possibly_welded_airlock, +/obj/effect/spawner/random/barrier/possibly_welded_airlock, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "bGJ" = ( @@ -33994,7 +33994,7 @@ /turf/simulated/wall, /area/station/maintenance/asmaint) "cja" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "cjb" = ( @@ -37463,7 +37463,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "cwl" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cwo" = ( @@ -38034,7 +38034,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/incinerator) "cyp" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/port) "cyq" = ( @@ -38258,7 +38258,7 @@ /turf/space, /area/station/engineering/solar/aft_port) "cyP" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plating, /area/station/maintenance/aft) "cyQ" = ( @@ -38345,7 +38345,7 @@ /area/station/medical/surgery/secondary) "cyZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/aft) "czb" = ( @@ -38368,7 +38368,7 @@ }, /area/station/science/hallway) "czf" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/aft) "czg" = ( @@ -38817,7 +38817,7 @@ }, /area/station/medical/storage) "cAu" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "cAv" = ( @@ -38829,7 +38829,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "cAz" = ( -/obj/effect/spawner/random_barrier/possibly_welded_airlock, +/obj/effect/spawner/random/barrier/possibly_welded_airlock, /turf/simulated/floor/plating, /area/station/maintenance/aft) "cAA" = ( @@ -39003,7 +39003,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/incinerator) "cBe" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -40026,7 +40026,7 @@ }, /area/station/maintenance/aft) "cEE" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "cEH" = ( @@ -41575,7 +41575,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -41937,7 +41937,7 @@ /area/station/engineering/break_room) "cLN" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "cLO" = ( @@ -42378,7 +42378,7 @@ }, /area/station/science/xenobiology) "cNs" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable{ d1 = 1; @@ -47584,7 +47584,7 @@ /area/station/engineering/ai_transit_tube) "dge" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "dgg" = ( @@ -51560,7 +51560,7 @@ }, /area/station/command/office/hop) "dKb" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -52861,7 +52861,7 @@ }, /area/station/engineering/gravitygenerator) "ejH" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -53993,7 +53993,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "eOb" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -54564,7 +54564,7 @@ "fcM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_barrier/possibly_welded_airlock, +/obj/effect/spawner/random/barrier/possibly_welded_airlock, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "fcQ" = ( @@ -56177,7 +56177,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/aft_starboard) "fNM" = ( -/obj/effect/spawner/random_barrier/possibly_welded_airlock, +/obj/effect/spawner/random/barrier/possibly_welded_airlock, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -57110,7 +57110,7 @@ }, /area/station/hallway/primary/central/west) "gmu" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/aft) "gmz" = ( @@ -58021,7 +58021,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "gJU" = ( @@ -59489,7 +59489,7 @@ /area/station/security/permabrig) "htV" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/port) "hug" = ( @@ -59562,7 +59562,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -62606,7 +62606,7 @@ }, /area/station/security/prison/cell_block/A) "iZV" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) @@ -62832,7 +62832,7 @@ /area/station/security/permabrig) "jgA" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "jgQ" = ( @@ -65032,7 +65032,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "kju" = ( @@ -66875,7 +66875,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/south) "lcL" = ( -/obj/effect/spawner/random_barrier/wall_probably, +/obj/effect/spawner/random/barrier/wall_probably, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "ldf" = ( @@ -73753,7 +73753,7 @@ "oxf" = ( /obj/effect/landmark/burnturf, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "oxp" = ( @@ -74562,7 +74562,7 @@ /area/station/maintenance/disposal) "oPp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "oPE" = ( @@ -75205,7 +75205,7 @@ /area/station/service/janitor) "pfF" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable{ d1 = 1; @@ -75858,7 +75858,7 @@ /area/station/engineering/atmos) "pxz" = ( /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/aft) "pxG" = ( @@ -76189,7 +76189,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "pEO" = ( @@ -76450,7 +76450,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "pNx" = ( @@ -79866,7 +79866,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "rmn" = ( @@ -79933,7 +79933,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "rng" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "rnx" = ( @@ -80707,7 +80707,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) "rID" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) @@ -80859,7 +80859,7 @@ }, /area/station/maintenance/asmaint2) "rNN" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) @@ -83073,7 +83073,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -83646,7 +83646,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "tmS" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "tmX" = ( @@ -84294,7 +84294,7 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "tEt" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -85495,7 +85495,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "ugC" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "ugH" = ( @@ -85716,7 +85716,7 @@ /area/station/medical/surgery/observation) "unu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -86012,7 +86012,7 @@ /area/station/maintenance/apmaint) "uwi" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/sign/xenobio{ pixel_x = -31 }, @@ -86205,7 +86205,7 @@ /turf/simulated/floor/plating, /area/station/security/main) "uBz" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -86307,7 +86307,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "uEF" = ( @@ -86445,7 +86445,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -86487,7 +86487,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plasteel, /area/station/maintenance/fpmaint) "uKy" = ( @@ -86584,7 +86584,7 @@ /area/station/maintenance/fpmaint) "uOG" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/aft) "uPg" = ( @@ -89243,7 +89243,7 @@ "wgA" = ( /obj/effect/landmark/burnturf, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "wgO" = ( @@ -89439,7 +89439,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/port) "wlJ" = ( @@ -91887,7 +91887,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "xxa" = ( @@ -92575,7 +92575,7 @@ /area/station/engineering/control) "xOA" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "xOM" = ( @@ -93245,7 +93245,7 @@ /area/station/command/office/hop) "ybL" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "ybN" = ( diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 15720336fae..a8806af20dd 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -3908,7 +3908,7 @@ /turf/simulated/wall, /area/station/security/range) "azv" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -6850,12 +6850,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/east) -"aUB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "darkgreenfull" - }, -/area/station/service/hydroponics) "aUE" = ( /obj/machinery/light{ dir = 8 @@ -9158,7 +9152,7 @@ /area/station/hallway/spacebridge/dockmed) "bis" = ( /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating{ icon_state = "asteroidplating" @@ -14169,7 +14163,7 @@ }, /area/station/service/library) "bGB" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "bGF" = ( @@ -18508,7 +18502,7 @@ /area/station/maintenance/apmaint) "caX" = ( /obj/effect/spawner/random_spawners/dirt_frequent, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "caY" = ( @@ -26895,11 +26889,6 @@ icon_state = "redcorner" }, /area/station/security/prison/cell_block/A) -"dcR" = ( -/obj/structure/table, -/obj/effect/spawner/random/maintenance, -/turf/simulated/floor/plating/asteroid/ancient, -/area/station/maintenance/port) "dda" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -28033,6 +28022,17 @@ /obj/machinery/ai_status_display, /turf/simulated/wall/r_wall, /area/station/security/prisonlockers) +"dkb" = ( +/obj/machinery/requests_console/directional/south, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/station/security/detective) "dkc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -34515,7 +34515,7 @@ /turf/simulated/floor/plating, /area/station/service/bar) "ezr" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -34671,7 +34671,7 @@ /turf/simulated/floor/plating, /area/station/command/office/hos) "eBq" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -35907,12 +35907,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/port) -"eTe" = ( -/obj/machinery/hologram/holopad, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/station/service/hydroponics) "eTg" = ( /obj/machinery/recharge_station, /turf/simulated/floor/plasteel{ @@ -35959,7 +35953,8 @@ /turf/simulated/floor/grass, /area/station/hallway/spacebridge/scidock) "eTI" = ( -/obj/effect/decal/cleanable/blood/splatter, +/obj/structure/table, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/port) "eTJ" = ( @@ -37353,7 +37348,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal/north) "fsV" = ( -/obj/effect/spawner/random_barrier/wall_probably, +/obj/effect/spawner/random/barrier/wall_probably, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/starboard) "fsW" = ( @@ -37632,6 +37627,13 @@ }, /turf/simulated/floor/plating, /area/station/hallway/primary/central/west) +"fvV" = ( +/obj/structure/chair/office/dark{ + dir = 4 + }, +/obj/effect/landmark/start/detective, +/turf/simulated/floor/carpet, +/area/station/security/detective) "fwd" = ( /obj/effect/decal/cleanable/crayon, /turf/simulated/floor/wood, @@ -38752,6 +38754,12 @@ icon_state = "dark" }, /area/station/engineering/control) +"fPD" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/maintenance/port) "fPE" = ( /obj/structure/disposalpipe/segment/corner{ dir = 4 @@ -40497,7 +40505,7 @@ /turf/simulated/floor/plasteel/freezer, /area/station/service/kitchen) "gsr" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "gsx" = ( @@ -40522,7 +40530,7 @@ pixel_y = -24; pixel_x = -32 }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -41260,25 +41268,6 @@ icon_state = "whitepurple" }, /area/station/science/genetics) -"gEI" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Walkway" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id_tag = "servlockdown"; - layer = 2.6; - name = "Service Lockdown" - }, -/obj/structure/disposalpipe/segment{ - color = "#954535" - }, -/obj/effect/turf_decal/caution/red, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/station/hallway/spacebridge/sercom) "gEJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -43009,7 +42998,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "hgx" = ( @@ -43812,7 +43801,6 @@ /area/station/service/bar) "htz" = ( /obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ icon_state = "darkgreenfull" }, @@ -47264,6 +47252,13 @@ icon_state = "browncorner" }, /area/station/hallway/primary/fore/east) +"inP" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/maintenance/port) "inQ" = ( /obj/machinery/door/airlock/maintenance{ name = "Port Asteroid Maintenance" @@ -48897,7 +48892,7 @@ /area/station/hallway/primary/fore/east) "iJM" = ( /obj/effect/spawner/random_spawners/dirt_frequent, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "iJY" = ( @@ -50482,6 +50477,21 @@ icon_state = "dark" }, /area/station/hallway/primary/starboard/south) +"jeu" = ( +/obj/machinery/hologram/holopad, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/service/hydroponics) "jeB" = ( /obj/structure/transit_tube/station/reverse/flipped{ dir = 4 @@ -51146,6 +51156,22 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/security/lobby) +"joS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/service/hydroponics) "joZ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -53202,7 +53228,7 @@ /area/station/science/xenobiology) "jNU" = ( /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -55788,15 +55814,6 @@ /area/station/medical/medbay) "kAT" = ( /obj/machinery/hologram/holopad, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -57758,12 +57775,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/port) -"lhc" = ( -/obj/effect/spawner/random_spawners/dirt_often, -/turf/simulated/floor/plasteel{ - icon_state = "darkgreenfull" - }, -/area/station/service/hydroponics) "lhf" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable/orange{ @@ -57997,6 +58008,10 @@ }, /turf/simulated/floor/plasteel/freezer, /area/station/service/kitchen) +"ljz" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/simulated/floor/plating/asteroid/ancient, +/area/station/maintenance/port) "ljL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -61297,11 +61312,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "mgq" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plating{ - icon_state = "asteroidplating" +/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel{ + icon_state = "darkgreenfull" }, -/area/station/maintenance/port) +/area/station/service/hydroponics) "mgu" = ( /obj/docking_port/stationary{ dir = 4; @@ -61670,7 +61686,7 @@ }, /area/station/science/robotics) "mmv" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -65387,16 +65403,8 @@ /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "nsy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -69153,7 +69161,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port2) "oyh" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) "oyo" = ( @@ -80846,7 +80854,7 @@ /turf/simulated/wall, /area/station/public/toilet) "rNW" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/fsmaint) "rOc" = ( @@ -81338,7 +81346,7 @@ /turf/simulated/floor/wood, /area/station/service/bar) "rVD" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -84495,14 +84503,6 @@ icon_state = "asteroidplating" }, /area/station/maintenance/port) -"sNb" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/station/service/hydroponics) "sNm" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ @@ -88027,6 +88027,12 @@ /obj/effect/spawner/airlock/s_to_n, /turf/simulated/wall, /area/station/hallway/primary/central/north) +"tMD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "darkgreenfull" + }, +/area/station/service/hydroponics) "tMN" = ( /obj/machinery/door/airlock/external{ id_tag = "laborcamp_home"; @@ -92038,7 +92044,7 @@ /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "uQB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "darkgreenfull" }, @@ -95546,7 +95552,7 @@ /area/station/public/storage/tools) "vPd" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "vPj" = ( @@ -101186,7 +101192,7 @@ }, /area/station/hallway/primary/port/north) "xrI" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/starboard) "xrN" = ( @@ -101853,7 +101859,7 @@ }, /area/station/science/misc_lab) "xAK" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "xAO" = ( @@ -101996,13 +102002,25 @@ icon_state = "dark" }, /area/station/engineering/control) -"xCH" = ( -/obj/structure/rack, -/obj/effect/spawner/random/maintenance, -/turf/simulated/floor/plating{ - icon_state = "asteroidplating" +"xCu" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Walkway" }, -/area/station/maintenance/port) +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id_tag = "servlockdown"; + layer = 2.6; + name = "Service Lockdown" + }, +/obj/structure/disposalpipe/segment{ + color = "#954535" + }, +/obj/effect/turf_decal/caution/red, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/station/hallway/spacebridge/sercom) "xCR" = ( /obj/machinery/computer/security/telescreen/entertainment, /turf/simulated/mineral/ancient, @@ -102173,7 +102191,7 @@ }, /area/station/command/teleporter) "xEX" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/asmaint) "xEZ" = ( @@ -102379,13 +102397,6 @@ /obj/machinery/light/small, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/port) -"xHt" = ( -/obj/structure/chair/office/dark{ - dir = 4 - }, -/obj/effect/landmark/start/detective, -/turf/simulated/floor/carpet, -/area/station/security/detective) "xHF" = ( /obj/structure/cable/orange{ d1 = 4; @@ -103211,17 +103222,6 @@ icon_state = "whitepurple" }, /area/station/maintenance/apmaint) -"xTG" = ( -/obj/machinery/requests_console/directional/south, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/station/security/detective) "xTL" = ( /turf/simulated/floor/plasteel{ icon_state = "white" @@ -113273,7 +113273,7 @@ rho uSf ygl wzC -mgq +fPD aXn aXn aXn @@ -113530,7 +113530,7 @@ aXn wGX ygl wzC -xCH +inP aXn aXn aXn @@ -114566,7 +114566,7 @@ eHn ohJ gUw xZV -eTI +ljz iuf mkL aXn @@ -115083,7 +115083,7 @@ aXn aXn dLa hwS -eTI +ljz kad uCK aXn @@ -116065,7 +116065,7 @@ eHu aXn aXn aXn -xCH +inP eCI ltk wzC @@ -117854,7 +117854,7 @@ uCK aXn aXn hvI -dcR +eTI pAV pXy dHZ @@ -119901,7 +119901,7 @@ aXn aXn eCI pDl -xCH +inP aXn aXn ock @@ -120135,8 +120135,8 @@ chV evL qwd pPN -xHt -xTG +fvV +dkb emw abW nxA @@ -122774,7 +122774,7 @@ btd btd uql cBs -nsy +joS cBs cBs biB @@ -122977,7 +122977,7 @@ bpf pbY pbY pbY -gEI +xCu abT jSU grv @@ -123031,9 +123031,9 @@ cuk prN mcu pcu -kAT +jeu jKU -sNb +nsy biB hqe btd @@ -123808,7 +123808,7 @@ biB biB xNP biB -eTe +kAT kDy biB etV @@ -124582,7 +124582,7 @@ lJR lJR btd pNE -htz +mgq btd cEM eQC @@ -125343,11 +125343,11 @@ muv lYO riS mcu -aUB -aUB -aUB -hpP uQB +uQB +uQB +hpP +tMD haI lUc xAS @@ -125600,7 +125600,7 @@ baF jUW fPp cxx -lhc +htz xnz wFD rxy diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index dd9cb4ba898..e2cfdca8fa9 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -5944,7 +5944,7 @@ }, /area/station/maintenance/fore) "ayr" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/fore) "ays" = ( @@ -10790,7 +10790,7 @@ /area/station/maintenance/fore) "aLC" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -16524,7 +16524,7 @@ }, /area/station/maintenance/fore) "baD" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -30985,7 +30985,7 @@ /turf/space, /area/space/nearstation) "bLN" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/port) "bLO" = ( @@ -31726,7 +31726,7 @@ icon_state = "1-2" }, /obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bNI" = ( @@ -35464,7 +35464,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "bYa" = ( -/obj/effect/spawner/random_barrier/possibly_welded_airlock, +/obj/effect/spawner/random/barrier/possibly_welded_airlock, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -65684,7 +65684,7 @@ }, /area/station/medical/surgery/primary) "eHp" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "eHD" = ( @@ -68860,8 +68860,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_barrier/possibly_welded_airlock, -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/possibly_welded_airlock, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "gyp" = ( @@ -70383,7 +70383,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/library) "huq" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "huN" = ( @@ -73321,7 +73321,7 @@ }, /area/station/engineering/atmos) "jhk" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "jhr" = ( @@ -75073,7 +75073,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "kju" = ( @@ -76722,7 +76722,7 @@ /turf/simulated/floor/plating, /area/station/science/server) "llm" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -77325,7 +77325,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "lAG" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "lAO" = ( @@ -77663,7 +77663,7 @@ }, /area/station/hallway/secondary/entry/south) "lMM" = ( -/obj/effect/spawner/random_barrier/wall_probably, +/obj/effect/spawner/random/barrier/wall_probably, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "lNF" = ( @@ -77764,7 +77764,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "lQl" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "lQs" = ( @@ -79117,7 +79117,7 @@ /turf/simulated/floor/plating, /area/station/science/toxins/launch) "mHK" = ( -/obj/effect/spawner/random_barrier/possibly_welded_airlock, +/obj/effect/spawner/random/barrier/possibly_welded_airlock, /obj/structure/barricade/wooden, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/simulated/floor/plating, @@ -82307,7 +82307,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "osF" = ( @@ -92935,7 +92935,7 @@ /turf/simulated/floor/plasteel/grimy, /area/station/service/chapel/office) "ugI" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "ugQ" = ( diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 3c8238ba991..149dc06e9d8 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -971,7 +971,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/fore) @@ -3777,7 +3777,7 @@ }, /area/station/maintenance/apmaint) "aMQ" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -4325,7 +4325,7 @@ /turf/simulated/floor/wood, /area/station/service/library) "aRD" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/fore) "aRO" = ( @@ -5120,7 +5120,7 @@ }, /area/station/turret_protected/ai) "aYL" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -5693,7 +5693,7 @@ }, /area/station/supply/expedition) "beq" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -6618,7 +6618,7 @@ }, /area/station/service/hydroponics) "bmZ" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "bnc" = ( @@ -6964,7 +6964,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "bpT" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -7364,7 +7364,7 @@ "btt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/junction{ dir = 1 @@ -9896,7 +9896,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "bPz" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) "bPA" = ( @@ -10429,7 +10429,7 @@ }, /area/station/science/break_room) "bTR" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft2) @@ -11166,7 +11166,7 @@ }, /area/station/engineering/gravitygenerator) "cbp" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random{ pixel_x = 32 @@ -12092,7 +12092,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "ckV" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -12150,7 +12150,7 @@ /area/station/maintenance/asmaint) "cly" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/hallway/primary/central/ne) "clF" = ( @@ -12275,7 +12275,7 @@ }, /area/station/medical/virology) "cmE" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -13165,7 +13165,7 @@ /turf/simulated/floor/plasteel, /area/station/public/storage/tools/auxiliary) "cvT" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -13698,7 +13698,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/aft) "cBD" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "cBH" = ( @@ -13818,7 +13818,7 @@ /turf/simulated/floor/engine, /area/station/engineering/engine) "cCG" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/fore) @@ -15059,7 +15059,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cPy" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/starboard) @@ -15121,7 +15121,7 @@ }, /area/station/science/research) "cPS" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable{ @@ -18736,7 +18736,7 @@ /area/station/hallway/primary/central/se) "dzk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "dzA" = ( @@ -18788,7 +18788,7 @@ }, /area/station/service/kitchen) "dAe" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -19318,7 +19318,7 @@ /turf/simulated/floor/engine, /area/station/engineering/engine) "dEV" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -20286,7 +20286,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/north) "dOx" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/machinery/alarm/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -20703,7 +20703,7 @@ }, /area/station/public/shops) "dTb" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -22016,7 +22016,7 @@ /turf/simulated/floor/wood, /area/station/public/dorms) "ehO" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -22237,7 +22237,7 @@ }, /area/station/security/processing) "ejV" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -23749,7 +23749,7 @@ /turf/simulated/floor/carpet, /area/station/command/office/hop) "eyo" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) @@ -26158,7 +26158,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "eVV" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -26391,7 +26391,7 @@ }, /area/station/medical/virology) "eYc" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -26757,7 +26757,7 @@ /area/station/engineering/atmos) "faA" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -29431,7 +29431,7 @@ /turf/simulated/floor/wood, /area/station/service/clown) "fxy" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "fxz" = ( @@ -30095,7 +30095,7 @@ /turf/simulated/floor/wood, /area/station/security/permabrig) "fEp" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -30198,7 +30198,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "fFW" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/spawner/lootdrop{ loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "trash spawner" @@ -30318,7 +30318,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/west) "fGG" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -30478,7 +30478,7 @@ /turf/space, /area/station/engineering/solar/aft_starboard) "fIk" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "fIl" = ( @@ -30789,7 +30789,7 @@ /turf/simulated/floor/wood, /area/station/public/vacant_office) "fKS" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -31292,7 +31292,7 @@ }, /area/station/security/permabrig) "fOz" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -32794,7 +32794,7 @@ }, /area/station/public/dorms) "gez" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -33513,7 +33513,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random{ pixel_y = -32 @@ -35784,7 +35784,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) "gHn" = ( @@ -36402,7 +36402,7 @@ }, /area/station/security/prison/cell_block) "gNy" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -36954,7 +36954,7 @@ }, /area/station/medical/storage/secondary) "gTE" = ( -/obj/effect/spawner/random_barrier/possibly_welded_airlock, +/obj/effect/spawner/random/barrier/possibly_welded_airlock, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "gTI" = ( @@ -37299,7 +37299,7 @@ }, /area/station/legal/lawoffice) "gWM" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 2; @@ -37482,7 +37482,7 @@ /turf/simulated/floor/grass/no_creep, /area/station/medical/virology) "gYD" = ( -/obj/effect/spawner/random_barrier/possibly_welded_airlock, +/obj/effect/spawner/random/barrier/possibly_welded_airlock, /turf/simulated/floor/plating, /area/station/maintenance/aft) "gYF" = ( @@ -37865,7 +37865,7 @@ /turf/simulated/floor/plating/airless, /area/station/turret_protected/aisat/interior) "hbO" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -37948,7 +37948,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -38440,7 +38440,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "hhe" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -40150,7 +40150,7 @@ /turf/simulated/floor/engine/xenobio, /area/station/science/xenobiology) "hwR" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) @@ -44146,7 +44146,7 @@ /turf/simulated/floor/carpet, /area/station/legal/courtroom) "ijv" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "ijw" = ( @@ -44166,7 +44166,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "ijF" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) @@ -46228,7 +46228,7 @@ /turf/simulated/floor/plating, /area/station/security/permabrig) "iEr" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/spawner/random_spawners/oil_maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -46596,7 +46596,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "iHn" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "iHq" = ( @@ -46883,7 +46883,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/port) @@ -47626,7 +47626,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "iQH" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -48123,7 +48123,7 @@ /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "iVl" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "iVu" = ( @@ -51208,7 +51208,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/hallway/primary/central/ne) "jzG" = ( @@ -51319,7 +51319,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "jAl" = ( @@ -51329,7 +51329,7 @@ /turf/simulated/floor/grass, /area/station/hallway/secondary/exit) "jAv" = ( -/obj/effect/spawner/random_barrier/wall_probably, +/obj/effect/spawner/random/barrier/wall_probably, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -51981,7 +51981,7 @@ }, /area/station/science/storage) "jFM" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -52261,7 +52261,7 @@ /obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "jIn" = ( @@ -52427,7 +52427,7 @@ }, /area/station/security/evidence) "jJF" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -53111,7 +53111,7 @@ /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) @@ -53538,7 +53538,7 @@ /turf/simulated/floor/carpet, /area/station/hallway/secondary/entry/lounge) "jUP" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) @@ -53742,7 +53742,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "jWA" = ( @@ -54523,7 +54523,7 @@ }, /area/station/maintenance/apmaint) "kdV" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -55562,7 +55562,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/dorms/fore) "koz" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) @@ -55679,7 +55679,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 9 }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/landmark/damageturf, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) @@ -57185,7 +57185,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "kFs" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -57601,7 +57601,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -58337,7 +58337,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "kQk" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -58358,7 +58358,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint) "kQw" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -58547,7 +58547,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "kRC" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 1 }, @@ -59715,7 +59715,7 @@ }, /area/station/turret_protected/ai) "lfn" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -60394,7 +60394,7 @@ }, /area/station/security/prison/cell_block) "llN" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) "llQ" = ( @@ -61423,7 +61423,7 @@ /turf/simulated/floor/plating, /area/station/science/toxins/mixing) "lvf" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plating, /area/station/maintenance/aft) "lvl" = ( @@ -61861,7 +61861,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "lyU" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/disposalpipe/segment, @@ -62027,7 +62027,7 @@ }, /area/station/supply/lobby) "lzK" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -62558,7 +62558,7 @@ }, /area/station/engineering/atmos) "lEX" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "lFb" = ( @@ -63371,7 +63371,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "lOB" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -63958,7 +63958,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "lVm" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -64614,7 +64614,7 @@ /area/station/public/dorms) "mcn" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plasteel, /area/station/maintenance/fpmaint) "mct" = ( @@ -65901,7 +65901,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -66103,7 +66103,7 @@ /turf/simulated/floor/wood, /area/station/public/vacant_office) "mqJ" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -67592,7 +67592,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "mGi" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -67735,7 +67735,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) "mIg" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -69558,7 +69558,7 @@ /turf/simulated/floor/plasteel, /area/station/command/teleporter) "mZE" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) "mZK" = ( @@ -69953,7 +69953,7 @@ }, /area/station/hallway/primary/central/sw) "ndJ" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/landmark/burnturf, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -70343,7 +70343,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "ngX" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -72280,7 +72280,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "nzv" = ( -/obj/effect/spawner/random_barrier/possibly_welded_airlock, +/obj/effect/spawner/random/barrier/possibly_welded_airlock, /obj/structure/barricade/wooden, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) @@ -72521,7 +72521,7 @@ /turf/simulated/floor/plasteel, /area/station/public/storage/tools/auxiliary) "nBB" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 4 @@ -72910,7 +72910,7 @@ }, /area/station/supply/lobby) "nFE" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/dorms/fore) "nFI" = ( @@ -74055,7 +74055,7 @@ }, /area/station/medical/medbay) "nOx" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -76212,7 +76212,7 @@ /turf/simulated/floor/plating, /area/station/service/chapel/funeral) "ohZ" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "oic" = ( @@ -76879,7 +76879,7 @@ }, /area/station/public/sleep) "oni" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -77473,7 +77473,7 @@ }, /area/station/service/kitchen) "osB" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -79100,7 +79100,7 @@ /turf/simulated/floor/lava/plasma/fuming, /area/station/engineering/atmos/asteroid_core) "oKb" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -79648,7 +79648,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/south) "oNO" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -80948,7 +80948,7 @@ /turf/simulated/floor/carpet, /area/station/security/detective) "oYL" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, @@ -81150,7 +81150,7 @@ }, /area/station/science/xenobiology) "pav" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -81577,7 +81577,7 @@ }, /area/station/service/kitchen) "peH" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/disposalpipe/segment, @@ -81786,7 +81786,7 @@ }, /area/station/hallway/primary/fore/north) "pgk" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -81824,7 +81824,7 @@ /turf/simulated/floor/plating, /area/station/engineering/ai_transit_tube) "pgr" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -83187,7 +83187,7 @@ /turf/simulated/floor/carpet, /area/station/hallway/primary/central/se) "puz" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -83658,7 +83658,7 @@ /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) "pAf" = ( @@ -84720,7 +84720,7 @@ /turf/simulated/floor/plating, /area/station/aisat/service) "pIP" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/aft) "pIU" = ( @@ -85185,7 +85185,7 @@ }, /area/station/turret_protected/aisat/interior) "pMM" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -85218,7 +85218,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "pNl" = ( @@ -86357,7 +86357,7 @@ /turf/simulated/floor/wood, /area/station/service/bar) "pZQ" = ( -/obj/effect/spawner/random_barrier/possibly_welded_airlock, +/obj/effect/spawner/random/barrier/possibly_welded_airlock, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "pZU" = ( @@ -86520,7 +86520,7 @@ }, /area/station/legal/courtroom) "qbz" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) "qbZ" = ( @@ -87200,7 +87200,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "qib" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -87893,7 +87893,7 @@ "qpR" = ( /obj/effect/decal/cleanable/shreds, /obj/item/airlock_electronics/destroyed, -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -90240,7 +90240,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/aft2) "qMW" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -90818,7 +90818,7 @@ /turf/simulated/wall, /area/station/maintenance/aft) "qTH" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) "qTK" = ( @@ -91399,7 +91399,7 @@ /turf/simulated/floor/plating, /area/station/security/warden) "qYA" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -92395,7 +92395,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 8 }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -93876,7 +93876,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) "ruB" = ( @@ -94025,7 +94025,7 @@ }, /area/station/public/shops) "rvy" = ( -/obj/effect/spawner/random_barrier/possibly_welded_airlock, +/obj/effect/spawner/random/barrier/possibly_welded_airlock, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "rvz" = ( @@ -95512,7 +95512,7 @@ }, /area/station/science/storage) "rKe" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -95599,7 +95599,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "rKO" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) @@ -98823,7 +98823,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/security/fore) "snP" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -99665,7 +99665,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "sww" = ( -/obj/effect/spawner/random_barrier/possibly_welded_airlock, +/obj/effect/spawner/random/barrier/possibly_welded_airlock, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) @@ -100254,7 +100254,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) "sBB" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) @@ -101247,7 +101247,7 @@ /turf/simulated/floor/plasteel, /area/station/command/office/ce) "sKI" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -101929,7 +101929,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "sRI" = ( -/obj/effect/spawner/random_barrier/possibly_welded_airlock, +/obj/effect/spawner/random/barrier/possibly_welded_airlock, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "sRJ" = ( @@ -102079,7 +102079,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "sTJ" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -102293,7 +102293,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft2) "sVz" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -103652,7 +103652,7 @@ }, /area/station/supply/storage) "thk" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -104956,7 +104956,7 @@ /turf/simulated/floor/engine/xenobio, /area/station/science/xenobiology) "tsp" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -105246,7 +105246,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "tuC" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -106047,7 +106047,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "tEl" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -106463,7 +106463,7 @@ /turf/simulated/floor/grass, /area/station/security/permabrig) "tIC" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "tID" = ( @@ -106864,7 +106864,7 @@ }, /area/station/medical/cloning) "tLi" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "tLr" = ( @@ -106914,7 +106914,7 @@ }, /area/station/telecomms/computer) "tMm" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) "tMn" = ( @@ -107426,7 +107426,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/starboard) "tSJ" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -107797,7 +107797,7 @@ /turf/simulated/floor/plating, /area/station/engineering/engine) "tVF" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) @@ -108136,7 +108136,7 @@ /area/station/medical/cloning) "tYb" = ( /obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -108211,7 +108211,7 @@ }, /area/station/public/dorms) "tYI" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -109559,7 +109559,7 @@ }, /area/station/hallway/secondary/entry/lounge) "ulr" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -109614,7 +109614,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "umn" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -109747,7 +109747,7 @@ }, /area/station/service/theatre) "unV" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -109887,7 +109887,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) "uph" = ( @@ -111196,7 +111196,7 @@ }, /area/station/hallway/primary/central/ne) "uBC" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -111598,7 +111598,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "uFA" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "uFC" = ( @@ -111914,7 +111914,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "uHL" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -113195,7 +113195,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/starboard) "uTQ" = ( @@ -113955,7 +113955,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/storage) "vbP" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plasteel, /area/station/maintenance/aft) "vbS" = ( @@ -114320,7 +114320,7 @@ /turf/simulated/floor/grass, /area/station/hallway/secondary/exit) "vfZ" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -115842,7 +115842,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "vuF" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/fore) @@ -117045,7 +117045,7 @@ }, /area/station/security/checkpoint/secondary) "vGd" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -117880,7 +117880,7 @@ }, /area/station/service/hydroponics) "vMJ" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -120619,7 +120619,7 @@ }, /area/station/service/bar) "wno" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) @@ -120862,7 +120862,7 @@ }, /area/station/medical/sleeper) "woU" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -120972,7 +120972,7 @@ }, /area/station/maintenance/asmaint) "wpY" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/item/decorations/sticky_decorations/flammable/tinsel/halloween{ pixel_y = 20 }, @@ -121966,7 +121966,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "wCd" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -122383,7 +122383,7 @@ }, /area/station/medical/virology) "wHk" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/aft) "wHn" = ( @@ -122565,7 +122565,7 @@ }, /area/station/engineering/atmos/transit) "wJj" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) @@ -123067,7 +123067,7 @@ }, /area/station/science/genetics) "wNQ" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -123410,7 +123410,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/incinerator) "wQC" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -124025,7 +124025,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "wXp" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "wXr" = ( @@ -124459,7 +124459,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "xbZ" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) "xcb" = ( @@ -124792,7 +124792,7 @@ /turf/simulated/floor/engine, /area/station/engineering/engine) "xfz" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -125987,7 +125987,7 @@ }, /area/station/security/permabrig) "xqe" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -126124,7 +126124,7 @@ /area/station/maintenance/dorms/starboard) "xrb" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -127173,7 +127173,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "xBo" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "xBs" = ( @@ -127361,7 +127361,7 @@ /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -128009,7 +128009,7 @@ /turf/simulated/floor/engine, /area/station/engineering/engine) "xJV" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -128319,7 +128319,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -128352,7 +128352,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "xNz" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -128917,7 +128917,7 @@ /turf/simulated/floor/grass, /area/station/hallway/secondary/exit) "xTH" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard) diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 0b026744f94..6a69edd21d2 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -2222,7 +2222,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aqO" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -3202,7 +3202,7 @@ /turf/simulated/wall, /area/station/public/mrchangs) "avs" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "avv" = ( @@ -4095,7 +4095,7 @@ }, /area/station/command/office/captain/bedroom) "ayk" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "ayr" = ( @@ -4415,7 +4415,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -4541,7 +4541,7 @@ }, /area/station/public/dorms) "aAf" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -5808,7 +5808,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/starboard2) "aFM" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -6829,7 +6829,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/north) "aJl" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/fore) "aJm" = ( @@ -7334,7 +7334,7 @@ /turf/simulated/floor/plating, /area/station/engineering/atmos/distribution) "aLc" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -7880,7 +7880,7 @@ /turf/simulated/floor/wood, /area/station/service/clown) "aMB" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -32592,7 +32592,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -35823,7 +35823,7 @@ /turf/simulated/wall, /area/station/maintenance/asmaint) "cAP" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "cAS" = ( @@ -42415,7 +42415,7 @@ /area/station/maintenance/starboard) "dcC" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "dcD" = ( @@ -44465,7 +44465,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "dHr" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "dHE" = ( @@ -48595,7 +48595,7 @@ }, /area/station/security/range) "fuy" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "fuC" = ( @@ -55662,7 +55662,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "iot" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "ioy" = ( @@ -56974,7 +56974,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "iRX" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -58414,7 +58414,7 @@ /turf/space, /area/space/nearstation) "jEA" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "jEC" = ( @@ -65301,7 +65301,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/lobby) "msw" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "msD" = ( @@ -67455,7 +67455,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/office) "niC" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -70764,7 +70764,7 @@ /turf/simulated/floor/plasteel, /area/station/science/robotics) "oNn" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -73032,7 +73032,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "pHF" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/xenobio_south) "pHM" = ( @@ -74342,7 +74342,7 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "qiP" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -75166,7 +75166,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/fore) "qyW" = ( @@ -77627,7 +77627,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "rCD" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "rDd" = ( @@ -78729,7 +78729,7 @@ /area/station/engineering/atmos/distribution) "rXf" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint) "rXj" = ( @@ -81082,7 +81082,7 @@ }, /area/station/hallway/primary/aft/north) "sZV" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -83635,7 +83635,7 @@ }, /area/station/security/main) "uhI" = ( -/obj/effect/spawner/random_spawners/grille_maybe, +/obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "uhJ" = ( @@ -86647,7 +86647,7 @@ /turf/simulated/floor/plating, /area/station/security/execution) "vxx" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "vxI" = ( @@ -87235,7 +87235,7 @@ /turf/simulated/floor/wood, /area/station/legal/courtroom) "vOJ" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -87891,7 +87891,7 @@ /turf/simulated/floor/plasteel, /area/station/science/toxins/mixing) "wfa" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/port) "wfs" = ( @@ -89005,7 +89005,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/east) "wFC" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "wFW" = ( @@ -91584,7 +91584,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "xNa" = ( -/obj/effect/spawner/random_spawners/grille_often, +/obj/effect/spawner/random/barrier/grille_often, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -92334,7 +92334,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "yaL" = ( -/obj/effect/spawner/random_barrier/obstruction, +/obj/effect/spawner/random/barrier/obstruction, /obj/effect/decal/cleanable/blood/writing{ dir = 8 }, diff --git a/code/game/objects/effects/spawners/random/random_spawner.dm b/code/game/objects/effects/spawners/random/random_spawner.dm index f0152ffd2a7..1120de174df 100644 --- a/code/game/objects/effects/spawners/random/random_spawner.dm +++ b/code/game/objects/effects/spawners/random/random_spawner.dm @@ -76,6 +76,8 @@ var/loot_spawned = 0 var/pixel_divider = FLOOR(spawn_random_offset_max_pixels / spawn_loot_split_pixel_offsets, 1) while((spawn_loot_count-loot_spawned) && length(loot)) + loot_spawned++ + var/lootspawn = pick_weight_recursive(loot) if(!spawn_loot_double) loot.Remove(lootspawn) @@ -84,6 +86,10 @@ if(spawn_scatter_radius > 0 && length(spawn_locations)) spawn_loc = pick(spawn_locations) + if(ispath(lootspawn, /turf)) + spawn_loc.ChangeTurf(lootspawn) + continue + var/atom/movable/spawned_loot = make_item(spawn_loc, lootspawn) spawned_loot.setDir(dir) @@ -100,7 +106,6 @@ var/column = FLOOR(loot_spawned / pixel_divider, 1) spawned_loot.pixel_x = spawn_loot_split_pixel_offsets * (loot_spawned % pixel_divider) + (column * spawn_loot_split_pixel_offsets) spawned_loot.pixel_y = spawn_loot_split_pixel_offsets * (loot_spawned % pixel_divider) - loot_spawned++ /** * Makes the actual item related to our spawner. If `record_spawn` is `TRUE`, diff --git a/code/game/objects/effects/spawners/random_barrier.dm b/code/game/objects/effects/spawners/random_barrier.dm index 385b0c38ace..0843419470d 100644 --- a/code/game/objects/effects/spawners/random_barrier.dm +++ b/code/game/objects/effects/spawners/random_barrier.dm @@ -1,72 +1,58 @@ -/obj/effect/spawner/random_barrier - name = "random tile" - icon = 'icons/effects/spawner_icons.dmi' - icon_state = "questionmark" - var/list/result = list( - /turf/simulated/floor/plasteel = 1, - /turf/simulated/wall = 1, - /obj/structure/falsewall = 1, - /obj/effect/spawner/window/reinforced = 1, - /obj/machinery/door/airlock = 1, - /obj/machinery/door/airlock/welded = 1, - /obj/structure/barricade/wooden = 1) +/obj/effect/spawner/random/barrier + name = "random barrier spawner" + icon = 'icons/effects/random_spawners.dmi' + icon_state = "barrier" + loot = list( + /obj/effect/spawner/window/reinforced, + /obj/machinery/door/airlock, + /obj/machinery/door/airlock/welded, + /obj/structure/barricade/wooden, + /obj/structure/falsewall, + /turf/simulated/floor/plasteel, + /turf/simulated/wall, + ) -// This needs to come before the initialization wave because -// the thing it creates might need to be initialized too -/obj/effect/spawner/random_barrier/Initialize() - . = ..() - var/turf/T = get_turf(src) - if(!T) - CRASH("Barrier spawner placed in nullspace!") - var/thing_to_place = pickweight(result) - if(ispath(thing_to_place, /turf)) - T.ChangeTurf(thing_to_place) - else - new thing_to_place(T) - return INITIALIZE_HINT_QDEL - -/obj/effect/spawner/random_barrier/wall_probably +/obj/effect/spawner/random/barrier/wall_probably name = "probably a wall" - icon_state = "girder" - result = list( - /turf/simulated/wall = 9, - /obj/structure/falsewall = 1) + icon_state = "wall" + loot = list( + /obj/structure/falsewall = 1, + /turf/simulated/wall = 9, + ) -/obj/effect/spawner/random_barrier/floor_probably - name = "probably a floor" - result = list( - /turf/simulated/floor/plasteel = 3, - /turf/simulated/wall = 1) - -/obj/effect/spawner/random_barrier/obstruction +/obj/effect/spawner/random/barrier/obstruction name = "obstruction" icon_state = "barrier" - result = list( - /turf/simulated/wall = 1, - /obj/structure/falsewall = 1, - /obj/structure/barricade/wooden = 1, - /obj/machinery/door/airlock/welded = 1) + loot = list( + /obj/machinery/door/airlock/welded, + /obj/structure/barricade/wooden, + /obj/structure/falsewall, + /turf/simulated/wall, + ) /// these have no access restrictions, so for internal maintenance only -/obj/effect/spawner/random_barrier/possibly_welded_airlock +/obj/effect/spawner/random/barrier/possibly_welded_airlock name = "possibly welded airlock" icon_state = "airlock" - result = list( - /obj/machinery/door/airlock = 3, - /obj/machinery/door/airlock/welded = 1) + loot = list( + /obj/machinery/door/airlock = 3, + /obj/machinery/door/airlock/welded = 1, + ) -/obj/effect/spawner/random_spawners/grille_often +/obj/effect/spawner/random/barrier/grille_often name = "grille often" icon_state = "grille" - result = list( - /obj/structure/grille = 8, - /obj/structure/grille/broken = 4, - /turf/simulated/floor/plating = 2) + loot = list( + /obj/structure/grille = 8, + /obj/structure/grille/broken = 4, + /turf/simulated/floor/plating = 2, + ) -/obj/effect/spawner/random_spawners/grille_maybe +/obj/effect/spawner/random/barrier/grille_maybe name = "grille maybe" icon_state = "grille" - result = list( - /obj/structure/grille = 2, - /obj/structure/grille/broken = 2, - /turf/simulated/floor/plating = 5) + loot = list( + /obj/structure/grille = 2, + /obj/structure/grille/broken = 2, + /turf/simulated/floor/plating = 5, + ) diff --git a/icons/effects/random_spawners.dmi b/icons/effects/random_spawners.dmi index fbf0d77c86e..993e5aa9a24 100644 Binary files a/icons/effects/random_spawners.dmi and b/icons/effects/random_spawners.dmi differ diff --git a/icons/effects/spawner_icons.dmi b/icons/effects/spawner_icons.dmi index 1b9730e5379..0417843bf62 100644 Binary files a/icons/effects/spawner_icons.dmi and b/icons/effects/spawner_icons.dmi differ diff --git a/tools/UpdatePaths/Scripts/26866_random_barrier_spawners.txt b/tools/UpdatePaths/Scripts/26866_random_barrier_spawners.txt new file mode 100644 index 00000000000..7bbe178be30 --- /dev/null +++ b/tools/UpdatePaths/Scripts/26866_random_barrier_spawners.txt @@ -0,0 +1,5 @@ +/obj/effect/spawner/random_barrier/wall_probably : /obj/effect/spawner/random/barrier/wall_probably +/obj/effect/spawner/random_barrier/obstruction : /obj/effect/spawner/random/barrier/obstruction +/obj/effect/spawner/random_barrier/possibly_welded_airlock : /obj/effect/spawner/random/barrier/possibly_welded_airlock +/obj/effect/spawner/random_spawners/grille_often : /obj/effect/spawner/random/barrier/grille_often +/obj/effect/spawner/random_spawners/grille_maybe : /obj/effect/spawner/random/barrier/grille_maybe