Merge pull request #11074 from farie82/refactor-pickup-and-fix-bomb

Refactored pickup code and fixed the bomb guardian bug
This commit is contained in:
variableundefined
2019-03-23 20:04:15 +08:00
committed by GitHub
16 changed files with 26 additions and 21 deletions
+1 -1
View File
@@ -47,4 +47,4 @@
H.reagents.add_reagent(poison_type, poison_dose)
poison_total -= poison_dose
add_attack_logs(src, user, "Picked up [src], the trapped syndicate documents")
..()
return ..()
@@ -235,7 +235,7 @@
nadeassembly.process_movement()
/obj/item/grenade/chem_grenade/pickup()
..()
. = ..()
if(nadeassembly)
nadeassembly.process_movement()
@@ -800,6 +800,7 @@
return (BRUTELOSS)
/obj/item/twohanded/pitchfork/demonic/pickup(mob/user)
. = ..()
if(istype(user, /mob/living))
var/mob/living/U = user
if(U.mind && !U.mind.devilinfo && (U.mind.soulOwner == U.mind)) //Burn hands unless they are a devil or have sold their soul