shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Why does adjustLungLoss not workkkkkkkkkkkkkkkkk

Browse Source
This commit is contained in:
Fermi
2019-05-31 03:49:25 +01:00
parent 1461f46292
commit 08e72ba05e
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/lungs.dm
+8 -7
View File
@@ -61,7 +61,8 @@
var/damage = 0
//TODO: lung health affects lung function
/obj/item/organ/lungs/proc/adjustLungLoss(mob/living/carbon/M, damage_mod)
/obj/item/organ/lungs/proc/adjustLungLoss(damage_mod, mob/living/carbon/M)
message_admins("lung damage: [damage_mod], damage: [damage]")
if (maxHealth == "plasma")
return
if(damage+damage_mod < 0)
@@ -405,13 +406,13 @@
var/cold_modifier = H.dna.species.coldmod
if(breath_temperature < cold_level_3_threshold)
H.apply_damage_type(cold_level_3_damage*cold_modifier, cold_damage_type)
adjustLungLoss(cold_level_3_damage*cold_modifier)
adjustLungLoss(cold_level_3_damage*cold_modifier, H)
if(breath_temperature > cold_level_3_threshold && breath_temperature < cold_level_2_threshold)
H.apply_damage_type(cold_level_2_damage*cold_modifier, cold_damage_type)
adjustLungLoss(cold_level_2_damage*cold_modifier)
adjustLungLoss(cold_level_2_damage*cold_modifier, H)
if(breath_temperature > cold_level_2_threshold && breath_temperature < cold_level_1_threshold)
H.apply_damage_type(cold_level_1_damage*cold_modifier, cold_damage_type)
adjustLungLoss(cold_level_1_damage*cold_modifier)
adjustLungLoss(cold_level_1_damage*cold_modifier, H)
if(breath_temperature < cold_level_1_threshold)
if(prob(20))
to_chat(H, "<span class='warning'>You feel [cold_message] in your [name]!</span>")
@@ -420,13 +421,13 @@
var/heat_modifier = H.dna.species.heatmod
if(breath_temperature > heat_level_1_threshold && breath_temperature < heat_level_2_threshold)
H.apply_damage_type(heat_level_1_damage*heat_modifier, heat_damage_type)
adjustLungLoss(cold_level_1_damage*heat_modifier)
adjustLungLoss(cold_level_1_damage*heat_modifier, H)
if(breath_temperature > heat_level_2_threshold && breath_temperature < heat_level_3_threshold)
H.apply_damage_type(heat_level_2_damage*heat_modifier, heat_damage_type)
adjustLungLoss(cold_level_1_damage*heat_modifier)
adjustLungLoss(cold_level_1_damage*heat_modifier, H)
if(breath_temperature > heat_level_3_threshold)
H.apply_damage_type(heat_level_3_damage*heat_modifier, heat_damage_type)
adjustLungLoss(cold_level_1_damage*heat_modifier)
adjustLungLoss(cold_level_1_damage*heat_modifier, H)
if(breath_temperature > heat_level_1_threshold)
if(prob(20))
to_chat(H, "<span class='warning'>You feel [hot_message] in your [name]!</span>")
modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+4 -4
View File
@@ -114,10 +114,10 @@
..()
/datum/reagent/fermi/eigenstate/on_mob_delete(mob/living/M) //returns back to original location
do_sparks(5,FALSE,src)
do_sparks(5,FALSE,M)
to_chat(M, "<span class='userdanger'>You feel your wavefunction collapse!</span>")
do_teleport(M, location_return, 0, asoundin = 'sound/effects/phasein.ogg') //Teleports home
do_sparks(5,FALSE,src)
do_sparks(5,FALSE,M)
..()
/datum/reagent/fermi/eigenstate/overdose_start(mob/living/M) //Overdose, makes you teleport randomly
@@ -1373,8 +1373,8 @@ Creating a chem with a low purity will make you permanently fall in love with so
if(prob(20))
to_chat(C, "<span class='warning'>You can feel your lungs burning!</b></span>")
var/obj/item/organ/lungs/L = C.getorganslot(ORGAN_SLOT_LUNGS)
L.adjustLungLoss(acidstr)
C.apply_damage(acidstr/2, BURN, target)
L.adjustLungLoss(acidstr, C)
C.apply_damage(acidstr/3, BURN, target)
C.acid_act(acidstr, volume)
..()