cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes species not respecting total_health (#9214)

Browse Source
This commit is contained in:
Matt Atlas
2020-06-27 16:36:11 +02:00
committed by GitHub
parent 01bf879064
commit 338c1cbe70
7 changed files with 49 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/outsider/shadow.dm
+1 -1
View File
@@ -114,6 +114,6 @@
return "grue"
/datum/species/shadow/handle_death_check(var/mob/living/carbon/human/H)
if(H.get_total_health() <= config.health_threshold_dead)
if(H.get_total_health() <= total_health)
return TRUE
return FALSE
code/modules/mob/living/carbon/human/species/outsider/undead.dm
+3 -3
View File
@@ -18,7 +18,7 @@
deform = 'icons/mob/human_races/r_skeleton.dmi'
eyes = "blank_eyes"
total_health = 70 //gotta get headshots to kill them, so they're frail
total_health = 100 //skeletons are frail
default_language = LANGUAGE_TCB
language = LANGUAGE_CULT
@@ -92,7 +92,7 @@
hud_type = /datum/hud_data/construct
/datum/species/skeleton/handle_death_check(var/mob/living/carbon/human/H)
if(H.get_total_health() <= config.health_threshold_dead)
if(H.get_total_health() <= total_health)
return TRUE
return FALSE
@@ -146,7 +146,7 @@
qdel(H)
/datum/species/apparition/handle_death_check(var/mob/living/carbon/human/H)
if(H.get_total_health() <= config.health_threshold_dead)
if(H.get_total_health() <= total_health)
return TRUE
return FALSE
code/modules/mob/living/carbon/human/species/station/diona/diona.dm
+1 -1
View File
@@ -184,7 +184,7 @@
return current_flags
/datum/species/diona/handle_death_check(var/mob/living/carbon/human/H)
if(H.get_total_health() <= config.health_threshold_dead)
if(H.get_total_health() <= total_health)
return TRUE
return FALSE
code/modules/mob/living/carbon/human/species/station/golem.dm
+1 -1
View File
@@ -119,7 +119,7 @@ var/global/list/golem_types = list("Coal Golem",
qdel(H)
/datum/species/golem/handle_death_check(var/mob/living/carbon/human/H)
if(H.get_total_health() <= config.health_threshold_dead)
if(H.get_total_health() <= total_health)
return TRUE
return FALSE
code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm
+1 -1
View File
@@ -298,7 +298,7 @@ datum/species/machine/handle_post_spawn(var/mob/living/carbon/human/H)
check_tag(H, H.client)
/datum/species/machine/handle_death_check(var/mob/living/carbon/human/H)
if(H.get_total_health() <= config.health_threshold_dead)
if(H.get_total_health() <= total_health)
return TRUE
return FALSE