cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 04:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Less obvious, obvious things after freeze.

Browse Source
This commit is contained in:
Nerd Lord
2016-01-13 16:44:13 -05:00
parent a99b39f18b
commit 33ece2fd29
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/guardian/guardian.dm
+1 -3
View File
@@ -60,7 +60,6 @@
visible_message("<span class='danger'>The [src] jumps back to its user.</span>")
PoolOrNew(/obj/effect/overlay/temp/guardian/phase/out, get_turf(src))
loc = get_turf(summoner)
PoolOrNew(/obj/effect/overlay/temp/guardian/phase, loc)
/mob/living/simple_animal/hostile/guardian/Move() //Returns to summoner if they move out of range
..()
@@ -72,7 +71,6 @@
visible_message("<span class='danger'>The [src] jumps back to its user.</span>")
PoolOrNew(/obj/effect/overlay/temp/guardian/phase/out, get_turf(src))
loc = get_turf(summoner)
PoolOrNew(/obj/effect/overlay/temp/guardian/phase, loc)
/mob/living/simple_animal/hostile/guardian/canSuicide()
return 0
@@ -118,7 +116,6 @@
return
if(loc == summoner)
loc = get_turf(summoner)
PoolOrNew(/obj/effect/overlay/temp/guardian/phase, loc)
cooldown = world.time + 30
/mob/living/simple_animal/hostile/guardian/proc/Recall()
@@ -392,6 +389,7 @@
if((pressure > 20) && (pressure < 550))
PoolOrNew(/obj/effect/overlay/temp/guardian/phase/out, get_turf(A))
do_teleport(A, beacon, 0)
PoolOrNew(/obj/effect/overlay/temp/guardian/phase, get_turf(A))
else
src << "<span class='danger'><B>The beacon isn't in a safe location!</span></B>"
else