"+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!"))
@@ -1183,8 +1181,7 @@
if(!heart_attack)
return
else
- if(losebreath < 3)
- losebreath += 2
+ AdjustLoseBreath(2, bound_lower = 0, bound_upper = 3)
adjustOxyLoss(5)
adjustBruteLoss(1)
diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm
index d8434a87223..49d6d7fe245 100644
--- a/code/modules/mob/living/carbon/human/species/plasmaman.dm
+++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm
@@ -189,7 +189,7 @@
if(SA_pp > SA_para_min) // Enough to make us paralysed for a bit
H.Paralyse(3) // 3 gives them one second to wake up and run away a bit!
if(SA_pp > SA_sleep_min) // Enough to make us sleep as well
- H.sleeping = min(H.sleeping+2, 10)
+ H.AdjustSleeping(2, bound_lower = 0, bound_upper = 10)
else if(SA_pp > 0.15) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
if(prob(20))
spawn(0)
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 9884ef74354..7b91d51261c 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -332,7 +332,7 @@
if(SA_pp > atmos_requirements["sa_para"]) // Enough to make us paralysed for a bit
H.Paralyse(3) // 3 gives them one second to wake up and run away a bit!
if(SA_pp > atmos_requirements["sa_sleep"]) // Enough to make us sleep as well
- H.sleeping = max(H.sleeping + 2, 10)
+ H.AdjustSleeping(2, bound_lower = 0, bound_upper = 10)
else if(SA_pp > 0.01) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
if(prob(20))
spawn(0)
@@ -509,7 +509,7 @@
if(tinted_weldhelh)
H.overlay_fullscreen("tint", /obj/screen/fullscreen/impaired, 2)
if(H.tinttotal >= TINT_BLIND)
- H.eye_blind = max(H.eye_blind, 1)
+ H.EyeBlind(1)
else
H.clear_fullscreen("tint")
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 985047a8284..5e0841168e0 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -49,10 +49,10 @@
var/datum/gas_mixture/breath
if(health <= config.health_threshold_crit)
- losebreath++
+ AdjustLoseBreath(1)
if(losebreath > 0)
- losebreath--
+ AdjustLoseBreath(-1)
if(prob(10))
spawn emote("gasp")
if(istype(loc, /obj/))
@@ -165,7 +165,7 @@
if(SA_partialpressure > SA_para_min)
Paralyse(3)
if(SA_partialpressure > SA_sleep_min)
- sleeping = max(sleeping+2, 10)
+ AdjustSleeping(2, bound_lower = 0, bound_upper = 10)
else if(SA_partialpressure > 0.01)
if(prob(20))
spawn(0) emote(pick("giggle","laugh"))
@@ -319,30 +319,27 @@
C.pixel_x -= pixel_x_diff
C.pixel_y -= pixel_y_diff
src = oldsrc
- dizziness = max(dizziness - restingpwr, 0)
+ AdjustDizzy(-restingpwr)
if(drowsyness)
- drowsyness = max(drowsyness - restingpwr, 0)
- eye_blurry = max(2, eye_blurry)
+ AdjustDrowsy(-restingpwr)
+ EyeBlurry(2)
if(prob(5))
- sleeping += 1
+ AdjustSleeping(1)
Paralyse(5)
if(confused)
- confused = max(0, confused - 1)
+ AdjustConfused(-1)
//Jitteryness
if(jitteriness)
do_jitter_animation(jitteriness)
- jitteriness = max(jitteriness - restingpwr, 0)
+ AdjustJitter(-restingpwr)
if(hallucination)
spawn handle_hallucinations()
- if(hallucination<=2)
- hallucination = 0
- else
- hallucination -= 2
+ AdjustHallucinate(-2)
/mob/living/carbon/handle_sleeping()
if(..())
@@ -352,8 +349,8 @@
spawn(0)
emote("snore")
// Keep SSD people asleep
- if(player_logged && sleeping < 2)
- sleeping = 2
+ if(player_logged)
+ Sleeping(2)
return sleeping
diff --git a/code/modules/mob/living/carbon/slime/life.dm b/code/modules/mob/living/carbon/slime/life.dm
index b51e0084ee3..6e3221c19fa 100644
--- a/code/modules/mob/living/carbon/slime/life.dm
+++ b/code/modules/mob/living/carbon/slime/life.dm
@@ -208,25 +208,25 @@
if(src.stuttering) src.stuttering = 0
if(src.eye_blind)
- src.eye_blind = 0
+ src.SetEyeBlind(0)
src.blinded = 1
- if(src.ear_deaf > 0) src.ear_deaf = 0
+ if(src.ear_deaf > 0) SetEarDeaf(0)
if(src.ear_damage < 25)
- src.ear_damage = 0
+ SetEarDamage(0)
src.density = !( src.lying )
if(src.disabilities & BLIND)
src.blinded = 1
if(src.disabilities & DEAF)
- src.ear_deaf = 1
+ EarDeaf(1)
if(src.eye_blurry > 0)
- src.eye_blurry = 0
+ SetEyeBlurry(0)
if(src.druggy > 0)
- src.druggy = 0
+ SetDruggy(0)
return 1
diff --git a/code/modules/mob/living/carbon/update_status.dm b/code/modules/mob/living/carbon/update_status.dm
new file mode 100644
index 00000000000..3b0d3a045fc
--- /dev/null
+++ b/code/modules/mob/living/carbon/update_status.dm
@@ -0,0 +1,17 @@
+/mob/living/carbon/update_stat()
+ if(status_flags & GODMODE)
+ return
+ if(stat != DEAD)
+// if(health <= min_health)
+ if(health <= config.health_threshold_dead)
+ death()
+ return
+// if(paralysis || sleeping || getOxyLoss() > low_oxy_ko || (status_flags & FAKEDEATH) || health <= crit_health)
+ if(paralysis || sleeping || getOxyLoss() > 50 || (status_flags & FAKEDEATH) || health <= config.health_threshold_crit)
+ if(stat == CONSCIOUS)
+ KnockOut()
+ else
+ if(stat == UNCONSCIOUS)
+ // updating=FALSE because `WakeUp` will handle canmove up for us
+ StopResting(updating=FALSE)
+ WakeUp()
diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index 921080c989a..ffd1fb9cd60 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -57,17 +57,16 @@
rad_damage = max(effect * ((100-run_armor_check(null, "rad", "Your clothes feel warm.", "Your clothes feel warm."))/100),0)
radiation += rad_damage
if(SLUR)
- slurring = max(slurring,(effect * blocked))
+ Slur(effect * blocked)
if(STUTTER)
- if(status_flags & CANSTUN) // stun is usually associated with stutter
- stuttering = max(stuttering,(effect * blocked))
+ Stuttering(effect * blocked)
if(EYE_BLUR)
- eye_blurry = max(eye_blurry,(effect * blocked))
+ EyeBlurry(effect * blocked)
if(DROWSY)
- drowsyness = max(drowsyness,(effect * blocked))
+ Drowsy(effect * blocked)
if(JITTER)
if(status_flags & CANSTUN)
- jitteriness = max(jitteriness,(effect * blocked))
+ Jitter(effect * blocked)
updatehealth()
return 1
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index a151a062bce..308025e0204 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -136,17 +136,17 @@
/mob/living/proc/handle_silent()
if(silent)
- silent = max(silent-1, 0)
+ AdjustSilence(-1)
return silent
/mob/living/proc/handle_drugged()
if(druggy)
- druggy = max(druggy-1, 0)
+ AdjustDruggy(-1)
return druggy
/mob/living/proc/handle_slurring()
if(slurring)
- slurring = max(slurring-1, 0)
+ AdjustSlur(-1)
return slurring
/mob/living/proc/handle_paralysed()
@@ -164,7 +164,7 @@
/mob/living/proc/handle_slowed()
if(slowed)
- slowed = max(slowed-1, 0)
+ AdjustSlowed(-1)
return slowed
/mob/living/proc/handle_drunk()
@@ -175,19 +175,20 @@
/mob/living/proc/handle_disabilities()
//Eyes
if(disabilities & BLIND || stat) //blindness from disability or unconsciousness doesn't get better on its own
- eye_blind = max(eye_blind, 1)
+ EyeBlind(1)
else if(eye_blind) //blindness, heals slowly over time
- eye_blind = max(eye_blind-1,0)
+ AdjustEyeBlind(-1)
else if(eye_blurry) //blurry eyes heal slowly
- eye_blurry = max(eye_blurry-1, 0)
+ AdjustEyeBlurry(-1)
//Ears
if(disabilities & DEAF) //disabled-deaf, doesn't get better on its own
- setEarDamage(-1, max(ear_deaf, 1))
+ EarDeaf(1)
else
// deafness heals slowly over time, unless ear_damage is over 100
if(ear_damage < 100)
- adjustEarDamage(-0.05,-1)
+ AdjustEarDamage(-0.05)
+ AdjustEarDeaf(-1)
//this handles hud updates. Calls update_vision() and handle_hud_icons()
/mob/living/proc/handle_regular_hud_updates()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 72cc4789779..dd9e9f7cbd6 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -261,19 +261,6 @@
var/obj/item/organ/external/def_zone = ran_zone(t)
return def_zone
-
-//damage/heal the mob ears and adjust the deaf amount
-/mob/living/adjustEarDamage(damage, deaf)
- ear_damage = max(0, ear_damage + damage)
- ear_deaf = max(0, ear_deaf + deaf)
-
-//pass a negative argument to skip one of the variable
-/mob/living/setEarDamage(damage, deaf)
- if(damage >= 0)
- ear_damage = damage
- if(deaf >= 0)
- ear_deaf = deaf
-
// heal ONE external organ, organ gets randomly selected from damaged ones.
/mob/living/proc/heal_organ_damage(var/brute, var/burn)
adjustBruteLoss(-brute)
@@ -323,14 +310,6 @@
C.reagents.clear_reagents()
C.reagents.addiction_list.Cut()
-/mob/living/proc/update_revive() // handles revival through other means than cloning or adminbus (defib, IPC repair)
- stat = CONSCIOUS
- dead_mob_list -= src
- living_mob_list |= src
- mob_list |= src
- setEarDamage(-1,0)
- timeofdeath = 0
-
/mob/living/proc/rejuvenate()
var/mob/living/carbon/human/human_mob = null //Get this declared for use later.
@@ -344,22 +323,30 @@
SetParalysis(0)
SetStunned(0)
SetWeakened(0)
- slowed = 0
- losebreath = 0
- dizziness = 0
- jitteriness = 0
- confused = 0
- drowsyness = 0
+ SetSlowed(0)
+ SetLoseBreath(0)
+ SetDizzy(0)
+ SetJitter(0)
+ SetConfused(0)
+ SetDrowsy(0)
radiation = 0
- druggy = 0
- hallucination = 0
+ SetDruggy(0)
+ SetHallucinate(0)
+ blinded = 0
nutrition = 400
bodytemperature = 310
- disabilities = 0
- blinded = 0
- eye_blind = 0
- eye_blurry = 0
- setEarDamage(0,0)
+ CureBlind()
+ CureNearsighted()
+ CureMute()
+ CureDeaf()
+ CureTourettes()
+ CureEpilepsy()
+ CureCoughing()
+ CureNervous()
+ SetEyeBlind(0)
+ SetEyeBlurry(0)
+ SetEarDamage(0)
+ SetEarDeaf(0)
heal_overall_damage(1000, 1000)
ExtinguishMob()
fire_stacks = 0
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index c142c8d28d1..c3dab651906 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -15,8 +15,6 @@
var/brainloss = 0 //'Retardation' damage caused by someone hitting you in the head with a bible or being infected with brainrot.
var/staminaloss = 0 //Stamina damage, or exhaustion. You recover it slowly naturally, and are stunned if it gets too high. Holodeck and hallucinations deal this.
- var/hallucination = 0 //Directly affects how long a mob will hallucinate for
-
var/last_special = 0 //Used by the resist verb, likely used to prevent players from bypassing next_move by logging in/out.
@@ -32,7 +30,6 @@
var/update_slimes = 1
var/implanting = 0 //Used for the mind-slave implant
- var/silent = 0 //Can't talk. Value goes down every life proc. //NOTE TO FUTURE CODERS: DO NOT INITIALIZE NUMERICAL VARS AS NULL OR I WILL MURDER YOU.
var/floating = 0
var/mob_size = MOB_SIZE_HUMAN
var/nightvision = 0
diff --git a/code/modules/mob/living/logout.dm b/code/modules/mob/living/logout.dm
index 71e26e60858..10ba19b4302 100644
--- a/code/modules/mob/living/logout.dm
+++ b/code/modules/mob/living/logout.dm
@@ -4,6 +4,6 @@
if(!key) //key and mind have become seperated. I believe this is for when a staff member aghosts.
mind.active = 0 //This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.
//This causes instant sleep and tags a player as SSD. See life.dm for furthering SSD.
- if(sleeping < 2 && mind.active)
- sleeping = 2
- player_logged = 1
\ No newline at end of file
+ if(mind.active)
+ Sleeping(2)
+ player_logged = 1
diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm
index 8cf6863eafb..2a3b39c1c9b 100644
--- a/code/modules/mob/living/silicon/ai/say.dm
+++ b/code/modules/mob/living/silicon/ai/say.dm
@@ -82,7 +82,7 @@ var/const/VOX_PATH = "sound/vox_fem/"
for(var/mob/M in player_list)
if(M.client)
var/turf/T = get_turf(M)
- if(T && T.z == z_level && !isdeaf(M))
+ if(T && T.z == z_level && M.can_hear())
M << voice
else
only_listener << voice
diff --git a/code/modules/mob/living/silicon/ai/update_status.dm b/code/modules/mob/living/silicon/ai/update_status.dm
new file mode 100644
index 00000000000..4fa060abf39
--- /dev/null
+++ b/code/modules/mob/living/silicon/ai/update_status.dm
@@ -0,0 +1,10 @@
+/mob/living/silicon/ai/update_stat()
+ if(status_flags & GODMODE)
+ return
+ if(stat != DEAD)
+ if(health <= config.health_threshold_dead)
+ death()
+ return
+ else if(stat == UNCONSCIOUS)
+ WakeUp()
+ //diag_hud_set_status()
diff --git a/code/modules/mob/living/silicon/login.dm b/code/modules/mob/living/silicon/login.dm
index bd93fd6c3c4..01240adf942 100644
--- a/code/modules/mob/living/silicon/login.dm
+++ b/code/modules/mob/living/silicon/login.dm
@@ -1,5 +1,5 @@
/mob/living/silicon/Login()
- sleeping = 0
+ SetSleeping(0)
if(mind && ticker && ticker.mode)
ticker.mode.remove_revolutionary(mind, 1)
ticker.mode.remove_cultist(mind, 1)
@@ -9,4 +9,4 @@
ticker.mode.remove_thrall(mind, 0)
ticker.mode.remove_shadowling(mind)
ticker.mode.remove_abductor(mind)
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/mob/living/silicon/pai/update_status.dm b/code/modules/mob/living/silicon/pai/update_status.dm
new file mode 100644
index 00000000000..155ecc84a28
--- /dev/null
+++ b/code/modules/mob/living/silicon/pai/update_status.dm
@@ -0,0 +1,3 @@
+/mob/living/silicon/pai/update_stat()
+ if(health <= 0)
+ death(gibbed = 0)
diff --git a/code/modules/mob/living/silicon/robot/drone/update_status.dm b/code/modules/mob/living/silicon/robot/drone/update_status.dm
new file mode 100644
index 00000000000..97d2214c2e2
--- /dev/null
+++ b/code/modules/mob/living/silicon/robot/drone/update_status.dm
@@ -0,0 +1,10 @@
+//Easiest to check this here, then check again in the robot proc.
+//Standard robots use config for crit, which is somewhat excessive for these guys.
+//Drones killed by damage will gib.
+/mob/living/silicon/robot/drone/update_stat()
+ if(status_flags & GODMODE)
+ return
+ if(health <= -35 && stat != DEAD)
+ gib()
+ return
+ return ..()
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index b2c8857f040..ca480d987f8 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -62,7 +62,7 @@
if(sleeping)
Paralyse(3)
- sleeping--
+ AdjustSleeping(-1)
if(resting)
Weaken(5)
@@ -90,7 +90,7 @@
stat = UNCONSCIOUS
if(!paralysis > 0)
- eye_blind = 0
+ SetEyeBlind(0)
else
stat = CONSCIOUS
@@ -98,7 +98,7 @@
diag_hud_set_health()
diag_hud_set_status()
else //dead
- eye_blind = 1
+ SetEyeBlind(0)
//update the state of modules and components here
if(stat != CONSCIOUS)
diff --git a/code/modules/mob/living/silicon/robot/update_status.dm b/code/modules/mob/living/silicon/robot/update_status.dm
new file mode 100644
index 00000000000..a28aae28278
--- /dev/null
+++ b/code/modules/mob/living/silicon/robot/update_status.dm
@@ -0,0 +1,21 @@
+// No args for restraints because robots don't have those
+/mob/living/silicon/robot/incapacitated()
+ if(stat || lockcharge || weakened || stunned || paralysis || !is_component_functioning("actuator"))
+ return 1
+
+/mob/living/silicon/robot/update_stat()
+ if(status_flags & GODMODE)
+ return
+ if(stat != DEAD)
+ if(health <= -maxHealth) //die only once
+ death()
+ return
+ if(!is_component_functioning("actuator") || paralysis || sleeping || stunned || weakened || getOxyLoss() > maxHealth * 0.5)
+ if(stat == CONSCIOUS)
+ KnockOut()
+ else
+ if(stat == UNCONSCIOUS)
+ WakeUp()
+ // diag_hud_set_status()
+ // diag_hud_set_health()
+ // update_health_hud()
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 75bbec89a1b..469b6e86574 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -152,7 +152,7 @@
//Silicon mob language procs
-/mob/living/silicon/can_speak(datum/language/speaking)
+/mob/living/silicon/can_speak_language(datum/language/speaking)
return universal_speak || (speaking in src.speech_synthesizer_langs) //need speech synthesizer support to vocalize a language
/mob/living/silicon/add_language(var/language, var/can_speak=1)
@@ -355,8 +355,8 @@
/////////////////////////////////// EAR DAMAGE ////////////////////////////////////
-/mob/living/silicon/adjustEarDamage()
+/mob/living/silicon/SetEarDamage()
return
-/mob/living/silicon/setEarDamage()
- return
\ No newline at end of file
+/mob/living/silicon/SetEarDeaf()
+ return
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
index 4c974c46c16..47c243e970e 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
@@ -466,6 +466,9 @@
return
if(istype(target, /obj/mecha/working/ripley))
var/obj/mecha/D = target
+ if(D.icon_state != "ripley-open")
+ to_chat(user, "You can't add armour onto the mech while someone is inside!")
+ return
var/list/damage_absorption = D.damage_absorption
if(damage_absorption["brute"] > 0.3)
damage_absorption["brute"] = max(damage_absorption["brute"] - 0.1, 0.3)
@@ -474,17 +477,11 @@
damage_absorption["laser"] = damage_absorption["laser"] - 0.025
to_chat(user, "You strengthen [target], improving its resistance against melee attacks.")
qdel(src)
- if(D.icon_state == "ripley-open")
- D.overlays += image("icon"="mecha.dmi", "icon_state"="ripley-g-open")
- D.desc = "Autonomous Power Loader Unit. Its armour is enhanced with some goliath hide plates."
- else
- to_chat(user, "You can't add armour onto the mech while someone is inside!")
+ D.overlays += image("icon"="mecha.dmi", "icon_state"="ripley-g-open")
+ D.desc = "Autonomous Power Loader Unit. Its armour is enhanced with some goliath hide plates."
if(damage_absorption.["brute"] == 0.3)
- if(D.icon_state == "ripley-open")
- D.overlays += image("icon"="mecha.dmi", "icon_state"="ripley-g-full-open")
- D.desc = "Autonomous Power Loader Unit. It's wearing a fearsome carapace entirely composed of goliath hide plates - the pilot must be an experienced monster hunter."
- else
- to_chat(user, "You can't add armour onto the mech while someone is inside!")
+ D.overlays += image("icon"="mecha.dmi", "icon_state"="ripley-g-full-open")
+ D.desc = "Autonomous Power Loader Unit. It's wearing a fearsome carapace entirely composed of goliath hide plates - the pilot must be an experienced monster hunter."
else
to_chat(user, "You can't improve [D] any further!")
return
diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm
index cb48c63b66f..d0e8e0e4bad 100644
--- a/code/modules/mob/living/simple_animal/hostile/statue.dm
+++ b/code/modules/mob/living/simple_animal/hostile/statue.dm
@@ -118,11 +118,11 @@
for(var/atom/check in check_list)
for(var/mob/living/M in viewers(world.view + 1, check) - src)
if(M.client && CanAttack(M) && !M.has_unlimited_silicon_privilege)
- if(!M.eye_blind)
+ if(M.can_see())
return M
for(var/obj/mecha/M in view(world.view + 1, check)) //assuming if you can see them they can see you
if(M.occupant && M.occupant.client)
- if(!M.occupant.eye_blind)
+ if(M.occupant.can_see())
return M.occupant
return null
@@ -185,7 +185,7 @@
continue
var/turf/T = get_turf(L.loc)
if(T && T in targets)
- L.eye_blind = max(L.eye_blind, 4)
+ L.EyeBlind(4)
return
//Toggle Night Vision
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 06160dca1fd..cc5b319c84f 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -706,8 +706,8 @@
/mob/living/simple_animal/proc/sentience_act() //Called when a simple animal gains sentience via gold slime potion
return
-/mob/living/simple_animal/adjustEarDamage()
+/mob/living/simple_animal/SetEarDamage()
return
-/mob/living/simple_animal/setEarDamage()
- return
\ No newline at end of file
+/mob/living/simple_animal/SetEarDeaf()
+ return
diff --git a/code/modules/mob/living/stat_states.dm b/code/modules/mob/living/stat_states.dm
new file mode 100644
index 00000000000..49c91a10d99
--- /dev/null
+++ b/code/modules/mob/living/stat_states.dm
@@ -0,0 +1,50 @@
+// There, now `stat` is a proper state-machine
+
+/mob/living/proc/KnockOut(updating = 1)
+ if(stat == DEAD)
+ log_runtime(EXCEPTION("KnockOut called on a dead mob."), src)
+ return 0
+ else if(stat == UNCONSCIOUS)
+ return 0
+ add_logs(src, null, "fallen unconscious at [atom_loc_line(get_turf(src))]", admin=0)
+ stat = UNCONSCIOUS
+ if(updating)
+ // update_blind_effects()
+ update_canmove()
+ return 1
+
+/mob/living/proc/WakeUp(updating = 1)
+ if(stat == DEAD)
+ log_runtime(EXCEPTION("WakeUp called on a dead mob."), src)
+ return 0
+ else if(stat == CONSCIOUS)
+ return 0
+ add_logs(src, null, "woken up at [atom_loc_line(get_turf(src))]", admin=0)
+ stat = CONSCIOUS
+ if(updating)
+ // update_blind_effects()
+ update_canmove()
+ return 1
+
+/mob/living/proc/can_be_revived()
+ . = TRUE
+ // if(health <= min_health)
+ if(health <= config.health_threshold_dead)
+ return FALSE
+
+// death() is used to make a mob die
+
+// handles revival through other means than cloning or adminbus (defib, IPC repair)
+/mob/living/proc/update_revive()
+ if(stat != DEAD)
+ return
+ if(!can_be_revived())
+ return
+ add_logs(src, null, "came back to life at [atom_loc_line(get_turf(src))]", admin=0)
+ stat = CONSCIOUS
+ dead_mob_list -= src
+ living_mob_list += src
+ timeofdeath = null
+ update_canmove()
+ // update_blind_effects()
+ updatehealth()
diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm
new file mode 100644
index 00000000000..bc12dfdeb87
--- /dev/null
+++ b/code/modules/mob/living/status_procs.dm
@@ -0,0 +1,513 @@
+//Here are the procs used to modify status effects of a mob.
+
+// We use these to automatically apply their effects when they are changed, as
+// opposed to setting them manually and having to either wait for the next `Life`
+// or update by hand
+
+// The `updating` argument is only available on effects that cause a visual/physical effect on the mob itself
+// when applied, such as Stun, Weaken, and Jitter - stuff like Blindness, which has a client-side effect,
+// lacks this argument.
+
+// Ideally, code should only read the vars in this file, and not ever directly
+// modify them
+
+// If you want a mob type to ignore a given status effect, just override the corresponding
+// `SetSTATE` proc - since all of the other procs are wrappers around that,
+// calling them will have no effect
+
+// BOOLEAN STATES
+
+/*
+ * EyesBlocked
+ Your eyes are covered somehow
+ * EarsBlocked
+ Your ears are covered somehow
+ * Resting
+ You are lying down of your own volition
+ * Flying
+ For some reason or another you can move while not touching the ground
+*/
+
+
+// STATUS EFFECTS
+// All of these decrement over time - at a rate of 1 per life cycle unless otherwise noted
+// Status effects sorted alphabetically:
+/*
+ * Confused *
+ Movement is scrambled
+ * Dizzy *
+ The screen goes all warped
+ * Drowsy
+ You begin to yawn, and have a chance of incrementing "Paralysis"
+ * Druggy *
+ A trippy overlay appears.
+ * Drunk *
+ Essentially what your "BAC" is - the higher it is, the more alcohol you have in you
+ * EarDamage *
+ Doesn't do much, but if it's 25+, you go deaf. Heals much slower than other statuses - 0.05 normally
+ * EarDeaf *
+ You cannot hear. Prevents EarDamage from healing naturally.
+ * EyeBlind *
+ You cannot see. Prevents EyeBlurry from healing naturally.
+ * EyeBlurry *
+ A hazy overlay appears on your screen.
+ * Hallucination *
+ Your character will imagine various effects happening to them, vividly.
+ * Jitter *
+ Your character will visibly twitch. Higher values amplify the effect.
+ * LoseBreath *
+ Your character is unable to breathe.
+ * Paralysis *
+ Your character is knocked out.
+ * Silent *
+ Your character is unable to speak.
+ * Sleeping *
+ Your character is asleep.
+ * Slowed *
+ Your character moves slower.
+ * Slurring *
+ Your character cannot enunciate clearly.
+ * Stunned *
+ Your character is unable to move, and drops stuff in their hands. They keep standing, though.
+ * Stuttering *
+ Your character stutters parts of their messages.
+ * Weakened *
+ Your character collapses, but is still conscious.
+*/
+
+// DISABILITIES
+// These are more permanent than the above.
+// Disabilities sorted alphabetically
+/*
+ * Blind (32)
+ Can't see. EyeBlind does not heal when this is active.
+ * Coughing (4)
+ Cough occasionally, causing you to drop your items
+ * Deaf (128)
+ Can't hear. EarDeaf does not heal when this is active
+ * Epilepsy (2)
+ Occasionally go "Epileptic", causing you to become very twitchy, drop all items, and fall to the floor
+ * Mute (64)
+ Cannot talk.
+ * Nearsighted (1)
+ My glasses! I can't see without my glasses! (Nearsighted overlay when not wearing prescription eyewear)
+ * Nervous (16)
+ Occasionally begin to stutter.
+ * Tourettes (8)
+ SHIT (say bad words, and drop stuff occasionally)
+*/
+
+/mob/living
+
+ // Booleans
+ var/resting = FALSE
+
+ /*
+ STATUS EFFECTS
+ */
+
+/mob // On `/mob` for now, to support legacy code
+ var/confused = 0
+ var/dizziness = 0
+ var/drowsyness = 0
+ var/druggy = 0
+ var/drunk = 0
+ var/ear_damage = 0
+ var/ear_deaf = 0
+ var/eye_blind = 0
+ var/eye_blurry = 0
+ var/hallucination = 0
+ var/jitteriness = 0
+ var/losebreath = 0
+ var/paralysis = 0
+ var/silent = 0
+ var/sleeping = 0
+ var/slowed = 0
+ var/slurring = 0
+ var/stunned = 0
+ var/stuttering = 0
+ var/weakened = 0
+
+/mob/living
+ // Bitfields
+ var/disabilities = 0
+
+// RESTING
+
+/mob/living/proc/StartResting(updating = 1)
+ var/val_change = !resting
+ resting = TRUE
+ if(updating && val_change)
+ update_canmove()
+
+/mob/living/proc/StopResting(updating = 1)
+ var/val_change = !!resting
+ resting = FALSE
+ if(updating && val_change)
+ update_canmove()
+
+/mob/living/proc/StartFlying()
+ var/val_change = !flying
+ flying = TRUE
+ if(val_change)
+ update_animations()
+
+/mob/living/proc/StopFlying()
+ var/val_change = !!flying
+ flying = FALSE
+ if(val_change)
+ update_animations()
+
+
+// SCALAR STATUS EFFECTS
+
+// CONFUSED
+
+/mob/living/Confused(amount)
+ SetConfused(max(confused, amount))
+
+/mob/living/SetConfused(amount)
+ confused = max(amount, 0)
+
+/mob/living/AdjustConfused(amount, bound_lower = 0, bound_upper = INFINITY)
+ var/new_value = directional_bounded_sum(confused, amount, bound_lower, bound_upper)
+ SetConfused(new_value)
+
+// DIZZY
+
+/mob/living/Dizzy(amount)
+ SetDizzy(max(dizziness, amount))
+
+/mob/living/SetDizzy(amount)
+ dizziness = max(amount, 0)
+
+/mob/living/AdjustDizzy(amount, bound_lower = 0, bound_upper = INFINITY)
+ var/new_value = directional_bounded_sum(dizziness, amount, bound_lower, bound_upper)
+ SetDizzy(new_value)
+
+// DROWSY
+
+/mob/living/Drowsy(amount)
+ SetDrowsy(max(drowsyness, amount))
+
+/mob/living/SetDrowsy(amount)
+ drowsyness = max(amount, 0)
+
+/mob/living/AdjustDrowsy(amount, bound_lower = 0, bound_upper = INFINITY)
+ var/new_value = directional_bounded_sum(drowsyness, amount, bound_lower, bound_upper)
+ SetDrowsy(new_value)
+
+// DRUNK
+
+/mob/living/Drunk(amount)
+ SetDrunk(max(drunk, amount))
+
+/mob/living/SetDrunk(amount)
+ drunk = max(amount, 0)
+
+/mob/living/AdjustDrunk(amount, bound_lower = 0, bound_upper = INFINITY)
+ var/new_value = directional_bounded_sum(drunk, amount, bound_lower, bound_upper)
+ SetDrunk(new_value)
+
+// DRUGGY
+
+/mob/living/Druggy(amount)
+ SetDruggy(max(druggy, amount))
+
+/mob/living/SetDruggy(amount)
+ var/old_val = druggy
+ druggy = max(amount, 0)
+ // We transitioned to/from 0, so update the druggy overlays
+ if((old_val == 0 || druggy == 0) && (old_val != druggy))
+ update_druggy_effects()
+
+/mob/living/AdjustDruggy(amount, bound_lower = 0, bound_upper = INFINITY)
+ var/new_value = directional_bounded_sum(druggy, amount, bound_lower, bound_upper)
+ SetDruggy(new_value)
+
+// EAR_DAMAGE
+
+/mob/living/EarDamage(amount)
+ SetEarDamage(max(ear_damage, amount))
+
+/mob/living/SetEarDamage(amount)
+ ear_damage = max(amount, 0)
+
+/mob/living/AdjustEarDamage(amount, bound_lower = 0, bound_upper = INFINITY)
+ var/new_value = directional_bounded_sum(ear_damage, amount, bound_lower, bound_upper)
+ SetEarDamage(new_value)
+
+// EAR_DEAF
+
+/mob/living/EarDeaf(amount)
+ SetEarDeaf(max(ear_deaf, amount))
+
+/mob/living/SetEarDeaf(amount)
+ ear_deaf = max(amount, 0)
+
+/mob/living/AdjustEarDeaf(amount, bound_lower = 0, bound_upper = INFINITY)
+ var/new_value = directional_bounded_sum(ear_deaf, amount, bound_lower, bound_upper)
+ SetEarDeaf(new_value)
+
+// EYE_BLIND
+
+/mob/living/EyeBlind(amount)
+ SetEyeBlind(max(eye_blind, amount))
+
+/mob/living/SetEyeBlind(amount)
+ var/old_val = eye_blind
+ eye_blind = max(amount, 0)
+ // We transitioned to/from 0, so update the eye blind overlays
+ if((old_val == 0 || eye_blind == 0) && (old_val != eye_blind))
+ update_blind_effects()
+
+/mob/living/AdjustEyeBlind(amount, bound_lower = 0, bound_upper = INFINITY)
+ var/new_value = directional_bounded_sum(eye_blind, amount, bound_lower, bound_upper)
+ SetEyeBlind(new_value)
+
+// EYE_BLURRY
+
+/mob/living/EyeBlurry(amount)
+ SetEyeBlurry(max(eye_blurry, amount))
+
+/mob/living/SetEyeBlurry(amount)
+ var/old_val = eye_blurry
+ eye_blurry = max(amount, 0)
+ // We transitioned to/from 0, so update the eye blur overlays
+ if((old_val == 0 || eye_blurry == 0) && (old_val != eye_blurry))
+ update_blurry_effects()
+
+/mob/living/AdjustEyeBlurry(amount, bound_lower = 0, bound_upper = INFINITY)
+ var/new_value = directional_bounded_sum(eye_blurry, amount, bound_lower, bound_upper)
+ SetEyeBlurry(new_value)
+
+// HALLUCINATION
+
+/mob/living/Hallucinate(amount)
+ SetHallucinate(max(hallucination, amount))
+
+/mob/living/SetHallucinate(amount)
+ hallucination = max(amount, 0)
+
+/mob/living/AdjustHallucinate(amount, bound_lower = 0, bound_upper = INFINITY)
+ var/new_value = directional_bounded_sum(hallucination, amount, bound_lower, bound_upper)
+ SetHallucinate(new_value)
+
+// JITTER
+
+/mob/living/Jitter(amount, force = 0)
+ SetJitter(max(jitteriness, amount), force)
+
+/mob/living/SetJitter(amount, force = 0)
+ // Jitter is also associated with stun
+ if(status_flags & CANSTUN || force)
+ jitteriness = max(amount, 0)
+
+/mob/living/AdjustJitter(amount, bound_lower = 0, bound_upper = INFINITY, force = 0)
+ var/new_value = directional_bounded_sum(jitteriness, amount, bound_lower, bound_upper)
+ SetJitter(new_value, force)
+
+// LOSE_BREATH
+
+/mob/living/LoseBreath(amount)
+ SetLoseBreath(max(losebreath, amount))
+
+/mob/living/SetLoseBreath(amount)
+ losebreath = max(amount, 0)
+
+/mob/living/AdjustLoseBreath(amount, bound_lower = 0, bound_upper = INFINITY)
+ var/new_value = directional_bounded_sum(losebreath, amount, bound_lower, bound_upper)
+ SetLoseBreath(new_value)
+
+// PARALYSE
+
+/mob/living/Paralyse(amount, updating = 1, force = 0)
+ SetParalysis(max(paralysis, amount), updating, force)
+
+/mob/living/SetParalysis(amount, updating = 1, force = 0)
+ if(status_flags & CANPARALYSE || force)
+ paralysis = max(amount, 0)
+ if(updating)
+ update_canmove()
+ update_stat()
+
+/mob/living/AdjustParalysis(amount, bound_lower = 0, bound_upper = INFINITY, updating = 1, force = 0)
+ var/new_value = directional_bounded_sum(paralysis, amount, bound_lower, bound_upper)
+ SetParalysis(new_value, updating, force)
+
+// SILENT
+
+/mob/living/Silence(amount)
+ SetSilence(max(silent, amount))
+
+/mob/living/SetSilence(amount)
+ silent = max(amount, 0)
+
+/mob/living/AdjustSilence(amount, bound_lower = 0, bound_upper = INFINITY)
+ var/new_value = directional_bounded_sum(silent, amount, bound_lower, bound_upper)
+ SetSilence(new_value)
+
+// SLEEPING
+
+/mob/living/Sleeping(amount, updating = 1)
+ SetSleeping(max(sleeping, amount), updating)
+
+/mob/living/SetSleeping(amount, updating = 1)
+ sleeping = max(amount, 0)
+ update_sleeping_effects()
+ if(updating)
+ update_stat()
+ update_canmove()
+
+/mob/living/AdjustSleeping(amount, bound_lower = 0, bound_upper = INFINITY, updating = 1)
+ var/new_value = directional_bounded_sum(sleeping, amount, bound_lower, bound_upper)
+ SetSleeping(new_value, updating)
+
+// SLOWED
+
+/mob/living/Slowed(amount, updating = 1)
+ SetSlowed(max(slowed, amount), updating)
+
+/mob/living/SetSlowed(amount, updating = 1)
+ slowed = max(amount, 0)
+
+/mob/living/AdjustSlowed(amount, bound_lower = 0, bound_upper = INFINITY, updating = 1)
+ var/new_value = directional_bounded_sum(slowed, amount, bound_lower, bound_upper)
+ SetSlowed(new_value, updating)
+
+// SLURRING
+
+/mob/living/Slur(amount)
+ SetSlur(max(slurring, amount))
+
+/mob/living/SetSlur(amount)
+ slurring = max(amount, 0)
+
+/mob/living/AdjustSlur(amount, bound_lower = 0, bound_upper = INFINITY)
+ var/new_value = directional_bounded_sum(slurring, amount, bound_lower, bound_upper)
+ SetSlur(new_value)
+
+// STUN
+
+/mob/living/Stun(amount, updating = 1, force = 0)
+ SetStunned(max(stunned, amount), updating, force)
+
+/mob/living/SetStunned(amount, updating = 1, force = 0) //if you REALLY need to set stun to a set amount without the whole "can't go below current stunned"
+ if(status_flags & CANSTUN || force)
+ stunned = max(amount, 0)
+ if(updating)
+ update_canmove()
+
+/mob/living/AdjustStunned(amount, bound_lower = 0, bound_upper = INFINITY, updating = 1, force = 0)
+ var/new_value = directional_bounded_sum(stunned, amount, bound_lower, bound_upper)
+ SetStunned(new_value, updating, force)
+
+// STUTTERING
+
+
+/mob/living/Stuttering(amount, force = 0)
+ SetStuttering(max(stuttering, amount), force)
+
+/mob/living/SetStuttering(amount, force = 0)
+ //From mob/living/apply_effect: "Stuttering is often associated with Stun"
+ if(status_flags & CANSTUN || force)
+ stuttering = max(stuttering, 0)
+
+/mob/living/AdjustStuttering(amount, bound_lower = 0, bound_upper = INFINITY, force = 0)
+ var/new_value = directional_bounded_sum(stuttering, amount, bound_lower, bound_upper)
+ SetStuttering(new_value, force)
+
+// WEAKEN
+
+/mob/living/Weaken(amount, updating = 1, force = 0)
+ SetWeakened(max(weakened, amount), updating, force)
+
+/mob/living/SetWeakened(amount, updating = 1, force = 0)
+ if(status_flags & CANWEAKEN || force)
+ weakened = max(amount, 0)
+ if(updating)
+ update_canmove() //updates lying, canmove and icons
+
+/mob/living/AdjustWeakened(amount, bound_lower = 0, bound_upper = INFINITY, updating = 1, force = 0)
+ var/new_value = directional_bounded_sum(weakened, amount, bound_lower, bound_upper)
+ SetWeakened(new_value, updating, force)
+
+//
+// DISABILITIES
+//
+
+// Blind
+
+/mob/living/proc/BecomeBlind()
+ var/val_change = !(disabilities & BLIND)
+ disabilities |= BLIND
+ if(val_change)
+ update_blind_effects()
+
+/mob/living/proc/CureBlind()
+ var/val_change = !!(disabilities & BLIND)
+ disabilities &= ~BLIND
+ if(val_change)
+ update_blind_effects()
+
+// Coughing
+
+/mob/living/proc/BecomeCoughing()
+ disabilities |= COUGHING
+
+/mob/living/proc/CureCoughing()
+ disabilities &= ~COUGHING
+
+// Deaf
+
+/mob/living/proc/BecomeDeaf()
+ disabilities |= DEAF
+
+/mob/living/proc/CureDeaf()
+ disabilities &= ~DEAF
+
+// Epilepsy
+
+/mob/living/proc/BecomeEpilepsy()
+ disabilities |= EPILEPSY
+
+/mob/living/proc/CureEpilepsy()
+ disabilities &= ~EPILEPSY
+
+// Mute
+
+/mob/living/proc/BecomeMute()
+ disabilities |= MUTE
+
+/mob/living/proc/CureMute()
+ disabilities &= ~MUTE
+
+// Nearsighted
+
+/mob/living/proc/BecomeNearsighted()
+ var/val_change = !(disabilities & NEARSIGHTED)
+ disabilities |= NEARSIGHTED
+ if(val_change)
+ update_nearsighted_effects()
+
+/mob/living/proc/CureNearsighted()
+ var/val_change = !!(disabilities & NEARSIGHTED)
+ disabilities &= ~NEARSIGHTED
+ if(val_change)
+ update_nearsighted_effects()
+
+// Nervous
+
+/mob/living/proc/BecomeNervous()
+ disabilities |= NERVOUS
+
+/mob/living/proc/CureNervous()
+ disabilities &= ~NERVOUS
+
+// Tourettes
+
+/mob/living/proc/BecomeTourettes()
+ disabilities |= TOURETTES
+
+/mob/living/proc/CureTourettes()
+ disabilities &= ~TOURETTES
diff --git a/code/modules/mob/living/update_status.dm b/code/modules/mob/living/update_status.dm
new file mode 100644
index 00000000000..5cbf7cae450
--- /dev/null
+++ b/code/modules/mob/living/update_status.dm
@@ -0,0 +1,97 @@
+/mob/living/update_blind_effects()
+ if(!can_see())
+ overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
+ throw_alert("blind", /obj/screen/alert/blind)
+ return 1
+ else
+ clear_fullscreen("blind")
+ clear_alert("blind")
+ return 0
+
+/mob/living/update_blurry_effects()
+ if(eyes_blurred())
+ overlay_fullscreen("blurry", /obj/screen/fullscreen/blurry)
+ return 1
+ else
+ clear_fullscreen("blurry")
+ return 0
+
+/mob/living/update_druggy_effects()
+ if(druggy)
+ overlay_fullscreen("high", /obj/screen/fullscreen/high)
+ throw_alert("high", /obj/screen/alert/high)
+ else
+ clear_fullscreen("high")
+ clear_alert("high")
+
+/mob/living/update_nearsighted_effects()
+ if(disabilities & NEARSIGHTED)
+ overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1)
+ else
+ clear_fullscreen("nearsighted")
+
+/mob/living/update_sleeping_effects()
+ if(sleeping)
+ throw_alert("asleep", /obj/screen/alert/asleep)
+ else
+ clear_alert("asleep")
+
+// Querying status of the mob
+
+// Whether the mob can hear things
+/mob/living/can_hear()
+ return !(ear_deaf || (disabilities & DEAF))
+
+// Whether the mob is able to see
+/mob/living/can_see()
+ return !(eye_blind || (disabilities & BLIND) || stat)
+
+// Whether the mob is capable of talking
+/mob/living/can_speak()
+ return !(silent || (disabilities & MUTE) || is_muzzled())
+
+// Whether the mob is capable of standing or not
+/mob/living/proc/can_stand()
+ return !(weakened || paralysis || stat || (status_flags & FAKEDEATH))
+
+// Whether the mob is capable of actions or not
+/mob/living/incapacitated(ignore_restraints = 0, ignore_grab = 0, ignore_lying = 0)
+ if(stat || paralysis || stunned || (weakened && lying) || (!ignore_restraints && restrained()) || (!ignore_lying && lying))
+ return 1
+
+// wonderful proc names, I know - used to check whether the blur overlay
+// should show or not
+/mob/living/proc/eyes_blurred()
+ return eye_blurry
+
+//Updates canmove, lying and icons. Could perhaps do with a rename but I can't think of anything to describe it.
+/mob/living/update_canmove(delay_action_updates = 0)
+ var/fall_over = !can_stand()
+ var/buckle_lying = !(buckled && !buckled.buckle_lying)
+ if(fall_over || resting || stunned)
+ drop_r_hand()
+ drop_l_hand()
+ else
+ lying = 0
+ canmove = 1
+ if(buckled)
+ lying = 90 * buckle_lying
+ else if((fall_over || resting) && !lying)
+ fall(fall_over)
+
+ canmove = !(fall_over || resting || stunned || buckled)
+ density = !lying
+ if(lying)
+ if(layer == initial(layer))
+ layer = MOB_LAYER - 0.2
+ else
+ if(layer == MOB_LAYER - 0.2)
+ layer = initial(layer)
+
+ update_transform()
+ if(!delay_action_updates)
+ update_action_buttons_icon()
+ return canmove
+
+/mob/living/proc/update_stamina()
+ return
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 4a292328fb6..e312ff9556b 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -62,22 +62,22 @@
if(!client) return
if(type)
- if(type & 1 && (disabilities & BLIND || blinded || paralysis) )//Vision related
+ if(type & 1 && !can_see())//Vision related
if(!( alt ))
return
else
msg = alt
type = alt_type
- if(type & 2 && (disabilities & DEAF || ear_deaf))//Hearing related
+ if(type & 2 && !can_hear())//Hearing related
if(!( alt ))
return
else
msg = alt
type = alt_type
- if((type & 1 && disabilities & BLIND))
+ if(type & 1 && !can_see())
return
// Added voice muffling for Issue 41.
- if(stat == UNCONSCIOUS || (sleeping > 0 && stat != 2))
+ if(stat == UNCONSCIOUS || (sleeping > 0 && stat != DEAD))
to_chat(src, "... You can almost hear someone talking ...")
else
to_chat(src, msg)
@@ -163,13 +163,6 @@
// handle_typing_indicator()
return
-
-/mob/proc/restrained()
- return
-
-/mob/proc/incapacitated()
- return
-
//This proc is called whenever someone clicks an inventory ui slot.
/mob/proc/attack_ui(slot)
var/obj/item/W = get_active_hand()
@@ -1031,36 +1024,6 @@ var/list/slot_equipment_priority = list( \
if(restrained()) return 0
return 1
-//Updates canmove, lying and icons. Could perhaps do with a rename but I can't think of anything to describe it.
-/mob/proc/update_canmove(delay_action_updates = 0)
- var/ko = weakened || paralysis || stat || (status_flags & FAKEDEATH)
- var/buckle_lying = !(buckled && !buckled.buckle_lying)
- if(ko || resting || stunned)
- drop_r_hand()
- drop_l_hand()
- else
- lying = 0
- canmove = 1
- if(buckled)
- lying = 90 * buckle_lying
- else
- if((ko || resting) && !lying)
- fall(ko)
-
- canmove = !(ko || resting || stunned || buckled)
- density = !lying
- if(lying)
- if(layer == initial(layer))
- layer = MOB_LAYER - 0.2
- else
- if(layer == MOB_LAYER - 0.2)
- layer = initial(layer)
-
- update_transform()
- if(!delay_action_updates)
- update_action_buttons_icon()
- return canmove
-
/mob/proc/fall(var/forced)
drop_l_hand()
drop_r_hand()
@@ -1101,77 +1064,6 @@ var/list/slot_equipment_priority = list( \
/mob/proc/activate_hand(selhand)
return
-/mob/proc/Jitter(amount)
- jitteriness = max(jitteriness, amount, 0)
-
-/mob/proc/Dizzy(amount)
- dizziness = max(dizziness, amount, 0)
-
-/mob/proc/AdjustDrunk(amount)
- drunk = max(drunk + amount, 0)
-
-/mob/proc/Stun(amount)
- SetStunned(max(stunned, amount))
-
-/mob/proc/SetStunned(amount) //if you REALLY need to set stun to a set amount without the whole "can't go below current stunned"
- if(status_flags & CANSTUN)
- stunned = max(amount, 0)
- update_canmove()
- else if(stunned)
- stunned = 0
- update_canmove()
-
-/mob/proc/AdjustStunned(amount)
- SetStunned(stunned + amount)
-
-/mob/proc/Weaken(amount)
- SetWeakened(max(weakened, amount))
-
-/mob/proc/SetWeakened(amount)
- if(status_flags & CANWEAKEN)
- weakened = max(amount, 0)
- update_canmove() //updates lying, canmove and icons
- else if(weakened)
- weakened = 0
- update_canmove()
-
-/mob/proc/AdjustWeakened(amount)
- SetWeakened(weakened + amount)
-
-/mob/proc/Paralyse(amount)
- SetParalysis(max(paralysis, amount))
-
-/mob/proc/SetParalysis(amount)
- if(status_flags & CANPARALYSE)
- paralysis = max(amount, 0)
- update_canmove()
- else if(paralysis)
- paralysis = 0
- update_canmove()
-
-/mob/proc/AdjustParalysis(amount)
- SetParalysis(paralysis + amount)
-
-/mob/proc/Sleeping(amount)
- SetSleeping(max(sleeping, amount))
-
-/mob/proc/SetSleeping(amount)
- sleeping = max(amount, 0)
- update_canmove()
-
-/mob/proc/AdjustSleeping(amount)
- SetSleeping(sleeping + amount)
-
-/mob/proc/Resting(amount)
- SetResting(max(resting, amount))
-
-/mob/proc/SetResting(amount)
- resting = max(amount, 0)
- update_canmove()
-
-/mob/proc/AdjustResting(amount)
- SetResting(resting + amount)
-
/mob/proc/get_species()
return ""
@@ -1365,13 +1257,6 @@ mob/proc/yank_out_object()
location.add_vomit_floor(src, 1)
playsound(location, 'sound/effects/splat.ogg', 50, 1)
-
-/mob/proc/adjustEarDamage()
- return
-
-/mob/proc/setEarDamage()
- return
-
/mob/proc/AddSpell(obj/effect/proc_holder/spell/S)
mob_spell_list += S
S.action.Grant(src)
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index f7bd04906ea..6cb582e94c1 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -33,18 +33,11 @@
var/obj/machinery/machine = null
var/other_mobs = null
var/memory = ""
- var/disabilities = 0 //Carbon
var/atom/movable/pulling = null
var/next_move = null
var/notransform = null //Carbon
var/other = 0.0
var/hand = null
- var/eye_blind = 0 //Carbon
- var/eye_blurry = 0 //Carbon
- var/ear_deaf = 0 //Carbon
- var/ear_damage = 0 //Carbon
- var/stuttering = 0 //Carbon
- var/slurring = 0 //Carbon
var/real_name = null
var/flavor_text = ""
var/med_record = ""
@@ -53,11 +46,6 @@
var/blinded = null
var/bhunger = 0 //Carbon
var/ajourn = 0
- var/druggy = 0 //Carbon
- var/confused = 0 //Carbon
- var/drunk = 0
- var/sleeping = 0 //Carbon
- var/resting = 0 //Carbon
var/lying = 0
var/lying_prev = 0
var/canmove = 1
@@ -77,19 +65,11 @@
var/bodytemperature = 310.055 //98.7 F
- var/drowsyness = 0.0//Carbon
- var/dizziness = 0//Carbon
- var/jitteriness = 0//Carbon
var/flying = 0
var/charges = 0.0
var/nutrition = 400.0//Carbon
var/overeatduration = 0 // How long this guy is overeating //Carbon
- var/paralysis = 0
- var/stunned = 0
- var/weakened = 0
- var/slowed = 0
- var/losebreath = 0 //Carbon
var/intent = null//Living
var/shakecamera = 0
var/a_intent = I_HELP//Living
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 90f84b7fc74..a22d9bf3c6b 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -175,9 +175,9 @@
if(state >= GRAB_KILL)
//affecting.apply_effect(STUTTER, 5) //would do this, but affecting isn't declared as mob/living for some stupid reason.
- affecting.stuttering = max(affecting.stuttering, 5) //It will hamper your voice, being choked and all.
+ affecting.Stuttering(5) //It will hamper your voice, being choked and all.
affecting.Weaken(5) //Should keep you down unless you get help.
- affecting.losebreath = max(affecting.losebreath + 2, 3)
+ affecting.AdjustLoseBreath(2, bound_lower = 0, bound_upper = 3)
adjust_position()
@@ -290,7 +290,7 @@
msg_admin_attack("[key_name(assailant)] strangled (kill intent) [key_name(affecting)]")
assailant.next_move = world.time + 10
- affecting.losebreath += 1
+ affecting.AdjustLoseBreath(1)
affecting.set_dir(WEST)
adjust_position()
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index aa59991a6cb..b03b9562949 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -75,12 +75,6 @@ proc/iscuffed(A)
return 1
return 0
-proc/isdeaf(A)
- if(istype(A, /mob))
- var/mob/M = A
- return (M.disabilities & DEAF) || M.ear_deaf
- return 0
-
proc/hassensorlevel(A, var/level)
var/mob/living/carbon/human/H = A
if(istype(H) && istype(H.w_uniform, /obj/item/clothing/under))
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index dd48c1ce1a4..f8a73364264 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -565,3 +565,7 @@
/mob/new_player/is_ready()
return ready && ..()
+
+// No hearing announcements
+/mob/new_player/can_hear()
+ return 0
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index f280bec0ce1..d010bdfa135 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -142,7 +142,7 @@
if(length(message) >= 2)
var/language_prefix = trim_right(lowertext(copytext(message, 1 ,4)))
var/datum/language/L = language_keys[language_prefix]
- if(can_speak(L))
+ if(can_speak_language(L))
return L
return null
diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm
new file mode 100644
index 00000000000..7358486deee
--- /dev/null
+++ b/code/modules/mob/status_procs.dm
@@ -0,0 +1,202 @@
+// A bunch of empty procs for all the status procs in living/status_procs.dm, because
+// I can't be bothered to deal with all the merge conflicts it would cause to
+// typecast every mob in the codebase correctly
+
+/mob/proc/Confused()
+ return
+
+/mob/proc/SetConfused()
+ return
+
+/mob/proc/AdjustConfused()
+ return
+
+
+/mob/proc/Dizzy()
+ return
+
+/mob/proc/SetDizzy()
+ return
+
+/mob/proc/AdjustDizzy()
+ return
+
+
+/mob/proc/Drowsy()
+ return
+
+/mob/proc/SetDrowsy()
+ return
+
+/mob/proc/AdjustDrowsy()
+ return
+
+
+/mob/proc/Drunk()
+ return
+
+/mob/proc/SetDrunk()
+ return
+
+/mob/proc/AdjustDrunk()
+ return
+
+
+/mob/proc/Druggy()
+ return
+
+/mob/proc/SetDruggy()
+ return
+
+/mob/proc/AdjustDruggy()
+ return
+
+
+/mob/proc/EarDamage()
+ return
+
+/mob/proc/SetEarDamage()
+ return
+
+/mob/proc/AdjustEarDamage()
+ return
+
+
+/mob/proc/EarDeaf()
+ return
+
+/mob/proc/SetEarDeaf()
+ return
+
+/mob/proc/AdjustEarDeaf()
+ return
+
+
+/mob/proc/EyeBlind()
+ return
+
+/mob/proc/SetEyeBlind()
+ return
+
+/mob/proc/AdjustEyeBlind()
+ return
+
+
+/mob/proc/EyeBlurry()
+ return
+
+/mob/proc/SetEyeBlurry()
+ return
+
+/mob/proc/AdjustEyeBlurry()
+ return
+
+
+/mob/proc/Hallucinate()
+ return
+
+/mob/proc/SetHallucinate()
+ return
+
+/mob/proc/AdjustHallucinate()
+ return
+
+
+/mob/proc/Jitter()
+ return
+
+/mob/proc/SetJitter()
+ return
+
+/mob/proc/AdjustJitter()
+ return
+
+
+/mob/proc/LoseBreath()
+ return
+
+/mob/proc/SetLoseBreath()
+ return
+
+/mob/proc/AdjustLoseBreath()
+ return
+
+
+/mob/proc/Paralyse()
+ return
+
+/mob/proc/SetParalysis()
+ return
+
+/mob/proc/AdjustParalysis()
+ return
+
+
+/mob/proc/Silence()
+ return
+
+/mob/proc/SetSilence()
+ return
+
+/mob/proc/AdjustSilence()
+ return
+
+
+/mob/proc/Sleeping()
+ return
+
+/mob/proc/SetSleeping()
+ return
+
+/mob/proc/AdjustSleeping()
+ return
+
+
+/mob/proc/Slowed()
+ return
+
+/mob/proc/SetSlowed()
+ return
+
+/mob/proc/AdjustSlowed()
+ return
+
+
+/mob/proc/Slur()
+ return
+
+/mob/proc/SetSlur()
+ return
+
+/mob/proc/AdjustSlur()
+ return
+
+
+/mob/proc/Stun()
+ return
+
+/mob/proc/SetStunned()
+ return
+
+/mob/proc/AdjustStunned()
+ return
+
+
+/mob/proc/Stuttering()
+ return
+
+/mob/proc/SetStuttering()
+ return
+
+/mob/proc/AdjustStuttering()
+ return
+
+
+/mob/proc/Weaken()
+ return
+
+/mob/proc/SetWeakened()
+ return
+
+/mob/proc/AdjustWeakened()
+ return
diff --git a/code/modules/mob/update_status.dm b/code/modules/mob/update_status.dm
new file mode 100644
index 00000000000..3893085edb3
--- /dev/null
+++ b/code/modules/mob/update_status.dm
@@ -0,0 +1,65 @@
+// These are procs that cause immediate updates to features of the mob - prefixed with `update_`
+// Procs that have a stacking effect depending on how many times they are called
+// do not belong in this file - those go in `life.dm` instead, with the prefix `handle_`
+
+// OVERLAY/SIGHT PROCS
+
+// These return 0 if they are not applying an overlay, and 1 if they are
+
+// Call this to immediately apply blindness effects, instead of
+// waiting for the next `Life` tick
+/mob/proc/update_blind_effects()
+ // No handling for this on the mob level
+ return 0
+
+/mob/proc/update_blurry_effects()
+ // No handling for this on the mob level
+ return 0
+
+/mob/proc/update_druggy_effects()
+ // No handling for this on the mob level
+ return 0
+
+/mob/proc/update_nearsighted_effects()
+ // No handling for this on the mob level
+ return 0
+
+/mob/proc/update_sleeping_effects()
+ // No handling for this on the mob level
+ return 0
+
+/mob/proc/update_tint_effects()
+ // No handling for this on the mob level
+ return 0
+
+// Procs that give information about the status of the mob
+
+/mob/proc/can_hear()
+ return 1
+
+/mob/proc/can_see()
+ return 1
+
+/mob/proc/can_speak()
+ return 1
+
+/mob/proc/incapacitated(ignore_restraints, ignore_grab)
+ return 0
+
+/mob/proc/restrained(ignore_grab)
+ // All are created free
+ return 0
+
+// Procs that update other things about the mob
+
+// Does various animations - Jitter, Flying, Spinning
+/mob/proc/update_animations()
+ if(flying)
+ animate(src, pixel_y = pixel_y + 5 , time = 10, loop = 1, easing = SINE_EASING)
+ animate(pixel_y = pixel_y - 5, time = 10, loop = 1, easing = SINE_EASING)
+
+/mob/proc/update_stat()
+ return
+
+/mob/proc/update_canmove()
+ return 1
diff --git a/code/modules/nano/interaction/base.dm b/code/modules/nano/interaction/base.dm
index 113c9e2878b..e4e5dd1a33b 100644
--- a/code/modules/nano/interaction/base.dm
+++ b/code/modules/nano/interaction/base.dm
@@ -14,10 +14,10 @@
/mob/proc/shared_nano_interaction()
if(stat || !client)
return STATUS_CLOSE // no updates, close the interface
- else if(restrained() || lying || stunned || weakened)
+ else if(incapacitated())
return STATUS_UPDATE // update only (orange visibility)
return STATUS_INTERACTIVE
-
+
/mob/dead/observer/shared_nano_interaction()
if(check_rights(R_ADMIN, 0, src))
return STATUS_INTERACTIVE // Admins are more equal
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
index f86b17eaab7..0ff6289ea66 100644
--- a/code/modules/power/generator.dm
+++ b/code/modules/power/generator.dm
@@ -1,211 +1,241 @@
-
/obj/machinery/power/generator
name = "thermoelectric generator"
desc = "It's a high efficiency thermoelectric generator."
icon_state = "teg"
- density = 1
anchored = 0
+ density = 1
+ use_power = 0
- use_power = 1
- idle_power_usage = 100 //Watts, I hope. Just enough to do the computer and display things.
-
- var/obj/machinery/atmospherics/binary/circulator/circ1
- var/obj/machinery/atmospherics/binary/circulator/circ2
+ var/obj/machinery/atmospherics/binary/circulator/cold_circ
+ var/obj/machinery/atmospherics/binary/circulator/hot_circ
+ var/cold_dir = WEST
+ var/hot_dir = EAST
+
var/lastgen = 0
var/lastgenlev = -1
-
- var/image/overlay_image
-
- var/power_multiplier = 1 // This is so admins can tweak how good it is to find a good balance for effort -> power
- var/powercap = 500000 //Not a hard cap, but outputs above this have a 10% chance to cause the TeG to lose half it's power.
-
+ var/lastcirc = "00"
+
/obj/machinery/power/generator/New()
..()
+ update_desc()
+
+/obj/machinery/power/generator/proc/update_desc()
+ desc = initial(desc) + " Its cold circulator is located on the [dir2text(cold_dir)] side, and its heat circulator is located on the [dir2text(hot_dir)] side."
+
+/obj/machinery/power/generator/Destroy()
+ disconnect()
+ return ..()
+
+/obj/machinery/power/generator/proc/disconnect()
+ if(cold_circ)
+ cold_circ.generator = null
+ if(hot_circ)
+ hot_circ.generator = null
+ if(powernet)
+ disconnect_from_network()
- spawn(1)
- reconnect()
+/obj/machinery/power/generator/initialize()
+ ..()
+ connect()
+
+/obj/machinery/power/generator/proc/connect()
+ connect_to_network()
+
+ var/obj/machinery/atmospherics/binary/circulator/circpath = /obj/machinery/atmospherics/binary/circulator
+ cold_circ = locate(circpath) in get_step(src, cold_dir)
+ hot_circ = locate(circpath) in get_step(src, hot_dir)
-//generators connect in dir and reverse_dir(dir) directions
-//mnemonic to determine circulator/generator directions: the cirulators orbit clockwise around the generator
-//so a circulator to the NORTH of the generator connects first to the EAST, then to the WEST
-//and a circulator to the WEST of the generator connects first to the NORTH, then to the SOUTH
-//note that the circulator's outlet dir is it's always facing dir, and it's inlet is always the reverse
-/obj/machinery/power/generator/proc/reconnect()
- circ1 = null
- circ2 = null
- if(src.loc && anchored)
- if(src.dir & (EAST|WEST))
- circ1 = locate(/obj/machinery/atmospherics/binary/circulator) in get_step(src,EAST)
- circ2 = locate(/obj/machinery/atmospherics/binary/circulator) in get_step(src,WEST)
+ if(cold_circ && cold_circ.side == cold_dir)
+ cold_circ.generator = src
+ cold_circ.update_icon()
+ else
+ cold_circ = null
- if(circ1 && circ2)
- if(circ1.dir != SOUTH || circ2.dir != NORTH)
- circ1 = null
- circ2 = null
+ if(hot_circ && hot_circ.side == hot_dir)
+ hot_circ.generator = src
+ hot_circ.update_icon()
+ else
+ hot_circ = null
- else if(src.dir & (NORTH|SOUTH))
- circ1 = locate(/obj/machinery/atmospherics/binary/circulator) in get_step(src,NORTH)
- circ2 = locate(/obj/machinery/atmospherics/binary/circulator) in get_step(src,SOUTH)
-
- if(circ1 && circ2 && (circ1.dir != EAST || circ2.dir != WEST))
- circ1 = null
- circ2 = null
-
-/obj/machinery/power/generator/proc/updateicon()
- if(isnull(src.overlay_image))
- src.overlay_image = image('icons/obj/power.dmi')
-
- overlays.Cut()
- if(!(stat & (NOPOWER|BROKEN)))
+ power_change()
+ update_icon()
+ updateDialog()
+
+/obj/machinery/power/generator/power_change()
+ if(!anchored)
+ stat |= NOPOWER
+ else
+ ..()
+
+/obj/machinery/power/generator/update_icon()
+ if(stat & (NOPOWER|BROKEN))
+ overlays.Cut()
+ else
+ overlays.Cut()
if(lastgenlev != 0)
- src.overlay_image.icon_state = "teg-op[lastgenlev]"
- overlays += src.overlay_image
+ overlays += image('icons/obj/power.dmi', "teg-op[lastgenlev]")
-/obj/machinery/power/generator/process()
- if(!circ1 || !circ2 || !anchored || stat & (BROKEN|NOPOWER))
+ overlays += image('icons/obj/power.dmi', "teg-oc[lastcirc]")
+
+/obj/machinery/power/generator/process()
+ if(stat & (NOPOWER|BROKEN))
return
+ if(!cold_circ || !hot_circ)
+ return
+
+ lastgen = 0
+
+ if(powernet)
+
+ //log_debug("cold_circ and hot_circ pass")
+
+ var/datum/gas_mixture/cold_air = cold_circ.return_transfer_air()
+ var/datum/gas_mixture/hot_air = hot_circ.return_transfer_air()
+
+ //log_debug("hot_air = [hot_air]; cold_air = [cold_air];")
+
+ if(cold_air && hot_air)
+
+ //log_debug("hot_air = [hot_air] temperature = [hot_air.temperature]; cold_air = [cold_air] temperature = [hot_air.temperature];")
+
+ //log_debug("coldair and hotair pass")
+ var/cold_air_heat_capacity = cold_air.heat_capacity()
+ var/hot_air_heat_capacity = hot_air.heat_capacity()
+
+ var/delta_temperature = hot_air.temperature - cold_air.temperature
+
+ //log_debug("delta_temperature = [delta_temperature]; cold_air_heat_capacity = [cold_air_heat_capacity]; hot_air_heat_capacity = [hot_air_heat_capacity]")
+
+ if(delta_temperature > 0 && cold_air_heat_capacity > 0 && hot_air_heat_capacity > 0)
+ var/efficiency = 0.65
+
+ var/energy_transfer = delta_temperature * hot_air_heat_capacity * cold_air_heat_capacity / (hot_air_heat_capacity + cold_air_heat_capacity)
+
+ var/heat = energy_transfer * (1 - efficiency)
+ lastgen = energy_transfer * efficiency
+
+ //log_debug("lastgen = [lastgen]; heat = [heat]; delta_temperature = [delta_temperature]; hot_air_heat_capacity = [hot_air_heat_capacity]; cold_air_heat_capacity = [cold_air_heat_capacity];")
+
+ hot_air.temperature = hot_air.temperature - energy_transfer / hot_air_heat_capacity
+ cold_air.temperature = cold_air.temperature + heat / cold_air_heat_capacity
+
+ //log_debug("POWER: [lastgen] W generated at [efficiency * 100]% efficiency and sinks sizes [cold_air_heat_capacity], [hot_air_heat_capacity]")
+
+ add_avail(lastgen)
+ // update icon overlays only if displayed level has changed
+
+ if(hot_air)
+ var/datum/gas_mixture/hot_circ_air1 = hot_circ.air1
+ hot_circ_air1.merge(hot_air)
+
+ if(cold_air)
+ var/datum/gas_mixture/cold_circ_air1 = cold_circ.air1
+ cold_circ_air1.merge(cold_air)
+
+ var/genlev = max(0, min( round(11 * lastgen / 100000), 11))
+ var/circ = "[cold_circ && cold_circ.last_pressure_delta > 0 ? "1" : "0"][hot_circ && hot_circ.last_pressure_delta > 0 ? "1" : "0"]"
+ if((genlev != lastgenlev) || (circ != lastcirc))
+ lastgenlev = genlev
+ lastcirc = circ
+ update_icon()
+
updateDialog()
- var/datum/gas_mixture/air1 = circ1.return_transfer_air()
- var/datum/gas_mixture/air2 = circ2.return_transfer_air()
- lastgen = 0
-
- if(air1 && air2)
- var/air1_heat_capacity = air1.heat_capacity()
- var/air2_heat_capacity = air2.heat_capacity()
- var/delta_temperature = abs(air2.temperature - air1.temperature)
-
- if(delta_temperature > 0 && air1_heat_capacity > 0 && air2_heat_capacity > 0)
- var/efficiency = 0.65
- var/energy_transfer = delta_temperature*air2_heat_capacity*air1_heat_capacity/(air2_heat_capacity+air1_heat_capacity)
- var/heat = energy_transfer*(1-efficiency)
- lastgen = energy_transfer*efficiency*0.05*power_multiplier
-
- if(air2.temperature > air1.temperature)
- air2.temperature = air2.temperature - energy_transfer/air2_heat_capacity
- air1.temperature = air1.temperature + heat/air1_heat_capacity
- else
- air2.temperature = air2.temperature + heat/air2_heat_capacity
- air1.temperature = air1.temperature - energy_transfer/air1_heat_capacity
-
- //Transfer the air
- if(air1)
- circ1.air2.merge(air1)
- if(air2)
- circ2.air2.merge(air2)
-
- //Update the gas networks
- if(circ1.parent2)
- circ1.parent2.update = 1
- if(circ2.parent2)
- circ2.parent2.update = 1
-
- // update icon overlays and power usage only if displayed level has changed
- if(lastgen > powercap && prob(10))
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
- s.set_up(3, 1, src)
- s.start()
- lastgen *= 0.5
- var/genlev = max(0, min( round(11*lastgen / powercap), 11))
- if(lastgen > 100 && genlev == 0)
- genlev = 1
- if(genlev != lastgenlev)
- lastgenlev = genlev
- updateicon()
- add_avail(lastgen)
-
/obj/machinery/power/generator/attack_ai(mob/user)
- if(stat & (BROKEN|NOPOWER)) return
+ return attack_hand(user)
+
+/obj/machinery/power/generator/attack_ghost(mob/user)
+ if(stat & (NOPOWER|BROKEN))
+ return
+ interact(user)
+
+/obj/machinery/power/generator/attack_hand(mob/user)
+ if(..())
+ user << browse(null, "window=teg")
+ return
interact(user)
/obj/machinery/power/generator/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/wrench))
anchored = !anchored
- to_chat(user, "\blue You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor.")
- use_power = anchored
- reconnect()
+ if(!anchored)
+ disconnect()
+ power_change()
+ else
+ connect()
+ playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
+ to_chat(user, "You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor.")
+ else if(istype(W, /obj/item/device/multitool))
+ if(cold_dir == WEST)
+ cold_dir = EAST
+ hot_dir = WEST
+ else
+ cold_dir = WEST
+ hot_dir = EAST
+ connect()
+ to_chat(user, "You reverse the generator's circulator settings. The cold circulator is now on the [dir2text(cold_dir)] side, and the heat circulator is now on the [dir2text(hot_dir)] side.")
+ update_desc()
else
- ..()
+ ..()
+
+/obj/machinery/power/generator/proc/get_menu(include_link = 1)
+ var/t = ""
+ if(!powernet)
+ t += "Unable to connect to the power network!"
+ t += "
Retry"
+ else if(cold_circ && hot_circ)
+ var/datum/gas_mixture/cold_circ_air1 = cold_circ.air1
+ var/datum/gas_mixture/cold_circ_air2 = cold_circ.air2
+ var/datum/gas_mixture/hot_circ_air1 = hot_circ.air1
+ var/datum/gas_mixture/hot_circ_air2 = hot_circ.air2
-/obj/machinery/power/generator/attack_hand(mob/user)
- add_fingerprint(user)
- if(stat & (BROKEN|NOPOWER) || !anchored) return
- interact(user)
+ t += ""
+ t += "Output: [round(lastgen)] W"
+
+ t += "
"
+
+ t += "Cold loop
"
+ t += "Temperature Inlet: [round(cold_circ_air2.temperature, 0.1)] K / Outlet: [round(cold_circ_air1.temperature, 0.1)] K
"
+ t += "Pressure Inlet: [round(cold_circ_air2.return_pressure(), 0.1)] kPa / Outlet: [round(cold_circ_air1.return_pressure(), 0.1)] kPa
"
+
+ t += "Hot loop
"
+ t += "Temperature Inlet: [round(hot_circ_air2.temperature, 0.1)] K / Outlet: [round(hot_circ_air1.temperature, 0.1)] K
"
+ t += "Pressure Inlet: [round(hot_circ_air2.return_pressure(), 0.1)] kPa / Outlet: [round(hot_circ_air1.return_pressure(), 0.1)] kPa
"
+
+ t += "
"
+ else
+ t += "Unable to locate all parts!"
+ t += "
Retry"
+ if(include_link)
+ t += "
Close"
+
+ return t
/obj/machinery/power/generator/interact(mob/user)
- if( (get_dist(src, user) > 1 ) && (!istype(user, /mob/living/silicon/ai)))
- user.unset_machine()
- user << browse(null, "window=teg")
- return
-
user.set_machine(src)
- var/t = "Thermo-Electric Generator
"
-
- if(circ1 && circ2)
- t += "Output : [round(lastgen)] W
"
-
- t += "Primary Circulator (top or right)
"
- t += "Inlet Pressure: [round(circ1.air1.return_pressure(), 0.1)] kPa
"
- t += "Inlet Temperature: [round(circ1.air1.temperature, 0.1)] K
"
- t += "Outlet Pressure: [round(circ1.air2.return_pressure(), 0.1)] kPa
"
- t += "Outlet Temperature: [round(circ1.air2.temperature, 0.1)] K
"
-
- t += "Secondary Circulator (bottom or left)
"
- t += "Inlet Pressure: [round(circ2.air1.return_pressure(), 0.1)] kPa
"
- t += "Inlet Temperature: [round(circ2.air1.temperature, 0.1)] K
"
- t += "Outlet Pressure: [round(circ2.air2.return_pressure(), 0.1)] kPa
"
- t += "Outlet Temperature: [round(circ2.air2.temperature, 0.1)] K
"
-
- else
- t += "Unable to connect to circulators.
"
- t += "Ensure both are in position and wrenched into place."
-
- t += "
"
- t += "
"
- t += "Refresh Close"
-
- user << browse(t, "window=teg;size=460x300")
- onclose(user, "teg")
+ var/datum/browser/popup = new(user, "teg", "Thermo-Electric Generator", 460, 300)
+ popup.set_content(get_menu())
+ popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
+ popup.open()
return 1
-
/obj/machinery/power/generator/Topic(href, href_list)
- ..()
+ if(..())
+ return 0
if( href_list["close"] )
usr << browse(null, "window=teg")
usr.unset_machine()
return 0
-
- updateDialog()
+ if( href_list["check"] )
+ if(!powernet || !cold_circ || !hot_circ)
+ connect()
return 1
-
/obj/machinery/power/generator/power_change()
..()
- updateicon()
-
-
-/obj/machinery/power/generator/verb/rotate_clock()
- set category = "Object"
- set name = "Rotate Generator (Clockwise)"
- set src in view(1)
-
- if(usr.stat || usr.restrained() || anchored)
- return
-
- src.dir = turn(src.dir, 90)
-
-/obj/machinery/power/generator/verb/rotate_anticlock()
- set category = "Object"
- set name = "Rotate Generator (Counterclockwise)"
- set src in view(1)
-
- if(usr.stat || usr.restrained() || anchored)
- return
-
- src.dir = turn(src.dir, -90)
\ No newline at end of file
+ update_icon()
\ No newline at end of file
diff --git a/code/modules/power/generator_type2.dm b/code/modules/power/generator_type2.dm
deleted file mode 100644
index d1ff1f1079c..00000000000
--- a/code/modules/power/generator_type2.dm
+++ /dev/null
@@ -1,143 +0,0 @@
-/obj/machinery/power/generator_type2
- name = "thermoelectric generator"
- desc = "It's a high efficiency thermoelectric generator."
- icon_state = "teg"
- anchored = 1
- density = 1
- use_power = 0
-
- var/obj/machinery/atmospherics/unary/generator_input/input1
- var/obj/machinery/atmospherics/unary/generator_input/input2
-
- var/lastgen = 0
- var/lastgenlev = -1
-
- var/image/overlay_image
-
-/obj/machinery/power/generator_type2/New()
- ..()
- spawn(5)
- input1 = locate(/obj/machinery/atmospherics/unary/generator_input) in get_step(src,turn(dir, 90))
- input2 = locate(/obj/machinery/atmospherics/unary/generator_input) in get_step(src,turn(dir, -90))
- if(!input1 || !input2)
- stat |= BROKEN
- updateicon()
-
-
-/obj/machinery/power/generator_type2/proc/updateicon()
-
- if(isnull(src.overlay_image))
- src.overlay_image = image('icons/obj/power.dmi')
-
- overlays.Cut()
- if(!(stat & (NOPOWER|BROKEN)))
-
- if(lastgenlev != 0)
- src.overlay_image.icon_state = "teg-op[lastgenlev]"
- overlays += src.overlay_image
-
-#define GENRATE 800 // generator output coefficient from Q
-
-
-/obj/machinery/power/generator_type2/process()
- if(!input1 || !input2)
- return
-
- var/datum/gas_mixture/air1 = input1.return_exchange_air()
- var/datum/gas_mixture/air2 = input2.return_exchange_air()
-
-
- lastgen = 0
-
- if(air1 && air2)
- var/datum/gas_mixture/hot_air = air1
- var/datum/gas_mixture/cold_air = air2
- if(hot_air.temperature < cold_air.temperature)
- hot_air = air2
- cold_air = air1
-
- var/hot_air_heat_capacity = hot_air.heat_capacity()
- var/cold_air_heat_capacity = cold_air.heat_capacity()
-
- var/delta_temperature = hot_air.temperature - cold_air.temperature
-
- if(delta_temperature > 1 && cold_air_heat_capacity > 0.01 && hot_air_heat_capacity > 0.01)
- var/efficiency = (1 - cold_air.temperature/hot_air.temperature)*0.65 //65% of Carnot efficiency
-
- var/energy_transfer = delta_temperature*hot_air_heat_capacity*cold_air_heat_capacity/(hot_air_heat_capacity+cold_air_heat_capacity)
-
- var/heat = energy_transfer*(1-efficiency)
- lastgen = energy_transfer*efficiency
-
- hot_air.temperature = hot_air.temperature - energy_transfer/hot_air_heat_capacity
- cold_air.temperature = cold_air.temperature + heat/cold_air_heat_capacity
-
-// to_chat(world, "POWER: [lastgen] W generated at [efficiency*100]% efficiency and sinks sizes [cold_air_heat_capacity], [hot_air_heat_capacity]")
-
- input1.parent.update = 1
- input2.parent.update = 1
-
- add_avail(lastgen)
- // update icon overlays only if displayed level has changed
-
- var/genlev = max(0, min( round(11*lastgen / 100000), 11))
- if(genlev != lastgenlev)
- lastgenlev = genlev
- updateicon()
-
- src.updateDialog()
-
-
-/obj/machinery/power/generator_type2/attack_ai(mob/user)
- if(stat & (BROKEN|NOPOWER)) return
- interact(user)
-
-
-/obj/machinery/power/generator_type2/attack_hand(mob/user)
- add_fingerprint(user)
- if(stat & (BROKEN|NOPOWER)) return
- interact(user)
-
-
-/obj/machinery/power/generator_type2/interact(mob/user)
- if( (get_dist(src, user) > 1 ) && (!istype(user, /mob/living/silicon/ai)))
- user.unset_machine()
- user << browse(null, "window=teg")
- return
-
- user.set_machine(src)
-
- var/t = "Thermo-Electric Generator
"
-
- t += "Output : [round(lastgen)] W
"
-
- t += "Cold loop
"
- t += "Temperature: [round(input1.air_contents.temperature, 0.1)] K
"
- t += "Pressure: [round(input1.air_contents.return_pressure(), 0.1)] kPa
"
-
- t += "Hot loop
"
- t += "Temperature: [round(input2.air_contents.temperature, 0.1)] K
"
- t += "Pressure: [round(input2.air_contents.return_pressure(), 0.1)] kPa
"
-
- t += "
Close"
-
- t += "
"
- user << browse(t, "window=teg;size=460x300")
- onclose(user, "teg")
- return 1
-
-
-/obj/machinery/power/generator_type2/Topic(href, href_list)
- ..()
-
- if( href_list["close"] )
- usr << browse(null, "window=teg")
- usr.unset_machine()
- return 0
-
- return 1
-
-
-/obj/machinery/power/generator_type2/power_change()
- ..()
- updateicon()
\ No newline at end of file
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 0f6d41fc145..420733f7c76 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -122,7 +122,7 @@
if(ishuman(mob))
//Hilariously enough, running into a closet should make you get hit the hardest.
var/mob/living/carbon/human/H = mob
- H.hallucination += max(50, min(300, DETONATION_HALLUCINATION * sqrt(1 / (get_dist(mob, src) + 1)) ) )
+ H.AdjustHallucinate(max(50, min(300, DETONATION_HALLUCINATION * sqrt(1 / (get_dist(mob, src) + 1)))))
var/rads = DETONATION_RADS * sqrt( 1 / (get_dist(mob, src) + 1) )
mob.apply_effect(rads, IRRADIATE)
@@ -189,7 +189,7 @@
var/obj/item/organ/internal/eyes/eyes = l.get_int_organ(/obj/item/organ/internal/eyes)
if(!istype(eyes))
continue
- l.hallucination = max(0, min(200, l.hallucination + power * config_hallucination_power * sqrt( 1 / max(1,get_dist(l, src)) ) ) )
+ l.Hallucinate(min(200, l.hallucination + power * config_hallucination_power * sqrt( 1 / max(1,get_dist(l, src)))))
for(var/mob/living/l in range(src, round((power / 100) ** 0.25)))
var/rads = (power / 10) * sqrt( 1 / max(get_dist(l, src),1) )
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 0ae9b10752e..275e2ec94e5 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -23,18 +23,18 @@
/obj/item/projectile/bullet/weakbullet/booze/on_hit(atom/target, blocked = 0)
if(..(target, blocked))
var/mob/living/M = target
- M.dizziness += 20
- M.slurring += 20
- M.confused += 20
- M.eye_blurry += 20
- M.drowsyness += 20
+ M.AdjustDizzy(20)
+ M.AdjustSlur(20)
+ M.AdjustConfused(20)
+ M.AdjustEyeBlurry(20)
+ M.AdjustDrowsy(20)
for(var/datum/reagent/ethanol/A in M.reagents.reagent_list)
M.AdjustParalysis(2)
- M.dizziness += 10
- M.slurring += 10
- M.confused += 10
- M.eye_blurry += 10
- M.drowsyness += 10
+ M.AdjustDizzy(10)
+ M.AdjustSlur(10)
+ M.AdjustConfused(10)
+ M.AdjustEyeBlurry(10)
+ M.AdjustDrowsy(10)
A.volume += 5 //Because we can
/obj/item/projectile/bullet/weakbullet2 //detective revolver instastuns, but multiple shots are better for keeping punks down
@@ -216,7 +216,7 @@
..(target, blocked)
if(iscarbon(target))
var/mob/living/carbon/M = target
- M.silent = max(M.silent, 10)
+ M.Silence(10)
else if(istype(target, /obj/mecha/combat/honker))
var/obj/mecha/chassis = target
chassis.occupant_message("A mimetech anti-honk bullet has hit \the [chassis]!")
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index 0e1b7478cc8..bcc4335f66a 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -186,7 +186,7 @@
if(ishuman(target))
var/mob/living/carbon/human/M = target
M.adjustBrainLoss(20)
- M.hallucination += 20
+ M.AdjustHallucinate(20)
/obj/item/projectile/clown
name = "snap-pop"
diff --git a/code/modules/reagents/newchem/Blob-Reagents.dm b/code/modules/reagents/newchem/Blob-Reagents.dm
index fa5e9747e34..a7cfa32f403 100644
--- a/code/modules/reagents/newchem/Blob-Reagents.dm
+++ b/code/modules/reagents/newchem/Blob-Reagents.dm
@@ -61,7 +61,7 @@
volume = ..()
M.apply_damage(0.4*volume, BRUTE)
M.apply_damage(1*volume, OXY)
- M.losebreath += round(0.3*volume)
+ M.AdjustLoseBreath(round(0.3*volume))
/datum/reagent/blob/kinetic //does semi-random brute damage
diff --git a/code/modules/reagents/newchem/disease.dm b/code/modules/reagents/newchem/disease.dm
index def94ba9a2c..cdc2d0b8d43 100644
--- a/code/modules/reagents/newchem/disease.dm
+++ b/code/modules/reagents/newchem/disease.dm
@@ -131,12 +131,12 @@
color = "#EC536D" // rgb: 236, 83, 109
/datum/reagent/synaphydramine/on_mob_life(mob/living/M)
- M.drowsyness = max(M.drowsyness-5, 0)
+ M.AdjustDrowsy(-5)
if(holder.has_reagent("lsd"))
holder.remove_reagent("lsd", 5)
if(holder.has_reagent("histamine"))
holder.remove_reagent("histamine", 5)
- M.hallucination = max(0, M.hallucination - 10)
+ M.AdjustHallucinate(-10)
if(prob(30))
M.adjustToxLoss(1)
..()
@@ -317,4 +317,4 @@
if(B && B.data)
var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
if(D)
- D.Devolve()
\ No newline at end of file
+ D.Devolve()
diff --git a/code/modules/reagents/newchem/drinks.dm b/code/modules/reagents/newchem/drinks.dm
index b1f789b7f22..da07f7a995f 100644
--- a/code/modules/reagents/newchem/drinks.dm
+++ b/code/modules/reagents/newchem/drinks.dm
@@ -15,7 +15,7 @@
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/reagent/ginsonic/on_mob_life(mob/living/M)
- M.drowsyness = max(0, M.drowsyness-5)
+ M.AdjustDrowsy(-5)
if(prob(25))
M.AdjustParalysis(-1)
M.AdjustStunned(-1)
diff --git a/code/modules/reagents/newchem/drugs.dm b/code/modules/reagents/newchem/drugs.dm
index 99a637e4fca..bc5b10be569 100644
--- a/code/modules/reagents/newchem/drugs.dm
+++ b/code/modules/reagents/newchem/drugs.dm
@@ -30,7 +30,7 @@
if(severity == 1)
if(effect <= 2)
M.visible_message("[M] looks nervous!")
- M.confused += 15
+ M.AdjustConfused(15)
M.adjustToxLoss(2)
M.Jitter(10)
M.emote("twitch_s")
@@ -55,7 +55,7 @@
M.Jitter(10)
M.adjustToxLoss(5)
M.Weaken(1)
- M.confused += 33
+ M.AdjustConfused(33)
else if(effect <= 7)
M.emote("collapse")
to_chat(M, "Your heart is pounding!")
@@ -90,7 +90,7 @@
if(prob(4))
to_chat(M, "You feel kinda awful!")
M.adjustToxLoss(1)
- M.jitteriness += 30
+ M.AdjustJitter(30)
M.emote(pick("groan", "moan"))
..()
@@ -99,7 +99,7 @@
if(severity == 1)
if(effect <= 2)
M.visible_message("[M] looks confused!")
- M.confused += 20
+ M.AdjustConfused(20)
M.Jitter(20)
M.emote("scream")
else if(effect <= 4)
@@ -123,7 +123,7 @@
M.adjustToxLoss(2)
M.adjustBrainLoss(8)
M.Weaken(3)
- M.confused += 25
+ M.AdjustConfused(25)
M.emote("scream")
M.reagents.add_reagent("jagged_crystals", 5)
else if(effect <= 7)
@@ -160,7 +160,7 @@
/datum/reagent/krokodil/on_mob_life(mob/living/M)
- M.jitteriness -= 40
+ M.AdjustJitter(-40)
if(prob(25))
M.adjustBrainLoss(1)
if(prob(15))
@@ -241,8 +241,8 @@
if(prob(5))
M.emote(pick("twitch_s","blink_r","shiver"))
if(current_cycle >= 25)
- M.jitteriness += 5
- M.drowsyness = max(0, M.drowsyness-10)
+ M.AdjustJitter(5)
+ M.AdjustDrowsy(-10)
M.AdjustParalysis(-2.5)
M.AdjustStunned(-2.5)
M.AdjustWeakened(-2.5)
@@ -262,7 +262,7 @@
if(severity == 1)
if(effect <= 2)
M.visible_message("[M] can't seem to control their legs!")
- M.confused += 20
+ M.AdjustConfused(20)
M.Weaken(4)
else if(effect <= 4)
M.visible_message("[M]'s hands flip out and flail everywhere!")
@@ -296,7 +296,7 @@
for(var/mob/living/carbon/C in range(T, 1))
if(C.can_breathe_gas())
C.emote("gasp")
- C.losebreath++
+ C.AdjustLoseBreath(1)
C.reagents.add_reagent("toxin", 10)
C.reagents.add_reagent("neurotoxin2", 20)
@@ -342,15 +342,15 @@
M.SetWeakened(0)
if(check < 30)
M.emote(pick("twitch", "twitch_s", "scream", "drool", "grumble", "mumble"))
- M.druggy = max(M.druggy, 15)
+ M.Druggy(15)
if(check < 20)
- M.confused += 10
+ M.AdjustConfused(10)
if(check < 8)
M.reagents.add_reagent(pick("methamphetamine", "crank", "neurotoxin"), rand(1,5))
M.visible_message("[M] scratches at something under their skin!")
M.adjustBruteLoss(5)
else if(check < 16)
- M.hallucination += 30
+ M.AdjustHallucinate(30)
else if(check < 24)
to_chat(M, "They're coming for you!")
else if(check < 28)
@@ -373,7 +373,7 @@
if(severity == 1)
if(effect <= 2)
M.visible_message("[M] flails around like a lunatic!")
- M.confused += 25
+ M.AdjustConfused(25)
M.Jitter(10)
M.emote("scream")
M.reagents.add_reagent("jagged_crystals", 5)
@@ -383,7 +383,7 @@
M.adjustToxLoss(2)
M.adjustBrainLoss(1)
M.Stun(3)
- M.eye_blurry = max(M.eye_blurry, 7)
+ M.EyeBlurry(7)
M.reagents.add_reagent("jagged_crystals", 5)
else if(effect <= 7)
M.emote("faint")
@@ -394,7 +394,7 @@
M.adjustToxLoss(2)
M.adjustBrainLoss(1)
M.Stun(3)
- M.eye_blurry = max(M.eye_blurry, 7)
+ M.EyeBlurry(7)
M.reagents.add_reagent("jagged_crystals", 5)
else if(effect <= 4)
M.visible_message("[M] convulses violently and falls to the floor!")
@@ -479,7 +479,7 @@
to_chat(M, "You cannot breathe!")
M.adjustOxyLoss(15)
M.Stun(1)
- M.losebreath++
+ M.AdjustLoseBreath(1)
..()
/datum/reagent/thc
@@ -497,10 +497,10 @@
if(prob(5))
to_chat(M, "[pick("You feel hungry.","Your stomach rumbles.","You feel cold.","You feel warm.")]")
if(prob(4))
- M.confused = max(M.confused, 10)
+ M.Confused(10)
if(volume >= 50 && prob(25))
if(prob(10))
- M.drowsyness = max(M.drowsyness, 10)
+ M.Drowsy(10)
..()
/datum/reagent/fliptonium
@@ -545,7 +545,7 @@
if(current_cycle == 50)
M.SpinAnimation(speed = 4, loops = -1)
- M.drowsyness = max(0, M.drowsyness-6)
+ M.AdjustDrowsy(-6)
M.AdjustParalysis(-1.5)
M.AdjustStunned(-1.5)
M.AdjustWeakened(-1.5)
@@ -561,7 +561,7 @@
if(severity == 1)
if(effect <= 2)
M.visible_message("[M] can't seem to control their legs!")
- M.confused += 33
+ M.AdjustConfused(33)
M.Weaken(2)
else if(effect <= 4)
M.visible_message("[M]'s hands flip out and flail everywhere!")
@@ -655,7 +655,7 @@
/datum/reagent/surge/on_mob_life(mob/living/M)
- M.druggy = max(M.druggy, 15)
+ M.Druggy(15)
var/high_message = pick("You feel calm.", "You feel collected.", "You feel like you need to relax.")
if(prob(1))
if(prob(1))
diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm
index 777c10ebfd7..a84ac83f385 100644
--- a/code/modules/reagents/newchem/medicine.dm
+++ b/code/modules/reagents/newchem/medicine.dm
@@ -167,7 +167,7 @@
M.adjustBruteLoss(-2*REM)
M.adjustFireLoss(-2*REM)
if(prob(50))
- M.losebreath -= 1
+ M.AdjustLoseBreath(-1)
..()
/datum/reagent/omnizine/overdose_process(mob/living/M, severity)
@@ -181,7 +181,7 @@
M.Weaken(4)
else if(effect <= 3)
M.visible_message("[M] completely spaces out for a moment.")
- M.confused += 15
+ M.AdjustConfused(15)
else if(effect <= 5)
M.visible_message("[M] stumbles and staggers.")
M.Dizzy(5)
@@ -317,7 +317,7 @@
/datum/reagent/salbutamol/on_mob_life(mob/living/M)
M.adjustOxyLoss(-6*REM)
- M.losebreath = max(0, M.losebreath-4)
+ M.AdjustLoseBreath(-4)
..()
/datum/chemical_reaction/salbutamol
@@ -341,8 +341,8 @@
/datum/reagent/perfluorodecalin/on_mob_life(mob/living/carbon/human/M)
M.adjustOxyLoss(-25*REM)
if(volume >= 4)
- M.losebreath = max(M.losebreath, 6)
- M.silent = max(M.silent, 6)
+ M.LoseBreath(6)
+ M.Silence(6)
if(prob(33))
M.adjustBruteLoss(-1*REM)
M.adjustFireLoss(-1*REM)
@@ -369,13 +369,12 @@
addiction_chance = 25
/datum/reagent/ephedrine/on_mob_life(mob/living/M)
- M.drowsyness = max(0, M.drowsyness-5)
+ M.AdjustDrowsy(-5)
M.AdjustParalysis(-1)
M.AdjustStunned(-1)
M.AdjustWeakened(-1)
M.adjustStaminaLoss(-1*REM)
- if(M.losebreath > 5)
- M.losebreath = max(5, M.losebreath-1)
+ M.AdjustLoseBreath(-1, bound_lower = 5)
if(M.oxyloss > 75)
M.adjustOxyLoss(-1)
if(M.health < 0 || M.health > 0 && prob(33))
@@ -422,14 +421,14 @@
addiction_chance = 10
/datum/reagent/diphenhydramine/on_mob_life(mob/living/M)
- M.jitteriness = max(0, M.jitteriness-20)
+ M.AdjustJitter(-20)
M.reagents.remove_reagent("histamine",3)
M.reagents.remove_reagent("itching_powder",3)
if(prob(7))
M.emote("yawn")
if(prob(3))
M.Stun(2)
- M.drowsyness += 1
+ M.AdjustDrowsy(1)
M.visible_message("[M] looks a bit dazed.")
..()
@@ -453,16 +452,16 @@
shock_reduction = 50
/datum/reagent/morphine/on_mob_life(mob/living/M)
- M.jitteriness = max(0, M.jitteriness-25)
+ M.AdjustJitter(-25)
switch(current_cycle)
if(1 to 15)
if(prob(7))
M.emote("yawn")
if(16 to 35)
- M.drowsyness = max(M.drowsyness, 20)
+ M.Drowsy(20)
if(36 to INFINITY)
M.Paralyse(15)
- M.drowsyness = max(M.drowsyness, 20)
+ M.Drowsy(20)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.traumatic_shock < 100)
@@ -476,16 +475,16 @@
var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes)
if(istype(E))
E.damage = max(E.damage-1, 0)
- M.eye_blurry = max(M.eye_blurry-1 , 0)
- M.adjustEarDamage(-1,0)
+ M.AdjustEyeBlurry(-1)
+ M.AdjustEarDamage(-1)
if(prob(50))
- M.disabilities &= ~NEARSIGHTED
+ M.CureNearsighted()
if(prob(30))
- M.disabilities &= ~BLIND
- M.eye_blind = 0
+ M.CureBlind()
+ M.SetEyeBlind(0)
if(M.ear_damage <= 25)
if(prob(30))
- M.setEarDamage(-1,0)
+ M.SetEarDeaf(0)
..()
/datum/chemical_reaction/oculine
@@ -515,12 +514,11 @@
overdose_threshold = 25
/datum/reagent/atropine/on_mob_life(mob/living/M)
- M.dizziness += 1
- M.confused = max(M.confused, 5)
+ M.AdjustDizzy(1)
+ M.Confused(5)
if(prob(4))
M.emote("collapse")
- if(M.losebreath > 5)
- M.losebreath = max(5, M.losebreath-5)
+ M.AdjustLoseBreath(-5, bound_lower = 5)
if(M.oxyloss > 65)
M.adjustOxyLoss(-10*REM)
if(M.health < -25)
@@ -550,7 +548,7 @@
overdose_threshold = 20
/datum/reagent/epinephrine/on_mob_life(mob/living/M)
- M.drowsyness = max(0, M.drowsyness-5)
+ M.AdjustDrowsy(-5)
if(prob(20))
M.AdjustParalysis(-1)
if(prob(20))
@@ -562,8 +560,7 @@
if(prob(5))
M.adjustBrainLoss(-1)
holder.remove_reagent("histamine", 15)
- if(M.losebreath > 3)
- M.losebreath--
+ M.AdjustLoseBreath(-1, bound_lower = 3)
if(M.oxyloss > 35)
M.adjustOxyLoss(-10*REM)
if(M.health < -10 && M.health > -65)
@@ -694,7 +691,7 @@
color = "#D1D1F1"
/datum/reagent/mutadone/on_mob_life(mob/living/carbon/human/M)
- M.jitteriness = 0
+ M.SetJitter(0)
var/needs_update = M.mutations.len > 0 || M.disabilities > 0
if(needs_update)
@@ -733,7 +730,7 @@
color = "#009CA8"
/datum/reagent/antihol/on_mob_life(mob/living/M)
- M.slurring = 0
+ M.SetSlur(0)
M.AdjustDrunk(-4)
M.reagents.remove_all_type(/datum/reagent/ethanol, 8, 0, 1)
if(M.toxloss <= 25)
@@ -763,10 +760,10 @@
M.adjustBruteLoss(-10*REM)
M.adjustFireLoss(-10*REM)
M.setStaminaLoss(0)
- M.slowed = 0
- M.dizziness = max(0,M.dizziness-10)
- M.drowsyness = max(0,M.drowsyness-10)
- M.confused = 0
+ M.SetSlowed(0)
+ M.AdjustDizzy(-10)
+ M.AdjustDrowsy(-10)
+ M.SetConfused(0)
M.SetSleeping(0)
var/status = CANSTUN | CANWEAKEN | CANPARALYSE
M.status_flags &= ~status
@@ -811,7 +808,7 @@
if(prob(33))
M.adjustStaminaLoss(2.5*REM)
M.adjustToxLoss(1*REM)
- M.losebreath++
+ M.AdjustLoseBreath(1)
/datum/reagent/insulin
name = "Insulin"
@@ -882,11 +879,11 @@
M.reagents.remove_reagent("bath_salts", 5)
M.reagents.remove_reagent("lsd", 5)
M.reagents.remove_reagent("thc", 5)
- M.druggy -= 5
- M.hallucination -= 5
- M.jitteriness -= 5
+ M.AdjustDruggy(-5)
+ M.AdjustHallucinate(-5)
+ M.AdjustJitter(-5)
if(prob(50))
- M.drowsyness = max(M.drowsyness, 3)
+ M.Drowsy(3)
if(prob(10))
M.emote("drool")
if(prob(20))
@@ -910,16 +907,16 @@
color = "#96DEDE"
/datum/reagent/ether/on_mob_life(mob/living/M)
- M.jitteriness = max(M.jitteriness-25,0)
+ M.AdjustJitter(-25)
switch(current_cycle)
if(1 to 15)
if(prob(7))
M.emote("yawn")
if(16 to 35)
- M.drowsyness = max(M.drowsyness, 20)
+ M.Drowsy(20)
if(36 to INFINITY)
M.Paralyse(15)
- M.drowsyness = max(M.drowsyness, 20)
+ M.Drowsy(20)
..()
/datum/chemical_reaction/ether
@@ -960,7 +957,7 @@
M.AdjustParalysis(-1)
M.AdjustStunned(-1)
M.AdjustWeakened(-1)
- M.confused = max(0, M.confused-5)
+ M.AdjustConfused(-5)
for(var/datum/reagent/R in M.reagents.reagent_list)
if(R != src)
if(R.id == "ultralube" || R.id == "lube")
@@ -1037,7 +1034,7 @@
M.Weaken(4)
else if(effect <= 3)
M.visible_message("[M] completely spaces out for a moment.")
- M.confused += 15
+ M.AdjustConfused(15)
else if(effect <= 5)
M.visible_message("[M] stumbles and staggers.")
M.Dizzy(5)
diff --git a/code/modules/reagents/newchem/pyro.dm b/code/modules/reagents/newchem/pyro.dm
index 6dece72544c..05ecb1b1206 100644
--- a/code/modules/reagents/newchem/pyro.dm
+++ b/code/modules/reagents/newchem/pyro.dm
@@ -356,12 +356,13 @@
if(!ear_safety)
M.Stun(max(10/distance, 3))
M.Weaken(max(10/distance, 3))
- M.setEarDamage(M.ear_damage + rand(0, 5), max(M.ear_deaf,15))
+ M.AdjustEarDamage(rand(0, 5))
+ M.EarDeaf(15)
if(M.ear_damage >= 15)
to_chat(M, "Your ears start to ring badly!")
- if(prob(M.ear_damage - 10 + 5))
+ if(prob(M.ear_damage - 5))
to_chat(M, "You can't hear anything!")
- M.disabilities |= DEAF
+ M.BecomeDeaf()
else
if(M.ear_damage >= 5)
to_chat(M, "Your ears start to ring!")
@@ -384,10 +385,11 @@
if(!ear_safety)
M.Stun(max(10/distance, 3))
M.Weaken(max(10/distance, 3))
- M.setEarDamage(M.ear_damage + rand(0, 5), max(M.ear_deaf,15))
+ M.AdjustEarDamage(rand(0, 5))
+ M.EarDeaf(15)
if(M.ear_damage >= 15)
to_chat(M, "Your ears start to ring badly!")
- if(prob(M.ear_damage - 10 + 5))
+ if(prob(M.ear_damage - 5))
to_chat(M, "You can't hear anything!")
M.disabilities |= DEAF
else
@@ -619,4 +621,4 @@
if(method == TOUCH)
M.adjust_fire_stacks(volume / 5)
return
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm
index 56d64d9a62e..d8e8205b1f7 100644
--- a/code/modules/reagents/newchem/toxins.dm
+++ b/code/modules/reagents/newchem/toxins.dm
@@ -41,7 +41,7 @@
if(prob(10))
to_chat(M, "Your eyes itch.")
M.emote(pick("blink", "sneeze"))
- M.eye_blurry += 3
+ M.AdjustEyeBlurry(3)
if(prob(10))
M.visible_message("[M] scratches at an itch.")
M.adjustBruteLoss(1)
@@ -141,7 +141,7 @@
if(prob(4))
M.visible_message("[M] starts convulsing violently!", "You feel as if your body is tearing itself apart!")
M.Weaken(15)
- M.jitteriness += 1000
+ M.AdjustJitter(1000)
spawn(rand(20, 100))
M.gib()
@@ -159,19 +159,19 @@
current_cycle++
return
if(5 to 8)
- M.dizziness += 1
- M.confused = max(M.confused, 10)
+ M.AdjustDizzy(1)
+ M.Confused(10)
if(9 to 12)
- M.drowsyness = max(M.drowsyness, 10)
- M.dizziness += 1
- M.confused = max(M.confused, 20)
+ M.Drowsy(10)
+ M.AdjustDizzy(1)
+ M.Confused(20)
if(13)
M.emote("faint")
if(14 to INFINITY)
M.Paralyse(10)
- M.drowsyness = max(M.drowsyness, 20)
+ M.Drowsy(20)
- M.jitteriness = max(0, M.jitteriness-30)
+ M.AdjustJitter(-30)
if(M.getBrainLoss() <= 80)
M.adjustBrainLoss(1)
else
@@ -207,7 +207,7 @@
M.emote("drool")
if(prob(10))
to_chat(M, "You cannot breathe!")
- M.losebreath += 1
+ M.AdjustLoseBreath(1)
M.emote("gasp")
if(prob(8))
to_chat(M, "You feel horrendously weak!")
@@ -261,7 +261,7 @@
to_chat(M, "AHHHHHH!")
M.adjustBruteLoss(5)
M.Weaken(5)
- M.jitteriness += 6
+ M.AdjustJitter(6)
M.visible_message("[M] falls to the floor, scratching themselves violently!")
M.emote("scream")
..()
@@ -364,11 +364,11 @@
if(prob(10))
to_chat(M, "You cannot breathe!")
M.adjustOxyLoss(10)
- M.losebreath++
+ M.AdjustLoseBreath(1)
if(prob(10))
to_chat(M, "Your chest is burning with pain!")
M.adjustOxyLoss(10)
- M.losebreath++
+ M.AdjustLoseBreath(1)
M.Stun(3)
M.Weaken(2)
if(ishuman(M))
@@ -425,12 +425,12 @@
M.Weaken(20)
if(prob(10))
M.emote(pick("drool", "tremble", "gasp"))
- M.losebreath++
+ M.AdjustLoseBreath(1)
if(prob(9))
to_chat(M, "You can't [pick("move", "feel your legs", "feel your face", "feel anything")]!")
if(prob(7))
to_chat(M, "You can't breathe!")
- M.losebreath += 3
+ M.AdjustLoseBreath(3)
..()
/datum/reagent/sodium_thiopental
@@ -445,15 +445,15 @@
switch(current_cycle)
if(1)
M.emote("drool")
- M.confused = max(M.confused, 5)
+ M.Confused(5)
if(2 to 4)
- M.drowsyness = max(M.drowsyness, 20)
+ M.Drowsy(20)
if(5)
M.emote("faint")
M.Weaken(5)
if(6 to INFINITY)
M.Paralyse(20)
- M.jitteriness = max(0, M.jitteriness-50)
+ M.AdjustJitter(-50)
if(prob(10))
M.emote("drool")
M.adjustBrainLoss(1)
@@ -474,7 +474,7 @@
if(prob(25))
M.emote("yawn")
if(6 to 9)
- M.eye_blurry += 5
+ M.AdjustEyeBlurry(5)
if(prob(35))
M.emote("yawn")
if(10)
@@ -502,20 +502,20 @@
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/reagent/sulfonal/on_mob_life(mob/living/M)
- M.jitteriness = max(0, M.jitteriness-30)
+ M.AdjustJitter(-30)
switch(current_cycle)
if(1 to 10)
if(prob(7))
M.emote("yawn")
if(11 to 20)
- M.drowsyness = max(M.drowsyness, 20)
+ M.Drowsy(20)
if(21)
M.emote("faint")
if(22 to INFINITY)
if(prob(20))
M.emote("faint")
M.Paralyse(5)
- M.drowsyness = max(M.drowsyness, 20)
+ M.Drowsy(20)
M.adjustToxLoss(1)
..()
@@ -570,7 +570,7 @@
/datum/reagent/coniine/on_mob_life(mob/living/M)
M.adjustToxLoss(2)
- M.losebreath += 5
+ M.AdjustLoseBreath(5)
..()
/datum/reagent/curare
@@ -590,7 +590,7 @@
if(prob(20))
M.emote(pick("drool", "pale", "gasp"))
if(6 to 10)
- M.eye_blurry += 5
+ M.AdjustEyeBlurry(5)
if(prob(8))
to_chat(M, "You feel [pick("weak", "horribly weak", "numb", "like you can barely move", "tingly")].")
M.Stun(1)
@@ -598,12 +598,12 @@
M.emote(pick("drool","pale", "gasp"))
if(11 to INFINITY)
M.Stun(30)
- M.drowsyness = max(M.drowsyness, 20)
+ M.Drowsy(20)
if(prob(20))
M.emote(pick("drool", "faint", "pale", "gasp", "collapse"))
else if(prob(8))
to_chat(M, "You can't [pick("breathe", "move", "feel your legs", "feel your face", "feel anything")]!")
- M.losebreath++
+ M.AdjustLoseBreath(1)
..()
/datum/reagent/sarin
@@ -636,22 +636,22 @@
/datum/reagent/sarin/on_mob_life(mob/living/M)
switch(current_cycle)
if(1 to 15)
- M.jitteriness += 20
+ M.AdjustJitter(20)
if(prob(20))
M.emote(pick("twitch","twitch_s","quiver"))
if(16 to 30)
if(prob(25))
M.emote(pick("twitch","twitch","drool","quiver","tremble"))
- M.eye_blurry += 5
- M.stuttering = max(M.stuttering, 5)
+ M.AdjustEyeBlurry(5)
+ M.Stuttering(5)
if(prob(10))
- M.confused = max(M.confused, 15)
+ M.Confused(15)
if(prob(15))
M.Stun(1)
M.emote("scream")
if(30 to 60)
- M.eye_blurry += 5
- M.stuttering = max(M.stuttering, 5)
+ M.AdjustEyeBlurry(5)
+ M.Stuttering(5)
if(prob(10))
M.Stun(1)
M.emote(pick("twitch","twitch","drool","shake","tremble"))
@@ -660,15 +660,15 @@
if(prob(5))
M.Weaken(3)
M.visible_message("[M] has a seizure!")
- M.jitteriness = 1000
+ M.SetJitter(1000)
if(prob(5))
to_chat(M, "You can't breathe!")
M.emote(pick("gasp", "choke", "cough"))
- M.losebreath++
+ M.AdjustLoseBreath(1)
if(61 to INFINITY)
if(prob(15))
M.emote(pick("gasp", "choke", "cough","twitch", "shake", "tremble","quiver","drool", "twitch","collapse"))
- M.losebreath = max(5, M.losebreath + 5)
+ M.LoseBreath(5)
M.adjustToxLoss(1)
M.adjustBrainLoss(1)
M.Weaken(4)
@@ -754,16 +754,16 @@
/datum/reagent/capulettium/on_mob_life(mob/living/M)
switch(current_cycle)
if(1 to 5)
- M.eye_blurry += 10
+ M.AdjustEyeBlurry(10)
if(6 to 10)
- M.drowsyness = max(M.drowsyness, 10)
+ M.Drowsy(10)
if(11)
M.Paralyse(10)
M.visible_message("[M] seizes up and falls limp, their eyes dead and lifeless...") //so you can't trigger deathgasp emote on people. Edge case, but necessary.
if(12 to 60)
M.Paralyse(10)
if(61 to INFINITY)
- M.eye_blurry += 10
+ M.AdjustEyeBlurry(10)
..()
/datum/reagent/capulettium_plus
@@ -783,7 +783,7 @@
mix_message = "The solution begins to slosh about violently by itself."
/datum/reagent/capulettium_plus/on_mob_life(mob/living/M)
- M.silent = max(M.silent, 2)
+ M.Silence(2)
..()
/datum/reagent/toxic_slurry
@@ -884,4 +884,4 @@
var/location = get_turf(holder.my_atom)
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(6, 1, location)
- s.start()
\ No newline at end of file
+ s.start()
diff --git a/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm b/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
index da92ffee0f2..e337aa10e1f 100644
--- a/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
+++ b/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
@@ -13,7 +13,7 @@
/datum/reagent/ethanol/on_mob_life(mob/living/M)
M.nutrition += nutriment_factor
M.AdjustDrunk(alcohol_perc)
- M.dizziness += dizzy_adj
+ M.AdjustDizzy(dizzy_adj)
..()
@@ -84,7 +84,7 @@
//copy paste from LSD... shoot me
/datum/reagent/ethanol/absinthe/on_mob_life(mob/living/M)
- M.hallucination += 5
+ M.AdjustHallucinate(5)
..()
/datum/reagent/ethanol/absinthe/overdose_process(mob/living/M, severity)
@@ -97,10 +97,7 @@
color = "#664300" // rgb: 102, 67, 0
overdose_threshold = 30
alcohol_perc = 0.4
-
-/datum/reagent/ethanol/rum/on_mob_life(mob/living/M)
- M.dizziness +=5
- ..()
+ dizzy_adj = 5
/datum/reagent/ethanol/rum/overdose_process(mob/living/M, severity)
M.adjustToxLoss(1)
@@ -182,7 +179,7 @@
/datum/reagent/ethanol/thirteenloko/on_mob_life(mob/living/M)
M.nutrition += nutriment_factor
- M.drowsyness = max(0, M.drowsyness-7)
+ M.AdjustDrowsy(-7)
M.AdjustSleeping(-2)
if(M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
@@ -625,7 +622,7 @@
/datum/reagent/ethanol/neurotoxin/on_mob_life(mob/living/M)
M.weakened = max(M.weakened, 3)
if(current_cycle >=55)
- M.druggy = max(M.druggy, 55)
+ M.Druggy(55)
if(current_cycle >=200)
M.adjustToxLoss(2)
..()
@@ -637,10 +634,7 @@
reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
alcohol_perc = 0.7
-
-/datum/reagent/ethanol/changelingsting/on_mob_life(mob/living/M)
- M.dizziness +=5
- ..()
+ dizzy_adj = 5
/datum/reagent/ethanol/irishcarbomb
name = "Irish Car Bomb"
@@ -649,10 +643,7 @@
reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
alcohol_perc = 0.3
-
-/datum/reagent/ethanol/irishcarbomb/on_mob_life(mob/living/M)
- M.dizziness +=5
- ..()
+ dizzy_adj = 5
/datum/reagent/ethanol/syndicatebomb
name = "Syndicate Bomb"
@@ -677,9 +668,9 @@
nutriment_factor = 1 * FOOD_METABOLISM
color = "#2E6671" // rgb: 46, 102, 113
alcohol_perc = 0.5
+ dizzy_adj = 10
/datum/reagent/ethanol/driestmartini/on_mob_life(mob/living/M)
- M.dizziness +=10
if(current_cycle >= 55 && current_cycle < 115)
M.stuttering += 10
..()
@@ -692,8 +683,8 @@
alcohol_perc = 0.2
/datum/reagent/ethanol/kahlua/on_mob_life(mob/living/M)
- M.dizziness = max(0, M.dizziness-5)
- M.drowsyness = max(0, M.drowsyness-3)
+ M.AdjustDizzy(-5)
+ M.AdjustDrowsy(-3)
M.AdjustSleeping(-2)
M.Jitter(5)
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm b/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm
index 26bad6c1665..869e9295bf5 100644
--- a/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm
+++ b/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm
@@ -38,8 +38,8 @@
color = "#973800" // rgb: 151, 56, 0
/datum/reagent/drink/carrotjuicde/on_mob_life(mob/living/M)
- M.eye_blurry = max(M.eye_blurry-1 , 0)
- M.eye_blind = max(M.eye_blind-1 , 0)
+ M.AdjustEyeBlurry(-1)
+ M.AdjustEyeBlind(-1)
switch(current_cycle)
if(1 to 20)
//nothing
@@ -282,4 +282,4 @@
if(ishuman(M) && M.job in list("Mime"))
M.adjustBruteLoss(-1)
M.adjustFireLoss(-1)
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/reagents/oldchem/reagents/drink/reagents_drink_base.dm b/code/modules/reagents/oldchem/reagents/drink/reagents_drink_base.dm
index 1868489adb7..6e30efb9423 100644
--- a/code/modules/reagents/oldchem/reagents/drink/reagents_drink_base.dm
+++ b/code/modules/reagents/oldchem/reagents/drink/reagents_drink_base.dm
@@ -14,9 +14,9 @@
/datum/reagent/drink/on_mob_life(mob/living/M)
M.nutrition += nutriment_factor
if(adj_dizzy)
- M.dizziness = max(0, M.dizziness + adj_dizzy)
+ M.AdjustDizzy(adj_dizzy)
if(adj_drowsy)
- M.drowsyness = max(0, M.drowsyness + adj_drowsy)
+ M.AdjustDrowsy(adj_drowsy)
if(adj_sleepy)
M.AdjustSleeping(adj_sleepy)
if(adj_temp_hot)
@@ -25,4 +25,4 @@
if(adj_temp_cool)
if(M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = max(310, M.bodytemperature - (adj_temp_cool * TEMPERATURE_DAMAGE_COEFFICIENT))
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/reagents/oldchem/reagents/drink/reagents_drink_cold.dm b/code/modules/reagents/oldchem/reagents/drink/reagents_drink_cold.dm
index fe54ed97246..26164571769 100644
--- a/code/modules/reagents/oldchem/reagents/drink/reagents_drink_cold.dm
+++ b/code/modules/reagents/oldchem/reagents/drink/reagents_drink_cold.dm
@@ -48,9 +48,9 @@
/datum/reagent/drink/cold/nuka_cola/on_mob_life(mob/living/M)
M.Jitter(20)
- M.druggy = max(M.druggy, 30)
- M.dizziness +=5
- M.drowsyness = 0
+ M.Druggy(30)
+ M.AdjustDizzy(5)
+ M.SetDrowsy(0)
M.status_flags |= GOTTAGOFAST
..()
@@ -121,4 +121,4 @@
/datum/reagent/drink/cold/rewriter/on_mob_life(mob/living/M)
M.Jitter(5)
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/reagents/oldchem/reagents/reagents_admin.dm b/code/modules/reagents/oldchem/reagents/reagents_admin.dm
index ccc617d2aaa..09636bd111f 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_admin.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_admin.dm
@@ -14,7 +14,6 @@
M.adjustBruteLoss(-5)
M.adjustFireLoss(-5)
M.adjustToxLoss(-5)
- M.hallucination = 0
M.setBrainLoss(0)
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -24,20 +23,28 @@
for(var/obj/item/organ/external/E in H.organs)
if(E.mend_fracture())
E.perma_injury = 0
- M.disabilities = 0
- M.eye_blurry = 0
- M.eye_blind = 0
+ M.SetEyeBlind(0)
+ M.CureNearsighted()
+ M.CureBlind()
+ M.CureMute()
+ M.CureDeaf()
+ M.CureEpilepsy()
+ M.CureTourettes()
+ M.CureCoughing()
+ M.CureNervous()
+ M.SetEyeBlurry(0)
M.SetWeakened(0)
M.SetStunned(0)
M.SetParalysis(0)
- M.silent = 0
- M.dizziness = 0
- M.drowsyness = 0
- M.stuttering = 0
- M.slurring = 0
- M.confused = 0
+ M.SetSilence(0)
+ M.SetHallucinate(0)
+ M.SetDizzy(0)
+ M.SetDrowsy(0)
+ M.SetStuttering(0)
+ M.SetSlur(0)
+ M.SetConfused(0)
M.SetSleeping(0)
- M.jitteriness = 0
+ M.SetJitter(0)
for(var/datum/disease/D in M.viruses)
if(D.severity == NONTHREAT)
continue
@@ -73,4 +80,4 @@
outgoing += tocheck
else
outgoing += tocheck
- return outgoing
\ No newline at end of file
+ return outgoing
diff --git a/code/modules/reagents/oldchem/reagents/reagents_drugs.dm b/code/modules/reagents/oldchem/reagents/reagents_drugs.dm
index 7cbc79b41b0..1fd0188287a 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_drugs.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_drugs.dm
@@ -37,7 +37,7 @@
metabolization_rate = 0.2 * REAGENTS_METABOLISM
/datum/reagent/hippies_delight/on_mob_life(mob/living/M)
- M.druggy = max(M.druggy, 50)
+ M.Druggy(50)
switch(current_cycle)
if(1 to 5)
if(!M.stuttering) M.stuttering = 1
@@ -47,13 +47,13 @@
if(!M.stuttering) M.stuttering = 1
M.Jitter(20)
M.Dizzy(20)
- M.druggy = max(M.druggy, 45)
+ M.Druggy(45)
if(prob(20)) M.emote(pick("twitch","giggle"))
if(10 to INFINITY)
if(!M.stuttering) M.stuttering = 1
M.Jitter(40)
M.Dizzy(40)
- M.druggy = max(M.druggy, 60)
+ M.Druggy(60)
if(prob(30)) M.emote(pick("twitch","giggle"))
..()
@@ -65,8 +65,8 @@
color = "#0000D8"
/datum/reagent/lsd/on_mob_life(mob/living/M)
- M.druggy = max(M.druggy, 15)
- M.hallucination += 10
+ M.Druggy(15)
+ M.AdjustHallucinate(10)
..()
/datum/reagent/space_drugs
@@ -80,7 +80,7 @@
heart_rate_decrease = 1
/datum/reagent/space_drugs/on_mob_life(mob/living/M)
- M.druggy = max(M.druggy, 15)
+ M.Druggy(15)
if(isturf(M.loc) && !istype(M.loc, /turf/space))
if(M.canmove && !M.restrained())
step(M, pick(cardinal))
@@ -94,22 +94,22 @@
color = "#E700E7" // rgb: 231, 0, 231
/datum/reagent/psilocybin/on_mob_life(mob/living/M)
- M.druggy = max(M.druggy, 30)
+ M.Druggy(30)
switch(current_cycle)
if(1 to 5)
- if(!M.stuttering) M.stuttering = 1
+ M.Stuttering(1)
M.Dizzy(5)
if(prob(10)) M.emote(pick("twitch","giggle"))
if(5 to 10)
- if(!M.stuttering) M.stuttering = 1
+ M.Stuttering(1)
M.Jitter(10)
M.Dizzy(10)
- M.druggy = max(M.druggy, 35)
+ M.Druggy(35)
if(prob(20)) M.emote(pick("twitch","giggle"))
if(10 to INFINITY)
- if(!M.stuttering) M.stuttering = 1
+ M.Stuttering(1)
M.Jitter(20)
M.Dizzy(20)
- M.druggy = max(M.druggy, 40)
+ M.Druggy(40)
if(prob(30)) M.emote(pick("twitch","giggle"))
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/reagents/oldchem/reagents/reagents_flammable.dm b/code/modules/reagents/oldchem/reagents/reagents_flammable.dm
index 52d33e21e07..61228dfb2d0 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_flammable.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_flammable.dm
@@ -22,7 +22,7 @@
M.adjustBrainLoss(3)
if(iscultist(M))
M.status_flags |= GOTTAGOFAST
- M.drowsyness = max(M.drowsyness-5, 0)
+ M.AdjustDrowsy(-5)
M.AdjustParalysis(-2)
M.AdjustStunned(-2)
M.AdjustWeakened(-2)
@@ -78,4 +78,4 @@
id = "glycerol"
description = "Glycerol is a simple polyol compound. Glycerol is sweet-tasting and of low toxicity."
reagent_state = LIQUID
- color = "#808080" // rgb: 128, 128, 128
\ No newline at end of file
+ color = "#808080" // rgb: 128, 128, 128
diff --git a/code/modules/reagents/oldchem/reagents/reagents_food.dm b/code/modules/reagents/oldchem/reagents/reagents_food.dm
index 1dbe1f05a20..de52805fef2 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_food.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_food.dm
@@ -370,9 +370,9 @@
overdose_threshold = 200 // Hyperglycaemic shock
/datum/reagent/sugar/on_mob_life(mob/living/M)
- M.drowsyness = max(0, M.drowsyness-5)
+ M.AdjustDrowsy(-5)
if(current_cycle >= 90)
- M.jitteriness += 2
+ M.AdjustJitter(2)
if(prob(50))
M.AdjustParalysis(-1)
M.AdjustStunned(-1)
@@ -391,4 +391,3 @@
M.Weaken(4 * severity)
if(prob(8))
M.adjustToxLoss(severity)
-
diff --git a/code/modules/reagents/oldchem/reagents/reagents_med.dm b/code/modules/reagents/oldchem/reagents/reagents_med.dm
index cc5592dd42e..b0a09afc999 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_med.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_med.dm
@@ -41,7 +41,7 @@
overdose_threshold = 40
/datum/reagent/synaptizine/on_mob_life(mob/living/M)
- M.drowsyness = max(0, M.drowsyness-5)
+ M.AdjustDrowsy(-5)
M.AdjustParalysis(-1)
M.AdjustStunned(-1)
M.AdjustWeakened(-1)
@@ -139,4 +139,4 @@
description = "An all-purpose antibiotic agent extracted from space fungus."
reagent_state = LIQUID
color = "#0AB478"
- metabolization_rate = 0.2
\ No newline at end of file
+ metabolization_rate = 0.2
diff --git a/code/modules/reagents/oldchem/reagents/reagents_toxin.dm b/code/modules/reagents/oldchem/reagents/reagents_toxin.dm
index bbdf92b8693..0aae5e3f40e 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_toxin.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_toxin.dm
@@ -326,7 +326,7 @@
/datum/reagent/spores/on_mob_life(mob/living/M)
M.adjustToxLoss(1)
M.damageoverlaytemp = 60
- M.eye_blurry = max(M.eye_blurry, 3)
+ M.EyeBlurry(3)
..()
/datum/reagent/beer2 //disguised as normal beer for use by emagged brobots
@@ -385,25 +385,25 @@
to_chat(victim, "Your [safe_thing] protect you from most of the pepperspray!")
if(prob(5))
victim.emote("scream")
- victim.eye_blurry = max(M.eye_blurry, 3)
- victim.eye_blind = max(M.eye_blind, 1)
- victim.confused = max(M.confused, 3)
+ victim.EyeBlurry(3)
+ victim.EyeBlind(1)
+ victim.Confused(3)
victim.damageoverlaytemp = 60
victim.Weaken(3)
victim.drop_item()
return
else if( eyes_covered ) // Eye cover is better than mouth cover
to_chat(victim, "Your [safe_thing] protects your eyes from the pepperspray!")
- victim.eye_blurry = max(M.eye_blurry, 3)
+ victim.EyeBlurry(3)
victim.damageoverlaytemp = 30
return
else // Oh dear :D
if(prob(5))
victim.emote("scream")
to_chat(victim, "You're sprayed directly in the eyes with pepperspray!")
- victim.eye_blurry = max(M.eye_blurry, 5)
- victim.eye_blind = max(M.eye_blind, 2)
- victim.confused = max(M.confused, 6)
+ victim.EyeBlurry(5)
+ victim.EyeBlind(2)
+ victim.Confused(6)
victim.damageoverlaytemp = 75
victim.Weaken(5)
victim.drop_item()
@@ -411,4 +411,4 @@
/datum/reagent/condensedcapsaicin/on_mob_life(mob/living/M)
if(prob(5))
M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]")
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/reagents/oldchem/reagents/reagents_water.dm b/code/modules/reagents/oldchem/reagents/reagents_water.dm
index bbfcbeb8142..a2dd3eb7fc4 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_water.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_water.dm
@@ -264,27 +264,27 @@
process_flags = ORGANIC | SYNTHETIC
/datum/reagent/holywater/on_mob_life(mob/living/M)
- M.jitteriness = max(M.jitteriness-5,0)
+ M.AdjustJitter(-5)
if(current_cycle >= 30) // 12 units, 60 seconds @ metabolism 0.4 units & tick rate 2.0 sec
- M.stuttering = min(M.stuttering+4, 20)
+ M.AdjustStuttering(4, bound_lower = 0, bound_upper = 20)
M.Dizzy(5)
if(iscultist(M) && prob(5))
M.say(pick("Av'te Nar'sie","Pa'lid Mors","INO INO ORA ANA","SAT ANA!","Daim'niodeis Arc'iai Le'eones","Egkau'haom'nai en Chaous","Ho Diak'nos tou Ap'iron","R'ge Na'sie","Diabo us Vo'iscum","Si gn'um Co'nu"))
if(current_cycle >= 75 && prob(33)) // 30 units, 150 seconds
- M.confused += 3
+ M.AdjustConfused(3)
if(isvampirethrall(M))
ticker.mode.remove_vampire_mind(M.mind)
holder.remove_reagent(id, volume)
- M.jitteriness = 0
- M.stuttering = 0
- M.confused = 0
+ M.SetJitter(0)
+ M.SetStuttering(0)
+ M.SetConfused(0)
return
if(iscultist(M))
ticker.mode.remove_cultist(M.mind)
holder.remove_reagent(id, volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
- M.jitteriness = 0
- M.stuttering = 0
- M.confused = 0
+ M.SetJitter(0)
+ M.SetStuttering(0)
+ M.SetConfused(0)
return
if(ishuman(M) && M.mind && M.mind.vampire && !M.mind.vampire.get_ability(/datum/vampire_passive/full) && prob(80))
switch(current_cycle)
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 1da5f07b2e5..a6fd792e795 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -80,12 +80,6 @@
icon_state = "pill8"
list_reagents = list("haloperidol" = 15)
-/obj/item/weapon/reagent_containers/food/pill/paroxetine
- name = "Paroxetine pill"
- desc = "Heavy anti-depressant."
- icon_state = "pill8"
- list_reagents = list("paroxetine" = 15)
-
/obj/item/weapon/reagent_containers/food/pill/happy
name = "Happy pill"
desc = "Happy happy joy joy!"
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm
index 373b5d9454f..0e83e5812c3 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm
@@ -37,7 +37,7 @@
to_chat(H, "[pick(messages)]")
if(prob(50))
- H.dizziness += rand(3,5)
+ H.AdjustDizzy(rand(3,5))
/datum/artifact_effect/badfeeling/DoEffectAura()
if(holder)
@@ -50,7 +50,7 @@
to_chat(H, "[pick(drastic_messages)]")
if(prob(10))
- H.dizziness += rand(3,5)
+ H.AdjustDizzy(rand(3,5))
return 1
/datum/artifact_effect/badfeeling/DoEffectPulse()
@@ -64,7 +64,7 @@
to_chat(H, "[pick(messages)]")
if(prob(50))
- H.dizziness += rand(3,5)
+ H.AdjustDizzy(rand(3,5))
else if(prob(25))
- H.dizziness += rand(5,15)
+ H.AdjustDizzy(rand(5,15))
return 1
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm
index 08639dec98f..dd42c44204c 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm
@@ -35,7 +35,7 @@
to_chat(H, "[pick(messages)]")
if(prob(50))
- H.dizziness += rand(3,5)
+ H.AdjustDizzy(rand(3,5))
/datum/artifact_effect/goodfeeling/DoEffectAura()
if(holder)
@@ -48,7 +48,7 @@
to_chat(H, "[pick(drastic_messages)]")
if(prob(5))
- H.dizziness += rand(3,5)
+ H.AdjustDizzy(rand(3,5))
return 1
/datum/artifact_effect/goodfeeling/DoEffectPulse()
@@ -62,7 +62,7 @@
to_chat(H, "[pick(messages)]")
if(prob(50))
- H.dizziness += rand(3,5)
+ H.AdjustDizzy(rand(3,5))
else if(prob(25))
- H.dizziness += rand(5,15)
+ H.AdjustDizzy(rand(5,15))
return 1
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm
index bbb16d76a3d..1f098ddfa6b 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm
@@ -13,8 +13,8 @@
if(ishuman(toucher) && prob(weakness * 100))
var/mob/living/carbon/human/H = toucher
to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired."))
- H.drowsyness = min(H.drowsyness + rand(5,25) * weakness, 50 * weakness)
- H.eye_blurry = min(H.eye_blurry + rand(1,3) * weakness, 50 * weakness)
+ H.AdjustDrowsy(rand(5,25) * weakness, bound_lower = 0, bound_upper = 50 * weakness)
+ H.AdjustEyeBlurry(rand(1,3) * weakness, bound_lower = 0, bound_upper = 50 * weakness)
return 1
else if(isrobot(toucher))
to_chat(toucher, "\red SYSTEM ALERT: CPU cycles slowing down.")
@@ -28,8 +28,8 @@
if(prob(weakness * 100))
if(prob(10))
to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired."))
- H.drowsyness = min(H.drowsyness + 1 * weakness, 25 * weakness)
- H.eye_blurry = min(H.eye_blurry + 1 * weakness, 25 * weakness)
+ H.AdjustDrowsy(1 * weakness, bound_lower = 0, bound_upper = 25 * weakness)
+ H.AdjustEyeBlurry(1 * weakness, bound_lower = 0, bound_upper = 25 * weakness)
for(var/mob/living/silicon/robot/R in range(src.effectrange,holder))
to_chat(R, "\red SYSTEM ALERT: CPU cycles slowing down.")
return 1
@@ -41,8 +41,8 @@
var/weakness = GetAnomalySusceptibility(H)
if(prob(weakness * 100))
to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired."))
- H.drowsyness = min(H.drowsyness + rand(5,15) * weakness, 50 * weakness)
- H.eye_blurry = min(H.eye_blurry + rand(5,15) * weakness, 50 * weakness)
+ H.AdjustDrowsy(rand(5,15) * weakness, bound_lower = 0, bound_upper = 50 * weakness)
+ H.AdjustEyeBlurry(rand(5,15) * weakness, bound_lower = 0, bound_upper = 50 * weakness)
for(var/mob/living/silicon/robot/R in range(src.effectrange,holder))
to_chat(R, "\red SYSTEM ALERT: CPU cycles slowing down.")
return 1
diff --git a/code/modules/research/xenoarchaeology/finds/finds_special.dm b/code/modules/research/xenoarchaeology/finds/finds_special.dm
index ce6fb4c2663..8ddcf27593b 100644
--- a/code/modules/research/xenoarchaeology/finds/finds_special.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds_special.dm
@@ -194,7 +194,7 @@
'sound/hallucinations/turn_around1.ogg',\
'sound/hallucinations/turn_around2.ogg',\
), 50, 1, -3)
- M.sleeping = max(M.sleeping,rand(5,10))
+ M.Sleeping(rand(5,10))
src.loc = null
else
processing_objects.Remove(src)
diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm
index 406c1f83083..6c2f7354b43 100644
--- a/code/modules/surgery/face.dm
+++ b/code/modules/surgery/face.dm
@@ -55,7 +55,7 @@
user.visible_message(" [user]'s hand slips, slicing [target]'s throat wth \the [tool]!" , \
" Your hand slips, slicing [target]'s throat wth \the [tool]!" )
affected.createwound(CUT, 60)
- target.losebreath += 4
+ target.AdjustLoseBreath(4)
return 0
@@ -83,7 +83,7 @@
/datum/surgery_step/face/mend_vocal/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
user.visible_message(" [user]'s hand slips, clamping [target]'s trachea shut for a moment with \the [tool]!", \
" Your hand slips, clamping [user]'s trachea shut for a moment with \the [tool]!")
- target.losebreath += 4
+ target.AdjustLoseBreath(4)
return 0
/datum/surgery_step/face/fix_face
diff --git a/code/modules/surgery/organs/blood.dm b/code/modules/surgery/organs/blood.dm
index 9034393bfe2..f71e9bff0be 100644
--- a/code/modules/surgery/organs/blood.dm
+++ b/code/modules/surgery/organs/blood.dm
@@ -101,7 +101,7 @@
else
adjustOxyLoss(round((BLOOD_VOLUME_NORMAL - blood_volume) * 0.02, 1))
if(prob(5))
- eye_blurry = max(eye_blurry, 6)
+ EyeBlurry(6)
var/word = pick("dizzy","woozy","faint")
to_chat(src, "You feel very [word].")
if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index bb408f51726..18f0e51b2e2 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -307,7 +307,7 @@
owner.drip(10)
if(prob(4))
spawn owner.custom_emote(1, "gasps for air!")
- owner.losebreath += 5
+ owner.AdjustLoseBreath(5)
/obj/item/organ/internal/kidneys
name = "kidneys"
@@ -357,10 +357,10 @@
/obj/item/organ/internal/eyes/surgeryize()
if(!owner)
return
- owner.disabilities &= ~NEARSIGHTED
- owner.disabilities &= ~BLIND
- owner.eye_blurry = 0
- owner.eye_blind = 0
+ owner.CureNearsighted()
+ owner.CureBlind()
+ owner.SetEyeBlurry(0)
+ owner.SetEyeBlind(0)
/obj/item/organ/internal/liver
@@ -493,6 +493,7 @@
slot = "brain_tumor"
health = 3
var/organhonked = 0
+ var/suffering_delay = 900
/obj/item/organ/internal/honktumor/New()
..()
@@ -535,11 +536,11 @@
return
if(organhonked < world.time)
- organhonked = world.time+900
+ organhonked = world.time + suffering_delay
to_chat(owner, "HONK")
- owner.sleeping = 0
- owner.stuttering = 20
- owner.adjustEarDamage(0, 30)
+ owner.SetSleeping(0)
+ owner.Stuttering(20)
+ owner.AdjustEarDeaf(30)
owner.Weaken(3)
owner << 'sound/items/AirHorn.ogg'
if(prob(30))
diff --git a/code/modules/surgery/organs/pain.dm b/code/modules/surgery/organs/pain.dm
index 23d2af69bf3..f0b4b912eaf 100644
--- a/code/modules/surgery/organs/pain.dm
+++ b/code/modules/surgery/organs/pain.dm
@@ -15,8 +15,8 @@ mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0
if(world.time < next_pain_time && !force)
return
if(amount > 10 && istype(src,/mob/living/carbon/human))
- if(src:paralysis)
- src:paralysis = max(0, src:paralysis-round(amount/10))
+ if(paralysis)
+ AdjustParalysis(-round(amount/10))
if(amount > 50 && prob(amount / 5))
src:drop_item()
var/msg
@@ -132,4 +132,4 @@ mob/living/carbon/human/proc/handle_pain()
toxDamageMessage = "Your body aches all over, it's driving you mad."
if(toxDamageMessage && prob(toxMessageProb))
- src.custom_pain(toxDamageMessage, getToxLoss() >= 15)
\ No newline at end of file
+ src.custom_pain(toxDamageMessage, getToxLoss() >= 15)
diff --git a/code/modules/surgery/organs/subtypes/diona.dm b/code/modules/surgery/organs/subtypes/diona.dm
index 0f75fe9f80f..a4b0d8fb92b 100644
--- a/code/modules/surgery/organs/subtypes/diona.dm
+++ b/code/modules/surgery/organs/subtypes/diona.dm
@@ -169,10 +169,10 @@
/obj/item/organ/internal/diona_receptor/surgeryize()
if(!owner)
return
- owner.disabilities &= ~NEARSIGHTED
- owner.disabilities &= ~BLIND
- owner.eye_blurry = 0
- owner.eye_blind = 0
+ owner.CureNearsighted()
+ owner.CureBlind()
+ owner.SetEyeBlurry(0)
+ owner.SetEyeBlind(0)
//TODO:Make absorb rads on insert
diff --git a/code/modules/surgery/organs/subtypes/machine.dm b/code/modules/surgery/organs/subtypes/machine.dm
index 61b2f143f69..0f402a42e5d 100644
--- a/code/modules/surgery/organs/subtypes/machine.dm
+++ b/code/modules/surgery/organs/subtypes/machine.dm
@@ -142,10 +142,10 @@
/obj/item/organ/internal/optical_sensor/surgeryize()
if(!owner)
return
- owner.disabilities &= ~NEARSIGHTED
- owner.disabilities &= ~BLIND
- owner.eye_blurry = 0
- owner.eye_blind = 0
+ owner.CureNearsighted()
+ owner.CureBlind()
+ owner.SetEyeBlurry(0)
+ owner.SetEyeBlind(0)
// Used for an MMI or posibrain being installed into a human.
diff --git a/html/changelogs/AutoChangeLog-pr-5601.yml b/html/changelogs/AutoChangeLog-pr-5601.yml
new file mode 100644
index 00000000000..cd74a767312
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5601.yml
@@ -0,0 +1,4 @@
+author: Crazylemon
+delete-after: True
+changes:
+ - tweak: "Status effects should work a little more consistently now"
diff --git a/html/changelogs/AutoChangeLog-pr-5826.yml b/html/changelogs/AutoChangeLog-pr-5826.yml
new file mode 100644
index 00000000000..62bc989c620
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5826.yml
@@ -0,0 +1,4 @@
+author: Twinmold93
+delete-after: True
+changes:
+ - bugfix: "Fixes a runtime issue caused by using the detective's scanner on the space hotel cleaver."
diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi
index 3fe35fe7651..9aed5172330 100644
Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi
index 590945e9e15..c0c5dbd8678 100644
Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 95a1a902aa0..568fcce4443 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/atmospherics/circulator.dmi b/icons/obj/atmospherics/circulator.dmi
new file mode 100644
index 00000000000..45f7a626ef6
Binary files /dev/null and b/icons/obj/atmospherics/circulator.dmi differ
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index a555009ae6a..5a198ee1e64 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ
diff --git a/icons/obj/pipe-item.dmi b/icons/obj/pipe-item.dmi
index 34fedaa560f..73d62edfaa8 100644
Binary files a/icons/obj/pipe-item.dmi and b/icons/obj/pipe-item.dmi differ
diff --git a/icons/obj/pipes.dmi b/icons/obj/pipes.dmi
index 45f79d9e66b..99e6e84d185 100644
Binary files a/icons/obj/pipes.dmi and b/icons/obj/pipes.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 17f48fd9dba..ad5db876321 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1434,9 +1434,11 @@
#include "code\modules\mob\mob_movement.dm"
#include "code\modules\mob\mob_transformation_simple.dm"
#include "code\modules\mob\say.dm"
+#include "code\modules\mob\status_procs.dm"
#include "code\modules\mob\transform_procs.dm"
#include "code\modules\mob\typing_indicator.dm"
#include "code\modules\mob\update_icons.dm"
+#include "code\modules\mob\update_status.dm"
#include "code\modules\mob\camera\camera.dm"
#include "code\modules\mob\dead\death.dm"
#include "code\modules\mob\dead\observer\login.dm"
@@ -1455,6 +1457,9 @@
#include "code\modules\mob\living\login.dm"
#include "code\modules\mob\living\logout.dm"
#include "code\modules\mob\living\say.dm"
+#include "code\modules\mob\living\stat_states.dm"
+#include "code\modules\mob\living\status_procs.dm"
+#include "code\modules\mob\living\update_status.dm"
#include "code\modules\mob\living\carbon\_defines.dm"
#include "code\modules\mob\living\carbon\carbon.dm"
#include "code\modules\mob\living\carbon\carbon_defenses.dm"
@@ -1465,6 +1470,7 @@
#include "code\modules\mob\living\carbon\shock.dm"
#include "code\modules\mob\living\carbon\superheroes.dm"
#include "code\modules\mob\living\carbon\update_icons.dm"
+#include "code\modules\mob\living\carbon\update_status.dm"
#include "code\modules\mob\living\carbon\alien\alien.dm"
#include "code\modules\mob\living\carbon\alien\alien_defenses.dm"
#include "code\modules\mob\living\carbon\alien\death.dm"
@@ -1501,6 +1507,7 @@
#include "code\modules\mob\living\carbon\brain\MMI.dm"
#include "code\modules\mob\living\carbon\brain\posibrain.dm"
#include "code\modules\mob\living\carbon\brain\say.dm"
+#include "code\modules\mob\living\carbon\brain\update_status.dm"
#include "code\modules\mob\living\carbon\human\appearance.dm"
#include "code\modules\mob\living\carbon\human\body_accessories.dm"
#include "code\modules\mob\living\carbon\human\death.dm"
@@ -1558,6 +1565,7 @@
#include "code\modules\mob\living\silicon\ai\login.dm"
#include "code\modules\mob\living\silicon\ai\logout.dm"
#include "code\modules\mob\living\silicon\ai\say.dm"
+#include "code\modules\mob\living\silicon\ai\update_status.dm"
#include "code\modules\mob\living\silicon\ai\freelook\cameranet.dm"
#include "code\modules\mob\living\silicon\ai\freelook\chunk.dm"
#include "code\modules\mob\living\silicon\ai\freelook\eye.dm"
@@ -1574,6 +1582,7 @@
#include "code\modules\mob\living\silicon\pai\say.dm"
#include "code\modules\mob\living\silicon\pai\software.dm"
#include "code\modules\mob\living\silicon\pai\software_modules.dm"
+#include "code\modules\mob\living\silicon\pai\update_status.dm"
#include "code\modules\mob\living\silicon\robot\component.dm"
#include "code\modules\mob\living\silicon\robot\death.dm"
#include "code\modules\mob\living\silicon\robot\emote.dm"
@@ -1588,6 +1597,7 @@
#include "code\modules\mob\living\silicon\robot\robot_items.dm"
#include "code\modules\mob\living\silicon\robot\robot_modules.dm"
#include "code\modules\mob\living\silicon\robot\robot_movement.dm"
+#include "code\modules\mob\living\silicon\robot\update_status.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_abilities.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_console.dm"
@@ -1595,6 +1605,7 @@
#include "code\modules\mob\living\silicon\robot\drone\drone_items.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_manufacturer.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_say.dm"
+#include "code\modules\mob\living\silicon\robot\drone\update_status.dm"
#include "code\modules\mob\living\simple_animal\constructs.dm"
#include "code\modules\mob\living\simple_animal\corpse.dm"
#include "code\modules\mob\living\simple_animal\parrot.dm"
@@ -1737,7 +1748,6 @@
#include "code\modules\power\cell.dm"
#include "code\modules\power\engine.dm"
#include "code\modules\power\generator.dm"
-#include "code\modules\power\generator_type2.dm"
#include "code\modules\power\gravitygenerator.dm"
#include "code\modules\power\lighting.dm"
#include "code\modules\power\port_gen.dm"