cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

ok

Browse Source
This commit is contained in:
silicons
2020-07-23 08:57:15 -07:00
parent 65898bb7f6
commit 703afec454
7 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/_onclick/click.dm
View File

@@ -111,12 +111,9 @@
if(A in DirectAccess())
if(W)
. = W.melee_attack_chain(src, A, params)
if(ismob(A) && !(. & MANUALLY_HANDLE_LAST_ACTION))
DelayNextAction()
. = !(. & DISCARD_LAST_ACTION)
else
UnarmedAttack(A)
return
. = UnarmedAttack(A)? TRUE : FALSE
//Can't reach anything else in lockers or other weirdness
if(!loc.AllowClick())
@@ -126,11 +123,9 @@
if(CanReach(A,W))
if(W)
. = W.melee_attack_chain(src, A, params)
if(ismob(A) && !(. & MANUALLY_HANDLE_LAST_ACTION))
DelayNextAction()
. = !(. & DISCARD_LAST_ACTION)
else
UnarmedAttack(A, 1)
. = UnarmedAttack(A, 1)? TRUE : FALSE
else
if(W)
W.ranged_attack_chain(src, A, params)

4
code/_onclick/cyborg.dm
View File

@@ -79,8 +79,6 @@
// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents)
if(A == loc || (A in loc) || (A in contents))
. = W.melee_attack_chain(src, A, params)
if(ismob(A) && !(. & MANUALLY_HANDLE_LAST_ACTION))
DelayNextAction()
. = !(. & DISCARD_LAST_ACTION)
return
@@ -91,8 +89,6 @@
if(isturf(A) || isturf(A.loc))
if(A.Adjacent(src)) // see adjacent.dm
. = W.melee_attack_chain(src, A, params)
if(ismob(A) && !(. & MANUALLY_HANDLE_LAST_ACTION))
DelayNextAction()
. = !(. & DISCARD_LAST_ACTION)
return
else

8
code/_onclick/right_click.dm
View File

@@ -37,12 +37,10 @@
if(A in DirectAccess())
if(W)
. = W.rightclick_melee_attack_chain(src, A, params)
if(ismob(A) && !(. & MANUALLY_HANDLE_LAST_ACTION))
DelayNextAction()
. = !(. & DISCARD_LAST_ACTION)
else
if(!AltUnarmedAttack(A))
UnarmedAttack(A)
. = UnarmedAttack(A, 1)? TRUE : FALSE
return
//Can't reach anything else in lockers or other weirdness
@@ -53,12 +51,10 @@
if(CanReach(A,W))
if(W)
. = W.rightclick_melee_attack_chain(src, A, params)
if(ismob(A) && !(. & MANUALLY_HANDLE_LAST_ACTION))
DelayNextAction()
. = !(. & DISCARD_LAST_ACTION)
else
if(!AltUnarmedAttack(A,1))
UnarmedAttack(A,1)
. = UnarmedAttack(A, 1)? TRUE : FALSE
else
if(W)
if(!W.altafterattack(A, src, FALSE, params))