Merge pull request #5353 from Citadel-Station-13/upstream-merge-35258

[MIRROR] Explosive holoparasites must now be adjacent to turn objects into bombs
This commit is contained in:
deathride58
2018-02-07 19:11:14 +00:00
committed by GitHub

View File

@@ -33,10 +33,10 @@
/mob/living/simple_animal/hostile/guardian/bomb/AltClickOn(atom/movable/A)
if(!istype(A))
return
if(src.loc == summoner)
if(loc == summoner)
to_chat(src, "<span class='danger'><B>You must be manifested to create bombs!</span></B>")
return
if(isobj(A))
if(isobj(A) && Adjacent(A))
if(bomb_cooldown <= world.time && !stat)
var/obj/guardian_bomb/B = new /obj/guardian_bomb(get_turf(A))
to_chat(src, "<span class='danger'><B>Success! Bomb armed!</span></B>")