cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-27 10:32:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hotfix for some disarming runtimes, from BubbleWrap.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3003 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-01-28 20:49:57 +00:00
parent d85fc1c604
commit 914acd8931
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/modules/mob/living/carbon/human/human_attackhand.dm
View File

@@ -123,29 +123,29 @@
if(randn <= 60)
//BubbleWrap: Disarming breaks a pull
if ( pulling )
if(pulling)
visible_message("\red <b>[M] has broken [src]'s grip on [pulling]!</B>")
talked = 1
pulling = null
//BubbleWrap: Disarming also breaks a grab - this will also stop someone being choked, won't it?
var/obj/item/weapon/grab/lgrab = l_hand
var/obj/item/weapon/grab/rgrab = r_hand
if ( lgrab )
if ( lgrab.affecting )
if(istype(l_hand, /obj/item/weapon/grab))
var/obj/item/weapon/grab/lgrab = l_hand
if(lgrab.affecting)
visible_message("\red <b>[M] has broken [src]'s grip on [lgrab.affecting]!</B>")
talked = 1
spawn(1)
del(lgrab)
if ( rgrab )
if ( rgrab.affecting )
if(istype(r_hand, /obj/item/weapon/grab))
var/obj/item/weapon/grab/rgrab = r_hand
if(rgrab.affecting)
visible_message("\red <b>[M] has broken [src]'s grip on [rgrab.affecting]!</B>")
talked = 1
spawn(1)
del(rgrab)
//End BubbleWrap
if( !talked ) //BubbleWrap
if(!talked) //BubbleWrap
drop_item()
visible_message("\red <B>[M] has disarmed [src]!</B>")
playsound(loc, 'thudswoosh.ogg', 50, 1, -1)