From b678bcf8ebe8b07ee8fd68300f774a3c34b3a3ac Mon Sep 17 00:00:00 2001
From: vuonojenmustaturska <naksu@youzen.ext.b2.fi>
Date: Wed, 7 Feb 2018 13:39:48 +0200
Subject: [PATCH 1/2] Merge pull request #35258 from kevinz000/patch-441

Explosive holoparasites must now be adjacent to turn objects into bombs
---
 .../mob/living/simple_animal/guardian/types/explosive.dm      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
index 54ef51ad5a..c2595279ff 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
@@ -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>")