cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-28 01:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12692 from VOREStation/upstream-merge-8505

Browse Source 
[MIRROR] Spiderlings die if they have 0 health
This commit is contained in:
Casey
2022-04-11 15:26:27 -04:00
committed by GitHub
parent 31690e77ba 16be8817ea
commit f7a9906893
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/game/objects/effects/spiders.dm
View File

@@ -57,9 +57,12 @@
health -= Proj.get_structure_damage()
healthcheck()
/obj/effect/spider/proc/die()
qdel(src)
/obj/effect/spider/proc/healthcheck()
if(health <= 0)
qdel(src)
die()
/obj/effect/spider/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 300 + T0C)
@@ -148,7 +151,7 @@
layer = HIDING_LAYER
health = 3
var/last_itch = 0
var/amount_grown = -1
var/amount_grown = 0
var/obj/machinery/atmospherics/unary/vent_pump/entry_vent
var/travelling_in_vent = 0
var/list/grow_as = list(/mob/living/simple_mob/animal/giant_spider, /mob/living/simple_mob/animal/giant_spider/nurse, /mob/living/simple_mob/animal/giant_spider/hunter)
@@ -187,16 +190,17 @@
else
..()
/obj/effect/spider/spiderling/proc/die()
/obj/effect/spider/spiderling/die()
visible_message("<span class='alert'>[src] dies!</span>")
new /obj/effect/decal/cleanable/spiderling_remains(src.loc)
qdel(src)
..()
/obj/effect/spider/spiderling/healthcheck()
if(health <= 0)
die()
/obj/effect/spider/spiderling/process()
healthcheck()
if(travelling_in_vent)
if(istype(src.loc, /turf))
travelling_in_vent = 0