diff --git a/code/game/dna/mutations/mutation_powers.dm b/code/game/dna/mutations/mutation_powers.dm index 0df8ee7db8c..7cc46cb92bc 100644 --- a/code/game/dna/mutations/mutation_powers.dm +++ b/code/game/dna/mutations/mutation_powers.dm @@ -509,7 +509,7 @@ if(user.restrained())//Why being pulled while cuffed prevents you from moving for(var/mob/living/M in range(user, 1)) if(M.pulling == user) - if(!M.restrained() && M.stat == 0 && !(M.mobility_flags & MOBILITY_STAND) && user.Adjacent(M)) + if(!M.restrained() && M.stat == CONSCIOUS && !(M.mobility_flags & MOBILITY_STAND) && user.Adjacent(M)) failure = TRUE else M.stop_pulling() diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 896ecf85717..9261b150e9d 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -317,7 +317,7 @@ if("VICTIM") var/mob/living/carbon/human/T = target - if(T.stat == 0) + if(T.stat == CONSCIOUS) to_chat(user, "Capture failed! Kill or maim the victim first!") else if(!length(T.client_mobs_in_contents)) diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index f090c33faf0..cb5cf0a9046 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -105,7 +105,7 @@ if(output) var/temp = "" if(patient) - temp = "
\[Occupant: [patient] ([patient.stat > 1 ? "*DECEASED*" : "Health: [patient.health]%"])\]
View stats|Eject" + temp = "
\[Occupant: [patient] ([patient.stat == DEAD ? "*DECEASED*" : "Health: [patient.health]%"])\]
View stats|Eject" return "[output] [temp]" /obj/item/mecha_parts/mecha_equipment/medical/sleeper/Topic(href,href_list) @@ -161,7 +161,7 @@ t1 = "*dead*" else t1 = "Unknown" - return {"Health: [patient.stat > 1 ? "[t1]" : "[patient.health]% ([t1])"]
+ return {"Health: [patient.stat == DEAD ? "[t1]" : "[patient.health]% ([t1])"]
Core Temperature: [patient.bodytemperature-T0C]°C ([patient.bodytemperature*1.8-459.67]°F)
Brute Damage: [patient.getBruteLoss()]%
Respiratory Damage: [patient.getOxyLoss()]%
diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm index b00cd44314b..188a9a8c399 100644 --- a/code/game/mecha/mecha_topic.dm +++ b/code/game/mecha/mecha_topic.dm @@ -250,7 +250,7 @@ return if(href_list["close"]) return - if(usr.stat > 0) + if(usr.stat != CONSCIOUS) return var/datum/topic_input/afilter = new /datum/topic_input(href,href_list) if(href_list["select_equip"]) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 906ac9501ac..3260884c7f3 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -429,7 +429,7 @@ SLIME SCANNER if("robot") var/burn = M.getFireLoss() > 50 ? "[M.getFireLoss()]" : M.getFireLoss() var/brute = M.getBruteLoss() > 50 ? "[M.getBruteLoss()]" : M.getBruteLoss() - msgs += "Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health]% functional"]" + msgs += "Analyzing Results for [M]:\n\t Overall Status: [M.stat == DEAD ? "fully disabled" : "[M.health]% functional"]" msgs += "\t Key: Electronics/Brute" msgs += "\t Damage Specifics: [burn] - [brute]" if(M.timeofdeath && M.stat == DEAD) @@ -460,7 +460,7 @@ SLIME SCANNER if("prosthetics") var/mob/living/carbon/human/H = M var/is_ipc = ismachineperson(H) - msgs += "Analyzing Results for [M]: [is_ipc ? "\n\t Overall Status: [H.stat > 1 ? "fully disabled" : "[H.health]% functional"]
" : "
"]" //for the record im sorry + msgs += "Analyzing Results for [M]: [is_ipc ? "\n\t Overall Status: [H.stat == DEAD ? "fully disabled" : "[H.health]% functional"]
" : "
"]" //for the record im sorry msgs += "\t Key: Electronics/Brute" msgs += "External prosthetics:" var/organ_found @@ -502,7 +502,7 @@ SLIME SCANNER var/mob/living/silicon/ai/A = M var/burn = A.getFireLoss() > 50 ? "[A.getFireLoss()]" : A.getFireLoss() var/brute = A.getBruteLoss() > 50 ? "[A.getBruteLoss()]" : A.getBruteLoss() - msgs += "Analyzing Results for [M]:\n\t Overall Status: [A.stat > 1 ? "fully disabled" : "[A.health]% functional"]" + msgs += "Analyzing Results for [M]:\n\t Overall Status: [A.stat == DEAD ? "fully disabled" : "[A.health]% functional"]" msgs += "\t Key: Electronics/Brute" msgs += "\t Damage Specifics: [burn] - [brute]" diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm index 7fdbbfbde7e..753b398e6a3 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm @@ -99,7 +99,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers) if(ishuman(grabbed)) var/mob/living/carbon/human/target = grabbed if(issmall(target)) - if(target.stat == 0) + if(target.stat == CONSCIOUS) to_chat(user, "The monkey is struggling far too much to put it in the recycler.") else user.drop_item() diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ai.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ai.dm index 5134355baf4..63f606f8293 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ai.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ai.dm @@ -77,7 +77,7 @@ /mob/living/simple_animal/hostile/poison/terror_spider/LoseTarget() if(target && isliving(target)) var/mob/living/T = target - if(T.stat > 0) + if(T.stat != CONSCIOUS) killcount++ regen_points += regen_points_per_kill attackstep = 0 diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 98d0832d2f1..8021539dcbf 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -207,7 +207,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist) var/n_name = tgui_input_text(usr, "What would you like to label the fax?", "Fax Labelling", copyitem.name) if(!n_name) return - if(copyitem && copyitem.loc == src && usr.stat == 0) + if(copyitem && copyitem.loc == src && usr.stat == CONSCIOUS) if(istype(copyitem, /obj/item/paper)) copyitem.name = "[(n_name ? "[n_name]" : initial(copyitem.name))]" copyitem.desc = "This is a paper titled '" + copyitem.name + "'." diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 77ea69bf8ca..f151998b1f7 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -45,7 +45,7 @@ if(!txt) return txt = copytext(txt, 1, 128) - if(loc == user && user.stat == 0) + if(loc == user && user.stat == CONSCIOUS) scribble = txt else if(P.get_heat()) burnphoto(P, user)