cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update worldbreaker.dm (#19392)

Browse Source
This commit is contained in:
Molti
2023-06-27 19:20:16 -05:00
committed by GitHub
parent f56118ba68
commit 71155e5ebd
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/datums/martial/worldbreaker.dm
View File

@@ -36,7 +36,7 @@
var/currentplate = 0 //how much damage the current plate has taken
/datum/martial_art/worldbreaker/can_use(mob/living/carbon/human/H)
if(H.stat == DEAD || H.IsUnconscious() || H.IsFrozen() || HAS_TRAIT(H, TRAIT_PACIFISM))
if(H.stat || H.IsFrozen() || HAS_TRAIT(H, TRAIT_PACIFISM))
return FALSE
return ispreternis(H)
@@ -48,7 +48,7 @@
/datum/martial_art/worldbreaker/proc/InterceptClickOn(mob/living/carbon/human/H, params, atom/target)
var/list/modifiers = params2list(params)
if(!(can_use(H)) || (modifiers["shift"] || modifiers["alt"] || modifiers["ctrl"]))
if(!can_use(H) || (modifiers["shift"] || modifiers["alt"] || modifiers["ctrl"]))
return
if(H.a_intent == INTENT_DISARM)
@@ -65,6 +65,7 @@
if(!H.Adjacent(target) || H==target)
return
if(H.a_intent == INTENT_HARM && isliving(target))
pummel(H,target)
if(H.a_intent == INTENT_GRAB)