fix sense - 10 8 23

BeeStation · Aug 10, 2023 · e3ef7f2 · e3ef7f2
1 parent 346da7d
commit e3ef7f2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/code/datums/components/blind_sense.dm b/code/datums/components/blind_sense.dm
@@ -29,7 +29,9 @@
 		RegisterSignal(ears, COMSIG_PARENT_QDELETING, PROC_REF(handle_ears))
 
 /datum/component/blind_sense/RemoveComponent()
-	. = ..()
+	UnregisterSignal(SSdcs, COMSIG_GLOB_LIVING_SAY_SPECIAL)
+	UnregisterSignal(SSdcs, COMSIG_GLOB_SOUND_PLAYED)
+	return ..()
 
 /datum/component/blind_sense/proc/handle_hear(datum/source, atom/speaker, message)
 	SIGNAL_HANDLER

diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm
@@ -52,6 +52,8 @@
 		clear_alert("blind")
 		clear_fullscreen("blind")
 		remove_client_colour(/datum/client_colour/monochrome/blind)
+		var/datum/component/blind_sense/B = GetComponent(/datum/component/blind_sense)	
+		B?.RemoveComponent()
 
 /**
   * Make the mobs vision blurry

diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
@@ -418,6 +418,18 @@
 	blind_type = /atom/movable/screen/fullscreen/blind/psychic
 	sight_flags = SEE_MOBS | SEE_OBJS | SEE_TURFS
 
+/obj/item/organ/eyes/psyphoza/on_life()
+	. = ..()
+	//If someone somehow heals psyphoza blindness
+	var/mob/living/carbon/C = owner
+	if(!HAS_TRAIT(C, TRAIT_BLIND))
+		C.clear_fullscreen("psychic_highlight")
+		C.clear_fullscreen("psychic_wall_highlight")
+	//And then cruely makes them blind again
+	else if(!C.screens["psychic_highlight"] && !C.screens["psychic_wall_highlight"])
+		C.overlay_fullscreen("psychic_highlight", /atom/movable/screen/fullscreen/blind/psychic_highlight)
+		C.overlay_fullscreen("psychic_wall_highlight", /atom/movable/screen/fullscreen/blind/psychic_highlight/wall)
+
 /obj/item/organ/eyes/psyphoza/Insert(mob/living/carbon/M, special, drop_if_replaced, initialising)
 	. = ..()
 	M.become_blind("uncurable", /atom/movable/screen/fullscreen/blind/psychic)