Merge pull request #35258 from kevinz000/patch-441

Explosive holoparasites must now be adjacent to turn objects into bombs
This commit is contained in:
vuonojenmustaturska
2018-02-07 13:39:48 +02:00
committed by CitadelStationBot
parent d6f916f37b
commit b678bcf8eb
@@ -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>")