diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm index 1c3bfcb71372..367c10be8f82 100644 --- a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm @@ -113,7 +113,7 @@ }, /area/overmap_encounter/planetoid/beachplanet/explored) "bs" = ( -/obj/effect/spawner/random/vending/colavend, +/obj/effect/spawner/random/vending/cola, /turf/open/floor/plasteel/patterned/grid, /area/ruin/beach/oceantown/shop) "bu" = ( diff --git a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm index 628e42272a91..fcda4390a285 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm @@ -109,7 +109,7 @@ /turf/open/floor/wood, /area/ruin/rockplanet/nanotrasen) "by" = ( -/obj/effect/spawner/random/vending/colavend, +/obj/effect/spawner/random/vending/cola, /obj/effect/turf_decal/industrial/warning, /obj/machinery/light/dim/directional/north, /turf/open/floor/plasteel, diff --git a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm index a349792cfb25..befb544e22c5 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm @@ -401,7 +401,7 @@ /turf/open/floor/plating/asteroid/rockplanet/lit, /area/overmap_encounter/planetoid/rockplanet/explored) "dZ" = ( -/obj/effect/spawner/random/vending/colavend, +/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) diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_medipen_plant.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_medipen_plant.dmm index 55a033cb5b8d..60dfc9186132 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_medipen_plant.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_surface_medipen_plant.dmm @@ -751,7 +751,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/powered) "uu" = ( -/obj/effect/spawner/random/vending/colavend, +/obj/effect/spawner/random/vending/cola, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm index 8da38104905b..f1a8d719d07d 100644 --- a/_maps/RandomRuins/SpaceRuins/spacemall.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacemall.dmm @@ -1323,7 +1323,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/spacemall/shop) "eX" = ( -/obj/effect/spawner/random/vending/colavend, +/obj/effect/spawner/random/vending/cola, /obj/effect/turf_decal/corner/transparent/green/diagonal, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 8 diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm index a89f9afe43c5..3cbabffe9368 100644 --- a/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm +++ b/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm @@ -699,7 +699,7 @@ /turf/open/floor/plating/rust, /area/ruin/powered) "HW" = ( -/obj/effect/spawner/random/vending/colavend, +/obj/effect/spawner/random/vending/cola, /turf/open/floor/plating, /area/ruin/powered) "Ie" = ( diff --git a/_maps/outpost/indie_space.dmm b/_maps/outpost/indie_space.dmm index 9b10b944a8fa..b10b86822c8c 100644 --- a/_maps/outpost/indie_space.dmm +++ b/_maps/outpost/indie_space.dmm @@ -958,7 +958,7 @@ /turf/open/floor/plasteel/mono, /area/outpost/vacant_rooms) "gz" = ( -/obj/effect/spawner/random/vending/colavend, +/obj/effect/spawner/random/vending/cola, /obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/spline/fancy/opaque/lightgrey{ dir = 1 @@ -4208,7 +4208,7 @@ /turf/open/floor/plasteel/tech, /area/outpost/maintenance/fore) "Am" = ( -/obj/effect/spawner/random/vending/colavend, +/obj/effect/spawner/random/vending/cola, /obj/effect/turf_decal/spline/fancy/opaque/lightgrey{ dir = 8 }, diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm index 098a1431c9ef..6cc96deccd90 100644 --- a/_maps/shuttles/independent/independent_shetland.dmm +++ b/_maps/shuttles/independent/independent_shetland.dmm @@ -3100,7 +3100,7 @@ /turf/open/floor/plating, /area/ship/hallway/port) "zr" = ( -/obj/effect/spawner/random/vending/colavend, +/obj/effect/spawner/random/vending/cola, /obj/effect/turf_decal/corner/opaque/neutral/three_quarters{ dir = 8 }, diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm index d7dd835538b5..9d27656bd271 100644 --- a/_maps/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/shuttles/inteq/inteq_colossus.dmm @@ -4498,7 +4498,7 @@ /turf/open/floor/carpet/black, /area/ship/crew) "XS" = ( -/obj/effect/spawner/random/vending/colavend, +/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/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 9f3a14293e19..c31ffa0caec3 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -4547,7 +4547,7 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "Cp" = ( -/obj/effect/spawner/random/vending/colavend, +/obj/effect/spawner/random/vending/cola, /obj/structure/sign/poster/contraband/inteq{ pixel_x = 32 }, @@ -6899,7 +6899,7 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "SS" = ( -/obj/effect/spawner/random/vending/colavend, +/obj/effect/spawner/random/vending/cola, /obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel/grimy, /area/ship/crew) diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm index f25dcd72186c..2921565f82b5 100644 --- a/_maps/shuttles/inteq/inteq_valor.dmm +++ b/_maps/shuttles/inteq/inteq_valor.dmm @@ -5382,7 +5382,7 @@ /obj/effect/turf_decal/trimline/opaque/yellow/line{ dir = 4 }, -/obj/effect/spawner/random/vending/colavend, +/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/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm index 7002fe4f7ed0..c07e81cefec8 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm @@ -435,7 +435,7 @@ /turf/open/floor/plasteel, /area/ship/cargo/starboard) "ej" = ( -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/borderfloor, /obj/structure/extinguisher_cabinet/directional/west, @@ -676,7 +676,7 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "gf" = ( -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, @@ -696,7 +696,7 @@ /turf/open/floor/plasteel/patterned, /area/ship/cargo/port) "gh" = ( -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/structure/cable{ icon_state = "1-2" }, @@ -712,7 +712,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 @@ -815,7 +815,7 @@ /area/ship/crew) "hA" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /turf/open/floor/plasteel/patterned, /area/ship/cargo/port) "hL" = ( @@ -907,7 +907,7 @@ /turf/open/floor/engine/airless, /area/ship/engineering/engine) "iJ" = ( -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /turf/open/floor/plasteel/patterned, /area/ship/cargo/starboard) "iK" = ( @@ -1150,7 +1150,7 @@ /area/ship/crew) "lE" = ( /obj/effect/turf_decal/box/corners, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo/starboard) "lM" = ( @@ -1176,7 +1176,7 @@ /area/ship/hallway/central) "lT" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/structure/cable{ icon_state = "1-2" }, @@ -1219,7 +1219,7 @@ /area/ship/cargo/port) "mb" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo/starboard) "mm" = ( @@ -1684,7 +1684,7 @@ /obj/effect/turf_decal/box/corners{ dir = 1 }, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo/port) @@ -1955,7 +1955,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, @@ -2158,7 +2158,7 @@ /turf/open/floor/plastic, /area/ship/crew/toilet) "vG" = ( -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/effect/turf_decal/borderfloor{ dir = 1 }, @@ -2267,7 +2267,7 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/communications) "wP" = ( -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/effect/turf_decal/industrial/outline/yellow, /turf/open/floor/plasteel, /area/ship/cargo/port) @@ -2336,7 +2336,7 @@ /area/ship/cargo/port) "xG" = ( /obj/item/radio/intercom/directional/north, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/effect/turf_decal/industrial/outline/yellow, /turf/open/floor/plasteel, /area/ship/cargo/port) @@ -2684,7 +2684,7 @@ "AN" = ( /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/industrial/outline/yellow, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /turf/open/floor/plasteel, /area/ship/cargo/starboard) "AW" = ( @@ -2729,7 +2729,7 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/crew) "BM" = ( -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/effect/turf_decal/trimline/transparent/white/filled/warning{ dir = 4 }, @@ -2752,7 +2752,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/structure/cable{ icon_state = "4-8" }, @@ -2761,7 +2761,7 @@ "Cc" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/industrial/warning, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -3080,7 +3080,7 @@ /obj/effect/turf_decal/box/corners{ dir = 8 }, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo/starboard) @@ -3345,14 +3345,14 @@ /area/ship/bridge) "HK" = ( /obj/machinery/light/directional/north, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/effect/turf_decal/borderfloor{ dir = 1 }, /turf/open/floor/plasteel, /area/ship/hallway/aft) "HN" = ( -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo/port) "HT" = ( @@ -3543,7 +3543,7 @@ "Jk" = ( /obj/effect/turf_decal/industrial/outline/yellow, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /turf/open/floor/plasteel, /area/ship/cargo/starboard) "Jn" = ( @@ -3875,7 +3875,7 @@ /area/ship/hallway/aft) "Nz" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo/port) "NC" = ( @@ -3944,7 +3944,7 @@ /obj/effect/turf_decal/arrows{ dir = 1 }, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/structure/cable{ icon_state = "4-8" }, @@ -4160,7 +4160,7 @@ /obj/effect/turf_decal/box/corners{ dir = 4 }, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo/starboard) "Qz" = ( @@ -4243,7 +4243,7 @@ /obj/effect/turf_decal/box/corners{ dir = 8 }, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo/starboard) @@ -4318,7 +4318,7 @@ "Sa" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/industrial/warning, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/structure/cable{ icon_state = "2-8" }, @@ -4340,7 +4340,7 @@ /obj/effect/turf_decal/borderfloor{ dir = 1 }, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /turf/open/floor/plasteel, /area/ship/hallway/aft) "Sl" = ( @@ -4401,7 +4401,7 @@ /area/ship/cargo/port) "SK" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/trimline/transparent/white/filled/warning{ dir = 4 @@ -4482,7 +4482,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, @@ -4527,7 +4527,7 @@ /obj/effect/turf_decal/box/corners{ dir = 1 }, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo/port) @@ -4571,7 +4571,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/central) "UC" = ( -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, @@ -4704,7 +4704,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo/port) "Vz" = ( @@ -5265,7 +5265,7 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/crew) "ZY" = ( -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/machinery/firealarm/directional/north, /turf/open/floor/plasteel/patterned, /area/ship/cargo/starboard) diff --git a/_maps/shuttles/nanotrasen/nanotrasen_harrier.dmm b/_maps/shuttles/nanotrasen/nanotrasen_harrier.dmm index 30c06f536966..ad2bb653d089 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_harrier.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_harrier.dmm @@ -5012,7 +5012,7 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "BO" = ( -/obj/effect/spawner/random/vending/colavend, +/obj/effect/spawner/random/vending/cola, /obj/effect/turf_decal/trimline/opaque/ntblue/filled/line, /turf/open/floor/plasteel, /area/ship/hallway/central) diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm index bb2405751c8f..e9ab200948c4 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, @@ -8990,7 +8990,7 @@ /obj/effect/turf_decal/trimline/opaque/beige/filled/line{ dir = 10 }, -/obj/effect/spawner/random/salvage_50, +/obj/effect/spawner/random/salvage/half, /obj/structure/cable{ icon_state = "1-2" }, diff --git a/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm index 6b3ef8e9b4b5..2f1d3b060077 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm @@ -3064,7 +3064,7 @@ /turf/open/floor/plasteel/dark, /area/ship/cargo) "La" = ( -/obj/effect/spawner/random/vending/colavend, +/obj/effect/spawner/random/vending/cola, /obj/effect/turf_decal/corner/transparent/bar/diagonal, /obj/machinery/light/broken/directional/east, /obj/effect/decal/cleanable/dirt/dust, diff --git a/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm b/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm index 2633ae384786..ce017fec067c 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm @@ -7102,7 +7102,7 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/maintenance/starboard) "PC" = ( -/obj/effect/spawner/random/vending/colavend, +/obj/effect/spawner/random/vending/cola, /obj/effect/turf_decal/siding/red{ dir = 4 }, diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm index 8a06197abcfe..b35aabc2923d 100644 --- a/_maps/shuttles/pgf/pgf_crying_sun.dmm +++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm @@ -2935,7 +2935,7 @@ /obj/effect/turf_decal/trimline/opaque/bottlegreen/filled/line{ dir = 1 }, -/obj/effect/spawner/random/vending/colavend, +/obj/effect/spawner/random/vending/cola, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "zc" = ( diff --git a/_maps/shuttles/syndicate/syndicate_litieguai.dmm b/_maps/shuttles/syndicate/syndicate_litieguai.dmm index 39df039c22ec..750f3016b14e 100644 --- a/_maps/shuttles/syndicate/syndicate_litieguai.dmm +++ b/_maps/shuttles/syndicate/syndicate_litieguai.dmm @@ -538,7 +538,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/maintenance/port) "na" = ( -/obj/effect/spawner/random/vending/colavend, +/obj/effect/spawner/random/vending/cola, /obj/effect/turf_decal/trimline/opaque/red/filled/line{ dir = 8 }, diff --git a/_maps/shuttles/syndicate/syndicate_panacea.dmm b/_maps/shuttles/syndicate/syndicate_panacea.dmm index 4a15cd353cca..875d5806131c 100644 --- a/_maps/shuttles/syndicate/syndicate_panacea.dmm +++ b/_maps/shuttles/syndicate/syndicate_panacea.dmm @@ -7126,7 +7126,7 @@ /turf/open/floor/carpet/red, /area/ship/crew/dorm/dormtwo) "Qi" = ( -/obj/effect/spawner/random/vending/colavend, +/obj/effect/spawner/random/vending/cola, /turf/open/floor/suns/diagonal{ color = "#543C30" }, @@ -8163,7 +8163,7 @@ /area/ship/engineering) "Wr" = ( /obj/machinery/light/directional/north, -/obj/effect/spawner/random/vending/colavend, +/obj/effect/spawner/random/vending/cola, /turf/open/floor/suns/dark/plain, /area/ship/crew/ccommons) "Wu" = ( diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index c2cc00ae0bb1..35b509de0c61 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -6329,7 +6329,7 @@ dir = 8 }, /obj/machinery/light/directional/north, -/obj/effect/spawner/random/vending/colavend, +/obj/effect/spawner/random/vending/cola, /obj/effect/turf_decal/borderfloorblack/corner{ dir = 8 }, diff --git a/code/game/objects/effects/spawners/random.dm/bedsheet.dm b/code/game/objects/effects/spawners/random.dm/bedsheet.dm new file mode 100644 index 000000000000..f8a53fffd2c9 --- /dev/null +++ b/code/game/objects/effects/spawners/random.dm/bedsheet.dm @@ -0,0 +1,33 @@ +/obj/effect/spawner/random/bedsheet + name = "random dorm bedsheet" + icon_state = "random_bedsheet" + loot = list( + /obj/item/bedsheet, + /obj/item/bedsheet/blue, + /obj/item/bedsheet/green, + /obj/item/bedsheet/grey, + /obj/item/bedsheet/orange, + /obj/item/bedsheet/purple, + /obj/item/bedsheet/red, + /obj/item/bedsheet/yellow, + /obj/item/bedsheet/brown, + /obj/item/bedsheet/black, + /obj/item/bedsheet/rainbow + ) + +/obj/effect/spawner/random/bedsheet/double + name = "random dorm double bedsheet" + icon_state = "random_doublesheet" + loot = list( + /obj/item/bedsheet/double, + /obj/item/bedsheet/double/blue, + /obj/item/bedsheet/double/green, + /obj/item/bedsheet/double/grey, + /obj/item/bedsheet/double/orange, + /obj/item/bedsheet/double/purple, + /obj/item/bedsheet/double/red, + /obj/item/bedsheet/double/yellow, + /obj/item/bedsheet/double/brown, + /obj/item/bedsheet/double/black, + /obj/item/bedsheet/double/rainbow + ) diff --git a/code/game/objects/effects/spawners/random.dm/boards.dm b/code/game/objects/effects/spawners/random.dm/boards.dm index 4eefa4239058..4c80338ff85c 100644 --- a/code/game/objects/effects/spawners/random.dm/boards.dm +++ b/code/game/objects/effects/spawners/random.dm/boards.dm @@ -2,7 +2,7 @@ /obj/effect/spawner/random/techstorage name = "generic circuit board spawner" - icon_state = "circut" + icon_state = "circuit" spawn_loot_split = TRUE spawn_all_loot = TRUE diff --git a/code/game/objects/effects/spawners/random.dm/clothing.dm b/code/game/objects/effects/spawners/random.dm/clothing.dm index 1b522aff8e04..e5137f9e5078 100644 --- a/code/game/objects/effects/spawners/random.dm/clothing.dm +++ b/code/game/objects/effects/spawners/random.dm/clothing.dm @@ -1,7 +1,7 @@ /obj/effect/spawner/random/clothing name = "clothing loot spawner" desc = "Time to look pretty." - icon_state = "hat" + icon_state = "suit" /obj/effect/spawner/random/clothing/gloves name = "random gloves" diff --git a/code/game/objects/effects/spawners/random.dm/decoration.dm b/code/game/objects/effects/spawners/random.dm/decoration.dm index e7b3b5433dfa..b9a305fb9fd0 100644 --- a/code/game/objects/effects/spawners/random.dm/decoration.dm +++ b/code/game/objects/effects/spawners/random.dm/decoration.dm @@ -1,3 +1,44 @@ +/obj/effect/spawner/random/decoration + name = "decoration loot spawner" + desc = "Time for some bling bling." + icon_state = "lamp" + +/obj/effect/spawner/random/decoration/material + name = "decoration material spawner" + icon_state = "tile" + loot = list( + /obj/item/stack/sheet/sandblock{amount = 30} = 25, + /obj/item/stack/sheet/mineral/wood{amount = 30} = 25, + /obj/item/stack/sheet/bronze/thirty = 20, + /obj/item/stack/tile/noslip{amount = 20} = 10, + /obj/item/stack/sheet/plastic{amount = 30} = 10, + /obj/item/stack/tile/pod{amount = 20} = 4, + /obj/item/stack/tile/pod/light{amount = 20} = 3, + /obj/item/stack/tile/pod/dark{amount = 20} = 3, + ) + +/obj/effect/spawner/random/decoration/carpet + name = "carpet spawner" + icon_state = "carpet" + loot = list( + /obj/item/stack/tile/carpet{amount = 30} = 35, + /obj/item/stack/tile/carpet/black{amount = 30} = 20, + /obj/item/stack/tile/carpet/donk/thirty = 15, + /obj/item/stack/tile/carpet/stellar/thirty = 15, + /obj/item/stack/tile/carpet/executive/thirty = 15, + ) + +/obj/effect/spawner/random/decoration/ornament + name = "ornament spawner" + icon_state = "lamp" + loot = list( + /obj/item/flashlight/lamp = 35, + /obj/item/flashlight/lamp/green = 35, + /obj/item/flashlight/lantern = 10, + /obj/item/phone = 10, + /obj/item/flashlight/lantern/jade = 5, + /obj/item/flashlight/lamp/bananalamp = 5, + ) /obj/effect/spawner/random/decoration/glowstick name = "random colored glowstick" icon_state = "glowstick" @@ -64,3 +105,20 @@ /obj/structure/flora/ausbushes/sparsegrass ) spawn_loot_count = 1 + +/obj/effect/spawner/random/decoration/paint + name = "paint spawner" + icon_state = "paint" + loot_subtype_path = /obj/item/paint + loot = list() + +/obj/effect/spawner/random/decoration/flower + name = "random flower spawner" + icon_state = "flower" + loot = list( + /obj/item/reagent_containers/food/snacks/grown/poppy, + /obj/item/reagent_containers/food/snacks/grown/harebell, + /obj/item/reagent_containers/food/snacks/grown/trumpet, + /obj/item/reagent_containers/food/snacks/grown/sunflower, + /obj/item/reagent_containers/food/snacks/grown/rose, + ) diff --git a/code/game/objects/effects/spawners/random.dm/exotic.dm b/code/game/objects/effects/spawners/random.dm/exotic.dm index 5a764c8df416..9d55fa9b69ff 100644 --- a/code/game/objects/effects/spawners/random.dm/exotic.dm +++ b/code/game/objects/effects/spawners/random.dm/exotic.dm @@ -1,9 +1,11 @@ /obj/effect/spawner/random/exotic name = "exotic spawner" desc = "Super duper rare stuff." + icon_state = "showcase" /obj/effect/spawner/random/exotic/ripley name = "25% exosuit 75% wreckage ripley spawner" + icon_state = "ripley" loot = list( /obj/mecha/working/ripley/mining = 1, /obj/structure/mecha_wreckage/ripley = 5 diff --git a/code/game/objects/effects/spawners/random.dm/food_or_drink.dm b/code/game/objects/effects/spawners/random.dm/food_or_drink.dm index d32f4a5f2e17..00a4fc76e056 100644 --- a/code/game/objects/effects/spawners/random.dm/food_or_drink.dm +++ b/code/game/objects/effects/spawners/random.dm/food_or_drink.dm @@ -1,6 +1,7 @@ /obj/effect/spawner/random/food_or_drink name = "food or drink loot spawner" desc = "Nom nom nom" + icon_state = "soup" /obj/effect/spawner/random/food_or_drink/donkpockets name = "donk pocket box spawner" diff --git a/code/game/objects/effects/spawners/random.dm/salvaging.dm b/code/game/objects/effects/spawners/random.dm/salvaging.dm index 212e53f4a582..a6bd07570d27 100644 --- a/code/game/objects/effects/spawners/random.dm/salvaging.dm +++ b/code/game/objects/effects/spawners/random.dm/salvaging.dm @@ -1,5 +1,6 @@ //GENERIC /obj/effect/spawner/random/salvage_capacitor + icon_state = "matter_bin" loot = list( /obj/item/stock_parts/capacitor = 120, /obj/item/stock_parts/capacitor/adv = 20, @@ -7,6 +8,7 @@ ) /obj/effect/spawner/random/salvage_scanning + icon_state = "matter_bin" loot = list( /obj/item/stock_parts/scanning_module = 120, /obj/item/stock_parts/scanning_module/adv = 20, @@ -14,6 +16,7 @@ ) /obj/effect/spawner/random/salvage_manipulator + icon_state = "matter_bin" loot = list( /obj/item/stock_parts/manipulator = 120, /obj/item/stock_parts/manipulator/nano = 20, @@ -21,6 +24,7 @@ ) /obj/effect/spawner/random/salvage_matter_bin + icon_state = "matter_bin" loot = list( /obj/item/stock_parts/matter_bin = 120, /obj/item/stock_parts/matter_bin/adv = 20, @@ -28,6 +32,7 @@ ) /obj/effect/spawner/random/salvage_laser + icon_state = "matter_bin" loot = list( /obj/item/stock_parts/micro_laser = 120, /obj/item/stock_parts/micro_laser/high = 20, @@ -37,6 +42,7 @@ //PROTOLATHE /obj/effect/spawner/random/random_gun_protolathe_lootdrop + icon_state = "laser_gun" loot = list( /obj/item/gun/energy/lasercannon = 1, /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto = 1, @@ -44,6 +50,7 @@ ) /obj/effect/spawner/random/random_ammo_protolathe_lootdrop + icon_state = "rubbershot" loot = list( /obj/item/stock_parts/cell/gun/upgraded = 5, /obj/item/ammo_box/magazine/smgm9mm = 7, @@ -74,6 +81,7 @@ /obj/effect/spawner/random/salvage_machine name = "salvageable machine spawner" + icon_state = "arcade" loot = list( /obj/structure/salvageable/protolathe, /obj/structure/salvageable/circuit_imprinter, @@ -84,19 +92,9 @@ /obj/structure/salvageable/destructive_analyzer ) -/obj/effect/spawner/random/salvage_50 - name = "50% salvage spawner" - spawn_loot_chance = 50 - loot = list( - /obj/effect/spawner/random/maintenance , - /obj/effect/spawner/random/salvage_machine, - /obj/effect/spawner/random/exotic/ripley, - /obj/structure/closet/crate/secure/loot, - ) - /obj/effect/spawner/random/salvage name = "salvage mats spawner" - icon_state = "metal" + icon_state = "rods" loot = list( /obj/item/stack/ore/salvage/scrapmetal, /obj/item/stack/ore/salvage/scrapgold, @@ -107,6 +105,16 @@ /obj/item/stack/ore/salvage/scrapuranium ) +/obj/effect/spawner/random/salvage/half + name = "50% salvage spawner" + spawn_loot_chance = 50 + loot = list( + /obj/effect/spawner/random/maintenance, + /obj/effect/spawner/random/salvage_machine, + /obj/effect/spawner/random/exotic/ripley, + /obj/structure/closet/crate/secure/loot, + ) + /obj/effect/spawner/random/salvage/metal loot = list( /obj/item/stack/ore/salvage/scrapmetal diff --git a/code/game/objects/effects/spawners/random.dm/structure.dm b/code/game/objects/effects/spawners/random.dm/structure.dm index 13e71ecd3e57..0264b3d76a9e 100644 --- a/code/game/objects/effects/spawners/random.dm/structure.dm +++ b/code/game/objects/effects/spawners/random.dm/structure.dm @@ -2,6 +2,7 @@ /obj/effect/spawner/random/structure name = "structure spawner" desc = "Now you see me, now you don't..." + icon_state = "girder" /obj/effect/spawner/random/structure/crate_abandoned name = "locked crate spawner" diff --git a/code/game/objects/effects/spawners/random.dm/trash.dm b/code/game/objects/effects/spawners/random.dm/trash.dm index d013da14e4be..69520f002fc8 100644 --- a/code/game/objects/effects/spawners/random.dm/trash.dm +++ b/code/game/objects/effects/spawners/random.dm/trash.dm @@ -54,6 +54,7 @@ /obj/effect/spawner/random/trash/food_packaging name = "empty food packaging spawner" + icon_state = "chips" loot = list( /obj/item/trash/raisins = 2, /obj/item/trash/cheesie = 2, @@ -91,7 +92,7 @@ ) /obj/effect/spawner/random/trash/decal - icon_state = "trash" + icon_state = "vomit" loot = list( /obj/effect/decal/cleanable/greenglow/filled = 30, /obj/effect/decal/cleanable/greenglow/ecto = 1, diff --git a/code/game/objects/effects/spawners/random.dm/vending.dm b/code/game/objects/effects/spawners/random.dm/vending.dm index a29b0d8ea27d..595746e14e19 100644 --- a/code/game/objects/effects/spawners/random.dm/vending.dm +++ b/code/game/objects/effects/spawners/random.dm/vending.dm @@ -9,7 +9,7 @@ loot_type_path = /obj/machinery/vending/snack loot = list() -/obj/effect/spawner/random/vending/colavend +/obj/effect/spawner/random/vending/cola name = "spawn random cola vending machine" desc = "Automagically transforms into a random cola vendor. If you see this while in a shift, please create a bug report." icon_state = "cola" diff --git a/tools/UpdatePaths/Scripts/60522_replace_spawners.txt b/tools/UpdatePaths/Scripts/60522_replace_spawners.txt index 9fb893c6563b..831d337edeb6 100644 --- a/tools/UpdatePaths/Scripts/60522_replace_spawners.txt +++ b/tools/UpdatePaths/Scripts/60522_replace_spawners.txt @@ -62,3 +62,6 @@ /obj/effect/spawner/randomarcade : /obj/effect/spawner/random/entertainment/arcade /obj/machinery/vending/cola/random : /obj/effect/spawner/random/vending/cola /obj/machinery/vending/snack/random : /obj/effect/spawner/random/vending/snack +/obj/item/bedsheet/dorms : /obj/effect/spawner/random/bedsheet +/obj/item/bedsheet/dorms/double : /obj/effect/spawner/random/bedsheet/double +/obj/item/bedsheet/random : /obj/effect/spawner/random/bedsheet