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

Merge pull request #10755 from kevinz000/attack_chain

Browse Source 
small refactor to melee_attack_chain
This commit is contained in:
Ghom
2020-02-13 09:39:07 +01:00
committed by GitHub
parent e5753b4fc0 3a655d71d4
commit bfdef7fcfd
7 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm
View File

@@ -68,8 +68,8 @@
/obj/item/clockwork/replica_fabricator/pre_attack(atom/target, mob/living/user, params)
if(!target || !user || !is_servant_of_ratvar(user) || istype(target, /obj/item/storage))
return TRUE
return fabricate(target, user)
return ..()
return !fabricate(target, user)
//A note here; return values are for if we CAN BE PUT ON A TABLE, not IF WE ARE SUCCESSFUL, unless no_table_check is TRUE
/obj/item/clockwork/replica_fabricator/proc/fabricate(atom/target, mob/living/user, silent, no_table_check)