Skip to content

Offbrand sightlights #20722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open
11 changes: 9 additions & 2 deletions code/modules/client/preference_setup/loadout/items/augments.dm
Original file line number Diff line number Diff line change
Expand Up @@ -179,14 +179,21 @@
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 = "ocular installed sightlights"
description = "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."
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
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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this have to be limited to the same species as the Zeng-Hu variant? I feel it could be opened to Unathi and Tajara too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch/thinking, I agree with that. Zeng-Hu isn't necessarily the manufacturer for all the offbrand models- could argue that they never created designs adaptable to the two species but I'd much rather open up access.

Will update tomorrow.

cost = 3

/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."
Expand Down
18 changes: 14 additions & 4 deletions code/modules/organs/subtypes/augment/augments/sight_lights.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/obj/item/organ/internal/augment/sightlights
name = "ocular installed sightlights "
desc = "Designed to assist 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."
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
Expand All @@ -10,6 +9,17 @@
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
lights_intensity = 2

/obj/item/organ/internal/augment/sightlights/attack_self(var/mob/user)
. = ..()
Expand All @@ -20,7 +30,7 @@
lights_on = !lights_on

if(lights_on)
set_light(5, 2, LIGHT_COLOR_TUNGSTEN, uv = 0, angle = LIGHT_WIDE)
set_light(lights_range, lights_intensity, lights_color, uv = 0, angle = LIGHT_WIDE)
else
set_light(0)

Expand Down
59 changes: 59 additions & 0 deletions html/changelogs/Batrachophreno-SightlightsOffbrand.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
################################
# 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: Batrachophreno

# 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:
- rscadd: "Offbrand variant of Sightlights available to non-Zeng-Hu crew; 50% weaker than Zeng-Hu variant."
- balance: "Tiny increase to brightness of original Zeng-Hu Sightlights and the light is now tinged a stylish pale violet."
Loading