cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed krav maga disarm not respecting NODROP. (#20975)

Browse Source 
* Fixed krav maga disarm not respecting NODROP.

* Reverted change to krav maga disarm not giving the successful disarm message if the item it was disarming did not exists.
This commit is contained in:
Cruix
2016-10-15 22:12:16 -05:00
committed by KorPhaeron
parent f14230b007
commit 573ec3f9ba
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/martial/krav_maga.dm
+2 -2
View File
@@ -132,8 +132,8 @@ datum/martial_art/krav_maga/grab_act(var/mob/living/carbon/human/A, var/mob/livi
if(prob(60))
var/obj/item/I = D.get_active_held_item()
if(I)
D.drop_item()
A.put_in_hands(I)
if(D.drop_item())
A.put_in_hands(I)
D.visible_message("<span class='danger'>[A] has disarmed [D]!</span>", \
"<span class='userdanger'>[A] has disarmed [D]!</span>")
playsound(D, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)