From 225b2ad03e3ae8171d79be6ec4849e5583b9301e Mon Sep 17 00:00:00 2001 From: Miniature Date: Tue, 10 Jan 2012 10:56:58 +1030 Subject: [PATCH] fix runtimes in disposals pipes and seed making for a plant whoever coded those parts should be shot --- code/defines/obj/hydro.dm | 2 +- code/modules/recycling/disposal.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 9a85cb59cb9..dbb26d4de1f 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -1139,7 +1139,7 @@ bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris - seed = "/obj/item/seeds/ambrosiavulgaris" + seed = "/obj/item/seeds/ambrosiavulgarisseed" name = "Ambrosia Vulgaris" desc = "A plant containing various healing chemicals." icon_state = "ambrosiavulgaris" diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index d416122e9cf..0535a5f6aed 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -688,7 +688,7 @@ M.weakened += 4 M << "\red You're gonna remember that one in the morning!" M:UpdateDamageIcon() - M:UpdateDamage() + //M:UpdateDamage() //doesnt fucking exist if you arent a blob else M.bruteloss += 4 if(prob(2)) @@ -742,7 +742,7 @@ H.active = 0 H.loc = src return - if(T.intact && istype(T,/turf/simulated/floor)) //intact floor, pop the tile + if(istype(T,/turf/simulated/floor) && T.intact) //intact floor, pop the tile var/turf/simulated/floor/F = T //F.health = 100 F.burnt = 1