From 8f7d108831967c1841fddada0ae6c282088ebcea Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Sat, 26 Sep 2015 15:35:46 +0200 Subject: [PATCH] Ctrl+Click deflates inflatables --- code/game/objects/structures/inflatable.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index c6b108825b..ff89ef8fd0 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -40,7 +40,7 @@ /obj/structure/inflatable/bullet_act(var/obj/item/projectile/Proj) var/proj_damage = Proj.get_structure_damage() if(!proj_damage) return - + health -= proj_damage ..() if(health <= 0) @@ -85,6 +85,9 @@ if(health <= 0) deflate(1) +/obj/structure/inflatable/CtrlClick() + hand_deflate() + /obj/structure/inflatable/proc/deflate(var/violent=0) playsound(loc, 'sound/machines/hiss.ogg', 75, 1) if(violent) @@ -105,7 +108,7 @@ set category = "Object" set src in oview(1) - if(isobserver(usr)) //to stop ghosts from deflating + if(isobserver(usr) || usr.restrained() || !usr.Adjacent(src)) return verbs -= /obj/structure/inflatable/verb/hand_deflate