From 46ad005b50158317ff2249046e0f7701daa913ae Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 2 May 2015 21:39:24 +0200 Subject: [PATCH] Adds two missing pooling instances and corrects broken grilles health status. --- code/game/objects/structures/grille.dm | 4 ++-- code/game/objects/structures/lattice.dm | 2 +- code/modules/research/xenoarchaeology/finds/finds.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 28036840c8e..f035069d8ab 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -228,8 +228,8 @@ density = 0 New() ..() - health -= rand(initial(health)*0.8, initial(health)*0.9) //Largely under broken threshold, this is used to adjust the health, NOT to break it - healthcheck() //Send this to healthcheck just in case we want to do something else with it + health = rand(-5, -1) //In the destroyed but not utterly threshold. + healthcheck() //Send this to healthcheck just in case we want to do something else with it. /obj/structure/grille/cult name = "cult grille" diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 788a6711f0e..078f4bc06bc 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -61,7 +61,7 @@ var/obj/item/weapon/weldingtool/WT = C if(WT.remove_fuel(0, user)) user << "\blue Slicing lattice joints ..." - new /obj/item/stack/rods(src.loc) + PoolOrNew(/obj/item/stack/rods, src.loc) qdel(src) return diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm index 5855ee7d735..521da5e4aad 100644 --- a/code/modules/research/xenoarchaeology/finds/finds.dm +++ b/code/modules/research/xenoarchaeology/finds/finds.dm @@ -323,7 +323,7 @@ apply_material_decorations = 0 if(23) apply_prefix = 0 - new_item = new /obj/item/stack/rods(src.loc) + new_item = PoolOrNew(/obj/item/stack/rods, src.loc) apply_image_decorations = 0 apply_material_decorations = 0 if(24)