From 5ba3bf7fd06b07fc81978ddd98417bee67c3155c Mon Sep 17 00:00:00 2001
From: generalthrax <139387950+generalthrax@users.noreply.github.com>
Date: Fri, 25 Oct 2024 20:26:45 -0500
Subject: [PATCH] Revert "Refactors lootdroppers (#3526)"
This reverts commit 94cb62b6626cd2b0d6fb5324b5c27f1eccffde27.
---
.../BeachRuins/beach_ancient_ruin.dmm | 2 +-
.../BeachRuins/beach_float_resort.dmm | 2 +-
.../BeachRuins/beach_ocean_town.dmm | 56 +-
.../BeachRuins/beach_pirate_crash.dmm | 10 +-
.../BeachRuins/beach_treasure_cove.dmm | 6 +-
.../IceRuins/icemoon_crashed_holemaker.dmm | 12 +-
.../IceRuins/icemoon_ice_lodge.dmm | 22 +-
.../icemoon_underground_abandoned_village.dmm | 8 +-
.../icemoon_underground_brazillianlab.dmm | 8 +-
.../JungleRuins/jungle_bombed_starport.dmm | 10 +-
.../JungleRuins/jungle_cavecrew.dmm | 12 +-
.../JungleRuins/jungle_medtech_outbreak.dmm | 2 +-
.../JungleRuins/jungle_paradise.dmm | 28 +-
.../JungleRuins/jungle_syndicate.dmm | 2 +-
.../lavaland_abandonedlisteningpost.dmm | 10 +-
.../LavaRuins/lavaland_crashed_starwalker.dmm | 4 +-
.../lavaland_surface_wrecked_factory.dmm | 50 +-
.../RockRuins/rockplanet_budgetcuts.dmm | 10 +-
.../RockRuins/rockplanet_distillery.dmm | 36 +-
.../RockRuins/rockplanet_nomadcrash.dmm | 6 +-
.../RockRuins/rockplanet_shippingdock.dmm | 22 +-
.../whitesands_surface_camp_combination.dmm | 16 +-
.../whitesands_surface_camp_saloon.dmm | 18 +-
.../whitesands_surface_medipen_plant.dmm | 8 +-
.../whitesands_surface_pubbyslopcrash.dmm | 28 +-
_maps/RandomRuins/SpaceRuins/astraeus.dmm | 24 +-
.../SpaceRuins/corporate_mining.dmm | 12 +-
_maps/RandomRuins/SpaceRuins/power_puzzle.dmm | 36 +-
_maps/RandomRuins/SpaceRuins/spacemall.dmm | 108 +-
.../wasteplanet_abandoned_mechbay.dmm | 30 +-
.../WasteRuins/wasteplanet_lab.dmm | 2 +-
.../WasteRuins/wasteplanet_tradepost.dmm | 8 +-
.../WasteRuins/wasteplanet_yard.dmm | 22 +-
_maps/outpost/hangar/nt_asteroid_40x20.dmm | 6 +-
_maps/outpost/hangar/nt_asteroid_40x40.dmm | 7 +-
_maps/outpost/hangar/nt_asteroid_56x20.dmm | 11 +-
_maps/outpost/hangar/nt_asteroid_56x40.dmm | 11 +-
_maps/outpost/indie_space.dmm | 122 +-
_maps/outpost/nanotrasen_asteroid.dmm | 48 +-
_maps/outpost/nanotrasen_ice.dmm | 26 +-
.../independent/independent_beluga.dmm | 12 +-
.../shuttles/independent/independent_box.dmm | 18 +-
.../independent/independent_bubble.dmm | 6 +-
.../independent/independent_dwayne.dmm | 65 +-
.../independent/independent_junker.dmm | 28 +-
.../shuttles/independent/independent_kilo.dmm | 12 +-
.../independent/independent_lagoon.dmm | 4 +-
.../independent/independent_mudskipper.dmm | 14 +-
.../independent/independent_raleigh.dmm | 22 +-
.../independent/independent_rigger.dmm | 40 +-
.../independent/independent_schmiedeberg.dmm | 26 +-
.../independent/independent_shetland.dmm | 18 +-
.../independent/independent_sunskipper.dmm | 4 +-
.../independent/independent_tranquility.dmm | 16 +-
_maps/shuttles/inteq/inteq_colossus.dmm | 32 +-
_maps/shuttles/inteq/inteq_hound.dmm | 14 +-
_maps/shuttles/inteq/inteq_talos.dmm | 70 +-
_maps/shuttles/inteq/inteq_valor.dmm | 18 +-
_maps/shuttles/inteq/inteq_vaquero.dmm | 26 +-
_maps/shuttles/minutemen/minutemen_atlas.dmm | 10 +-
.../shuttles/nanotrasen/nanotrasen_delta.dmm | 16 +-
.../shuttles/nanotrasen/nanotrasen_gecko.dmm | 146 +-
.../nanotrasen/nanotrasen_harrier.dmm | 14 +-
.../shuttles/nanotrasen/nanotrasen_heron.dmm | 41 +-
_maps/shuttles/nanotrasen/nanotrasen_meta.dmm | 30 +-
.../shuttles/nanotrasen/nanotrasen_mimir.dmm | 56 +-
.../shuttles/nanotrasen/nanotrasen_ranger.dmm | 10 +-
_maps/shuttles/pgf/pgf_crying_sun.dmm | 12 +-
_maps/shuttles/pirate/pirate_libertatia.dmm | 20 +-
_maps/shuttles/pirate/pirate_tortuga.dmm | 54 +-
_maps/shuttles/solgov/solgov_inkwell.dmm | 16 +-
.../subshuttles/independent_sugarcube.dmm | 8 +-
.../syndicate/syndicate_cybersun_kansatsu.dmm | 6 +-
.../syndicate/syndicate_gorlex_hyena.dmm | 16 +-
.../syndicate/syndicate_gorlex_komodo.dmm | 48 +-
.../syndicate/syndicate_litieguai.dmm | 8 +-
.../shuttles/syndicate/syndicate_panacea.dmm | 6 +-
.../syndicate/syndicate_twinkleshine.dmm | 22 +-
_maps/templates/shelter_2.dmm | 2 +-
_maps/templates/shelter_3.dmm | 2 +-
code/__HELPERS/_lists.dm | 102 +-
code/__HELPERS/_string_lists.dm | 2 +-
code/_globalvars/lists/maintenance_loot.dm | 6 +-
.../configuration/entries/game_options.dm | 10 -
code/controllers/subsystem/overmap.dm | 2 +-
code/controllers/subsystem/ticker.dm | 2 +-
code/datums/ai_laws.dm | 4 +-
code/datums/components/fantasy/_fantasy.dm | 2 +-
code/datums/components/fantasy/suffixes.dm | 2 +-
code/datums/components/squeak.dm | 4 +-
code/datums/looping_sounds/_looping_sound.dm | 2 +-
.../mapgen/planetary/JungleGenerator.dm | 6 +-
code/datums/mapgen/planetary/LavaGenerator.dm | 6 +-
code/datums/mapgen/planetary/RockGenerator.dm | 6 +-
code/datums/mapgen/planetary/SandGenerator.dm | 6 +-
code/datums/mapgen/planetary/SnowGenerator.dm | 10 +-
.../datums/mapgen/planetary/WasteGenerator.dm | 248 ++--
.../mapgen/single_biome/WasteplanetCaves.dm | 2 +-
code/datums/votes/_vote_datum.dm | 2 +-
code/datums/weather/weather_controller.dm | 2 +-
.../MapData/shuttles/nanotrasen_ranger.dm | 12 +-
code/game/gamemodes/dynamic/dynamic.dm | 14 +-
code/game/gamemodes/game_mode.dm | 4 +-
code/game/gamemodes/meteor/meteors.dm | 2 +-
code/game/machinery/computer/arcade.dm | 12 +-
code/game/objects/effects/landmarks.dm | 10 +-
code/game/objects/effects/misc.dm | 20 +
code/game/objects/effects/spawners/bundle.dm | 104 +-
.../game/objects/effects/spawners/lootdrop.dm | 1314 +++++++++++++++++
.../objects/effects/spawners/mobspawner.dm | 32 +-
.../effects/spawners/random.dm/ai_module.dm | 41 -
.../effects/spawners/random.dm/anomaly.dm | 222 ---
.../effects/spawners/random.dm/bedsheet.dm | 33 -
.../effects/spawners/random.dm/boards.dm | 245 ---
.../effects/spawners/random.dm/bureaucracy.dm | 68 -
.../effects/spawners/random.dm/clothing.dm | 67 -
.../effects/spawners/random.dm/decoration.dm | 118 --
.../effects/spawners/random.dm/engineering.dm | 138 --
.../spawners/random.dm/entertainment.dm | 282 ----
.../effects/spawners/random.dm/exotic.dm | 69 -
.../spawners/random.dm/food_or_drink.dm | 284 ----
.../effects/spawners/random.dm/maintenance.dm | 57 -
.../effects/spawners/random.dm/medical.dm | 145 --
.../effects/spawners/random.dm/random.dm | 175 ---
.../effects/spawners/random.dm/readme.md | 425 ------
.../effects/spawners/random.dm/salvaging.dm | 207 ---
.../effects/spawners/random.dm/structure.dm | 91 --
.../effects/spawners/random.dm/trash.dm | 282 ----
.../effects/spawners/random.dm/vending.dm | 17 -
.../spawners/random.dm/waste_planet.dm | 101 --
code/game/objects/effects/spawners/spawner.dm | 23 -
code/game/objects/effects/spawners/traps.dm | 9 +
.../objects/effects/spawners/vaultspawner.dm | 28 +
.../effects/spawners/xeno_egg_delivery.dm | 18 +
code/game/objects/items/chromosome.dm | 2 +-
code/game/objects/items/devices/flashlight.dm | 9 +
code/game/objects/items/devices/mines.dm | 8 +-
.../game/objects/items/grenades/ghettobomb.dm | 2 +-
code/game/objects/items/plushes.dm | 40 +
.../game/objects/items/storage/uplink_kits.dm | 6 +-
code/game/objects/items/toys.dm | 2 +-
code/game/objects/structures/bedsheet_bin.dm | 4 +-
.../crates_lockers/closets/gimmick.dm | 1 +
.../crates_lockers/closets/utility_closets.dm | 2 +-
code/game/objects/structures/geyser.dm | 2 +-
code/game/objects/structures/salvaging.dm | 316 +++-
code/game/turfs/closed/minerals.dm | 2 +-
code/modules/admin/verbs/randomverbs.dm | 2 +-
.../changeling/powers/pheromone_receptors.dm | 2 +-
code/modules/awaymissions/away_props.dm | 6 +-
code/modules/awaymissions/corpse.dm | 12 +-
.../awaymissions/mission_code/snowdin.dm | 77 +
.../blackmarket_items/consumables.dm | 4 +-
code/modules/cargo/packs/costumes_toys.dm | 4 +-
code/modules/cargo/packs/food.dm | 12 +-
code/modules/clothing/gloves/color.dm | 18 +
.../clothing/outfits/ert/frontiersmen_ert.dm | 12 +-
code/modules/events/brain_trauma.dm | 2 +-
code/modules/events/heart_attack.dm | 2 +-
code/modules/events/holiday/xmas.dm | 2 +-
code/modules/fishing/fish/_fish.dm | 2 +-
code/modules/fishing/sources/_fish_source.dm | 2 +-
code/modules/flufftext/Hallucination.dm | 2 +-
code/modules/food_and_drinks/pizzabox.dm | 4 +-
code/modules/mapping/mapping_helpers.dm | 8 +-
code/modules/mining/lavaland/ash_flora.dm | 121 +-
code/modules/mining/ore_veins.dm | 2 +-
.../hostile/abandoned_minebot.dm | 4 +-
.../living/simple_animal/hostile/hivebot.dm | 2 +-
.../simple_animal/hostile/human/survivors.dm | 32 +-
.../hostile/mining_mobs/hivelord.dm | 4 +-
.../hostile/mining_mobs/hivelord_outfits.dm | 56 +-
.../mob/living/simple_animal/simple_animal.dm | 2 +-
code/modules/mob/mob_helpers.dm | 2 +-
code/modules/mob_spawner/hivebot.dm | 2 +-
code/modules/mob_spawner/spawner_componet.dm | 2 +-
code/modules/overmap/objects/dynamic_datum.dm | 4 +-
code/modules/overmap/objects/event_datum.dm | 2 +-
.../chemistry/reagents/other_reagents.dm | 4 +-
.../research/designs/biogenerator_designs.dm | 2 +-
code/modules/research/experimentor.dm | 4 +-
code/modules/shuttle/shuttle.dm | 8 +-
code/modules/vending/cola.dm | 11 +
code/modules/vending/snack.dm | 11 +
config/game_options.txt | 5 -
html/changelogs/archive/2019-03.yml | 2 +-
icons/effects/landmarks_static.dmi | Bin 0 -> 19814 bytes
icons/effects/mapping/docking_ports.dmi | Bin 697 -> 0 bytes
icons/effects/mapping/landmarks_static.dmi | Bin 19106 -> 0 bytes
icons/effects/mapping/mapping_helpers.dmi | Bin 12739 -> 0 bytes
icons/effects/mapping/random_spawners.dmi | Bin 97084 -> 0 bytes
icons/effects/mapping_helpers.dmi | Bin 0 -> 16864 bytes
icons/obj/clothing/gloves.dmi | Bin 21845 -> 24290 bytes
icons/obj/lighting.dmi | Bin 76435 -> 80208 bytes
shiptest.dme | 24 +-
.../Scripts/17256_NEWFOOD_cakebreadnoodle.txt | 22 +
.../Scripts/55614_replacemonkeys.txt | 5 +
.../Scripts/55658_apc_pixel_offsets.txt | 4 +
.../UpdatePaths/Scripts/55658_cornersfix.txt | 30 +
.../Scripts/56644_turfs2decals.txt | 467 ++++++
.../Scripts/59820_replaceplasteelturf.txt | 50 +
...pawners.txt => 60522_replace_spawners.txt} | 128 +-
.../Scripts/60619_toxins_to_plasma.txt | 38 +
.../Scripts/61694_reinforcedwindows.txt | 35 +
.../Scripts/62601_wallitems_f2w.txt | 94 ++
.../Scripts/62789_camera_diag_f2w.txt | 5 +
.../Scripts/65236_clothingunderrepath.txt | 196 +++
.../Scripts/65326_lib_computers.txt | 1 +
.../Scripts/65504_floor_repathing.txt | 53 +
.../Scripts/65656_windoor_replacement.txt | 39 +
.../Scripts/65755_pdas_to_tabs.txt | 56 +
.../65906_replace_wayfinding_beacons.txt | 1 +
.../66210_replace_tiered_canisters.txt | 9 +
.../Scripts/66406_turf_updates.txt | 344 +++++
.../Scripts/66411_thermomachines.txt | 6 +
.../Scripts/66505_tablet_cartridges.txt | 24 +
.../Scripts/66754_replace_sign_names.txt | 17 +
.../Scripts/66860_replace_masks.txt | 16 +
.../Scripts/67083_action_granters.txt | 1 +
.../Scripts/67107_turf_updates_2.txt | 118 ++
.../Scripts/67324_misc_space_fix.txt | 4 +
.../67512_mail_sorting_to_shipping.txt | 2 +
.../67761_floorvaredits_to_mappinghelpers.txt | 66 +
...aredited_signs_to_subtype_directionals.txt | 452 ++++++
224 files changed, 5518 insertions(+), 4584 deletions(-)
create mode 100644 code/game/objects/effects/spawners/lootdrop.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/ai_module.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/anomaly.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/bedsheet.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/boards.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/bureaucracy.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/clothing.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/decoration.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/engineering.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/entertainment.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/exotic.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/food_or_drink.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/maintenance.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/medical.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/random.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/readme.md
delete mode 100644 code/game/objects/effects/spawners/random.dm/salvaging.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/structure.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/trash.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/vending.dm
delete mode 100644 code/game/objects/effects/spawners/random.dm/waste_planet.dm
delete mode 100644 code/game/objects/effects/spawners/spawner.dm
create mode 100644 code/game/objects/effects/spawners/traps.dm
create mode 100644 code/game/objects/effects/spawners/vaultspawner.dm
create mode 100644 code/game/objects/effects/spawners/xeno_egg_delivery.dm
create mode 100644 icons/effects/landmarks_static.dmi
delete mode 100644 icons/effects/mapping/docking_ports.dmi
delete mode 100644 icons/effects/mapping/landmarks_static.dmi
delete mode 100644 icons/effects/mapping/mapping_helpers.dmi
delete mode 100644 icons/effects/mapping/random_spawners.dmi
create mode 100644 icons/effects/mapping_helpers.dmi
create mode 100644 tools/UpdatePaths/Scripts/17256_NEWFOOD_cakebreadnoodle.txt
create mode 100644 tools/UpdatePaths/Scripts/55614_replacemonkeys.txt
create mode 100644 tools/UpdatePaths/Scripts/55658_apc_pixel_offsets.txt
create mode 100644 tools/UpdatePaths/Scripts/55658_cornersfix.txt
create mode 100644 tools/UpdatePaths/Scripts/56644_turfs2decals.txt
create mode 100644 tools/UpdatePaths/Scripts/59820_replaceplasteelturf.txt
rename tools/UpdatePaths/Scripts/{3526_replace_spawners.txt => 60522_replace_spawners.txt} (62%)
create mode 100644 tools/UpdatePaths/Scripts/60619_toxins_to_plasma.txt
create mode 100644 tools/UpdatePaths/Scripts/61694_reinforcedwindows.txt
create mode 100644 tools/UpdatePaths/Scripts/62601_wallitems_f2w.txt
create mode 100644 tools/UpdatePaths/Scripts/62789_camera_diag_f2w.txt
create mode 100644 tools/UpdatePaths/Scripts/65236_clothingunderrepath.txt
create mode 100644 tools/UpdatePaths/Scripts/65326_lib_computers.txt
create mode 100644 tools/UpdatePaths/Scripts/65504_floor_repathing.txt
create mode 100644 tools/UpdatePaths/Scripts/65656_windoor_replacement.txt
create mode 100644 tools/UpdatePaths/Scripts/65755_pdas_to_tabs.txt
create mode 100644 tools/UpdatePaths/Scripts/65906_replace_wayfinding_beacons.txt
create mode 100644 tools/UpdatePaths/Scripts/66210_replace_tiered_canisters.txt
create mode 100644 tools/UpdatePaths/Scripts/66406_turf_updates.txt
create mode 100644 tools/UpdatePaths/Scripts/66411_thermomachines.txt
create mode 100644 tools/UpdatePaths/Scripts/66505_tablet_cartridges.txt
create mode 100644 tools/UpdatePaths/Scripts/66754_replace_sign_names.txt
create mode 100644 tools/UpdatePaths/Scripts/66860_replace_masks.txt
create mode 100644 tools/UpdatePaths/Scripts/67083_action_granters.txt
create mode 100644 tools/UpdatePaths/Scripts/67107_turf_updates_2.txt
create mode 100644 tools/UpdatePaths/Scripts/67324_misc_space_fix.txt
create mode 100644 tools/UpdatePaths/Scripts/67512_mail_sorting_to_shipping.txt
create mode 100644 tools/UpdatePaths/Scripts/67761_floorvaredits_to_mappinghelpers.txt
create mode 100644 tools/UpdatePaths/Scripts/68004_varedited_signs_to_subtype_directionals.txt
diff --git a/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm b/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
index dad43ef34082..bda6fb742d53 100644
--- a/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
@@ -1144,7 +1144,7 @@
/turf/open/floor/concrete/slab_1,
/area/ruin/beach/complex/wall)
"sa" = (
-/obj/effect/spawner/random/food_or_drink/garden/seaweed,
+/obj/effect/spawner/lootdrop/garden/seaweed,
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
"so" = (
diff --git a/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm b/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm
index 8c8097e2c794..b2c39404d641 100644
--- a/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm
@@ -825,7 +825,7 @@
dir = 1
},
/obj/item/candle,
-/obj/effect/spawner/random/food_or_drink/donut,
+/obj/effect/spawner/lootdrop/donut,
/turf/open/floor/wood{
light_range = 2
},
diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
index 39bebb15982e..312e11abe0f4 100644
--- a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
@@ -113,7 +113,7 @@
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"bs" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"bu" = (
@@ -412,9 +412,9 @@
/area/ruin/beach/oceantown)
"fn" = (
/obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
-/obj/effect/spawner/random/food_or_drink/donut,
-/obj/effect/spawner/random/food_or_drink/donut,
+/obj/effect/spawner/lootdrop/donut/slimejelly,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"fp" = (
@@ -711,8 +711,8 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"ix" = (
/obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
-/obj/effect/spawner/random/food_or_drink/donut,
+/obj/effect/spawner/lootdrop/donut/slimejelly,
+/obj/effect/spawner/lootdrop/donut,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"iz" = (
@@ -1560,11 +1560,11 @@
/area/ruin/beach/oceantown/bar)
"un" = (
/obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/donut,
-/obj/effect/spawner/random/food_or_drink/donut,
-/obj/effect/spawner/random/food_or_drink/donut,
-/obj/effect/spawner/random/food_or_drink/donut,
-/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut/slimejelly,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"ur" = (
@@ -3367,8 +3367,8 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"NX" = (
/obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/donut/jelly,
-/obj/effect/spawner/random/food_or_drink/donut/jelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"Oe" = (
@@ -3541,7 +3541,7 @@
/area/ruin/beach/oceantown)
"PF" = (
/obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
+/obj/effect/spawner/lootdrop/donut/slimejelly,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"PH" = (
@@ -3569,7 +3569,7 @@
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
"Qf" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"Qm" = (
@@ -3733,10 +3733,10 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"SS" = (
/obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/donut,
-/obj/effect/spawner/random/food_or_drink/donut,
-/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
-/obj/effect/spawner/random/food_or_drink/donut/jelly,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut/slimejelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"SY" = (
@@ -3906,7 +3906,7 @@
/area/ruin/beach/oceantown/bar)
"Vr" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/carpet,
/area/ruin/beach/oceantown)
"VI" = (
@@ -3945,9 +3945,9 @@
/area/ruin/beach/oceantown/shop)
"VQ" = (
/obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/donut/jelly,
-/obj/effect/spawner/random/food_or_drink/donut/jelly,
-/obj/effect/spawner/random/food_or_drink/donut/jelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"VS" = (
@@ -4112,11 +4112,11 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"XQ" = (
/obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/donut/jelly,
-/obj/effect/spawner/random/food_or_drink/donut/jelly,
-/obj/effect/spawner/random/food_or_drink/donut/jelly,
-/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
-/obj/effect/spawner/random/food_or_drink/donut/jelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
+/obj/effect/spawner/lootdrop/donut/slimejelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"XS" = (
diff --git a/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm b/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm
index fddfa5bdc00f..67ac69292603 100644
--- a/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm
@@ -1111,7 +1111,7 @@
/obj/structure/closet/crate,
/obj/effect/turf_decal/box,
/obj/item/stack/cable_coil/red,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ruin/beach/piratecrash/shuttle)
@@ -1350,7 +1350,7 @@
"Pf" = (
/obj/effect/turf_decal/box,
/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/item/stack/sheet/mineral/gold/five,
/obj/item/stack/sheet/mineral/silver/five,
/obj/item/stack/sheet/mineral/silver/five,
@@ -1433,9 +1433,9 @@
"QG" = (
/obj/effect/turf_decal/box,
/obj/structure/closet/crate,
-/obj/effect/spawner/random/circuit/machine/rare,
-/obj/effect/spawner/random/maintenance/four,
-/obj/effect/spawner/random/circuit/machine/common,
+/obj/effect/spawner/lootdrop/random_machine_circuit_rare,
+/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/lootdrop/random_machine_circuit_common,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating/rust,
diff --git a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
index fbf9bf8ed4eb..839e87815f93 100644
--- a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
@@ -35,7 +35,7 @@
"bI" = (
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/machinery/light/small/directional/north,
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick,
/turf/open/floor/concrete/slab_1,
/area/ruin/beach/treasure_cove)
"bN" = (
@@ -53,7 +53,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick,
/turf/open/floor/plating/dirt/jungle,
/area/ruin/unpowered)
"cJ" = (
@@ -543,7 +543,7 @@
pixel_x = -10;
pixel_y = 4
},
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick,
/turf/open/floor/wood,
/area/ruin/beach/treasure_cove)
"rA" = (
diff --git a/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm b/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
index 294dd1056431..707be4573d13 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
@@ -473,7 +473,9 @@
/obj/structure/bed/double{
dir = 1
},
-/obj/effect/spawner/random/bedsheet/double,
+/obj/item/bedsheet/dorms/double{
+ dir = 1
+ },
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered/crashed_holemaker)
"iN" = (
@@ -672,7 +674,7 @@
/area/ruin/unpowered/crashed_holemaker)
"lt" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/structure/crate_abandoned,
+/obj/effect/spawner/lootdrop/crate_spawner,
/turf/open/floor/plating,
/area/ruin/unpowered/crashed_holemaker)
"lu" = (
@@ -741,7 +743,7 @@
},
/obj/item/radio/intercom/directional/north,
/obj/structure/closet/cabinet,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered/crashed_holemaker)
@@ -1439,7 +1441,7 @@
/turf/open/floor/carpet,
/area/ruin/unpowered/crashed_holemaker)
"ze" = (
-/obj/effect/spawner/random/structure/crate_abandoned,
+/obj/effect/spawner/lootdrop/crate_spawner,
/turf/open/floor/plating,
/area/ruin/unpowered/crashed_holemaker)
"zh" = (
@@ -2387,7 +2389,7 @@
/turf/open/floor/plasteel/icemoon,
/area/ruin/unpowered/crashed_holemaker)
"RL" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/obj/effect/turf_decal/spline/fancy/transparent/neutral/corner{
dir = 4
},
diff --git a/_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm b/_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm
index a698cf49ea18..92b840e05aa0 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm
@@ -337,7 +337,7 @@
/turf/open/floor/concrete/slab_3/icemoon,
/area/overmap_encounter/planetoid/cave/explored)
"fe" = (
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/random,
/obj/effect/turf_decal/siding/wood,
/obj/structure/bed{
icon_state = "dirty_mattress"
@@ -1256,10 +1256,10 @@
/obj/item/clothing/head/frontier,
/obj/item/clothing/gloves/color/latex,
/obj/item/clothing/mask/surgical,
-/obj/effect/spawner/random/medical/chem_jug,
-/obj/effect/spawner/random/medical/chem_jug,
-/obj/effect/spawner/random/medical/chem_jug,
-/obj/effect/spawner/random/medical/chem_jug,
+/obj/effect/spawner/lootdrop/chem_jug,
+/obj/effect/spawner/lootdrop/chem_jug,
+/obj/effect/spawner/lootdrop/chem_jug,
+/obj/effect/spawner/lootdrop/chem_jug,
/obj/effect/turf_decal/corner/opaque/blue,
/obj/effect/turf_decal/corner/opaque/neutral{
dir = 4
@@ -1659,7 +1659,7 @@
/area/ruin/powered/icemoon/lodge/mainhall)
"wD" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/random,
/obj/effect/turf_decal/siding/wood{
dir = 10
},
@@ -1771,7 +1771,7 @@
/turf/open/floor/wood/maple,
/area/ruin/powered/icemoon/lodge/mainhall)
"yi" = (
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/random,
/obj/effect/turf_decal/siding/wood{
dir = 6
},
@@ -1968,9 +1968,9 @@
/obj/effect/turf_decal/spline/fancy/wood{
dir = 8
},
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/turf/open/floor/wood/mahogany{
icon_state = "wood-broken6"
},
@@ -2677,7 +2677,7 @@
/turf/closed/wall/mineral/wood,
/area/ruin/powered/icemoon/lodge/residential)
"Nq" = (
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/random,
/obj/effect/turf_decal/siding/wood,
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed{
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
index f4db9fa9d9f7..42aa6b288469 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -40,7 +40,7 @@
"fD" = (
/obj/structure/bed,
/obj/effect/decal/cleanable/blood/bubblegum,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/wood,
/area/ruin/powered)
"fQ" = (
@@ -459,7 +459,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"LZ" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/wood,
/area/ruin/powered)
"Nq" = (
@@ -477,7 +477,7 @@
/turf/open/floor/carpet,
/area/ruin/powered)
"Pp" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/turf/open/floor/holofloor/wood,
/area/ruin/powered)
"PQ" = (
@@ -554,7 +554,7 @@
"WH" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/wood,
/area/ruin/powered)
"Ze" = (
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm
index 1a52405a3ec0..d560e98b2f20 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm
@@ -478,7 +478,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"xN" = (
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/ruin/unpowered)
"xQ" = (
@@ -1028,7 +1028,7 @@
/obj/structure/rack,
/obj/item/hatchet,
/obj/item/hatchet,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/ruin/unpowered)
"Ul" = (
@@ -1086,7 +1086,7 @@
/obj/item/ammo_casing/shotgun/improvised,
/obj/item/ammo_casing/shotgun/improvised,
/obj/item/ammo_casing/shotgun/improvised,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/ruin/unpowered)
"WH" = (
@@ -1181,7 +1181,7 @@
"Yx" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/rack_parts,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/wood{
icon_state = "wood-broken3";
initial_gas_mix = "ICEMOON_ATMOS"
diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
index 1afed51826aa..77c280d07e90 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
@@ -811,10 +811,10 @@
/area/overmap_encounter/planetoid/jungle/explored)
"fJ" = (
/obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
/turf/open/floor/plasteel/dark,
/area/overmap_encounter/planetoid/jungle/explored)
"fL" = (
@@ -2699,7 +2699,7 @@
/area/overmap_encounter/planetoid/jungle/explored)
"sK" = (
/obj/structure/table,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
/turf/open/floor/plasteel/grimy,
/area/ruin/jungle/starport)
"sN" = (
diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
index 1159123d30f1..923e58b4cb05 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -167,7 +167,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"bH" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/curtain/cloth/grey,
/obj/effect/decal/cleanable/shreds,
/turf/open/floor/carpet/nanoweave/beige,
@@ -1028,10 +1028,10 @@
pixel_y = 32
},
/obj/structure/closet/secure_closet/freezer/wall/directional/west,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/reagent_containers/condiment/enzyme{
pixel_x = -8;
pixel_y = 5
@@ -2221,7 +2221,7 @@
/area/ruin/jungle/cavecrew/bridge)
"Be" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/curtain/cloth/grey,
/turf/open/floor/carpet/red_gold,
/area/ruin/jungle/cavecrew/dormitories)
diff --git a/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm b/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
index 467dd8e8abd7..75b7e390c540 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
@@ -2108,7 +2108,7 @@
/obj/effect/turf_decal/corner/opaque/mauve{
dir = 1
},
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
"Ie" = (
diff --git a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
index 4429e0b8779a..47455933ec16 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
@@ -685,7 +685,7 @@
/turf/open/floor/plating/grass/jungle,
/area/overmap_encounter/planetoid/cave/explored)
"ei" = (
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick,
/turf/open/floor/plating/dirt/jungle/dark,
/area/overmap_encounter/planetoid/cave/explored)
"el" = (
@@ -989,7 +989,7 @@
/obj/structure/bed{
icon_state = "dirty_mattress"
},
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/effect/decal/cleanable/dirt,
/obj/structure/railing{
color = "#A47449";
@@ -1446,7 +1446,7 @@
dir = 4;
layer = 3.9
},
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/cable/yellow{
icon_state = "1-9"
},
@@ -3204,7 +3204,7 @@
/obj/structure/bed{
icon_state = "dirty_mattress"
},
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/cable/yellow{
icon_state = "0-5"
},
@@ -4344,11 +4344,11 @@
/obj/effect/turf_decal/techfloor/corner{
dir = 1
},
-/obj/effect/spawner/random/food_or_drink/three_course_meal,
-/obj/effect/spawner/random/food_or_drink/three_course_meal,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/lootdrop/three_course_meal,
+/obj/effect/spawner/lootdrop/three_course_meal,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
/turf/open/floor/plasteel/tech/grid,
/area/ruin/jungle/paradise/cargo)
"AT" = (
@@ -5764,9 +5764,9 @@
/obj/structure/cable/yellow{
icon_state = "1-6"
},
-/obj/effect/spawner/random/food_or_drink/three_course_meal,
-/obj/effect/spawner/random/food_or_drink/three_course_meal,
-/obj/effect/spawner/random/food_or_drink/three_course_meal,
+/obj/effect/spawner/lootdrop/three_course_meal,
+/obj/effect/spawner/lootdrop/three_course_meal,
+/obj/effect/spawner/lootdrop/three_course_meal,
/obj/item/reagent_containers/food/snacks/meat/slab,
/obj/item/reagent_containers/food/snacks/meat/slab,
/obj/item/reagent_containers/food/snacks/meat/slab,
@@ -7185,7 +7185,7 @@
/obj/structure/bed{
icon_state = "dirty_mattress"
},
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/wood/walnut,
/area/ruin/jungle/paradise/dorms)
"UC" = (
@@ -7411,7 +7411,7 @@
},
/area/overmap_encounter/planetoid/cave/explored)
"VV" = (
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick,
/turf/open/floor/plating/dirt/jungle,
/area/overmap_encounter/planetoid/cave/explored)
"VW" = (
diff --git a/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm b/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm
index 60d24171ad0f..2eba13537777 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm
@@ -662,7 +662,7 @@
/obj/item/storage/box/donkpockets/donkpocketteriyaki,
/obj/item/storage/box/donkpockets,
/obj/item/storage/box/donkpockets/donkpocketberry,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
/turf/open/floor/plating,
/area/ruin/jungle/syndifort)
"ve" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm b/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm
index dd98807a4958..24fea81ce05c 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm
@@ -77,7 +77,7 @@
/obj/effect/turf_decal/spline/fancy/opaque/syndiered/corner{
dir = 4
},
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/listening_post)
"cm" = (
@@ -2039,7 +2039,7 @@
/area/ruin/unpowered/listening_post/engineering)
"MZ" = (
/obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/structure/sign/poster/official/high_class_martini{
pixel_y = 32
},
@@ -2124,8 +2124,8 @@
/area/ruin/unpowered/listening_post/commons)
"Om" = (
/obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered/listening_post/canteen)
"On" = (
@@ -2246,7 +2246,7 @@
icon_state = "trimline";
dir = 8
},
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 10
},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm b/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
index e0a98de791fc..336588e2d807 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
@@ -2415,7 +2415,7 @@
pixel_x = -26
},
/obj/structure/spider/stickyweb,
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick,
/turf/open/floor/pod/light,
/area/ruin/unpowered/crashed_starwalker)
"MO" = (
@@ -2447,7 +2447,7 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit,
/area/ruin/unpowered/crashed_starwalker)
"MX" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/obj/structure/railing{
dir = 4
},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
index 3a6b545859b7..768c6275cf56 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
@@ -164,8 +164,8 @@
/area/ruin/lavaland/factory/manager_office)
"bE" = (
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/random/trash/decal,
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/lootdrop/waste/trash,
/obj/item/storage/bag/trash,
/obj/item/reagent_containers/glass/bucket,
/obj/item/mop,
@@ -216,7 +216,7 @@
"cm" = (
/obj/structure/table/wood,
/obj/machinery/light/directional/east,
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/turf/open/floor/wood,
/area/ruin/lavaland/factory/adminstrative)
"co" = (
@@ -341,7 +341,7 @@
/area/ruin/lavaland/factory/warehouse)
"dc" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/curtain/cloth,
/obj/effect/turf_decal/corner/opaque/ntblue,
/obj/effect/turf_decal/corner/opaque/ntblue{
@@ -641,7 +641,7 @@
},
/obj/item/modular_computer/laptop,
/obj/item/stack/arcadeticket,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/white,
/area/ruin/lavaland/factory/dorms)
"go" = (
@@ -1506,7 +1506,7 @@
},
/obj/item/storage/wallet/random,
/obj/item/instrument/guitar,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/white,
/area/ruin/lavaland/factory/dorms)
"oh" = (
@@ -1887,7 +1887,7 @@
/obj/item/poster/random_contraband,
/obj/item/toy/eightball,
/obj/item/toy/cards/deck/tarot,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/white,
/area/ruin/lavaland/factory/dorms)
"rh" = (
@@ -2287,7 +2287,7 @@
/obj/item/storage/fancy/cigarettes/cigpack_cannabis,
/obj/item/lighter/greyscale,
/obj/item/reagent_containers/food/drinks/bottle/whiskey,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/white,
/area/ruin/lavaland/factory/dorms)
"ve" = (
@@ -2985,7 +2985,7 @@
/obj/machinery/light/directional/west,
/obj/item/melee/knife/hunting,
/obj/item/clothing/suit/hooded/cloak/goliath,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/white,
/area/ruin/lavaland/factory/dorms)
"CW" = (
@@ -3149,18 +3149,18 @@
/obj/effect/turf_decal/corner/opaque/ntblue{
dir = 1
},
-/obj/effect/spawner/random/trash/decal,
-/obj/effect/spawner/random/trash/decal,
-/obj/effect/spawner/random/trash/decal,
-/obj/effect/spawner/random/trash/decal,
-/obj/effect/spawner/random/trash/decal,
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/lootdrop/waste/trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/white,
/area/ruin/lavaland/factory/dorms)
"EP" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/curtain/cloth,
/obj/effect/turf_decal/corner/opaque/ntblue,
/obj/effect/turf_decal/corner/opaque/ntblue{
@@ -4062,11 +4062,11 @@
/area/overmap_encounter/planetoid/cave/explored)
"Or" = (
/obj/structure/closet/crate/freezer,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
@@ -4945,9 +4945,9 @@
/obj/effect/turf_decal/corner/opaque/bar,
/obj/structure/closet/crate/bin,
/obj/machinery/light/directional/west,
-/obj/effect/spawner/random/trash/decal,
-/obj/effect/spawner/random/trash/decal,
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/lootdrop/waste/trash,
/turf/open/floor/plasteel,
/area/ruin/lavaland/factory/dorms)
"Xn" = (
@@ -5078,7 +5078,7 @@
/area/overmap_encounter/planetoid/lava/explored)
"YJ" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/curtain/cloth,
/obj/effect/turf_decal/corner/opaque/ntblue,
/obj/effect/turf_decal/corner/opaque/ntblue{
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
index c9c7ea2501f3..3b2b995fd979 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
@@ -109,7 +109,7 @@
/turf/open/floor/wood,
/area/ruin/rockplanet/nanotrasen)
"by" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/obj/effect/turf_decal/industrial/warning,
/obj/machinery/light/dim/directional/north,
/turf/open/floor/plasteel,
@@ -214,7 +214,7 @@
/area/ruin/rockplanet/nanotrasen)
"db" = (
/obj/structure/bed/pod,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/ruin/rockplanet/nanotrasen)
@@ -1551,7 +1551,7 @@
/obj/structure/railing{
dir = 4
},
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/wood,
/area/ruin/rockplanet/nanotrasen)
"Ap" = (
@@ -1699,7 +1699,7 @@
/area/overmap_encounter/planetoid/rockplanet/explored)
"Cx" = (
/obj/structure/bed/pod,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/machinery/light/dim/directional/east,
/turf/open/floor/wood,
/area/ruin/rockplanet/nanotrasen)
@@ -2493,7 +2493,7 @@
/area/ruin/rockplanet/nanotrasen)
"Rm" = (
/obj/structure/bed/pod,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/machinery/light/dim/directional/east,
/turf/open/floor/carpet/black,
/area/ruin/rockplanet/nanotrasen)
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
index 6d6f81ffd5a0..3926cffbbf81 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
@@ -401,7 +401,7 @@
/turf/open/floor/plating/asteroid/rockplanet/lit,
/area/overmap_encounter/planetoid/rockplanet/explored)
"dZ" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/obj/effect/turf_decal/spline/fancy/opaque/white,
/turf/open/floor/plasteel/patterned/brushed,
/area/ruin/rockplanet/distillery/crew)
@@ -859,7 +859,7 @@
dir = 8;
icon_state = "dirty_mattress"
},
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/wood,
/area/ruin/rockplanet/distillery/crew)
"kn" = (
@@ -1613,12 +1613,12 @@
"sQ" = (
/obj/effect/turf_decal/industrial/outline/red,
/obj/structure/closet/crate/freezer,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/turf/open/floor/plasteel/patterned/brushed/rockplanet,
/area/ruin/rockplanet/distillery/crew)
"tc" = (
@@ -2187,7 +2187,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/pod,
/area/ruin/rockplanet/distillery/office)
"yO" = (
@@ -3032,10 +3032,10 @@
"Iz" = (
/obj/structure/closet/crate,
/obj/effect/turf_decal/industrial/outline/red,
-/obj/effect/spawner/random/circuit/computer/common,
-/obj/effect/spawner/random/maintenance/four,
-/obj/effect/spawner/random/circuit/machine/common,
-/obj/effect/spawner/random/circuit/machine/common,
+/obj/effect/spawner/lootdrop/random_computer_circuit_common,
+/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/lootdrop/random_machine_circuit_common,
+/obj/effect/spawner/lootdrop/random_machine_circuit_common,
/turf/open/floor/plasteel/patterned/brushed/rockplanet,
/area/ruin/rockplanet/distillery/crew)
"IA" = (
@@ -3419,7 +3419,7 @@
icon_state = "1-5"
},
/obj/machinery/light/small/directional/west,
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/maintenance/four,
/turf/open/floor/wood/rockplanet{
icon_state = "wood-broken6"
},
@@ -3582,7 +3582,9 @@
},
/area/overmap_encounter/planetoid/rockplanet/explored)
"Os" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random{
+ tilted = 1
+ },
/obj/effect/turf_decal/spline/fancy/opaque/white,
/turf/open/floor/plasteel/patterned/brushed,
/area/ruin/rockplanet/distillery/crew)
@@ -4183,7 +4185,7 @@
/obj/structure/fluff/glowshroom,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/wood,
/area/ruin/rockplanet/distillery/crew)
"Vg" = (
@@ -4197,7 +4199,7 @@
widenet = 1
},
/obj/machinery/light/small/broken/directional/east,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plasteel/patterned/brushed,
/area/ruin/rockplanet/distillery/crew)
"Vj" = (
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm b/_maps/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm
index 6db4bf5240a2..ff58248ffc4e 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm
@@ -408,7 +408,7 @@
icon_state = "1-8"
},
/obj/structure/frame/machine,
-/obj/effect/spawner/random/salvage_matter_bin,
+/obj/effect/spawner/lootdrop/salvage_matter_bin,
/turf/open/floor/plasteel/rockplanet,
/area/ruin/rockplanet/nomad)
"oz" = (
@@ -558,7 +558,7 @@
},
/obj/structure/frame/machine,
/obj/machinery/light/small/directional/north,
-/obj/effect/spawner/random/salvage_matter_bin,
+/obj/effect/spawner/lootdrop/salvage_matter_bin,
/turf/open/floor/plating,
/area/ruin/rockplanet/nomad)
"sn" = (
@@ -1272,7 +1272,7 @@
icon_state = "spline_plain_cee"
},
/obj/structure/frame/machine,
-/obj/effect/spawner/random/salvage_matter_bin,
+/obj/effect/spawner/lootdrop/salvage_matter_bin,
/turf/open/floor/plasteel/tech/grid,
/area/ruin/rockplanet/nomad)
"Lk" = (
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm b/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
index 1c518cceabca..f18742a8aadb 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
@@ -288,7 +288,7 @@
/turf/open/floor/wood,
/area/ruin/rockplanet/shippingdockoffice)
"cz" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ruin/rockplanet/shippingdock)
@@ -2068,7 +2068,7 @@
"sa" = (
/obj/effect/turf_decal/rechargefloor,
/obj/effect/turf_decal/industrial/warning/dust,
-/obj/effect/spawner/random/exotic/ripley,
+/obj/effect/spawner/lootdrop/ripley,
/turf/open/floor/plasteel/mono/dark,
/area/ruin/rockplanet/shippingdockwarehouse)
"sc" = (
@@ -2132,7 +2132,7 @@
/area/overmap_encounter/planetoid/rockplanet/explored)
"su" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/concrete/pavement{
light_power = 0.6;
light_range = 2
@@ -2426,7 +2426,7 @@
/area/ruin/rockplanet/shippingdockoffice)
"uo" = (
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/item/trash/can,
/obj/item/trash/can/food/peaches,
/obj/item/trash/tray,
@@ -4044,7 +4044,7 @@
},
/area/overmap_encounter/planetoid/rockplanet/explored)
"HL" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/concrete/pavement{
light_power = 0.6;
light_range = 2
@@ -4208,7 +4208,7 @@
/turf/open/floor/concrete/pavement,
/area/ruin/rockplanet/shippingdockwarehouse)
"Ju" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/ruin/rockplanet/shippingdock)
"Jz" = (
@@ -5282,9 +5282,9 @@
"SJ" = (
/obj/structure/rack,
/obj/structure/window/reinforced,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
/turf/open/floor/plasteel/mono/white,
/area/ruin/rockplanet/shippingdockwarehouse)
"SM" = (
@@ -5968,7 +5968,7 @@
/obj/structure/window/reinforced{
dir = 1
},
-/obj/effect/spawner/random/maintenance/eight,
+/obj/effect/spawner/lootdrop/maintenance/eight,
/turf/open/floor/plasteel/mono/white,
/area/ruin/rockplanet/shippingdockwarehouse)
"XU" = (
@@ -6020,7 +6020,7 @@
"Yf" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/concrete/pavement{
light_power = 0.6;
light_range = 2
diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
index c19dd9de68a1..c7b060634951 100644
--- a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
+++ b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
@@ -115,7 +115,7 @@
/area/ruin)
"fb" = (
/obj/structure/flora/ash/cap_shroom,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/asteroid/whitesands{
light_range = 2
},
@@ -269,7 +269,7 @@
/area/overmap_encounter/planetoid/sand/explored)
"ko" = (
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/item/chair/stool/bar,
/turf/open/floor/wood,
/area/ruin)
@@ -290,7 +290,7 @@
},
/area/overmap_encounter/planetoid/sand/explored)
"kO" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/asteroid/whitesands{
light_range = 2
},
@@ -699,7 +699,7 @@
/area/ruin)
"AI" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/wood,
/area/ruin)
"AR" = (
@@ -915,7 +915,7 @@
/turf/open/floor/wood,
/area/ruin)
"HX" = (
-/obj/effect/spawner/random/exotic/armory,
+/obj/effect/spawner/lootdrop/armory_contraband/metastation,
/turf/open/floor/plating/asteroid/whitesands/dried{
light_range = 2
},
@@ -964,7 +964,7 @@
},
/area/overmap_encounter/planetoid/sand/explored)
"JE" = (
-/obj/effect/spawner/random/engineering/tool/sydnie,
+/obj/effect/spawner/lootdrop/tool_engie_sydnie,
/turf/open/floor/plating/asteroid/whitesands{
light_range = 2
},
@@ -1164,7 +1164,7 @@
},
/area/overmap_encounter/planetoid/sand/explored)
"SV" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/asteroid/whitesands/dried{
light_range = 2
},
@@ -1273,7 +1273,7 @@
/area/ruin)
"Xa" = (
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/wood,
/area/ruin)
"Xb" = (
diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm
index 17a16c3fffc6..219fc7a6b6b6 100644
--- a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm
+++ b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm
@@ -133,7 +133,7 @@
/area/ruin/whitesands/saloon)
"eq" = (
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/directional/west,
/turf/open/floor/wood,
@@ -220,7 +220,7 @@
/area/ruin/whitesands/saloon)
"ge" = (
/obj/structure/closet/cabinet,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
icon_state = "wood-broken5"
@@ -426,7 +426,7 @@
/area/ruin/whitesands/saloon)
"lg" = (
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/wood,
/area/ruin/whitesands/saloon)
"lB" = (
@@ -444,7 +444,7 @@
/area/ruin/whitesands/saloon)
"lI" = (
/obj/structure/table/wood/poker,
-/obj/effect/spawner/random/entertainment/gambling,
+/obj/effect/spawner/lootdrop/gambling,
/turf/open/floor/carpet,
/area/ruin/whitesands/saloon)
"lV" = (
@@ -645,7 +645,7 @@
/area/ruin/whitesands/saloon)
"sj" = (
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/item/chair/stool/bar,
/turf/open/floor/wood,
/area/ruin/whitesands/saloon)
@@ -848,7 +848,7 @@
/area/ruin/whitesands/saloon)
"zv" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/wood{
icon_state = "wood-broken5"
},
@@ -1025,7 +1025,7 @@
/area/ruin/whitesands/saloon)
"EV" = (
/obj/structure/closet/cabinet,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/dirt,
/obj/item/gun/energy/plasmacutter{
icon_state = "pulse_carbine";
@@ -1355,7 +1355,7 @@
/area/ruin/whitesands/saloon)
"Pi" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/wood,
/area/ruin/whitesands/saloon)
"Px" = (
@@ -1590,7 +1590,7 @@
/area/ruin/whitesands/saloon)
"Wl" = (
/obj/structure/closet/cabinet,
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/maintenance/four,
/turf/open/floor/wood,
/area/ruin/whitesands/saloon)
"WP" = (
diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_medipen_plant.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_medipen_plant.dmm
index 60dfc9186132..7ae333dcd541 100644
--- a/_maps/RandomRuins/SandRuins/whitesands_surface_medipen_plant.dmm
+++ b/_maps/RandomRuins/SandRuins/whitesands_surface_medipen_plant.dmm
@@ -751,7 +751,7 @@
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
"uu" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
},
@@ -760,7 +760,7 @@
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
"uz" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
},
@@ -848,7 +848,7 @@
},
/obj/effect/turf_decal/corner/transparent/neutral,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
"xd" = (
@@ -1210,7 +1210,7 @@
/area/ruin/powered)
"KU" = (
/obj/structure/table,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
},
diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
index 5cfb5e8eb771..6906e1dd2bed 100644
--- a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
+++ b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
@@ -225,8 +225,8 @@
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
-/obj/effect/spawner/random/maintenance/five,
-/obj/effect/spawner/random/maintenance/five,
+/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/lootdrop/maintenance/five,
/turf/open/floor/plasteel,
/area/ruin/whitesands/pubbycrash)
"fO" = (
@@ -405,7 +405,7 @@
dir = 8;
name = "engine fuel pump"
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plasteel/tech,
/area/ruin/whitesands/pubbycrash/engine_room)
"jt" = (
@@ -502,7 +502,7 @@
"ln" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/emcloset/wall/directional/south,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plasteel/tech/grid,
/area/ruin/whitesands/pubbycrash/engine_room)
"ly" = (
@@ -530,7 +530,7 @@
name = "engine fuel pump"
},
/obj/machinery/light/small/directional/north,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/item/stack/sheet/mineral/wood/fifty,
/obj/structure/closet/crate,
/turf/open/floor/plasteel/tech,
@@ -622,7 +622,7 @@
/area/ruin/whitesands/pubbycrash)
"nP" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/engine,
/area/ruin/whitesands/pubbycrash)
"nQ" = (
@@ -780,7 +780,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plasteel/tech,
/area/ruin/whitesands/pubbycrash/engine_room)
"rT" = (
@@ -931,7 +931,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/engine,
/area/ruin/whitesands/pubbycrash)
"vL" = (
@@ -972,7 +972,7 @@
/obj/structure/sign/poster/official/random{
pixel_x = 32
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
@@ -1063,7 +1063,7 @@
/obj/structure/table,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/industrial/warning/corner,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plasteel/tech,
/area/ruin/whitesands/pubbycrash/engine_room)
"xX" = (
@@ -1792,7 +1792,7 @@
/obj/structure/sign/poster/retro/nanotrasen_logo_70s{
pixel_x = -32
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plating,
/area/ruin/whitesands/pubbycrash/engine_room)
"KT" = (
@@ -2003,7 +2003,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable/yellow,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plasteel/tech,
/area/ruin/whitesands/pubbycrash/engine_room)
"PA" = (
@@ -2118,7 +2118,7 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ruin/whitesands/pubbycrash/engine_room)
"RC" = (
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/item/stack/ore/salvage/scraptitanium,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/engine,
@@ -2292,7 +2292,7 @@
/obj/structure/sign/number/two,
/obj/item/stack/ore/salvage/scrapmetal,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/engine,
/area/ruin/whitesands/pubbycrash)
"Wo" = (
diff --git a/_maps/RandomRuins/SpaceRuins/astraeus.dmm b/_maps/RandomRuins/SpaceRuins/astraeus.dmm
index e790766a2a94..2c62420cef30 100644
--- a/_maps/RandomRuins/SpaceRuins/astraeus.dmm
+++ b/_maps/RandomRuins/SpaceRuins/astraeus.dmm
@@ -101,7 +101,7 @@
/turf/open/space,
/area/space/nearstation)
"dx" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/airless,
/area/ruin/space/has_grav/astraeus/hallway)
"dA" = (
@@ -326,7 +326,7 @@
/turf/open/space,
/area/space/nearstation)
"jd" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/astraeus/disposals)
"je" = (
@@ -349,7 +349,7 @@
/obj/machinery/conveyor{
dir = 6
},
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/astraeus/disposals)
"jT" = (
@@ -556,7 +556,7 @@
/area/ruin/space/has_grav/astraeus/bridge)
"pT" = (
/obj/item/stack/conveyor,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/astraeus/disposals)
"pU" = (
@@ -621,7 +621,7 @@
dir = 5
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/dark/airless,
/area/ruin/space/has_grav/astraeus/bridge)
"rk" = (
@@ -675,7 +675,7 @@
/turf/open/floor/plasteel/airless,
/area/ruin/space/has_grav/astraeus/hallway)
"sL" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/airless,
/area/ruin/space/has_grav/astraeus/dorms_med)
"sR" = (
@@ -731,8 +731,8 @@
"uH" = (
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/structure/closet,
-/obj/effect/spawner/random/maintenance{
- spawn_loot_count = 2;
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
name = "2maintenance loot spawner"
},
/turf/open/floor/plasteel/airless,
@@ -800,7 +800,7 @@
/obj/machinery/conveyor{
dir = 4
},
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/airless,
/area/ruin/space/has_grav/astraeus/munitions)
"wl" = (
@@ -1374,7 +1374,7 @@
/obj/machinery/conveyor/inverted{
dir = 9
},
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/astraeus/disposals)
"KD" = (
@@ -1560,7 +1560,7 @@
/obj/machinery/power/apc/auto_name/directional/east{
start_charge = 0
},
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/airless,
/area/ruin/space/has_grav/astraeus/munitions)
"Pd" = (
@@ -1734,7 +1734,7 @@
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered)
"UK" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/astraeus/hallway)
"UU" = (
diff --git a/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm b/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm
index 956466fc4be0..a2cb21cd1c1c 100644
--- a/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm
+++ b/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm
@@ -462,7 +462,7 @@
/area/ruin/space/has_grav/corporatemine/bridge)
"kZ" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/effect/turf_decal/spline/fancy/opaque/lightgrey{
dir = 4
},
@@ -812,7 +812,7 @@
/obj/effect/decal/cleanable/oil/slippery,
/obj/structure/closet/crate,
/obj/effect/turf_decal/industrial/outline,
-/obj/effect/spawner/random/materials,
+/obj/effect/spawner/lootdrop/materials,
/turf/open/floor/plasteel/tech/grid,
/area/ruin/space/has_grav/corporatemine/hall)
"sb" = (
@@ -1590,8 +1590,8 @@
"IF" = (
/obj/structure/closet/crate,
/obj/effect/turf_decal/industrial/outline,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
/turf/open/floor/plasteel/tech/grid,
/area/ruin/space/has_grav/corporatemine/hall)
"IS" = (
@@ -1774,7 +1774,7 @@
"NH" = (
/obj/structure/closet/crate,
/obj/effect/turf_decal/industrial/outline,
-/obj/effect/spawner/random/materials,
+/obj/effect/spawner/lootdrop/materials,
/turf/open/floor/plasteel/tech/grid,
/area/ruin/space/has_grav/corporatemine/hall)
"NO" = (
@@ -2293,7 +2293,7 @@
/area/ruin/space/has_grav/corporatemine/crewquarters)
"ZU" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/effect/turf_decal/spline/fancy/opaque/lightgrey{
dir = 8
},
diff --git a/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm b/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm
index c052a6f0cd04..e02a7e328b28 100644
--- a/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm
+++ b/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm
@@ -3,7 +3,7 @@
/obj/structure/bed,
/obj/structure/curtain/cloth/grey,
/obj/effect/turf_decal/corner/transparent/grey/diagonal,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/powerpuzzle)
"ae" = (
@@ -365,9 +365,9 @@
/area/ruin/space/has_grav/powerpuzzle)
"br" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/cobweb,
-/obj/effect/spawner/random/clothing/kittyears_or_rabbitears,
+/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
/obj/effect/turf_decal/corner/transparent/grey/diagonal,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/powerpuzzle)
@@ -695,14 +695,14 @@
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/powerpuzzle)
"cB" = (
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/generic,
/obj/effect/turf_decal/corner/transparent/grey/diagonal,
/obj/structure/closet/crate/secure,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/powerpuzzle)
"cD" = (
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick,
/obj/effect/decal/cleanable/glass,
/obj/effect/turf_decal/industrial/warning{
dir = 8
@@ -797,7 +797,7 @@
/obj/effect/decal/cleanable/greenglow,
/obj/item/stack/ore/salvage/scrapuranium,
/obj/item/bodypart/l_arm/robot,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/item/assembly/prox_sensor,
/obj/item/stack/ore/salvage/scrapuranium{
pixel_x = -4;
@@ -1116,7 +1116,7 @@
/area/ruin/space/has_grav/powerpuzzle)
"gM" = (
/obj/effect/turf_decal/corner/transparent/grey/diagonal,
-/obj/effect/spawner/random/maintenance/six,
+/obj/effect/spawner/lootdrop/maintenance/six,
/obj/structure/closet/crate/secure,
/obj/machinery/light/dim/directional/north,
/turf/open/floor/plasteel/dark,
@@ -1478,7 +1478,7 @@
pixel_x = 2;
pixel_y = 4
},
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/light/broken/directional/south,
/obj/item/poster/random_official,
/obj/item/poster/random_official,
@@ -1677,7 +1677,7 @@
/obj/structure/railing/corner{
dir = 1
},
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/powerpuzzle)
"rI" = (
@@ -1838,7 +1838,7 @@
/obj/structure/railing,
/obj/effect/turf_decal/corner/transparent/grey/diagonal,
/obj/item/stack/ore/salvage/scrapuranium/five,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/structure/closet/crate/engineering,
/obj/effect/turf_decal/box,
/turf/open/floor/plasteel/dark,
@@ -1850,8 +1850,8 @@
/obj/item/reagent_containers/food/drinks/waterbottle/empty,
/obj/item/reagent_containers/food/drinks/waterbottle/empty,
/obj/item/reagent_containers/food/drinks/waterbottle,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/reagent_containers/food/snacks/sosjerky,
/obj/item/reagent_containers/food/snacks/sosjerky,
/obj/item/stack/medical/gauze/improvised,
@@ -2446,7 +2446,7 @@
/obj/structure/bed,
/obj/structure/curtain/cloth/grey,
/obj/effect/turf_decal/corner/transparent/grey/diagonal,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/machinery/light/small/broken/directional/north,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/powerpuzzle)
@@ -3273,7 +3273,7 @@
/obj/structure/bed,
/obj/structure/curtain/cloth/grey,
/obj/effect/turf_decal/corner/transparent/grey/diagonal,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/machinery/light/small/broken/directional/south,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/powerpuzzle)
@@ -3546,7 +3546,7 @@
dir = 4
},
/obj/structure/closet/crate/secure,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/powerpuzzle)
"VV" = (
@@ -3589,7 +3589,7 @@
dir = 6
},
/obj/structure/table,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
/obj/structure/noticeboard{
pixel_x = -15;
pixel_y = 32
@@ -3647,7 +3647,7 @@
/obj/structure/railing{
dir = 6
},
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/powerpuzzle/engineering)
"Xj" = (
@@ -3692,7 +3692,7 @@
dir = 5
},
/obj/structure/closet/crate/secure,
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/maintenance/four,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/powerpuzzle)
"Yr" = (
diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
index c5acb2629e09..6b75031ae8ba 100644
--- a/_maps/RandomRuins/SpaceRuins/spacemall.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
@@ -708,7 +708,7 @@
/area/ruin/space/has_grav/spacemall/dorms)
"cO" = (
/obj/effect/turf_decal/box,
-/obj/effect/spawner/random/salvage_machine,
+/obj/effect/spawner/lootdrop/salvage_machine,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shuttle)
"cP" = (
@@ -1296,9 +1296,9 @@
"eS" = (
/obj/structure/rack,
/obj/effect/turf_decal/corner/transparent/black/diagonal,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
"eU" = (
@@ -1306,7 +1306,7 @@
pixel_y = -30
},
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/wood,
/area/ruin/space/has_grav/spacemall/dorms)
"eV" = (
@@ -1323,7 +1323,7 @@
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
"eX" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/obj/effect/turf_decal/corner/transparent/green/diagonal,
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 8
@@ -1391,7 +1391,7 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/stack/cable_coil/random/five,
-/obj/effect/spawner/random/techstorage/engineering,
+/obj/effect/spawner/lootdrop/techstorage/engineering,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/maint)
"fi" = (
@@ -1399,8 +1399,8 @@
dir = 2
},
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
"fl" = (
@@ -1655,7 +1655,7 @@
/area/ruin/space/has_grav/spacemall/dorms)
"gu" = (
/obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
/obj/effect/turf_decal/corner/transparent/black/diagonal,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
@@ -2516,9 +2516,9 @@
"jD" = (
/obj/effect/turf_decal/box,
/obj/structure/closet/crate/secure,
-/obj/effect/spawner/random/clothing/costume,
-/obj/effect/spawner/random/clothing/costume,
-/obj/effect/spawner/random/clothing/costume,
+/obj/effect/spawner/lootdrop/costume,
+/obj/effect/spawner/lootdrop/costume,
+/obj/effect/spawner/lootdrop/costume,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shuttle)
"jE" = (
@@ -3111,7 +3111,7 @@
/obj/effect/decal/cleanable/cobweb,
/obj/effect/turf_decal/box,
/obj/structure/closet/crate/wooden,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/maint)
"lR" = (
@@ -3255,7 +3255,7 @@
"mJ" = (
/obj/structure/rack,
/obj/machinery/light/small/directional/north,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
"mK" = (
@@ -3638,7 +3638,7 @@
/area/ruin/space/has_grav/spacemall/dorms)
"ob" = (
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
"od" = (
@@ -4048,7 +4048,7 @@
/area/ruin/space/has_grav/spacemall)
"pB" = (
/obj/effect/decal/cleanable/ash,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
/obj/structure/closet/crate,
/obj/structure/railing,
@@ -5749,7 +5749,7 @@
"vp" = (
/obj/structure/rack,
/obj/effect/turf_decal/corner/transparent/black/diagonal,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
"vs" = (
@@ -5866,7 +5866,7 @@
/area/ruin/space/has_grav/spacemall/shop2)
"vS" = (
/obj/structure/rack,
-/obj/effect/spawner/random/medical/beaker,
+/obj/effect/spawner/lootdrop/beaker_loot_spawner,
/obj/effect/turf_decal/corner/opaque/blue/diagonal,
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/spacemall/shop2)
@@ -6451,8 +6451,8 @@
/obj/structure/closet/crate/secure,
/obj/effect/turf_decal/box,
/obj/structure/railing,
-/obj/effect/spawner/random/exotic/prison_contraband,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/prison_contraband,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/maint)
"yk" = (
@@ -6524,7 +6524,7 @@
/obj/structure/closet/crate/trashcart,
/obj/item/trash/popcorn,
/obj/item/trash/candy,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shuttle)
"yF" = (
@@ -6666,7 +6666,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shuttle)
"yZ" = (
@@ -6964,9 +6964,9 @@
"Ag" = (
/obj/structure/rack,
/obj/effect/turf_decal/corner/transparent/black/diagonal,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/circuit/computer/common,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/lootdrop/random_computer_circuit_common,
/obj/item/research_notes/loot,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
@@ -7269,9 +7269,9 @@
"Bq" = (
/obj/effect/turf_decal/box,
/obj/structure/closet/crate/secure,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shuttle)
"Bu" = (
@@ -7469,7 +7469,7 @@
dir = 10
},
/obj/structure/spider/stickyweb,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/maint)
"Cv" = (
@@ -7631,7 +7631,7 @@
/area/ruin/space/has_grav/spacemall)
"CR" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/effect/decal/cleanable/blood,
/obj/item/reagent_containers/food/snacks/spiderling{
pixel_y = 5;
@@ -8230,9 +8230,9 @@
/turf/open/floor/eighties,
/area/ruin/space/has_grav/spacemall/shop2)
"EI" = (
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick,
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
"EJ" = (
@@ -9438,7 +9438,7 @@
/area/ruin/space/has_grav/spacemall)
"JE" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/wood,
/area/ruin/space/has_grav/spacemall/dorms)
"JF" = (
@@ -9569,7 +9569,7 @@
"Kl" = (
/obj/effect/decal/cleanable/robot_debris/old,
/obj/structure/closet/crate/wooden,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/maint)
"Kn" = (
@@ -9999,9 +9999,9 @@
"LS" = (
/obj/structure/rack,
/obj/effect/turf_decal/corner/transparent/black/diagonal,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/circuit/computer/common,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/lootdrop/random_computer_circuit_common,
/obj/machinery/firealarm/directional/north,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
@@ -10056,9 +10056,9 @@
/area/ruin/space/has_grav/spacemall/dorms)
"Mb" = (
/obj/effect/decal/cleanable/greenglow,
-/obj/effect/spawner/random/medical/prosthetic,
-/obj/effect/spawner/random/medical/memeorgans,
-/obj/effect/spawner/random/medical/memeorgans,
+/obj/effect/spawner/lootdrop/random_prosthetic,
+/obj/effect/spawner/lootdrop/memeorgans,
+/obj/effect/spawner/lootdrop/memeorgans,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 4
},
@@ -11266,7 +11266,7 @@
/area/ruin/space/has_grav/spacemall)
"Qf" = (
/obj/structure/rack,
-/obj/effect/spawner/random/engineering/tool/common,
+/obj/effect/spawner/lootdrop/tool_engie_common,
/obj/effect/turf_decal/corner/transparent/black/diagonal,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
@@ -11297,7 +11297,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
"Qn" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/obj/effect/turf_decal/corner/transparent/green/diagonal,
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 8
@@ -11311,7 +11311,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/maint)
"Qu" = (
@@ -11865,7 +11865,7 @@
/area/ruin/space/has_grav/spacemall/maint)
"SD" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/item/toy/plush/slimeplushie{
pixel_y = -4;
pixel_x = 4
@@ -12218,7 +12218,7 @@
/obj/structure/rack,
/obj/effect/turf_decal/corner/transparent/black/diagonal,
/obj/machinery/light/directional/east,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
"TZ" = (
@@ -12290,10 +12290,10 @@
"Ul" = (
/obj/effect/turf_decal/box,
/obj/structure/closet/crate/engineering/electrical,
-/obj/effect/spawner/random/techstorage,
-/obj/effect/spawner/random/techstorage,
-/obj/effect/spawner/random/stockparts,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/techstorage,
+/obj/effect/spawner/lootdrop/techstorage,
+/obj/effect/spawner/lootdrop/stockparts,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shuttle)
"Um" = (
@@ -12606,7 +12606,7 @@
},
/obj/structure/closet/crate,
/obj/structure/catwalk/over/plated_catwalk,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
"Vr" = (
@@ -12655,8 +12655,8 @@
"VA" = (
/obj/structure/rack,
/obj/structure/window/reinforced/spawner,
-/obj/effect/spawner/random/medical/beaker,
-/obj/effect/spawner/random/medical/beaker,
+/obj/effect/spawner/lootdrop/beaker_loot_spawner,
+/obj/effect/spawner/lootdrop/beaker_loot_spawner,
/obj/effect/turf_decal/corner/opaque/blue/diagonal,
/obj/item/clothing/neck/stethoscope,
/turf/open/floor/plasteel/white,
@@ -13459,7 +13459,7 @@
dir = 2
},
/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/turf_decal/box,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm
index 50d9986ea756..e1a64004decb 100644
--- a/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm
+++ b/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm
@@ -612,7 +612,7 @@
/area/ruin/wasteplanet/abandoned_mechbay/mainhall)
"fX" = (
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/maintenance/four,
/obj/machinery/light/dim/directional/south,
/turf/open/floor/plasteel/dark,
/area/ruin/wasteplanet/abandoned_mechbay/bay2)
@@ -1084,8 +1084,8 @@
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/item/mop,
/obj/item/reagent_containers/glass/bucket,
-/obj/effect/spawner/random/maintenance/two,
-/obj/effect/spawner/random/clothing/costume,
+/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/lootdrop/costume,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/tech/grid,
/area/ruin/wasteplanet/abandoned_mechbay/crewquarters)
@@ -1445,7 +1445,7 @@
"qH" = (
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/maintenance/six,
+/obj/effect/spawner/lootdrop/maintenance/six,
/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill,
/turf/open/floor/plasteel/dark,
/area/ruin/wasteplanet/abandoned_mechbay/bay2)
@@ -2278,7 +2278,7 @@
/area/ruin/wasteplanet/abandoned_mechbay/mainhall)
"Bg" = (
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/maintenance/four,
/obj/effect/turf_decal/box/white,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plasteel/tech/grid,
@@ -2360,13 +2360,13 @@
/area/ruin/wasteplanet/abandoned_mechbay/bay2)
"BF" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/machinery/light/small/directional/north,
/obj/effect/decal/cleanable/food/salt,
@@ -2411,7 +2411,7 @@
"Cp" = (
/obj/structure/table,
/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/spawner/random/materials,
+/obj/effect/spawner/lootdrop/materials,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/twenty,
/turf/open/floor/plasteel/tech/grid,
@@ -3424,7 +3424,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"Oj" = (
/obj/structure/table,
-/obj/effect/spawner/random/clothing/pirate_or_bandana,
+/obj/effect/spawner/lootdrop/minor/pirate_or_bandana,
/turf/open/floor/plasteel,
/area/ruin/wasteplanet/abandoned_mechbay/crewquarters)
"Om" = (
@@ -3933,7 +3933,7 @@
"Vx" = (
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill,
/turf/open/floor/plasteel/dark,
/area/ruin/wasteplanet/abandoned_mechbay/bay2)
diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
index bdfc9c75a4a1..dba9f5e3c3c9 100644
--- a/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
+++ b/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
@@ -699,7 +699,7 @@
/turf/open/floor/plating/rust,
/area/ruin/powered)
"HW" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/turf/open/floor/plating,
/area/ruin/powered)
"Ie" = (
diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm
index 83c587268b34..c865138fb568 100644
--- a/_maps/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm
+++ b/_maps/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm
@@ -1806,10 +1806,10 @@
/obj/effect/turf_decal/industrial/warning/full,
/obj/structure/closet/crate,
/obj/machinery/light/small/broken/directional/south,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/turf/open/floor/pod/dark,
/area/ruin/wasteplanet/tradepost/warehouse)
"ug" = (
diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_yard.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_yard.dmm
index e3e0c20ef75f..a53934c91013 100644
--- a/_maps/RandomRuins/WasteRuins/wasteplanet_yard.dmm
+++ b/_maps/RandomRuins/WasteRuins/wasteplanet_yard.dmm
@@ -152,10 +152,10 @@
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/turf/open/floor/plasteel/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/ship)
"bB" = (
@@ -1542,10 +1542,10 @@
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/machinery/light/small/broken/directional/south,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/turf/open/floor/plasteel/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/ship)
"rd" = (
@@ -1965,8 +1965,8 @@
/area/ruin/wasteplanet/wasteplanet_shipbreaking/canteen)
"wc" = (
/obj/structure/closet/secure_closet/freezer/fridge,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/machinery/light/small/directional/west,
/obj/effect/turf_decal/corner/transparent/neutral/mono,
/obj/effect/turf_decal/corner/transparent/blue/border{
@@ -4045,7 +4045,7 @@
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/machinery/light/small/broken/directional/west,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
/turf/open/floor/plasteel/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/ship)
"Zy" = (
diff --git a/_maps/outpost/hangar/nt_asteroid_40x20.dmm b/_maps/outpost/hangar/nt_asteroid_40x20.dmm
index ab49a101ee1e..312e0443aeea 100644
--- a/_maps/outpost/hangar/nt_asteroid_40x20.dmm
+++ b/_maps/outpost/hangar/nt_asteroid_40x20.dmm
@@ -383,7 +383,7 @@
},
/area/hangar)
"kU" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/item/stack/sheet/mineral/wood{
pixel_x = -6
},
@@ -392,7 +392,7 @@
pixel_y = 7
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/item/stack/sheet/mineral/wood{
pixel_x = -6
},
@@ -861,7 +861,7 @@
},
/area/hangar)
"vh" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating{
planetary_atmos = 1
diff --git a/_maps/outpost/hangar/nt_asteroid_40x40.dmm b/_maps/outpost/hangar/nt_asteroid_40x40.dmm
index eab944babc1c..005b657e38ee 100644
--- a/_maps/outpost/hangar/nt_asteroid_40x40.dmm
+++ b/_maps/outpost/hangar/nt_asteroid_40x40.dmm
@@ -1070,7 +1070,10 @@
/area/hangar)
"NE" = (
/obj/structure/catwalk/over/plated_catwalk,
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick{
+ pixel_x = 5;
+ pixel_y = 9
+ },
/turf/open/floor/plating{
planetary_atmos = 1
},
@@ -1330,7 +1333,7 @@
/obj/structure/catwalk/over/plated_catwalk,
/obj/item/stack/cable_coil/cut/yellow,
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating{
icon_state = "panelscorched";
planetary_atmos = 1
diff --git a/_maps/outpost/hangar/nt_asteroid_56x20.dmm b/_maps/outpost/hangar/nt_asteroid_56x20.dmm
index 070f2a949044..11ba5baac070 100644
--- a/_maps/outpost/hangar/nt_asteroid_56x20.dmm
+++ b/_maps/outpost/hangar/nt_asteroid_56x20.dmm
@@ -106,7 +106,7 @@
/area/hangar)
"cz" = (
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating{
planetary_atmos = 1
},
@@ -1024,8 +1024,8 @@
/area/hangar)
"MI" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/light/directional/east,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark{
@@ -1254,7 +1254,10 @@
/area/hangar)
"Wp" = (
/obj/structure/catwalk/over/plated_catwalk,
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick{
+ pixel_x = 5;
+ pixel_y = 9
+ },
/turf/open/floor/plating{
icon_state = "panelscorched";
planetary_atmos = 1
diff --git a/_maps/outpost/hangar/nt_asteroid_56x40.dmm b/_maps/outpost/hangar/nt_asteroid_56x40.dmm
index 020ab48b8d9f..5d66d8966d0b 100644
--- a/_maps/outpost/hangar/nt_asteroid_56x40.dmm
+++ b/_maps/outpost/hangar/nt_asteroid_56x40.dmm
@@ -277,8 +277,8 @@
/area/hangar)
"lZ" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/light/directional/east,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark{
@@ -806,7 +806,7 @@
/area/hangar)
"Hs" = (
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating{
planetary_atmos = 1
},
@@ -963,7 +963,10 @@
/area/hangar)
"KT" = (
/obj/structure/catwalk/over/plated_catwalk,
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick{
+ pixel_x = 5;
+ pixel_y = 9
+ },
/turf/open/floor/plating{
icon_state = "panelscorched";
planetary_atmos = 1
diff --git a/_maps/outpost/indie_space.dmm b/_maps/outpost/indie_space.dmm
index b10b86822c8c..86a2a8d102b1 100644
--- a/_maps/outpost/indie_space.dmm
+++ b/_maps/outpost/indie_space.dmm
@@ -113,7 +113,7 @@
/obj/effect/turf_decal/spline/fancy/opaque/lightgrey{
dir = 8
},
-/obj/effect/spawner/random/entertainment/plushie{
+/obj/effect/spawner/lootdrop/plushie{
pixel_x = 16;
pixel_y = 4
},
@@ -270,7 +270,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 10
},
-/obj/effect/spawner/random/salvage/metal,
+/obj/effect/spawner/lootdrop/salvage/metal,
/turf/open/floor/plasteel/tech/techmaint,
/area/outpost/maintenance/central)
"bL" = (
@@ -287,7 +287,7 @@
/turf/open/floor/plasteel,
/area/outpost/hallway/port)
"bS" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/turf_decal/corner_techfloor_grid{
dir = 8
},
@@ -346,7 +346,7 @@
/turf/open/floor/plasteel,
/area/outpost/hallway/central)
"ci" = (
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
@@ -481,7 +481,7 @@
/turf/open/floor/plasteel,
/area/outpost/vacant_rooms)
"dl" = (
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/obj/effect/turf_decal/steeldecal/steel_decals7{
dir = 9
},
@@ -958,7 +958,7 @@
/turf/open/floor/plasteel/mono,
/area/outpost/vacant_rooms)
"gz" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/obj/item/radio/intercom/directional/east,
/obj/effect/turf_decal/spline/fancy/opaque/lightgrey{
dir = 1
@@ -1001,7 +1001,7 @@
/turf/open/floor/plating,
/area/outpost/maintenance/central)
"gS" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"gT" = (
@@ -1078,7 +1078,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/outpost/maintenance/central)
"hz" = (
@@ -1126,8 +1126,8 @@
/area/outpost/hallway/port)
"hK" = (
/obj/structure/rack,
-/obj/effect/spawner/random/salvage_laser,
-/obj/effect/spawner/random/salvage_capacitor,
+/obj/effect/spawner/lootdrop/salvage_laser,
+/obj/effect/spawner/lootdrop/salvage_capacitor,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"hM" = (
@@ -1188,7 +1188,7 @@
/area/outpost/maintenance/central)
"hZ" = (
/obj/structure/table/wood,
-/obj/effect/spawner/random/food_or_drink/donut,
+/obj/effect/spawner/lootdrop/donut,
/turf/open/floor/wood,
/area/outpost/crew/bar)
"ib" = (
@@ -1269,7 +1269,7 @@
/turf/open/floor/wood,
/area/outpost/crew/library)
"iD" = (
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"iG" = (
@@ -1350,7 +1350,7 @@
/area/outpost/crew/bar)
"jn" = (
/obj/structure/table,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/outpost/maintenance/central)
@@ -1430,7 +1430,7 @@
/turf/open/floor/plasteel/tech,
/area/outpost/hallway/central)
"jM" = (
-/obj/effect/spawner/random/chicken,
+/obj/effect/spawner/lootdrop/chicken,
/turf/open/floor/ship/dirt,
/area/outpost/hallway/port)
"jO" = (
@@ -1703,7 +1703,7 @@
/area/outpost/maintenance/central)
"lA" = (
/obj/structure/flora/grass/jungle,
-/obj/effect/spawner/random/chicken,
+/obj/effect/spawner/lootdrop/chicken,
/turf/open/floor/grass/ship/jungle,
/area/outpost/hallway/central)
"lB" = (
@@ -1858,7 +1858,7 @@
/area/outpost/hallway/central)
"mv" = (
/obj/structure/rack,
-/obj/effect/spawner/random/clothing/kittyears_or_rabbitears,
+/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
/obj/effect/decal/cleanable/wrapping,
/turf/open/floor/plasteel/mono,
/area/outpost/vacant_rooms)
@@ -2597,8 +2597,8 @@
/area/outpost/maintenance/fore)
"rp" = (
/obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/maintenance/seven,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/maintenance/seven,
/turf/open/floor/plasteel/mono,
/area/outpost/vacant_rooms)
"rr" = (
@@ -2670,7 +2670,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
@@ -2782,7 +2782,7 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
},
@@ -2988,9 +2988,9 @@
/area/outpost/crew/library)
"ta" = (
/obj/structure/rack,
-/obj/effect/spawner/random/clothing/twentyfive_percent_cyborg_mask,
+/obj/effect/spawner/lootdrop/minor/twentyfive_percent_cyborg_mask,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/clothing/gloves,
+/obj/effect/spawner/lootdrop/gloves,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/mono,
/area/outpost/storage)
@@ -3160,7 +3160,7 @@
/area/outpost/cargo)
"tS" = (
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/maintenance/four,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"tT" = (
@@ -3324,7 +3324,7 @@
/turf/open/floor/ship/dirt,
/area/outpost/hallway/central)
"uE" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
@@ -3791,7 +3791,7 @@
/turf/open/floor/plasteel,
/area/outpost/hallway/port)
"xu" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
@@ -3884,7 +3884,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"xZ" = (
@@ -3968,7 +3968,7 @@
/area/outpost/crew/bar)
"yN" = (
/obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
/turf/open/floor/plasteel/mono,
/area/outpost/vacant_rooms)
"yQ" = (
@@ -4155,7 +4155,7 @@
/turf/open/floor/plating/asteroid,
/area/outpost/external)
"zS" = (
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/turf/open/floor/plating,
/area/outpost/maintenance/central)
"zY" = (
@@ -4208,7 +4208,7 @@
/turf/open/floor/plasteel/tech,
/area/outpost/maintenance/fore)
"Am" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/obj/effect/turf_decal/spline/fancy/opaque/lightgrey{
dir = 8
},
@@ -4858,8 +4858,8 @@
/area/outpost/hallway/port)
"DH" = (
/obj/structure/rack,
-/obj/effect/spawner/random/clothing/bowler_or_that,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/minor/bowler_or_that,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plasteel/mono,
/area/outpost/storage)
"DI" = (
@@ -4912,7 +4912,7 @@
/obj/effect/turf_decal/corner_techfloor_gray{
dir = 9
},
-/obj/effect/spawner/random/salvage/metal,
+/obj/effect/spawner/lootdrop/salvage/metal,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/tech/techmaint,
/area/outpost/maintenance/fore)
@@ -4984,7 +4984,7 @@
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"ER" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/outpost/maintenance/central)
"EV" = (
@@ -4995,7 +4995,7 @@
/area/outpost/crew/bar)
"EX" = (
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"Fa" = (
@@ -5189,7 +5189,7 @@
/turf/open/floor/plasteel/patterned/cargo_one,
/area/outpost/vacant_rooms/office)
"Gj" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -5222,7 +5222,7 @@
/area/outpost/external)
"Gn" = (
/obj/structure/rack,
-/obj/effect/spawner/random/clothing/bowler_or_that,
+/obj/effect/spawner/lootdrop/minor/bowler_or_that,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"Gu" = (
@@ -5394,7 +5394,7 @@
/area/outpost/hallway/central)
"Hk" = (
/obj/structure/rack,
-/obj/effect/spawner/random/clothing/beret_or_rabbitears,
+/obj/effect/spawner/lootdrop/minor/beret_or_rabbitears,
/obj/machinery/light/dim/directional/west,
/turf/open/floor/plasteel/mono,
/area/outpost/storage)
@@ -5853,7 +5853,7 @@
/area/outpost/cargo/office)
"JV" = (
/obj/structure/rack,
-/obj/effect/spawner/random/clothing/pirate_or_bandana,
+/obj/effect/spawner/lootdrop/minor/pirate_or_bandana,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/mono,
@@ -6213,8 +6213,8 @@
/turf/open/floor/wood,
/area/outpost/crew/library)
"LR" = (
-/obj/effect/spawner/random/engineering/tool/common,
-/obj/effect/spawner/random/engineering/tool/common,
+/obj/effect/spawner/lootdrop/tool_engie_common,
+/obj/effect/spawner/lootdrop/tool_engie_common,
/obj/structure/rack,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
@@ -6454,7 +6454,7 @@
/area/outpost/cargo/office)
"No" = (
/obj/structure/table,
-/obj/effect/spawner/random/food_or_drink/donut/jelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
/obj/effect/turf_decal/floordetail/tiled,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/outpost/security)
@@ -6531,7 +6531,7 @@
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
/obj/item/reagent_containers/food/snacks/grown/citrus/orange,
-/obj/effect/spawner/random/salvage_capacitor,
+/obj/effect/spawner/lootdrop/salvage_capacitor,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"NV" = (
@@ -6718,7 +6718,7 @@
/area/outpost/crew/cryo)
"Pw" = (
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/maintenance/four,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/outpost/vacant_rooms/office)
"Px" = (
@@ -6914,8 +6914,8 @@
/area/outpost/maintenance/fore)
"Qx" = (
/obj/structure/rack,
-/obj/effect/spawner/random/clothing/bowler_or_that,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/minor/bowler_or_that,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plasteel/mono,
/area/outpost/storage)
"QA" = (
@@ -7079,7 +7079,7 @@
/obj/structure/cable/yellow{
icon_state = "4-6"
},
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/obj/effect/turf_decal/corner_techfloor_gray{
dir = 10
},
@@ -7166,7 +7166,7 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"RJ" = (
@@ -7390,8 +7390,8 @@
/area/outpost/hallway/port)
"SW" = (
/obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plasteel/mono,
/area/outpost/vacant_rooms)
"SY" = (
@@ -7400,7 +7400,7 @@
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"Ta" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/oil,
/obj/effect/turf_decal/steeldecal/steel_decals9,
/turf/open/floor/plating,
@@ -7556,7 +7556,7 @@
/obj/effect/turf_decal/corner_techfloor_gray{
dir = 9
},
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/tech/techmaint,
/area/outpost/maintenance/fore)
@@ -7608,7 +7608,7 @@
/turf/open/floor/plating,
/area/outpost/maintenance/central)
"Uq" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/turf/open/floor/plasteel/tech/techmaint,
/area/outpost/hallway/port)
"Us" = (
@@ -7618,7 +7618,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -7789,7 +7789,7 @@
},
/obj/item/bedsheet/double/captain,
/obj/effect/decal/cleanable/greenglow,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/head/papersack/smiley{
pixel_x = 7
@@ -7897,7 +7897,7 @@
/turf/open/floor/carpet/green,
/area/outpost/crew/bar)
"Wa" = (
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/mouse/brown,
/turf/open/floor/plating,
@@ -8004,7 +8004,7 @@
/turf/open/floor/plasteel,
/area/outpost/hallway/central)
"WO" = (
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"WR" = (
@@ -8029,7 +8029,7 @@
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"WV" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/obj/effect/turf_decal/spline/fancy/opaque/lightgrey{
dir = 1
},
@@ -8161,7 +8161,7 @@
/area/outpost/hallway/port)
"XA" = (
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/five,
+/obj/effect/spawner/lootdrop/maintenance/five,
/turf/open/floor/plasteel/mono,
/area/outpost/vacant_rooms)
"XD" = (
@@ -8332,7 +8332,7 @@
/turf/open/floor/plasteel/patterned,
/area/outpost/cargo)
"YC" = (
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/obj/structure/rack,
/obj/effect/turf_decal/steeldecal/steel_decals_central2{
dir = 4
@@ -8528,8 +8528,8 @@
/area/outpost/hallway/central)
"ZP" = (
/obj/structure/rack,
-/obj/effect/spawner/random/medical/surgery_tool/common,
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/tool_surgery_common,
+/obj/effect/spawner/lootdrop/maintenance/four,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/outpost/vacant_rooms/office)
"ZU" = (
diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm
index 179aa234e780..d5af45bfef2d 100644
--- a/_maps/outpost/nanotrasen_asteroid.dmm
+++ b/_maps/outpost/nanotrasen_asteroid.dmm
@@ -63,7 +63,7 @@
/area/outpost/hallway/starboard)
"aw" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/obj/machinery/light/small/broken/directional/south,
/turf/open/floor/plating/rust,
/area/outpost/maintenance/aft)
@@ -951,7 +951,7 @@
dir = 8
},
/obj/effect/turf_decal/box/corners,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/concrete/slab_1,
/area/outpost/hallway/central)
"dF" = (
@@ -1678,7 +1678,7 @@
dir = 8
},
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/item/paper/crumpled,
/turf/open/floor/concrete/slab_1,
/area/outpost/hallway/central)
@@ -1911,7 +1911,7 @@
/turf/closed/mineral/random/snow,
/area/outpost/crew/cryo)
"hd" = (
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plating,
/area/outpost/maintenance/aft)
"he" = (
@@ -2178,7 +2178,7 @@
/area/outpost/crew/bar)
"im" = (
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/structure/grille/broken,
/turf/open/floor/plating{
icon_state = "foam_plating"
@@ -2337,7 +2337,7 @@
/area/outpost/vacant_rooms)
"iW" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/structure/sign/poster/contraband/random{
pixel_x = 32;
pixel_y = -32
@@ -5481,7 +5481,7 @@
/turf/open/floor/plasteel/dark,
/area/outpost/operations)
"tD" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating{
icon_state = "panelscorched"
@@ -6814,7 +6814,7 @@
"xV" = (
/obj/machinery/light/dim/directional/south,
/obj/structure/closet/cardboard,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"xW" = (
@@ -6990,7 +6990,7 @@
},
/area/outpost/maintenance/fore)
"yE" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating{
icon_state = "platingdmg1"
},
@@ -7386,7 +7386,7 @@
/area/outpost/engineering/atmospherics)
"zY" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/rust,
/area/outpost/maintenance/aft)
"zZ" = (
@@ -7614,7 +7614,7 @@
icon_state = "box_corners";
dir = 8
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/machinery/airalarm/directional/west,
/turf/open/floor/concrete/slab_1,
/area/outpost/hallway/central)
@@ -7899,7 +7899,7 @@
"BI" = (
/obj/machinery/door/window/brigdoor/southright,
/obj/structure/rack,
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick,
/turf/open/floor/concrete/tiles,
/area/outpost/hallway/central)
"BJ" = (
@@ -10357,7 +10357,7 @@
/obj/effect/turf_decal/box/corners{
dir = 4
},
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/concrete/slab_1,
/area/outpost/hallway/central)
"Kj" = (
@@ -10560,7 +10560,7 @@
/area/outpost/hallway/starboard)
"KW" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/outpost/maintenance/aft)
"KX" = (
@@ -11767,7 +11767,7 @@
"Pb" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/item/stack/sheet/mineral/wood{
pixel_x = -6
},
@@ -12080,7 +12080,7 @@
/obj/effect/turf_decal/box/corners{
dir = 4
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/item/paperplane,
/obj/item/radio/intercom/directional/south,
/obj/machinery/firealarm/directional/south,
@@ -12344,7 +12344,7 @@
"Ra" = (
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"Rc" = (
@@ -12447,7 +12447,7 @@
/area/outpost/maintenance/aft)
"Ru" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plating{
icon_state = "panelscorched"
},
@@ -12633,7 +12633,7 @@
"RZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/item/stack/rods/ten{
pixel_x = 9
},
@@ -12648,7 +12648,7 @@
/area/outpost/crew/canteen)
"Sd" = (
/obj/structure/grille/broken,
-/obj/effect/spawner/random/clothing/pirate_or_bandana,
+/obj/effect/spawner/lootdrop/minor/pirate_or_bandana,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"Se" = (
@@ -12868,8 +12868,8 @@
"Tc" = (
/obj/structure/closet/crate/trashcart/laundry,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/maintenance/two,
-/obj/effect/spawner/random/clothing/kittyears_or_rabbitears,
+/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
/obj/structure/grille/broken,
/obj/effect/turf_decal/box/white,
/turf/open/floor/plating{
@@ -13743,7 +13743,7 @@
/area/outpost/hallway/central)
"Wj" = (
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/concrete/slab_1,
/area/outpost/hallway/central)
"Wn" = (
@@ -14038,7 +14038,7 @@
/obj/structure/railing{
layer = 3.1
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/item/trash/can{
pixel_x = -8;
pixel_y = -6
diff --git a/_maps/outpost/nanotrasen_ice.dmm b/_maps/outpost/nanotrasen_ice.dmm
index cfd32ad951ae..70fb809c4c95 100644
--- a/_maps/outpost/nanotrasen_ice.dmm
+++ b/_maps/outpost/nanotrasen_ice.dmm
@@ -943,7 +943,7 @@
"gO" = (
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/obj/structure/sign/poster/retro/random{
pixel_x = -32
},
@@ -1168,7 +1168,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/rack,
/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/maintenance/four,
/turf/open/floor/plasteel/tech,
/area/outpost/vacant_rooms/shop)
"iH" = (
@@ -1809,7 +1809,7 @@
"mV" = (
/obj/structure/rack,
/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plasteel/tech,
/area/outpost/vacant_rooms/shop)
"na" = (
@@ -2177,7 +2177,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
/obj/structure/grille/broken,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plating,
/area/outpost/maintenance/starboard)
"oF" = (
@@ -3267,7 +3267,7 @@
/area/outpost/maintenance/fore)
"vn" = (
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/small/directional/south,
/turf/open/floor/plating{
@@ -3476,7 +3476,7 @@
/area/outpost/engineering/atmospherics)
"wD" = (
/obj/structure/grille/broken,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/structure/spider/stickyweb,
/obj/machinery/light/small/directional/east,
/turf/open/floor/plating/rust,
@@ -4002,7 +4002,7 @@
/obj/structure/flora/grass/both{
layer = 3.1
},
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/asteroid/snow/temperatre{
light_color = "#1B1D2E";
light_range = 2
@@ -4396,7 +4396,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/item/trash/sosjerky,
/obj/item/trash/can,
/turf/open/floor/plasteel/patterned/brushed{
@@ -4552,7 +4552,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/maintenance/four,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
@@ -4840,7 +4840,7 @@
dir = 5
},
/obj/item/trash/chips,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/item/trash/candy,
/turf/open/floor/wood/walnut,
/area/outpost/crew/bar)
@@ -6062,7 +6062,7 @@
"PN" = (
/obj/structure/rack,
/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/tech,
/area/outpost/vacant_rooms/shop)
"PT" = (
@@ -7551,7 +7551,7 @@
/obj/structure/flora/grass/green{
layer = 3.1
},
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/asteroid/snow/temperatre{
light_color = "#1B1D2E";
light_range = 2
@@ -7688,7 +7688,7 @@
layer = 3.1
},
/obj/item/shard,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/asteroid/snow/temperatre{
light_color = "#1B1D2E";
light_range = 2
diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm
index ddbcfba512b3..c283c0d21584 100644
--- a/_maps/shuttles/independent/independent_beluga.dmm
+++ b/_maps/shuttles/independent/independent_beluga.dmm
@@ -1090,7 +1090,7 @@
pixel_y = -32
},
/obj/item/storage/bag/tray,
-/obj/effect/spawner/random/food_or_drink/ration{
+/obj/effect/spawner/lootdrop/ration{
pixel_x = 6;
pixel_y = 6
},
@@ -2631,7 +2631,7 @@
"zh" = (
/obj/structure/bed,
/obj/structure/curtain/cloth/grey,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/machinery/light/directional/south,
/turf/open/floor/wood,
/area/ship/crew/dorm)
@@ -3425,7 +3425,7 @@
/area/ship/crew/canteen)
"Hq" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/curtain/bounty,
/obj/structure/sign/poster/official/ian{
pixel_x = 32
@@ -3803,7 +3803,7 @@
"Kc" = (
/obj/structure/bed,
/obj/structure/curtain/cloth/grey,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/machinery/light_switch{
pixel_x = -8;
pixel_y = -20;
@@ -3827,7 +3827,7 @@
/area/ship/crew)
"Ko" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/curtain/bounty,
/turf/open/floor/carpet/red,
/area/ship/crew)
@@ -4118,7 +4118,7 @@
"Nv" = (
/obj/structure/bed,
/obj/structure/curtain/cloth/grey,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/wood,
/area/ship/crew/dorm)
"Nw" = (
diff --git a/_maps/shuttles/independent/independent_box.dmm b/_maps/shuttles/independent/independent_box.dmm
index f64c84ca5b33..31891a371d8c 100644
--- a/_maps/shuttles/independent/independent_box.dmm
+++ b/_maps/shuttles/independent/independent_box.dmm
@@ -711,7 +711,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/crew/toilet)
"cG" = (
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/obj/structure/closet/emcloset/anchored,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
@@ -968,7 +968,7 @@
dir = 8
},
/obj/structure/bed/pod,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/carpet/blue,
/area/ship/crew)
"dr" = (
@@ -1162,7 +1162,7 @@
/obj/structure/sign/poster/official/help_others{
pixel_x = -32
},
-/obj/effect/spawner/random/medical/surgery_tool/adv,
+/obj/effect/spawner/lootdrop/tool_surgery_adv,
/obj/item/megaphone/command,
/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 4
@@ -1421,7 +1421,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/medical)
"mx" = (
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/curtain/bounty,
/obj/effect/turf_decal/siding/wood/corner{
dir = 4
@@ -1460,10 +1460,10 @@
/area/ship/medical)
"nA" = (
/obj/structure/table,
-/obj/effect/spawner/random/food_or_drink/ration{
+/obj/effect/spawner/lootdrop/ration{
pixel_y = 3
},
-/obj/effect/spawner/random/food_or_drink/ration{
+/obj/effect/spawner/lootdrop/ration{
pixel_x = -5;
pixel_y = 3
},
@@ -2022,7 +2022,7 @@
/obj/item/circuitboard/machine/chem_master,
/obj/item/reagent_containers/glass/beaker/large,
/obj/item/stack/sheet/glass/two,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/item/trash/can/food/beans,
/turf/open/floor/plasteel/white,
/area/ship/medical)
@@ -2165,7 +2165,7 @@
/obj/item/vending_refill/medical,
/obj/item/screwdriver,
/obj/machinery/airalarm/directional/south,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plasteel/white,
/area/ship/cargo)
"Cn" = (
@@ -2808,7 +2808,7 @@
/obj/structure/cable/yellow{
icon_state = "0-10"
},
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/obj/structure/rack,
/obj/item/areaeditor/shuttle,
/obj/item/flashlight{
diff --git a/_maps/shuttles/independent/independent_bubble.dmm b/_maps/shuttles/independent/independent_bubble.dmm
index 298a919bbaa7..08fd116f2536 100644
--- a/_maps/shuttles/independent/independent_bubble.dmm
+++ b/_maps/shuttles/independent/independent_bubble.dmm
@@ -248,7 +248,7 @@
/turf/open/floor/plasteel/mono,
/area/ship/hallway/central)
"jr" = (
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/bed,
/obj/structure/curtain/bounty,
/obj/effect/turf_decal/siding/wood{
@@ -905,7 +905,7 @@
/turf/open/floor/plating,
/area/ship/engineering)
"LK" = (
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/bed,
/obj/structure/curtain/bounty,
/obj/effect/turf_decal/siding/wood{
@@ -1228,7 +1228,7 @@
/turf/open/floor/plasteel,
/area/ship/engineering)
"Yi" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/structure/closet/firecloset/full,
/turf/open/floor/plating,
/area/ship/maintenance/port)
diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm
index 9d36cb61c748..7f8e7b569c68 100644
--- a/_maps/shuttles/independent/independent_dwayne.dmm
+++ b/_maps/shuttles/independent/independent_dwayne.dmm
@@ -257,7 +257,7 @@
/obj/structure/closet/crate,
/obj/machinery/firealarm/directional/north,
/obj/item/circuitboard/machine/pipedispenser,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/cargo)
"dh" = (
@@ -1442,7 +1442,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/cargo)
"vj" = (
@@ -1584,7 +1584,7 @@
},
/obj/machinery/light/directional/west,
/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/cargo)
"yu" = (
@@ -1889,7 +1889,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/large,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/cargo)
"Ds" = (
@@ -2083,7 +2083,7 @@
/area/ship/external/dark)
"Gl" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/machinery/airalarm/directional/east,
/obj/item/radio/intercom/directional/south,
/turf/open/floor/carpet,
@@ -2213,7 +2213,7 @@
"Is" = (
/obj/structure/closet/crate/science,
/obj/item/paicard,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/ship/cargo)
"IF" = (
@@ -2301,7 +2301,7 @@
/area/ship/storage/eva)
"JH" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/cable/yellow{
icon_state = "4-10"
},
@@ -2433,10 +2433,10 @@
/obj/structure/closet/secure_closet/freezer/wall/directional/south{
name = "kitchen cabinet"
},
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/storage/cans/sixbeer,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
@@ -2617,13 +2617,28 @@
/area/ship/storage/eva)
"NT" = (
/obj/structure/closet/cardboard,
-/obj/effect/spawner/random/decoration/glowstick,
-/obj/effect/spawner/random/decoration/glowstick,
-/obj/effect/spawner/random/decoration/glowstick,
-/obj/effect/spawner/random/decoration/glowstick,
-/obj/effect/spawner/random/decoration/glowstick,
-/obj/effect/spawner/random/decoration/glowstick,
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/lootdrop/glowstick{
+ pixel_y = 2
+ },
+/obj/effect/spawner/lootdrop/glowstick{
+ pixel_y = -3;
+ pixel_x = 7
+ },
+/obj/effect/spawner/lootdrop/glowstick{
+ pixel_x = -6
+ },
+/obj/effect/spawner/lootdrop/glowstick{
+ pixel_y = -3
+ },
+/obj/effect/spawner/lootdrop/glowstick{
+ pixel_x = 2;
+ pixel_y = 3
+ },
+/obj/effect/spawner/lootdrop/glowstick{
+ pixel_x = -4;
+ pixel_y = -4
+ },
/turf/open/floor/plating,
/area/ship/storage/eva)
"NW" = (
@@ -2736,11 +2751,11 @@
/obj/effect/turf_decal/corner/opaque/yellow/half,
/obj/structure/closet/crate/large,
/obj/effect/turf_decal/industrial/warning,
-/obj/effect/spawner/random/entertainment/plushie,
-/obj/effect/spawner/random/entertainment/plushie,
-/obj/effect/spawner/random/entertainment/plushie,
-/obj/effect/spawner/random/entertainment/plushie,
-/obj/effect/spawner/random/entertainment/plushie,
+/obj/effect/spawner/lootdrop/plushie,
+/obj/effect/spawner/lootdrop/plushie,
+/obj/effect/spawner/lootdrop/plushie,
+/obj/effect/spawner/lootdrop/plushie,
+/obj/effect/spawner/lootdrop/plushie,
/obj/structure/cable/cyan{
icon_state = "1-2"
},
@@ -3390,7 +3405,7 @@
/obj/item/trash/candy,
/obj/item/trash/sosjerky,
/obj/item/trash/can/food/beans,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/structure/cable/cyan{
icon_state = "2-5"
},
@@ -3458,7 +3473,7 @@
/area/ship/engineering)
"ZQ" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/carpet,
/area/ship/crew/dorm)
"ZR" = (
diff --git a/_maps/shuttles/independent/independent_junker.dmm b/_maps/shuttles/independent/independent_junker.dmm
index c7b7eb4ae673..0ae98ef37fe2 100644
--- a/_maps/shuttles/independent/independent_junker.dmm
+++ b/_maps/shuttles/independent/independent_junker.dmm
@@ -48,7 +48,7 @@
/area/ship/maintenance/port)
"aq" = (
/obj/item/trash/sosjerky,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/item/areaeditor/shuttle{
pixel_y = 7
},
@@ -67,7 +67,7 @@
/obj/item/storage/backpack/explorer,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/item/pickaxe/rusted,
/turf/open/floor/plating,
/area/ship/engineering/electrical)
@@ -75,7 +75,7 @@
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/broken/directional/north,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/obj/item/flashlight/pen,
/turf/open/floor/wood/walnut{
icon_state = "wood-broken"
@@ -399,7 +399,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plating,
/area/ship/engineering/electrical)
"hb" = (
@@ -857,7 +857,7 @@
"qm" = (
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/obj/item/reagent_containers/food/snacks/canned/peaches/maint,
/turf/open/floor/plating,
/area/ship/construction)
@@ -1232,7 +1232,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/effect/spawner/random/maintenance/eight,
+/obj/effect/spawner/lootdrop/maintenance/eight,
/obj/structure/safe/floor{
number_of_tumblers = 5
},
@@ -1610,7 +1610,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 6
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/ship/maintenance/port)
"Df" = (
@@ -1735,7 +1735,7 @@
/obj/item/reagent_containers/glass/bottle/welding_fuel,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/effect/decal/cleanable/cobweb,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plating,
/area/ship/storage/eva)
"Fz" = (
@@ -1808,7 +1808,7 @@
/area/ship/storage/eva)
"Hj" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/item/decal_painter,
/obj/item/storage/box/mousetraps,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -2034,7 +2034,7 @@
"JZ" = (
/obj/structure/rack,
/obj/machinery/light/small/broken/directional/west,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/obj/item/toner,
/obj/item/clothing/neck/stethoscope,
/turf/open/floor/plating,
@@ -2085,7 +2085,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/machinery/light/small/directional/north,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/wood/walnut{
icon_state = "wood-broken3"
},
@@ -2231,7 +2231,7 @@
dir = 1
},
/mob/living/simple_animal/hostile/cockroach/glockroach,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/light_switch{
dir = 8;
pixel_x = 20;
@@ -2487,7 +2487,7 @@
},
/obj/effect/decal/cleanable/sprayweb,
/obj/effect/decal/cleanable/cobweb,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/pod/light,
/area/ship/maintenance/aft)
"Wv" = (
@@ -2730,7 +2730,7 @@
/obj/structure/cable{
icon_state = "0-2"
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/ship/maintenance/port)
diff --git a/_maps/shuttles/independent/independent_kilo.dmm b/_maps/shuttles/independent/independent_kilo.dmm
index 7783dff02df5..43941169b66a 100644
--- a/_maps/shuttles/independent/independent_kilo.dmm
+++ b/_maps/shuttles/independent/independent_kilo.dmm
@@ -123,7 +123,7 @@
/turf/open/floor/plating,
/area/ship/hallway/port)
"bm" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"bn" = (
@@ -905,7 +905,7 @@
/area/ship/cargo)
"mz" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/machinery/light_switch{
pixel_x = 7;
pixel_y = 20
@@ -1212,9 +1212,9 @@
/obj/item/reagent_containers/food/drinks/soda_cans/cola,
/obj/item/reagent_containers/food/drinks/soda_cans/cola,
/obj/item/reagent_containers/food/drinks/soda_cans/cola,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/reagent_containers/food/snacks/icecreamsandwich,
/obj/item/reagent_containers/food/snacks/icecreamsandwich,
/obj/effect/turf_decal/corner/transparent/beige/full,
@@ -1789,7 +1789,7 @@
/obj/structure/cable/pink{
icon_state = "1-6"
},
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/machinery/light/directional/west,
/turf/open/floor/carpet,
/area/ship/crew/dorm)
diff --git a/_maps/shuttles/independent/independent_lagoon.dmm b/_maps/shuttles/independent/independent_lagoon.dmm
index 2855c6e0d686..5130aed76be3 100644
--- a/_maps/shuttles/independent/independent_lagoon.dmm
+++ b/_maps/shuttles/independent/independent_lagoon.dmm
@@ -4873,7 +4873,7 @@
/area/ship/hallway/aft)
"GN" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/effect/turf_decal/siding/wood{
dir = 4
},
@@ -6155,7 +6155,7 @@
/area/ship/hallway/port)
"QI" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/effect/turf_decal/siding/wood{
dir = 6
},
diff --git a/_maps/shuttles/independent/independent_mudskipper.dmm b/_maps/shuttles/independent/independent_mudskipper.dmm
index 676301c8271e..11d98b3c1475 100644
--- a/_maps/shuttles/independent/independent_mudskipper.dmm
+++ b/_maps/shuttles/independent/independent_mudskipper.dmm
@@ -1412,7 +1412,7 @@
/area/ship/hallway/aft)
"Ft" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/curtain/bounty,
/obj/machinery/light_switch{
dir = 1;
@@ -1727,10 +1727,10 @@
/obj/structure/closet/crate{
name = "ration crate"
},
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/reagent_containers/food/snacks/canned/beans,
/obj/item/reagent_containers/food/snacks/canned/beans,
/obj/item/reagent_containers/food/snacks/canned/beans,
@@ -1990,7 +1990,7 @@
/area/ship/crew/toilet)
"ST" = (
/obj/item/storage/cans/sixbeer,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
/obj/structure/closet/secure_closet/freezer{
anchored = 1;
name = "fridge"
@@ -2140,7 +2140,7 @@
/area/ship/engineering/engine)
"Vy" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/curtain/bounty,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/dim/directional/north,
diff --git a/_maps/shuttles/independent/independent_raleigh.dmm b/_maps/shuttles/independent/independent_raleigh.dmm
index 906af974bfe5..a6bff35f8dc7 100644
--- a/_maps/shuttles/independent/independent_raleigh.dmm
+++ b/_maps/shuttles/independent/independent_raleigh.dmm
@@ -714,12 +714,16 @@
/obj/structure/table,
/obj/effect/turf_decal/corner/opaque/yellow/mono,
/obj/structure/closet/wall/white/directional/east,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration{
+ pixel_y = 1
+ },
/obj/item/storage/cans/sixbeer,
/obj/item/storage/cans/sixbeer,
/obj/effect/decal/cleanable/food/flour,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration{
+ pixel_y = 1
+ },
/turf/open/floor/plasteel/mono/white,
/area/ship/crew/canteen)
"jc" = (
@@ -1032,7 +1036,7 @@
/area/ship/crew/ccommons)
"my" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/random,
/obj/structure/curtain/bounty,
/obj/item/toy/plush/flushed,
/turf/open/floor/carpet/green,
@@ -1051,7 +1055,7 @@
/area/ship/hallway/central)
"mE" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/random,
/obj/structure/curtain/bounty,
/obj/item/toy/plush/carpplushie,
/turf/open/floor/carpet/green,
@@ -1621,7 +1625,7 @@
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"tg" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/obj/effect/turf_decal/corner_steel_grid{
dir = 9
},
@@ -1847,7 +1851,7 @@
"ws" = (
/obj/structure/curtain/bounty,
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/random,
/turf/open/floor/carpet/green,
/area/ship/crew/dorm)
"wS" = (
@@ -4078,7 +4082,7 @@
dir = 8
},
/obj/structure/extinguisher_cabinet/directional/west,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"Wm" = (
@@ -4527,7 +4531,7 @@
"ZE" = (
/obj/structure/closet/crate,
/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/obj/machinery/light/small/directional/east,
/turf/open/floor/plating,
/area/ship/engineering/engines/starboard)
diff --git a/_maps/shuttles/independent/independent_rigger.dmm b/_maps/shuttles/independent/independent_rigger.dmm
index 78053b7e5e8c..d87ae083832b 100644
--- a/_maps/shuttles/independent/independent_rigger.dmm
+++ b/_maps/shuttles/independent/independent_rigger.dmm
@@ -62,7 +62,7 @@
"bc" = (
/obj/structure/closet/cardboard,
/obj/item/paicard,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"bi" = (
@@ -239,8 +239,8 @@
populate = 0
},
/obj/item/storage/cans/sixbeer,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/reagent_containers/condiment/flour,
/obj/item/reagent_containers/condiment/sugar,
/obj/item/radio/intercom/directional/north,
@@ -283,7 +283,7 @@
"eu" = (
/obj/structure/closet/crate,
/obj/machinery/airalarm/directional/north,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"eF" = (
@@ -430,7 +430,7 @@
dir = 1
},
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/random,
/obj/structure/curtain/bounty,
/turf/open/floor/plasteel/grimy,
/area/ship/crew/dorm)
@@ -1102,7 +1102,7 @@
"nU" = (
/obj/machinery/light/directional/west,
/obj/effect/turf_decal/corner/opaque/yellow/diagonal,
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/turf/open/floor/plasteel/white,
/area/ship/crew/canteen)
"od" = (
@@ -1160,7 +1160,7 @@
/turf/open/floor/plasteel/white,
/area/ship/crew/canteen)
"oX" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"ph" = (
@@ -2463,7 +2463,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engine)
"DG" = (
@@ -2616,7 +2616,7 @@
},
/obj/structure/closet/crate,
/obj/machinery/firealarm/directional/west,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plating,
/area/ship/maintenance/port)
"Fu" = (
@@ -3240,7 +3240,7 @@
/area/ship/medical)
"Ne" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/random,
/obj/structure/curtain/bounty,
/turf/open/floor/plasteel/grimy,
/area/ship/crew/dorm)
@@ -3552,7 +3552,7 @@
/area/ship/maintenance/central)
"Qv" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plasteel,
/area/ship/construction)
"QB" = (
@@ -3680,7 +3680,7 @@
},
/obj/structure/bed,
/obj/structure/curtain/bounty,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/random,
/turf/open/floor/plasteel/grimy,
/area/ship/crew/dorm)
"Sj" = (
@@ -3791,13 +3791,13 @@
dir = 1
},
/obj/structure/crate_shelf,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/reagent_containers/food/drinks/waterbottle/large{
pixel_x = 1;
pixel_y = -3
@@ -3903,7 +3903,7 @@
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"Ug" = (
diff --git a/_maps/shuttles/independent/independent_schmiedeberg.dmm b/_maps/shuttles/independent/independent_schmiedeberg.dmm
index bf97b9b1a44b..3ae3915db4d3 100644
--- a/_maps/shuttles/independent/independent_schmiedeberg.dmm
+++ b/_maps/shuttles/independent/independent_schmiedeberg.dmm
@@ -167,7 +167,7 @@
/obj/machinery/door/window/brigdoor/northright{
dir = 2
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/turf_decal/siding/wood{
dir = 10
},
@@ -440,7 +440,7 @@
/area/ship/cargo)
"fq" = (
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/greenglow/filled,
/obj/effect/turf_decal/siding/wood{
color = "#543C30";
@@ -462,7 +462,7 @@
/area/ship/engineering)
"fM" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/effect/turf_decal/siding/wood/corner{
dir = 4
},
@@ -1176,8 +1176,8 @@
/obj/machinery/door/poddoor/shutters/preopen{
id = "pharmlobby"
},
-/obj/effect/spawner/random/maintenance/two,
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/four,
/turf/open/floor/mineral/titanium,
/area/ship/cargo)
"qj" = (
@@ -1222,7 +1222,7 @@
/area/ship/medical)
"qU" = (
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/turf_decal/siding/wood{
color = "#543C30";
dir = 9
@@ -2360,7 +2360,7 @@
/obj/structure/rack,
/obj/structure/window/reinforced/spawner/east,
/obj/structure/window/reinforced/spawner/north,
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/maintenance/four,
/obj/machinery/door/window/brigdoor/northright{
dir = 8
},
@@ -2728,14 +2728,14 @@
/obj/structure/rack,
/obj/structure/window/reinforced/spawner/east,
/obj/structure/window/reinforced/spawner/north,
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/maintenance/four,
/obj/machinery/door/window/brigdoor/northright{
dir = 8
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "pharmlobby"
},
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/maintenance/four,
/turf/open/floor/wood/walnut,
/area/ship/cargo)
"OO" = (
@@ -2977,7 +2977,7 @@
pixel_y = -32
},
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/curtain/bounty,
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
@@ -3050,7 +3050,7 @@
/obj/item/flashlight/glowstick/blue,
/obj/item/flashlight/glowstick/cyan,
/obj/item/storage/pill_bottle/floorpill,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/turf_decal/siding/wood{
color = "#543C30";
dir = 1
@@ -3097,7 +3097,7 @@
dir = 8
},
/obj/item/storage/pill_bottle/zoom,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/machinery/door/poddoor/shutters/preopen{
id = "pharmlobby"
},
@@ -3205,7 +3205,7 @@
/obj/machinery/door/window/brigdoor/northright{
dir = 2
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/turf_decal/siding/wood{
dir = 6
},
diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm
index 8cdb3dfae61a..75784c301eda 100644
--- a/_maps/shuttles/independent/independent_shetland.dmm
+++ b/_maps/shuttles/independent/independent_shetland.dmm
@@ -735,7 +735,7 @@
/turf/open/floor/plasteel/patterned,
/area/ship/crew/janitor)
"gd" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/obj/effect/turf_decal/corner/opaque/neutral/half{
dir = 4
},
@@ -3100,7 +3100,7 @@
/turf/open/floor/plating,
/area/ship/hallway/port)
"zr" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/obj/effect/turf_decal/corner/opaque/neutral/three_quarters{
dir = 8
},
@@ -4361,7 +4361,7 @@
"Li" = (
/obj/structure/bed,
/obj/structure/curtain/bounty,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/random{
pixel_x = -32;
@@ -4647,7 +4647,7 @@
"MS" = (
/obj/structure/bed,
/obj/structure/curtain/bounty,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/plasteel/grimy,
/area/ship/crew/dorm)
"MT" = (
@@ -4676,7 +4676,7 @@
"Ni" = (
/obj/structure/bed,
/obj/structure/curtain/bounty,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/random{
pixel_y = 32
@@ -4768,7 +4768,7 @@
"Ok" = (
/obj/structure/bed,
/obj/structure/curtain/bounty,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
@@ -5423,9 +5423,9 @@
pixel_x = -5;
pixel_y = 3
},
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/storage/cans/sixbeer,
/obj/item/reagent_containers/food/drinks/waterbottle/large{
pixel_x = 1;
diff --git a/_maps/shuttles/independent/independent_sunskipper.dmm b/_maps/shuttles/independent/independent_sunskipper.dmm
index 12f34a8991ac..3edffc72acbc 100644
--- a/_maps/shuttles/independent/independent_sunskipper.dmm
+++ b/_maps/shuttles/independent/independent_sunskipper.dmm
@@ -1182,7 +1182,9 @@
/obj/structure/bed{
dir = 1
},
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms{
+ dir = 1
+ },
/obj/structure/curtain/cloth/grey,
/obj/structure/cable/green{
icon_state = "1-2"
diff --git a/_maps/shuttles/independent/independent_tranquility.dmm b/_maps/shuttles/independent/independent_tranquility.dmm
index 0ecbfbe09e90..35b3044df741 100644
--- a/_maps/shuttles/independent/independent_tranquility.dmm
+++ b/_maps/shuttles/independent/independent_tranquility.dmm
@@ -1721,7 +1721,7 @@
/area/ship/hallway/starboard)
"nr" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/curtain/cloth/grey,
/obj/machinery/light/dim/directional/east,
/obj/structure/sign/poster/contraband/gec{
@@ -4731,7 +4731,7 @@
"LT" = (
/obj/structure/bed,
/obj/structure/curtain/cloth/grey,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/effect/turf_decal/siding/wood{
dir = 4
},
@@ -5755,7 +5755,7 @@
/area/ship/crew/hydroponics)
"Tl" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/curtain/cloth/grey,
/obj/machinery/light/dim/directional/east,
/obj/structure/sign/poster/contraband/hacking_guide{
@@ -5891,7 +5891,7 @@
/obj/structure/bed,
/obj/structure/curtain/cloth/grey,
/obj/machinery/light/dim/directional/north,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/carpet/black,
/area/ship/crew/dorm/dormthree)
"Up" = (
@@ -6197,10 +6197,10 @@
"WS" = (
/obj/machinery/light/dim/directional/north,
/obj/structure/closet/crate/hydroponics,
-/obj/effect/spawner/random/food_or_drink/seed,
-/obj/effect/spawner/random/food_or_drink/seed,
-/obj/effect/spawner/random/food_or_drink/seed,
-/obj/effect/spawner/random/food_or_drink/seed,
+/obj/effect/spawner/lootdrop/seeded,
+/obj/effect/spawner/lootdrop/seeded,
+/obj/effect/spawner/lootdrop/seeded,
+/obj/effect/spawner/lootdrop/seeded,
/obj/item/seeds/random,
/turf/open/floor/grass,
/area/ship/crew/hydroponics)
diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm
index e6542ff6a355..70f32bfb60f2 100644
--- a/_maps/shuttles/inteq/inteq_colossus.dmm
+++ b/_maps/shuttles/inteq/inteq_colossus.dmm
@@ -228,8 +228,8 @@
locked = 0;
name = "fridge"
},
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/storage/cans/sixbeer,
/obj/effect/turf_decal/corner/opaque/yellow{
dir = 1
@@ -856,7 +856,7 @@
/turf/open/floor/plating,
/area/ship/maintenance/port)
"iT" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/obj/effect/turf_decal/trimline/opaque/yellow/line,
/obj/effect/turf_decal/siding/thinplating,
/obj/structure/cable,
@@ -1632,16 +1632,16 @@
dir = 1
},
/obj/structure/closet/crate,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
@@ -2537,7 +2537,7 @@
},
/obj/structure/closet/cardboard,
/obj/item/radio/intercom/directional/south,
-/obj/effect/spawner/random/maintenance/seven,
+/obj/effect/spawner/lootdrop/maintenance/seven,
/obj/effect/turf_decal/corner_techfloor_gray{
dir = 4
},
@@ -3652,7 +3652,7 @@
/obj/structure/closet/crate/trashcart,
/obj/machinery/airalarm/directional/east,
/obj/machinery/firealarm/directional/south,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/turf_decal/corner_techfloor_gray{
dir = 4
},
@@ -4494,7 +4494,7 @@
/turf/open/floor/carpet/black,
/area/ship/crew)
"XS" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/obj/effect/turf_decal/trimline/opaque/yellow/line,
/obj/effect/turf_decal/siding/thinplating,
/obj/machinery/airalarm/directional/south,
diff --git a/_maps/shuttles/inteq/inteq_hound.dmm b/_maps/shuttles/inteq/inteq_hound.dmm
index b0c1bdfb8171..c6f9e34a653d 100644
--- a/_maps/shuttles/inteq/inteq_hound.dmm
+++ b/_maps/shuttles/inteq/inteq_hound.dmm
@@ -27,8 +27,8 @@
locked = 0;
name = "fridge"
},
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/storage/cans/sixbeer,
/obj/item/reagent_containers/food/snacks/icecreamsandwich,
/obj/machinery/light/directional/south,
@@ -2043,11 +2043,11 @@
dir = 4
},
/obj/structure/closet/crate,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/turf/open/floor/plasteel/patterned/cargo_one,
diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm
index b322c45ea99b..5df5060f6f06 100644
--- a/_maps/shuttles/inteq/inteq_talos.dmm
+++ b/_maps/shuttles/inteq/inteq_talos.dmm
@@ -888,12 +888,12 @@
/area/ship/maintenance/starboard)
"fN" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/airless,
/area/ship/maintenance/port)
"fU" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/airless,
/area/ship/storage/port)
"fX" = (
@@ -948,7 +948,7 @@
"gm" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/airless,
/area/ship/storage/starboard)
"go" = (
@@ -1262,7 +1262,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/item/cigbutt,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/airless,
/area/ship/storage/starboard)
"im" = (
@@ -1640,7 +1640,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/maintenance/starboard)
"kD" = (
@@ -2132,7 +2132,7 @@
/area/ship/storage)
"nF" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/storage/port)
"nH" = (
@@ -2345,7 +2345,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/closet/cardboard,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plating/airless,
/area/ship/maintenance/starboard)
"oR" = (
@@ -2484,8 +2484,8 @@
name = "fridge"
},
/obj/item/storage/cans/sixbeer,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/reagent_containers/food/snacks/popsicle/creamsicle_orange,
/obj/item/reagent_containers/food/snacks/popsicle/creamsicle_orange,
/obj/item/radio/intercom/directional/north,
@@ -2636,7 +2636,7 @@
"qp" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/maintenance/port)
"qr" = (
@@ -2879,7 +2879,7 @@
/area/ship/security)
"rN" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/maintenance/starboard)
"rP" = (
@@ -3028,7 +3028,7 @@
/area/ship/maintenance/port)
"sD" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/turf_decal/industrial/warning{
dir = 4
},
@@ -3041,7 +3041,7 @@
/obj/effect/turf_decal/corner/opaque/brown{
dir = 4
},
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/obj/machinery/camera/autoname,
/obj/machinery/status_display/shuttle{
pixel_y = 32
@@ -4081,7 +4081,7 @@
/area/ship/maintenance/port)
"zg" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/maintenance/port)
"zh" = (
@@ -4159,7 +4159,7 @@
"zB" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/airless,
/area/ship/storage/port)
"zE" = (
@@ -4237,7 +4237,7 @@
"Aa" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/storage/port)
"Ag" = (
@@ -4499,7 +4499,7 @@
/area/ship/crew/canteen)
"BN" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/storage/starboard)
"BP" = (
@@ -4545,7 +4545,7 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"Cp" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/obj/structure/sign/poster/contraband/inteq{
pixel_x = 32
},
@@ -5212,7 +5212,7 @@
icon_state = "1-8"
},
/obj/effect/decal/cleanable/blood/old,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/maintenance/starboard)
"GR" = (
@@ -5286,7 +5286,7 @@
"Ho" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/storage/starboard)
"Hp" = (
@@ -5522,7 +5522,7 @@
/turf/open/floor/engine/vacuum,
/area/ship/engineering/engine)
"Jk" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/airless,
/area/ship/maintenance/starboard)
"Jo" = (
@@ -6161,7 +6161,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/airless,
/area/ship/storage/port)
"NK" = (
@@ -6308,7 +6308,7 @@
"OP" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/maintenance/port)
"Pf" = (
@@ -6360,7 +6360,7 @@
/obj/machinery/light/small/directional/west,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/obj/structure/closet/crate,
/turf/open/floor/plating/airless,
/area/ship/storage/starboard)
@@ -6635,7 +6635,7 @@
/area/ship/hallway/central)
"Ri" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/maintenance/port)
"Rp" = (
@@ -6717,7 +6717,7 @@
/obj/machinery/light/small/directional/north,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/plasma,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/ship/maintenance/port)
"RY" = (
@@ -6888,7 +6888,7 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"SS" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/obj/machinery/airalarm/directional/east,
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
@@ -7105,11 +7105,11 @@
/obj/structure/closet/crate{
name = "food crate"
},
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
@@ -7146,7 +7146,7 @@
/area/ship/storage/starboard)
"Uy" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/storage/port)
"UD" = (
@@ -7684,7 +7684,7 @@
/area/ship/maintenance/starboard)
"YZ" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/maintenance/starboard)
"Zb" = (
@@ -7883,7 +7883,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/cardboard,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plating/airless,
/area/ship/storage/port)
"ZY" = (
diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm
index 994041639613..00b25f936eab 100644
--- a/_maps/shuttles/inteq/inteq_valor.dmm
+++ b/_maps/shuttles/inteq/inteq_valor.dmm
@@ -92,7 +92,7 @@
},
/obj/effect/turf_decal/box/corners,
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/five,
+/obj/effect/spawner/lootdrop/maintenance/five,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"bv" = (
@@ -586,9 +586,9 @@
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/storage/ration/crayons,
/obj/effect/turf_decal/box/corners{
dir = 8
@@ -1491,7 +1491,7 @@
/obj/effect/turf_decal/trimline/opaque/yellow/line{
dir = 5
},
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
@@ -2691,8 +2691,8 @@
dir = 1
},
/obj/item/reagent_containers/food/snacks/hotdog,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"yu" = (
@@ -4647,7 +4647,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/food_or_drink/donut,
+/obj/effect/spawner/lootdrop/donut,
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"Qn" = (
@@ -5393,7 +5393,7 @@
/obj/effect/turf_decal/trimline/opaque/yellow/line{
dir = 4
},
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/directional/east,
/turf/open/floor/plasteel/patterned/grid,
diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm
index cd79d41cc9cc..9ea8b60d9b89 100644
--- a/_maps/shuttles/inteq/inteq_vaquero.dmm
+++ b/_maps/shuttles/inteq/inteq_vaquero.dmm
@@ -1520,16 +1520,16 @@
dir = 1
},
/obj/structure/closet/crate,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
@@ -3217,7 +3217,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"XG" = (
@@ -3252,8 +3252,8 @@
name = "fridge"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
/obj/item/storage/cans/sixbeer,
/obj/item/reagent_containers/food/snacks/carneburrito,
/obj/effect/turf_decal/corner/opaque/yellow{
diff --git a/_maps/shuttles/minutemen/minutemen_atlas.dmm b/_maps/shuttles/minutemen/minutemen_atlas.dmm
index 1b9d5dc2dffb..325069e91a6e 100644
--- a/_maps/shuttles/minutemen/minutemen_atlas.dmm
+++ b/_maps/shuttles/minutemen/minutemen_atlas.dmm
@@ -3749,11 +3749,11 @@
/obj/structure/closet/secure_closet/freezer/fridge/open{
populate = 0
},
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm
index f4643679b3d0..0d57e0ca165a 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm
@@ -252,11 +252,11 @@
},
/obj/structure/closet/crate,
/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"bd" = (
@@ -497,7 +497,7 @@
/turf/open/floor/plating,
/area/ship/engineering)
"cm" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/obj/machinery/light/small/directional/east,
/turf/open/floor/plasteel/dark,
/area/ship/hallway/central)
@@ -1089,8 +1089,8 @@
dir = 1;
pixel_y = -32
},
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/storage/cans/sixbeer,
/turf/open/floor/plasteel,
/area/ship/crew)
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
index 1e65ca7f3773..2cb4e641cd53 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
@@ -130,7 +130,7 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/aft)
"bh" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
@@ -246,7 +246,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"cj" = (
@@ -319,7 +319,7 @@
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"cP" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
@@ -357,7 +357,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/maintenance/fore)
"dp" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -435,7 +435,7 @@
/turf/open/floor/plasteel,
/area/ship/cargo/starboard)
"ej" = (
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/borderfloor,
/obj/structure/extinguisher_cabinet/directional/west,
@@ -559,7 +559,7 @@
/turf/open/floor/engine/hull,
/area/ship/external)
"eQ" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb/cobweb2,
@@ -658,7 +658,7 @@
/area/ship/engineering/atmospherics)
"ga" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/curtain/bounty,
/obj/structure/window/reinforced{
dir = 4
@@ -676,7 +676,7 @@
/turf/open/floor/plating,
/area/ship/engineering/engine)
"gf" = (
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
@@ -696,7 +696,7 @@
/turf/open/floor/plasteel/patterned,
/area/ship/cargo/port)
"gh" = (
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -712,7 +712,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 1
@@ -776,7 +776,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/turf_decal/industrial/warning,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
@@ -815,7 +815,7 @@
/area/ship/crew)
"hA" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo/port)
"hL" = (
@@ -907,7 +907,7 @@
/turf/open/floor/engine/airless,
/area/ship/engineering/engine)
"iJ" = (
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo/starboard)
"iK" = (
@@ -931,7 +931,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/port)
@@ -944,9 +944,9 @@
/area/ship/bridge)
"jc" = (
/obj/structure/table/reinforced,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/radio/intercom/directional/east,
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
@@ -1144,13 +1144,13 @@
/area/ship/engineering/engine)
"lb" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/curtain/bounty,
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"lE" = (
/obj/effect/turf_decal/box/corners,
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/starboard)
"lM" = (
@@ -1176,7 +1176,7 @@
/area/ship/hallway/central)
"lT" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -1219,7 +1219,7 @@
/area/ship/cargo/port)
"mb" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/starboard)
"mm" = (
@@ -1402,7 +1402,7 @@
/obj/structure/cable{
icon_state = "1-8"
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
@@ -1418,10 +1418,10 @@
/obj/item/reagent_containers/food/snacks/canned/beans,
/obj/item/reagent_containers/food/snacks/canned/beans,
/obj/structure/closet/crate,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/turf/open/floor/plasteel/patterned,
/area/ship/storage)
"oR" = (
@@ -1579,7 +1579,7 @@
/area/ship/storage)
"qn" = (
/obj/machinery/power/apc/auto_name/directional/west,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
icon_state = "0-4"
@@ -1604,7 +1604,7 @@
/turf/open/floor/plating,
/area/ship/maintenance/port)
"qu" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
@@ -1684,12 +1684,12 @@
/obj/effect/turf_decal/box/corners{
dir = 1
},
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/port)
"qY" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 6
@@ -1955,7 +1955,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 10
},
@@ -2078,7 +2078,7 @@
icon_state = "1-8"
},
/obj/machinery/light/small/directional/south,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -2113,7 +2113,7 @@
/turf/open/floor/plasteel/patterned,
/area/ship/storage)
"vi" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"vl" = (
@@ -2158,7 +2158,7 @@
/turf/open/floor/plastic,
/area/ship/crew/toilet)
"vG" = (
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/effect/turf_decal/borderfloor{
dir = 1
},
@@ -2267,7 +2267,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/engineering/communications)
"wP" = (
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/effect/turf_decal/industrial/outline/yellow,
/turf/open/floor/plasteel,
/area/ship/cargo/port)
@@ -2294,7 +2294,7 @@
/turf/open/floor/plating,
/area/ship/engineering/engine)
"xd" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plating,
@@ -2336,7 +2336,7 @@
/area/ship/cargo/port)
"xG" = (
/obj/item/radio/intercom/directional/north,
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/effect/turf_decal/industrial/outline/yellow,
/turf/open/floor/plasteel,
/area/ship/cargo/port)
@@ -2397,7 +2397,7 @@
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plasteel/stairs{
dir = 1
},
@@ -2453,7 +2453,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plasteel/stairs,
/area/ship/maintenance/port)
"yG" = (
@@ -2524,7 +2524,7 @@
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/engineering/communications)
"zv" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/ntspaceworks_big/six{
dir = 4
@@ -2637,7 +2637,7 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering/engine)
"AD" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -2684,7 +2684,7 @@
"AN" = (
/obj/item/radio/intercom/directional/south,
/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/turf/open/floor/plasteel,
/area/ship/cargo/starboard)
"AW" = (
@@ -2729,7 +2729,7 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/crew)
"BM" = (
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
dir = 4
},
@@ -2752,7 +2752,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -2761,7 +2761,7 @@
"Cc" = (
/obj/machinery/light/directional/west,
/obj/effect/turf_decal/industrial/warning,
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
@@ -3080,7 +3080,7 @@
/obj/effect/turf_decal/box/corners{
dir = 8
},
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/starboard)
@@ -3345,14 +3345,14 @@
/area/ship/bridge)
"HK" = (
/obj/machinery/light/directional/north,
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/effect/turf_decal/borderfloor{
dir = 1
},
/turf/open/floor/plasteel,
/area/ship/hallway/aft)
"HN" = (
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/port)
"HT" = (
@@ -3437,7 +3437,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"Is" = (
@@ -3543,7 +3543,7 @@
"Jk" = (
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/turf/open/floor/plasteel,
/area/ship/cargo/starboard)
"Jn" = (
@@ -3568,7 +3568,7 @@
/obj/structure/cable{
icon_state = "1-8"
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"JL" = (
@@ -3739,7 +3739,7 @@
/obj/machinery/atmospherics/pipe/simple/purple/hidden/layer1{
dir = 9
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"LK" = (
@@ -3771,7 +3771,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/sign/warning/electricshock{
pixel_y = 32
@@ -3875,7 +3875,7 @@
/area/ship/hallway/aft)
"Nz" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/port)
"NC" = (
@@ -3944,7 +3944,7 @@
/obj/effect/turf_decal/arrows{
dir = 1
},
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -3970,7 +3970,7 @@
/area/ship/external)
"OZ" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Pc" = (
@@ -4080,7 +4080,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
@@ -4160,7 +4160,7 @@
/obj/effect/turf_decal/box/corners{
dir = 4
},
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/starboard)
"Qz" = (
@@ -4243,7 +4243,7 @@
/obj/effect/turf_decal/box/corners{
dir = 8
},
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/starboard)
@@ -4318,7 +4318,7 @@
"Sa" = (
/obj/machinery/light/directional/east,
/obj/effect/turf_decal/industrial/warning,
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/structure/cable{
icon_state = "2-8"
},
@@ -4340,7 +4340,7 @@
/obj/effect/turf_decal/borderfloor{
dir = 1
},
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/turf/open/floor/plasteel,
/area/ship/hallway/aft)
"Sl" = (
@@ -4382,7 +4382,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -4401,7 +4401,7 @@
/area/ship/cargo/port)
"SK" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/machinery/airalarm/directional/south,
/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
dir = 4
@@ -4416,7 +4416,7 @@
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"SQ" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"SV" = (
@@ -4482,7 +4482,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 1
},
@@ -4527,7 +4527,7 @@
/obj/effect/turf_decal/box/corners{
dir = 1
},
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/port)
@@ -4571,7 +4571,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/hallway/central)
"UC" = (
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
@@ -4642,7 +4642,7 @@
/obj/structure/cable{
icon_state = "2-4"
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plating,
/area/ship/maintenance/port)
@@ -4704,7 +4704,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/port)
"Vz" = (
@@ -4845,7 +4845,7 @@
/area/ship/cargo/port)
"Wo" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/ship/maintenance/port)
"Wq" = (
@@ -5106,7 +5106,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/sign/warning/electricshock{
pixel_y = -32
@@ -5248,7 +5248,7 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/fore)
"ZS" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/machinery/button/ignition/incinerator/atmos{
dir = 4;
@@ -5265,7 +5265,7 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/crew)
"ZY" = (
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/machinery/firealarm/directional/north,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo/starboard)
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_harrier.dmm b/_maps/shuttles/nanotrasen/nanotrasen_harrier.dmm
index 3ddabcf1253c..72bd430d743b 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_harrier.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_harrier.dmm
@@ -1370,11 +1370,11 @@
/obj/structure/closet/crate{
name = "food crate"
},
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/storage/cans/sixbeer,
/obj/machinery/light/directional/west,
/turf/open/floor/plasteel/patterned,
@@ -5012,7 +5012,7 @@
/turf/open/floor/plasteel/white,
/area/ship/medical)
"BO" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/obj/effect/turf_decal/trimline/opaque/ntblue/filled/line,
/turf/open/floor/plasteel,
/area/ship/hallway/central)
@@ -7448,7 +7448,7 @@
/turf/open/floor/plasteel/mono,
/area/ship/hallway/central)
"OD" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/obj/machinery/light/directional/south,
/obj/effect/turf_decal/trimline/opaque/ntblue/filled/line,
/turf/open/floor/plasteel,
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
index 1a07763671e5..a02ec78fc9e6 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
@@ -807,7 +807,7 @@
/area/ship/science/robotics)
"dq" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/effect/turf_decal/siding/wood{
dir = 10
},
@@ -1740,7 +1740,10 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"hn" = (
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick{
+ pixel_x = 5;
+ pixel_y = 9
+ },
/obj/effect/decal/cleanable/plastic,
/obj/machinery/atmospherics/pipe/simple/purple/hidden,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
@@ -1886,7 +1889,7 @@
/area/ship/crew/dorm/dormtwo)
"hM" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/effect/turf_decal/siding/wood{
dir = 6
},
@@ -2449,7 +2452,7 @@
/obj/effect/turf_decal/trimline/opaque/blue/line{
dir = 9
},
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/obj/machinery/light/directional/west,
/obj/machinery/light_switch{
pixel_y = 22;
@@ -4832,7 +4835,7 @@
/area/ship/medical)
"sr" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/effect/turf_decal/siding/wood{
dir = 9
},
@@ -6160,14 +6163,14 @@
/area/ship/bridge)
"wq" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/turf_decal/corner_techfloor_gray/diagonal{
dir = 8
},
/obj/effect/turf_decal/industrial/warning{
dir = 4
},
-/obj/effect/spawner/random/maintenance/five,
+/obj/effect/spawner/lootdrop/maintenance/five,
/obj/item/radio/intercom/directional/east,
/turf/open/floor/plasteel/dark,
/area/ship/storage)
@@ -6913,9 +6916,9 @@
dir = 10
},
/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/clothing/gloves,
-/obj/effect/spawner/random/clothing/beret_or_rabbitears,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/lootdrop/gloves,
+/obj/effect/spawner/lootdrop/minor/beret_or_rabbitears,
/obj/effect/decal/cleanable/vomit/old,
/turf/open/floor/plasteel/dark,
/area/ship/storage)
@@ -7719,7 +7722,7 @@
/area/ship/crew/canteen)
"CP" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/effect/turf_decal/siding/wood{
dir = 4
},
@@ -8990,7 +8993,7 @@
/obj/effect/turf_decal/trimline/opaque/beige/filled/line{
dir = 10
},
-/obj/effect/spawner/random/salvage/half,
+/obj/effect/spawner/lootdrop/salvage_50,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -10461,7 +10464,7 @@
/obj/effect/turf_decal/industrial/warning{
dir = 8
},
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/light/small/directional/west,
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/official/get_your_legs{
@@ -10960,7 +10963,7 @@
/area/ship/engineering/atmospherics)
"OR" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/effect/turf_decal/siding/wood{
dir = 8
},
@@ -11572,8 +11575,8 @@
dir = 9
},
/obj/structure/closet/crate,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/ship/storage)
@@ -11810,7 +11813,7 @@
/area/ship/hangar)
"Sz" = (
/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/effect/turf_decal/siding/wood{
dir = 5
},
@@ -11886,7 +11889,7 @@
dir = 5
},
/obj/item/toy/plush/beeplushie,
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/maintenance/four,
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable{
icon_state = "0-8"
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm
index 2f1d3b060077..95b61c204b54 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm
@@ -240,9 +240,9 @@
icon_state = "crateopen";
opened = 1
},
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/clothing/gloves,
+/obj/effect/spawner/lootdrop/gloves,
/turf/open/floor/plasteel/dark,
/area/ship/cargo)
"aF" = (
@@ -576,9 +576,9 @@
dir = 4
},
/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick,
/turf/open/floor/plasteel/dark,
/area/ship/cargo)
"bX" = (
@@ -2000,7 +2000,7 @@
/turf/open/floor/plasteel,
/area/ship/crew/canteen/kitchen)
"pF" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/obj/effect/turf_decal/corner/transparent/bar/diagonal,
/obj/machinery/light/directional/east,
/obj/effect/decal/cleanable/dirt/dust,
@@ -2172,8 +2172,8 @@
/obj/effect/turf_decal/ntspaceworks_big/two,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate,
-/obj/effect/spawner/random/medical/surgery_tool/common,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/tool_surgery_common,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plasteel/dark,
/area/ship/cargo)
"uk" = (
@@ -2520,8 +2520,8 @@
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/two,
-/obj/effect/spawner/random/medical/prosthetic,
+/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/lootdrop/random_prosthetic,
/turf/open/floor/plasteel/dark,
/area/ship/cargo)
"Ai" = (
@@ -2683,7 +2683,7 @@
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/radio/intercom/directional/east,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/item/extinguisher/mini,
/turf/open/floor/plasteel/dark,
/area/ship/cargo)
@@ -2846,7 +2846,7 @@
dir = 8
},
/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/maintenance/four,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/spacecash/bundle/pocketchange,
/turf/open/floor/plasteel/dark,
@@ -3064,7 +3064,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/cargo)
"La" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/obj/effect/turf_decal/corner/transparent/bar/diagonal,
/obj/machinery/light/broken/directional/east,
/obj/effect/decal/cleanable/dirt/dust,
@@ -3701,11 +3701,11 @@
"Zf" = (
/obj/effect/turf_decal/corner/transparent/bar/diagonal,
/obj/structure/table,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration{
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration{
pixel_x = 7
},
-/obj/effect/spawner/random/food_or_drink/ration{
+/obj/effect/spawner/lootdrop/ration{
pixel_x = -8
},
/obj/machinery/button/door{
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm b/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
index 25b3bb0a0c83..f749f60f7e52 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
@@ -50,7 +50,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/techfloor/orange,
/turf/open/floor/plasteel/tech/grid,
@@ -876,7 +876,7 @@
/area/ship/engineering)
"fd" = (
/obj/structure/table/wood/reinforced,
-/obj/effect/spawner/random/food_or_drink/ration{
+/obj/effect/spawner/lootdrop/ration{
pixel_x = 5;
pixel_y = 5
},
@@ -908,7 +908,7 @@
pixel_x = -5;
pixel_y = -7
},
-/obj/effect/spawner/random/food_or_drink/ration{
+/obj/effect/spawner/lootdrop/ration{
pixel_x = 6;
pixel_y = 11
},
@@ -1035,7 +1035,7 @@
/obj/structure/railing{
dir = 8
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/port)
@@ -1412,7 +1412,7 @@
/turf/open/floor/plasteel/white,
/area/ship/medical)
"hZ" = (
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plating,
@@ -1441,7 +1441,7 @@
/obj/structure/railing/corner{
dir = 1
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -2092,7 +2092,7 @@
dir = 6
},
/obj/structure/railing,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plating,
@@ -2117,7 +2117,7 @@
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"lW" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/port)
@@ -2330,7 +2330,7 @@
/area/ship/security/prison)
"nk" = (
/obj/structure/railing,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plating,
@@ -2745,12 +2745,12 @@
/area/ship/engineering/electrical)
"pV" = (
/obj/structure/railing,
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/port)
"pY" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/obj/effect/turf_decal/siding/red{
dir = 4
},
@@ -2956,7 +2956,7 @@
/obj/structure/railing{
dir = 9
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -3258,7 +3258,7 @@
/obj/structure/railing{
dir = 1
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/tech/grid,
/area/ship/maintenance/starboard)
@@ -3321,7 +3321,7 @@
icon_state = "5-8"
},
/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/techfloor/orange,
@@ -4610,7 +4610,7 @@
/obj/structure/railing/corner{
dir = 4
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/techfloor/orange{
@@ -4726,7 +4726,7 @@
/obj/structure/window/reinforced/tinted/frosted{
dir = 8
},
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/curtain/cloth/grey,
/obj/machinery/light_switch{
dir = 8;
@@ -4851,7 +4851,7 @@
/area/ship/crew/canteen)
"Dh" = (
/obj/structure/table/wood,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
/turf/open/floor/plasteel,
/area/ship/security/prison)
"Dj" = (
@@ -5222,7 +5222,7 @@
/obj/item/canvas/twentythreeXtwentythree,
/obj/structure/closet/crate/trashcart,
/obj/item/paint/anycolor,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/sprayweb,
/turf/open/floor/plating,
@@ -5644,7 +5644,7 @@
/turf/open/floor/mineral/plastitanium/red/brig,
/area/ship/hallway/central)
"GZ" = (
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/maintenance/four,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"Ha" = (
@@ -5657,7 +5657,7 @@
/obj/structure/railing{
dir = 1
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/engineering)
@@ -5752,7 +5752,7 @@
/obj/structure/railing{
dir = 1
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -6434,7 +6434,7 @@
dir = 4
},
/obj/structure/curtain/cloth/grey,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/wood,
/area/ship/crew/dorm)
"Lt" = (
@@ -6870,7 +6870,7 @@
/obj/structure/railing{
dir = 1
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -7102,7 +7102,7 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/maintenance/starboard)
"PC" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/obj/effect/turf_decal/siding/red{
dir = 4
},
@@ -7467,7 +7467,7 @@
/obj/structure/railing{
dir = 6
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/port)
@@ -7713,7 +7713,7 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/crew/dorm/dormthree)
"Ti" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/railing{
dir = 9
@@ -7737,7 +7737,7 @@
/obj/structure/railing{
dir = 4
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/port)
@@ -8532,7 +8532,7 @@
/area/ship/engineering/atmospherics)
"XY" = (
/obj/structure/table/wood,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/effect/turf_decal/spline/plain/opaque/blue,
/turf/open/floor/plasteel,
/area/ship/security/prison)
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
index 5d181bcf584c..f50061aaa28f 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
@@ -1137,7 +1137,7 @@
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/machinery/firealarm/directional/east,
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/obj/effect/decal/cleanable/plasma,
/turf/open/floor/plating,
/area/ship/maintenance/port)
@@ -3923,7 +3923,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/hallway/port)
"EP" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/turf/open/floor/plasteel/lightgrey,
/area/ship/hallway/central)
"Ff" = (
@@ -4272,7 +4272,7 @@
id = "Ranger_Port_maint_shut";
req_ship_access = 1
},
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/turf/open/floor/plating,
/area/ship/maintenance/port)
"Ih" = (
@@ -5558,11 +5558,11 @@
/obj/effect/turf_decal/techfloor{
dir = 5
},
-/obj/effect/spawner/random/lpaid{
+/obj/effect/spawner/lootdrop/lpaid{
pixel_x = 2;
pixel_y = -2
},
-/obj/effect/spawner/random/lpretrieval{
+/obj/effect/spawner/lootdrop/lpretrieval{
pixel_x = -10;
pixel_y = 10
},
diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm
index ca6e86f10345..933d8f7fbfe0 100644
--- a/_maps/shuttles/pgf/pgf_crying_sun.dmm
+++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm
@@ -2667,7 +2667,7 @@
/obj/effect/turf_decal/trimline/opaque/bottlegreen/filled/corner{
dir = 8
},
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/obj/machinery/light/directional/east,
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
@@ -2935,7 +2935,7 @@
/obj/effect/turf_decal/trimline/opaque/bottlegreen/filled/line{
dir = 1
},
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"zc" = (
@@ -6330,10 +6330,10 @@
/obj/item/storage/ration/vegan_chili,
/obj/item/storage/ration/beef_strips,
/obj/item/storage/ration/beef_strips,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/storage/cans/sixbeer,
/turf/open/floor/plasteel/white,
/area/ship/crew/canteen)
diff --git a/_maps/shuttles/pirate/pirate_libertatia.dmm b/_maps/shuttles/pirate/pirate_libertatia.dmm
index 2890fa5ba815..46d00806edd7 100644
--- a/_maps/shuttles/pirate/pirate_libertatia.dmm
+++ b/_maps/shuttles/pirate/pirate_libertatia.dmm
@@ -842,8 +842,8 @@
/area/ship/crew)
"AL" = (
/obj/structure/table,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/item/radio/intercom/directional/north,
/obj/item/lighter{
@@ -876,8 +876,8 @@
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"Bw" = (
-/obj/effect/spawner/random/clothing/pirate_or_bandana,
-/obj/effect/spawner/random/clothing/pirate_or_bandana,
+/obj/effect/spawner/lootdrop/minor/pirate_or_bandana,
+/obj/effect/spawner/lootdrop/minor/pirate_or_bandana,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/shoes/jackboots,
@@ -1569,12 +1569,12 @@
name = "food crate"
},
/obj/item/storage/cans/sixbeer,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
diff --git a/_maps/shuttles/pirate/pirate_tortuga.dmm b/_maps/shuttles/pirate/pirate_tortuga.dmm
index 35387ea53cd5..3e48d25a962c 100644
--- a/_maps/shuttles/pirate/pirate_tortuga.dmm
+++ b/_maps/shuttles/pirate/pirate_tortuga.dmm
@@ -158,7 +158,7 @@
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"bR" = (
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/turf/open/floor/plating/airless,
/area/ship/maintenance)
"cb" = (
@@ -555,7 +555,7 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/security/armory)
"gG" = (
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plating/airless,
/area/ship/maintenance)
@@ -918,7 +918,7 @@
/turf/open/floor/mineral/plastitanium,
/area/ship/security/armory)
"kp" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -928,7 +928,7 @@
},
/area/ship/maintenance)
"kv" = (
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/airless,
/area/ship/maintenance)
@@ -942,7 +942,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/maintenance)
"la" = (
@@ -977,7 +977,7 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/cargo)
"li" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/airless,
/area/ship/maintenance)
@@ -1022,7 +1022,7 @@
/turf/open/floor/mineral/plastitanium,
/area/ship/security/armory)
"mf" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/structure/cable/yellow{
icon_state = "5-9"
},
@@ -1297,8 +1297,8 @@
/turf/open/floor/plasteel,
/area/ship/crew/canteen)
"oK" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/airless,
/area/ship/maintenance)
@@ -1391,7 +1391,7 @@
/turf/closed/wall,
/area/ship/crew/canteen)
"qi" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/crayon{
icon_state = "med"
@@ -1448,7 +1448,7 @@
/obj/structure/cable/yellow{
icon_state = "0-2"
},
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/airless{
icon_state = "plating_rust"
@@ -1546,7 +1546,7 @@
/turf/open/floor/plasteel,
/area/ship/crew/canteen)
"ti" = (
-/obj/effect/spawner/random/food_or_drink/donut,
+/obj/effect/spawner/lootdrop/donut,
/turf/open/floor/plating/airless{
icon_state = "plating_rust"
},
@@ -1577,7 +1577,7 @@
dir = 1
},
/obj/structure/curtain/cloth,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/carpet,
/area/ship/crew)
@@ -1936,7 +1936,7 @@
/turf/open/floor/plasteel,
/area/ship/crew/canteen)
"yc" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/airless,
/area/ship/maintenance)
@@ -2051,7 +2051,7 @@
"Ar" = (
/obj/structure/bed,
/obj/structure/curtain/cloth,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/turf/open/floor/carpet,
/area/ship/crew)
"Av" = (
@@ -2072,7 +2072,7 @@
/turf/open/floor/plasteel,
/area/ship/crew)
"AG" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/maintenance)
"AQ" = (
@@ -2199,7 +2199,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/airless{
icon_state = "plating_rust"
@@ -2233,7 +2233,7 @@
dir = 1
},
/obj/structure/curtain/cloth,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
/obj/machinery/airalarm/directional/north,
/turf/open/floor/carpet,
/area/ship/crew)
@@ -2255,7 +2255,7 @@
/turf/open/floor/plating/airless,
/area/ship/maintenance)
"Eb" = (
-/obj/effect/spawner/random/trash/decal,
+/obj/effect/spawner/lootdrop/waste/trash,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/airless{
icon_state = "plating_rust"
@@ -2820,9 +2820,9 @@
/area/ship/crew/canteen)
"Lb" = (
/obj/structure/table,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/effect/turf_decal/siding/wideplating{
dir = 5
},
@@ -2998,7 +2998,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/airless{
icon_state = "plating_rust"
@@ -3216,7 +3216,7 @@
/turf/open/floor/plasteel/white,
/area/ship/crew/canteen)
"Pb" = (
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating/airless{
icon_state = "platingdmg1"
},
@@ -3309,7 +3309,7 @@
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"QM" = (
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/obj/structure/closet/cardboard,
/turf/open/floor/plating/airless,
/area/ship/maintenance)
@@ -3358,7 +3358,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/spawner/random/trash/grille_or_waste,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating/airless{
icon_state = "plating_rust"
},
@@ -4044,7 +4044,7 @@
/turf/open/floor/plating,
/area/ship/cargo)
"YU" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/airless{
icon_state = "plating_rust"
diff --git a/_maps/shuttles/solgov/solgov_inkwell.dmm b/_maps/shuttles/solgov/solgov_inkwell.dmm
index 8ed63dcfac50..0a63ed263799 100644
--- a/_maps/shuttles/solgov/solgov_inkwell.dmm
+++ b/_maps/shuttles/solgov/solgov_inkwell.dmm
@@ -2536,7 +2536,7 @@
/obj/effect/turf_decal/industrial/stand_clear{
dir = 1
},
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"qw" = (
@@ -2645,7 +2645,7 @@
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"rm" = (
-/obj/effect/spawner/random/structure/crate_abandoned,
+/obj/effect/spawner/lootdrop/crate_spawner,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 1
},
@@ -2862,7 +2862,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"sn" = (
@@ -5208,7 +5208,7 @@
/obj/structure/closet/crate,
/obj/effect/turf_decal/techfloor,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plasteel/tech/grid,
/area/ship/storage)
"GN" = (
@@ -5450,7 +5450,7 @@
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"IC" = (
-/obj/effect/spawner/random/structure/crate_abandoned,
+/obj/effect/spawner/lootdrop/crate_spawner,
/obj/machinery/light/small/directional/east,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/tech/grid,
@@ -5613,7 +5613,7 @@
dir = 1
},
/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"JN" = (
@@ -6128,7 +6128,7 @@
/area/ship/crew/canteen/kitchen)
"Nj" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"Np" = (
@@ -6776,7 +6776,7 @@
/area/ship/bridge)
"RS" = (
/obj/structure/closet/cardboard,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"RX" = (
diff --git a/_maps/shuttles/subshuttles/independent_sugarcube.dmm b/_maps/shuttles/subshuttles/independent_sugarcube.dmm
index ad9ef66d3d5d..0504142f55b3 100644
--- a/_maps/shuttles/subshuttles/independent_sugarcube.dmm
+++ b/_maps/shuttles/subshuttles/independent_sugarcube.dmm
@@ -56,8 +56,8 @@
/turf/open/floor/plating,
/area/ship/engineering)
"h" = (
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/trash/cheesie,
/obj/item/trash/cheesie,
/obj/item/trash/candy,
@@ -259,8 +259,8 @@
/obj/item/circuitboard/machine/autolathe,
/obj/item/pickaxe/improvised,
/obj/item/pickaxe/improvised,
-/obj/effect/spawner/random/decoration/glowstick,
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/lootdrop/glowstick,
/obj/machinery/power/terminal{
dir = 8
},
diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
index 71019ff4131e..253a82277fdf 100644
--- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
+++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
@@ -849,9 +849,9 @@
/obj/structure/railing{
dir = 4
},
-/obj/effect/spawner/random/maintenance/five,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
/obj/item/stack/marker_beacon/thirty,
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
index 711a9f2033ae..4aafbcf9dc72 100644
--- a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
+++ b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
@@ -222,12 +222,12 @@
name = "food crate"
},
/obj/item/storage/cans/sixbeer,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/effect/turf_decal/industrial/outline,
/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
@@ -1284,8 +1284,8 @@
/area/ship/security/armory)
"wO" = (
/obj/structure/table,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
/obj/effect/turf_decal/corner/transparent/bar{
dir = 1
},
diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
index 6b63e3626a88..fedc993738bd 100644
--- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
+++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -998,7 +998,7 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
"jD" = (
-/obj/effect/spawner/random/salvage_capacitor,
+/obj/effect/spawner/lootdrop/salvage_capacitor,
/obj/effect/decal/cleanable/shreds,
/obj/structure/cable{
icon_state = "4-8"
@@ -1461,7 +1461,7 @@
dir = 9
},
/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/turf_decal/box,
/obj/machinery/camera/autoname{
dir = 10
@@ -2009,7 +2009,7 @@
dir = 4
},
/obj/machinery/light/dim/directional/north,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/starboard)
"sV" = (
@@ -2058,9 +2058,9 @@
dir = 10
},
/obj/structure/closet/crate,
-/obj/effect/spawner/random/clothing/costume,
+/obj/effect/spawner/lootdrop/costume,
/obj/item/storage/box/emptysandbags,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/button/door{
dir = 4;
id = "syndie_mechbay";
@@ -3151,14 +3151,22 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
},
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration{
+ pixel_x = -6
+ },
+/obj/effect/spawner/lootdrop/ration{
+ pixel_x = -6
+ },
+/obj/effect/spawner/lootdrop/ration{
+ pixel_x = -6
+ },
+/obj/effect/spawner/lootdrop/ration{
+ pixel_x = -6
+ },
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/machinery/airalarm/directional/south,
/turf/open/floor/mineral/plastitanium,
/area/ship/hallway/aft)
@@ -3249,7 +3257,7 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"FV" = (
-/obj/effect/spawner/random/salvage_scanning,
+/obj/effect/spawner/lootdrop/salvage_scanning,
/obj/effect/decal/cleanable/shreds{
pixel_y = 14
},
@@ -3876,10 +3884,10 @@
/obj/structure/table/reinforced,
/obj/item/hemostat,
/obj/machinery/light/directional/west,
-/obj/effect/spawner/random/medical/prosthetic{
+/obj/effect/spawner/lootdrop/random_prosthetic{
pixel_x = 6
},
-/obj/effect/spawner/random/medical/prosthetic{
+/obj/effect/spawner/lootdrop/random_prosthetic{
pixel_x = -6
},
/turf/open/floor/pod/dark,
@@ -4452,7 +4460,7 @@
/obj/structure/railing{
dir = 8
},
-/obj/effect/spawner/random/salvage_manipulator,
+/obj/effect/spawner/lootdrop/salvage_manipulator,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/industrial/warning{
dir = 1
@@ -5340,7 +5348,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"YT" = (
-/obj/effect/spawner/random/salvage_manipulator,
+/obj/effect/spawner/lootdrop/salvage_manipulator,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable{
icon_state = "4-8"
@@ -5423,7 +5431,7 @@
},
/area/ship/cargo)
"Zf" = (
-/obj/effect/spawner/random/salvage_matter_bin,
+/obj/effect/spawner/lootdrop/salvage_matter_bin,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/industrial/warning{
@@ -5439,7 +5447,7 @@
/obj/effect/turf_decal/techfloor{
dir = 8
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/machinery/button/door{
dir = 1;
id = "Artillery2shutter";
diff --git a/_maps/shuttles/syndicate/syndicate_litieguai.dmm b/_maps/shuttles/syndicate/syndicate_litieguai.dmm
index 750f3016b14e..2b12f177f57e 100644
--- a/_maps/shuttles/syndicate/syndicate_litieguai.dmm
+++ b/_maps/shuttles/syndicate/syndicate_litieguai.dmm
@@ -266,7 +266,7 @@
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/medical)
"fX" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/obj/effect/turf_decal/trimline/opaque/red/filled/line{
dir = 8
},
@@ -397,8 +397,8 @@
/area/ship/crew)
"jh" = (
/obj/structure/table,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/obj/item/radio/intercom/directional/west,
/turf/open/floor/wood/ebony,
/area/ship/crew)
@@ -538,7 +538,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/maintenance/port)
"na" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/obj/effect/turf_decal/trimline/opaque/red/filled/line{
dir = 8
},
diff --git a/_maps/shuttles/syndicate/syndicate_panacea.dmm b/_maps/shuttles/syndicate/syndicate_panacea.dmm
index 875d5806131c..3d26ff6512b5 100644
--- a/_maps/shuttles/syndicate/syndicate_panacea.dmm
+++ b/_maps/shuttles/syndicate/syndicate_panacea.dmm
@@ -47,7 +47,7 @@
/turf/open/floor/plasteel/sepia,
/area/ship/crew/ccommons)
"az" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/turf/open/floor/suns/diagonal{
color = "#543C30"
},
@@ -7126,7 +7126,7 @@
/turf/open/floor/carpet/red,
/area/ship/crew/dorm/dormtwo)
"Qi" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/turf/open/floor/suns/diagonal{
color = "#543C30"
},
@@ -8163,7 +8163,7 @@
/area/ship/engineering)
"Wr" = (
/obj/machinery/light/directional/north,
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/turf/open/floor/suns/dark/plain,
/area/ship/crew/ccommons)
"Wu" = (
diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
index f52d41d021c3..9b789add9c3e 100644
--- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
+++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
@@ -272,7 +272,7 @@
"bR" = (
/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters,
/obj/machinery/light/directional/south,
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/obj/effect/turf_decal/borderfloorblack{
dir = 1
},
@@ -358,7 +358,7 @@
/area/ship/medical)
"cp" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/maintenance/four,
/obj/item/trash/syndi_cakes,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
@@ -815,7 +815,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/security)
"eQ" = (
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/pod/dark,
/area/ship/engineering/atmospherics)
"eR" = (
@@ -3005,8 +3005,8 @@
/obj/item/storage/box/ingredients/vegetarian,
/obj/item/reagent_containers/condiment/milk,
/obj/item/reagent_containers/condiment/milk,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
/turf/open/floor/carpet/red,
/area/ship/crew/canteen)
"qQ" = (
@@ -5820,7 +5820,7 @@
dir = 8
},
/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/eight,
+/obj/effect/spawner/lootdrop/maintenance/eight,
/obj/item/circuitboard/machine/autolathe,
/obj/item/stock_parts/manipulator,
/obj/item/stock_parts/matter_bin,
@@ -6329,7 +6329,7 @@
dir = 8
},
/obj/machinery/light/directional/north,
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
/obj/effect/turf_decal/borderfloorblack/corner{
dir = 8
},
@@ -7487,7 +7487,7 @@
icon_state = "2-8"
},
/obj/structure/closet/emcloset,
-/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/lootdrop/maintenance/four,
/obj/item/reagent_containers/food/snacks/burger/red{
name = "suspicious red burger";
desc = "A suspicious looking burger.";
@@ -8597,9 +8597,9 @@
"Xf" = (
/obj/structure/table/wood,
/obj/machinery/door/firedoor/border_only,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
/turf/open/floor/carpet/red,
/area/ship/crew/canteen)
"Xg" = (
diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm
index 6a076e34555b..c12d8dd837da 100644
--- a/_maps/templates/shelter_2.dmm
+++ b/_maps/templates/shelter_2.dmm
@@ -161,7 +161,7 @@
pixel_x = 7;
pixel_y = 2
},
-/obj/effect/spawner/random/food_or_drink/three_course_meal,
+/obj/effect/spawner/lootdrop/three_course_meal,
/turf/open/floor/carpet/black,
/area/survivalpod)
"y" = (
diff --git a/_maps/templates/shelter_3.dmm b/_maps/templates/shelter_3.dmm
index 56743e38b0f7..570483a06a1d 100644
--- a/_maps/templates/shelter_3.dmm
+++ b/_maps/templates/shelter_3.dmm
@@ -225,7 +225,7 @@
/turf/open/floor/carpet/black,
/area/survivalpod)
"L" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
/turf/open/floor/carpet/black,
/area/survivalpod)
"M" = (
diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm
index 776014c4dfb5..b231b4e944c9 100644
--- a/code/__HELPERS/_lists.dm
+++ b/code/__HELPERS/_lists.dm
@@ -261,99 +261,43 @@
result = first ^ second
return result
-/**
- * Picks a random element from a list based on a weighting system:
- * 1. Adds up the total of weights for each element
- * 2. Gets a number between 1 and that total
- * 3. For each element in the list, subtracts its weighting from that number
- * 4. If that makes the number 0 or less, return that element.
- * Will output null sometimes if you use decimals (e.g. 0.1 instead of 10) as rand() uses integers, not floats
-**/
-/proc/pick_weight(list/list_to_pick)
+//Picks a random element from a list based on a weighting system:
+//1. Adds up the total of weights for each element
+//2. Gets a number between 1 and that total
+//3. For each element in the list, subtracts its weighting from that number
+//4. If that makes the number 0 or less, return that element.
+/proc/pickweight(list/L)
var/total = 0
var/item
- for(item in list_to_pick)
- if(!list_to_pick[item])
- list_to_pick[item] = 1
- total += list_to_pick[item]
+ for (item in L)
+ if (!L[item])
+ L[item] = 1
+ total += L[item]
total = rand(1, total)
- for(item in list_to_pick)
- total -= list_to_pick[item]
- if(total <= 0)
+ for (item in L)
+ total -=L [item]
+ if (total <= 0)
return item
return null
-/**
- * Picks a random element from a list based on a weighting system.
- * For example, given the following list:
- * A = 6, B = 3, C = 1, D = 0
- * A would have a 60% chance of being picked,
- * B would have a 30% chance of being picked,
- * C would have a 10% chance of being picked,
- * and D would have a 0% chance of being picked.
- * You should only pass integers in.
- */
-/proc/pick_weight_allow_zero(list/list_to_pick) //The original pick_weight proc will sometimes pick entries with zero weight. I'm not sure if changing the original will break anything, so I left it be.
- if(length(list_to_pick) == 0)
- return null
-
+/proc/pickweightAllowZero(list/L) //The original pickweight proc will sometimes pick entries with zero weight. I'm not sure if changing the original will break anything, so I left it be.
var/total = 0
- for(var/item in list_to_pick)
- if(!list_to_pick[item])
- list_to_pick[item] = 0
- total += list_to_pick[item]
-
- total = rand(1, total)
- for(var/item in list_to_pick)
- var/item_weight = list_to_pick[item]
- if(item_weight == 0)
- continue
+ var/item
+ for (item in L)
+ if (!L[item])
+ L[item] = 0
+ total += L[item]
- total -= item_weight
- if(total <= 0)
+ total = rand(0, total)
+ for (item in L)
+ total -=L [item]
+ if (total <= 0 && L[item])
return item
return null
-/**
- * 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 = pick_weight(fill_with_ones(list_to_pick))
- while(islist(result))
- result = pick_weight(fill_with_ones(result))
- return result
-
-/**
- * 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
-
/// Takes a weighted list (see above) and expands it into raw entries
/// This eats more memory, but saves time when actually picking from it
/proc/expand_weights(list/list_to_pick)
diff --git a/code/__HELPERS/_string_lists.dm b/code/__HELPERS/_string_lists.dm
index 5dab48761ecc..cdbee26f9ba7 100644
--- a/code/__HELPERS/_string_lists.dm
+++ b/code/__HELPERS/_string_lists.dm
@@ -1,5 +1,5 @@
#define pick_list(FILE, KEY) (pick(strings(FILE, KEY)))
-#define pick_list_weighted(FILE, KEY) (pick_weight(strings(FILE, KEY)))
+#define pick_list_weighted(FILE, KEY) (pickweight(strings(FILE, KEY)))
#define pick_list_replacements(FILE, KEY) (strings_replacement(FILE, KEY))
#define json_load(FILE) (json_decode(file2text(FILE)))
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index 505734d6cd5d..15fbf39c6e24 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -92,7 +92,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
/obj/item/clothing/suit/toggle/labcoat = 1,
/obj/item/clothing/under/color/grey = 1,
/obj/item/clothing/gloves/color/fyellow = 1,
- /obj/effect/spawner/random/clothing/gloves = 1,
+ /obj/effect/spawner/lootdrop/gloves = 1,
/obj/item/storage/wallet/random = 1,
/obj/item/clothing/glasses/science = 1,
/obj/item/clothing/glasses/meson = 1,
@@ -148,7 +148,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
//light sources
/obj/item/flashlight = 1,
- /obj/effect/spawner/random/decoration/glowstick = 1,
+ /obj/effect/spawner/lootdrop/glowstick = 1,
/obj/item/clothing/head/hardhat/red = 1,
/obj/item/flashlight/flare = 1,
) = 1,
@@ -233,7 +233,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
/obj/item/storage/box/donkpockets/donkpockethonk = 1,
) = 1,
/obj/item/reagent_containers/food/snacks/monkeycube = 1,
- /obj/effect/spawner/random/food_or_drink/ration = 1,
+ /obj/effect/spawner/lootdrop/ration = 1,
) = 8,
list(//fakeout items, keep this list at low relative weight
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index 37256f9ce833..ac7298dc100d 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -431,13 +431,3 @@
max_val = 255
config_entry_value = 127
min_val = 127
-
-/**
- * A config that skews with the random spawners weights
- * If the value is lower than 1, it'll tend to even out the odds
- * If higher than 1, it'll lean toward common spawns even more.
- */
-/datum/config_entry/number/random_loot_weight_modifier
- integer = FALSE
- default = 1
- min_val = 0.05
diff --git a/code/controllers/subsystem/overmap.dm b/code/controllers/subsystem/overmap.dm
index dd5515397277..113bfefa7a52 100644
--- a/code/controllers/subsystem/overmap.dm
+++ b/code/controllers/subsystem/overmap.dm
@@ -154,7 +154,7 @@ SUBSYSTEM_DEF(overmap)
return
if(!length(orbits))
break // Can't fit any more in
- var/event_type = pick_weight(GLOB.overmap_event_pick_list)
+ var/event_type = pickweight(GLOB.overmap_event_pick_list)
var/selected_orbit = pick(orbits)
var/list/T = get_unused_overmap_square_in_radius(selected_orbit)
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 7f0e9c8ee627..5ca963c53472 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -225,7 +225,7 @@ SUBSYSTEM_DEF(ticker)
if(!runnable_modes.len)
to_chat(world, "Unable to choose playable game mode. Reverting to pre-game lobby.")
return 0
- mode = pick_weight(runnable_modes)
+ mode = pickweight(runnable_modes)
if(!mode) //too few roundtypes all run too recently
mode = pick(runnable_modes)
diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm
index 148bf17ed210..acaa03d3ff7a 100644
--- a/code/datums/ai_laws.dm
+++ b/code/datums/ai_laws.dm
@@ -264,7 +264,7 @@
var/datum/ai_laws/lawtype
var/list/law_weights = CONFIG_GET(keyed_list/law_weight)
while(!lawtype && law_weights.len)
- var/possible_id = pick_weight_allow_zero(law_weights)
+ var/possible_id = pickweightAllowZero(law_weights)
lawtype = lawid_to_type(possible_id)
if(!lawtype)
law_weights -= possible_id
@@ -331,7 +331,7 @@
replaceable_groups[LAW_INHERENT] = inherent.len
if(supplied.len && (LAW_SUPPLIED in groups))
replaceable_groups[LAW_SUPPLIED] = supplied.len
- var/picked_group = pick_weight(replaceable_groups)
+ var/picked_group = pickweight(replaceable_groups)
switch(picked_group)
if(LAW_ZEROTH)
. = zeroth
diff --git a/code/datums/components/fantasy/_fantasy.dm b/code/datums/components/fantasy/_fantasy.dm
index 6941f6c169b4..92bd0868a746 100644
--- a/code/datums/components/fantasy/_fantasy.dm
+++ b/code/datums/components/fantasy/_fantasy.dm
@@ -75,7 +75,7 @@
var/usedSlots = NONE
for(var/i in 1 to max(1, abs(quality))) // We want at least 1 affix applied
- var/datum/fantasy_affix/affix = pick_weight(affixListing)
+ var/datum/fantasy_affix/affix = pickweight(affixListing)
if(affix.placement & usedSlots)
continue
if(!(affix.alignment & alignment))
diff --git a/code/datums/components/fantasy/suffixes.dm b/code/datums/components/fantasy/suffixes.dm
index 7035c143ae4f..8cabee42d21c 100644
--- a/code/datums/components/fantasy/suffixes.dm
+++ b/code/datums/components/fantasy/suffixes.dm
@@ -138,7 +138,7 @@
/obj/projectile/beam/disabler = 15
)
- var/obj/projectile/picked_projectiletype = pick_weight(weighted_projectile_types)
+ var/obj/projectile/picked_projectiletype = pickweight(weighted_projectile_types)
var/obj/item/master = comp.parent
comp.appliedComponents += master.AddComponent(/datum/component/mirv, picked_projectiletype)
diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm
index 7f4b8b50229e..1307d5d0ec8e 100644
--- a/code/datums/components/squeak.dm
+++ b/code/datums/components/squeak.dm
@@ -67,9 +67,9 @@
if(prob(squeak_chance))
if(!override_squeak_sounds)
- playsound(parent, pick_weight(default_squeak_sounds), volume, TRUE, sound_extra_range, sound_falloff_exponent, falloff_distance = sound_falloff_distance)
+ playsound(parent, pickweight(default_squeak_sounds), volume, TRUE, sound_extra_range, sound_falloff_exponent, falloff_distance = sound_falloff_distance)
else
- playsound(parent, pick_weight(override_squeak_sounds), volume, TRUE, sound_extra_range, sound_falloff_exponent, falloff_distance = sound_falloff_distance)
+ playsound(parent, pickweight(override_squeak_sounds), volume, TRUE, sound_extra_range, sound_falloff_exponent, falloff_distance = sound_falloff_distance)
/datum/component/squeak/proc/step_squeak()
SIGNAL_HANDLER
diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm
index f88e594e3fc7..bb7a33846a34 100644
--- a/code/datums/looping_sounds/_looping_sound.dm
+++ b/code/datums/looping_sounds/_looping_sound.dm
@@ -100,7 +100,7 @@
/datum/looping_sound/proc/get_sound(starttime, _mid_sounds)
. = _mid_sounds || mid_sounds
while(!isfile(.) && !isnull(.))
- . = pick_weight(.)
+ . = pickweight(.)
/datum/looping_sound/proc/on_start()
var/start_wait = 0
diff --git a/code/datums/mapgen/planetary/JungleGenerator.dm b/code/datums/mapgen/planetary/JungleGenerator.dm
index f64e47504957..077065c8e44e 100644
--- a/code/datums/mapgen/planetary/JungleGenerator.dm
+++ b/code/datums/mapgen/planetary/JungleGenerator.dm
@@ -100,7 +100,7 @@
mob_spawn_list = list(
/mob/living/carbon/monkey = 10,
/mob/living/simple_animal/hostile/retaliate/chicken = 10,
- /obj/effect/spawner/random/chicken/jungle/flock = 1
+ /obj/effect/spawner/lootdrop/chicken/jungle/flock = 1
)
/datum/biome/jungle/dense
@@ -123,7 +123,7 @@
/mob/living/simple_animal/hostile/gorilla = 1,
/mob/living/carbon/monkey = 6,
/mob/living/simple_animal/hostile/retaliate/chicken = 4,
- /obj/effect/spawner/random/chicken/jungle/flock = 1
+ /obj/effect/spawner/lootdrop/chicken/jungle/flock = 1
)
/datum/biome/jungle/plains
@@ -181,7 +181,7 @@
feature_spawn_list = list(
/obj/item/pickaxe/rusted = 1,
/obj/structure/spawner/burrow/jungle_planet = 1,
- /obj/effect/spawner/random/anomaly/jungle = 1
+ /obj/effect/spawner/lootdrop/anomaly/jungle = 1
)
/datum/biome/cave/jungle/dirt
diff --git a/code/datums/mapgen/planetary/LavaGenerator.dm b/code/datums/mapgen/planetary/LavaGenerator.dm
index 846d4145a66c..bca54d019397 100644
--- a/code/datums/mapgen/planetary/LavaGenerator.dm
+++ b/code/datums/mapgen/planetary/LavaGenerator.dm
@@ -100,7 +100,7 @@
/obj/structure/flora/rock/hell = 20,
/obj/structure/elite_tumor = 4,
/obj/structure/geyser/random = 4,
- /obj/effect/spawner/random/anomaly/lava = 2,
+ /obj/effect/spawner/lootdrop/anomaly/lava = 2,
/obj/structure/flora/rock/hell = 14,
/obj/structure/vein = 5,
/obj/structure/vein/classtwo = 2,
@@ -108,7 +108,7 @@
/obj/structure/geyser/random = 2,
/obj/structure/vein/classthree = 1,
/obj/effect/spawner/minefield = 1,
- /obj/effect/spawner/random/anomaly/lava = 1,
+ /obj/effect/spawner/lootdrop/anomaly/lava = 1,
)
mob_spawn_chance = 4
mob_spawn_list = list(
@@ -167,7 +167,7 @@
feature_spawn_list = list(
/obj/structure/flora/tree/dead/barren = 50,
/obj/structure/flora/tree/dead/tall/grey = 45,
- /obj/effect/spawner/random/anomaly/lava = 10,
+ /obj/effect/spawner/lootdrop/anomaly/lava = 10,
/obj/structure/vein = 5,
/obj/structure/vein/classtwo = 2,
/obj/structure/vein/classthree = 1,
diff --git a/code/datums/mapgen/planetary/RockGenerator.dm b/code/datums/mapgen/planetary/RockGenerator.dm
index b7ab59f5d843..30349a2ea53b 100644
--- a/code/datums/mapgen/planetary/RockGenerator.dm
+++ b/code/datums/mapgen/planetary/RockGenerator.dm
@@ -89,10 +89,10 @@
/obj/structure/vein = 60,
/obj/structure/elite_tumor = 40,
/obj/structure/vein/classtwo = 40,
- /obj/effect/spawner/random/anomaly/rock = 10,
+ /obj/effect/spawner/lootdrop/anomaly/rock = 10,
/obj/structure/vein/classthree = 10,
/obj/effect/spawner/minefield = 2,
- /obj/effect/spawner/random/anomaly/big = 1 //get out of here stalker
+ /obj/effect/spawner/lootdrop/anomaly/big = 1 //get out of here stalker
)
flora_spawn_chance = 5
@@ -162,7 +162,7 @@
/obj/structure/vein/classthree = 1,
/obj/structure/spawner/burrow/rock_plant = 4,
/obj/effect/spawner/minefield = 1,
- /obj/effect/spawner/random/anomaly/rock/cave = 1,
+ /obj/effect/spawner/lootdrop/anomaly/rock/cave = 1,
)
mob_spawn_chance = 6
mob_spawn_list = list(
diff --git a/code/datums/mapgen/planetary/SandGenerator.dm b/code/datums/mapgen/planetary/SandGenerator.dm
index 37615a6b961e..e285f5b1ac6c 100644
--- a/code/datums/mapgen/planetary/SandGenerator.dm
+++ b/code/datums/mapgen/planetary/SandGenerator.dm
@@ -96,7 +96,7 @@
/obj/structure/vein/classtwo = 4,
/obj/structure/elite_tumor = 4,
/obj/structure/vein/classthree = 2,
- /obj/effect/spawner/random/anomaly/sand = 1,
+ /obj/effect/spawner/lootdrop/anomaly/sand = 1,
)
mob_spawn_chance = 4
mob_spawn_list = list(
@@ -120,7 +120,7 @@
/obj/structure/flora/ash/cap_shroom = 4,
/obj/structure/flora/ash/stem_shroom = 4,
/obj/effect/decal/remains/human = 4,
- /obj/effect/spawner/random/maintenance = 40,
+ /obj/effect/spawner/lootdrop/maintenance = 40,
)
/datum/biome/sand/grass
@@ -199,7 +199,7 @@
/obj/structure/geyser/random = 4,
/obj/structure/vein/classtwo = 4,
/obj/structure/elite_tumor = 4,
- /obj/effect/spawner/random/anomaly/sand/cave = 1
+ /obj/effect/spawner/lootdrop/anomaly/sand/cave = 1
)
mob_spawn_chance = 4
mob_spawn_list = list(
diff --git a/code/datums/mapgen/planetary/SnowGenerator.dm b/code/datums/mapgen/planetary/SnowGenerator.dm
index 4297f8a50f2c..7fddcd176c66 100644
--- a/code/datums/mapgen/planetary/SnowGenerator.dm
+++ b/code/datums/mapgen/planetary/SnowGenerator.dm
@@ -112,8 +112,8 @@
)
feature_spawn_chance = 0.1
feature_spawn_list = list(
- /obj/effect/spawner/random/anomaly/ice = 12,
- /obj/effect/spawner/random/anomaly/big = 1,
+ /obj/effect/spawner/lootdrop/anomaly/ice = 12,
+ /obj/effect/spawner/lootdrop/anomaly/big = 1,
/obj/structure/spawner/burrow/ice_planet = 80,
/obj/structure/vein/ice = 25,
/obj/effect/spawner/minefield = 2,
@@ -212,8 +212,8 @@
)
feature_spawn_chance = 0.3
feature_spawn_list = list(
- /obj/effect/spawner/random/anomaly/ice = 100,
- /obj/effect/spawner/random/anomaly/big = 1,
+ /obj/effect/spawner/lootdrop/anomaly/ice = 100,
+ /obj/effect/spawner/lootdrop/anomaly/big = 1,
/obj/structure/spawner/burrow/ice_planet/hard = 600,
/obj/structure/vein/ice = 300,
/obj/structure/vein/ice/classtwo = 500,
@@ -268,7 +268,7 @@
feature_spawn_list = list(
/obj/structure/spawner/burrow/ice_planet = 60,
/obj/structure/spawner/burrow/ice_planet = 40,
- /obj/effect/spawner/random/anomaly/ice/cave = 10,
+ /obj/effect/spawner/lootdrop/anomaly/ice/cave = 10,
/obj/structure/vein/ice = 30,
/obj/structure/vein/ice/classtwo = 50,
/obj/structure/vein/ice/classthree = 6,
diff --git a/code/datums/mapgen/planetary/WasteGenerator.dm b/code/datums/mapgen/planetary/WasteGenerator.dm
index 3f87e6879c1b..621d5e3b9c4d 100644
--- a/code/datums/mapgen/planetary/WasteGenerator.dm
+++ b/code/datums/mapgen/planetary/WasteGenerator.dm
@@ -96,27 +96,27 @@
flora_spawn_list = list(
//mech spawners
- /obj/effect/spawner/random/waste/mechwreck = 100,
- /obj/effect/spawner/random/waste/mechwreck/rare = 20,
+ /obj/effect/spawner/lootdrop/waste/mechwreck = 100,
+ /obj/effect/spawner/lootdrop/waste/mechwreck/rare = 20,
//decals and fluff structures
- /obj/effect/spawner/random/trash/decal = 1800,
- /obj/effect/spawner/random/waste/radiation = 80,
- /obj/effect/spawner/random/waste/radiation/more_rads = 10,
+ /obj/effect/spawner/lootdrop/waste/trash = 1800,
+ /obj/effect/spawner/lootdrop/waste/radiation = 80,
+ /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 10,
//stuff you can actually use
- /obj/effect/spawner/random/waste/girder = 600,
+ /obj/effect/spawner/lootdrop/waste/girder = 600,
/obj/structure/reagent_dispensers/watertank = 200,
/obj/item/stack/cable_coil/cut = 500,
/obj/structure/closet/crate/secure/loot = 30,
- /obj/effect/spawner/random/waste/atmos_can = 50,
- /obj/effect/spawner/random/waste/atmos_can/rare = 1,
- /obj/effect/spawner/random/waste/salvageable = 300,
- /obj/effect/spawner/random/waste/grille_or_trash = 200,
- /obj/effect/spawner/random/maintenance = 200,
- /obj/effect/spawner/random/maintenance/two = 100,
- /obj/effect/spawner/random/maintenance/three = 50,
- /obj/effect/spawner/random/maintenance/four = 20,
+ /obj/effect/spawner/lootdrop/waste/atmos_can = 50,
+ /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1,
+ /obj/effect/spawner/lootdrop/waste/salvageable = 300,
+ /obj/effect/spawner/lootdrop/waste/grille_or_trash = 200,
+ /obj/effect/spawner/lootdrop/maintenance = 200,
+ /obj/effect/spawner/lootdrop/maintenance/two = 100,
+ /obj/effect/spawner/lootdrop/maintenance/three = 50,
+ /obj/effect/spawner/lootdrop/maintenance/four = 20,
//plants
/obj/structure/flora/ash/garden/waste = 70,
@@ -125,7 +125,7 @@
//the illusive shrapnel plant
/obj/item/mine/pressure/explosive/shrapnel/live = 30,
- /obj/effect/spawner/random/mine = 8,
+ /obj/effect/spawner/lootdrop/mine = 8,
/obj/effect/spawner/minefield = 2
)
@@ -133,7 +133,7 @@
/obj/effect/radiation/waste = 30,
/obj/effect/radiation/waste/intense = 10,
/obj/structure/geyser/random = 1,
- /obj/effect/spawner/random/anomaly/waste = 1
+ /obj/effect/spawner/lootdrop/anomaly/waste = 1
)
mob_spawn_list = list(
@@ -159,23 +159,23 @@
)
flora_spawn_list = list(
- /obj/effect/spawner/random/trash/decal = 180,
- /obj/effect/spawner/random/waste/radiation = 16,
- /obj/effect/spawner/random/waste/radiation/more_rads = 2,
- /obj/effect/spawner/random/waste/atmos_can = 36,
- /obj/effect/spawner/random/waste/atmos_can/rare = 1,
- /obj/effect/spawner/random/waste/salvageable = 60,
+ /obj/effect/spawner/lootdrop/waste/trash = 180,
+ /obj/effect/spawner/lootdrop/waste/radiation = 16,
+ /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 2,
+ /obj/effect/spawner/lootdrop/waste/atmos_can = 36,
+ /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1,
+ /obj/effect/spawner/lootdrop/waste/salvageable = 60,
)
mob_spawn_chance = 1
/datum/biome/waste/crater/rad
flora_spawn_list = list(
/obj/structure/flora/ash/glowshroom = 180,
- /obj/effect/spawner/random/trash/decal = 90,
- /obj/effect/spawner/random/waste/radiation = 25,
- /obj/effect/spawner/random/waste/radiation/more_rads = 7,
- /obj/effect/spawner/random/waste/atmos_can = 7,
- /obj/effect/spawner/random/waste/salvageable = 15
+ /obj/effect/spawner/lootdrop/waste/trash = 90,
+ /obj/effect/spawner/lootdrop/waste/radiation = 25,
+ /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 7,
+ /obj/effect/spawner/lootdrop/waste/atmos_can = 7,
+ /obj/effect/spawner/lootdrop/waste/salvageable = 15
)
/datum/biome/waste/clearing
@@ -184,26 +184,26 @@
/datum/biome/waste/clearing/mushroom
flora_spawn_list = list(
- /obj/effect/spawner/random/waste/mechwreck = 100,
- /obj/effect/spawner/random/trash/decal = 900,
- /obj/effect/spawner/random/waste/radiation = 300,
- /obj/effect/spawner/random/waste/radiation/more_rads = 120,
- /obj/effect/spawner/random/waste/girder = 600,
+ /obj/effect/spawner/lootdrop/waste/mechwreck = 100,
+ /obj/effect/spawner/lootdrop/waste/trash = 900,
+ /obj/effect/spawner/lootdrop/waste/radiation = 300,
+ /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 120,
+ /obj/effect/spawner/lootdrop/waste/girder = 600,
/obj/structure/reagent_dispensers/watertank = 200,
/obj/item/stack/cable_coil/cut = 500,
/obj/structure/closet/crate/secure/loot = 30,
- /obj/effect/spawner/random/waste/atmos_can = 50,
- /obj/effect/spawner/random/waste/atmos_can/rare = 1,
- /obj/effect/spawner/random/waste/salvageable = 300,
- /obj/effect/spawner/random/waste/grille_or_trash = 200,
- /obj/effect/spawner/random/maintenance = 200,
- /obj/effect/spawner/random/maintenance/two = 100,
- /obj/effect/spawner/random/maintenance/three = 50,
- /obj/effect/spawner/random/maintenance/four = 20,
+ /obj/effect/spawner/lootdrop/waste/atmos_can = 50,
+ /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1,
+ /obj/effect/spawner/lootdrop/waste/salvageable = 300,
+ /obj/effect/spawner/lootdrop/waste/grille_or_trash = 200,
+ /obj/effect/spawner/lootdrop/maintenance = 200,
+ /obj/effect/spawner/lootdrop/maintenance/two = 100,
+ /obj/effect/spawner/lootdrop/maintenance/three = 50,
+ /obj/effect/spawner/lootdrop/maintenance/four = 20,
/obj/structure/flora/ash/garden/waste = 300,
/obj/structure/flora/ash/glowshroom = 1800,
/obj/item/mine/pressure/explosive/shrapnel/live = 30,
- /obj/effect/spawner/random/mine = 8,
+ /obj/effect/spawner/lootdrop/mine = 8,
/obj/effect/spawner/minefield = 2
)
@@ -227,29 +227,29 @@
)
flora_spawn_list = list( //there are no plants here
- /obj/effect/spawner/random/waste/mechwreck = 200,
- /obj/effect/spawner/random/waste/mechwreck/rare = 50,
- /obj/effect/spawner/random/trash/decal = 900,
- /obj/effect/spawner/random/waste/radiation = 80,
- /obj/effect/spawner/random/waste/radiation/more_rads = 20,
- /obj/effect/spawner/random/waste/girder = 600,
+ /obj/effect/spawner/lootdrop/waste/mechwreck = 200,
+ /obj/effect/spawner/lootdrop/waste/mechwreck/rare = 50,
+ /obj/effect/spawner/lootdrop/waste/trash = 900,
+ /obj/effect/spawner/lootdrop/waste/radiation = 80,
+ /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 20,
+ /obj/effect/spawner/lootdrop/waste/girder = 600,
/obj/structure/reagent_dispensers/watertank = 200,
/obj/item/stack/cable_coil/cut = 500,
/obj/structure/closet/crate/secure/loot = 30,
- /obj/effect/spawner/random/waste/atmos_can = 50,
- /obj/effect/spawner/random/waste/atmos_can/rare = 1,
- /obj/effect/spawner/random/waste/salvageable = 300,
- /obj/effect/spawner/random/waste/grille_or_trash = 200,
- /obj/effect/spawner/random/maintenance = 200,
- /obj/effect/spawner/random/maintenance/two = 100,
- /obj/effect/spawner/random/maintenance/three = 50,
- /obj/effect/spawner/random/maintenance/four = 20,
+ /obj/effect/spawner/lootdrop/waste/atmos_can = 50,
+ /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1,
+ /obj/effect/spawner/lootdrop/waste/salvageable = 300,
+ /obj/effect/spawner/lootdrop/waste/grille_or_trash = 200,
+ /obj/effect/spawner/lootdrop/maintenance = 200,
+ /obj/effect/spawner/lootdrop/maintenance/two = 100,
+ /obj/effect/spawner/lootdrop/maintenance/three = 50,
+ /obj/effect/spawner/lootdrop/maintenance/four = 20,
/obj/structure/closet/crate/secure/loot = 30,
- /obj/effect/spawner/random/waste/atmos_can = 180,
- /obj/effect/spawner/random/waste/atmos_can/rare = 1,
- /obj/effect/spawner/random/waste/salvageable = 300,
+ /obj/effect/spawner/lootdrop/waste/atmos_can = 180,
+ /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1,
+ /obj/effect/spawner/lootdrop/waste/salvageable = 300,
/obj/item/mine/pressure/explosive/rad/live = 30,
- /obj/effect/spawner/random/mine = 8,
+ /obj/effect/spawner/lootdrop/mine = 8,
/obj/effect/spawner/minefield = 2
)
mob_spawn_list = list( //nor organics, more biased towards hivebots though
@@ -288,28 +288,28 @@
)
flora_spawn_list = list(
- /obj/effect/spawner/random/waste/mechwreck = 100,
- /obj/effect/spawner/random/waste/mechwreck/rare = 20,
- /obj/effect/spawner/random/trash/decal = 1800,
- /obj/effect/spawner/random/waste/radiation = 80,
- /obj/effect/spawner/random/waste/radiation/more_rads = 10,
- /obj/effect/spawner/random/waste/girder = 600,
+ /obj/effect/spawner/lootdrop/waste/mechwreck = 100,
+ /obj/effect/spawner/lootdrop/waste/mechwreck/rare = 20,
+ /obj/effect/spawner/lootdrop/waste/trash = 1800,
+ /obj/effect/spawner/lootdrop/waste/radiation = 80,
+ /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 10,
+ /obj/effect/spawner/lootdrop/waste/girder = 600,
/obj/structure/reagent_dispensers/watertank = 200,
/obj/item/stack/cable_coil/cut = 500,
/obj/structure/closet/crate/secure/loot = 30,
- /obj/effect/spawner/random/waste/atmos_can = 50,
- /obj/effect/spawner/random/waste/atmos_can/rare = 5,
- /obj/effect/spawner/random/waste/salvageable = 300,
- /obj/effect/spawner/random/waste/grille_or_trash = 200,
- /obj/effect/spawner/random/maintenance = 20,
- /obj/effect/spawner/random/maintenance/two = 50,
- /obj/effect/spawner/random/maintenance/three = 100,
- /obj/effect/spawner/random/maintenance/four = 200,
- /obj/effect/spawner/random/waste/salvageable = 400,
+ /obj/effect/spawner/lootdrop/waste/atmos_can = 50,
+ /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 5,
+ /obj/effect/spawner/lootdrop/waste/salvageable = 300,
+ /obj/effect/spawner/lootdrop/waste/grille_or_trash = 200,
+ /obj/effect/spawner/lootdrop/maintenance = 20,
+ /obj/effect/spawner/lootdrop/maintenance/two = 50,
+ /obj/effect/spawner/lootdrop/maintenance/three = 100,
+ /obj/effect/spawner/lootdrop/maintenance/four = 200,
+ /obj/effect/spawner/lootdrop/waste/salvageable = 400,
/obj/structure/flora/ash/garden/waste = 70,
/obj/structure/flora/ash/glowshroom = 400, //more common in caves
/obj/item/mine/pressure/explosive/rad/live = 10,
- /obj/effect/spawner/random/mine = 8,
+ /obj/effect/spawner/lootdrop/mine = 8,
/obj/effect/spawner/minefield = 2
)
@@ -317,7 +317,7 @@
/obj/effect/radiation/waste = 30,
/obj/effect/radiation/waste/intense = 10,
/obj/structure/geyser/random = 1,
- /obj/effect/spawner/random/anomaly/waste/cave = 1
+ /obj/effect/spawner/lootdrop/anomaly/waste/cave = 1
)
mob_spawn_list = list(
/mob/living/simple_animal/hostile/hivebot/strong/rockplanet = 70,
@@ -348,24 +348,24 @@
/datum/biome/cave/waste/rad
flora_spawn_list = list(
- /obj/effect/spawner/random/trash/decal = 900,
- /obj/effect/spawner/random/waste/radiation = 250,
- /obj/effect/spawner/random/waste/radiation/more_rads = 70,
- /obj/effect/spawner/random/waste/atmos_can = 50,
- /obj/effect/spawner/random/waste/atmos_can/rare = 5,
- /obj/effect/spawner/random/waste/salvageable = 150,
- /obj/effect/spawner/random/waste/girder = 200,
+ /obj/effect/spawner/lootdrop/waste/trash = 900,
+ /obj/effect/spawner/lootdrop/waste/radiation = 250,
+ /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 70,
+ /obj/effect/spawner/lootdrop/waste/atmos_can = 50,
+ /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 5,
+ /obj/effect/spawner/lootdrop/waste/salvageable = 150,
+ /obj/effect/spawner/lootdrop/waste/girder = 200,
/obj/structure/reagent_dispensers/watertank = 10,
/obj/item/stack/cable_coil/cut = 500,
/obj/structure/closet/crate/secure/loot = 30,
- /obj/effect/spawner/random/waste/grille_or_trash = 200,
- /obj/effect/spawner/random/maintenance = 20,
- /obj/effect/spawner/random/maintenance/two = 50,
- /obj/effect/spawner/random/maintenance/three = 100,
- /obj/effect/spawner/random/maintenance/four = 200,
+ /obj/effect/spawner/lootdrop/waste/grille_or_trash = 200,
+ /obj/effect/spawner/lootdrop/maintenance = 20,
+ /obj/effect/spawner/lootdrop/maintenance/two = 50,
+ /obj/effect/spawner/lootdrop/maintenance/three = 100,
+ /obj/effect/spawner/lootdrop/maintenance/four = 200,
/obj/structure/flora/ash/glowshroom = 1800,
/obj/item/mine/pressure/explosive/rad/live = 30,
- /obj/effect/spawner/random/mine = 8,
+ /obj/effect/spawner/lootdrop/mine = 8,
/obj/effect/spawner/minefield = 2
)
feature_spawn_chance = 12
@@ -382,26 +382,26 @@
/turf/closed/wall/rust/wasteplanet = 10
)
flora_spawn_list = list(
- /obj/effect/spawner/random/waste/mechwreck = 40,
- /obj/effect/spawner/random/waste/mechwreck/rare = 10,
- /obj/effect/spawner/random/trash/decal = 180,
- /obj/effect/spawner/random/waste/radiation = 32,
- /obj/effect/spawner/random/waste/radiation/more_rads = 4,
- /obj/effect/spawner/random/waste/girder = 120,
+ /obj/effect/spawner/lootdrop/waste/mechwreck = 40,
+ /obj/effect/spawner/lootdrop/waste/mechwreck/rare = 10,
+ /obj/effect/spawner/lootdrop/waste/trash = 180,
+ /obj/effect/spawner/lootdrop/waste/radiation = 32,
+ /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 4,
+ /obj/effect/spawner/lootdrop/waste/girder = 120,
/obj/structure/reagent_dispensers/watertank = 40,
/obj/item/stack/cable_coil/cut = 100,
/obj/structure/closet/crate/secure/loot = 6,
- /obj/effect/spawner/random/waste/atmos_can = 10,
- /obj/effect/spawner/random/waste/atmos_can/rare = 1,
- /obj/effect/spawner/random/waste/salvageable = 60,
- /obj/effect/spawner/random/waste/grille_or_trash = 40,
- /obj/effect/spawner/random/maintenance = 4,
- /obj/effect/spawner/random/maintenance/two = 10,
- /obj/effect/spawner/random/maintenance/three = 20,
- /obj/effect/spawner/random/maintenance/four = 40,
- /obj/effect/spawner/random/waste/salvageable = 80,
+ /obj/effect/spawner/lootdrop/waste/atmos_can = 10,
+ /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1,
+ /obj/effect/spawner/lootdrop/waste/salvageable = 60,
+ /obj/effect/spawner/lootdrop/waste/grille_or_trash = 40,
+ /obj/effect/spawner/lootdrop/maintenance = 4,
+ /obj/effect/spawner/lootdrop/maintenance/two = 10,
+ /obj/effect/spawner/lootdrop/maintenance/three = 20,
+ /obj/effect/spawner/lootdrop/maintenance/four = 40,
+ /obj/effect/spawner/lootdrop/waste/salvageable = 80,
/obj/item/mine/proximity/spawner/manhack/live = 40,
- /obj/effect/spawner/random/mine = 8,
+ /obj/effect/spawner/lootdrop/mine = 8,
/obj/effect/spawner/minefield/manhack = 2
)
mob_spawn_list = list( //nor organics, more biased towards hivebots though
@@ -417,18 +417,18 @@
/datum/biome/cave/waste/metal/hivebot
flora_spawn_list = list(
- /obj/effect/spawner/random/trash/decal = 90,
- /obj/effect/spawner/random/waste/radiation = 16,
- /obj/effect/spawner/random/waste/radiation/more_rads = 2,
- /obj/effect/spawner/random/waste/girder = 60,
+ /obj/effect/spawner/lootdrop/waste/trash = 90,
+ /obj/effect/spawner/lootdrop/waste/radiation = 16,
+ /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 2,
+ /obj/effect/spawner/lootdrop/waste/girder = 60,
/obj/structure/reagent_dispensers/watertank = 20,
/obj/item/stack/cable_coil/cut = 50,
/obj/structure/closet/crate/secure/loot = 3,
- /obj/effect/spawner/random/maintenance = 2,
- /obj/effect/spawner/random/maintenance/two = 5,
- /obj/effect/spawner/random/maintenance/three = 10,
- /obj/effect/spawner/random/maintenance/four = 20,
- /obj/effect/spawner/random/waste/salvageable = 40,
+ /obj/effect/spawner/lootdrop/maintenance = 2,
+ /obj/effect/spawner/lootdrop/maintenance/two = 5,
+ /obj/effect/spawner/lootdrop/maintenance/three = 10,
+ /obj/effect/spawner/lootdrop/maintenance/four = 20,
+ /obj/effect/spawner/lootdrop/waste/salvageable = 40,
/obj/structure/foamedmetal = 100,
/obj/item/mine/proximity/spawner/manhack/live = 20
)
@@ -456,19 +456,19 @@
)
flora_spawn_list = list(
- /obj/effect/spawner/random/waste/mechwreck = 20,
- /obj/effect/spawner/random/trash/decal = 90,
- /obj/effect/spawner/random/waste/radiation = 16,
+ /obj/effect/spawner/lootdrop/waste/mechwreck = 20,
+ /obj/effect/spawner/lootdrop/waste/trash = 90,
+ /obj/effect/spawner/lootdrop/waste/radiation = 16,
/obj/structure/reagent_dispensers/watertank = 20,
/obj/item/stack/cable_coil/cut = 50,
/obj/structure/closet/crate/secure/loot = 3,
- /obj/effect/spawner/random/waste/atmos_can = 5,
- /obj/effect/spawner/random/waste/atmos_can/rare = 1,
- /obj/effect/spawner/random/waste/salvageable = 30,
- /obj/effect/spawner/random/maintenance = 2,
- /obj/effect/spawner/random/maintenance/two = 5,
- /obj/effect/spawner/random/maintenance/three = 10,
- /obj/effect/spawner/random/waste/salvageable = 40,
+ /obj/effect/spawner/lootdrop/waste/atmos_can = 5,
+ /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1,
+ /obj/effect/spawner/lootdrop/waste/salvageable = 30,
+ /obj/effect/spawner/lootdrop/maintenance = 2,
+ /obj/effect/spawner/lootdrop/maintenance/two = 5,
+ /obj/effect/spawner/lootdrop/maintenance/three = 10,
+ /obj/effect/spawner/lootdrop/waste/salvageable = 40,
)
mob_spawn_list = list(
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 80,
diff --git a/code/datums/mapgen/single_biome/WasteplanetCaves.dm b/code/datums/mapgen/single_biome/WasteplanetCaves.dm
index 3caf1c9429ad..08f63ba3149a 100644
--- a/code/datums/mapgen/single_biome/WasteplanetCaves.dm
+++ b/code/datums/mapgen/single_biome/WasteplanetCaves.dm
@@ -40,7 +40,7 @@
/obj/structure/salvageable/destructive_analyzer = 8,
/obj/structure/salvageable/server = 8,
/obj/item/mine/pressure/explosive/rusty/live = 30,
- /obj/effect/spawner/random/mine = 8
+ /obj/effect/spawner/lootdrop/mine = 8
)
feature_spawn_list = list(
/obj/structure/geyser/random = 1,
diff --git a/code/datums/votes/_vote_datum.dm b/code/datums/votes/_vote_datum.dm
index 7118695bf1bb..8c7b7234b516 100644
--- a/code/datums/votes/_vote_datum.dm
+++ b/code/datums/votes/_vote_datum.dm
@@ -156,7 +156,7 @@
/// Gets the winner of the vote, selecting a random choice from all choices based on their vote count.
/datum/vote/proc/get_random_winner()
- var/winner = pick_weight(choices)
+ var/winner = pickweight(choices)
return winner ? list(winner) : list()
/**
diff --git a/code/datums/weather/weather_controller.dm b/code/datums/weather/weather_controller.dm
index 30be3ebb23c5..ad4d5005c049 100644
--- a/code/datums/weather/weather_controller.dm
+++ b/code/datums/weather/weather_controller.dm
@@ -60,7 +60,7 @@
if(!possible_weathers)
return
next_weather = world.time + rand(wait_interval_low, wait_interval_high)
- next_weather_type = pick_weight(possible_weathers)
+ next_weather_type = pickweight(possible_weathers)
/datum/weather_controller/proc/run_weather(datum/weather/weather_datum_type, telegraph = TRUE)
if(!ispath(weather_datum_type, /datum/weather))
diff --git a/code/game/MapData/shuttles/nanotrasen_ranger.dm b/code/game/MapData/shuttles/nanotrasen_ranger.dm
index 06d988760722..08f1a7c670d2 100644
--- a/code/game/MapData/shuttles/nanotrasen_ranger.dm
+++ b/code/game/MapData/shuttles/nanotrasen_ranger.dm
@@ -283,9 +283,9 @@
//lootdrop
-/obj/effect/spawner/random/lpretrieval
+/obj/effect/spawner/lootdrop/lpretrieval
name = "LP Retrieval Missions"
- spawn_loot_double = FALSE
+ lootdoubles = FALSE
loot = list(
/obj/item/disk/holodisk/lp/retrieval/phazon = 1,
@@ -294,11 +294,11 @@
/obj/item/disk/holodisk/lp/retrieval/materials = 1
)
- spawn_loot_count = 2
+ lootcount = 2
-/obj/effect/spawner/random/lpaid
+/obj/effect/spawner/lootdrop/lpaid
name = "LP Aid Missions"
- spawn_loot_double = FALSE
+ lootdoubles = FALSE
loot = list(
/obj/item/disk/holodisk/lp/aid/repairs = 1,
@@ -306,5 +306,5 @@
/obj/item/disk/holodisk/lp/aid/guard = 1,
)
- spawn_loot_count = 4
+ lootcount = 4
diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm
index f8d681199094..b8dcd669d385 100644
--- a/code/game/gamemodes/dynamic/dynamic.dm
+++ b/code/game/gamemodes/dynamic/dynamic.dm
@@ -435,7 +435,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
/// Picks a random roundstart rule from the list given as an argument and executes it.
/datum/game_mode/dynamic/proc/picking_roundstart_rule(list/drafted_rules = list(), forced = FALSE)
- var/datum/dynamic_ruleset/roundstart/starting_rule = pick_weight(drafted_rules)
+ var/datum/dynamic_ruleset/roundstart/starting_rule = pickweight(drafted_rules)
if(!starting_rule)
log_game("DYNAMIC: Couldn't pick a starting ruleset. No rulesets available")
return FALSE
@@ -450,7 +450,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
if(drafted_rules.len <= 0)
log_game("DYNAMIC: Picking [starting_rule.name] failed due to blocking_rules and no more rulesets available. Report this.")
return FALSE
- starting_rule = pick_weight(drafted_rules)
+ starting_rule = pickweight(drafted_rules)
// Check if the ruleset is highlander and if a highlander ruleset has been executed
else if(starting_rule.flags & HIGHLANDER_RULESET) // Should already be filtered out, but making sure. Check filtering at end of proc if reported.
if(threat_level > GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking)
@@ -459,14 +459,14 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
if(drafted_rules.len <= 0)
log_game("DYNAMIC: Picking [starting_rule.name] failed due to no highlander stacking and no more rulesets available. Report this.")
return FALSE
- starting_rule = pick_weight(drafted_rules)
+ starting_rule = pickweight(drafted_rules)
// With low pop and high threat there might be rulesets that get executed with no valid candidates.
else if(!starting_rule.ready()) // Should already be filtered out, but making sure. Check filtering at end of proc if reported.
drafted_rules -= starting_rule
if(drafted_rules.len <= 0)
log_game("DYNAMIC: Picking [starting_rule.name] failed because there were not enough candidates and no more rulesets available. Report this.")
return FALSE
- starting_rule = pick_weight(drafted_rules)
+ starting_rule = pickweight(drafted_rules)
log_game("DYNAMIC: Picked a ruleset: [starting_rule.name]")
@@ -512,7 +512,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
/// Picks a random midround OR latejoin rule from the list given as an argument and executes it.
/// Also this could be named better.
/datum/game_mode/dynamic/proc/picking_midround_latejoin_rule(list/drafted_rules = list(), forced = FALSE)
- var/datum/dynamic_ruleset/rule = pick_weight(drafted_rules)
+ var/datum/dynamic_ruleset/rule = pickweight(drafted_rules)
if(!rule)
return FALSE
@@ -524,7 +524,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
drafted_rules -= rule
if(drafted_rules.len <= 0)
return FALSE
- rule = pick_weight(drafted_rules)
+ rule = pickweight(drafted_rules)
// Check if the ruleset is highlander and if a highlander ruleset has been executed
else if(rule.flags & HIGHLANDER_RULESET)
if(threat_level > GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking)
@@ -532,7 +532,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
drafted_rules -= rule
if(drafted_rules.len <= 0)
return FALSE
- rule = pick_weight(drafted_rules)
+ rule = pickweight(drafted_rules)
if(!rule.repeatable)
if(rule.ruletype == "Latejoin")
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index eca77ba4df5a..00bc1bc95e13 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -149,7 +149,7 @@
message_admins("Convert_roundtype failed due to no valid modes to convert to. Please report this error to the Coders.")
return null
- replacementmode = pick_weight(usable_modes)
+ replacementmode = pickweight(usable_modes)
var/matc = CONFIG_GET(number/midround_antag_time_check)
if(world.time >= (matc * 600))
@@ -272,7 +272,7 @@
reports += config.mode_reports[report_type]
Count++
for(var/i in Count to rand(3,5)) //Between three and five wrong entries on the list.
- var/false_report_type = pick_weight_allow_zero(report_weights)
+ var/false_report_type = pickweightAllowZero(report_weights)
report_weights[false_report_type] = 0 //Make it so the same false report won't be selected twice
reports += config.mode_reports[false_report_type]
diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm
index 93f3e5d98a15..7e9d90bb482f 100644
--- a/code/game/gamemodes/meteor/meteors.dm
+++ b/code/game/gamemodes/meteor/meteors.dm
@@ -50,7 +50,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
max_i--
if(max_i<=0)
return
- var/Me = pick_weight(meteortypes)
+ var/Me = pickweight(meteortypes)
var/obj/effect/meteor/M = new Me(pickedstart, pickedgoal)
M.dest = pickedgoal
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 4caca6b376d3..96fbbd8254d1 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -72,7 +72,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
var/list/gameodds = list(/obj/item/circuitboard/computer/arcade/battle = 49,
/obj/item/circuitboard/computer/arcade/orion_trail = 49,
/obj/item/circuitboard/computer/arcade/amputation = 2)
- var/thegame = pick_weight(gameodds)
+ var/thegame = pickweight(gameodds)
var/obj/item/circuitboard/CB = new thegame()
new CB.build_path(loc, CB)
return INITIALIZE_HINT_QDEL
@@ -93,9 +93,9 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
return
var/prizeselect
if(prize_override)
- prizeselect = pick_weight(prize_override)
+ prizeselect = pickweight(prize_override)
else
- prizeselect = pick_weight(GLOB.arcade_prize_pool)
+ prizeselect = pickweight(GLOB.arcade_prize_pool)
var/atom/movable/the_prize = new prizeselect(get_turf(src))
playsound(src, 'sound/machines/machine_vend.ogg', 50, TRUE, extrarange = -3)
visible_message("[src] dispenses [the_prize]!", "You hear a chime and a clunk.")
@@ -118,9 +118,9 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
num_of_prizes = rand(0,2)
for(var/i = num_of_prizes; i > 0; i--)
if(override)
- empprize = pick_weight(prize_override)
+ empprize = pickweight(prize_override)
else
- empprize = pick_weight(GLOB.arcade_prize_pool)
+ empprize = pickweight(GLOB.arcade_prize_pool)
new empprize(loc)
explosion(loc, -1, 0, 1+num_of_prizes, flame_range = 1+num_of_prizes)
@@ -635,7 +635,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
event = ORION_TRAIL_COLLISION
event()
else if(prob(75-gamerSkill))
- event = pick_weight(events)
+ event = pickweight(events)
if(lings_aboard)
if(event == ORION_TRAIL_LING || prob(55-gamerSkill))
event = ORION_TRAIL_LING_ATTACK
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 495b4c9ab666..ccc3e4f0286a 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -1,6 +1,6 @@
/obj/effect/landmark
name = "landmark"
- icon = 'icons/effects/mapping/landmarks_static.dmi'
+ icon = 'icons/effects/landmarks_static.dmi'
icon_state = "x2"
anchored = TRUE
layer = MID_LANDMARK_LAYER
@@ -210,7 +210,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
return ..()
/obj/effect/landmark/start/ai/secondary
- icon = 'icons/effects/mapping/landmarks_static.dmi'
+ icon = 'icons/effects/landmarks_static.dmi'
icon_state = "ai_spawn"
primary_ai = FALSE
latejoin_active = FALSE
@@ -249,7 +249,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
/obj/effect/landmark/start/wizard
name = "wizard"
- icon = 'icons/effects/mapping/landmarks_static.dmi'
+ icon = 'icons/effects/landmarks_static.dmi'
icon_state = "wiznerd_spawn"
/obj/effect/landmark/start/wizard/Initialize()
@@ -259,7 +259,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
/obj/effect/landmark/start/nukeop
name = "nukeop"
- icon = 'icons/effects/mapping/landmarks_static.dmi'
+ icon = 'icons/effects/landmarks_static.dmi'
icon_state = "snukeop_spawn"
/obj/effect/landmark/start/nukeop/Initialize()
@@ -269,7 +269,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
/obj/effect/landmark/start/nukeop_leader
name = "nukeop leader"
- icon = 'icons/effects/mapping/landmarks_static.dmi'
+ icon = 'icons/effects/landmarks_static.dmi'
icon_state = "snukeop_leader_spawn"
/obj/effect/landmark/start/nukeop_leader/Initialize()
diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm
index 986ad10eb187..73b96c29768c 100644
--- a/code/game/objects/effects/misc.dm
+++ b/code/game/objects/effects/misc.dm
@@ -9,6 +9,26 @@
/obj/effect/beam/singularity_pull()
return
+/obj/effect/spawner
+ name = "object spawner"
+
+// 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
+/obj/effect/spawner/Initialize(mapload)
+ SHOULD_CALL_PARENT(FALSE)
+ if(flags_1 & INITIALIZED_1)
+ stack_trace("Warning: [src]([type]) initialized multiple times!")
+ flags_1 |= INITIALIZED_1
+
+ return INITIALIZE_HINT_QDEL
+
+/obj/effect/spawner/Destroy(force)
+ SHOULD_CALL_PARENT(FALSE)
+ moveToNullspace()
+ return QDEL_HINT_QUEUE
+
/obj/effect/list_container
name = "list container"
diff --git a/code/game/objects/effects/spawners/bundle.dm b/code/game/objects/effects/spawners/bundle.dm
index 8ccaf334feae..f9f465bf47ab 100644
--- a/code/game/objects/effects/spawners/bundle.dm
+++ b/code/game/objects/effects/spawners/bundle.dm
@@ -1,150 +1,134 @@
-/obj/effect/spawner/costume
- name = "costume spawner"
+/obj/effect/spawner/bundle
+ name = "bundle spawner"
icon = 'icons/hud/screen_gen.dmi'
icon_state = "x2"
- color = COLOR_VIBRANT_LIME
+ color = "#00FF00"
var/list/items
-/obj/effect/spawner/costume/Initialize(mapload)
+/obj/effect/spawner/bundle/Initialize(mapload)
. = ..()
- if(items?.len)
+ if(items && items.len)
for(var/path in items)
new path(loc)
-/obj/effect/spawner/costume/gladiator
+/obj/effect/spawner/bundle/costume/gladiator
name = "gladiator costume spawner"
items = list(
/obj/item/clothing/under/costume/gladiator,
- /obj/item/clothing/head/helmet/gladiator
- )
+ /obj/item/clothing/head/helmet/gladiator)
-/obj/effect/spawner/costume/madscientist
+/obj/effect/spawner/bundle/costume/madscientist
name = "mad scientist costume spawner"
items = list(
/obj/item/clothing/under/rank/command/captain/suit,
/obj/item/clothing/head/flatcap,
- /obj/item/clothing/suit/toggle/labcoat/mad
- )
+ /obj/item/clothing/suit/toggle/labcoat/mad)
-/obj/effect/spawner/costume/elpresidente
+/obj/effect/spawner/bundle/costume/elpresidente
name = "el presidente costume spawner"
items = list(
/obj/item/clothing/under/rank/command/captain/suit,
/obj/item/clothing/head/flatcap,
/obj/item/clothing/mask/cigarette/cigar/havana,
- /obj/item/clothing/shoes/jackboots
- )
+ /obj/item/clothing/shoes/jackboots)
-/obj/effect/spawner/costume/nyangirl
+/obj/effect/spawner/bundle/costume/nyangirl
name = "nyangirl costume spawner"
items = list(
/obj/item/clothing/under/costume/schoolgirl,
/obj/item/clothing/head/kitty,
- /obj/item/clothing/glasses/blindfold
- )
+ /obj/item/clothing/glasses/blindfold)
-/obj/effect/spawner/costume/maid
+/obj/effect/spawner/bundle/costume/maid
name = "maid costume spawner"
items = list(
/obj/item/clothing/under/dress/skirt/color,
- /obj/effect/spawner/random/clothing/beret_or_rabbitears,
- /obj/item/clothing/glasses/blindfold
- )
+ /obj/effect/spawner/lootdrop/minor/beret_or_rabbitears,
+ /obj/item/clothing/glasses/blindfold)
-/obj/effect/spawner/costume/butler
+
+/obj/effect/spawner/bundle/costume/butler
name = "butler costume spawner"
items = list(
/obj/item/clothing/accessory/waistcoat,
/obj/item/clothing/under/suit/black,
- /obj/item/clothing/head/that
- )
+ /obj/item/clothing/head/that)
-/obj/effect/spawner/costume/highlander
+/obj/effect/spawner/bundle/costume/highlander
name = "highlander costume spawner"
items = list(
/obj/item/clothing/under/costume/kilt,
- /obj/item/clothing/head/beret
- )
+ /obj/item/clothing/head/beret)
-/obj/effect/spawner/costume/prig
+/obj/effect/spawner/bundle/costume/prig
name = "prig costume spawner"
items = list(
/obj/item/clothing/accessory/waistcoat,
- /obj/effect/spawner/random/clothing/bowler_or_that,
+ /obj/effect/spawner/lootdrop/minor/bowler_or_that,
/obj/item/clothing/shoes/sneakers/black,
/obj/item/cane,
/obj/item/clothing/under/suit/sl,
- /obj/item/clothing/mask/fakemoustache
- )
+ /obj/item/clothing/mask/fakemoustache)
-/obj/effect/spawner/costume/plaguedoctor
+/obj/effect/spawner/bundle/costume/plaguedoctor
name = "plague doctor costume spawner"
items = list(
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit,
- /obj/item/clothing/mask/gas/plaguedoctor
- )
+ /obj/item/clothing/mask/gas/plaguedoctor)
-/obj/effect/spawner/costume/nightowl
+/obj/effect/spawner/bundle/costume/nightowl
name = "night owl costume spawner"
items = list(
/obj/item/clothing/suit/toggle/owlwings,
/obj/item/clothing/under/costume/owl,
- /obj/item/clothing/mask/gas/owl_mask
- )
+ /obj/item/clothing/mask/gas/owl_mask)
-/obj/effect/spawner/costume/waiter
+/obj/effect/spawner/bundle/costume/waiter
name = "waiter costume spawner"
items = list(
/obj/item/clothing/under/suit/waiter,
- /obj/effect/spawner/random/clothing/kittyears_or_rabbitears,
- /obj/item/clothing/suit/apron
- )
+ /obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
+ /obj/item/clothing/suit/apron)
-/obj/effect/spawner/costume/pirate
+/obj/effect/spawner/bundle/costume/pirate
name = "pirate costume spawner"
items = list(
/obj/item/clothing/under/costume/pirate,
/obj/item/clothing/suit/pirate,
- /obj/effect/spawner/random/clothing/pirate_or_bandana,
- /obj/item/clothing/glasses/eyepatch
- )
+ /obj/effect/spawner/lootdrop/minor/pirate_or_bandana,
+ /obj/item/clothing/glasses/eyepatch)
-/obj/effect/spawner/costume/cutewitch
+/obj/effect/spawner/bundle/costume/cutewitch
name = "cute witch costume spawner"
items = list(
/obj/item/clothing/under/dress/sundress,
- /obj/item/staff/broom
- )
+ /obj/item/staff/broom)
-/obj/effect/spawner/costume/mafia
+/obj/effect/spawner/bundle/costume/mafia
name = "black mafia outfit spawner"
items = list(
/obj/item/clothing/head/fedora,
/obj/item/clothing/under/suit/blacktwopiece,
- /obj/item/clothing/shoes/laceup
- )
+ /obj/item/clothing/shoes/laceup)
-/obj/effect/spawner/costume/mafia/white
+/obj/effect/spawner/bundle/costume/mafia/white
name = "white mafia outfit spawner"
items = list(
/obj/item/clothing/head/fedora/white,
/obj/item/clothing/under/suit/white,
- /obj/item/clothing/shoes/laceup
- )
+ /obj/item/clothing/shoes/laceup)
-/obj/effect/spawner/costume/mafia/checkered
+/obj/effect/spawner/bundle/costume/mafia/checkered
name = "checkered mafia outfit spawner"
items = list(
/obj/item/clothing/head/fedora,
/obj/item/clothing/under/suit/checkered,
- /obj/item/clothing/shoes/laceup
- )
+ /obj/item/clothing/shoes/laceup)
-/obj/effect/spawner/costume/mafia/beige
+/obj/effect/spawner/bundle/costume/mafia/beige
name = "beige mafia outfit spawner"
items = list(
/obj/item/clothing/head/fedora/beige,
/obj/item/clothing/under/suit/beige,
- /obj/item/clothing/shoes/laceup
- )
+ /obj/item/clothing/shoes/laceup)
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
new file mode 100644
index 000000000000..b0239c8f5fdd
--- /dev/null
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -0,0 +1,1314 @@
+/obj/effect/spawner/lootdrop
+ icon = 'icons/effects/landmarks_static.dmi'
+ icon_state = "random_loot"
+ layer = OBJ_LAYER
+ var/lootcount = 1 //how many items will be spawned
+ var/lootdoubles = TRUE //if the same item can be spawned twice
+ var/list/loot //a list of possible items to spawn e.g. list(/obj/item, /obj/structure, /obj/effect)
+ var/fan_out_items = FALSE //Whether the items should be distributed to offsets 0,1,-1,2,-2,3,-3.. This overrides pixel_x/y on the spawner itself
+
+/obj/effect/spawner/lootdrop/Initialize(mapload)
+ . = ..()
+ if(loot && loot.len)
+ var/loot_spawned = 0
+ while((lootcount-loot_spawned) && loot.len)
+ var/lootspawn = pickweight_float(loot) // WS edit - Fix various startup runtimes
+ while(islist(lootspawn))
+ lootspawn = pickweight_float(lootspawn) // WS edit - Fix various startup runtimes
+ if(!lootdoubles)
+ loot.Remove(lootspawn)
+
+ if(lootspawn)
+ var/atom/movable/spawned_loot = new lootspawn(loc)
+ if (!fan_out_items)
+ if (pixel_x != 0)
+ spawned_loot.pixel_x = pixel_x
+ if (pixel_y != 0)
+ spawned_loot.pixel_y = pixel_y
+ else
+ if (loot_spawned)
+ spawned_loot.pixel_x = spawned_loot.pixel_y = ((!(loot_spawned%2)*loot_spawned/2)*-1)+((loot_spawned%2)*(loot_spawned+1)/2*1)
+ else
+ break // WS edit - Support spawn weights of 0 in loot tables and ruins
+ loot_spawned++
+
+/obj/effect/spawner/lootdrop/donkpockets
+ name = "donk pocket box spawner"
+ lootdoubles = FALSE
+
+ loot = list(
+ /obj/item/storage/box/donkpockets/donkpocketspicy = 1,
+ /obj/item/storage/box/donkpockets/donkpocketteriyaki = 1,
+ /obj/item/storage/box/donkpockets/donkpocketpizza = 1,
+ /obj/item/storage/box/donkpockets/donkpocketberry = 1,
+ /obj/item/storage/box/donkpockets/donkpockethonk = 1,
+ )
+
+
+/obj/effect/spawner/lootdrop/armory_contraband
+ name = "armory contraband gun spawner"
+ lootdoubles = FALSE
+
+ loot = list(
+ /obj/item/gun/ballistic/automatic/pistol/ringneck = 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/ringneck = 5,
+ /obj/item/gun/ballistic/shotgun/automatic/combat = 5,
+ /obj/item/gun/ballistic/automatic/pistol/deagle,
+ /obj/item/storage/box/syndie_kit/throwing_weapons = 3,
+ /obj/item/gun/ballistic/revolver/mateba)
+
+/obj/effect/spawner/lootdrop/armory_contraband/donutstation
+ loot = list(/obj/item/grenade/clusterbuster/teargas = 5,
+ /obj/item/gun/ballistic/shotgun/automatic/combat = 5,
+ /obj/item/bikehorn/golden,
+ /obj/item/grenade/clusterbuster,
+ /obj/item/storage/box/syndie_kit/throwing_weapons = 3,
+ /obj/item/gun/ballistic/revolver/mateba)
+
+/obj/effect/spawner/lootdrop/prison_contraband
+ name = "prison contraband loot spawner"
+ loot = list(/obj/item/clothing/mask/cigarette/space_cigarette = 4,
+ /obj/item/clothing/mask/cigarette/robust = 2,
+ /obj/item/clothing/mask/cigarette/carp = 3,
+ /obj/item/clothing/mask/cigarette/uplift = 2,
+ /obj/item/clothing/mask/cigarette/dromedary = 3,
+ /obj/item/clothing/mask/cigarette/robustgold = 1,
+ /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
+ /obj/item/storage/fancy/cigarettes = 3,
+ /obj/item/clothing/mask/cigarette/rollie/cannabis = 4,
+ /obj/item/toy/crayon/spraycan = 2,
+ /obj/item/crowbar = 1,
+ /obj/item/assembly/flash/handheld = 1,
+ /obj/item/restraints/handcuffs/cable/zipties = 1,
+ /obj/item/restraints/handcuffs = 1,
+ /obj/item/radio = 1,
+ /obj/item/lighter = 3,
+ /obj/item/storage/box/matches = 3,
+ /obj/item/reagent_containers/syringe/contraband/space_drugs = 1,
+ /obj/item/reagent_containers/syringe/contraband/krokodil = 1,
+ /obj/item/reagent_containers/syringe/contraband/crank = 1,
+ /obj/item/reagent_containers/syringe/contraband/methamphetamine = 1,
+ /obj/item/reagent_containers/syringe/contraband/bath_salts = 1,
+ /obj/item/reagent_containers/syringe/contraband/fentanyl = 1,
+ /obj/item/reagent_containers/syringe/contraband/morphine = 1,
+ /obj/item/storage/pill_bottle/happy = 1,
+ /obj/item/storage/pill_bottle/lsd = 1,
+ /obj/item/storage/pill_bottle/psicodine = 1,
+ /obj/item/reagent_containers/food/drinks/beer = 4,
+ /obj/item/reagent_containers/food/drinks/bottle/whiskey = 1,
+ /obj/item/paper/fluff/jobs/prisoner/letter = 1,
+ /obj/item/grenade/smokebomb = 1,
+ /obj/item/flashlight/seclite = 1,
+ /obj/item/melee/knife/shiv = 4,
+ /obj/item/melee/knife/shiv/carrot = 1,
+ /obj/item/melee/knife/kitchen = 1,
+ /obj/item/storage/wallet/random = 1,
+ /obj/item/pda = 1
+ )
+
+/obj/effect/spawner/lootdrop/gambling
+ name = "gambling valuables spawner"
+ loot = list(
+ /obj/item/clothing/head/trapper = 3,
+ /obj/item/storage/box/syndie_kit/throwing_weapons,
+ /obj/item/coin/gold,
+ /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
+ )
+
+/obj/effect/spawner/lootdrop/grille_or_trash
+ name = "maint grille or trash spawner"
+ loot = list(/obj/structure/grille = 5,
+ /obj/item/flashlight/flare/burnt = 1,
+ /obj/item/cigbutt = 1,
+ /obj/item/trash/cheesie = 1,
+ /obj/item/trash/candy = 1,
+ /obj/item/trash/chips = 1,
+ /obj/item/reagent_containers/food/snacks/deadmouse = 1,
+ /obj/item/trash/pistachios = 1,
+ /obj/item/trash/plate = 1,
+ /obj/item/trash/popcorn = 1,
+ /obj/item/trash/raisins = 1,
+ /obj/item/trash/sosjerky = 1,
+ /obj/item/trash/syndi_cakes = 1)
+
+/obj/effect/spawner/lootdrop/three_course_meal
+ name = "three course meal spawner"
+ lootcount = 3
+ lootdoubles = FALSE
+ var/soups = list(
+ /obj/item/reagent_containers/food/snacks/soup/beet,
+ /obj/item/reagent_containers/food/snacks/soup/sweetpotato,
+ /obj/item/reagent_containers/food/snacks/soup/stew,
+ /obj/item/reagent_containers/food/snacks/soup/hotchili,
+ /obj/item/reagent_containers/food/snacks/soup/nettle,
+ /obj/item/reagent_containers/food/snacks/soup/meatball)
+ var/salads = list(
+ /obj/item/reagent_containers/food/snacks/salad/herbsalad,
+ /obj/item/reagent_containers/food/snacks/salad/validsalad,
+ /obj/item/reagent_containers/food/snacks/salad/fruit,
+ /obj/item/reagent_containers/food/snacks/salad/jungle,
+ /obj/item/reagent_containers/food/snacks/salad/aesirsalad)
+ var/mains = list(
+ /obj/item/reagent_containers/food/snacks/bearsteak,
+ /obj/item/reagent_containers/food/snacks/enchiladas,
+ /obj/item/reagent_containers/food/snacks/stewedsoymeat,
+ /obj/item/reagent_containers/food/snacks/burger/bigbite,
+ /obj/item/reagent_containers/food/snacks/burger/superbite,
+ /obj/item/reagent_containers/food/snacks/burger/fivealarm)
+
+/obj/effect/spawner/lootdrop/three_course_meal/Initialize(mapload)
+ loot = list(pick(soups) = 1,pick(salads) = 1,pick(mains) = 1)
+ . = ..()
+
+/obj/effect/spawner/lootdrop/maintenance
+ name = "maintenance loot spawner"
+ // see code/_globalvars/lists/maintenance_loot.dm for loot table
+
+/obj/effect/spawner/lootdrop/maintenance/Initialize(mapload)
+ loot = GLOB.maintenance_loot
+ . = ..()
+
+/obj/effect/spawner/lootdrop/maintenance/two
+ name = "2 x maintenance loot spawner"
+ lootcount = 2
+
+/obj/effect/spawner/lootdrop/maintenance/three
+ name = "3 x maintenance loot spawner"
+ lootcount = 3
+
+/obj/effect/spawner/lootdrop/maintenance/four
+ name = "4 x maintenance loot spawner"
+ lootcount = 4
+
+/obj/effect/spawner/lootdrop/maintenance/five
+ name = "5 x maintenance loot spawner"
+ lootcount = 5
+
+/obj/effect/spawner/lootdrop/maintenance/six
+ name = "6 x maintenance loot spawner"
+ lootcount = 6
+
+/obj/effect/spawner/lootdrop/maintenance/seven
+ name = "7 x maintenance loot spawner"
+ lootcount = 7
+
+/obj/effect/spawner/lootdrop/maintenance/eight
+ name = "8 x maintenance loot spawner"
+ lootcount = 8
+
+/obj/effect/spawner/lootdrop/crate_spawner
+ name = "lootcrate spawner" //USE PROMO CODE "SELLOUT" FOR 20% OFF!
+ lootdoubles = FALSE
+
+ loot = list(
+ /obj/structure/closet/crate/secure/loot = 20,
+ "" = 80
+ )
+
+/obj/effect/spawner/lootdrop/organ_spawner
+ name = "ayylien organ spawner"
+ loot = list(
+ /obj/item/organ/heart/gland/electric = 3,
+ /obj/item/organ/heart/gland/trauma = 4,
+ /obj/item/organ/heart/gland/egg = 7,
+ /obj/item/organ/heart/gland/chem = 5,
+ /obj/item/organ/heart/gland/mindshock = 5,
+ /obj/item/organ/heart/gland/plasma = 7,
+ /obj/item/organ/heart/gland/transform = 5,
+ /obj/item/organ/heart/gland/slime = 4,
+ /obj/item/organ/heart/gland/spiderman = 5,
+ /obj/item/organ/heart/gland/ventcrawling = 1,
+ /obj/item/organ/body_egg/alien_embryo = 1,
+ /obj/item/organ/regenerative_core = 2)
+ lootcount = 3
+
+/obj/effect/spawner/lootdrop/memeorgans
+ name = "meme organ spawner"
+ loot = list(
+ /obj/item/organ/ears/penguin,
+ /obj/item/organ/ears/cat,
+ /obj/item/organ/eyes/compound,
+ /obj/item/organ/eyes/snail,
+ /obj/item/organ/tongue/bone,
+ /obj/item/organ/tongue/fly,
+ /obj/item/organ/tongue/snail,
+ /obj/item/organ/tongue/lizard,
+ /obj/item/organ/tongue/alien,
+ /obj/item/organ/tongue/ethereal,
+ /obj/item/organ/tongue/robot,
+ /obj/item/organ/tongue/zombie,
+ /obj/item/organ/appendix,
+ /obj/item/organ/liver/fly,
+ /obj/item/organ/lungs/plasmaman,
+ /obj/item/organ/tail/cat,
+ /obj/item/organ/tail/lizard)
+ lootcount = 5
+
+/obj/effect/spawner/lootdrop/rnd
+ name = "random RND spawner"
+ loot = list(
+ /obj/item/storage/box/rndmining,
+ /obj/item/storage/box/rndengi,
+ /obj/item/storage/box/rndsec,
+ /obj/item/storage/box/rndciv,
+ /obj/item/storage/box/rndmed)
+ lootcount = 1
+
+/obj/effect/spawner/lootdrop/two_percent_xeno_egg_spawner
+ name = "2% chance xeno egg spawner"
+ loot = list(
+ /obj/effect/decal/remains/xeno = 49,
+ /obj/effect/spawner/xeno_egg_delivery = 1)
+
+/obj/effect/spawner/lootdrop/costume
+ name = "random costume spawner"
+
+/obj/effect/spawner/lootdrop/costume/Initialize()
+ loot = list()
+ for(var/path in subtypesof(/obj/effect/spawner/bundle/costume))
+ loot[path] = TRUE
+ . = ..()
+
+// Minor lootdrops follow
+
+/obj/effect/spawner/lootdrop/minor/beret_or_rabbitears
+ name = "beret or rabbit ears spawner"
+ loot = list(
+ /obj/item/clothing/head/beret = 1)
+
+/obj/effect/spawner/lootdrop/minor/bowler_or_that
+ name = "bowler or top hat spawner"
+ loot = list(
+ /obj/item/clothing/head/that = 1)
+
+/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears
+ name = "kitty ears or rabbit ears spawner"
+ loot = list(
+ /obj/item/clothing/head/kitty = 1)
+
+/obj/effect/spawner/lootdrop/minor/pirate_or_bandana
+ name = "pirate hat or bandana spawner"
+ loot = list(
+ /obj/item/clothing/head/pirate = 1,
+ /obj/item/clothing/head/bandana = 1)
+
+/obj/effect/spawner/lootdrop/minor/twentyfive_percent_cyborg_mask
+ name = "25% cyborg mask spawner"
+ loot = list(
+ /obj/item/clothing/mask/gas/cyborg = 25,
+ "" = 75)
+
+/obj/effect/spawner/lootdrop/aimodule_harmless // These shouldn't allow the AI to start butchering people
+ name = "harmless AI module spawner"
+ loot = list(
+ /obj/item/aiModule/core/full/asimov,
+ /obj/item/aiModule/core/full/asimovpp,
+ /obj/item/aiModule/core/full/hippocratic,
+ /obj/item/aiModule/core/full/paladin_devotion,
+ /obj/item/aiModule/core/full/paladin
+ )
+
+/obj/effect/spawner/lootdrop/aimodule_neutral // These shouldn't allow the AI to start butchering people without reason
+ name = "neutral AI module spawner"
+ loot = list(
+ /obj/item/aiModule/core/full/corp,
+ /obj/item/aiModule/core/full/maintain,
+ /obj/item/aiModule/core/full/drone,
+ /obj/item/aiModule/core/full/peacekeeper,
+ /obj/item/aiModule/core/full/reporter,
+ /obj/item/aiModule/core/full/robocop,
+ /obj/item/aiModule/core/full/liveandletlive,
+ /obj/item/aiModule/core/full/hulkamania
+ )
+
+/obj/effect/spawner/lootdrop/aimodule_harmful // These will get the shuttle called
+ name = "harmful AI module spawner"
+ loot = list(
+ /obj/item/aiModule/core/full/antimov,
+ /obj/item/aiModule/core/full/balance,
+ /obj/item/aiModule/core/full/tyrant,
+ /obj/item/aiModule/core/full/thermurderdynamic,
+ /obj/item/aiModule/core/full/damaged,
+ /obj/item/aiModule/reset/purge
+ )
+
+// Tech storage circuit board spawners
+
+/obj/effect/spawner/lootdrop/techstorage
+ name = "generic circuit board spawner"
+ lootdoubles = FALSE
+ fan_out_items = TRUE
+ lootcount = INFINITY
+
+/obj/effect/spawner/lootdrop/techstorage/service
+ name = "service circuit board spawner"
+ loot = list(
+ /obj/item/circuitboard/computer/arcade/battle,
+ /obj/item/circuitboard/computer/arcade/orion_trail,
+ /obj/item/circuitboard/machine/autolathe,
+ /obj/item/circuitboard/computer/mining,
+ /obj/item/circuitboard/machine/ore_redemption,
+ /obj/item/circuitboard/machine/vending/mining_equipment,
+ /obj/item/circuitboard/machine/microwave,
+ /obj/item/circuitboard/machine/chem_dispenser/drinks,
+ /obj/item/circuitboard/machine/chem_dispenser/drinks/beer,
+ /obj/item/circuitboard/computer/slot_machine
+ )
+
+/obj/effect/spawner/lootdrop/techstorage/rnd
+ name = "RnD circuit board spawner"
+ loot = list(
+ /obj/item/circuitboard/computer/aifixer,
+ /obj/item/circuitboard/machine/rdserver,
+ /obj/item/circuitboard/machine/mechfab,
+ /obj/item/circuitboard/machine/circuit_imprinter/department,
+ /obj/item/circuitboard/computer/teleporter,
+ /obj/item/circuitboard/machine/destructive_analyzer,
+ /obj/item/circuitboard/computer/rdconsole,
+ /obj/item/circuitboard/computer/nanite_chamber_control,
+ /obj/item/circuitboard/computer/nanite_cloud_controller,
+ /obj/item/circuitboard/machine/nanite_chamber,
+ /obj/item/circuitboard/machine/nanite_programmer,
+ /obj/item/circuitboard/machine/nanite_program_hub
+ )
+
+/obj/effect/spawner/lootdrop/techstorage/security
+ name = "security circuit board spawner"
+ loot = list(
+ /obj/item/circuitboard/computer/secure_data,
+ /obj/item/circuitboard/computer/security,
+ /obj/item/circuitboard/computer/prisoner
+ )
+
+/obj/effect/spawner/lootdrop/techstorage/engineering
+ name = "engineering circuit board spawner"
+ loot = list(
+ /obj/item/circuitboard/computer/atmos_alert,
+ /obj/item/circuitboard/computer/stationalert,
+ /obj/item/circuitboard/computer/powermonitor
+ )
+
+/obj/effect/spawner/lootdrop/techstorage/tcomms
+ name = "tcomms circuit board spawner"
+ loot = list(
+ /obj/item/circuitboard/computer/message_monitor,
+ /obj/item/circuitboard/machine/telecomms/broadcaster,
+ /obj/item/circuitboard/machine/telecomms/bus,
+ /obj/item/circuitboard/machine/telecomms/server,
+ /obj/item/circuitboard/machine/telecomms/receiver,
+ /obj/item/circuitboard/machine/telecomms/processor,
+ /obj/item/circuitboard/machine/announcement_system,
+ /obj/item/circuitboard/computer/comm_server,
+ /obj/item/circuitboard/computer/comm_monitor
+ )
+
+/obj/effect/spawner/lootdrop/techstorage/medical
+ name = "medical circuit board spawner"
+ loot = list(
+ /obj/item/circuitboard/machine/chem_dispenser,
+ /obj/item/circuitboard/computer/scan_consolenew,
+ /obj/item/circuitboard/computer/med_data,
+ /obj/item/circuitboard/machine/smoke_machine,
+ /obj/item/circuitboard/machine/chem_master,
+ /obj/item/circuitboard/machine/dnascanner,
+ /obj/item/circuitboard/computer/pandemic
+ )
+
+/obj/effect/spawner/lootdrop/techstorage/AI
+ name = "secure AI circuit board spawner"
+ loot = list(
+ /obj/item/circuitboard/computer/aiupload,
+ /obj/item/circuitboard/computer/borgupload,
+ /obj/item/circuitboard/aicore
+ )
+
+/obj/effect/spawner/lootdrop/techstorage/command
+ name = "secure command circuit board spawner"
+ loot = list(
+ /obj/item/circuitboard/computer/crew,
+ /obj/item/circuitboard/computer/communications,
+ /obj/item/circuitboard/computer/card
+ )
+
+/obj/effect/spawner/lootdrop/techstorage/RnD_secure
+ name = "secure RnD circuit board spawner"
+ loot = list(
+ /obj/item/circuitboard/computer/mecha_control,
+ /obj/item/circuitboard/computer/apc_control,
+ /obj/item/circuitboard/computer/robotics
+ )
+
+/obj/effect/spawner/lootdrop/mafia_outfit
+ name = "mafia outfit spawner"
+ loot = list(
+ /obj/effect/spawner/bundle/costume/mafia = 20,
+ /obj/effect/spawner/bundle/costume/mafia/white = 5,
+ /obj/effect/spawner/bundle/costume/mafia/checkered = 2,
+ /obj/effect/spawner/bundle/costume/mafia/beige = 5
+ )
+
+/obj/effect/spawner/lootdrop/salvage_machine
+ name = "salvageable machine spawner"
+ loot = list(
+ /obj/structure/salvageable/protolathe,
+ /obj/structure/salvageable/circuit_imprinter,
+ /obj/structure/salvageable/server,
+ /obj/structure/salvageable/machine,
+ /obj/structure/salvageable/autolathe,
+ /obj/structure/salvageable/computer,
+ /obj/structure/salvageable/destructive_analyzer
+ )
+
+/obj/effect/spawner/lootdrop/ripley
+ name = "25% exosuit 75% wreckage ripley spawner"
+ loot = list(/obj/mecha/working/ripley/mining = 1,
+ /obj/structure/mecha_wreckage/ripley = 5)
+ lootdoubles = FALSE
+
+/obj/effect/spawner/lootdrop/salvage_50
+ name = "50% salvage spawner"
+ loot = list(
+ /obj/effect/spawner/lootdrop/maintenance = 13,
+ /obj/effect/spawner/lootdrop/salvage_machine = 12,
+ /obj/effect/spawner/lootdrop/ripley = 12,
+ /obj/structure/closet/crate/secure/loot = 13,
+ "" = 50
+ )
+
+//finds the probabilities of items spawning from a loot spawner's loot pool
+/obj/item/loot_table_maker
+ icon = 'icons/effects/landmarks_static.dmi'
+ icon_state = "random_loot"
+ var/spawner_to_test = /obj/effect/spawner/lootdrop/maintenance //what lootdrop spawner to use the loot pool of
+ var/loot_count = 180 //180 is about how much maint loot spawns per map as of 11/14/2019
+ //result outputs
+ var/list/spawned_table //list of all items "spawned" and how many
+ var/list/stat_table //list of all items "spawned" and their occurrance probability
+
+/obj/item/loot_table_maker/Initialize()
+ . = ..()
+ make_table()
+
+/obj/item/loot_table_maker/attack_self(mob/user)
+ to_chat(user, "Loot pool re-rolled.")
+ make_table()
+
+/obj/item/loot_table_maker/proc/make_table()
+ spawned_table = list()
+ stat_table = list()
+ var/obj/effect/spawner/lootdrop/spawner_to_table = new spawner_to_test
+ var/lootpool = spawner_to_table.loot
+ qdel(spawner_to_table)
+ for(var/i in 1 to loot_count)
+ var/loot_spawn = pick_loot(lootpool)
+ if(!loot_spawn) // WS edit - Support spawn weights of 0 in loot tables and ruins
+ continue
+ if(!(loot_spawn in spawned_table))
+ spawned_table[loot_spawn] = 1
+ else
+ spawned_table[loot_spawn] += 1
+ stat_table += spawned_table
+ for(var/item in stat_table)
+ stat_table[item] /= loot_count
+
+/obj/item/loot_table_maker/proc/pick_loot(lootpool) //selects path from loot table and returns it
+ var/lootspawn = pickweight_float(lootpool) // WS edit - Fix various startup runtimes
+ while(islist(lootspawn))
+ lootspawn = pickweight_float(lootspawn) // WS edit - Fix various startup runtimes
+ return lootspawn
+
+/obj/effect/spawner/lootdrop/stockparts
+ name = "random good stock parts"
+ lootcount = 6
+ loot = list(
+ /obj/item/stock_parts/capacitor/adv,
+ /obj/item/stock_parts/capacitor/quadratic,
+ /obj/item/stock_parts/capacitor/super,
+ /obj/item/stock_parts/cell/hyper,
+ /obj/item/stock_parts/cell/super,
+ /obj/item/stock_parts/cell/bluespace,
+ /obj/item/stock_parts/matter_bin/bluespace,
+ /obj/item/stock_parts/matter_bin/super,
+ /obj/item/stock_parts/matter_bin/adv,
+ /obj/item/stock_parts/micro_laser/ultra,
+ /obj/item/stock_parts/micro_laser/quadultra,
+ /obj/item/stock_parts/micro_laser/high,
+ /obj/item/stock_parts/scanning_module/triphasic,
+ /obj/item/stock_parts/scanning_module/phasic,
+ /obj/item/stock_parts/scanning_module/adv,
+ /obj/item/reagent_containers/glass/beaker/bluespace,
+ /obj/item/reagent_containers/glass/beaker/plastic,
+ /obj/item/reagent_containers/glass/beaker/large,
+ /obj/item/stock_parts/manipulator/nano,
+ /obj/item/stock_parts/manipulator/pico,
+ /obj/item/stock_parts/manipulator/femto
+ )
+
+/obj/effect/spawner/lootdrop/materials
+ name = "random bulk materials"
+ lootcount = 2
+ loot = list(
+ /obj/item/stack/sheet/plastic/fifty,
+ /obj/item/stack/sheet/bluespace_crystal/twenty,
+ /obj/item/stack/sheet/cardboard/fifty,
+ /obj/item/stack/sheet/glass/fifty,
+ /obj/item/stack/sheet/metal/fifty,
+ /obj/item/stack/sheet/plasteel/twenty,
+ /obj/item/stack/sheet/mineral/plasma/fifty,
+ /obj/item/stack/sheet/mineral/silver/fifty,
+ /obj/item/stack/sheet/mineral/titanium/fifty,
+ /obj/item/stack/sheet/mineral/uranium/fifty,
+ /obj/item/stack/sheet/mineral/wood/fifty,
+ /obj/item/stack/sheet/mineral/diamond/twenty,
+ /obj/item/stack/sheet/mineral/gold/fifty,
+
+ /obj/item/stack/cable_coil/red,
+ /obj/item/stack/rods/fifty
+ )
+
+/obj/effect/spawner/lootdrop/singularitygen
+ name = "Tesla or Singulo spawner"
+ lootdoubles = FALSE
+
+ loot = list(
+ /obj/machinery/the_singularitygen/tesla = 1,
+ /obj/machinery/the_singularitygen = 1,
+ )
+
+/obj/effect/spawner/lootdrop/stockparts
+ name = "random good stock parts"
+ lootcount = 5
+ loot = list(
+ /obj/item/stock_parts/capacitor/adv,
+ /obj/item/stock_parts/capacitor/quadratic,
+ /obj/item/stock_parts/capacitor/super,
+ /obj/item/stock_parts/cell/hyper,
+ /obj/item/stock_parts/cell/super,
+ /obj/item/stock_parts/cell/bluespace,
+ /obj/item/stock_parts/matter_bin/bluespace,
+ /obj/item/stock_parts/matter_bin/super,
+ /obj/item/stock_parts/matter_bin/adv,
+ /obj/item/stock_parts/micro_laser/ultra,
+ /obj/item/stock_parts/micro_laser/quadultra,
+ /obj/item/stock_parts/micro_laser/high,
+ /obj/item/stock_parts/scanning_module/triphasic,
+ /obj/item/stock_parts/scanning_module/phasic,
+ /obj/item/stock_parts/scanning_module/adv,
+ /obj/item/reagent_containers/glass/beaker/bluespace,
+ /obj/item/reagent_containers/glass/beaker/plastic,
+ /obj/item/reagent_containers/glass/beaker/large,
+ /obj/item/stock_parts/manipulator/nano,
+ /obj/item/stock_parts/manipulator/pico,
+ /obj/item/stock_parts/manipulator/femto
+ )
+
+/obj/effect/spawner/lootdrop/materials
+ name = "random materials"
+ lootcount = 3
+ loot = list(
+ /obj/item/stack/sheet/plastic/fifty,
+ /obj/item/stack/sheet/plastic/five,
+ /obj/item/stack/sheet/bluespace_crystal/twenty,
+ /obj/item/stack/sheet/bluespace_crystal/five,
+ /obj/item/stack/sheet/cardboard/fifty,
+ /obj/item/stack/sheet/glass/fifty,
+ /obj/item/stack/sheet/metal/fifty,
+ /obj/item/stack/sheet/metal/twenty,
+ /obj/item/stack/sheet/plasteel/twenty,
+ /obj/item/stack/sheet/mineral/plasma/fifty,
+ /obj/item/stack/sheet/mineral/plasma/twenty,
+ /obj/item/stack/sheet/mineral/silver/fifty,
+ /obj/item/stack/sheet/mineral/titanium/twenty,
+ /obj/item/stack/sheet/mineral/uranium/twenty,
+ /obj/item/stack/sheet/mineral/wood/fifty,
+ /obj/item/stack/sheet/mineral/diamond/twenty,
+ /obj/item/stack/sheet/mineral/gold/fifty,
+ /obj/item/stack/cable_coil/red,
+ /obj/item/stack/rods/fifty
+ )
+
+/obj/effect/spawner/lootdrop/donut
+ name = "random donut" //donut :)
+ lootcount = 1
+ loot = list(
+ /obj/item/reagent_containers/food/snacks/donut/apple = 1,
+ /obj/item/reagent_containers/food/snacks/donut/berry = 1,
+ /obj/item/reagent_containers/food/snacks/donut/caramel = 1,
+ /obj/item/reagent_containers/food/snacks/donut/choco = 1,
+ /obj/item/reagent_containers/food/snacks/donut/laugh = 1,
+ /obj/item/reagent_containers/food/snacks/donut/matcha = 1,
+ /obj/item/reagent_containers/food/snacks/donut/meat = 1,
+ /obj/item/reagent_containers/food/snacks/donut/plain = 1,
+ /obj/item/reagent_containers/food/snacks/donut/trumpet = 1,
+ /obj/item/reagent_containers/food/snacks/donut/blumpkin = 1,
+ /obj/item/reagent_containers/food/snacks/donut/bungo = 1,
+ /obj/item/reagent_containers/food/snacks/donut/chaos = 1,
+ )
+
+/obj/effect/spawner/lootdrop/donut/jelly
+ name = "random jelly donut"
+ lootcount = 1
+ loot = list(
+ /obj/item/reagent_containers/food/snacks/donut/jelly/berry = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/apple = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/blumpkin = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/bungo = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/caramel = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/choco = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/laugh = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/matcha = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/trumpet = 1,
+ )
+
+/obj/effect/spawner/lootdrop/donut/slimejelly
+ name = "random slimejelly donut"
+ lootcount = 1
+ loot = list(
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/apple = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/berry = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/blumpkin = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/bungo = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/caramel = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/choco = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/laugh = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/matcha = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/trumpet = 1,
+ )
+
+/obj/effect/spawner/lootdrop/seeded
+ name = "GO FORTH AND CULTIVATE"
+ icon = 'icons/obj/hydroponics/seeds.dmi'
+ icon_state = "seed"//sneed
+ loot = list(
+ /obj/item/seeds/aloe,
+ /obj/item/seeds/ambrosia,
+ /obj/item/seeds/apple,
+ /obj/item/seeds/cotton,
+ /obj/item/seeds/banana,
+ /obj/item/seeds/berry,
+ /obj/item/seeds/cabbage,
+ /obj/item/seeds/carrot,
+ /obj/item/seeds/cherry,
+ /obj/item/seeds/chanter,
+ /obj/item/seeds/chili,
+ /obj/item/seeds/cocoapod,
+ /obj/item/seeds/coffee,
+ /obj/item/seeds/corn,
+ /obj/item/seeds/eggplant,
+ /obj/item/seeds/garlic,
+ /obj/item/seeds/grape,
+ /obj/item/seeds/grass,
+ /obj/item/seeds/lemon,
+ /obj/item/seeds/lime,
+ /obj/item/seeds/onion,
+ /obj/item/seeds/orange,
+ /obj/item/seeds/peas,
+ /obj/item/seeds/pineapple,
+ /obj/item/seeds/potato,
+ /obj/item/seeds/poppy,
+ /obj/item/seeds/pumpkin,
+ /obj/item/seeds/wheat/rice,
+ /obj/item/seeds/soya,
+ /obj/item/seeds/sugarcane,
+ /obj/item/seeds/sunflower,
+ /obj/item/seeds/tea,
+ /obj/item/seeds/tobacco,
+ /obj/item/seeds/tomato,
+ /obj/item/seeds/tower,
+ /obj/item/seeds/watermelon,
+ /obj/item/seeds/wheat,
+ /obj/item/seeds/whitebeet,
+ /obj/item/seeds/amanita,
+ /obj/item/seeds/glowshroom,
+ /obj/item/seeds/liberty,
+ /obj/item/seeds/nettle,
+ /obj/item/seeds/plump,
+ /obj/item/seeds/reishi,
+ /obj/item/seeds/cannabis,
+ /obj/item/seeds/starthistle,
+ /obj/item/seeds/cherry/bomb,
+ /obj/item/seeds/berry/glow,
+ /obj/item/seeds/sunflower/moonflower
+ )
+
+/obj/effect/spawner/lootdrop/flora
+ name = "random flora spawner"
+ loot = list(
+ /obj/structure/flora/tree/chapel,
+ /obj/structure/flora/tree/pine,
+ /obj/structure/flora/tree/jungle/small,
+ /obj/structure/flora/tree/jungle,
+ /obj/structure/flora/ash/puce,
+ /obj/structure/flora/ash/fireblossom,
+ /obj/structure/flora/ash/fern,
+ /obj/structure/flora/ash/tall_shroom,
+ /obj/structure/flora/ash/stem_shroom,
+ /obj/structure/flora/ash/space/voidmelon,
+ /obj/structure/flora/ash/leaf_shroom,
+ /obj/structure/flora/junglebush/large,
+ /obj/structure/flora/junglebush/b,
+ /obj/structure/flora/junglebush/c,
+ /obj/structure/flora/ausbushes/fernybush,
+ /obj/structure/flora/ausbushes/genericbush,
+ /obj/structure/flora/ausbushes/grassybush,
+ /obj/structure/flora/ausbushes/leafybush,
+ /obj/structure/flora/ausbushes/palebush,
+ /obj/structure/flora/ausbushes/pointybush,
+ /obj/structure/flora/ausbushes/reedbush,
+ /obj/structure/flora/ausbushes/stalkybush,
+ /obj/structure/flora/ausbushes/sunnybush,
+ /obj/structure/flora/bush,
+ /obj/structure/flora/grass/jungle,
+ /obj/structure/flora/junglebush,
+ /obj/structure/flora/junglebush/b,
+ /obj/structure/flora/junglebush/c,
+ /obj/structure/flora/ash,
+ /obj/structure/flora/ash/cacti,
+ /obj/structure/flora/ash/cap_shroom,
+ /obj/structure/flora/ash/chilly,
+ /obj/structure/flora/tree/palm
+ )
+ lootcount = 1
+
+/obj/effect/spawner/lootdrop/flower
+ name = "random flower spawner"
+ loot = list(
+ /obj/structure/flora/ausbushes/brflowers,
+ /obj/structure/flora/ausbushes/ywflowers,
+ /obj/structure/flora/ausbushes/ppflowers,
+ /obj/structure/flora/ausbushes/fullgrass,
+ /obj/structure/flora/ausbushes/sparsegrass
+ )
+ lootcount = 1
+
+/obj/effect/spawner/lootdrop/anomaly
+ name = "random anomaly spawner"
+ loot = list(
+ /obj/effect/anomaly/bluespace/planetary,
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/grav/planetary,
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/pyro/planetary,
+ /obj/effect/anomaly/vortex/planetary,
+ /obj/effect/anomaly/grav/high/planetary,
+ /obj/effect/anomaly/heartbeat/planetary,
+ /obj/effect/anomaly/sparkler/planetary,
+ /obj/effect/anomaly/tvstatic/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ /obj/effect/anomaly/melter/planetary,
+ /obj/effect/anomaly/transfusion/planetary,
+ )
+
+/obj/effect/spawner/lootdrop/anomaly/safe
+ name = "relatively safe anomaly spawner"
+ loot = list(
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/pyro/planetary,
+ /obj/effect/anomaly/sparkler/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ /obj/effect/anomaly/transfusion/planetary,
+ )
+
+/obj/effect/spawner/lootdrop/anomaly/dangerous
+ name = "relatively dangerous anomaly spawner"
+ loot = list(
+ /obj/effect/anomaly/bluespace/planetary,
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/grav/planetary,
+ /obj/effect/anomaly/vortex/planetary,
+ /obj/effect/anomaly/grav/high/planetary,
+ /obj/effect/anomaly/heartbeat/planetary,
+ /obj/effect/anomaly/tvstatic/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ /obj/effect/anomaly/melter/planetary,
+ )
+
+/obj/effect/spawner/lootdrop/anomaly/big
+ name = "random big anomaly spawner"
+ loot = list(
+ /obj/effect/anomaly/bluespace/big/planetary,
+ /obj/effect/anomaly/flux/big/planetary,
+ /obj/effect/anomaly/grav/high/big/planetary,
+ /obj/effect/anomaly/pyro/big/planetary
+
+ )
+
+//handpicked lists relevant to the planets they're on
+// /cave lists are made for spawning in cave biomes. Not every anomaly goes well there. We don't have enough anomalies to really populate them all though
+
+/obj/effect/spawner/lootdrop/anomaly/jungle
+ name = "Jungle Anomaly Spawner"
+ loot = list(
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/heartbeat/planetary,
+ /obj/effect/anomaly/tvstatic/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ )
+
+/obj/effect/spawner/lootdrop/anomaly/jungle/cave
+ loot = list(
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/heartbeat/planetary,
+ /obj/effect/anomaly/tvstatic/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ )
+
+//beaches don't currently have anomalies, but I don't see a reason why they couldn't have *some*
+
+/obj/effect/spawner/lootdrop/anomaly/beach
+ name = "Beach anomaly spawner"
+ loot = list(
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/sparkler/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ )
+
+/obj/effect/spawner/lootdrop/anomaly/beach/cave
+ loot = list(
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/sparkler/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ )
+
+/obj/effect/spawner/lootdrop/anomaly/sand
+ name = "Sand anomaly spawner"
+ loot = list(
+ /obj/effect/anomaly/bluespace/planetary,
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/sparkler/planetary,
+ /obj/effect/anomaly/tvstatic/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ /obj/effect/anomaly/melter/planetary,
+ )
+
+/obj/effect/spawner/lootdrop/anomaly/sand/cave
+ loot = list(
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/pyro/planetary,
+ /obj/effect/anomaly/sparkler/planetary,
+ /obj/effect/anomaly/tvstatic/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ /obj/effect/anomaly/melter/planetary,
+ )
+
+/obj/effect/spawner/lootdrop/anomaly/rock
+ name = "Rock anomaly spawner"
+ loot = list(
+ /obj/effect/anomaly/bluespace/planetary,
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/grav/planetary,
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/pyro/planetary,
+ /obj/effect/anomaly/vortex/planetary,
+ /obj/effect/anomaly/grav/high/planetary,
+ /obj/effect/anomaly/heartbeat/planetary,
+ /obj/effect/anomaly/sparkler/planetary,
+ /obj/effect/anomaly/tvstatic/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ /obj/effect/anomaly/melter/planetary,
+ )
+
+/obj/effect/spawner/lootdrop/anomaly/rock/cave
+ loot = list(
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/pyro/planetary,
+ /obj/effect/anomaly/heartbeat/planetary,
+ /obj/effect/anomaly/sparkler/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ /obj/effect/anomaly/melter/planetary,
+ )
+
+/obj/effect/spawner/lootdrop/anomaly/lava
+ name = "Lava anomaly spawner"
+ loot = list(
+ /obj/effect/anomaly/bluespace/planetary,
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/grav/planetary,
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/pyro/planetary,
+ /obj/effect/anomaly/vortex/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ )
+
+/obj/effect/spawner/lootdrop/anomaly/lava/cave
+ loot = list(
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/pyro/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ )
+
+/obj/effect/spawner/lootdrop/anomaly/ice
+ name = "Ice anomaly spawner"
+ loot = list(
+ /obj/effect/anomaly/bluespace/planetary,
+ /obj/effect/anomaly/grav/planetary,
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/vortex/planetary,
+ /obj/effect/anomaly/grav/high/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ )
+
+/obj/effect/spawner/lootdrop/anomaly/ice/cave
+ loot = list(
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/grav/high/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ )
+
+/obj/effect/spawner/lootdrop/anomaly/waste
+ name = "Waste anomaly spawner"
+ loot = list(
+ /obj/effect/anomaly/vortex/planetary,
+ /obj/effect/anomaly/heartbeat/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ /obj/effect/anomaly/melter/planetary,
+ )
+
+/obj/effect/spawner/lootdrop/anomaly/waste/cave
+ loot = list(
+ /obj/effect/anomaly/heartbeat/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ /obj/effect/anomaly/melter/planetary,
+ )
+
+/obj/effect/spawner/lootdrop/anomaly/storm
+ loot = list(
+ /obj/effect/anomaly/flux/storm,
+ /obj/effect/anomaly/pyro/storm,
+ /obj/effect/anomaly/sparkler,
+ /obj/effect/anomaly/veins,
+ /obj/effect/anomaly/phantom,
+ /obj/effect/anomaly/melter,
+ )
+
+//wasteplanet things
+
+/obj/effect/spawner/lootdrop/waste/grille_or_trash
+ name = "wasteplanet loot spawner"
+ loot = list(
+ /obj/structure/grille/broken = 5,
+ /obj/structure/grille = 5,
+ /obj/item/flashlight/flare/burnt = 1,
+ /obj/item/cigbutt = 1,
+ /obj/item/trash/cheesie = 1,
+ /obj/item/trash/candy = 1,
+ /obj/item/trash/chips = 1,
+ /obj/item/reagent_containers/food/snacks/deadmouse = 1,
+ /obj/item/trash/pistachios = 1,
+ /obj/item/trash/plate = 1,
+ /obj/item/trash/popcorn = 1,
+ /obj/item/trash/raisins = 1,
+ /obj/item/trash/sosjerky = 1,
+ /obj/item/trash/syndi_cakes = 1
+ )
+
+/obj/effect/spawner/lootdrop/waste/mechwreck
+ name = "wasteplanet exosuit wreckage"
+ loot = list(
+ /obj/structure/mecha_wreckage/ripley = 15,
+ /obj/structure/mecha_wreckage/ripley/firefighter = 9,
+ /obj/structure/mecha_wreckage/ripley/mkii = 9,
+ /obj/structure/mecha_wreckage/ripley/clip = 9
+ )
+
+/obj/effect/spawner/lootdrop/waste/mechwreck/rare
+ loot = list(
+ /obj/structure/mecha_wreckage/durand = 12.5,
+ /obj/structure/mecha_wreckage/durand/clip = 12.5,
+ /obj/structure/mecha_wreckage/odysseus = 25,
+ /obj/structure/mecha_wreckage/gygax = 25
+ )
+
+/obj/effect/spawner/lootdrop/waste/trash //debatable if this is actually loot
+ loot = list(
+ /obj/item/flashlight/flare/burnt = 30,
+ /obj/effect/decal/cleanable/greenglow/filled = 30,
+ /obj/effect/decal/cleanable/greenglow/ecto = 1,
+ /obj/effect/decal/cleanable/glass = 30,
+ /obj/effect/decal/cleanable/glass/plasma = 30,
+ /obj/effect/decal/cleanable/glass/strange = 30,
+ /obj/effect/decal/cleanable/molten_object = 30,
+ /obj/effect/decal/cleanable/molten_object/large = 30,
+ /obj/effect/decal/cleanable/oil = 30,
+ /obj/effect/decal/cleanable/oil/slippery = 1, // :)
+ /obj/effect/decal/cleanable/plastic = 30,
+ /obj/effect/decal/cleanable/ash = 30,
+ /obj/effect/decal/cleanable/ash/large = 30,
+ )
+
+/obj/effect/spawner/lootdrop/waste/radiation
+ loot = list(
+ /obj/structure/radioactive = 6,
+ /obj/structure/radioactive/stack = 6,
+ /obj/structure/radioactive/waste = 6
+ )
+
+/obj/effect/spawner/lootdrop/waste/radiation/more_rads
+ loot = list(
+ /obj/structure/radioactive = 3,
+ /obj/structure/radioactive/stack = 12,
+ /obj/structure/radioactive/waste = 12
+ )
+
+/obj/effect/spawner/lootdrop/waste/atmos_can
+ loot = list(
+ /obj/machinery/portable_atmospherics/canister/toxins = 3,
+ /obj/machinery/portable_atmospherics/canister/carbon_dioxide = 3,
+ /obj/machinery/portable_atmospherics/canister/nitrogen = 3,
+ /obj/machinery/portable_atmospherics/canister/oxygen = 3,
+ /obj/machinery/portable_atmospherics/canister/nitrous_oxide = 1,
+ /obj/machinery/portable_atmospherics/canister/water_vapor = 1
+ )
+
+/obj/effect/spawner/lootdrop/waste/atmos_can/rare
+ loot = list(
+ /obj/machinery/portable_atmospherics/canister/tritium = 3,
+ /obj/machinery/portable_atmospherics/canister/pluoxium = 3
+ )
+
+/obj/effect/spawner/lootdrop/waste/salvageable
+ loot = list(
+ /obj/structure/salvageable/machine = 20,
+ /obj/structure/salvageable/autolathe = 15,
+ /obj/structure/salvageable/computer = 10,
+ /obj/structure/salvageable/protolathe = 10,
+ /obj/structure/salvageable/circuit_imprinter = 8,
+ /obj/structure/salvageable/destructive_analyzer = 8,
+ /obj/structure/salvageable/server = 8
+ )
+
+/obj/effect/spawner/lootdrop/waste/girder
+ loot = list(
+ /obj/structure/girder,
+ /obj/structure/girder/displaced,
+ /obj/structure/girder/reinforced
+ )
+/obj/effect/spawner/lootdrop/waste/hivebot
+ loot = list(
+ /obj/effect/spawner/lootdrop/salvage/metal,
+ /obj/effect/spawner/lootdrop/salvage/metal,
+ /obj/effect/spawner/lootdrop/salvage/metal,
+ /obj/effect/spawner/lootdrop/salvage/gold,
+ /obj/effect/spawner/lootdrop/salvage/plasma,
+ /obj/effect/spawner/lootdrop/salvage/silver,
+ /obj/effect/spawner/lootdrop/salvage/titanium,
+ /obj/item/stack/ore/salvage/scrapbluespace,
+ /obj/item/stack/ore/salvage/scrapbluespace,
+ /obj/item/stack/ore/salvage/scrapuranium
+ )
+ lootcount = 2
+
+/obj/effect/spawner/lootdrop/waste/hivebot/beacon
+ lootcount = 6
+
+/obj/effect/spawner/lootdrop/salvage
+ name = "salvage mats spawner"
+ loot = list(
+ /obj/item/stack/ore/salvage/scrapmetal,
+ /obj/item/stack/ore/salvage/scrapgold,
+ /obj/item/stack/ore/salvage/scrapplasma,
+ /obj/item/stack/ore/salvage/scrapsilver,
+ /obj/item/stack/ore/salvage/scraptitanium,
+ /obj/item/stack/ore/salvage/scrapbluespace,
+ /obj/item/stack/ore/salvage/scrapuranium
+ )
+
+/obj/effect/spawner/lootdrop/salvage/metal
+ loot = list(
+ /obj/item/stack/ore/salvage/scrapmetal
+ )
+
+/obj/effect/spawner/lootdrop/salvage/metal/Initialize()
+ lootcount = pick(list(
+ 1,
+ 2,
+ 3,
+ 4
+ ))
+ return ..()
+
+/obj/effect/spawner/lootdrop/salvage/gold
+ loot = list(
+ /obj/item/stack/ore/salvage/scrapgold
+ )
+
+/obj/effect/spawner/lootdrop/salvage/gold/Initialize()
+ lootcount = pick(list(
+ 1,
+ 2,
+ 3,
+ 4
+ ))
+ return ..()
+
+/obj/effect/spawner/lootdrop/salvage/plasma
+ loot = list(
+ /obj/item/stack/ore/salvage/scrapplasma
+ )
+/obj/effect/spawner/lootdrop/salvage/plasma/Initialize()
+ lootcount = pick(list(
+ 1,
+ 2,
+ 3,
+ 4
+ ))
+ return ..()
+
+
+/obj/effect/spawner/lootdrop/salvage/silver
+ loot = list(
+ /obj/item/stack/ore/salvage/scrapsilver
+ )
+/obj/effect/spawner/lootdrop/salvage/silver/Initialize()
+ lootcount = pick(list(
+ 1,
+ 2,
+ 3,
+ 4
+ ))
+ return ..()
+
+
+/obj/effect/spawner/lootdrop/salvage/titanium
+ loot = list(
+ /obj/item/stack/ore/salvage/scraptitanium
+ )
+/obj/effect/spawner/lootdrop/salvage/titanium/Initialize()
+ lootcount = pick(list(
+ 1,
+ 2,
+ 3,
+ 4
+ ))
+ return ..()
+
+/obj/effect/spawner/lootdrop/salvage/bluespace
+ loot = list(
+ /obj/item/stack/ore/salvage/scrapbluespace
+ )
+/obj/effect/spawner/lootdrop/salvage/bluespace/Initialize()
+ lootcount = pick(list(
+ 1,
+ 2,
+ 3,
+ 4
+ ))
+ return ..()
+
+/obj/effect/spawner/lootdrop/salvage/uranium
+ loot = list(
+ /obj/item/stack/ore/salvage/scrapuranium
+ )
+/obj/effect/spawner/lootdrop/salvage/uranium/Initialize()
+ lootcount = pick(list(
+ 1,
+ 2,
+ 3,
+ 4
+ ))
+ return ..()
+
+
+//random RND imprinter/protolathe board spawners. Do not use on maps without a good reason
+/obj/effect/spawner/lootdrop/randomprotolathe
+ name = "random departmental protolathe"
+ loot = list(
+ /obj/item/circuitboard/machine/protolathe/department/cargo,
+ /obj/item/circuitboard/machine/protolathe/department/engineering,
+ /obj/item/circuitboard/machine/protolathe/department/service,
+ /obj/item/circuitboard/machine/protolathe/department/medical,
+ /obj/item/circuitboard/machine/protolathe/department/science,
+ /obj/item/circuitboard/machine/protolathe/department/security
+ )
+
+/obj/effect/spawner/lootdrop/randomimprinter
+ name = "random departmental circuit imprinter"
+ loot = list(
+ /obj/item/circuitboard/machine/circuit_imprinter/department/cargo,
+ /obj/item/circuitboard/machine/circuit_imprinter/department/engi,
+ /obj/item/circuitboard/machine/circuit_imprinter/department/civ,
+ /obj/item/circuitboard/machine/circuit_imprinter/department/med,
+ /obj/item/circuitboard/machine/circuit_imprinter/department/science,
+ /obj/item/circuitboard/machine/circuit_imprinter/department/sec
+ )
+
+/obj/effect/spawner/lootdrop/randomtechfab
+ name = "random departmental techfab"
+ loot = list(
+ /obj/item/circuitboard/machine/techfab/department/service,
+ /obj/item/circuitboard/machine/techfab/department/cargo,
+ /obj/item/circuitboard/machine/techfab/department/engineering,
+ /obj/item/circuitboard/machine/techfab/department/service,
+ /obj/item/circuitboard/machine/techfab/department/medical,
+ /obj/item/circuitboard/machine/techfab/department/science,
+ /obj/item/circuitboard/machine/techfab/department/security
+ )
+
+/obj/effect/spawner/lootdrop/ration
+ loot = list (
+ /obj/item/storage/ration/vegan_chili = 5,
+ /obj/item/storage/ration/shredded_beef = 5,
+ /obj/item/storage/ration/pork_spaghetti = 5,
+ /obj/item/storage/ration/fried_fish = 5,
+ /obj/item/storage/ration/beef_strips = 5,
+ /obj/item/storage/ration/chili_macaroni = 5,
+ /obj/item/storage/ration/chicken_wings_hot_sauce = 5,
+ /obj/item/storage/ration/fish_stew = 5,
+ /obj/item/storage/ration/lemon_pepper_chicken = 5,
+ /obj/item/storage/ration/sausage_peppers_onions = 5,
+ /obj/item/storage/ration/pork_dumplings_chili_sauce = 5,
+ /obj/item/storage/ration/battered_fish_sticks = 5,
+ /obj/item/storage/ration/assorted_salted_offal = 5,
+ /obj/item/storage/ration/maple_pork_sausage_patty = 5,
+ /obj/item/storage/ration/pepper_jack_beef_patty = 5,
+ /obj/item/storage/ration/beef_goulash = 5,
+ /obj/item/storage/ration/pepperoni_pizza_slice = 5,
+ /obj/item/storage/ration/blackened_calamari = 5,
+ /obj/item/storage/ration/elbow_macaroni = 5,
+ /obj/item/storage/ration/cheese_pizza_slice = 5,
+ /obj/item/storage/ration/crayons = 2 // :)
+ )
+
+/obj/effect/spawner/lootdrop/chem_jug
+ loot = list(
+ /obj/item/reagent_containers/glass/chem_jug/carbon,
+ /obj/item/reagent_containers/glass/chem_jug/oxygen,
+ /obj/item/reagent_containers/glass/chem_jug/nitrogen,
+ /obj/item/reagent_containers/glass/chem_jug/hydrogen,
+ /obj/item/reagent_containers/glass/chem_jug/radium,
+ /obj/item/reagent_containers/glass/chem_jug/aluminium,
+ /obj/item/reagent_containers/glass/chem_jug/chlorine,
+ /obj/item/reagent_containers/glass/chem_jug/copper,
+ /obj/item/reagent_containers/glass/chem_jug/bromine,
+ /obj/item/reagent_containers/glass/chem_jug/iodine,
+ /obj/item/reagent_containers/glass/chem_jug/potassium,
+ /obj/item/reagent_containers/glass/chem_jug/sulfur)
diff --git a/code/game/objects/effects/spawners/mobspawner.dm b/code/game/objects/effects/spawners/mobspawner.dm
index 2161ebd06bb5..187b7c155fe0 100644
--- a/code/game/objects/effects/spawners/mobspawner.dm
+++ b/code/game/objects/effects/spawners/mobspawner.dm
@@ -1,11 +1,11 @@
-/obj/effect/spawner/random/randomthreat
+/obj/effect/spawner/lootdrop/randomthreat
var/static/mob_category = rand(1, 3)
-/obj/effect/spawner/random/randomthreat/Initialize(mapload)
+/obj/effect/spawner/lootdrop/randomthreat/Initialize(mapload)
switch(mob_category)
if(1)
loot = list(
- /obj/effect/spawner/random/hivebotspawner
+ /obj/effect/spawner/lootdrop/hivebotspawner
)
if(2)
loot = list(
@@ -13,28 +13,28 @@
)
if(3)
loot = list(
- /obj/effect/spawner/random/spiderspawner
+ /obj/effect/spawner/lootdrop/spiderspawner
)
return ..()
-/obj/effect/spawner/random/xenospawner
+/obj/effect/spawner/lootdrop/xenospawner
name = "Xenomorph spawner"
loot = list(
/mob/living/simple_animal/hostile/alien = 0.3,
/mob/living/simple_animal/hostile/alien/drone = 0.2,
/mob/living/simple_animal/hostile/alien/sentinel = 0.3,
- /obj/effect/spawner/random/xenoqueenspawner = 0.1
+ /obj/effect/spawner/lootdrop/xenoqueenspawner = 0.1
)
-/obj/effect/spawner/random/xenoqueenspawner
+/obj/effect/spawner/lootdrop/xenoqueenspawner
name = "xenomorph queen spawner"
loot = list(
/mob/living/simple_animal/hostile/alien/queen = 0.2, //regular queen mob isn't actually that strong
/mob/living/simple_animal/hostile/alien/queen/large = 0.8
)
-/obj/effect/spawner/random/hivebotspawner
+/obj/effect/spawner/lootdrop/hivebotspawner
name = "Hivebot spawner"
loot = list(
@@ -42,7 +42,7 @@
/mob/living/simple_animal/hostile/hivebot,
)
-/obj/effect/spawner/random/spiderspawner
+/obj/effect/spawner/lootdrop/spiderspawner
name = "Spider spawner"
loot = list(
@@ -51,29 +51,29 @@
/mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper,
)
-/obj/effect/spawner/random/thirtyfive_percent_borerspawner
+/obj/effect/spawner/lootdrop/thirtyfive_percent_borerspawner
name = "35 percent neutered borer spawner"
loot = list(
/mob/living/simple_animal/borer/sterile = 0.35,
- /obj/effect/spawner/random/maintenance = 0.65,
+ /obj/effect/spawner/lootdrop/maintenance = 0.65,
)
-/obj/effect/spawner/random/chicken
+/obj/effect/spawner/lootdrop/chicken
name = "chicken spawner"
loot = list(
/mob/living/simple_animal/chicken
)
-/obj/effect/spawner/random/chicken/jungle
+/obj/effect/spawner/lootdrop/chicken/jungle
name = "jungle chicken spawner"
loot = list(
/mob/living/simple_animal/hostile/retaliate/chicken
)
-/obj/effect/spawner/random/chicken/jungle/flock
+/obj/effect/spawner/lootdrop/chicken/jungle/flock
loot = list(
/mob/living/simple_animal/hostile/retaliate/chicken
)
- spawn_loot_count = 7
- spawn_loot_double = TRUE
+ lootcount = 7
+ lootdoubles = TRUE
diff --git a/code/game/objects/effects/spawners/random.dm/ai_module.dm b/code/game/objects/effects/spawners/random.dm/ai_module.dm
deleted file mode 100644
index 7f5eed59e4a0..000000000000
--- a/code/game/objects/effects/spawners/random.dm/ai_module.dm
+++ /dev/null
@@ -1,41 +0,0 @@
-/obj/effect/spawner/random/aimodule
- name = "AI module spawner"
- desc = "State laws human."
- icon_state = "circuit"
- spawn_loot_double = FALSE
- spawn_loot_count = 3
- spawn_loot_split = TRUE
-
-/obj/effect/spawner/random/aimodule_harmless // These shouldn't allow the AI to start butchering people
- name = "harmless AI module spawner"
- loot = list(
- /obj/item/aiModule/core/full/asimov,
- /obj/item/aiModule/core/full/asimovpp,
- /obj/item/aiModule/core/full/hippocratic,
- /obj/item/aiModule/core/full/paladin_devotion,
- /obj/item/aiModule/core/full/paladin
- )
-
-/obj/effect/spawner/random/aimodule_neutral // These shouldn't allow the AI to start butchering people without reason
- name = "neutral AI module spawner"
- loot = list(
- /obj/item/aiModule/core/full/corp,
- /obj/item/aiModule/core/full/maintain,
- /obj/item/aiModule/core/full/drone,
- /obj/item/aiModule/core/full/peacekeeper,
- /obj/item/aiModule/core/full/reporter,
- /obj/item/aiModule/core/full/robocop,
- /obj/item/aiModule/core/full/liveandletlive,
- /obj/item/aiModule/core/full/hulkamania
- )
-
-/obj/effect/spawner/random/aimodule_harmful // These will get the shuttle called
- name = "harmful AI module spawner"
- loot = list(
- /obj/item/aiModule/core/full/antimov,
- /obj/item/aiModule/core/full/balance,
- /obj/item/aiModule/core/full/tyrant,
- /obj/item/aiModule/core/full/thermurderdynamic,
- /obj/item/aiModule/core/full/damaged,
- /obj/item/aiModule/reset/purge
- )
diff --git a/code/game/objects/effects/spawners/random.dm/anomaly.dm b/code/game/objects/effects/spawners/random.dm/anomaly.dm
deleted file mode 100644
index aa8fa472de2c..000000000000
--- a/code/game/objects/effects/spawners/random.dm/anomaly.dm
+++ /dev/null
@@ -1,222 +0,0 @@
-/obj/effect/spawner/random/anomaly
- name = "random anomaly spawner"
- icon_state = "anomaly"
- loot = list(
- /obj/effect/anomaly/bluespace/planetary,
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/grav/planetary,
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/pyro/planetary,
- /obj/effect/anomaly/vortex/planetary,
- /obj/effect/anomaly/grav/high/planetary,
- /obj/effect/anomaly/heartbeat/planetary,
- /obj/effect/anomaly/sparkler/planetary,
- /obj/effect/anomaly/tvstatic/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- /obj/effect/anomaly/phantom/planetary,
- /obj/effect/anomaly/melter/planetary,
- /obj/effect/anomaly/transfusion/planetary,
- )
-
-/obj/effect/spawner/random/anomaly/safe
- name = "relatively safe anomaly spawner"
- loot = list(
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/pyro/planetary,
- /obj/effect/anomaly/sparkler/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/phantom/planetary,
- /obj/effect/anomaly/transfusion/planetary,
- )
-
-/obj/effect/spawner/random/anomaly/dangerous
- name = "relatively dangerous anomaly spawner"
- loot = list(
- /obj/effect/anomaly/bluespace/planetary,
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/grav/planetary,
- /obj/effect/anomaly/vortex/planetary,
- /obj/effect/anomaly/grav/high/planetary,
- /obj/effect/anomaly/heartbeat/planetary,
- /obj/effect/anomaly/tvstatic/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- /obj/effect/anomaly/melter/planetary,
- )
-
-/obj/effect/spawner/random/anomaly/big
- name = "random big anomaly spawner"
- icon_state = "big_anomaly"
- loot = list(
- /obj/effect/anomaly/bluespace/big/planetary,
- /obj/effect/anomaly/flux/big/planetary,
- /obj/effect/anomaly/grav/high/big/planetary,
- /obj/effect/anomaly/pyro/big/planetary
-
- )
-
-//handpicked lists relevant to the planets they're on
-// /cave lists are made for spawning in cave biomes. Not every anomaly goes well there. We don't have enough anomalies to really populate them all though
-
-/obj/effect/spawner/random/anomaly/jungle
- name = "Jungle Anomaly Spawner"
- loot = list(
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/heartbeat/planetary,
- /obj/effect/anomaly/tvstatic/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/phantom/planetary,
- )
-
-/obj/effect/spawner/random/anomaly/jungle/cave
- loot = list(
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/heartbeat/planetary,
- /obj/effect/anomaly/tvstatic/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/phantom/planetary,
- )
-
-//beaches don't currently have anomalies, but I don't see a reason why they couldn't have *some*
-
-/obj/effect/spawner/random/anomaly/beach
- name = "Beach anomaly spawner"
- loot = list(
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/sparkler/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/phantom/planetary,
- )
-
-/obj/effect/spawner/random/anomaly/beach/cave
- loot = list(
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/sparkler/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/phantom/planetary,
- )
-
-/obj/effect/spawner/random/anomaly/sand
- name = "Sand anomaly spawner"
- loot = list(
- /obj/effect/anomaly/bluespace/planetary,
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/sparkler/planetary,
- /obj/effect/anomaly/tvstatic/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/phantom/planetary,
- /obj/effect/anomaly/melter/planetary,
- )
-
-/obj/effect/spawner/random/anomaly/sand/cave
- loot = list(
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/pyro/planetary,
- /obj/effect/anomaly/sparkler/planetary,
- /obj/effect/anomaly/tvstatic/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/phantom/planetary,
- /obj/effect/anomaly/melter/planetary,
- )
-
-/obj/effect/spawner/random/anomaly/rock
- name = "Rock anomaly spawner"
- loot = list(
- /obj/effect/anomaly/bluespace/planetary,
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/grav/planetary,
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/pyro/planetary,
- /obj/effect/anomaly/vortex/planetary,
- /obj/effect/anomaly/grav/high/planetary,
- /obj/effect/anomaly/heartbeat/planetary,
- /obj/effect/anomaly/sparkler/planetary,
- /obj/effect/anomaly/tvstatic/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- /obj/effect/anomaly/phantom/planetary,
- /obj/effect/anomaly/melter/planetary,
- )
-
-/obj/effect/spawner/random/anomaly/rock/cave
- loot = list(
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/pyro/planetary,
- /obj/effect/anomaly/heartbeat/planetary,
- /obj/effect/anomaly/sparkler/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- /obj/effect/anomaly/phantom/planetary,
- /obj/effect/anomaly/melter/planetary,
- )
-
-/obj/effect/spawner/random/anomaly/lava
- name = "Lava anomaly spawner"
- loot = list(
- /obj/effect/anomaly/bluespace/planetary,
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/grav/planetary,
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/pyro/planetary,
- /obj/effect/anomaly/vortex/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- )
-
-/obj/effect/spawner/random/anomaly/lava/cave
- loot = list(
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/pyro/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- )
-
-/obj/effect/spawner/random/anomaly/ice
- name = "Ice anomaly spawner"
- loot = list(
- /obj/effect/anomaly/bluespace/planetary,
- /obj/effect/anomaly/grav/planetary,
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/vortex/planetary,
- /obj/effect/anomaly/grav/high/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- /obj/effect/anomaly/phantom/planetary,
- )
-
-/obj/effect/spawner/random/anomaly/ice/cave
- loot = list(
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/grav/high/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- /obj/effect/anomaly/phantom/planetary,
- )
-
-/obj/effect/spawner/random/anomaly/waste
- name = "Waste anomaly spawner"
- loot = list(
- /obj/effect/anomaly/vortex/planetary,
- /obj/effect/anomaly/heartbeat/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- /obj/effect/anomaly/melter/planetary,
- )
-
-/obj/effect/spawner/random/anomaly/waste/cave
- loot = list(
- /obj/effect/anomaly/heartbeat/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- /obj/effect/anomaly/melter/planetary,
- )
-
-/obj/effect/spawner/random/anomaly/storm
- loot = list(
- /obj/effect/anomaly/flux/storm,
- /obj/effect/anomaly/pyro/storm,
- /obj/effect/anomaly/sparkler,
- /obj/effect/anomaly/veins,
- /obj/effect/anomaly/phantom,
- /obj/effect/anomaly/melter,
- )
diff --git a/code/game/objects/effects/spawners/random.dm/bedsheet.dm b/code/game/objects/effects/spawners/random.dm/bedsheet.dm
deleted file mode 100644
index f8a53fffd2c9..000000000000
--- a/code/game/objects/effects/spawners/random.dm/bedsheet.dm
+++ /dev/null
@@ -1,33 +0,0 @@
-/obj/effect/spawner/random/bedsheet
- name = "random dorm bedsheet"
- icon_state = "random_bedsheet"
- loot = list(
- /obj/item/bedsheet,
- /obj/item/bedsheet/blue,
- /obj/item/bedsheet/green,
- /obj/item/bedsheet/grey,
- /obj/item/bedsheet/orange,
- /obj/item/bedsheet/purple,
- /obj/item/bedsheet/red,
- /obj/item/bedsheet/yellow,
- /obj/item/bedsheet/brown,
- /obj/item/bedsheet/black,
- /obj/item/bedsheet/rainbow
- )
-
-/obj/effect/spawner/random/bedsheet/double
- name = "random dorm double bedsheet"
- icon_state = "random_doublesheet"
- loot = list(
- /obj/item/bedsheet/double,
- /obj/item/bedsheet/double/blue,
- /obj/item/bedsheet/double/green,
- /obj/item/bedsheet/double/grey,
- /obj/item/bedsheet/double/orange,
- /obj/item/bedsheet/double/purple,
- /obj/item/bedsheet/double/red,
- /obj/item/bedsheet/double/yellow,
- /obj/item/bedsheet/double/brown,
- /obj/item/bedsheet/double/black,
- /obj/item/bedsheet/double/rainbow
- )
diff --git a/code/game/objects/effects/spawners/random.dm/boards.dm b/code/game/objects/effects/spawners/random.dm/boards.dm
deleted file mode 100644
index 0104d17326d7..000000000000
--- a/code/game/objects/effects/spawners/random.dm/boards.dm
+++ /dev/null
@@ -1,245 +0,0 @@
-// Tech storage circuit board spawners
-
-/obj/effect/spawner/random/techstorage
- name = "generic circuit board spawner"
- icon_state = "circuit"
- spawn_loot_split = TRUE
- spawn_all_loot = TRUE
-
-/obj/effect/spawner/random/techstorage/service
- name = "service circuit board spawner"
- loot = list(
- /obj/item/circuitboard/computer/arcade/battle,
- /obj/item/circuitboard/computer/arcade/orion_trail,
- /obj/item/circuitboard/machine/autolathe,
- /obj/item/circuitboard/computer/mining,
- /obj/item/circuitboard/machine/ore_redemption,
- /obj/item/circuitboard/machine/vending/mining_equipment,
- /obj/item/circuitboard/machine/microwave,
- /obj/item/circuitboard/machine/chem_dispenser/drinks,
- /obj/item/circuitboard/machine/chem_dispenser/drinks/beer,
- /obj/item/circuitboard/computer/slot_machine
- )
-
-/obj/effect/spawner/random/techstorage/rnd
- name = "RnD circuit board spawner"
- loot = list(
- /obj/item/circuitboard/computer/aifixer,
- /obj/item/circuitboard/machine/rdserver,
- /obj/item/circuitboard/machine/mechfab,
- /obj/item/circuitboard/machine/circuit_imprinter/department,
- /obj/item/circuitboard/computer/teleporter,
- /obj/item/circuitboard/machine/destructive_analyzer,
- /obj/item/circuitboard/computer/rdconsole,
- /obj/item/circuitboard/computer/nanite_chamber_control,
- /obj/item/circuitboard/computer/nanite_cloud_controller,
- /obj/item/circuitboard/machine/nanite_chamber,
- /obj/item/circuitboard/machine/nanite_programmer,
- /obj/item/circuitboard/machine/nanite_program_hub
- )
-
-/obj/effect/spawner/random/techstorage/security
- name = "security circuit board spawner"
- loot = list(
- /obj/item/circuitboard/computer/secure_data,
- /obj/item/circuitboard/computer/security,
- /obj/item/circuitboard/computer/prisoner
- )
-
-/obj/effect/spawner/random/techstorage/engineering
- name = "engineering circuit board spawner"
- loot = list(
- /obj/item/circuitboard/computer/atmos_alert,
- /obj/item/circuitboard/computer/stationalert,
- /obj/item/circuitboard/computer/powermonitor
- )
-
-/obj/effect/spawner/random/techstorage/tcomms
- name = "tcomms circuit board spawner"
- loot = list(
- /obj/item/circuitboard/computer/message_monitor,
- /obj/item/circuitboard/machine/telecomms/broadcaster,
- /obj/item/circuitboard/machine/telecomms/bus,
- /obj/item/circuitboard/machine/telecomms/server,
- /obj/item/circuitboard/machine/telecomms/receiver,
- /obj/item/circuitboard/machine/telecomms/processor,
- /obj/item/circuitboard/machine/announcement_system,
- /obj/item/circuitboard/computer/comm_server,
- /obj/item/circuitboard/computer/comm_monitor
- )
-
-/obj/effect/spawner/random/techstorage/medical
- name = "medical circuit board spawner"
- loot = list(
- /obj/item/circuitboard/machine/chem_dispenser,
- /obj/item/circuitboard/computer/scan_consolenew,
- /obj/item/circuitboard/computer/med_data,
- /obj/item/circuitboard/machine/smoke_machine,
- /obj/item/circuitboard/machine/chem_master,
- /obj/item/circuitboard/machine/dnascanner,
- /obj/item/circuitboard/computer/pandemic
- )
-
-/obj/effect/spawner/random/techstorage/ai_all
- name = "secure AI circuit board spawner"
- loot = list(
- /obj/item/circuitboard/computer/aiupload,
- /obj/item/circuitboard/computer/borgupload,
- /obj/item/circuitboard/aicore
- )
-
-/obj/effect/spawner/random/techstorage/command
- name = "secure command circuit board spawner"
- loot = list(
- /obj/item/circuitboard/computer/crew,
- /obj/item/circuitboard/computer/communications,
- /obj/item/circuitboard/computer/card
- )
-
-/obj/effect/spawner/random/techstorage/rnd_secure
- name = "secure RnD circuit board spawner"
- loot = list(
- /obj/item/circuitboard/computer/mecha_control,
- /obj/item/circuitboard/computer/apc_control,
- /obj/item/circuitboard/computer/robotics
- )
-
-//random RND imprinter/protolathe board spawners. Do not use on maps without a good reason
-/obj/effect/spawner/random/circuit/protolathe
- name = "random departmental protolathe"
- icon_state = "circuit"
- loot = list(
- /obj/item/circuitboard/machine/protolathe/department/cargo,
- /obj/item/circuitboard/machine/protolathe/department/engineering,
- /obj/item/circuitboard/machine/protolathe/department/service,
- /obj/item/circuitboard/machine/protolathe/department/medical,
- /obj/item/circuitboard/machine/protolathe/department/science,
- /obj/item/circuitboard/machine/protolathe/department/security
- )
-
-/obj/effect/spawner/random/circuit/imprinter
- name = "random departmental circuit imprinter"
- icon_state = "circuit"
- loot = list(
- /obj/item/circuitboard/machine/circuit_imprinter/department/cargo,
- /obj/item/circuitboard/machine/circuit_imprinter/department/engi,
- /obj/item/circuitboard/machine/circuit_imprinter/department/civ,
- /obj/item/circuitboard/machine/circuit_imprinter/department/med,
- /obj/item/circuitboard/machine/circuit_imprinter/department/science,
- /obj/item/circuitboard/machine/circuit_imprinter/department/sec
- )
-
-/obj/effect/spawner/random/circuit/techfab
- name = "random departmental techfab"
- icon_state = "circuit"
- loot = list(
- /obj/item/circuitboard/machine/techfab/department/service,
- /obj/item/circuitboard/machine/techfab/department/cargo,
- /obj/item/circuitboard/machine/techfab/department/engineering,
- /obj/item/circuitboard/machine/techfab/department/service,
- /obj/item/circuitboard/machine/techfab/department/medical,
- /obj/item/circuitboard/machine/techfab/department/science,
- /obj/item/circuitboard/machine/techfab/department/security
- )
-
-/obj/effect/spawner/random/rnd
- name = "random RND spawner"
- icon_state = "circuit"
- loot = list(
- /obj/item/storage/box/rndmining,
- /obj/item/storage/box/rndengi,
- /obj/item/storage/box/rndsec,
- /obj/item/storage/box/rndciv,
- /obj/item/storage/box/rndmed
- )
-
-/obj/effect/spawner/random/circuit/machine/common
- loot = list(
- /obj/item/circuitboard/machine/autolathe = 5,
- /obj/item/circuitboard/machine/biogenerator = 5,
- /obj/item/circuitboard/machine/cell_charger = 5,
- /obj/item/circuitboard/machine/chem_heater = 5,
- /obj/item/circuitboard/machine/chem_master = 5,
- /obj/item/circuitboard/machine/clonescanner = 5,
- /obj/item/circuitboard/machine/cryo_tube = 5,
- /obj/item/circuitboard/machine/cyborgrecharger = 5,
- /obj/item/circuitboard/machine/deep_fryer = 5,
- /obj/item/circuitboard/machine/experimentor = 5,
- /obj/item/circuitboard/machine/holopad = 5,
- /obj/item/circuitboard/machine/hydroponics = 5,
- /obj/item/circuitboard/machine/limbgrower = 5,
- /obj/item/circuitboard/machine/ltsrbt = 5,
- /obj/item/circuitboard/machine/mech_recharger = 5,
- /obj/item/circuitboard/machine/mechfab = 5,
- /obj/item/circuitboard/machine/medical_kiosk = 5,
- /obj/item/circuitboard/machine/medipen_refiller = 5,
- /obj/item/circuitboard/machine/microwave = 5,
- /obj/item/circuitboard/machine/ore_redemption = 5,
- /obj/item/circuitboard/machine/ore_silo = 5,
- /obj/item/circuitboard/machine/reagentgrinder = 5,
- /obj/item/circuitboard/machine/recharger = 5,
- /obj/item/circuitboard/machine/seed_extractor = 5,
- /obj/item/circuitboard/machine/selling_pad = 5,
- /obj/item/circuitboard/machine/emitter = 5,
- )
-
-/obj/effect/spawner/random/circuit
- icon_state = "circuit"
-
-/obj/effect/spawner/random/circuit/machine/rare
- loot = list(
- /obj/item/circuitboard/aicore = 5,
- /obj/item/circuitboard/machine/chem_dispenser = 5,
- /obj/item/circuitboard/machine/circuit_imprinter = 5,
- /obj/item/circuitboard/machine/protolathe = 5,
- /obj/item/circuitboard/machine/clonepod/experimental = 5,
- /obj/item/circuitboard/machine/rad_collector = 5,
- /obj/item/circuitboard/machine/launchpad = 5,
- )
-
-/obj/effect/spawner/random/circuit/machine/mech
- loot = list(
- /obj/item/circuitboard/mecha/ripley/main = 100,
- /obj/item/circuitboard/mecha/ripley/peripherals = 100,
- /obj/item/circuitboard/mecha/honker/main = 5,
- /obj/item/circuitboard/mecha/honker/peripherals = 5,
- /obj/item/circuitboard/mecha/odysseus/main = 5,
- /obj/item/circuitboard/mecha/odysseus/peripherals = 5,
- /obj/item/circuitboard/mecha/gygax/main = 1,
- /obj/item/circuitboard/mecha/gygax/peripherals = 1,
- /obj/item/circuitboard/mecha/gygax/targeting = 1,
- /obj/item/circuitboard/mecha/durand/main = 1,
- /obj/item/circuitboard/mecha/durand/peripherals = 1,
- /obj/item/circuitboard/mecha/durand/targeting = 1,
- )
-
-//COMPUTER
-/obj/effect/spawner/random/circuit/computer/common
- loot = list(
- /obj/item/circuitboard/computer/aifixer = 5,
- /obj/item/circuitboard/computer/arcade/amputation = 5,
- /obj/item/circuitboard/computer/arcade/battle = 5,
- /obj/item/circuitboard/computer/arcade/orion_trail = 5,
- /obj/item/circuitboard/computer/atmos_alert = 5,
- /obj/item/circuitboard/computer/card = 5,
- /obj/item/circuitboard/computer/cloning = 5,
- /obj/item/circuitboard/computer/communications = 5,
- /obj/item/circuitboard/computer/launchpad_console = 5,
- /obj/item/circuitboard/computer/mech_bay_power_console = 5,
- /obj/item/circuitboard/computer/pandemic = 5,
- /obj/item/circuitboard/computer/powermonitor/secret = 5,
- /obj/item/circuitboard/computer/prototype_cloning = 5,
- /obj/item/circuitboard/computer/stationalert = 5,
- /obj/item/circuitboard/computer/teleporter = 5,
- /obj/item/circuitboard/computer/operating = 5,
- /obj/item/circuitboard/computer/crew = 5,
- /obj/item/circuitboard/computer/scan_consolenew = 5,
- )
-
-/obj/effect/spawner/random/circuit/computer/rare
- loot = list(
- /obj/item/circuitboard/computer/cargo = 5,
- /obj/item/circuitboard/computer/communications = 5,
- /obj/item/circuitboard/computer/shuttle/helm = 5,
- /obj/item/circuitboard/computer/med_data = 5,
- )
diff --git a/code/game/objects/effects/spawners/random.dm/bureaucracy.dm b/code/game/objects/effects/spawners/random.dm/bureaucracy.dm
deleted file mode 100644
index b55c9dc7b364..000000000000
--- a/code/game/objects/effects/spawners/random.dm/bureaucracy.dm
+++ /dev/null
@@ -1,68 +0,0 @@
-/obj/effect/spawner/random/bureaucracy
- name = "bureaucracy loot spawner"
- desc = "For the exotic art of paper shuffling."
-
-/obj/effect/spawner/random/bureaucracy/pen
- name = "pen spawner"
- icon_state = "pen"
- loot = list(
- /obj/item/pen = 30,
- /obj/item/pen/blue = 5,
- /obj/item/pen/red = 5,
- /obj/item/flashlight/pen = 5,
- /obj/item/pen/fourcolor = 2,
- /obj/item/pen/fountain = 1,
- )
-
-/obj/effect/spawner/random/bureaucracy/stamp
- name = "stamp spawner"
- icon_state = "stamp"
- loot = list(
- /obj/item/stamp = 3,
- /obj/item/stamp/denied = 1,
- )
-
-/obj/effect/spawner/random/bureaucracy/crayon
- name = "crayon spawner"
- icon_state = "crayon"
- loot = list(
- /obj/item/toy/crayon/red,
- /obj/item/toy/crayon/orange,
- /obj/item/toy/crayon/yellow,
- /obj/item/toy/crayon/green,
- /obj/item/toy/crayon/blue,
- /obj/item/toy/crayon/purple,
- /obj/item/toy/crayon/black,
- /obj/item/toy/crayon/white,
- )
-
-/obj/effect/spawner/random/bureaucracy/paper
- name = "paper spawner"
- icon_state = "paper"
- loot = list(
- /obj/item/paper = 20,
- /obj/item/paper/crumpled = 2,
- /obj/item/paper/crumpled/bloody = 2,
- /obj/item/paper/crumpled/muddy = 2,
- /obj/item/paper/construction = 1,
- /obj/item/paper/carbon = 1,
- )
-
-/obj/effect/spawner/random/bureaucracy/briefcase
- name = "briefcase spawner"
- icon_state = "briefcase"
- loot = list(
- /obj/item/storage/briefcase = 3,
- /obj/item/storage/briefcase/lawyer = 1,
- )
-
-/obj/effect/spawner/random/bureaucracy/folder
- name = "folder spawner"
- icon_state = "folder"
- loot = list(
- /obj/item/folder/blue,
- /obj/item/folder/red,
- /obj/item/folder/yellow,
- /obj/item/folder/white,
- /obj/item/folder,
- )
diff --git a/code/game/objects/effects/spawners/random.dm/clothing.dm b/code/game/objects/effects/spawners/random.dm/clothing.dm
deleted file mode 100644
index e5137f9e5078..000000000000
--- a/code/game/objects/effects/spawners/random.dm/clothing.dm
+++ /dev/null
@@ -1,67 +0,0 @@
-/obj/effect/spawner/random/clothing
- name = "clothing loot spawner"
- desc = "Time to look pretty."
- icon_state = "suit"
-
-/obj/effect/spawner/random/clothing/gloves
- name = "random gloves"
- desc = "These gloves are supposed to be a random color..."
- icon_state = "gloves"
- loot = list(
- /obj/item/clothing/gloves/color/orange,
- /obj/item/clothing/gloves/color/red,
- /obj/item/clothing/gloves/color/blue,
- /obj/item/clothing/gloves/color/purple,
- /obj/item/clothing/gloves/color/green,
- /obj/item/clothing/gloves/color/grey,
- /obj/item/clothing/gloves/color/light_brown,
- /obj/item/clothing/gloves/color/brown,
- /obj/item/clothing/gloves/color/white,
- /obj/item/clothing/gloves/color/rainbow
- )
-
-/obj/effect/spawner/random/clothing/costume
- name = "random costume spawner"
- icon_state = "costume"
- loot_subtype_path = /obj/effect/spawner/costume
- loot = list()
-
-/obj/effect/spawner/random/clothing/beret_or_rabbitears
- name = "beret or rabbit ears spawner"
- loot = list(
- /obj/item/clothing/head/beret
- )
-
-/obj/effect/spawner/random/clothing/bowler_or_that
- name = "bowler or top hat spawner"
- loot = list(
- /obj/item/clothing/head/that
- )
-
-/obj/effect/spawner/random/clothing/kittyears_or_rabbitears
- name = "kitty ears or rabbit ears spawner"
- loot = list(
- /obj/item/clothing/head/kitty
- )
-
-/obj/effect/spawner/random/clothing/pirate_or_bandana
- name = "pirate hat or bandana spawner"
- loot = list(
- /obj/item/clothing/head/pirate,
- /obj/item/clothing/head/bandana
- )
-
-/obj/effect/spawner/random/clothing/twentyfive_percent_cyborg_mask
- name = "25% cyborg mask spawner"
- spawn_loot_chance = 25
- loot = list(/obj/item/clothing/mask/gas/cyborg)
-
-/obj/effect/spawner/random/clothing/mafia_outfit
- name = "mafia outfit spawner"
- icon_state = "costume"
- loot = list(
- /obj/effect/spawner/costume/mafia = 20,
- /obj/effect/spawner/costume/mafia/white = 5,
- /obj/effect/spawner/costume/mafia/checkered = 2,
- /obj/effect/spawner/costume/mafia/beige = 5
- )
diff --git a/code/game/objects/effects/spawners/random.dm/decoration.dm b/code/game/objects/effects/spawners/random.dm/decoration.dm
deleted file mode 100644
index 7af7af7fe85b..000000000000
--- a/code/game/objects/effects/spawners/random.dm/decoration.dm
+++ /dev/null
@@ -1,118 +0,0 @@
-/obj/effect/spawner/random/decoration
- name = "decoration loot spawner"
- desc = "Time for some bling bling."
- icon_state = "lamp"
-
-/obj/effect/spawner/random/decoration/material
- name = "decoration material spawner"
- icon_state = "tile"
- loot = list(
- /obj/item/stack/sheet/sandblock{amount = 30} = 25,
- /obj/item/stack/sheet/mineral/wood{amount = 30} = 25,
- /obj/item/stack/tile/noslip{amount = 20} = 10,
- /obj/item/stack/sheet/plastic{amount = 30} = 10,
- /obj/item/stack/tile/pod{amount = 20} = 4,
- /obj/item/stack/tile/pod/light{amount = 20} = 3,
- /obj/item/stack/tile/pod/dark{amount = 20} = 3,
- )
-
-/obj/effect/spawner/random/decoration/carpet
- name = "carpet spawner"
- icon_state = "carpet"
- loot = list(
- /obj/item/stack/tile/carpet{amount = 30} = 35,
- /obj/item/stack/tile/carpet/black{amount = 30} = 20,
- )
-
-/obj/effect/spawner/random/decoration/ornament
- name = "ornament spawner"
- icon_state = "lamp"
- loot = list(
- /obj/item/flashlight/lamp = 35,
- /obj/item/flashlight/lamp/green = 35,
- /obj/item/flashlight/lantern = 10,
- /obj/item/flashlight/lamp/bananalamp = 5,
- )
-/obj/effect/spawner/random/decoration/glowstick
- name = "random colored glowstick"
- icon_state = "glowstick"
- loot_type_path = /obj/item/flashlight/glowstick
- loot = list()
-
-/obj/effect/spawner/random/decoration/glowstick/on
- name = "random colored glowstick (on)"
- icon_state = "glowstick"
-
-/obj/effect/spawner/random/decoration/glowstick/on/make_item(spawn_loc, type_path_to_make)
- . = ..()
-
- var/obj/item/flashlight/glowstick = .
-
- glowstick.set_light_on(TRUE)
-
-/obj/effect/spawner/random/decoration/paint
- name = "paint spawner"
- icon_state = "paint"
- loot_subtype_path = /obj/item/paint
- loot = list()
-
-/obj/effect/spawner/random/decoration/flower
- name = "random grown flower spawner"
- icon_state = "flower"
- loot = list(
- /obj/item/reagent_containers/food/snacks/grown/poppy,
- /obj/item/reagent_containers/food/snacks/grown/harebell,
- /obj/item/reagent_containers/food/snacks/grown/trumpet,
- )
-
-/obj/effect/spawner/random/flora
- name = "random flora spawner"
- loot = list(
- /obj/structure/flora/tree/chapel,
- /obj/structure/flora/tree/pine,
- /obj/structure/flora/tree/jungle/small,
- /obj/structure/flora/tree/jungle,
- /obj/structure/flora/ash/puce,
- /obj/structure/flora/ash/fireblossom,
- /obj/structure/flora/ash/fern,
- /obj/structure/flora/ash/tall_shroom,
- /obj/structure/flora/ash/stem_shroom,
- /obj/structure/flora/ash/space/voidmelon,
- /obj/structure/flora/ash/leaf_shroom,
- /obj/structure/flora/junglebush/large,
- /obj/structure/flora/junglebush/b,
- /obj/structure/flora/junglebush/c,
- /obj/structure/flora/ausbushes/fernybush,
- /obj/structure/flora/ausbushes/genericbush,
- /obj/structure/flora/ausbushes/grassybush,
- /obj/structure/flora/ausbushes/leafybush,
- /obj/structure/flora/ausbushes/palebush,
- /obj/structure/flora/ausbushes/pointybush,
- /obj/structure/flora/ausbushes/reedbush,
- /obj/structure/flora/ausbushes/stalkybush,
- /obj/structure/flora/ausbushes/sunnybush,
- /obj/structure/flora/bush,
- /obj/structure/flora/grass/jungle,
- /obj/structure/flora/junglebush,
- /obj/structure/flora/junglebush/b,
- /obj/structure/flora/junglebush/c,
- /obj/structure/flora/ash,
- /obj/structure/flora/ash/cacti,
- /obj/structure/flora/ash/cap_shroom,
- /obj/structure/flora/ash/chilly,
- /obj/structure/flora/tree/palm
- )
- spawn_loot_count = 1
-
-/obj/effect/spawner/random/flower
- name = "random flower spawner"
- icon_state = "flower"
- loot = list(
- /obj/structure/flora/ausbushes/brflowers,
- /obj/structure/flora/ausbushes/ywflowers,
- /obj/structure/flora/ausbushes/ppflowers,
- /obj/structure/flora/ausbushes/fullgrass,
- /obj/structure/flora/ausbushes/sparsegrass
- )
- spawn_loot_count = 1
-
diff --git a/code/game/objects/effects/spawners/random.dm/engineering.dm b/code/game/objects/effects/spawners/random.dm/engineering.dm
deleted file mode 100644
index 81f264039feb..000000000000
--- a/code/game/objects/effects/spawners/random.dm/engineering.dm
+++ /dev/null
@@ -1,138 +0,0 @@
-/obj/effect/spawner/random/engineering
- name = "engineering loot spawner"
- desc = "All engineering related spawners go here"
- icon_state = "toolbox"
-
-/obj/effect/spawner/random/engineering/tool
- loot = list(
- /obj/effect/spawner/random/engineering/tool/common = 120,
- /obj/effect/spawner/random/engineering/tool/sydnie = 20,
- /obj/effect/spawner/random/engineering/tool/adv = 5,
- )
-
-/obj/effect/spawner/random/engineering/tool/common
- loot = list(
- /obj/item/wrench/crescent = 1,
- /obj/item/screwdriver = 1,
- /obj/item/weldingtool = 1,
- /obj/item/crowbar = 1,
- /obj/item/wirecutters = 1,
- /obj/item/multitool = 1,
- )
-
-/obj/effect/spawner/random/engineering/tool/sydnie
- loot = list(
- /obj/item/wrench/syndie = 1,
- /obj/item/screwdriver/nuke = 1,
- /obj/item/weldingtool/largetank = 1,
- /obj/item/crowbar/syndie = 1,
- /obj/item/wirecutters/syndie = 1,
- /obj/item/multitool/syndie = 1,
- )
-
-/obj/effect/spawner/random/engineering/tool/adv
- loot = list(
- /obj/item/screwdriver/power = 1,
- /obj/item/weldingtool/experimental = 1,
- /obj/item/crowbar/power = 1,
- )
-
-/obj/effect/spawner/random/stockparts
- name = "random good stock parts"
- spawn_loot_count = 6
- loot = list(
- /obj/item/stock_parts/capacitor/adv,
- /obj/item/stock_parts/capacitor/quadratic,
- /obj/item/stock_parts/capacitor/super,
- /obj/item/stock_parts/cell/hyper,
- /obj/item/stock_parts/cell/super,
- /obj/item/stock_parts/cell/bluespace,
- /obj/item/stock_parts/matter_bin/bluespace,
- /obj/item/stock_parts/matter_bin/super,
- /obj/item/stock_parts/matter_bin/adv,
- /obj/item/stock_parts/micro_laser/ultra,
- /obj/item/stock_parts/micro_laser/quadultra,
- /obj/item/stock_parts/micro_laser/high,
- /obj/item/stock_parts/scanning_module/triphasic,
- /obj/item/stock_parts/scanning_module/phasic,
- /obj/item/stock_parts/scanning_module/adv,
- /obj/item/reagent_containers/glass/beaker/bluespace,
- /obj/item/reagent_containers/glass/beaker/plastic,
- /obj/item/reagent_containers/glass/beaker/large,
- /obj/item/stock_parts/manipulator/nano,
- /obj/item/stock_parts/manipulator/pico,
- /obj/item/stock_parts/manipulator/femto
- )
-
-/obj/effect/spawner/random/materials
- name = "random bulk materials"
- spawn_loot_count = 2
- loot = list(
- /obj/item/stack/sheet/plastic/fifty,
- /obj/item/stack/sheet/bluespace_crystal/twenty,
- /obj/item/stack/sheet/cardboard/fifty,
- /obj/item/stack/sheet/glass/fifty,
- /obj/item/stack/sheet/metal/fifty,
- /obj/item/stack/sheet/plasteel/twenty,
- /obj/item/stack/sheet/mineral/plasma/fifty,
- /obj/item/stack/sheet/mineral/silver/fifty,
- /obj/item/stack/sheet/mineral/titanium/fifty,
- /obj/item/stack/sheet/mineral/uranium/fifty,
- /obj/item/stack/sheet/mineral/wood/fifty,
- /obj/item/stack/sheet/mineral/diamond/twenty,
- /obj/item/stack/sheet/mineral/gold/fifty,
- /obj/item/stack/cable_coil/red,
- /obj/item/stack/rods/fifty
- )
-
-/obj/effect/spawner/random/stockparts
- name = "random good stock parts"
- spawn_loot_count = 5
- loot = list(
- /obj/item/stock_parts/capacitor/adv,
- /obj/item/stock_parts/capacitor/quadratic,
- /obj/item/stock_parts/capacitor/super,
- /obj/item/stock_parts/cell/hyper,
- /obj/item/stock_parts/cell/super,
- /obj/item/stock_parts/cell/bluespace,
- /obj/item/stock_parts/matter_bin/bluespace,
- /obj/item/stock_parts/matter_bin/super,
- /obj/item/stock_parts/matter_bin/adv,
- /obj/item/stock_parts/micro_laser/ultra,
- /obj/item/stock_parts/micro_laser/quadultra,
- /obj/item/stock_parts/micro_laser/high,
- /obj/item/stock_parts/scanning_module/triphasic,
- /obj/item/stock_parts/scanning_module/phasic,
- /obj/item/stock_parts/scanning_module/adv,
- /obj/item/reagent_containers/glass/beaker/bluespace,
- /obj/item/reagent_containers/glass/beaker/plastic,
- /obj/item/reagent_containers/glass/beaker/large,
- /obj/item/stock_parts/manipulator/nano,
- /obj/item/stock_parts/manipulator/pico,
- /obj/item/stock_parts/manipulator/femto
- )
-
-/obj/effect/spawner/random/materials
- name = "random materials"
- spawn_loot_count = 3
- loot = list(
- /obj/item/stack/sheet/plastic/fifty,
- /obj/item/stack/sheet/plastic/five,
- /obj/item/stack/sheet/bluespace_crystal/twenty,
- /obj/item/stack/sheet/bluespace_crystal/five,
- /obj/item/stack/sheet/cardboard/fifty,
- /obj/item/stack/sheet/glass/fifty,
- /obj/item/stack/sheet/metal/fifty,
- /obj/item/stack/sheet/metal/twenty,
- /obj/item/stack/sheet/plasteel/twenty,
- /obj/item/stack/sheet/mineral/plasma/fifty,
- /obj/item/stack/sheet/mineral/plasma/twenty,
- /obj/item/stack/sheet/mineral/silver/fifty,
- /obj/item/stack/sheet/mineral/titanium/twenty,
- /obj/item/stack/sheet/mineral/uranium/twenty,
- /obj/item/stack/sheet/mineral/wood/fifty,
- /obj/item/stack/sheet/mineral/diamond/twenty,
- /obj/item/stack/sheet/mineral/gold/fifty,
- /obj/item/stack/cable_coil/red,
- /obj/item/stack/rods/fifty
- )
diff --git a/code/game/objects/effects/spawners/random.dm/entertainment.dm b/code/game/objects/effects/spawners/random.dm/entertainment.dm
deleted file mode 100644
index 8e51ddf384c0..000000000000
--- a/code/game/objects/effects/spawners/random.dm/entertainment.dm
+++ /dev/null
@@ -1,282 +0,0 @@
-/obj/effect/spawner/random/entertainment
- name = "entertainment loot spawner"
- desc = "It's time to paaaaaarty!"
-
-/obj/effect/spawner/random/entertainment/arcade
- name = "spawn random arcade machine"
- desc = "Automagically transforms into a random arcade machine. If you see this while in a shift, please create a bug report."
- icon_state = "arcade"
- loot = list(
- /obj/machinery/computer/arcade/orion_trail = 49,
- /obj/machinery/computer/arcade/battle = 49,
- /obj/machinery/computer/arcade/amputation = 2,
- )
-
-/obj/effect/spawner/random/entertainment/musical_instrument
- name = "musical instrument spawner"
- icon_state = "eguitar"
- loot = list(
- /obj/item/instrument/violin = 5,
- /obj/item/instrument/banjo = 5,
- /obj/item/instrument/guitar = 5,
- /obj/item/instrument/eguitar = 5,
- /obj/item/instrument/glockenspiel = 5,
- /obj/item/instrument/accordion = 5,
- /obj/item/instrument/trumpet = 5,
- /obj/item/instrument/saxophone = 5,
- /obj/item/instrument/trombone = 5,
- /obj/item/instrument/recorder = 5,
- /obj/item/instrument/harmonica = 5,
- /obj/item/instrument/bikehorn = 2,
- /obj/item/instrument/violin/golden = 2,
- )
-
-/obj/effect/spawner/random/entertainment/gambling
- name = "gambling valuables spawner"
- icon_state = "dice"
- loot = list(
- /obj/item/clothing/head/trapper = 3,
- /obj/effect/spawner/random/entertainment/coin = 3,
- /obj/effect/spawner/random/entertainment/money = 3,
- /obj/item/dice/d6 = 3,
- /obj/item/storage/box/syndie_kit/throwing_weapons = 1,
- /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
- )
-
-/obj/effect/spawner/random/entertainment/coin
- name = "coin spawner"
- icon_state = "coin"
- loot = list(
- /obj/item/coin/iron = 5,
- /obj/item/coin/plastic = 5,
- /obj/item/coin/silver = 4,
- /obj/item/coin/plasma = 4,
- /obj/item/coin/uranium = 3,
- /obj/item/coin/titanium = 3,
- /obj/item/coin/diamond = 2,
- /obj/item/coin/twoheaded = 1,
- /obj/item/coin/antagtoken = 1,
- )
-
-/obj/effect/spawner/random/entertainment/money_small
- name = "small money spawner"
- icon_state = "cash"
- spawn_loot_count = 3
- spawn_loot_split = TRUE
- loot = list(
- /obj/item/spacecash/bundle/c1 = 5,
- /obj/item/spacecash/bundle/c10 = 3,
- /obj/item/spacecash/bundle/c20 = 2,
- )
-
-/obj/effect/spawner/random/entertainment/money
- name = "money spawner"
- icon_state = "cash"
- spawn_loot_count = 3
- spawn_loot_split = TRUE
- loot = list(
- /obj/item/spacecash/bundle/c1 = 10,
- /obj/item/spacecash/bundle/c10 = 5,
- /obj/item/spacecash/bundle/c20 = 3,
- /obj/item/spacecash/bundle/c50 = 2,
- /obj/item/spacecash/bundle/c100 = 1,
- )
-
-/obj/effect/spawner/random/entertainment/money_medium
- name = "money spawner"
- icon_state = "cash"
- loot = list(
- /obj/item/spacecash/bundle/c100 = 25,
- /obj/item/spacecash/bundle/c200 = 15,
- /obj/item/spacecash/bundle/c50 = 10,
- /obj/item/spacecash/bundle/c500 = 5,
- /obj/item/spacecash/bundle/c1000 = 1,
- )
-
-/obj/effect/spawner/random/entertainment/money_large
- name = "large money spawner"
- icon_state = "cash"
- spawn_loot_count = 5
- spawn_loot_split = TRUE
- loot = list(
- /obj/item/spacecash/bundle/c1 = 100,
- /obj/item/spacecash/bundle/c10 = 80,
- /obj/item/spacecash/bundle/c20 = 60,
- /obj/item/spacecash/bundle/c50 = 40,
- /obj/item/spacecash/bundle/c100 = 30,
- /obj/item/spacecash/bundle/c200 = 20,
- /obj/item/spacecash/bundle/c500 = 10,
- /obj/item/spacecash/bundle/c1000 = 5,
- /obj/item/spacecash/bundle/c10000 = 1,
- )
-
-/obj/effect/spawner/random/entertainment/drugs
- name = "recreational drugs spawner"
- icon_state = "pill"
- loot = list(
- /obj/item/reagent_containers/food/drinks/bottle/hooch = 50,
- /obj/item/clothing/mask/cigarette/rollie/cannabis = 15,
- /obj/item/reagent_containers/syringe = 15,
- /obj/item/cigbutt/roach = 15,
- /obj/item/clothing/mask/cigarette/rollie/mindbreaker = 5,
- )
-
-/obj/effect/spawner/random/entertainment/dice
- name = "dice spawner"
- icon_state = "dice_bag"
- loot = list(
- /obj/item/dice/d4,
- /obj/item/dice/d6,
- /obj/item/dice/d8,
- /obj/item/dice/d10,
- /obj/item/dice/d12,
- /obj/item/dice/d20,
- )
-
-/obj/effect/spawner/random/entertainment/cigarette_pack
- name = "cigarette pack spawner"
- icon_state = "cigarettes"
- loot = list(
- /obj/item/storage/fancy/cigarettes = 3,
- /obj/item/storage/fancy/cigarettes/dromedaryco = 3,
- /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
- /obj/item/storage/fancy/cigarettes/cigpack_robust = 3,
- /obj/item/storage/fancy/cigarettes/cigpack_carp = 3,
- /obj/item/storage/fancy/cigarettes/cigpack_robustgold = 1,
- /obj/item/storage/fancy/cigarettes/cigpack_midori = 1,
- /obj/item/storage/fancy/cigarettes/cigpack_candy = 1,
- )
-
-/obj/effect/spawner/random/entertainment/cigarette
- name = "cigarette spawner"
- icon_state = "cigarettes"
- loot = list(
- /obj/item/clothing/mask/cigarette/space_cigarette = 3,
- /obj/item/clothing/mask/cigarette/rollie/cannabis = 3,
- /obj/item/clothing/mask/cigarette/rollie/nicotine = 3,
- /obj/item/clothing/mask/cigarette/dromedary = 2,
- /obj/item/clothing/mask/cigarette/uplift = 2,
- /obj/item/clothing/mask/cigarette/robust = 2,
- /obj/item/clothing/mask/cigarette/carp = 1,
- /obj/item/clothing/mask/cigarette/robustgold = 1,
- )
-
-/obj/effect/spawner/random/entertainment/cigar
- name = "cigar spawner"
- icon_state = "cigarettes"
- loot = list(
- /obj/item/clothing/mask/cigarette/cigar = 3,
- /obj/item/clothing/mask/cigarette/cigar/havana = 2,
- /obj/item/clothing/mask/cigarette/cigar/cohiba = 1,
- )
-
-/obj/effect/spawner/random/entertainment/wallet_lighter
- name = "lighter wallet spawner"
- icon_state = "lighter"
- loot = list( // these fit inside a wallet
- /obj/item/match = 10,
- /obj/item/lighter/greyscale = 10,
- /obj/item/lighter = 1,
- )
-
-/obj/effect/spawner/random/entertainment/lighter
- name = "lighter spawner"
- icon_state = "lighter"
- loot = list(
- /obj/item/storage/box/matches = 10,
- /obj/item/lighter/greyscale = 10,
- /obj/item/lighter = 1,
- )
-
-/obj/effect/spawner/random/entertainment/wallet_storage
- name = "wallet contents spawner"
- icon_state = "wallet"
- spawn_loot_count = 1
- loot = list( // random photos would go here. IF I HAD ONE. :'(
- /obj/item/lipstick/random,
- /obj/effect/spawner/random/food_or_drink/seed,
- /obj/effect/spawner/random/medical/minor_healing,
- /obj/effect/spawner/random/entertainment/coin,
- /obj/effect/spawner/random/entertainment/dice,
- /obj/effect/spawner/random/entertainment/cigarette,
- /obj/effect/spawner/random/entertainment/wallet_lighter,
- /obj/effect/spawner/random/bureaucracy/paper,
- /obj/effect/spawner/random/bureaucracy/crayon,
- /obj/effect/spawner/random/bureaucracy/pen,
- /obj/effect/spawner/random/bureaucracy/stamp,
- )
-
-/obj/effect/spawner/random/entertainment/deck
- name = "deck spawner"
- icon_state = "deck"
- loot = list(
- /obj/item/toy/cards/deck = 5,
- /obj/item/toy/cards/deck/kotahi = 2,
- /obj/item/toy/cards/deck/tarot = 1,
- )
-
-/obj/effect/spawner/random/entertainment/toy_figure
- name = "toy figure spawner"
- icon_state = "toy"
- loot_subtype_path = /obj/item/toy/figure
- loot = list()
-
-/obj/effect/spawner/random/entertainment/toy
- name = "toy spawner"
- icon_state = "toy"
- loot = list()
-
-/obj/effect/spawner/random/entertainment/toy/Initialize(mapload)
- loot += GLOB.arcade_prize_pool
- return ..()
-
-/obj/effect/spawner/random/entertainment/plushie
- name = "plushie spawner"
- icon_state = "plushie"
- loot = list (
- /obj/item/toy/plush/beeplushie,
- /obj/item/toy/plush/blahaj,
- /obj/item/toy/plush/carpplushie,
- /obj/item/toy/plush/flushed,
- /obj/item/toy/plush/kari,
- /obj/item/toy/plush/lizardplushie,
- /obj/item/toy/plush/mora,
- /obj/item/toy/plush/realgoat,
- /obj/item/toy/plush/rilena,
- /obj/item/toy/plush/sharai,
- /obj/item/toy/plush/slimeplushie,
- /obj/item/toy/plush/snakeplushie,
- /obj/item/toy/plush/spider,
- /obj/item/toy/plush/tali,
- /obj/item/toy/plush/xader,
- /obj/effect/spawner/random/entertainment/plushie/moth // fair chances
- )
-
-/obj/effect/spawner/random/entertainment/plushie/moth
- loot = list (
- /obj/item/toy/plush/moth,
- /obj/item/toy/plush/moth/monarch,
- /obj/item/toy/plush/moth/luna,
- /obj/item/toy/plush/moth/atlas,
- /obj/item/toy/plush/moth/redish,
- /obj/item/toy/plush/moth/royal,
- /obj/item/toy/plush/moth/gothic,
- /obj/item/toy/plush/moth/lovers,
- /obj/item/toy/plush/moth/whitefly,
- /obj/item/toy/plush/moth/punished,
- /obj/item/toy/plush/moth/firewatch,
- /obj/item/toy/plush/moth/deadhead,
- /obj/item/toy/plush/moth/poison,
- /obj/item/toy/plush/moth/ragged,
- /obj/item/toy/plush/moth/snow,
- /obj/item/toy/plush/moth/moonfly
- )
-
-/obj/effect/spawner/random/entertainment/colorful_grenades
- name = "colorful/glitter grenades spawner"
- loot = list(
- /obj/item/grenade/chem_grenade/glitter/pink,
- /obj/item/grenade/chem_grenade/glitter/blue,
- /obj/item/grenade/chem_grenade/glitter/white,
- /obj/item/grenade/chem_grenade/colorful
- )
diff --git a/code/game/objects/effects/spawners/random.dm/exotic.dm b/code/game/objects/effects/spawners/random.dm/exotic.dm
deleted file mode 100644
index 9d55fa9b69ff..000000000000
--- a/code/game/objects/effects/spawners/random.dm/exotic.dm
+++ /dev/null
@@ -1,69 +0,0 @@
-/obj/effect/spawner/random/exotic
- name = "exotic spawner"
- desc = "Super duper rare stuff."
- icon_state = "showcase"
-
-/obj/effect/spawner/random/exotic/ripley
- name = "25% exosuit 75% wreckage ripley spawner"
- icon_state = "ripley"
- loot = list(
- /obj/mecha/working/ripley/mining = 1,
- /obj/structure/mecha_wreckage/ripley = 5
- )
-
-/obj/effect/spawner/random/exotic/prison_contraband
- name = "prison contraband loot spawner"
- icon_state = "prisoner"
- loot = list(
- /obj/item/clothing/mask/cigarette/space_cigarette = 4,
- /obj/item/clothing/mask/cigarette/robust = 2,
- /obj/item/clothing/mask/cigarette/carp = 3,
- /obj/item/clothing/mask/cigarette/uplift = 2,
- /obj/item/clothing/mask/cigarette/dromedary = 3,
- /obj/item/clothing/mask/cigarette/robustgold = 1,
- /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
- /obj/item/storage/fancy/cigarettes = 3,
- /obj/item/clothing/mask/cigarette/rollie/cannabis = 4,
- /obj/item/toy/crayon/spraycan = 2,
- /obj/item/crowbar = 1,
- /obj/item/assembly/flash/handheld = 1,
- /obj/item/restraints/handcuffs/cable/zipties = 1,
- /obj/item/restraints/handcuffs = 1,
- /obj/item/radio = 1,
- /obj/item/lighter = 3,
- /obj/item/storage/box/matches = 3,
- /obj/item/reagent_containers/syringe/contraband/space_drugs = 1,
- /obj/item/reagent_containers/syringe/contraband/krokodil = 1,
- /obj/item/reagent_containers/syringe/contraband/crank = 1,
- /obj/item/reagent_containers/syringe/contraband/methamphetamine = 1,
- /obj/item/reagent_containers/syringe/contraband/bath_salts = 1,
- /obj/item/reagent_containers/syringe/contraband/fentanyl = 1,
- /obj/item/reagent_containers/syringe/contraband/morphine = 1,
- /obj/item/storage/pill_bottle/happy = 1,
- /obj/item/storage/pill_bottle/lsd = 1,
- /obj/item/storage/pill_bottle/psicodine = 1,
- /obj/item/reagent_containers/food/drinks/beer = 4,
- /obj/item/reagent_containers/food/drinks/bottle/whiskey = 1,
- /obj/item/paper/fluff/jobs/prisoner/letter = 1,
- /obj/item/grenade/smokebomb = 1,
- /obj/item/flashlight/seclite = 1,
- /obj/item/melee/knife/shiv = 4,
- /obj/item/melee/knife/shiv/carrot = 1,
- /obj/item/melee/knife/kitchen = 1,
- /obj/item/storage/wallet/random = 1,
- /obj/item/pda = 1
- )
-
-/obj/effect/spawner/random/exotic/armory
- name = "generic armory spawner"
- spawn_loot_split = TRUE
- spawn_loot_count = 3
- spawn_loot_split_pixel_offsets = 4
-
- loot = list(
- /obj/item/gun/ballistic/automatic/pistol/ringneck = 8,
- /obj/item/gun/ballistic/shotgun/automatic/combat = 5,
- /obj/item/gun/ballistic/automatic/pistol/deagle,
- /obj/item/gun/ballistic/revolver/mateba
- )
-
diff --git a/code/game/objects/effects/spawners/random.dm/food_or_drink.dm b/code/game/objects/effects/spawners/random.dm/food_or_drink.dm
deleted file mode 100644
index 300f94260ee1..000000000000
--- a/code/game/objects/effects/spawners/random.dm/food_or_drink.dm
+++ /dev/null
@@ -1,284 +0,0 @@
-/obj/effect/spawner/random/food_or_drink
- name = "food or drink loot spawner"
- desc = "Nom nom nom"
- icon_state = "soup"
-
-/obj/effect/spawner/random/food_or_drink/donkpockets
- name = "donk pocket box spawner"
- icon_state = "donkpocket"
- loot = list(
- /obj/item/storage/box/donkpockets/donkpocketspicy = 1,
- /obj/item/storage/box/donkpockets/donkpocketteriyaki = 1,
- /obj/item/storage/box/donkpockets/donkpocketpizza = 1,
- /obj/item/storage/box/donkpockets/donkpocketberry = 1,
- /obj/item/storage/box/donkpockets/donkpockethonk = 1,
- )
-
-/obj/effect/spawner/random/food_or_drink/ration
- name = "ration spawner"
- icon_state = "pizzabox"
- loot = list (
- /obj/item/storage/ration/vegan_chili = 5,
- /obj/item/storage/ration/shredded_beef = 5,
- /obj/item/storage/ration/pork_spaghetti = 5,
- /obj/item/storage/ration/fried_fish = 5,
- /obj/item/storage/ration/beef_strips = 5,
- /obj/item/storage/ration/chili_macaroni = 5,
- /obj/item/storage/ration/chicken_wings_hot_sauce = 5,
- /obj/item/storage/ration/fish_stew = 5,
- /obj/item/storage/ration/lemon_pepper_chicken = 5,
- /obj/item/storage/ration/sausage_peppers_onions = 5,
- /obj/item/storage/ration/pork_dumplings_chili_sauce = 5,
- /obj/item/storage/ration/battered_fish_sticks = 5,
- /obj/item/storage/ration/assorted_salted_offal = 5,
- /obj/item/storage/ration/maple_pork_sausage_patty = 5,
- /obj/item/storage/ration/pepper_jack_beef_patty = 5,
- /obj/item/storage/ration/beef_goulash = 5,
- /obj/item/storage/ration/pepperoni_pizza_slice = 5,
- /obj/item/storage/ration/blackened_calamari = 5,
- /obj/item/storage/ration/elbow_macaroni = 5,
- /obj/item/storage/ration/cheese_pizza_slice = 5,
- /obj/item/storage/ration/crayons = 2 // :)
- )
-
-/obj/effect/spawner/random/food_or_drink/donut
- name = "random donut" //donut :)
- icon_state = "pizzabox"
- loot = list(
- /obj/item/reagent_containers/food/snacks/donut/apple = 1,
- /obj/item/reagent_containers/food/snacks/donut/berry = 1,
- /obj/item/reagent_containers/food/snacks/donut/caramel = 1,
- /obj/item/reagent_containers/food/snacks/donut/choco = 1,
- /obj/item/reagent_containers/food/snacks/donut/laugh = 1,
- /obj/item/reagent_containers/food/snacks/donut/matcha = 1,
- /obj/item/reagent_containers/food/snacks/donut/meat = 1,
- /obj/item/reagent_containers/food/snacks/donut/plain = 1,
- /obj/item/reagent_containers/food/snacks/donut/trumpet = 1,
- /obj/item/reagent_containers/food/snacks/donut/blumpkin = 1,
- /obj/item/reagent_containers/food/snacks/donut/bungo = 1,
- /obj/item/reagent_containers/food/snacks/donut/chaos = 1,
- )
-
-/obj/effect/spawner/random/food_or_drink/donut/jelly
- name = "random jelly donut"
- loot = list(
- /obj/item/reagent_containers/food/snacks/donut/jelly/berry = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/apple = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/blumpkin = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/bungo = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/caramel = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/choco = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/laugh = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/matcha = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/trumpet = 1,
- )
-
-/obj/effect/spawner/random/food_or_drink/donut/slimejelly
- name = "random slimejelly donut"
- loot = list(
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/apple = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/berry = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/blumpkin = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/bungo = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/caramel = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/choco = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/laugh = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/matcha = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/trumpet = 1,
- )
-
-/obj/effect/spawner/random/food_or_drink/three_course_meal
- name = "three course meal spawner"
- spawn_loot_count = 3
- spawn_loot_double = FALSE
- var/soups = list(
- /obj/item/reagent_containers/food/snacks/soup/beet,
- /obj/item/reagent_containers/food/snacks/soup/sweetpotato,
- /obj/item/reagent_containers/food/snacks/soup/stew,
- /obj/item/reagent_containers/food/snacks/soup/hotchili,
- /obj/item/reagent_containers/food/snacks/soup/nettle,
- /obj/item/reagent_containers/food/snacks/soup/meatball)
- var/salads = list(
- /obj/item/reagent_containers/food/snacks/salad/herbsalad,
- /obj/item/reagent_containers/food/snacks/salad/validsalad,
- /obj/item/reagent_containers/food/snacks/salad/fruit,
- /obj/item/reagent_containers/food/snacks/salad/jungle,
- /obj/item/reagent_containers/food/snacks/salad/aesirsalad)
- var/mains = list(
- /obj/item/reagent_containers/food/snacks/bearsteak,
- /obj/item/reagent_containers/food/snacks/enchiladas,
- /obj/item/reagent_containers/food/snacks/stewedsoymeat,
- /obj/item/reagent_containers/food/snacks/burger/bigbite,
- /obj/item/reagent_containers/food/snacks/burger/superbite,
- /obj/item/reagent_containers/food/snacks/burger/fivealarm)
-
-/obj/effect/spawner/random/food_or_drink/three_course_meal/Initialize(mapload)
- loot = list(pick(soups) = 1,pick(salads) = 1,pick(mains) = 1)
- . = ..()
-
-/obj/effect/spawner/random/food_or_drink/garden
- name = "lush garden seeder"
- spawn_loot_count = 3
- loot = list(
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus = 1,
- /obj/item/reagent_containers/food/snacks/grown/berries/death/stealth = 2,
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange_3d = 1,
- /obj/item/reagent_containers/food/snacks/grown/trumpet = 1,
- /obj/item/reagent_containers/food/snacks/grown/bungofruit = 1,
- /obj/item/seeds/random = 1,
- /obj/item/grown/log/bamboo = 2,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 2,
- /obj/item/reagent_containers/food/snacks/grown/berries/poison/stealth = 5,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 2,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lime = 2,
- /obj/item/reagent_containers/food/snacks/grown/vanillapod = 2,
- /obj/item/reagent_containers/food/snacks/grown/moonflower = 2,
- /obj/item/reagent_containers/food/snacks/grown/cocoapod = 2,
- /obj/item/reagent_containers/food/snacks/grown/pineapple = 2,
- /obj/item/reagent_containers/food/snacks/grown/poppy/lily = 2,
- /obj/item/reagent_containers/food/snacks/grown/poppy/geranium = 2,
- /obj/item/reagent_containers/food/snacks/grown/sugarcane = 2,
- /obj/item/reagent_containers/food/snacks/grown/tea = 2,
- /obj/item/reagent_containers/food/snacks/grown/tobacco = 2,
- /obj/item/reagent_containers/food/snacks/grown/watermelon = 4,
- /obj/item/grown/sunflower = 4,
- /obj/item/reagent_containers/food/snacks/grown/banana = 4,
- /obj/item/reagent_containers/food/snacks/grown/apple = 4,
- /obj/item/reagent_containers/food/snacks/grown/berries = 5,
- /obj/item/reagent_containers/food/snacks/grown/cherries = 4,
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 4,
- /obj/item/reagent_containers/food/snacks/grown/garlic = 4,
- /obj/item/reagent_containers/food/snacks/grown/grapes = 4,
- /obj/item/reagent_containers/food/snacks/grown/grass = 5,
- /obj/item/reagent_containers/food/snacks/grown/pumpkin = 4,
- /obj/item/reagent_containers/food/snacks/grown/rainbow_flower = 4,
- /obj/item/reagent_containers/food/snacks/grown/wheat = 4,
- /obj/item/reagent_containers/food/snacks/grown/parsnip = 4,
- /obj/item/reagent_containers/food/snacks/grown/peas = 4,
- /obj/item/reagent_containers/food/snacks/grown/rice = 4,
- /obj/item/reagent_containers/food/snacks/grown/soybeans = 4,
- /obj/item/reagent_containers/food/snacks/grown/tomato = 4,
- /obj/item/reagent_containers/food/snacks/grown/cabbage = 4,
- /obj/item/reagent_containers/food/snacks/grown/onion = 4,
- /obj/item/reagent_containers/food/snacks/grown/carrot = 4)
-
-/obj/effect/spawner/random/food_or_drink/garden/arid
- name = "arid garden seeder"
- loot = list(
- /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 1,
- /obj/item/reagent_containers/food/snacks/grown/nettle = 1,
- /obj/item/grown/cotton/durathread = 1,
- /obj/item/seeds/random = 1,
- /obj/item/reagent_containers/food/snacks/grown/redbeet = 1,
- /obj/item/reagent_containers/food/snacks/grown/aloe = 2,
- /obj/item/grown/cotton = 2,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/angel = 2,
- /obj/item/reagent_containers/food/snacks/grown/chili = 2,
- /obj/item/reagent_containers/food/snacks/grown/whitebeet = 5,
- /obj/item/reagent_containers/food/snacks/grown/potato = 4,
- /obj/item/reagent_containers/food/snacks/grown/potato/sweet = 4,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 4,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 4,
- /obj/item/reagent_containers/food/snacks/grown/corn = 4
- )
-
-/obj/effect/spawner/random/food_or_drink/garden/cold
- name = "frigid garden seeder"
- loot = list(
- /obj/item/reagent_containers/food/snacks/grown/bluecherries = 1,
- /obj/item/reagent_containers/food/snacks/grown/galaxythistle = 1,
- /obj/item/reagent_containers/food/snacks/grown/berries/death/stealth = 1,
- /obj/item/seeds/random = 1,
- /obj/item/reagent_containers/food/snacks/grown/poppy = 2,
- /obj/item/reagent_containers/food/snacks/grown/tomato/blue = 2,
- /obj/item/reagent_containers/food/snacks/grown/berries/poison/stealth = 2,
- /obj/item/reagent_containers/food/snacks/grown/berries = 4,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 4,
- /obj/item/reagent_containers/food/snacks/grown/oat = 4,
- /obj/item/reagent_containers/food/snacks/grown/grapes/green = 4,
- /obj/item/reagent_containers/food/snacks/grown/grass = 4,
- /obj/item/reagent_containers/food/snacks/grown/harebell = 5,
- /obj/item/seeds/starthistle = 5
- )
-
-/obj/effect/spawner/random/food_or_drink/garden/sick
- name = "sickly garden seeder"
- loot = list(
- /obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow = 1,
- /obj/item/reagent_containers/food/snacks/grown/cannabis/death = 1,
- /obj/item/seeds/replicapod = 1,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/angel = 1,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap = 2,
- /obj/item/seeds/tower/steel = 2,
- /obj/item/reagent_containers/food/snacks/grown/cannabis = 2,
- /obj/item/seeds/random = 2,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/jupitercup = 2,
- /obj/item/reagent_containers/food/snacks/grown/cherrybulbs = 4,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 4,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap = 4,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/reishi = 4,
- /obj/item/reagent_containers/food/snacks/grown/berries/glow = 4
- )
-
-/obj/effect/spawner/random/food_or_drink/garden/seaweed
- name = "seaweed patch seeder"
- loot = list(
- /obj/item/reagent_containers/food/snacks/grown/seaweed
- )
-
-/obj/effect/spawner/random/food_or_drink/seed
- name = "GO FORTH AND CULTIVATE"
- icon_state = "seed"//sneed
- loot = list(
- /obj/item/seeds/aloe,
- /obj/item/seeds/ambrosia,
- /obj/item/seeds/apple,
- /obj/item/seeds/cotton,
- /obj/item/seeds/banana,
- /obj/item/seeds/berry,
- /obj/item/seeds/cabbage,
- /obj/item/seeds/carrot,
- /obj/item/seeds/cherry,
- /obj/item/seeds/chanter,
- /obj/item/seeds/chili,
- /obj/item/seeds/cocoapod,
- /obj/item/seeds/coffee,
- /obj/item/seeds/corn,
- /obj/item/seeds/eggplant,
- /obj/item/seeds/garlic,
- /obj/item/seeds/grape,
- /obj/item/seeds/grass,
- /obj/item/seeds/lemon,
- /obj/item/seeds/lime,
- /obj/item/seeds/onion,
- /obj/item/seeds/orange,
- /obj/item/seeds/peas,
- /obj/item/seeds/pineapple,
- /obj/item/seeds/potato,
- /obj/item/seeds/poppy,
- /obj/item/seeds/pumpkin,
- /obj/item/seeds/wheat/rice,
- /obj/item/seeds/soya,
- /obj/item/seeds/sugarcane,
- /obj/item/seeds/sunflower,
- /obj/item/seeds/tea,
- /obj/item/seeds/tobacco,
- /obj/item/seeds/tomato,
- /obj/item/seeds/tower,
- /obj/item/seeds/watermelon,
- /obj/item/seeds/wheat,
- /obj/item/seeds/whitebeet,
- /obj/item/seeds/amanita,
- /obj/item/seeds/glowshroom,
- /obj/item/seeds/liberty,
- /obj/item/seeds/nettle,
- /obj/item/seeds/plump,
- /obj/item/seeds/reishi,
- /obj/item/seeds/cannabis,
- /obj/item/seeds/starthistle,
- /obj/item/seeds/cherry/bomb,
- /obj/item/seeds/berry/glow,
- /obj/item/seeds/sunflower/moonflower
- )
diff --git a/code/game/objects/effects/spawners/random.dm/maintenance.dm b/code/game/objects/effects/spawners/random.dm/maintenance.dm
deleted file mode 100644
index 53a61e0f877d..000000000000
--- a/code/game/objects/effects/spawners/random.dm/maintenance.dm
+++ /dev/null
@@ -1,57 +0,0 @@
-/obj/effect/spawner/random/maintenance
- name = "maintenance loot spawner"
- desc = "Come on Lady Luck, spawn me a pair of sunglasses."
- icon_state = "loot"
- // see code/_globalvars/lists/maintenance_loot.dm for loot table
-
-/obj/effect/spawner/random/maintenance/Initialize(mapload)
- loot = GLOB.maintenance_loot
- . = ..()
-
-/obj/effect/spawner/random/maintenance/skew_loot_weights(list/loot_list, exponent)
- ///We only need to skew the weights once, since it's a global list used by all maint spawners.
- var/static/already_done = FALSE
- if(loot_list == GLOB.maintenance_loot && already_done)
- return
- already_done = TRUE
- return ..()
-
-/obj/effect/spawner/random/maintenance/spawn_loot(lootcount_override)
- if(isnull(lootcount_override))
- lootcount_override = spawn_loot_count
- . = ..()
-
- /* Fucks everything. Investigate further
- // In addition, closets that are closed will have the maintenance loot inserted inside.
- for(var/obj/structure/closet/closet in get_turf(src))
- if(!closet.opened)
- closet.take_contents()
- */
-
-/obj/effect/spawner/random/maintenance/two
- name = "2 x maintenance loot spawner"
- spawn_loot_count = 2
-
-/obj/effect/spawner/random/maintenance/three
- name = "3 x maintenance loot spawner"
- spawn_loot_count = 3
-
-/obj/effect/spawner/random/maintenance/four
- name = "4 x maintenance loot spawner"
- spawn_loot_count = 4
-
-/obj/effect/spawner/random/maintenance/five
- name = "5 x maintenance loot spawner"
- spawn_loot_count = 5
-
-/obj/effect/spawner/random/maintenance/six
- name = "6 x maintenance loot spawner"
- spawn_loot_count = 6
-
-/obj/effect/spawner/random/maintenance/seven
- name = "7 x maintenance loot spawner"
- spawn_loot_count = 7
-
-/obj/effect/spawner/random/maintenance/eight
- name = "8 x maintenance loot spawner"
- spawn_loot_count = 8
diff --git a/code/game/objects/effects/spawners/random.dm/medical.dm b/code/game/objects/effects/spawners/random.dm/medical.dm
deleted file mode 100644
index a0d5a6db53b9..000000000000
--- a/code/game/objects/effects/spawners/random.dm/medical.dm
+++ /dev/null
@@ -1,145 +0,0 @@
-/obj/effect/spawner/random/medical
- name = "medical loot spawner"
- desc = "Doc, gimmie something good."
-
-/obj/effect/spawner/random/medical/minor_healing
- name = "minor healing spawner"
- icon_state = "gauze"
- loot = list(
- /obj/item/stack/medical/suture,
- /obj/item/stack/medical/mesh,
- /obj/item/stack/medical/gauze,
- )
-
-/obj/effect/spawner/random/medical/organs
- name = "ayylien organ spawner"
- loot = list(
- /obj/item/organ/heart/gland/electric = 3,
- /obj/item/organ/heart/gland/trauma = 4,
- /obj/item/organ/heart/gland/egg = 7,
- /obj/item/organ/heart/gland/chem = 5,
- /obj/item/organ/heart/gland/mindshock = 5,
- /obj/item/organ/heart/gland/plasma = 7,
- /obj/item/organ/heart/gland/transform = 5,
- /obj/item/organ/heart/gland/slime = 4,
- /obj/item/organ/heart/gland/spiderman = 5,
- /obj/item/organ/heart/gland/ventcrawling = 1,
- /obj/item/organ/body_egg/alien_embryo = 1,
- /obj/item/organ/regenerative_core = 2)
- spawn_loot_count = 3
-
-/obj/effect/spawner/random/medical/memeorgans
- name = "meme organ spawner"
- loot = list(
- /obj/item/organ/ears/penguin,
- /obj/item/organ/ears/cat,
- /obj/item/organ/eyes/compound,
- /obj/item/organ/eyes/snail,
- /obj/item/organ/tongue/bone,
- /obj/item/organ/tongue/fly,
- /obj/item/organ/tongue/snail,
- /obj/item/organ/tongue/lizard,
- /obj/item/organ/tongue/alien,
- /obj/item/organ/tongue/ethereal,
- /obj/item/organ/tongue/robot,
- /obj/item/organ/tongue/zombie,
- /obj/item/organ/appendix,
- /obj/item/organ/liver/fly,
- /obj/item/organ/lungs/plasmaman,
- /obj/item/organ/tail/cat,
- /obj/item/organ/tail/lizard
- )
- spawn_loot_count = 5
-
-/obj/effect/spawner/random/medical/surgery_tool/common
- name = "Surgery tool spawner"
- icon_state = "scapel"
- loot = list(
- /obj/item/scalpel,
- /obj/item/hemostat,
- /obj/item/retractor,
- /obj/item/circular_saw,
- /obj/item/surgicaldrill,
- /obj/item/cautery,
- )
-
-/obj/effect/spawner/random/medical/surgery_tool/adv
- loot = list(
- /obj/item/scalpel/advanced,
- /obj/item/retractor/advanced,
- /obj/item/surgicaldrill/advanced,
- )
-
-/obj/effect/spawner/random/medical/surgery_tool
- loot = list(
- /obj/effect/spawner/random/medical/surgery_tool/common = 120,
- /obj/effect/spawner/random/medical/surgery_tool/adv = 10,
- )
-
-/obj/effect/spawner/random/medical/medkit
- name = "medkit spawner"
- icon_state = "medkit"
- loot = list(
- /obj/item/storage/firstaid/regular = 10,
- /obj/item/storage/firstaid/o2 = 10,
- /obj/item/storage/firstaid/fire = 10,
- /obj/item/storage/firstaid/brute = 10,
- /obj/item/storage/firstaid/toxin = 10,
- /obj/item/storage/firstaid/advanced = 1,
- )
-
-/obj/effect/spawner/random/medical/patient_stretcher
- name = "patient stretcher spawner"
- icon_state = "rollerbed"
- loot = list(
- /obj/structure/bed/roller,
- /obj/vehicle/ridden/wheelchair,
- )
-
-/obj/effect/spawner/random/medical/supplies
- name = "medical supplies spawner"
- icon_state = "box_small"
- loot = list(
- /obj/item/storage/box/hug,
- /obj/item/storage/box/pillbottles,
- /obj/item/storage/box/bodybags,
- /obj/item/storage/box/rxglasses,
- /obj/item/storage/box/beakers,
- /obj/item/storage/box/gloves,
- /obj/item/storage/box/masks,
- /obj/item/storage/box/syringes,
- )
-
-/obj/effect/spawner/random/medical/beaker
- loot = list(
- /obj/item/reagent_containers/glass/beaker = 300,
- /obj/item/reagent_containers/glass/beaker/large = 200,
- /obj/item/reagent_containers/glass/beaker/plastic = 50,
- /obj/item/reagent_containers/glass/beaker/meta = 10,
- /obj/item/reagent_containers/glass/beaker/noreact = 5,
- /obj/item/reagent_containers/glass/beaker/bluespace = 1,
- )
-
-/obj/effect/spawner/random/medical/prosthetic
- loot = list(
- /obj/item/bodypart/l_arm/robot/surplus = 1,
- /obj/item/bodypart/r_arm/robot/surplus = 1,
- /obj/item/bodypart/leg/left/robot/surplus = 1,
- /obj/item/bodypart/leg/right/robot/surplus = 1,
- )
-
-/obj/effect/spawner/random/medical/chem_jug
- loot = list(
- /obj/item/reagent_containers/glass/chem_jug/carbon,
- /obj/item/reagent_containers/glass/chem_jug/oxygen,
- /obj/item/reagent_containers/glass/chem_jug/nitrogen,
- /obj/item/reagent_containers/glass/chem_jug/hydrogen,
- /obj/item/reagent_containers/glass/chem_jug/radium,
- /obj/item/reagent_containers/glass/chem_jug/aluminium,
- /obj/item/reagent_containers/glass/chem_jug/chlorine,
- /obj/item/reagent_containers/glass/chem_jug/copper,
- /obj/item/reagent_containers/glass/chem_jug/bromine,
- /obj/item/reagent_containers/glass/chem_jug/iodine,
- /obj/item/reagent_containers/glass/chem_jug/potassium,
- /obj/item/reagent_containers/glass/chem_jug/sulfur
- )
diff --git a/code/game/objects/effects/spawners/random.dm/random.dm b/code/game/objects/effects/spawners/random.dm/random.dm
deleted file mode 100644
index 0e6606f3b9ee..000000000000
--- a/code/game/objects/effects/spawners/random.dm/random.dm
+++ /dev/null
@@ -1,175 +0,0 @@
-/**
- * Base class for all random spawners.
- */
-/obj/effect/spawner/random
- icon = 'icons/effects/mapping/random_spawners.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 (maxium offset distance is ±16 pixels for x/y)
- var/spawn_random_offset = FALSE
- /// Whether items that cannot be spawned will be removed from the loot list. Keep it TRUE unless you've a good reason.
- var/remove_if_cant_spawn = TRUE
-
-/obj/effect/spawner/random/Initialize(mapload)
- . = ..()
- spawn_loot()
-
-///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(CONFIG_GET(number/random_loot_weight_modifier) != 1)
- skew_loot_weights(loot, CONFIG_GET(number/random_loot_weight_modifier))
-
- if(loot?.len)
- var/loot_spawned = 0
- var/pixel_divider = FLOOR(16 / spawn_loot_split_pixel_offsets, 1) // 16 pixels offsets is max that should be allowed in any direction
- while((spawn_loot_count-loot_spawned) && loot.len)
- var/lootspawn = pick_weight_recursive(loot)
- if(!can_spawn(lootspawn))
- if(remove_if_cant_spawn)
- loot.Remove(lootspawn)
- continue
- if(!spawn_loot_double)
- loot.Remove(lootspawn)
- if(lootspawn && (spawn_scatter_radius == 0 || spawn_locations.len))
- var/turf/spawn_loc = loc
- if(spawn_scatter_radius > 0)
- spawn_loc = pick_n_take(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(-16, 16)
- spawned_loot.pixel_y = rand(-16, 16)
- 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++
-
-///Levels out the weights of loot if lower than 1, or makes rarer spawns even more rare.
-/obj/effect/spawner/random/proc/skew_loot_weights(list/loot_list, exponent)
- ///This helps keeping the modified weights more or less correct, since pick_weight doesn't appreciate decimals.
- var/precision = 1
- if(exponent < 1)
- precision = round((1 - exponent) * 10) + 1
- for(var/loot_type in loot_list)
- if(islist(loot_type))
- skew_loot_weights(loot_type, exponent)
- var/loot_weight = loot_list[loot_type]
- if(loot_weight <= 1)
- if(exponent < 1)
- loot_list[loot_type] = precision
- continue
- loot_list[loot_type] = round(loot_weight ** exponent * precision, 1)
-
-/**
- * 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)
- return new type_path_to_make(spawn_loc)
-
-///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(isclosedturf(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(!potential_blockage.is_blocked_turf(exclude_mobs = TRUE))
- continue
- return FALSE
- return TRUE
-
-//finds the probabilities of items spawning from a loot spawner's loot pool
-/obj/item/loot_table_maker
- icon = 'icons/effects/mapping/landmarks_static.dmi'
- icon_state = "random_loot"
- var/spawner_to_test = /obj/effect/spawner/random/maintenance //what lootdrop spawner to use the loot pool of
- var/loot_count = 180 //180 is about how much maint loot spawns per map as of 11/14/2019
- //result outputs
- var/list/spawned_table //list of all items "spawned" and how many
- var/list/stat_table //list of all items "spawned" and their occurrance probability
-
-/obj/item/loot_table_maker/Initialize(mapload)
- . = ..()
- make_table()
-
-/obj/item/loot_table_maker/attack_self(mob/user)
- to_chat(user, "Loot pool re-rolled.")
- make_table()
-
-/obj/item/loot_table_maker/proc/make_table()
- spawned_table = list()
- stat_table = list()
- var/obj/effect/spawner/random/spawner_to_table = new spawner_to_test
- var/lootpool = spawner_to_table.loot
- qdel(spawner_to_table)
- for(var/i in 1 to loot_count)
- var/loot_spawn = pick_weight_recursive(lootpool)
- if(!(loot_spawn in spawned_table))
- spawned_table[loot_spawn] = 1
- else
- spawned_table[loot_spawn] += 1
- stat_table += spawned_table
- for(var/item in stat_table)
- stat_table[item] /= loot_count
diff --git a/code/game/objects/effects/spawners/random.dm/readme.md b/code/game/objects/effects/spawners/random.dm/readme.md
deleted file mode 100644
index 97db867f2de6..000000000000
--- a/code/game/objects/effects/spawners/random.dm/readme.md
+++ /dev/null
@@ -1,425 +0,0 @@
-# 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/exotic/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/exotic/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/exotic/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.dm/salvaging.dm b/code/game/objects/effects/spawners/random.dm/salvaging.dm
deleted file mode 100644
index 66543e3ef47a..000000000000
--- a/code/game/objects/effects/spawners/random.dm/salvaging.dm
+++ /dev/null
@@ -1,207 +0,0 @@
-//GENERIC
-/obj/effect/spawner/random/salvage_capacitor
- icon_state = "matter_bin"
- loot = list(
- /obj/item/stock_parts/capacitor = 120,
- /obj/item/stock_parts/capacitor/adv = 20,
- /obj/item/stock_parts/capacitor/super = 5,
- )
-
-/obj/effect/spawner/random/salvage_scanning
- icon_state = "matter_bin"
- loot = list(
- /obj/item/stock_parts/scanning_module = 120,
- /obj/item/stock_parts/scanning_module/adv = 20,
- /obj/item/stock_parts/scanning_module/phasic = 5,
- )
-
-/obj/effect/spawner/random/salvage_manipulator
- icon_state = "matter_bin"
- loot = list(
- /obj/item/stock_parts/manipulator = 120,
- /obj/item/stock_parts/manipulator/nano = 20,
- /obj/item/stock_parts/manipulator/pico = 5,
- )
-
-/obj/effect/spawner/random/salvage_matter_bin
- icon_state = "matter_bin"
- loot = list(
- /obj/item/stock_parts/matter_bin = 120,
- /obj/item/stock_parts/matter_bin/adv = 20,
- /obj/item/stock_parts/matter_bin/super = 5,
- )
-
-/obj/effect/spawner/random/salvage_laser
- icon_state = "matter_bin"
- loot = list(
- /obj/item/stock_parts/micro_laser = 120,
- /obj/item/stock_parts/micro_laser/high = 20,
- /obj/item/stock_parts/micro_laser/ultra = 5,
- )
-
-//PROTOLATHE
-
-/obj/effect/spawner/random/random_gun_protolathe_lootdrop
- icon_state = "laser_gun"
- loot = list(
- /obj/item/gun/energy/lasercannon = 1,
- /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto = 1,
- /obj/item/gun/energy/temperature/security = 1,
- )
-
-/obj/effect/spawner/random/random_ammo_protolathe_lootdrop
- icon_state = "rubbershot"
- loot = list(
- /obj/item/stock_parts/cell/gun/upgraded = 5,
- /obj/item/ammo_box/magazine/smgm9mm = 7,
- )
-
-//DESTRUCTIVE ANAL //i'm killing you
-/obj/effect/spawner/random/destructive_anal_loot //what do people usually put in these things anayways
- loot = list(
- /obj/item/storage/toolbox/syndicate/empty = 650,
- /obj/item/gun/ballistic/automatic/pistol/ringneck = 500,
- /obj/item/camera_bug = 500,
- /obj/item/clothing/gloves/combat = 200,
- /obj/item/clothing/head/chameleon = 200,
- /obj/item/pen/sleepy = 200,
- /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 100,
- /obj/item/grenade/c4 = 100,
-
- /obj/item/wrench/syndie = 30,
- /obj/item/screwdriver/nuke = 30,
- /obj/item/crowbar/syndie = 30,
- /obj/item/wirecutters/syndie = 30,
- /obj/item/multitool/syndie = 30,
- )
-
-/obj/effect/spawner/random/salvage_machine
- name = "salvageable machine spawner"
- icon_state = "arcade"
- loot = list(
- /obj/structure/salvageable/protolathe,
- /obj/structure/salvageable/circuit_imprinter,
- /obj/structure/salvageable/server,
- /obj/structure/salvageable/machine,
- /obj/structure/salvageable/autolathe,
- /obj/structure/salvageable/computer,
- /obj/structure/salvageable/destructive_analyzer
- )
-
-/obj/effect/spawner/random/salvage
- name = "salvage mats spawner"
- icon_state = "rods"
- loot = list(
- /obj/item/stack/ore/salvage/scrapmetal,
- /obj/item/stack/ore/salvage/scrapgold,
- /obj/item/stack/ore/salvage/scrapplasma,
- /obj/item/stack/ore/salvage/scrapsilver,
- /obj/item/stack/ore/salvage/scraptitanium,
- /obj/item/stack/ore/salvage/scrapbluespace,
- /obj/item/stack/ore/salvage/scrapuranium
- )
-
-/obj/effect/spawner/random/salvage/half
- name = "50% salvage spawner"
- spawn_loot_chance = 50
- loot = list(
- /obj/effect/spawner/random/maintenance,
- /obj/effect/spawner/random/salvage_machine,
- /obj/effect/spawner/random/exotic/ripley,
- /obj/structure/closet/crate/secure/loot,
- )
-
-/obj/effect/spawner/random/salvage/metal
- loot = list(
- /obj/item/stack/ore/salvage/scrapmetal
- )
-
-/obj/effect/spawner/random/salvage/metal/Initialize()
- spawn_loot_count = pick(list(
- 1,
- 2,
- 3,
- 4
- ))
- return ..()
-
-/obj/effect/spawner/random/salvage/gold
- loot = list(
- /obj/item/stack/ore/salvage/scrapgold
- )
-
-/obj/effect/spawner/random/salvage/gold/Initialize()
- spawn_loot_count = pick(list(
- 1,
- 2,
- 3,
- 4
- ))
- return ..()
-
-/obj/effect/spawner/random/salvage/plasma
- loot = list(
- /obj/item/stack/ore/salvage/scrapplasma
- )
-/obj/effect/spawner/random/salvage/plasma/Initialize()
- spawn_loot_count = pick(list(
- 1,
- 2,
- 3,
- 4
- ))
- return ..()
-
-
-/obj/effect/spawner/random/salvage/silver
- loot = list(
- /obj/item/stack/ore/salvage/scrapsilver
- )
-/obj/effect/spawner/random/salvage/silver/Initialize()
- spawn_loot_count = pick(list(
- 1,
- 2,
- 3,
- 4
- ))
- return ..()
-
-
-/obj/effect/spawner/random/salvage/titanium
- loot = list(
- /obj/item/stack/ore/salvage/scraptitanium
- )
-/obj/effect/spawner/random/salvage/titanium/Initialize()
- spawn_loot_count = pick(list(
- 1,
- 2,
- 3,
- 4
- ))
- return ..()
-
-/obj/effect/spawner/random/salvage/bluespace
- loot = list(
- /obj/item/stack/ore/salvage/scrapbluespace
- )
-/obj/effect/spawner/random/salvage/bluespace/Initialize()
- spawn_loot_count = pick(list(
- 1,
- 2,
- 3,
- 4
- ))
- return ..()
-
-/obj/effect/spawner/random/salvage/uranium
- loot = list(
- /obj/item/stack/ore/salvage/scrapuranium
- )
-/obj/effect/spawner/random/salvage/uranium/Initialize()
- spawn_loot_count = pick(list(
- 1,
- 2,
- 3,
- 4
- ))
- return ..()
diff --git a/code/game/objects/effects/spawners/random.dm/structure.dm b/code/game/objects/effects/spawners/random.dm/structure.dm
deleted file mode 100644
index 0264b3d76a9e..000000000000
--- a/code/game/objects/effects/spawners/random.dm/structure.dm
+++ /dev/null
@@ -1,91 +0,0 @@
-
-/obj/effect/spawner/random/structure
- name = "structure spawner"
- desc = "Now you see me, now you don't..."
- icon_state = "girder"
-
-/obj/effect/spawner/random/structure/crate_abandoned
- name = "locked crate spawner"
- icon_state = "crate_secure"
- spawn_loot_chance = 20
- loot = list(/obj/structure/closet/crate/secure/loot)
-
-/obj/effect/spawner/random/structure/girder
- name = "girder spawner"
- icon_state = "girder"
- spawn_loot_chance = 90
- loot = list( // 80% chance normal girder, 10% chance of displaced, 10% chance of nothing
- /obj/structure/girder = 8,
- /obj/structure/girder/displaced = 1,
- )
-
-/obj/effect/spawner/random/structure/grille
- name = "grille spawner"
- icon_state = "grille"
- spawn_loot_chance = 90
- loot = list( // 80% chance normal grille, 10% chance of broken, 10% chance of nothing
- /obj/structure/grille = 8,
- /obj/structure/grille/broken = 1,
- )
-
-/obj/effect/spawner/random/structure/furniture_parts
- name = "furniture parts spawner"
- icon_state = "table_parts"
- loot = list(
- /obj/structure/table_frame,
- /obj/structure/table_frame/wood,
- /obj/item/rack_parts,
- )
-
-/obj/effect/spawner/random/structure/table_or_rack
- name = "table or rack spawner"
- icon_state = "rack_parts"
- loot = list(
- /obj/effect/spawner/random/structure/table,
- /obj/structure/rack,
- )
-
-/obj/effect/spawner/random/structure/table
- name = "table spawner"
- icon_state = "table"
- loot = list(
- /obj/structure/table = 40,
- /obj/structure/table/wood = 30,
- /obj/structure/table/glass = 20,
- /obj/structure/table/reinforced = 5,
- /obj/structure/table/wood/poker = 5,
- )
-
-/obj/effect/spawner/random/structure/closet_empty
- name = "empty closet spawner"
- icon_state = "locker"
- loot = list(
- /obj/structure/closet = 850,
- /obj/structure/closet/cabinet = 150,
- /obj/structure/closet/acloset = 1,
- )
-
-/obj/effect/spawner/random/structure/closet_empty/crate
- name = "empty crate spawner"
- icon_state = "crate"
- loot = list(
- /obj/structure/closet/crate = 20,
- /obj/structure/closet/crate/wooden = 1,
- /obj/structure/closet/crate/internals = 1,
- /obj/structure/closet/crate/medical = 1,
- /obj/structure/closet/crate/freezer = 1,
- /obj/structure/closet/crate/radiation = 1,
- /obj/structure/closet/crate/hydroponics = 1,
- /obj/structure/closet/crate/engineering = 1,
- /obj/structure/closet/crate/engineering/electrical = 1,
- /obj/structure/closet/crate/science = 1,
- )
-
-/obj/effect/spawner/random/structure/barricade
- name = "barricade spawner"
- icon_state = "barricade"
- spawn_loot_chance = 80
- loot = list(
- /obj/structure/barricade/wooden,
- /obj/structure/barricade/wooden/crude,
- )
diff --git a/code/game/objects/effects/spawners/random.dm/trash.dm b/code/game/objects/effects/spawners/random.dm/trash.dm
deleted file mode 100644
index 3c15e77106a3..000000000000
--- a/code/game/objects/effects/spawners/random.dm/trash.dm
+++ /dev/null
@@ -1,282 +0,0 @@
-/obj/effect/spawner/random/trash
- name = "trash spawner"
- desc = "Ewwwwwww gross."
- icon_state = "trash"
-
-/obj/effect/spawner/random/trash/garbage
- name = "garbage spawner"
- loot = list(
- /obj/effect/spawner/random/trash/food_packaging = 20,
- /obj/item/trash/can = 15,
- /obj/item/shard = 10,
- /obj/effect/spawner/random/trash/cigbutt = 10,
- /obj/effect/spawner/random/trash/botanical_waste = 5,
- /obj/item/broken_bottle = 5,
- /obj/item/light/tube/broken = 5,
- /obj/item/light/bulb/broken = 5,
- /obj/item/assembly/mousetrap/armed = 5,
- /obj/item/stack/cable_coil = 5,
- /obj/item/trash/candle = 1,
- /obj/item/reagent_containers/glass/rag = 1,
- /obj/item/popsicle_stick = 1,
- /obj/item/reagent_containers/syringe = 1,
- /obj/item/shard/plasma = 1,
- )
-
-/obj/effect/spawner/random/trash/deluxe_garbage
- name = "fancy deluxe garbage spawner"
- loot = list(
- /obj/effect/spawner/random/trash/garbage = 25,
- /obj/effect/spawner/random/trash/food_packaging = 10,
- /obj/effect/spawner/random/entertainment/money = 10,
- /obj/effect/spawner/random/trash/crushed_can = 10,
- /obj/item/shard/plasma = 5,
- /obj/item/reagent_containers/pill/floorpill = 5,
- /obj/effect/spawner/random/trash/soap = 3,
- /obj/item/broken_bottle = 3,
- /obj/effect/spawner/random/engineering/tool/common = 1,
- /mob/living/simple_animal/mouse = 1,
- /obj/item/reagent_containers/glass/rag = 1,
- /obj/effect/spawner/random/entertainment/drugs= 1,
- /obj/item/reagent_containers/syringe = 1,
- /obj/effect/spawner/random/entertainment/cigar = 1,
- /obj/item/stack/ore/gold = 1,
- )
-
-/obj/effect/spawner/random/trash/cigbutt
- name = "cigarette butt spawner"
- loot = list(
- /obj/item/cigbutt = 25,
- /obj/item/cigbutt/roach = 25,
- /obj/effect/decal/cleanable/ash = 25,
- /obj/item/cigbutt/cigarbutt = 15,
- )
-
-/obj/effect/spawner/random/trash/food_packaging
- name = "empty food packaging spawner"
- icon_state = "chips"
- loot = list(
- /obj/item/trash/raisins = 2,
- /obj/item/trash/cheesie = 2,
- /obj/item/trash/candy = 2,
- /obj/item/trash/chips = 2,
- /obj/item/trash/sosjerky = 2,
- /obj/item/trash/pistachios = 2,
- /obj/item/trash/boritos = 1,
- /obj/item/trash/can/food/beans = 1,
- /obj/item/trash/can/food/peaches = 1,
- /obj/item/trash/popcorn = 1,
- /obj/item/trash/energybar = 1,
- /obj/item/trash/can/food/peaches/maint = 1,
- /obj/item/trash/semki = 1,
- /obj/item/trash/syndi_cakes = 1,
- /obj/item/trash/tray = 1,
- )
-
-/obj/effect/spawner/random/trash/botanical_waste
- name = "botanical waste spawner"
- icon_state = "peel"
- loot = list(
- /obj/item/grown/bananapeel = 6,
- /obj/item/grown/corncob = 3,
- )
-
-/obj/effect/spawner/random/trash/grille_or_waste
- name = "grille or waste spawner"
- icon_state = "grille"
- loot = list(
- /obj/structure/grille = 5,
- /obj/effect/spawner/random/trash/food_packaging = 3,
- /obj/effect/spawner/random/trash/cigbutt = 1,
- /obj/item/reagent_containers/food/snacks/deadmouse = 1,
- )
-
-/obj/effect/spawner/random/trash/decal
- icon_state = "vomit"
- loot = list(
- /obj/effect/decal/cleanable/greenglow/filled = 30,
- /obj/effect/decal/cleanable/greenglow/ecto = 1,
- /obj/effect/decal/cleanable/glass = 30,
- /obj/effect/decal/cleanable/glass/plasma = 30,
- /obj/effect/decal/cleanable/glass/strange = 30,
- /obj/effect/decal/cleanable/molten_object = 30,
- /obj/effect/decal/cleanable/molten_object/large = 30,
- /obj/effect/decal/cleanable/oil = 30,
- /obj/effect/decal/cleanable/oil/slippery = 1, // :)
- /obj/effect/decal/cleanable/plastic = 30,
- /obj/effect/decal/cleanable/ash = 30,
- /obj/effect/decal/cleanable/ash/large = 30,
- )
-
-/obj/effect/spawner/random/trash/mess
- name = "gross decal spawner"
- icon_state = "vomit"
- loot = list(
- /obj/effect/decal/cleanable/dirt = 6,
- /obj/effect/decal/cleanable/garbage = 3,
- /obj/effect/decal/cleanable/vomit/old = 3,
- /obj/effect/decal/cleanable/blood/gibs/old = 3,
- /obj/effect/decal/cleanable/insectguts = 1,
- /obj/effect/decal/cleanable/greenglow/ecto = 1,
- /obj/effect/decal/cleanable/wrapping = 1,
- /obj/effect/decal/cleanable/plastic = 1,
- /obj/effect/decal/cleanable/glass = 1,
- )
-
-/obj/effect/spawner/random/trash/grime
- name = "trash and grime spawner"
- spawn_loot_count = 5
- spawn_scatter_radius = 2
- loot = list( // This spawner will scatter garbage around a dirty site.
- /obj/effect/spawner/random/trash/garbage = 6,
- /mob/living/simple_animal/hostile/cockroach = 5,
- /obj/effect/decal/cleanable/garbage = 4,
- /obj/effect/decal/cleanable/vomit/old = 3,
- /obj/effect/spawner/random/trash/cigbutt = 2,
- )
-
-/obj/effect/spawner/random/trash/moisture
- name = "water hazard spawner"
- icon_state = "caution"
- spawn_loot_count = 2
- spawn_scatter_radius = 1
- loot = list( // This spawner will scatter water related items around a moist site.
- /obj/item/clothing/head/cone = 7,
- /obj/item/clothing/suit/caution = 3,
- /mob/living/simple_animal/hostile/retaliate/frog = 2,
- /obj/item/reagent_containers/glass/rag = 2,
- /obj/item/reagent_containers/glass/bucket = 2,
- /obj/effect/decal/cleanable/blood/old = 2,
- )
-
-/obj/effect/spawner/random/trash/graffiti
- name = "random graffiti spawner"
- icon_state = "rune"
- loot = list(/obj/effect/decal/cleanable/crayon)
- var/graffiti_icons = list(
- "rune1", "rune2", "rune3", "rune4", "rune5", "rune6",
- "amyjon", "face", "matt", "revolution", "engie", "guy",
- "end", "dwarf", "uboa", "body", "cyka", "star",
- "prolizard", "antilizard", "danger", "firedanger", "electricdanger",
- "biohazard", "radiation", "safe", "evac", "space", "med", "trade", "shop",
- "food", "peace", "like", "skull", "nay", "heart", "credit",
- "smallbrush", "brush", "largebrush", "splatter", "snake", "stickman",
- "carp", "ghost", "clown", "taser", "disk", "fireaxe", "toolbox",
- "corgi", "cat", "toilet", "blueprint", "beepsky", "scroll", "bottle",
- "shotgun", "arrow", "line", "thinline", "shortline", "body", "chevron",
- "footprint", "clawprint", "pawprint",
- )
- // This sets the color of the graffiti (used for mapedits)
- color = COLOR_WHITE
- /// Whether the graffiti will spawn with a random color (used for mapedits)
- var/random_color = TRUE
- /// Whether the graffiti will spawn with this spawner's icon_state instead of a random one (used for mapedits)
- var/random_icon = TRUE
-
-/obj/effect/spawner/random/trash/graffiti/make_item(spawn_loc, type_path_to_make)
- var/obj/effect/decal/cleanable/crayon/graffiti_decal = ..()
- if(istype(graffiti_decal))
- color = random_color && "#[random_short_color()]" || color
- icon_state = random_icon && pick(graffiti_icons) || icon_state
-
- graffiti_decal.add_atom_colour(color, FIXED_COLOUR_PRIORITY)
- graffiti_decal.icon_state = icon_state
-
- return graffiti_decal
-
-/obj/effect/spawner/random/trash/mopbucket
- name = "mop bucket spawner"
- icon_state = "mopbucket"
- spawn_loot_count = 2
- spawn_loot_double = FALSE
- loot = list(
- /obj/item/mop = 5,
- /obj/item/clothing/suit/caution = 3,
- /obj/item/reagent_containers/glass/bucket = 1,
- /obj/item/reagent_containers/glass/bucket/wooden = 1,
- )
-
-/obj/effect/spawner/random/trash/caution_sign
- name = "caution sign spawner"
- icon_state = "caution"
- loot = list(
- /obj/item/clothing/suit/caution = 40,
- /obj/structure/holosign/wetsign = 5,
- /obj/structure/holosign/barrier = 3,
- /obj/structure/holosign/barrier/wetsign = 2,
- )
-
-/obj/effect/spawner/random/trash/bucket
- name = "bucket spawner"
- icon_state = "caution"
- loot = list(
- /obj/item/reagent_containers/glass/bucket,
- /obj/item/reagent_containers/glass/bucket/wooden,
- )
-
-/obj/effect/spawner/random/trash/soap
- name = "soap spawner"
- icon_state = "soap"
- loot = list(
- /obj/item/soap = 25,
- /obj/item/bikehorn/rubberducky = 20,
- /obj/item/soap/homemade = 20,
- /obj/item/soap/deluxe = 15,
- /obj/item/soap/nanotrasen = 10,
- )
-
-/obj/effect/spawner/random/trash/box
- name = "box spawner"
- icon_state = "box"
- loot = list(
- /obj/structure/closet/cardboard = 9,
- /obj/structure/closet/cardboard/metal = 1,
- )
-
-/obj/effect/spawner/random/trash/bin
- name = "trashbin spawner"
- icon_state = "trash_bin"
- loot = list(
- /obj/structure/closet/crate/bin = 10,
- /obj/structure/closet/crate/trashcart = 3,
- /obj/effect/spawner/random/trash/box = 3,
- /obj/structure/closet/crate/trashcart/laundry = 1,
- )
-
-
-/obj/effect/spawner/random/trash/janitor_supplies
- name = "janitor supplies spawner"
- icon_state = "box_small"
- 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,
- )
-
-/obj/effect/spawner/random/trash/crushed_can
- name = "crushed can spawner"
- icon_state = "crushed_can"
- loot = list(/obj/item/trash/can)
- /// Whether the can will spawn with this spawner's icon_state instead of a random one (used for mapedits)
- var/soda_icons = list(
- "energy_drink", "monkey_energy", "thirteen_loko", "space_mountain_wind", "dr_gibb", "starkist",
- "sodawater", "tonic", "cola", "purple_can", "ice_tea_can",
- "sol_dry", "wellcheers", "space beer", "ebisu", "shimauma", "moonlabor",
- "space_up", "lemon_lime", "shamblers", "shamblerseldritch", "air", "laughter",
- "volt_energy", "melon_soda",
- )
-
-/obj/effect/spawner/random/trash/crushed_can/make_item(spawn_loc, type_path_to_make)
- var/obj/item/trash/can/crushed_can = .. ()
- if(istype(crushed_can))
- crushed_can.icon_state = pick(soda_icons)
- return crushed_can
-
-/obj/effect/spawner/random/trash/ghetto_containers
- name = "ghetto container spawner"
- loot = list(
- /obj/item/reagent_containers/glass/bucket = 5,
- /obj/item/reagent_containers/glass/bottle = 5,
- /obj/item/reagent_containers/glass/mortar = 2,
- )
diff --git a/code/game/objects/effects/spawners/random.dm/vending.dm b/code/game/objects/effects/spawners/random.dm/vending.dm
deleted file mode 100644
index 595746e14e19..000000000000
--- a/code/game/objects/effects/spawners/random.dm/vending.dm
+++ /dev/null
@@ -1,17 +0,0 @@
-/obj/effect/spawner/random/vending
- name = "machinery spawner"
- desc = "Randomized electronics for extra fun."
-
-/obj/effect/spawner/random/vending/snack
- name = "spawn random snack vending machine"
- desc = "Automagically transforms into a random snack vendor. If you see this while in a shift, please create a bug report."
- icon_state = "snack"
- loot_type_path = /obj/machinery/vending/snack
- loot = list()
-
-/obj/effect/spawner/random/vending/cola
- name = "spawn random cola vending machine"
- desc = "Automagically transforms into a random cola vendor. If you see this while in a shift, please create a bug report."
- icon_state = "cola"
- loot_type_path = /obj/machinery/vending/cola
- loot = list()
diff --git a/code/game/objects/effects/spawners/random.dm/waste_planet.dm b/code/game/objects/effects/spawners/random.dm/waste_planet.dm
deleted file mode 100644
index 46ad61a754a6..000000000000
--- a/code/game/objects/effects/spawners/random.dm/waste_planet.dm
+++ /dev/null
@@ -1,101 +0,0 @@
-/obj/effect/spawner/random/waste/grille_or_trash
- icon_state = "grille"
- name = "wasteplanet loot spawner"
- loot = list(
- /obj/structure/grille/broken = 5,
- /obj/structure/grille = 5,
- /obj/item/cigbutt = 1,
- /obj/item/trash/cheesie = 1,
- /obj/item/trash/candy = 1,
- /obj/item/trash/chips = 1,
- /obj/item/reagent_containers/food/snacks/deadmouse = 1,
- /obj/item/trash/pistachios = 1,
- /obj/item/trash/plate = 1,
- /obj/item/trash/popcorn = 1,
- /obj/item/trash/raisins = 1,
- /obj/item/trash/sosjerky = 1,
- /obj/item/trash/syndi_cakes = 1
- )
-
-/obj/effect/spawner/random/waste/mechwreck
- icon_state = "ripley"
- name = "wasteplanet exosuit wreckage"
- loot = list(
- /obj/structure/mecha_wreckage/ripley = 15,
- /obj/structure/mecha_wreckage/ripley/firefighter = 9,
- /obj/structure/mecha_wreckage/ripley/mkii = 9,
- /obj/structure/mecha_wreckage/ripley/clip = 9
- )
-
-/obj/effect/spawner/random/waste/mechwreck/rare
- loot = list(
- /obj/structure/mecha_wreckage/durand = 12.5,
- /obj/structure/mecha_wreckage/durand/clip = 12.5,
- /obj/structure/mecha_wreckage/odysseus = 25,
- /obj/structure/mecha_wreckage/gygax = 25
- )
-
-/obj/effect/spawner/random/waste/radiation
- loot = list(
- /obj/structure/radioactive = 6,
- /obj/structure/radioactive/stack = 6,
- /obj/structure/radioactive/waste = 6
- )
-
-/obj/effect/spawner/random/waste/radiation/more_rads
- loot = list(
- /obj/structure/radioactive = 3,
- /obj/structure/radioactive/stack = 12,
- /obj/structure/radioactive/waste = 12
- )
-
-/obj/effect/spawner/random/waste/atmos_can
- loot = list(
- /obj/machinery/portable_atmospherics/canister/toxins = 3,
- /obj/machinery/portable_atmospherics/canister/carbon_dioxide = 3,
- /obj/machinery/portable_atmospherics/canister/nitrogen = 3,
- /obj/machinery/portable_atmospherics/canister/oxygen = 3,
- /obj/machinery/portable_atmospherics/canister/nitrous_oxide = 1,
- /obj/machinery/portable_atmospherics/canister/water_vapor = 1
- )
-
-/obj/effect/spawner/random/waste/atmos_can/rare
- loot = list(
- /obj/machinery/portable_atmospherics/canister/tritium = 3,
- /obj/machinery/portable_atmospherics/canister/pluoxium = 3
- )
-
-/obj/effect/spawner/random/waste/salvageable
- loot = list(
- /obj/structure/salvageable/machine = 20,
- /obj/structure/salvageable/autolathe = 15,
- /obj/structure/salvageable/computer = 10,
- /obj/structure/salvageable/protolathe = 10,
- /obj/structure/salvageable/circuit_imprinter = 8,
- /obj/structure/salvageable/destructive_analyzer = 8,
- /obj/structure/salvageable/server = 8
- )
-
-/obj/effect/spawner/random/waste/girder
- loot = list(
- /obj/structure/girder,
- /obj/structure/girder/displaced,
- /obj/structure/girder/reinforced
- )
-/obj/effect/spawner/random/waste/hivebot
- loot = list(
- /obj/effect/spawner/random/salvage/metal,
- /obj/effect/spawner/random/salvage/metal,
- /obj/effect/spawner/random/salvage/metal,
- /obj/effect/spawner/random/salvage/gold,
- /obj/effect/spawner/random/salvage/plasma,
- /obj/effect/spawner/random/salvage/silver,
- /obj/effect/spawner/random/salvage/titanium,
- /obj/item/stack/ore/salvage/scrapbluespace,
- /obj/item/stack/ore/salvage/scrapbluespace,
- /obj/item/stack/ore/salvage/scrapuranium
- )
- spawn_loot_count = 2
-
-/obj/effect/spawner/random/waste/hivebot/beacon
- spawn_loot_count = 6
diff --git a/code/game/objects/effects/spawners/spawner.dm b/code/game/objects/effects/spawners/spawner.dm
deleted file mode 100644
index d8091c6cfc65..000000000000
--- a/code/game/objects/effects/spawners/spawner.dm
+++ /dev/null
@@ -1,23 +0,0 @@
-/obj/effect/spawner
- name = "object spawner"
-
-// 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
-/obj/effect/spawner/Initialize(mapload)
- SHOULD_CALL_PARENT(FALSE)
- if(flags_1 & INITIALIZED_1)
- stack_trace("Warning: [src]([type]) initialized multiple times!")
- flags_1 |= INITIALIZED_1
-
- return INITIALIZE_HINT_QDEL
-
-/obj/effect/spawner/Destroy(force)
- SHOULD_CALL_PARENT(FALSE)
- moveToNullspace()
- return QDEL_HINT_QUEUE
-
-/// Override to define loot blacklist behavior
-/obj/effect/spawner/proc/can_spawn(atom/loot)
- return TRUE
diff --git a/code/game/objects/effects/spawners/traps.dm b/code/game/objects/effects/spawners/traps.dm
new file mode 100644
index 000000000000..0409d9944b9b
--- /dev/null
+++ b/code/game/objects/effects/spawners/traps.dm
@@ -0,0 +1,9 @@
+/obj/effect/spawner/trap
+ name = "random trap"
+ icon = 'icons/obj/hand_of_god_structures.dmi'
+ icon_state = "trap_rand"
+
+/obj/effect/spawner/trap/Initialize(mapload)
+ . = ..()
+ var/new_type = pick(subtypesof(/obj/structure/trap) - typesof(/obj/structure/trap/ctf))
+ new new_type(get_turf(src))
diff --git a/code/game/objects/effects/spawners/vaultspawner.dm b/code/game/objects/effects/spawners/vaultspawner.dm
new file mode 100644
index 000000000000..9bdf0a673ed9
--- /dev/null
+++ b/code/game/objects/effects/spawners/vaultspawner.dm
@@ -0,0 +1,28 @@
+/obj/effect/vaultspawner
+ var/maxX = 6
+ var/maxY = 6
+ var/minX = 2
+ var/minY = 2
+
+/obj/effect/vaultspawner/New(turf/location,lX = minX,uX = maxX,lY = minY,uY = maxY,type = null)
+ if(!type)
+ type = pick("sandstone","rock","alien")
+
+ var/lowBoundX = location.x
+ var/lowBoundY = location.y
+
+ var/hiBoundX = location.x + rand(lX,uX)
+ var/hiBoundY = location.y + rand(lY,uY)
+
+ var/z = location.z
+
+ for(var/i = lowBoundX,i<=hiBoundX,i++)
+ for(var/j = lowBoundY,j<=hiBoundY,j++)
+ var/turf/T = locate(i,j,z)
+ if(i == lowBoundX || i == hiBoundX || j == lowBoundY || j == hiBoundY)
+ T.PlaceOnTop(/turf/closed/wall/vault)
+ else
+ T.PlaceOnTop(/turf/open/floor/vault)
+ T.icon_state = "[type]vault"
+
+ qdel(src)
diff --git a/code/game/objects/effects/spawners/xeno_egg_delivery.dm b/code/game/objects/effects/spawners/xeno_egg_delivery.dm
new file mode 100644
index 000000000000..1eb4fd0dda94
--- /dev/null
+++ b/code/game/objects/effects/spawners/xeno_egg_delivery.dm
@@ -0,0 +1,18 @@
+/obj/effect/spawner/xeno_egg_delivery
+ name = "xeno egg delivery"
+ icon = 'icons/mob/alien.dmi'
+ icon_state = "egg_growing"
+ var/announcement_time = 1200
+
+/obj/effect/spawner/xeno_egg_delivery/Initialize(mapload)
+ . = ..()
+ var/turf/T = get_turf(src)
+
+ new /obj/structure/alien/egg(T)
+ new /obj/effect/temp_visual/gravpush(T)
+ playsound(T, 'sound/items/party_horn.ogg', 50, TRUE, -1)
+
+ message_admins("An alien egg has been delivered to [ADMIN_VERBOSEJMP(T)].")
+ log_game("An alien egg has been delivered to [AREACOORD(T)]")
+ var/message = "Attention [station_name()], we have entrusted you with a research specimen in [get_area_name(T, TRUE)]. Remember to follow all safety precautions when dealing with the specimen."
+ SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_addtimer), CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(print_command_report), message), announcement_time))
diff --git a/code/game/objects/items/chromosome.dm b/code/game/objects/items/chromosome.dm
index c6ee7f174aab..3acf3cfe5cb3 100644
--- a/code/game/objects/items/chromosome.dm
+++ b/code/game/objects/items/chromosome.dm
@@ -48,7 +48,7 @@
if(!initial(CM.weight))
break
chromosomes[A] = initial(CM.weight)
- return pick_weight(chromosomes)
+ return pickweight(chromosomes)
/obj/item/chromosome/stabilizer
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 0606e999b1ce..26b23c509838 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -564,6 +564,15 @@
name = "pink glowstick"
color = LIGHT_COLOR_PINK
+/obj/effect/spawner/lootdrop/glowstick
+ name = "random colored glowstick"
+ icon = 'icons/obj/lighting.dmi'
+ icon_state = "random_glowstick"
+
+/obj/effect/spawner/lootdrop/glowstick/Initialize()
+ loot = typesof(/obj/item/flashlight/glowstick)
+ . = ..()
+
/obj/item/flashlight/spotlight //invisible lighting source
name = "disco light"
desc = "Groovy..."
diff --git a/code/game/objects/items/devices/mines.dm b/code/game/objects/items/devices/mines.dm
index 4f2169350d79..ee391d578c03 100644
--- a/code/game/objects/items/devices/mines.dm
+++ b/code/game/objects/items/devices/mines.dm
@@ -841,10 +841,10 @@ LIVE_MINE_HELPER(pressure/sound)
// spawners (random mines, minefields, non-guaranteed mine)
//
-/obj/effect/spawner/random/mine
+/obj/effect/spawner/lootdrop/mine
name = "live mine spawner (random)"
- spawn_loot_count = 1
- spawn_loot_split = TRUE
+ lootcount = 1
+ fan_out_items = TRUE
loot = list(
/obj/item/mine/pressure/explosive/live = 10,
/obj/item/mine/pressure/explosive/shrapnel/live = 3,
@@ -864,7 +864,7 @@ LIVE_MINE_HELPER(pressure/sound)
/obj/effect/spawner/minefield/random
name = "random minefield spawner"
- minetype = /obj/effect/spawner/random/mine
+ minetype = /obj/effect/spawner/lootdrop/mine
/obj/effect/spawner/minefield/manhack
name = "manhack field spawner"
diff --git a/code/game/objects/items/grenades/ghettobomb.dm b/code/game/objects/items/grenades/ghettobomb.dm
index 247ca439c8bd..915011b81b11 100644
--- a/code/game/objects/items/grenades/ghettobomb.dm
+++ b/code/game/objects/items/grenades/ghettobomb.dm
@@ -25,7 +25,7 @@
add_overlay("improvised_grenade_filled")
add_overlay("improvised_grenade_wired")
times = list("5" = 10, "-1" = 20, "[rand(30,80)]" = 50, "[rand(65,180)]" = 20)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value]
- det_time = text2num(pick_weight(times))
+ det_time = text2num(pickweight(times))
if(det_time < 0) //checking for 'duds'
range = 1
det_time = rand(30,80)
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index dd00d3abd1fd..4b16ee60942d 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -863,3 +863,43 @@
var/mutable_appearance/base_overlay_among = mutable_appearance(icon, "plushie_among_visor")
base_overlay_among.appearance_flags = RESET_COLOR
add_overlay(base_overlay_among)
+
+/obj/effect/spawner/lootdrop/plushie
+ loot = list (
+ /obj/item/toy/plush/beeplushie,
+ /obj/item/toy/plush/blahaj,
+ /obj/item/toy/plush/carpplushie,
+ /obj/item/toy/plush/flushed,
+ /obj/item/toy/plush/kari,
+ /obj/item/toy/plush/lizardplushie,
+ /obj/item/toy/plush/mora,
+ /obj/item/toy/plush/realgoat,
+ /obj/item/toy/plush/rilena,
+ /obj/item/toy/plush/sharai,
+ /obj/item/toy/plush/slimeplushie,
+ /obj/item/toy/plush/snakeplushie,
+ /obj/item/toy/plush/spider,
+ /obj/item/toy/plush/tali,
+ /obj/item/toy/plush/xader,
+ /obj/effect/spawner/lootdrop/plushie/moth // fair chances
+ )
+
+/obj/effect/spawner/lootdrop/plushie/moth
+ loot = list (
+ /obj/item/toy/plush/moth,
+ /obj/item/toy/plush/moth/monarch,
+ /obj/item/toy/plush/moth/luna,
+ /obj/item/toy/plush/moth/atlas,
+ /obj/item/toy/plush/moth/redish,
+ /obj/item/toy/plush/moth/royal,
+ /obj/item/toy/plush/moth/gothic,
+ /obj/item/toy/plush/moth/lovers,
+ /obj/item/toy/plush/moth/whitefly,
+ /obj/item/toy/plush/moth/punished,
+ /obj/item/toy/plush/moth/firewatch,
+ /obj/item/toy/plush/moth/deadhead,
+ /obj/item/toy/plush/moth/poison,
+ /obj/item/toy/plush/moth/ragged,
+ /obj/item/toy/plush/moth/snow,
+ /obj/item/toy/plush/moth/moonfly
+ )
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index 5a1bdaabe340..e8b619b0d712 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -2,7 +2,7 @@
/obj/item/storage/box/syndicate
/obj/item/storage/box/syndicate/bundle_A/PopulateContents()
- switch (pick_weight(list("recon" = 2, "bloodyspai" = 3, "stealth" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "sniper" = 1, "metaops" = 1)))
+ switch (pickweight(list("recon" = 2, "bloodyspai" = 3, "stealth" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "sniper" = 1, "metaops" = 1)))
if("recon")
new /obj/item/clothing/glasses/thermal/xray(src) // ~8 tc?
new /obj/item/storage/briefcase/launchpad(src) //6 tc
@@ -117,7 +117,7 @@
new /obj/item/card/emag(src) // 6 tc
/obj/item/storage/box/syndicate/bundle_B/PopulateContents()
- switch (pick_weight(list( "bond" = 2, "ninja" = 1, "darklord" = 1, "white_whale_holy_grail" = 2, "mad_scientist" = 2, "mr_freeze" = 2, "made_man"= 1)))
+ switch (pickweight(list( "bond" = 2, "ninja" = 1, "darklord" = 1, "white_whale_holy_grail" = 2, "mad_scientist" = 2, "mr_freeze" = 2, "made_man"= 1)))
if("bond")
new /obj/item/gun/ballistic/automatic/pistol/ringneck(src)
new /obj/item/attachment/silencer(src)
@@ -181,7 +181,7 @@
new /obj/item/melee/transforming/energy/sword/saber/blue(src) //see see it fits the theme bc its blue and ice is blue
if("made_man")
- new /obj/effect/spawner/random/clothing/mafia_outfit(src) // 0 TC, just an outfit for the new 'don of this family
+ new /obj/effect/spawner/lootdrop/mafia_outfit(src) // 0 TC, just an outfit for the new 'don of this family
new /obj/item/gun/ballistic/automatic/smg/firestorm/pan(src) // 20 TC, a gun with 50 .45 bullets on a three round burst is kinda outstanding
new /obj/item/melee/knife/switchblade(src) // 3 TC? It's nice, but it's really a stealth/oh fuck I'm out of ammo weapon
new /obj/item/reagent_containers/food/drinks/bottle/vodka (src) // 5 TC, free molotov assemblies
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 220e0e605828..81e6ea9d54ec 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -1392,7 +1392,7 @@
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
icon_state = "shell[rand(1,3)]"
- color = pick_weight(possible_colors)
+ color = pickweight(possible_colors)
setDir(pick(GLOB.cardinals))
/obj/item/toy/brokenradio
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index 5b140a5b2428..8ee8d8214f80 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -383,7 +383,7 @@ LINEN BINS
/obj/item/bedsheet/dorms/Initialize()
..()
- var/type = pick_weight(list("Colors" = 80, "Special" = 20))
+ var/type = pickweight(list("Colors" = 80, "Special" = 20))
switch(type)
if("Colors")
type = pick(list(/obj/item/bedsheet,
@@ -408,7 +408,7 @@ LINEN BINS
/obj/item/bedsheet/dorms/double/Initialize()
..()
- var/type = pick_weight(list("Colors" = 80, "Special" = 20))
+ var/type = pickweight(list("Colors" = 80, "Special" = 20))
switch(type)
if("Colors")
type = pick(list(/obj/item/bedsheet/double,
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index a69a279bad77..cfea37148e55 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -14,6 +14,7 @@
desc = "It looks alien!"
icon_state = "alien"
+
/obj/structure/closet/gimmick
name = "administrative supply closet"
desc = "It's a storage unit for things that have no right being here."
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index fa4fe485015d..7b800d7ab097 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -29,7 +29,7 @@
if (prob(40))
new /obj/item/storage/toolbox/emergency(src)
- switch (pick_weight(list("small" = 40, "aid" = 25, "tank" = 20, "both" = 10, "nothing" = 4, "delete" = 1)))
+ switch (pickweight(list("small" = 40, "aid" = 25, "tank" = 20, "both" = 10, "nothing" = 4, "delete" = 1)))
if ("small")
new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/tank/internals/emergency_oxygen(src)
diff --git a/code/game/objects/structures/geyser.dm b/code/game/objects/structures/geyser.dm
index d5c7dbeef362..af536d2e8c1c 100644
--- a/code/game/objects/structures/geyser.dm
+++ b/code/game/objects/structures/geyser.dm
@@ -45,7 +45,7 @@
/obj/structure/geyser/random/Initialize()
. = ..()
- reagent_id = pick_weight(options)
+ reagent_id = pickweight(options)
/obj/item/plunger
name = "plunger"
diff --git a/code/game/objects/structures/salvaging.dm b/code/game/objects/structures/salvaging.dm
index ccb76bd81c4a..a3b3b2b5763f 100644
--- a/code/game/objects/structures/salvaging.dm
+++ b/code/game/objects/structures/salvaging.dm
@@ -56,16 +56,16 @@
/obj/item/stack/ore/salvage/scrapgold/five = 60,
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
- /obj/effect/spawner/random/salvage_capacitor = 50,
- /obj/effect/spawner/random/salvage_capacitor = 50,
- /obj/effect/spawner/random/salvage_scanning = 50,
- /obj/effect/spawner/random/salvage_scanning = 50,
- /obj/effect/spawner/random/salvage_matter_bin = 40,
- /obj/effect/spawner/random/salvage_matter_bin = 40,
- /obj/effect/spawner/random/salvage_manipulator = 40,
- /obj/effect/spawner/random/salvage_manipulator = 40,
- /obj/effect/spawner/random/salvage_laser = 40,
- /obj/effect/spawner/random/salvage_laser = 40,
+ /obj/effect/spawner/lootdrop/salvage_capacitor = 50,
+ /obj/effect/spawner/lootdrop/salvage_capacitor = 50,
+ /obj/effect/spawner/lootdrop/salvage_scanning = 50,
+ /obj/effect/spawner/lootdrop/salvage_scanning = 50,
+ /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
+ /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
+ /obj/effect/spawner/lootdrop/salvage_manipulator = 40,
+ /obj/effect/spawner/lootdrop/salvage_manipulator = 40,
+ /obj/effect/spawner/lootdrop/salvage_laser = 40,
+ /obj/effect/spawner/lootdrop/salvage_laser = 40,
)
/obj/structure/salvageable/computer
@@ -79,7 +79,7 @@
/obj/item/stack/ore/salvage/scrapgold/five = 60,
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
- /obj/effect/spawner/random/salvage_capacitor = 60,
+ /obj/effect/spawner/lootdrop/salvage_capacitor = 60,
/obj/item/computer_hardware/battery = 40,
/obj/item/computer_hardware/battery = 40,
@@ -91,8 +91,8 @@
/obj/item/computer_hardware/card_slot = 40,
/obj/item/computer_hardware/network_card/advanced = 20,
- /obj/effect/spawner/random/circuit/computer/common = 50,
- /obj/effect/spawner/random/circuit/computer/rare = 5,
+ /obj/effect/spawner/lootdrop/random_computer_circuit_common = 50,
+ /obj/effect/spawner/lootdrop/random_computer_circuit_rare = 5,
/obj/item/research_notes/loot/tiny = 10,
)
@@ -106,10 +106,11 @@
/obj/item/stack/ore/salvage/scraptitanium/five = 60,
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
- /obj/effect/spawner/random/salvage_matter_bin = 40,
- /obj/effect/spawner/random/salvage_matter_bin = 40,
- /obj/effect/spawner/random/salvage_matter_bin = 40,
- /obj/effect/spawner/random/salvage_manipulator = 30,
+
+ /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
+ /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
+ /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
+ /obj/effect/spawner/lootdrop/salvage_manipulator = 30,
/obj/item/circuitboard/machine/autolathe = 35,
@@ -133,17 +134,17 @@
/obj/item/stack/ore/salvage/scrapplasma/five = 60,
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
- /obj/effect/spawner/random/salvage_matter_bin = 40,
- /obj/effect/spawner/random/salvage_matter_bin = 40,
- /obj/effect/spawner/random/salvage_manipulator = 30,
- /obj/effect/spawner/random/salvage_manipulator = 30,
+ /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
+ /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
+ /obj/effect/spawner/lootdrop/salvage_manipulator = 30,
+ /obj/effect/spawner/lootdrop/salvage_manipulator = 30,
- /obj/effect/spawner/random/engineering/tool = 45,
- /obj/effect/spawner/random/medical/surgery_tool = 55,
- /obj/effect/spawner/random/medical/beaker = 45,
- /obj/effect/spawner/random/medical/prosthetic = 25,
- /obj/effect/spawner/random/random_gun_protolathe_lootdrop = 5, //:flushed:
- /obj/effect/spawner/random/random_ammo_protolathe_lootdrop = 5,
+ /obj/effect/spawner/lootdrop/tool_engie_proto = 45,
+ /obj/effect/spawner/lootdrop/tool_surgery_proto = 55,
+ /obj/effect/spawner/lootdrop/beaker_loot_spawner = 45,
+ /obj/effect/spawner/lootdrop/random_prosthetic = 25,
+ /obj/effect/spawner/lootdrop/random_gun_protolathe_lootdrop = 5, //:flushed:
+ /obj/effect/spawner/lootdrop/random_ammo_protolathe_lootdrop = 5,
/obj/item/storage/part_replacer = 20,
/obj/item/storage/part_replacer/bluespace = 1,
@@ -171,13 +172,13 @@
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
/obj/item/stack/ore/salvage/scrapbluespace = 60,
- /obj/effect/spawner/random/salvage_matter_bin = 40,
- /obj/effect/spawner/random/salvage_manipulator = 30,
+ /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
+ /obj/effect/spawner/lootdrop/salvage_manipulator = 30,
/obj/item/stack/circuit_stack = 50, //this might be the only way in the game to get a poly circuit, and the only way for many ships to get essensial electronics. huh.
- /obj/effect/spawner/random/circuit/machine/mech = 45, //with all the wonderful broken mechs lying around, this might be a chance to get something stupidly overpowered.
- /obj/effect/spawner/random/circuit/machine/common = 50, //well.... "common"
- /obj/effect/spawner/random/circuit/machine/rare = 5,
+ /obj/effect/spawner/lootdrop/random_machine_circuit_mech = 45, //with all the wonderful broken mechs lying around, this might be a chance to get something stupidly overpowered.
+ /obj/effect/spawner/lootdrop/random_machine_circuit_common = 50, //well.... "common"
+ /obj/effect/spawner/lootdrop/random_machine_circuit_rare = 5,
/obj/item/stack/sheet/metal/five = 15, //same as above but more geared towards stuff used by circuit imprinter
/obj/item/stack/sheet/glass/five = 15,
@@ -198,12 +199,12 @@
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
/obj/item/stack/ore/salvage/scrapplasma = 60,
- /obj/effect/spawner/random/salvage_scanning = 40,
- /obj/effect/spawner/random/salvage_laser = 30,
- /obj/effect/spawner/random/salvage_manipulator = 30,
+ /obj/effect/spawner/lootdrop/salvage_scanning = 40,
+ /obj/effect/spawner/lootdrop/salvage_laser = 30,
+ /obj/effect/spawner/lootdrop/salvage_manipulator = 30,
/obj/item/storage/toolbox/syndicate/empty = 80,
- /obj/effect/spawner/random/destructive_anal_loot = 65,
+ /obj/effect/spawner/lootdrop/destructive_anal_loot = 65,
/obj/item/stack/sheet/metal/five = 15, //same as above but more geared towards stuff used by circuit imprinter
/obj/item/stack/sheet/glass/five = 15,
@@ -341,11 +342,11 @@
color = "#808080"
salvageable_parts = list(
- /obj/effect/spawner/random/food_or_drink/seed = 80,
- /obj/effect/spawner/random/food_or_drink/seed = 80,
- /obj/effect/spawner/random/food_or_drink/seed = 80,
- /obj/effect/spawner/random/food_or_drink/seed = 80,
- /obj/effect/spawner/random/food_or_drink/seed = 80,
+ /obj/effect/spawner/lootdrop/seeded = 80,
+ /obj/effect/spawner/lootdrop/seeded = 80,
+ /obj/effect/spawner/lootdrop/seeded = 80,
+ /obj/effect/spawner/lootdrop/seeded = 80,
+ /obj/effect/spawner/lootdrop/seeded = 80,
/obj/item/seeds/random = 80,
/obj/item/seeds/random = 40,
/obj/item/seeds/random = 40,
@@ -469,3 +470,236 @@
/obj/item/stack/ore/salvage/scrapbluespace/five
amount = 5
+
+//loot spawners as shown above
+
+//GENERIC
+/obj/effect/spawner/lootdrop/salvage_capacitor
+ loot = list(
+ /obj/item/stock_parts/capacitor = 120,
+ /obj/item/stock_parts/capacitor/adv = 20,
+ /obj/item/stock_parts/capacitor/super = 5,
+ )
+
+/obj/effect/spawner/lootdrop/salvage_scanning
+ loot = list(
+ /obj/item/stock_parts/scanning_module = 120,
+ /obj/item/stock_parts/scanning_module/adv = 20,
+ /obj/item/stock_parts/scanning_module/phasic = 5,
+ )
+
+/obj/effect/spawner/lootdrop/salvage_manipulator
+ loot = list(
+ /obj/item/stock_parts/manipulator = 120,
+ /obj/item/stock_parts/manipulator/nano = 20,
+ /obj/item/stock_parts/manipulator/pico = 5,
+ )
+
+/obj/effect/spawner/lootdrop/salvage_matter_bin
+ loot = list(
+ /obj/item/stock_parts/matter_bin = 120,
+ /obj/item/stock_parts/matter_bin/adv = 20,
+ /obj/item/stock_parts/matter_bin/super = 5,
+ )
+
+/obj/effect/spawner/lootdrop/salvage_laser
+ loot = list(
+ /obj/item/stock_parts/micro_laser = 120,
+ /obj/item/stock_parts/micro_laser/high = 20,
+ /obj/item/stock_parts/micro_laser/ultra = 5,
+ )
+
+//PROTOLATHE
+/obj/effect/spawner/lootdrop/tool_engie_proto
+ loot = list(
+ /obj/effect/spawner/lootdrop/tool_engie_common = 120,
+ /obj/effect/spawner/lootdrop/tool_engie_sydnie = 20,
+ /obj/effect/spawner/lootdrop/tool_engie_adv = 5,
+ )
+
+/obj/effect/spawner/lootdrop/tool_engie_common
+ loot = list(
+ /obj/item/wrench/crescent = 1,
+ /obj/item/screwdriver = 1,
+ /obj/item/weldingtool = 1,
+ /obj/item/crowbar = 1,
+ /obj/item/wirecutters = 1,
+ /obj/item/multitool = 1,
+ )
+
+/obj/effect/spawner/lootdrop/tool_engie_sydnie
+ loot = list(
+ /obj/item/wrench/syndie = 1,
+ /obj/item/screwdriver/nuke = 1,
+ /obj/item/weldingtool/largetank = 1,
+ /obj/item/crowbar/syndie = 1,
+ /obj/item/wirecutters/syndie = 1,
+ /obj/item/multitool/syndie = 1,
+ )
+
+/obj/effect/spawner/lootdrop/tool_engie_adv
+ loot = list(
+ /obj/item/screwdriver/power = 1,
+ /obj/item/weldingtool/experimental = 1,
+ /obj/item/crowbar/power = 1,
+ )
+
+/obj/effect/spawner/lootdrop/tool_surgery_proto
+ loot = list(
+ /obj/effect/spawner/lootdrop/tool_surgery_common = 120,
+ /obj/effect/spawner/lootdrop/tool_surgery_adv = 10,
+ )
+
+/obj/effect/spawner/lootdrop/tool_surgery_common
+ loot = list(
+ /obj/item/scalpel = 1,
+ /obj/item/hemostat = 1,
+ /obj/item/cautery = 1,
+ /obj/item/retractor = 1,
+ /obj/item/circular_saw = 1,
+ /obj/item/surgicaldrill = 1,
+ )
+
+/obj/effect/spawner/lootdrop/tool_surgery_adv
+ loot = list(
+ /obj/item/scalpel/advanced = 1,
+ /obj/item/retractor/advanced = 1,
+ /obj/item/surgicaldrill/advanced = 1,
+ )
+
+/obj/effect/spawner/lootdrop/beaker_loot_spawner
+ loot = list(
+ /obj/item/reagent_containers/glass/beaker = 300,
+ /obj/item/reagent_containers/glass/beaker/large = 200,
+ /obj/item/reagent_containers/glass/beaker/plastic = 50,
+ /obj/item/reagent_containers/glass/beaker/meta = 10,
+ /obj/item/reagent_containers/glass/beaker/noreact = 5,
+ /obj/item/reagent_containers/glass/beaker/bluespace = 1,
+ )
+/obj/effect/spawner/lootdrop/random_prosthetic
+ loot = list(
+ /obj/item/bodypart/l_arm/robot/surplus = 1,
+ /obj/item/bodypart/r_arm/robot/surplus = 1,
+ /obj/item/bodypart/leg/left/robot/surplus = 1,
+ /obj/item/bodypart/leg/right/robot/surplus = 1,
+ )
+/obj/effect/spawner/lootdrop/random_gun_protolathe_lootdrop
+ loot = list(
+ /obj/item/gun/energy/lasercannon = 1,
+ /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto = 1,
+ /obj/item/gun/energy/temperature/security = 1,
+ )
+/obj/effect/spawner/lootdrop/random_ammo_protolathe_lootdrop
+ loot = list(
+ /obj/item/stock_parts/cell/gun/upgraded = 5,
+ /obj/item/ammo_box/magazine/smgm9mm = 7,
+ )
+
+//CIRCUIT IMPRINTER
+/obj/effect/spawner/lootdrop/random_machine_circuit_common
+ loot = list(
+ /obj/item/circuitboard/machine/autolathe = 5,
+ /obj/item/circuitboard/machine/biogenerator = 5,
+ /obj/item/circuitboard/machine/cell_charger = 5,
+ /obj/item/circuitboard/machine/chem_heater = 5,
+ /obj/item/circuitboard/machine/chem_master = 5,
+ /obj/item/circuitboard/machine/clonescanner = 5,
+ /obj/item/circuitboard/machine/cryo_tube = 5,
+ /obj/item/circuitboard/machine/cyborgrecharger = 5,
+ /obj/item/circuitboard/machine/deep_fryer = 5,
+ /obj/item/circuitboard/machine/experimentor = 5,
+ /obj/item/circuitboard/machine/holopad = 5,
+ /obj/item/circuitboard/machine/hydroponics = 5,
+ /obj/item/circuitboard/machine/limbgrower = 5,
+ /obj/item/circuitboard/machine/ltsrbt = 5,
+ /obj/item/circuitboard/machine/mech_recharger = 5,
+ /obj/item/circuitboard/machine/mechfab = 5,
+ /obj/item/circuitboard/machine/medical_kiosk = 5,
+ /obj/item/circuitboard/machine/medipen_refiller = 5,
+ /obj/item/circuitboard/machine/microwave = 5,
+ /obj/item/circuitboard/machine/ore_redemption = 5,
+ /obj/item/circuitboard/machine/ore_silo = 5,
+ /obj/item/circuitboard/machine/reagentgrinder = 5,
+ /obj/item/circuitboard/machine/recharger = 5,
+ /obj/item/circuitboard/machine/seed_extractor = 5,
+ /obj/item/circuitboard/machine/selling_pad = 5,
+ /obj/item/circuitboard/machine/emitter = 5,
+ )
+
+/obj/effect/spawner/lootdrop/random_machine_circuit_rare
+ loot = list(
+ /obj/item/circuitboard/aicore = 5,
+ /obj/item/circuitboard/machine/chem_dispenser = 5,
+ /obj/item/circuitboard/machine/circuit_imprinter = 5,
+ /obj/item/circuitboard/machine/protolathe = 5,
+ /obj/item/circuitboard/machine/clonepod/experimental = 5,
+ /obj/item/circuitboard/machine/rad_collector = 5,
+ /obj/item/circuitboard/machine/launchpad = 5,
+ )
+
+/obj/effect/spawner/lootdrop/random_machine_circuit_mech
+ loot = list(
+ /obj/item/circuitboard/mecha/ripley/main = 100,
+ /obj/item/circuitboard/mecha/ripley/peripherals = 100,
+ /obj/item/circuitboard/mecha/honker/main = 5,
+ /obj/item/circuitboard/mecha/honker/peripherals = 5,
+ /obj/item/circuitboard/mecha/odysseus/main = 5,
+ /obj/item/circuitboard/mecha/odysseus/peripherals = 5,
+ /obj/item/circuitboard/mecha/gygax/main = 1,
+ /obj/item/circuitboard/mecha/gygax/peripherals = 1,
+ /obj/item/circuitboard/mecha/gygax/targeting = 1,
+ /obj/item/circuitboard/mecha/durand/main = 1,
+ /obj/item/circuitboard/mecha/durand/peripherals = 1,
+ /obj/item/circuitboard/mecha/durand/targeting = 1,
+ )
+
+//COMPUTER
+/obj/effect/spawner/lootdrop/random_computer_circuit_common
+ loot = list(
+ /obj/item/circuitboard/computer/aifixer = 5,
+ /obj/item/circuitboard/computer/arcade/amputation = 5,
+ /obj/item/circuitboard/computer/arcade/battle = 5,
+ /obj/item/circuitboard/computer/arcade/orion_trail = 5,
+ /obj/item/circuitboard/computer/atmos_alert = 5,
+ /obj/item/circuitboard/computer/card = 5,
+ /obj/item/circuitboard/computer/cloning = 5,
+ /obj/item/circuitboard/computer/communications = 5,
+ /obj/item/circuitboard/computer/launchpad_console = 5,
+ /obj/item/circuitboard/computer/mech_bay_power_console = 5,
+ /obj/item/circuitboard/computer/pandemic = 5,
+ /obj/item/circuitboard/computer/powermonitor/secret = 5,
+ /obj/item/circuitboard/computer/prototype_cloning = 5,
+ /obj/item/circuitboard/computer/stationalert = 5,
+ /obj/item/circuitboard/computer/teleporter = 5,
+ /obj/item/circuitboard/computer/operating = 5,
+ /obj/item/circuitboard/computer/crew = 5,
+ /obj/item/circuitboard/computer/scan_consolenew = 5,
+ )
+
+/obj/effect/spawner/lootdrop/random_computer_circuit_rare
+ loot = list(
+ /obj/item/circuitboard/computer/cargo = 5,
+ /obj/item/circuitboard/computer/communications = 5,
+ /obj/item/circuitboard/computer/shuttle/helm = 5,
+ /obj/item/circuitboard/computer/med_data = 5,
+ )
+
+//DESTRUCTIVE ANAL //i'm killing you
+/obj/effect/spawner/lootdrop/destructive_anal_loot //what do people usually put in these things anayways
+ loot = list(
+ /obj/item/storage/toolbox/syndicate/empty = 650,
+ /obj/item/gun/ballistic/automatic/pistol/ringneck = 500,
+ /obj/item/camera_bug = 500,
+ /obj/item/clothing/gloves/combat = 200,
+ /obj/item/clothing/head/chameleon = 200,
+ /obj/item/pen/sleepy = 200,
+ /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 100,
+
+ /obj/item/grenade/c4 = 100,
+
+ /obj/item/wrench/syndie = 30,
+ /obj/item/screwdriver/nuke = 30,
+ /obj/item/crowbar/syndie = 30,
+ /obj/item/wirecutters/syndie = 30,
+ /obj/item/multitool/syndie = 30,
+ )
diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm
index 7b8d68b7b2f9..dfdc7797e7f5 100644
--- a/code/game/turfs/closed/minerals.dm
+++ b/code/game/turfs/closed/minerals.dm
@@ -197,7 +197,7 @@
. = ..()
if (prob(mineralChance))
- var/path = pick_weight(mineralSpawnChanceList)
+ var/path = pickweight(mineralSpawnChanceList)
if(ispath(path, /turf))
var/turf/T = ChangeTurf(path,null,CHANGETURF_IGNORE_AIR)
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 68a2f4675bdb..333b8b828022 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -854,7 +854,7 @@
switch(ruin_force)
if("Random")
- //Can't use pick_weight as it might be from "everything"
+ //Can't use pickweight as it might be from "everything"
ruin_target = select_from[pick(select_from)]
else
var/selected_ruin = tgui_input_list(usr, "Which ruin?", "Spawn Ruin", select_from, 60 SECONDS)
diff --git a/code/modules/antagonists/changeling/powers/pheromone_receptors.dm b/code/modules/antagonists/changeling/powers/pheromone_receptors.dm
index 93905c9d6aed..5980993958b0 100644
--- a/code/modules/antagonists/changeling/powers/pheromone_receptors.dm
+++ b/code/modules/antagonists/changeling/powers/pheromone_receptors.dm
@@ -48,7 +48,7 @@
changelings[C] = (CHANGELING_PHEROMONE_MAX_DISTANCE ** 2) - (distance ** 2)
if(changelings.len)
- scan_target = pick_weight(changelings) //Point at a 'random' changeling, biasing heavily towards closer ones.
+ scan_target = pickweight(changelings) //Point at a 'random' changeling, biasing heavily towards closer ones.
else
scan_target = null
diff --git a/code/modules/awaymissions/away_props.dm b/code/modules/awaymissions/away_props.dm
index 3b51ebb583d8..a29d48657446 100644
--- a/code/modules/awaymissions/away_props.dm
+++ b/code/modules/awaymissions/away_props.dm
@@ -1,7 +1,7 @@
/obj/effect/oneway
name = "one way effect"
desc = "Only lets things in from it's dir."
- icon = 'icons/effects/mapping/mapping_helpers.dmi'
+ icon = 'icons/effects/mapping_helpers.dmi'
icon_state = "field_dir"
invisibility = INVISIBILITY_MAXIMUM
anchored = TRUE
@@ -14,7 +14,7 @@
/obj/effect/wind
name = "wind effect"
desc = "Creates pressure effect in it's direction. Use sparingly."
- icon = 'icons/effects/mapping/mapping_helpers.dmi'
+ icon = 'icons/effects/mapping_helpers.dmi'
icon_state = "field_dir"
invisibility = INVISIBILITY_MAXIMUM
var/strength = 30
@@ -32,7 +32,7 @@
/obj/effect/path_blocker
name = "magic barrier"
desc = "You shall not pass."
- icon = 'icons/effects/mapping/mapping_helpers.dmi'
+ icon = 'icons/effects/mapping_helpers.dmi'
icon_state = "blocker" //todo make this actually look fine when visible
anchored = TRUE
var/list/blocked_types = list()
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 4fb7ceac4527..26361b99cfc6 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -6,7 +6,7 @@
name = "Mob Spawner"
density = TRUE
anchored = TRUE
- icon = 'icons/effects/mapping/mapping_helpers.dmi' // These aren't *really* mapping helpers but it fits the most with it's common usage (to help place corpses in maps)
+ icon = 'icons/effects/mapping_helpers.dmi' // These aren't *really* mapping helpers but it fits the most with it's common usage (to help place corpses in maps)
icon_state = "mobspawner" // So it shows up in the map editor
var/mob_type = null
var/mob_name = ""
@@ -138,7 +138,6 @@
// Base version - place these on maps/templates.
/obj/effect/mob_spawn/human
mob_type = /mob/living/carbon/human
- icon_state = "corpsehuman"
//Human specific stuff.
var/mob_species = null //Set to make them a mutant race such as lizard or skeleton. Uses the datum typepath instead of the ID.
var/datum/outfit/outfit = /datum/outfit //If this is a path, it will be instanced in Initialize()
@@ -327,10 +326,12 @@
/obj/effect/mob_spawn/human/corpse/cargo_tech
name = "Cargo Tech"
outfit = /datum/outfit/job/cargo_tech
+ icon_state = "corpsecargotech"
/obj/effect/mob_spawn/human/cook
name = "Cook"
outfit = /datum/outfit/job/cook
+ icon_state = "corpsecook"
/obj/effect/mob_spawn/human/cook/husked
husk = TRUE
@@ -338,6 +339,8 @@
/obj/effect/mob_spawn/human/doctor
name = "Doctor"
outfit = /datum/outfit/job/doctor
+ icon_state = "corpsedoctor"
+
/obj/effect/mob_spawn/human/doctor/alive
death = FALSE
@@ -360,18 +363,22 @@
/obj/effect/mob_spawn/human/engineer
name = "Engineer"
outfit = /datum/outfit/job/engineer
+ icon_state = "corpseengineer"
/obj/effect/mob_spawn/human/clown
name = "Clown"
outfit = /datum/outfit/job/clown
+ icon_state = "corpseclown"
/obj/effect/mob_spawn/human/scientist
name = "Scientist"
outfit = /datum/outfit/job/scientist
+ icon_state = "corpsescientist"
/obj/effect/mob_spawn/human/miner
name = "Shaft Miner"
outfit = /datum/outfit/job/miner
+ icon_state = "corpseminer"
/obj/effect/mob_spawn/human/plasmaman
mob_species = /datum/species/plasmaman
@@ -398,6 +405,7 @@
/obj/effect/mob_spawn/human/bartender
name = "Space Bartender"
+ icon_state = "corpsebartender"
id_job = "Bartender"
id_access_list = list(ACCESS_BAR)
outfit = /datum/outfit/spacebartender
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index 210a5cec7a47..a240bf9f8404 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -453,6 +453,83 @@
SAY AAAAAAAAAAAAAAAA FUCK THAT
DELAY 15;"}
+//lootspawners//--
+
+/obj/effect/spawner/lootdrop/snowdin
+ name = "why are you using this dummy"
+ lootdoubles = 0
+ lootcount = 1
+ loot = list(/obj/item/bikehorn = 100)
+
+/obj/effect/spawner/lootdrop/snowdin/dungeonlite
+ name = "dungeon lite"
+ loot = list(/obj/item/melee/classic_baton = 11,
+ /obj/item/melee/classic_baton/telescopic = 12,
+ /obj/item/book/granter/spell/smoke = 10,
+ /obj/item/book/granter/spell/blind = 10,
+ /obj/item/storage/firstaid/regular = 45,
+ /obj/item/storage/firstaid/toxin = 35,
+ /obj/item/storage/firstaid/brute = 27,
+ /obj/item/storage/firstaid/fire = 27,
+ /obj/item/storage/toolbox/syndicate = 12,
+ /obj/item/grenade/c4 = 7,
+ /obj/item/grenade/clusterbuster/smoke = 15,
+ /obj/item/clothing/under/chameleon = 13,
+ /obj/item/clothing/shoes/chameleon/noslip = 10,
+ /obj/item/borg/upgrade/ddrill = 3,
+ /obj/item/borg/upgrade/soh = 3)
+
+/obj/effect/spawner/lootdrop/snowdin/dungeonmid
+ name = "dungeon mid"
+ loot = list(/obj/item/defibrillator/compact = 6,
+ /obj/item/storage/firstaid/tactical = 35,
+ /obj/item/shield/energy = 6,
+ /obj/item/shield/riot/tele = 12,
+ /obj/item/dnainjector/lasereyesmut = 7,
+ /obj/item/pneumatic_cannon = 15,
+ /obj/item/melee/transforming/energy/sword = 7,
+ /obj/item/book/granter/spell/knock = 15,
+ /obj/item/book/granter/spell/summonitem = 20,
+ /obj/item/book/granter/spell/forcewall = 17,
+ /obj/item/storage/backpack/holding = 12,
+ /obj/item/grenade/spawnergrenade/manhacks = 6,
+ /obj/item/grenade/spawnergrenade/spesscarp = 7,
+ /obj/item/grenade/clusterbuster/inferno = 3,
+ /obj/item/stack/sheet/mineral/diamond{amount = 15} = 10,
+ /obj/item/stack/sheet/mineral/uranium{amount = 15} = 10,
+ /obj/item/stack/sheet/mineral/plasma{amount = 15} = 10,
+ /obj/item/stack/sheet/mineral/gold{amount = 15} = 10,
+ /obj/item/book/granter/spell/barnyard = 4,
+ /obj/item/pickaxe/drill/diamonddrill = 6,
+ /obj/item/borg/upgrade/disablercooler = 7)
+
+
+/obj/effect/spawner/lootdrop/snowdin/dungeonheavy
+ name = "dungeon heavy"
+ loot = list(/obj/item/melee/axe/fire = 25,
+ /obj/item/organ/brain/alien = 17,
+ /obj/item/dualsaber = 15,
+ /obj/item/organ/heart/demon = 7,
+ /obj/item/gun/ballistic/automatic/smg/cobra = 16,
+ /obj/item/uplink/old = 2,
+ /obj/item/book/granter/spell/charge = 12,
+ /obj/item/grenade/clusterbuster/spawner_manhacks = 15,
+ /obj/item/book/granter/spell/fireball = 10,
+ /obj/item/pickaxe/drill/jackhammer = 30,
+ /obj/item/borg/upgrade/syndicate = 13,
+ /obj/item/borg/upgrade/selfrepair = 17)
+
+/obj/effect/spawner/lootdrop/snowdin/dungeonmisc
+ name = "dungeon misc"
+ lootdoubles = 2
+ lootcount = 1
+
+ loot = list(/obj/item/stack/sheet/mineral/snow{amount = 25} = 10,
+ /obj/item/toy/snowball = 15,
+ /obj/item/shovel = 10,
+ /obj/item/melee/spear = 8,
+ )
+
//special items//--
/obj/structure/barricade/wooden/snowed
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
index 65a72290bf07..2d9f3af83c06 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
@@ -4,7 +4,7 @@
/datum/blackmarket_item/consumable/donk_pocket_box
name = "Box of Donk Pockets"
desc = "A well packaged box containing the favourite snack of every spacefarer."
- item = /obj/effect/spawner/random/food_or_drink/donkpockets
+ item = /obj/effect/spawner/lootdrop/donkpockets
stock_min = 2
stock_max = 5
@@ -186,7 +186,7 @@
/datum/blackmarket_item/consumable/ration
name = "Ration Pack"
desc = "PGF military surplus rations. What's in them? Who knows. Surprise is the spice of life after all."
- item = /obj/effect/spawner/random/food_or_drink/ration
+ item = /obj/effect/spawner/lootdrop/ration
price_min = 150
price_max = 300
diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm
index a7bcbb2fe7d4..cab2ac8563af 100644
--- a/code/modules/cargo/packs/costumes_toys.dm
+++ b/code/modules/cargo/packs/costumes_toys.dm
@@ -73,7 +73,7 @@
var/the_toy
for(var/i in 1 to 5)
if(prob(50))
- the_toy = pick_weight(GLOB.arcade_prize_pool)
+ the_toy = pickweight(GLOB.arcade_prize_pool)
else
the_toy = pick(subtypesof(/obj/item/toy/plush))
new the_toy(C)
@@ -103,7 +103,7 @@
/datum/supply_pack/costumes_toys/mafia/fill(obj/structure/closet/crate/C)
for(var/i in 1 to 4)
- new /obj/effect/spawner/random/clothing/mafia_outfit(C)
+ new /obj/effect/spawner/lootdrop/mafia_outfit(C)
new /obj/item/virgin_mary(C)
if(prob(30)) //Not all mafioso have mustaches, some people also find this item annoying.
new /obj/item/clothing/mask/fakemoustache/italian(C)
diff --git a/code/modules/cargo/packs/food.dm b/code/modules/cargo/packs/food.dm
index 13402cce51b3..364c53ec9eb5 100644
--- a/code/modules/cargo/packs/food.dm
+++ b/code/modules/cargo/packs/food.dm
@@ -47,12 +47,12 @@
name = "Ration Crate"
desc = "6 standerd issue rations."
cost = 500
- contains = list(/obj/effect/spawner/random/food_or_drink/ration,
- /obj/effect/spawner/random/food_or_drink/ration,
- /obj/effect/spawner/random/food_or_drink/ration,
- /obj/effect/spawner/random/food_or_drink/ration,
- /obj/effect/spawner/random/food_or_drink/ration,
- /obj/effect/spawner/random/food_or_drink/ration)
+ contains = list(/obj/effect/spawner/lootdrop/ration,
+ /obj/effect/spawner/lootdrop/ration,
+ /obj/effect/spawner/lootdrop/ration,
+ /obj/effect/spawner/lootdrop/ration,
+ /obj/effect/spawner/lootdrop/ration,
+ /obj/effect/spawner/lootdrop/ration)
crate_name = "ration crate"
crate_type = /obj/structure/closet/crate
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index db9e2814b2c0..0447f62aab9e 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -259,6 +259,24 @@
item_state = "lgloves"
custom_price = 200
+/obj/effect/spawner/lootdrop/gloves
+ name = "random gloves"
+ desc = "These gloves are supposed to be a random color..."
+ icon = 'icons/obj/clothing/gloves.dmi'
+ icon_state = "random_gloves"
+ loot = list(
+ /obj/item/clothing/gloves/color/orange = 1,
+ /obj/item/clothing/gloves/color/red = 1,
+ /obj/item/clothing/gloves/color/blue = 1,
+ /obj/item/clothing/gloves/color/purple = 1,
+ /obj/item/clothing/gloves/color/green = 1,
+ /obj/item/clothing/gloves/color/grey = 1,
+ /obj/item/clothing/gloves/color/light_brown = 1,
+ /obj/item/clothing/gloves/color/brown = 1,
+ /obj/item/clothing/gloves/color/white = 1,
+ /obj/item/clothing/gloves/color/rainbow = 1,
+ )
+
/obj/item/clothing/gloves/maid
name = "maid arm covers"
desc = "Cylindrical looking tubes that go over your arm, weird."
diff --git a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
index 8f1e0663ee31..f5e4ddcdf55b 100644
--- a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
+++ b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
@@ -47,26 +47,26 @@
return
if(prob(90))
- head = pick_weight(list(
+ head = pickweight(list(
/obj/item/clothing/head/beret/sec/frontier = 10,
/obj/item/clothing/head/helmet/bulletproof/x11/frontier = 5,
/obj/item/reagent_containers/glass/bucket = 1))
if(prob(60))
- suit = pick_weight(list(
+ suit = pickweight(list(
/obj/item/clothing/suit/armor/vest = 5,
/obj/item/clothing/suit/armor/vest/bulletproof/frontier = 5,
/obj/item/clothing/suit/armor/vest/scrap = 1))
if(prob(50))
- mask = pick_weight(list(
+ mask = pickweight(list(
/obj/item/clothing/mask/gas/frontiersmen = 12,
/obj/item/clothing/mask/gas/sechailer/balaclava = 10,
/obj/item/clothing/mask/breath = 7,
/obj/item/clothing/mask/whistle/trench = 3))
if(prob(90))
- back = pick_weight(list(
+ back = pickweight(list(
/obj/item/storage/backpack = 20,
/obj/item/storage/backpack/satchel = 20,
/obj/item/storage/backpack/messenger = 20,
@@ -76,7 +76,7 @@
))
if(prob(90))
- shoes = pick_weight(list(
+ shoes = pickweight(list(
/obj/item/clothing/shoes/jackboots = 10,
/obj/item/clothing/shoes/sneakers = 5,
))
@@ -136,7 +136,7 @@
/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/presawn,
/obj/item/gun/energy/e_gun/mini))
if("Melee")
- r_hand = pick_weight(list(
+ r_hand = pickweight(list(
/obj/item/melee/knife/survival = 15,
/obj/item/melee/baseball_bat = 10,
/obj/item/roastingstick = 2,
diff --git a/code/modules/events/brain_trauma.dm b/code/modules/events/brain_trauma.dm
index 3c68b18d50f9..f7324e3c57dd 100644
--- a/code/modules/events/brain_trauma.dm
+++ b/code/modules/events/brain_trauma.dm
@@ -27,7 +27,7 @@
15;TRAUMA_RESILIENCE_LOBOTOMY,
5;TRAUMA_RESILIENCE_MAGIC)
- var/trauma_type = pick_weight(list(
+ var/trauma_type = pickweight(list(
BRAIN_TRAUMA_MILD = 60,
BRAIN_TRAUMA_SEVERE = 30,
BRAIN_TRAUMA_SPECIAL = 10
diff --git a/code/modules/events/heart_attack.dm b/code/modules/events/heart_attack.dm
index 73e3b721c067..35d8c4b141e1 100644
--- a/code/modules/events/heart_attack.dm
+++ b/code/modules/events/heart_attack.dm
@@ -18,7 +18,7 @@
heart_attack_contestants[victim] = 1
if(LAZYLEN(heart_attack_contestants))
- var/mob/living/carbon/human/winner = pick_weight(heart_attack_contestants)
+ var/mob/living/carbon/human/winner = pickweight(heart_attack_contestants)
var/datum/disease/D = new /datum/disease/heart_failure()
winner.ForceContractDisease(D, FALSE, TRUE)
announce_to_ghosts(winner)
diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm
index 1fbb017b7dd4..43e60c3137c3 100644
--- a/code/modules/events/holiday/xmas.dm
+++ b/code/modules/events/holiday/xmas.dm
@@ -42,7 +42,7 @@
/obj/effect/spawner/xmastree
name = "christmas tree spawner"
- icon = 'icons/effects/mapping/landmarks_static.dmi'
+ icon = 'icons/effects/landmarks_static.dmi'
icon_state = "x2"
layer = FLY_LAYER
diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm
index 40b979a89577..4f2c3cd1343a 100644
--- a/code/modules/fishing/fish/_fish.dm
+++ b/code/modules/fishing/fish/_fish.dm
@@ -386,6 +386,6 @@
if(initial(fish.available_in_random_cases) || !case_fish_only)
chance_table[fish] = initial(fish.random_case_rarity)
probability_table[argkey] = chance_table
- return pick_weight(probability_table[argkey])
+ return pickweight(probability_table[argkey])
diff --git a/code/modules/fishing/sources/_fish_source.dm b/code/modules/fishing/sources/_fish_source.dm
index db051d69175e..136a650148cd 100644
--- a/code/modules/fishing/sources/_fish_source.dm
+++ b/code/modules/fishing/sources/_fish_source.dm
@@ -79,7 +79,7 @@ GLOBAL_LIST_INIT(preset_fish_sources,init_fishing_configurations())
/// In case you want more complex rules for specific spots
/datum/fish_source/proc/roll_reward(obj/item/fishing_rod/rod, mob/fisherman)
- return pick_weight(get_modified_fish_table(rod,fisherman))
+ return pickweight(get_modified_fish_table(rod,fisherman))
/// Gives out the reward if possible
/datum/fish_source/proc/dispense_reward(reward_path, mob/fisherman)
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 30b768e702b0..29ff8ead2f62 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -34,7 +34,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
if(world.time < next_hallucination)
return
- var/halpick = pick_weight(GLOB.hallucination_list)
+ var/halpick = pickweight(GLOB.hallucination_list)
new halpick(src, FALSE)
next_hallucination = world.time + rand(100, 600)
diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm
index bfc9179c4893..b5c4c2c42b85 100644
--- a/code/modules/food_and_drinks/pizzabox.dm
+++ b/code/modules/food_and_drinks/pizzabox.dm
@@ -341,13 +341,13 @@
/obj/item/pizzabox/infinite/proc/attune_pizza(mob/living/carbon/human/noms) //tonight on "proc names I never thought I'd type"
if(!pizza_preferences[noms.ckey])
- pizza_preferences[noms.ckey] = pick_weight(pizza_types)
+ pizza_preferences[noms.ckey] = pickweight(pizza_types)
if(noms.has_quirk(/datum/quirk/pineapple_liker))
pizza_preferences[noms.ckey] = /obj/item/reagent_containers/food/snacks/pizza/pineapple
else if(noms.has_quirk(/datum/quirk/pineapple_hater))
var/list/pineapple_pizza_liker = pizza_types.Copy()
pineapple_pizza_liker -= /obj/item/reagent_containers/food/snacks/pizza/pineapple
- pizza_preferences[noms.ckey] = pick_weight(pineapple_pizza_liker)
+ pizza_preferences[noms.ckey] = pickweight(pineapple_pizza_liker)
else if(noms.mind && noms.mind.assigned_role == "Botanist")
pizza_preferences[noms.ckey] = /obj/item/reagent_containers/food/snacks/pizza/dank
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index 52b5f7659305..47e545c33663 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -4,7 +4,7 @@
/obj/effect/baseturf_helper //Set the baseturfs of every turf in the /area/ it is placed.
name = "baseturf editor"
- icon = 'icons/effects/mapping/mapping_helpers.dmi'
+ icon = 'icons/effects/mapping_helpers.dmi'
icon_state = ""
var/list/baseturf_to_replace
@@ -89,9 +89,8 @@
/obj/effect/mapping_helpers
- icon = 'icons/effects/mapping/mapping_helpers.dmi'
+ icon = 'icons/effects/mapping_helpers.dmi'
icon_state = ""
- invisibility = INVISIBILITY_OBSERVER
var/late = FALSE
/obj/effect/mapping_helpers/Initialize()
@@ -273,6 +272,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
/obj/effect/mapping_helpers/ianbirthday
name = "Ian's Bday Helper"
late = TRUE
+ icon_state = "iansbdayhelper"
var/balloon_clusters = 2
/obj/effect/mapping_helpers/ianbirthday/LateInitialize()
@@ -331,6 +331,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
/obj/effect/mapping_helpers/ianbirthday/admin//so admins may birthday any room
name = "generic birthday setup"
+ icon_state = "bdayhelper"
/obj/effect/mapping_helpers/ianbirthday/admin/LateInitialize()
birthday()
@@ -340,6 +341,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
/obj/effect/mapping_helpers/iannewyear
name = "Ian's New Years Helper"
late = TRUE
+ icon_state = "iansnewyrshelper"
/obj/effect/mapping_helpers/iannewyear/LateInitialize()
if(SSevents.holidays && SSevents.holidays[NEW_YEAR])
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index bf4ad80647ef..bf6fb15c9332 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -508,7 +508,7 @@
icon_state = "garden"
harvested_name = "lush garden"
harvested_desc = "In the soil and shade, something softly grew. It seems some industrious scavenger already passed by."
- harvest = /obj/effect/spawner/random/food_or_drink/garden
+ harvest = /obj/effect/spawner/lootdrop/garden
harvest_amount_high = 1
harvest_amount_low = 1
harvest_message_low = "You discover something nestled away in the growing bough."
@@ -527,7 +527,7 @@
icon_state = "gardenarid"
harvested_name = "sandy garden"
harvested_desc = "Beneath a bluff of soft silicate, a sheltered grove slumbered. Some desert wanderer seems to have picked it clean."
- harvest = /obj/effect/spawner/random/food_or_drink/garden/arid
+ harvest = /obj/effect/spawner/lootdrop/garden/arid
harvest_amount_high = 1
harvest_amount_low = 1
harvest_message_low = "You brush sand away from a verdant prize, nestled in the leaves."
@@ -540,7 +540,7 @@
icon_state = "gardencold"
harvested_name = "chilly garden"
harvested_desc = "A delicate layer of frost covers hardy brush. Someone came with the blizzard, and left with any prize this might contain."
- harvest = /obj/effect/spawner/random/food_or_drink/garden/cold
+ harvest = /obj/effect/spawner/lootdrop/garden/cold
harvest_amount_high = 1
harvest_amount_low = 1
harvest_message_low = "You unearth a snow-covered treat."
@@ -553,7 +553,7 @@
icon_state = "gardensick"
harvested_name = "sickly garden"
harvested_desc = "Polluted water wells up from the cracked earth, where it once fed a patch of something curious. Now only wilted leaves remain."
- harvest = /obj/effect/spawner/random/food_or_drink/garden/sick
+ harvest = /obj/effect/spawner/lootdrop/garden/sick
harvest_amount_high = 1
harvest_amount_low = 1
harvest_message_low = "You pry something odd from the poisoned soil."
@@ -567,13 +567,124 @@
icon_state = "seaweed"
harvested_name = "seaweed patch"
harvested_desc = "A patch of seaweed, floating on the surface of the water. It seems someone has already searched through this"
- harvest = /obj/effect/spawner/random/food_or_drink/garden/seaweed
+ harvest = /obj/effect/spawner/lootdrop/garden/seaweed
harvest_amount_high = 1
harvest_amount_low = 1
harvest_message_low = "You discover some edible weeds within the patch."
harvest_message_med = "You discover some edible weeds within the patch."
harvest_message_high = "You discover some edible weeds within the patch."
+/obj/effect/spawner/lootdrop/garden
+ name = "lush garden seeder"
+ lootcount = 3
+ var/list/plant = list(
+ /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus = 1,
+ /obj/item/reagent_containers/food/snacks/grown/berries/death/stealth = 2,
+ /obj/item/reagent_containers/food/snacks/grown/citrus/orange_3d = 1,
+ /obj/item/reagent_containers/food/snacks/grown/trumpet = 1,
+ /obj/item/reagent_containers/food/snacks/grown/bungofruit = 1,
+ /obj/item/seeds/random = 1,
+ /obj/item/grown/log/bamboo = 2,
+ /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 2,
+ /obj/item/reagent_containers/food/snacks/grown/berries/poison/stealth = 5,
+ /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 2,
+ /obj/item/reagent_containers/food/snacks/grown/citrus/lime = 2,
+ /obj/item/reagent_containers/food/snacks/grown/vanillapod = 2,
+ /obj/item/reagent_containers/food/snacks/grown/moonflower = 2,
+ /obj/item/reagent_containers/food/snacks/grown/cocoapod = 2,
+ /obj/item/reagent_containers/food/snacks/grown/pineapple = 2,
+ /obj/item/reagent_containers/food/snacks/grown/poppy/lily = 2,
+ /obj/item/reagent_containers/food/snacks/grown/poppy/geranium = 2,
+ /obj/item/reagent_containers/food/snacks/grown/sugarcane = 2,
+ /obj/item/reagent_containers/food/snacks/grown/tea = 2,
+ /obj/item/reagent_containers/food/snacks/grown/tobacco = 2,
+ /obj/item/reagent_containers/food/snacks/grown/watermelon = 4,
+ /obj/item/grown/sunflower = 4,
+ /obj/item/reagent_containers/food/snacks/grown/banana = 4,
+ /obj/item/reagent_containers/food/snacks/grown/apple = 4,
+ /obj/item/reagent_containers/food/snacks/grown/berries = 5,
+ /obj/item/reagent_containers/food/snacks/grown/cherries = 4,
+ /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 4,
+ /obj/item/reagent_containers/food/snacks/grown/garlic = 4,
+ /obj/item/reagent_containers/food/snacks/grown/grapes = 4,
+ /obj/item/reagent_containers/food/snacks/grown/grass = 5,
+ /obj/item/reagent_containers/food/snacks/grown/pumpkin = 4,
+ /obj/item/reagent_containers/food/snacks/grown/rainbow_flower = 4,
+ /obj/item/reagent_containers/food/snacks/grown/wheat = 4,
+ /obj/item/reagent_containers/food/snacks/grown/parsnip = 4,
+ /obj/item/reagent_containers/food/snacks/grown/peas = 4,
+ /obj/item/reagent_containers/food/snacks/grown/rice = 4,
+ /obj/item/reagent_containers/food/snacks/grown/soybeans = 4,
+ /obj/item/reagent_containers/food/snacks/grown/tomato = 4,
+ /obj/item/reagent_containers/food/snacks/grown/cabbage = 4,
+ /obj/item/reagent_containers/food/snacks/grown/onion = 4,
+ /obj/item/reagent_containers/food/snacks/grown/carrot = 4)
+
+/obj/effect/spawner/lootdrop/garden/Initialize(mapload)
+ loot = plant
+ . = ..()
+
+/obj/effect/spawner/lootdrop/garden/arid
+ name = "arid garden seeder"
+ plant = list(
+ /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 1,
+ /obj/item/reagent_containers/food/snacks/grown/nettle = 1,
+ /obj/item/grown/cotton/durathread = 1,
+ /obj/item/seeds/random = 1,
+ /obj/item/reagent_containers/food/snacks/grown/redbeet = 1,
+ /obj/item/reagent_containers/food/snacks/grown/aloe = 2,
+ /obj/item/grown/cotton = 2,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/angel = 2,
+ /obj/item/reagent_containers/food/snacks/grown/chili = 2,
+ /obj/item/reagent_containers/food/snacks/grown/whitebeet = 5,
+ /obj/item/reagent_containers/food/snacks/grown/potato = 4,
+ /obj/item/reagent_containers/food/snacks/grown/potato/sweet = 4,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 4,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 4,
+ /obj/item/reagent_containers/food/snacks/grown/corn = 4)
+
+/obj/effect/spawner/lootdrop/garden/cold
+ name = "frigid garden seeder"
+ plant = list(
+ /obj/item/reagent_containers/food/snacks/grown/bluecherries = 1,
+ /obj/item/reagent_containers/food/snacks/grown/galaxythistle = 1,
+ /obj/item/reagent_containers/food/snacks/grown/berries/death/stealth = 1,
+ /obj/item/seeds/random = 1,
+ /obj/item/reagent_containers/food/snacks/grown/poppy = 2,
+ /obj/item/reagent_containers/food/snacks/grown/tomato/blue = 2,
+ /obj/item/reagent_containers/food/snacks/grown/berries/poison/stealth = 2,
+ /obj/item/reagent_containers/food/snacks/grown/berries = 4,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 4,
+ /obj/item/reagent_containers/food/snacks/grown/oat = 4,
+ /obj/item/reagent_containers/food/snacks/grown/grapes/green = 4,
+ /obj/item/reagent_containers/food/snacks/grown/grass = 4,
+ /obj/item/reagent_containers/food/snacks/grown/harebell = 5,
+ /obj/item/seeds/starthistle = 5)
+
+/obj/effect/spawner/lootdrop/garden/sick
+ name = "sickly garden seeder"
+ plant = list(
+ /obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow = 1,
+ /obj/item/reagent_containers/food/snacks/grown/cannabis/death = 1,
+ /obj/item/seeds/replicapod = 1,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/angel = 1,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap = 2,
+ /obj/item/seeds/tower/steel = 2,
+ /obj/item/reagent_containers/food/snacks/grown/cannabis = 2,
+ /obj/item/seeds/random = 2,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/jupitercup = 2,
+ /obj/item/reagent_containers/food/snacks/grown/cherrybulbs = 4,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 4,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap = 4,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/reishi = 4,
+ /obj/item/reagent_containers/food/snacks/grown/berries/glow = 4)
+
+/obj/effect/spawner/lootdrop/garden/seaweed
+ name = "seaweed patch seeder"
+ plant = list(
+ /obj/item/reagent_containers/food/snacks/grown/seaweed = 1
+ )
+
/obj/item/reagent_containers/food/snacks/grown/berries/poison/stealth //careful eating from random jungle bushes
seed = /obj/item/seeds/berry/poison
name = "bunch of berries"
diff --git a/code/modules/mining/ore_veins.dm b/code/modules/mining/ore_veins.dm
index fa497b44a323..16f6afa8da0c 100644
--- a/code/modules/mining/ore_veins.dm
+++ b/code/modules/mining/ore_veins.dm
@@ -72,7 +72,7 @@ GLOBAL_LIST_EMPTY(ore_veins)
else
ore_type_amount = 1
for(var/ore_count in 1 to ore_type_amount)
- var/picked = pick_weight(ore_list)
+ var/picked = pickweight(ore_list)
vein_contents.Add(picked)
ore_list.Remove(picked)
GLOB.ore_veins += src
diff --git a/code/modules/mob/living/simple_animal/hostile/abandoned_minebot.dm b/code/modules/mob/living/simple_animal/hostile/abandoned_minebot.dm
index 038aae0900de..58e48850c2b8 100644
--- a/code/modules/mob/living/simple_animal/hostile/abandoned_minebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/abandoned_minebot.dm
@@ -35,14 +35,14 @@
minimum_distance = 1
icon_state = "mining_drone_offense"
faction = list("mining", "turret")
- loot = list(/obj/effect/decal/cleanable/robot_debris, /obj/effect/spawner/random/minebot)
+ loot = list(/obj/effect/decal/cleanable/robot_debris, /obj/effect/spawner/lootdrop/minebot)
projectiletype = /obj/projectile/kinetic/miner/weak
/obj/projectile/kinetic/miner/weak
damage = 15
-/obj/effect/spawner/random/minebot
+/obj/effect/spawner/lootdrop/minebot
loot = list(/obj/item/borg/upgrade/modkit/minebot_passthrough = 15,
/obj/item/borg/upgrade/modkit/chassis_mod = 15,
/obj/item/borg/upgrade/modkit/tracer = 15,
diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
index 6dcff82cb7c4..b98da0a899fc 100644
--- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
@@ -69,7 +69,7 @@
/mob/living/simple_animal/hostile/hivebot/death(gibbed)
do_sparks(3, TRUE, src)
- new /obj/effect/spawner/random/waste/hivebot(loc)
+ new /obj/effect/spawner/lootdrop/waste/hivebot(loc)
..(TRUE)
/mob/living/simple_animal/hostile/hivebot/range
diff --git a/code/modules/mob/living/simple_animal/hostile/human/survivors.dm b/code/modules/mob/living/simple_animal/hostile/human/survivors.dm
index 772c277a0e8d..8cfeeff0695a 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/survivors.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/survivors.dm
@@ -80,7 +80,7 @@
var/survivor_type //room for alternatives inside the fuckoff grade init.
/obj/effect/mob_spawn/human/corpse/damaged/whitesands/Initialize() //everything here should equal out to 100 for the sake of my sanity.
- mob_species = pick_weight(list(
+ mob_species = pickweight(list(
/datum/species/human = 50,
/datum/species/lizard = 20,
/datum/species/ipc = 10,
@@ -92,7 +92,7 @@
//to-do: learn how to make mobsprites for other survivors
//gloves are a tossup
- gloves = pick_weight(list(
+ gloves = pickweight(list(
/obj/item/clothing/gloves/color/black = 60,
/obj/item/clothing/gloves/explorer = 30,
/obj/item/clothing/gloves/explorer/old = 10
@@ -100,7 +100,7 @@
)
//bags are semi-random.
- back = pick_weight(list(
+ back = pickweight(list(
/obj/item/storage/backpack = 20,
/obj/item/storage/backpack/explorer = 20,
/obj/item/storage/backpack/satchel = 20,
@@ -112,7 +112,7 @@
//as are bag contents
backpack_contents = list()
if(prob(70))
- backpack_contents += pick_weight(list( //these could stand to be expanded, right now they're just mildly modified miner ones, and I don't know how to plus that up.
+ backpack_contents += pickweight(list( //these could stand to be expanded, right now they're just mildly modified miner ones, and I don't know how to plus that up.
/obj/item/soap = 10,
/obj/item/stack/marker_beacon/ten = 15,
/obj/item/mining_scanner = 5,
@@ -128,7 +128,7 @@
)
)
if(prob(70))
- backpack_contents += pick_weight(list(
+ backpack_contents += pickweight(list(
/obj/item/stack/sheet/animalhide/goliath_hide = 20,
/obj/item/stack/marker_beacon/ten = 10,
/obj/item/mining_scanner = 20,
@@ -140,7 +140,7 @@
)
)
if(prob(70))
- backpack_contents += pick_weight(list(
+ backpack_contents += pickweight(list(
/obj/item/stack/sheet/animalhide/goliath_hide = 5,
/obj/item/stack/marker_beacon/ten = 5,
/obj/item/mining_scanner = 5,
@@ -154,7 +154,7 @@
)
)
if (prob(15)) //mayhaps a medkit
- backpack_contents += pick_weight(list(
+ backpack_contents += pickweight(list(
/obj/item/storage/firstaid/regular = 50,
/obj/item/storage/firstaid/brute = 15,
/obj/item/storage/firstaid/medical = 15,
@@ -167,7 +167,7 @@
backpack_contents += /obj/item/reagent_containers/hypospray/medipen/survival
//masks
- mask = pick_weight(list(
+ mask = pickweight(list(
/obj/item/clothing/mask/gas = 40,
/obj/item/clothing/mask/gas/explorer = 20,
/obj/item/clothing/mask/gas/explorer/old = 20,
@@ -177,7 +177,7 @@
//the eyes are the window into the soul.
if(prob(70))
- glasses = pick_weight(list(
+ glasses = pickweight(list(
/obj/item/clothing/glasses/heat = 20,
/obj/item/clothing/glasses/cold = 20,
/obj/item/clothing/glasses/meson = 40,
@@ -189,7 +189,7 @@
if(prob(1)) //oh my god they can't hear the sandstorm coming they've got airpods in
ears = /obj/item/instrument/piano_synth/headphones/spacepods
else
- ears = pick_weight(list(
+ ears = pickweight(list(
/obj/item/radio/headset = 50,
/obj/item/radio/headset/alt = 50
)
@@ -198,7 +198,7 @@
switch(survivor_type)
if("survivor")
//uniforms are random to show varied backgrounds, but similar goal
- uniform = pick_weight(list(
+ uniform = pickweight(list(
/obj/item/clothing/under/color/random = 65,
/obj/item/clothing/under/rank/cargo/miner/lavaland = 10,
/obj/item/clothing/under/rank/prisoner = 10,
@@ -207,7 +207,7 @@
)
)
//storage is semi-randomized, giving some variety
- belt = pick_weight(list(
+ belt = pickweight(list(
/obj/item/storage/belt/fannypack = 40,
/obj/item/storage/belt/mining = 20,
/obj/item/storage/belt/mining/alt = 15,
@@ -223,7 +223,7 @@
r_pocket = /obj/item/spacecash/bundle/smallrand
if("hunter")
- uniform = pick_weight(list(
+ uniform = pickweight(list(
/obj/item/clothing/under/color/random = 50,
/obj/item/clothing/under/rank/cargo/miner/lavaland = 25,
/obj/item/clothing/under/rank/cargo/miner/lavaland/old = 15,
@@ -231,7 +231,7 @@
/obj/item/clothing/under/utility = 5
)
)
- belt = pick_weight(list(
+ belt = pickweight(list(
/obj/item/storage/belt/mining = 30,
/obj/item/storage/belt/fannypack = 20,
/obj/item/storage/belt/mining/alt = 15,
@@ -251,7 +251,7 @@
visible_message(span_warning("The hunter's weapon shatters as they impact the ground!"))
if("gunslinger")
- uniform = pick_weight(list(
+ uniform = pickweight(list(
/obj/item/clothing/under/rank/cargo/miner/lavaland = 35,
/obj/item/clothing/under/color/random = 25,
/obj/item/clothing/under/rank/cargo/miner/lavaland/old = 15,
@@ -260,7 +260,7 @@
/obj/item/clothing/under/syndicate/combat = 5
)
)
- belt = pick_weight(list(
+ belt = pickweight(list(
/obj/item/storage/belt/mining = 30,
/obj/item/storage/belt/bandolier = 30,
/obj/item/storage/belt/military = 20,
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index 7e3e217ecebd..2bae8ea2a5dc 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -463,7 +463,7 @@
H.transform = H.transform.Scale(0.8, 1)//somehow dwarf squashing is borked when not roundstart. I hate WS code
/obj/effect/mob_spawn/human/corpse/damaged/legioninfested/Initialize() //in an ideal world, these would generate, the legion would overlay over the corpse, and we'd get cool sprites
- mob_species = pick_weight(list(
+ mob_species = pickweight(list(
/datum/species/human = 50,
/datum/species/lizard = 20,
/datum/species/ipc = 10,
@@ -472,7 +472,7 @@
/datum/species/spider = 5
)
)
- var/type = pick_weight(list(
+ var/type = pickweight(list(
"Miner" = 40,
"Assistant" = 10,
"Engineer" = 5,
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
index 86476b21b3f4..15626099bff9 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
@@ -1,6 +1,6 @@
/datum/outfit/generic/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
- uniform = pick_weight(list(
+ uniform = pickweight(list(
/obj/item/clothing/under/utility = 5,
/obj/item/clothing/under/utility/skirt = 5,
/obj/item/clothing/under/color/black = 1,
@@ -21,7 +21,7 @@
/obj/item/clothing/under/syndicate/tacticool = 1,
)
)
- suit = pick_weight(list(
+ suit = pickweight(list(
/obj/item/clothing/suit/hooded/wintercoat = 1,
/obj/item/clothing/suit/jacket = 1,
/obj/item/clothing/suit/jacket/leather = 1,
@@ -33,7 +33,7 @@
/obj/item/clothing/suit/toggle/hazard = 1,
)
)
- back = pick_weight(list(
+ back = pickweight(list(
/obj/item/storage/backpack = 1,
/obj/item/storage/backpack/satchel = 1,
/obj/item/storage/backpack/duffelbag = 1,
@@ -42,7 +42,7 @@
)
)
if (prob(10))
- belt = pick_weight(list(
+ belt = pickweight(list(
/obj/item/gun/ballistic/automatic/pistol/candor = 2,
/obj/item/gun/ballistic/automatic/pistol/commander = 1,
/obj/item/gun/ballistic/automatic/pistol/ringneck = 1,
@@ -51,13 +51,13 @@
)
)
if(prob(50))
- gloves = pick_weight(list(
+ gloves = pickweight(list(
/obj/item/clothing/gloves/color/black = 1,
/obj/item/clothing/gloves/fingerless = 1,
/obj/item/clothing/gloves/color/white = 1,
)
)
- shoes = pick_weight(list(
+ shoes = pickweight(list(
/obj/item/clothing/shoes/laceup = 1,
/obj/item/clothing/shoes/sandal = 1,
/obj/item/clothing/shoes/winterboots = 1,
@@ -69,7 +69,7 @@
)
)
if(prob(50))
- head = pick_weight(list(
+ head = pickweight(list(
/obj/item/clothing/head/beret = 3,
/obj/item/clothing/head/beret/grey = 3,
/obj/item/clothing/head/flatcap = 3,
@@ -83,7 +83,7 @@
)
)
if(prob(50))
- mask = pick_weight(list(
+ mask = pickweight(list(
/obj/item/clothing/mask/balaclava = 1,
/obj/item/clothing/mask/bandana/red = 1,
/obj/item/clothing/mask/gas = 3,
@@ -91,7 +91,7 @@
)
)
if(prob(25))
- neck = pick_weight(list(
+ neck = pickweight(list(
/obj/item/clothing/neck/scarf/red = 1,
/obj/item/clothing/neck/scarf/green = 1,
/obj/item/clothing/neck/scarf/darkblue = 1,
@@ -103,7 +103,7 @@
)
ears = pick(/obj/item/radio/headset, /obj/item/radio/headset/alt)
if(prob(50))
- glasses = pick_weight(list(
+ glasses = pickweight(list(
/obj/item/clothing/glasses/regular = 1,
/obj/item/clothing/glasses/regular/circle = 1,
/obj/item/clothing/glasses/regular/jamjar = 1,
@@ -121,7 +121,7 @@
l_pocket = pick(/obj/item/radio, /obj/item/flashlight)
id = /obj/item/card/id
backpack_contents = list()
- backpack_contents += pick_weight(list(
+ backpack_contents += pickweight(list(
/obj/item/dice/d20 = 1,
/obj/item/lipstick = 1,
/obj/item/clothing/mask/vape = 1,
@@ -151,14 +151,14 @@
/datum/outfit/generic/miner/pre_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
if(prob(75))
- uniform = pick_weight(list(
+ uniform = pickweight(list(
/obj/item/clothing/under/rank/cargo/miner/lavaland = 5,
/obj/item/clothing/under/rank/cargo/miner = 4,
/obj/item/clothing/under/rank/cargo/miner/lavaland/old = 1,
)
)
if(prob(25))
- suit = pick_weight(list(
+ suit = pickweight(list(
/obj/item/clothing/suit/hooded/explorer = 18,
/obj/item/clothing/suit/hooded/explorer/old = 1,
/obj/item/clothing/suit/hooded/cloak/goliath = 1
@@ -167,13 +167,13 @@
if(prob(75))
back = /obj/item/storage/backpack/explorer
if(prob(75))
- belt = pick_weight(list(
+ belt = pickweight(list(
/obj/item/storage/belt/mining = 2,
/obj/item/storage/belt/mining/alt = 2
)
)
else if(prob(75))
- belt = pick_weight(list(
+ belt = pickweight(list(
/obj/item/pickaxe = 16,
/obj/item/pickaxe/mini = 8,
/obj/item/pickaxe/silver = 4,
@@ -183,7 +183,7 @@
)
)
if(prob(75))
- gloves = pick_weight(list(
+ gloves = pickweight(list(
/obj/item/clothing/gloves/color/black = 9,
/obj/item/clothing/gloves/explorer/old = 1
)
@@ -191,7 +191,7 @@
if(prob(75))
shoes = /obj/item/clothing/shoes/workboots/mining
if(prob(75))
- mask = pick_weight(list(
+ mask = pickweight(list(
/obj/item/clothing/mask/gas/explorer = 9,
/obj/item/clothing/mask/gas/explorer/old = 1
)
@@ -199,7 +199,7 @@
if(prob(50))
glasses = /obj/item/clothing/glasses/meson
if(prob(50))
- r_pocket = pick_weight(list(
+ r_pocket = pickweight(list(
/obj/item/stack/marker_beacon = 20,
/obj/item/spacecash/bundle/smallrand = 7,
/obj/item/reagent_containers/hypospray/medipen/survival = 2,
@@ -207,7 +207,7 @@
)
)
if(prob(25))
- l_pocket = pick_weight(list(
+ l_pocket = pickweight(list(
/obj/item/spacecash/bundle/smallrand = 5,
/obj/item/reagent_containers/hypospray/medipen/survival = 2,
/obj/item/borg/upgrade/modkit/cooldown = 1
@@ -216,7 +216,7 @@
if(prob(75))
for(var/count in 1 to 3)
if(prob(70))
- backpack_contents += pick_weight(list(
+ backpack_contents += pickweight(list(
/obj/item/borg/upgrade/modkit/damage = 1,
/obj/item/borg/upgrade/modkit/trigger_guard = 1,
/obj/item/soap/nanotrasen = 1,
@@ -236,7 +236,7 @@
)
if(prob(30))
backpack_contents += list(
- /obj/item/reagent_containers/hypospray/medipen/survival = pick_weight(list(
+ /obj/item/reagent_containers/hypospray/medipen/survival = pickweight(list(
1 = 3,
2 = 2,
3 = 1
@@ -245,7 +245,7 @@
)
else if (prob(75))
backpack_contents = list()
- back = pick_weight(list(
+ back = pickweight(list(
/obj/item/kinetic_crusher = 9,
/obj/item/kinetic_crusher/old = 1
)
@@ -276,7 +276,7 @@
back = /obj/item/melee/axe/fire
for(var/i = 1 to 3)
if(prob(75))
- backpack_contents += pick_weight(list(
+ backpack_contents += pickweight(list(
/obj/item/stack/tape/industrial/electrical = 1,
/obj/item/electronics/apc = 1,
/obj/item/multitool = 1,
@@ -305,7 +305,7 @@
else if (prob(75))
back = /obj/item/defibrillator/loaded
if(prob(75))
- belt = pick_weight(list(/obj/item/storage/belt/medical = 5, /obj/item/defibrillator/compact/loaded = 1))
+ belt = pickweight(list(/obj/item/storage/belt/medical = 5, /obj/item/defibrillator/compact/loaded = 1))
if(prob(75))
gloves = pick(/obj/item/clothing/gloves/color/white, /obj/item/clothing/gloves/color/latex/nitrile)
if(prob(75))
@@ -320,7 +320,7 @@
glasses = pick(/obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health/prescription)
for(var/i = 1 to 3)
if(prob(75))
- backpack_contents += pick_weight(list(
+ backpack_contents += pickweight(list(
/obj/item/reagent_containers/pill/patch/styptic = 5,
/obj/item/reagent_containers/pill/patch/silver_sulf = 5,
/obj/item/storage/firstaid/medical = 3,
@@ -365,7 +365,7 @@
neck = /obj/item/clothing/neck/tie/horrible
for(var/i = 1 to 3)
if(prob(75))
- backpack_contents += pick_weight(list(
+ backpack_contents += pickweight(list(
/obj/item/research_notes/loot/tiny = 3,
/obj/item/research_notes/loot/small = 3,
/obj/item/reagent_scanner = 3,
@@ -408,7 +408,7 @@
ears = /obj/item/radio/headset/headset_cargo
for(var/i = 1 to 3)
if(prob(75))
- backpack_contents += pick_weight(list(
+ backpack_contents += pickweight(list(
/obj/item/spacecash/bundle/smallrand = 5,
/obj/item/ammo_box/magazine/illestren_a850r = 5,
/obj/item/ammo_box/magazine/zip_ammo_9mm = 5,
@@ -456,7 +456,7 @@
suit_store = pick(/obj/item/gun/energy/e_gun, /obj/item/gun/energy/e_gun/smg, /obj/item/gun/energy/e_gun/iot)
for(var/i = 1 to 3)
if(prob(75))
- backpack_contents += pick_weight(list(
+ backpack_contents += pickweight(list(
/obj/item/restraints/handcuffs = 8,
/obj/item/assembly/flash/handheld = 5,
/obj/item/storage/box/evidence = 6,
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index e90d00a38a42..f6dff0f23bb8 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -479,7 +479,7 @@
return //we never mate when not alone, so just abort early
if(alone && partner && children < 3)
- var/childspawn = pick_weight(childtype)
+ var/childspawn = pickweight(childtype)
var/turf/target = get_turf(loc)
if(target)
return new childspawn(target)
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index e8d5f5c508c6..bfad583d057c 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -77,7 +77,7 @@
if(prob(probability))
zone = check_zone(zone)
else
- zone = pick_weight(list(BODY_ZONE_HEAD = 1, BODY_ZONE_CHEST = 1, BODY_ZONE_L_ARM = 4, BODY_ZONE_R_ARM = 4, BODY_ZONE_L_LEG = 4, BODY_ZONE_R_LEG = 4))
+ zone = pickweight(list(BODY_ZONE_HEAD = 1, BODY_ZONE_CHEST = 1, BODY_ZONE_L_ARM = 4, BODY_ZONE_R_ARM = 4, BODY_ZONE_L_LEG = 4, BODY_ZONE_R_LEG = 4))
return zone
///Would this zone be above the neck
diff --git a/code/modules/mob_spawner/hivebot.dm b/code/modules/mob_spawner/hivebot.dm
index 2b36075d2225..630ed6f6f3c7 100644
--- a/code/modules/mob_spawner/hivebot.dm
+++ b/code/modules/mob_spawner/hivebot.dm
@@ -42,7 +42,7 @@
smoke.set_up(2, loc)
smoke.start()
new /obj/effect/particle_effect/sparks(loc)
- new /obj/effect/spawner/random/waste/hivebot/beacon(loc)
+ new /obj/effect/spawner/lootdrop/waste/hivebot/beacon(loc)
/obj/effect/light_emitter/hivespawner
set_luminosity = 4
diff --git a/code/modules/mob_spawner/spawner_componet.dm b/code/modules/mob_spawner/spawner_componet.dm
index 637423f0b1e0..8a904a5504c4 100644
--- a/code/modules/mob_spawner/spawner_componet.dm
+++ b/code/modules/mob_spawner/spawner_componet.dm
@@ -114,7 +114,7 @@
spot = pick(peel)
else
spot = pick(circleviewturfs(origin, spawn_distance_max))
- var/chosen_mob_type = pick_weight(mob_types)
+ var/chosen_mob_type = pickweight(mob_types)
var/mob/living/simple_animal/L = new chosen_mob_type(spot)
L.flags_1 |= (P.flags_1 & ADMIN_SPAWNED_1)
spawned_mobs += L
diff --git a/code/modules/overmap/objects/dynamic_datum.dm b/code/modules/overmap/objects/dynamic_datum.dm
index ad7d5007ca6d..1ca28df922aa 100644
--- a/code/modules/overmap/objects/dynamic_datum.dm
+++ b/code/modules/overmap/objects/dynamic_datum.dm
@@ -128,7 +128,7 @@
probabilities = list()
for(var/datum/planet_type/planet_type as anything in subtypesof(/datum/planet_type))
probabilities[initial(planet_type.planet)] = initial(planet_type.weight)
- planet = SSmapping.planet_types[force_encounter ? force_encounter : pick_weight_allow_zero(probabilities)]
+ planet = SSmapping.planet_types[force_encounter ? force_encounter : pickweightAllowZero(probabilities)]
if(planet.planet !=DYNAMIC_WORLD_ASTEROID && planet.planet != DYNAMIC_WORLD_SPACERUIN) //these aren't real planets
@@ -192,7 +192,7 @@
log_shuttle("[src] [REF(src)] LEVEL_INIT")
// use the ruin type in template if it exists, or pick from ruin list if IT exists; otherwise null
- var/selected_ruin = template || (ruin_type ? pick_weight_allow_zero(SSmapping.ruin_types_probabilities[ruin_type]) : null)
+ var/selected_ruin = template || (ruin_type ? pickweightAllowZero(SSmapping.ruin_types_probabilities[ruin_type]) : null)
var/list/dynamic_encounter_values = SSovermap.spawn_dynamic_encounter(src, selected_ruin)
if(!length(dynamic_encounter_values))
return FALSE
diff --git a/code/modules/overmap/objects/event_datum.dm b/code/modules/overmap/objects/event_datum.dm
index 19604ce53375..9381e8cae6d5 100644
--- a/code/modules/overmap/objects/event_datum.dm
+++ b/code/modules/overmap/objects/event_datum.dm
@@ -323,7 +323,7 @@
/datum/overmap/event/anomaly/affect_ship(datum/overmap/ship/controlled/S)
var/area/source_area = pick(S.shuttle_port.shuttle_areas)
var/source_object = pick(source_area.contents)
- new /obj/effect/spawner/random/anomaly/storm(get_turf(source_object))
+ new /obj/effect/spawner/lootdrop/anomaly/storm(get_turf(source_object))
for(var/mob/M as anything in GLOB.player_list)
if(S.shuttle_port.is_in_shuttle_bounds(M))
M.playsound_local(S.shuttle_port, 'sound/effects/bamf.ogg', 100)
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 35adab3cd4a3..b6fe4370d9c5 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -1517,9 +1517,9 @@
var/turf/open/floor/F = T
playsound(T, 'sound/effects/bubbles.ogg', 50)
F.PlaceOnTop(/turf/open/floor/grass, flags = CHANGETURF_INHERIT_AIR)
- new /obj/effect/spawner/random/flower(T)
+ new /obj/effect/spawner/lootdrop/flower(T)
if(prob(75))
- new /obj/effect/spawner/random/flora(T)
+ new /obj/effect/spawner/lootdrop/flora(T)
..()
/datum/reagent/genesis/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm
index 2cc0134cf8f6..c33b2c4558d3 100644
--- a/code/modules/research/designs/biogenerator_designs.dm
+++ b/code/modules/research/designs/biogenerator_designs.dm
@@ -199,7 +199,7 @@
id = "rngplant"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass= 2000)
- build_path = /obj/effect/spawner/random/food_or_drink/seed
+ build_path = /obj/effect/spawner/lootdrop/seeded
category = list("initial","LIFESEED_2.0")
/datum/design/genesis
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 62cd6f6bf8ef..64e5a0921b2b 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -200,7 +200,7 @@
use_power(750)
if(dotype != FAIL)
var/list/nodes = techweb_item_boost_check(process)
- var/picked = pick_weight(nodes) //This should work.
+ var/picked = pickweight(nodes) //This should work.
if(linked_console)
linked_console.stored_research.boost_with_path(SSresearch.techweb_node_by_id(picked), process.type)
updateUsrDialog()
@@ -292,7 +292,7 @@
else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
var/savedName = "[exp_on]"
ejectItem(TRUE)
- var/newPath = text2path(pick_weight(valid_items))
+ var/newPath = text2path(pickweight(valid_items))
loaded_item = new newPath(src)
visible_message("[src] malfunctions, transforming [savedName] into [loaded_item]!")
investigate_log("Experimentor has transformed [savedName] into [loaded_item]", INVESTIGATE_EXPERIMENTOR)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 5b6e6239f6a7..1a5ad3d0d35f 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -5,9 +5,9 @@
//NORTH default dir
/obj/docking_port
- invisibility = INVISIBILITY_OBSERVER
- icon = 'icons/effects/mapping/docking_ports.dmi'
- icon_state = "static"
+ invisibility = INVISIBILITY_ABSTRACT
+ icon = 'icons/obj/device.dmi'
+ icon_state = "pinonfar"
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | LANDING_PROOF | HYPERSPACE_PROOF
anchored = TRUE
@@ -272,7 +272,7 @@
/obj/docking_port/mobile
name = "shuttle"
- icon_state = "mobile"
+ icon_state = "pinonclose"
var/area_type = SHUTTLE_DEFAULT_SHUTTLE_AREA_TYPE
diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm
index 8592b02f2dae..a3fa70ce6209 100644
--- a/code/modules/vending/cola.dm
+++ b/code/modules/vending/cola.dm
@@ -31,6 +31,17 @@
machine_name = "RobustMore Softdrinks"
icon_state = "refill_cola"
+/obj/machinery/vending/cola/random
+ name = "\improper Random Drinkies"
+ icon_state = "random_cola"
+ desc = "Uh oh!"
+
+/obj/machinery/vending/cola/random/Initialize()
+ ..()
+ var/T = pick(subtypesof(/obj/machinery/vending/cola) - /obj/machinery/vending/cola/random)
+ new T(loc)
+ return INITIALIZE_HINT_QDEL
+
/obj/machinery/vending/cola/blue
icon_state = "Cola_Machine"
light_mask = "cola-light-mask"
diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm
index 7d5e13a5e5c0..cb9b6b1b9d95 100644
--- a/code/modules/vending/snack.dm
+++ b/code/modules/vending/snack.dm
@@ -26,6 +26,17 @@
/obj/item/vending_refill/snack
machine_name = "RobustMore DrinkFoods LLC"
+/obj/machinery/vending/snack/random
+ name = "\improper Random Snackies"
+ icon_state = "random_snack"
+ desc = "Uh oh!"
+
+/obj/machinery/vending/snack/random/Initialize()
+ ..()
+ var/T = pick(subtypesof(/obj/machinery/vending/snack) - /obj/machinery/vending/snack/random)
+ new T(loc)
+ return INITIALIZE_HINT_QDEL
+
/obj/machinery/vending/snack/blue
icon_state = "snackblue"
diff --git a/config/game_options.txt b/config/game_options.txt
index 005649a1480c..135123b845ad 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -593,8 +593,3 @@ BLUESPACE_JUMP_WAIT 12000
## If admins are allowed to use the authentication server as a regular server for testing
AUTH_ADMIN_TESTING
-
-# A config that skews with the random spawners weights
-# If the value is lower than 1, it'll tend to even out the odds
-# If higher than 1, it'll lean toward common spawns even more.
-RANDOM_LOOT_WEIGHT_MODIFIER 1
diff --git a/html/changelogs/archive/2019-03.yml b/html/changelogs/archive/2019-03.yml
index af4cd2063ffc..b5fd83b8ae4c 100644
--- a/html/changelogs/archive/2019-03.yml
+++ b/html/changelogs/archive/2019-03.yml
@@ -430,7 +430,7 @@
- bugfix: Rolling a 17 on the d20 of fate no longer gives you an empty box.
Basilman:
- bugfix: fixed runtime from selectin missing bodypart due to ran_zone
- - code_imp: changed how ran_zone selects a zone from a switch to pick_weight
+ - code_imp: changed how ran_zone selects a zone from a switch to pickweight
Kierany9:
- bugfix: Added a 15 second grace period after death to prevent people from avoiding
a hivemind host's Reclaim by succumbing.
diff --git a/icons/effects/landmarks_static.dmi b/icons/effects/landmarks_static.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..05301f14a8313341677a74718c2b6d9df943f61d
GIT binary patch
literal 19814
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%0Dt$x8%$wY}
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
diff --git a/icons/effects/mapping/landmarks_static.dmi b/icons/effects/mapping/landmarks_static.dmi
deleted file mode 100644
index 3e51e3f9a6e504f98bf87b4fb1a3121726ec3076..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 19106
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