From 12cf1ed3ad1fc4cb108435fe7ec12a1c0b156c59 Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Mon, 26 Aug 2024 17:35:14 -0400 Subject: [PATCH] More varied and balanced maintenance loot. (#26500) * More varied and balanced maintenance loot. * linting * assign updatepaths script PR number * went a bit overboard with the trash * get rid of varedited lootdrop spawners on maps * Separate trash and food trash for mappers * fix incorrect food/other trash statistics * TM feedback tweaking round 1 Significantly lower occurrence of all tier 2 items. * allow randomizing angles, use for litter * move trait delta to define, bump loot chance 10% --- .../RandomRuins/SpaceRuins/abandonedzoo.dmm | 2 +- .../RandomRuins/SpaceRuins/casino.dmm | 2 +- .../RandomRuins/SpaceRuins/deepstorage.dmm | 74 +- .../RandomRuins/SpaceRuins/moonoutpost19.dmm | 58 +- .../SpaceRuins/telecomns_returns.dmm | 8 +- .../map_files/RandomRuins/SpaceRuins/ussp.dmm | 18 +- .../SpaceRuins/wreckedcargoship.dmm | 4 +- _maps/map_files/generic/Lavaland.dmm | 14 +- .../map_files/shuttles/emergency_cramped.dmm | 4 +- _maps/map_files/stations/boxstation.dmm | 559 ++++++------- _maps/map_files/stations/cerestation.dmm | 496 ++++++------ _maps/map_files/stations/deltastation.dmm | 259 +++--- _maps/map_files/stations/metastation.dmm | 747 +++++++----------- code/__HELPERS/lists.dm | 37 + code/_globalvars/lists/maint_loot_tables.dm | 206 +++++ .../effects/spawners/decorative_spawners.dm | 131 +++ .../{random_spawners.dm => depot_spawners.dm} | 181 +---- .../game/objects/effects/spawners/lootdrop.dm | 169 ---- .../spawners/random/engineering_spawners.dm | 54 ++ .../effects/spawners/random/food_spawners.dm | 20 + .../spawners/random/maint_loot_spawners.dm | 19 + .../effects/spawners/random/misc_spawners.dm | 92 +++ .../effects/spawners/random/random_spawner.dm | 143 ++++ .../objects/effects/spawners/random/readme.md | 425 ++++++++++ .../effects/spawners/random/trash_spawners.dm | 75 ++ .../objects/effects/spawners/turf_spawners.dm | 30 + code/game/objects/items/devices/flashlight.dm | 16 + icons/effects/random_spawners.dmi | Bin 0 -> 8750 bytes paradise.dme | 11 +- .../Scripts/26500_random_spawners.txt | 1 + 30 files changed, 2184 insertions(+), 1671 deletions(-) create mode 100644 code/_globalvars/lists/maint_loot_tables.dm create mode 100644 code/game/objects/effects/spawners/decorative_spawners.dm rename code/game/objects/effects/spawners/{random_spawners.dm => depot_spawners.dm} (58%) create mode 100644 code/game/objects/effects/spawners/random/engineering_spawners.dm create mode 100644 code/game/objects/effects/spawners/random/food_spawners.dm create mode 100644 code/game/objects/effects/spawners/random/maint_loot_spawners.dm create mode 100644 code/game/objects/effects/spawners/random/misc_spawners.dm create mode 100644 code/game/objects/effects/spawners/random/random_spawner.dm create mode 100644 code/game/objects/effects/spawners/random/readme.md create mode 100644 code/game/objects/effects/spawners/random/trash_spawners.dm create mode 100644 code/game/objects/effects/spawners/turf_spawners.dm create mode 100644 icons/effects/random_spawners.dmi create mode 100644 tools/UpdatePaths/Scripts/26500_random_spawners.txt diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm index 2db26731792d..f7d730106c91 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -349,7 +349,7 @@ }, /obj/structure/rack, /obj/item/melee/baton/cattleprod, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm b/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm index c12b99680ace..e6788fd772a3 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm @@ -633,7 +633,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/ruin/space/powered/casino/security) "pB" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm index 893390b5251e..4b7c7a3edcda 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm @@ -860,7 +860,7 @@ /area/ruin/space/deepstorage) "cU" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "vault" @@ -1079,7 +1079,7 @@ /area/ruin/space/deepstorage) "eI" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "vault" @@ -1211,7 +1211,7 @@ dir = 1 }, /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "podfloor" @@ -1259,7 +1259,7 @@ dir = 4 }, /obj/machinery/light/small, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "vault" @@ -1462,7 +1462,7 @@ dir = 4 }, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "whiteredcorner"; dir = 1 @@ -1495,7 +1495,7 @@ /area/ruin/space/deepstorage) "hK" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/sign/poster/contraband/power{ pixel_x = -32 }, @@ -1619,7 +1619,7 @@ /obj/structure/window/reinforced/polarized{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "vault" @@ -1742,7 +1742,7 @@ /area/ruin/space/deepstorage) "jq" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/ruin/space/deepstorage) "jr" = ( @@ -1946,7 +1946,7 @@ /obj/structure/window/reinforced/polarized{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -1981,7 +1981,7 @@ "kG" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "podfloor" @@ -2093,7 +2093,7 @@ dir = 1 }, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "vault" @@ -2111,12 +2111,12 @@ dir = 6 }, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/catwalk, /area/ruin/space/deepstorage) "lL" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/small{ dir = 1 }, @@ -2539,7 +2539,7 @@ dir = 4 }, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "darkredcorners"; dir = 4 @@ -2593,7 +2593,7 @@ /obj/structure/railing/corner, /obj/structure/rack, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "vault" @@ -2757,7 +2757,7 @@ /area/ruin/space/deepstorage) "qa" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/small{ dir = 8 }, @@ -2860,7 +2860,7 @@ /area/ruin/space/deepstorage) "qQ" = ( /obj/structure/closet/crate/can, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3011,7 +3011,7 @@ /area/ruin/space/deepstorage) "rQ" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -3019,7 +3019,7 @@ /area/ruin/space/deepstorage) "rS" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -3145,7 +3145,7 @@ /obj/structure/window/reinforced/polarized{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -3153,7 +3153,7 @@ /area/ruin/space/deepstorage) "sY" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "podfloor" @@ -3169,7 +3169,7 @@ /area/ruin/space/unpowered) "ta" = ( /obj/structure/table/glass, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "whiteredcorner" }, @@ -3348,7 +3348,7 @@ /area/ruin/space/deepstorage) "tH" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; @@ -3409,7 +3409,7 @@ /area/ruin/space/deepstorage) "tZ" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -4657,7 +4657,7 @@ /area/ruin/space/deepstorage) "Cl" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 10; @@ -4770,7 +4770,7 @@ "CZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "black" @@ -5233,7 +5233,7 @@ /area/ruin/space/unpowered) "GE" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "vault" @@ -5465,7 +5465,7 @@ /area/ruin/space/deepstorage) "IJ" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -5957,7 +5957,7 @@ "Mb" = ( /obj/structure/railing, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/catwalk, /area/ruin/space/deepstorage) "Mf" = ( @@ -6166,7 +6166,7 @@ /area/ruin/space/deepstorage) "Ob" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "black" @@ -6283,7 +6283,7 @@ /obj/structure/window/reinforced/polarized{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 10; @@ -6412,7 +6412,7 @@ /area/ruin/space/deepstorage) "PU" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/small{ dir = 4 }, @@ -6596,7 +6596,7 @@ dir = 10 }, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/ruin/space/deepstorage) "Rc" = ( @@ -7108,7 +7108,7 @@ /area/ruin/space/unpowered) "UM" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "darkredcorners"; dir = 1 @@ -7529,7 +7529,7 @@ dir = 1 }, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "vault" @@ -7614,7 +7614,7 @@ /area/ruin/space/deepstorage) "XN" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "vault" @@ -7905,7 +7905,7 @@ "ZS" = ( /obj/effect/decal/cleanable/cobweb2, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/basalt, /area/ruin/space/deepstorage) "ZU" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm index 1e380195b61d..24116f28c9cb 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm @@ -442,7 +442,7 @@ /area/ruin/space/moonbase19) "bh" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "caution"; dir = 4 @@ -527,7 +527,7 @@ dir = 4 }, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) "bv" = ( @@ -615,7 +615,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "caution" @@ -678,7 +678,7 @@ /area/ruin/space/moonbase19) "bU" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "dark" @@ -1043,7 +1043,7 @@ dir = 1 }, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) "dg" = ( @@ -1329,7 +1329,7 @@ /area/ruin/space/moonbase19) "eb" = ( /obj/structure/closet/crate/can, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor"; temperature = 273.15 @@ -2165,7 +2165,7 @@ "gX" = ( /obj/structure/rack, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "caution" @@ -3083,7 +3083,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/grille/broken, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) "jy" = ( @@ -3316,7 +3316,7 @@ /area/ruin/space/moonbase19) "kf" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" @@ -3783,7 +3783,7 @@ /area/ruin/space/moonbase19) "mb" = ( /obj/structure/closet/cabinet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) "md" = ( @@ -4416,7 +4416,7 @@ }, /obj/structure/rack, /obj/structure/window/basic, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) "ot" = ( @@ -4509,7 +4509,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) "oM" = ( @@ -4753,7 +4753,7 @@ "pL" = ( /obj/structure/rack, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) "pN" = ( @@ -6485,7 +6485,7 @@ /area/ruin/space/moonbase19) "xw" = ( /obj/structure/closet/crate/can, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) "xz" = ( @@ -6864,7 +6864,7 @@ "yZ" = ( /obj/structure/closet/cabinet, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) "zh" = ( @@ -7084,7 +7084,7 @@ "zW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) "Aa" = ( @@ -7698,7 +7698,7 @@ "CH" = ( /obj/structure/rack, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) "CI" = ( @@ -7893,7 +7893,7 @@ /area/ruin/space/moonbase19) "Dw" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -7962,7 +7962,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) "DO" = ( @@ -8370,7 +8370,7 @@ /area/ruin/space/moonbase19) "FC" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "caution"; dir = 10 @@ -8424,7 +8424,7 @@ /area/ruin/space/moonbase19) "FT" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitecorner" @@ -8877,7 +8877,7 @@ /area/ruin/space/moonbase19) "HV" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "yellowsiding"; @@ -10248,7 +10248,7 @@ /area/ruin/space/moonbase19) "Of" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) "Og" = ( @@ -10839,7 +10839,7 @@ /obj/structure/sign/pods{ pixel_y = 32 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) "QG" = ( @@ -11045,7 +11045,7 @@ /area/ruin/space/moonbase19) "Rv" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -11858,7 +11858,7 @@ "Vo" = ( /obj/structure/closet/crate/can, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "escape" @@ -12160,7 +12160,7 @@ /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) "WH" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/table, /turf/simulated/floor/plasteel{ icon_state = "whitecorner"; @@ -12502,7 +12502,7 @@ /area/ruin/space/moonbase19) "XX" = ( /obj/structure/closet/crate/can, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -12830,7 +12830,7 @@ }, /area/ruin/space/moonbase19) "Zp" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/table, /turf/simulated/floor/plasteel{ dir = 10; diff --git a/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm b/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm index 3feac9757b90..86f7d95fa878 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm @@ -438,7 +438,7 @@ pixel_x = 29; pixel_y = 0 }, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/ruin/space/telecomms) "hq" = ( @@ -699,7 +699,7 @@ /area/space/nearstation) "mN" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/ruin/space/telecomms) "mO" = ( @@ -1010,7 +1010,7 @@ /obj/machinery/light_switch{ pixel_y = -28 }, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/ruin/space/telecomms) "qO" = ( @@ -2928,7 +2928,7 @@ /obj/item/stock_parts/micro_laser/high, /obj/item/stock_parts/micro_laser/high, /obj/item/stock_parts/micro_laser/high, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /obj/item/stock_parts/matter_bin, /obj/item/stock_parts/matter_bin, /obj/item/stock_parts/matter_bin, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index a2c98e391d9d..4a04d9c2a6d9 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -1029,7 +1029,7 @@ /area/ruin/space/derelict/bridge) "cG" = ( /obj/structure/closet/crate/can, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/item/trash/can, /obj/item/trash/semki, /turf/simulated/floor/plasteel{ @@ -1557,7 +1557,7 @@ /area/ruin/space/derelict/arrival) "dT" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/clothing/shoes/jackboots, /obj/item/clothing/shoes/jackboots, /obj/item/clothing/shoes/jackboots, @@ -3434,7 +3434,7 @@ /area/ruin/space/derelict/arrival) "iA" = ( /obj/structure/closet/crate/can, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/paper/crumpled{ info = "This note has been crossed out so many times it's hard to make out its contents.
Katerina,

Your eyes are like diamonds,
Forged in the very fire of Cygni-A.
My heart yearns for you,
For your soft beauty
Fuckfucknothat'sbad.

Your voice is like liquid gold,
Smothering me in its delicate contours.
Never before had I known,
The touch,
The touch!
The touch of an angel's voice

note to self: stick to science, poetry is not my forte."; name = "love poem" @@ -3561,7 +3561,7 @@ /area/ruin/space/derelict/arrival) "iS" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/structure/sign/poster/contraband/communist_state{ pixel_x = -32 }, @@ -4822,7 +4822,7 @@ /area/ruin/space/derelict/arrival) "lL" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -4894,7 +4894,7 @@ /area/ruin/space/derelict/hallway/primary) "lV" = ( /obj/structure/closet/crate/can, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/spot{ dir = 4 }, @@ -4989,7 +4989,7 @@ "ml" = ( /obj/effect/landmark/damageturf, /obj/structure/grille/broken, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) "mn" = ( @@ -6261,7 +6261,7 @@ /area/ruin/space/derelict/crew_quarters) "pE" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/spider/stickyweb, /turf/simulated/floor/plasteel, /area/ruin/space/derelict/crew_quarters) @@ -7128,7 +7128,7 @@ /area/ruin/space/derelict/arrival) "rJ" = ( /obj/structure/closet/crate/can, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/item/trash/popcorn, /obj/item/trash/semki, /obj/item/paper/crumpled{ diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm index f03faedabeda..243674063756 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm @@ -680,7 +680,7 @@ /obj/structure/sign/poster/contraband/smoke{ pixel_x = -32 }, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -709,7 +709,7 @@ /obj/structure/sign/cargo{ pixel_x = -32 }, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "titanium"; dir = 4 diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index ebbcc6a197e5..be524dc396c6 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -4408,7 +4408,7 @@ /obj/structure/closet/cabinet, /obj/item/trash/can, /obj/item/trash/pistachios, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/clothing/mask/balaclava, /turf/simulated/floor/wood, /area/mine/laborcamp) @@ -5213,7 +5213,7 @@ /area/lavaland/surface/outdoors) "te" = ( /obj/structure/closet/crate/can, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/cigbutt, /turf/simulated/floor/plasteel{ icon_state = "darkredyellowfull" @@ -5636,7 +5636,7 @@ dir = 4 }, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/stack/cable_coil, /turf/simulated/floor/plating, /area/mine/laborcamp) @@ -8645,7 +8645,7 @@ "Ow" = ( /obj/effect/turf_decal/delivery/hollow, /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/mine/outpost/production) @@ -8917,7 +8917,7 @@ /area/lavaland/surface/outdoors) "Qa" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/stack/marker_beacon/ten, /obj/item/book/random, /turf/simulated/floor/plating, @@ -9743,7 +9743,7 @@ dir = 8; id = "mining_internal" }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/mine/outpost/production) "VN" = ( @@ -10351,7 +10351,7 @@ /area/lavaland/surface/outdoors) "YP" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/mounted/frame/apc_frame, /turf/simulated/floor/plating, /area/mine/laborcamp) diff --git a/_maps/map_files/shuttles/emergency_cramped.dmm b/_maps/map_files/shuttles/emergency_cramped.dmm index e1810925cb69..c96a6d1ab9b6 100644 --- a/_maps/map_files/shuttles/emergency_cramped.dmm +++ b/_maps/map_files/shuttles/emergency_cramped.dmm @@ -80,7 +80,7 @@ "r" = ( /obj/effect/turf_decal/delivery/hollow, /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/spot{ dir = 4 }, @@ -95,7 +95,7 @@ "u" = ( /obj/effect/turf_decal/delivery/hollow, /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/shuttle/escape) "w" = ( diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 52e2261f4c8e..d5a739a7300f 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -17,7 +17,7 @@ }, /area/station/science/hallway) "aad" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -4495,7 +4495,7 @@ /obj/item/storage/secure/safe{ pixel_y = 25 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "aqb" = ( @@ -6633,7 +6633,7 @@ /area/station/security/processing) "awD" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "awE" = ( @@ -7092,7 +7092,7 @@ dir = 1 }, /obj/item/storage/fancy/donut_box, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "axY" = ( @@ -7126,7 +7126,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "ayf" = ( @@ -8463,7 +8463,7 @@ }, /area/station/legal/magistrate) "aCh" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "aCi" = ( @@ -8603,7 +8603,7 @@ /area/station/hallway/primary/fore) "aCz" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "aCB" = ( @@ -8909,7 +8909,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "aDq" = ( @@ -9673,7 +9673,7 @@ /obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aFN" = ( @@ -9782,7 +9782,7 @@ /turf/simulated/floor/plasteel, /area/station/security/permabrig) "aGb" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aGc" = ( @@ -9800,7 +9800,7 @@ "aGe" = ( /obj/structure/table, /obj/item/restraints/handcuffs/cable, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aGi" = ( @@ -10073,7 +10073,7 @@ /area/station/public/arcade) "aHb" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aHc" = ( @@ -10148,13 +10148,9 @@ /obj/item/melee/baseball_bat, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) -"aHs" = ( -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) "aHt" = ( /obj/structure/table/wood/poker, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/carpet, /area/station/maintenance/fpmaint) "aHu" = ( @@ -10614,7 +10610,7 @@ /area/station/maintenance/fpmaint) "aIV" = ( /obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/wood, /area/station/maintenance/fpmaint) "aIW" = ( @@ -10914,7 +10910,7 @@ /area/station/maintenance/fpmaint) "aKa" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aKb" = ( @@ -10926,7 +10922,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aKd" = ( -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aKf" = ( @@ -11193,7 +11189,7 @@ icon_state = "0-4" }, /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -11223,7 +11219,7 @@ "aKY" = ( /obj/structure/closet, /obj/item/coin/iron, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aKZ" = ( @@ -11246,7 +11242,7 @@ /area/shuttle/pod_1) "aLc" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aLd" = ( @@ -11411,7 +11407,7 @@ /area/station/service/mime) "aLB" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aLC" = ( @@ -11468,7 +11464,7 @@ /area/station/maintenance/fpmaint) "aLM" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aLN" = ( @@ -11704,24 +11700,14 @@ /area/station/maintenance/fpmaint2) "aMi" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) -"aMj" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/simulated/floor/plating, -/area/station/maintenance/fore) "aMl" = ( /obj/structure/table, /obj/item/food/donut, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) -"aMo" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating, -/area/station/maintenance/fsmaint) "aMp" = ( /obj/item/radio/intercom{ name = "east bump"; @@ -12006,11 +11992,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) -"aNh" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/simulated/floor/plating, -/area/station/maintenance/fsmaint) "aNi" = ( /mob/living/simple_animal/mouse, /turf/simulated/floor/plating, @@ -12128,11 +12109,6 @@ }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_2) -"aNA" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint2) "aNB" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, @@ -12160,11 +12136,6 @@ /obj/machinery/atmospherics/binary/valve, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) -"aNF" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint2) "aNH" = ( /obj/structure/chair/stool{ dir = 8 @@ -12581,7 +12552,7 @@ "aOX" = ( /obj/structure/lattice, /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/effect/spawner/random/maintenance, /turf/space, /area/space/nearstation) "aOY" = ( @@ -12678,7 +12649,7 @@ "aPu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -12933,7 +12904,7 @@ /area/station/maintenance/fpmaint) "aQj" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aQk" = ( @@ -13038,7 +13009,7 @@ /area/station/public/dorms) "aQC" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aQD" = ( @@ -13073,7 +13044,7 @@ }, /area/station/public/dorms) "aQI" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aQJ" = ( @@ -13445,7 +13416,7 @@ /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -13922,7 +13893,7 @@ /obj/effect/turf_decal/delivery/blue/hollow, /obj/effect/decal/cleanable/dirt, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "darkbluefull" }, @@ -14198,7 +14169,7 @@ "aTZ" = ( /obj/structure/closet, /obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aUa" = ( @@ -14207,11 +14178,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) -"aUb" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/simulated/floor/plating, -/area/station/maintenance/fsmaint) "aUc" = ( /obj/machinery/door/poddoor{ id_tag = "maint2" @@ -14230,7 +14196,7 @@ /obj/structure/closet, /obj/item/reagent_containers/drinks/cans/badminbrew, /obj/effect/landmark/spawner/nukedisc_respawn, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aUf" = ( @@ -14517,7 +14483,7 @@ /obj/structure/chair/stool{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aUV" = ( @@ -15668,7 +15634,7 @@ /area/station/maintenance/fpmaint) "aYb" = ( /obj/item/tank/internals/emergency_oxygen, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -17086,7 +17052,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bcB" = ( @@ -18903,7 +18869,7 @@ /area/station/public/storage/office) "bhG" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "darkbluefull" }, @@ -19156,7 +19122,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bip" = ( @@ -21755,7 +21721,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random_spawners/cobweb_left_frequent, /turf/simulated/floor/plating, @@ -22623,7 +22589,7 @@ "brF" = ( /obj/structure/rack, /obj/item/melee/baton/cattleprod, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "brG" = ( @@ -22753,7 +22719,7 @@ layer = 2.9 }, /obj/item/extinguisher, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "bsd" = ( @@ -22976,7 +22942,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/storage/secure/safe{ pixel_y = 25 }, @@ -23047,7 +23013,7 @@ /area/station/supply/lobby) "bsZ" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/port) @@ -23419,7 +23385,7 @@ dir = 8; layer = 2.9 }, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "buc" = ( @@ -24149,7 +24115,7 @@ /area/station/maintenance/port) "bwz" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "bwA" = ( @@ -24182,7 +24148,7 @@ /area/station/hallway/secondary/exit) "bwK" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "bwL" = ( @@ -24884,7 +24850,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -25420,7 +25386,7 @@ /area/space) "bCj" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/port) "bCk" = ( @@ -26047,7 +26013,7 @@ /obj/structure/rack, /obj/effect/spawner/random_spawners/cobweb_left_frequent, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "bER" = ( @@ -26094,7 +26060,7 @@ pixel_x = 4; pixel_y = 3 }, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "bFi" = ( @@ -28003,7 +27969,7 @@ icon_state = "4-8" }, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "bMg" = ( @@ -31121,7 +31087,7 @@ /area/station/command/office/rd) "bYk" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "bYm" = ( @@ -32426,7 +32392,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, @@ -33591,7 +33557,7 @@ /area/station/medical/cryo) "cho" = ( /obj/structure/closet/firecloset, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "chp" = ( @@ -34066,7 +34032,7 @@ /area/station/maintenance/port) "cjf" = ( /obj/structure/table/glass, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/small{ dir = 1 }, @@ -34802,7 +34768,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/sign/securearea{ pixel_x = -32 }, @@ -34970,7 +34936,7 @@ /area/station/science/storage) "cmH" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) "cmJ" = ( @@ -36435,7 +36401,7 @@ /area/station/science/toxins/mixing) "csw" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "csB" = ( @@ -36478,7 +36444,7 @@ /area/station/science/server/coldroom) "csK" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) "csL" = ( @@ -39003,7 +38969,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "cAU" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "cAW" = ( @@ -39641,7 +39607,7 @@ /area/station/maintenance/aft) "cDo" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "cDs" = ( @@ -40358,7 +40324,7 @@ dir = 8; layer = 2.9 }, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_left_frequent, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -41733,7 +41699,7 @@ /area/station/maintenance/asmaint) "cKF" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "cKK" = ( @@ -41749,12 +41715,12 @@ }, /area/station/maintenance/aft) "cKO" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) "cKQ" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "cKR" = ( @@ -41828,7 +41794,7 @@ /area/station/science/test_chamber) "cLc" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "cLd" = ( @@ -42168,7 +42134,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cMt" = ( @@ -43226,7 +43192,7 @@ "cQs" = ( /obj/item/wrench, /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "cQv" = ( @@ -43249,11 +43215,6 @@ icon_state = "purple" }, /area/station/science/hallway) -"cQC" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/simulated/floor/plating, -/area/station/maintenance/asmaint) "cQE" = ( /turf/simulated/floor/plasteel, /area/station/command/office/ce) @@ -43608,7 +43569,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/purple, /obj/structure/cable{ d1 = 2; @@ -43639,7 +43600,7 @@ /area/station/maintenance/port) "cRE" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_right_rare, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -44279,7 +44240,7 @@ /area/station/engineering/control) "cTB" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) "cTD" = ( @@ -46250,7 +46211,7 @@ /area/station/maintenance/aft) "dbg" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "dbi" = ( @@ -46272,7 +46233,7 @@ /obj/structure/closet/crate/freezer, /obj/item/organ/internal/heart/vox, /obj/item/organ/internal/liver/vox, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/organ/internal/heart/vox, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -46280,7 +46241,7 @@ /area/station/maintenance/asmaint) "dbq" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -46334,7 +46295,7 @@ "dbD" = ( /obj/structure/table, /obj/item/extinguisher, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -47150,7 +47111,7 @@ dir = 10 }, /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) "der" = ( @@ -47411,11 +47372,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/aft_starboard) -"dfc" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating, -/area/station/maintenance/asmaint2) "dfg" = ( /obj/machinery/photocopier, /turf/simulated/floor/wood, @@ -47828,13 +47784,13 @@ /area/station/engineering/atmos) "dgX" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/roller, /turf/simulated/floor/plating, /area/station/maintenance/aft) "dgY" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/food/donkpocket, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -47867,7 +47823,7 @@ /area/station/turret_protected/aisat/interior) "dhk" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/item/toy/minimeteor, /obj/item/poster/random_contraband, /turf/simulated/floor/plating, @@ -49333,14 +49289,9 @@ /area/station/maintenance/aft) "dmq" = ( /obj/structure/disposalpipe/segment, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) -"dmr" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/simulated/floor/plating, -/area/station/maintenance/aft) "dms" = ( /obj/structure/cable{ d1 = 1; @@ -51113,7 +51064,7 @@ /area/station/public/arcade) "dwT" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) @@ -51143,7 +51094,7 @@ /area/station/medical/morgue) "dxN" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) "dxQ" = ( @@ -52321,7 +52272,7 @@ pixel_x = 2; pixel_y = 2 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "eaU" = ( @@ -52741,7 +52692,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "ehp" = ( @@ -53316,7 +53267,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) "euQ" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/closet, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -53782,7 +53733,7 @@ dir = 4 }, /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_right_frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -53888,7 +53839,7 @@ /area/station/security/prison/cell_block/A) "eIN" = ( /obj/structure/table/reinforced, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/eftpos/register, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -54043,12 +53994,12 @@ }, /area/station/engineering/smes) "eNn" = ( -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "eNs" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/fpmaint) "eND" = ( @@ -54088,19 +54039,13 @@ /area/station/public/dorms) "eOI" = ( /obj/structure/closet/crate/trashcart, -/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" - }, -/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" - }, /obj/effect/decal/cleanable/dirt, /obj/item/wirerod, /obj/item/wirecutters, /obj/item/crowbar/large, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/trash, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "eOZ" = ( @@ -54308,7 +54253,7 @@ "eUk" = ( /obj/structure/closet/crate/freezer, /obj/effect/spawner/lootdrop/three_course_meal, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "eUq" = ( @@ -55235,7 +55180,7 @@ "fof" = ( /obj/structure/rack, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "fog" = ( @@ -55340,7 +55285,7 @@ "fqt" = ( /obj/item/storage/bag/plasticbag, /obj/item/trash/fried_vox, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "fqw" = ( @@ -55874,7 +55819,7 @@ /area/station/maintenance/asmaint2) "fDd" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "fDx" = ( @@ -56045,14 +55990,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) -"fHs" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/simulated/floor/plasteel{ - icon_state = "showroomfloor" - }, -/area/station/maintenance/fpmaint) "fHB" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /obj/structure/cable{ @@ -56311,7 +56248,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "fPq" = ( -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, @@ -56582,7 +56519,7 @@ /area/station/hallway/primary/port/west) "fVy" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/item/storage/fancy/cigarettes/dromedaryco, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -57389,7 +57326,7 @@ "gsd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -57496,7 +57433,7 @@ /area/station/turret_protected/ai_upload) "gsY" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/small{ dir = 8 }, @@ -57505,7 +57442,7 @@ /area/station/maintenance/aft) "gta" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "gto" = ( @@ -57560,7 +57497,7 @@ /obj/item/reagent_containers/condiment/peppermill{ pixel_x = -7 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/wood, /area/station/maintenance/aft) "guY" = ( @@ -57863,7 +57800,7 @@ /area/station/command/office/captain) "gEj" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, @@ -58928,7 +58865,7 @@ pixel_y = 30 }, /obj/structure/table_frame, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59823,7 +59760,7 @@ /turf/simulated/floor/grass, /area/station/security/permabrig) "hAG" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) @@ -59837,7 +59774,7 @@ /area/station/maintenance/aft) "hBu" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/robotanalyzer, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -60744,7 +60681,7 @@ /area/station/engineering/control) "hYf" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -60777,7 +60714,7 @@ "iac" = ( /obj/structure/table, /obj/item/wrench, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) "iag" = ( @@ -60944,7 +60881,7 @@ /area/station/maintenance/asmaint) "ieW" = ( /obj/structure/closet/firecloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "ifp" = ( @@ -62893,7 +62830,7 @@ }, /area/station/medical/medbay2) "jgm" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/table, /turf/simulated/floor/plating/airless, /area/station/science/toxins/test) @@ -63101,7 +63038,7 @@ "jmU" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "jnc" = ( @@ -63119,7 +63056,7 @@ }, /obj/item/tank/internals/emergency_oxygen, /obj/item/clothing/mask/breath, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "jnh" = ( @@ -63634,7 +63571,7 @@ /area/station/maintenance/port) "jxj" = ( /obj/structure/table/reinforced, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -64272,7 +64209,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "jPx" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -64535,7 +64472,7 @@ /area/station/science/toxins/test) "jUM" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) "jUZ" = ( @@ -64730,7 +64667,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 6 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/alarm/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -65009,7 +64946,7 @@ /obj/structure/chair/sofa/right{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "khU" = ( @@ -65610,7 +65547,7 @@ /area/station/maintenance/disposal) "kwO" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "kwP" = ( @@ -66091,7 +66028,7 @@ /area/station/public/dorms) "kIa" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "kIP" = ( @@ -66509,7 +66446,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -67274,7 +67211,7 @@ }, /area/station/security/permabrig) "llx" = ( -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -67717,7 +67654,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random_spawners/cobweb_left_frequent, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /obj/item/coin/silver{ pixel_x = 5; pixel_y = -8 @@ -68210,7 +68147,7 @@ /obj/effect/decal/cleanable/blood/xeno, /obj/structure/closet/crate/freezer, /obj/item/organ/internal/lungs/vox, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -69139,7 +69076,7 @@ /area/station/medical/cryo) "meB" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/item/tank/internals/oxygen/yellow, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -69693,7 +69630,7 @@ "mtx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "muh" = ( @@ -69901,7 +69838,7 @@ /area/station/security/permabrig) "mAq" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -69923,7 +69860,7 @@ /area/station/command/office/captain) "mBE" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/small{ dir = 8 }, @@ -70059,7 +69996,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "mEQ" = ( @@ -71406,7 +71343,7 @@ "nsu" = ( /obj/structure/closet/wardrobe/pjs, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -71416,7 +71353,7 @@ /turf/simulated/wall/r_wall, /area/station/medical/virology) "nsP" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -71648,11 +71585,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) -"nyh" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/eight, -/turf/simulated/floor/plating, -/area/station/maintenance/aft) "nyC" = ( /obj/structure/rack, /turf/simulated/floor/plating, @@ -72637,7 +72569,7 @@ /area/station/science/test_chamber) "nXK" = ( /obj/structure/closet/firecloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "nYg" = ( @@ -73587,7 +73519,7 @@ /area/station/science/server/coldroom) "orE" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/blood_maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -73842,7 +73774,7 @@ /turf/simulated/floor/plating/airless, /area/station/maintenance/asmaint) "oxe" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/airless, /area/station/maintenance/fpmaint2) "oxf" = ( @@ -73859,7 +73791,7 @@ /area/station/science/hallway) "oxy" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/sign/engineering{ pixel_x = 29 }, @@ -74925,7 +74857,7 @@ /area/station/maintenance/fsmaint) "oVs" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_right_frequent, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) @@ -75156,7 +75088,7 @@ "paW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table_frame, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/sign/poster/official/healthy{ pixel_x = 31 }, @@ -75598,7 +75530,7 @@ "pon" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "pop" = ( @@ -75850,7 +75782,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_right_rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -75954,7 +75886,7 @@ /turf/simulated/floor/engine/co2, /area/station/engineering/atmos) "pxz" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -76954,7 +76886,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/rack, /obj/item/storage/box/bodybags, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -77453,7 +77385,7 @@ /area/station/security/permabrig) "qjC" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) @@ -78150,7 +78082,7 @@ /area/station/maintenance/apmaint) "qwM" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_right_frequent, /obj/machinery/light/small{ dir = 1 @@ -78270,7 +78202,7 @@ /area/station/hallway/secondary/exit) "qAg" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "cmo" }, @@ -78581,7 +78513,7 @@ /area/station/science/toxins/test) "qES" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) "qFg" = ( @@ -79424,7 +79356,7 @@ /area/station/maintenance/asmaint) "raL" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/soap, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -79974,7 +79906,7 @@ /area/station/maintenance/aft) "rmI" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -80000,7 +79932,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "rnd" = ( @@ -80157,11 +80089,6 @@ icon_state = "freezerfloor" }, /area/station/public/toilet/unisex) -"rrg" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating, -/area/station/maintenance/apmaint) "rrh" = ( /obj/machinery/light/small, /obj/structure/disposalpipe/segment/corner{ @@ -80209,7 +80136,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_right_frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -81261,7 +81188,7 @@ /area/station/hallway/primary/port/east) "rVK" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "rVV" = ( @@ -81362,7 +81289,7 @@ /area/station/science/rnd) "rYt" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "rYY" = ( @@ -81636,7 +81563,7 @@ /area/station/hallway/primary/port/east) "sfc" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/door/window/classic/normal{ dir = 1; name = "Kitchen" @@ -81890,7 +81817,7 @@ req_one_access = list(33,41); req_one_access_txt = "33;41" }, -/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/effect/spawner/random/maintenance, /mob/living/simple_animal/hostile/scarybat, /turf/simulated/floor/plasteel{ icon_state = "vault" @@ -81968,7 +81895,7 @@ "spr" = ( /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "spy" = ( @@ -82124,16 +82051,6 @@ icon_state = "bar" }, /area/station/security/permabrig) -"ssr" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/three, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/apmaint2) "ssF" = ( /obj/structure/closet/secure_closet/hop, /obj/machinery/camera/autoname{ @@ -82147,7 +82064,7 @@ }, /area/station/public/toilet/unisex) "ssL" = ( -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /obj/item/clothing/gloves/color/blue, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -82455,7 +82372,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "sDp" = ( @@ -82751,7 +82668,7 @@ }, /area/station/command/office/ce) "sKQ" = ( -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /obj/structure/sign/poster/official/help_others{ pixel_y = 31 }, @@ -83201,13 +83118,6 @@ icon_state = "grimy" }, /area/station/command/office/hop) -"sXJ" = ( -/obj/structure/rack{ - dir = 1 - }, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/simulated/floor/plating, -/area/station/maintenance/apmaint) "sXR" = ( /obj/structure/cable{ d1 = 1; @@ -83312,17 +83222,14 @@ dir = 1 }, /obj/item/stack/spacecash/c10, -/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" - }, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plasteel, /area/station/maintenance/port) "sZg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "sZh" = ( @@ -83727,11 +83634,6 @@ icon_state = "dark" }, /area/station/engineering/control) -"tkT" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/three, -/turf/simulated/floor/plasteel, -/area/station/maintenance/apmaint) "tkW" = ( /obj/machinery/light/small{ dir = 1 @@ -83973,7 +83875,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "tue" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/landmark/damageturf, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) @@ -84553,7 +84455,7 @@ /area/station/science/toxins/mixing) "tHO" = ( /obj/structure/chair/sofa/bench/right, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -85130,7 +85032,7 @@ /obj/item/crowbar, /obj/effect/landmark/spawner/nukedisc_respawn, /obj/effect/spawner/random_spawners/cobweb_left_frequent, -/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "tUH" = ( @@ -85163,10 +85065,6 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/aft) -"tVF" = ( -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating, -/area/station/maintenance/asmaint) "tVK" = ( /obj/structure/cable{ d2 = 4; @@ -85448,7 +85346,7 @@ /obj/structure/bed, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/body_bag, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -85505,7 +85403,7 @@ /area/station/command/bridge) "ucE" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "ucL" = ( @@ -85588,7 +85486,7 @@ /area/station/maintenance/fsmaint) "ueT" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -85616,7 +85514,7 @@ "ufC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) "ugC" = ( @@ -85734,7 +85632,7 @@ /area/station/maintenance/asmaint2) "ukQ" = ( /obj/structure/closet/body_bag, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) "ukV" = ( @@ -86014,7 +85912,7 @@ }, /area/station/engineering/smes) "urU" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/disposalpipe/segment/corner{ dir = 2 }, @@ -86542,7 +86440,7 @@ dir = 1 }, /obj/item/storage/toolbox/mechanical, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -87445,7 +87343,7 @@ /area/station/supply/sorting) "vic" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/small{ dir = 1 }, @@ -88109,7 +88007,7 @@ /area/station/security/permabrig) "vxz" = ( /obj/structure/closet/crate/can, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/item/reagent_containers/syringe/insulin, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/syringe, @@ -88252,7 +88150,7 @@ "vBC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "vBG" = ( @@ -88743,7 +88641,7 @@ /area/station/science/lobby) "vOy" = ( /obj/effect/spawner/random_spawners/blood_maybe, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -89099,7 +88997,7 @@ }, /area/station/science/genetics) "vZV" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/table, /obj/item/cartridge/signal/toxins, /turf/simulated/floor/plating, @@ -89453,7 +89351,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/disposalpipe/segment/corner{ dir = 2 }, @@ -89560,7 +89458,7 @@ /area/station/security/permabrig) "wkQ" = ( /obj/effect/spawner/random_spawners/blood_maybe, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -89992,7 +89890,7 @@ "wvD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/landmark/burnturf, /obj/effect/landmark/spawner/nukedisc_respawn, /turf/simulated/floor/plating, @@ -90190,7 +90088,7 @@ "wCk" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitegreen" @@ -90601,7 +90499,7 @@ /area/station/maintenance/asmaint) "wLu" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/sign/restroom{ pixel_y = 31 }, @@ -90797,7 +90695,7 @@ /area/station/aisat/service) "wQI" = ( /obj/structure/closet/crate/internals, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "wQK" = ( @@ -90954,7 +90852,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "wXg" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -90989,7 +90887,7 @@ }, /area/station/medical/chemistry) "wYs" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -91367,7 +91265,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/rack, /obj/item/clothing/gloves/color/latex, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) "xig" = ( @@ -91586,7 +91484,7 @@ /area/station/maintenance/assembly_line) "xmq" = ( /obj/structure/closet/crate/internals, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "xmr" = ( @@ -92215,7 +92113,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "xBC" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/sign/engineering{ pixel_x = -27 }, @@ -93568,7 +93466,7 @@ /area/station/maintenance/aft) "ygC" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "ygM" = ( @@ -93660,7 +93558,7 @@ /area/station/engineering/hardsuitstorage) "yhY" = ( /obj/structure/table/reinforced, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /obj/effect/landmark/damageturf, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) @@ -93723,11 +93621,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) -"yjF" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/simulated/floor/plating, -/area/station/maintenance/asmaint) "yjH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -106385,7 +106278,7 @@ aaa aaa aaa loS -aNA +aLB aKN aGn oan @@ -108180,7 +108073,7 @@ aED aFR aHg aIw -aNF +aKa aGn aLu jwb @@ -108437,7 +108330,7 @@ uQE aFT aHi aRA -aNF +aKa aGn fRo aLj @@ -108496,7 +108389,7 @@ coL cgQ gta gta -rrg +gta cgQ bCf bOd @@ -108740,7 +108633,7 @@ bET lRv aaa gzN -tkT +csw cwI cqK qjC @@ -110295,7 +110188,7 @@ cgQ yjC coL tGO -sXJ +sCW hoJ jVv rqF @@ -111783,8 +111676,8 @@ blG aHl aLu aHS -aNA -aNA +aLB +aLB aGn aKb aHl @@ -115123,7 +115016,7 @@ aMA aLF aMT aOo -fHs +aPu aMA wnG hNI @@ -116402,7 +116295,7 @@ axb axb aMA aGj -aHs +aGb aIT aJO aOr @@ -117770,7 +117663,7 @@ bKD cLi cLi tEU -ssr +mAq kkk rne bUv @@ -119038,7 +118931,7 @@ cwl wFR fnV cwz -sXJ +sCW sCW cgQ dCM @@ -124372,7 +124265,7 @@ aGy ayV ayA axe -aMj +aCz sZa pVr mSN @@ -131323,7 +131216,7 @@ bbw bdm bfz aOI -aMo +aMi bbI bdT bdM @@ -134406,7 +134299,7 @@ mxZ knB aMz aLc -aNh +aHb aQL mvU ttT @@ -135010,7 +134903,7 @@ chf rmI cep cYj -dmr +csK klf aaa aaa @@ -135682,7 +135575,7 @@ aGT aGT aGX aHb -aNh +aHb aOG aGX aHb @@ -136018,7 +135911,7 @@ rAi xRP chf ebS -nyh +cTB jFf chf cyJ @@ -136202,7 +136095,7 @@ aMz aOF aOG aGX -aUb +aLc aGY aGX aWb @@ -136967,7 +136860,7 @@ aGX aGY aQI aGX -aMo +aMi aRJ aTe xRy @@ -137029,8 +136922,8 @@ dHU sQt cQk lbZ -dfc -dfc +bYk +bYk bGG bGG xBC @@ -138052,7 +137945,7 @@ dcK bGG cuS qmw -dfc +bYk dcW cpH bGG @@ -138508,8 +138401,8 @@ aGY aGY aGY aKV -aMo -aMo +aMi +aMi aGY aMz aQO @@ -140142,7 +140035,7 @@ ioE rHJ yfJ oJr -cQC +cKF dhR csL ciY @@ -140921,7 +140814,7 @@ ciY ciY ciY ciY -tVF +eNn csL ciY ciY @@ -141174,7 +141067,7 @@ kMc kdc csL djP -cQC +cKF fof dlz dSu @@ -142197,7 +142090,7 @@ uXA uXA wUT ciY -cQC +cKF csL qdO ycI @@ -142454,7 +142347,7 @@ ciY ciY oUq ciY -cQC +cKF csL dhR ycI @@ -144244,7 +144137,7 @@ ciY dHc pOY ciY -yjF +cDo ePu ugC ciY @@ -144469,7 +144362,7 @@ oUq ciY ciY cKF -tVF +eNn csL ciY hdW @@ -144496,7 +144389,7 @@ iDg cga fGT nBI -tVF +eNn ciY ylP ciY @@ -144719,7 +144612,7 @@ gww csL rng csL -tVF +eNn ciY fVy dbX @@ -144734,7 +144627,7 @@ qQj fUW cgs cgs -tVF +eNn csL uzh rSS @@ -145235,7 +145128,7 @@ mZs oUq csL dbX -tVF +eNn ciY ciY cgs @@ -145789,7 +145682,7 @@ csL ciY dbi csL -tVF +eNn ciY ciY faP @@ -147070,7 +146963,7 @@ cpE cQw ciY ePu -tVF +eNn ciY ciY vMe @@ -147835,7 +147728,7 @@ cga ciY pbc ctq -tVF +eNn kpR raH eba @@ -148087,7 +147980,7 @@ ece kBI eNn ciY -tVF +eNn iZV ciY mQX @@ -148347,7 +148240,7 @@ ciY euQ ePu jgA -tVF +eNn gmU jPx gmU @@ -148867,7 +148760,7 @@ ciY ciY ciY ciY -cQC +cKF meB ciY aab diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 19a4c3b993e7..50111f43079a 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -240,7 +240,7 @@ /area/station/maintenance/disposal/external/north) "abH" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/starboard) "abJ" = ( @@ -435,7 +435,7 @@ /area/station/turret_protected/ai) "acK" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -1925,7 +1925,7 @@ dir = 1 }, /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/north) "alW" = ( @@ -2108,7 +2108,7 @@ dir = 8 }, /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/north) "ang" = ( @@ -2328,7 +2328,7 @@ /area/station/security/permabrig) "aoE" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/northeast) "aoF" = ( @@ -2507,7 +2507,7 @@ /area/station/turret_protected/aisat/interior) "apu" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -2689,9 +2689,9 @@ /area/station/security/prisonlockers) "arc" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/fpmaint) "ard" = ( @@ -2806,7 +2806,7 @@ /area/station/maintenance/disposal/northeast) "arQ" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -3009,8 +3009,8 @@ /area/station/security/prisonlockers) "atB" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/fore2) "atC" = ( @@ -3409,7 +3409,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "avS" = ( @@ -3422,7 +3422,7 @@ }, /area/station/maintenance/fore2) "awc" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/fore2) "awd" = ( @@ -4233,7 +4233,7 @@ /area/station/science/rnd) "aCb" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, /area/station/maintenance/fore2) @@ -5907,7 +5907,7 @@ /area/station/telecomms/computer) "aPc" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "aPd" = ( @@ -6210,7 +6210,7 @@ /area/station/security/permabrig) "aQR" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) "aQS" = ( @@ -6676,7 +6676,7 @@ /area/station/public/arcade) "aUi" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/camera{ c_tag = "Fore Asteroid Maintenance APCs 2"; dir = 5 @@ -6828,7 +6828,7 @@ /area/station/maintenance/disposal/north) "aUU" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -7432,7 +7432,7 @@ /area/station/turret_protected/aisat/interior) "aYC" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/port2) "aYD" = ( @@ -7916,7 +7916,7 @@ /area/station/hallway/primary/central/north) "bbv" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/hallway/primary/central/north) "bbw" = ( @@ -7926,7 +7926,7 @@ /area/station/maintenance/disposal/south) "bbC" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/hallway/primary/port/north) "bbH" = ( @@ -8011,7 +8011,7 @@ "bcf" = ( /obj/structure/closet/crate, /obj/item/pickaxe/mini, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "bck" = ( @@ -10670,7 +10670,7 @@ dir = 4 }, /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/fore) "bqR" = ( @@ -11086,7 +11086,7 @@ /area/station/medical/medbay) "bsA" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/fpmaint) "bsB" = ( @@ -12630,7 +12630,7 @@ /area/station/security/processing) "bzh" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/fpmaint) "bzj" = ( @@ -12640,7 +12640,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/east) "bzq" = ( @@ -15747,7 +15747,7 @@ /area/station/command/bridge) "bMX" = ( /obj/structure/closet/wardrobe/mixed, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "bMY" = ( @@ -15927,13 +15927,8 @@ }, /turf/simulated/floor/plating, /area/station/hallway/primary/starboard/south) -"bNL" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating/asteroid/ancient, -/area/station/maintenance/starboard) "bNM" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/fore) "bNT" = ( @@ -16038,7 +16033,7 @@ dir = 4 }, /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -18148,7 +18143,7 @@ }, /obj/effect/decal/cleanable/cobweb, /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "bWl" = ( @@ -18219,7 +18214,7 @@ /area/station/maintenance/port) "bWG" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/port) "bWJ" = ( @@ -18438,7 +18433,7 @@ "bXu" = ( /obj/structure/rack, /obj/item/pickaxe/emergency, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "bXv" = ( @@ -18521,7 +18516,7 @@ dir = 1 }, /obj/effect/spawner/random_spawners/dirt_frequent, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/item/paper/crumpled, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -18759,11 +18754,11 @@ /area/station/maintenance/gambling_den) "bZt" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/gambling_den) "bZv" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/closet/crate, /turf/simulated/floor/plating, /area/station/maintenance/storage) @@ -19074,7 +19069,7 @@ /area/station/maintenance/fore2) "ccV" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/fore2) "ccW" = ( @@ -19210,7 +19205,7 @@ /area/station/security/prisonershuttle) "cdO" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "cdP" = ( @@ -19507,8 +19502,8 @@ /area/station/public/quantum/docking) "cfH" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/asmaint) "cfN" = ( @@ -20789,7 +20784,7 @@ /obj/structure/closet/emcloset, /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "coO" = ( @@ -20825,7 +20820,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "coX" = ( @@ -20882,7 +20877,7 @@ "cpo" = ( /obj/structure/table, /obj/effect/spawner/random_spawners/dirt_frequent, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -20992,7 +20987,7 @@ /area/station/maintenance/port) "cpQ" = ( /obj/structure/closet/firecloset/full, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -21190,7 +21185,7 @@ /area/station/hallway/secondary/exit) "crC" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 10; @@ -21401,7 +21396,7 @@ "ctC" = ( /obj/structure/rack, /obj/item/pickaxe, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -21790,7 +21785,7 @@ /area/station/security/prison/cell_block/A) "cxd" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; @@ -21861,8 +21856,8 @@ /area/station/science/toxins/mixing) "cxU" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -22089,7 +22084,7 @@ "czP" = ( /obj/structure/closet/crate, /obj/item/pickaxe, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/apmaint) "czV" = ( @@ -22690,7 +22685,7 @@ icon_state = "1-4" }, /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "cDW" = ( @@ -23889,7 +23884,7 @@ /area/shuttle/arrival/station) "cJN" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/hallway/primary/central/west) "cJO" = ( @@ -24286,8 +24281,8 @@ /area/station/maintenance/disposal/external/southeast) "cMw" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/port) "cMx" = ( @@ -25326,7 +25321,7 @@ /area/station/command/bridge) "cQU" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/storage) "cQW" = ( @@ -25341,7 +25336,7 @@ /area/station/maintenance/storage) "cRa" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) "cRh" = ( @@ -25470,7 +25465,7 @@ /area/station/hallway/primary/aft/west) "cRZ" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/pickaxe, /turf/simulated/floor/plating, /area/station/maintenance/storage) @@ -25526,12 +25521,12 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "cSj" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "cSk" = ( @@ -28746,7 +28741,7 @@ /area/station/maintenance/disposal/west) "doo" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/fpmaint) "dos" = ( @@ -29397,7 +29392,7 @@ dir = 1 }, /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "dsc" = ( @@ -31423,7 +31418,7 @@ /area/station/hallway/primary/fore/west) "dCU" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/starboard) "dCV" = ( @@ -33222,7 +33217,7 @@ /area/station/medical/morgue) "eeN" = ( /obj/effect/spawner/random_spawners/blood_maybe, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -33230,7 +33225,7 @@ "eeZ" = ( /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "efa" = ( @@ -33820,7 +33815,7 @@ dir = 1 }, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/structure/window/basic{ dir = 8 }, @@ -33828,7 +33823,7 @@ /area/station/maintenance/disposal) "eot" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) "eoz" = ( @@ -34046,7 +34041,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/storage) "etG" = ( @@ -34127,7 +34122,7 @@ /area/station/science/xenobiology) "eux" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/maintcentral) "euD" = ( @@ -34519,7 +34514,7 @@ /obj/structure/closet/crate{ name = "top secret mime supplies" }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -35493,7 +35488,7 @@ /turf/simulated/floor/carpet/green, /area/station/service/library) "eOu" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -35747,7 +35742,7 @@ /area/station/hallway/spacebridge/scidock) "eTI" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/port) "eTJ" = ( @@ -36235,19 +36230,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) -"fbA" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plating{ - icon_state = "asteroidplating" - }, -/area/station/maintenance/asmaint) "fcm" = ( /obj/structure/chair/office/dark{ dir = 1 @@ -36289,7 +36271,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 8 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -36644,17 +36626,6 @@ icon_state = "browncorner" }, /area/station/supply/lobby) -"fka" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, -/obj/structure/disposalpipe/segment/corner, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/asmaint) "fkc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/computer/area_atmos{ @@ -37775,7 +37746,7 @@ icon_state = "4-8" }, /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "fFz" = ( @@ -38820,7 +38791,7 @@ /area/station/hallway/primary/fore/west) "fVg" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "fVo" = ( @@ -39166,6 +39137,17 @@ icon_state = "redyellowfull" }, /area/station/service/bar) +"gah" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/closet/crate, +/obj/structure/disposalpipe/segment/corner, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/asmaint) "gaj" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 @@ -39436,7 +39418,7 @@ /area/station/security/range) "gge" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/asmaint) "ggt" = ( @@ -39862,7 +39844,7 @@ /area/station/maintenance/disposal/west) "goE" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) @@ -40352,7 +40334,7 @@ }, /area/station/hallway/primary/port/south) "gxp" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/service/clown/secret) @@ -41162,7 +41144,7 @@ /area/station/maintenance/fsmaint) "gLj" = ( /obj/structure/table/wood, -/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -41830,7 +41812,7 @@ /area/station/service/bar) "gWd" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/maintcentral) "gXb" = ( @@ -42240,7 +42222,7 @@ "hcK" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/closet/wardrobe/black, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "hcL" = ( @@ -42248,7 +42230,7 @@ /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, /obj/item/storage/fancy/cigarettes/cigpack_random, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -42814,7 +42796,7 @@ /area/station/maintenance/storage) "hmo" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "hmp" = ( @@ -43288,7 +43270,7 @@ /area/station/hallway/primary/fore/east) "huF" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/west) "huM" = ( @@ -43413,7 +43395,7 @@ /area/station/maintenance/disposal/west) "hxc" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -43462,7 +43444,7 @@ /area/station/maintenance/storage) "hxO" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "hxR" = ( @@ -43551,7 +43533,7 @@ /area/station/security/lobby) "hzj" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/structure/disposalpipe/segment/corner{ dir = 4 }, @@ -43663,7 +43645,7 @@ }, /obj/effect/decal/cleanable/cobweb, /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/north) "hAX" = ( @@ -44038,7 +44020,7 @@ /area/station/science/hallway) "hHb" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/gambling_den) "hHu" = ( @@ -44151,7 +44133,7 @@ icon_state = "1-2" }, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "hIo" = ( @@ -44583,7 +44565,7 @@ /area/station/public/quantum/security) "hPG" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/roller, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -44919,7 +44901,7 @@ "hSU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "hSY" = ( @@ -45467,7 +45449,7 @@ /area/station/command/office/ntrep) "ibf" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) "ibJ" = ( @@ -46256,8 +46238,8 @@ pixel_x = 1; pixel_y = 5 }, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/west) "imU" = ( @@ -46315,7 +46297,7 @@ /area/station/hallway/primary/fore/east) "inP" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -47531,11 +47513,6 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/fore/east) -"iEW" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating, -/area/station/maintenance/starboard) "iEY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -47761,7 +47738,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "iIW" = ( @@ -48032,7 +48009,7 @@ /area/station/science/toxins/launch) "iNd" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "iNj" = ( @@ -48175,7 +48152,7 @@ /area/station/maintenance/fore) "iOU" = ( /obj/structure/table/wood, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/wood, /area/station/maintenance/starboard) "iPa" = ( @@ -48882,13 +48859,13 @@ "iYY" = ( /obj/structure/closet, /obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/mine/unexplored/cere/orbiting) "iZd" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/west) "iZr" = ( @@ -49160,7 +49137,7 @@ /area/station/engineering/atmos) "jbp" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/flashlight, /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/starboard) @@ -50029,7 +50006,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/east) "jpP" = ( @@ -50750,7 +50727,7 @@ /area/station/command/office/rd) "jyk" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "jyx" = ( @@ -50954,7 +50931,7 @@ /turf/space, /area/station/hallway/spacebridge/cargocom) "jAx" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/table, /obj/effect/landmark/burnturf, /obj/item/robotanalyzer, @@ -51335,7 +51312,7 @@ /area/station/maintenance/port) "jFd" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "jFg" = ( @@ -52360,7 +52337,7 @@ /area/station/hallway/secondary/entry/east) "jUd" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -52383,7 +52360,7 @@ pixel_x = 5; pixel_y = -2 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/starboard) "jUz" = ( @@ -52529,7 +52506,7 @@ /area/station/hallway/primary/starboard/south) "jXm" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "jXt" = ( @@ -53170,7 +53147,7 @@ pixel_y = -3; pixel_x = 3 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkpurple" @@ -53245,8 +53222,8 @@ dir = 8 }, /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/storage) "kjT" = ( @@ -53872,7 +53849,7 @@ icon_state = "1-2" }, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "kuj" = ( @@ -54015,7 +53992,7 @@ /area/station/command/office/ntrep) "kwQ" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/disposalpipe/segment/corner{ dir = 4 }, @@ -54169,7 +54146,7 @@ /area/station/hallway/secondary/entry/south) "kyo" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/storage) "kyp" = ( @@ -54660,7 +54637,7 @@ "kIn" = ( /obj/structure/table, /obj/item/storage/fancy/cigarettes, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/south) "kIo" = ( @@ -55874,7 +55851,7 @@ "kZw" = ( /obj/structure/table, /obj/item/storage/fancy/cigarettes, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 4; sort_type_txt = "25" @@ -56618,11 +56595,6 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/central/east) -"ljR" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/simulated/floor/plating, -/area/station/maintenance/starboard) "ljV" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -56693,7 +56665,7 @@ /area/station/supply/expedition) "lkL" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "llc" = ( @@ -58387,7 +58359,7 @@ /area/station/maintenance/apmaint) "lJM" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/southeast) "lJN" = ( @@ -60111,7 +60083,7 @@ "mkA" = ( /obj/item/storage/toolbox/mechanical, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/south) "mkS" = ( @@ -60149,7 +60121,7 @@ dir = 4 }, /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/east) "mlM" = ( @@ -60188,7 +60160,7 @@ /area/station/maintenance/fsmaint) "mmx" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/port) "mmz" = ( @@ -60339,7 +60311,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/southwest) "moQ" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fore2) @@ -61213,7 +61185,7 @@ /area/station/security/main) "mCE" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/pickaxe, /turf/simulated/floor/plating, /area/station/maintenance/storage) @@ -61443,7 +61415,7 @@ "mGY" = ( /obj/item/storage/box/bodybags, /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "mHg" = ( @@ -61597,8 +61569,8 @@ /area/station/hallway/primary/port/north) "mJn" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -61922,7 +61894,7 @@ /area/station/maintenance/electrical_shop) "mPu" = ( /obj/structure/table/wood/poker, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/barsign{ pixel_y = 32 }, @@ -62304,8 +62276,8 @@ /area/station/hallway/secondary/entry/north) "mUe" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/port) "mUu" = ( @@ -63194,7 +63166,7 @@ /area/station/hallway/secondary/exit) "njs" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/pickaxe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -63218,7 +63190,7 @@ /area/station/hallway/spacebridge/engmed) "njx" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/maintcentral) "njB" = ( @@ -63778,7 +63750,7 @@ /area/station/turret_protected/ai_upload) "ntf" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/port) "nto" = ( @@ -63982,7 +63954,7 @@ /area/station/engineering/control) "nvA" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -64174,7 +64146,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "nyX" = ( -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -64659,7 +64631,7 @@ /area/station/security/detective) "nHK" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/hallway/primary/port/north) "nHR" = ( @@ -65426,7 +65398,7 @@ path_to_spawn = /mob/living/simple_animal/hostile/scarybat; total_amount = 20 }, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -65788,7 +65760,7 @@ /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/port) "oci" = ( -/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/hallway/spacebridge/scidock) "ocw" = ( @@ -67770,7 +67742,7 @@ pixel_x = -13; pixel_y = 2 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -67854,7 +67826,7 @@ "oJH" = ( /obj/structure/closet/crate, /obj/item/pickaxe/emergency, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/apmaint) "oJY" = ( @@ -70380,12 +70352,6 @@ icon_state = "whitepurplecorner" }, /area/station/science/misc_lab) -"pvo" = ( -/obj/effect/spawner/lootdrop/maintenance/three, -/turf/simulated/floor/plating{ - icon_state = "asteroidplating" - }, -/area/station/hallway/spacebridge/scidock) "pvH" = ( /obj/structure/chair/sofa/pew/right{ dir = 8 @@ -70610,7 +70576,7 @@ "pzK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "pzS" = ( @@ -71153,7 +71119,7 @@ /turf/simulated/floor/wood, /area/station/service/bar) "pIc" = ( -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/structure/closet, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -71245,7 +71211,7 @@ "pKj" = ( /obj/structure/table, /obj/machinery/light, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -71663,7 +71629,7 @@ /area/station/supply/storage) "pPI" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "pPM" = ( @@ -72212,7 +72178,7 @@ /area/station/maintenance/apmaint) "pWH" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/starboard) "pWQ" = ( @@ -72251,7 +72217,7 @@ /area/station/service/theatre) "pXp" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/food/donkpocket, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -72681,7 +72647,7 @@ dir = 8 }, /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "qcS" = ( @@ -72869,7 +72835,7 @@ /area/station/service/library) "qfv" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -73066,6 +73032,18 @@ icon_state = "dark" }, /area/station/service/chapel) +"qhZ" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/closet/crate, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/maintenance/asmaint) "qii" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -73483,7 +73461,7 @@ /area/station/hallway/secondary/exit) "qov" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/pickaxe/emergency, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -73593,7 +73571,7 @@ /area/station/maintenance/apmaint) "qpM" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) @@ -75460,7 +75438,7 @@ pixel_x = 1 }, /obj/item/storage/toolbox/mechanical, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/hallway/primary/aft/west) "qUu" = ( @@ -77395,7 +77373,7 @@ /area/station/maintenance/disposal/external/southwest) "rFq" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/hallway/primary/aft/west) "rFJ" = ( @@ -77891,7 +77869,7 @@ /area/station/command/bridge) "rMP" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/southwest) "rMT" = ( @@ -79260,8 +79238,8 @@ "shB" = ( /obj/structure/rack, /obj/item/pickaxe/emergency, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/small, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -79849,7 +79827,7 @@ "srv" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/starboard) "srN" = ( @@ -80377,16 +80355,6 @@ icon_state = "darkblue" }, /area/station/command/office/cmo) -"swR" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/starboard) "sxa" = ( /obj/effect/spawner/random_spawners/wall_rusted_always, /turf/simulated/wall, @@ -82130,7 +82098,7 @@ /area/station/security/warden) "sWZ" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/southwest) "sXj" = ( @@ -82348,11 +82316,6 @@ icon_state = "white" }, /area/station/medical/virology) -"taQ" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating/asteroid/ancient, -/area/station/maintenance/port) "taW" = ( /obj/machinery/light/small{ dir = 1 @@ -82487,7 +82450,7 @@ /area/station/public/vacant_office) "tcw" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/gambling_den) "tcx" = ( @@ -82754,9 +82717,9 @@ /area/station/maintenance/disposal/external/southwest) "thz" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/disposalpipe/segment/corner{ dir = 1 }, @@ -83177,7 +83140,7 @@ /area/station/hallway/spacebridge/scidock) "tnj" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/apmaint) "tnA" = ( @@ -83434,8 +83397,8 @@ /area/station/supply/sorting) "tsc" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/maintcentral) "tsf" = ( @@ -83806,8 +83769,8 @@ /area/station/engineering/tech_storage) "twx" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/fpmaint) "twF" = ( @@ -84382,7 +84345,7 @@ /area/station/hallway/spacebridge/dockmed) "tFK" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -85392,8 +85355,8 @@ /area/station/maintenance/starboard) "tXA" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "tXE" = ( @@ -88196,11 +88159,6 @@ "uMr" = ( /turf/simulated/wall/r_wall, /area/station/science/rnd) -"uMu" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating, -/area/station/maintenance/maintcentral) "uMC" = ( /obj/machinery/door/airlock/public/glass{ name = "Rehabilitation Dome" @@ -88475,7 +88433,7 @@ "uQh" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/disposalpipe/segment/corner, /turf/simulated/floor/plating{ icon_state = "asteroidplating" @@ -90023,11 +89981,6 @@ icon_state = "tranquillite" }, /area/station/service/mime) -"vok" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating, -/area/station/maintenance/maintcentral) "vos" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -90092,7 +90045,7 @@ pixel_y = 5 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitepurple" @@ -90521,8 +90474,8 @@ /area/station/medical/cloning) "vun" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -90885,7 +90838,7 @@ /obj/item/coin/silver, /obj/item/coin/silver, /obj/item/pickaxe, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/port) "vzj" = ( @@ -91865,11 +91818,6 @@ icon_state = "darkred" }, /area/station/security/checkpoint/secondary) -"vOv" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating/asteroid/ancient, -/area/station/maintenance/starboard) "vOI" = ( /turf/simulated/floor/carpet/cyan, /area/station/public/fitness) @@ -94150,7 +94098,7 @@ /area/station/hallway/primary/starboard/south) "wuY" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/public/storefront) @@ -95372,7 +95320,7 @@ /area/station/maintenance/fsmaint) "wJY" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -96297,7 +96245,7 @@ /area/station/maintenance/gambling_den) "wZl" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/station/hallway/primary/central/north) @@ -96489,7 +96437,7 @@ /area/station/maintenance/port) "xaU" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "xbh" = ( @@ -96597,7 +96545,7 @@ /obj/structure/rack, /obj/item/storage/toolbox/mechanical, /obj/item/weldingtool/hugetank, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/east) "xcH" = ( @@ -96954,7 +96902,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -96965,7 +96913,7 @@ "xiV" = ( /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/port) "xja" = ( @@ -97527,7 +97475,7 @@ /area/station/legal/courtroom) "xtR" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/gambling_den) "xtS" = ( @@ -98580,7 +98528,7 @@ /area/station/engineering/control) "xGC" = ( /obj/structure/closet/crate/internals, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 5; @@ -98661,7 +98609,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/electrical_shop) "xHO" = ( @@ -98756,7 +98704,7 @@ /area/station/public/quantum/science) "xIU" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -99853,7 +99801,7 @@ /area/station/maintenance/port) "xZC" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/airlock_electronics, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -100152,7 +100100,7 @@ dir = 1 }, /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "yeW" = ( @@ -114765,7 +114713,7 @@ rzu mHH ijL ccx -taQ +mmx vtY vtY usD @@ -135101,7 +135049,7 @@ mkk fLT fLT dkk -uMu +aQR cUr rgm rgm @@ -135377,7 +135325,7 @@ cYC cYM wzj cYC -pvo +nyX cYC cYC jGj @@ -139186,7 +139134,7 @@ oLP iuC bvj fLT -uMu +aQR nVW nVW nVW @@ -140748,7 +140696,7 @@ wJC vUQ wJC mkk -vok +eot hxE aXR aXR @@ -141555,7 +141503,7 @@ mpB mpB ixC bKg -fbA +qhZ vWF vWF vWF @@ -144638,7 +144586,7 @@ aXn aXn aXn wLr -fka +gah pXf yep xSo @@ -154362,7 +154310,7 @@ gbJ gbJ bLk cFA -bNL +abH tvJ xjx vbn @@ -156157,7 +156105,7 @@ uyn bkH biN wyL -iEW +fVg itf qIV xAV @@ -157176,7 +157124,7 @@ oXg bil gFg gSQ -vOv +pWH biN eEd bkH @@ -157936,7 +157884,7 @@ alc gSQ xAV qWh -swR +arQ bil dzF dzP @@ -159980,7 +159928,7 @@ rNK rNK lCC alc -ljR +jXm yhg umz gSQ diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index c39322991ad3..c208e919ab1a 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -1703,7 +1703,7 @@ /area/station/maintenance/fore2) "amV" = ( /obj/structure/table/wood, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -1851,7 +1851,7 @@ /area/station/maintenance/fore2) "anC" = ( /obj/structure/table/reinforced, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/station/maintenance/fore2) @@ -2799,7 +2799,7 @@ /area/station/maintenance/fore2) "aqm" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -2807,7 +2807,7 @@ "aqn" = ( /obj/structure/rack, /obj/item/crowbar, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -2816,7 +2816,7 @@ "aqo" = ( /obj/structure/closet/crate, /obj/item/flashlight, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/fore2) @@ -3996,7 +3996,7 @@ name = "booze cabinet" }, /obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/effect/landmark/damageturf, /turf/simulated/floor/wood, /area/station/maintenance/fore) @@ -4569,7 +4569,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "auQ" = ( @@ -4700,7 +4700,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "avl" = ( @@ -5859,12 +5859,12 @@ /area/station/maintenance/fore) "axZ" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "aya" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -6158,7 +6158,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/disposal) "azh" = ( @@ -6553,7 +6553,7 @@ "aAk" = ( /obj/structure/rack, /obj/item/reagent_containers/drinks/bottle/whiskey, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "aAl" = ( @@ -6775,7 +6775,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/turf_decal/delivery/hollow, /obj/structure/disposalpipe/segment{ dir = 4 @@ -6789,7 +6789,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment{ dir = 4 @@ -7066,7 +7066,7 @@ /area/station/supply/storage) "aBo" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "aBp" = ( @@ -7081,7 +7081,7 @@ /obj/structure/table/wood, /obj/item/clothing/shoes/jackboots, /obj/effect/landmark/costume/random, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -7702,7 +7702,7 @@ /area/station/supply/storage) "aDj" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/station/supply/sorting) @@ -7924,7 +7924,7 @@ /area/station/supply/storage) "aDN" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/supply/sorting) "aDO" = ( @@ -8290,7 +8290,7 @@ }, /area/station/supply/storage) "aEX" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -8298,7 +8298,7 @@ /area/station/supply/storage) "aEY" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -8541,7 +8541,7 @@ "aFG" = ( /obj/structure/closet/crate, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -9242,7 +9242,7 @@ /area/station/maintenance/abandoned_garden) "aHz" = ( /obj/structure/closet/cardboard, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ @@ -10389,7 +10389,7 @@ /obj/machinery/conveyor{ id = "cargodisposals" }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/supply/sorting) "aKB" = ( @@ -10437,7 +10437,7 @@ /area/station/supply/storage) "aKL" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ @@ -10758,7 +10758,7 @@ /area/station/engineering/controlroom) "aLx" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -10815,7 +10815,7 @@ /area/station/service/barber) "aLH" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -11385,7 +11385,7 @@ }, /area/station/supply/storage) "aNw" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -12411,7 +12411,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/gambling_den) "aQr" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ @@ -12866,7 +12866,7 @@ /area/station/service/bar) "aRu" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/effect/spawner/random/maintenance, /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel/airless{ dir = 10; @@ -18563,7 +18563,7 @@ /area/station/maintenance/fore) "bgo" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "bgp" = ( @@ -19707,7 +19707,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "bjd" = ( @@ -19880,7 +19880,7 @@ /area/station/service/kitchen) "bjy" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "bjz" = ( @@ -21183,7 +21183,7 @@ "bmP" = ( /obj/structure/rack, /obj/effect/landmark/costume/random, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "bmQ" = ( @@ -26841,7 +26841,7 @@ /obj/item/assembly/igniter, /obj/item/assembly/igniter, /obj/item/assembly/igniter, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) @@ -30757,7 +30757,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "cautioncorner" @@ -30765,7 +30765,7 @@ /area/station/public/storage/tools/auxiliary) "bLm" = ( /obj/structure/closet/toolcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "yellow" @@ -32205,7 +32205,7 @@ /obj/structure/rack, /obj/item/storage/toolbox/emergency, /obj/item/storage/toolbox/emergency, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "yellow" @@ -35679,7 +35679,7 @@ /area/station/legal/magistrate) "bYU" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/railing{ dir = 1 }, @@ -35977,7 +35977,7 @@ /area/station/maintenance/port) "bZI" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "bZJ" = ( @@ -36742,7 +36742,7 @@ /area/station/engineering/smes) "cby" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "neutral" @@ -37555,7 +37555,7 @@ /area/station/engineering/smes) "cdr" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -38184,12 +38184,6 @@ /obj/machinery/power/apc/critical/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/engineering/smes) -"cfk" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "cfn" = ( /obj/effect/decal/cleanable/fungus, /turf/simulated/wall, @@ -39481,7 +39475,7 @@ /area/station/public/locker) "cjm" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "cjn" = ( @@ -39491,7 +39485,7 @@ "cjo" = ( /obj/structure/rack, /obj/item/book/manual/wiki/security_space_law, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "cjp" = ( @@ -40653,7 +40647,7 @@ /area/station/legal/lawoffice) "cmq" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard2) "cmr" = ( @@ -41524,7 +41518,7 @@ "coU" = ( /obj/structure/closet, /obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "neutral" @@ -42781,7 +42775,7 @@ "csd" = ( /obj/structure/table, /obj/item/storage/box/bodybags, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "cse" = ( @@ -42793,7 +42787,7 @@ "csf" = ( /obj/structure/closet/crate, /obj/item/clothing/shoes/jackboots, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "csh" = ( @@ -45345,7 +45339,7 @@ }, /obj/item/clothing/gloves/color/black, /obj/item/wrench, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/maintenance/port) @@ -46007,7 +46001,7 @@ /area/station/maintenance/port) "cBd" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -46972,7 +46966,7 @@ /area/station/maintenance/port) "cEa" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 4; @@ -47263,7 +47257,7 @@ "cFk" = ( /obj/structure/table, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "cFl" = ( @@ -47540,7 +47534,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -48247,7 +48241,7 @@ /area/station/maintenance/port) "cHo" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -48255,7 +48249,7 @@ "cHp" = ( /obj/structure/rack, /obj/item/clothing/gloves/color/fyellow, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -48820,7 +48814,7 @@ /area/station/engineering/equipmentstorage) "cIS" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "cIT" = ( @@ -49151,13 +49145,13 @@ /area/station/maintenance/port) "cKf" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/port) "cKg" = ( /obj/structure/rack, /obj/item/book/manual/wiki/engineering_guide, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/port) "cKi" = ( @@ -49812,11 +49806,6 @@ icon_state = "neutralcorner" }, /area/station/public/fitness) -"cMS" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/three, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "cMU" = ( /obj/machinery/atmospherics/binary/valve, /obj/effect/turf_decal/stripes/line{ @@ -50727,7 +50716,7 @@ /obj/structure/closet, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -51602,7 +51591,7 @@ /area/station/maintenance/starboard) "cTc" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -51937,7 +51926,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "cUA" = ( @@ -52904,7 +52893,7 @@ /area/station/maintenance/port) "cXY" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -53086,7 +53075,7 @@ "cZc" = ( /obj/structure/rack, /obj/item/clothing/accessory/stethoscope, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -54691,7 +54680,7 @@ /area/station/maintenance/starboard) "dey" = ( /obj/structure/table/wood, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/wood, /area/station/maintenance/starboard) "deA" = ( @@ -55364,7 +55353,7 @@ /area/station/public/construction) "dhq" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -55757,7 +55746,7 @@ }, /obj/item/crowbar/red, /obj/item/wrench, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -57100,7 +57089,7 @@ "dot" = ( /obj/effect/decal/cleanable/cobweb2, /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "dou" = ( @@ -58390,7 +58379,7 @@ /area/station/maintenance/starboard) "duK" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -59129,7 +59118,7 @@ /area/station/maintenance/library) "dzo" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/landmark/costume/random, /obj/effect/landmark/costume/random, /turf/simulated/floor/plasteel{ @@ -60263,7 +60252,7 @@ /area/station/science/toxins/test) "dES" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -60912,11 +60901,6 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) -"dIA" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating, -/area/station/maintenance/apmaint) "dID" = ( /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -61202,7 +61186,7 @@ "dKH" = ( /obj/structure/closet/crate, /obj/item/flashlight, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dKI" = ( @@ -62688,7 +62672,7 @@ /area/station/maintenance/apmaint) "dRL" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dRM" = ( @@ -62810,7 +62794,7 @@ /area/station/service/chapel) "dSn" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ dir = 8; @@ -64559,7 +64543,7 @@ /area/station/maintenance/starboard2) "eeX" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/storage/box/bodybags, /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -67578,7 +67562,7 @@ /obj/machinery/fishtank/bowl, /obj/machinery/fishtank/bowl, /obj/machinery/fishtank/bowl, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/beach/sand, /area/station/maintenance/fsmaint) "fMc" = ( @@ -68159,7 +68143,7 @@ /area/station/aisat) "gbO" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -68777,7 +68761,7 @@ /area/station/security/armory/secure) "gwu" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "gwZ" = ( @@ -69518,7 +69502,7 @@ /obj/structure/table/wood, /obj/item/folder/white, /obj/item/folder/red, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -70017,7 +70001,7 @@ "hjo" = ( /obj/structure/closet/crate, /obj/effect/landmark/costume/random, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "hjK" = ( @@ -70034,7 +70018,7 @@ name = "north bump"; pixel_y = 28 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/fore2) "hkM" = ( @@ -71802,7 +71786,7 @@ /area/station/public/pet_store) "iny" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "inH" = ( @@ -72254,7 +72238,7 @@ /area/station/medical/reception) "iBK" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -72686,7 +72670,7 @@ dir = 1 }, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "iQb" = ( @@ -73013,7 +72997,7 @@ /area/station/hallway/primary/central/nw) "iXL" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "iXM" = ( @@ -74050,7 +74034,7 @@ /area/station/engineering/atmos) "jJj" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "jJl" = ( @@ -75082,7 +75066,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "kkB" = ( -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -75141,7 +75125,7 @@ /area/station/hallway/primary/central/north) "klS" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) "kmr" = ( @@ -76159,7 +76143,7 @@ "kSX" = ( /obj/structure/closet/crate, /obj/item/flashlight, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -77102,7 +77086,7 @@ dir = 4 }, /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -77185,7 +77169,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "lxC" = ( @@ -79725,7 +79709,7 @@ /area/station/hallway/primary/central/east) "mWO" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -79876,7 +79860,7 @@ /obj/structure/rack, /obj/item/storage/fancy/matches, /obj/item/storage/fancy/cigarettes/cigpack_robust, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "naB" = ( @@ -80720,7 +80704,7 @@ /area/station/maintenance/abandoned_garden) "nyK" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "nzB" = ( @@ -81880,7 +81864,7 @@ /area/station/turret_protected/aisat) "okf" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/small{ dir = 1 }, @@ -82534,7 +82518,7 @@ /area/station/aisat) "oBE" = ( /obj/item/vending_refill/coffee, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "oBK" = ( @@ -83223,7 +83207,7 @@ /obj/structure/closet/crate{ opened = 1 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -83828,7 +83812,7 @@ "pmA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "pmI" = ( @@ -84946,7 +84930,7 @@ /obj/structure/rack, /obj/item/multitool, /obj/item/wrench, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/effect/landmark/damageturf, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) @@ -85084,7 +85068,7 @@ "pWt" = ( /obj/effect/spawner/random_spawners/cobweb_right_frequent, /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "pWw" = ( @@ -85184,7 +85168,7 @@ /area/station/medical/cryo) "qaf" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/retractor, /turf/simulated/floor/plasteel{ dir = 8; @@ -86283,7 +86267,7 @@ /area/station/engineering/controlroom) "qOd" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/small{ dir = 1 }, @@ -86793,7 +86777,7 @@ }, /area/station/hallway/primary/central/south) "qZI" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "qZV" = ( @@ -87187,11 +87171,6 @@ temperature = 80 }, /area/station/science/xenobiology) -"rkv" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/three, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "rkA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -87240,7 +87219,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "rly" = ( @@ -88061,7 +88040,7 @@ /obj/effect/decal/cleanable/cobweb2, /obj/effect/decal/cleanable/dirt, /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "rJk" = ( @@ -88222,7 +88201,7 @@ "rOe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -89841,7 +89820,7 @@ /area/station/maintenance/apmaint) "szf" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "szk" = ( @@ -90141,7 +90120,7 @@ /area/space/nearstation) "sHd" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -90240,7 +90219,7 @@ "sJD" = ( /obj/structure/table, /obj/item/hand_labeler, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -90494,7 +90473,7 @@ "sQa" = ( /obj/structure/closet, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "sQr" = ( @@ -92395,7 +92374,7 @@ "tVb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -93001,7 +92980,7 @@ }, /area/station/public/fitness) "ujH" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -93349,7 +93328,7 @@ /area/station/maintenance/apmaint) "uud" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /obj/item/clothing/accessory/stethoscope, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -93371,7 +93350,7 @@ /area/station/maintenance/apmaint) "uvD" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" @@ -94500,7 +94479,7 @@ /area/station/engineering/controlroom) "vhF" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "vhS" = ( @@ -96428,7 +96407,7 @@ /area/station/maintenance/starboard) "wnt" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/effect/turf_decal/delivery/hollow, /obj/structure/cable{ d1 = 1; @@ -99294,7 +99273,7 @@ "xRD" = ( /obj/effect/spawner/random_spawners/cobweb_right_frequent, /obj/structure/closet/firecloset, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "xRM" = ( @@ -119773,7 +119752,7 @@ cie cie cie bXU -rkv +jJj drn dhG cHA @@ -120550,7 +120529,7 @@ drn cIv dhG cLA -cMS +cIS cLA cQu cLA @@ -128750,7 +128729,7 @@ bYe cHA cby cdr -cfk +cdr drn cLA cQu @@ -134980,7 +134959,7 @@ jLf gNm iqc dHL -dIA +bjy dJx dKh dOr diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 0169c7bbe85f..893b1d023e85 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -72,10 +72,7 @@ /turf/simulated/wall/r_wall, /area/station/security/permabrig) "abX" = ( -/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" - }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/fore) "abZ" = ( @@ -97,15 +94,12 @@ pixel_y = 2 }, /obj/item/taperecorder, -/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" - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/fore) "acv" = ( @@ -518,7 +512,7 @@ /obj/structure/table, /obj/item/multitool, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "agi" = ( @@ -574,7 +568,7 @@ /area/space) "agG" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "agH" = ( @@ -1221,7 +1215,7 @@ /area/station/maintenance/disposal) "alt" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "alv" = ( @@ -1275,7 +1269,7 @@ /obj/item/clothing/suit/monkeysuit, /obj/item/clothing/head/xenos, /obj/item/clothing/mask/gas/monkeymask, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "alz" = ( @@ -1429,7 +1423,7 @@ /obj/item/clothing/gloves/color/yellow, /obj/item/mop, /obj/item/bikehorn/rubberducky, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "amv" = ( @@ -1568,7 +1562,7 @@ /area/station/engineering/gravitygenerator) "ano" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "anv" = ( @@ -1585,7 +1579,7 @@ /obj/structure/closet, /obj/item/poster/random_contraband, /obj/item/storage/box/lights/mixed, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "anA" = ( @@ -1668,7 +1662,7 @@ }, /obj/item/dice/d8, /obj/item/healthanalyzer, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "anK" = ( @@ -1871,10 +1865,7 @@ /obj/machinery/conveyor/north{ id = "garbage" }, -/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" - }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "aoU" = ( @@ -1936,7 +1927,7 @@ /obj/item/storage/secure/briefcase, /obj/item/disk/data, /obj/item/grenade/flashbang, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "api" = ( @@ -2190,21 +2181,21 @@ /obj/structure/closet/crate, /obj/item/bodybag, /obj/item/radio, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aqz" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, /obj/item/stock_parts/cell/crap, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aqA" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, /obj/item/firealarm_electronics, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aqB" = ( @@ -2220,7 +2211,7 @@ pixel_x = 4; pixel_y = -3 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 10 }, @@ -2300,7 +2291,7 @@ "arn" = ( /obj/structure/rack, /obj/item/extinguisher, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random_spawners/cobweb_left_frequent, /turf/simulated/floor/plasteel, @@ -2633,7 +2624,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "ata" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/airless, /area/space/nearstation) "atc" = ( @@ -2791,7 +2782,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "atJ" = ( @@ -3090,7 +3081,7 @@ /obj/structure/rack, /obj/item/storage/toolbox/emergency, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "auB" = ( @@ -3115,7 +3106,7 @@ "auG" = ( /obj/structure/closet/crate, /obj/item/clothing/gloves/color/fyellow, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "auH" = ( @@ -3650,7 +3641,7 @@ /area/station/maintenance/fpmaint) "awM" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_right_frequent, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -3769,7 +3760,7 @@ /area/station/public/locker) "axb" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "axc" = ( @@ -3850,7 +3841,7 @@ /turf/simulated/floor/plating, /area/station/public/storage/emergency/port) "axt" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/landmark/damageturf, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -4362,7 +4353,7 @@ /area/station/maintenance/fsmaint) "azu" = ( /obj/structure/closet/firecloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "azy" = ( @@ -4493,10 +4484,7 @@ /area/station/maintenance/port) "azQ" = ( /obj/item/stack/sheet/cardboard, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs); - name = "Janitor Supplies Spawner" - }, +/obj/effect/spawner/random/janitor/supplies, /turf/simulated/floor/plating, /area/station/maintenance/port2) "azR" = ( @@ -4575,7 +4563,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) "aAm" = ( @@ -4675,12 +4663,12 @@ /area/station/legal/courtroom/gallery) "aAO" = ( /obj/structure/closet/crate/freezer, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "aAP" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aAU" = ( @@ -4881,7 +4869,7 @@ /area/station/public/mrchangs) "aBT" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aBV" = ( @@ -4922,7 +4910,7 @@ /turf/simulated/wall/r_wall, /area/station/maintenance/fsmaint) "aCa" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -5279,7 +5267,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aDD" = ( @@ -5650,10 +5638,7 @@ /obj/machinery/light/small{ dir = 1 }, -/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" - }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/aft) "aEQ" = ( @@ -6012,16 +5997,13 @@ /area/station/maintenance/fore) "aGH" = ( /obj/effect/decal/cleanable/dirt, -/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" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/fore) "aGJ" = ( @@ -6046,10 +6028,7 @@ /obj/machinery/conveyor/west{ id = "garbage" }, -/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" - }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "aGO" = ( @@ -6185,7 +6164,7 @@ "aHm" = ( /obj/structure/closet/crate, /obj/item/coin/silver, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aHn" = ( @@ -7566,7 +7545,7 @@ /area/station/service/bar) "aLD" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/public/construction) "aLE" = ( @@ -7753,11 +7732,8 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "aMe" = ( -/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" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aMf" = ( @@ -9148,7 +9124,7 @@ /area/station/command/office/hos) "aQQ" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/small{ dir = 8 }, @@ -10230,7 +10206,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/east) "aUx" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -11245,7 +11221,7 @@ "aXr" = ( /obj/structure/table, /obj/item/storage/belt/utility, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -11476,7 +11452,7 @@ /area/station/hallway/secondary/entry/north) "aXT" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/public/construction) "aXU" = ( @@ -11537,7 +11513,7 @@ /area/station/hallway/secondary/entry/north) "aYb" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aYh" = ( @@ -13190,7 +13166,7 @@ /area/station/security/permabrig) "bdl" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "bdm" = ( @@ -15453,10 +15429,7 @@ id = "packageSort2" }, /obj/effect/turf_decal/stripes/line, -/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" - }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/supply/office) "biG" = ( @@ -15519,7 +15492,7 @@ /area/station/hallway/primary/central/north) "biO" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "biS" = ( @@ -15727,7 +15700,7 @@ /obj/structure/rack, /obj/item/apc_electronics, /obj/item/airlock_electronics, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "yellow" }, @@ -16646,7 +16619,7 @@ /obj/item/clothing/gloves/color/fyellow, /obj/item/clothing/suit/storage/hazardvest, /obj/item/multitool, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light_switch{ dir = 4; name = "west bump"; @@ -16964,7 +16937,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bmA" = ( @@ -19784,7 +19757,7 @@ /area/station/command/bridge) "buy" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/small{ dir = 4 }, @@ -22400,7 +22373,7 @@ /obj/structure/closet, /obj/item/poster/random_contraband, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "bBO" = ( @@ -23690,11 +23663,8 @@ d2 = 4; icon_state = "0-4" }, -/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" - }, /obj/machinery/power/apc/directional/south, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/port) "bGd" = ( @@ -23886,7 +23856,7 @@ "bHp" = ( /obj/structure/rack, /obj/item/flashlight, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "bHq" = ( @@ -24150,11 +24120,8 @@ /area/station/maintenance/starboard) "bHX" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/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" - }, /obj/item/shard, +/obj/effect/spawner/random/trash, /turf/simulated/floor/bluegrid, /area/station/maintenance/starboard) "bHY" = ( @@ -26619,18 +26586,18 @@ /area/station/public/vacant_office) "bRD" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "bRE" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "bRF" = ( /obj/structure/closet, /obj/item/clothing/shoes/jackboots, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "bRG" = ( @@ -27045,14 +27012,6 @@ icon_state = "dark" }, /area/station/medical/morgue) -"bTb" = ( -/obj/effect/landmark/damageturf, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs); - name = "Janitor Supplies Spawner" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "bTd" = ( /obj/machinery/light_switch{ dir = 8; @@ -27171,7 +27130,7 @@ "bTr" = ( /obj/structure/closet/crate, /obj/item/rack_parts, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "bTs" = ( @@ -27463,7 +27422,7 @@ /area/station/public/vacant_office) "bUG" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/light/small{ dir = 8 @@ -27899,10 +27858,7 @@ /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "bWi" = ( -/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" - }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/port) "bWj" = ( @@ -28929,7 +28885,7 @@ dir = 4 }, /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -29042,11 +28998,9 @@ /area/station/maintenance/port) "caj" = ( /obj/structure/closet/crate/can, -/obj/effect/spawner/lootdrop/maintenance/two, -/obj/item/trash/pistachios, -/obj/item/trash/raisins, -/obj/item/trash/gum, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/fore) "cam" = ( @@ -29381,7 +29335,7 @@ /area/station/service/hydroponics) "cbq" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -29929,7 +29883,7 @@ "cdm" = ( /obj/structure/rack, /obj/item/clothing/mask/gas, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "caution" @@ -30016,7 +29970,7 @@ /area/station/maintenance/port) "cdG" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "cdH" = ( @@ -30371,7 +30325,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) "cfb" = ( @@ -31593,7 +31547,7 @@ /obj/item/stack/rods{ amount = 23 }, -/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cjq" = ( @@ -31990,7 +31944,7 @@ /area/station/engineering/solar/aft_port) "ckN" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -32077,7 +32031,7 @@ /obj/structure/sign/poster/random{ pixel_y = -32 }, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "greenblue" }, @@ -32113,7 +32067,7 @@ "clv" = ( /obj/item/food/monkeycube, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "cly" = ( @@ -32171,7 +32125,7 @@ "clK" = ( /obj/structure/closet, /obj/item/extinguisher, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "clL" = ( @@ -32280,7 +32234,7 @@ "cmg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/firecloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_right_rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -32722,12 +32676,6 @@ icon_state = "chapel" }, /area/station/service/chapel) -"coj" = ( -/obj/structure/closet, -/obj/item/extinguisher, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/simulated/floor/plating, -/area/station/maintenance/apmaint) "cok" = ( /obj/structure/chair/wheelchair, /obj/item/radio/intercom{ @@ -33648,14 +33596,14 @@ "crQ" = ( /obj/effect/turf_decal/stripes/white/line, /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_left_frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "crR" = ( /obj/structure/closet/crate, /obj/item/assembly/infra, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/turf_decal/stripes/white/line, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plating, @@ -33814,7 +33762,7 @@ pixel_x = 7; pixel_y = 4 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "csG" = ( @@ -33872,7 +33820,7 @@ amount = 34 }, /obj/item/extinguisher/mini, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "csT" = ( @@ -33940,16 +33888,13 @@ d2 = 8; icon_state = "4-8" }, -/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" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cta" = ( @@ -34207,11 +34152,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs); - name = "Janitor Supplies Spawner" - }, /obj/effect/turf_decal/stripes/line, +/obj/effect/spawner/random/janitor/supplies, /turf/simulated/floor/plating, /area/station/public/storage/emergency/port) "cuc" = ( @@ -34857,7 +34799,7 @@ /area/station/maintenance/turbine) "cwC" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cwD" = ( @@ -34909,7 +34851,7 @@ /area/station/maintenance/aft) "cwQ" = ( /obj/structure/closet/firecloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_right_frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -35090,7 +35032,7 @@ /obj/structure/rack, /obj/item/reagent_containers/glass/bucket, /obj/item/mop, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) "cxE" = ( @@ -35251,7 +35193,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -35433,7 +35375,7 @@ /area/station/science/server/coldroom) "cyT" = ( /obj/item/toy/plushie/shark, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /obj/effect/landmark/spawner/rev, /obj/effect/decal/cleanable/blood/old, /obj/structure/closet/crate, @@ -35447,7 +35389,7 @@ /area/station/engineering/atmos) "cze" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "czg" = ( @@ -35561,10 +35503,7 @@ }, /area/station/medical/storage) "czw" = ( -/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" - }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/aft) "czx" = ( @@ -35724,7 +35663,7 @@ /area/station/medical/virology) "cAu" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "cAw" = ( @@ -36221,13 +36160,13 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cCp" = ( /obj/structure/closet/crate, /obj/effect/landmark/damageturf, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cCr" = ( @@ -36719,7 +36658,7 @@ /area/station/command/office/captain/bedroom) "cEh" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cEj" = ( @@ -36777,7 +36716,7 @@ }, /area/station/science/xenobiology) "cEr" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "cEu" = ( @@ -37005,7 +36944,7 @@ dir = 4 }, /obj/structure/closet/firecloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -37109,13 +37048,10 @@ }, /area/station/medical/virology) "cFG" = ( -/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" - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/bluegrid, /area/station/maintenance/starboard) "cFH" = ( @@ -37146,7 +37082,7 @@ "cFU" = ( /obj/structure/closet/crate, /obj/effect/turf_decal/delivery/hollow, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "cFY" = ( @@ -38056,15 +37992,12 @@ }, /area/station/medical/cloning) "cIS" = ( -/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" - }, /obj/structure/sink{ dir = 8; pixel_x = -12; pixel_y = 2 }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cIT" = ( @@ -38497,7 +38430,7 @@ /area/station/medical/surgery/observation) "cKB" = ( /obj/structure/closet/crate/plastic, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "cKC" = ( @@ -38721,7 +38654,7 @@ "cLr" = ( /obj/structure/closet/firecloset, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "caution" @@ -38810,7 +38743,7 @@ /area/station/service/chapel) "cLN" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "cLO" = ( @@ -39190,7 +39123,7 @@ /area/station/maintenance/solar_maintenance/aft_port) "cNw" = ( /obj/structure/closet/wardrobe/white, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/medmaint) "cNz" = ( @@ -39401,7 +39334,7 @@ /area/station/hallway/primary/aft/south) "cOh" = ( /obj/structure/closet/crate/freezer, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; @@ -39668,11 +39601,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cPq" = ( -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs); - name = "Janitor Supplies Spawner" - }, /obj/effect/landmark/damageturf, +/obj/effect/spawner/random/janitor/supplies, /turf/simulated/floor/plating, /area/station/maintenance/port) "cPr" = ( @@ -39751,7 +39681,7 @@ pixel_x = 32 }, /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cPL" = ( @@ -39849,11 +39779,6 @@ }, /turf/simulated/floor/plating/airless, /area/station/science/toxins/test) -"cQb" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "cQc" = ( /obj/structure/window/reinforced{ dir = 1 @@ -39968,7 +39893,7 @@ /obj/item/stack/cable_coil, /obj/item/wrench, /obj/item/flashlight/seclite, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cQI" = ( @@ -40065,7 +39990,7 @@ /area/station/maintenance/solar_maintenance/aft_starboard) "cRc" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) "cRe" = ( @@ -40449,12 +40374,6 @@ }, /turf/simulated/floor/wood, /area/station/command/office/ntrep) -"cSK" = ( -/obj/structure/closet/crate, -/obj/effect/turf_decal/delivery/hollow, -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plasteel, -/area/station/maintenance/apmaint) "cSL" = ( /obj/structure/table/wood, /obj/item/clothing/under/misc/burial, @@ -40691,7 +40610,7 @@ "cTD" = ( /obj/effect/landmark/burnturf, /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) "cTH" = ( @@ -40966,7 +40885,7 @@ /area/station/service/chapel) "cUL" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "cUM" = ( @@ -41355,7 +41274,7 @@ /area/station/hallway/secondary/exit) "cWF" = ( /obj/structure/closet/secure_closet/personal, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/clothing/suit/storage/labcoat/science, /obj/item/clothing/under/rank/rnd/scientist, /obj/effect/decal/cleanable/dirt, @@ -41524,7 +41443,7 @@ /area/station/maintenance/port2) "cXu" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_right_rare, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -41747,7 +41666,7 @@ }, /area/station/medical/exam_room) "cYF" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cYG" = ( @@ -41849,10 +41768,7 @@ /area/station/medical/surgery/primary) "cZi" = ( /obj/structure/closet/emcloset, -/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" - }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "cZl" = ( @@ -41934,7 +41850,7 @@ "cZD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "cZI" = ( @@ -42085,7 +42001,7 @@ /area/station/maintenance/asmaint) "das" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "dat" = ( @@ -42407,7 +42323,7 @@ /area/station/engineering/solar/fore_starboard) "dcj" = ( /obj/structure/chair/sofa/left, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_right_rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -42646,7 +42562,7 @@ /area/space) "ddR" = ( /obj/structure/closet/secure_closet/personal, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/clothing/suit/storage/labcoat/science, /obj/item/clothing/under/rank/rnd/scientist, /obj/effect/decal/cleanable/dirt, @@ -43077,10 +42993,7 @@ /area/station/hallway/secondary/entry/south) "dgg" = ( /obj/effect/landmark/burnturf, -/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" - }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/port) "dgj" = ( @@ -43196,7 +43109,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -43206,7 +43119,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dhl" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/rack, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -44372,10 +44285,7 @@ /area/station/hallway/primary/central/se) "dCJ" = ( /obj/structure/closet, -/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" - }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "dCQ" = ( @@ -44654,7 +44564,7 @@ /area/station/service/hydroponics) "dLg" = ( /obj/item/rack_parts, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "dLF" = ( @@ -45384,7 +45294,7 @@ }, /area/station/public/toilet/lockerroom) "ech" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/table, /obj/effect/spawner/random_spawners/cobweb_left_rare, /turf/simulated/floor/plating, @@ -45985,7 +45895,7 @@ "erF" = ( /obj/structure/closet/crate/radiation, /obj/effect/turf_decal/delivery, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "erM" = ( @@ -46311,7 +46221,7 @@ /area/station/engineering/atmos) "eyo" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) "eyP" = ( @@ -47992,7 +47902,7 @@ /turf/space, /area/space/nearstation) "fiU" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/small{ dir = 8 }, @@ -48191,7 +48101,7 @@ "fmm" = ( /obj/structure/table, /obj/item/clothing/glasses/meson, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "caution" @@ -48916,13 +48826,13 @@ }, /obj/item/book/manual/wiki/hacking, /obj/item/tape/random, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "fAs" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "fAH" = ( @@ -49759,7 +49669,7 @@ /area/station/science/xenobiology) "fRm" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_left_rare, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -49898,7 +49808,7 @@ /area/station/maintenance/starboard) "fUf" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "caution" @@ -50887,7 +50797,7 @@ /area/station/engineering/ai_transit_tube) "gqi" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/small{ dir = 8 }, @@ -51104,7 +51014,7 @@ "gwG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/cardboard, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/toy/plushie/lizardplushie, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -51627,18 +51537,11 @@ /area/station/engineering/control) "gHN" = ( /obj/structure/closet/crate/trashcart, -/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" - }, -/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" - }, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/screwdriver, /obj/item/wirecutters, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "gHV" = ( @@ -53010,7 +52913,7 @@ /area/station/supply/lobby) "hjE" = ( /obj/effect/spawner/random_spawners/oil_maybe, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "hka" = ( @@ -53359,7 +53262,7 @@ /area/station/engineering/atmos/control) "hqx" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "hqL" = ( @@ -53447,7 +53350,7 @@ /area/station/medical/virology) "hts" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/small{ dir = 1 }, @@ -53746,10 +53649,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "hAK" = ( -/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" - }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -53757,6 +53656,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/fore) "hAL" = ( @@ -53854,11 +53754,8 @@ /obj/structure/closet/crate/secure/bin, /obj/item/paper/crumpled, /obj/item/paper/crumpled, -/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" - }, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "hCM" = ( @@ -53902,11 +53799,6 @@ icon_state = "neutralcorner" }, /area/station/hallway/secondary/bridge) -"hDE" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/simulated/floor/plating, -/area/station/maintenance/asmaint) "hDK" = ( /turf/simulated/floor/plasteel, /area/station/supply/lobby) @@ -53946,7 +53838,7 @@ /area/station/science/robotics) "hEj" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/xenobio_north) "hEo" = ( @@ -54111,7 +54003,7 @@ /area/station/engineering/control) "hFY" = ( /obj/structure/closet/firecloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "hGj" = ( @@ -55345,20 +55237,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/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" - }, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/xenobio_north) "igJ" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_left_frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -55423,11 +55312,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) -"iip" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "iiB" = ( /obj/docking_port/stationary{ dir = 8; @@ -56348,7 +56232,7 @@ /area/station/security/execution) "iBb" = ( /obj/structure/closet/secure_closet/personal, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/clothing/under/plasmaman/science, /obj/item/clothing/head/helmet/space/plasmaman/science, /obj/effect/spawner/random_spawners/cobweb_left_rare, @@ -56419,11 +56303,8 @@ /obj/structure/disposalpipe/broken{ dir = 1 }, -/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" - }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "iBR" = ( @@ -56545,7 +56426,7 @@ /obj/structure/closet/crate{ name = "Silver Crate" }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "iGV" = ( @@ -57715,7 +57596,7 @@ /area/station/engineering/control) "jiR" = ( /obj/structure/closet/firecloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_left_frequent, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -57733,7 +57614,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/rack, /obj/item/tank/internals/anesthetic, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -58131,7 +58012,7 @@ "juY" = ( /obj/structure/rack, /obj/item/poster/random_contraband, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "jvf" = ( @@ -58658,7 +58539,7 @@ /area/station/security/armory) "jGq" = ( /obj/structure/closet/crate/engineering/electrical, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "jGr" = ( @@ -59664,7 +59545,7 @@ /obj/item/stack/sheet/glass{ amount = 12 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "jXC" = ( @@ -59726,7 +59607,7 @@ /area/station/science/xenobiology) "jYH" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -59903,7 +59784,7 @@ /area/station/maintenance/aft2) "ken" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/small{ dir = 1 }, @@ -60311,10 +60192,7 @@ /area/station/engineering/atmos) "kol" = ( /obj/effect/landmark/burnturf, -/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" - }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/fore) "kpl" = ( @@ -60484,7 +60362,7 @@ /area/station/maintenance/engimaint) "ksa" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "ksb" = ( @@ -60827,22 +60705,10 @@ "kAP" = ( /obj/structure/closet/crate/trashcart, /obj/effect/turf_decal/delivery, -/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" - }, -/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" - }, -/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" - }, -/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" - }, +/obj/effect/spawner/random/trash, +/obj/effect/spawner/random/trash, +/obj/effect/spawner/random/trash, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "kBa" = ( @@ -61196,10 +61062,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/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" - }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/medmaint) "kGN" = ( @@ -61238,7 +61101,7 @@ "kIc" = ( /obj/structure/rack, /obj/item/hand_labeler, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "kIi" = ( @@ -61509,7 +61372,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) "kOw" = ( @@ -61763,7 +61626,7 @@ /area/station/security/permabrig) "kUz" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/xenobio_south) "kUA" = ( @@ -62595,7 +62458,7 @@ /area/station/science/rnd) "ljT" = ( /obj/item/rack_parts, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_right_rare, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -63164,7 +63027,7 @@ /area/station/maintenance/port) "lvJ" = ( /obj/structure/closet/secure_closet/personal, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/item/clothing/under/rank/rnd/scientist/skirt, /obj/item/clothing/suit/hooded/wintercoat/science, /obj/item/clothing/head/hooded/winterhood/science, @@ -63277,7 +63140,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/xenobio_north) "lAl" = ( @@ -63434,7 +63297,7 @@ /area/station/maintenance/fpmaint) "lCO" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "lCQ" = ( @@ -63532,7 +63395,7 @@ /area/station/science/toxins/mixing) "lEM" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "lEN" = ( @@ -63593,7 +63456,7 @@ "lFM" = ( /obj/structure/closet/crate, /obj/item/cane, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "lGh" = ( @@ -63697,7 +63560,7 @@ /area/station/maintenance/fore) "lHy" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /obj/item/clothing/gloves/color/white, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -63819,7 +63682,7 @@ /area/station/security/brig) "lJt" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "lJA" = ( @@ -64411,7 +64274,7 @@ /area/station/science/xenobiology) "lXi" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_left_rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -64422,7 +64285,7 @@ /obj/structure/rack, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/suit/storage/hazardvest, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "caution" }, @@ -65390,7 +65253,7 @@ /area/station/maintenance/fore2) "mtr" = ( /obj/structure/closet/firecloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_right_rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) @@ -65539,7 +65402,7 @@ "mxp" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "mxw" = ( @@ -67336,7 +67199,7 @@ desc = "Takes you to a whole new level of thinking."; name = "Meta-Cider" }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -67468,7 +67331,7 @@ "nhR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/firecloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint) "nia" = ( @@ -68130,7 +67993,7 @@ /area/station/service/clown) "nwY" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/turf_decal/stripes/white/line{ dir = 10 }, @@ -68358,7 +68221,7 @@ /area/station/maintenance/fore) "nBf" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_right_rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) @@ -68392,7 +68255,7 @@ /area/station/medical/reception) "nBW" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, @@ -68405,7 +68268,7 @@ /area/station/maintenance/apmaint) "nCh" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitepurple" @@ -68463,7 +68326,7 @@ /area/station/security/brig) "nDd" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/xenobio_south) "nDi" = ( @@ -69001,7 +68864,7 @@ /area/station/supply/lobby) "nPD" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_left_frequent, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -69443,11 +69306,6 @@ /obj/item/toy/plushie/carpplushie, /turf/space, /area/space/nearstation) -"oai" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/eight, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) "oaj" = ( /obj/structure/table/glass, /obj/structure/cable{ @@ -69613,10 +69471,6 @@ /turf/simulated/floor/bluegrid, /area/station/telecomms/chamber) "odT" = ( -/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" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -69625,6 +69479,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/xenobio_north) "odW" = ( @@ -70250,7 +70105,7 @@ }, /area/station/service/chapel/office) "oyN" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "oyP" = ( @@ -70562,15 +70417,12 @@ }, /area/station/engineering/gravitygenerator) "oFf" = ( -/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" - }, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/xenobio_south) "oFn" = ( @@ -70709,7 +70561,7 @@ /area/station/engineering/controlroom) "oIs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "oIT" = ( @@ -71032,7 +70884,7 @@ dir = 4 }, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitepurple" @@ -71258,7 +71110,7 @@ /area/station/legal/lawoffice) "oUa" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -71613,7 +71465,7 @@ "pcb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "pcd" = ( @@ -71787,15 +71639,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "pes" = ( -/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" - }, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/xenobio_south) "peF" = ( @@ -71811,7 +71660,7 @@ /obj/structure/table, /obj/item/storage/belt/utility, /obj/item/robotanalyzer, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard2) "pfp" = ( @@ -72519,7 +72368,7 @@ /area/station/hallway/secondary/exit) "pvb" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard2) "pvo" = ( @@ -73056,11 +72905,6 @@ icon_state = "darkred" }, /area/station/security/storage) -"pGU" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) "pHq" = ( /obj/structure/rack, /obj/item/clothing/head/helmet/riot{ @@ -74412,7 +74256,7 @@ /area/station/maintenance/starboard2) "qiA" = ( /obj/structure/closet/crate/sci, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/xenobio_north) "qiI" = ( @@ -75195,11 +75039,8 @@ dir = 4 }, /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, -/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" - }, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "qyo" = ( @@ -75275,7 +75116,7 @@ /area/station/maintenance/aft2) "qzT" = ( /obj/structure/closet/secure_closet/hydroponics, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "qAb" = ( @@ -75599,10 +75440,7 @@ }, /area/station/security/main) "qJN" = ( -/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" - }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -75761,7 +75599,7 @@ /obj/structure/cable/cyan{ icon_state = "2-4" }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) "qNV" = ( @@ -77004,7 +76842,7 @@ "roH" = ( /obj/structure/closet/crate/internals, /obj/effect/turf_decal/delivery/hollow, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "rpt" = ( @@ -77088,10 +76926,7 @@ /area/station/medical/exam_room) "rqC" = ( /obj/structure/closet/crate, -/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" - }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -77322,7 +77157,7 @@ "ruo" = ( /obj/structure/rack, /obj/item/stack/cable_coil/random, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "ruH" = ( @@ -77482,10 +77317,7 @@ /area/station/science/storage) "rxV" = ( /obj/structure/table/reinforced, -/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" - }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -77879,7 +77711,7 @@ "rFg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/medical, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) "rFq" = ( @@ -78051,7 +77883,7 @@ "rIT" = ( /obj/structure/table, /obj/item/geiger_counter, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "caution" @@ -78526,7 +78358,7 @@ /area/station/maintenance/turbine) "rRg" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -79960,22 +79792,6 @@ dir = 4 }, /obj/structure/closet/crate/trashcart, -/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" - }, -/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" - }, -/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" - }, -/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" - }, /obj/effect/landmark/burnturf, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -79988,6 +79804,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/spawner/random/trash, +/obj/effect/spawner/random/trash, +/obj/effect/spawner/random/trash, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/aft) "szY" = ( @@ -81175,7 +80995,7 @@ /area/station/science/xenobiology) "sZC" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_right_frequent, /obj/machinery/light/small{ dir = 1 @@ -81288,7 +81108,7 @@ /area/station/science/research) "tba" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_left_rare, /obj/structure/cable{ d1 = 2; @@ -81336,7 +81156,7 @@ /area/station/science/xenobiology) "tca" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -81690,7 +81510,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "tjd" = ( @@ -82001,11 +81821,6 @@ }, /turf/space, /area/space/nearstation) -"tpw" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/three, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "tpD" = ( /obj/effect/spawner/window, /turf/simulated/floor/plating, @@ -83059,7 +82874,7 @@ /area/station/service/hydroponics) "tTK" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/random/maintenance, /obj/structure/disposalpipe/segment/corner{ dir = 8 }, @@ -83482,10 +83297,7 @@ /obj/machinery/light/small{ dir = 4 }, -/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" - }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "caution" @@ -83656,7 +83468,7 @@ "ufr" = ( /obj/structure/table, /obj/item/clothing/gloves/color/fyellow, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 8 @@ -83676,7 +83488,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port2) "ufD" = ( @@ -84071,10 +83883,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "uoQ" = ( -/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" - }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "upe" = ( @@ -84123,7 +83932,7 @@ "uqN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/medical, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -84781,7 +84590,7 @@ /area/station/hallway/primary/aft/north) "uIW" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -85097,7 +84906,7 @@ /area/station/engineering/break_room) "uNQ" = ( /obj/structure/closet/crate/medical, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "uOg" = ( @@ -86300,7 +86109,7 @@ /area/station/service/hydroponics) "vmT" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "vmW" = ( @@ -86351,7 +86160,7 @@ "vnt" = ( /obj/structure/closet/crate, /obj/effect/turf_decal/delivery, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "vnQ" = ( @@ -86610,7 +86419,7 @@ "vtY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "vub" = ( @@ -86755,11 +86564,6 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/security/execution) -"vxi" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/three, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) "vxx" = ( /obj/effect/spawner/random_spawners/grille_often, /turf/simulated/floor/plating, @@ -86816,25 +86620,6 @@ icon_state = "green" }, /area/station/security/permabrig) -"vzu" = ( -/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" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 8 - }, -/obj/structure/disposalpipe/segment/corner{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel, -/area/station/maintenance/fsmaint) "vzD" = ( /obj/machinery/iv_drip, /obj/structure/cable{ @@ -87055,7 +86840,7 @@ /area/station/security/processing) "vFm" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_left_rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -88047,7 +87832,7 @@ }, /obj/structure/table, /obj/item/storage/toolbox/electrical, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/effect/spawner/random_spawners/cobweb_right_rare, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard2) @@ -88262,22 +88047,10 @@ /area/station/engineering/control) "wlo" = ( /obj/structure/closet/crate/trashcart, -/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" - }, -/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" - }, -/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" - }, -/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" - }, +/obj/effect/spawner/random/trash, +/obj/effect/spawner/random/trash, +/obj/effect/spawner/random/trash, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "wlG" = ( @@ -88306,13 +88079,10 @@ /area/station/engineering/control) "wlT" = ( /obj/effect/decal/cleanable/dirt, -/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" - }, /obj/structure/disposalpipe/segment/corner{ dir = 2 }, +/obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/aft) "wlW" = ( @@ -88419,12 +88189,9 @@ }, /area/station/science/research) "woK" = ( -/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" - }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/item/pen, +/obj/effect/spawner/random/trash, /turf/simulated/floor/bluegrid, /area/station/maintenance/starboard) "woN" = ( @@ -88505,7 +88272,7 @@ /area/station/aisat) "wrO" = ( /obj/structure/closet/firecloset, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard2) "wrW" = ( @@ -88896,7 +88663,7 @@ /area/station/maintenance/fore) "wzV" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/machinery/light/small{ dir = 1 }, @@ -88973,7 +88740,7 @@ dir = 1 }, /obj/item/radio, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "wBR" = ( @@ -89314,7 +89081,7 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "wKQ" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /obj/structure/table, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -90449,7 +90216,7 @@ /area/station/security/permabrig) "xkc" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "xki" = ( @@ -90973,7 +90740,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "xuG" = ( @@ -92159,6 +91926,22 @@ /obj/machinery/atmospherics/portable/canister/sleeping_agent, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/control) +"xWu" = ( +/obj/effect/spawner/random/trash, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ + dir = 8 + }, +/obj/structure/disposalpipe/segment/corner{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel, +/area/station/maintenance/fsmaint) "xWI" = ( /obj/structure/closet/secure_closet/brig, /turf/simulated/floor/plasteel{ @@ -105874,7 +105657,7 @@ uWq bBv dgb cdT -bTb +cPq bBz anE cdT @@ -106613,7 +106396,7 @@ adY cEr rbU xgb -vxi +aAP fuy adY aYb @@ -106908,7 +106691,7 @@ rvu wfa clT bTY -cQb +cLN bZP bcO bQy @@ -107154,7 +106937,7 @@ bHd aUu ckv cdT -tpw +cLN bTY bTY bTY @@ -108976,7 +108759,7 @@ xZa cCy crG crG -cSK +cFU crG jGq crG @@ -109239,7 +109022,7 @@ cFU cpD crG bZP -coj +clK gof crG bZP @@ -111224,7 +111007,7 @@ aOB aKy jGH aOB -oai +aAP aOB bfn eiR @@ -112257,7 +112040,7 @@ vyn vyn aEM aDz -pGU +aYb aAP aVl aVl @@ -113333,7 +113116,7 @@ bFw bTt cdT bqQ -iip +bRE bZP ceu tVy @@ -128535,7 +128318,7 @@ bUG nBW cPc rRg -hDE +das rOZ ljg fuC @@ -133068,7 +132851,7 @@ lEo qvN iBO aUx -vzu +xWu jJr tmq aBZ diff --git a/code/__HELPERS/lists.dm b/code/__HELPERS/lists.dm index 79047dfc6e63..0c172757ce39 100644 --- a/code/__HELPERS/lists.dm +++ b/code/__HELPERS/lists.dm @@ -883,3 +883,40 @@ for(var/key in input) UNTYPED_LIST_ADD(keys, key) return keys + +/** + * Given a list, return a copy where values without defined weights are given weight 1. + * For example, fill_with_ones(list(A, B=2, C)) = list(A=1, B=2, C=1) + * Useful for weighted random choices (loot tables, syllables in languages, etc.) + */ +/proc/fill_with_ones(list/list_to_pad) + if(!islist(list_to_pad)) + return list_to_pad + + var/list/final_list = list() + + for(var/key in list_to_pad) + if(list_to_pad[key]) + final_list[key] = list_to_pad[key] + else + final_list[key] = 1 + + return final_list + +/** + * Like pick_weight, but allowing for nested lists. + * + * For example, given the following list: + * list(A = 1, list(B = 1, C = 1)) + * A would have a 50% chance of being picked, + * and list(B, C) would have a 50% chance of being picked. + * If list(B, C) was picked, B and C would then each have a 50% chance of being picked. + * So the final probabilities would be 50% for A, 25% for B, and 25% for C. + * + * Weights should be integers. Entries without weights are assigned weight 1 (so unweighted lists can be used as well) + */ +/proc/pick_weight_recursive(list/list_to_pick) + var/result = pickweight(fill_with_ones(list_to_pick)) + while(islist(result)) + result = pickweight(fill_with_ones(result)) + return result diff --git a/code/_globalvars/lists/maint_loot_tables.dm b/code/_globalvars/lists/maint_loot_tables.dm new file mode 100644 index 000000000000..12640e2c35a4 --- /dev/null +++ b/code/_globalvars/lists/maint_loot_tables.dm @@ -0,0 +1,206 @@ +GLOBAL_LIST_INIT(maintenance_loot_tier_0, list( + list( + // Tools + /obj/effect/spawner/random/engineering/tools, + + // Materials + /obj/effect/spawner/random/engineering/materials, + ) = 6, + + list( + // Spawners for easily found items + /obj/effect/spawner/random/bureaucracy, + /obj/effect/spawner/random/dice, + /obj/effect/spawner/random/book, + + // Other worthless/easily found items + /obj/item/camera_film, + /obj/item/camera, + /obj/item/caution, + /obj/item/clothing/head/cone, + /obj/item/light/bulb, + /obj/item/light/tube, + /obj/item/poster/random_contraband, + /obj/item/poster/random_official, + /obj/item/reagent_containers/drinks/drinkingglass, + /obj/item/reagent_containers/glass/beaker/waterbottle, + /obj/item/reagent_containers/glass/beaker/waterbottle/empty, + /obj/item/scissors, + /obj/item/storage/box, + /obj/item/storage/fancy/crayons, + /obj/item/storage/fancy/matches, + ) = 2, + + list( + // Emergency items + /obj/item/extinguisher, + /obj/item/flashlight, + ) = 1, +)) + +GLOBAL_LIST_INIT(maintenance_loot_tier_1, list( + list( + // Sub-spawners + /obj/effect/spawner/random/engineering/toolbox, + /obj/effect/spawner/random/snacks, + + // Assemblies and cells + /obj/item/assembly/prox_sensor, + /obj/item/assembly/timer, + /obj/item/assembly/signaler, + /obj/item/assembly/voice, + /obj/item/assembly/voice/noise, + /obj/item/stock_parts/cell, + + // Clothing + /obj/item/clothing/glasses/sunglasses, + /obj/item/clothing/gloves/color/black, + /obj/item/clothing/gloves/color/fyellow, + /obj/item/clothing/gloves/color/yellow/fake, + /obj/item/clothing/head/hardhat, + /obj/item/clothing/head/hardhat/red, + /obj/item/clothing/head/that, + /obj/item/clothing/head/ushanka, + /obj/item/clothing/mask/gas, + /obj/item/clothing/shoes/black, + /obj/item/clothing/suit/storage/hazardvest, + /obj/item/clothing/under/color/black, + /obj/item/clothing/under/misc/vice, + + // Medical supplies / chemistry items + /obj/item/reagent_containers/dropper, + /obj/item/reagent_containers/glass/beaker, + /obj/item/reagent_containers/glass/beaker/large, + /obj/item/reagent_containers/syringe, + /obj/item/stack/medical/bruise_pack/advanced, + /obj/item/stack/medical/ointment/advanced, + + // Common items + /obj/item/bodybag, + /obj/item/cultivator, + /obj/item/flashlight/pen, + /obj/item/radio/off, + /obj/item/reagent_containers/drinks/mug, + /obj/item/reagent_containers/glass/bucket, + /obj/item/reagent_containers/spray/pestspray, + /obj/item/relic, + /obj/item/restraints/handcuffs/toy, + /obj/item/scratch, + /obj/item/seeds/ambrosia, + /obj/item/seeds/ambrosia/deus, + /obj/item/stack/sheet/cardboard, + /obj/item/stack/sheet/cloth, + /obj/item/storage/bag/plasticbag, + /obj/item/storage/box/cups, + /obj/item/storage/box/donkpockets, + /obj/item/storage/box/lights/mixed, + /obj/item/storage/fancy/cigarettes/dromedaryco, + /obj/item/tank/internals/emergency_oxygen, + /obj/item/tank/internals/emergency_oxygen/engi, + /obj/item/vending_refill/cola, + ) = 85, + + list( + /obj/item/storage/wallet, + /obj/item/storage/wallet/random, + ) = 5, + + list( + // Small chance of tier 1 stock parts + /obj/item/stock_parts/capacitor, + /obj/item/stock_parts/manipulator, + /obj/item/stock_parts/matter_bin, + /obj/item/stock_parts/micro_laser, + /obj/item/stock_parts/scanning_module, + + // Coins + /obj/item/coin/silver, + /obj/item/coin/twoheaded, + ) = 2, +)) + +GLOBAL_LIST_INIT(maintenance_loot_tier_2, list( + list( + // Rarer items + /obj/effect/spawner/random/mod/maint, + /obj/item/clothing/glasses/meson, + /obj/item/clothing/head/welding, + /obj/item/crowbar/red, + /obj/item/storage/belt/utility, + ) = 45, + + list( + // Contraband and Syndicate items + /obj/item/ammo_box/magazine/m10mm, + /obj/item/clothing/mask/chameleon, + /obj/item/clothing/mask/chameleon/voice_change, + /obj/item/clothing/mask/gas/voice_modulator, + /obj/item/clothing/mask/gas/voice_modulator/chameleon, + /obj/item/clothing/shoes/chameleon/noslip, + /obj/item/clothing/suit/jacket/bomber/syndicate, + /obj/item/clothing/suit/storage/iaa/blackjacket/armored, + /obj/item/clothing/under/chameleon, + /obj/item/deck/cards/syndicate, + /obj/item/grenade/clown_grenade, + /obj/item/grenade/smokebomb, + /obj/item/gun/syringe/syndicate, + /obj/item/melee/knuckleduster/syndie, + /obj/item/mod/construction/broken_core, + /obj/item/multitool/ai_detect, + /obj/item/seeds/ambrosia/cruciatus, + /obj/item/soap/syndie, + /obj/item/stamp/chameleon, + /obj/item/storage/backpack/duffel/syndie/med/surgery_fake, + /obj/item/storage/backpack/satchel_flat, + /obj/item/storage/belt/military/traitor, + /obj/item/storage/fancy/cigarettes/cigpack_syndicate, + /obj/item/storage/pill_bottle/fakedeath, + /obj/item/storage/secure/briefcase/syndie, + /obj/item/storage/toolbox/syndicate, + /obj/item/suppressor, + /obj/item/weaponcrafting/receiver, + ) = 45, + + list( + // Health/repair kits + /obj/item/storage/firstaid/regular, + /obj/item/storage/firstaid/machine, + + // Rarer departmental items + /obj/item/reagent_scanner/adv, + /obj/item/robotanalyzer, + /obj/item/stack/nanopaste, + /obj/item/whetstone, + + // Other rare but useful items + /obj/item/radio/headset, + /obj/item/melee/knuckleduster, + ) = 3, +)) + +GLOBAL_LIST_INIT(maintenance_loot_tier_3, list( + list( + // Coveted items + /obj/item/clothing/gloves/color/yellow, + ) = 7, + + list( + // Rare Syndicate items + /obj/item/gun/projectile/automatic/pistol, + /obj/item/dnascrambler, + /obj/item/bio_chip_implanter/storage, + /obj/item/reagent_containers/spray/sticky_tar, + /obj/item/storage/box/syndie_kit/space, + ) = 3, +)) + +GLOBAL_LIST_INIT(maintenance_loot_tables, list( + list( + GLOB.maintenance_loot_tier_0 = 490, + GLOB.maintenance_loot_tier_1 = 390, + GLOB.maintenance_loot_tier_2 = 114, + GLOB.maintenance_loot_tier_3 = 6, + ) = 75, + + /obj/effect/spawner/random/trash = 25, +)) diff --git a/code/game/objects/effects/spawners/decorative_spawners.dm b/code/game/objects/effects/spawners/decorative_spawners.dm new file mode 100644 index 000000000000..7b200d627308 --- /dev/null +++ b/code/game/objects/effects/spawners/decorative_spawners.dm @@ -0,0 +1,131 @@ +/obj/effect/spawner/random_spawners + name = "random spawners" + icon = 'icons/effects/spawner_icons.dmi' + icon_state = "questionmark" + var/list/result = list( + /datum/nothing = 1, + /obj/effect/decal/cleanable/blood/splatter = 1, + /obj/effect/decal/cleanable/blood/oil = 1, + /obj/effect/decal/cleanable/fungus = 1) + var/spawn_inside = null + +// This needs to use New() instead of Initialize() because the thing it creates might need to be initialized too +// AA 2022-08-11: The above comment doesnt even make sense. If extra atoms are loaded during SSatoms.Initialize(), they still get initialised! +/obj/effect/spawner/random_spawners/New() + . = ..() + var/turf/T = get_turf(src) + if(!T) + stack_trace("Spawner placed in nullspace!") + return + randspawn(T) + +/obj/effect/spawner/random_spawners/proc/randspawn(turf/T) + var/thing_to_place = pickweight(result) + if(ispath(thing_to_place, /datum/nothing)) + // Nothing. + qdel(src) // See line 13, this needs moving to /Initialize() so we can use the qdel hint already + return + else if(ispath(thing_to_place, /turf)) + T.ChangeTurf(thing_to_place) + else + if(ispath(spawn_inside, /obj)) + var/obj/O = new thing_to_place(T) + var/obj/E = new spawn_inside(T) + O.forceMove(E) + else + new thing_to_place(T) + qdel(src) + +/obj/effect/spawner/random_spawners/blood_maybe + name = "blood maybe" + icon_state = "blood" + result = list( + /datum/nothing = 20, + /obj/effect/decal/cleanable/blood/splatter = 1) + +/obj/effect/spawner/random_spawners/blood_often + name = "blood often" + icon_state = "blood" + result = list( + /datum/nothing = 5, + /obj/effect/decal/cleanable/blood/splatter = 1) + +/obj/effect/spawner/random_spawners/oil_maybe + name = "oil maybe" + icon_state = "oil" + result = list( + /datum/nothing = 20, + /obj/effect/decal/cleanable/blood/oil = 1) + +/obj/effect/spawner/random_spawners/oil_often + name = "oil often" + icon_state = "oil" + result = list( + /datum/nothing = 5, + /obj/effect/decal/cleanable/blood/oil = 1) + +/obj/effect/spawner/random_spawners/cobweb_left_frequent + name = "cobweb left frequent" + icon_state = "cobwebl" + result = list( + /datum/nothing = 1, + /obj/effect/decal/cleanable/cobweb = 1) + +/obj/effect/spawner/random_spawners/cobweb_right_frequent + name = "cobweb right frequent" + icon_state = "cobwebr" + result = list( + /datum/nothing = 1, + /obj/effect/decal/cleanable/cobweb2 = 1) + +/obj/effect/spawner/random_spawners/cobweb_left_rare + name = "cobweb left rare" + icon_state = "cobwebl" + result = list( + /datum/nothing = 10, + /obj/effect/decal/cleanable/cobweb = 1) + +/obj/effect/spawner/random_spawners/cobweb_right_rare + name = "cobweb right rare" + icon_state = "cobwebr" + result = list( + /datum/nothing = 10, + /obj/effect/decal/cleanable/cobweb2 = 1) + +/obj/effect/spawner/random_spawners/dirt_frequent + name = "dirt frequent" + icon_state = "dirt" + result = list( + /datum/nothing = 1, + /obj/effect/decal/cleanable/dirt = 1) + +/obj/effect/spawner/random_spawners/dirt_often + name = "dirt often" + icon_state = "dirt" + result = list( + /datum/nothing = 5, + /obj/effect/decal/cleanable/dirt = 1) + +/obj/effect/spawner/random_spawners/dirt_maybe + name = "dirt maybe" + icon_state = "dirt" + result = list( + /datum/nothing = 7, + /obj/effect/decal/cleanable/dirt = 1) + +/obj/effect/spawner/random_spawners/fungus_maybe + name = "fungus maybe" + icon_state = "fungus" + color = "#D5820B" + result = list( + /datum/nothing = 7, + /obj/effect/decal/cleanable/fungus = 1) + +/obj/effect/spawner/random_spawners/fungus_probably + name = "fungus probably" + icon_state = "fungus" + color = "#D5820B" + result = list( + /datum/nothing = 1, + /obj/effect/decal/cleanable/fungus = 7) + diff --git a/code/game/objects/effects/spawners/random_spawners.dm b/code/game/objects/effects/spawners/depot_spawners.dm similarity index 58% rename from code/game/objects/effects/spawners/random_spawners.dm rename to code/game/objects/effects/spawners/depot_spawners.dm index 32b8052bd2f9..ac489f588c2d 100644 --- a/code/game/objects/effects/spawners/random_spawners.dm +++ b/code/game/objects/effects/spawners/depot_spawners.dm @@ -1,185 +1,6 @@ -/obj/effect/spawner/random_spawners - name = "random spawners" - icon = 'icons/effects/spawner_icons.dmi' - icon_state = "questionmark" - var/list/result = list( - /datum/nothing = 1, - /obj/effect/decal/cleanable/blood/splatter = 1, - /obj/effect/decal/cleanable/blood/oil = 1, - /obj/effect/decal/cleanable/fungus = 1) - var/spawn_inside = null - -// This needs to use New() instead of Initialize() because the thing it creates might need to be initialized too -// AA 2022-08-11: The above comment doesnt even make sense. If extra atoms are loaded during SSatoms.Initialize(), they still get initialised! -/obj/effect/spawner/random_spawners/New() - . = ..() - var/turf/T = get_turf(src) - if(!T) - stack_trace("Spawner placed in nullspace!") - return - randspawn(T) - -/obj/effect/spawner/random_spawners/proc/randspawn(turf/T) - var/thing_to_place = pickweight(result) - if(ispath(thing_to_place, /datum/nothing)) - // Nothing. - qdel(src) // See line 13, this needs moving to /Initialize() so we can use the qdel hint already - return - else if(ispath(thing_to_place, /turf)) - T.ChangeTurf(thing_to_place) - else - if(ispath(spawn_inside, /obj)) - var/obj/O = new thing_to_place(T) - var/obj/E = new spawn_inside(T) - O.forceMove(E) - else - new thing_to_place(T) - qdel(src) - -/obj/effect/spawner/random_spawners/blood_maybe - name = "blood maybe" - icon_state = "blood" - result = list( - /datum/nothing = 20, - /obj/effect/decal/cleanable/blood/splatter = 1) - -/obj/effect/spawner/random_spawners/blood_often - name = "blood often" - icon_state = "blood" - result = list( - /datum/nothing = 5, - /obj/effect/decal/cleanable/blood/splatter = 1) - -/obj/effect/spawner/random_spawners/oil_maybe - name = "oil maybe" - icon_state = "oil" - result = list( - /datum/nothing = 20, - /obj/effect/decal/cleanable/blood/oil = 1) - -/obj/effect/spawner/random_spawners/oil_often - name = "oil often" - icon_state = "oil" - result = list( - /datum/nothing = 5, - /obj/effect/decal/cleanable/blood/oil = 1) - -/obj/effect/spawner/random_spawners/proc/rustify(turf/T) - var/turf/simulated/wall/W = T - if(istype(W) && !W.rusted) - W.rust() - -/obj/effect/spawner/random_spawners/wall_rusted_probably - name = "rusted wall probably" - icon_state = "rust" - -/obj/effect/spawner/random_spawners/wall_rusted_probably/randspawn(turf/T) - if(prob(75)) - rustify(T) - qdel(src) - -/obj/effect/spawner/random_spawners/wall_rusted_maybe - name = "rusted wall maybe" - icon_state = "rust" - -/obj/effect/spawner/random_spawners/wall_rusted_maybe/randspawn(turf/T) - if(prob(25)) - rustify(T) - qdel(src) - -/obj/effect/spawner/random_spawners/wall_rusted_always - name = "rusted wall always" - icon_state = "rust" - -/obj/effect/spawner/random_spawners/wall_rusted_always/randspawn(turf/T) - rustify(T) - qdel(src) - -/obj/effect/spawner/random_spawners/cobweb_left_frequent - name = "cobweb left frequent" - icon_state = "cobwebl" - result = list( - /datum/nothing = 1, - /obj/effect/decal/cleanable/cobweb = 1) - -/obj/effect/spawner/random_spawners/cobweb_right_frequent - name = "cobweb right frequent" - icon_state = "cobwebr" - result = list( - /datum/nothing = 1, - /obj/effect/decal/cleanable/cobweb2 = 1) - -/obj/effect/spawner/random_spawners/cobweb_left_rare - name = "cobweb left rare" - icon_state = "cobwebl" - result = list( - /datum/nothing = 10, - /obj/effect/decal/cleanable/cobweb = 1) - -/obj/effect/spawner/random_spawners/cobweb_right_rare - name = "cobweb right rare" - icon_state = "cobwebr" - result = list( - /datum/nothing = 10, - /obj/effect/decal/cleanable/cobweb2 = 1) - -/obj/effect/spawner/random_spawners/dirt_frequent - name = "dirt frequent" - icon_state = "dirt" - result = list( - /datum/nothing = 1, - /obj/effect/decal/cleanable/dirt = 1) - -/obj/effect/spawner/random_spawners/dirt_often - name = "dirt often" - icon_state = "dirt" - result = list( - /datum/nothing = 5, - /obj/effect/decal/cleanable/dirt = 1) - -/obj/effect/spawner/random_spawners/dirt_maybe - name = "dirt maybe" - icon_state = "dirt" - result = list( - /datum/nothing = 7, - /obj/effect/decal/cleanable/dirt = 1) - -/obj/effect/spawner/random_spawners/fungus_maybe - name = "fungus maybe" - icon_state = "fungus" - color = "#D5820B" - result = list( - /datum/nothing = 7, - /obj/effect/decal/cleanable/fungus = 1) - -/obj/effect/spawner/random_spawners/fungus_probably - name = "fungus probably" - icon_state = "fungus" - color = "#D5820B" - result = list( - /datum/nothing = 1, - /obj/effect/decal/cleanable/fungus = 7) - -/obj/effect/spawner/random_spawners/mod - name = "MOD module spawner" - desc = "Modularize this, please." - icon_state = "circuit" - -/obj/effect/spawner/random_spawners/mod/maint - name = "maint MOD module spawner" - result = list( - /obj/item/mod/module/springlock = 2, - /obj/item/mod/module/balloon = 1, - /obj/item/mod/module/stamp = 1 - ) - - -// z6 DEPOT SPAWNERS - +/// Spawners for the Syndicate depot ruin. /obj/effect/spawner/random_spawners/syndicate - - // Turrets /obj/effect/spawner/random_spawners/syndicate/turret diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 069fd19b3b21..0daaeef79308 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -27,175 +27,6 @@ /obj/item/gun/projectile/automatic/pistol/deagle ) -/obj/effect/spawner/lootdrop/maintenance - name = "maintenance loot spawner (1 item)" - icon_state = "loot" - - //How to balance this table - //------------------------- - //The total added weight of all the entries should be (roughly) equal to the total number of lootdrops - //(take in account those that spawn more than one object!) - // - //While this is random, probabilities tells us that item distribution will have a tendency to look like - //the content of the weighted table that created them. - //The less lootdrops, the less even the distribution. - // - //If you want to give items a weight <1 you can multiply all the weights by 10 - // - //the "" entry will spawn nothing, if you increase this value, - //ensure that you balance it with more spawn points - - //table data: - //----------- - //aft maintenance: 24 items, 18 spots 2 extra (28/08/2014) - //asmaint: 16 items, 11 spots 0 extra (08/08/2014) - //asmaint2: 36 items, 26 spots 2 extra (28/08/2014) - //fpmaint: 5 items, 4 spots 0 extra (08/08/2014) - //fpmaint2: 12 items, 11 spots 2 extra (28/08/2014) - //fsmaint: 0 items, 0 spots 0 extra (08/08/2014) - //fsmaint2: 40 items, 27 spots 5 extra (28/08/2014) - //maintcentral: 2 items, 2 spots 0 extra (08/08/2014) - //port: 5 items, 5 spots 0 extra (08/08/2014) - loot = list( - /obj/item/bodybag = 10, - /obj/item/clothing/glasses/meson = 20, - /obj/item/clothing/glasses/sunglasses = 10, - /obj/item/clothing/gloves/color/yellow/fake = 15, - /obj/item/clothing/gloves/color/fyellow = 10, - /obj/item/clothing/gloves/color/yellow = 5, - /obj/item/clothing/gloves/color/black = 20, - /obj/item/clothing/head/hardhat = 10, - /obj/item/clothing/head/hardhat/red = 10, - /obj/item/clothing/head/that = 10, - /obj/item/clothing/head/ushanka = 10, - /obj/item/clothing/head/welding = 10, - /obj/item/clothing/mask/gas = 10, - /obj/item/clothing/suit/storage/hazardvest = 10, - /obj/item/clothing/under/misc/vice = 10, - /obj/item/assembly/prox_sensor = 40, - /obj/item/assembly/timer = 30, - /obj/item/flashlight = 40, - /obj/item/flashlight/pen = 10, - /obj/item/multitool = 20, - /obj/item/radio/off = 20, - /obj/item/t_scanner = 60, - /obj/item/stack/cable_coil = 40, - /obj/item/stack/cable_coil{amount = 5} = 60, - /obj/item/stack/medical/bruise_pack/advanced = 10, - /obj/item/stack/medical/ointment/advanced = 10, - /obj/item/stack/rods{amount = 10} = 80, - /obj/item/stack/rods{amount = 23} = 20, - /obj/item/stack/rods{amount = 50} = 10, - /obj/item/stack/sheet/cardboard = 20, - /obj/item/stack/sheet/metal{amount = 20} = 10, - /obj/item/stack/sheet/mineral/plasma = 10, - /obj/item/stack/sheet/rglass = 10, - /obj/item/stack/sheet/cloth{amount = 3} = 40, - /obj/item/book/manual/wiki/engineering_construction = 10, - /obj/item/book/manual/wiki/hacking = 10, - /obj/item/clothing/head/cone = 10, - /obj/item/geiger_counter = 30, - /obj/item/coin/silver = 10, - /obj/item/coin/twoheaded = 10, - /obj/item/poster/random_contraband = 10, - /obj/item/crowbar = 10, - /obj/item/crowbar/red = 10, - /obj/item/restraints/handcuffs/toy = 5, - /obj/item/extinguisher = 90, - /obj/item/hand_labeler = 10, - /obj/item/paper/crumpled = 10, - /obj/item/pen = 10, - /obj/item/cultivator = 10, - /obj/item/reagent_containers/spray/pestspray = 10, - /obj/item/stock_parts/cell = 30, - /obj/item/storage/belt/utility = 20, - /obj/item/storage/box = 20, - /obj/item/storage/box/cups = 10, - /obj/item/storage/box/donkpockets = 10, - /obj/item/storage/box/lights/mixed = 30, - /obj/item/storage/fancy/cigarettes/dromedaryco = 10, - /obj/item/storage/toolbox/mechanical = 10, - /obj/item/screwdriver = 30, - /obj/item/tank/internals/emergency_oxygen = 20, - /obj/item/tank/internals/emergency_oxygen/engi = 10, - /obj/item/vending_refill/cola = 10, - /obj/item/weldingtool = 30, - /obj/item/wirecutters = 10, - /obj/item/wrench = 40, - /obj/item/relic = 35, - /obj/item/weaponcrafting/receiver = 2, - /obj/item/clothing/shoes/black = 30, - /obj/item/seeds/ambrosia/deus = 10, - /obj/item/seeds/ambrosia = 20, - /obj/item/clothing/under/color/black = 30, - /obj/item/stack/tape_roll = 10, - /obj/item/storage/bag/plasticbag = 20, - /obj/item/storage/wallet = 20, - /obj/item/storage/wallet/random = 5, - /obj/item/scratch = 10, - /obj/item/caution = 10, - /obj/item/mod/construction/broken_core = 4, - /obj/effect/spawner/random_spawners/mod/maint = 10, - /obj/item/melee/knuckleduster = 10, - ////////////////CONTRABAND STUFF////////////////// - /obj/item/grenade/clown_grenade = 3, - /obj/item/grenade/smokebomb = 3, - /obj/item/seeds/ambrosia/cruciatus = 3, - /obj/item/gun/projectile/automatic/pistol = 1, - /obj/item/ammo_box/magazine/m10mm = 4, - /obj/item/soap/syndie = 7, - /obj/item/gun/syringe/syndicate = 2, - /obj/item/suppressor = 4, - /obj/item/clothing/under/chameleon = 2, - /obj/item/stamp/chameleon = 2, - /obj/item/clothing/shoes/chameleon/noslip = 5, - /obj/item/clothing/mask/chameleon = 4, - /obj/item/clothing/mask/chameleon/voice_change = 2, - /obj/item/clothing/mask/gas/voice_modulator = 2, - /obj/item/clothing/mask/gas/voice_modulator/chameleon = 2, - /obj/item/dnascrambler = 1, - /obj/item/storage/backpack/satchel_flat = 2, - /obj/item/storage/toolbox/syndicate = 2, - /obj/item/storage/backpack/duffel/syndie/med/surgery_fake = 2, - /obj/item/storage/belt/military/traitor = 2, - /obj/item/storage/box/syndie_kit/space = 2, - /obj/item/multitool/ai_detect = 2, - /obj/item/bio_chip_implanter/storage = 1, - /obj/item/deck/cards/syndicate = 2, - /obj/item/storage/secure/briefcase/syndie = 2, - /obj/item/storage/fancy/cigarettes/cigpack_syndicate = 2, - /obj/item/storage/pill_bottle/fakedeath = 2, - /obj/item/clothing/suit/jacket/bomber/syndicate = 5, - /obj/item/clothing/suit/storage/iaa/blackjacket/armored = 2, // More armored than bomber and has pockets, so it is rarer - /obj/item/melee/knuckleduster/syndie = 2, - /obj/item/reagent_containers/spray/sticky_tar = 1, - "" = 61 // This should be a decently high number for chances where no loot will spawn - ) - -/obj/effect/spawner/lootdrop/maintenance/Initialize(mapload) - if(HAS_TRAIT(SSstation, STATION_TRAIT_EMPTY_MAINT) && prob(50)) - return qdel(src) - if(HAS_TRAIT(SSstation, STATION_TRAIT_FILLED_MAINT) && prob(50)) - lootcount = min(lootcount * 2, 12) - . = ..() - - -/obj/effect/spawner/lootdrop/maintenance/two - name = "maintenance loot spawner (2 items)" - icon_state = "doubleloot" - lootcount = 2 - -/obj/effect/spawner/lootdrop/maintenance/three - name = "maintenance loot spawner (3 items)" - icon_state = "moreloot" - lootcount = 3 - -/obj/effect/spawner/lootdrop/maintenance/eight - name = "maintenance loot spawner (8 items)" - icon_state = "megaloot" - lootcount = 8 - - /// for ruins /obj/effect/spawner/lootdrop/crate_spawner name = "lootcrate spawner" diff --git a/code/game/objects/effects/spawners/random/engineering_spawners.dm b/code/game/objects/effects/spawners/random/engineering_spawners.dm new file mode 100644 index 000000000000..d9978dc606b8 --- /dev/null +++ b/code/game/objects/effects/spawners/random/engineering_spawners.dm @@ -0,0 +1,54 @@ +/obj/effect/spawner/random/engineering + icon = 'icons/effects/random_spawners.dmi' + icon_state = "wrench" + +/obj/effect/spawner/random/engineering/tools + name = "Tool spawner" + loot = list( + /obj/item/wrench = 2, + /obj/item/wirecutters = 2, + /obj/item/screwdriver = 2, + /obj/item/crowbar = 2, + /obj/item/weldingtool = 2, + /obj/item/stack/cable_coil = 2, + /obj/item/analyzer = 2, + /obj/item/t_scanner = 2, + /obj/item/geiger_counter = 2, + /obj/item/multitool = 1, + ) + +/obj/effect/spawner/random/engineering/materials + name = "Materials spawner" + icon_state = "metal" + loot = list( + list( + /obj/item/stack/rods, + /obj/item/stack/sheet/metal, + /obj/item/stack/sheet/glass, + /obj/item/stack/sheet/rglass, + /obj/item/stack/sheet/wood, + ) = 8, + + list( + /obj/item/stack/sheet/plastic, + /obj/item/stack/sheet/plasteel, + /obj/item/stack/sheet/mineral/plasma, + ) = 2, + ) + +/obj/effect/spawner/random/engineering/materials/make_item(spawn_loc, type_path_to_make) + var/obj/item/stack/item = ..() + if(istype(item)) + item.amount = rand(1, 10) + item.update_icon() + + return item + +/obj/effect/spawner/random/engineering/toolbox + name = "Toolbox spawner" + icon_state = "toolbox" + loot = list( + /obj/item/storage/toolbox/mechanical, + /obj/item/storage/toolbox/electrical, + /obj/item/storage/toolbox/emergency + ) diff --git a/code/game/objects/effects/spawners/random/food_spawners.dm b/code/game/objects/effects/spawners/random/food_spawners.dm new file mode 100644 index 000000000000..069859f2ef52 --- /dev/null +++ b/code/game/objects/effects/spawners/random/food_spawners.dm @@ -0,0 +1,20 @@ +/obj/effect/spawner/random/snacks + name = "snacks spawner" + icon = 'icons/effects/random_spawners.dmi' + icon_state = "donkpocket_single" + loot = list( + list( + /obj/item/food/candy/candybar, + /obj/item/reagent_containers/drinks/dry_ramen, + /obj/item/food/chips, + /obj/item/food/twimsts, + /obj/item/food/sosjerky, + /obj/item/food/no_raisin, + /obj/item/food/pistachios, + /obj/item/food/spacetwinkie, + /obj/item/food/cheesiehonkers, + /obj/item/food/tastybread, + ) = 5, + + /obj/item/food/stroopwafel = 1, + ) diff --git a/code/game/objects/effects/spawners/random/maint_loot_spawners.dm b/code/game/objects/effects/spawners/random/maint_loot_spawners.dm new file mode 100644 index 000000000000..2ad64ece299b --- /dev/null +++ b/code/game/objects/effects/spawners/random/maint_loot_spawners.dm @@ -0,0 +1,19 @@ +#define TRAIT_CHANCE_DELTA 25 + +/obj/effect/spawner/random/maintenance + name = "Maintenance loot spawner" + spawn_loot_chance = 65 + spawn_random_offset_max_pixels = 8 + +/obj/effect/spawner/random/maintenance/Initialize(mapload) + loot = GLOB.maintenance_loot_tables + spawn_loot_count = rand(2, 4) + + if(HAS_TRAIT(SSstation, STATION_TRAIT_EMPTY_MAINT)) + spawn_loot_chance -= TRAIT_CHANCE_DELTA + else if(HAS_TRAIT(SSstation, STATION_TRAIT_FILLED_MAINT)) + spawn_loot_chance += TRAIT_CHANCE_DELTA + + . = ..() + +#undef TRAIT_CHANCE_DELTA diff --git a/code/game/objects/effects/spawners/random/misc_spawners.dm b/code/game/objects/effects/spawners/random/misc_spawners.dm new file mode 100644 index 000000000000..7d4467767c23 --- /dev/null +++ b/code/game/objects/effects/spawners/random/misc_spawners.dm @@ -0,0 +1,92 @@ +/obj/effect/spawner/random/dice + loot = list( + /obj/item/dice/d4, + /obj/item/dice/d6, + /obj/item/dice/d8, + /obj/item/dice/d10, + /obj/item/dice/d12, + ) + +/obj/effect/spawner/random/dice/Initialize() + . = ..() + spawn_loot_count = rand(1, 2) + +/obj/effect/spawner/random/bureaucracy + icon = 'icons/effects/random_spawners.dmi' + icon_state = "folder" + name = "bureaucracy spawner" + loot = list( + /obj/item/hand_labeler, + /obj/item/hand_labeler_refill, + /obj/item/stack/tape_roll, + /obj/item/paper_bin, + /obj/item/pen, + /obj/item/pen/blue, + /obj/item/pen/red, + /obj/item/folder/blue, + /obj/item/folder/red, + /obj/item/folder/yellow, + /obj/item/clipboard, + ) + +/obj/effect/spawner/random/book + icon = 'icons/effects/random_spawners.dmi' + icon_state = "book" + name = "book spawner" + loot = list( + /obj/item/book/manual/atmospipes, + /obj/item/book/manual/barman_recipes, + /obj/item/book/manual/detective, + /obj/item/book/manual/engineering_particle_accelerator, + /obj/item/book/manual/engineering_singularity_safety, + /obj/item/book/manual/evaguide, + /obj/item/book/manual/hydroponics_pod_people, + /obj/item/book/manual/medical_cloning, + /obj/item/book/manual/research_and_development, + /obj/item/book/manual/ripley_build_and_repair, + /obj/item/book/manual/supermatter_engine, + /obj/item/book/manual/wiki/botanist, + /obj/item/book/manual/wiki/chef_recipes, + /obj/item/book/manual/wiki/engineering_construction, + /obj/item/book/manual/wiki/engineering_guide, + /obj/item/book/manual/wiki/experimentor, + /obj/item/book/manual/wiki/faxes, + /obj/item/book/manual/wiki/hacking, + /obj/item/book/manual/wiki/hydroponics, + /obj/item/book/manual/wiki/robotics_cyborgs, + /obj/item/book/manual/wiki/security_space_law, + /obj/item/book/manual/wiki/security_space_law/black, + /obj/item/book/manual/wiki/sop_command, + /obj/item/book/manual/wiki/sop_engineering, + /obj/item/book/manual/wiki/sop_general, + /obj/item/book/manual/wiki/sop_legal, + /obj/item/book/manual/wiki/sop_medical, + /obj/item/book/manual/wiki/sop_science, + /obj/item/book/manual/wiki/sop_security, + /obj/item/book/manual/wiki/sop_service, + /obj/item/book/manual/wiki/sop_supply, + /obj/item/book/manual/zombie_manual, + ) + +/obj/effect/spawner/random/book/record_item(type_path_to_make) + SSblackbox.record_feedback("tally", "random_spawners", 1, "[/obj/item/book]") + +/obj/effect/spawner/random/mod/maint + name = "maint MOD module spawner" + loot = list( + /obj/item/mod/module/springlock = 2, + /obj/item/mod/module/balloon = 1, + /obj/item/mod/module/stamp = 1 + ) + +/obj/effect/spawner/random/janitor/supplies + icon = 'icons/effects/random_spawners.dmi' + icon_state = "mopbucket" + name = "janitorial supplies spawner" + loot = list( + /obj/item/storage/box/mousetraps, + /obj/item/storage/box/lights/tubes, + /obj/item/storage/box/lights/mixed, + /obj/item/storage/box/lights/bulbs, + ) + diff --git a/code/game/objects/effects/spawners/random/random_spawner.dm b/code/game/objects/effects/spawners/random/random_spawner.dm new file mode 100644 index 000000000000..91814b9bdfb5 --- /dev/null +++ b/code/game/objects/effects/spawners/random/random_spawner.dm @@ -0,0 +1,143 @@ +/** + * Base class for all random spawners. + */ +/obj/effect/spawner/random + icon = 'icons/effects/spawner_icons.dmi' + icon_state = "loot" + layer = OBJ_LAYER + /// Stops persistent lootdrop spawns from being shoved into lockers + anchored = TRUE + /// A list of possible items to spawn e.g. list(/obj/item, /obj/structure, /obj/effect) + var/list/loot + /// The subtypes AND type to combine with the loot list + var/loot_type_path + /// The subtypes (this excludes the provided path) to combine with the loot list + var/loot_subtype_path + /// How many items will be spawned + var/spawn_loot_count = 1 + /// If the same item can be spawned twice + var/spawn_loot_double = TRUE + /// Whether the items should be distributed to offsets 0,1,-1,2,-2,3,-3.. This overrides pixel_x/y on the spawner itself + var/spawn_loot_split = FALSE + /// The pixel x/y divider offsets for spawn_loot_split (spaced 1 pixel apart by default) + var/spawn_loot_split_pixel_offsets = 2 + /// Whether the spawner should spawn all the loot in the list + var/spawn_all_loot = FALSE + /// The chance for the spawner to create loot (ignores spawn_loot_count) + var/spawn_loot_chance = 100 + /// Determines how big of a range (in tiles) we should scatter things in. + var/spawn_scatter_radius = 0 + /// Whether the items should have a random pixel_x/y offset (maximum offset distance is ± spawn_random_offset_max_pixels for x/y) + var/spawn_random_offset = FALSE + /// Maximum offset distance for random pixel offsets. + var/spawn_random_offset_max_pixels = 16 + /// Whether the spawned items should be rotated randomly. + var/spawn_random_angle = FALSE + +// Brief explanation: +// Rather then setting up and then deleting spawners, we block all atomlike setup +// and do the absolute bare minimum +// This is with the intent of optimizing mapload +// TODO: Bring this optimization up one level if possible +/obj/effect/spawner/random/Initialize(mapload) + SHOULD_CALL_PARENT(FALSE) + if(initialized) + stack_trace("Warning: [src]([type]) initialized multiple times!") + initialized = TRUE + spawn_loot() + return INITIALIZE_HINT_QDEL + +///If the spawner has any loot defined, randomly picks some and spawns it. Does not cleanup the spawner. +/obj/effect/spawner/random/proc/spawn_loot(lootcount_override) + if(!prob(spawn_loot_chance)) + return + + var/list/spawn_locations = get_spawn_locations(spawn_scatter_radius) + var/spawn_loot_count = isnull(lootcount_override) ? src.spawn_loot_count : lootcount_override + + if(spawn_all_loot) + spawn_loot_count = INFINITY + spawn_loot_double = FALSE + + if(loot_type_path) + loot += typesof(loot_type_path) + + if(loot_subtype_path) + loot += subtypesof(loot_subtype_path) + + if(length(loot)) + 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)) + var/lootspawn = pick_weight_recursive(loot) + if(!spawn_loot_double) + loot.Remove(lootspawn) + if(lootspawn) + var/turf/spawn_loc = loc + if(spawn_scatter_radius > 0 && length(spawn_locations)) + spawn_loc = pick(spawn_locations) + + var/atom/movable/spawned_loot = make_item(spawn_loc, lootspawn) + spawned_loot.setDir(dir) + + if(!spawn_loot_split && !spawn_random_offset) + if(pixel_x != 0) + spawned_loot.pixel_x = pixel_x + if(pixel_y != 0) + spawned_loot.pixel_y = pixel_y + else if(spawn_random_offset) + spawned_loot.pixel_x = rand(-spawn_random_offset_max_pixels, spawn_random_offset_max_pixels) + spawned_loot.pixel_y = rand(-spawn_random_offset_max_pixels, spawn_random_offset_max_pixels) + else if(spawn_loot_split) + if(loot_spawned) + 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. + * + * spawn_loc - where are we spawning it? + * type_path_to_make - what are we spawning? + **/ +/obj/effect/spawner/random/proc/make_item(spawn_loc, type_path_to_make) + var/result = new type_path_to_make(spawn_loc) + + record_item(type_path_to_make) + + var/atom/item = result + if(spawn_random_angle && istype(item)) + item.transform = turn(item.transform, rand(0, 360)) + + return result + +/obj/effect/spawner/random/proc/record_item(type_path_to_make) + if(ispath(type_path_to_make, /obj/effect)) + return + + SSblackbox.record_feedback("tally", "random_spawners", 1, "[type_path_to_make]") + +///If the spawner has a spawn_scatter_radius set, this creates a list of nearby turfs available that are in view and have an unblocked line to them. +/obj/effect/spawner/random/proc/get_spawn_locations(radius) + var/list/scatter_locations = list() + + if(!radius) + return scatter_locations + + for(var/turf/turf_in_view in view(radius, get_turf(src))) + if(!isfloorturf(turf_in_view)) + continue + if(!has_unblocked_line(turf_in_view)) + continue + + scatter_locations += turf_in_view + + return scatter_locations + +/obj/effect/spawner/random/proc/has_unblocked_line(destination) + for(var/turf/potential_blockage as anything in get_line(get_turf(src), destination)) + if(!is_blocked_turf(potential_blockage, exclude_mobs = TRUE)) + continue + return FALSE + return TRUE diff --git a/code/game/objects/effects/spawners/random/readme.md b/code/game/objects/effects/spawners/random/readme.md new file mode 100644 index 000000000000..e65d0f520087 --- /dev/null +++ b/code/game/objects/effects/spawners/random/readme.md @@ -0,0 +1,425 @@ +# Random Spawners + +## About + +Random spawners are an organized tool primarily for mapping to enhance replayability. The spawners can create objects, effects, and structures with different tweakable settings to get the desired outcome. You can make a spawner determine direction, rarity, number of items to spawn, pixel spacing between items, and even spread it over a large tile radius. This lets you control the atmosphere of a location. You could for instance spawn different piles of trash in maint or spawn decoration items for a room to give it more randomized flavor. The choice is yours! + +*(note the audience of this README is directed towards mappers who lack knowledge of coding)* + +## Variables + +The following variables are defined in `code/game/objects/effects/spawners/random/random.dm` that control how a spawner works. + +- `loot` - a list of possible items to spawn e.g. list(/obj/item, /obj/structure, /obj/effect) +- `loot_type_path` - this combines the subtypes AND type list with the loot list +- `loot_subtype_path` - this combines ONLY the subtypes (excludes the `loot_subtype_path`) with the loot list +- `spawn_loot_count` - how many items will be spawned +- `spawn_loot_double` - if the same item can be spawned twice from the loot list +- `spawn_loot_split` - whether the items should be distributed to offsets 0,1,-1,2,-2,3,-3.. This overrides pixel_x/y on the spawner itself +- `spawn_all_loot` - whether the spawner should spawn all the loot in the list (ignores `spawn_loot_count`) +- `spawn_loot_chance` - the chance for the spawner to create loot (ignores `spawn_loot_count`) +- `spawn_scatter_radius` - determines how big of a range (in tiles) we should scatter things in + +These variables are set to the following default values for the base `random.dm` object that all objects inherit from: + +```dm + /// these three loot values are all empty + var/list/loot + var/loot_type_path + var/loot_subtype_path + + var/spawn_loot_count = 1 // by default one item will be selected from the loot list + var/spawn_loot_double = TRUE // by default duplicate items CAN be spawned from the loot list + var/spawn_loot_split = FALSE // by default items will NOT spread out on the same tile + var/spawn_all_loot = FALSE // by default the spawner will only spawn the number of items set in spawn_loot_count + var/spawn_loot_chance = 100 // by default the spawner has a 100% chance to spawn the item(s) + var/spawn_scatter_radius = 0 // by default the spawner will spawn the items ONLY on the tile it is on +``` + +However there are some categories that overwrite these default values so pay attention to the folder or category you group your spawner in. For instance the `obj/effect/spawner/random/techstorage` category overwrites the `spawn_all_loot` and the `spawn_loot_split` variables. + +```dm +// Tech storage circuit board spawners +/obj/effect/spawner/random/techstorage + name = "generic circuit board spawner" + spawn_loot_split = TRUE + spawn_all_loot = TRUE +``` + +This means any spawner you create under the techstorage will also have those variables set to that by default. This can be overridden quite easily just be resetting the variables back to the normal state like so: + +```dm +/obj/effect/spawner/random/techstorage/data_disk + name = "data disk spawner" + spawn_all_loot = FALSE // now our loot won't all be spawned + loot = list( + /obj/item/disk/data = 49, + /obj/item/disk/nuclear/fake/obvious = 1, + ) +``` + +## Template + +All the random spawners follow the same template format to keep things consistent and unison. + +```dm +/obj/effect/spawner/random/INSERT_SPAWNER_GROUP/INSERT_SPAWNER_NAME + name = "INSERT_SPAWNER_NAME spawner" + loot = list( + /obj/item/PATH/INSERT_OBJ_1, + /obj/item/PATH/INSERT_OBJ_2, + /obj/item/PATH/INSERT_OBJ_3, + ) +``` + +All the capitalized code is the parts where you are supposed to swap out with your objects like so: + +```dm +/obj/effect/spawner/random/medical/minor_healing + name = "minor healing spawner" + loot = list( + /obj/item/stack/medical/suture, + /obj/item/stack/medical/mesh, + /obj/item/stack/medical/gauze, + ) +``` + +Find the path to different objects and add them to the list but try to be consistent with the types of the object and the spawner. For example a medical spawner shouldn't have a emag in the loot list. (use an antag spawner for that instead!) + +## Probability + +Be aware that the `loot` list uses a *weighted chance* formula to determine probability. So if there are no numbers set in the `loot` list then each object defaults to 1 and has the same probability to be selected. For our above example for the `minor_healing` spawner each medical item has a 1/3 chance to be spawned. But if we rearranged the values to this: + +```dm +/obj/effect/spawner/random/medical/minor_healing + name = "minor healing spawner" + loot = list( + /obj/item/stack/medical/suture = 2, + /obj/item/stack/medical/mesh = 1, + /obj/item/stack/medical/gauze = 1, + ) +``` + +Then now `suture` has a 50% chance of being spawned (2/4), `mesh` has a 25% chance of being spawned (1/4), and `gauze` also has a 25% chance of being spawned (1/4). If we add another item into the mix then we get the following: + +```dm +/obj/effect/spawner/random/medical/minor_healing + name = "minor healing spawner" + loot = list( + /obj/item/stack/medical/suture = 2, + /obj/item/stack/medical/mesh = 1, + /obj/item/stack/medical/gauze = 1, + /obj/item/reagent_containers/syringe = 1, + ) +``` + +Suture is 40% (2/5), Mesh is 20% (1/5), Gauze is 20% (1/5), and Syringe is 20% (1/5). A weighted list has the advantage of not needing to update every item in the list when adding a new item. If the list was based on a straight percent values, then each new item would require to manually go and edit ALL the items in the list. For big lists that would become very tedious. This is why we use weighted lists to determine probability! + +## Style + +Here are some simple guidelines that you should stick to when making a new spawner: + +### If ALL the items have the same chance, we should not set a weighted value to the item + +Do not put `/obj/item/ = 1` unless other items have different spawn chances + +Good: + +```dm +/obj/effect/spawner/random/medical/minor_healing + name = "minor healing spawner" + loot = list( + /obj/item/stack/medical/suture = 2, + /obj/item/stack/medical/mesh = 1, + /obj/item/stack/medical/gauze = 1, + /obj/item/reagent_containers/syringe = 1, + ) +``` + +Also Good: + +```dm +/obj/effect/spawner/random/medical/minor_healing + name = "minor healing spawner" + loot = list( + /obj/item/stack/medical/suture, + /obj/item/stack/medical/mesh, + /obj/item/stack/medical/gauze, + /obj/item/reagent_containers/syringe, + ) +``` + +Bad: + +```dm +/obj/effect/spawner/random/medical/minor_healing + name = "minor healing spawner" + loot = list( + /obj/item/stack/medical/suture = 1, + /obj/item/stack/medical/mesh = 1, + /obj/item/stack/medical/gauze = 1, + /obj/item/reagent_containers/syringe = 1, + ) +``` + + +### Sort the list from highest probability to lowest + +Sort from top to bottom. The rarest items for your spawner should be at the bottom of the list. + +Good: + +```dm +/obj/effect/spawner/random/contraband/armory + name = "armory loot spawner" + loot = list( + /obj/item/gun/ballistic/automatic/pistol = 8, + /obj/item/gun/ballistic/shotgun/automatic/combat = 5, + /obj/item/storage/box/syndie_kit/throwing_weapons = 3, + /obj/item/grenade/clusterbuster/teargas = 2, + /obj/item/grenade/clusterbuster = 2, + /obj/item/gun/ballistic/automatic/pistol/deagle = 1, + /obj/item/gun/ballistic/revolver/mateba = 1, + ) +``` + +Bad: + +```dm +/obj/effect/spawner/random/contraband/armory + name = "armory loot spawner" + loot = list( + /obj/item/storage/box/syndie_kit/throwing_weapons = 3, + /obj/item/gun/ballistic/automatic/pistol = 8, + /obj/item/gun/ballistic/revolver/mateba = 1, + /obj/item/grenade/clusterbuster/teargas = 2, + /obj/item/gun/ballistic/automatic/pistol/deagle = 1, + /obj/item/grenade/clusterbuster = 2, + /obj/item/gun/ballistic/shotgun/automatic/combat = 5, + ) +``` + +### Always put the `loot` list at the bottom of your spawner + +This is just to keep things organized. + +Good: + +```dm +/obj/effect/spawner/random/food_or_drink/donkpockets + name = "donk pocket box spawner" + spawn_loot_double = FALSE + loot = list( + /obj/item/storage/box/donkpockets/donkpocketspicy, + /obj/item/storage/box/donkpockets/donkpocketteriyaki, + /obj/item/storage/box/donkpockets/donkpocketpizza, + /obj/item/storage/box/donkpockets/donkpocketberry, + /obj/item/storage/box/donkpockets/donkpockethonk, + ) +``` + +Bad: + +```dm +/obj/effect/spawner/random/food_or_drink/donkpockets + name = "donk pocket box spawner" + loot = list( + /obj/item/storage/box/donkpockets/donkpocketspicy, + /obj/item/storage/box/donkpockets/donkpocketteriyaki, + /obj/item/storage/box/donkpockets/donkpocketpizza, + /obj/item/storage/box/donkpockets/donkpocketberry, + /obj/item/storage/box/donkpockets/donkpockethonk, + ) + spawn_loot_double = FALSE +``` + +### Always put a comma at the last item in the `loot` list + +This will make it easier for people to add items to your spawner later without getting frustrating code errors. + +Good: + +```dm +/obj/effect/spawner/random/medical/minor_healing + name = "minor healing spawner" + loot = list( + /obj/item/stack/medical/suture, + /obj/item/stack/medical/mesh, + /obj/item/stack/medical/gauze, + ) +``` + +Bad: + +```dm +/obj/effect/spawner/random/medical/minor_healing + name = "minor healing spawner" + loot = list( + /obj/item/stack/medical/suture, + /obj/item/stack/medical/mesh, + /obj/item/stack/medical/gauze // if someone adds an item to the list later it will cause an error + ) +``` + +### Keep the same tab formatting for the `loot` list (unless there is only one item) + +Again, this is just good code organization. If there is only one item, then encase that item in `loot = list(item)` + +Good: + +```dm +/obj/effect/spawner/random/medical/minor_healing + name = "minor healing spawner" + loot = list( + /obj/item/stack/medical/suture, + /obj/item/stack/medical/mesh, + /obj/item/stack/medical/gauze, + ) +``` + +Also Good: + +```dm +/obj/effect/spawner/random/structure/crate_abandoned + icon = 'icons/effects/landmarks_static.dmi' + icon_state = "loot_site" + spawn_loot_chance = 20 + loot = list(/obj/structure/closet/crate/secure/loot) +``` + +Bad: + +```dm +/obj/effect/spawner/random/medical/minor_healing + name = "minor healing spawner" + loot = list( + /obj/item/stack/medical/suture, + /obj/item/stack/medical/mesh, + /obj/item/stack/medical/gauze, + ) +``` + +Also Bad: + +```dm +/obj/effect/spawner/random/medical/minor_healing + name = "minor healing spawner" + loot = list(/obj/item/stack/medical/suture, + /obj/item/stack/medical/mesh, + /obj/item/stack/medical/gauze,) +``` + +### Try to keep the total combined weight of your `loot` list to sane values (Aim for 5, 10, 20, 50, or 100) + +This makes the math probability easier for people to calculate. (this is recommended, but not always possible) + +Good: + +```dm +/obj/effect/spawner/random/trash/cigbutt + name = "cigarette butt spawner" + loot = list( + /obj/item/cigbutt = 65, + /obj/item/cigbutt/roach = 20, + /obj/item/cigbutt/cigarbutt = 15, + ) +``` + +Also Good: + +```dm +/obj/effect/spawner/random/trash/botanical_waste + name = "botanical waste spawner" + loot = list( + /obj/item/grown/bananapeel = 6, + /obj/item/grown/corncob = 3, + /obj/item/food/grown/bungopit = 1, + ) +``` + +Bad: + +```dm +/obj/effect/spawner/random/entertainment/money_large + name = "large money spawner" + loot = list( + /obj/item/stack/spacecash/c1 = 521, + /obj/item/stack/spacecash/c10 = 378, + /obj/item/stack/spacecash/c20 = 212, + /obj/item/stack/spacecash/c50 = 205, + /obj/item/stack/spacecash/c100 = 71, + /obj/item/stack/spacecash/c200 = 60, + /obj/item/stack/spacecash/c500 = 57, + /obj/item/stack/spacecash/c1000 = 41, + /obj/item/stack/spacecash/c10000 = 12, + ) +``` + +### Do not put empty items in the loot list + +Instead use the `spawn_loot_chance` var to control the chance for the spawner to spawn nothing. + +Good: + +```dm +/obj/effect/spawner/random/structure/crate_abandoned + name = "locked crate spawner" + spawn_loot_chance = 20 + loot = list(/obj/structure/closet/crate/secure/loot) +``` + + +Bad: + +```dm +/obj/effect/spawner/lootdrop/crate_spawner + name = "lootcrate spawner" + loot = list( + "" = 80 + /obj/structure/closet/crate/secure/loot = 20, + ) +``` + +### Avoid making a spawner that is a duplicate + +We don't want copy-cat spawners that are almost identical. Instead merge spawners together if possible. + +Good: + +```dm +/obj/effect/spawner/random/contraband/armory + name = "armory loot spawner" + icon_state = "pistol" + loot = list( + /obj/item/gun/ballistic/automatic/pistol = 8, + /obj/item/gun/ballistic/shotgun/automatic/combat = 5, + /obj/item/storage/box/syndie_kit/throwing_weapons = 3, + /obj/item/grenade/clusterbuster/teargas = 2, + /obj/item/grenade/clusterbuster = 2, + /obj/item/gun/ballistic/automatic/pistol/deagle, + /obj/item/gun/ballistic/revolver/mateba, + ) +``` + + +Bad: + +```dm +/obj/effect/spawner/lootdrop/armory_contraband + loot = list( + /obj/item/gun/ballistic/automatic/pistol = 8, + /obj/item/gun/ballistic/shotgun/automatic/combat = 5, + /obj/item/gun/ballistic/automatic/pistol/deagle, + /obj/item/gun/ballistic/revolver/mateba + ) + +/obj/effect/spawner/lootdrop/armory_contraband/metastation + loot = list( + /obj/item/gun/ballistic/automatic/pistol = 8, + /obj/item/gun/ballistic/shotgun/automatic/combat = 5, + /obj/item/storage/box/syndie_kit/throwing_weapons = 3, + /obj/item/gun/ballistic/automatic/pistol/deagle, + /obj/item/gun/ballistic/revolver/mateba + ) + +``` diff --git a/code/game/objects/effects/spawners/random/trash_spawners.dm b/code/game/objects/effects/spawners/random/trash_spawners.dm new file mode 100644 index 000000000000..776a387c0b79 --- /dev/null +++ b/code/game/objects/effects/spawners/random/trash_spawners.dm @@ -0,0 +1,75 @@ +/// Food trash spawner, for when you specifically want it to look like someone +/// didn't clean up after themselves after lunch. +/obj/effect/spawner/random/food_trash + icon = 'icons/effects/random_spawners.dmi' + icon_state = "tray" + name = "Food trash spawner" + loot = list( + /obj/item/trash/bowl, + /obj/item/trash/candle, + /obj/item/trash/candy, + /obj/item/trash/cheesie, + /obj/item/trash/chips, + /obj/item/trash/fried_vox, + /obj/item/trash/gum, + /obj/item/trash/liquidfood, + /obj/item/trash/pistachios, + /obj/item/trash/plate, + /obj/item/trash/popcorn, + /obj/item/trash/popsicle_stick, + /obj/item/trash/raisins, + /obj/item/trash/semki, + /obj/item/trash/snack_bowl, + /obj/item/trash/sosjerky, + /obj/item/trash/spacetwinkie, + /obj/item/trash/syndi_cakes, + /obj/item/trash/tastybread, + /obj/item/trash/tray, + /obj/item/trash/twimsts, + /obj/item/trash/waffles, + ) + + spawn_random_angle = TRUE + +/obj/effect/spawner/random/food_trash/record_item(type_path_to_make) + SSblackbox.record_feedback("tally", "random_spawners", 1, "[/obj/item/trash]") + +/obj/effect/spawner/random/trash + icon = 'icons/effects/random_spawners.dmi' + icon_state = "trash" + + name = "Trash spawner" + loot = list( + // Food litter often + /obj/effect/spawner/random/food_trash = 8, + + // Some regular trash + list( + /obj/item/broken_bottle, + /obj/item/cigbutt, + /obj/item/cigbutt/roach, + /obj/item/flashlight/flare/glowstick/used, + /obj/item/flashlight/flare/used, + /obj/item/paper/crumpled, + /obj/item/shard, + /obj/item/trash/tapetrash, + ) = 5, + + // Ammo casings rarely + list( + /obj/item/ammo_casing/c10mm, + /obj/item/trash/spentcasing, + ) = 1, + ) + + // TODO: Random spawner scatter behavior doesn't work well with items in + // containers or on dense objects like racks. Fix up so we can scatter trash. + spawn_random_angle = TRUE + spawn_random_offset = TRUE + spawn_random_offset_max_pixels = 8 + +/obj/effect/spawner/random/trash/record_item(type_path_to_make) + if(istype(type_path_to_make, /obj/effect/spawner)) + return + + SSblackbox.record_feedback("tally", "random_spawners", 1, "[/obj/item/trash]") diff --git a/code/game/objects/effects/spawners/turf_spawners.dm b/code/game/objects/effects/spawners/turf_spawners.dm new file mode 100644 index 000000000000..eeaf554b506a --- /dev/null +++ b/code/game/objects/effects/spawners/turf_spawners.dm @@ -0,0 +1,30 @@ +/obj/effect/spawner/random_spawners/proc/rustify(turf/T) + var/turf/simulated/wall/W = T + if(istype(W) && !W.rusted) + W.rust() + +/obj/effect/spawner/random_spawners/wall_rusted_probably + name = "rusted wall probably" + icon_state = "rust" + +/obj/effect/spawner/random_spawners/wall_rusted_probably/randspawn(turf/T) + if(prob(75)) + rustify(T) + qdel(src) + +/obj/effect/spawner/random_spawners/wall_rusted_maybe + name = "rusted wall maybe" + icon_state = "rust" + +/obj/effect/spawner/random_spawners/wall_rusted_maybe/randspawn(turf/T) + if(prob(25)) + rustify(T) + qdel(src) + +/obj/effect/spawner/random_spawners/wall_rusted_always + name = "rusted wall always" + icon_state = "rust" + +/obj/effect/spawner/random_spawners/wall_rusted_always/randspawn(turf/T) + rustify(T) + qdel(src) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 3a992cd935c7..8ac39ab3c0ed 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -226,6 +226,22 @@ attack_verb = list("burnt", "singed") START_PROCESSING(SSobj, src) +/obj/item/flashlight/flare/used + +/obj/item/flashlight/flare/used/Initialize() + . = ..() + // fuel gets set on New which is annoying so these can't just be vars + fuel = 0 + on = 0 + update_icon() + +/obj/item/flashlight/flare/glowstick/used/Initialize() + . = ..() + // fuel gets set on New which is annoying so these can't just be vars + fuel = 0 + on = 0 + update_icon() + /obj/item/flashlight/flare/decompile_act(obj/item/matter_decompiler/C, mob/user) if(isdrone(user) && !fuel) C.stored_comms["metal"] += 1 diff --git a/icons/effects/random_spawners.dmi b/icons/effects/random_spawners.dmi new file mode 100644 index 0000000000000000000000000000000000000000..77aa8915532212c081ef90d265533ec2f0a71a16 GIT binary patch literal 8750 zcmV+}BGKK6P)V=-0C=2@lFtr;Fbu}e+fyuXH~zbNF&M)^Ucn4D*uq#zS4H36A&ECLZeN>U zzw}F+i}U4LR-(9-{HZZm@Zuznn=NOPRb*mu*mGvI?F=nNAW1sPY(niDlX0djhS=C~ z)}kErqJJ2n3~9#46@aVZmE>A*YDMB2 zV8v!I){i;wnrpoOLAkh8#rG9HSG1Rz511=C001E|Nkllfv)jiYQGn34TLHVH5UDe$+-Tl3K?^SiZYMb3|$2I(V5&m;u zz}14Mo_b34<@h;s=Ga1YEy2V!0q_D${>KN7Ar4DS`Cp)&DgD>@HjeFkAH2sTFkdcR zSt$kLngDo>d8U*n@_))Ha5?k3*eD?ol~D-F6@VX<-kKCY>Bzgy-oH}Z#N;;>M-3Y{ z#(qVw$x8mm+S(oYdOiz5FksazM))IO&P3fe5*cXzwL?(!CTW5 z(~Upg7r66w;Op)!sP)auX!hE*XxOVBXqJo3537U$q%NMDOUhe>}zcI zC?nO$_@hXFh1R$mV=+gWaYcpToym&&=_@ty-whXW;5g9odf>o8VDx8l|EO_J@<*3e zbvb_~CYqoLt zry!q^fkQ$FhATh#T38Ro&jR5R6sEse>?C z?4LzKaHY{_s@?X|pB1%UHGuvj`z-LAX?9!Z<%+ubeklYx!*5l&EY_X`!dK+yPh!`RJ?MjOSfwlxLNHdDrnbcG zScGw?stLgb@({=+4D|PXLSzXrxFKMp+n&3JGRBZ!@TL?3tg+kP(rP)Y`#@^EJ23hC z)pg_pn6cwU`m^7eF1D4qoEt3ijpZ=;!O$``Yfs=b<$p~!pGjx(+mlHA8_lr?58+b$ zI1{83u%=N&UiBLw0Dj2S&z zWexBiPKb0hG$Gqr4d2g;mIoB&0hfz__G=LR;8>UQgZ)e%9Q3Gq^vq9=bRb&BMFR+% zPeO19+5MeZ1y=hFhw*Tr1!oe*pfqlB!;gAb;nwuSnN-a~#Ly z4{p#1ICWa210`R_BExo8Vs8`_6rjP2&b+9oC>)vhg4hnV{ST&=aq9!H5X@0lsqE~% zK{Y;?GytP9rL*wb6>0ApQB|3(w!iN&V0#Ar$PS=h3*f2tWbD_2^M9cIm+d1R58$#| zf{X^SXpoT;^lM=p8MT@&ik%Tn1Kholw7@0cL}pOR|0gxIjp?nH{c8LLm*=c}yV!8f z2GhP2s>(Y0++prBaVr3G$irvy+2d!Me}T+ETYQR>qydZwReRTnTxF};x6L?u>Xb;- zoVt8k=F<{=m)O3o%`NysS*^y{JK4Clf2!O6D#7goV6e?kd`oHo2VQh)09!;YdM^H# z&*TrNG2W4WmzI`>{ohiC?diX{Xqg)0N9ZNca*Jc%QPERTLu_BTkdH;=NZ;{@QwZD& z0JrhSDi5hAX}cK-0544b(Sh{Lzc#dYPkxQ)#&`OEw_czKbxHN#C=^^_n$r5Xn{%5Yg8qI$i?gR<9acb|L9M0> zd$Dz<>v=By06J#aQ*29VIZCx(EbYnbKlmN;p8pvXv5DS4Zt&AO~;)n5w zZ?+sqL)hMBTt*Cv!y-@|9wGZ&X?^;eGgyu_V*iM6*;*mz1S*+dl`KS^{Au|7e2UB` z6VNSk2Qt%u+GC_3YuzLw|#yaXrGZ{Qy%)W>dq6*d#<^!#g&U<)J6f3dVyps zYt2QGw}u+0Ai-eF`sM?4LJ!=~sfjRi*+mz{IT@ua7&e^7DXcG;gy(BaMcOMsmq5BL z@->I@&Q!||1Nmurn2GQ4iQV_&7w&pftT$NlQ-9Ap4H+Fz!Q2mLZjw*J7R)xJYo<{% zc33hl=k7w)2zp3AQ061f{eHa;wx_%*dZDZ;KW*#|ygfrve{);lZ|C+ab=6iaTjTpN zMKYs$Rct-K7Nw{~jnZ30_iT1{Ha+eg_0>^NT5e5aa^{}EWcVwWR*`EU6yzZ=ka0IU6fo9yJ1 zWD0{J1kWn1(L{Ja)o@UI8yQ=>4;qlemyxX>)j%wqx8L!`vKTEAhv48AZYFFNIg1z0 z7i;^xX8vE(?Z+UzO$W^6e}?~no#soIF8NjbOp>px{7sJZwwLM87AVS}5eISJ3MN+jh7Axv) z1N|3*!l;utSG_UL9<|ezliVjNIFp@^999UIJgGD6iHw_?nc>(Niv<^Yf zq$~MG)UsNM3c&6B>+>%=(t>;=?qZ!kz>u+s>{$y(ipe*E$!ATl;!6UywGes4U|LU+)*munL;!9CLZI=>kpFjztd)1rnzr=XtC#LgOkWXaX9k0{gK0ZOZ)R z=BC?k9wb9Y&6~`VGM#-!E`0pUK_uH9qWB$T`Q*1_i`c-w;>%Ek?I~o&3Jsac5g^xi z)N<1~ACuM3Go)h=m=9;QFV;kU8eLnDF{NqwYw>`Fjjmh*G2S{(hj+huDm!;wZHm!Xau2v+tsq`H}Ubqq9^ca1KZpa zIPbY5ei#4!zv$0?1AX1nEaaQj{9JsCi-t6t9n;}d^NZ>_lO=0gz#W3>1EfsWgrJ_( z1WfuvgA{dTVGm4E9#L`CxaPKYe{878w_xGwBZwr0P(yna5JfGqqGI60Y3+co zd@Ju*k2JZVH#IwxhBLj!Ft_`sVIz#~k(gta!&jTjFZ#S4+9C|kQtcmN|Fq(F0f9gW z0g?VGnE_rSvleN!Tzp5$>dKBD2n|^65AL04eis0P23QV8~o#O1t&;jgC0?mKuD#v@f~YSd4KPNjr{ikaC{22p^X`PO}huuq* zbWd<`_N;1uOH=spDuA5XAwS!5x)vGa15T!q!*v8E2h7FcWAd*eToV8<5EmbhdH?XT zO1E>Kb2Z?a0C<536DIs3O&P=EfRJnWb>Nx+{K|371pI>GO(gL(0q}sYl{-~dkNjdT z95zyw!$p2L{R^Y?HY7l$y_Zph0_0LNyjZ-@S#1A9rSKQLjU*0<00bk3{eU4r6?opX zuciGiQyITkoNo=I&=Pa)Ep5tz11i!FXeVUBe*cqR6T{?p7O_7z%|^aKw9D}ZO#ats zjuu2W3qTo4u#%QKwD2q4{>n^siG6gX5CU)FH-hd17$wiT826V4CVxayOSGoT8-OxFnCA6ke}ULJ!=f9eQD#W*o{yz(N_0-B$z@#zA@cLzQC%?XUj4=D?ds;*hoi{EcBR zOg&70-!kPbK?me$5l-h)3oY-+4CL!@A%BP0zaJ$+O5Z>PstWQuqYWwe0i=NxQvJ81 z74E=cT51Vx&_%3|jk_Iar2xr&fSd0Ho~EN`zH-IpP_TkY*O&4li9;d)I`RI;2xu>~ z+spYkn0zDN)z-T0ubBK4XGN&QENB>_99 z)&XkL5)~`s1$!Q+btDiGocRd?0Y?&-H(x=}O+er=>}H2=d;e~Tcg8k~c$XM$yE-{z zhkk3BtRg`28DYYrO99w{y5v?$@*_z%{7a0exeJa#Uv(dXzTWZcXHGEtBtu z<7z?q@ClU%?#7bB)97El9(IZl2{~vqHSJrkubqi!tU^25mI4+|TTFgUINJw1 z$I*^3?Gc6%`8^MkT-2t86jMnlElX)>1Qe8zIT)haM=$VM2qq}+In2mG%f8H;&o~n` z>6tXkwj8k+(Z#Nj#72Zn0Q`+%|B7Q{QX#zkW@PJ6QVaWmq>*?wbv7Cp$oJH~{db+4 zkaTu4mdw@yCOXKMGI!&o*Vi6K|Gpt%i`AUGDzyHL1b~TmkpFVDto0nW#x=h$(-S9& zFJld`fEE&@yvt+`s^I>J6BYih6-@qpkYQ-7cdpm+bFdBvKYG%9@WbTeyuA$Qp_@zk zecS|mky&p1re6Y}%-LvmZrZ1dmA%UY4uaJRB+nC?63rPz*VfdzBK;$2fbU2kvT3b* z-xakoQfChb{!7>N0zH83=dh~7CM<92{Wa{Q2BrS6Ss1<)^*=&*`wsFWqa^tev>rg@ zhiOA|iiz+t(ntjnqUIyahWE0+!k0ciX(m4jUB$L>Ah;lZdJkawz0S;rxpFkn>whAL zXgdjkb##bl`0NA<@*A}!Z}+!yd7&xr+uMM)iBL8!GYN*Z51=B9e)4hkAnH-gtB>o* z=Wc_Z^ysHiy}A=O(z-UKjqupYVDg`pGj~pfGunpB_vSiuK?|c_-vqr~&zc}gs(mJ& z!^5k`Ao}H2h;DN~qFdc3m*fW#ee+j{?naJmR5%g;6(aa>Kf4D$v7`?^Zb)>v4|wWk z;67tO+1KWKaT`hOgnuR=p6pt^8%gqa;iekNWGSoRBYx0(-lv@p_*Ep6^ScN8WAl_E zvRrEg`P-9{5Si*6D4)K9S_Q)l^Ao%_7SaDZ!=6Ezh-aQK)>`~M*q&H2s93aRyVu303y(NgG`Wd)|e*!Ron_Bf{xYUVE>~8W;mqV

({SvYEJe*tHUn{o6l=l-y3j@o_x_$goDGi-(k<5n|gQC(+qb8qUyG_ z*4aO}Ei2(i;RlLS{ej8mGdf#aGp^(tQ6BjWmw5s!LhBo1)RN-zow`FmmH1ry**16W z-UCbLWuq~kMFIBV;7gVWAfB9IAKg*wW{CdXXqPfRS(%U4?PyKfaKI31CmUvRUPQLI zFnTyPtY3$Ue1PG~cWMl7!_L>ph8^B0WAkH48%2_L-@XMYKWbXW)^T|d>iB6-7 zb>_J>M?2@{Bc0T*owSf~a;Azfh*|-ecUUsrwDXM^2=i!VtJ)v>=OFk1On!KTyt#8f z?Ln=&&IuPdKldz$#`-@XvO1XnuKmL1*D_3z)OVk=-1>6u?twG;!$u@w=?kf7FMTv@ zXM@US!1_Qvpai+t`Ilm9(iO-FAj`-c^xaLBO?!T<0m5dJ`m8Qq3Kut6=Jr}nEy_oB zu2%akGjmh~L4HzKXNIWxjSNR{&3AT)xvly2oaqf7B9{E}0dx%ze_dN41p0PGn!#Ia z9KM#w?bXL#d$%5vsM#e#@7GRsd)}U%!0pshJijCrBL*d5?jk7!9k#)z*^N*1 z%H^9Rl|k!LBEJ_&P*JSx;bU++zpN?=iZl=I%+bYFWhg9^uLHst2l&z@P_=J~6*R&x z0l0AHsH5gH@eC%P^Q%VI@TW)zPIgKoK_?Gx?^>i@$dqbdn<-I{zmFb%>sXJi40cgC z06H~Qo29|sg#HzwM63Pm?YB8j=~{9cIQ9cLT&v9K(e1}VG%GH4+s5X@%jQVADRPw& z?+`-r89oa@LGEcmGOw)&l>GDzb}S>Ds-GP`lR0@0qGepa8ZO>i1$~Qqph5FhXx1E} zz0a|73;yjqy1h2V%J%cd@+$^M>L@9*R5UzCH`RoMp+vTLis)&U)RBx5p{LaMpxWd; zyO@BoB9u_mvAE1U--AymU1^y$%GKr@XAyO2>g`2^@L2#(U5vLW8=qBQgt=`MOk{y_IM6qt7+<8k3FlNhhs9q# zZ6rVAP#?UVvI+KF{+9Vf{- zXR{pnJ$v1W&z8#hH!EreTA|E(Ocm9*c?=fz+$$!A;D!768&KmUB3wFqyp+w7a#Em? zpR>9JwJA!mj0B*(DBYh6l|lfxYxY9Ud0c;E3$InQ6`syD=Ih(FVr!$ku3%4?zerJe zCbV#^Z@*ru)*>Y35EV(=3!FBeCuJ&LE6L|EhKrDmr|q9rIsvFuaRFRonIvBO0u~+} zOs>0pf6BF@m|KPg^37h1zbg+ajRs&< z&AoJ?2KP3yN$^JlFs9E^)bK1xy57ATo+`$CAl#-2!O=Q`cwTbFD1uga!9JzZ)qX~$ z5C8`I0DA4^n(M2b{<+G&+EHnOLz$q<9mfc#&8WsJd)ZezDvbtU=;H$XRnI?H*;g|v zl>l7Bl}AWh0m1&zab?0U<=#T30V)blW?W4V%7|amy@k{XEN{Hr)sA1vybWa2M59W(D7R3L-j>GjvQRX+A6(KEdeOgz90C$ z;W!?B%TunOE~IC2Y%8$O4*Q7CAt5IeA93~vI1LPx~?`%uF&xkkc+(q&7-RV>#QGn3N8Yd5vCms}6Q*0`;C#yUn(mwLNz-9}7OIa%}XqzQJ z%^C^TRt~$e_k39Vpua()jI*TpFCh_KaI+(iU+fyg>@q~8R2?~Vn~^L-$@mp)sNweB z+WqL9OgO0tl&p!WJ#L~;(#Yg@(?0*kaX8lLi-|9ZvSC zJ4p}^L`fh)7^=Dx0-rQMHYVZ*L;9N!EeAZTUCG3`P}Y8|>O$bJjkM82s6(=zuZ^a$ zzU|M@!sK3_H4hV>c^pVQ2Q-v%y=7NG02t-pn>DnvVi?K)KQXAy8O)-8?WZ{2Idy$> zy7~OP28KC}ztjl2m+WM>1iUd@QU5g3i?4^f1J``7$ajE8t3K>)@orJoFj3pEm*?S+ zGowxWqqT8>e^(X*{WK$3Qc4esKf%Vqe8U3zeIuSxvP}}T=TG_{iBE@=vHu{l?XIMW&QQ<6XIhvuaEsdpeJ`L;F0Ns1JMk)I&0HWp- z`RY>h*9~nG^zYYm&2Q?+_cusXhcTMZtLf*;SUrwH>7~nVj|~+2M>w}H-uD`CS2meg zBC4?-#WW9&q3kE~@otuPUyz!wOjkRirLg%t{MAZ+IAUDR@f47Xn5uGQN=`BQAq`yA zB~2D@r%RhZO;LxXNG;$~N03qN+a8=CNY@vMH+?CtLhSdD@45GFuX9Y6kG0RM>ltCm z=yKe-y^XGR+ca(aoLE+9Uz6Y#fH&oDH#F-QQtih$$WQ+tnXlh}-lP3I7e>$F(U>&U zG{_BqNZJao1;FI(vk7>G+|L2Moy$b?1Ah+QMdJDb$BoCf@qAF2R5&}rf)};SD3^Rj z#~*0XYCf&Eb+r3b{xQ-TMTYNz>EwqYN-XJJaz&_GUdLg`Yxgkn9=Hq9AAau934J0e z71gyQ3qd6L1Ep>vRQ&4)5DuU5E8K>fKe0WYo4CMwMnI6>{y>>HwFl8Td&~8{yWlje z()dDfa}jA{)>I?=SR4+E*>QlQfROW{DCRsM<$ICL%zQYaPjudYCi+PCI4g}b2>gh z-7Wcf{bXdw^JQ{U!R)g^y$rJPZRPSXk<|7^=OP?FCzyOAVtt891q|ONlTpe-?H}JM z$!El;i_mnpolt`t3$=f}p>Dc-U2Ls6>6-?)!sMs-v}8~_zxa@w8`sDmtVIx&ArpDI z<|$SJMoa?m0zIxQqZ@5-_`pqNr`h57l#`lb@TT_jwDaF0PfR?mBa5T0^w7BKqyZAx z>{O?9oZC*QC#oC}pC0BYX;%A8ey-swlU3|8TFDrw>b(H8wFXv}Pks&aH;MxXck;k< z&!SF#srKn?m4hm84dUB5X-Y{8938?$Q=@(F8aYA5joM6Ux%x+9 zJ=+zIS=8^pNPBCllW(p44BrHRr)M#Jzmn%FT4B1Jc>iW-_l%ZV@FlLY#!qrx7P6jT zGx_hYl--e!-P2ZV*Rfj3&*638>?foJlow{JxRgw8I|)IXUh>7xn$3ozWY2)RPACq1 zVsBq>kM-&Vhs|g5cU>^oeui%X@W~`olAC%f3~6J{?>Qu}P;r49*^@J>`@QA%EDDE5 zn>9t3{$POL=qXv-RBW3ln|fJACh{4)%|fv9)jgtLXxjlg>^&fEif_-sK9z)E{CpJ+ zTL8)2(NFi^tFykB7U}O?B-wbSG+lJ?Z2Asp*a*0p+=D8KhQiiL;u%)eufuBrkS}%u z>)ZDkVPS?Dxn$er;@vC|u4-TRcJ;$E$s{-Qa!w%cz}~*o0n`aMg2{Jak^jGBpES&- z%zs_Qu1h2Y&9z)Z`yjIj``$ijE<(#JQUt9+rIZ-h&+EEIPanzW}Qej>T0w-_X`wnSO!?bsWu7)HQ}V zh`5u-)FJ%2`5a&EzY)s9w^TGe276aGv#|sbm0AGo)0g^n^BiP8X07*qoM6N<$f@E+O;{X5v literal 0 HcmV?d00001 diff --git a/paradise.dme b/paradise.dme index 7d57b41f5a18..9fe3bf88a113 100644 --- a/paradise.dme +++ b/paradise.dme @@ -215,6 +215,7 @@ #include "code\_globalvars\lists\flavor_misc.dm" #include "code\_globalvars\lists\fortunes.dm" #include "code\_globalvars\lists\keybindings_lists.dm" +#include "code\_globalvars\lists\maint_loot_tables.dm" #include "code\_globalvars\lists\misc_lists.dm" #include "code\_globalvars\lists\mob_lists.dm" #include "code\_globalvars\lists\names.dm" @@ -1011,15 +1012,23 @@ #include "code\game\objects\effects\effect_system\effects_water.dm" #include "code\game\objects\effects\spawners\airlock_spawner.dm" #include "code\game\objects\effects\spawners\bombspawner.dm" +#include "code\game\objects\effects\spawners\decorative_spawners.dm" +#include "code\game\objects\effects\spawners\depot_spawners.dm" #include "code\game\objects\effects\spawners\detgun_spawner.dm" #include "code\game\objects\effects\spawners\gibspawner.dm" #include "code\game\objects\effects\spawners\grouped_spawner.dm" #include "code\game\objects\effects\spawners\lootdrop.dm" #include "code\game\objects\effects\spawners\mess_spawners.dm" #include "code\game\objects\effects\spawners\random_barrier.dm" -#include "code\game\objects\effects\spawners\random_spawners.dm" +#include "code\game\objects\effects\spawners\turf_spawners.dm" #include "code\game\objects\effects\spawners\vaultspawner.dm" #include "code\game\objects\effects\spawners\windowspawner.dm" +#include "code\game\objects\effects\spawners\random\engineering_spawners.dm" +#include "code\game\objects\effects\spawners\random\food_spawners.dm" +#include "code\game\objects\effects\spawners\random\maint_loot_spawners.dm" +#include "code\game\objects\effects\spawners\random\misc_spawners.dm" +#include "code\game\objects\effects\spawners\random\random_spawner.dm" +#include "code\game\objects\effects\spawners\random\trash_spawners.dm" #include "code\game\objects\effects\temporary_visuals\clockcult.dm" #include "code\game\objects\effects\temporary_visuals\cult_visuals.dm" #include "code\game\objects\effects\temporary_visuals\explosion_temp_visuals.dm" diff --git a/tools/UpdatePaths/Scripts/26500_random_spawners.txt b/tools/UpdatePaths/Scripts/26500_random_spawners.txt new file mode 100644 index 000000000000..c73bca8226c1 --- /dev/null +++ b/tools/UpdatePaths/Scripts/26500_random_spawners.txt @@ -0,0 +1 @@ +/obj/effect/spawner/lootdrop/maintenance/@SUBTYPES : /obj/effect/spawner/random/maintenance