Adjusts Species Lung Temperature Tolerances (#24509)

* Adjusts Species Temperature Tolerances

* Update code/modules/surgery/organs/organ_datums/lung_datum.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Adjusts Unathi and Ashwalker to match #23325

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
LtDiggs
2024-03-18 17:53:04 +00:00
committed by GitHub
co-authored by Henri215
parent df29a55f54
commit 6f632040aa
5 changed files with 49 additions and 11 deletions
+2 -2
View File
@@ -77,7 +77,7 @@
name = "[dna.real_name]'s [initial(name)]"
if(!owner) return ..() // Probably a redundant removal; just bail
if(is_species(owner, /datum/species/monkey))
name = "[owner.name]'s [initial(name)]"
@@ -201,7 +201,7 @@
icon = 'icons/mob/slimes.dmi'
icon_state = "green slime extract"
mmi_icon_state = "slime_mmi"
organ_datums = list(/datum/organ/heart, /datum/organ/lungs)
organ_datums = list(/datum/organ/heart, /datum/organ/lungs/slime)
/obj/item/organ/internal/brain/golem
name = "Runic mind"
+11
View File
@@ -27,10 +27,21 @@
organ_datums = list(/datum/organ/lungs/vox)
/obj/item/organ/internal/lungs/drask
name = "drask lungs"
icon = 'icons/obj/species_organs/drask.dmi'
organ_datums = list(/datum/organ/lungs/drask)
/obj/item/organ/internal/lungs/tajaran
name = "tajaran lungs"
icon = 'icons/obj/species_organs/tajaran.dmi'
organ_datums = list(/datum/organ/lungs/tajaran)
/obj/item/organ/internal/lungs/unathi
name = "unathi lungs"
icon = 'icons/obj/species_organs/unathi.dmi'
organ_datums = list(/datum/organ/lungs/unathi)
/obj/item/organ/internal/lungs/cybernetic
name = "cybernetic lungs"
desc = "A cybernetic version of the lungs found in traditional humanoid entities. It functions the same as an organic lung and is merely meant as a replacement."
@@ -40,7 +40,7 @@
var/hot_message = "your face burning and a searing heat"
var/heat_level_1_threshold = 360
var/heat_level_2_threshold = 400
var/heat_level_3_threshold = 1000
var/heat_level_3_threshold = 460
var/heat_level_1_damage = HEAT_GAS_DAMAGE_LEVEL_1
var/heat_level_2_damage = HEAT_GAS_DAMAGE_LEVEL_2
var/heat_level_3_damage = HEAT_GAS_DAMAGE_LEVEL_3
@@ -329,12 +329,47 @@
cold_level_3_damage = -COLD_GAS_DAMAGE_LEVEL_3
cold_damage_types = list(BRUTE = 0.5, BURN = 0.25)
heat_level_1_threshold = 310
heat_level_2_threshold = 340
heat_level_3_threshold = 400
/datum/organ/lungs/tajaran
cold_level_1_threshold = 240
cold_level_2_threshold = 180
cold_level_3_threshold = 100
heat_level_1_threshold = 340
heat_level_2_threshold = 380
heat_level_3_threshold = 440
/datum/organ/lungs/unathi
cold_level_1_threshold = 280
cold_level_2_threshold = 220
cold_level_3_threshold = 140
heat_level_1_threshold = 505
heat_level_2_threshold = 540
heat_level_3_threshold = 600
/datum/organ/lungs/ashwalker
safe_oxygen_min = 4 // 4x as efficient as regular Unathi, can comfortably breathe on lavaland
heat_level_1_threshold = 505
heat_level_2_threshold = 540
heat_level_3_threshold = 600
cold_level_1_threshold = 280
cold_level_2_threshold = 220
cold_level_3_threshold = 140
heat_level_1_threshold = 505
heat_level_2_threshold = 540
heat_level_3_threshold = 600
/datum/organ/lungs/slime
cold_level_1_threshold = 280
cold_level_2_threshold = 240
cold_level_3_threshold = 200
/datum/organ/lungs/advanced_cyber/New(obj/item/organ/internal/link_em)
. = ..()
make_advanced()
@@ -27,10 +27,6 @@
mmi_icon = 'icons/obj/species_organs/tajaran.dmi'
mmi_icon_state = "mmi_full"
/obj/item/organ/internal/lungs/tajaran
name = "tajaran lungs"
icon = 'icons/obj/species_organs/tajaran.dmi'
/obj/item/organ/internal/kidneys/tajaran
name = "tajaran kidneys"
icon = 'icons/obj/species_organs/tajaran.dmi'
@@ -21,10 +21,6 @@
mmi_icon = 'icons/obj/species_organs/unathi.dmi'
mmi_icon_state = "mmi_full"
/obj/item/organ/internal/lungs/unathi
name = "unathi lungs"
icon = 'icons/obj/species_organs/unathi.dmi'
/obj/item/organ/internal/kidneys/unathi
name = "unathi kidneys"
icon = 'icons/obj/species_organs/unathi.dmi'