diff --git a/_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm b/_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm
index 1aca7e66e15c..f48679d3a868 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm
@@ -2737,8 +2737,8 @@
/obj/item/spacecash/bundle/c1000,
/obj/item/spacecash/bundle/c1000,
/obj/item/gun/ballistic/automatic/marksman/vickland,
-/obj/item/ammo_box/vickland_a308/empty,
-/obj/item/ammo_box/vickland_a308/empty,
+/obj/item/storage/box/ammo/vickland_a308/empty,
+/obj/item/storage/box/ammo/vickland_a308/empty,
/turf/open/floor/wood/mahogany,
/area/ruin/powered/icemoon/lodge/montagne_office)
"Oa" = (
diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
index e4199f6282b6..de6005c0e366 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -1340,7 +1340,7 @@
/obj/structure/cable{
icon_state = "1-8"
},
-/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/neutered,
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/internals/neutered,
/turf/open/floor/plasteel/patterned/brushed,
/area/ruin/jungle/cavecrew/security)
"pB" = (
diff --git a/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm b/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
index 2e7e1e63bf1c..18f5be7e1c74 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
@@ -3171,7 +3171,7 @@
"VL" = (
/obj/structure/closet/cabinet,
/obj/item/hatchet/wooden,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
/obj/item/gun/ballistic/revolver/viper,
/turf/open/floor/wood,
/area/ship/bridge)
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm b/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
index 779d6da2e3c6..9863d5913d09 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
@@ -1243,7 +1243,7 @@
pixel_x = 6;
pixel_y = 5
},
-/obj/item/ammo_box/a357{
+/obj/item/storage/box/ammo/a357{
pixel_y = 6
},
/turf/open/floor/plasteel/dark,
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_SPOOKYCRASH.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_SPOOKYCRASH.dmm
index da7751618d04..8af11782c7fd 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_SPOOKYCRASH.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_SPOOKYCRASH.dmm
@@ -49,7 +49,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"m" = (
/obj/structure/table,
-/obj/item/soulstone/anybody,
+/obj/item/storage/belt/chameleon,
/obj/item/toy/plush/lizardplushie,
/obj/machinery/light/broken/directional/north,
/obj/structure/window/reinforced/spawner,
@@ -189,7 +189,7 @@
"O" = (
/obj/effect/mob_spawn/human/corpse/damaged,
/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/under/color/khaki/buster,
+/obj/item/clothing/glasses/welding/ghostbuster,
/obj/item/clothing/glasses/welding/ghostbuster,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/mineral/plastitanium/red,
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
index ed1febb808b2..da6979d140a8 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
@@ -618,11 +618,11 @@
pixel_y = 6;
start_empty = 1
},
-/obj/item/ammo_casing/c9mm,
-/obj/item/ammo_casing/c9mm,
-/obj/item/ammo_casing/c9mm,
-/obj/item/ammo_casing/c9mm,
-/obj/item/ammo_casing/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
/turf/open/floor/carpet,
/area/ruin/rockplanet/distillery/office)
"gM" = (
@@ -3069,7 +3069,7 @@
/obj/structure/closet/crate/secure/weapon{
name = "ammo crate"
},
-/obj/item/ammo_box/a357{
+/obj/item/storage/box/ammo/a357{
pixel_x = -3
},
/obj/item/ammo_box/magazine/illestren_a850r,
@@ -3081,7 +3081,7 @@
/obj/item/ammo_box/magazine/co9mm{
start_empty = 1
},
-/obj/item/ammo_box/a357{
+/obj/item/storage/box/ammo/a357{
pixel_x = 3
},
/obj/machinery/button/door{
diff --git a/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm b/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm
index c052a6f0cd04..2dd656b040d9 100644
--- a/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm
+++ b/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm
@@ -2167,7 +2167,7 @@
/obj/item/ammo_casing/c9mm/surplus{
pixel_x = 6
},
-/obj/item/ammo_casing/c9mm/surplus,
+/obj/item/storage/box/ammo/c9mm_surplus,
/obj/item/ammo_casing/c9mm/surplus{
pixel_x = 3;
pixel_y = 5
diff --git a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_ancient_ruin.dmm b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
index 41bac1cf5f06..158fefb033c3 100644
--- a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
+++ b/_maps/_mod_celadon/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/lootdrop/garden/seaweed,
+/obj/effect/spawner/random/food_or_drink/garden/seaweed,
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
"so" = (
diff --git a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_colony.dmm b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_colony.dmm
index 6fab2d2bf55d..b200aa57e92f 100644
--- a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_colony.dmm
+++ b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_colony.dmm
@@ -540,7 +540,7 @@
/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
"Xo" = (
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
"Xr" = (
diff --git a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_engineer.dmm b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_engineer.dmm
index 6cbb2b065c86..5363be4db0e0 100644
--- a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_engineer.dmm
+++ b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_engineer.dmm
@@ -17,7 +17,7 @@
},
/area/ruin/unpowered)
"bp" = (
-/turf/open/floor/plating/beach/sand,
+/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
"bv" = (
/obj/machinery/power/smes/shuttle/precharged{
@@ -41,7 +41,7 @@
/mob/living/simple_animal/crab{
name = "\improper Crab"
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -158,7 +158,7 @@
/mob/living/simple_animal/hostile/abandoned_minebot{
name = "\improper Abandoned Tony"
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -231,7 +231,7 @@
/area/ruin/unpowered)
"kH" = (
/obj/item/book/manual/wiki/construction,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -246,7 +246,7 @@
/turf/open/floor/plating/rust,
/area/ruin/unpowered)
"kP" = (
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/ruin/unpowered)
@@ -258,7 +258,7 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"lk" = (
/mob/living/simple_animal/hostile/asteroid/lobstrosity/beach,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -397,7 +397,7 @@
/obj/structure/cable{
icon_state = "6-9"
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -410,7 +410,7 @@
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 10
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -433,13 +433,13 @@
/obj/structure/cable{
icon_state = "4-10"
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"sv" = (
/obj/machinery/atmospherics/components/binary/valve,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -454,7 +454,7 @@
/area/ruin/unpowered)
"sB" = (
/obj/item/book/manual/wiki/engineering,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -475,7 +475,7 @@
/obj/structure/cable{
icon_state = "0-5"
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -501,7 +501,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -511,7 +511,7 @@
/turf/open/floor/plating/rust,
/area/ruin/unpowered)
"vO" = (
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
icon_state = "sand_dug";
light_range = 2
},
@@ -539,7 +539,7 @@
"xV" = (
/obj/effect/decal/cleanable/glass,
/obj/item/shard,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -563,7 +563,7 @@
/obj/effect/turf_decal/weather/sand{
dir = 5
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -602,7 +602,7 @@
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"Ae" = (
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -616,7 +616,7 @@
/obj/structure/cable{
icon_state = "4-9"
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -624,7 +624,7 @@
/obj/structure/cable{
icon_state = "5-10"
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -685,7 +685,7 @@
/obj/structure/cable{
icon_state = "1-10"
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -696,7 +696,7 @@
/area/ruin/unpowered)
"DB" = (
/obj/item/stack/cable_coil/red,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -707,13 +707,13 @@
/obj/structure/cable{
icon_state = "0-9"
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"DO" = (
/obj/structure/flora/tree/palm,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -767,7 +767,7 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"Gj" = (
/obj/effect/decal/cleanable/glass,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -796,7 +796,7 @@
/obj/structure/cable{
icon_state = "0-6"
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -817,7 +817,7 @@
"Ir" = (
/obj/item/shovel,
/obj/item/stack/ore/glass/beach,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
icon_state = "sand_dug";
light_range = 2
},
@@ -905,7 +905,7 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"LI" = (
/obj/structure/flora/rock,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -920,7 +920,7 @@
/area/ruin/unpowered)
"Na" = (
/obj/item/pickaxe/improvised,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -950,7 +950,7 @@
/area/ruin/unpowered)
"Ot" = (
/obj/item/geiger_counter,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -1014,7 +1014,7 @@
/obj/structure/cable{
icon_state = "6-8"
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/ruin/unpowered)
@@ -1057,7 +1057,7 @@
/area/ruin/unpowered)
"Sl" = (
/obj/structure/radioactive/stack,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -1072,7 +1072,7 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"SE" = (
/obj/structure/barricade/wooden,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/ruin/unpowered)
@@ -1101,7 +1101,7 @@
/obj/structure/cable{
icon_state = "5-8"
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -1122,7 +1122,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -1135,7 +1135,7 @@
"TI" = (
/obj/structure/radioactive/waste,
/obj/effect/decal/cleanable/greenglow,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -1181,7 +1181,7 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"Wg" = (
/obj/structure/flora/ausbushes/sparsegrass,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -1246,7 +1246,7 @@
/obj/structure/cable{
icon_state = "0-10"
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
@@ -1277,7 +1277,7 @@
/obj/structure/cable{
icon_state = "1-10"
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/overmap_encounter/planetoid/beachplanet/explored)
diff --git a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
index a9508748cf01..ac44b94100f1 100644
--- a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
+++ b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
@@ -100,7 +100,7 @@
req_one_access_txt = "1"
},
/obj/item/storage/box/slugshot,
-/obj/item/ammo_box/c38,
+/obj/item/storage/box/ammo/c38,
/obj/structure/spacevine,
/turf/open/floor/mineral/plastitanium,
/area/ruin/beach/oceantown/house{
@@ -2341,7 +2341,7 @@
/turf/open/floor/engine/hull/interior,
/area/overmap_encounter/planetoid/beachplanet/explored)
"Hl" = (
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/contraband/random{
pixel_y = -32
@@ -2779,7 +2779,7 @@
name = "Starwalker"
})
"Mk" = (
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/light,
@@ -2820,7 +2820,7 @@
pixel_x = -26
},
/obj/structure/spider/stickyweb,
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/turf/open/floor/pod/light,
/area/ruin/beach/oceantown/house{
name = "Starwalker"
@@ -2858,7 +2858,7 @@
name = "Starwalker"
})
"MX" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/structure/railing{
dir = 4
},
@@ -2899,7 +2899,7 @@
icon_state = "gib3-old";
pixel_x = -6
},
-/obj/item/melee/transforming/energy/sword/saber/pirate/yellow{
+/obj/item/melee/energy/sword/saber/pirate/yellow{
pixel_x = -5;
pixel_y = 16
},
diff --git a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_fishing_hut.dmm b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_fishing_hut.dmm
index 59d1b19f9c7a..dc930e0749a8 100644
--- a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_fishing_hut.dmm
+++ b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_fishing_hut.dmm
@@ -275,7 +275,7 @@
/turf/open/floor/plating/asteroid/sand,
/area/overmap_encounter/planetoid/cave/explored)
"mq" = (
-/obj/item/ammo_box/c38_box,
+/obj/item/storage/box/ammo/c38,
/obj/structure/closet/crate/wooden,
/turf/open/floor/wood,
/area/ruin/beach)
diff --git a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_float_resort.dmm b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_float_resort.dmm
index b2c39404d641..653f927cdace 100644
--- a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_float_resort.dmm
+++ b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_float_resort.dmm
@@ -57,7 +57,7 @@
layer = 2.01
},
/turf/open/floor/carpet/cyan{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"ca" = (
@@ -343,7 +343,7 @@
layer = 2.01
},
/turf/open/floor/carpet/orange{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"jQ" = (
@@ -548,7 +548,7 @@
pixel_y = 13
},
/turf/open/floor/carpet/blue{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"pr" = (
@@ -825,7 +825,7 @@
dir = 1
},
/obj/item/candle,
-/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/random/food_or_drink/donut,
/turf/open/floor/wood{
light_range = 2
},
@@ -1396,7 +1396,7 @@
layer = 2.01
},
/turf/open/floor/carpet/blue{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"Kv" = (
@@ -1548,7 +1548,7 @@
layer = 2.01
},
/turf/open/floor/carpet/cyan{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"NU" = (
@@ -1560,7 +1560,7 @@
layer = 2.01
},
/turf/open/floor/carpet/orange{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"NV" = (
diff --git a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_ocean_town.dmm
index d1a3ff05cf04..6628683b7246 100644
--- a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_ocean_town.dmm
+++ b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_ocean_town.dmm
@@ -113,7 +113,7 @@
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"bs" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"bu" = (
@@ -275,7 +275,7 @@
layer = 2.01
},
/turf/open/floor/carpet/cyan{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"dT" = (
@@ -412,9 +412,9 @@
/area/ruin/beach/oceantown)
"fn" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/donut/slimejelly,
-/obj/effect/spawner/lootdrop/donut,
-/obj/effect/spawner/lootdrop/donut,
+/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,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"fp" = (
@@ -618,7 +618,7 @@
layer = 2.01
},
/turf/open/floor/carpet/orange{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"hG" = (
@@ -711,8 +711,8 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"ix" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/donut/slimejelly,
-/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
+/obj/effect/spawner/random/food_or_drink/donut,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"iz" = (
@@ -953,7 +953,7 @@
layer = 2.01
},
/turf/open/floor/carpet/blue{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"mc" = (
@@ -991,7 +991,7 @@
layer = 2.01
},
/turf/open/floor/carpet/orange{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"mt" = (
@@ -1132,7 +1132,7 @@
layer = 2.01
},
/turf/open/floor/carpet/cyan{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"oF" = (
@@ -1346,7 +1346,7 @@
layer = 2.01
},
/turf/open/floor/carpet/cyan{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"rN" = (
@@ -1560,11 +1560,11 @@
/area/ruin/beach/oceantown/bar)
"un" = (
/obj/structure/rack,
-/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,
+/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,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"ur" = (
@@ -1683,7 +1683,7 @@
layer = 2.01
},
/turf/open/floor/carpet/orange{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"wu" = (
@@ -1699,7 +1699,7 @@
/turf/open/floor/plasteel,
/area/ruin/beach/oceantown/shop)
"ww" = (
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
"wF" = (
@@ -1917,7 +1917,7 @@
layer = 2.01
},
/turf/open/floor/carpet/orange{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"yQ" = (
@@ -2270,7 +2270,7 @@
layer = 2.01
},
/turf/open/floor/carpet/cyan{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"De" = (
@@ -2408,7 +2408,7 @@
layer = 2.01
},
/turf/open/floor/carpet/purple{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"Eu" = (
@@ -3052,7 +3052,7 @@
layer = 2.01
},
/turf/open/floor/carpet/cyan{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"KD" = (
@@ -3171,7 +3171,7 @@
layer = 2.01
},
/turf/open/floor/carpet/blue{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"LR" = (
@@ -3371,8 +3371,8 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"NX" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/donut/jelly,
-/obj/effect/spawner/lootdrop/donut/jelly,
+/obj/effect/spawner/random/food_or_drink/donut/jelly,
+/obj/effect/spawner/random/food_or_drink/donut/jelly,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"Oe" = (
@@ -3448,7 +3448,7 @@
desc = "100% pure cotton!"
},
/turf/open/floor/carpet/blue{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"OR" = (
@@ -3519,7 +3519,7 @@
layer = 2.01
},
/turf/open/floor/carpet/purple{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"Pv" = (
@@ -3545,7 +3545,7 @@
/area/ruin/beach/oceantown)
"PF" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/donut/slimejelly,
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"PH" = (
@@ -3573,7 +3573,7 @@
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
"Qf" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"Qm" = (
@@ -3737,10 +3737,10 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"SS" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/donut,
-/obj/effect/spawner/lootdrop/donut,
-/obj/effect/spawner/lootdrop/donut/slimejelly,
-/obj/effect/spawner/lootdrop/donut/jelly,
+/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,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"SY" = (
@@ -3859,7 +3859,7 @@
layer = 2.01
},
/turf/open/floor/carpet/cyan{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"UH" = (
@@ -3949,9 +3949,9 @@
/area/ruin/beach/oceantown/shop)
"VQ" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/donut/jelly,
-/obj/effect/spawner/lootdrop/donut/jelly,
-/obj/effect/spawner/lootdrop/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/jelly,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"VS" = (
@@ -4116,11 +4116,11 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"XQ" = (
/obj/structure/rack,
-/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,
+/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,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/beach/oceantown/shop)
"XS" = (
diff --git a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_pirate_crash.dmm b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_pirate_crash.dmm
index 67ac69292603..fddfa5bdc00f 100644
--- a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_pirate_crash.dmm
+++ b/_maps/_mod_celadon/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/lootdrop/maintenance/two,
+/obj/effect/spawner/random/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/lootdrop/maintenance/two,
+/obj/effect/spawner/random/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/lootdrop/random_machine_circuit_rare,
-/obj/effect/spawner/lootdrop/maintenance/four,
-/obj/effect/spawner/lootdrop/random_machine_circuit_common,
+/obj/effect/spawner/random/circuit/machine/rare,
+/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/random/circuit/machine/common,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating/rust,
diff --git a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_treasure_cove.dmm
index bcbcf9510bf4..d353ab2e21b6 100644
--- a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_treasure_cove.dmm
+++ b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_treasure_cove.dmm
@@ -20,7 +20,7 @@
/area/ruin/beach/treasure_cove)
"ay" = (
/obj/structure/flora/tree/palm,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/ruin/unpowered)
@@ -35,7 +35,7 @@
"bI" = (
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/machinery/light/small/directional/north,
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/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/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/turf/open/floor/plating/dirt/jungle,
/area/ruin/unpowered)
"cJ" = (
@@ -194,7 +194,7 @@
/area/ruin/beach/treasure_cove)
"ht" = (
/obj/effect/overlay/palmtree_r,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/ruin/unpowered)
@@ -207,7 +207,7 @@
/turf/open/floor/concrete/slab_1,
/area/ruin/beach/treasure_cove)
"hS" = (
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/ruin/unpowered)
@@ -297,7 +297,7 @@
/area/ruin/unpowered)
"kl" = (
/obj/effect/overlay/palmtree_l,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/ruin/unpowered)
@@ -390,7 +390,7 @@
pixel_x = 9;
pixel_y = -1
},
-/obj/item/gun/ballistic/automatic/assault/p16{
+/obj/item/gun/ballistic/automatic/assault/cm82{
pixel_x = -9;
pixel_y = 7
},
@@ -540,7 +540,7 @@
pixel_x = -10;
pixel_y = 4
},
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/turf/open/floor/wood,
/area/ruin/beach/treasure_cove)
"rA" = (
@@ -663,11 +663,11 @@
/obj/structure/table/reinforced{
color = "#c1b6a5"
},
-/obj/item/ammo_box/c38_box{
+/obj/item/storage/box/ammo/c38{
pixel_x = 10;
pixel_y = 8
},
-/obj/item/ammo_box/c38_box{
+/obj/item/storage/box/ammo/c38{
pixel_x = 10
},
/obj/structure/sign/poster/contraband/energy_swords{
@@ -1103,7 +1103,7 @@
pixel_x = -6;
pixel_y = 10
},
-/obj/item/melee/transforming/energy/sword/saber/pirate/red{
+/obj/item/melee/energy/sword/saber/pirate/red{
pixel_y = 8;
pixel_x = 10
},
@@ -1440,7 +1440,7 @@
/area/ruin/beach/treasure_cove)
"WX" = (
/mob/living/simple_animal/crab,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/ruin/unpowered)
diff --git a/_maps/_mod_celadon/RandomRuins/EarthSandRuins/el_town.dmm b/_maps/_mod_celadon/RandomRuins/EarthSandRuins/el_town.dmm
index 255a17595940..ae92d7aa92b1 100644
--- a/_maps/_mod_celadon/RandomRuins/EarthSandRuins/el_town.dmm
+++ b/_maps/_mod_celadon/RandomRuins/EarthSandRuins/el_town.dmm
@@ -156,8 +156,8 @@
})
"aY" = (
/obj/effect/turf_decal/sand/plating,
-/obj/item/ammo_box/a762_40,
-/obj/item/ammo_box/a762_40{
+/obj/item/storage/box/ammo/a762_40,
+/obj/item/storage/box/ammo/a762_40{
pixel_x = 4;
pixel_y = 9
},
@@ -1190,11 +1190,11 @@
})
"iA" = (
/obj/structure/table/wood,
-/obj/item/ammo_box/a762_40{
+/obj/item/storage/box/ammo/a762_40{
pixel_x = -5;
pixel_y = -3
},
-/obj/item/ammo_box/a762_40{
+/obj/item/storage/box/ammo/a762_40{
pixel_x = -5;
pixel_y = 7
},
@@ -1691,11 +1691,11 @@
})
"lR" = (
/obj/structure/table/wood,
-/obj/item/ammo_box/a762_40{
+/obj/item/storage/box/ammo/a762_40{
pixel_x = -5;
pixel_y = -3
},
-/obj/item/ammo_box/a762_40{
+/obj/item/storage/box/ammo/a762_40{
pixel_x = -5;
pixel_y = 7
},
@@ -2762,7 +2762,7 @@
},
/area/overmap_encounter/planetoid/earth_sand)
"us" = (
-/obj/item/ammo_box/a762_40{
+/obj/item/storage/box/ammo/a762_40{
pixel_x = 9;
pixel_y = -10
},
@@ -3035,7 +3035,7 @@
"wJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/wood,
-/obj/item/ammo_box/a762_40{
+/obj/item/storage/box/ammo/a762_40{
pixel_x = -5;
pixel_y = -3
},
@@ -5039,7 +5039,7 @@
name = "Elysium Town"
})
"Nz" = (
-/obj/item/ammo_box/a762_40{
+/obj/item/storage/box/ammo/a762_40{
pixel_x = -5;
pixel_y = 7
},
@@ -6046,7 +6046,7 @@
pixel_x = 4;
pixel_y = -6
},
-/obj/item/ammo_box/a762_40{
+/obj/item/storage/box/ammo/a762_40{
pixel_x = -5;
pixel_y = 7
},
diff --git a/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm b/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
index 707be4573d13..5d3160ba0c1b 100644
--- a/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
+++ b/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
@@ -674,7 +674,7 @@
/area/ruin/unpowered/crashed_holemaker)
"lt" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/crate_spawner,
+/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plating,
/area/ruin/unpowered/crashed_holemaker)
"lu" = (
@@ -743,7 +743,7 @@
},
/obj/item/radio/intercom/directional/north,
/obj/structure/closet/cabinet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered/crashed_holemaker)
@@ -1441,7 +1441,7 @@
/turf/open/floor/carpet,
/area/ruin/unpowered/crashed_holemaker)
"ze" = (
-/obj/effect/spawner/lootdrop/crate_spawner,
+/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plating,
/area/ruin/unpowered/crashed_holemaker)
"zh" = (
@@ -2389,7 +2389,7 @@
/turf/open/floor/plasteel/icemoon,
/area/ruin/unpowered/crashed_holemaker)
"RL" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/effect/turf_decal/spline/fancy/transparent/neutral/corner{
dir = 4
},
diff --git a/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_raided_cargobase.dmm b/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_raided_cargobase.dmm
index a98e2cd64686..2c2d69af174c 100644
--- a/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_raided_cargobase.dmm
+++ b/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_raided_cargobase.dmm
@@ -1040,7 +1040,7 @@
/area/ruin)
"Rk" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plasteel/tech/grid/airless,
/area/ruin)
"RX" = (
diff --git a/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm b/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
index 2fe945797efe..940d20723295 100644
--- a/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
+++ b/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
@@ -472,7 +472,7 @@
/turf/closed/mineral/snowmountain/icemoon,
/area/ruin/unpowered/corprejectrooms)
"lF" = (
-/obj/structure/mecha_wreckage/honker/dark,
+/obj/structure/mecha_wreckage/honker,
/obj/machinery/light/directional/east,
/turf/open/floor/mech_bay_recharge_floor,
/area/ruin/unpowered/corprejectengineering)
@@ -1339,7 +1339,7 @@
/area/ruin/unpowered/corprejectrooms)
"En" = (
/obj/structure/rack,
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto,
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq,
/turf/open/floor/vault,
/area/ruin/unpowered/corprejectvault)
"Er" = (
@@ -1704,7 +1704,7 @@
"Md" = (
/obj/structure/rack,
/obj/item/ammo_box/magazine/smgm9mm/ap,
-/obj/item/ammo_box/magazine/smgm9mm/inc,
+/obj/item/ammo_box/magazine/smgm9mm/rubber,
/obj/machinery/light/small/directional/east,
/turf/open/floor/vault,
/area/ruin/unpowered/corprejectvault)
diff --git a/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
index 6b2d11fd47b8..3eb16a5e27c7 100644
--- a/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
+++ b/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
@@ -407,7 +407,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/icemoon,
/area/ruin)
"bk" = (
@@ -486,7 +486,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/obj/structure/table/reinforced,
/obj/effect/turf_decal/corner/opaque/red/diagonal,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/white,
/area/ruin)
"bq" = (
@@ -853,7 +853,7 @@
dir = 8
},
/obj/effect/turf_decal/corner/transparent/neutral/full,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/icemoon,
/area/ruin)
"cf" = (
@@ -929,7 +929,7 @@
/obj/machinery/atmospherics/pipe/manifold4w/supply/visible,
/obj/machinery/meter/atmos/distro_loop,
/obj/effect/turf_decal/corner/transparent/neutral/full,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/icemoon,
/area/ruin)
"co" = (
@@ -1101,7 +1101,7 @@
/obj/item/rcd_ammo,
/obj/item/rcd_upgrade/frames,
/obj/effect/turf_decal/corner/transparent/neutral/half,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/dark{
initial_gas_mix = "ICEMOON_ATMOS"
},
@@ -1109,7 +1109,7 @@
"cK" = (
/obj/machinery/airalarm/directional/west,
/obj/structure/table/reinforced,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/obj/effect/turf_decal/corner/transparent/neutral/half{
dir = 4
},
@@ -1133,7 +1133,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
dir = 4
},
@@ -1412,7 +1412,7 @@
dir = 1
},
/obj/machinery/airalarm/directional/north,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/dark{
initial_gas_mix = "ICEMOON_ATMOS"
},
@@ -1660,7 +1660,7 @@
/obj/effect/turf_decal/trimline/opaque/yellow/filled/corner{
dir = 4
},
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/turf/open/floor/plasteel/icemoon,
/area/ruin)
"De" = (
@@ -1810,7 +1810,7 @@
dir = 4
},
/obj/structure/table/reinforced,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/white,
/area/ruin)
"RD" = (
diff --git a/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_underground_abandoned_newcops.dmm b/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_underground_abandoned_newcops.dmm
index 8f3f708e009d..6a24a7290c9c 100644
--- a/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_underground_abandoned_newcops.dmm
+++ b/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_underground_abandoned_newcops.dmm
@@ -145,7 +145,7 @@
dir = 1
},
/obj/structure/chair/stool,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel,
/area/ruin/powered)
"ha" = (
@@ -161,7 +161,7 @@
/area/ruin/powered)
"ij" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/wood{
icon_state = "wood-broken3"
},
@@ -184,18 +184,18 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ruin/powered)
"iR" = (
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/ruin/powered)
@@ -215,7 +215,7 @@
/turf/open/floor/plasteel,
/area/ruin/powered)
"jp" = (
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/structure/closet/syndicate,
/obj/item/flashlight/flare,
/obj/item/toy/crayon/spraycan,
@@ -238,7 +238,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ruin/powered)
"jX" = (
@@ -274,7 +274,7 @@
/turf/open/floor/wood,
/area/ruin/powered)
"kS" = (
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/structure/closet/syndicate,
/obj/item/megaphone/sec{
name = "syndicate megaphone"
@@ -290,7 +290,7 @@
/turf/open/floor/plating,
/area/ruin/powered)
"lw" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/ruin/powered)
@@ -310,11 +310,11 @@
pixel_y = 6
},
/obj/structure/table_frame/wood,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ruin/powered)
"mE" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ruin/powered)
"nm" = (
@@ -322,7 +322,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ruin/powered)
"ok" = (
@@ -351,13 +351,13 @@
/turf/open/floor/plasteel/freezer,
/area/ruin/powered)
"oU" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
"ps" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/wood,
/area/ruin/powered)
"pW" = (
@@ -400,7 +400,7 @@
/area/ruin/powered)
"so" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/wood{
icon_state = "wood-broken5"
},
@@ -411,7 +411,7 @@
dir = 1
},
/obj/effect/gibspawner/human,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/ruin/powered)
@@ -473,7 +473,7 @@
/area/ruin/powered)
"ux" = (
/obj/item/chair/stool,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
@@ -504,7 +504,7 @@
/area/ruin/powered)
"wO" = (
/obj/structure/closet/syndicate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/item/card/id/syndicate/anyone,
/turf/open/floor/plating,
/area/ruin/powered)
@@ -601,7 +601,7 @@
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ruin/powered)
"AW" = (
@@ -662,7 +662,7 @@
/area/ruin/powered)
"Di" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ruin/powered)
"Ds" = (
@@ -749,7 +749,7 @@
dir = 1
},
/obj/item/paper/fluff/stations/centcom/disk_memo,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/ruin/powered)
@@ -802,7 +802,7 @@
},
/obj/structure/closet/syndicate,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/powered)
"Kk" = (
@@ -811,7 +811,7 @@
},
/obj/structure/closet/syndicate,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/powered)
@@ -846,7 +846,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel,
/area/ruin/powered)
"Lh" = (
@@ -876,7 +876,7 @@
/area/ruin/powered)
"LL" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
"LP" = (
@@ -1071,7 +1071,7 @@
"WW" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/wood,
/area/ruin/powered)
"WY" = (
@@ -1123,11 +1123,11 @@
"Zc" = (
/obj/structure/closet/cardboard,
/obj/effect/turf_decal/industrial/warning/corner,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ruin/powered)
"Zk" = (
diff --git a/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
index 29710e094f64..5429cfd943bc 100644
--- a/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
+++ b/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -383,7 +383,7 @@
"EF" = (
/obj/effect/decal/cleanable/blood/gibs/torso,
/obj/structure/safe,
-/obj/item/ammo_box/a12g/slug,
+/obj/item/storage/box/ammo/a12g_slug,
/obj/item/melee/knife/combat,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -477,7 +477,7 @@
/turf/open/floor/carpet,
/area/ruin/powered)
"Pp" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/holofloor/wood,
/area/ruin/powered)
"PQ" = (
diff --git a/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm b/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm
index 4783db9b0132..35086e169c85 100644
--- a/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm
+++ b/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm
@@ -495,7 +495,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"xN" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/ruin/unpowered)
"xQ" = (
@@ -1045,7 +1045,7 @@
/obj/structure/rack,
/obj/item/hatchet,
/obj/item/hatchet,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/ruin/unpowered)
"Ul" = (
@@ -1103,7 +1103,7 @@
/obj/item/ammo_casing/shotgun/improvised,
/obj/item/ammo_casing/shotgun/improvised,
/obj/item/ammo_casing/shotgun/improvised,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/ruin/unpowered)
"WH" = (
@@ -1198,7 +1198,7 @@
"Yx" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/rack_parts,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/wood{
icon_state = "wood-broken3";
initial_gas_mix = "ICEMOON_ATMOS"
diff --git a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
index ee572a5408db..c0dd5fd964a1 100644
--- a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
+++ b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
@@ -811,10 +811,10 @@
/area/overmap_encounter/planetoid/jungle/explored)
"fJ" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/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,
/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/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/turf/open/floor/plasteel/grimy,
/area/ruin/jungle/starport)
"sN" = (
diff --git a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_cavecrew.dmm
index 063922d0d88e..84b0810597a2 100644
--- a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_cavecrew.dmm
+++ b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -192,7 +192,7 @@
/area/overmap_encounter/planetoid/jungle/explored)
"bU" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/obj/machinery/light_switch{
pixel_y = 21;
pixel_x = -10
@@ -1026,14 +1026,14 @@
pixel_y = 32
},
/obj/structure/closet/secure_closet/freezer/wall/directional/west,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
+/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/item/reagent_containers/condiment/enzyme{
pixel_x = -8;
pixel_y = 5
@@ -1342,7 +1342,7 @@
/obj/structure/cable{
icon_state = "1-8"
},
-/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/neutered,
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/internals/neutered,
/turf/open/floor/plasteel/patterned/brushed,
/area/ruin/jungle/cavecrew/security)
"pB" = (
@@ -1754,9 +1754,9 @@
pixel_y = -5
},
/obj/item/ammo_casing/a4570,
-/obj/item/ammo_box/magazine/skm_545_39,
-/obj/item/ammo_box/magazine/skm_545_39,
-/obj/item/ammo_box/magazine/skm_545_39,
+/obj/item/ammo_box/magazine/skm_762_40,
+/obj/item/ammo_box/magazine/skm_762_40,
+/obj/item/ammo_box/magazine/skm_762_40,
/obj/item/ammo_box/magazine/illestren_a850r,
/obj/item/ammo_box/magazine/illestren_a850r,
/turf/open/floor/plasteel/tech,
@@ -2416,7 +2416,7 @@
pixel_y = -8;
pixel_x = 5
},
-/obj/item/melee/transforming/energy/sword/saber/pirate/red,
+/obj/item/melee/energy/sword/saber/pirate/red,
/turf/open/floor/wood,
/area/ruin/jungle/cavecrew/dormitories)
"Dh" = (
@@ -3934,9 +3934,9 @@
/obj/item/clothing/under/frontiersmen,
/obj/item/clothing/under/frontiersmen,
/obj/item/clothing/under/frontiersmen,
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier,
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier,
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier,
+/obj/item/clothing/suit/armor/vest/frontier,
+/obj/item/clothing/suit/armor/vest/frontier,
+/obj/item/clothing/suit/armor/vest/frontier,
/obj/item/clothing/head/helmet/bulletproof/x11/frontier,
/obj/item/clothing/head/helmet/bulletproof/x11/frontier,
/obj/item/clothing/head/helmet/bulletproof/x11/frontier,
@@ -4082,7 +4082,7 @@
"WQ" = (
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/structure/closet/crate/secure/loot,
-/obj/item/storage/box/inteqmaid{
+/obj/item/storage/box/maid{
pixel_x = -5;
pixel_y = 3
},
diff --git a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_interceptor.dmm b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_interceptor.dmm
index aab9b566f78e..4d17f130e1ae 100644
--- a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_interceptor.dmm
+++ b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_interceptor.dmm
@@ -1090,7 +1090,7 @@
/obj/item/radio,
/obj/item/radio,
/obj/item/clothing/under/color/jumpskirt/darkblue,
-/obj/item/clothing/under/dress/skirt/blue,
+/obj/item/clothing/under/dress/skirt/color/blue,
/obj/effect/turf_decal/corner/opaque/black{
icon_state = "siding_line";
dir = 10
@@ -1516,7 +1516,7 @@
},
/obj/item/radio,
/obj/item/radio,
-/obj/item/clothing/under/dress/skirt/blue,
+/obj/item/clothing/under/dress/skirt/color/blue,
/obj/item/clothing/under/color/darkblue,
/obj/effect/turf_decal/corner/opaque/black{
icon_state = "siding_line";
@@ -3050,7 +3050,7 @@
/obj/item/clothing/under/rank/security/officer/blueshirt,
/obj/item/clothing/gloves/combat,
/obj/item/clothing/shoes/jackboots,
-/obj/item/ammo_box/c9mm,
+/obj/item/storage/box/ammo/c9mm,
/obj/machinery/light/small/broken/directional/north,
/obj/effect/turf_decal/corner/transparent/bar/three_quarters{
dir = 4
diff --git a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
index 668373301734..35691370fa84 100644
--- a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
+++ b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
@@ -956,7 +956,7 @@
pixel_y = 11
},
/obj/effect/gibspawner/human,
-/obj/item/ammo_box/magazine/skm_545_39,
+/obj/item/ammo_box/magazine/skm_762_40,
/turf/open/floor/plasteel/tech,
/area/ship/science)
"oJ" = (
@@ -2108,7 +2108,7 @@
/obj/effect/turf_decal/corner/opaque/mauve{
dir = 1
},
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
"Ie" = (
@@ -2441,7 +2441,7 @@
"MB" = (
/obj/structure/flora/ausbushes/sparsegrass,
/obj/effect/decal/cleanable/blood/splatter,
-/obj/item/weldingtool/experimental,
+/obj/item/weldingtool/electric,
/turf/open/floor/grass,
/area/overmap_encounter/planetoid/jungle/explored)
"MF" = (
@@ -3172,7 +3172,7 @@
"VL" = (
/obj/structure/closet/cabinet,
/obj/item/hatchet/wooden,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
/obj/item/gun/ballistic/revolver/viper,
/turf/open/floor/wood,
/area/ship/bridge)
diff --git a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_nest.dmm b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_nest.dmm
index 5ceab6d0e390..5b8b0d811122 100644
--- a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_nest.dmm
+++ b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_nest.dmm
@@ -273,7 +273,7 @@
"EC" = (
/obj/structure/alien/weeds,
/obj/structure/bed/nest,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating/dirt,
/area/overmap_encounter/planetoid/cave/explored)
"Fe" = (
diff --git a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_paradise.dmm b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_paradise.dmm
index ebeeb97af193..cdb5715d3a94 100644
--- a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_paradise.dmm
+++ b/_maps/_mod_celadon/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/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/turf/open/floor/plating/dirt/jungle/dark,
/area/overmap_encounter/planetoid/cave/explored)
"el" = (
@@ -4344,11 +4344,11 @@
/obj/effect/turf_decal/techfloor/corner{
dir = 1
},
-/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,
+/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,
/turf/open/floor/plasteel/tech/grid,
/area/ruin/jungle/paradise/cargo)
"AT" = (
@@ -5762,9 +5762,9 @@
/obj/structure/cable/yellow{
icon_state = "1-6"
},
-/obj/effect/spawner/lootdrop/three_course_meal,
-/obj/effect/spawner/lootdrop/three_course_meal,
-/obj/effect/spawner/lootdrop/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/random/food_or_drink/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,
@@ -7409,7 +7409,7 @@
},
/area/overmap_encounter/planetoid/cave/explored)
"VV" = (
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/turf/open/floor/plating/dirt/jungle,
/area/overmap_encounter/planetoid/cave/explored)
"VW" = (
diff --git a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_pirate.dmm b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_pirate.dmm
index a9c3820aff97..beef2743aa66 100644
--- a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_pirate.dmm
+++ b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_pirate.dmm
@@ -49,12 +49,12 @@
/turf/open/floor/wood,
/area/ruin/unpowered)
"iw" = (
-/obj/item/ammo_box/c45,
+/obj/item/storage/box/ammo/c45,
/obj/structure/table/wood/poker,
/turf/open/floor/wood,
/area/ruin/unpowered)
"iC" = (
-/obj/item/ammo_box/c9mm,
+/obj/item/storage/box/ammo/c9mm,
/obj/structure/table/wood/poker,
/mob/living/simple_animal/hostile/human/pirate/melee,
/turf/open/floor/wood,
@@ -386,7 +386,7 @@
/area/ruin/unpowered)
"Xt" = (
/obj/structure/table/wood/poker,
-/obj/item/melee/transforming/energy/sword/saber/pirate,
+/obj/item/melee/energy/sword/saber/pirate,
/turf/open/floor/carpet/red,
/area/ruin/unpowered)
"XA" = (
diff --git a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_pizzawave.dmm b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_pizzawave.dmm
index e4dee4cec868..e2de1e245569 100644
--- a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_pizzawave.dmm
+++ b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_pizzawave.dmm
@@ -13,7 +13,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"d" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/memeorgans,
+/obj/effect/spawner/random/medical/memeorgans,
/turf/open/floor/grass,
/area/overmap_encounter/planetoid/cave/explored)
"e" = (
@@ -160,7 +160,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"N" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
+/obj/effect/spawner/random/clothing/kittyears_or_rabbitears,
/turf/open/floor/grass,
/area/overmap_encounter/planetoid/cave/explored)
"O" = (
diff --git a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_surface_coffinpirate.dmm b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_surface_coffinpirate.dmm
index b4d280ba7a17..18c6a20db2ea 100644
--- a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_surface_coffinpirate.dmm
+++ b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_surface_coffinpirate.dmm
@@ -159,7 +159,7 @@
/area/ruin/unpowered)
"I" = (
/obj/structure/table/wood,
-/obj/item/melee/transforming/energy/sword/saber/pirate{
+/obj/item/melee/energy/sword/saber/pirate{
pixel_x = 2;
pixel_y = 3
},
diff --git a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_surface_roommates.dmm b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_surface_roommates.dmm
index 38087a6a32e4..9806d2880b4a 100644
--- a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_surface_roommates.dmm
+++ b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_surface_roommates.dmm
@@ -89,7 +89,7 @@
/obj/item/melee/sword/claymore{
pixel_x = 5
},
-/obj/item/clothing/head/peaceflower{
+/obj/item/clothing/head/plastic_flower{
desc = "An extremely addictive flower, full of lesbian magic."
},
/obj/effect/turf_decal/corner/opaque/blue,
diff --git a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_syndicate.dmm b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_syndicate.dmm
index 2eba13537777..60d24171ad0f 100644
--- a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_syndicate.dmm
+++ b/_maps/_mod_celadon/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/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/turf/open/floor/plating,
/area/ruin/jungle/syndifort)
"ve" = (
diff --git a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_crashed_heron.dmm b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_crashed_heron.dmm
index d963eb303b65..1f7ec30266fd 100644
--- a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_crashed_heron.dmm
+++ b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_crashed_heron.dmm
@@ -2013,7 +2013,7 @@
pixel_x = -8;
pixel_y = 5
},
-/obj/item/weldingtool/experimental{
+/obj/item/weldingtool/electric{
pixel_x = 7;
pixel_y = 4
},
@@ -8108,13 +8108,13 @@
"and" = (
/obj/structure/window/reinforced/spawner,
/obj/structure/rack,
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq{
pixel_y = 3
},
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq{
pixel_y = -2
},
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq{
pixel_y = -7
},
/obj/item/attachment/foldable_stock,
@@ -8213,19 +8213,19 @@
pixel_x = 5;
pixel_y = 4
},
-/obj/item/ammo_box/c9mm{
+/obj/item/storage/box/ammo/c9mm{
pixel_x = 4;
pixel_y = -6
},
-/obj/item/ammo_box/c9mm{
+/obj/item/storage/box/ammo/c9mm{
pixel_x = 4;
pixel_y = 1
},
-/obj/item/ammo_box/c9mm{
+/obj/item/storage/box/ammo/c9mm{
pixel_x = 4;
pixel_y = 9
},
-/obj/item/ammo_box/c9mm/ap{
+/obj/item/storage/box/ammo/c9mm_ap{
pixel_x = 4;
pixel_y = 17
},
@@ -14617,9 +14617,9 @@
/obj/item/clothing/suit/armor/vest/marine/heavy,
/obj/item/clothing/suit/armor/vest/marine/medium,
/obj/item/clothing/suit/armor/vest/marine/medium,
-/obj/item/clothing/head/helmet/marine/security,
-/obj/item/clothing/head/helmet/marine,
-/obj/item/clothing/head/helmet/marine,
+/obj/item/clothing/head/helmet/gezena,
+/obj/item/clothing/head/helmet/gezena,
+/obj/item/clothing/head/helmet/gezena,
/obj/item/clothing/suit/armor/vest/bulletproof,
/obj/item/clothing/suit/armor/vest/bulletproof,
/obj/item/clothing/head/helmet/plate,
diff --git a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
index cb0b752cd930..ab4b6d8b356b 100644
--- a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
+++ b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
@@ -92,7 +92,7 @@
name = "armory locker";
req_one_access_txt = "1"
},
-/obj/item/ammo_box/a12g,
+/obj/item/storage/box/ammo/a12g_buckshot,
/turf/open/floor/mineral/plastitanium,
/area/ruin/unpowered/crashed_starwalker)
"bL" = (
@@ -940,7 +940,7 @@
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/closet/crate/secure/gear,
-/obj/item/ammo_box/c10mm/surplus,
+/obj/item/storage/box/ammo/c10mm_surplus,
/obj/item/weaponcrafting/stock,
/obj/item/weaponcrafting/stock{
pixel_x = -6
@@ -1241,7 +1241,7 @@
pixel_x = 6;
pixel_y = 5
},
-/obj/item/ammo_box/a357{
+/obj/item/storage/box/ammo/a357{
pixel_y = 6
},
/turf/open/floor/plasteel/dark,
@@ -2001,7 +2001,7 @@
req_one_access_txt = "1"
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier,
+/obj/item/clothing/suit/armor/vest/frontier,
/obj/item/clothing/head/helmet/bulletproof/x11/frontier{
pixel_y = 6
},
@@ -2022,7 +2022,7 @@
/turf/open/floor/engine/hull/interior,
/area/overmap_encounter/planetoid/lava/explored)
"Hl" = (
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/contraband/random{
pixel_y = -32
@@ -2378,7 +2378,7 @@
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered/crashed_starwalker)
"Mk" = (
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/light,
@@ -2415,7 +2415,7 @@
pixel_x = -26
},
/obj/structure/spider/stickyweb,
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/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/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/structure/railing{
dir = 4
},
@@ -2480,7 +2480,7 @@
icon_state = "gib3-old";
pixel_x = -6
},
-/obj/item/melee/transforming/energy/sword/saber/pirate/yellow{
+/obj/item/melee/energy/sword/saber/pirate/yellow{
pixel_x = -5;
pixel_y = 16
},
diff --git a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_SPOOKYCRASH.dmm b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_SPOOKYCRASH.dmm
index f3ab87f2916f..39353aeaa86f 100644
--- a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_SPOOKYCRASH.dmm
+++ b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_SPOOKYCRASH.dmm
@@ -49,7 +49,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"m" = (
/obj/structure/table,
-/obj/item/soulstone/anybody,
+/obj/item/storage/belt/chameleon,
/obj/item/toy/plush/lizardplushie,
/obj/machinery/light/broken/directional/north,
/obj/structure/window/reinforced/spawner,
@@ -189,7 +189,7 @@
"O" = (
/obj/effect/mob_spawn/human/corpse/damaged,
/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/under/color/khaki/buster,
+/obj/item/clothing/glasses/welding/ghostbuster,
/obj/item/clothing/glasses/welding/ghostbuster,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/mineral/plastitanium/red,
diff --git a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm
index 267dd8eb859f..095c2356d906 100644
--- a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm
+++ b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm
@@ -2,7 +2,7 @@
"ai" = (
/obj/effect/decal/cleanable/molten_object,
/obj/structure/table/chem,
-/obj/item/slime_extract/darkblue{
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly{
pixel_x = -7
},
/obj/item/reagent_containers/glass/beaker/cryoxadone{
@@ -1545,15 +1545,15 @@
pixel_x = 8
},
/obj/structure/table,
-/obj/item/slime_extract/green{
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly{
pixel_x = -4;
pixel_y = 11
},
-/obj/item/slime_extract/green{
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly{
pixel_x = -11;
pixel_y = 11
},
-/obj/item/slime_extract/green{
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly{
pixel_x = -7;
pixel_y = 5
},
@@ -1743,7 +1743,7 @@
})
"rw" = (
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/buried_shrine{
name = "Nanotrasen Genetic Research Laboratory"
@@ -2046,10 +2046,10 @@
"uA" = (
/obj/machinery/light/dim/directional/north,
/obj/structure/table/chem,
-/obj/item/slimecrossbeaker/autoinjector/slimestimulant{
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly{
pixel_y = 11
},
-/obj/item/slimecrossbeaker/omnizine,
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
/obj/item/reagent_containers/glass/beaker{
pixel_y = 10;
pixel_x = -9
@@ -3109,7 +3109,7 @@
name = "Nanotrasen Genetic Research Reception"
})
"DD" = (
-/obj/machinery/porta_turret/ai,
+/obj/machinery/porta_turret,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/corprejectvault{
name = "Nanotrasen Genetic Research Storage"
@@ -4651,7 +4651,7 @@
})
"UA" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/obj/item/storage/box/cups,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/buried_shrine{
@@ -4753,7 +4753,7 @@
})
"Wa" = (
/obj/structure/table,
-/obj/item/slime_extract/grey,
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
/obj/item/reagent_containers/glass/beaker{
pixel_y = 10;
pixel_x = -9
@@ -4815,7 +4815,7 @@
pixel_y = 9;
pixel_x = 10
},
-/obj/item/slime_extract/grey,
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/buried_shrine{
name = "Nanotrasen Genetic Research Laboratory"
diff --git a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_comm_outpost.dmm b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_comm_outpost.dmm
index 5089582d8bae..c736eba02a24 100644
--- a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_comm_outpost.dmm
+++ b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_comm_outpost.dmm
@@ -104,7 +104,7 @@
})
"AV" = (
/obj/structure/table/reinforced,
-/obj/item/paper/crumpled/awaymissions/moonoutpost19/hastey_note{
+/obj/item/paper/crumpled/muddy{
desc = "It seems like it was written in a hurry";
default_raw_text = "Hey, you're probably reading this after having killed me, but that's alright. I probably shot first. Names' Yuto, Syndicate Radio Operator, there used to be another op here, a nice one too. Had syndicate command not forgotten about this post, we'd of probably been executed for sentinmental attachments on the job. Although she didn't have to worry about that, the local fauna got her first. I guess this note is my way of saying sorry. Take what you want from this station and my body, you need it more than I do now. Good luck out there, whoever you are. - Syndicate Radio
e f.";
pixel_x = -3;
diff --git a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_crashed_pinnance.dmm b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_crashed_pinnance.dmm
index 62d564e35ab1..3e113329fe74 100644
--- a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_crashed_pinnance.dmm
+++ b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_crashed_pinnance.dmm
@@ -73,7 +73,7 @@
/obj/structure/windoor_assembly{
dir = 2
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating/rust,
/area/ruin/unpowered/corprejectrooms{
name = "Pinnace Wreckage"
@@ -183,7 +183,7 @@
name = "Pinnace Wreckage"
})
"pA" = (
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/overmap_encounter/planetoid/lava/explored)
"rr" = (
@@ -439,7 +439,7 @@
name = "Pinnace Wreckage"
})
"Fv" = (
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/corprejectrooms{
name = "Pinnace Wreckage"
diff --git a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm
index 50c80a9e6cf9..ffbbc2d858f1 100644
--- a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm
+++ b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm
@@ -7,12 +7,12 @@
/area/ruin/unpowered)
"c" = (
/obj/item/reagent_containers/food/snacks/grown/citrus/orange_3d,
-/turf/open/floor/sepia{
+/turf/open/floor/plasteel/sepia{
slowdown = 10
},
/area/ruin/unpowered)
"d" = (
-/turf/open/floor/sepia{
+/turf/open/floor/plasteel/sepia{
slowdown = 10
},
/area/ruin/unpowered)
@@ -20,14 +20,14 @@
/obj/machinery/door/airlock/wood{
dir = 4
},
-/turf/open/floor/sepia{
+/turf/open/floor/plasteel/sepia{
slowdown = 10
},
/area/ruin/unpowered)
"g" = (
/obj/structure/bed,
/obj/item/bedsheet/brown,
-/turf/open/floor/sepia{
+/turf/open/floor/plasteel/sepia{
slowdown = 10
},
/area/ruin/unpowered)
@@ -36,7 +36,7 @@
/obj/item/toy/plush/lizardplushie{
name = "Mark"
},
-/turf/open/floor/sepia{
+/turf/open/floor/plasteel/sepia{
slowdown = 10
},
/area/ruin/unpowered)
diff --git a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
index fda16098a148..8e12f3a2331e 100644
--- a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
+++ b/_maps/_mod_celadon/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/lootdrop/waste/trash,
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/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/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/wood,
/area/ruin/lavaland/factory/adminstrative)
"co" = (
@@ -641,7 +641,7 @@
},
/obj/item/modular_computer/laptop,
/obj/item/stack/arcadeticket,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/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/lootdrop/maintenance,
+/obj/effect/spawner/random/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/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/white,
/area/ruin/lavaland/factory/dorms)
"rh" = (
@@ -2286,7 +2286,7 @@
/obj/item/storage/fancy/cigarettes/cigpack_cannabis,
/obj/item/lighter/greyscale,
/obj/item/reagent_containers/food/drinks/bottle/whiskey,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/white,
/area/ruin/lavaland/factory/dorms)
"ve" = (
@@ -2716,7 +2716,7 @@
/obj/item/ammo_box/magazine/smgm9mm{
start_empty = 1
},
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto,
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq,
/turf/open/floor/plasteel/dark,
/area/ruin/lavaland/factory/dorms)
"zC" = (
@@ -2984,7 +2984,7 @@
/obj/machinery/light/directional/west,
/obj/item/melee/knife/hunting,
/obj/item/clothing/suit/hooded/cloak/goliath,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/white,
/area/ruin/lavaland/factory/dorms)
"CW" = (
@@ -3148,12 +3148,12 @@
/obj/effect/turf_decal/corner/opaque/ntblue{
dir = 1
},
-/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/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/white,
/area/ruin/lavaland/factory/dorms)
@@ -3532,7 +3532,7 @@
/obj/structure/flippedtable{
dir = 4
},
-/obj/item/reagent_containers/food/drinks/bottle/molotov,
+/obj/item/reagent_containers/food/drinks/molotov,
/obj/item/lighter/greyscale{
pixel_x = -8;
pixel_y = -7
@@ -4061,11 +4061,11 @@
/area/overmap_encounter/planetoid/cave/explored)
"Or" = (
/obj/structure/closet/crate/freezer,
-/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/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/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
@@ -4944,9 +4944,9 @@
/obj/effect/turf_decal/corner/opaque/bar,
/obj/structure/closet/crate/bin,
/obj/machinery/light/directional/west,
-/obj/effect/spawner/lootdrop/waste/trash,
-/obj/effect/spawner/lootdrop/waste/trash,
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plasteel,
/area/ruin/lavaland/factory/dorms)
"Xn" = (
diff --git a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
index a2888e3de87c..9abec503af60 100644
--- a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
+++ b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
@@ -109,7 +109,7 @@
/turf/open/floor/wood,
/area/ruin/rockplanet/nanotrasen)
"by" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/industrial/warning,
/obj/machinery/light/dim/directional/north,
/turf/open/floor/plasteel,
@@ -960,21 +960,21 @@
/area/overmap_encounter/planetoid/rockplanet/explored)
"pj" = (
/obj/structure/table/reinforced,
-/obj/item/slime_extract/grey{
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly{
pixel_x = -4;
pixel_y = -1
},
-/obj/item/slime_extract/grey{
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly{
pixel_x = 8
},
-/obj/item/slime_extract/grey,
-/obj/item/slime_extract/grey,
-/obj/item/slime_extract/green{
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly{
pixel_x = 4;
pixel_y = -6
},
/obj/structure/window/reinforced,
-/obj/item/slime_scanner,
+/obj/item/t_scanner,
/turf/open/floor/engine,
/area/ruin/rockplanet/nanotrasen)
"pl" = (
diff --git a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_crash.dmm b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_crash.dmm
index 2e32dddf2a0b..25f2ef15b176 100644
--- a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_crash.dmm
+++ b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_crash.dmm
@@ -515,7 +515,7 @@
/obj/item/flashlight/glowstick/red{
on = 1
},
-/mob/living/simple_animal/hostile/hivebot/strong/rockplanet,
+/mob/living/simple_animal/hostile/hivebot/strong,
/turf/open/floor/plating,
/area/ruin/unpowered)
"qS" = (
@@ -942,7 +942,7 @@
/obj/effect/turf_decal/corner/opaque/blue{
dir = 1
},
-/mob/living/simple_animal/hostile/hivebot/strong/rockplanet,
+/mob/living/simple_animal/hostile/hivebot/strong,
/turf/open/floor/plating,
/area/ruin/unpowered)
"Dc" = (
diff --git a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_distillery.dmm b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_distillery.dmm
index 655a420f7a05..5b65260ac512 100644
--- a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_distillery.dmm
+++ b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_distillery.dmm
@@ -395,7 +395,7 @@
/turf/open/floor/plating/asteroid/rockplanet/lit,
/area/overmap_encounter/planetoid/rockplanet/explored)
"dZ" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/spline/fancy/opaque/white,
/turf/open/floor/plasteel/patterned/brushed,
/area/ruin/rockplanet/distillery/crew)
@@ -592,11 +592,11 @@
start_empty = 1;
layer = 3.1
},
-/obj/item/ammo_casing/c9mm,
-/obj/item/ammo_casing/c9mm,
-/obj/item/ammo_casing/c9mm,
-/obj/item/ammo_casing/c9mm,
-/obj/item/ammo_casing/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
/turf/open/floor/carpet,
/area/ruin/rockplanet/distillery/office)
"gM" = (
@@ -1604,12 +1604,12 @@
"sQ" = (
/obj/effect/turf_decal/industrial/outline/red,
/obj/structure/closet/crate/freezer,
-/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/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,
/turf/open/floor/plasteel/patterned/brushed/rockplanet,
/area/ruin/rockplanet/distillery/crew)
"tc" = (
@@ -2177,7 +2177,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/pod,
/area/ruin/rockplanet/distillery/office)
"yO" = (
@@ -3019,10 +3019,10 @@
"Iz" = (
/obj/structure/closet/crate,
/obj/effect/turf_decal/industrial/outline/red,
-/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,
+/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,
/turf/open/floor/plasteel/patterned/brushed/rockplanet,
/area/ruin/rockplanet/distillery/crew)
"IA" = (
@@ -3069,11 +3069,11 @@
/obj/structure/closet/crate/secure/weapon{
name = "ammo crate"
},
-/obj/item/ammo_box/a357{
+/obj/item/storage/box/ammo/a357{
pixel_x = -3
},
/obj/item/ammo_box/magazine/illestren_a850r,
-/obj/item/ammo_box/c9mm/ap,
+/obj/item/storage/box/ammo/c9mm_ap,
/obj/item/ammo_box/magazine/illestren_a850r,
/obj/item/ammo_box/magazine/co9mm{
start_empty = 1
@@ -3081,7 +3081,7 @@
/obj/item/ammo_box/magazine/co9mm{
start_empty = 1
},
-/obj/item/ammo_box/a357{
+/obj/item/storage/box/ammo/a357{
pixel_x = 3
},
/obj/machinery/button/door{
@@ -3406,7 +3406,7 @@
icon_state = "1-5"
},
/obj/machinery/light/small/directional/west,
-/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/random/maintenance/four,
/turf/open/floor/wood/rockplanet{
icon_state = "wood-broken6"
},
@@ -3569,7 +3569,7 @@
},
/area/overmap_encounter/planetoid/rockplanet/explored)
"Os" = (
-/obj/machinery/vending/snack/random{
+/obj/effect/spawner/random/vending/snack{
tilted = 1
},
/obj/effect/turf_decal/spline/fancy/opaque/white,
@@ -4169,7 +4169,7 @@
/obj/structure/fluff/glowshroom,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/wood,
/area/ruin/rockplanet/distillery/crew)
"Vg" = (
@@ -4183,7 +4183,7 @@
widenet = 1
},
/obj/machinery/light/small/broken/directional/east,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plasteel/patterned/brushed,
/area/ruin/rockplanet/distillery/crew)
"Vj" = (
diff --git a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_harmfactory.dmm b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_harmfactory.dmm
index 937f7d7a0783..b9fb86484131 100644
--- a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_harmfactory.dmm
+++ b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_harmfactory.dmm
@@ -255,7 +255,7 @@
pixel_x = 5;
pixel_y = 7
},
-/obj/item/ammo_box/foambox/riot{
+/obj/item/storage/box/ammo/foam_darts/riot{
pixel_x = -3;
pixel_y = -3
},
diff --git a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm
index ff58248ffc4e..6db4bf5240a2 100644
--- a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm
+++ b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm
@@ -408,7 +408,7 @@
icon_state = "1-8"
},
/obj/structure/frame/machine,
-/obj/effect/spawner/lootdrop/salvage_matter_bin,
+/obj/effect/spawner/random/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/lootdrop/salvage_matter_bin,
+/obj/effect/spawner/random/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/lootdrop/salvage_matter_bin,
+/obj/effect/spawner/random/salvage_matter_bin,
/turf/open/floor/plasteel/tech/grid,
/area/ruin/rockplanet/nomad)
"Lk" = (
diff --git a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_saloon.dmm b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_saloon.dmm
index 00451c3d2b3d..d4f95ea87cb5 100644
--- a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_saloon.dmm
+++ b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_saloon.dmm
@@ -723,7 +723,7 @@
pixel_x = 3;
pixel_y = 2
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/turf_decal/siding/wood{
color = "#543C30";
dir = 10
@@ -1266,7 +1266,7 @@
/area/ruin/unpowered)
"Ms" = (
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood,
/area/ruin/unpowered)
@@ -1416,7 +1416,7 @@
/area/ruin/unpowered)
"QZ" = (
/obj/structure/closet/crate/wooden,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating/asteroid/rockplanet/cracked/lit,
/area/overmap_encounter/planetoid/rockplanet/explored)
"Ri" = (
@@ -1596,9 +1596,9 @@
pixel_x = 4;
pixel_y = 1
},
-/obj/effect/spawner/lootdrop/maintenance/two,
-/obj/effect/spawner/lootdrop/gloves,
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/random/clothing/gloves,
+/obj/effect/spawner/random/decoration/glowstick,
/obj/effect/decal/cleanable/wrapping,
/turf/open/floor/plating/asteroid/rockplanet/cracked/lit,
/area/overmap_encounter/planetoid/rockplanet/explored)
@@ -1672,7 +1672,7 @@
/area/ruin/unpowered)
"XZ" = (
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood,
diff --git a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_shippingdock.dmm b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
index d8c9061355aa..a51c2203dd49 100644
--- a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
+++ b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
@@ -288,7 +288,7 @@
/turf/open/floor/wood,
/area/ruin/rockplanet/shippingdockoffice)
"cz" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ruin/rockplanet/shippingdock)
@@ -2002,7 +2002,7 @@
},
/obj/item/ammo_box/magazine/m9mm_rattlesnake,
/obj/item/ammo_box/magazine/m9mm_rattlesnake,
-/obj/item/storage/pistolcase/ringneck,
+/obj/item/storage/guncase/pistol/ringneck,
/turf/open/floor/plasteel/mono/dark,
/area/ruin/rockplanet/shippingdocksecure)
"rK" = (
@@ -2068,7 +2068,7 @@
"sa" = (
/obj/effect/turf_decal/rechargefloor,
/obj/effect/turf_decal/industrial/warning/dust,
-/obj/effect/spawner/lootdrop/ripley,
+/obj/effect/spawner/random/exotic/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/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/concrete/pavement{
light_power = 0.6;
light_range = 2
@@ -2431,7 +2431,7 @@
/area/ruin/rockplanet/shippingdockoffice)
"uo" = (
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/trash/can,
/obj/item/trash/can/food/peaches,
/obj/item/trash/tray,
@@ -4049,7 +4049,7 @@
},
/area/overmap_encounter/planetoid/rockplanet/explored)
"HL" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/concrete/pavement{
light_power = 0.6;
light_range = 2
@@ -4213,7 +4213,7 @@
/turf/open/floor/concrete/pavement,
/area/ruin/rockplanet/shippingdockwarehouse)
"Ju" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ruin/rockplanet/shippingdock)
"Jz" = (
@@ -4361,7 +4361,9 @@
/obj/structure/window/reinforced{
dir = 1
},
-/obj/effect/spawner/bundle/costume/marisawizard,
+/obj/item/clothing/head/wizard/marisa/fake,
+/obj/item/clothing/suit/wizrobe/marisa/fake,
+/obj/item/clothing/shoes/wizrobe/marisa,
/turf/open/floor/plasteel/mono/white,
/area/ruin/rockplanet/shippingdockwarehouse)
"Kt" = (
@@ -5288,9 +5290,9 @@
"SJ" = (
/obj/structure/rack,
/obj/structure/window/reinforced,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/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,
/turf/open/floor/plasteel/mono/white,
/area/ruin/rockplanet/shippingdockwarehouse)
"SM" = (
@@ -5974,7 +5976,7 @@
/obj/structure/window/reinforced{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance/eight,
/turf/open/floor/plasteel/mono/white,
/area/ruin/rockplanet/shippingdockwarehouse)
"XU" = (
@@ -6026,7 +6028,7 @@
"Yf" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/concrete/pavement{
light_power = 0.6;
light_range = 2
diff --git a/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm b/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
index d6238dcf237b..b5a8b09b142d 100644
--- a/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
@@ -115,7 +115,7 @@
/area/ruin)
"fb" = (
/obj/structure/flora/ash/cap_shroom,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/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/lootdrop/maintenance,
+/obj/effect/spawner/random/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/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/asteroid/whitesands{
light_range = 2
},
@@ -916,7 +916,7 @@
/turf/open/floor/wood,
/area/ruin)
"HX" = (
-/obj/effect/spawner/lootdrop/armory_contraband/metastation,
+/obj/effect/spawner/random/exotic/armory,
/turf/open/floor/plating/asteroid/whitesands/dried{
light_range = 2
},
@@ -965,7 +965,7 @@
},
/area/overmap_encounter/planetoid/sand/explored)
"JE" = (
-/obj/effect/spawner/lootdrop/tool_engie_sydnie,
+/obj/effect/spawner/random/engineering/tool/sydnie,
/turf/open/floor/plating/asteroid/whitesands{
light_range = 2
},
@@ -996,7 +996,7 @@
"KJ" = (
/obj/structure/table,
/obj/item/gun/ballistic/automatic/smg/skm_carbine,
-/obj/item/ammo_box/magazine/skm_545_39,
+/obj/item/ammo_box/magazine/skm_762_40,
/turf/open/floor/concrete,
/area/ruin)
"Ld" = (
@@ -1165,7 +1165,7 @@
},
/area/overmap_encounter/planetoid/sand/explored)
"SV" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/asteroid/whitesands/dried{
light_range = 2
},
@@ -1274,7 +1274,7 @@
/area/ruin)
"Xa" = (
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/wood,
/area/ruin)
"Xb" = (
@@ -1302,7 +1302,7 @@
"XP" = (
/obj/structure/table,
/obj/item/trash/can,
-/obj/item/ammo_box/c45/surplus,
+/obj/item/storage/box/ammo/c45_surplus,
/turf/open/floor/concrete,
/area/ruin)
"XS" = (
diff --git a/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_camp_drugstore.dmm b/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_camp_drugstore.dmm
index a20f5cf8d265..a65de81b5ffd 100644
--- a/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_camp_drugstore.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_camp_drugstore.dmm
@@ -23,10 +23,10 @@
/area/ruin/unpowered)
"e" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/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/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/ruin/unpowered)
@@ -126,8 +126,8 @@
/area/ruin/unpowered)
"t" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
-/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
+/obj/effect/spawner/random/clothing/kittyears_or_rabbitears,
+/obj/effect/spawner/random/clothing/kittyears_or_rabbitears,
/turf/open/floor/wood,
/area/ruin/unpowered)
"u" = (
@@ -184,8 +184,8 @@
},
/area/ruin/unpowered)
"E" = (
-/obj/effect/spawner/lootdrop/costume,
-/obj/effect/spawner/lootdrop/gloves,
+/obj/effect/spawner/random/clothing/costume,
+/obj/effect/spawner/random/clothing/gloves,
/obj/structure/window,
/obj/structure/rack,
/turf/open/floor/wood,
@@ -203,7 +203,7 @@
/turf/open/floor/wood,
/area/ruin/unpowered)
"G" = (
-/obj/effect/spawner/lootdrop/costume,
+/obj/effect/spawner/random/clothing/costume,
/obj/structure/window,
/obj/structure/rack,
/turf/open/floor/wood,
@@ -239,8 +239,8 @@
/turf/open/floor/wood,
/area/ruin/unpowered)
"M" = (
-/obj/effect/spawner/lootdrop/costume,
-/obj/effect/spawner/lootdrop/gloves,
+/obj/effect/spawner/random/clothing/costume,
+/obj/effect/spawner/random/clothing/gloves,
/obj/item/shard{
icon_state = "tiny"
},
@@ -284,7 +284,7 @@
/turf/template_noop,
/area/template_noop)
"T" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/machinery/light/directional/west,
/turf/open/floor/wood,
/area/ruin/unpowered)
diff --git a/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm b/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm
index d4c307df25d7..c4b81f94a8e0 100644
--- a/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm
@@ -133,7 +133,7 @@
/area/ruin/whitesands/saloon)
"eq" = (
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/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/lootdrop/maintenance/three,
+/obj/effect/spawner/random/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/lootdrop/maintenance,
+/obj/effect/spawner/random/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/lootdrop/gambling,
+/obj/effect/spawner/random/entertainment/gambling,
/obj/item/spacecash/bundle/loadsamoney,
/turf/open/floor/carpet,
/area/ruin/whitesands/saloon)
@@ -646,7 +646,7 @@
/area/ruin/whitesands/saloon)
"sj" = (
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/chair/stool/bar,
/turf/open/floor/wood,
/area/ruin/whitesands/saloon)
@@ -1023,7 +1023,7 @@
/area/ruin/whitesands/saloon)
"EV" = (
/obj/structure/closet/cabinet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/decal/cleanable/dirt,
/obj/item/gun/energy/plasmacutter{
icon_state = "pulse_carbine";
@@ -1587,7 +1587,7 @@
/area/ruin/whitesands/saloon)
"Wl" = (
/obj/structure/closet/cabinet,
-/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/random/maintenance/four,
/turf/open/floor/wood,
/area/ruin/whitesands/saloon)
"WP" = (
diff --git a/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_conveniencestore.dmm b/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_conveniencestore.dmm
index afab861b7012..cd72b3ffeae7 100644
--- a/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_conveniencestore.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_conveniencestore.dmm
@@ -141,7 +141,7 @@
/turf/template_noop,
/area/template_noop)
"uM" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered)
"wd" = (
@@ -213,7 +213,7 @@
/turf/closed/wall,
/area/ruin/unpowered)
"FX" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered)
"Gr" = (
diff --git a/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_medipen_plant.dmm b/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_medipen_plant.dmm
index 4961ef905901..b10dc6d9b231 100644
--- a/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_medipen_plant.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_medipen_plant.dmm
@@ -751,7 +751,7 @@
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
"uu" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
},
@@ -760,7 +760,7 @@
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
"uz" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
},
@@ -852,7 +852,7 @@
},
/obj/effect/turf_decal/corner/transparent/neutral,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
"xd" = (
@@ -1218,7 +1218,7 @@
/area/ruin/powered)
"KU" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
},
diff --git a/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm b/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
index 397dff3689ee..5953e29111ee 100644
--- a/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
@@ -225,8 +225,8 @@
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance/five,
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/turf/open/floor/plasteel,
/area/ruin/whitesands/pubbycrash)
"fO" = (
@@ -405,7 +405,7 @@
dir = 8;
name = "engine fuel pump"
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/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/lootdrop/maintenance/two,
+/obj/effect/spawner/random/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/lootdrop/maintenance/two,
+/obj/effect/spawner/random/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/lootdrop/maintenance/two,
+/obj/effect/spawner/random/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/lootdrop/maintenance/two,
+/obj/effect/spawner/random/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/lootdrop/maintenance,
+/obj/effect/spawner/random/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/lootdrop/maintenance/two,
+/obj/effect/spawner/random/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/lootdrop/maintenance/two,
+/obj/effect/spawner/random/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/lootdrop/maintenance/two,
+/obj/effect/spawner/random/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/lootdrop/maintenance/two,
+/obj/effect/spawner/random/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/lootdrop/maintenance/two,
+/obj/effect/spawner/random/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/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/engine,
/area/ruin/whitesands/pubbycrash)
"Wo" = (
diff --git a/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_waterplant.dmm b/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_waterplant.dmm
index 126ebb818766..b62f05e99b4d 100644
--- a/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_waterplant.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_waterplant.dmm
@@ -243,7 +243,7 @@
/turf/open/floor/plasteel,
/area/ruin/powered)
"hy" = (
-/obj/structure/statue/gold/hos,
+/obj/structure/statue/bronze/masson_kills,
/turf/open/floor/wood,
/area/ruin/powered)
"hC" = (
diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/DJstation.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/DJstation.dmm
index d42ce9d3ae43..ff5fae118f1b 100644
--- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/DJstation.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/DJstation.dmm
@@ -174,7 +174,7 @@
name = "Listening Post"
})
"aB" = (
-/obj/effect/spawner/lootdrop/crate_spawner,
+/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plasteel/grimy,
/area/ruin/space/has_grav/powered{
name = "Listening Post"
@@ -320,7 +320,7 @@
})
"aP" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/corner/opaque/white{
dir = 1
},
diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/Fast_Food.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/Fast_Food.dmm
index 2471e5dd669f..464b046c9cb5 100644
--- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/Fast_Food.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/Fast_Food.dmm
@@ -1750,7 +1750,6 @@
name = "Mac Space Restaurant"
})
"df" = (
-/obj/structure/statue/silver/sec,
/turf/open/floor/mineral/titanium,
/area/ruin/space/has_grav{
name = "Mac Space Restaurant"
diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/astraeus.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/astraeus.dmm
index 2224e0dd60ad..4465897faebb 100644
--- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/astraeus.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/astraeus.dmm
@@ -101,7 +101,7 @@
/turf/open/space,
/area/space/nearstation)
"dx" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/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/lootdrop/maintenance,
+/obj/effect/spawner/random/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/lootdrop/maintenance,
+/obj/effect/spawner/random/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/lootdrop/maintenance,
+/obj/effect/spawner/random/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/lootdrop/maintenance,
+/obj/effect/spawner/random/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/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/airless,
/area/ruin/space/has_grav/astraeus/dorms_med)
"sR" = (
@@ -731,7 +731,7 @@
"uH" = (
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance{
+/obj/effect/spawner/random/maintenance{
lootcount = 2;
name = "2maintenance loot spawner"
},
@@ -800,7 +800,7 @@
/obj/machinery/conveyor{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/airless,
/area/ruin/space/has_grav/astraeus/munitions)
"wl" = (
@@ -1375,7 +1375,7 @@
/obj/machinery/conveyor/inverted{
dir = 9
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/astraeus/disposals)
"KD" = (
@@ -1558,7 +1558,7 @@
/obj/machinery/power/apc/auto_name/directional/east{
start_charge = 0
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/airless,
/area/ruin/space/has_grav/astraeus/munitions)
"Pd" = (
@@ -1736,7 +1736,7 @@
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered)
"UK" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/astraeus/hallway)
"UU" = (
diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/corporate_mining.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/corporate_mining.dmm
index 6302f09741b0..a93c9e982708 100644
--- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/corporate_mining.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/corporate_mining.dmm
@@ -813,7 +813,7 @@
/obj/effect/decal/cleanable/oil/slippery,
/obj/structure/closet/crate,
/obj/effect/turf_decal/industrial/outline,
-/obj/effect/spawner/lootdrop/materials,
+/obj/effect/spawner/random/materials,
/turf/open/floor/plasteel/tech/grid,
/area/ruin/space/has_grav/corporatemine/hall)
"sb" = (
@@ -1587,8 +1587,8 @@
"IF" = (
/obj/structure/closet/crate,
/obj/effect/turf_decal/industrial/outline,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/turf/open/floor/plasteel/tech/grid,
/area/ruin/space/has_grav/corporatemine/hall)
"IS" = (
@@ -1771,7 +1771,7 @@
"NH" = (
/obj/structure/closet/crate,
/obj/effect/turf_decal/industrial/outline,
-/obj/effect/spawner/lootdrop/materials,
+/obj/effect/spawner/random/materials,
/turf/open/floor/plasteel/tech/grid,
/area/ruin/space/has_grav/corporatemine/hall)
"NO" = (
diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/cryocontainment.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/cryocontainment.dmm
index 2e7f664f4aa3..8eb5ac7d50a8 100644
--- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/cryocontainment.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/cryocontainment.dmm
@@ -394,7 +394,7 @@
/turf/open/floor/plasteel/dark/airless,
/area/ruin/unpowered)
"kT" = (
-/obj/effect/spawner/lootdrop/beaker_loot_spawner,
+/obj/effect/spawner/random/medical/beaker,
/turf/open/floor/plating/airless{
icon_state = "platingdmg2"
},
@@ -674,7 +674,7 @@
"xD" = (
/obj/structure/table/chem,
/obj/item/reagent_containers/glass/beaker/sulphuric,
-/obj/effect/spawner/lootdrop/beaker_loot_spawner,
+/obj/effect/spawner/random/medical/beaker,
/turf/open/floor/plasteel/dark/airless,
/area/ruin/unpowered)
"xL" = (
@@ -1111,7 +1111,7 @@
/turf/open/floor/plasteel/dark/airless,
/area/ruin/unpowered)
"Pg" = (
-/obj/effect/spawner/lootdrop/beaker_loot_spawner,
+/obj/effect/spawner/random/medical/beaker,
/turf/open/floor/plasteel/dark/airless,
/area/ruin/unpowered)
"Po" = (
diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/dangerous_research.dmm
index 971d868c75df..d2abf5207a42 100644
--- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/dangerous_research.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/dangerous_research.dmm
@@ -104,7 +104,7 @@
/area/ruin/space/has_grav)
"dA" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/obj/structure/closet/crate,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav)
diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/hellfactory.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/hellfactory.dmm
index 5e57e5bc1a6e..23d472dac61f 100644
--- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/hellfactory.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/hellfactory.dmm
@@ -997,7 +997,7 @@
/obj/structure/rack,
/obj/item/stack/wrapping_paper,
/obj/item/stack/packageWrap,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/astraeus/disposals{
name = "Hell Factory"
diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/ntfacility.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/ntfacility.dmm
index 2a73d1a84db3..534f47955aee 100644
--- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/ntfacility.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/ntfacility.dmm
@@ -405,7 +405,7 @@
/obj/machinery/door/poddoor/preopen{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/obj/structure/closet/crate,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt,
@@ -616,7 +616,7 @@
"os" = (
/obj/item/mop,
/obj/structure/mopbucket,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ruin/powered)
@@ -653,7 +653,7 @@
dir = 4
},
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/vault,
@@ -1740,7 +1740,7 @@
"ML" = (
/obj/machinery/door/poddoor/preopen,
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/vault,
@@ -1873,7 +1873,7 @@
name = "captain's locker";
req_access = list(103)
},
-/obj/item/ammo_box/c38,
+/obj/item/storage/box/ammo/c38,
/obj/item/melee/sword/sabre,
/obj/item/clothing/suit/hooded/wintercoat/captain,
/obj/item/clothing/head/beret/captain,
@@ -1900,7 +1900,7 @@
"Rw" = (
/obj/machinery/door/poddoor/preopen,
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/obj/item/camera_bug,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt,
@@ -2078,7 +2078,7 @@
/turf/open/floor/plating,
/area/ruin/powered)
"WU" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ruin/powered)
diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/oldstation.dmm
index 0fd25b700c6e..8421f96a1465 100644
--- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/oldstation.dmm
@@ -12,7 +12,7 @@
/area/ruin/space/has_grav/ancientstation)
"ah" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/smartfridge/extract,
+/obj/machinery/smartfridge,
/turf/open/floor/plasteel/patterned{
color = "#8a8a8a"
},
@@ -203,7 +203,7 @@
/obj/structure/table,
/obj/machinery/light/small/directional/west,
/obj/item/crowbar,
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/patterned{
color = "#8a8a8a"
@@ -1087,7 +1087,7 @@
/obj/item/reagent_containers/syringe{
pixel_x = 6
},
-/obj/item/slime_extract/grey{
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly{
pixel_y = 11
},
/turf/open/floor/plasteel/patterned{
@@ -1279,7 +1279,7 @@
"jp" = (
/obj/structure/table,
/obj/item/crowbar,
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/patterned{
@@ -1325,8 +1325,8 @@
dir = 1
},
/obj/structure/rack,
-/obj/item/gun/energy/laser/retro/sc_retro,
-/obj/item/gun/energy/laser/retro/sc_retro{
+/obj/item/gun/energy/laser/retro,
+/obj/item/gun/energy/laser/retro{
pixel_x = -5;
pixel_y = -5
},
@@ -2750,7 +2750,7 @@
/area/ruin/space/has_grav/ancientstation/betanorth)
"wd" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/turf/open/floor/plasteel/patterned{
color = "#8a8a8a"
},
@@ -3754,7 +3754,7 @@
"Ei" = (
/obj/structure/table,
/obj/item/crowbar,
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/patterned{
color = "#8a8a8a"
diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/power_puzzle.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/power_puzzle.dmm
index 7d284afb9ed4..bc4125341346 100644
--- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/power_puzzle.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/power_puzzle.dmm
@@ -365,9 +365,9 @@
/area/ruin/space/has_grav/powerpuzzle)
"br" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/decal/cleanable/cobweb,
-/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
+/obj/effect/spawner/random/clothing/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/lootdrop/maintenance/two,
+/obj/effect/spawner/random/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/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/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/lootdrop/maintenance,
+/obj/effect/spawner/random/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/lootdrop/maintenance/six,
+/obj/effect/spawner/random/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/lootdrop/maintenance,
+/obj/effect/spawner/random/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/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/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/lootdrop/maintenance/two,
+/obj/effect/spawner/random/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/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/item/reagent_containers/food/snacks/sosjerky,
/obj/item/reagent_containers/food/snacks/sosjerky,
/obj/item/stack/medical/gauze/improvised,
@@ -2167,7 +2167,7 @@
/obj/item/ammo_casing/c9mm/surplus{
pixel_x = 6
},
-/obj/item/ammo_casing/c9mm/surplus,
+/obj/item/storage/box/ammo/c9mm_surplus,
/obj/item/ammo_casing/c9mm/surplus{
pixel_x = 3;
pixel_y = 5
@@ -2694,8 +2694,8 @@
/obj/structure/closet/crate/secure/weapon{
name = "Ammo Crate"
},
-/obj/item/ammo_box/c9mm/surplus,
-/obj/item/ammo_box/c9mm/surplus,
+/obj/item/storage/box/ammo/c9mm_surplus,
+/obj/item/storage/box/ammo/c9mm_surplus,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm,
/turf/open/floor/plasteel,
@@ -3546,7 +3546,7 @@
dir = 4
},
/obj/structure/closet/crate/secure,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/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/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/obj/structure/noticeboard{
pixel_x = -15;
pixel_y = 32
@@ -3647,7 +3647,7 @@
/obj/structure/railing{
dir = 6
},
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/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/lootdrop/maintenance/four,
+/obj/effect/spawner/random/maintenance/four,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/powerpuzzle)
"Yr" = (
diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/provinggrounds.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/provinggrounds.dmm
index 1ee2e5ea427c..d145a6aa2794 100644
--- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/provinggrounds.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/provinggrounds.dmm
@@ -1919,7 +1919,7 @@
/area/ruin/space/has_grav/powerpuzzle/secure)
"XA" = (
/obj/structure/rack,
-/obj/item/ammo_box/foambox/riot,
+/obj/item/storage/box/ammo/foam_darts/riot,
/obj/item/gun/ballistic/automatic/toy/pistol/riot,
/obj/structure/cable{
icon_state = "1-2"
diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/spacemall.dmm
index d4989af21fb5..48a4d23ec0c9 100644
--- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/spacemall.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/spacemall.dmm
@@ -320,7 +320,7 @@
/obj/item/toy/talking/AI{
pixel_x = 20
},
-/obj/item/ammo_box/foambox/riot,
+/obj/item/storage/box/ammo/foam_darts/riot,
/obj/item/gun/ballistic/shotgun/toy,
/turf/open/floor/light,
/area/ruin/space/has_grav/spacemall/shop2)
@@ -708,7 +708,7 @@
/area/ruin/space/has_grav/spacemall/dorms)
"cO" = (
/obj/effect/turf_decal/box,
-/obj/effect/spawner/lootdrop/salvage_machine,
+/obj/effect/spawner/random/salvage_machine,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shuttle)
"cP" = (
@@ -1299,9 +1299,9 @@
"eS" = (
/obj/structure/rack,
/obj/effect/turf_decal/corner/transparent/black/diagonal,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
"eU" = (
@@ -1326,7 +1326,7 @@
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
"eX" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/corner/transparent/green/diagonal,
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 8
@@ -1394,7 +1394,7 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/stack/cable_coil/random/five,
-/obj/effect/spawner/lootdrop/techstorage/engineering,
+/obj/effect/spawner/random/techstorage/engineering,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/maint)
"fi" = (
@@ -1402,8 +1402,8 @@
dir = 2
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
"fl" = (
@@ -1658,7 +1658,7 @@
/area/ruin/space/has_grav/spacemall/dorms)
"gu" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/obj/effect/turf_decal/corner/transparent/black/diagonal,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
@@ -2437,7 +2437,7 @@
/area/ruin/space/has_grav/spacemall)
"jm" = (
/obj/structure/rack,
-/obj/item/ammo_box/c9mm,
+/obj/item/storage/box/ammo/c9mm,
/obj/item/ammo_box/magazine/co9mm{
pixel_x = 5
},
@@ -2519,9 +2519,9 @@
"jD" = (
/obj/effect/turf_decal/box,
/obj/structure/closet/crate/secure,
-/obj/effect/spawner/lootdrop/costume,
-/obj/effect/spawner/lootdrop/costume,
-/obj/effect/spawner/lootdrop/costume,
+/obj/effect/spawner/random/clothing/costume,
+/obj/effect/spawner/random/clothing/costume,
+/obj/effect/spawner/random/clothing/costume,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shuttle)
"jE" = (
@@ -3119,7 +3119,7 @@
/obj/effect/decal/cleanable/cobweb,
/obj/effect/turf_decal/box,
/obj/structure/closet/crate/wooden,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/maint)
"lR" = (
@@ -3263,7 +3263,7 @@
"mJ" = (
/obj/structure/rack,
/obj/machinery/light/small/directional/north,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
"mK" = (
@@ -3646,7 +3646,7 @@
/area/ruin/space/has_grav/spacemall/dorms)
"ob" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
"od" = (
@@ -4056,7 +4056,7 @@
/area/ruin/space/has_grav/spacemall)
"pB" = (
/obj/effect/decal/cleanable/ash,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
/obj/structure/closet/crate,
/obj/structure/railing,
@@ -5759,7 +5759,7 @@
"vp" = (
/obj/structure/rack,
/obj/effect/turf_decal/corner/transparent/black/diagonal,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
"vs" = (
@@ -5876,7 +5876,7 @@
/area/ruin/space/has_grav/spacemall/shop2)
"vS" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/beaker_loot_spawner,
+/obj/effect/spawner/random/medical/beaker,
/obj/effect/turf_decal/corner/opaque/blue/diagonal,
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/spacemall/shop2)
@@ -6461,8 +6461,8 @@
/obj/structure/closet/crate/secure,
/obj/effect/turf_decal/box,
/obj/structure/railing,
-/obj/effect/spawner/lootdrop/prison_contraband,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/stockparts,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/maint)
"yk" = (
@@ -6534,7 +6534,7 @@
/obj/structure/closet/crate/trashcart,
/obj/item/trash/popcorn,
/obj/item/trash/candy,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shuttle)
"yF" = (
@@ -6676,7 +6676,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shuttle)
"yZ" = (
@@ -6972,9 +6972,9 @@
"Ag" = (
/obj/structure/rack,
/obj/effect/turf_decal/corner/transparent/black/diagonal,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/random_computer_circuit_common,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/circuit/computer/common,
/obj/item/research_notes/loot,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
@@ -7277,9 +7277,9 @@
"Bq" = (
/obj/effect/turf_decal/box,
/obj/structure/closet/crate/secure,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shuttle)
"Bu" = (
@@ -7477,7 +7477,7 @@
dir = 10
},
/obj/structure/spider/stickyweb,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/maint)
"Cv" = (
@@ -7908,10 +7908,10 @@
/obj/item/clothing/head/hardhat/weldhat/dblue{
pixel_y = 5
},
-/obj/item/weldingtool/experimental{
+/obj/item/weldingtool/electric{
pixel_y = 5
},
-/obj/item/weldingtool/experimental,
+/obj/item/weldingtool/electric,
/obj/effect/turf_decal/siding/wideplating/dark/end{
dir = 8
},
@@ -8238,9 +8238,9 @@
/turf/open/floor/eighties,
/area/ruin/space/has_grav/spacemall/shop2)
"EI" = (
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
"EJ" = (
@@ -9577,7 +9577,7 @@
"Kl" = (
/obj/effect/decal/cleanable/robot_debris/old,
/obj/structure/closet/crate/wooden,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/maint)
"Kn" = (
@@ -10011,9 +10011,9 @@
"LS" = (
/obj/structure/rack,
/obj/effect/turf_decal/corner/transparent/black/diagonal,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/random_computer_circuit_common,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/circuit/computer/common,
/obj/machinery/firealarm/directional/north,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
@@ -10068,9 +10068,9 @@
/area/ruin/space/has_grav/spacemall/dorms)
"Mb" = (
/obj/effect/decal/cleanable/greenglow,
-/obj/effect/spawner/lootdrop/random_prosthetic,
-/obj/effect/spawner/lootdrop/memeorgans,
-/obj/effect/spawner/lootdrop/memeorgans,
+/obj/effect/spawner/random/medical/prosthetic,
+/obj/effect/spawner/random/medical/memeorgans,
+/obj/effect/spawner/random/medical/memeorgans,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 4
},
@@ -11278,7 +11278,7 @@
/area/ruin/space/has_grav/spacemall)
"Qf" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/tool_engie_common,
+/obj/effect/spawner/random/engineering/tool/common,
/obj/effect/turf_decal/corner/transparent/black/diagonal,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
@@ -11309,7 +11309,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
"Qn" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/effect/turf_decal/corner/transparent/green/diagonal,
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 8
@@ -11323,7 +11323,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/maint)
"Qu" = (
@@ -12230,7 +12230,7 @@
/obj/structure/rack,
/obj/effect/turf_decal/corner/transparent/black/diagonal,
/obj/machinery/light/directional/east,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
"TZ" = (
@@ -12302,10 +12302,10 @@
"Ul" = (
/obj/effect/turf_decal/box,
/obj/structure/closet/crate/engineering/electrical,
-/obj/effect/spawner/lootdrop/techstorage,
-/obj/effect/spawner/lootdrop/techstorage,
-/obj/effect/spawner/lootdrop/stockparts,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/techstorage,
+/obj/effect/spawner/random/techstorage,
+/obj/effect/spawner/random/stockparts,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shuttle)
"Um" = (
@@ -12618,7 +12618,7 @@
},
/obj/structure/closet/crate,
/obj/structure/catwalk/over/plated_catwalk,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
"Vr" = (
@@ -12667,8 +12667,8 @@
"VA" = (
/obj/structure/rack,
/obj/structure/window/reinforced/spawner,
-/obj/effect/spawner/lootdrop/beaker_loot_spawner,
-/obj/effect/spawner/lootdrop/beaker_loot_spawner,
+/obj/effect/spawner/random/medical/beaker,
+/obj/effect/spawner/random/medical/beaker,
/obj/effect/turf_decal/corner/opaque/blue/diagonal,
/obj/item/clothing/neck/stethoscope,
/turf/open/floor/plasteel/white,
@@ -13471,7 +13471,7 @@
dir = 2
},
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/box,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
diff --git a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm
index bebc25e7b57c..1fadae6e0ca8 100644
--- a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm
+++ b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm
@@ -612,7 +612,7 @@
/area/ruin/wasteplanet/abandoned_mechbay/mainhall)
"fX" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/random/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/lootdrop/maintenance/two,
-/obj/effect/spawner/lootdrop/costume,
+/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/random/clothing/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/lootdrop/maintenance/six,
+/obj/effect/spawner/random/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/lootdrop/maintenance/four,
+/obj/effect/spawner/random/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/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/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/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/lootdrop/materials,
+/obj/effect/spawner/random/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/lootdrop/minor/pirate_or_bandana,
+/obj/effect/spawner/random/clothing/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/lootdrop/maintenance/two,
+/obj/effect/spawner/random/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/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_clowncrash.dmm b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_clowncrash.dmm
index b0375ff5e947..e3e8d73b932f 100644
--- a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_clowncrash.dmm
+++ b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_clowncrash.dmm
@@ -193,7 +193,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"K" = (
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/lootdrop/maintenance/seven,
+/obj/effect/spawner/random/maintenance/seven,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/overmap_encounter/planetoid/cave/explored)
"L" = (
@@ -265,7 +265,7 @@
/turf/open/floor/plating/asteroid/wasteplanet,
/area/overmap_encounter/planetoid/cave/explored)
"Y" = (
-/obj/structure/statue/bananium/clown,
+/obj/item/melee/energy/sword/bananium,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/window/reinforced/survival_pod{
dir = 8
diff --git a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_crash_kitchen.dmm b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_crash_kitchen.dmm
index 892b5c2feabe..6c9ed7e6f8a4 100644
--- a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_crash_kitchen.dmm
+++ b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_crash_kitchen.dmm
@@ -487,7 +487,7 @@
/area/ruin/unpowered)
"Vy" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/obj/machinery/button/door{
id = "sgkitchen";
name = "Kitchen Shutters";
diff --git a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm
index a938281fb4ba..4c7848f36fe8 100644
--- a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm
+++ b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm
@@ -19,7 +19,7 @@
/area/ruin/powered)
"am" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/item/flashlight/glowstick,
/obj/item/hand_labeler_refill,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -115,7 +115,7 @@
/area/ruin/powered)
"aY" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/poster/random_contraband,
/turf/open/floor/plating,
/area/ruin/powered)
@@ -145,7 +145,7 @@
/turf/open/floor/plating/rust,
/area/ruin/powered)
"bs" = (
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plating/rust,
@@ -222,7 +222,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/rack,
/obj/item/trash/plate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/toner,
/obj/item/mop,
/obj/item/weldingtool/empty,
@@ -470,7 +470,7 @@
/turf/open/floor/carpet/royalblack,
/area/ruin/powered)
"ep" = (
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/structure/table,
/obj/item/coin/plastic,
/obj/item/food/butterdog,
@@ -499,7 +499,7 @@
/obj/structure/rack,
/obj/item/trash/plate,
/obj/item/trash/sosjerky,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/assembly/igniter,
/obj/item/clipboard,
/obj/item/electronics/airlock,
@@ -524,7 +524,7 @@
/area/ruin/powered)
"eO" = (
/obj/effect/gibspawner/human,
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/turf/open/floor/plating,
/area/ruin/powered)
"eS" = (
@@ -608,13 +608,13 @@
/obj/item/stack/sheet/mineral/wood,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/item/trash/waffles,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/flashlight/glowstick,
/turf/open/floor/plating,
/area/ruin/powered)
"fw" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/item/toner/extreme,
/obj/item/poster/random_contraband,
@@ -670,7 +670,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/structure/cable{
icon_state = "0-8"
},
@@ -722,7 +722,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/coin,
/obj/machinery/light/small/directional/south,
/turf/open/floor/plating,
@@ -732,8 +732,8 @@
/obj/item/trash/sosjerky,
/obj/item/trash/raisins,
/obj/item/folder/blue,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ruin/powered)
"gG" = (
@@ -858,7 +858,7 @@
/obj/item/trash/can/food/beans,
/obj/structure/closet/crate,
/obj/item/trash/candy,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/assembly/prox_sensor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
@@ -960,7 +960,6 @@
/area/ruin/powered)
"jr" = (
/obj/structure/table/reinforced,
-/obj/item/slime_cookie/green,
/obj/item/toy/figure/chef,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -1120,7 +1119,7 @@
/turf/open/floor/wood,
/area/ruin/powered)
"kD" = (
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating/rust,
/area/ruin/powered)
@@ -1154,7 +1153,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/item/trash/plate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/item/electronics/airlock,
/turf/open/floor/plating,
/area/ruin/powered)
@@ -1303,12 +1302,12 @@
"mc" = (
/obj/structure/closet/crate,
/obj/item/trash/raisins,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/flashlight/glowstick,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"md" = (
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"mh" = (
@@ -1519,7 +1518,7 @@
/area/ruin/powered)
"nK" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/obj/item/shovel/spoon,
/turf/open/floor/plating/rust,
/area/ruin/powered)
@@ -1536,7 +1535,7 @@
/obj/item/toy/plush/carpplushie,
/obj/item/toy/plush/carpplushie,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/poster/random_contraband,
/turf/open/floor/plating,
/area/ruin/powered)
@@ -1545,7 +1544,7 @@
/obj/item/melee/baton/cattleprod,
/obj/item/restraints/handcuffs/cable/pink,
/obj/item/clothing/mask/muzzle,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ruin/powered)
"oa" = (
@@ -1570,7 +1569,7 @@
/turf/open/floor/plating/rust,
/area/ruin/powered)
"oj" = (
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/effect/decal/cleanable/oil,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -1603,7 +1602,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/structure/cable{
icon_state = "0-2"
},
@@ -1692,7 +1691,7 @@
/obj/effect/decal/cleanable/insectguts,
/obj/structure/rack,
/obj/item/folder/yellow,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/electronics/airlock,
/turf/open/floor/plating/rust,
/area/ruin/powered)
@@ -1742,7 +1741,7 @@
/obj/effect/decal/cleanable/generic,
/obj/structure/rack,
/obj/item/trash/sosjerky,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/assembly/prox_sensor,
/obj/item/photo,
/obj/item/poster/random_contraband,
@@ -1778,7 +1777,7 @@
/area/ruin/powered)
"pY" = (
/obj/structure/table,
-/obj/item/ammo_box/c9mm{
+/obj/item/storage/box/ammo/c9mm{
pixel_y = 6
},
/obj/item/gun/ballistic/automatic/zip_pistol,
@@ -1850,7 +1849,7 @@
/obj/item/clothing/suit/toggle/owlwings/griffinwings{
pixel_y = 5
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"qR" = (
@@ -1999,7 +1998,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/structure/cable{
icon_state = "0-8"
},
@@ -2117,7 +2116,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/structure/cable{
icon_state = "0-2"
},
@@ -2148,7 +2147,7 @@
/turf/open/floor/plating,
/area/ruin/powered)
"tY" = (
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/turf/open/floor/plating,
/area/ruin/powered)
"ub" = (
@@ -2181,7 +2180,7 @@
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/trash/raisins,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/airlock_painter,
/obj/item/tape/random,
/obj/item/poster/random_contraband,
@@ -2450,7 +2449,7 @@
/area/ruin/powered)
"wx" = (
/obj/effect/gibspawner/human,
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating/rust,
/area/ruin/powered)
@@ -2459,7 +2458,7 @@
/obj/item/circuitboard/machine/dnascanner,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/trash/semki,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/photo,
/turf/open/floor/plating/rust,
/area/ruin/powered)
@@ -2500,7 +2499,7 @@
/turf/open/floor/plating,
/area/ruin/powered)
"xm" = (
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating,
/area/ruin/powered)
"xu" = (
@@ -2545,7 +2544,7 @@
"yb" = (
/obj/effect/decal/cleanable/blood/old,
/obj/effect/decal/cleanable/generic,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 1
},
@@ -2590,7 +2589,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/old,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/book/manual/random,
/turf/open/floor/plating,
/area/ruin/powered)
@@ -2603,7 +2602,7 @@
"yK" = (
/obj/structure/closet/crate,
/obj/item/folder/yellow,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ruin/powered)
"yS" = (
@@ -2615,7 +2614,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating,
/area/ruin/powered)
"yV" = (
@@ -2682,7 +2681,7 @@
/area/ruin/powered)
"zw" = (
/obj/effect/gibspawner/human,
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"zy" = (
@@ -2862,7 +2861,7 @@
"AH" = (
/obj/structure/rack,
/obj/item/trash/raisins,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/toner,
/obj/item/assembly/prox_sensor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -2894,7 +2893,7 @@
/obj/effect/decal/cleanable/glass,
/obj/structure/closet/crate,
/obj/item/trash/semki,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/airlock_painter,
/obj/item/hand_labeler_refill,
/turf/open/floor/plating/rust,
@@ -2952,7 +2951,7 @@
/obj/structure/closet/crate,
/obj/item/trash/sosjerky,
/obj/item/trash/syndi_cakes,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 1
@@ -3004,7 +3003,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/structure/cable{
icon_state = "0-2"
},
@@ -3151,7 +3150,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"Db" = (
@@ -3230,7 +3229,7 @@
/area/ruin/powered)
"DX" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/obj/item/toner/extreme,
/turf/open/floor/plating,
/area/ruin/powered)
@@ -3257,7 +3256,7 @@
/obj/item/clothing/under/color/grey,
/obj/item/trash/sosjerky,
/obj/item/folder/yellow,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/book/manual/random,
/obj/item/poster/random_contraband,
/turf/open/floor/plating/rust,
@@ -3267,7 +3266,7 @@
/obj/structure/closet/crate,
/obj/item/trash/sosjerky,
/obj/item/trash/candy,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/book/manual/random,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 1
@@ -3460,7 +3459,7 @@
/area/ruin/powered)
"Gd" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"Gg" = (
@@ -3634,7 +3633,7 @@
/area/ruin/powered)
"Ib" = (
/obj/structure/table/wood/poker,
-/obj/item/gun/ballistic/revolver/shadow/no_mag,
+/obj/item/gun/ballistic/revolver/shadow/empty,
/obj/item/ammo_casing/a44roum,
/turf/open/floor/wood,
/area/ruin/powered)
@@ -3709,7 +3708,7 @@
/turf/open/floor/plating,
/area/ruin/powered)
"IE" = (
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/generic,
@@ -3831,7 +3830,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/structure/cable{
icon_state = "0-2"
},
@@ -3840,7 +3839,7 @@
"JK" = (
/obj/structure/closet/crate,
/obj/item/trash/plate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/clipboard,
/turf/open/floor/plating,
/area/ruin/powered)
@@ -4048,7 +4047,7 @@
/obj/item/clothing/under/misc/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ruin/powered)
"LR" = (
@@ -4179,7 +4178,7 @@
/obj/structure/rack,
/obj/item/trash/sosjerky,
/obj/item/trash/candy,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"Ny" = (
@@ -4223,7 +4222,7 @@
/obj/structure/rack,
/obj/item/trash/candy,
/obj/item/folder/yellow,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/electronics/airlock,
/obj/item/hot_potato/harmless/toy,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -4332,7 +4331,7 @@
"Ox" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"OE" = (
@@ -4341,7 +4340,7 @@
/turf/open/floor/plating,
/area/ruin/powered)
"OI" = (
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"OM" = (
@@ -4433,7 +4432,7 @@
/area/ruin/powered)
"PA" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"PE" = (
@@ -4509,7 +4508,7 @@
/turf/open/floor/plating/rust,
/area/ruin/powered)
"Qm" = (
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plating/rust,
/area/ruin/powered)
@@ -4537,7 +4536,7 @@
/obj/structure/closet/crate,
/obj/item/trash/sosjerky,
/obj/item/trash/raisins,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/toner,
/obj/item/flashlight/glowstick,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -4587,7 +4586,7 @@
/obj/structure/rack,
/obj/item/trash/plate,
/obj/item/trash/raisins,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/book/manual/random,
/obj/item/paper,
/turf/open/floor/plating,
@@ -4660,7 +4659,7 @@
/turf/open/floor/plating,
/area/ruin/powered)
"RX" = (
-/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/random/maintenance/four,
/obj/structure/table/wood/poker,
/turf/open/floor/plating/rust,
/area/ruin/powered)
@@ -4684,7 +4683,7 @@
/area/ruin/powered)
"Sb" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/item/assembly/prox_sensor,
/obj/item/camera,
/turf/open/floor/plating,
@@ -4807,8 +4806,8 @@
"Tk" = (
/obj/structure/closet/crate,
/obj/item/trash/popcorn,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/assembly/prox_sensor,
/turf/open/floor/plating/rust,
/area/ruin/powered)
@@ -4838,7 +4837,7 @@
/obj/structure/rack,
/obj/item/trash/boritos,
/obj/item/trash/can/food/peaches/maint,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/decal_painter,
/obj/item/poster/random_retro,
/obj/item/poster/random_contraband,
@@ -4890,7 +4889,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/structure/cable{
icon_state = "0-8"
},
@@ -4987,7 +4986,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"UF" = (
@@ -5002,7 +5001,7 @@
/turf/open/floor/plating,
/area/ruin/powered)
"UJ" = (
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/glass,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -5211,7 +5210,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"WM" = (
@@ -5279,7 +5278,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/rack,
/obj/item/trash/plate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/item/assembly/prox_sensor,
/obj/item/hand_labeler_refill,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -5346,7 +5345,7 @@
"XS" = (
/obj/structure/rack,
/obj/item/trash/can/food/peaches,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/fakeartefact,
/obj/item/poster/random_retro,
/obj/item/poster/random_contraband,
@@ -5370,7 +5369,7 @@
"Yd" = (
/obj/structure/rack,
/obj/item/trash/plate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/assembly/igniter,
/obj/item/camera,
/obj/item/tape/random,
@@ -5434,7 +5433,7 @@
/obj/structure/rack,
/obj/item/trash/can/food,
/obj/item/trash/popcorn,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/toner,
/obj/item/clipboard,
/obj/item/flashlight/glowstick,
@@ -5529,7 +5528,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate,
/obj/item/trash/plate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/assembly/igniter,
/obj/item/flashlight/glowstick,
/turf/open/floor/plating,
@@ -5537,7 +5536,7 @@
"Zo" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/cleanable/blood/gibs,
-/mob/living/simple_animal/hostile/human/cat_butcherer{
+/mob/living/simple_animal/hostile/clown/clownhulk/honcmunculus{
dir = 4
},
/turf/open/floor/plating,
diff --git a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_lab.dmm b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_lab.dmm
index aa5797d05a95..bdfc9c75a4a1 100644
--- a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_lab.dmm
+++ b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_lab.dmm
@@ -118,13 +118,13 @@
/area/ruin/powered)
"gw" = (
/obj/structure/table,
-/obj/item/ammo_box/c45,
+/obj/item/storage/box/ammo/c45,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/mono/white,
/area/ruin/powered)
"gx" = (
/obj/structure/table,
-/obj/item/ammo_box/c9mm/rubbershot,
+/obj/item/storage/box/ammo/c9mm_rubber,
/turf/open/floor/plasteel/mono/white,
/area/ruin/powered)
"gz" = (
@@ -699,7 +699,7 @@
/turf/open/floor/plating/rust,
/area/ruin/powered)
"HW" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/turf/open/floor/plating,
/area/ruin/powered)
"Ie" = (
diff --git a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_ore_proccessing_facility.dmm b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_ore_proccessing_facility.dmm
index e251b79dc713..bd5a96224bc1 100644
--- a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_ore_proccessing_facility.dmm
+++ b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_ore_proccessing_facility.dmm
@@ -67,7 +67,7 @@
/turf/open/floor/plating/rust,
/area/ruin/powered)
"db" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"ed" = (
@@ -123,7 +123,7 @@
/area/ruin/powered)
"jA" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"jE" = (
@@ -456,7 +456,7 @@
dir = 4;
id = "rockplanet_ore_process"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"Ff" = (
@@ -661,7 +661,7 @@
dir = 1;
id = "rockplanet_ore_process"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"Ql" = (
@@ -693,7 +693,7 @@
/turf/open/floor/plating/rust,
/area/ruin/powered)
"Vf" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/railing{
dir = 4
},
diff --git a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_pandora.dmm b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
index 7529934bb4ea..6d37150ea21e 100644
--- a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
+++ b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
@@ -23,7 +23,7 @@
/area/ruin/wasteplanet)
"bc" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/ammo_box/c9mm,
+/obj/item/storage/box/ammo/c9mm,
/turf/open/floor/plating/wasteplanet,
/area/ruin/wasteplanet)
"bd" = (
@@ -807,7 +807,7 @@
pixel_x = -11;
pixel_y = -5
},
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq{
pixel_y = -18
},
/turf/open/indestructible/hierophant/two/waste,
diff --git a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm
index 63cedb497f90..88986e834081 100644
--- a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm
+++ b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm
@@ -1,7 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aj" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/aimodule_harmless,
+/obj/effect/spawner/random/aimodule_harmless,
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plating/rust,
/area/ruin/unpowered)
@@ -40,7 +40,7 @@
"fC" = (
/obj/structure/rack,
/obj/item/stack/wrapping_paper,
-/obj/effect/spawner/lootdrop/gambling,
+/obj/effect/spawner/random/entertainment/gambling,
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plating/rust,
/area/ruin/unpowered)
@@ -56,9 +56,9 @@
/area/overmap_encounter/planetoid/wasteplanet/explored)
"im" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/mafia_outfit,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/clothing/mafia_outfit,
/turf/open/floor/plating,
/area/ruin/unpowered)
"ip" = (
@@ -69,7 +69,7 @@
/area/ruin/unpowered)
"iy" = (
/obj/structure/cable,
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/overmap_encounter/planetoid/wasteplanet/explored)
"kf" = (
@@ -139,7 +139,7 @@
/area/ruin/unpowered)
"sW" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/gambling,
+/obj/effect/spawner/random/entertainment/gambling,
/obj/effect/decal/cleanable/garbage,
/turf/open/floor/plating,
/area/ruin/unpowered)
@@ -199,7 +199,7 @@
/turf/open/floor/plating/asteroid/wasteplanet,
/area/overmap_encounter/planetoid/wasteplanet/explored)
"yd" = (
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/obj/structure/cable{
icon_state = "4-9"
},
@@ -381,7 +381,7 @@
/area/ruin/unpowered)
"QD" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/gambling,
+/obj/effect/spawner/random/entertainment/gambling,
/obj/effect/decal/cleanable/garbage,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/wrench,
diff --git a/_maps/_mod_celadon/map_files/generic/blank.dmm b/_maps/_mod_celadon/map_files/generic/blank.dmm
index b1037ce0a805..eb3a3bec0bb8 100644
--- a/_maps/_mod_celadon/map_files/generic/blank.dmm
+++ b/_maps/_mod_celadon/map_files/generic/blank.dmm
@@ -1052,7 +1052,7 @@
"dk" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/under/rank/civilian/curator/treasure_hunter,
-/obj/item/clothing/under/dress/skirt,
+/obj/item/clothing/under/dress/skirt/color,
/obj/item/clothing/under/shorts/black,
/obj/item/clothing/under/pants/track,
/obj/item/clothing/accessory/armband/deputy,
@@ -10792,8 +10792,8 @@
/area/centcom)
"FT" = (
/obj/item/storage/box/handcuffs,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
/obj/item/gun/ballistic/revolver/mateba,
/obj/structure/table/reinforced,
/obj/effect/turf_decal/industrial/warning{
diff --git a/_maps/_mod_celadon/map_files/generic/runtime_check_map.dmm b/_maps/_mod_celadon/map_files/generic/runtime_check_map.dmm
index 9f05c498cbad..8356a8f9bbce 100644
--- a/_maps/_mod_celadon/map_files/generic/runtime_check_map.dmm
+++ b/_maps/_mod_celadon/map_files/generic/runtime_check_map.dmm
@@ -699,7 +699,7 @@
/obj/item/skateboard/hoverboard/admin,
/obj/item/skub,
/obj/item/slapper,
-/obj/item/slime_scanner,
+/obj/item/t_scanner,
/obj/item/smallDelivery,
/obj/item/soap,
/obj/item/soap/deluxe,
@@ -707,11 +707,11 @@
/obj/item/soap/nanotrasen,
/obj/item/soap/omega,
/obj/item/solar_assembly,
-/obj/item/soulstone,
-/obj/item/soulstone/anybody,
-/obj/item/soulstone/anybody/revolver,
-/obj/item/soulstone/anybody/purified,
-/obj/item/soulstone/anybody/chaplain,
+/obj/item/gem/bloodstone
+/obj/item/gem/bloodstone,
+/obj/item/gem/bloodstone,
+/obj/item/gem/bloodstone,
+/obj/item/gem/bloodstone,
/obj/item/spacecash,
/obj/item/spacecash/bundle,
/obj/item/spacecash/bundle/c1,
@@ -831,7 +831,7 @@
/obj/item/weldingtool,
/obj/item/weldingtool/abductor,
/obj/item/weldingtool/empty,
-/obj/item/weldingtool/experimental,
+/obj/item/weldingtool/electric,
/obj/item/weldingtool/hugetank,
/obj/item/weldingtool/hugetank/empty,
/obj/item/weldingtool/largetank,
@@ -909,20 +909,20 @@
/turf/open/floor/plating/asteroid/snow/under,
/area/space)
"bd" = (
-/obj/item/ammo_box/a357/hp,
-/obj/item/ammo_box/a357/match,
-/obj/item/ammo_box/a44roum/rubber,
-/obj/item/ammo_box/a4570/hp,
-/obj/item/ammo_box/c10mm/fire,
-/obj/item/ammo_box/c38_box/hotshot,
-/obj/item/ammo_box/c45/ap,
-/obj/item/ammo_box/c556mmHITP/hp,
-/obj/item/ammo_box/c8x50mm_box,
-/obj/item/ammo_box/c8x50mmhp_box,
-/obj/item/ammo_box/c9mm/fire,
-/obj/item/ammo_box/c9mm/rubbershot,
-/obj/item/ammo_box/ferropelletbox,
-/obj/item/ammo_box/generic,
+/obj/item/storage/box/ammo/a357/hp,
+/obj/item/storage/box/ammo/a357/match,
+/obj/item/storage/box/ammo/a44roum/rubber,
+/obj/item/storage/box/ammo/a4570/hp,
+/obj/item/storage/box/ammo/c10mm_ap,
+/obj/item/storage/box/ammo/c38_hotshot,
+/obj/item/storage/box/ammo/c45_ap,
+/obj/item/storage/box/ammo/c556mmHITP/hp,
+/obj/item/storage/box/ammo/c8x50mm_box,
+/obj/item/storage/box/ammo/c8x50mmhp_box,
+/obj/item/storage/box/ammo/c9mm_ap,
+/obj/item/storage/box/ammo/c9mm_rubber,
+/obj/item/storage/box/ammo/ferropelletbox,
+/obj/item/storage/box/ammo/generic,
/obj/item/ammo_box/magazine/cm40_762_40_box,
/obj/item/ammo_box/magazine/co9mm/hp,
/obj/item/ammo_box/magazine/e40,
@@ -960,8 +960,8 @@
/obj/item/ammo_casing/c10mm/rubber,
/obj/item/ammo_casing/c38/hotshot,
/obj/item/ammo_casing/c45/surplus,
-/obj/item/ammo_casing/c9mm/rubber,
-/obj/item/ammo_casing/c9mm/surplus,
+/obj/item/storage/box/ammo/c9mm_rubber,
+/obj/item/storage/box/ammo/c9mm_surplus,
/obj/item/ammo_casing/caseless/arrow/bronze,
/obj/item/ammo_casing/caseless/arrow/wood,
/obj/item/ammo_casing/caseless/c299,
@@ -1724,98 +1724,98 @@
/obj/item/aicard/aitater,
/obj/item/airlock_painter,
/obj/item/alquadim_manual,
-/obj/item/ammo_box,
-/obj/item/ammo_box/a12g,
-/obj/item/ammo_box/a12g/beanbag,
-/obj/item/ammo_box/a12g/blanks,
-/obj/item/ammo_box/a12g/rubbershot,
-/obj/item/ammo_box/a12g/slug,
-/obj/item/ammo_box/a300,
-/obj/item/ammo_box/a300/empty,
-/obj/item/ammo_box/a300_box,
-/obj/item/ammo_box/a308,
-/obj/item/ammo_box/a308/a308_ap,
-/obj/item/ammo_box/a308/a308_brak,
-/obj/item/ammo_box/a308/a308_rubber,
-/obj/item/ammo_box/a308/a308_sp,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357/empty,
-/obj/item/ammo_box/a357/hp,
-/obj/item/ammo_box/a357/match,
-/obj/item/ammo_box/a357_box,
-/obj/item/ammo_box/a357_box/hp,
-/obj/item/ammo_box/a357_box/match,
+/obj/item/storage/box/ammo,
+/obj/item/storage/box/ammo/a12g_buckshot,
+/obj/item/storage/box/ammo/a12g_beanbag,
+/obj/item/storage/box/ammo/a12g_blanks,
+/obj/item/storage/box/ammo/a12g_rubbershot,
+/obj/item/storage/box/ammo/a12g_slug,
+/obj/item/storage/box/ammo/a300,
+/obj/item/storage/box/ammo/a300/empty,
+/obj/item/storage/box/ammo/a300_box,
+/obj/item/storage/box/ammo/a308,
+/obj/item/storage/box/ammo/a308/a308_ap,
+/obj/item/storage/box/ammo/a308/a308_brak,
+/obj/item/storage/box/ammo/a308/a308_rubber,
+/obj/item/storage/box/ammo/a308/a308_sp,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357/empty,
+/obj/item/storage/box/ammo/a357/hp,
+/obj/item/storage/box/ammo/a357/match,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357_hp,
+/obj/item/storage/box/ammo/a357_match,
/obj/item/ammo_box/a40mm,
-/obj/item/ammo_box/a44roum,
-/obj/item/ammo_box/a44roum/hp,
-/obj/item/ammo_box/a44roum/rubber,
+/obj/item/storage/box/ammo/a44roum,
+/obj/item/storage/box/ammo/a44roum/hp,
+/obj/item/storage/box/ammo/a44roum/rubber,
/obj/item/ammo_box/a44roum_speedloader,
/obj/item/ammo_box/a44roum_speedloader/empty,
-/obj/item/ammo_box/a4570,
-/obj/item/ammo_box/a4570/explosive,
-/obj/item/ammo_box/a4570/hp,
-/obj/item/ammo_box/a4570/match,
-/obj/item/ammo_box/a556_42,
-/obj/item/ammo_box/a556_box,
-/obj/item/ammo_box/a556_box/a856,
-/obj/item/ammo_box/a556_box/surplus,
-/obj/item/ammo_box/a65clip_box,
-/obj/item/ammo_box/a65clip_box/syndicate,
-/obj/item/ammo_box/a762_40,
-/obj/item/ammo_box/a762_40/inteq,
+/obj/item/storage/box/ammo/a4570,
+/obj/item/storage/box/ammo/a4570/explosive,
+/obj/item/storage/box/ammo/a4570/hp,
+/obj/item/storage/box/ammo/a4570/match,
+/obj/item/storage/box/ammo/a556_42,
+/obj/item/storage/box/ammo/a556_box,
+/obj/item/storage/box/ammo/a556_box/a856,
+/obj/item/storage/box/ammo/a556_box/surplus,
+/obj/item/storage/box/ammo/a65clip_box,
+/obj/item/storage/box/ammo/a65clip_box/syndicate,
+/obj/item/storage/box/ammo/a762_40,
+/obj/item/storage/box/ammo/a762_40/inteq,
/obj/item/ammo_box/a762_stripper,
/obj/item/ammo_box/a762_stripper/empty,
-/obj/item/ammo_box/a858,
-/obj/item/ammo_box/a858/empty,
-/obj/item/ammo_box/a858_ammo_box,
-/obj/item/ammo_box/amagpellet_claris,
-/obj/item/ammo_box/c10mm,
-/obj/item/ammo_box/c10mm/ap,
-/obj/item/ammo_box/c10mm/fire,
-/obj/item/ammo_box/c10mm/hp,
-/obj/item/ammo_box/c10mm/rubbershot,
-/obj/item/ammo_box/c10mm/surplus,
-/obj/item/ammo_box/c22lr_box,
-/obj/item/ammo_box/c299,
-/obj/item/ammo_box/c38,
-/obj/item/ammo_box/c38/dumdum,
-/obj/item/ammo_box/c38/empty,
-/obj/item/ammo_box/c38/hotshot,
-/obj/item/ammo_box/c38/iceblox,
-/obj/item/ammo_box/c38/match,
-/obj/item/ammo_box/c38/match/bouncy,
-/obj/item/ammo_box/c38/trac,
-/obj/item/ammo_box/c38_box,
-/obj/item/ammo_box/c38_box/hotshot,
-/obj/item/ammo_box/c38_box/iceblox,
-/obj/item/ammo_box/c38_box/surplus,
-/obj/item/ammo_box/c45,
-/obj/item/ammo_box/c45/ap,
-/obj/item/ammo_box/c45/fire,
-/obj/item/ammo_box/c45/hp,
-/obj/item/ammo_box/c45/rubbershot,
-/obj/item/ammo_box/c45/surplus,
-/obj/item/ammo_box/c46x30mm_box,
-/obj/item/ammo_box/c556mmHITP,
-/obj/item/ammo_box/c556mmHITP/ap,
-/obj/item/ammo_box/c556mmHITP/hp,
-/obj/item/ammo_box/c556mmHITP/rubbershot,
-/obj/item/ammo_box/c556mmHITP/surplus,
-/obj/item/ammo_box/c57x39mm_box,
-/obj/item/ammo_box/c8x50mm_box,
-/obj/item/ammo_box/c8x50mmhp_box,
-/obj/item/ammo_box/c9mm,
-/obj/item/ammo_box/c9mm/ap,
-/obj/item/ammo_box/c9mm/fire,
-/obj/item/ammo_box/c9mm/hp,
-/obj/item/ammo_box/c9mm/rubbershot,
-/obj/item/ammo_box/c9mm/surplus,
-/obj/item/ammo_box/ferrolancebox,
-/obj/item/ammo_box/ferropelletbox,
-/obj/item/ammo_box/ferroslugbox,
-/obj/item/ammo_box/foambox,
-/obj/item/ammo_box/foambox/riot,
-/obj/item/ammo_box/generic,
+/obj/item/storage/box/ammo/a858,
+/obj/item/storage/box/ammo/a858/empty,
+/obj/item/storage/box/ammo/a858_ammo_box,
+/obj/item/storage/box/ammo/amagpellet_claris,
+/obj/item/storage/box/ammo/c10mm,
+/obj/item/storage/box/ammo/c10mm_ap,
+/obj/item/storage/box/ammo/c10mm_ap,
+/obj/item/storage/box/ammo/c10mm_hp,
+/obj/item/storage/box/ammo/c10mm_rubber,
+/obj/item/storage/box/ammo/c10mm_surplus,
+/obj/item/storage/box/ammo/c22lr_box,
+/obj/item/storage/box/ammo/c299,
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38/dumdum,
+/obj/item/storage/box/ammo/c38/empty,
+/obj/item/storage/box/ammo/c38/hotshot,
+/obj/item/storage/box/ammo/c38/iceblox,
+/obj/item/storage/box/ammo/c38/match,
+/obj/item/storage/box/ammo/c38/match/bouncy,
+/obj/item/storage/box/ammo/c38/trac,
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38_hotshot,
+/obj/item/storage/box/ammo/c38_iceblox,
+/obj/item/storage/box/ammo/c38_surplus,
+/obj/item/storage/box/ammo/c45,
+/obj/item/storage/box/ammo/c45_ap,
+/obj/item/storage/box/ammo/c45_ap,
+/obj/item/storage/box/ammo/c45_hp,
+/obj/item/storage/box/ammo/c45_rubber,
+/obj/item/storage/box/ammo/c45_surplus,
+/obj/item/storage/box/ammo/c46x30mm_box,
+/obj/item/storage/box/ammo/c556mmHITP,
+/obj/item/storage/box/ammo/c556mmHITP/ap,
+/obj/item/storage/box/ammo/c556mmHITP/hp,
+/obj/item/storage/box/ammo/c556mmHITP/rubbershot,
+/obj/item/storage/box/ammo/c556mmHITP/surplus,
+/obj/item/storage/box/ammo/c57x39mm_box,
+/obj/item/storage/box/ammo/c8x50mm_box,
+/obj/item/storage/box/ammo/c8x50mmhp_box,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm_ap,
+/obj/item/storage/box/ammo/c9mm_ap,
+/obj/item/storage/box/ammo/c9mm_hp,
+/obj/item/storage/box/ammo/c9mm_rubber,
+/obj/item/storage/box/ammo/c9mm_surplus,
+/obj/item/storage/box/ammo/ferrolancebox,
+/obj/item/storage/box/ammo/ferropelletbox,
+/obj/item/storage/box/ammo/ferroslug,
+/obj/item/storage/box/ammo/foam_darts,
+/obj/item/storage/box/ammo/foam_darts/riot,
+/obj/item/storage/box/ammo/generic,
/obj/item/ammo_box/magazine,
/obj/item/ammo_box/magazine/boomslang,
/obj/item/ammo_box/magazine/boomslang/short,
@@ -1942,7 +1942,7 @@
/obj/item/ammo_box/magazine/recharge/ctf/red,
/obj/item/ammo_box/magazine/recharge/ctf/blue,
/obj/item/ammo_box/magazine/rifle47x33mm,
-/obj/item/ammo_box/magazine/skm_545_39,
+/obj/item/ammo_box/magazine/skm_762_40,
/obj/item/ammo_box/magazine/skm_762_40,
/obj/item/ammo_box/magazine/skm_762_40/drum,
/obj/item/ammo_box/magazine/skm_762_40/empty,
@@ -1951,7 +1951,7 @@
/obj/item/ammo_box/magazine/smgm10mm/rubber,
/obj/item/ammo_box/magazine/smgm9mm,
/obj/item/ammo_box/magazine/smgm9mm/ap,
-/obj/item/ammo_box/magazine/smgm9mm/inc,
+/obj/item/ammo_box/magazine/smgm9mm/rubber,
/obj/item/ammo_box/magazine/smgm9mm/rubber,
/obj/item/ammo_box/magazine/sniper_rounds,
/obj/item/ammo_box/magazine/sniper_rounds/penetrator,
@@ -1970,10 +1970,10 @@
/obj/item/ammo_box/magazine/wt550m9/empty,
/obj/item/ammo_box/magazine/wt550m9/inc,
/obj/item/ammo_box/magazine/zip_ammo_9mm,
-/obj/item/ammo_box/shuffler,
-/obj/item/ammo_box/shuffler/a12g,
-/obj/item/ammo_box/vickland_a308,
-/obj/item/ammo_box/vickland_a308/empty,
+/obj/item/storage/box/ammo/shuffler,
+/obj/item/storage/box/ammo/shuffler/a12g,
+/obj/item/storage/box/ammo/vickland_a308,
+/obj/item/storage/box/ammo/vickland_a308/empty,
/obj/item/ammo_casing,
/obj/item/ammo_casing/a300,
/obj/item/ammo_casing/a308,
@@ -2033,12 +2033,12 @@
/obj/item/ammo_casing/c46x30mm/bof,
/obj/item/ammo_casing/c46x30mm/inc,
/obj/item/ammo_casing/c57x39mm,
-/obj/item/ammo_casing/c9mm,
-/obj/item/ammo_casing/c9mm/ap,
-/obj/item/ammo_casing/c9mm/hp,
-/obj/item/ammo_casing/c9mm/inc,
-/obj/item/ammo_casing/c9mm/rubber,
-/obj/item/ammo_casing/c9mm/surplus,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm_ap,
+/obj/item/storage/box/ammo/c9mm_hp
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm_rubber,
+/obj/item/storage/box/ammo/c9mm_surplus,
/obj/item/ammo_casing/caseless,
/obj/item/ammo_casing/caseless/a75,
/obj/item/ammo_casing/caseless/a858,
@@ -3289,61 +3289,7 @@
/obj/item/robot_module/syndieproto,
/obj/item/robot_module/syndicate_medical,
/obj/item/robot_module/saboteur,
-/obj/item/slime_cookie,
-/obj/item/slime_cookie/grey,
-/obj/item/slime_cookie/orange,
-/obj/item/slime_cookie/purple,
-/obj/item/slime_cookie/blue,
-/obj/item/slime_cookie/metal,
-/obj/item/slime_cookie/yellow,
-/obj/item/slime_cookie/darkpurple,
-/obj/item/slime_cookie/darkblue,
-/obj/item/slime_cookie/silver,
-/obj/item/slime_cookie/bluespace,
-/obj/item/slime_cookie/sepia,
-/obj/item/slime_cookie/cerulean,
-/obj/item/slime_cookie/pyrite,
-/obj/item/slime_cookie/red,
-/obj/item/slime_cookie/green,
-/obj/item/slime_cookie/pink,
-/obj/item/slime_cookie/gold,
-/obj/item/slime_cookie/oil,
-/obj/item/slime_cookie/black,
-/obj/item/slime_cookie/lightpink,
-/obj/item/slime_cookie/adamantine,
-/obj/item/slime_extract,
-/obj/item/slime_extract/grey,
-/obj/item/slime_extract/gold,
-/obj/item/slime_extract/silver,
-/obj/item/slime_extract/metal,
-/obj/item/slime_extract/purple,
-/obj/item/slime_extract/darkpurple,
-/obj/item/slime_extract/orange,
-/obj/item/slime_extract/yellow,
-/obj/item/slime_extract/red,
-/obj/item/slime_extract/blue,
-/obj/item/slime_extract/darkblue,
-/obj/item/slime_extract/pink,
-/obj/item/slime_extract/green,
-/obj/item/slime_extract/lightpink,
-/obj/item/slime_extract/black,
-/obj/item/slime_extract/oil,
-/obj/item/slime_extract/adamantine,
-/obj/item/slime_extract/bluespace,
-/obj/item/slime_extract/pyrite,
-/obj/item/slime_extract/cerulean,
-/obj/item/slime_extract/sepia,
-/obj/item/slime_extract/rainbow,
-/obj/item/slimecross,
-/obj/item/slimecrossbeaker,
-/obj/item/slimecrossbeaker/bloodpack,
-/obj/item/slimecrossbeaker/pax,
-/obj/item/slimecrossbeaker/omnizine,
-/obj/item/slimecrossbeaker/autoinjector,
-/obj/item/slimecrossbeaker/autoinjector/regenpack,
-/obj/item/slimecrossbeaker/autoinjector/slimejelly,
-/obj/item/slimecrossbeaker/autoinjector/peaceandlove,
-/obj/item/slimecrossbeaker/autoinjector/slimestimulant,
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
/obj/item/slimepotion,
/obj/item/slimepotion/slime/docility,
/obj/item/slimepotion/slime/sentience,
@@ -3695,7 +3641,7 @@
/obj/item/stamp/artificer,
/obj/item/stamp/clip,
/obj/item/stamp/gold,
-/obj/item/stamp/bard,
+/obj/item/stamp/clip/bard,
/obj/item/stamp/suns,
/obj/item/stock_parts,
/obj/item/stock_parts/capacitor,
@@ -3776,7 +3722,7 @@
/obj/item/storage/belt/mining/vendor,
/obj/item/storage/belt/mining/alt,
/obj/item/storage/belt/mining/primitive,
-/obj/item/storage/belt/soulstone,
+/obj/item/storage/belt/chameleon,
/obj/item/storage/belt/champion,
/obj/item/storage/belt/military,
/obj/item/storage/belt/military/snack,
@@ -3921,7 +3867,7 @@
/obj/item/storage/box/stockparts/t3,
/obj/item/storage/box/stockparts/deluxe,
/obj/item/storage/box/dishdrive,
-/obj/item/storage/box/inteqmaid,
+/obj/item/storage/box/maid,
/obj/item/storage/box/syndimaid,
/obj/item/storage/box/maid,
/obj/item/storage/box/material,
@@ -4020,25 +3966,25 @@
/obj/item/storage/guncase/brimstone,
/obj/item/storage/guncase/illestren,
/obj/item/storage/guncase/wt550,
-/obj/item/storage/pistolcase,
-/obj/item/storage/pistolcase/modelh,
-/obj/item/storage/pistolcase/ringneck,
-/obj/item/storage/pistolcase/candor,
-/obj/item/storage/pistolcase/detective,
-/obj/item/storage/pistolcase/shadow,
-/obj/item/storage/pistolcase/viper,
-/obj/item/storage/pistolcase/commander,
-/obj/item/storage/pistolcase/firebrand,
-/obj/item/storage/pistolcase/derringer,
-/obj/item/storage/pistolcase/a357,
-/obj/item/storage/pistolcase/montagne,
-/obj/item/storage/pistolcase/disposable,
-/obj/item/storage/pistolcase/laser,
-/obj/item/storage/pistolcase/egun,
-/obj/item/storage/pistolcase/kalixpistol,
+/obj/item/storage/guncase/pistol,
+/obj/item/storage/guncase/pistol/modelh,
+/obj/item/storage/guncase/pistol/ringneck,
+/obj/item/storage/guncase/pistol/candor,
+/obj/item/storage/guncase/pistol/detective,
+/obj/item/storage/guncase/pistol/shadow,
+/obj/item/storage/guncase/pistol/viper,
+/obj/item/storage/guncase/pistol/commander,
+/obj/item/storage/guncase/pistol/firebrand,
+/obj/item/storage/guncase/pistol/derringer,
+/obj/item/storage/guncase/pistol/a357,
+/obj/item/storage/guncase/pistol/montagne,
+/obj/item/storage/guncase/pistol/disposable,
+/obj/item/storage/guncase/pistol/laser,
+/obj/item/storage/guncase/pistol/egun,
+/obj/item/storage/guncase/pistol/kalixpistol,
/obj/item/storage/guncase/kalixrifle,
-/obj/item/storage/pistolcase/miniegun,
-/obj/item/storage/pistolcase/iongun,
+/obj/item/storage/guncase/pistol/miniegun,
+/obj/item/storage/guncase/pistol/iongun,
/obj/item/storage/lockbox,
/obj/item/storage/lockbox/loyalty,
/obj/item/storage/lockbox/clusterbang,
@@ -4170,7 +4116,7 @@
/obj/item/toy/snappop/phoenix,
/obj/item/toy/talking,
/obj/item/toy/talking/AI,
-/obj/item/toy/talking/codex_gigas,
+/obj/item/storage/book/bible,
/obj/item/toy/talking/owl,
/obj/item/toy/talking/griffin,
/obj/item/toy/cards,
@@ -4449,8 +4395,8 @@
/obj/item/gun/ballistic/automatic/assault/skm/no_mag,
/obj/item/gun/ballistic/automatic/assault/skm/pirate,
/obj/item/gun/ballistic/automatic/assault/skm/inteq,
-/obj/item/gun/ballistic/automatic/assault/p16,
-/obj/item/gun/ballistic/automatic/assault/p16/no_mag,
+/obj/item/gun/ballistic/automatic/assault/cm82,
+/obj/item/gun/ballistic/automatic/assault/cm82/no_mag,
/obj/item/gun/ballistic/automatic/assault/cm82,
/obj/item/gun/ballistic/automatic/assault/swiss_cheese,
/obj/item/gun/ballistic/automatic/assault/e40,
@@ -4509,7 +4455,7 @@
/obj/item/gun/ballistic/revolver/firebrand,
/obj/item/gun/ballistic/revolver/firebrand/no_mag,
/obj/item/gun/ballistic/revolver/shadow,
-/obj/item/gun/ballistic/revolver/shadow/no_mag,
+/obj/item/gun/ballistic/revolver/shadow/empty,
/obj/item/gun/ballistic/rifle,
/obj/item/gun/ballistic/rifle/illestren,
/obj/item/gun/ballistic/rifle/illestren/empty,
@@ -4560,7 +4506,7 @@
/obj/item/gun/ballistic/automatic/smg/firestorm/pan,
/obj/item/gun/ballistic/automatic/smg/skm_carbine,
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq,
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto,
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq,
/obj/item/gun/ballistic/automatic/toy,
/obj/item/gun/ballistic/automatic/toy/pistol,
/obj/item/gun/ballistic/automatic/toy/pistol/riot,
@@ -5119,12 +5065,12 @@
/obj/item/melee/transforming/energy/sword/saber/green,
/obj/item/melee/transforming/energy/sword/saber/purple,
/obj/item/melee/transforming/energy/sword/saber/yellow,
-/obj/item/melee/transforming/energy/sword/saber/pirate,
-/obj/item/melee/transforming/energy/sword/saber/pirate/red,
-/obj/item/melee/transforming/energy/sword/saber/pirate/blue,
-/obj/item/melee/transforming/energy/sword/saber/pirate/green,
-/obj/item/melee/transforming/energy/sword/saber/pirate/purple,
-/obj/item/melee/transforming/energy/sword/saber/pirate/yellow,
+/obj/item/melee/energy/sword/saber/pirate,
+/obj/item/melee/energy/sword/saber/pirate/red,
+/obj/item/melee/energy/sword/saber/pirate/blue,
+/obj/item/melee/energy/sword/saber/pirate/green,
+/obj/item/melee/energy/sword/saber/pirate/purple,
+/obj/item/melee/energy/sword/saber/pirate/yellow,
/obj/item/melee/transforming/energy/blade,
/obj/item/melee/transforming/energy/blade/hardlight,
/obj/item/melee/transforming/energy/ctf,
@@ -5629,7 +5575,7 @@
/turf/open/space/basic,
/area/ruin/space/has_grav)
"mJ" = (
-/turf/open/floor/plating/beach/sand,
+/turf/open/floor/plating/asteroid/sand/lit,
/area/space)
"mM" = (
/turf/open/space/transit/south,
@@ -6556,7 +6502,7 @@
/obj/item/clothing/under/frontiersmen/officer,
/obj/item/clothing/under/frontiersmen/admiral,
/obj/item/clothing/suit/frontiersmen,
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier,
+/obj/item/clothing/suit/armor/vest/frontier,
/obj/item/clothing/suit/armor/vest/marine/frontier,
/obj/item/clothing/suit/armor/frontier,
/obj/item/clothing/suit/armor/frontier/fireproof,
@@ -6873,7 +6819,7 @@
/obj/item/clothing/under/color/lightbrown,
/obj/item/clothing/under/color/jumpskirt/lightbrown,
/obj/item/clothing/under/color/khaki,
-/obj/item/clothing/under/color/khaki/buster,
+/obj/item/clothing/glasses/welding/ghostbuster,
/obj/item/clothing/under/color/brown,
/obj/item/clothing/under/color/jumpskirt/brown,
/obj/item/clothing/under/color/maroon,
@@ -6915,14 +6861,14 @@
/obj/item/clothing/under/dress/striped,
/obj/item/clothing/under/dress/sailor,
/obj/item/clothing/under/dress/redeveninggown,
-/obj/item/clothing/under/dress/skirt,
-/obj/item/clothing/under/dress/skirt/blue,
-/obj/item/clothing/under/dress/skirt/red,
-/obj/item/clothing/under/dress/skirt/purple,
-/obj/item/clothing/under/dress/skirt/plaid,
-/obj/item/clothing/under/dress/skirt/plaid/blue,
-/obj/item/clothing/under/dress/skirt/plaid/purple,
-/obj/item/clothing/under/dress/skirt/plaid/green,
+/obj/item/clothing/under/dress/skirt/color,
+/obj/item/clothing/under/dress/skirt/color/blue,
+/obj/item/clothing/under/dress/skirt/color/red,
+/obj/item/clothing/under/dress/skirt/color/purple,
+/obj/item/clothing/under/dress/skirt/color/plaid,
+/obj/item/clothing/under/dress/skirt/color/plaid/blue,
+/obj/item/clothing/under/dress/skirt/color/plaid/purple,
+/obj/item/clothing/under/dress/skirt/color/plaid/green,
/obj/item/clothing/under/dress/rilena,
/obj/item/clothing/head/helmet/riot/gamma_vision,
/obj/item/clothing/head/helmet/space/hardsuit/security/gamma/white_squadron_rig,
@@ -7430,7 +7376,7 @@
/obj/item/storage/box/stockparts/t3,
/obj/item/storage/box/stockparts/deluxe,
/obj/item/storage/box/dishdrive,
-/obj/item/storage/box/inteqmaid,
+/obj/item/storage/box/maid,
/obj/item/storage/box/syndimaid,
/obj/item/storage/box/maid,
/obj/item/storage/box/material,
@@ -7561,7 +7507,7 @@
/obj/item/key/lasso,
/obj/item/storage/belt/mining/vendor,
/obj/item/storage/belt/mining/primitive,
-/obj/item/storage/belt/soulstone,
+/obj/item/storage/belt/chameleon,
/obj/item/storage/belt/champion,
/obj/item/storage/belt/military,
/obj/item/storage/belt/military/snack,
@@ -7792,7 +7738,7 @@
/obj/item/clothing/head/nun_hood,
/obj/item/clothing/head/nursehat,
/obj/item/clothing/head/papersack,
-/obj/item/clothing/head/peaceflower,
+/obj/item/clothing/head/plastic_flower,
/obj/item/clothing/head/pharaoh,
/obj/item/clothing/head/pirate,
/obj/item/clothing/head/plaguedoctorhat,
@@ -7854,10 +7800,7 @@
/obj/item/clothing/head/helmet,
/obj/item/clothing/head/helmet/sec,
/obj/item/clothing/head/helmet/bulletproof,
-/obj/item/clothing/head/helmet/marine,
-/obj/item/clothing/head/helmet/marine/security,
-/obj/item/clothing/head/helmet/marine/engineer,
-/obj/item/clothing/head/helmet/marine/medic,
+/obj/item/clothing/head/helmet/gezena,
/obj/item/clothing/head/helmet/old,
/obj/item/clothing/head/helmet/blueshirt,
/obj/item/clothing/head/helmet/riot,
@@ -8360,7 +8303,7 @@
/obj/machinery/porta_turret/syndicate/energy/raven,
/obj/machinery/porta_turret/syndicate/pod,
/obj/machinery/porta_turret/syndicate/shuttle,
-/obj/machinery/porta_turret/ai,
+/obj/machinery/porta_turret,
/obj/machinery/porta_turret/ship,
/obj/machinery/porta_turret/ship/weak,
/obj/machinery/porta_turret/ship/ballistic,
@@ -8744,10 +8687,10 @@
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/obj/machinery/portable_atmospherics/canister/air,
/obj/machinery/portable_atmospherics/canister/tritium,
-/obj/machinery/portable_atmospherics/canister/nob,
-/obj/machinery/portable_atmospherics/canister/nitryl,
-/obj/machinery/portable_atmospherics/canister/stimulum,
-/obj/machinery/portable_atmospherics/canister/pluoxium,
+/obj/machinery/portable_atmospherics/canister/freon,
+/obj/machinery/portable_atmospherics/canister/freon,
+/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/toxins,
/obj/machinery/portable_atmospherics/canister/water_vapor,
/obj/machinery/portable_atmospherics/canister/freon,
/obj/machinery/portable_atmospherics/canister/hydrogen,
@@ -8816,8 +8759,6 @@
/obj/machinery/smartfridge/drying_rack,
/obj/machinery/smartfridge/drinks,
/obj/machinery/smartfridge/food,
-/obj/machinery/smartfridge/extract,
-/obj/machinery/smartfridge/extract/preloaded,
/obj/machinery/smartfridge/organ,
/obj/machinery/smartfridge/chemistry,
/obj/machinery/smartfridge/chemistry/preloaded,
@@ -9150,7 +9091,7 @@
/obj/machinery/vending/clothing,
/obj/machinery/vending/coffee,
/obj/machinery/vending/cola,
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/machinery/vending/cola/blue,
/obj/machinery/vending/cola/black,
/obj/machinery/vending/cola/red,
@@ -9178,7 +9119,7 @@
/obj/machinery/vending/security/marine/syndicate,
/obj/machinery/vending/security/marine/nanotrasen,
/obj/machinery/vending/snack,
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/machinery/vending/snack/blue,
/obj/machinery/vending/snack/orange,
/obj/machinery/vending/snack/green,
@@ -9266,7 +9207,7 @@
/obj/structure/shuttle/engine/router,
/obj/structure/shuttle/engine/large,
/obj/structure/shuttle/engine/huge,
-/obj/structure/mecha_wreckage/honker/dark,
+/obj/structure/mecha_wreckage/honker,
/obj/structure/door_assembly,
/obj/structure/frame,
/obj/structure/frame/machine,
@@ -10329,7 +10270,7 @@
/obj/structure/disposalpipe/broken,
/obj/structure/altar_of_gods,
/obj/structure/barricade/slime,
-/obj/structure/ice_stasis,
+/obj/structure/chair,
/obj/structure/puzzle_element,
/obj/structure/puzzle_element/prison,
/obj/structure/lavaland/ash_walker,
@@ -10699,7 +10640,7 @@
/mob/living/simple_animal/hostile/hivebot/rapid,
/mob/living/simple_animal/hostile/hivebot/rapid/rockplanet,
/mob/living/simple_animal/hostile/hivebot/strong,
-/mob/living/simple_animal/hostile/hivebot/strong/rockplanet,
+/mob/living/simple_animal/hostile/hivebot/strong,
/mob/living/simple_animal/hostile/hivebot/mechanic,
/mob/living/simple_animal/hostile/hivebot/wasteplanet,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged,
@@ -10736,7 +10677,7 @@
/mob/living/simple_animal/hostile/asteroid/fugu/asteroid,
/mob/living/simple_animal/hostile/boss,
/mob/living/simple_animal/hostile/gorilla,
-/mob/living/simple_animal/hostile/human/cat_butcherer,
+/mob/living/simple_animal/hostile/clown/clownhulk/honcmunculus,
/mob/living/simple_animal/hostile/human/frontier,
/mob/living/simple_animal/hostile/human/frontier/internals,
/mob/living/simple_animal/hostile/human/frontier/ranged,
@@ -10761,8 +10702,8 @@
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle/neutered,
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy,
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/internals,
-/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/neutered,
-/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/neutered,
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/internals/neutered,
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/internals/neutered,
/mob/living/simple_animal/hostile/human/frontier/ranged/officer,
/mob/living/simple_animal/hostile/human/frontier/ranged/officer/internals,
/mob/living/simple_animal/hostile/human/frontier/ranged/officer/internals/neutered,
@@ -11138,7 +11079,7 @@
/turf/open/space/basic,
/area/ruin/beach/piratecrash/storage)
"sx" = (
-/turf/open/floor/sepia,
+/turf/open/floor/plasteel/sepia,
/area/space)
"sz" = (
/turf/open/space/basic,
@@ -13927,7 +13868,9 @@
/obj/effect/spawner/bundle/costume/madscientist,
/obj/effect/spawner/bundle/costume/mafia,
/obj/effect/spawner/bundle/costume/maid,
-/obj/effect/spawner/bundle/costume/marisawizard,
+/obj/item/clothing/head/wizard/marisa/fake,
+/obj/item/clothing/suit/wizrobe/marisa/fake,
+/obj/item/clothing/shoes/wizrobe/marisa,
/obj/effect/spawner/bundle/costume/nightowl,
/obj/effect/spawner/bundle/costume/nyangirl,
/obj/effect/spawner/bundle/costume/pirate,
@@ -13938,135 +13881,135 @@
/obj/effect/spawner/bunk_bed,
/obj/effect/spawner/clawloot,
/obj/effect/spawner/clawloot/crusher,
-/obj/effect/spawner/lootdrop,
-/obj/effect/spawner/lootdrop/aimodule_harmful,
-/obj/effect/spawner/lootdrop/aimodule_harmless,
-/obj/effect/spawner/lootdrop/aimodule_neutral,
-/obj/effect/spawner/lootdrop/anomaly,
-/obj/effect/spawner/lootdrop/anomaly/beach,
-/obj/effect/spawner/lootdrop/anomaly/beach/cave,
-/obj/effect/spawner/lootdrop/anomaly/big,
-/obj/effect/spawner/lootdrop/anomaly/dangerous,
-/obj/effect/spawner/lootdrop/anomaly/ice,
-/obj/effect/spawner/lootdrop/anomaly/ice/cave,
-/obj/effect/spawner/lootdrop/anomaly/jungle,
-/obj/effect/spawner/lootdrop/anomaly/jungle/cave,
-/obj/effect/spawner/lootdrop/anomaly/lava,
-/obj/effect/spawner/lootdrop/anomaly/lava/cave,
-/obj/effect/spawner/lootdrop/anomaly/rock,
-/obj/effect/spawner/lootdrop/anomaly/rock/cave,
-/obj/effect/spawner/lootdrop/anomaly/safe,
-/obj/effect/spawner/lootdrop/anomaly/sand,
-/obj/effect/spawner/lootdrop/anomaly/sand/cave,
-/obj/effect/spawner/lootdrop/anomaly/storm,
-/obj/effect/spawner/lootdrop/anomaly/waste,
-/obj/effect/spawner/lootdrop/anomaly/waste/cave,
-/obj/effect/spawner/lootdrop/armory_contraband,
-/obj/effect/spawner/lootdrop/armory_contraband/donutstation,
-/obj/effect/spawner/lootdrop/armory_contraband/metastation,
-/obj/effect/spawner/lootdrop/beaker_loot_spawner,
-/obj/effect/spawner/lootdrop/chicken,
-/obj/effect/spawner/lootdrop/chicken/jungle,
-/obj/effect/spawner/lootdrop/chicken/jungle/flock,
-/obj/effect/spawner/lootdrop/costume,
-/obj/effect/spawner/lootdrop/crate_spawner,
-/obj/effect/spawner/lootdrop/destructive_anal_loot,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donut,
-/obj/effect/spawner/lootdrop/donut/slimejelly,
-/obj/effect/spawner/lootdrop/flora,
-/obj/effect/spawner/lootdrop/flower,
-/obj/effect/spawner/lootdrop/gambling,
-/obj/effect/spawner/lootdrop/garden,
-/obj/effect/spawner/lootdrop/garden/arid,
-/obj/effect/spawner/lootdrop/garden/cold,
-/obj/effect/spawner/lootdrop/garden/seaweed,
-/obj/effect/spawner/lootdrop/garden/sick,
-/obj/effect/spawner/lootdrop/gloves,
-/obj/effect/spawner/lootdrop/glowstick,
-/obj/effect/spawner/lootdrop/grille_or_trash,
-/obj/effect/spawner/lootdrop/hivebotspawner,
-/obj/effect/spawner/lootdrop/lpaid,
-/obj/effect/spawner/lootdrop/lpretrieval,
-/obj/effect/spawner/lootdrop/mafia_outfit,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance/eight,
-/obj/effect/spawner/lootdrop/maintenance/five,
-/obj/effect/spawner/lootdrop/maintenance/four,
-/obj/effect/spawner/lootdrop/maintenance/seven,
-/obj/effect/spawner/lootdrop/maintenance/six,
-/obj/effect/spawner/lootdrop/maintenance/three,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/obj/effect/spawner/lootdrop/materials,
-/obj/effect/spawner/lootdrop/memeorgans,
-/obj/effect/spawner/lootdrop/mine,
-/obj/effect/spawner/lootdrop/minebot,
-/obj/effect/spawner/lootdrop/minor,
-/obj/effect/spawner/lootdrop/minor/beret_or_rabbitears,
-/obj/effect/spawner/lootdrop/minor/bowler_or_that,
-/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
-/obj/effect/spawner/lootdrop/minor/pirate_or_bandana,
-/obj/effect/spawner/lootdrop/minor/twentyfive_percent_cyborg_mask,
-/obj/effect/spawner/lootdrop/plushie,
-/obj/effect/spawner/lootdrop/plushie/moth,
-/obj/effect/spawner/lootdrop/prison_contraband,
-/obj/effect/spawner/lootdrop/random_ammo_protolathe_lootdrop,
-/obj/effect/spawner/lootdrop/random_computer_circuit_common,
-/obj/effect/spawner/lootdrop/random_computer_circuit_rare,
-/obj/effect/spawner/lootdrop/random_gun_protolathe_lootdrop,
-/obj/effect/spawner/lootdrop/random_machine_circuit_common,
-/obj/effect/spawner/lootdrop/random_machine_circuit_mech,
-/obj/effect/spawner/lootdrop/random_machine_circuit_rare,
-/obj/effect/spawner/lootdrop/random_prosthetic,
-/obj/effect/spawner/lootdrop/randomimprinter,
-/obj/effect/spawner/lootdrop/randomprotolathe,
-/obj/effect/spawner/lootdrop/randomtechfab,
-/obj/effect/spawner/lootdrop/randomthreat,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ripley,
-/obj/effect/spawner/lootdrop/rnd,
-/obj/effect/spawner/lootdrop/salvage,
-/obj/effect/spawner/lootdrop/salvage_50,
-/obj/effect/spawner/lootdrop/salvage_capacitor,
-/obj/effect/spawner/lootdrop/salvage_laser,
-/obj/effect/spawner/lootdrop/salvage_machine,
-/obj/effect/spawner/lootdrop/salvage_manipulator,
-/obj/effect/spawner/lootdrop/salvage_matter_bin,
-/obj/effect/spawner/lootdrop/salvage_scanning,
-/obj/effect/spawner/lootdrop/seeded,
-/obj/effect/spawner/lootdrop/singularitygen,
-/obj/effect/spawner/lootdrop/snowdin,
-/obj/effect/spawner/lootdrop/spiderspawner,
-/obj/effect/spawner/lootdrop/stockparts,
-/obj/effect/spawner/lootdrop/techstorage,
-/obj/effect/spawner/lootdrop/thirtyfive_percent_borerspawner,
-/obj/effect/spawner/lootdrop/three_course_meal,
-/obj/effect/spawner/lootdrop/tool_engie_adv,
-/obj/effect/spawner/lootdrop/tool_engie_common,
-/obj/effect/spawner/lootdrop/tool_engie_proto,
-/obj/effect/spawner/lootdrop/tool_engie_sydnie,
-/obj/effect/spawner/lootdrop/tool_surgery_adv,
-/obj/effect/spawner/lootdrop/tool_surgery_common,
-/obj/effect/spawner/lootdrop/tool_surgery_proto,
-/obj/effect/spawner/lootdrop/two_percent_xeno_egg_spawner,
-/obj/effect/spawner/lootdrop/waste,
-/obj/effect/spawner/lootdrop/xenoqueenspawner,
-/obj/effect/spawner/lootdrop/xenospawner,
-/obj/effect/spawner/lootdrop/waste/atmos_can,
-/obj/effect/spawner/lootdrop/waste/girder,
-/obj/effect/spawner/lootdrop/waste/grille_or_trash,
-/obj/effect/spawner/lootdrop/waste/grille_or_trash,
-/obj/effect/spawner/lootdrop/waste/hivebot,
-/obj/effect/spawner/lootdrop/waste/mechwreck,
-/obj/effect/spawner/lootdrop/waste/radiation,
-/obj/effect/spawner/lootdrop/waste/salvageable,
-/obj/effect/spawner/lootdrop/waste/trash,
-/obj/effect/spawner/lootdrop/waste/radiation/more_rads,
-/obj/effect/spawner/lootdrop/waste/mechwreck/rare,
-/obj/effect/spawner/lootdrop/waste/hivebot/beacon,
-/obj/effect/spawner/lootdrop/waste/atmos_can/rare,
-/obj/effect/spawner/lootdrop/xenoqueenspawner,
-/obj/effect/spawner/lootdrop/xenospawner,
+/obj/effect/spawner/random,
+/obj/effect/spawner/random/aimodule_harmful,
+/obj/effect/spawner/random/aimodule_harmless,
+/obj/effect/spawner/random/aimodule_neutral,
+/obj/effect/spawner/random/anomaly,
+/obj/effect/spawner/random/anomaly/beach,
+/obj/effect/spawner/random/anomaly/beach/cave,
+/obj/effect/spawner/random/anomaly/big,
+/obj/effect/spawner/random/anomaly/dangerous,
+/obj/effect/spawner/random/anomaly/ice,
+/obj/effect/spawner/random/anomaly/ice/cave,
+/obj/effect/spawner/random/anomaly/jungle,
+/obj/effect/spawner/random/anomaly/jungle/cave,
+/obj/effect/spawner/random/anomaly/lava,
+/obj/effect/spawner/random/anomaly/lava/cave,
+/obj/effect/spawner/random/anomaly/rock,
+/obj/effect/spawner/random/anomaly/rock/cave,
+/obj/effect/spawner/random/anomaly/safe,
+/obj/effect/spawner/random/anomaly/sand,
+/obj/effect/spawner/random/anomaly/sand/cave,
+/obj/effect/spawner/random/anomaly/storm,
+/obj/effect/spawner/random/anomaly/waste,
+/obj/effect/spawner/random/anomaly/waste/cave,
+/obj/effect/spawner/random/exotic/armory,
+/obj/effect/spawner/random/armory_contraband/donutstation,
+/obj/effect/spawner/random/exotic/armory,
+/obj/effect/spawner/random/medical/beaker,
+/obj/effect/spawner/random/chicken,
+/obj/effect/spawner/random/chicken/jungle,
+/obj/effect/spawner/random/chicken/jungle/flock,
+/obj/effect/spawner/random/clothing/costume,
+/obj/effect/spawner/random/structure/crate_abandoned,
+/obj/effect/spawner/random/destructive_anal_loot,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donut,
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
+/obj/effect/spawner/random/flora,
+/obj/effect/spawner/random/flower,
+/obj/effect/spawner/random/entertainment/gambling,
+/obj/effect/spawner/random/garden,
+/obj/effect/spawner/random/garden/arid,
+/obj/effect/spawner/random/garden/cold,
+/obj/effect/spawner/random/food_or_drink/garden/seaweed,
+/obj/effect/spawner/random/garden/sick,
+/obj/effect/spawner/random/clothing/gloves,
+/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/random/waste/grille_or_trash,
+/obj/effect/spawner/random/hivebotspawner,
+/obj/effect/spawner/random/lpaid,
+/obj/effect/spawner/random/lpretrieval,
+/obj/effect/spawner/random/clothing/mafia_outfit,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance/eight,
+/obj/effect/spawner/random/maintenance/five,
+/obj/effect/spawner/random/maintenance/four,
+/obj/effect/spawner/random/maintenance/seven,
+/obj/effect/spawner/random/maintenance/six,
+/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/random/materials,
+/obj/effect/spawner/random/medical/memeorgans,
+/obj/effect/spawner/random/mine,
+/obj/effect/spawner/random/minebot,
+/obj/effect/spawner/random/minor,
+/obj/effect/spawner/random/minor/beret_or_rabbitears,
+/obj/effect/spawner/random/minor/bowler_or_that,
+/obj/effect/spawner/random/clothing/kittyears_or_rabbitears,
+/obj/effect/spawner/random/clothing/pirate_or_bandana,
+/obj/effect/spawner/random/minor/twentyfive_percent_cyborg_mask,
+/obj/effect/spawner/random/entertainment/plushie,
+/obj/effect/spawner/random/entertainment/plushie/moth,
+/obj/effect/spawner/random/stockparts,
+/obj/effect/spawner/random/random_ammo_protolathe_lootdrop,
+/obj/effect/spawner/random/circuit/computer/common,
+/obj/effect/spawner/random/circuit/computer/rare,
+/obj/effect/spawner/random/random_gun_protolathe_lootdrop,
+/obj/effect/spawner/random/circuit/machine/common,
+/obj/effect/spawner/random/circuit/machine/mech,
+/obj/effect/spawner/random/circuit/machine/rare,
+/obj/effect/spawner/random/medical/prosthetic,
+/obj/effect/spawner/random/randomimprinter,
+/obj/effect/spawner/random/randomprotolathe,
+/obj/effect/spawner/random/randomtechfab,
+/obj/effect/spawner/random/randomthreat,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/exotic/ripley,
+/obj/effect/spawner/random/rnd,
+/obj/effect/spawner/random/salvage,
+/obj/effect/spawner/random/salvage_50,
+/obj/effect/spawner/random/salvage_capacitor,
+/obj/effect/spawner/random/salvage_laser,
+/obj/effect/spawner/random/salvage_machine,
+/obj/effect/spawner/random/salvage_manipulator,
+/obj/effect/spawner/random/salvage_matter_bin,
+/obj/effect/spawner/random/salvage_scanning,
+/obj/effect/spawner/random/seeded,
+/obj/effect/spawner/random/singularitygen,
+/obj/effect/spawner/random/snowdin,
+/obj/effect/spawner/random/spiderspawner,
+/obj/effect/spawner/random/stockparts,
+/obj/effect/spawner/random/techstorage,
+/obj/effect/spawner/random/thirtyfive_percent_borerspawner,
+/obj/effect/spawner/random/food_or_drink/three_course_meal,
+/obj/effect/spawner/random/engineering/tool/adv,
+/obj/effect/spawner/random/engineering/tool/common,
+/obj/effect/spawner/random/engineering/tool,
+/obj/effect/spawner/random/engineering/tool/sydnie,
+/obj/effect/spawner/random/medical/surgery_tool/adv,
+/obj/effect/spawner/random/medical/surgery_tool/common,
+/obj/effect/spawner/random/medical/surgery_tool/common,
+/obj/effect/spawner/random/two_percent_xeno_egg_spawner,
+/obj/effect/spawner/random/waste,
+/obj/effect/spawner/random/xenoqueenspawner,
+/obj/effect/spawner/random/xenospawner,
+/obj/effect/spawner/random/waste/atmos_can,
+/obj/effect/spawner/random/waste/girder,
+/obj/effect/spawner/random/waste/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
+/obj/effect/spawner/random/waste/hivebot,
+/obj/effect/spawner/random/waste/mechwreck,
+/obj/effect/spawner/random/waste/radiation,
+/obj/effect/spawner/random/waste/salvageable,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/waste/radiation/more_rads,
+/obj/effect/spawner/random/waste/mechwreck/rare,
+/obj/effect/spawner/random/waste/hivebot/beacon,
+/obj/effect/spawner/random/waste/atmos_can/rare,
+/obj/effect/spawner/random/xenoqueenspawner,
+/obj/effect/spawner/random/xenospawner,
/obj/effect/spawner/minefield,
/obj/effect/spawner/minefield/manhack,
/obj/effect/spawner/minefield/random,
@@ -14545,35 +14488,15 @@
/obj/structure/statue,
/obj/structure/statue/uranium,
/obj/structure/statue/uranium/nuke,
-/obj/structure/statue/uranium/eng,
-/obj/structure/statue/plasma,
-/obj/structure/statue/plasma/scientist,
-/obj/structure/statue/gold,
-/obj/structure/statue/gold/hos,
-/obj/structure/statue/gold/head_of_personnel,
-/obj/structure/statue/gold/cmo,
-/obj/structure/statue/gold/ce,
-/obj/structure/statue/gold/rd,
-/obj/structure/statue/silver,
-/obj/structure/statue/silver/md,
-/obj/structure/statue/silver/janitor,
-/obj/structure/statue/silver/sec,
-/obj/structure/statue/silver/secborg,
-/obj/structure/statue/silver/medborg,
-/obj/structure/statue/diamond,
-/obj/structure/statue/diamond/captain,
-/obj/structure/statue/diamond/ai1,
-/obj/structure/statue/diamond/ai2,
-/obj/structure/statue/bananium,
-/obj/structure/statue/bananium/clown,
+/obj/structure/statue/bronze/masson_kills,
/obj/structure/statue/sandstone,
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/obj/structure/statue/sandstone/venus,
/obj/structure/statue/snow,
/obj/structure/statue/snow/snowman,
/obj/structure/statue/snow/snowlegion,
/obj/structure/statue/bronze,
-/obj/structure/statue/bronze/marx,
+/obj/item/statuebust,
/obj/structure/statue/bone,
/obj/structure/statue/bone/rib,
/obj/structure/statue/bone/skull,
diff --git a/_maps/_mod_celadon/outpost/elysium_asteroid.dmm b/_maps/_mod_celadon/outpost/elysium_asteroid.dmm
index 0e6893951323..0b66a2007ffa 100644
--- a/_maps/_mod_celadon/outpost/elysium_asteroid.dmm
+++ b/_maps/_mod_celadon/outpost/elysium_asteroid.dmm
@@ -52,7 +52,7 @@
"aj" = (
/obj/structure/table/scrap,
/obj/machinery/light/small/directional/south,
-/obj/effect/spawner/lootdrop/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
/turf/open/floor/concrete,
/area/outpost/hallway/central)
"ak" = (
@@ -95,7 +95,7 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/outpost/fraction/inteq)
"as" = (
-/obj/effect/spawner/lootdrop/stockparts,
+/obj/effect/spawner/random/stockparts,
/obj/structure/lattice,
/turf/open/space/basic,
/area/outpost/external)
@@ -177,7 +177,7 @@
/area/outpost/vacant_rooms)
"aD" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/mafia_outfit,
+/obj/effect/spawner/random/clothing/mafia_outfit,
/turf/open/floor/wood/walnut,
/area/outpost/fraction/syndi/donkco_shop)
"aE" = (
@@ -1014,7 +1014,7 @@
/turf/closed/indestructible/reinforced,
/area/outpost/maintenance/aft)
"cM" = (
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance/eight,
/obj/structure/lattice,
/turf/open/space/basic,
/area/outpost/external)
@@ -1496,7 +1496,7 @@
/area/outpost/crew/canteen)
"dV" = (
/obj/machinery/light/small/directional/south,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/outpost/hallway/central)
@@ -1661,7 +1661,7 @@
/area/outpost/hallway/central)
"es" = (
/obj/effect/turf_decal/box/corners,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/mono,
/area/outpost/cargo/faction/solfed)
"et" = (
@@ -1999,7 +1999,7 @@
/turf/open/floor/plasteel/white,
/area/outpost/crew/library)
"fm" = (
-/obj/effect/spawner/lootdrop/flora,
+/obj/effect/spawner/random/flora,
/obj/effect/turf_decal/siding/wood{
dir = 1
},
@@ -2086,7 +2086,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 8
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/outpost/hallway/central)
@@ -2779,7 +2779,7 @@
"hl" = (
/obj/structure/closet/crate/goldcrate,
/obj/item/surgical_processor,
-/obj/effect/spawner/lootdrop/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
/turf/open/floor/concrete,
/area/outpost/hallway/central)
"hm" = (
@@ -3003,7 +3003,7 @@
/turf/open/floor/wood/ebony,
/area/outpost/fraction/solfed)
"hU" = (
-/obj/effect/spawner/lootdrop/waste/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/outpost/hallway/central)
"hV" = (
@@ -3068,7 +3068,7 @@
/turf/open/floor/plasteel/tech,
/area/outpost/cargo/office)
"id" = (
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/turf/open/floor/plating/dirt/rockplanet,
/area/outpost/hallway/central)
"ie" = (
@@ -3134,7 +3134,7 @@
/turf/open/floor/plating/foam,
/area/outpost/hallway/central)
"io" = (
-/obj/effect/spawner/lootdrop/tool_engie_common,
+/obj/effect/spawner/random/engineering/tool/common,
/obj/structure/closet/crate,
/turf/open/floor/plasteel/rockvault,
/area/outpost/hallway/central)
@@ -3632,7 +3632,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 9
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/outpost/hallway/central)
@@ -4031,7 +4031,7 @@
dir = 4;
pixel_x = 3
},
-/obj/effect/spawner/lootdrop/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
/obj/structure/window/reinforced/spawner{
dir = 8;
pixel_x = -2
@@ -4219,7 +4219,7 @@
dir = 1;
pixel_y = 5
},
-/obj/effect/spawner/lootdrop/mine,
+/obj/effect/spawner/random/mine,
/obj/structure/lattice,
/turf/open/space/basic,
/area/outpost/external)
@@ -4649,7 +4649,7 @@
/turf/open/floor/plasteel/rockvault,
/area/outpost/hallway/central)
"mh" = (
-/obj/effect/spawner/lootdrop/tool_engie_common,
+/obj/effect/spawner/random/engineering/tool/common,
/obj/structure/table/reinforced,
/obj/item/phone{
pixel_y = 12
@@ -4788,7 +4788,7 @@
/turf/open/floor/wood,
/area/outpost/operations)
"mC" = (
-/obj/effect/spawner/lootdrop/stockparts,
+/obj/effect/spawner/random/stockparts,
/turf/open/floor/plating/rust,
/area/outpost/hallway/central)
"mD" = (
@@ -4894,10 +4894,10 @@
},
/area/outpost/maintenance/fore)
"mT" = (
-/obj/effect/spawner/lootdrop/tool_engie_sydnie,
-/obj/effect/spawner/lootdrop/tool_engie_sydnie,
+/obj/effect/spawner/random/engineering/tool/sydnie,
+/obj/effect/spawner/random/engineering/tool/sydnie,
/obj/structure/closet/crate,
-/obj/item/storage/pistolcase/candor,
+/obj/item/storage/guncase/pistol/candor,
/turf/open/floor/plating,
/area/outpost/hallway/central)
"mU" = (
@@ -5217,7 +5217,7 @@
"nK" = (
/obj/structure/closet/crate/goldcrate,
/obj/item/survey_handheld/elite,
-/obj/effect/spawner/lootdrop/memeorgans,
+/obj/effect/spawner/random/medical/memeorgans,
/turf/open/floor/concrete,
/area/outpost/hallway/central)
"nL" = (
@@ -5729,7 +5729,7 @@
/area/outpost/operations)
"oY" = (
/obj/machinery/light/small/directional/north,
-/obj/effect/spawner/lootdrop/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
/turf/open/floor/plating/foam,
/area/outpost/hallway/central)
"oZ" = (
@@ -6429,7 +6429,7 @@
/area/outpost/fraction/inteq)
"qJ" = (
/obj/machinery/light/small/directional/east,
-/obj/effect/spawner/lootdrop/stockparts,
+/obj/effect/spawner/random/stockparts,
/turf/open/floor/plating/foam,
/area/outpost/hallway/central)
"qK" = (
@@ -6677,7 +6677,7 @@
/area/outpost/hallway/central)
"rn" = (
/obj/effect/turf_decal/syndicateemblem/bottom/right,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/mineral/plastitanium/red,
/area/outpost/cargo/faction/syndicate)
"ro" = (
@@ -7704,7 +7704,7 @@
},
/area/outpost/vacant_rooms/trash_factory)
"tS" = (
-/obj/effect/spawner/lootdrop/waste/mechwreck,
+/obj/effect/spawner/random/waste/mechwreck,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/outpost/hallway/central)
"tT" = (
@@ -7840,7 +7840,7 @@
/turf/open/floor/concrete/reinforced,
/area/outpost/crew/garden)
"ul" = (
-/obj/effect/spawner/lootdrop/gloves,
+/obj/effect/spawner/random/clothing/gloves,
/turf/open/floor/plating/foam,
/area/outpost/hallway/central)
"un" = (
@@ -8070,7 +8070,7 @@
/turf/open/floor/carpet/red,
/area/outpost/vacant_rooms/office)
"uM" = (
-/obj/effect/spawner/lootdrop/tool_surgery_common,
+/obj/effect/spawner/random/medical/surgery_tool/common,
/turf/open/floor/wood{
light_range = 2
},
@@ -8864,7 +8864,7 @@
/obj/structure/sign/warning/fire{
pixel_y = 32
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/obj/structure/closet/crate,
/turf/open/floor/plasteel/rockvault,
/area/outpost/hallway/central)
@@ -8982,7 +8982,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating{
icon_state = "panelscorched"
},
@@ -9030,12 +9030,12 @@
},
/area/outpost/fraction/solfed)
"xh" = (
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/structure/closet/crate,
/turf/open/floor/engine/hull/rockplanet,
/area/outpost/hallway/central)
"xi" = (
-/obj/effect/spawner/lootdrop/waste/salvageable,
+/obj/effect/spawner/random/waste/salvageable,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/outpost/hallway/central)
"xj" = (
@@ -9431,7 +9431,7 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/outpost/engineering/atmospherics)
"yf" = (
-/obj/effect/spawner/lootdrop/mine,
+/obj/effect/spawner/random/mine,
/obj/structure/lattice,
/turf/open/space/basic,
/area/outpost/external)
@@ -9563,7 +9563,7 @@
/turf/open/water/beach,
/area/outpost/hallway/central)
"yx" = (
-/obj/effect/spawner/lootdrop/stockparts,
+/obj/effect/spawner/random/stockparts,
/turf/open/floor/plating/asteroid/snow/temperatre{
light_color = "#1B1D2E";
light_range = 2
@@ -10058,7 +10058,7 @@
"zP" = (
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/outpost/maintenance/aft)
"zQ" = (
@@ -10783,7 +10783,7 @@
},
/obj/machinery/light/small/directional/west,
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/lootdrop/mafia_outfit,
+/obj/effect/spawner/random/clothing/mafia_outfit,
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2
@@ -11043,7 +11043,7 @@
/area/outpost/hallway/central)
"Cj" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/tech/techmaint,
/area/outpost/fraction/inteq)
"Ck" = (
@@ -11114,7 +11114,7 @@
/area/outpost/operations)
"Ct" = (
/obj/effect/turf_decal/syndicateemblem/bottom/left,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/mineral/plastitanium/red,
/area/outpost/cargo/faction/syndicate)
"Cu" = (
@@ -11343,12 +11343,12 @@
dir = 1;
icon_state = "box_corners"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/mono,
/area/outpost/cargo/faction/solfed)
"CP" = (
/obj/effect/turf_decal/syndicateemblem/top/middle,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/mineral/plastitanium/red,
/area/outpost/cargo/faction/syndicate)
"CQ" = (
@@ -11433,7 +11433,7 @@
/turf/open/floor/concrete/reinforced,
/area/outpost/hallway/central)
"De" = (
-/obj/effect/spawner/lootdrop/mine,
+/obj/effect/spawner/random/mine,
/turf/open/space/basic,
/area/space)
"Df" = (
@@ -11529,7 +11529,7 @@
/turf/open/floor/concrete/slab_3,
/area/outpost/hallway/central)
"Ds" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/effect/turf_decal/siding/wood{
dir = 8
},
@@ -11708,7 +11708,7 @@
/turf/open/floor/plasteel/tech,
/area/outpost/engineering)
"DS" = (
-/obj/effect/spawner/lootdrop/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
/obj/structure/lattice,
/turf/open/space/basic,
/area/outpost/external)
@@ -12133,7 +12133,7 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/outpost/fraction/inteq)
"EQ" = (
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/outpost/hallway/central)
"ER" = (
@@ -12141,7 +12141,7 @@
/turf/open/floor/wood,
/area/outpost/fraction/solfed)
"ES" = (
-/obj/effect/spawner/lootdrop/gambling,
+/obj/effect/spawner/random/entertainment/gambling,
/obj/structure/table/reinforced,
/obj/item/paper/crumpled{
default_raw_text = "Сфера по изучению влияния аномалии ракушка. Довольно странное явление, видеть как аномалия повторяет стиль и дизайн пляжного небольшого курорта. Почему именно пляж?"
@@ -12549,7 +12549,7 @@
/turf/open/floor/plasteel/dark,
/area/outpost/operations)
"FS" = (
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/turf/open/floor/plating/dirt/jungle,
/area/outpost/hallway/central)
"FT" = (
@@ -12574,7 +12574,7 @@
/turf/open/floor/plasteel/rockvault,
/area/outpost/operations)
"FZ" = (
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/outpost/hallway/central)
@@ -13273,7 +13273,7 @@
/turf/open/floor/plasteel/tech,
/area/outpost/crew/cryo)
"HP" = (
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/obj/structure/closet/crate,
/turf/open/floor/plasteel/rockvault,
/area/outpost/hallway/central)
@@ -13448,7 +13448,7 @@
"Im" = (
/obj/machinery/light/small/directional/east,
/obj/structure/chair/comfy/blue/corpo/directional/south,
-/obj/effect/spawner/lootdrop/stockparts,
+/obj/effect/spawner/random/stockparts,
/turf/open/floor/plating/foam,
/area/outpost/hallway/central)
"In" = (
@@ -13541,7 +13541,7 @@
/turf/open/floor/carpet/nanoweave,
/area/outpost/hallway/central)
"Ix" = (
-/obj/effect/spawner/lootdrop/crate_spawner,
+/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plating/dirt/jungle,
/area/outpost/hallway/central)
"Iy" = (
@@ -13712,7 +13712,7 @@
dir = 8;
pixel_x = 26
},
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/turf/open/floor/wood/walnut,
/area/outpost/fraction/syndi/donkco_shop)
"IP" = (
@@ -13747,7 +13747,7 @@
/obj/machinery/door/airlock/maintenance_hatch{
req_access_txt = "60003"
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/outpost/hallway/central)
@@ -13936,7 +13936,7 @@
id = "OutpostPoligonExit_6";
pixel_x = 1
},
-/obj/effect/spawner/lootdrop/waste/hivebot,
+/obj/effect/spawner/random/waste/hivebot,
/turf/open/floor/concrete,
/area/outpost/hallway/central)
"Jm" = (
@@ -13962,7 +13962,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 1
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/outpost/hallway/central)
@@ -14139,7 +14139,7 @@
dir = 4;
pixel_x = 3
},
-/obj/effect/spawner/lootdrop/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
/turf/open/floor/wood/walnut,
/area/outpost/fraction/syndi/donkco_shop)
"JH" = (
@@ -14624,7 +14624,7 @@
/area/outpost/hallway/starboard)
"KW" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating,
/area/outpost/maintenance/aft)
"KX" = (
@@ -14707,7 +14707,7 @@
/turf/open/floor/wood/ebony,
/area/outpost/fraction/solfed)
"Lk" = (
-/obj/effect/spawner/lootdrop/maintenance/six,
+/obj/effect/spawner/random/maintenance/six,
/obj/structure/lattice,
/turf/open/space/basic,
/area/outpost/external)
@@ -14812,7 +14812,7 @@
/turf/open/floor/grass/snow/safe,
/area/outpost/hallway/fore)
"Lw" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/turf/open/floor/concrete/reinforced,
/area/outpost/hallway/central)
"Lx" = (
@@ -14834,7 +14834,7 @@
"LB" = (
/mob/living/simple_animal/hostile/mimic/crate,
/obj/item/storage/photo_album/prison,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle,
/turf/open/floor/concrete,
/area/outpost/hallway/central)
@@ -15216,7 +15216,7 @@
/turf/open/space/basic,
/area/outpost/crew/garden)
"Mz" = (
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/rockvault,
/area/outpost/hallway/central)
@@ -15749,7 +15749,7 @@
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"NN" = (
-/obj/effect/spawner/lootdrop/crate_spawner,
+/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/wood{
light_range = 2
},
@@ -15962,7 +15962,7 @@
dir = 8;
pixel_x = 26
},
-/obj/effect/spawner/lootdrop/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
/turf/open/floor/wood/walnut,
/area/outpost/fraction/syndi/donkco_shop)
"Oo" = (
@@ -16210,7 +16210,7 @@
/area/outpost/hallway/central)
"OT" = (
/obj/item/storage/fancy/candle_box,
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/outpost/hallway/central)
@@ -16274,7 +16274,7 @@
"Pb" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/item/stack/sheet/mineral/wood{
pixel_x = -6
},
@@ -16482,7 +16482,7 @@
/obj/structure/fluff/paper/stack,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/wood,
/area/outpost/maintenance/aft)
"PC" = (
@@ -16593,7 +16593,7 @@
/obj/structure/window/reinforced{
pixel_y = -5
},
-/obj/effect/spawner/lootdrop/stockparts,
+/obj/effect/spawner/random/stockparts,
/turf/open/floor/plating/foam,
/area/outpost/hallway/central)
"PP" = (
@@ -16934,7 +16934,7 @@
/area/outpost/hallway/central)
"QH" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/mafia_outfit,
+/obj/effect/spawner/random/clothing/mafia_outfit,
/obj/machinery/light/small/directional/north,
/turf/open/floor/wood/walnut,
/area/outpost/fraction/syndi/donkco_shop)
@@ -17089,8 +17089,8 @@
/area/outpost/hallway/central)
"QZ" = (
/obj/structure/closet/crate/goldcrate,
-/obj/item/storage/pistolcase/viper,
-/obj/effect/spawner/lootdrop/plushie,
+/obj/item/storage/guncase/pistol/viper,
+/obj/effect/spawner/random/entertainment/plushie,
/turf/open/floor/concrete,
/area/outpost/hallway/central)
"Ra" = (
@@ -17220,7 +17220,7 @@
/area/outpost/hallway/central)
"Ru" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating{
icon_state = "panelscorched"
},
@@ -17459,7 +17459,7 @@
/area/outpost/crew/canteen)
"Sd" = (
/obj/structure/grille/broken,
-/obj/effect/spawner/lootdrop/minor/pirate_or_bandana,
+/obj/effect/spawner/random/clothing/pirate_or_bandana,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"Se" = (
@@ -17481,7 +17481,7 @@
/turf/open/floor/carpet/red,
/area/outpost/vacant_rooms/office)
"Sj" = (
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/turf/open/floor/plating/asteroid/rockplanet/lit,
/area/outpost/hallway/central)
"Sk" = (
@@ -17584,7 +17584,7 @@
/obj/item/towel{
pixel_y = 15
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/outpost/hallway/central)
@@ -17656,10 +17656,10 @@
/obj/structure/filler{
icon_state = "safe-open"
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
-/obj/effect/spawner/lootdrop/grille_or_trash,
-/obj/effect/spawner/lootdrop/grille_or_trash,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating{
icon_state = "foam_plating"
},
@@ -17701,7 +17701,7 @@
/turf/open/floor/concrete/slab_3,
/area/outpost/hallway/central)
"SM" = (
-/obj/effect/spawner/lootdrop/waste/girder,
+/obj/effect/spawner/random/waste/girder,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/outpost/hallway/central)
"SN" = (
@@ -17874,7 +17874,7 @@
/area/outpost/hallway/central)
"Tm" = (
/obj/structure/closet/crate/coffin,
-/obj/effect/spawner/lootdrop/waste/radiation/more_rads,
+/obj/effect/spawner/random/waste/radiation/more_rads,
/obj/item/storage/belt/medical,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/outpost/hallway/central)
@@ -18172,7 +18172,7 @@
dir = 8;
pixel_x = 26
},
-/obj/effect/spawner/lootdrop/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
/obj/machinery/camera/autoname{
pixel_y = 11;
network = list("outpostelysium")
@@ -18301,7 +18301,7 @@
/obj/effect/turf_decal/weather/dirt/corner{
dir = 1
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/outpost/hallway/central)
@@ -18322,7 +18322,7 @@
/area/outpost/fraction/syndi)
"Um" = (
/obj/structure/lattice,
-/obj/effect/spawner/lootdrop/mine,
+/obj/effect/spawner/random/mine,
/turf/open/space/basic,
/area/outpost/external)
"Un" = (
@@ -18365,7 +18365,7 @@
/area/outpost/fraction/syndi)
"Ut" = (
/obj/structure/closet/crate/coffin,
-/obj/effect/spawner/lootdrop/waste/radiation/more_rads,
+/obj/effect/spawner/random/waste/radiation/more_rads,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/outpost/hallway/central)
"Uu" = (
@@ -18895,7 +18895,7 @@
/turf/open/floor/carpet/nanoweave,
/area/outpost/crew/canteen)
"VH" = (
-/obj/effect/spawner/lootdrop/stockparts,
+/obj/effect/spawner/random/stockparts,
/obj/structure/chair/comfy/blue/corpo/directional/north,
/turf/open/floor/plating/foam,
/area/outpost/hallway/central)
@@ -19140,7 +19140,7 @@
/turf/open/floor/plasteel/telecomms_floor,
/area/outpost/crew/cryo)
"Ws" = (
-/obj/structure/ice_stasis,
+/obj/structure/chair,
/turf/open/space/basic,
/area/outpost/crew/garden)
"Wu" = (
@@ -19495,7 +19495,7 @@
/obj/structure/closet/crate/grave/loot{
desc = "Here lies our great brother and infamous pirate"
},
-/obj/effect/spawner/lootdrop/costume,
+/obj/effect/spawner/random/clothing/costume,
/turf/open/floor/plating/dirt/jungle,
/area/outpost/hallway/central)
"Xo" = (
@@ -19711,7 +19711,7 @@
/obj/structure/deployable_barricade/guardrail{
dir = 8
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/outpost/hallway/central)
"XM" = (
@@ -19751,7 +19751,7 @@
/obj/item/reagent_containers/spray/spraytan{
pixel_y = -8
},
-/turf/open/floor/plating/beach/sand{
+/turf/open/floor/plating/asteroid/sand/lit{
light_range = 2
},
/area/outpost/hallway/central)
diff --git a/_maps/_mod_celadon/outpost/elysium_ice.dmm b/_maps/_mod_celadon/outpost/elysium_ice.dmm
index c46c7daff863..9d5502df7704 100644
--- a/_maps/_mod_celadon/outpost/elysium_ice.dmm
+++ b/_maps/_mod_celadon/outpost/elysium_ice.dmm
@@ -631,7 +631,7 @@
/area/outpost/security)
"axu" = (
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/lootdrop/chicken,
+/obj/effect/spawner/random/chicken,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
"axV" = (
@@ -835,7 +835,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/random/maintenance/four,
/turf/open/floor/plating/rust,
/area/outpost/maintenance/port)
"aHx" = (
@@ -1324,7 +1324,7 @@
req_one_access_txt = "8125";
req_access = null
},
-/obj/item/ammo_box/ferroslugbox,
+/obj/item/storage/box/ammo/ferroslug,
/obj/item/storage/box/slugshot,
/obj/item/storage/fancy/cigarettes/cigars,
/obj/item/storage/fancy/cigarettes/cigars/havana,
@@ -1332,7 +1332,7 @@
/obj/item/storage/photo_album/bar,
/obj/item/storage/box/matches,
/obj/item/pda/bar,
-/obj/item/stamp/bard,
+/obj/item/stamp/clip/bard,
/obj/item/clothing/under/rank/civilian/bartender/skirt,
/obj/item/clothing/under/rank/civilian/bartender/purple,
/obj/item/clothing/under/rank/civilian/bartender,
@@ -1376,7 +1376,7 @@
"aZB" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/outpost/maintenance/port)
"bav" = (
@@ -1791,7 +1791,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance{
+/obj/effect/spawner/random/maintenance{
pixel_x = -9
},
/turf/open/floor/plating{
@@ -2230,7 +2230,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/white,
/area/outpost/medical/hall_1)
"bJc" = (
@@ -3060,7 +3060,7 @@
icon_state = "1-2"
},
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/lootdrop/mafia_outfit,
+/obj/effect/spawner/random/clothing/mafia_outfit,
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2
@@ -3717,7 +3717,7 @@
"cPP" = (
/obj/effect/mob_spawn/human/cook/husked,
/obj/item/spacecash/bundle/c100,
-/obj/effect/spawner/lootdrop/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
@@ -3805,7 +3805,7 @@
/turf/closed/indestructible/reinforced,
/area/outpost/exterior)
"cVC" = (
-/obj/effect/spawner/lootdrop/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
/obj/item/spacecash/bundle/c10,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
@@ -3903,7 +3903,7 @@
"daH" = (
/obj/item/soap/syndie,
/obj/structure/closet/crate/wooden,
-/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine,
+/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine,
/obj/item/reagent_containers/glass/bottle/antitoxin,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
@@ -4006,7 +4006,7 @@
/area/outpost/fraction/solfed)
"dfm" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/table/scrap,
/turf/open/floor/plating{
light_color = "#1B1D2E";
@@ -4263,7 +4263,7 @@
"dns" = (
/obj/effect/decal/fakelattice,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/clothing/head/hardhat/pumpkinhead/blumpkin{
light_on = 1
},
@@ -4382,7 +4382,7 @@
/turf/open/floor/plasteel/white,
/area/outpost/crew/canteen)
"dsZ" = (
-/obj/effect/spawner/lootdrop/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
"dtD" = (
@@ -4591,7 +4591,7 @@
/obj/item/shard{
pixel_x = -5
},
-/obj/effect/spawner/lootdrop/maintenance/three{
+/obj/effect/spawner/random/maintenance/three{
pixel_y = -2;
pixel_x = 6
},
@@ -4901,7 +4901,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
/obj/structure/grille/broken,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating,
/area/outpost/maintenance/starboard)
"dLa" = (
@@ -4947,7 +4947,7 @@
pixel_y = 14;
pixel_x = 12
},
-/obj/effect/spawner/lootdrop/maintenance/six,
+/obj/effect/spawner/random/maintenance/six,
/obj/item/tank/internals/oxygen/empty,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
@@ -5679,7 +5679,7 @@
/turf/open/floor/wood,
/area/outpost/medical/cmo)
"eij" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating{
@@ -5889,7 +5889,7 @@
/turf/open/floor/plating,
/area/outpost/maintenance/starboard)
"eoJ" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
@@ -6025,7 +6025,7 @@
/turf/open/floor/carpet/purple,
/area/outpost/crew/bar)
"ess" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
@@ -7160,7 +7160,7 @@
/turf/open/floor/plasteel/dark,
/area/outpost/medical/morgue)
"ffJ" = (
-/obj/effect/spawner/lootdrop/materials,
+/obj/effect/spawner/random/materials,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
"ffR" = (
@@ -7271,7 +7271,7 @@
/area/outpost/cargo/smeltery)
"fmB" = (
/obj/structure/curtain/cloth/grey,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/mob_spawn/human/elysium_outpost/wagabond{
layer = 2
},
@@ -7301,7 +7301,7 @@
/area/outpost/operations/outpost_command)
"fmX" = (
/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/portable_atmospherics/canister/stimulum,
+/obj/machinery/portable_atmospherics/canister/toxins,
/turf/open/floor/plasteel/mono/dark,
/area/outpost/cargo)
"foo" = (
@@ -8349,7 +8349,7 @@
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
"gaf" = (
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/item/clothing/mask/gas/tiki_mask,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
@@ -9168,7 +9168,7 @@
},
/area/outpost/fraction/separatist)
"gCN" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/asteroid/snow/temperatre{
light_color = "#1B1D2E";
light_range = 2
@@ -9244,7 +9244,7 @@
/turf/open/floor/plasteel/white,
/area/outpost/medical/reseption)
"gGe" = (
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance/eight,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
"gGh" = (
@@ -9697,7 +9697,7 @@
/area/outpost/crew/cryo)
"gVe" = (
/obj/structure/grille/broken,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/spider/stickyweb,
/obj/machinery/light/small/directional/east,
/turf/open/floor/plating/rust,
@@ -10618,7 +10618,7 @@
},
/area/outpost/exterior)
"hEO" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/small/directional/north,
/turf/open/floor/plating{
@@ -12013,7 +12013,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/trash/sosjerky,
/obj/item/trash/can,
/turf/open/floor/plasteel/patterned/brushed{
@@ -12386,7 +12386,7 @@
"iRB" = (
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/structure/sign/poster/retro/random{
pixel_x = -32
},
@@ -12759,12 +12759,12 @@
pixel_x = -1;
pixel_y = 16
},
-/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/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,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
"jgu" = (
@@ -13224,7 +13224,7 @@
/turf/open/floor/carpet/cyan,
/area/outpost/medical/palata_1)
"jtg" = (
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/portal/permanent/one_way{
id = "outpost_joke_endless_1l";
alpha = 0;
@@ -13367,7 +13367,7 @@
/obj/structure/flora/grass/green{
layer = 3.1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/asteroid/snow/temperatre{
light_color = "#1B1D2E";
light_range = 2
@@ -13512,7 +13512,7 @@
/turf/open/floor/plasteel/dark,
/area/outpost/security)
"jDr" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/spacecash/bundle/c10,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
@@ -13606,7 +13606,7 @@
default_raw_text = "Это снова Энди. Ох, незнаю как вам а это были очень острые ощущения, ходить по мосту который вот вот грохнется в лаву! Но да ладно. Мы открыли вход. Нам удалось раскапать тунель, который судя по всему ведет куда-то глубоко вниз. Ну что ж, будем готовиться к спуску. К сожалению туннель тут слегка обвалился, приходится ползти ползком. Черт, придется оставить ящики с инструментами, они не пролезут дальше...";
pixel_x = 10
},
-/obj/effect/spawner/lootdrop/gloves,
+/obj/effect/spawner/random/clothing/gloves,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
"jHw" = (
@@ -13615,7 +13615,7 @@
},
/obj/structure/closet/crate/wooden,
/obj/item/stack/sheet/mineral/sandstone,
-/obj/effect/spawner/lootdrop/materials,
+/obj/effect/spawner/random/materials,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood/walnut,
/area/outpost/exterior)
@@ -14192,7 +14192,7 @@
/turf/open/floor/plasteel/dark,
/area/outpost/fraction/inteq)
"kfF" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
@@ -14275,15 +14275,15 @@
/obj/item/flashlight/seclite,
/obj/item/flashlight/seclite,
/obj/item/flashlight/seclite,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
+/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/structure/closet/wall/directional/north,
/obj/machinery/door/window,
/obj/machinery/light/small/directional/north{
@@ -14477,7 +14477,7 @@
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
"kqB" = (
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
"kqF" = (
@@ -14762,7 +14762,7 @@
},
/area/outpost/exterior)
"kDj" = (
-/obj/item/clothing/suit/armor/heavy/adamantine{
+/obj/item/clothing/suit/armor/heavy{
anchored = 1
},
/obj/structure/table/abductor,
@@ -14835,7 +14835,7 @@
/area/outpost/cargo)
"kFW" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/small/directional/south,
/turf/open/floor/plating{
@@ -14984,7 +14984,7 @@
/area/outpost/fraction/separatist)
"kLU" = (
/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/portable_atmospherics/canister/pluoxium,
+/obj/machinery/portable_atmospherics/canister/toxins,
/turf/open/floor/plasteel/mono/dark,
/area/outpost/cargo)
"kLZ" = (
@@ -15315,7 +15315,7 @@
/area/outpost/crew/cryo)
"kVU" = (
/obj/structure/table/abductor,
-/obj/effect/spawner/lootdrop/random_machine_circuit_mech,
+/obj/effect/spawner/random/circuit/machine/mech,
/turf/open/floor/plating/abductor,
/area/outpost/exterior)
"kVV" = (
@@ -15672,7 +15672,7 @@
/turf/open/floor/plasteel/white,
/area/outpost/crew/canteen)
"lqe" = (
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/portal/permanent/one_way{
id = "outpost_joke_endless_105l";
alpha = 0;
@@ -15727,7 +15727,7 @@
/area/outpost/exterior)
"lsF" = (
/obj/structure/table/abductor,
-/obj/effect/spawner/lootdrop/random_computer_circuit_rare,
+/obj/effect/spawner/random/circuit/computer/rare,
/turf/open/floor/plating/abductor,
/area/outpost/exterior)
"lug" = (
@@ -15977,7 +15977,7 @@
layer = 3.1;
pixel_x = 13
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/asteroid/snow/temperatre{
light_color = "#1B1D2E";
light_range = 2
@@ -17105,7 +17105,7 @@
/area/outpost/crew/bar/vip_elysium_zone)
"mrG" = (
/obj/structure/table/reinforced/titaniumglass,
-/obj/structure/statue/bronze/marx{
+/obj/item/statuebust{
pixel_y = 16;
mouse_opacity = 0
},
@@ -18427,7 +18427,7 @@
/area/outpost/maintenance/port)
"nlC" = (
/obj/structure/table/abductor,
-/obj/effect/spawner/lootdrop/random_ammo_protolathe_lootdrop,
+/obj/effect/spawner/random/random_ammo_protolathe_lootdrop,
/turf/open/floor/plating/abductor,
/area/outpost/exterior)
"nlM" = (
@@ -18869,7 +18869,7 @@
/area/outpost/cargo/smeltery)
"nyo" = (
/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/portable_atmospherics/canister/nitryl,
+/obj/machinery/portable_atmospherics/canister/freon,
/turf/open/floor/plasteel/mono/dark,
/area/outpost/cargo)
"nzG" = (
@@ -18972,7 +18972,7 @@
short_desc = "Искусаное тараканами тело клоуна выглядит так как-будто его задушили одноцветным зеленым шарфом. Вы также замечаете что вокруг его шеи обмотан шарф в полосочку запачканый то ли грязью толи блевотиной клоуна. По цветам не скажешь, но кажется он был красно-серого цвета. Хороший был шарф, жаль его.";
desc = "Искусаное тараканами тело клоуна выглядит так как-будто его задушили одноцветным зеленым шарфом. Вы также замечаете что вокруг его шеи обмотан шарф в полосочку запачканый то ли грязью толи блевотиной клоуна. По цветам не скажешь, но кажется он был красно-серого цвета. Хороший был шарф, жаль его."
},
-/obj/effect/spawner/lootdrop/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
@@ -19740,7 +19740,7 @@
pixel_x = 14;
all_items_free = 1
},
-/obj/machinery/vending/snack/random{
+/obj/effect/spawner/random/vending/snack{
pixel_x = -14;
all_items_free = 1
},
@@ -20468,7 +20468,7 @@
pixel_x = 10;
pixel_y = 1
},
-/obj/item/toy/talking/codex_gigas{
+/obj/item/storage/book/bible{
pixel_y = 10;
pixel_x = 12
},
@@ -20770,7 +20770,7 @@
pixel_y = 7;
pixel_x = -6
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/wood/walnut,
/area/outpost/exterior)
"oOO" = (
@@ -20778,7 +20778,7 @@
color = "#808080"
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/wood/walnut,
/area/outpost/exterior)
"oPl" = (
@@ -20912,7 +20912,7 @@
},
/obj/structure/closet/crate/wooden,
/obj/item/stack/sheet/mineral/sandstone/thirty,
-/obj/effect/spawner/lootdrop/materials,
+/obj/effect/spawner/random/materials,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood/walnut,
/area/outpost/exterior)
@@ -21421,7 +21421,7 @@
/obj/item/reagent_containers/glass/bottle/antitoxin,
/obj/item/storage/ration/pepper_jack_beef_patty,
/obj/item/storage/ration/pepper_jack_beef_patty,
-/obj/effect/spawner/lootdrop/salvage/plasma,
+/obj/effect/spawner/random/salvage/plasma,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
"prZ" = (
@@ -21812,7 +21812,7 @@
"pBF" = (
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/portable_atmospherics/canister/stimulum,
+/obj/machinery/portable_atmospherics/canister/toxins,
/turf/open/floor/plasteel/mono/dark,
/area/outpost/cargo)
"pCc" = (
@@ -21856,7 +21856,7 @@
"pDh" = (
/obj/effect/decal/fakelattice,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/outpost/maintenance/port)
"pDq" = (
@@ -21996,7 +21996,7 @@
},
/obj/item/stack/sheet/mineral/plasma,
/obj/structure/closet/crate/wooden,
-/obj/effect/spawner/lootdrop/materials,
+/obj/effect/spawner/random/materials,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood/walnut,
/area/outpost/exterior)
@@ -22004,7 +22004,7 @@
/obj/structure/spider/stickyweb{
color = "#808080"
},
-/obj/effect/spawner/lootdrop/materials,
+/obj/effect/spawner/random/materials,
/turf/open/floor/wood/walnut,
/area/outpost/exterior)
"pIS" = (
@@ -22077,7 +22077,7 @@
/turf/open/floor/plasteel/white,
/area/outpost/crew/garden)
"pLe" = (
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/portal/permanent/one_way{
id = "outpost_joke_endless_101l";
alpha = 0;
@@ -22796,7 +22796,7 @@
/area/outpost/crew/garden)
"qlM" = (
/obj/structure/table/abductor,
-/obj/effect/spawner/lootdrop/random_gun_protolathe_lootdrop,
+/obj/effect/spawner/random/random_gun_protolathe_lootdrop,
/turf/open/floor/plating/abductor,
/area/outpost/exterior)
"qlN" = (
@@ -23667,15 +23667,15 @@
"qRW" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance{
+/obj/effect/spawner/random/maintenance{
pixel_x = -2;
pixel_y = -11
},
-/obj/effect/spawner/lootdrop/maintenance{
+/obj/effect/spawner/random/maintenance{
pixel_x = 3;
pixel_y = 13
},
-/obj/effect/spawner/lootdrop/maintenance{
+/obj/effect/spawner/random/maintenance{
pixel_x = 21;
pixel_y = 11
},
@@ -24284,7 +24284,7 @@
/obj/structure/closet/crate/secure/loot,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2
@@ -24576,7 +24576,7 @@
/area/outpost/fraction/separatist)
"rBo" = (
/obj/machinery/light/small/directional/east,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
@@ -24656,7 +24656,7 @@
/area/outpost/fraction/solfed)
"rDZ" = (
/obj/effect/turf_decal/borderfloor/full,
-/obj/effect/spawner/lootdrop/maintenance{
+/obj/effect/spawner/random/maintenance{
pixel_x = -9
},
/turf/open/floor/plating{
@@ -25153,7 +25153,7 @@
},
/area/outpost/fraction/separatist)
"rVu" = (
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
"rVx" = (
@@ -25605,7 +25605,7 @@
/area/outpost/medical/reseption)
"smM" = (
/obj/machinery/light/small/directional/east,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating{
@@ -25790,7 +25790,7 @@
/obj/structure/closet/crate/wooden,
/obj/item/reagent_containers/glass/bottle/antitoxin,
/obj/item/reagent_containers/glass/bottle/antitoxin,
-/obj/effect/spawner/lootdrop/salvage,
+/obj/effect/spawner/random/salvage,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
"ssN" = (
@@ -25883,7 +25883,7 @@
/turf/open/floor/plating/rust,
/area/outpost/maintenance/starboard)
"suZ" = (
-/obj/effect/spawner/lootdrop/rnd{
+/obj/effect/spawner/random/rnd{
max_integrity = 100000;
pixel_x = 0;
anchored = 1;
@@ -26070,7 +26070,7 @@
dir = 8;
pixel_y = -15
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/mob_spawn/human/elysium_outpost/wagabond{
layer = 2
},
@@ -26092,7 +26092,7 @@
/obj/structure/closet/crate/radiation,
/obj/effect/radiation/waste/intense,
/obj/item/mining_scanner,
-/obj/effect/spawner/lootdrop/prison_contraband,
+/obj/effect/spawner/random/stockparts,
/turf/open/floor/plating,
/area/outpost/exterior)
"sDN" = (
@@ -26219,7 +26219,7 @@
},
/obj/item/stack/sheet/mineral/sandstone/thirty,
/obj/structure/closet/crate/wooden,
-/obj/effect/spawner/lootdrop/materials,
+/obj/effect/spawner/random/materials,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood/walnut,
/area/outpost/exterior)
@@ -26893,7 +26893,7 @@
/area/outpost/operations/outpost_command)
"tig" = (
/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/portable_atmospherics/canister/nob,
+/obj/machinery/portable_atmospherics/canister/freon,
/turf/open/floor/plasteel/mono/dark,
/area/outpost/cargo)
"tjC" = (
@@ -27199,7 +27199,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2
@@ -27365,7 +27365,7 @@
/turf/open/floor/wood/walnut,
/area/outpost/exterior)
"tBn" = (
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/portal/permanent/one_way{
id = "outpost_joke_endless_222r";
alpha = 0;
@@ -27732,7 +27732,7 @@
},
/obj/machinery/light/small/directional/west,
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/lootdrop/mafia_outfit,
+/obj/effect/spawner/random/clothing/mafia_outfit,
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2
@@ -27820,7 +27820,7 @@
/area/outpost/crew/bar/vip_elysium_zone)
"tWq" = (
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
"tWE" = (
@@ -27828,7 +27828,7 @@
layer = 3.1
},
/obj/item/shard,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/asteroid/snow/temperatre{
light_color = "#1B1D2E";
light_range = 2
@@ -28087,7 +28087,7 @@
/turf/open/floor/wood/walnut,
/area/outpost/crew/lounge/cab_4)
"udk" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
"udN" = (
@@ -28663,7 +28663,7 @@
/turf/open/floor/plating/asteroid/icerock/smooth,
/area/outpost/exterior)
"uGn" = (
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/portal/permanent/one_way{
id = "outpost_joke_endless_333l";
alpha = 0;
@@ -29009,9 +29009,9 @@
/obj/structure/spider/stickyweb{
color = "#808080"
},
-/obj/effect/spawner/lootdrop/gloves,
+/obj/effect/spawner/random/clothing/gloves,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance/eight,
/turf/open/floor/wood/walnut,
/area/outpost/exterior)
"uXa" = (
@@ -29611,7 +29611,7 @@
/turf/open/floor/wood/walnut,
/area/outpost/fraction/solfed)
"vCR" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/tank/internals/emergency_oxygen,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
@@ -29864,7 +29864,7 @@
icon_state = "2-8"
},
/obj/effect/turf_decal/borderfloor/full,
-/obj/effect/spawner/lootdrop/maintenance{
+/obj/effect/spawner/random/maintenance{
pixel_x = -9
},
/turf/open/floor/plating{
@@ -29918,7 +29918,7 @@
/turf/open/floor/carpet/orange,
/area/outpost/medical/relax_room)
"vNC" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating{
light_color = "#1B1D2E";
@@ -30727,9 +30727,9 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
/obj/item/reagent_containers/food/drinks/flask/det,
/obj/item/storage/box/matches,
-/obj/item/ammo_box/a357_box/match,
-/obj/item/ammo_box/a357_box/hp,
-/obj/item/ammo_box/a357_box,
+/obj/item/storage/box/ammo/a357_match,
+/obj/item/storage/box/ammo/a357_hp,
+/obj/item/storage/box/ammo/a357,
/obj/machinery/light/directional/west,
/obj/item/pda/detective,
/obj/structure/closet/secure_closet/detective{
@@ -30748,8 +30748,8 @@
/obj/item/cartridge/detective,
/obj/item/camera/detective,
/obj/item/gun/ballistic/revolver/viper,
-/obj/item/ammo_box/c38_box,
-/obj/item/storage/pistolcase/detective,
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/guncase/pistol/detective,
/obj/item/detective_scanner,
/obj/item/camera_film,
/obj/item/camera_film,
@@ -31849,7 +31849,7 @@
/area/outpost/security/armory)
"xaZ" = (
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/lootdrop/mafia_outfit,
+/obj/effect/spawner/random/clothing/mafia_outfit,
/turf/open/floor/plating/asteroid/icerock/temperate,
/area/outpost/exterior)
"xbv" = (
@@ -32536,7 +32536,7 @@
"xEL" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/west,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/closet/crate/secure/loot,
/turf/open/floor/plating,
/area/outpost/maintenance/starboard)
@@ -33051,7 +33051,7 @@
/turf/open/floor/wood/walnut,
/area/outpost/crew/bar)
"xZy" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating{
@@ -33200,7 +33200,7 @@
/obj/structure/closet/crate/radiation,
/obj/effect/radiation/waste/intense,
/obj/item/pizzabox/bomb,
-/obj/effect/spawner/lootdrop/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
/turf/open/floor/plating,
/area/outpost/exterior)
"yfF" = (
diff --git a/_maps/_mod_celadon/outpost/hangar/elysium_asteroid_40x20.dmm b/_maps/_mod_celadon/outpost/hangar/elysium_asteroid_40x20.dmm
index d6b1b6cc5566..1aca57647036 100644
--- a/_maps/_mod_celadon/outpost/hangar/elysium_asteroid_40x20.dmm
+++ b/_maps/_mod_celadon/outpost/hangar/elysium_asteroid_40x20.dmm
@@ -388,7 +388,7 @@
},
/area/hangar)
"kU" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/stack/sheet/mineral/wood{
pixel_x = -6
},
@@ -397,7 +397,7 @@
pixel_y = 7
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/stack/sheet/mineral/wood{
pixel_x = -6
},
@@ -866,7 +866,7 @@
},
/area/hangar)
"vh" = (
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating{
planetary_atmos = 1
diff --git a/_maps/_mod_celadon/outpost/hangar/elysium_asteroid_40x40.dmm b/_maps/_mod_celadon/outpost/hangar/elysium_asteroid_40x40.dmm
index 98cc44e68897..ac65ac13683b 100644
--- a/_maps/_mod_celadon/outpost/hangar/elysium_asteroid_40x40.dmm
+++ b/_maps/_mod_celadon/outpost/hangar/elysium_asteroid_40x40.dmm
@@ -1062,7 +1062,7 @@
/area/hangar)
"NE" = (
/obj/structure/catwalk/over/plated_catwalk,
-/obj/effect/spawner/lootdrop/glowstick{
+/obj/effect/spawner/random/decoration/glowstick{
pixel_x = 5;
pixel_y = 9
},
@@ -1325,7 +1325,7 @@
/obj/structure/catwalk/over/plated_catwalk,
/obj/item/stack/cable_coil/cut/yellow,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating{
icon_state = "panelscorched";
planetary_atmos = 1
diff --git a/_maps/_mod_celadon/outpost/hangar/elysium_asteroid_56x20.dmm b/_maps/_mod_celadon/outpost/hangar/elysium_asteroid_56x20.dmm
index 762deecbbeba..269f6c80f05d 100644
--- a/_maps/_mod_celadon/outpost/hangar/elysium_asteroid_56x20.dmm
+++ b/_maps/_mod_celadon/outpost/hangar/elysium_asteroid_56x20.dmm
@@ -106,7 +106,7 @@
/area/hangar)
"cz" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating{
planetary_atmos = 1
},
@@ -1016,8 +1016,8 @@
/area/hangar)
"MI" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/directional/east,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark{
@@ -1246,7 +1246,7 @@
/area/hangar)
"Wp" = (
/obj/structure/catwalk/over/plated_catwalk,
-/obj/effect/spawner/lootdrop/glowstick{
+/obj/effect/spawner/random/decoration/glowstick{
pixel_x = 5;
pixel_y = 9
},
diff --git a/_maps/_mod_celadon/outpost/hangar/elysium_asteroid_56x40.dmm b/_maps/_mod_celadon/outpost/hangar/elysium_asteroid_56x40.dmm
index e265413c9556..d87b972d73c7 100644
--- a/_maps/_mod_celadon/outpost/hangar/elysium_asteroid_56x40.dmm
+++ b/_maps/_mod_celadon/outpost/hangar/elysium_asteroid_56x40.dmm
@@ -265,8 +265,8 @@
/area/hangar)
"lZ" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/directional/east,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark{
@@ -791,7 +791,7 @@
/area/hangar)
"Hs" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating{
planetary_atmos = 1
},
@@ -948,7 +948,7 @@
/area/hangar)
"KT" = (
/obj/structure/catwalk/over/plated_catwalk,
-/obj/effect/spawner/lootdrop/glowstick{
+/obj/effect/spawner/random/decoration/glowstick{
pixel_x = 5;
pixel_y = 9
},
diff --git a/_maps/_mod_celadon/outpost/indie_space.dmm b/_maps/_mod_celadon/outpost/indie_space.dmm
index 20d3df1579fb..25616f4f402e 100644
--- a/_maps/_mod_celadon/outpost/indie_space.dmm
+++ b/_maps/_mod_celadon/outpost/indie_space.dmm
@@ -109,7 +109,7 @@
/area/outpost/crew/library)
"aM" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/prison_contraband,
+/obj/effect/spawner/random/stockparts,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/outpost/vacant_rooms)
"aP" = (
@@ -255,7 +255,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 10
},
-/obj/effect/spawner/lootdrop/salvage/metal,
+/obj/effect/spawner/random/salvage/metal,
/turf/open/floor/plasteel/tech/techmaint,
/area/outpost/maintenance/central)
"bL" = (
@@ -269,7 +269,7 @@
/turf/open/floor/plasteel,
/area/outpost/hallway/port)
"bS" = (
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/effect/turf_decal/corner_techfloor_grid{
dir = 8
},
@@ -328,7 +328,7 @@
/turf/open/floor/plasteel,
/area/outpost/hallway/central)
"ci" = (
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
@@ -463,7 +463,7 @@
/turf/open/floor/plasteel,
/area/outpost/vacant_rooms)
"dl" = (
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/obj/effect/turf_decal/steeldecal/steel_decals7{
dir = 9
},
@@ -945,7 +945,7 @@
/turf/open/floor/plasteel/mono,
/area/outpost/vacant_rooms)
"gz" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/item/radio/intercom/directional/east,
/obj/effect/turf_decal/spline/fancy/opaque/lightgrey{
dir = 1
@@ -988,7 +988,7 @@
/turf/open/floor/plating,
/area/outpost/maintenance/central)
"gS" = (
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"gT" = (
@@ -1065,7 +1065,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/outpost/maintenance/central)
"hz" = (
@@ -1110,8 +1110,8 @@
/area/outpost/hallway/port)
"hK" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/salvage_laser,
-/obj/effect/spawner/lootdrop/salvage_capacitor,
+/obj/effect/spawner/random/salvage_laser,
+/obj/effect/spawner/random/salvage_capacitor,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"hM" = (
@@ -1172,7 +1172,7 @@
/area/outpost/maintenance/central)
"hZ" = (
/obj/structure/table/wood,
-/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/random/food_or_drink/donut,
/turf/open/floor/wood,
/area/outpost/crew/bar)
"ib" = (
@@ -1253,7 +1253,7 @@
/turf/open/floor/wood,
/area/outpost/crew/library)
"iD" = (
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"iG" = (
@@ -1342,7 +1342,7 @@
/area/outpost/crew/bar)
"jn" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/outpost/maintenance/central)
@@ -1422,7 +1422,7 @@
/turf/open/floor/plasteel/tech,
/area/outpost/hallway/central)
"jM" = (
-/obj/effect/spawner/lootdrop/chicken,
+/obj/effect/spawner/random/chicken,
/turf/open/floor/ship/dirt,
/area/outpost/hallway/port)
"jO" = (
@@ -1691,7 +1691,7 @@
/area/outpost/maintenance/central)
"lA" = (
/obj/structure/flora/grass/jungle,
-/obj/effect/spawner/lootdrop/chicken,
+/obj/effect/spawner/random/chicken,
/turf/open/floor/grass/ship/jungle,
/area/outpost/hallway/central)
"lB" = (
@@ -1842,7 +1842,7 @@
/area/outpost/hallway/port)
"mv" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
+/obj/effect/spawner/random/clothing/kittyears_or_rabbitears,
/obj/effect/decal/cleanable/wrapping,
/turf/open/floor/plasteel/mono,
/area/outpost/vacant_rooms)
@@ -2582,8 +2582,8 @@
/area/outpost/maintenance/fore)
"rp" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/maintenance/seven,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/maintenance/seven,
/turf/open/floor/plasteel/mono,
/area/outpost/vacant_rooms)
"rr" = (
@@ -2655,7 +2655,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
@@ -2767,7 +2767,7 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
},
@@ -2973,9 +2973,9 @@
/area/outpost/crew/library)
"ta" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/minor/twentyfive_percent_cyborg_mask,
+/obj/effect/spawner/random/minor/twentyfive_percent_cyborg_mask,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/gloves,
+/obj/effect/spawner/random/clothing/gloves,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/mono,
/area/outpost/storage)
@@ -3159,7 +3159,7 @@
/area/outpost/cargo)
"tS" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/random/maintenance/four,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"tT" = (
@@ -3323,7 +3323,7 @@
/turf/open/floor/ship/dirt,
/area/outpost/hallway/central)
"uE" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
@@ -3756,7 +3756,7 @@
/turf/open/floor/plasteel,
/area/outpost/hallway/port)
"xu" = (
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
@@ -3847,7 +3847,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"xZ" = (
@@ -3942,7 +3942,7 @@
/area/outpost/vacant_rooms)
"yN" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/turf/open/floor/plasteel/mono,
/area/outpost/vacant_rooms)
"yQ" = (
@@ -4136,7 +4136,7 @@
/turf/open/floor/plating/asteroid,
/area/outpost/external)
"zS" = (
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plating,
/area/outpost/maintenance/central)
"zY" = (
@@ -4189,7 +4189,7 @@
/turf/open/floor/plasteel/tech,
/area/outpost/maintenance/fore)
"Am" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/spline/fancy/opaque/lightgrey{
dir = 8
},
@@ -4845,8 +4845,8 @@
/area/outpost/hallway/port)
"DH" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/minor/bowler_or_that,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/minor/bowler_or_that,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plasteel/mono,
/area/outpost/storage)
"DI" = (
@@ -4899,7 +4899,7 @@
/obj/effect/turf_decal/corner_techfloor_gray{
dir = 9
},
-/obj/effect/spawner/lootdrop/salvage/metal,
+/obj/effect/spawner/random/salvage/metal,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/tech/techmaint,
/area/outpost/maintenance/fore)
@@ -4970,7 +4970,7 @@
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"ER" = (
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating,
/area/outpost/maintenance/central)
"EV" = (
@@ -4981,7 +4981,7 @@
/area/outpost/crew/bar)
"EX" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"Fa" = (
@@ -5181,7 +5181,7 @@
},
/area/outpost/crew/cryo)
"Gj" = (
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -5214,7 +5214,7 @@
/area/outpost/external)
"Gn" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/minor/bowler_or_that,
+/obj/effect/spawner/random/minor/bowler_or_that,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"Gu" = (
@@ -5386,7 +5386,7 @@
/area/outpost/hallway/central)
"Hk" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/minor/beret_or_rabbitears,
+/obj/effect/spawner/random/minor/beret_or_rabbitears,
/obj/machinery/light/dim/directional/west,
/turf/open/floor/plasteel/mono,
/area/outpost/storage)
@@ -5401,11 +5401,11 @@
/area/outpost/maintenance/fore)
"HB" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/glowstick,
-/obj/effect/spawner/lootdrop/glowstick,
-/obj/effect/spawner/lootdrop/glowstick,
-/obj/effect/spawner/lootdrop/glowstick,
-/obj/effect/spawner/lootdrop/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/machinery/firealarm/directional/east,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/outpost/vacant_rooms)
@@ -5830,7 +5830,7 @@
/area/outpost/cargo/office)
"JV" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/minor/pirate_or_bandana,
+/obj/effect/spawner/random/clothing/pirate_or_bandana,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/mono,
@@ -6181,8 +6181,8 @@
/turf/open/floor/wood,
/area/outpost/crew/library)
"LR" = (
-/obj/effect/spawner/lootdrop/tool_engie_common,
-/obj/effect/spawner/lootdrop/tool_engie_common,
+/obj/effect/spawner/random/engineering/tool/common,
+/obj/effect/spawner/random/engineering/tool/common,
/obj/structure/rack,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
@@ -6420,7 +6420,7 @@
/area/outpost/hallway/port)
"No" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/donut/jelly,
+/obj/effect/spawner/random/food_or_drink/donut/jelly,
/obj/effect/turf_decal/floordetail/tiled,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/outpost/security)
@@ -6497,7 +6497,7 @@
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
/obj/item/reagent_containers/food/snacks/grown/citrus/orange,
-/obj/effect/spawner/lootdrop/salvage_capacitor,
+/obj/effect/spawner/random/salvage_capacitor,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"NV" = (
@@ -6842,8 +6842,8 @@
/area/outpost/maintenance/fore)
"Qx" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/minor/bowler_or_that,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/minor/bowler_or_that,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plasteel/mono,
/area/outpost/storage)
"QA" = (
@@ -7006,7 +7006,7 @@
/obj/structure/cable/yellow{
icon_state = "4-6"
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/obj/effect/turf_decal/corner_techfloor_gray{
dir = 10
},
@@ -7093,7 +7093,7 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"RJ" = (
@@ -7317,8 +7317,8 @@
/area/outpost/hallway/port)
"SW" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plasteel/mono,
/area/outpost/vacant_rooms)
"SY" = (
@@ -7327,7 +7327,7 @@
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"Ta" = (
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/effect/decal/cleanable/oil,
/obj/effect/turf_decal/steeldecal/steel_decals9,
/turf/open/floor/plating,
@@ -7353,7 +7353,7 @@
/area/outpost/security)
"Tg" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/random/food_or_drink/donut,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/outpost/vacant_rooms)
"Th" = (
@@ -7479,7 +7479,7 @@
/obj/effect/turf_decal/corner_techfloor_gray{
dir = 9
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/tech/techmaint,
/area/outpost/maintenance/fore)
@@ -7531,7 +7531,7 @@
/turf/open/floor/plating,
/area/outpost/maintenance/central)
"Uq" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/tech/techmaint,
/area/outpost/hallway/port)
"Us" = (
@@ -7541,7 +7541,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -7723,7 +7723,7 @@
},
/obj/item/bedsheet/double/captain,
/obj/effect/decal/cleanable/greenglow,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/head/papersack/smiley{
pixel_x = 7
@@ -7828,7 +7828,7 @@
/turf/open/floor/carpet/green,
/area/outpost/crew/bar)
"Wa" = (
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/mouse/brown,
/turf/open/floor/plating,
@@ -7938,7 +7938,7 @@
/turf/open/floor/plasteel,
/area/outpost/hallway/central)
"WO" = (
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"WR" = (
@@ -7963,7 +7963,7 @@
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
"WV" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/effect/turf_decal/spline/fancy/opaque/lightgrey{
dir = 1
},
@@ -8092,7 +8092,7 @@
/area/outpost/hallway/port)
"XA" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/turf/open/floor/plasteel/mono,
/area/outpost/vacant_rooms)
"XD" = (
@@ -8264,7 +8264,7 @@
/turf/open/floor/plasteel/patterned,
/area/outpost/cargo)
"YC" = (
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/obj/structure/rack,
/obj/effect/turf_decal/steeldecal/steel_decals_central2{
dir = 4
@@ -8307,7 +8307,7 @@
/area/outpost/maintenance/fore)
"YJ" = (
/obj/structure/flora/grass/jungle,
-/obj/effect/spawner/lootdrop/chicken,
+/obj/effect/spawner/random/chicken,
/turf/open/floor/grass/ship/jungle,
/area/outpost/hallway/port)
"YL" = (
diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_aldaama.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_aldaama.dmm
index 58c649fff121..1e916a19335e 100644
--- a/_maps/_mod_celadon/shuttles/elysium/elysium_aldaama.dmm
+++ b/_maps/_mod_celadon/shuttles/elysium/elysium_aldaama.dmm
@@ -385,7 +385,7 @@
/area/ship/bridge)
"dc" = (
/obj/effect/turf_decal/industrial/traffic,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -1255,7 +1255,7 @@
"mH" = (
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/machinery/light/small/directional/east,
/turf/open/floor/plating,
/area/ship/engineering/engine)
@@ -1777,7 +1777,7 @@
icon_state = "2-8"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/item/ammo_box/a762_40{
+/obj/item/storage/box/ammo/a762_40{
pixel_x = 3;
pixel_y = 4
},
@@ -2464,7 +2464,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 8
},
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/carpet/green,
/area/ship/crew/dorm)
"xR" = (
@@ -2543,7 +2543,7 @@
/area/ship/engineering/engine)
"yQ" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"za" = (
@@ -2553,7 +2553,7 @@
"zb" = (
/obj/machinery/light/small/directional/east,
/obj/machinery/atmospherics/components/binary/pump/on/layer2,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"zc" = (
@@ -2867,7 +2867,7 @@
/area/ship/crew)
"Cn" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating{
icon_state = "platingdmg1"
},
@@ -3123,7 +3123,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"EW" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/cable{
icon_state = "2-8"
},
@@ -3276,7 +3276,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"Gz" = (
@@ -4019,7 +4019,7 @@
"PU" = (
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/machinery/airalarm/directional/east,
/turf/open/floor/plating/rust,
/area/ship/engineering/engine)
@@ -4311,7 +4311,7 @@
/area/ship/engineering/communications)
"SL" = (
/obj/structure/rack,
-/obj/item/ammo_box/a762_40{
+/obj/item/storage/box/ammo/a762_40{
pixel_x = 3;
pixel_y = 4
},
diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_homa.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_homa.dmm
index 07da31dd3e36..741d72e06c49 100644
--- a/_maps/_mod_celadon/shuttles/elysium/elysium_homa.dmm
+++ b/_maps/_mod_celadon/shuttles/elysium/elysium_homa.dmm
@@ -14,7 +14,7 @@
/area/ship/bridge)
"az" = (
/obj/structure/rack,
-/obj/item/ammo_box/a762_40{
+/obj/item/storage/box/ammo/a762_40{
pixel_x = -5;
pixel_y = -3
},
@@ -318,7 +318,7 @@
"je" = (
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/structure/catwalk,
-/obj/effect/spawner/lootdrop/crate_spawner,
+/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plating,
/area/ship/cargo)
"js" = (
@@ -695,7 +695,7 @@
/turf/open/floor/plating,
/area/ship/hallway/central)
"ry" = (
-/obj/effect/spawner/lootdrop/crate_spawner,
+/obj/effect/spawner/random/structure/crate_abandoned,
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable{
icon_state = "0-8"
@@ -985,7 +985,7 @@
"Aw" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/spawner/lootdrop/crate_spawner,
+/obj/effect/spawner/random/structure/crate_abandoned,
/obj/machinery/light/small/directional/south,
/turf/open/floor/plating,
/area/ship/cargo)
@@ -1039,7 +1039,7 @@
"Dd" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/effect/spawner/lootdrop/crate_spawner,
+/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plating,
/area/ship/cargo)
"Dj" = (
@@ -1115,7 +1115,7 @@
/turf/closed/wall/r_wall/rust,
/area/ship/bridge)
"Fr" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/carpet/green,
/area/ship/crew/canteen)
"Gl" = (
@@ -1706,7 +1706,7 @@
/obj/structure/catwalk,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/effect/spawner/lootdrop/crate_spawner,
+/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plating,
/area/ship/cargo)
"Xv" = (
diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm
index 1e53c59fe14c..667c620f273c 100644
--- a/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm
+++ b/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm
@@ -158,7 +158,7 @@
},
/obj/machinery/power/terminal,
/obj/structure/cable,
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/carpet/green,
/area/ship/crew/cryo)
"gE" = (
@@ -246,7 +246,7 @@
/obj/effect/turf_decal/trimline/opaque/green/arrow_ccw{
dir = 1
},
-/obj/effect/spawner/lootdrop/crate_spawner,
+/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
"kT" = (
@@ -637,11 +637,11 @@
/obj/effect/turf_decal/trimline/opaque/green/arrow_ccw{
dir = 1
},
-/obj/item/ammo_box/a762_40{
+/obj/item/storage/box/ammo/a762_40{
pixel_x = -5;
pixel_y = -3
},
-/obj/item/ammo_box/a762_40{
+/obj/item/storage/box/ammo/a762_40{
pixel_x = -5;
pixel_y = -3
},
diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_khalifat.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_khalifat.dmm
index 8741e01b3d41..58d2b1483847 100644
--- a/_maps/_mod_celadon/shuttles/elysium/elysium_khalifat.dmm
+++ b/_maps/_mod_celadon/shuttles/elysium/elysium_khalifat.dmm
@@ -282,7 +282,7 @@
/area/ship/bridge)
"bR" = (
/obj/machinery/light/directional/south,
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/effect/turf_decal/borderfloorblack{
dir = 1
},
@@ -957,7 +957,7 @@
/obj/structure/table/scrap,
/obj/item/gun/ballistic/shotgun/brimstone,
/obj/item/gun/energy/kinetic_accelerator,
-/obj/item/ammo_box/a12g/blanks,
+/obj/item/storage/box/ammo/a12g_blanks,
/turf/open/floor/plasteel/darkgreenfull,
/area/ship/security)
"fN" = (
@@ -1218,7 +1218,7 @@
/turf/open/floor/plasteel,
/area/ship/crew/dorm)
"hb" = (
-/obj/effect/spawner/lootdrop/tool_surgery_common,
+/obj/effect/spawner/random/medical/surgery_tool/common,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/carpet/green,
/area/ship/medical/surgery)
@@ -1704,7 +1704,7 @@
dir = 8
},
/obj/effect/decal/cleanable/glass,
-/obj/effect/spawner/lootdrop/tool_surgery_common,
+/obj/effect/spawner/random/medical/surgery_tool/common,
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"ka" = (
@@ -1780,10 +1780,10 @@
/obj/item/gun/ballistic/derringer/gold,
/obj/item/gun/ballistic/automatic/pistol/ringneck,
/obj/item/gun/ballistic/automatic/smg/skm_carbine,
-/obj/item/ammo_box/c10mm,
-/obj/item/ammo_box/magazine/skm_545_39,
-/obj/item/ammo_box/magazine/skm_545_39,
-/obj/item/ammo_box/magazine/skm_545_39,
+/obj/item/storage/box/ammo/c10mm,
+/obj/item/ammo_box/magazine/skm_762_40,
+/obj/item/ammo_box/magazine/skm_762_40,
+/obj/item/ammo_box/magazine/skm_762_40,
/turf/open/floor/mineral/plastitanium,
/area/ship/security)
"kJ" = (
@@ -2337,7 +2337,7 @@
},
/obj/machinery/power/terminal,
/obj/structure/cable,
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/carpet/green,
/area/ship/cargo)
"oi" = (
@@ -2487,7 +2487,7 @@
/obj/effect/turf_decal/trimline/opaque/green/arrow_ccw{
dir = 1
},
-/obj/effect/spawner/lootdrop/crate_spawner,
+/obj/effect/spawner/random/structure/crate_abandoned,
/obj/item/stack/sheet/metal/five{
pixel_x = -3
},
@@ -2875,8 +2875,8 @@
/obj/item/storage/box/ingredients/vegetarian,
/obj/item/reagent_containers/condiment/milk,
/obj/item/reagent_containers/condiment/milk,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/turf/open/floor/carpet/green,
/area/ship/crew/canteen)
"qQ" = (
@@ -4135,7 +4135,7 @@
/obj/structure/table/scrap,
/obj/item/gun/ballistic/revolver/montagne,
/obj/item/gun/ballistic/rifle/illestren/sawn,
-/obj/item/ammo_box/a357_box,
+/obj/item/storage/box/ammo/a357,
/turf/open/floor/mineral/plastitanium,
/area/ship/security)
"yO" = (
@@ -4170,7 +4170,7 @@
/area/ship/hallway/port)
"yT" = (
/obj/structure/closet/crate/secure/exo,
-/obj/item/ammo_box/a762_40{
+/obj/item/storage/box/ammo/a762_40{
pixel_x = -5;
pixel_y = -3
},
@@ -5010,7 +5010,7 @@
/obj/item/borg/upgrade/hypospray/expanded,
/obj/item/borg/upgrade/defib,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/tool_surgery_common,
+/obj/effect/spawner/random/medical/surgery_tool/common,
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"Dk" = (
@@ -5499,7 +5499,7 @@
/obj/effect/turf_decal/steeldecal/steel_decals_central1,
/obj/structure/table/glass,
/obj/item/storage/book/bible/koran,
-/obj/effect/spawner/lootdrop/tool_surgery_common,
+/obj/effect/spawner/random/medical/surgery_tool/common,
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"Gg" = (
@@ -5711,7 +5711,7 @@
dir = 8
},
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance/eight,
/obj/item/circuitboard/machine/autolathe,
/obj/item/stock_parts/manipulator,
/obj/item/stock_parts/matter_bin,
@@ -6259,7 +6259,7 @@
/area/ship/crew/canteen)
"Kg" = (
/obj/machinery/light/directional/north,
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/borderfloorblack/corner{
dir = 8
},
@@ -7396,7 +7396,7 @@
icon_state = "2-8"
},
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/random/maintenance/four,
/obj/item/reagent_containers/food/snacks/burger/red{
name = "suspicious red burger";
desc = "A suspicious looking burger.";
@@ -7452,7 +7452,7 @@
/area/ship/cargo)
"Ry" = (
/obj/structure/table/scrap,
-/obj/item/ammo_box/a12g,
+/obj/item/storage/box/ammo/a12g_buckshot,
/obj/item/gun/ballistic/shotgun/doublebarrel/improvised/sawn,
/obj/item/ammo_casing/shotgun/improvised,
/obj/item/ammo_casing/shotgun/improvised,
@@ -8466,7 +8466,7 @@
"Xf" = (
/obj/structure/table/wood,
/obj/machinery/door/firedoor/border_only,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/turf/open/floor/carpet/green,
/area/ship/crew/canteen)
"Xg" = (
diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_kondor.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_kondor.dmm
index 9d6bc0d1f163..09ba8d6cd2f3 100644
--- a/_maps/_mod_celadon/shuttles/elysium/elysium_kondor.dmm
+++ b/_maps/_mod_celadon/shuttles/elysium/elysium_kondor.dmm
@@ -54,7 +54,7 @@
},
/obj/effect/turf_decal/box/white,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/crate_spawner,
+/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plasteel/dark,
/area/ship/cargo)
"bx" = (
@@ -240,7 +240,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/box/white,
-/obj/effect/spawner/lootdrop/crate_spawner,
+/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plating,
/area/ship/storage/eva)
"gu" = (
@@ -1255,7 +1255,7 @@
/obj/effect/turf_decal/box/white,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/crate_spawner,
+/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plasteel/dark,
/area/ship/cargo)
"Ce" = (
@@ -1336,7 +1336,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/trash/can,
/obj/effect/turf_decal/box/white,
-/obj/effect/spawner/lootdrop/crate_spawner,
+/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plasteel/dark,
/area/ship/storage/eva)
"Er" = (
@@ -1646,8 +1646,8 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/effect/turf_decal/box/white,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance/three,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/structure/closet/crate/wooden,
/turf/open/floor/plating,
/area/ship/cargo)
@@ -1806,7 +1806,7 @@
/turf/open/floor/carpet/green,
/area/ship/crew/dorm)
"Pb" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/dark,
/area/ship/hallway/central)
"Pv" = (
diff --git a/_maps/_mod_celadon/shuttles/events/nanotrasen_darect_gold.dmm b/_maps/_mod_celadon/shuttles/events/nanotrasen_darect_gold.dmm
index 22f1fc6ca447..be4416e2e673 100644
--- a/_maps/_mod_celadon/shuttles/events/nanotrasen_darect_gold.dmm
+++ b/_maps/_mod_celadon/shuttles/events/nanotrasen_darect_gold.dmm
@@ -955,7 +955,7 @@
/obj/machinery/light/small/directional/north{
pixel_x = -9
},
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/obj/machinery/shower{
pixel_y = 13
},
@@ -2127,10 +2127,10 @@
dir = 10
},
/obj/structure/table/reinforced,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/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/item/trash/chips{
pixel_x = 7;
pixel_y = 6
diff --git a/_maps/_mod_celadon/shuttles/events/solfed_saber_gold.dmm b/_maps/_mod_celadon/shuttles/events/solfed_saber_gold.dmm
index 049172387016..fc4c352fbd64 100644
--- a/_maps/_mod_celadon/shuttles/events/solfed_saber_gold.dmm
+++ b/_maps/_mod_celadon/shuttles/events/solfed_saber_gold.dmm
@@ -750,8 +750,8 @@
/obj/machinery/microwave{
pixel_y = 2
},
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/structure/table/reinforced{
color = "#c1b6a5"
},
@@ -1849,19 +1849,19 @@
dir = 2;
req_one_access_txt = "2"
},
-/obj/item/gun/ballistic/automatic/assault/p16{
+/obj/item/gun/ballistic/automatic/assault/cm82{
pixel_x = -11;
pixel_y = 9
},
-/obj/item/gun/ballistic/automatic/assault/p16{
+/obj/item/gun/ballistic/automatic/assault/cm82{
pixel_x = 4;
pixel_y = -6
},
-/obj/item/gun/ballistic/automatic/assault/p16{
+/obj/item/gun/ballistic/automatic/assault/cm82{
pixel_x = -2;
pixel_y = -1
},
-/obj/item/gun/ballistic/automatic/assault/p16{
+/obj/item/gun/ballistic/automatic/assault/cm82{
pixel_x = -7;
pixel_y = 5
},
@@ -2003,7 +2003,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/mineral/gold,
/area/ship/engineering)
"ps" = (
@@ -2081,7 +2081,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate/trashcart,
/obj/item/paper/pamphlet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/mineral/gold,
/area/ship/crew/office)
"qi" = (
@@ -2315,7 +2315,7 @@
pixel_y = -28;
pixel_x = -5
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/trimline/opaque/blue/warning{
dir = 10
},
@@ -2999,17 +2999,17 @@
/turf/open/floor/plasteel/mono/white,
/area/ship/medical/surgery)
"xz" = (
-/obj/item/ammo_box/a556_box,
+/obj/item/storage/box/ammo/a556_box,
/obj/structure/rack,
/obj/effect/turf_decal/box/red,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/corner/opaque/bar{
dir = 5
},
-/obj/item/ammo_box/a556_box{
+/obj/item/storage/box/ammo/a556_box{
pixel_y = 10
},
-/obj/item/ammo_box/a556_box{
+/obj/item/storage/box/ammo/a556_box{
pixel_y = 19
},
/obj/structure/window/reinforced{
@@ -3468,7 +3468,7 @@
/obj/structure/closet/firecloset/wall{
pixel_y = -28
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/corner/opaque/solgovgold{
dir = 10
},
@@ -4674,20 +4674,20 @@
/obj/machinery/airalarm/directional/north,
/obj/structure/rack,
/obj/structure/rack,
-/obj/item/ammo_box/c556mmHITP/rubbershot{
+/obj/item/storage/box/ammo/c556mmHITP/rubbershot{
pixel_x = -7;
pixel_y = 10
},
-/obj/item/ammo_box/c556mmHITP{
+/obj/item/storage/box/ammo/c556mmHITP{
pixel_x = -1;
pixel_y = 6
},
-/obj/item/ammo_box/c556mmHITP{
+/obj/item/storage/box/ammo/c556mmHITP{
pixel_x = 6;
pixel_y = 1
},
/obj/effect/decal/cleanable/cobweb,
-/obj/item/ammo_box/c556mmHITP{
+/obj/item/storage/box/ammo/c556mmHITP{
pixel_x = 6;
pixel_y = 1
},
@@ -5194,14 +5194,14 @@
/obj/structure/table/reinforced{
color = "#c1b6a5"
},
-/obj/item/reagent_containers/food/snacks/rationpack{
+/obj/effect/spawner/random/food_or_drink/ration{
pixel_x = -4;
pixel_y = 7
},
-/obj/item/reagent_containers/food/snacks/rationpack{
+/obj/effect/spawner/random/food_or_drink/ration{
pixel_y = 11
},
-/obj/item/reagent_containers/food/snacks/rationpack{
+/obj/effect/spawner/random/food_or_drink/ration{
pixel_x = -1;
pixel_y = 1
},
@@ -5303,7 +5303,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/obj/effect/spawner/lootdrop/glowstick{
+/obj/effect/spawner/random/decoration/glowstick{
pixel_x = 5;
pixel_y = 9
},
@@ -6021,12 +6021,12 @@
req_one_access_txt = "3"
},
/obj/item/gun/ballistic/rifle/solgov,
-/obj/item/ammo_box/a858,
-/obj/item/ammo_box/a858{
+/obj/item/storage/box/ammo/a858,
+/obj/item/storage/box/ammo/a858{
pixel_x = 3;
pixel_y = -4
},
-/obj/item/ammo_box/a858{
+/obj/item/storage/box/ammo/a858{
pixel_x = 6;
pixel_y = -8
},
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_alone.dmm b/_maps/_mod_celadon/shuttles/independent/independent_alone.dmm
index af988160e06e..c577e8e87373 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_alone.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_alone.dmm
@@ -153,9 +153,9 @@
"ry" = (
/obj/structure/closet/crate/trashcart,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/waste/trash,
-/obj/effect/spawner/lootdrop/waste/trash,
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plasteel,
/area/ship/bridge)
"tK" = (
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_beluga.dmm b/_maps/_mod_celadon/shuttles/independent/independent_beluga.dmm
index 7611abc9b948..7df668494a5b 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_beluga.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_beluga.dmm
@@ -1091,7 +1091,7 @@
all_items_free = 1
},
/obj/item/storage/bag/tray,
-/obj/effect/spawner/lootdrop/ration{
+/obj/effect/spawner/random/food_or_drink/ration{
pixel_x = 6;
pixel_y = 6
},
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_box.dmm b/_maps/_mod_celadon/shuttles/independent/independent_box.dmm
index 7c4165633f99..06766b5fff26 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_box.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_box.dmm
@@ -711,7 +711,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/crew/toilet)
"cG" = (
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/structure/closet/emcloset/anchored,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
@@ -1162,7 +1162,7 @@
/obj/structure/sign/poster/official/help_others{
pixel_x = -32
},
-/obj/effect/spawner/lootdrop/tool_surgery_adv,
+/obj/effect/spawner/random/medical/surgery_tool/adv,
/obj/item/megaphone/command,
/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 4
@@ -1460,10 +1460,10 @@
/area/ship/medical)
"nA" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/ration{
+/obj/effect/spawner/random/food_or_drink/ration{
pixel_y = 3
},
-/obj/effect/spawner/lootdrop/ration{
+/obj/effect/spawner/random/food_or_drink/ration{
pixel_x = -5;
pixel_y = 3
},
@@ -2029,7 +2029,7 @@
/obj/item/circuitboard/machine/chem_master,
/obj/item/reagent_containers/glass/beaker/large,
/obj/item/stack/sheet/glass/two,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/item/trash/can/food/beans,
/turf/open/floor/plasteel/white,
/area/ship/medical)
@@ -2173,7 +2173,7 @@
/obj/item/vending_refill/medical,
/obj/item/screwdriver,
/obj/machinery/airalarm/directional/south,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plasteel/white,
/area/ship/cargo)
"Cn" = (
@@ -2389,7 +2389,7 @@
icon_state = "0-2"
},
/obj/item/bot_assembly/hygienebot,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/item/areaeditor/shuttle,
/obj/item/flashlight{
pixel_x = 3;
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_boyardee.dmm b/_maps/_mod_celadon/shuttles/independent/independent_boyardee.dmm
index d17e9044d2a7..6f5b7eb9ffae 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_boyardee.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_boyardee.dmm
@@ -228,7 +228,7 @@
/area/ship/storage)
"ej" = (
/obj/structure/table/reinforced,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/effect/turf_decal/corner/opaque/white/half,
/obj/effect/turf_decal/corner/opaque/white{
dir = 4
@@ -2269,7 +2269,7 @@
/area/ship/crew/canteen/kitchen)
"Qc" = (
/obj/structure/table/reinforced,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/structure/cable{
icon_state = "4-8"
},
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_byo.dmm b/_maps/_mod_celadon/shuttles/independent/independent_byo.dmm
index 936b7d5e3584..b2a616807ef7 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_byo.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_byo.dmm
@@ -169,12 +169,12 @@
/area/ship/construction)
"rS" = (
/obj/structure/closet/wall/directional/north,
-/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/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/item/storage/cans/sixbeer,
/obj/item/reagent_containers/food/drinks/waterbottle/large{
pixel_x = 8;
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_caravan.dmm b/_maps/_mod_celadon/shuttles/independent/independent_caravan.dmm
index 4e6e52f52e6c..9433c90a0634 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_caravan.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_caravan.dmm
@@ -579,7 +579,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"kY" = (
@@ -587,7 +587,7 @@
dir = 4
},
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"ll" = (
@@ -832,8 +832,8 @@
/area/ship/crew)
"oA" = (
/obj/structure/table/reinforced,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/item/melee/knife/kitchen,
/obj/item/kitchen/rollingpin,
/turf/open/floor/carpet/royalblue,
@@ -1096,7 +1096,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/hallway/fore)
"tQ" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/oil,
/obj/effect/turf_decal/number/five{
dir = 8
@@ -1270,7 +1270,7 @@
/area/ship/bridge)
"xF" = (
/obj/machinery/atmospherics/pipe/simple/violet/visible,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"xI" = (
@@ -1509,7 +1509,7 @@
/area/ship/bridge)
"BV" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"Ca" = (
@@ -2012,7 +2012,7 @@
"Ko" = (
/obj/effect/turf_decal/box/corners,
/obj/structure/closet/cardboard,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"Kx" = (
@@ -2890,8 +2890,8 @@
/obj/item/reagent_containers/food/drinks/flask/gold,
/obj/item/gun/ballistic/revolver/detective,
/obj/item/gun/ballistic/derringer,
-/obj/item/ammo_box/c38,
-/obj/item/ammo_box/c38,
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38,
/turf/open/floor/carpet/red_gold,
/area/ship/bridge)
"ZM" = (
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_dwayne.dmm b/_maps/_mod_celadon/shuttles/independent/independent_dwayne.dmm
index 24d1f158bcb0..1a3ba6e78700 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_dwayne.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_dwayne.dmm
@@ -70,7 +70,7 @@
icon_state = "4-8"
},
/obj/structure/table/wood,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/item/storage/cans/sixbeer,
/turf/open/floor/wood,
/area/ship/crew)
@@ -624,7 +624,7 @@
/turf/open/floor/wood,
/area/ship/crew)
"nL" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/closet/crate/internals,
/obj/effect/turf_decal/box,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -809,12 +809,12 @@
icon_state = "1-2"
},
/obj/item/storage/cans/sixbeer,
-/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/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,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering)
"rp" = (
@@ -1620,15 +1620,15 @@
/area/ship/bridge)
"Mo" = (
/obj/structure/closet/crate/large,
-/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/random/maintenance/four,
/obj/item/circuitboard/machine/chem_dispenser/drinks,
/obj/item/circuitboard/computer/arcade/orion_trail,
/obj/item/kinetic_crusher,
/obj/effect/turf_decal/box,
/obj/item/vending_refill/mining_equipment,
-/obj/item/ammo_box/c38_box,
-/obj/item/ammo_box/c38_box,
-/obj/item/ammo_box/c38_box,
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
@@ -2023,7 +2023,7 @@
/turf/open/floor/plating,
/area/ship/engineering)
"UY" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/closet/crate,
/obj/effect/turf_decal/box,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_elder.dmm b/_maps/_mod_celadon/shuttles/independent/independent_elder.dmm
index 73403f20fe69..342b794c9f04 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_elder.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_elder.dmm
@@ -341,7 +341,7 @@
pixel_y = 14;
pixel_x = 5
},
-/obj/item/ammo_box/c38_box{
+/obj/item/storage/box/ammo/c38{
pixel_x = -6;
pixel_y = 7
},
@@ -349,7 +349,7 @@
pixel_x = 8;
pixel_y = 6
},
-/obj/item/ammo_box/c38_box{
+/obj/item/storage/box/ammo/c38{
pixel_x = -6;
pixel_y = 1
},
@@ -2033,7 +2033,7 @@
},
/obj/item/gun/ballistic/revolver/montagne,
/obj/item/storage/backpack/satchel/leather,
-/obj/item/ammo_box/c45,
+/obj/item/storage/box/ammo/c45,
/obj/item/clothing/head/cowboy/sec/roumain/montagne,
/obj/item/clothing/suit/armor/roumain/montagne,
/obj/item/ammo_box/a44roum_speedloader,
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_escapepod.dmm b/_maps/_mod_celadon/shuttles/independent/independent_escapepod.dmm
index a32e51b0a227..00342470019d 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_escapepod.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_escapepod.dmm
@@ -7,8 +7,8 @@
/obj/item/clothing/mask/gas/sechailer,
/obj/item/tank/internals/emergency_oxygen/double,
/obj/item/tank/internals/emergency_oxygen/double,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/structure/cable{
icon_state = "2-8"
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_halftrack.dmm b/_maps/_mod_celadon/shuttles/independent/independent_halftrack.dmm
index afa5df0df97b..edb5c924e944 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_halftrack.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_halftrack.dmm
@@ -179,8 +179,8 @@
/area/ship/crew)
"fa" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/machinery/newscaster/directional/south,
/turf/open/floor/carpet/nanoweave,
/area/ship/crew)
@@ -200,16 +200,16 @@
/obj/machinery/airalarm/directional/south,
/obj/machinery/firealarm/directional/west,
/obj/structure/closet/crate/secure/weapon,
-/obj/item/ammo_box/a12g,
-/obj/item/ammo_box/a12g,
-/obj/item/ammo_box/a12g,
-/obj/item/ammo_box/a12g,
-/obj/item/ammo_box/a12g,
-/obj/item/ammo_box/a12g/beanbag,
-/obj/item/ammo_box/a12g/beanbag,
-/obj/item/ammo_box/a12g/beanbag,
-/obj/item/ammo_box/a12g/beanbag,
-/obj/item/ammo_box/a12g/beanbag,
+/obj/item/storage/box/ammo/a12g_buckshot,
+/obj/item/storage/box/ammo/a12g_buckshot,
+/obj/item/storage/box/ammo/a12g_buckshot,
+/obj/item/storage/box/ammo/a12g_buckshot,
+/obj/item/storage/box/ammo/a12g_buckshot,
+/obj/item/storage/box/ammo/a12g_beanbag,
+/obj/item/storage/box/ammo/a12g_beanbag,
+/obj/item/storage/box/ammo/a12g_beanbag,
+/obj/item/storage/box/ammo/a12g_beanbag,
+/obj/item/storage/box/ammo/a12g_beanbag,
/obj/effect/turf_decal/box/red,
/turf/open/floor/plasteel/dark,
/area/ship/security)
@@ -1621,8 +1621,8 @@
/obj/item/ammo_box/magazine/toy/smg,
/obj/item/ammo_box/magazine/toy/smg,
/obj/item/ammo_box/magazine/toy/smg,
-/obj/item/ammo_box/foambox,
-/obj/item/ammo_box/foambox,
+/obj/item/storage/box/ammo/foam_darts,
+/obj/item/storage/box/ammo/foam_darts,
/turf/open/floor/plasteel/dark,
/area/ship/security/range)
"Ob" = (
@@ -1730,7 +1730,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/storage)
"Qp" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/machinery/light/directional/west,
/obj/machinery/newscaster/directional/south,
/turf/open/floor/carpet/nanoweave/beige,
@@ -2211,7 +2211,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/security)
"ZO" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/machinery/light/directional/east,
/turf/open/floor/carpet/nanoweave/beige,
/area/ship/hallway/aft)
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_junker.dmm b/_maps/_mod_celadon/shuttles/independent/independent_junker.dmm
index cf8d94742709..87acaef9ef40 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_junker.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_junker.dmm
@@ -464,7 +464,7 @@
/obj/structure/closet/crate,
/obj/effect/decal/cleanable/wrapping,
/obj/item/reagent_containers/glass/bottle/welding_fuel,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/cable{
icon_state = "0-2"
@@ -476,7 +476,7 @@
/turf/open/floor/plating,
/area/ship/storage/eva)
"jm" = (
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 10
},
@@ -570,7 +570,7 @@
/area/ship/storage/eva)
"km" = (
/obj/item/trash/sosjerky,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/areaeditor/shuttle{
pixel_y = 7
},
@@ -1007,7 +1007,7 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/ship/engineering/electrical)
"sM" = (
@@ -1099,7 +1099,7 @@
/area/ship/storage/eva)
"un" = (
/obj/machinery/door/firedoor,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -1295,7 +1295,7 @@
/area/ship/maintenance/starboard)
"zy" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/item/decal_painter,
/obj/item/storage/box/mousetraps,
/obj/structure/closet/toolcloset{
@@ -1425,7 +1425,7 @@
"Cf" = (
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/item/flashlight/pen,
/obj/machinery/light/small/broken/directional/north{
pixel_y = 0;
@@ -1628,7 +1628,7 @@
/area/ship/maintenance/central)
"Fl" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/item/toner,
/obj/item/clothing/neck/stethoscope,
/obj/machinery/light/small/broken/directional/north,
@@ -2157,7 +2157,7 @@
"Pf" = (
/obj/structure/rack,
/obj/item/storage/backpack/explorer,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/item/pickaxe/rusted,
/turf/open/floor/plating,
/area/ship/engineering/electrical)
@@ -2245,7 +2245,7 @@
/obj/structure/closet/crate/trashcart,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/machinery/light/small/directional/east,
/turf/open/floor/wood/walnut{
icon_state = "wood-broken3"
@@ -2352,7 +2352,7 @@
/turf/open/floor/pod/dark,
/area/ship/crew/canteen)
"Uu" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/mob/living/simple_animal/hostile/cockroach/glockroach,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/simple/purple/hidden{
@@ -2451,7 +2451,7 @@
"Wr" = (
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/item/reagent_containers/food/snacks/canned/peaches/maint,
/turf/open/floor/plating,
/area/ship/construction)
@@ -2586,7 +2586,7 @@
"Yx" = (
/obj/effect/decal/cleanable/sprayweb,
/obj/effect/decal/cleanable/cobweb,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/machinery/light/small/directional/north,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/effect/decal/cleanable/dirt/dust,
@@ -2622,7 +2622,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance/eight,
/obj/structure/safe/floor{
number_of_tumblers = 5
},
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_kilo.dmm b/_maps/_mod_celadon/shuttles/independent/independent_kilo.dmm
index d3e6ccc64a0a..31dcd48abf76 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_kilo.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_kilo.dmm
@@ -929,7 +929,7 @@
/obj/structure/rack,
/obj/item/storage/box/lights/mixed,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/structure/sign/poster/contraband/random{
pixel_x = 32
},
@@ -1417,11 +1417,11 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/ration{
+/obj/effect/spawner/random/food_or_drink/ration{
pixel_x = -6;
pixel_y = 4
},
-/obj/effect/spawner/lootdrop/ration{
+/obj/effect/spawner/random/food_or_drink/ration{
pixel_x = -6;
pixel_y = 8
},
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_koi.dmm b/_maps/_mod_celadon/shuttles/independent/independent_koi.dmm
index fd3ade35ec3f..0bd76e921f7b 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_koi.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_koi.dmm
@@ -25,15 +25,15 @@
/obj/item/flashlight/seclite,
/obj/item/flashlight/seclite,
/obj/item/flashlight/seclite,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
+/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/structure/closet/wall/directional/north,
/obj/machinery/door/window,
/obj/machinery/light/small/directional/north{
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_lagoon.dmm b/_maps/_mod_celadon/shuttles/independent/independent_lagoon.dmm
index 55d5f9bb0194..3abf00f59977 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_lagoon.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_lagoon.dmm
@@ -2820,7 +2820,7 @@
/turf/open/floor/plasteel,
/area/ship/hallway/fore)
"qx" = (
-/turf/open/floor/plating/beach/sand,
+/turf/open/floor/plating/asteroid/sand/lit,
/area/ship/hallway/central)
"qA" = (
/obj/structure/chair/comfy/orange/directional/north,
@@ -3830,7 +3830,7 @@
/area/ship/hallway/fore)
"wV" = (
/obj/structure/mineral_door/sandstone,
-/turf/open/floor/plating/beach/sand,
+/turf/open/floor/plating/asteroid/sand/lit,
/area/ship/hallway/central)
"wX" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
@@ -3852,7 +3852,7 @@
dir = 8
},
/turf/open/floor/carpet/blue{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/ship/hallway/central)
"xc" = (
@@ -4529,11 +4529,11 @@
},
/obj/item/clothing/head/plastic_flower,
/obj/item/clothing/head/plastic_flower,
-/obj/item/clothing/head/peaceflower,
-/obj/item/clothing/head/peaceflower,
-/obj/item/clothing/head/peaceflower,
-/obj/effect/spawner/lootdrop/flower,
-/obj/effect/spawner/lootdrop/flower,
+/obj/item/clothing/head/plastic_flower,
+/obj/item/clothing/head/plastic_flower,
+/obj/item/clothing/head/plastic_flower,
+/obj/effect/spawner/random/flower,
+/obj/effect/spawner/random/flower,
/obj/item/clothing/under/dress/flower,
/obj/item/grown/novaflower,
/obj/item/grown/novaflower,
@@ -5764,7 +5764,7 @@
pixel_x = 19
},
/turf/open/floor/carpet/blue{
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand/lit
},
/area/ship/hallway/central)
"Iy" = (
@@ -6242,7 +6242,7 @@
/obj/item/reagent_containers/spray/spraytan{
pixel_y = -8
},
-/turf/open/floor/plating/beach/sand,
+/turf/open/floor/plating/asteroid/sand/lit,
/area/ship/hallway/central)
"LF" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
@@ -6376,7 +6376,7 @@
/area/ship/hallway/starboard)
"Mz" = (
/obj/structure/table/wood,
-/obj/effect/spawner/lootdrop/flower,
+/obj/effect/spawner/random/flower,
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood,
/area/ship/crew/chapel)
@@ -8490,7 +8490,7 @@
/obj/structure/flora/tree/palm{
pixel_x = 1
},
-/turf/open/floor/plating/beach/sand,
+/turf/open/floor/plating/asteroid/sand/lit,
/area/ship/hallway/central)
"ZA" = (
/obj/structure/fluff/beach_umbrella/engine,
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_mimos.dmm b/_maps/_mod_celadon/shuttles/independent/independent_mimos.dmm
index af91cbe7c1d2..f471562ee40c 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_mimos.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_mimos.dmm
@@ -278,22 +278,22 @@
/area/ship/engineering/atmospherics)
"cG" = (
/obj/structure/safe/floor,
-/obj/effect/spawner/lootdrop/random_ammo_protolathe_lootdrop,
+/obj/effect/spawner/random/random_ammo_protolathe_lootdrop,
/obj/item/beacon{
icon_state = "bluebeacon";
name = "Подозрительный маяк"
},
/mob/living/simple_animal/hostile/rat,
-/obj/item/ammo_box/foambox/riot,
-/obj/item/ammo_box/foambox,
-/obj/item/ammo_box/foambox,
+/obj/item/storage/box/ammo/foam_darts/riot,
+/obj/item/storage/box/ammo/foam_darts,
+/obj/item/storage/box/ammo/foam_darts,
/obj/item/gun/ballistic/automatic/toy,
/turf/open/floor/plasteel/tech/grid,
/area/ship/construction)
"cH" = (
/obj/effect/turf_decal/corner/opaque/black/mono,
/obj/effect/turf_decal/corner/opaque/white/diagonal,
-/obj/item/gun/ballistic/revolver/shadow/no_mag{
+/obj/item/gun/ballistic/revolver/shadow/empty{
pixel_x = 2;
pixel_y = 6
},
@@ -526,7 +526,7 @@
"fc" = (
/obj/machinery/light/small/directional/south,
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/lootdrop/maintenance/six,
+/obj/effect/spawner/random/maintenance/six,
/obj/item/ammo_casing/shotgun/buckshot,
/obj/item/ammo_casing/shotgun/buckshot,
/turf/open/floor/plasteel/vaporwave{
@@ -638,7 +638,7 @@
/turf/open/floor/wood,
/area/ship/crew)
"gu" = (
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/obj/item/seeds/banana/mime,
/obj/structure/closet/crate/bin,
/turf/open/floor/carpet/royalblack,
@@ -664,7 +664,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/obj/item/ammo_casing/shotgun/buckshot{
pixel_x = 2;
pixel_y = 8
@@ -1014,11 +1014,11 @@
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/ammo_box/a12g,
-/obj/item/ammo_box/a12g,
+/obj/item/storage/box/ammo/a12g_buckshot,
+/obj/item/storage/box/ammo/a12g_buckshot,
/obj/item/gun/ballistic/automatic/pistol/solgov/old,
/obj/item/ammo_box/magazine/pistol556mm,
-/obj/item/ammo_box/c556mmHITP/hp,
+/obj/item/storage/box/ammo/c556mmHITP/hp,
/turf/open/floor/plasteel/tech/grid,
/area/ship/security)
"mg" = (
@@ -1352,9 +1352,9 @@
/obj/machinery/camera/preset,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate/trashcart/laundry,
-/obj/effect/spawner/lootdrop/gloves,
-/obj/effect/spawner/lootdrop/gloves,
-/obj/effect/spawner/lootdrop/gloves,
+/obj/effect/spawner/random/clothing/gloves,
+/obj/effect/spawner/random/clothing/gloves,
+/obj/effect/spawner/random/clothing/gloves,
/turf/open/floor/plasteel/vaporwave{
icon_state = "floor"
},
@@ -1591,8 +1591,8 @@
/obj/item/reagent_containers/food/snacks/canned/beans,
/obj/item/reagent_containers/food/snacks/canned/beans,
/obj/item/reagent_containers/food/snacks/canned/beans,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/machinery/door/window/northright{
dir = 8
},
@@ -1809,7 +1809,7 @@
dir = 9
},
/obj/machinery/airalarm/directional/east,
-/obj/effect/spawner/lootdrop/minor/pirate_or_bandana,
+/obj/effect/spawner/random/clothing/pirate_or_bandana,
/obj/item/cane,
/obj/item/storage/backpack/mime,
/turf/open/floor/plasteel/vaporwave{
@@ -1845,7 +1845,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
},
-/obj/structure/statue/bananium/clown,
+/obj/item/melee/energy/sword/bananium,
/obj/structure/safe/floor,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/circuitboard/machine/circuit_imprinter/department/civ,
@@ -1853,7 +1853,7 @@
/obj/item/circuitboard/machine/ore_redemption,
/obj/item/circuitboard/computer/rdconsole,
/obj/item/circuitboard/machine/rdserver,
-/obj/item/ammo_box/c10mm/hp,
+/obj/item/storage/box/ammo/c10mm_hp,
/obj/item/gun/ballistic/automatic/pistol/ringneck/no_mag,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
@@ -1903,7 +1903,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate/bin,
/obj/item/tank/internals/emergency_oxygen,
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/turf/open/floor/plasteel/vaporwave{
icon_state = "floor"
},
@@ -2071,7 +2071,7 @@
pixel_x = 1;
pixel_y = 1
},
-/obj/effect/spawner/lootdrop/maintenance/six,
+/obj/effect/spawner/random/maintenance/six,
/obj/machinery/light/small/broken/directional/south,
/turf/open/floor/plasteel/vaporwave{
icon_state = "floor"
@@ -2221,12 +2221,12 @@
},
/obj/item/storage/bag/tray,
/obj/item/reagent_containers/glass/beaker,
-/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/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/machinery/door/window/northleft{
dir = 8;
req_access_txt = null
@@ -2411,7 +2411,7 @@
},
/obj/machinery/airalarm/directional/east,
/obj/item/bedsheet/dorms,
-/obj/effect/spawner/lootdrop/minor/beret_or_rabbitears,
+/obj/effect/spawner/random/minor/beret_or_rabbitears,
/obj/item/cane,
/obj/item/storage/backpack/mime,
/turf/open/floor/plasteel/vaporwave{
@@ -2425,7 +2425,7 @@
id = "Ext.Windows";
name = "Ext.Windows"
},
-/obj/effect/spawner/lootdrop/tool_surgery_adv,
+/obj/effect/spawner/random/medical/surgery_tool/adv,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"BF" = (
@@ -2637,7 +2637,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/mob/living/simple_animal/hostile/cockroach,
/turf/open/floor/plating,
/area/ship/engineering/incinerator)
@@ -2692,7 +2692,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate/trashcart,
-/obj/item/ammo_box/a12g/rubbershot,
+/obj/item/storage/box/ammo/a12g_rubbershot,
/obj/item/gun/ballistic/shotgun/doublebarrel,
/turf/open/floor/plasteel/tech/grid,
/area/ship/security)
@@ -2783,7 +2783,7 @@
/area/ship/construction)
"ES" = (
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/turf/open/floor/wood,
/area/ship/crew)
"EU" = (
@@ -2971,7 +2971,7 @@
"Hg" = (
/obj/structure/closet/crate/bin,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/turf/open/floor/wood,
/area/ship/crew)
"Hi" = (
@@ -3169,7 +3169,7 @@
icon_state = "4-8"
},
/obj/item/extinguisher/mini,
-/obj/effect/spawner/lootdrop/tool_engie_adv,
+/obj/effect/spawner/random/engineering/tool/adv,
/turf/open/floor/plasteel/vaporwave{
icon_state = "floorscorched1"
},
@@ -4015,7 +4015,7 @@
"Vi" = (
/obj/effect/turf_decal/corner/opaque/black/mono,
/obj/effect/turf_decal/corner/opaque/white/diagonal,
-/obj/item/clothing/head/peaceflower,
+/obj/item/clothing/head/plastic_flower,
/turf/open/floor/plating,
/area/ship/crew)
"Vp" = (
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_mudskipper.dmm b/_maps/_mod_celadon/shuttles/independent/independent_mudskipper.dmm
index 4a80df0adb1f..a48407412d92 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_mudskipper.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_mudskipper.dmm
@@ -1806,10 +1806,10 @@
/obj/structure/closet/crate{
name = "ration crate"
},
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/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/item/reagent_containers/food/snacks/canned/beans,
/obj/item/reagent_containers/food/snacks/canned/beans,
/obj/item/reagent_containers/food/snacks/canned/beans,
@@ -2080,7 +2080,7 @@
dir = 1
},
/obj/item/storage/cans/sixbeer,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/obj/structure/closet/secure_closet/freezer{
anchored = 1;
name = "fridge"
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_nemo.dmm b/_maps/_mod_celadon/shuttles/independent/independent_nemo.dmm
index 5dde87d4c7d2..9f769ccbdc0e 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_nemo.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_nemo.dmm
@@ -1038,7 +1038,7 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/effect/spawner/lootdrop/techstorage/tcomms,
+/obj/effect/spawner/random/techstorage/tcomms,
/obj/structure/closet/crate,
/obj/item/stock_parts/subspace/filter,
/obj/item/stock_parts/subspace/filter,
@@ -2241,8 +2241,8 @@
},
/obj/item/melee/knife/hunting,
/obj/item/gun/ballistic/shotgun/doublebarrel/beacon,
-/obj/item/ammo_box/a4570,
-/obj/item/ammo_box/a4570,
+/obj/item/storage/box/ammo/a4570,
+/obj/item/storage/box/ammo/a4570,
/turf/open/floor/carpet/black,
/area/ship/bridge)
"FT" = (
@@ -2936,7 +2936,7 @@
/obj/structure/cable{
icon_state = "1-8"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"Qj" = (
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_qurk.dmm b/_maps/_mod_celadon/shuttles/independent/independent_qurk.dmm
index 47709c9d05cc..663c7d5feb89 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_qurk.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_qurk.dmm
@@ -1047,7 +1047,7 @@
/turf/open/floor/plasteel/mono/white,
/area/ship/medical)
"cj" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/turf/open/floor/plasteel/mono/white,
/area/ship/hallway/aft)
"ck" = (
@@ -2806,7 +2806,7 @@
/obj/item/storage/backpack/messenger/para,
/obj/item/storage/belt/medical/webbing/paramedic,
/obj/item/storage/firstaid/advanced,
-/obj/item/clothing/head/helmet/marine/medic,
+/obj/item/clothing/head/helmet/gezena,
/obj/item/clothing/head/soft/paramedic,
/obj/item/clothing/suit/toggle/labcoat/paramedic,
/obj/item/clothing/mask/gas/sechailer,
@@ -3112,7 +3112,7 @@
/obj/item/storage/backpack/messenger/para,
/obj/item/storage/belt/medical/webbing/paramedic,
/obj/item/storage/firstaid/advanced,
-/obj/item/clothing/head/helmet/marine/medic,
+/obj/item/clothing/head/helmet/gezena,
/obj/item/clothing/head/soft/paramedic,
/obj/item/clothing/suit/toggle/labcoat/paramedic,
/obj/item/clothing/mask/gas/sechailer,
@@ -3838,7 +3838,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/science/robotics)
"CG" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/white,
/area/ship/medical)
"CO" = (
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_radio_broadcast.dmm b/_maps/_mod_celadon/shuttles/independent/independent_radio_broadcast.dmm
index cab7f429e0ae..d7f81db33c7d 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_radio_broadcast.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_radio_broadcast.dmm
@@ -23,7 +23,7 @@
/obj/item/megaphone/command,
/obj/item/binoculars,
/obj/item/gun/ballistic/automatic/pistol/commissar,
-/obj/item/ammo_box/c9mm,
+/obj/item/storage/box/ammo/c9mm,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/storage/firstaid/medical,
@@ -460,8 +460,8 @@
pixel_y = 5
},
/obj/item/camera/detective,
-/obj/item/ammo_box/c38/dumdum,
-/obj/item/ammo_box/c38/iceblox,
+/obj/item/storage/box/ammo/c38/dumdum,
+/obj/item/storage/box/ammo/c38/iceblox,
/obj/structure/closet/wall/directional/south{
pixel_y = -32
},
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_ramo.dmm b/_maps/_mod_celadon/shuttles/independent/independent_ramo.dmm
index fe9a661185c8..cfd4c97c3157 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_ramo.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_ramo.dmm
@@ -72,7 +72,7 @@
pixel_y = 26;
id = 51321
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/ore_silo,
/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
@@ -87,7 +87,7 @@
"am" = (
/obj/effect/turf_decal/siding/thinplating/light,
/obj/item/radio/intercom/directional/west,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/holopad,
/turf/open/floor/plasteel/white,
/area/ship/medical/surgery)
@@ -512,7 +512,7 @@
icon_state = "vent_map_on-2";
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plasteel/grimy,
/area/ship/crew/cryo)
"aZ" = (
@@ -641,7 +641,7 @@
icon_state = "borderfloor_black";
dir = 10
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/holopad,
/turf/open/floor/plasteel/dark,
/area/ship/engineering)
@@ -744,7 +744,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/grimy,
/area/ship/crew/cryo)
"bq" = (
@@ -1029,7 +1029,7 @@
/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
"bG" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/borderfloorblack{
icon_state = "borderfloor_black";
dir = 4
@@ -1046,7 +1046,7 @@
/obj/effect/turf_decal/box/corners,
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
"bI" = (
@@ -1125,9 +1125,9 @@
/obj/item/storage/cans/sixsoda,
/obj/item/storage/cans/sixsoda,
/obj/item/storage/cans/sixbeer,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/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/machinery/door/firedoor/border_only{
dir = 4
},
@@ -1498,7 +1498,7 @@
icon_state = "siding_wood_line";
dir = 9
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/holopad,
/turf/open/floor/wood/walnut,
/area/ship/crew/canteen)
@@ -1526,7 +1526,7 @@
/turf/open/floor/carpet/orange,
/area/ship/engineering)
"cz" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small/directional/south,
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
@@ -1592,7 +1592,7 @@
/obj/structure/closet/crate/bin,
/obj/item/clothing/head/wizard/marisa/fake,
/obj/item/clothing/suit/wizrobe/marisa/fake,
-/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/random/maintenance/four,
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plasteel/grimy,
/area/ship/crew/canteen)
@@ -1601,7 +1601,7 @@
icon_state = "pipe11-2";
dir = 10
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/holopad/emergency/command,
/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
@@ -1680,7 +1680,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/external)
"cO" = (
@@ -1958,7 +1958,7 @@
/turf/open/floor/plasteel/grimy,
/area/ship/crew/canteen)
"dg" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/atmospherics/components/binary/dp_vent_pump{
icon_state = "dpvent_map-3";
@@ -1980,7 +1980,7 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering)
"di" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/firealarm/directional/south{
pixel_x = 5
},
@@ -2164,7 +2164,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/external)
"du" = (
@@ -2205,7 +2205,7 @@
/turf/open/floor/plasteel/grimy,
/area/ship/crew/canteen)
"dz" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/cable{
icon_state = "2-8"
},
@@ -2310,9 +2310,9 @@
/obj/effect/turf_decal/box/corners,
/obj/structure/closet/crate/trashcart,
/obj/item/clothing/head/kitty,
-/obj/effect/spawner/lootdrop/costume,
-/obj/effect/spawner/lootdrop/armory_contraband,
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/clothing/costume,
+/obj/effect/spawner/random/exotic/armory,
+/obj/effect/spawner/random/maintenance/eight,
/obj/effect/decal/cleanable/wrapping,
/obj/machinery/door/firedoor/border_only{
dir = 4
@@ -2468,7 +2468,7 @@
/turf/open/floor/plating,
/area/ship/external)
"dZ" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/advanced_airlock_controller{
pixel_x = -28;
pixel_y = -5
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_rigger.dmm b/_maps/_mod_celadon/shuttles/independent/independent_rigger.dmm
index 2165167e6277..e78f64336c3c 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_rigger.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_rigger.dmm
@@ -70,7 +70,7 @@
"bc" = (
/obj/structure/closet/cardboard,
/obj/item/circuitboard/machine/mechfab,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating,
/area/ship/construction)
"bi" = (
@@ -228,8 +228,8 @@
/area/ship/construction)
"dx" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/effect/turf_decal/corner/opaque/yellow/diagonal,
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/plasteel/white,
@@ -264,7 +264,7 @@
"eu" = (
/obj/structure/closet/crate,
/obj/machinery/airalarm/directional/north,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/item/circuitboard/machine/circuit_imprinter/department/science,
/turf/open/floor/plating,
/area/ship/construction)
@@ -472,7 +472,7 @@
/area/ship/cargo)
"hE" = (
/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/radio/intercom/directional/north{
pixel_x = 10
},
@@ -730,7 +730,7 @@
/turf/open/floor/plating,
/area/ship/engineering/communications)
"jx" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"jy" = (
@@ -809,7 +809,7 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/firealarm/directional/east,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -956,12 +956,12 @@
name = "food crate"
},
/obj/item/storage/cans/sixbeer,
-/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/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/turf_decal/box/corners{
dir = 1
},
@@ -1153,7 +1153,7 @@
/turf/open/floor/plasteel/white,
/area/ship/crew/canteen)
"oX" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ship/construction)
"ph" = (
@@ -2619,7 +2619,7 @@
},
/obj/structure/closet/crate,
/obj/machinery/firealarm/directional/west,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating,
/area/ship/maintenance/port)
"Fu" = (
@@ -3397,7 +3397,7 @@
pixel_x = -32
},
/obj/effect/turf_decal/corner/opaque/yellow/diagonal,
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/white,
/area/ship/crew/canteen)
"ON" = (
@@ -3582,7 +3582,7 @@
"Qv" = (
/obj/structure/closet/crate,
/obj/item/circuitboard/computer/rdconsole,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plasteel,
/area/ship/construction)
"QB" = (
@@ -3614,8 +3614,8 @@
pixel_x = -28;
req_access_txt = "57"
},
-/obj/item/ammo_box/c38,
-/obj/item/ammo_box/c38,
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38,
/turf/open/floor/carpet/blue,
/area/ship/engineering/communications)
"QT" = (
@@ -4146,7 +4146,7 @@
req_access_txt = "1";
dir = 1
},
-/obj/item/ammo_box/c38_box,
+/obj/item/storage/box/ammo/c38,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45,
@@ -4248,7 +4248,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 9
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ship/construction)
"XD" = (
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_rube_goldberg.dmm b/_maps/_mod_celadon/shuttles/independent/independent_rube_goldberg.dmm
index c1caf10dbf69..d0b468843797 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_rube_goldberg.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_rube_goldberg.dmm
@@ -1307,7 +1307,7 @@
/obj/item/rcd_ammo,
/obj/item/clothing/gloves/color/yellow,
/obj/item/gun/ballistic/shotgun/flamingarrow,
-/obj/item/ammo_box/c38_box,
+/obj/item/storage/box/ammo/c38,
/obj/item/storage/fancy/cigarettes/cigars/cohiba,
/obj/effect/turf_decal/corner/opaque/yellow/border{
dir = 6
@@ -2847,9 +2847,9 @@
/area/ship/engineering/atmospherics)
"Ck" = (
/obj/structure/closet/crate/freezer,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/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/item/pizzabox/meat,
/obj/item/pizzabox/vegetable,
/obj/machinery/camera/autoname{
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_schmiedeberg.dmm b/_maps/_mod_celadon/shuttles/independent/independent_schmiedeberg.dmm
index a7666f680710..f576f6abee19 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_schmiedeberg.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_schmiedeberg.dmm
@@ -167,7 +167,7 @@
/obj/machinery/door/window/brigdoor/northright{
dir = 2
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/turf_decal/siding/wood{
dir = 10
},
@@ -439,7 +439,7 @@
/area/ship/cargo)
"fq" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/decal/cleanable/greenglow/filled,
/obj/effect/turf_decal/siding/wood{
color = "#543C30";
@@ -1182,8 +1182,8 @@
/obj/machinery/door/poddoor/shutters/preopen{
id = "pharmlobby"
},
-/obj/effect/spawner/lootdrop/maintenance/two,
-/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/random/maintenance/four,
/turf/open/floor/mineral/titanium,
/area/ship/cargo)
"qj" = (
@@ -1228,7 +1228,7 @@
/area/ship/medical)
"qU" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/turf_decal/siding/wood{
color = "#543C30";
dir = 9
@@ -2366,7 +2366,7 @@
/obj/structure/rack,
/obj/structure/window/reinforced/spawner/east,
/obj/structure/window/reinforced/spawner/north,
-/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/random/maintenance/four,
/obj/machinery/door/window/brigdoor/northright{
dir = 8
},
@@ -2734,14 +2734,14 @@
/obj/structure/rack,
/obj/structure/window/reinforced/spawner/east,
/obj/structure/window/reinforced/spawner/north,
-/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/random/maintenance/four,
/obj/machinery/door/window/brigdoor/northright{
dir = 8
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "pharmlobby"
},
-/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/random/maintenance/four,
/turf/open/floor/wood/walnut,
/area/ship/cargo)
"OO" = (
@@ -3058,7 +3058,7 @@
/obj/item/flashlight/glowstick/blue,
/obj/item/flashlight/glowstick/cyan,
/obj/item/storage/pill_bottle/floorpill,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/turf_decal/siding/wood{
color = "#543C30";
dir = 1
@@ -3105,7 +3105,7 @@
dir = 8
},
/obj/item/storage/pill_bottle/zoom,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/machinery/door/poddoor/shutters/preopen{
id = "pharmlobby"
},
@@ -3213,7 +3213,7 @@
/obj/machinery/door/window/brigdoor/northright{
dir = 2
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/turf_decal/siding/wood{
dir = 6
},
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_shepherd.dmm b/_maps/_mod_celadon/shuttles/independent/independent_shepherd.dmm
index 68bfff86c508..62d41edc0fa1 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_shepherd.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_shepherd.dmm
@@ -2504,7 +2504,7 @@
/turf/open/floor/ship/dirt/dark,
/area/ship/crew/hydroponics)
"wz" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood,
/area/ship/hallway/starboard)
@@ -2613,7 +2613,7 @@
/area/ship/hallway/port)
"xs" = (
/obj/structure/table/wood,
-/obj/effect/spawner/lootdrop/three_course_meal,
+/obj/effect/spawner/random/food_or_drink/three_course_meal,
/obj/effect/turf_decal/corner_techfloor_grid/diagonal,
/obj/machinery/light/small/directional/west,
/turf/open/floor/pod/dark,
@@ -2660,7 +2660,7 @@
/area/ship/medical/morgue)
"yg" = (
/obj/structure/table/wood/fancy,
-/obj/effect/spawner/lootdrop/three_course_meal,
+/obj/effect/spawner/random/food_or_drink/three_course_meal,
/obj/effect/turf_decal/siding/wood{
color = "#332521"
},
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_shetland.dmm b/_maps/_mod_celadon/shuttles/independent/independent_shetland.dmm
index 633d89ba20bf..e4b781e1e2a5 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_shetland.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_shetland.dmm
@@ -533,7 +533,7 @@
/turf/open/floor/plasteel/white,
/area/ship/hallway/fore)
"eJ" = (
-/obj/machinery/vending/snack/random{
+/obj/effect/spawner/random/vending/snack{
all_items_free = 1
},
/turf/open/floor/plasteel,
@@ -3676,12 +3676,12 @@
name = "food crate"
},
/obj/item/storage/cans/sixbeer,
-/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/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/structure/cable{
icon_state = "1-2"
},
@@ -3708,7 +3708,7 @@
/area/ship/hallway/port)
"LK" = (
/obj/structure/closet/crate/large,
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/obj/item/trash/can/food/beans,
/obj/item/trash/energybar,
/obj/item/trash/can,
@@ -4554,7 +4554,7 @@
/turf/open/floor/plasteel,
/area/ship/crew/hydroponics)
"Tc" = (
-/obj/machinery/vending/cola/random{
+/obj/effect/spawner/random/vending/cola{
all_items_free = 1
},
/turf/open/floor/plasteel,
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_skipjack.dmm b/_maps/_mod_celadon/shuttles/independent/independent_skipjack.dmm
index 97a2cdcd2fdf..1f29a7d754ee 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_skipjack.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_skipjack.dmm
@@ -264,15 +264,15 @@
/turf/open/floor/plating,
/area/ship/security/armory)
"fa" = (
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/machinery/newscaster/directional/south,
/obj/structure/table/wood/reinforced,
/obj/effect/decal/cleanable/dirt,
/obj/item/melee/knife/kitchen{
pixel_x = -11
},
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/turf/open/floor/carpet/nanoweave,
/area/ship/crew)
"fe" = (
@@ -507,7 +507,7 @@
/obj/machinery/door/firedoor/border_only{
dir = 8
},
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/dark,
/area/ship/security/armory)
"kR" = (
@@ -759,7 +759,7 @@
/area/ship/maintenance/port)
"pw" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/turf/open/floor/plasteel/dark,
/area/ship/security/armory)
"pK" = (
@@ -948,7 +948,7 @@
/obj/machinery/airalarm/directional/west,
/obj/structure/window/reinforced/spawner/north,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/obj/item/reagent_containers/food/snacks/canned/peaches{
pixel_x = 10
},
@@ -2257,7 +2257,7 @@
/area/ship/crew)
"UT" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/salvage/gold,
+/obj/effect/spawner/random/salvage/gold,
/turf/open/floor/plasteel/dark,
/area/ship/security/armory)
"UX" = (
@@ -2282,7 +2282,7 @@
pixel_y = 22
},
/obj/machinery/airalarm/directional/west,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"Vs" = (
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_tranquility.dmm b/_maps/_mod_celadon/shuttles/independent/independent_tranquility.dmm
index 3a987fe98e3b..27a2c1e3a34f 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_tranquility.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_tranquility.dmm
@@ -1149,10 +1149,10 @@
/area/ship/hallway/starboard)
"ld" = (
/obj/structure/closet/crate/hydroponics,
-/obj/effect/spawner/lootdrop/seeded,
-/obj/effect/spawner/lootdrop/seeded,
-/obj/effect/spawner/lootdrop/seeded,
-/obj/effect/spawner/lootdrop/seeded,
+/obj/effect/spawner/random/seeded,
+/obj/effect/spawner/random/seeded,
+/obj/effect/spawner/random/seeded,
+/obj/effect/spawner/random/seeded,
/obj/item/seeds/random,
/obj/machinery/light/directional/east,
/turf/open/floor/grass,
@@ -4318,7 +4318,7 @@
/obj/item/clothing/head/beret,
/obj/item/clothing/under/color/jumpskirt/random,
/obj/item/clothing/under/color/random,
-/obj/item/clothing/under/dress/skirt/red,
+/obj/item/clothing/under/dress/skirt/color/red,
/obj/item/clothing/suit/longcoat,
/obj/item/clothing/suit/jacket/letterman_red,
/obj/item/clothing/head/wizard/marisa,
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_vela.dmm b/_maps/_mod_celadon/shuttles/independent/independent_vela.dmm
index 2ef108551787..52ffe4924dcf 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_vela.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_vela.dmm
@@ -30,9 +30,9 @@
/obj/structure/cable{
icon_state = "0-6"
},
-/obj/item/ammo_box/c9mm/rubbershot,
-/obj/item/ammo_box/c9mm,
-/obj/item/ammo_box/c9mm,
+/obj/item/storage/box/ammo/c9mm_rubber,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
/turf/open/floor/plasteel/tech,
/area/ship/security/armory)
"al" = (
@@ -1076,7 +1076,7 @@
/area/ship/science/ai_chamber)
"gX" = (
/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/tech/grid,
/area/ship/crew)
"hf" = (
@@ -3056,9 +3056,9 @@
dir = 1
},
/obj/effect/turf_decal/techfloor,
-/obj/effect/spawner/lootdrop/aimodule_harmless,
-/obj/effect/spawner/lootdrop/aimodule_harmless,
-/obj/effect/spawner/lootdrop/aimodule_harmless,
+/obj/effect/spawner/random/aimodule_harmless,
+/obj/effect/spawner/random/aimodule_harmless,
+/obj/effect/spawner/random/aimodule_harmless,
/obj/machinery/light/small/directional/south,
/turf/open/floor/plasteel/tech/grid,
/area/ship/science/ai_chamber)
@@ -3435,7 +3435,7 @@
/obj/item/pizzabox/pineapple,
/obj/item/pizzabox/pineapple,
/obj/item/pizzabox/pineapple,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/item/reagent_containers/glass/mortar/metal,
/obj/item/pestle,
/obj/item/reagent_containers/condiment/saltshaker,
@@ -4673,7 +4673,7 @@
/area/ship/bridge)
"zC" = (
/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/tech/grid,
/area/ship/hallway/central)
"zE" = (
@@ -4812,9 +4812,9 @@
dir = 1
},
/obj/effect/turf_decal/techfloor,
-/obj/effect/spawner/lootdrop/aimodule_neutral,
-/obj/effect/spawner/lootdrop/aimodule_neutral,
-/obj/effect/spawner/lootdrop/aimodule_neutral,
+/obj/effect/spawner/random/aimodule_neutral,
+/obj/effect/spawner/random/aimodule_neutral,
+/obj/effect/spawner/random/aimodule_neutral,
/turf/open/floor/plasteel/tech/grid,
/area/ship/science/ai_chamber)
"Aq" = (
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm
index 2638fb1f65bb..80b812bdf32f 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm
@@ -244,8 +244,8 @@
locked = 0;
name = "fridge"
},
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/item/storage/cans/sixbeer,
/obj/effect/turf_decal/corner/opaque/yellow{
dir = 1
@@ -844,7 +844,7 @@
/turf/open/floor/plating,
/area/ship/maintenance/port)
"iT" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/effect/turf_decal/trimline/opaque/yellow/line,
/obj/effect/turf_decal/siding/thinplating,
/obj/structure/cable,
@@ -1606,16 +1606,16 @@
dir = 1
},
/obj/structure/closet/crate,
-/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/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/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
@@ -2493,7 +2493,7 @@
},
/obj/structure/closet/cardboard,
/obj/item/radio/intercom/directional/south,
-/obj/effect/spawner/lootdrop/maintenance/seven,
+/obj/effect/spawner/random/maintenance/seven,
/obj/effect/turf_decal/corner_techfloor_gray{
dir = 4
},
@@ -2647,9 +2647,9 @@
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/storage/belt/military/assault,
/obj/item/clothing/head/inteq_peaked,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
/turf/open/floor/carpet/orange,
/area/ship/bridge)
"Dq" = (
@@ -3616,7 +3616,7 @@
/obj/structure/closet/crate/trashcart,
/obj/machinery/airalarm/directional/east,
/obj/machinery/firealarm/directional/south,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/corner_techfloor_gray{
dir = 4
},
@@ -4452,7 +4452,7 @@
/turf/open/floor/carpet/black,
/area/ship/crew)
"XS" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/trimline/opaque/yellow/line,
/obj/effect/turf_decal/siding/thinplating,
/obj/machinery/airalarm/directional/south,
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm
index d433747208d8..fab683beabb6 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm
@@ -1188,7 +1188,7 @@
pixel_x = -20;
pixel_y = -10
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
"mK" = (
@@ -1249,9 +1249,9 @@
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
/obj/item/gun/energy/e_gun/adv_stopping,
/obj/item/stock_parts/cell/gun/upgraded,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"nB" = (
@@ -2922,8 +2922,8 @@
/area/ship/crew/office)
"Ky" = (
/obj/structure/closet/cardboard,
-/obj/effect/spawner/lootdrop/maintenance/seven,
-/obj/effect/spawner/lootdrop/gloves,
+/obj/effect/spawner/random/maintenance/seven,
+/obj/effect/spawner/random/clothing/gloves,
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/starboard)
"KL" = (
@@ -3457,7 +3457,7 @@
dir = 9
},
/obj/machinery/airalarm/directional/east,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plasteel/white,
/area/ship/medical)
"RO" = (
@@ -3592,7 +3592,7 @@
pixel_x = -10;
pixel_y = -19
},
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/structure/extinguisher_cabinet/directional/east,
/obj/machinery/firealarm/directional/south,
/turf/open/floor/plasteel/dark,
@@ -3651,7 +3651,7 @@
/area/ship/engineering)
"TQ" = (
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/lootdrop/maintenance/six,
+/obj/effect/spawner/random/maintenance/six,
/obj/structure/sign/poster/official/help_others{
pixel_x = 32
},
@@ -3788,7 +3788,7 @@
/obj/effect/turf_decal/corner/opaque/yellow/half{
dir = 8
},
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
"Wh" = (
@@ -3911,12 +3911,12 @@
locked = 0;
name = "fridge"
},
-/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/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/turf_decal/corner/opaque/yellow/three_quarters,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable{
@@ -3966,7 +3966,7 @@
/obj/structure/closet/crate,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/structure/cable{
icon_state = "2-4";
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
index 260a4cf7750d..156f6ca15ee8 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
@@ -68,10 +68,10 @@
anchored = 1;
req_access_txt = "8486"
},
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
/obj/item/clothing/accessory/holster,
/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
@@ -780,7 +780,7 @@
/area/ship/security/prison)
"dS" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/tech/grid,
/area/ship/maintenance/central)
"dU" = (
@@ -941,8 +941,8 @@
icon_state = "0-2"
},
/obj/item/reagent_containers/food/snacks/pizzaslice/arnold,
-/obj/effect/spawner/lootdrop/maintenance/eight,
-/obj/effect/spawner/lootdrop/mafia_outfit,
+/obj/effect/spawner/random/maintenance/eight,
+/obj/effect/spawner/random/clothing/mafia_outfit,
/obj/structure/closet/crate/wooden{
name = "old wooden crate"
},
@@ -2625,7 +2625,7 @@
dir = 5
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/cargo/office)
"rD" = (
@@ -3469,7 +3469,7 @@
},
/obj/effect/turf_decal/box/white,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/seven,
+/obj/effect/spawner/random/maintenance/seven,
/turf/open/floor/plating,
/area/ship/cargo)
"wR" = (
@@ -3908,9 +3908,9 @@
name = "Kitchen"
},
/obj/machinery/door/firedoor,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/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,
/turf/open/floor/plastic,
/area/ship/crew/canteen/kitchen)
"zh" = (
@@ -4252,7 +4252,7 @@
/obj/structure/closet/crate/large,
/obj/effect/turf_decal/industrial/traffic,
/obj/effect/turf_decal/box/white,
-/obj/effect/spawner/lootdrop/maintenance/seven,
+/obj/effect/spawner/random/maintenance/seven,
/turf/open/floor/plating,
/area/ship/cargo)
"AT" = (
@@ -4488,7 +4488,7 @@
/turf/open/floor/plating,
/area/ship/cargo)
"Cd" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/structure/disposalpipe/segment{
dir = 2
},
@@ -4508,7 +4508,7 @@
name = "good looking turtleneck";
desc = "a midnight black turtleneck."
},
-/obj/item/storage/box/inteqmaid,
+/obj/item/storage/box/maid,
/obj/item/storage/belt/security/webbing/inteq/alt,
/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
/obj/item/clothing/head/beret/sec/hos/inteq/honorable{
@@ -4745,7 +4745,7 @@
/obj/structure/closet/crate/engineering,
/obj/item/storage/cans/sixbeer,
/obj/item/storage/cans/sixbeer,
-/obj/item/storage/box/inteqmaid,
+/obj/item/storage/box/maid,
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plating,
/area/ship/engineering/engine)
@@ -4850,7 +4850,7 @@
dir = 4
},
/obj/effect/turf_decal/box/white,
-/obj/effect/spawner/lootdrop/maintenance/seven,
+/obj/effect/spawner/random/maintenance/seven,
/turf/open/floor/plating,
/area/ship/cargo)
"Em" = (
@@ -4938,15 +4938,15 @@
/area/ship/engineering/electrical)
"EY" = (
/obj/effect/turf_decal/box/white,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
+/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/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/obj/structure/closet/crate/large,
/turf/open/floor/plating,
/area/ship/cargo)
@@ -7194,7 +7194,7 @@
},
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/structure/closet/crate/large,
-/obj/effect/spawner/lootdrop/maintenance/seven,
+/obj/effect/spawner/random/maintenance/seven,
/turf/open/floor/plating,
/area/ship/cargo)
"Un" = (
@@ -7891,7 +7891,7 @@
"Yv" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/dresser,
-/obj/item/ammo_box/foambox{
+/obj/item/storage/box/ammo/foam_darts{
pixel_y = 11;
layer = 6
},
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm
index e0830ed9bf98..32e3ad61ef56 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm
@@ -27,8 +27,8 @@
locked = 0;
name = "fridge"
},
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/item/storage/cans/sixbeer,
/obj/item/reagent_containers/food/snacks/icecreamsandwich,
/obj/machinery/light/directional/south,
@@ -969,9 +969,9 @@
/obj/item/radio/headset/inteq/alt/captain,
/obj/item/shield/riot/tele,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
/turf/open/floor/carpet/orange,
/area/ship/bridge)
"ve" = (
@@ -2044,11 +2044,11 @@
dir = 4
},
/obj/structure/closet/crate,
-/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/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/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/turf/open/floor/plasteel/patterned/cargo_one,
@@ -2085,7 +2085,7 @@
/obj/item/storage/fancy/cigarettes/cigars{
pixel_x = 8
},
-/obj/item/ammo_box/a762_40/inteq{
+/obj/item/storage/box/ammo/a762_40/inteq{
pixel_x = 5;
pixel_y = 12
},
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm
index b096ef9fd04c..b014882f6622 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm
@@ -576,13 +576,13 @@
/obj/structure/closet/crate/secure/weapon{
req_access_txt = "3"
},
-/obj/item/ammo_box/a556_box,
-/obj/item/ammo_box/a556_box,
-/obj/item/ammo_box/a556_box/a856,
-/obj/item/ammo_box/a556_box/m903,
-/obj/item/ammo_box/c10mm,
-/obj/item/ammo_box/c10mm,
-/obj/item/ammo_box/c10mm,
+/obj/item/storage/box/ammo/a556_box,
+/obj/item/storage/box/ammo/a556_box,
+/obj/item/storage/box/ammo/a556_box/a856,
+/obj/item/storage/box/ammo/a556_box/m903,
+/obj/item/storage/box/ammo/c10mm,
+/obj/item/storage/box/ammo/c10mm,
+/obj/item/storage/box/ammo/c10mm,
/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
"xk" = (
@@ -884,14 +884,14 @@
/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/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/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,
/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
"JU" = (
@@ -1246,9 +1246,9 @@
req_access_txt = "20"
},
/obj/item/melee/knife/combat,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
/obj/item/melee/baton/loaded,
/obj/item/storage/belt/military/assault,
/obj/structure/sign/poster/contraband/inteq{
@@ -1625,14 +1625,14 @@
/obj/structure/closet/crate/secure/weapon{
req_access_txt = "3"
},
-/obj/item/ammo_box/c9mm,
-/obj/item/ammo_box/c9mm,
-/obj/item/ammo_box/c9mm,
-/obj/item/ammo_box/c9mm,
-/obj/item/ammo_box/c9mm,
-/obj/item/ammo_box/c9mm,
-/obj/item/ammo_box/c45,
-/obj/item/ammo_box/c45,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c45,
+/obj/item/storage/box/ammo/c45,
/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
"ZZ" = (
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm
index 38d9af33bd70..3892b8b1a1f0 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm
@@ -33,7 +33,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/airless,
/area/ship/maintenance/port)
"au" = (
@@ -423,7 +423,7 @@
/area/ship/crew/canteen)
"cr" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/cargo/starboard)
"cx" = (
@@ -903,7 +903,7 @@
/obj/machinery/light/small/directional/north,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/plasma,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ship/cargo/port)
"eO" = (
@@ -1145,7 +1145,7 @@
"gj" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/cargo/port)
"gm" = (
@@ -1842,7 +1842,7 @@
/area/ship/security)
"kK" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/effect/turf_decal/industrial/warning{
dir = 4
},
@@ -2041,7 +2041,7 @@
/area/ship/engineering)
"lL" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/maintenance/starboard)
"lN" = (
@@ -2119,7 +2119,7 @@
/area/ship/storage)
"mu" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/cargo/starboard)
"mv" = (
@@ -2344,7 +2344,7 @@
/area/ship/engineering/engine)
"nC" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/airless,
/area/ship/cargo/port)
"nF" = (
@@ -2671,7 +2671,7 @@
/area/ship/hallway/central)
"ph" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/structure/cable{
icon_state = "1-6"
},
@@ -3000,7 +3000,7 @@
/area/ship/cargo)
"rc" = (
/obj/machinery/light/small/directional/east,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/airless,
/area/ship/maintenance/port)
"rh" = (
@@ -3613,7 +3613,7 @@
/area/ship/security)
"vm" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/cargo/port)
"vv" = (
@@ -3824,7 +3824,7 @@
/obj/effect/turf_decal/corner/opaque/brown{
dir = 8
},
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"wl" = (
@@ -3927,7 +3927,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/security/armory)
"wO" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/grimy,
/area/ship/crew/crewtwo)
@@ -4032,7 +4032,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/cargo/starboard)
"xx" = (
@@ -4407,7 +4407,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/item/cigbutt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/airless,
/area/ship/maintenance/starboard)
"zc" = (
@@ -4595,9 +4595,9 @@
"Aq" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/machinery/light_switch{
dir = 4;
pixel_x = -22;
@@ -5236,7 +5236,7 @@
/area/ship/engineering)
"DS" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/machinery/light_switch{
dir = 4;
pixel_x = -22;
@@ -5568,7 +5568,7 @@
/area/ship/crew/crewtwo)
"Gm" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/airless,
/area/ship/maintenance/port)
"Gn" = (
@@ -5788,7 +5788,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/closet/cardboard,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/item/clothing/head/maidheadband/inteq,
/turf/open/floor/plating/airless,
/area/ship/cargo/starboard)
@@ -6461,7 +6461,7 @@
"Lx" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/airless,
/area/ship/maintenance/starboard)
"LA" = (
@@ -6587,9 +6587,9 @@
/obj/item/storage/lockbox/medal/sec{
pixel_y = 5
},
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Mo" = (
@@ -6650,7 +6650,7 @@
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/item/instrument/harmonica{
pixel_x = -4;
pixel_y = 21
@@ -7018,7 +7018,7 @@
/area/ship/external/dark)
"OP" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/machinery/light_switch{
pixel_y = 22
},
@@ -7069,7 +7069,7 @@
/area/ship/engineering/engine)
"Ph" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/maintenance/port)
"Pj" = (
@@ -7107,7 +7107,7 @@
/area/ship/cargo)
"PB" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/cargo/port)
"PF" = (
@@ -7117,11 +7117,11 @@
/obj/structure/closet/crate{
name = "food crate"
},
-/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/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/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
@@ -7450,7 +7450,7 @@
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Rw" = (
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/structure/closet/cardboard,
/obj/effect/turf_decal/techfloor{
dir = 1
@@ -7682,7 +7682,7 @@
icon_state = "1-8"
},
/obj/effect/decal/cleanable/blood/old,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/cargo/starboard)
"Sw" = (
@@ -7971,7 +7971,7 @@
"TE" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/maintenance/starboard)
"TI" = (
@@ -8147,7 +8147,7 @@
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"Vh" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/airless,
/area/ship/cargo/starboard)
"Vi" = (
@@ -8215,7 +8215,7 @@
/obj/structure/sign/poster/contraband/eat{
pixel_y = 32
},
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"VB" = (
@@ -8280,7 +8280,7 @@
/area/ship/hallway/central)
"VS" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/maintenance/port)
"VX" = (
@@ -8733,7 +8733,7 @@
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"Yd" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/airless,
/area/ship/maintenance/port)
"Yg" = (
@@ -9012,7 +9012,7 @@
"ZU" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating/airless,
/area/ship/cargo/port)
"ZZ" = (
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_valor.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_valor.dmm
index a551f25ebab4..cc2f14585322 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_valor.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_valor.dmm
@@ -111,7 +111,7 @@
},
/obj/effect/turf_decal/box/corners,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"bv" = (
@@ -596,9 +596,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/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/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/item/storage/ration/crayons,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
@@ -1467,7 +1467,7 @@
/obj/effect/turf_decal/trimline/opaque/yellow/line{
dir = 5
},
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
@@ -2651,8 +2651,8 @@
dir = 1
},
/obj/item/reagent_containers/food/snacks/hotdog,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/obj/machinery/newscaster/directional/south,
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
@@ -3896,7 +3896,7 @@
dir = 1
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"JT" = (
@@ -4355,9 +4355,9 @@
/obj/item/storage/lockbox/medal/sec,
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
/obj/item/clothing/head/inteq_peaked,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
/turf/open/floor/carpet/orange,
/area/ship/bridge)
"Od" = (
@@ -4571,7 +4571,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/random/food_or_drink/donut,
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"Qn" = (
@@ -4980,11 +4980,11 @@
/obj/effect/turf_decal/corner/opaque/yellow,
/obj/structure/rack,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/item/ammo_box/c9mm/rubbershot{
+/obj/item/storage/box/ammo/c9mm_rubber{
pixel_x = 5;
pixel_y = 10
},
-/obj/item/ammo_box/c9mm{
+/obj/item/storage/box/ammo/c9mm{
pixel_x = -2;
pixel_y = 2
},
@@ -5284,7 +5284,7 @@
/obj/effect/turf_decal/trimline/opaque/yellow/line{
dir = 4
},
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/directional/east,
/turf/open/floor/plasteel/patterned/grid,
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm
index 2dd69b1c7c08..c8d0176bab1c 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm
@@ -937,9 +937,9 @@
dir = 1
},
/obj/item/clothing/head/inteq_peaked,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"mE" = (
@@ -1517,16 +1517,16 @@
dir = 1
},
/obj/structure/closet/crate,
-/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/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/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
@@ -3145,7 +3145,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"XG" = (
@@ -3165,8 +3165,8 @@
name = "fridge"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/obj/item/storage/cans/sixbeer,
/obj/item/reagent_containers/food/snacks/carneburrito,
/obj/effect/turf_decal/corner/opaque/yellow{
diff --git a/_maps/_mod_celadon/shuttles/misc/independent_bulk.dmm b/_maps/_mod_celadon/shuttles/misc/independent_bulk.dmm
index 7ec780f7855d..11562c32c792 100644
--- a/_maps/_mod_celadon/shuttles/misc/independent_bulk.dmm
+++ b/_maps/_mod_celadon/shuttles/misc/independent_bulk.dmm
@@ -455,7 +455,7 @@
icon_state = "1-4"
},
/obj/structure/closet/cardboard,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plasteel/dark,
/area/ship/maintenance/central)
"ju" = (
@@ -676,7 +676,7 @@
icon_state = "0-10"
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/turf/open/floor/plasteel/mono/dark,
/area/ship/bridge)
"nI" = (
@@ -1283,7 +1283,7 @@
icon_state = "1-2"
},
/obj/structure/closet/cardboard,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plasteel/dark,
/area/ship/maintenance/central)
"AV" = (
@@ -1760,10 +1760,10 @@
/obj/structure/closet/crate{
name = "food crate"
},
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/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/machinery/light_switch{
pixel_x = -12;
pixel_y = 23
@@ -1848,7 +1848,7 @@
/obj/effect/decal/cleanable/greenglow{
color = "#808080"
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/machinery/door/firedoor/border_only,
/obj/effect/turf_decal/industrial/fire/corner,
/obj/structure/closet/cardboard,
@@ -2064,10 +2064,10 @@
icon_state = "0-2"
},
/obj/machinery/light/directional/east,
-/obj/item/ammo_box/c38_box,
-/obj/item/ammo_box/c38_box,
-/obj/item/ammo_box/c38_box,
-/obj/item/ammo_box/c38_box,
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38,
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
"Pm" = (
@@ -2297,13 +2297,13 @@
title = "Атлас галактики";
author = "Мама кошка"
},
-/obj/effect/spawner/lootdrop/prison_contraband,
+/obj/effect/spawner/random/stockparts,
/turf/open/floor/plasteel/mono/dark,
/area/ship/bridge)
"Uu" = (
/obj/effect/turf_decal/box,
/obj/effect/decal/cleanable/sprayweb,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
@@ -2478,7 +2478,7 @@
/obj/effect/turf_decal/industrial/warning{
dir = 8
},
-/obj/effect/spawner/lootdrop/gambling,
+/obj/effect/spawner/random/entertainment/gambling,
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_chariot.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_chariot.dmm
index 06cde8c9ba3b..12480a9da701 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_chariot.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_chariot.dmm
@@ -322,7 +322,7 @@
/obj/effect/turf_decal/corner/opaque/ntblue/border{
dir = 1
},
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/hangar/plasteel,
/area/ship/hallway/central)
"cg" = (
@@ -446,7 +446,7 @@
pixel_y = 41
},
/obj/machinery/airalarm/directional/north,
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/hallway/central)
"cW" = (
@@ -771,7 +771,7 @@
/obj/effect/turf_decal/industrial/warning{
dir = 8
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plasteel/dark,
/area/ship/security/dock)
"fF" = (
@@ -845,7 +845,7 @@
/turf/open/floor/plating/ship,
/area/ship/general/engineering/engineering_1)
"gA" = (
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/obj/item/radio/intercom/directional/west,
/turf/open/floor/concrete,
/area/ship/security/prison)
@@ -869,7 +869,7 @@
/turf/open/floor/plating/ship,
/area/ship/engineering/atmospherics)
"gV" = (
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/concrete,
/area/ship/security/prison)
"hc" = (
@@ -968,7 +968,7 @@
/obj/effect/turf_decal/corner/opaque/ntblue/border{
dir = 8
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/hallway/central)
"ik" = (
@@ -1068,7 +1068,7 @@
/obj/effect/turf_decal/corner/opaque/ntblue/border{
dir = 8
},
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/turf/open/floor/hangar/plasteel,
/area/ship/hallway/central)
"ji" = (
@@ -1086,7 +1086,7 @@
dir = 6
},
/obj/effect/decal/cleanable/oil,
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plating/ship,
/area/ship/engineering/atmospherics)
"jL" = (
@@ -1132,7 +1132,7 @@
dir = 4
},
/obj/machinery/computer/helm/viewscreen/directional/east,
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/hallway/central)
"ki" = (
@@ -1390,7 +1390,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/concrete,
/area/ship/security/prison)
"mv" = (
@@ -1436,7 +1436,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/cargo)
"mG" = (
@@ -1511,7 +1511,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/hallway/central)
"ng" = (
@@ -1626,7 +1626,7 @@
/area/ship/security/dock)
"og" = (
/obj/effect/turf_decal/industrial/warning,
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plasteel/dark,
/area/ship/security/dock)
"oi" = (
@@ -1732,7 +1732,7 @@
/area/ship/science)
"pi" = (
/obj/effect/turf_decal/box,
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/cargo)
"pk" = (
@@ -1816,7 +1816,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plasteel/dark,
/area/ship/security/dock)
"pS" = (
@@ -1885,7 +1885,7 @@
/obj/machinery/camera/autoname{
dir = 10
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/hallway/central)
"qB" = (
@@ -1920,7 +1920,7 @@
icon_state = "4-8"
},
/obj/effect/turf_decal/corner/opaque/ntblue/border,
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/hallway/central)
"qP" = (
@@ -2098,7 +2098,7 @@
/obj/structure/cable{
icon_state = "1-4"
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plating/ship,
/area/ship/general/engineering/engineering_1)
"sg" = (
@@ -2159,7 +2159,7 @@
/obj/structure/cable{
icon_state = "2-4"
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plating/ship,
/area/ship/engineering/atmospherics)
"sG" = (
@@ -2217,7 +2217,7 @@
/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{
dir = 4
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plating/ship,
/area/ship/engineering/atmospherics)
"tp" = (
@@ -2370,7 +2370,7 @@
/obj/machinery/camera/autoname{
dir = 6
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plating/ship,
/area/ship/engineering/atmospherics)
"uJ" = (
@@ -2538,7 +2538,7 @@
/obj/effect/turf_decal/corner/opaque/mauve{
dir = 10
},
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/machinery/light/directional/south,
/obj/machinery/camera/autoname{
dir = 8;
@@ -2621,7 +2621,7 @@
pixel_x = 35;
pixel_y = 0
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plasteel/dark,
/area/ship/security/dock)
"wN" = (
@@ -2777,7 +2777,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plating/ship,
/area/ship/engineering/atmospherics)
"xY" = (
@@ -2799,7 +2799,7 @@
/obj/machinery/power/terminal{
dir = 8
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plating/ship,
/area/ship/general/engineering/engineering_1)
@@ -2807,7 +2807,7 @@
/obj/effect/turf_decal/industrial/warning{
dir = 4
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plasteel/dark,
/area/ship/security/dock)
"yz" = (
@@ -3438,7 +3438,7 @@
/obj/effect/turf_decal/corner/opaque/ntblue/border{
dir = 1
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/hallway/central)
"Fd" = (
@@ -3473,7 +3473,7 @@
/obj/effect/turf_decal/corner/opaque/ntblue/bordercorner{
dir = 8
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/hallway/central)
"Fi" = (
@@ -3547,7 +3547,7 @@
/obj/effect/turf_decal/corner/opaque/ntblue/border{
dir = 1
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/hallway/central)
"FH" = (
@@ -3687,7 +3687,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 8
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plating/ship,
/area/ship/engineering/atmospherics)
"GZ" = (
@@ -3730,7 +3730,7 @@
icon_state = "1-2"
},
/obj/effect/decal/cleanable/oil,
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plating/ship,
/area/ship/general/engineering/engineering_1)
"Hf" = (
@@ -3966,7 +3966,7 @@
/obj/structure/cable{
icon_state = "1-8"
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plating/ship,
/area/ship/engineering/atmospherics)
"IE" = (
@@ -4211,7 +4211,7 @@
/turf/open/floor/plating/ship,
/area/ship/general/engineering/engineering_1)
"JT" = (
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/cargo)
"JU" = (
@@ -4457,7 +4457,7 @@
/obj/machinery/camera/autoname{
dir = 10
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/hallway/central)
"LC" = (
@@ -4624,7 +4624,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/carpet/nanoweave/orange,
/area/ship/general/engineering/engineering_1)
"MY" = (
@@ -4693,7 +4693,7 @@
/turf/open/floor/hangar/plasteel,
/area/ship/hallway/central)
"Nq" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/corner/opaque/ntblue/border{
dir = 8
},
@@ -4741,7 +4741,7 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/hallway/central)
"Os" = (
@@ -5124,7 +5124,7 @@
/obj/effect/turf_decal/industrial/warning{
dir = 8
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/cargo)
"QV" = (
@@ -5209,7 +5209,7 @@
dir = 4;
color = "#c3893f"
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/cargo)
"RL" = (
@@ -5238,7 +5238,7 @@
dir = 8;
color = "#c3893f"
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/cargo)
"RM" = (
@@ -5251,7 +5251,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plating/ship,
/area/ship/general/engineering/engineering_1)
"RN" = (
@@ -5442,7 +5442,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"SW" = (
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/hallway/central)
"Tb" = (
@@ -5696,7 +5696,7 @@
dir = 4
},
/obj/machinery/light/dim/directional/east,
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/hallway/central)
"Wa" = (
@@ -5804,7 +5804,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/hangar/plasteel,
/area/ship/hallway/central)
"WI" = (
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
index b95e1b25cae4..20d437cb9a83 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
@@ -944,7 +944,7 @@
/obj/machinery/light/small/directional/north{
pixel_x = -9
},
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/obj/machinery/shower{
pixel_y = 13
},
@@ -1263,18 +1263,18 @@
/obj/structure/closet/secure_closet/freezer{
name = "emergency donuts locker"
},
-/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,
-/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,
-/obj/effect/spawner/lootdrop/donut,
-/obj/effect/spawner/lootdrop/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,
+/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,
+/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/item/storage/fancy/donut_box{
pixel_x = 0;
pixel_y = -4
@@ -1372,9 +1372,9 @@
name = "ammo locker"
},
/obj/item/ammo_box/magazine/gauss,
-/obj/item/ammo_box/ferropelletbox,
-/obj/item/ammo_box/c46x30mm_box,
-/obj/item/ammo_box/c46x30mm_box,
+/obj/item/storage/box/ammo/ferropelletbox,
+/obj/item/storage/box/ammo/c46x30mm_box,
+/obj/item/storage/box/ammo/c46x30mm_box,
/obj/item/ammo_box/magazine/wt550m9,
/obj/item/ammo_box/magazine/wt550m9,
/obj/item/ammo_box/magazine/wt550m9,
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm
index 6ec097aaa7c8..ee4604831fcd 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm
@@ -201,10 +201,10 @@
})
"bU" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/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/item/reagent_containers/food/snacks/canned/beans,
/obj/item/reagent_containers/food/snacks/canned/beans,
/obj/item/reagent_containers/food/snacks/canned/beans,
@@ -414,7 +414,7 @@
/turf/open/floor/plating,
/area/ship/engineering/engine)
"ej" = (
-/obj/effect/spawner/lootdrop/salvage_50,
+/obj/effect/spawner/random/salvage_50,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/borderfloor,
/obj/structure/extinguisher_cabinet/directional/west,
@@ -642,7 +642,7 @@
/turf/open/floor/engine/o2,
/area/ship/engineering/engine)
"gh" = (
-/obj/effect/spawner/lootdrop/salvage_50,
+/obj/effect/spawner/random/salvage_50,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -686,7 +686,7 @@
/obj/structure/cable{
icon_state = "1-8"
},
-/obj/effect/spawner/lootdrop/salvage_50,
+/obj/effect/spawner/random/salvage_50,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo/starboard)
"gN" = (
@@ -831,7 +831,7 @@
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"iQ" = (
@@ -860,9 +860,9 @@
/area/ship/crew/toilet)
"jc" = (
/obj/structure/table/reinforced,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/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/item/radio/intercom/directional/east,
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
@@ -1025,7 +1025,7 @@
/area/ship/crew)
"lE" = (
/obj/effect/turf_decal/box/corners,
-/obj/effect/spawner/lootdrop/salvage_50,
+/obj/effect/spawner/random/salvage_50,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/starboard)
"lS" = (
@@ -1051,7 +1051,7 @@
/area/ship/engineering/engine)
"mb" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/salvage_50,
+/obj/effect/spawner/random/salvage_50,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/starboard)
"ms" = (
@@ -1092,7 +1092,7 @@
pixel_x = 11;
pixel_y = 23
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"mN" = (
@@ -1426,7 +1426,7 @@
/obj/effect/turf_decal/industrial/fire{
dir = 8
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/button/door{
id = "gecko_starboard_thrusters";
name = "Thruster Blast Door Control";
@@ -1647,7 +1647,7 @@
/obj/structure/cable{
icon_state = "1-8"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -1808,10 +1808,10 @@
/area/ship/medical/surgery)
"wV" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/salvage,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/salvage,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"wY" = (
@@ -1989,7 +1989,7 @@
/obj/effect/turf_decal/box/corners{
dir = 8
},
-/obj/effect/spawner/lootdrop/salvage_50,
+/obj/effect/spawner/random/salvage_50,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/starboard)
"zE" = (
@@ -2099,7 +2099,7 @@
/area/ship/cargo/starboard)
"AN" = (
/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/spawner/lootdrop/salvage_50,
+/obj/effect/spawner/random/salvage_50,
/obj/structure/table/reinforced,
/obj/machinery/computer/helm/viewscreen/directional/south,
/turf/open/floor/plasteel,
@@ -3047,7 +3047,7 @@
/obj/structure/sign/warning/electricshock{
pixel_y = 32
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"LZ" = (
@@ -3178,7 +3178,7 @@
/obj/effect/turf_decal/arrows{
dir = 1
},
-/obj/effect/spawner/lootdrop/salvage_50,
+/obj/effect/spawner/random/salvage_50,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -3472,7 +3472,7 @@
"Sa" = (
/obj/machinery/light/directional/east,
/obj/effect/turf_decal/industrial/warning,
-/obj/effect/spawner/lootdrop/salvage_50,
+/obj/effect/spawner/random/salvage_50,
/obj/structure/cable{
icon_state = "2-8"
},
@@ -3537,7 +3537,7 @@
/area/ship/bridge)
"Sy" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"SE" = (
@@ -3703,7 +3703,7 @@
/area/ship/crew)
"UD" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/salvage_50,
+/obj/effect/spawner/random/salvage_50,
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/starboard)
@@ -4224,7 +4224,7 @@
"ZM" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"ZS" = (
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_heron.dmm
index 49116dce0063..7e4fd152c94b 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_heron.dmm
+++ b/_maps/_mod_celadon/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/lootdrop/salvage_50,
+/obj/effect/spawner/random/salvage_50,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
@@ -690,7 +690,7 @@
dir = 8
},
/obj/structure/extinguisher_cabinet/directional/west,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/dark,
/area/ship/storage)
"cF" = (
@@ -1794,7 +1794,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"hn" = (
-/obj/effect/spawner/lootdrop/glowstick{
+/obj/effect/spawner/random/decoration/glowstick{
pixel_x = 5;
pixel_y = 9
},
@@ -2556,7 +2556,7 @@
/obj/effect/turf_decal/siding/thinplating{
dir = 9
},
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/machinery/light/directional/west,
/obj/machinery/light_switch{
pixel_y = 22;
@@ -6319,14 +6319,14 @@
/area/ship/bridge)
"wq" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/turf_decal/corner_techfloor_gray/diagonal{
dir = 8
},
/obj/effect/turf_decal/industrial/warning{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/obj/item/radio/intercom/directional/east,
/turf/open/floor/plasteel/dark,
/area/ship/storage)
@@ -7114,9 +7114,9 @@
dir = 10
},
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/gloves,
-/obj/effect/spawner/lootdrop/minor/beret_or_rabbitears,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/clothing/gloves,
+/obj/effect/spawner/random/minor/beret_or_rabbitears,
/obj/effect/decal/cleanable/vomit/old,
/turf/open/floor/plasteel/dark,
/area/ship/storage)
@@ -9285,7 +9285,7 @@
/obj/effect/turf_decal/trimline/opaque/beige/filled/line{
dir = 10
},
-/obj/effect/spawner/lootdrop/salvage_50,
+/obj/effect/spawner/random/salvage_50,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -11931,8 +11931,8 @@
dir = 9
},
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/ship/storage)
@@ -12247,7 +12247,7 @@
dir = 5
},
/obj/item/toy/plush/beeplushie,
-/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/random/maintenance/four,
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable{
icon_state = "0-8"
@@ -13101,9 +13101,9 @@
/obj/item/clothing/suit/armor/vest/marine/heavy,
/obj/item/clothing/suit/armor/vest/marine/medium,
/obj/item/clothing/suit/armor/vest/marine/medium,
-/obj/item/clothing/head/helmet/marine/security,
-/obj/item/clothing/head/helmet/marine,
-/obj/item/clothing/head/helmet/marine,
+/obj/item/clothing/head/helmet/gezena,
+/obj/item/clothing/head/helmet/gezena,
+/obj/item/clothing/head/helmet/gezena,
/obj/item/clothing/suit/armor/vest/bulletproof,
/obj/item/clothing/suit/armor/vest/bulletproof,
/obj/item/clothing/head/helmet/plate,
@@ -13478,9 +13478,9 @@
/obj/item/ammo_box/magazine/wt550m9,
/obj/item/ammo_box/magazine/wt550m9,
/obj/item/ammo_box/magazine/wt550m9/inc,
-/obj/item/ammo_box/c46x30mm_box,
-/obj/item/ammo_box/c46x30mm_box,
-/obj/item/ammo_box/c46x30mm_box,
+/obj/item/storage/box/ammo/c46x30mm_box,
+/obj/item/storage/box/ammo/c46x30mm_box,
+/obj/item/storage/box/ammo/c46x30mm_box,
/turf/open/floor/plasteel/tech,
/area/ship/security/armory)
"Xb" = (
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_meta.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_meta.dmm
index aa19801074a7..fd880f6dd9ec 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_meta.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_meta.dmm
@@ -21,12 +21,12 @@
"af" = (
/obj/structure/railing,
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/tool_surgery_common,
+/obj/effect/spawner/random/medical/surgery_tool/common,
/obj/machinery/firealarm/directional/west{
pixel_y = 5
},
-/obj/effect/spawner/lootdrop/donut,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/food_or_drink/donut,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"ag" = (
@@ -118,7 +118,7 @@
/obj/item/choice_beacon/music,
/obj/item/spacecash/bundle/c10,
/obj/structure/extinguisher_cabinet/directional/west,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/directional/north,
/turf/open/floor/plasteel/dark,
@@ -3006,8 +3006,8 @@
/obj/item/stamp,
/obj/item/clothing/accessory/armband/cargo,
/obj/item/clothing/head/beret/cargo,
-/obj/item/ammo_box/c38_box,
-/obj/item/ammo_box/c38_box,
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38,
/obj/item/clothing/under/nanotrasen/supply/qm,
/obj/item/clothing/neck/cloak/qm,
/obj/item/clothing/suit/nanotrasen/vest,
@@ -5325,7 +5325,7 @@
/turf/open/floor/plasteel/patterned,
/area/ship/cargo/office)
"SR" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/patterned,
/area/ship/hallway/central)
"SZ" = (
@@ -5759,7 +5759,7 @@
/turf/open/floor/wood/ebony,
/area/ship/crew/dorm/captain)
"WZ" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/machinery/firealarm/directional/east,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/disposalpipe/segment{
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_mimir.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_mimir.dmm
index 6834f62501d0..e2d5ca25ddb8 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_mimir.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_mimir.dmm
@@ -50,7 +50,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/techfloor/orange,
/turf/open/floor/plasteel/tech/grid,
@@ -877,7 +877,7 @@
/area/ship/engineering)
"fd" = (
/obj/structure/table/wood/reinforced,
-/obj/effect/spawner/lootdrop/ration{
+/obj/effect/spawner/random/food_or_drink/ration{
pixel_x = 5;
pixel_y = 5
},
@@ -909,7 +909,7 @@
pixel_x = -5;
pixel_y = -7
},
-/obj/effect/spawner/lootdrop/ration{
+/obj/effect/spawner/random/food_or_drink/ration{
pixel_x = 6;
pixel_y = 11
},
@@ -1037,7 +1037,7 @@
/obj/structure/railing{
dir = 8
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/port)
@@ -1414,7 +1414,7 @@
/turf/open/floor/plasteel/white,
/area/ship/medical)
"hZ" = (
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plating,
@@ -1443,7 +1443,7 @@
/obj/structure/railing/corner{
dir = 1
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -2094,7 +2094,7 @@
dir = 6
},
/obj/structure/railing,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plating,
@@ -2119,7 +2119,7 @@
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"lW" = (
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/port)
@@ -2327,7 +2327,7 @@
/obj/item/flashlight/lamp{
pixel_y = 13
},
-/obj/item/book/codex_gigas,
+/obj/item/storage/book/bible,
/turf/open/floor/wood,
/area/ship/crew/dorm)
"nh" = (
@@ -2346,7 +2346,7 @@
/area/ship/security/prison)
"nk" = (
/obj/structure/railing,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plating,
@@ -2766,12 +2766,12 @@
/area/ship/engineering/electrical)
"pV" = (
/obj/structure/railing,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/port)
"pY" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/effect/turf_decal/siding/red{
dir = 4
},
@@ -3003,7 +3003,7 @@
/obj/structure/railing{
dir = 9
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -3308,7 +3308,7 @@
/obj/structure/railing{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/tech/grid,
/area/ship/maintenance/starboard)
@@ -3371,7 +3371,7 @@
icon_state = "5-8"
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/techfloor/orange,
@@ -4697,7 +4697,7 @@
/obj/structure/railing/corner{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/techfloor/orange{
@@ -4938,7 +4938,7 @@
/area/ship/crew/canteen)
"Dh" = (
/obj/structure/table/wood,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/turf/open/floor/plasteel,
/area/ship/security/prison)
"Dm" = (
@@ -5288,7 +5288,7 @@
/obj/item/canvas/twentythreeXtwentythree,
/obj/structure/closet/crate/trashcart,
/obj/item/paint/anycolor,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/sprayweb,
/turf/open/floor/plating,
@@ -5710,7 +5710,7 @@
/turf/open/floor/mineral/plastitanium/red/brig,
/area/ship/hallway/central)
"GZ" = (
-/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/random/maintenance/four,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"Ha" = (
@@ -5723,7 +5723,7 @@
/obj/structure/railing{
dir = 1
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/engineering)
@@ -5818,7 +5818,7 @@
/obj/structure/railing{
dir = 1
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -6920,7 +6920,7 @@
/obj/structure/railing{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -7152,7 +7152,7 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/maintenance/starboard)
"PC" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/siding/red{
dir = 4
},
@@ -7515,7 +7515,7 @@
/obj/structure/railing{
dir = 6
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/port)
@@ -7761,7 +7761,7 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/crew/dorm/dormthree)
"Ti" = (
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/railing{
dir = 9
@@ -7785,7 +7785,7 @@
/obj/structure/railing{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/port)
@@ -8272,7 +8272,7 @@
/turf/open/floor/plasteel,
/area/ship/security/prison)
"Wi" = (
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"Wj" = (
@@ -8561,7 +8561,7 @@
/area/ship/engineering/atmospherics)
"XY" = (
/obj/structure/table/wood,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/effect/turf_decal/spline/plain/opaque/blue,
/turf/open/floor/plasteel,
/area/ship/security/prison)
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_osprey.dmm
index eca071f7158a..9d907205d1c2 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_osprey.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_osprey.dmm
@@ -623,7 +623,7 @@
/turf/open/floor/plasteel/white,
/area/ship/science)
"eB" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/structure/disposalpipe/segment{
dir = 8
},
@@ -1586,7 +1586,7 @@
/turf/open/floor/plating,
/area/ship/hallway/central)
"kZ" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/structure/disposalpipe/segment{
dir = 5
},
@@ -2906,12 +2906,12 @@
name = "food crate"
},
/obj/item/storage/cans/sixbeer,
-/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/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/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
@@ -3049,7 +3049,7 @@
},
/obj/structure/closet/crate,
/obj/item/vending_refill/coffee,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
@@ -3507,7 +3507,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"wC" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/structure/disposalpipe/segment{
dir = 8
},
@@ -3888,7 +3888,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/science/ai_chamber)
"yE" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/structure/disposalpipe/segment{
dir = 8
},
@@ -4056,7 +4056,7 @@
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 4
},
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/machinery/light/directional/east,
/turf/open/floor/plasteel,
/area/ship/hallway/central)
@@ -4306,7 +4306,7 @@
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"Bu" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/corner/opaque/white{
dir = 8
},
@@ -7427,7 +7427,7 @@
/obj/structure/window/reinforced,
/obj/effect/turf_decal/box,
/obj/effect/turf_decal/box,
-/obj/machinery/portable_atmospherics/canister/nitryl,
+/obj/machinery/portable_atmospherics/canister/freon,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"Wk" = (
@@ -7897,7 +7897,7 @@
/turf/open/floor/circuit,
/area/ship/science/ai_chamber)
"ZR" = (
-/obj/machinery/porta_turret/ai,
+/obj/machinery/porta_turret,
/turf/open/floor/circuit,
/area/ship/science/ai_chamber)
"ZW" = (
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_ranger.dmm
index 05f88995765d..6167cf4c1f5e 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_ranger.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_ranger.dmm
@@ -1109,11 +1109,11 @@
},
/obj/effect/turf_decal/steeldecal/steel_decals4,
/obj/effect/turf_decal/steeldecal/steel_decals9,
-/obj/effect/spawner/lootdrop/lpaid{
+/obj/effect/spawner/random/lpaid{
pixel_x = -5;
pixel_y = 10
},
-/obj/effect/spawner/lootdrop/lpretrieval{
+/obj/effect/spawner/random/lpretrieval{
pixel_x = 3;
pixel_y = 1
},
@@ -2513,8 +2513,8 @@
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun,
-/obj/item/ammo_box/c46x30mm_box,
-/obj/item/ammo_box/c46x30mm_box,
+/obj/item/storage/box/ammo/c46x30mm_box,
+/obj/item/storage/box/ammo/c46x30mm_box,
/obj/item/ammo_box/magazine/wt550m9,
/obj/item/ammo_box/magazine/wt550m9,
/obj/item/ammo_box/magazine/wt550m9,
@@ -5462,12 +5462,12 @@
dir = 1
},
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration{
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration{
pixel_x = 10;
pixel_y = -1
},
-/obj/effect/spawner/lootdrop/ration{
+/obj/effect/spawner/random/food_or_drink/ration{
pixel_x = -10;
pixel_y = 0
},
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm
index 1efb1ac73963..df26bf20442e 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm
@@ -242,7 +242,7 @@
/obj/item/tank/internals/anesthetic,
/obj/machinery/light/directional/east,
/obj/machinery/firealarm/directional/north,
-/obj/effect/spawner/lootdrop/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
/turf/open/floor/plasteel/white,
/area/ship/medical/surgery)
"eE" = (
@@ -570,8 +570,8 @@
pixel_y = 10;
pixel_x = 9
},
-/obj/effect/spawner/lootdrop/waste/trash,
-/obj/effect/spawner/lootdrop/gloves,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/clothing/gloves,
/turf/open/floor/plating,
/area/ship/engineering/electrical)
"hm" = (
@@ -669,7 +669,7 @@
/turf/open/floor/plasteel/white,
/area/ship/crew/cryo)
"iw" = (
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plating,
/area/ship/engineering/electrical)
"ix" = (
@@ -895,9 +895,9 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/waste/trash,
-/obj/effect/spawner/lootdrop/waste/trash,
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
/obj/item/trash/candy,
/turf/open/floor/engine/airless,
/area/ship/engineering/atmospherics)
@@ -1305,8 +1305,8 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/waste/trash,
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
/obj/item/trash/pistachios,
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{
piping_layer = 5;
@@ -1429,7 +1429,7 @@
pixel_x = -10;
pixel_y = 7
},
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/item/storage/box/donkpockets{
pixel_x = 8;
pixel_y = -5
@@ -2479,7 +2479,7 @@
/area/ship/crew/canteen)
"Gu" = (
/obj/machinery/power/apc/auto_name/directional/east,
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/cable,
/obj/machinery/light_switch{
@@ -2769,7 +2769,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
},
@@ -2785,7 +2785,7 @@
},
/obj/item/folder,
/obj/item/pen,
-/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plating,
/area/ship/engineering/electrical)
"Lu" = (
@@ -3591,7 +3591,7 @@
/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/tool_surgery_adv,
+/obj/effect/spawner/random/medical/surgery_tool/adv,
/turf/open/floor/plasteel/white,
/area/ship/medical/surgery)
"Vf" = (
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_skipper.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_skipper.dmm
index 884f395c29be..04e866bf3731 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_skipper.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_skipper.dmm
@@ -558,8 +558,8 @@
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun,
-/obj/item/ammo_box/c9mm/rubbershot,
-/obj/item/ammo_box/c9mm,
+/obj/item/storage/box/ammo/c9mm_rubber,
+/obj/item/storage/box/ammo/c9mm,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm/rubber,
@@ -1455,8 +1455,8 @@
/obj/item/stamp,
/obj/item/clothing/accessory/armband/cargo,
/obj/item/clothing/head/beret/cargo,
-/obj/item/ammo_box/c38_box,
-/obj/item/ammo_box/c38_box,
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38,
/obj/item/clothing/under/nanotrasen/supply/qm,
/obj/item/clothing/neck/cloak/qm,
/obj/item/clothing/suit/nanotrasen/vest,
@@ -4783,7 +4783,7 @@
/turf/open/floor/wood,
/area/ship/crew/dorm)
"Hb" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/turf/open/floor/carpet/nanoweave,
/area/ship/hallway/central)
"Hf" = (
@@ -6285,7 +6285,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Tz" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/carpet/nanoweave,
/area/ship/hallway/central)
"TF" = (
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_skybreaker.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_skybreaker.dmm
index 0b52d0645884..0df2c95b76db 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_skybreaker.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_skybreaker.dmm
@@ -1358,12 +1358,12 @@
anchored = 1;
name = "MRE supply crate"
},
-/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/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,
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"rM" = (
@@ -2139,11 +2139,11 @@
/area/ship/general/engineering)
"Du" = (
/obj/structure/closet/crate/trashcart,
-/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/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"DC" = (
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_teardrop.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_teardrop.dmm
index 41ca116458c2..2a39a4f81f68 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_teardrop.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_teardrop.dmm
@@ -221,7 +221,7 @@
/area/ship/security)
"cK" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/obj/machinery/light/directional/west{
light_color = "#e8eaff"
},
@@ -556,11 +556,11 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/turf_decal/corner/opaque/solgovblue/mono,
-/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/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/structure/closet/crate,
/turf/open/floor/plasteel/white,
/area/ship/cargo)
@@ -3375,9 +3375,9 @@
},
/obj/item/stock_parts/cell/gun,
/obj/item/stock_parts/cell/gun,
-/obj/item/ammo_box/a300_box,
-/obj/item/ammo_box/a300,
-/obj/item/ammo_box/a300,
+/obj/item/storage/box/ammo/a300_box,
+/obj/item/storage/box/ammo/a300,
+/obj/item/storage/box/ammo/a300,
/turf/open/floor/plasteel/white,
/area/ship/security)
"KX" = (
@@ -3690,7 +3690,7 @@
"Oq" = (
/obj/structure/table/wood/fancy/royalblue,
/obj/machinery/recharger,
-/obj/item/gun/ballistic/revolver/shadow/no_mag{
+/obj/item/gun/ballistic/revolver/shadow/empty{
name = "\improper Last Exit"
},
/obj/item/ammo_casing/a44roum,
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm
index f654cf062c09..9896b325f386 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm
@@ -109,8 +109,8 @@
pixel_y = 32;
dir = 1
},
-/obj/item/ammo_box/c9mm,
-/obj/item/ammo_box/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
/obj/item/gun/ballistic/automatic/pistol/commander,
/obj/item/ammo_box/magazine/co9mm{
pixel_x = 5
@@ -209,8 +209,8 @@
id = "venture_belt"
},
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/lootdrop/maintenance/five,
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/turf/open/floor/plating,
/area/ship/bridge)
"qp" = (
@@ -288,7 +288,7 @@
/obj/item/stack/sheet/glass/five,
/obj/item/stack/sheet/glass/five,
/obj/item/stack/sheet/metal/ten,
-/obj/effect/spawner/lootdrop/materials,
+/obj/effect/spawner/random/materials,
/turf/open/floor/plating,
/area/ship/bridge)
"vm" = (
@@ -450,7 +450,7 @@
dir = 8;
layer = 4.1
},
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
@@ -463,10 +463,10 @@
/obj/structure/chair/wood{
dir = 4
},
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
+/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/item/reagent_containers/food/drinks/waterbottle,
/obj/item/reagent_containers/food/drinks/waterbottle,
/obj/item/reagent_containers/food/drinks/waterbottle,
@@ -615,10 +615,10 @@
id = "venture_belt"
},
/obj/structure/closet/crate/wooden,
-/obj/effect/spawner/lootdrop/donut,
-/obj/effect/spawner/lootdrop/donut,
-/obj/effect/spawner/lootdrop/donut,
-/obj/effect/spawner/lootdrop/donkpockets,
+/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/donkpockets,
/turf/open/floor/plating,
/area/ship/bridge)
"PO" = (
diff --git a/_maps/_mod_celadon/shuttles/pirate/pirate_crying_sun.dmm b/_maps/_mod_celadon/shuttles/pirate/pirate_crying_sun.dmm
index 6a0783de8e12..c3bcaed171bf 100644
--- a/_maps/_mod_celadon/shuttles/pirate/pirate_crying_sun.dmm
+++ b/_maps/_mod_celadon/shuttles/pirate/pirate_crying_sun.dmm
@@ -2833,7 +2833,7 @@
/obj/effect/turf_decal/trimline/opaque/bottlegreen/filled/line{
dir = 1
},
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"zc" = (
@@ -5266,16 +5266,16 @@
"Qq" = (
/obj/structure/rack,
/obj/effect/turf_decal/corner/opaque/neutral/full,
-/obj/item/melee/transforming/energy/sword/saber/pirate{
+/obj/item/melee/energy/sword/saber/pirate{
pixel_x = -3
},
-/obj/item/melee/transforming/energy/sword/saber/pirate{
+/obj/item/melee/energy/sword/saber/pirate{
pixel_x = 1
},
-/obj/item/melee/transforming/energy/sword/saber/pirate{
+/obj/item/melee/energy/sword/saber/pirate{
pixel_x = 5
},
-/obj/item/melee/transforming/energy/sword/saber/pirate{
+/obj/item/melee/energy/sword/saber/pirate{
pixel_x = 9
},
/turf/open/floor/vault,
@@ -6036,8 +6036,8 @@
/obj/item/storage/ration/crayons,
/obj/item/storage/ration/vegan_chili,
/obj/item/storage/ration/beef_strips,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/turf/open/floor/plasteel/white,
/area/ship/crew/canteen)
"WQ" = (
diff --git a/_maps/_mod_celadon/shuttles/pirate/pirate_ember.dmm b/_maps/_mod_celadon/shuttles/pirate/pirate_ember.dmm
index e6bcbd10405d..cd4e8e6b733a 100644
--- a/_maps/_mod_celadon/shuttles/pirate/pirate_ember.dmm
+++ b/_maps/_mod_celadon/shuttles/pirate/pirate_ember.dmm
@@ -396,7 +396,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/directional/west,
-/obj/effect/spawner/lootdrop/gambling{
+/obj/effect/spawner/random/entertainment/gambling{
pixel_x = -5;
pixel_y = 4
},
@@ -664,7 +664,7 @@
/area/ship/medical)
"dv" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/effect/spawner/random/waste/grille_or_trash,
/obj/effect/decal/cleanable/robot_debris/old,
/obj/item/stock_parts/capacitor{
pixel_y = -9;
@@ -1274,7 +1274,7 @@
"ge" = (
/obj/structure/catwalk/over/plated_catwalk,
/obj/effect/decal/cleanable/greenglow,
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plating,
/area/ship/hallway/central)
"gg" = (
@@ -1836,7 +1836,7 @@
"jv" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/oil,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating/airless{
icon_state = "plating_rust"
},
@@ -2034,7 +2034,7 @@
/area/ship/security/armory)
"kf" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/salvage_manipulator,
+/obj/effect/spawner/random/salvage_manipulator,
/turf/open/floor/plating/airless,
/area/ship/maintenance/port)
"kk" = (
@@ -2442,11 +2442,11 @@
/obj/effect/turf_decal/techfloor{
dir = 8
},
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier,
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier,
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier,
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier,
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier,
+/obj/item/clothing/suit/armor/vest/frontier,
+/obj/item/clothing/suit/armor/vest/frontier,
+/obj/item/clothing/suit/armor/vest/frontier,
+/obj/item/clothing/suit/armor/vest/frontier,
+/obj/item/clothing/suit/armor/vest/frontier,
/obj/item/clothing/head/helmet/bulletproof/x11/frontier,
/obj/item/clothing/head/helmet/bulletproof/x11/frontier,
/obj/item/clothing/head/helmet/bulletproof/x11/frontier,
@@ -4264,7 +4264,7 @@
/obj/effect/decal/cleanable/blood/tracks{
dir = 5
},
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -5136,7 +5136,7 @@
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/medical)
"zn" = (
-/obj/effect/spawner/lootdrop/salvage_scanning,
+/obj/effect/spawner/random/salvage_scanning,
/turf/open/floor/plating/airless{
icon_state = "panelscorched"
},
@@ -5758,7 +5758,7 @@
/obj/effect/turf_decal/techfloor/hole{
dir = 4
},
-/obj/effect/spawner/lootdrop/random_machine_circuit_rare,
+/obj/effect/spawner/random/circuit/machine/rare,
/obj/item/stack/ore/salvage/scraptitanium/five,
/turf/open/floor/plating/airless{
icon_state = "panelscorched"
@@ -6094,7 +6094,7 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/item/melee/transforming/energy/sword/saber/pirate/red,
+/obj/item/melee/energy/sword/saber/pirate/red,
/obj/item/clothing/under/frontiersmen/officer,
/turf/open/floor/plasteel/dark,
/area/ship/hallway/fore)
@@ -7352,7 +7352,7 @@
"IX" = (
/obj/effect/turf_decal/techfloor/corner,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/obj/item/stack/cable_coil/cut/yellow,
/obj/item/stack/rods{
pixel_x = 7;
@@ -7490,7 +7490,7 @@
/turf/open/floor/concrete/tiles,
/area/ship/crew/canteen/kitchen)
"Jx" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/structure/sign/directions/command{
dir = 4;
pixel_y = 42
@@ -8158,7 +8158,7 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/item/melee/transforming/energy/sword/saber/pirate/red,
+/obj/item/melee/energy/sword/saber/pirate/red,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
@@ -8529,7 +8529,7 @@
},
/area/ship/hallway/central)
"Nr" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
@@ -9376,7 +9376,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/crew/office)
"RY" = (
-/obj/effect/spawner/lootdrop/salvage_capacitor,
+/obj/effect/spawner/random/salvage_capacitor,
/obj/item/stack/cable_coil/cut/yellow,
/obj/item/stack/rods{
pixel_x = 7
@@ -10093,7 +10093,7 @@
/area/ship/crew/canteen/kitchen)
"VA" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/mafia_outfit,
+/obj/effect/spawner/random/clothing/mafia_outfit,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -10630,7 +10630,7 @@
},
/area/ship/maintenance/port)
"Yj" = (
-/obj/effect/spawner/lootdrop/salvage_manipulator,
+/obj/effect/spawner/random/salvage_manipulator,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable{
icon_state = "1-8"
diff --git a/_maps/_mod_celadon/shuttles/pirate/pirate_libertatia.dmm b/_maps/_mod_celadon/shuttles/pirate/pirate_libertatia.dmm
index a132d02c2fcb..c774e5a2f3d7 100644
--- a/_maps/_mod_celadon/shuttles/pirate/pirate_libertatia.dmm
+++ b/_maps/_mod_celadon/shuttles/pirate/pirate_libertatia.dmm
@@ -847,8 +847,8 @@
/area/ship/crew)
"AL" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/item/radio/intercom/directional/north,
/obj/item/lighter{
@@ -881,8 +881,8 @@
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"Bw" = (
-/obj/effect/spawner/lootdrop/minor/pirate_or_bandana,
-/obj/effect/spawner/lootdrop/minor/pirate_or_bandana,
+/obj/effect/spawner/random/clothing/pirate_or_bandana,
+/obj/effect/spawner/random/clothing/pirate_or_bandana,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/shoes/jackboots,
@@ -1575,12 +1575,12 @@
name = "food crate"
},
/obj/item/storage/cans/sixbeer,
-/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/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/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
diff --git a/_maps/_mod_celadon/shuttles/pirate/pirate_santiana.dmm b/_maps/_mod_celadon/shuttles/pirate/pirate_santiana.dmm
index 1d88b69e12f8..254d9419ac75 100644
--- a/_maps/_mod_celadon/shuttles/pirate/pirate_santiana.dmm
+++ b/_maps/_mod_celadon/shuttles/pirate/pirate_santiana.dmm
@@ -414,7 +414,7 @@
/area/ship/crew/canteen)
"aY" = (
/obj/structure/rack,
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier,
+/obj/item/clothing/suit/armor/vest/frontier,
/obj/item/clothing/head/helmet/operator,
/obj/item/clothing/suit/pirate,
/obj/effect/decal/cleanable/cobweb,
@@ -661,7 +661,7 @@
/obj/item/clothing/suit/pirate/captain,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/south,
-/obj/item/melee/transforming/energy/sword/saber/pirate/purple,
+/obj/item/melee/energy/sword/saber/pirate/purple,
/obj/item/clothing/gloves/maid,
/turf/open/floor/plasteel/mono,
/area/ship/security/armory)
@@ -794,7 +794,7 @@
/obj/item/clothing/head/pirate/captain,
/obj/effect/decal/cleanable/dirt,
/obj/item/reagent_containers/food/snacks/grown/tobacco,
-/obj/item/melee/transforming/energy/sword/saber/pirate/red,
+/obj/item/melee/energy/sword/saber/pirate/red,
/obj/item/clothing/head/frontier/admiral,
/turf/open/floor/wood/ebony,
/area/ship/bridge)
@@ -1133,7 +1133,7 @@
/area/ship/medical)
"cD" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/molotov,
+/obj/item/reagent_containers/food/drinks/molotov,
/obj/item/ammo_box/magazine/m45{
pixel_x = 8;
pixel_y = -2
@@ -1735,7 +1735,7 @@
"dT" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/wood,
-/obj/item/gun/ballistic/revolver/shadow/no_mag{
+/obj/item/gun/ballistic/revolver/shadow/empty{
pixel_x = 2;
pixel_y = 6
},
diff --git a/_maps/_mod_celadon/shuttles/solfed/solfed_anomaly.dmm b/_maps/_mod_celadon/shuttles/solfed/solfed_anomaly.dmm
index a181192910e3..8bc0e5ef65a7 100644
--- a/_maps/_mod_celadon/shuttles/solfed/solfed_anomaly.dmm
+++ b/_maps/_mod_celadon/shuttles/solfed/solfed_anomaly.dmm
@@ -821,11 +821,11 @@
/area/ship/science)
"nT" = (
/obj/structure/closet/crate/large,
-/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/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/turf_decal/box,
/turf/open/floor/plasteel/dark_2,
/area/ship/general/cargo/cargo_bay)
diff --git a/_maps/_mod_celadon/shuttles/solfed/solfed_cepheus.dmm b/_maps/_mod_celadon/shuttles/solfed/solfed_cepheus.dmm
index 5aef976a9b3a..405b8a12fe61 100644
--- a/_maps/_mod_celadon/shuttles/solfed/solfed_cepheus.dmm
+++ b/_maps/_mod_celadon/shuttles/solfed/solfed_cepheus.dmm
@@ -1358,7 +1358,7 @@
/area/ship/hallway/central)
"rr" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/effect/turf_decal/industrial/stand_clear,
/obj/machinery/light/directional/north,
/turf/open/floor/plasteel/patterned/cargo_one,
@@ -1920,7 +1920,7 @@
pixel_x = -1;
pixel_y = 4
},
-/obj/effect/spawner/lootdrop/random_machine_circuit_mech,
+/obj/effect/spawner/random/circuit/machine/mech,
/turf/open/floor/plasteel/white,
/area/ship/science/robotics)
"wK" = (
@@ -3509,7 +3509,7 @@
/obj/item/trash/waffles,
/obj/item/trash/chips,
/obj/item/trash/energybar,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/item/trash/can,
/obj/effect/turf_decal/industrial/stand_clear{
dir = 1
@@ -3691,9 +3691,9 @@
},
/obj/item/ammo_box/magazine/modelh,
/obj/item/ammo_box/magazine/modelh,
-/obj/item/ammo_box/ferroslugbox,
-/obj/item/ammo_box/ferroslugbox,
-/obj/item/ammo_box/ferropelletbox,
+/obj/item/storage/box/ammo/ferroslug,
+/obj/item/storage/box/ammo/ferroslug,
+/obj/item/storage/box/ammo/ferropelletbox,
/turf/open/floor/plasteel/white,
/area/ship/security/armory)
"RN" = (
@@ -3771,7 +3771,7 @@
/obj/structure/closet/firecloset/wall{
pixel_y = -28
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plasteel/white,
/area/ship/hallway/central)
"TJ" = (
diff --git a/_maps/_mod_celadon/shuttles/solfed/solfed_chronicle.dmm b/_maps/_mod_celadon/shuttles/solfed/solfed_chronicle.dmm
index 482c64e10dd2..1b5158c2c421 100644
--- a/_maps/_mod_celadon/shuttles/solfed/solfed_chronicle.dmm
+++ b/_maps/_mod_celadon/shuttles/solfed/solfed_chronicle.dmm
@@ -4612,7 +4612,7 @@
/obj/structure/closet/cabinet{
name = "ammunition"
},
-/obj/item/ammo_box/amagpellet_claris,
+/obj/item/storage/box/ammo/amagpellet_claris,
/obj/item/ammo_box/magazine/pistol556mm,
/obj/item/ammo_box/magazine/pistol556mm,
/obj/item/ammo_box/magazine/pistol556mm,
diff --git a/_maps/_mod_celadon/shuttles/solfed/solfed_inkwell.dmm b/_maps/_mod_celadon/shuttles/solfed/solfed_inkwell.dmm
index 6f88c1ada615..3abbdf35705f 100644
--- a/_maps/_mod_celadon/shuttles/solfed/solfed_inkwell.dmm
+++ b/_maps/_mod_celadon/shuttles/solfed/solfed_inkwell.dmm
@@ -1481,7 +1481,7 @@
/area/ship/cargo)
"jM" = (
/obj/structure/closet/cardboard,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/effect/turf_decal/industrial/stand_clear,
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
@@ -2535,7 +2535,7 @@
/obj/effect/turf_decal/industrial/stand_clear{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"qw" = (
@@ -2634,7 +2634,7 @@
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"rm" = (
-/obj/effect/spawner/lootdrop/crate_spawner,
+/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"rz" = (
@@ -5110,7 +5110,7 @@
/obj/structure/closet/crate,
/obj/effect/turf_decal/techfloor,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plasteel/tech/grid,
/area/ship/storage)
"GO" = (
@@ -5333,7 +5333,7 @@
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"IC" = (
-/obj/effect/spawner/lootdrop/crate_spawner,
+/obj/effect/spawner/random/structure/crate_abandoned,
/obj/machinery/light/small/directional/east,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/tech/grid,
@@ -6012,7 +6012,7 @@
/area/ship/crew/canteen/kitchen)
"Nj" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"Np" = (
diff --git a/_maps/_mod_celadon/shuttles/solfed/solfed_lightning_bolt.dmm b/_maps/_mod_celadon/shuttles/solfed/solfed_lightning_bolt.dmm
index 4ceb7f534aaf..31d2fa8f37ba 100644
--- a/_maps/_mod_celadon/shuttles/solfed/solfed_lightning_bolt.dmm
+++ b/_maps/_mod_celadon/shuttles/solfed/solfed_lightning_bolt.dmm
@@ -291,24 +291,24 @@
req_access = null;
req_one_access = list(1,10)
},
-/obj/item/ammo_box/ferrolancebox,
-/obj/item/ammo_box/ferrolancebox,
-/obj/item/ammo_box/ferrolancebox,
-/obj/item/ammo_box/ferrolancebox,
-/obj/item/ammo_box/a300_box,
-/obj/item/ammo_box/a300_box,
-/obj/item/ammo_box/a300_box,
-/obj/item/ammo_box/a300_box,
+/obj/item/storage/box/ammo/ferrolancebox,
+/obj/item/storage/box/ammo/ferrolancebox,
+/obj/item/storage/box/ammo/ferrolancebox,
+/obj/item/storage/box/ammo/ferrolancebox,
+/obj/item/storage/box/ammo/a300_box,
+/obj/item/storage/box/ammo/a300_box,
+/obj/item/storage/box/ammo/a300_box,
+/obj/item/storage/box/ammo/a300_box,
/obj/item/ammo_box/magazine/p16,
/obj/item/ammo_box/magazine/p16,
/obj/item/ammo_box/magazine/p16,
/obj/item/ammo_box/magazine/p16,
/obj/item/ammo_box/magazine/p16,
/obj/item/ammo_box/magazine/p16,
-/obj/item/ammo_box/ferropelletbox,
-/obj/item/ammo_box/ferropelletbox,
-/obj/item/ammo_box/ferropelletbox,
-/obj/item/ammo_box/ferropelletbox,
+/obj/item/storage/box/ammo/ferropelletbox,
+/obj/item/storage/box/ammo/ferropelletbox,
+/obj/item/storage/box/ammo/ferropelletbox,
+/obj/item/storage/box/ammo/ferropelletbox,
/obj/item/ammo_box/magazine/p16,
/obj/item/ammo_box/magazine/p16,
/obj/effect/turf_decal/siding/thinplating/dark/end{
@@ -778,12 +778,12 @@
/obj/item/clothing/suit/armor/vest/bulletproof,
/obj/item/clothing/head/helmet/solfedm11,
/obj/item/gun/ballistic/automatic/powered/gauss/claris,
-/obj/item/ammo_box/ferropelletbox,
-/obj/item/ammo_box/amagpellet_claris,
-/obj/item/ammo_box/amagpellet_claris,
-/obj/item/ammo_box/amagpellet_claris,
-/obj/item/ammo_box/amagpellet_claris,
-/obj/item/ammo_box/amagpellet_claris,
+/obj/item/storage/box/ammo/ferropelletbox,
+/obj/item/storage/box/ammo/amagpellet_claris,
+/obj/item/storage/box/ammo/amagpellet_claris,
+/obj/item/storage/box/ammo/amagpellet_claris,
+/obj/item/storage/box/ammo/amagpellet_claris,
+/obj/item/storage/box/ammo/amagpellet_claris,
/obj/item/grenade/c4/x4,
/obj/item/grenade/c4/x4,
/obj/item/grenade/syndieminibomb{
@@ -1420,7 +1420,7 @@
req_access_txt = "5";
name = "Stormtrooper door"
},
-/obj/item/gun/ballistic/automatic/assault/p16,
+/obj/item/gun/ballistic/automatic/assault/cm82,
/obj/item/ammo_box/magazine/p16,
/obj/item/ammo_box/magazine/p16,
/obj/item/ammo_box/magazine/p16,
@@ -1452,7 +1452,7 @@
req_access_txt = "5";
name = "Stormtrooper door"
},
-/obj/item/gun/ballistic/automatic/assault/p16,
+/obj/item/gun/ballistic/automatic/assault/cm82,
/obj/item/ammo_box/magazine/p16,
/obj/item/ammo_box/magazine/p16,
/obj/item/ammo_box/magazine/p16,
@@ -1770,7 +1770,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
dir = 4
},
@@ -1935,10 +1935,10 @@
/obj/item/ammo_box/magazine/gar,
/obj/item/ammo_box/magazine/gar,
/obj/item/ammo_box/magazine/gar,
-/obj/item/ammo_box/ferrolancebox,
-/obj/item/ammo_box/ferrolancebox,
-/obj/item/ammo_box/ferrolancebox,
-/obj/item/ammo_box/ferrolancebox,
+/obj/item/storage/box/ammo/ferrolancebox,
+/obj/item/storage/box/ammo/ferrolancebox,
+/obj/item/storage/box/ammo/ferrolancebox,
+/obj/item/storage/box/ammo/ferrolancebox,
/turf/open/floor/plasteel/white,
/area/ship/security/prison)
"wM" = (
@@ -2381,7 +2381,7 @@
/obj/item/clothing/neck/cloak/solgovcap,
/obj/item/binoculars,
/obj/item/ammo_box/magazine/gar,
-/obj/item/ammo_box/ferrolancebox,
+/obj/item/storage/box/ammo/ferrolancebox,
/obj/item/hatchet/wooden{
name = "Tomahawk";
force = 20;
@@ -2511,7 +2511,7 @@
/obj/effect/turf_decal/corner/opaque/solgovblue{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/ash,
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
@@ -4596,14 +4596,14 @@
/obj/item/clothing/suit/armor/vest/bulletproof,
/obj/item/clothing/head/helmet/solfedm11,
/obj/item/gun/ballistic/rifle/scout,
-/obj/item/ammo_box/a300_box,
-/obj/item/ammo_box/a300_box,
-/obj/item/ammo_box/a300,
-/obj/item/ammo_box/a300,
-/obj/item/ammo_box/a300,
-/obj/item/ammo_box/a300,
-/obj/item/ammo_box/a300,
-/obj/item/ammo_box/a300,
+/obj/item/storage/box/ammo/a300_box,
+/obj/item/storage/box/ammo/a300_box,
+/obj/item/storage/box/ammo/a300,
+/obj/item/storage/box/ammo/a300,
+/obj/item/storage/box/ammo/a300,
+/obj/item/storage/box/ammo/a300,
+/obj/item/storage/box/ammo/a300,
+/obj/item/storage/box/ammo/a300,
/turf/open/floor/plasteel/white,
/area/ship/security/prison)
"ZL" = (
diff --git a/_maps/_mod_celadon/shuttles/solfed/solfed_saber.dmm b/_maps/_mod_celadon/shuttles/solfed/solfed_saber.dmm
index 6040f930ae38..85301c2bc1fe 100644
--- a/_maps/_mod_celadon/shuttles/solfed/solfed_saber.dmm
+++ b/_maps/_mod_celadon/shuttles/solfed/solfed_saber.dmm
@@ -750,8 +750,8 @@
/obj/machinery/microwave{
pixel_y = 2
},
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/obj/structure/table/reinforced{
color = "#c1b6a5"
},
@@ -1855,19 +1855,19 @@
dir = 2;
req_one_access_txt = "2"
},
-/obj/item/gun/ballistic/automatic/assault/p16{
+/obj/item/gun/ballistic/automatic/assault/cm82{
pixel_x = -11;
pixel_y = 9
},
-/obj/item/gun/ballistic/automatic/assault/p16{
+/obj/item/gun/ballistic/automatic/assault/cm82{
pixel_x = 4;
pixel_y = -6
},
-/obj/item/gun/ballistic/automatic/assault/p16{
+/obj/item/gun/ballistic/automatic/assault/cm82{
pixel_x = -2;
pixel_y = -1
},
-/obj/item/gun/ballistic/automatic/assault/p16{
+/obj/item/gun/ballistic/automatic/assault/cm82{
pixel_x = -7;
pixel_y = 5
},
@@ -2012,7 +2012,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/wood/walnut,
/area/ship/engineering)
"ps" = (
@@ -2092,7 +2092,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate/trashcart,
/obj/item/paper/pamphlet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/wood/yew,
/area/ship/crew/office)
"qi" = (
@@ -2326,7 +2326,7 @@
pixel_y = -28;
pixel_x = -5
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/trimline/opaque/blue/warning{
dir = 10
},
@@ -3009,9 +3009,9 @@
dir = 2;
req_one_access_txt = "2"
},
-/obj/item/ammo_box/a556_42,
-/obj/item/ammo_box/a556_42,
-/obj/item/ammo_box/a556_42,
+/obj/item/storage/box/ammo/a556_42,
+/obj/item/storage/box/ammo/a556_42,
+/obj/item/storage/box/ammo/a556_42,
/turf/open/floor/wood/ebony,
/area/ship/security/armory)
"xH" = (
@@ -3460,7 +3460,7 @@
/obj/structure/closet/firecloset/wall{
pixel_y = -28
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/corner/opaque/solgovgold{
dir = 10
},
@@ -3899,15 +3899,15 @@
/obj/item/ammo_box/magazine/p16,
/obj/item/ammo_box/magazine/p16,
/obj/effect/turf_decal/box/red,
-/obj/item/ammo_box/a858{
+/obj/item/storage/box/ammo/a858{
pixel_x = 6;
pixel_y = -8
},
-/obj/item/ammo_box/a858{
+/obj/item/storage/box/ammo/a858{
pixel_x = 3;
pixel_y = -4
},
-/obj/item/ammo_box/a858,
+/obj/item/storage/box/ammo/a858,
/turf/open/floor/wood/ebony,
/area/ship/security/armory)
"DW" = (
@@ -4685,20 +4685,20 @@
/obj/machinery/airalarm/directional/north,
/obj/structure/rack,
/obj/structure/rack,
-/obj/item/ammo_box/c556mmHITP/rubbershot{
+/obj/item/storage/box/ammo/c556mmHITP/rubbershot{
pixel_x = -7;
pixel_y = 10
},
-/obj/item/ammo_box/c556mmHITP{
+/obj/item/storage/box/ammo/c556mmHITP{
pixel_x = -1;
pixel_y = 6
},
-/obj/item/ammo_box/c556mmHITP{
+/obj/item/storage/box/ammo/c556mmHITP{
pixel_x = 6;
pixel_y = 1
},
/obj/effect/decal/cleanable/cobweb,
-/obj/item/ammo_box/c556mmHITP{
+/obj/item/storage/box/ammo/c556mmHITP{
pixel_x = 6;
pixel_y = 1
},
@@ -5204,14 +5204,14 @@
/obj/structure/table/reinforced{
color = "#c1b6a5"
},
-/obj/item/reagent_containers/food/snacks/rationpack{
+/obj/effect/spawner/random/food_or_drink/ration{
pixel_x = -4;
pixel_y = 7
},
-/obj/item/reagent_containers/food/snacks/rationpack{
+/obj/effect/spawner/random/food_or_drink/ration{
pixel_y = 11
},
-/obj/item/reagent_containers/food/snacks/rationpack{
+/obj/effect/spawner/random/food_or_drink/ration{
pixel_x = -1;
pixel_y = 1
},
@@ -5313,7 +5313,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/obj/effect/spawner/lootdrop/glowstick{
+/obj/effect/spawner/random/decoration/glowstick{
pixel_x = 5;
pixel_y = 9
},
diff --git a/_maps/_mod_celadon/shuttles/solfed/solfed_tomahawk.dmm b/_maps/_mod_celadon/shuttles/solfed/solfed_tomahawk.dmm
index 6adf6ea2bbb1..2c8abfc53c5a 100644
--- a/_maps/_mod_celadon/shuttles/solfed/solfed_tomahawk.dmm
+++ b/_maps/_mod_celadon/shuttles/solfed/solfed_tomahawk.dmm
@@ -459,9 +459,9 @@
/turf/open/floor/plasteel/white,
/area/ship/medical)
"fO" = (
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/effect/turf_decal/box/corners,
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/obj/structure/closet/crate/trashcart,
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
@@ -474,8 +474,8 @@
/obj/structure/sink{
pixel_y = 13
},
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
/turf/open/floor/plasteel/white,
/area/ship/security/prison)
"fY" = (
@@ -1702,7 +1702,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
dir = 4
},
@@ -2364,7 +2364,7 @@
/obj/item/clothing/neck/cloak/solgovcap,
/obj/item/binoculars,
/obj/item/ammo_box/magazine/gar,
-/obj/item/ammo_box/ferrolancebox,
+/obj/item/storage/box/ammo/ferrolancebox,
/obj/item/hatchet/wooden{
name = "Tomahawk";
force = 20;
@@ -2478,7 +2478,7 @@
/obj/effect/turf_decal/corner/opaque/solgovblue{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/ash,
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
@@ -2895,8 +2895,8 @@
},
/obj/item/ammo_box/magazine/gar,
/obj/item/ammo_box/magazine/gar,
-/obj/item/ammo_box/ferrolancebox,
-/obj/item/ammo_box/ferrolancebox,
+/obj/item/storage/box/ammo/ferrolancebox,
+/obj/item/storage/box/ammo/ferrolancebox,
/turf/open/floor/plasteel/white,
/area/ship/security/prison)
"Gw" = (
diff --git a/_maps/_mod_celadon/shuttles/subshuttles/independent_sugarcube.dmm b/_maps/_mod_celadon/shuttles/subshuttles/independent_sugarcube.dmm
index ea051d59dbd0..83237bcac88f 100644
--- a/_maps/_mod_celadon/shuttles/subshuttles/independent_sugarcube.dmm
+++ b/_maps/_mod_celadon/shuttles/subshuttles/independent_sugarcube.dmm
@@ -56,8 +56,8 @@
/turf/open/floor/plating,
/area/ship/engineering)
"h" = (
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/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/lootdrop/glowstick,
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/obj/machinery/power/terminal{
dir = 8
},
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_aegis.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_aegis.dmm
index 75f5651008bf..a92a51045bba 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_aegis.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_aegis.dmm
@@ -742,7 +742,7 @@
/obj/item/stack/sheet/mineral/uranium/five{
pixel_x = 2
},
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/structure/catwalk/over,
/obj/effect/decal/cleanable/oil,
/obj/item/stack/sheet/mineral/plasma/five,
@@ -869,9 +869,9 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/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/turf_decal/trimline/opaque/brown/filled/line,
/obj/structure/table/wood/reinforced,
/obj/item/food/cake/bscc{
@@ -1971,8 +1971,8 @@
/area/ship/engineering)
"qA" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/effect/decal/cleanable/plasma,
/obj/effect/decal/cleanable/glass,
/obj/item/circuitboard/machine/techfab/department/service,
@@ -3186,7 +3186,7 @@
pixel_x = 6
},
/obj/item/stack/sheet/metal/fifty,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/structure/catwalk/over,
/obj/item/circuitboard/machine/pacman,
/obj/item/circuitboard/machine/pacman/super,
@@ -3747,8 +3747,8 @@
/area/ship/crew/janitor)
"KR" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/random/maintenance/three,
/obj/effect/decal/cleanable/plasma,
/obj/effect/decal/cleanable/glass,
/obj/item/poster/random_contraband,
@@ -4402,7 +4402,7 @@
/area/ship/engineering)
"QN" = (
/obj/machinery/airalarm/directional/north,
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/effect/turf_decal/box,
/obj/machinery/light/directional/west,
/turf/open/floor/mineral/plastitanium/red,
@@ -4545,9 +4545,9 @@
},
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/costume,
-/obj/effect/spawner/lootdrop/costume,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/clothing/costume,
+/obj/effect/spawner/random/clothing/costume,
+/obj/effect/spawner/random/maintenance/three,
/obj/effect/turf_decal/corner_techfloor_grid/diagonal{
dir = 4
},
@@ -4647,7 +4647,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/medical)
"Tw" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/effect/turf_decal/box,
/obj/structure/cable/yellow{
icon_state = "1-2"
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
index 6617073ca6a7..cfd1bb9ec195 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
@@ -1040,12 +1040,12 @@
pixel_y = 1
},
/obj/structure/closet/crate/wooden,
-/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/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,
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
"xF" = (
@@ -2039,9 +2039,9 @@
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/disabler,
/obj/item/gun/ballistic/automatic/pistol/ringneck/no_mag,
-/obj/item/ammo_box/c10mm/rubbershot,
+/obj/item/storage/box/ammo/c10mm_rubber,
/obj/item/ammo_box/magazine/m10mm_ringneck,
-/obj/item/ammo_box/c10mm/ap,
+/obj/item/storage/box/ammo/c10mm_ap,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/book/granter/martial/cqc,
/turf/open/floor/plasteel/stairs{
@@ -2096,7 +2096,7 @@
"Yp" = (
/obj/structure/window/reinforced/spawner,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/random/maintenance/five,
/obj/item/stack/marker_beacon/thirty,
/obj/effect/turf_decal/box,
/obj/item/stack/sheet/metal/twenty{
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm
index 2911552027a4..331ec668cc35 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm
@@ -44,7 +44,7 @@
},
/obj/structure/closet/crate/bin,
/obj/machinery/light/directional/west,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/plasteel/dark,
/area/ship/hallway/central)
@@ -239,7 +239,7 @@
"aG" = (
/obj/structure/catwalk/over,
/obj/machinery/firealarm/directional/north,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"aH" = (
@@ -523,7 +523,7 @@
icon_state = "manifold-3";
dir = 8
},
-/obj/effect/spawner/lootdrop/gloves,
+/obj/effect/spawner/random/clothing/gloves,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"bl" = (
@@ -672,7 +672,7 @@
/obj/item/cigbutt/cigarbutt,
/obj/item/cigbutt,
/obj/item/cigbutt,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/item/cigbutt,
/obj/item/cigbutt,
/obj/item/cigbutt,
@@ -821,7 +821,7 @@
/obj/structure/closet/crate/bin,
/obj/machinery/airalarm/directional/north,
/obj/machinery/light/directional/west,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/wood/ebony,
/area/ship/crew/dorm)
"bR" = (
@@ -1091,7 +1091,7 @@
},
/obj/item/cigbutt/cigarbutt,
/obj/item/cigbutt/cigarbutt,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/item/broken_bottle,
/turf/open/floor/plasteel/white,
/area/ship/science)
@@ -1470,7 +1470,7 @@
/obj/effect/turf_decal/corner/transparent/syndiered/mono,
/obj/structure/closet/crate/bin,
/obj/item/cigbutt,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/item/cigbutt,
/obj/item/cigbutt,
/turf/open/floor/plasteel/mono/dark,
@@ -1752,7 +1752,7 @@
},
/obj/structure/closet/crate/bin,
/obj/machinery/firealarm/directional/north,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/machinery/newscaster/directional/east,
/turf/open/floor/plasteel/dark,
/area/ship/hallway/central)
@@ -1767,12 +1767,12 @@
pixel_x = -19;
pixel_y = 13
},
-/obj/effect/spawner/lootdrop/organ_spawner,
+/obj/effect/spawner/random/organ_spawner,
/turf/open/floor/plasteel/white,
/area/ship/medical)
"dF" = (
/obj/structure/table/chem,
-/obj/effect/spawner/lootdrop/memeorgans,
+/obj/effect/spawner/random/medical/memeorgans,
/turf/open/floor/plasteel/white,
/area/ship/medical)
"dG" = (
@@ -2485,11 +2485,11 @@
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
-/obj/item/ammo_box/c10mm,
-/obj/item/ammo_box/c10mm,
+/obj/item/storage/box/ammo/c10mm,
+/obj/item/storage/box/ammo/c10mm,
/obj/item/ammo_box/magazine/m556_42_hydra,
/obj/item/ammo_box/magazine/m556_42_hydra,
-/obj/item/ammo_box/c556mmHITP,
+/obj/item/storage/box/ammo/c556mmHITP,
/obj/item/storage/box/lethalshot{
pixel_x = 4;
pixel_y = -7
@@ -2627,7 +2627,7 @@
/obj/item/clothing/gloves/fingerless,
/obj/item/clothing/shoes/combat,
/obj/item/defibrillator/compact/combat/loaded,
-/obj/item/ammo_box/c10mm,
+/obj/item/storage/box/ammo/c10mm,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
@@ -3038,7 +3038,7 @@
/obj/item/clothing/shoes/combat,
/obj/machinery/firealarm/directional/south,
/obj/item/defibrillator/compact/combat/loaded,
-/obj/item/ammo_box/c10mm,
+/obj/item/storage/box/ammo/c10mm,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
@@ -3128,7 +3128,7 @@
/obj/machinery/firealarm/directional/south{
pixel_x = 10
},
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/obj/item/radio/intercom/wideband/directional/south{
pixel_x = -6
},
@@ -3258,7 +3258,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 4
},
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/turf/open/floor/plating,
/area/ship/engineering/electrical)
"gb" = (
@@ -3548,7 +3548,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/electrical)
"gB" = (
@@ -3866,7 +3866,7 @@
icon_state = "0-4"
},
/obj/machinery/light/directional/south,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/ship/engineering/electrical)
"hc" = (
@@ -4082,7 +4082,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"jX" = (
@@ -4204,7 +4204,7 @@
icon_state = "bordercolor";
dir = 4
},
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/dark,
/area/ship/hallway/central)
"qK" = (
@@ -4307,7 +4307,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"BE" = (
@@ -4346,7 +4346,7 @@
icon_state = "bordercolor";
dir = 4
},
-/obj/effect/spawner/lootdrop/destructive_anal_loot,
+/obj/effect/spawner/random/destructive_anal_loot,
/obj/item/kirbyplants/random,
/turf/open/floor/plasteel/dark,
/area/ship/hallway/central)
@@ -4402,7 +4402,7 @@
icon_state = "bordercolor";
dir = 8
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/structure/closet/crate/bin,
/obj/item/cigbutt,
/obj/item/cigbutt,
@@ -4487,7 +4487,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/ship/engineering/electrical)
"QF" = (
@@ -4586,7 +4586,7 @@
"YN" = (
/obj/effect/turf_decal/corner/transparent/syndiered/mono,
/obj/structure/closet/crate/bin,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/item/cigbutt,
/obj/item/cigbutt,
/turf/open/floor/plasteel/mono/dark,
@@ -4614,7 +4614,7 @@
/obj/item/clothing/gloves/fingerless,
/obj/item/clothing/shoes/combat,
/obj/item/defibrillator/compact/combat/loaded,
-/obj/item/ammo_box/c10mm,
+/obj/item/storage/box/ammo/c10mm,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_elegia.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_elegia.dmm
index 2ead1e0e90e6..320e233779de 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_elegia.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_elegia.dmm
@@ -1978,7 +1978,7 @@
/obj/item/storage/box/lethalshot,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/effect/turf_decal/industrial/traffic/full,
-/obj/item/ammo_box/c10mm,
+/obj/item/storage/box/ammo/c10mm,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/turf/open/floor/mineral/plastitanium/red,
@@ -2218,8 +2218,8 @@
/area/ship/bridge)
"JA" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/obj/effect/turf_decal/corner/transparent/bar{
dir = 1
},
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_hyena.dmm
index a300d7a5e0ba..15c874de3cb9 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_hyena.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_hyena.dmm
@@ -62,9 +62,9 @@
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
/obj/item/clothing/head/HoS/syndicate,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/ammo_box/a357/match,
-/obj/item/ammo_box/a357/match,
-/obj/item/ammo_box/a357/match,
+/obj/item/storage/box/ammo/a357/match,
+/obj/item/storage/box/ammo/a357/match,
+/obj/item/storage/box/ammo/a357/match,
/obj/item/pen/edagger,
/obj/item/gun/ballistic/revolver/viper,
/turf/open/floor/carpet/black,
@@ -220,12 +220,12 @@
name = "food crate"
},
/obj/item/storage/cans/sixbeer,
-/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/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/turf_decal/industrial/outline,
/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
@@ -299,8 +299,8 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/airalarm/directional/north,
/obj/effect/turf_decal/industrial/outline,
-/obj/item/ammo_box/a12g,
-/obj/item/ammo_box/c10mm,
+/obj/item/storage/box/ammo/a12g_buckshot,
+/obj/item/storage/box/ammo/c10mm,
/turf/open/floor/mineral/plastitanium,
/area/ship/security/armory)
"fC" = (
@@ -1326,8 +1326,8 @@
/area/ship/security/armory)
"wO" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/obj/effect/turf_decal/corner/transparent/bar{
dir = 1
},
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm
index 7458feb18662..f7f5bdad0ca1 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -184,7 +184,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/rust,
/area/ship/maintenance/starboard)
"dD" = (
@@ -969,7 +969,7 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
"jD" = (
-/obj/effect/spawner/lootdrop/salvage_capacitor,
+/obj/effect/spawner/random/salvage_capacitor,
/obj/effect/decal/cleanable/shreds,
/obj/structure/cable{
icon_state = "4-8"
@@ -1025,20 +1025,20 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/south,
-/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/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{
pixel_x = -6
},
-/obj/effect/spawner/lootdrop/ration{
+/obj/effect/spawner/random/food_or_drink/ration{
pixel_x = -6
},
-/obj/effect/spawner/lootdrop/ration{
+/obj/effect/spawner/random/food_or_drink/ration{
pixel_x = -6
},
-/obj/effect/spawner/lootdrop/ration{
+/obj/effect/spawner/random/food_or_drink/ration{
pixel_x = -6
},
/obj/structure/closet/crate{
@@ -2012,14 +2012,14 @@
/obj/item/ammo_box/magazine/m45_cobra,
/obj/item/ammo_box/magazine/m12g_bulldog/drum,
/obj/item/ammo_box/magazine/m12g_bulldog/drum,
-/obj/item/ammo_box/a12g/slug,
-/obj/item/ammo_box/a12g,
+/obj/item/storage/box/ammo/a12g_slug,
+/obj/item/storage/box/ammo/a12g_buckshot,
/obj/item/ammo_box/magazine/m556_42_hydra,
/obj/item/ammo_box/magazine/m556_42_hydra,
/obj/item/ammo_box/magazine/m556_42_hydra,
/obj/item/ammo_box/magazine/m556_42_hydra,
-/obj/item/ammo_box/a556_42,
-/obj/item/ammo_box/a556_42,
+/obj/item/storage/box/ammo/a556_42,
+/obj/item/storage/box/ammo/a556_42,
/turf/open/floor/mineral/plastitanium/red,
/area/ship/security/armory)
"sY" = (
@@ -2047,9 +2047,9 @@
dir = 10
},
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/costume,
+/obj/effect/spawner/random/clothing/costume,
/obj/item/storage/box/emptysandbags,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/button/door{
dir = 4;
id = "syndie_mechbay";
@@ -3096,8 +3096,8 @@
/obj/item/clothing/head/HoS/beret/syndicate,
/obj/item/clothing/head/HoS/syndicate,
/obj/item/clothing/under/syndicate/sniper,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
/obj/item/radio/headset/syndicate/alt/leader,
/obj/item/gun/ballistic/derringer/traitor,
/obj/item/clothing/shoes/combat,
@@ -3227,7 +3227,7 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"FV" = (
-/obj/effect/spawner/lootdrop/salvage_scanning,
+/obj/effect/spawner/random/salvage_scanning,
/obj/effect/decal/cleanable/shreds{
pixel_y = 14
},
@@ -3795,10 +3795,10 @@
"Lj" = (
/obj/structure/table/reinforced,
/obj/machinery/light/directional/west,
-/obj/effect/spawner/lootdrop/random_prosthetic{
+/obj/effect/spawner/random/medical/prosthetic{
pixel_x = 6
},
-/obj/effect/spawner/lootdrop/random_prosthetic{
+/obj/effect/spawner/random/medical/prosthetic{
pixel_x = -6
},
/turf/open/floor/pod/dark,
@@ -3913,7 +3913,7 @@
all_items_free = 1
},
/obj/item/gun/ballistic/shotgun/doublebarrel,
-/obj/item/ammo_box/a12g/rubbershot,
+/obj/item/storage/box/ammo/a12g_rubbershot,
/turf/open/floor/mineral/plastitanium,
/area/ship/crew/canteen)
"MG" = (
@@ -4373,7 +4373,7 @@
/obj/structure/railing{
dir = 8
},
-/obj/effect/spawner/lootdrop/salvage_manipulator,
+/obj/effect/spawner/random/salvage_manipulator,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/industrial/warning{
dir = 1
@@ -5238,7 +5238,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"YT" = (
-/obj/effect/spawner/lootdrop/salvage_manipulator,
+/obj/effect/spawner/random/salvage_manipulator,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable{
icon_state = "4-8"
@@ -5295,7 +5295,7 @@
},
/area/ship/cargo)
"Zf" = (
-/obj/effect/spawner/lootdrop/salvage_matter_bin,
+/obj/effect/spawner/random/salvage_matter_bin,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/industrial/warning{
@@ -5311,7 +5311,7 @@
/obj/effect/turf_decal/techfloor{
dir = 8
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/obj/machinery/button/door{
dir = 1;
id = "Artillery2shutter";
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kaas.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kaas.dmm
index b909b34fbac3..521cdddc912c 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kaas.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kaas.dmm
@@ -1253,9 +1253,9 @@
/obj/item/sbeacondrop/bomb,
/obj/item/sbeacondrop/bomb,
/obj/item/sbeacondrop/bomb,
-/obj/item/ammo_box/c9mm/fire,
-/obj/item/ammo_box/c9mm/fire,
-/obj/item/ammo_box/c9mm/fire,
+/obj/item/storage/box/ammo/c9mm_ap,
+/obj/item/storage/box/ammo/c9mm_ap,
+/obj/item/storage/box/ammo/c9mm_ap,
/obj/item/ammo_box/magazine/m9mm_rattlesnake,
/obj/item/ammo_box/magazine/m9mm_rattlesnake,
/obj/item/ammo_box/magazine/m9mm_rattlesnake,
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm
index 4aa442bac01c..42050f8db169 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm
@@ -644,7 +644,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate/large,
/obj/item/trash/can,
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/obj/structure/cable{
icon_state = "1-4"
},
@@ -1345,7 +1345,7 @@
/obj/item/radio/headset/syndicate/alt/captain,
/obj/item/ammo_box/magazine/m45_cobra,
/obj/item/ammo_box/magazine/m45_cobra,
-/obj/item/ammo_box/c45,
+/obj/item/storage/box/ammo/c45,
/turf/open/floor/carpet/red_gold,
/area/ship/bridge)
"BW" = (
@@ -1419,10 +1419,10 @@
pixel_y = -29;
name = "ammo locker"
},
-/obj/item/ammo_box/a300,
-/obj/item/ammo_box/a300_box,
-/obj/item/ammo_box/c45,
-/obj/item/ammo_box/c45,
+/obj/item/storage/box/ammo/a300,
+/obj/item/storage/box/ammo/a300_box,
+/obj/item/storage/box/ammo/c45,
+/obj/item/storage/box/ammo/c45,
/obj/item/ammo_box/magazine/m45_cobra,
/obj/item/ammo_box/magazine/m45_cobra,
/obj/item/ammo_box/magazine/m45_cobra,
@@ -1980,7 +1980,7 @@
/obj/item/clothing/shoes/sneakers/orange,
/obj/item/clothing/shoes/sneakers/orange,
/obj/structure/closet/secure_closet/brig/wall/directional/north,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plasteel/dark,
/area/ship/maintenance/port)
"ML" = (
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_krait.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_krait.dmm
index 42ef91a5d23e..d186ec9a3dd6 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_krait.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_krait.dmm
@@ -50,7 +50,7 @@
icon_state = "bordercolor";
dir = 8
},
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/dark,
/area/ship/hallway/central)
"aG" = (
@@ -536,8 +536,8 @@
pixel_y = 1
},
/obj/item/gun/ballistic/derringer/traitor,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
/obj/item/melee/classic_baton/telescopic/contractor_baton{
name = "SnD baton";
pixel_y = 8
@@ -589,7 +589,7 @@
/area/ship/engineering)
"fi" = (
/obj/structure/closet/crate/large,
-/obj/effect/spawner/lootdrop/glowstick,
+/obj/effect/spawner/random/decoration/glowstick,
/obj/item/trash/can/food/beans,
/obj/item/trash/energybar,
/obj/item/trash/can,
@@ -810,7 +810,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 1
},
-/obj/effect/spawner/lootdrop/donkpockets{
+/obj/effect/spawner/random/food_or_drink/donkpockets{
pixel_y = 7
},
/obj/structure/table/wood,
@@ -966,7 +966,7 @@
name = "recreation package"
},
/obj/effect/turf_decal/spline/plain/opaque/syndiered,
-/obj/item/reagent_containers/food/snacks/rationpack,
+/obj/effect/spawner/random/food_or_drink/ration,
/turf/open/floor/plasteel/tech,
/area/ship/cargo/port)
"hp" = (
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_litieguai.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_litieguai.dmm
index 58856acd7f9e..274df5ee7818 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_litieguai.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_litieguai.dmm
@@ -266,7 +266,7 @@
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/medical)
"fX" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/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/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/random/food_or_drink/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/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/trimline/opaque/red/filled/line{
dir = 8
},
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_luxembourg.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_luxembourg.dmm
index 752dd9cdd995..bdb4982c828f 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_luxembourg.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_luxembourg.dmm
@@ -1602,7 +1602,7 @@
pixel_y = 21;
dir = 8
},
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance/eight,
/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
"Dy" = (
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_panacea.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_panacea.dmm
index 27357498f2ed..beafb4b82f93 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_panacea.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_panacea.dmm
@@ -34,7 +34,7 @@
/turf/open/floor/plasteel/sepia,
/area/ship/crew/ccommons)
"az" = (
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/turf/open/floor/suns/diagonal{
color = "#543C30"
},
@@ -6581,11 +6581,11 @@
pixel_x = 8;
pixel_y = 7
},
-/obj/item/ammo_box/amagpellet_claris{
+/obj/item/storage/box/ammo/amagpellet_claris{
pixel_x = 4;
pixel_y = -4
},
-/obj/item/ammo_box/amagpellet_claris{
+/obj/item/storage/box/ammo/amagpellet_claris{
pixel_x = -2;
pixel_y = -4
},
@@ -6604,7 +6604,7 @@
req_one_access = list(1, 20);
name = "Peacekeeper's locker"
},
-/obj/item/ammo_box/ferropelletbox,
+/obj/item/storage/box/ammo/ferropelletbox,
/obj/item/storage/belt/security/military,
/turf/open/floor/suns/dark/plain,
/area/ship/security)
@@ -7171,7 +7171,7 @@
/turf/open/floor/carpet/red,
/area/ship/crew/dorm/dormtwo)
"Qi" = (
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/turf/open/floor/suns/diagonal{
color = "#543C30"
},
@@ -8199,7 +8199,7 @@
/area/ship/engineering)
"Wr" = (
/obj/machinery/light/directional/north,
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/turf/open/floor/suns/dark/plain,
/area/ship/crew/ccommons)
"Wu" = (
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_twinkleshine.dmm
index 082d5a1541d7..c583b9205c0c 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_twinkleshine.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_twinkleshine.dmm
@@ -292,7 +292,7 @@
"bR" = (
/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters,
/obj/machinery/light/directional/south,
-/obj/machinery/vending/snack/random,
+/obj/effect/spawner/random/vending/snack,
/obj/effect/turf_decal/borderfloorblack{
dir = 1
},
@@ -378,7 +378,7 @@
/area/ship/medical)
"cp" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/random/maintenance/four,
/obj/item/trash/syndi_cakes,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
@@ -838,7 +838,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/security)
"eQ" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/open/floor/pod/dark,
/area/ship/engineering/atmospherics)
"eR" = (
@@ -1807,9 +1807,9 @@
/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
/obj/item/clothing/under/syndicate/ngr/officer,
/obj/item/clothing/head/HoS/syndicate,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
/obj/item/gun/ballistic/revolver/viper,
/turf/open/floor/carpet/nanoweave/red,
/area/ship/crew/dorm/dormtwo)
@@ -2995,8 +2995,8 @@
/obj/item/storage/box/ingredients/vegetarian,
/obj/item/reagent_containers/condiment/milk,
/obj/item/reagent_containers/condiment/milk,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
/turf/open/floor/carpet/red,
/area/ship/crew/canteen)
"qQ" = (
@@ -5817,7 +5817,7 @@
dir = 8
},
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance/eight,
/obj/item/circuitboard/machine/autolathe,
/obj/item/stock_parts/manipulator,
/obj/item/stock_parts/matter_bin,
@@ -6351,7 +6351,7 @@
dir = 8
},
/obj/machinery/light/directional/north,
-/obj/machinery/vending/cola/random,
+/obj/effect/spawner/random/vending/cola,
/obj/effect/turf_decal/borderfloorblack/corner{
dir = 8
},
@@ -7487,7 +7487,7 @@
icon_state = "2-8"
},
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/random/maintenance/four,
/obj/item/reagent_containers/food/snacks/burger/red{
name = "suspicious red burger";
desc = "A suspicious looking burger.";
@@ -8617,9 +8617,9 @@
"Xf" = (
/obj/structure/table/wood,
/obj/machinery/door/firedoor/border_only,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/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,
/turf/open/floor/carpet/red,
/area/ship/crew/canteen)
"Xg" = (
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index d8a562fe99e5..fe531295354c 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -5166,8 +5166,8 @@
/area/centcom/holding)
"aUf" = (
/obj/item/storage/box/handcuffs,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
/obj/item/gun/ballistic/revolver/mateba,
/obj/structure/table/reinforced,
/obj/effect/turf_decal/industrial/warning{
diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm
index ec06680151f2..a137fd2df5d0 100644
--- a/_maps/shuttles/independent/independent_dwayne.dmm
+++ b/_maps/shuttles/independent/independent_dwayne.dmm
@@ -2709,8 +2709,8 @@
/obj/item/tank/internals/emergency_oxygen,
/obj/item/clothing/mask/breath,
/obj/item/reagent_containers/food/drinks/bottle/whiskey,
-/obj/item/ammo_box/c38,
-/obj/item/ammo_box/c38,
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38,
/obj/item/gun/ballistic/revolver/detective,
/obj/item/megaphone/cargo,
/turf/open/floor/plasteel/mono/dark,
diff --git a/_maps/shuttles/independent/independent_raleigh.dmm b/_maps/shuttles/independent/independent_raleigh.dmm
index 29920b3f2cf2..6914783b21dd 100644
--- a/_maps/shuttles/independent/independent_raleigh.dmm
+++ b/_maps/shuttles/independent/independent_raleigh.dmm
@@ -681,8 +681,8 @@
name = "Captain's Locker";
req_access_txt = "20"
},
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
/obj/item/clothing/under/rank/command/captain,
/obj/item/clothing/head/caphat,
/obj/item/clothing/under/syndicate/camo{
diff --git a/_maps/shuttles/independent/independent_rigger.dmm b/_maps/shuttles/independent/independent_rigger.dmm
index 98765718971d..b3e90787e119 100644
--- a/_maps/shuttles/independent/independent_rigger.dmm
+++ b/_maps/shuttles/independent/independent_rigger.dmm
@@ -3581,8 +3581,8 @@
/obj/item/clothing/glasses/sunglasses,
/obj/item/gun/ballistic/revolver/detective,
/obj/item/clothing/head/HoS/cowboy,
-/obj/item/ammo_box/c38,
-/obj/item/ammo_box/c38,
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38,
/obj/structure/closet/secure_closet/wall/directional/west{
icon_state = "solgov_wall";
name = "first mate's closet";
diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm
index 645dee18a539..e0c5b441b95a 100644
--- a/_maps/shuttles/independent/independent_shetland.dmm
+++ b/_maps/shuttles/independent/independent_shetland.dmm
@@ -3477,8 +3477,8 @@
},
/obj/item/storage/box/ammo/c38,
/obj/effect/turf_decal/box,
-/obj/item/ammo_box/c38,
-/obj/item/ammo_box/c38,
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38,
/obj/item/gun/ballistic/revolver/detective,
/turf/open/floor/plasteel/dark,
/area/ship/security)
diff --git a/_maps/shuttles/roumain/srm_elder.dmm b/_maps/shuttles/roumain/srm_elder.dmm
index fdd49c8d696a..8dc2df387690 100644
--- a/_maps/shuttles/roumain/srm_elder.dmm
+++ b/_maps/shuttles/roumain/srm_elder.dmm
@@ -2690,8 +2690,8 @@
},
/obj/item/storage/backpack/satchel/leather,
/obj/item/gun/ballistic/revolver/detective,
-/obj/item/ammo_box/c38,
-/obj/item/ammo_box/c38,
+/obj/item/storage/box/ammo/c38,
+/obj/item/storage/box/ammo/c38,
/obj/item/storage/box/ammo/c38,
/obj/item/clothing/head/cowboy/sec/roumain/colligne,
/obj/item/clothing/suit/armor/roumain/colligne,
diff --git a/_maps/shuttles/solgov/solgov_chronicle.dmm b/_maps/shuttles/solgov/solgov_chronicle.dmm
index 9a3be7fe22c1..e73f49173922 100644
--- a/_maps/shuttles/solgov/solgov_chronicle.dmm
+++ b/_maps/shuttles/solgov/solgov_chronicle.dmm
@@ -4603,7 +4603,7 @@
/obj/structure/closet/cabinet{
name = "ammunition"
},
-/obj/item/ammo_box/amagpellet_claris,
+/obj/item/storage/box/ammo/amagpellet_claris,
/obj/item/ammo_box/magazine/pistol556mm,
/obj/item/ammo_box/magazine/pistol556mm,
/obj/item/ammo_box/magazine/pistol556mm,
diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
index 8961a67042fe..46bdd3fd299d 100644
--- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
+++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -1116,8 +1116,8 @@
/obj/item/clothing/glasses/thermal/eyepatch,
/obj/item/gun/ballistic/revolver/viper,
/obj/item/clothing/under/syndicate/sniper,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
/obj/item/radio/headset/syndicate/alt/leader,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/under/syndicate/hardliners/officer,
diff --git a/_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm b/_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm
index f2e6b8f6dd63..019c81a25c28 100644
--- a/_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm
+++ b/_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm
@@ -3489,8 +3489,8 @@
/obj/item/megaphone,
/obj/item/storage/guncase/pistol/inherit,
/obj/item/gun/ballistic/revolver/viper/empty,
-/obj/item/ammo_box/a357/empty,
-/obj/item/ammo_box/a357/empty,
+/obj/item/storage/box/ammo/a357/empty,
+/obj/item/storage/box/ammo/a357/empty,
/turf/open/floor/carpet/red_gold,
/area/ship/crew/dorm/captain)
"xo" = (
diff --git a/_maps/shuttles/syndicate/syndicate_panacea.dmm b/_maps/shuttles/syndicate/syndicate_panacea.dmm
index 82d98e21b2a8..2e9e2cc3d1e9 100644
--- a/_maps/shuttles/syndicate/syndicate_panacea.dmm
+++ b/_maps/shuttles/syndicate/syndicate_panacea.dmm
@@ -6541,11 +6541,11 @@
pixel_x = 8;
pixel_y = 7
},
-/obj/item/ammo_box/amagpellet_claris{
+/obj/item/storage/box/ammo/amagpellet_claris{
pixel_x = 4;
pixel_y = -4
},
-/obj/item/ammo_box/amagpellet_claris{
+/obj/item/storage/box/ammo/amagpellet_claris{
pixel_x = -2;
pixel_y = -4
},
diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
index 49e0cacc0c02..6bf593e266b0 100644
--- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
+++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
@@ -1819,8 +1819,8 @@
/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
/obj/item/clothing/under/syndicate/ngr/officer,
/obj/item/clothing/head/HoS/syndicate,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
+/obj/item/storage/box/ammo/a357,
/turf/open/floor/carpet/nanoweave/red,
/area/ship/crew/dorm/dormtwo)
"kr" = (
diff --git a/mod_celadon/_storge_icons/icons/items/obj/restraints.dmi b/mod_celadon/_storge_icons/icons/items/obj/restraints.dmi
new file mode 100644
index 000000000000..23404b479f2e
Binary files /dev/null and b/mod_celadon/_storge_icons/icons/items/obj/restraints.dmi differ
diff --git a/mod_celadon/items/code/items.dm b/mod_celadon/items/code/items.dm
index 6af20aca9299..8ab00c6dfb49 100644
--- a/mod_celadon/items/code/items.dm
+++ b/mod_celadon/items/code/items.dm
@@ -1,3 +1,10 @@
/obj/item/taperecorder
name = "cassette tape recorder"
desc = "A device that can record to cassette tapes, and play them."
+
+/obj/item/restraints/handcuffs/pinkcuffs
+ name = "fluffy pink handcuffs"
+ desc = "Use this to keep prisoners in line, they are really itchy."
+ icon = 'mod_celadon/_storge_icons/icons/items/obj/restraints.dmi'
+ icon_state = "pinkcuffs"
+ cuffed_state = "pinkcuff"