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

god damn bitflags ARGH

Browse Source
This commit is contained in:
Thalpy
2019-11-21 20:30:49 +00:00
parent db74091dd4
commit 7b17bf2acd
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/scanners.dm
+9 -9
View File
@@ -226,7 +226,7 @@ SLIME SCANNER
//BRAIN //BRAIN
else if(istype(O, /obj/item/organ/brain)) else if(istype(O, /obj/item/organ/brain))
if (C.getOrganLoss(ORGAN_SLOT_BRAIN) >= 200) if (C.getOrganLoss(ORGAN_SLOT_BRAIN) >= 200)
damage_message += " <span class='alert'>Subject's brain function is non-existent. Neurine injection recomended.</span>" damage_message += " <span class='alert'>Subject's brain non-functional. Neurine injection recomended.</span>"
else if (C.getOrganLoss(ORGAN_SLOT_BRAIN) >= 120) else if (C.getOrganLoss(ORGAN_SLOT_BRAIN) >= 120)
damage_message += " <span class='alert'>Severe brain damage detected. Subject likely to have mental traumas.</span>" damage_message += " <span class='alert'>Severe brain damage detected. Subject likely to have mental traumas.</span>"
else if (C.getOrganLoss(ORGAN_SLOT_BRAIN) >= 45) else if (C.getOrganLoss(ORGAN_SLOT_BRAIN) >= 45)
@@ -314,7 +314,7 @@ SLIME SCANNER
damage_message += " <font color='red'>Acute [O.name] failure detected.</span>" damage_message += " <font color='red'>Acute [O.name] failure detected.</span>"
if(temp_message || damage_message) if(temp_message || damage_message)
msg += "<b><span class='info'>[uppertext(O.name)]:</b></span> [damage_message] [temp_message]\n" msg += "\t<b><span class='info'>[uppertext(O.name)]:</b></span> [damage_message] [temp_message]\n"
@@ -329,19 +329,19 @@ SLIME SCANNER
var/has_liver = (!(NOLIVER in C.dna.species.species_traits)) var/has_liver = (!(NOLIVER in C.dna.species.species_traits))
var/has_stomach = (!(NOSTOMACH in C.dna.species.species_traits)) var/has_stomach = (!(NOSTOMACH in C.dna.species.species_traits))
if(!M.getorganslot(ORGAN_SLOT_EYES)) if(!M.getorganslot(ORGAN_SLOT_EYES))
msg += "\t<span class='alert'>Subject does not have eyes.</span>\n" msg += "\t<span class='alert'><b>Subject does not have eyes.</b></span>\n"
if(!M.getorganslot(ORGAN_SLOT_EARS)) if(!M.getorganslot(ORGAN_SLOT_EARS))
msg += "\t<span class='alert'>Subject does not have ears.</span>\n" msg += "\t<span class='alert'><b>Subject does not have ears.</b></span>\n"
if(!M.getorganslot(ORGAN_SLOT_BRAIN)) if(!M.getorganslot(ORGAN_SLOT_BRAIN))
msg += "\t<span class='alert'>Subject's brain function is non-existent!</span>\n" msg += "\t<span class='alert'><b>Subject's brain function is non-existent!</b></span>\n"
if(has_liver && !M.getorganslot(ORGAN_SLOT_LIVER)) if(has_liver && !M.getorganslot(ORGAN_SLOT_LIVER))
msg += "\t<span class='alert'>Subject's liver is missing!/span>\n" msg += "\t<span class='alert'><b>Subject's liver is missing!</b></span>\n"
if(blooded && !M.getorganslot(ORGAN_SLOT_HEART)) if(blooded && !M.getorganslot(ORGAN_SLOT_HEART))
msg += "\t<span class='alert'>Subject's heart is missing!</span>\n" msg += "\t<span class='alert'><b>Subject's heart is missing!</b></span>\n"
if(breathes && !M.getorganslot(ORGAN_SLOT_LUNGS)) if(breathes && !M.getorganslot(ORGAN_SLOT_LUNGS))
msg += "\t<span class='alert'>Subject's lungs have collapsed from trauma!</span>\n" msg += "\t<span class='alert'><b>Subject's lungs have collapsed from trauma!</b></span>\n"
if(has_stomach && !M.getorganslot(ORGAN_SLOT_STOMACH)) if(has_stomach && !M.getorganslot(ORGAN_SLOT_STOMACH))
msg += "\t<span class='alert'>Subject's stomach is missing!</span>\n" msg += "\t<span class='alert'><b>Subject's stomach is missing!</span>\n"
if(M.radiation) if(M.radiation)
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+4 -3
View File
@@ -940,11 +940,11 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
description = "Reacts with neural tissue, helping reform damaged connections. Can cure minor traumas." description = "Reacts with neural tissue, helping reform damaged connections. Can cure minor traumas."
color = "#EEFF8F" color = "#EEFF8F"
/datum/reagent/neurine/reaction_mob(mob/living/M, method=TOUCH, reac_volume) /datum/reagent/medicine/neurine/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(method != INJECT) if(!(method == INJECT))
return return
var/obj/item/organ/brain/B = M.getorganslot(ORGAN_SLOT_BRAIN) var/obj/item/organ/brain/B = M.getorganslot(ORGAN_SLOT_BRAIN)
if(!B || !(B.organ_flags & ORGAN_FAILING)) if(!B || (B.organ_flags & ORGAN_FAILING))
return return
B.applyOrganDamage(-20) B.applyOrganDamage(-20)
if(prob(80)) if(prob(80))
@@ -953,6 +953,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
B.gain_trauma_type(BRAIN_TRAUMA_SEVERE) B.gain_trauma_type(BRAIN_TRAUMA_SEVERE)
else else
B.gain_trauma_type(BRAIN_TRAUMA_SPECIAL) B.gain_trauma_type(BRAIN_TRAUMA_SPECIAL)
message_admins("Trauma'd")
/datum/reagent/medicine/neurine/on_mob_life(mob/living/carbon/C) /datum/reagent/medicine/neurine/on_mob_life(mob/living/carbon/C)
if(holder.has_reagent("neurotoxin")) if(holder.has_reagent("neurotoxin"))
modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm
+1
View File
@@ -103,6 +103,7 @@
metabolization_rate = 0.05 //Give them time to graft metabolization_rate = 0.05 //Give them time to graft
data = list("grown_volume" = 0, "injected_vol" = 0) data = list("grown_volume" = 0, "injected_vol" = 0)
var/borrowed_health var/borrowed_health
color = "#FFDADA"
/datum/reagent/synthtissue/reaction_mob(mob/living/M, method=TOUCH, reac_volume,show_message = 1) /datum/reagent/synthtissue/reaction_mob(mob/living/M, method=TOUCH, reac_volume,show_message = 1)
if(iscarbon(M)) if(iscarbon(M))