diff --git a/code/modules/client/preference_setup/loadout/items/augments.dm b/code/modules/client/preference_setup/loadout/items/augments.dm index 11f84109f3c..707049f6b25 100644 --- a/code/modules/client/preference_setup/loadout/items/augments.dm +++ b/code/modules/client/preference_setup/loadout/items/augments.dm @@ -193,20 +193,19 @@ allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Research Intern", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") /datum/gear/augment/sightlights - display_name = "Zeng-Hu ocular sightlights" - description = "Designed to assist Zeng-Hu medical personnel in darker areas or places experiencing periodic power issues, Sightlights allow one to use their eyes as a flashlight. These are the original high-spec models available exclusively through Zeng-Hu." - path = /obj/item/organ/internal/augment/sightlights - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) - faction = "Zeng-Hu Pharmaceuticals" - cost = 3 - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Research Intern", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") - -/datum/gear/augment/sightlights/generic display_name = "offbrand ocular sightlights" description = "Designed to assist personnel in darker areas or places experiencing periodic power issues, sightlights allow one to use their eyes as a flashlight. Later SCC-mediated negotiation loosened the augment's patent restrictions, allowing offbrand manufacture and use of lesser models by other members of the Chainlink." - path = /obj/item/organ/internal/augment/sightlights/generic + path = /obj/item/organ/internal/augment/sightlights cost = 3 +/datum/gear/augment/sightlights/zenghu + display_name = "Zeng-Hu ocular sightlights" + description = "Designed to assist Zeng-Hu medical personnel in darker areas or places experiencing periodic power issues, Sightlights allow one to use their eyes as a flashlight. These are the original high-spec models available exclusively through Zeng-Hu." + path = /obj/item/organ/internal/augment/sightlights/zenghu + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) + faction = "Zeng-Hu Pharmaceuticals" + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Research Intern", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") + /datum/gear/augment/zenghu_mask display_name = "zeng-hu facial augment selection" description = "A clear sign of Zeng-Hu's best, this plate bearing the company's symbol is installed on those who prove themselves in the hyper-competitive environment." diff --git a/code/modules/organs/subtypes/augment/augments/sight_lights.dm b/code/modules/organs/subtypes/augment/augments/sight_lights.dm index 872097dab8d..7e203eef974 100644 --- a/code/modules/organs/subtypes/augment/augments/sight_lights.dm +++ b/code/modules/organs/subtypes/augment/augments/sight_lights.dm @@ -1,24 +1,25 @@ /obj/item/organ/internal/augment/sightlights - name = "Zeng-Hu ocular sightlights" - desc = "Designed to assist Zeng-Hu medical personnel in darker areas or places experiencing periodic power issues, sightlights will allow one to be able to use their eyes as a flashlight. These are the original high-spec models available exclusively through Zeng-Hu." - icon_state = "sightlights" - organ_tag = BP_AUG_SIGHTLIGHTS - parent_organ = BP_HEAD - action_button_name = "Activate Ocular Installed Sightlights " - action_button_icon = "sightlights" - cooldown = 30 - activable = TRUE - var/lights_on = FALSE - var/lights_color = "#e9dfea" // Pale violet, very Zeng-Hu. - var/lights_range = 6 - var/lights_intensity = 2 - -/obj/item/organ/internal/augment/sightlights/generic name = "offbrand ocular sightlights" desc = "Designed to assist personnel in darker areas or places experiencing periodic power issues, Zeng-Hu sightlights will allow one to be able to use their eyes as a flashlight. Later SCC-mediated negotiation loosened the augment's patent restrictions, allowing offbrand manufacture and use of lesser models by other members of the Chainlink." icon_state = "m2eyes" - lights_color = LIGHT_COLOR_TUNGSTEN - lights_range = 4 + action_button_name = "Activate Ocular Installed Sightlights " + action_button_icon = "sightlights" + activable = TRUE + organ_tag = BP_AUG_SIGHTLIGHTS + parent_organ = BP_HEAD + cooldown = 30 + + var/lights_on = FALSE + var/lights_color = LIGHT_COLOR_TUNGSTEN + var/lights_range = 4 + var/lights_intensity = 2 + +/obj/item/organ/internal/augment/sightlights/zenghu + name = "Zeng-Hu ocular sightlights" + desc = "Designed to assist Zeng-Hu medical personnel in darker areas or places experiencing periodic power issues, sightlights will allow one to be able to use their eyes as a flashlight. These are the original high-spec models available exclusively through Zeng-Hu." + icon_state = "sightlights" + lights_color = "#e9dfea" // Pale violet, very Zeng-Hu. + lights_range = 6 lights_intensity = 2 /obj/item/organ/internal/augment/sightlights/attack_self(var/mob/user) diff --git a/html/changelogs/Batrachophreno-SightlightsFix.yml b/html/changelogs/Batrachophreno-SightlightsFix.yml new file mode 100644 index 00000000000..2b5686a530e --- /dev/null +++ b/html/changelogs/Batrachophreno-SightlightsFix.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Batrachophrenoboocosmomachia + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixed sightlights object hierarchy; offbrand sightlights now selectable by non-Zeng-Hu crew."