diff --git a/code/modules/client/preference_setup/loadout/items/augments.dm b/code/modules/client/preference_setup/loadout/items/augments.dm index a9853fddb0b..3ebf122a05c 100644 --- a/code/modules/client/preference_setup/loadout/items/augments.dm +++ b/code/modules/client/preference_setup/loadout/items/augments.dm @@ -187,14 +187,21 @@ cost = 3 allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") -/datum/gear/augment/zenghu_plate - display_name = "zeng-hu veterancy plate" - 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" - path = /obj/item/organ/internal/augment/zenghu_plate +/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." + path = /obj/item/organ/internal/augment/eye_sensors/medical/zenghu_plate whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, 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", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") +/datum/gear/augment/zenghu_mask/New() + ..() + var/list/masks = list() + masks["zeng-hu veterancy plate"] = /obj/item/organ/internal/augment/eye_sensors/medical/zenghu_plate + masks["zeng-hu seniority mask"] = /obj/item/organ/internal/augment/eye_sensors/medical/zenghu_plate/mask + gear_tweaks += new /datum/gear_tweak/path(masks) + /datum/gear/augment/corrective_lenses display_name = "retractable corrective lenses" description = "A set of corrective lenses that can be deployed & retracted." diff --git a/code/modules/organs/subtypes/augment/augments/zengu_plate.dm b/code/modules/organs/subtypes/augment/augments/zengu_plate.dm index f38dac3df5e..97c2b2c53bf 100644 --- a/code/modules/organs/subtypes/augment/augments/zengu_plate.dm +++ b/code/modules/organs/subtypes/augment/augments/zengu_plate.dm @@ -1,9 +1,18 @@ -/obj/item/organ/internal/augment/zenghu_plate +/obj/item/organ/internal/augment/eye_sensors/medical/zenghu_plate name = "zeng-hu veterancy plate" desc = "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." icon_state = "zenghu_plate" on_mob_icon = 'icons/mob/human_races/augments_external.dmi' sprite_sheets = list( - BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/augments_external.dmi' + BODYTYPE_VAURCA = 'icons/mob/species/vaurca/augments_external.dmi' + ) + +/obj/item/organ/internal/augment/eye_sensors/medical/zenghu_plate/mask + name = "zeng-hu seniority mask" + desc = "A clear sign of Zeng-Hu's best, this mask bearing the company's symbol is installed on those who prove themselves in the hyper-competitive environment. Though a step down from the veterancy plate in terms of experience requirements, the mask is often opted for over its counterpart as a less invasive augmentation option." + icon_state = "zenghu_mask" + sprite_sheets = list( + BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/augments_external.dmi', + BODYTYPE_VAURCA = 'icons/mob/species/vaurca/augments_external.dmi', + BODYTYPE_SKRELL = 'icons/mob/species/skrell/augments_external.dmi' ) - parent_organ = BP_HEAD diff --git a/html/changelogs/SimpleMaroon-zengplatesovl.yml b/html/changelogs/SimpleMaroon-zengplatesovl.yml new file mode 100644 index 00000000000..91807d1c598 --- /dev/null +++ b/html/changelogs/SimpleMaroon-zengplatesovl.yml @@ -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: SimpleMaroon + +# 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: + - imageadd: "The Zeng-Hu Pharmaceuticals veterancy plate now has a less senior alternative, designed to be less invasive and more unique; this includes unique variants for Vaurcae (including Bulwarks) and Skrell." + - qol: "The Zeng-Hu veterancy plate is now a variant of the medical eye sensor augmentation in order to add useful functionality." diff --git a/icons/mob/human_races/augments_external.dmi b/icons/mob/human_races/augments_external.dmi index a33b26af06f..d0eeca03862 100644 Binary files a/icons/mob/human_races/augments_external.dmi and b/icons/mob/human_races/augments_external.dmi differ diff --git a/icons/mob/species/bulwark/augments_external.dmi b/icons/mob/species/bulwark/augments_external.dmi index a90f57e5bf2..01111c7af31 100644 Binary files a/icons/mob/species/bulwark/augments_external.dmi and b/icons/mob/species/bulwark/augments_external.dmi differ diff --git a/icons/mob/species/skrell/augments_external.dmi b/icons/mob/species/skrell/augments_external.dmi new file mode 100644 index 00000000000..fdd5cb2bb8c Binary files /dev/null and b/icons/mob/species/skrell/augments_external.dmi differ diff --git a/icons/mob/species/vaurca/augments_external.dmi b/icons/mob/species/vaurca/augments_external.dmi index 905a5b4b9da..e5d711382f1 100644 Binary files a/icons/mob/species/vaurca/augments_external.dmi and b/icons/mob/species/vaurca/augments_external.dmi differ diff --git a/icons/obj/organs/augments.dmi b/icons/obj/organs/augments.dmi index 9288db8f4c6..8f0542373a8 100644 Binary files a/icons/obj/organs/augments.dmi and b/icons/obj/organs/augments.dmi differ