shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Stunbaton disarm mode also works on disarm intent now" (#11446)

Browse Source
This commit is contained in:
kevinz000
2020-03-14 23:14:57 +01:00
committed by GitHub
parent cda2ace252
commit e73e1b03ec
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stunbaton.dm
+1 -3
View File
@@ -25,7 +25,7 @@
/obj/item/melee/baton/examine(mob/user) /obj/item/melee/baton/examine(mob/user)
. = ..() . = ..()
. += "<span class='notice'>Right click attack while in combat mode or attack while in disarm intent to disarm instead of stun.</span>" . += "<span class='notice'>Right click attack while in combat mode to disarm instead of stun.</span>"
/obj/item/melee/baton/get_cell() /obj/item/melee/baton/get_cell()
. = cell . = cell
@@ -149,8 +149,6 @@
//return TRUE to interrupt attack chain. //return TRUE to interrupt attack chain.
/obj/item/melee/baton/proc/common_baton_melee(mob/M, mob/living/user, disarming = FALSE) /obj/item/melee/baton/proc/common_baton_melee(mob/M, mob/living/user, disarming = FALSE)
if(user.a_intent == INTENT_DISARM)
disarming = TRUE //override if they're in disarm intent.
if(iscyborg(M) || !isliving(M)) //can't baton cyborgs if(iscyborg(M) || !isliving(M)) //can't baton cyborgs
return FALSE return FALSE
if(status && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) if(status && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))