let's do this

This commit is contained in:
silicons
2020-07-24 23:40:24 -07:00
parent 0e1574bf77
commit 48fa617aeb
3 changed files with 28 additions and 37 deletions
+9 -11
View File
@@ -17,8 +17,7 @@
if(restrained())
DelayNextAction(CLICK_CD_HANDCUFFED)
RestrainedClickOn(A)
return TRUE
return RestrainedClickOn(A)
if(in_throw_mode)
throw_item(A)//todo: make it plausible to lightly toss items via right-click
@@ -36,14 +35,14 @@
//User itself, current loc, and user inventory
if(A in DirectAccess())
if(W)
return !(W.rightclick__melee_attack_chain(src, A, params) & DISCARD_LAST_ACTION)
return W.rightclick_melee_attack_chain(src, A, params)
else
if(!AltUnarmedAttack(A, TRUE))
. = UnarmedAttack(A, TRUE, a_intent)
if(!(. & NO_AUTO_CLICKDELAY_HANDLING) && ismob(A))
DelayNextAction(CLICK_CD_MELEE)
return (.)? TRUE : FALSE
return TRUE
return
return
//Can't reach anything else in lockers or other weirdness
if(!loc.AllowClick())
@@ -52,22 +51,21 @@
//Standard reach turf to turf or reaching inside storage
if(CanReach(A,W))
if(W)
return !(W.rightclick_melee_attack_chain(src, A, params) & DISCARD_LAST_ACTION)
return W.rightclick_melee_attack_chain(src, A, params)
else
if(!AltUnarmedAttack(A, TRUE))
. = UnarmedAttack(A, TRUE, a_intent)
if(!(. & NO_AUTO_CLICKDELAY_HANDLING) && ismob(A))
DelayNextAction(CLICK_CD_MELEE)
return (.)? TRUE : FALSE
return TRUE
return
return
else
if(W)
if(!W.altafterattack(A, src, FALSE, params))
W.afterattack(A, src, FALSE, params)
return W.afterattack(A, src, FALSE, params)
else
if(!AltRangedAttack(A, params))
return !(RangedAttack(A, params) & DISCARD_LAST_ACTION)
return TRUE
return (RangedAttack(A, params)
/mob/proc/AltUnarmedAttack(atom/A, proximity_flag)
if(ismob(A))