From e0fb2433ddfbeedab5df22a1fc0c8fdf1f0c04dc Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 10 Jul 2017 23:08:08 +0100 Subject: [PATCH] Tweaks for fox --- code/game/objects/effects/decals/contraband.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index f4071cf6ade..ae38a2b5c3f 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -86,7 +86,7 @@ ruined = initial(selected.ruined) /obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/wirecutters)) + if(iswirecutter(I)) playsound(loc, I.usesound, 100, 1) if(ruined) to_chat(user, "You remove the remnants of the poster.") @@ -152,12 +152,12 @@ return flick("poster_being_set", D) - D.loc = temp_loc + D.forceMove(temp_loc) qdel(P) //delete it now to cut down on sanity checks afterwards. Agouri's code supports rerolling it anyway playsound(D.loc, 'sound/items/poster_being_created.ogg', 100, 1) if(do_after(user, PLACE_SPEED, target = src)) - if(!exists(D)) + if(!D || qdeleted(D)) return if(iswallturf(src) && user && user.loc == temp_loc) //Let's check if everything is still there