From 974baec0435ccb3ccaae1e269bd2cc2bca57d6a9 Mon Sep 17 00:00:00 2001 From: Tim Date: Sat, 12 Mar 2022 19:47:17 -0600 Subject: [PATCH] Improve ornament, barricade, grille, and girder random spawners (#65252) --- .../objects/effects/spawners/random/decoration.dm | 10 +++++----- .../game/objects/effects/spawners/random/structure.dm | 11 +++++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/code/game/objects/effects/spawners/random/decoration.dm b/code/game/objects/effects/spawners/random/decoration.dm index bc50d1da3f9..44a40bbc240 100644 --- a/code/game/objects/effects/spawners/random/decoration.dm +++ b/code/game/objects/effects/spawners/random/decoration.dm @@ -32,12 +32,12 @@ name = "ornament spawner" icon_state = "lamp" loot = list( - /obj/item/sign = 10, - /obj/item/flashlight/lamp/green = 10, - /obj/item/plaque = 5, + /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/phone = 5, - /obj/item/flashlight/lamp/bananalamp = 3, + /obj/item/flashlight/lamp/bananalamp = 5, ) /obj/effect/spawner/random/decoration/generic diff --git a/code/game/objects/effects/spawners/random/structure.dm b/code/game/objects/effects/spawners/random/structure.dm index fb54433b39e..2c353b7124a 100644 --- a/code/game/objects/effects/spawners/random/structure.dm +++ b/code/game/objects/effects/spawners/random/structure.dm @@ -25,16 +25,18 @@ /obj/effect/spawner/random/structure/girder name = "girder spawner" icon_state = "girder" - loot = list( - /obj/structure/girder = 4, + spawn_loot_chance = 90 + loot = list( // 80% chance normal girder, 10% chance of displaced, 10% chance of nothing + /obj/structure/girder = 8, /obj/structure/girder/displaced = 1, ) /obj/effect/spawner/random/structure/grille name = "grille spawner" icon_state = "grille" - loot = list( - /obj/structure/grille = 4, + spawn_loot_chance = 90 + loot = list( // 80% chance normal grille, 10% chance of broken, 10% chance of nothing + /obj/structure/grille = 8, /obj/structure/grille/broken = 1, ) @@ -173,6 +175,7 @@ /obj/effect/spawner/random/structure/barricade name = "barricade spawner" icon_state = "barricade" + spawn_loot_chance = 80 loot = list( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/crude,