Merge pull request #17527 from ChangelingRain/glowyhealything

Adds healy glows to cult pylons and the medbeam gun
This commit is contained in:
Jordie
2016-05-11 22:51:22 +10:00
3 changed files with 16 additions and 11 deletions
+11 -10
View File
@@ -100,16 +100,17 @@
if((last_shot + heal_delay) <= world.time)
last_shot = world.time
for(var/mob/living/L in range(5, src))
if(iscultist(L))
var/mob/living/carbon/human/H = L
if(istype(H))
L.adjustBruteLoss(-1, 0)
L.adjustFireLoss(-1, 0)
L.updatehealth()
if(istype(L, /mob/living/simple_animal/hostile/construct))
var/mob/living/simple_animal/M = L
if(M.health < M.maxHealth)
M.adjustHealth(-2)
if(iscultist(L) || istype(L, /mob/living/simple_animal/shade) || istype(L, /mob/living/simple_animal/hostile/construct))
if(L.health != L.maxHealth)
PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(src), "#960000"))
if(ishuman(L))
L.adjustBruteLoss(-1, 0)
L.adjustFireLoss(-1, 0)
L.updatehealth()
if(istype(L, /mob/living/simple_animal/shade) || istype(L, /mob/living/simple_animal/hostile/construct))
var/mob/living/simple_animal/M = L
if(M.health < M.maxHealth)
M.adjustHealth(-2)
if(corruption.len)
var/turf/T = pick_n_take(corruption)
corruption -= T
+3 -1
View File
@@ -43,10 +43,12 @@
icon_state = "heal"
duration = 15
/obj/effect/overlay/temp/heal/New()
/obj/effect/overlay/temp/heal/New(loc, colour)
..()
pixel_x = rand(-12, 12)
pixel_y = rand(-9, 0)
if(colour)
color = colour
/obj/effect/overlay/temp/explosion
name = "explosion"
+2
View File
@@ -103,6 +103,8 @@
return
/obj/item/weapon/gun/medbeam/proc/on_beam_tick(var/mob/living/target)
if(target.health != target.maxHealth)
PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(target), "#80F5FF"))
target.adjustBruteLoss(-4)
target.adjustFireLoss(-4)
return