From 550315ce85e006d3c30516539a5613905abda078 Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Wed, 9 Apr 2025 13:13:20 -0400 Subject: [PATCH] remove redundant spawner icon decls (#28937) --- .../objects/effects/spawners/random/decal_spawners.dm | 4 ---- .../effects/spawners/random/engineering_spawners.dm | 1 - .../game/objects/effects/spawners/random/food_spawners.dm | 8 +------- .../objects/effects/spawners/random/furniture_spawners.dm | 1 - .../game/objects/effects/spawners/random/loot_spawners.dm | 2 -- .../game/objects/effects/spawners/random/misc_spawners.dm | 6 ------ .../objects/effects/spawners/random/outfit_spawners.dm | 1 - .../objects/effects/spawners/random/pool/misc_pools.dm | 1 - .../objects/effects/spawners/random/pool/pool_spawner.dm | 3 --- .../objects/effects/spawners/random/pool/space_loot.dm | 2 -- .../objects/effects/spawners/random/random_spawner.dm | 2 +- code/game/objects/effects/spawners/random/toy_spawners.dm | 1 - .../spawners/random/traders/trader_department_spawners.dm | 1 - .../objects/effects/spawners/random/trash_spawners.dm | 2 -- 14 files changed, 2 insertions(+), 33 deletions(-) diff --git a/code/game/objects/effects/spawners/random/decal_spawners.dm b/code/game/objects/effects/spawners/random/decal_spawners.dm index e04e75efd7d..d116a8844ef 100644 --- a/code/game/objects/effects/spawners/random/decal_spawners.dm +++ b/code/game/objects/effects/spawners/random/decal_spawners.dm @@ -1,6 +1,5 @@ /obj/effect/spawner/random/fungus name = "fungus 100% chance" - icon = 'icons/effects/random_spawners.dmi' icon_state = "fungus" color = "#D5820B" loot = list(/obj/effect/decal/cleanable/fungus) @@ -19,7 +18,6 @@ /obj/effect/spawner/random/blood name = "blood 100% chance" - icon = 'icons/effects/random_spawners.dmi' icon_state = "blood" loot = list(/obj/effect/decal/cleanable/blood/splatter) @@ -33,7 +31,6 @@ /obj/effect/spawner/random/oil name = "oil 100% chance" - icon = 'icons/effects/random_spawners.dmi' icon_state = "oil" loot = list(/obj/effect/decal/cleanable/blood/oil) @@ -76,7 +73,6 @@ /obj/effect/spawner/random/dirt name = "dirt 100% chance" - icon = 'icons/effects/random_spawners.dmi' icon_state = "dirt" loot = list(/obj/effect/decal/cleanable/dirt) diff --git a/code/game/objects/effects/spawners/random/engineering_spawners.dm b/code/game/objects/effects/spawners/random/engineering_spawners.dm index 65c5b5bfc45..89c545373c7 100644 --- a/code/game/objects/effects/spawners/random/engineering_spawners.dm +++ b/code/game/objects/effects/spawners/random/engineering_spawners.dm @@ -1,5 +1,4 @@ /obj/effect/spawner/random/engineering - icon = 'icons/effects/random_spawners.dmi' icon_state = "wrench" record_spawn = TRUE diff --git a/code/game/objects/effects/spawners/random/food_spawners.dm b/code/game/objects/effects/spawners/random/food_spawners.dm index b53c148d96d..2515b507e3a 100644 --- a/code/game/objects/effects/spawners/random/food_spawners.dm +++ b/code/game/objects/effects/spawners/random/food_spawners.dm @@ -1,6 +1,5 @@ /obj/effect/spawner/random/snacks name = "snacks spawner" - icon = 'icons/effects/random_spawners.dmi' icon_state = "donkpocket_single" loot = list( list( @@ -21,22 +20,18 @@ record_spawn = TRUE /obj/effect/spawner/random/food_or_drink - // TODO: Consolidate all the spawner icons once all the legacy random spawners have been migrated - icon = 'icons/effects/random_spawners.dmi' + icon_state = "soup" /obj/effect/spawner/random/food_or_drink/soup name = "soup spawner" - icon_state = "soup" loot_subtype_path = /obj/item/food/soup /obj/effect/spawner/random/food_or_drink/salad name = "salad spawner" - icon_state = "soup" loot_subtype_path = /obj/item/food/salad /obj/effect/spawner/random/food_or_drink/dinner name = "dinner spawner" - icon_state = "soup" loot = list( /obj/item/food/burger/bigbite, /obj/item/food/burger/fivealarm, @@ -49,7 +44,6 @@ /obj/effect/spawner/random/food_or_drink/three_course_meal name = "three course meal spawner" - icon_state = "soup" spawn_all_loot = TRUE loot = list( /obj/effect/spawner/random/food_or_drink/soup, diff --git a/code/game/objects/effects/spawners/random/furniture_spawners.dm b/code/game/objects/effects/spawners/random/furniture_spawners.dm index f5c41a3e050..207a49c24af 100644 --- a/code/game/objects/effects/spawners/random/furniture_spawners.dm +++ b/code/game/objects/effects/spawners/random/furniture_spawners.dm @@ -1,6 +1,5 @@ /obj/effect/spawner/random/storage name = "storage furniture spawner" - icon = 'icons/effects/random_spawners.dmi' icon_state = "shelf" layer = BELOW_OBJ_LAYER loot = list( diff --git a/code/game/objects/effects/spawners/random/loot_spawners.dm b/code/game/objects/effects/spawners/random/loot_spawners.dm index 02c88a2157f..f0ecf8cec97 100644 --- a/code/game/objects/effects/spawners/random/loot_spawners.dm +++ b/code/game/objects/effects/spawners/random/loot_spawners.dm @@ -1,6 +1,5 @@ /obj/effect/spawner/random/loot name = "random loot spawner" - icon = 'icons/effects/random_spawners.dmi' icon_state = "loot" /obj/effect/spawner/random/loot/contraband_posters @@ -77,7 +76,6 @@ /obj/effect/spawner/random/loot_crate name = "lootcrate spawner" - icon = 'icons/effects/random_spawners.dmi' icon_state = "crate_secure" spawn_inside = /obj/structure/closet/crate/secure/loot loot = list( diff --git a/code/game/objects/effects/spawners/random/misc_spawners.dm b/code/game/objects/effects/spawners/random/misc_spawners.dm index 9b29645438b..b2f8bc7e64e 100644 --- a/code/game/objects/effects/spawners/random/misc_spawners.dm +++ b/code/game/objects/effects/spawners/random/misc_spawners.dm @@ -13,7 +13,6 @@ spawn_loot_count = rand(1, 2) /obj/effect/spawner/random/bureaucracy - icon = 'icons/effects/random_spawners.dmi' icon_state = "folder" name = "bureaucracy spawner" loot = list( @@ -32,7 +31,6 @@ record_spawn = TRUE /obj/effect/spawner/random/book - icon = 'icons/effects/random_spawners.dmi' icon_state = "book" name = "book spawner" loot = list( @@ -82,7 +80,6 @@ record_spawn = TRUE /obj/effect/spawner/random/jani_supplies - icon = 'icons/effects/random_spawners.dmi' icon_state = "mopbucket" name = "janitorial supplies spawner" loot = list( @@ -95,7 +92,6 @@ /obj/effect/spawner/random/stock_parts name = "stock parts spawner" - icon = 'icons/effects/random_spawners.dmi' icon_state = "stock_parts" loot_subtype_path = /obj/item/stock_parts @@ -105,7 +101,6 @@ /obj/effect/spawner/random/glowstick name = "random glowstick spawner" - icon = 'icons/effects/random_spawners.dmi' icon_state = "glowstick" loot = list( /obj/item/flashlight/flare/glowstick, @@ -118,7 +113,6 @@ /obj/effect/spawner/random/smithed_item name = "random smithed item" - icon = 'icons/effects/random_spawners.dmi' icon_state = "metal" record_spawn = TRUE diff --git a/code/game/objects/effects/spawners/random/outfit_spawners.dm b/code/game/objects/effects/spawners/random/outfit_spawners.dm index bd3e1166757..3dc2d7bbd1a 100644 --- a/code/game/objects/effects/spawners/random/outfit_spawners.dm +++ b/code/game/objects/effects/spawners/random/outfit_spawners.dm @@ -1,7 +1,6 @@ /obj/effect/spawner/random/loot/outfit name = "outfit spawner" spawn_all_loot = TRUE - icon = 'icons/effects/random_spawners.dmi' icon_state = "suit" /obj/effect/spawner/random/loot/outfit/clown diff --git a/code/game/objects/effects/spawners/random/pool/misc_pools.dm b/code/game/objects/effects/spawners/random/pool/misc_pools.dm index 509616aa64f..fce62bc582c 100644 --- a/code/game/objects/effects/spawners/random/pool/misc_pools.dm +++ b/code/game/objects/effects/spawners/random/pool/misc_pools.dm @@ -3,7 +3,6 @@ available_points = 0 /obj/effect/spawner/random/pool/whiteship_mob - icon = 'icons/effects/random_spawners.dmi' icon_state = "giftbox" spawn_pool_id = "whiteship_mobs_spawn_pool" unique_picks = TRUE diff --git a/code/game/objects/effects/spawners/random/pool/pool_spawner.dm b/code/game/objects/effects/spawners/random/pool/pool_spawner.dm index 397a4801bd4..9175f5a060f 100644 --- a/code/game/objects/effects/spawners/random/pool/pool_spawner.dm +++ b/code/game/objects/effects/spawners/random/pool/pool_spawner.dm @@ -1,8 +1,5 @@ /// A random spawner managed by a [/datum/spawn_pool]. /obj/effect/spawner/random/pool - icon = 'icons/effects/random_spawners.dmi' - icon_state = "loot" - /// How much this spawner will subtract from the available budget if it /// spawns. A value of `-1` (i.e., not setting the value on a subtype) /// does not attempt to subtract from the budget. This is useful for diff --git a/code/game/objects/effects/spawners/random/pool/space_loot.dm b/code/game/objects/effects/spawners/random/pool/space_loot.dm index 1cec5c1408f..330791fe8ea 100644 --- a/code/game/objects/effects/spawners/random/pool/space_loot.dm +++ b/code/game/objects/effects/spawners/random/pool/space_loot.dm @@ -3,8 +3,6 @@ available_points = 1700 /obj/effect/spawner/random/pool/spaceloot - icon = 'icons/effects/random_spawners.dmi' - icon_state = "giftbox" spawn_pool_id = "space_loot_spawn_pool" record_spawn = TRUE diff --git a/code/game/objects/effects/spawners/random/random_spawner.dm b/code/game/objects/effects/spawners/random/random_spawner.dm index c3f1c6eec5b..be0c2ea7e0b 100644 --- a/code/game/objects/effects/spawners/random/random_spawner.dm +++ b/code/game/objects/effects/spawners/random/random_spawner.dm @@ -2,7 +2,7 @@ * Base class for all random spawners. */ /obj/effect/spawner/random - icon = 'icons/effects/spawner_icons.dmi' + icon = 'icons/effects/random_spawners.dmi' icon_state = "loot" layer = OBJ_LAYER /// Stops persistent lootdrop spawns from being shoved into lockers diff --git a/code/game/objects/effects/spawners/random/toy_spawners.dm b/code/game/objects/effects/spawners/random/toy_spawners.dm index 01fb4300baf..02b157a8e00 100644 --- a/code/game/objects/effects/spawners/random/toy_spawners.dm +++ b/code/game/objects/effects/spawners/random/toy_spawners.dm @@ -1,6 +1,5 @@ /obj/effect/spawner/random/toy name = "random toy spawner" - icon = 'icons/effects/random_spawners.dmi' icon_state = "toy" /obj/effect/spawner/random/toy/mech_figure diff --git a/code/game/objects/effects/spawners/random/traders/trader_department_spawners.dm b/code/game/objects/effects/spawners/random/traders/trader_department_spawners.dm index 3af2926b4e1..e8e0f4f5df6 100644 --- a/code/game/objects/effects/spawners/random/traders/trader_department_spawners.dm +++ b/code/game/objects/effects/spawners/random/traders/trader_department_spawners.dm @@ -1,6 +1,5 @@ /obj/effect/spawner/random/traders name = "trader item spawner" - icon = 'icons/effects/random_spawners.dmi' icon_state = "loot" spawn_loot_count = 6 diff --git a/code/game/objects/effects/spawners/random/trash_spawners.dm b/code/game/objects/effects/spawners/random/trash_spawners.dm index 6fc25c65a82..113581ad226 100644 --- a/code/game/objects/effects/spawners/random/trash_spawners.dm +++ b/code/game/objects/effects/spawners/random/trash_spawners.dm @@ -1,7 +1,6 @@ /// Food trash spawner, for when you specifically want it to look like someone /// didn't clean up after themselves after lunch. /obj/effect/spawner/random/food_trash - icon = 'icons/effects/random_spawners.dmi' icon_state = "tray" name = "Food trash spawner" loot = list( @@ -36,7 +35,6 @@ SSblackbox.record_feedback("tally", "random_spawners", 1, "[/obj/item/trash]") /obj/effect/spawner/random/trash - icon = 'icons/effects/random_spawners.dmi' icon_state = "trash" name = "Trash spawner"