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

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

Browse Source 
[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
parent 010bebb4e6 62f5e579e8
commit 9c1effc0ff
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/guardian/types/explosive.dm
+2 -2
View File
@@ -33,10 +33,10 @@
/mob/living/simple_animal/hostile/guardian/bomb/AltClickOn(atom/movable/A) /mob/living/simple_animal/hostile/guardian/bomb/AltClickOn(atom/movable/A)
if(!istype(A)) if(!istype(A))
return return
if(src.loc == summoner) if(loc == summoner)
to_chat(src, "<span class='danger'><B>You must be manifested to create bombs!</span></B>") to_chat(src, "<span class='danger'><B>You must be manifested to create bombs!</span></B>")
return return
if(isobj(A)) if(isobj(A) && Adjacent(A))
if(bomb_cooldown <= world.time && !stat) if(bomb_cooldown <= world.time && !stat)
var/obj/guardian_bomb/B = new /obj/guardian_bomb(get_turf(A)) var/obj/guardian_bomb/B = new /obj/guardian_bomb(get_turf(A))
to_chat(src, "<span class='danger'><B>Success! Bomb armed!</span></B>") to_chat(src, "<span class='danger'><B>Success! Bomb armed!</span></B>")