From de06f5f1e71b71fc0483395b9ce1bfe0a99c7f7e Mon Sep 17 00:00:00 2001
From: Casper3667 <CasperMC@hotmail.dk>
Date: Thu, 8 Jul 2021 19:11:21 +0200
Subject: [PATCH] fixes taj and vaurca nightvision (#12150)

---
 code/_onclick/hud/action.dm                    | 4 ++++
 code/modules/organs/internal/species/tajara.dm | 8 +-------
 html/changelogs/NightvisionFix.yml             | 6 ++++++
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 html/changelogs/NightvisionFix.yml

diff --git a/code/_onclick/hud/action.dm b/code/_onclick/hud/action.dm
index 4498c7406f1..57599be68d2 100644
--- a/code/_onclick/hud/action.dm
+++ b/code/_onclick/hud/action.dm
@@ -234,6 +234,10 @@
 	if(istype(O))
 		O.refresh_action_button()
 
+/datum/action/item_action/organ/night_eyes
+	check_flags = AB_CHECK_STUNNED|AB_CHECK_ALIVE|AB_CHECK_INSIDE
+	button_icon_state = "night_eyes"
+
 #undef AB_WEST_OFFSET
 #undef AB_NORTH_OFFSET
 #undef AB_MAX_COLUMNS
diff --git a/code/modules/organs/internal/species/tajara.dm b/code/modules/organs/internal/species/tajara.dm
index 087c3c8a2af..276de81a92e 100644
--- a/code/modules/organs/internal/species/tajara.dm
+++ b/code/modules/organs/internal/species/tajara.dm
@@ -3,6 +3,7 @@
 	desc = "A pair of Tajaran eyes accustomed to the low light conditions of Adhomai."
 	icon_state = "tajaran_eyes"
 	action_button_name = "Activate Low Light Vision"
+	default_action_type = /datum/action/item_action/organ/night_eyes
 	relative_size = 8
 	var/night_vision = FALSE
 	var/datum/client_color/vision_color = /datum/client_color/monochrome
@@ -21,13 +22,6 @@
 	. = ..()
 	disable_night_vision()
 
-/obj/item/organ/internal/eyes/night/refresh_action_button()
-	. = ..()
-	if(.)
-		action.button_icon_state = "night_eyes"
-		if(action.button)
-			action.button.update_icon()
-
 /obj/item/organ/internal/eyes/night/attack_self(var/mob/user)
 	. = ..()
 	if(owner.last_special > world.time)
diff --git a/html/changelogs/NightvisionFix.yml b/html/changelogs/NightvisionFix.yml
new file mode 100644
index 00000000000..7fd56b49f54
--- /dev/null
+++ b/html/changelogs/NightvisionFix.yml
@@ -0,0 +1,6 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - bugfix: "Tajara & Vaurca nightvision can now be used even while restrained or laying down."