Bumping blind calls up to 2 so that it will always last at least one …

…full tick and won't fade in and out.
NebulaSS13 · Aug 14, 2023 · c11e750 · c11e750
1 parent b87736f
commit c11e750
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 24 deletions.
diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm
@@ -631,7 +631,7 @@
 	else if(href_list["setstatuscond"])
 		if(!check_rights(R_DEBUG))
 			return
-		var/mob/living/L = locate(href_list["removestressor"])
+		var/mob/living/L = locate(href_list["setstatuscond"])
 		if(!istype(L))
 			return
 		var/list/all_status_conditions = decls_repository.get_decls_of_subtype(/decl/status_condition)

diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm
@@ -23,18 +23,18 @@
 	if(status_flags & GODMODE)	return 0
 
 	if(stat == DEAD)
-		SET_STATUS_MAX(src, STAT_BLIND, 1)
+		SET_STATUS_MAX(src, STAT_BLIND, 2)
 		set_status(STAT_SILENCE, 0)
 	else
 		updatehealth()
 		if(health <= 0)
 			death()
-			SET_STATUS_MAX(src, STAT_BLIND, 1)
+			SET_STATUS_MAX(src, STAT_BLIND, 2)
 			set_status(STAT_SILENCE, 0)
 			return 1
 
 		if(HAS_STATUS(src, STAT_PARA))
-			SET_STATUS_MAX(src, STAT_BLIND, 1)
+			SET_STATUS_MAX(src, STAT_BLIND, 2)
 			set_stat(UNCONSCIOUS)
 			if(getHalLoss() > 0)
 				adjustHalLoss(-3)
@@ -44,7 +44,7 @@
 			if (mind)
 				if(mind.active && client != null)
 					ADJ_STATUS(src, STAT_ASLEEP, -1)
-			SET_STATUS_MAX(src, STAT_BLIND, 1)
+			SET_STATUS_MAX(src, STAT_BLIND, 2)
 			set_stat(UNCONSCIOUS)
 		else if(resting)
 			if(getHalLoss() > 0)
@@ -57,7 +57,7 @@
 
 		// Eyes and blindness.
 		if(!check_has_eyes())
-			SET_STATUS_MAX(src, STAT_BLIND, 1)
+			SET_STATUS_MAX(src, STAT_BLIND, 2)
 			SET_STATUS_MAX(src, STAT_BLURRY, 1)
 		else if(GET_STATUS(src, STAT_BLIND))
 			ADJ_STATUS(src, STAT_BLIND, -1)

diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm
@@ -76,12 +76,12 @@
 	updatehealth()
 
 	if(stat == DEAD)	//DEAD. BROWN BREAD. SWIMMING WITH THE SPESS CARP
-		SET_STATUS_MAX(src, STAT_BLIND, 1)
+		SET_STATUS_MAX(src, STAT_BLIND, 2)
 		set_status(STAT_SILENCE, 0)
 	else				//ALIVE. LIGHTS ARE ON
 		if( !container && (health < config.health_threshold_dead || (config.revival_brain_life >= 0 && (world.time - timeofhostdeath) > config.revival_brain_life)) )
 			death()
-			SET_STATUS_MAX(src, STAT_BLIND, 1)
+			SET_STATUS_MAX(src, STAT_BLIND, 2)
 			set_status(STAT_SILENCE, 0)
 			return 1
 
@@ -95,9 +95,9 @@
 				if(31 to INFINITY)
 					emp_damage = 30//Let's not overdo it
 				if(21 to 30)//High level of EMP damage, unable to see, hear, or speak
-					SET_STATUS_MAX(src, STAT_BLIND, 1)
-					SET_STATUS_MAX(src, STAT_DEAF, 1)
-					SET_STATUS_MAX(src, STAT_SILENCE, 1)
+					SET_STATUS_MAX(src, STAT_BLIND, 2)
+					SET_STATUS_MAX(src, STAT_DEAF, 2)
+					SET_STATUS_MAX(src, STAT_SILENCE, 2)
 					if(!alert)//Sounds an alarm, but only once per 'level'
 						emote("alarm")
 						to_chat(src, "<span class='warning'>Major electrical distruption detected: System rebooting.</span>")
@@ -111,8 +111,8 @@
 					set_status(STAT_SILENCE, 0)
 					emp_damage -= 1
 				if(11 to 19)//Moderate level of EMP damage, resulting in nearsightedness and ear damage
-					set_status(STAT_BLURRY, 1)
-					set_status(STAT_TINNITUS, 1)
+					set_status(STAT_BLURRY, 2)
+					set_status(STAT_TINNITUS, 2)
 					if(!alert)
 						emote("alert")
 						to_chat(src, "<span class='warning'>Primary systems are now online.</span>")

diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
@@ -155,7 +155,7 @@
 		set_status(STAT_BLIND, 0)
 		set_status(STAT_BLURRY, 0)
 	else if(!vision || (vision && !vision.is_usable()))   // Vision organs cut out or broken? Permablind.
-		SET_STATUS_MAX(src, STAT_BLIND, 1)
+		SET_STATUS_MAX(src, STAT_BLIND, 2)
 		SET_STATUS_MAX(src, STAT_BLURRY, 1)
 	// Non-genetic blindness; covered eyes will heal faster.
 	else if(!(sdisabilities & BLINDED) && equipment_tint_total >= TINT_BLIND)
@@ -389,7 +389,7 @@
 
 	//SSD check, if a logged player is awake put them back to sleep!
 	if(stat == DEAD)	//DEAD. BROWN BREAD. SWIMMING WITH THE SPESS CARP
-		SET_STATUS_MAX(src, STAT_BLIND, 1)
+		SET_STATUS_MAX(src, STAT_BLIND, 2)
 		set_status(STAT_SILENCE, 0)
 	else				//ALIVE. LIGHTS ARE ON
 		updatehealth()	//TODO
@@ -404,7 +404,7 @@
 			SET_STATUS_MAX(src, STAT_PARA, 10)
 
 		if(HAS_STATUS(src, STAT_PARA) ||HAS_STATUS(src, STAT_ASLEEP))
-			SET_STATUS_MAX(src, STAT_BLIND, 1)
+			SET_STATUS_MAX(src, STAT_BLIND, 2)
 			set_stat(UNCONSCIOUS)
 			animate_tail_reset()
 			adjustHalLoss(-3)

diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
@@ -270,11 +270,11 @@
 
 /mob/living/proc/handle_impaired_vision()
 	if((sdisabilities & BLINDED) || stat) //blindness from disability or unconsciousness doesn't get better on its own
-		SET_STATUS_MAX(src, STAT_BLIND, 1)
+		SET_STATUS_MAX(src, STAT_BLIND, 2)
 
 /mob/living/proc/handle_impaired_hearing()
 	if((sdisabilities & DEAFENED) || stat) //disabled-deaf, doesn't get better on its own
-		SET_STATUS_MAX(src, STAT_TINNITUS, 1)
+		SET_STATUS_MAX(src, STAT_TINNITUS, 2)
 
 //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/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
@@ -88,21 +88,21 @@
 				ADJ_STATUS(src, STAT_WEAK, -1)
 			if (HAS_STATUS(src, STAT_PARA) > 0)
 				ADJ_STATUS(src, STAT_PARA, -1)
-				SET_STATUS_MAX(src, STAT_BLIND, 1)
+				SET_STATUS_MAX(src, STAT_BLIND, 2)
 		else	//Not stunned.
 			src.set_stat(CONSCIOUS)
 
 	else //Dead.
 		cameranet.update_visibility(src, FALSE)
-		SET_STATUS_MAX(src, STAT_BLIND, 1)
+		SET_STATUS_MAX(src, STAT_BLIND, 2)
 		src.set_stat(DEAD)
 
 	if(HAS_STATUS(src, STAT_BLIND))
 		ADJ_STATUS(src, STAT_BLIND, -1)
 
 	src.set_density(!src.lying)
 	if(src.sdisabilities & BLINDED)
-		SET_STATUS_MAX(src, STAT_BLIND, 1)
+		SET_STATUS_MAX(src, STAT_BLIND, 2)
 
 	if(src.sdisabilities & DEAFENED)
 		src.set_status(STAT_DEAF, 1)
@@ -118,7 +118,7 @@
 			silicon_radio.on = 1
 
 	if(!isnull(components["camera"]) && !is_component_functioning("camera"))
-		SET_STATUS_MAX(src, STAT_BLIND, 1)
+		SET_STATUS_MAX(src, STAT_BLIND, 2)
 		cameranet.update_visibility(src, FALSE)
 
 	return 1

diff --git a/code/modules/species/species.dm b/code/modules/species/species.dm
@@ -534,7 +534,7 @@ var/global/const/DEFAULT_SPECIES_HEALTH = 200
 			H.set_see_invisible(max(min(H.see_invisible, H.equipment_see_invis), vision[2]))
 
 	if(H.equipment_tint_total >= TINT_BLIND)
-		SET_STATUS_MAX(H, STAT_BLIND, 1)
+		SET_STATUS_MAX(H, STAT_BLIND, 2)
 
 	if(!H.client)//no client, no screen to update
 		return 1

diff --git a/mods/species/serpentid/mobs/bodyparts_serpentid.dm b/mods/species/serpentid/mobs/bodyparts_serpentid.dm
@@ -122,7 +122,7 @@
 			lowblood_tally = 10
 			if(prob(10))
 				to_chat(owner, "<span class='warning'>Your body is barely functioning and is starting to shut down.</span>")
-				SET_STATUS_MAX(owner, STAT_PARA, 1)
+				SET_STATUS_MAX(owner, STAT_PARA, 2)
 				var/obj/item/organ/internal/I = pick(owner.internal_organs)
 				I.take_internal_damage(5)
 	..()