cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes science prescription HUDs giving medhuds + fixes AR prescription huds not working (#29531)

Browse Source 
yippee
This commit is contained in:
nikothedude
2024-08-23 05:11:49 +07:00
committed by GitHub
parent 6ddd1120e3
commit 3e526b96fc
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_skyrat/master_files/code/modules/loadout/categories/glasses.dm
+1 -1
View File
@@ -155,7 +155,7 @@
/datum/loadout_item/glasses/science_glasses
name = "Prescription Science glasses"
item_path = /obj/item/clothing/glasses/hud/science/prescription
item_path = /obj/item/clothing/glasses/science/prescription
restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD)
/datum/loadout_item/glasses/aviator_security
modular_skyrat/modules/huds/code/designs.dm
+1 -1
View File
@@ -56,7 +56,7 @@
/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
/datum/material/gold = SMALL_MATERIAL_AMOUNT * 4,
)
build_path = /obj/item/clothing/glasses/hud/science/prescription
build_path = /obj/item/clothing/glasses/science/prescription
category = list(
RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE,
)
modular_skyrat/modules/huds/code/glasses/HUD_Glasses.dm
+5 -4
View File
@@ -31,17 +31,18 @@
. = ..()
clothing_traits += list(TRAIT_NEARSIGHTED_CORRECTED)
/obj/item/clothing/glasses/hud/science/prescription
/obj/item/clothing/glasses/science/prescription
name = "prescription science glasses"
desc = "These glasses scan the contents of containers and projects their contents to the user in an easy to read format. This one has prescription lenses."
icon = 'modular_skyrat/modules/huds/icons/huds.dmi'
icon_state = "glasses_sciencehud"
worn_icon = 'modular_skyrat/modules/huds/icons/hudeyes.dmi'
flash_protect = FLASH_PROTECTION_NONE
glass_colour_type = /datum/client_colour/glass_colour/purple
resistance_flags = ACID_PROOF
armor_type = /datum/armor/prescription_science
clothing_traits = list(TRAIT_REAGENT_SCANNER, TRAIT_MEDICAL_HUD, TRAIT_NEARSIGHTED_CORRECTED)
/obj/item/clothing/glasses/science/prescription/Initialize()
. = ..()
clothing_traits += list(TRAIT_NEARSIGHTED_CORRECTED)
/datum/armor/prescription_science
fire = 80
modular_skyrat/modules/modular_items/code/modular_glasses.dm
+11 -4
View File
@@ -22,6 +22,8 @@
var/list/modes_msg = list(MODE_ON = "optical matrix enabled", MODE_OFF = "optical matrix disabled")
/// Because initial() will not work on subtypes from within the parent we need to store a reference to the type of the glasses calling the procs
var/obj/item/clothing/glasses/hud/ar/glasses_type
/// Lazylist of traits that will not be removed if we switch modes.
var/list/permanent_clothing_traits
/// Reuse logic from engine_goggles.dm
/obj/item/clothing/glasses/hud/ar/Initialize(mapload)
@@ -104,7 +106,7 @@
var/mob/living/carbon/human/human = user
if(!ishuman(user) || human.glasses != src) // Make sure they're a human wearing the glasses first
return
for(var/trait in clothing_traits)
for(var/trait in (clothing_traits - permanent_clothing_traits)) // yes, you can do /list - null, it has no side effects i can see
REMOVE_CLOTHING_TRAIT(human, trait)
/obj/item/clothing/glasses/hud/ar/proc/reset_vars()
@@ -214,27 +216,32 @@
/obj/item/clothing/glasses/hud/ar/aviator/security/prescription
name = "prescription security HUD aviators"
desc = "A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. This HUD has been fitted inside of a pair of sunglasses with toggleable electrochromatic tinting which. Has lenses that help correct eye sight."
clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED)
clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED, TRAIT_SECURITY_HUD)
permanent_clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED)
/obj/item/clothing/glasses/hud/ar/aviator/health/prescription
name = "prescription medical HUD aviators"
desc = "A heads-up display that scans the humanoids in view and provides accurate data about their health status. This HUD has been fitted inside of a pair of sunglasses which has lenses that help correct eye sight."
clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED)
clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED, TRAIT_MEDICAL_HUD)
permanent_clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED)
/obj/item/clothing/glasses/hud/ar/aviator/meson/prescription
name = "prescription meson HUD aviators"
desc = "A heads-up display used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting conditions. This HUD has been fitted inside of a pair of sunglasses which has lenses that help correct eye sight."
clothing_traits = list(TRAIT_MADNESS_IMMUNE, TRAIT_NEARSIGHTED_CORRECTED)
permanent_clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED)
/obj/item/clothing/glasses/hud/ar/aviator/diagnostic/prescription
name = "prescription diagnostic HUD aviators"
desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits. This HUD has been fitted inside of a pair of sunglasses which has lenses that help correct eye sight."
clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED)
clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED, TRAIT_DIAGNOSTIC_HUD)
permanent_clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED)
/obj/item/clothing/glasses/hud/ar/aviator/science/prescription
name = "prescription science aviators"
desc = "A pair of tacky purple aviator sunglasses that allow the wearer to recognize various chemical compounds with only a glance, which has lenses that help correct eye sight."
clothing_traits = list(TRAIT_REAGENT_SCANNER, TRAIT_RESEARCH_SCANNER, TRAIT_NEARSIGHTED_CORRECTED)
permanent_clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED)
// Retinal projector