blind fix

cmss13-devs · Sep 7, 2023 · cb40a49 · cb40a49
1 parent f87a482
commit cb40a49
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm
@@ -295,16 +295,16 @@
 	var/effect_amt = round(6 + amount*6)
 
 	if(xeno_creature)
-		xeno_creature.interference = 20
+		if(xeno_creature.interference < 4)
+			to_chat(xeno_creature, SPAN_XENOHIGHDANGER("Your awareness dims to a small area!"))
+		xeno_creature.interference = 10
+		xeno_creature.blinded = TRUE
 	else
 		creature.apply_damage(12, OXY)
 	creature.SetEarDeafness(max(creature.ear_deaf, round(effect_amt*1.5))) //Paralysis of hearing system, aka deafness
-	if(!creature.eye_blind) //Eye exposure damage
-		if(xeno_creature)
-			to_chat(xeno_creature, SPAN_XENODANGER("Your awareness dims to a small area!"))
-		else
-			to_chat(creature, SPAN_DANGER("Your eyes sting. You can't see!"))
-	creature.SetEyeBlind(round(effect_amt/3))
+	if(!xeno_creature && !creature.eye_blind) //Eye exposure damage
+		to_chat(creature, SPAN_DANGER("Your eyes sting. You can't see!"))
+		creature.SetEyeBlind(round(effect_amt/3))
 	if(!xeno_creature && creature.coughedtime != 1 && !creature.stat) //Coughing/gasping
 		creature.coughedtime = 1
 		if(prob(50))

diff --git a/code/game/objects/structures/pipes/vents/vents.dm b/code/game/objects/structures/pipes/vents/vents.dm
@@ -147,7 +147,7 @@
 		var/warn_choice = tgui_input_number(user, "How many seconds warning do you wish to give?", "Release Warning", 5, 30, 1, 20 SECONDS)
 		warn_choice = warn_choice SECONDS
 
-		var/confirm = alert(user, "Confirm gas setup. \n\nGas: '[gas_choice]'\n Radius: '[radius_choice]'\n Warn Time: '[warn_choice / 10] seconds' \n\n Is this correct?", "Confirmation", "Yes", "No")
+		var/confirm = alert(user, "Confirm gas setup. \n\nGas: '[gas_choice]'\nRadius: '[radius_choice]'\nWarn Time: '[warn_choice / 10] seconds' \n\n Is this correct?", "Confirmation", "Yes", "No")
 		if(confirm != "Yes")
 			return FALSE
 		create_gas(gas_choice, radius_choice, warn_choice)

diff --git a/code/modules/mob/living/carbon/xenomorph/life.dm b/code/modules/mob/living/carbon/xenomorph/life.dm
@@ -201,7 +201,8 @@
 			blinded = TRUE
 			set_stat(UNCONSCIOUS)
 		else
-			blinded = FALSE
+			if(!interference)//If their connection to hivemind is affected, their vision should be too.
+				blinded = FALSE
 			set_stat(CONSCIOUS)
 			if(regular_update && halloss > 0)
 				if(resting)