cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #3191 cyborgs could not combine stackables anymore.

Browse Source
This commit is contained in:
D3athrow
2015-02-23 13:38:09 -06:00
parent a790bae643
commit 2b75aadeef
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
code/_onclick/cyborg.dm
View File

@@ -67,14 +67,19 @@
// 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))
// No adjacency checks
delayNextAttack(8)
/*if(W.flags&USEDELAY)
next_move += 5
*/
var/resolved = A.attackby(W,src)
if(!resolved && A && W)
W.afterattack(A,src,1,params)
var/resolved = W.preattack(A, src, 1, params)
if(!resolved)
resolved = A.attackby(W,src)
if(ismob(A) || istype(A, /obj/mecha) || istype(W, /obj/item/weapon/grab))
delayNextAttack(10)
if(!resolved && A && W)
W.afterattack(A,src,1,params) // 1 indicates adjacency
else
delayNextAttack(10)
return
@@ -86,10 +91,15 @@
if(W.flags&USEDELAY)
next_move += 5
*/
var/resolved = A.attackby(W, src)
if(!resolved && A && W)
W.afterattack(A, src, 1, params)
var/resolved = W.preattack(A, src, 1, params)
if(!resolved)
resolved = A.attackby(W,src)
if(ismob(A) || istype(A, /obj/mecha))
delayNextAttack(10)
if(!resolved && A && W)
W.afterattack(A,src,1,params) // 1 indicates adjacency
else
delayNextAttack(10)
return
else
//next_move = world.time + 10