diff --git a/code/_onclick/hud/action.dm b/code/_onclick/hud/action.dm index 57599be68d2..f9d7c855619 100644 --- a/code/_onclick/hud/action.dm +++ b/code/_onclick/hud/action.dm @@ -238,6 +238,10 @@ check_flags = AB_CHECK_STUNNED|AB_CHECK_ALIVE|AB_CHECK_INSIDE button_icon_state = "night_eyes" +/datum/action/item_action/organ/night_eyes/rev + check_flags = AB_CHECK_ALIVE|AB_CHECK_INSIDE + button_icon_state = "rev_eyes" + #undef AB_WEST_OFFSET #undef AB_NORTH_OFFSET #undef AB_MAX_COLUMNS diff --git a/code/modules/mob/living/carbon/human/species/outsider/revenant.dm b/code/modules/mob/living/carbon/human/species/outsider/revenant.dm index f0b8eb7f7a2..d3e77b13bb0 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/revenant.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/revenant.dm @@ -26,7 +26,6 @@ unarmed_types = list(/datum/unarmed_attack/claws/shredding) darksight = 8 - has_organ = list() siemens_coefficient = 0 rarity_value = 10 @@ -65,6 +64,10 @@ vision_flags = DEFAULT_SIGHT | SEE_MOBS + has_organ = list( + BP_EYES = /obj/item/organ/internal/eyes/night/revenant + ) + has_limbs = list( BP_CHEST = list("path" = /obj/item/organ/external/chest), BP_GROIN = list("path" = /obj/item/organ/external/groin), @@ -86,7 +89,6 @@ inherent_verbs = list( /mob/living/carbon/human/proc/shatter_light, - /mob/living/carbon/human/proc/darkness_eyes, /mob/living/carbon/human/proc/dissolve ) @@ -138,4 +140,15 @@ if((istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam)) && prob(20)) H.visible_message(SPAN_CULT("The [P.name] gets absorbed by [H]!"), SPAN_CULT("You absorb the [P.name]!")) return -1 - return ..() \ No newline at end of file + return ..() + +/obj/item/organ/internal/eyes/night/revenant + name = "spectral eyes" + desc = "A pair of glowing eyes. The ocular nerves still slowly writhe." + icon_state = "revenant_eyes" + eye_emote = null + vision_color = null + default_action_type = /datum/action/item_action/organ/night_eyes/rev + +/obj/item/organ/internal/eyes/night/revenant/flash_act() + return \ No newline at end of file diff --git a/code/modules/organs/internal/species/tajara.dm b/code/modules/organs/internal/species/tajara.dm index 276de81a92e..55f4fd666fe 100644 --- a/code/modules/organs/internal/species/tajara.dm +++ b/code/modules/organs/internal/species/tajara.dm @@ -85,9 +85,11 @@ if(can_change_invisible()) owner.set_see_invisible(SEE_INVISIBLE_NOLIGHTING) if(status & ORGAN_ROBOT) - owner.add_client_color(vision_mechanical_color) + if(vision_mechanical_color) + owner.add_client_color(vision_mechanical_color) else - owner.add_client_color(vision_color) + if(vision_color) + owner.add_client_color(vision_color) /obj/item/organ/internal/eyes/night/proc/disable_night_vision() if(!owner) @@ -98,9 +100,11 @@ if(can_change_invisible()) owner.set_see_invisible(SEE_INVISIBLE_LIVING) if(status & ORGAN_ROBOT) - owner.remove_client_color(vision_mechanical_color) + if(vision_mechanical_color) + owner.remove_client_color(vision_mechanical_color) else - owner.remove_client_color(vision_color) + if(vision_color) + owner.remove_client_color(vision_color) /obj/item/organ/internal/stomach/tajara name = "reinforced stomach" diff --git a/html/changelogs/geeves-revenant_night_eyes.yml b/html/changelogs/geeves-revenant_night_eyes.yml new file mode 100644 index 00000000000..57359315254 --- /dev/null +++ b/html/changelogs/geeves-revenant_night_eyes.yml @@ -0,0 +1,7 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Revenant night vision is now located in the top left, like other nightvision abilities." + - bugfix: "Revenant night vision now properly works." \ No newline at end of file diff --git a/icons/obj/action_buttons/organs.dmi b/icons/obj/action_buttons/organs.dmi index af5108d8057..43b53321089 100644 Binary files a/icons/obj/action_buttons/organs.dmi and b/icons/obj/action_buttons/organs.dmi differ diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index 781444fa46a..7bab01da245 100644 Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ