cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes an inheritence issues with arglasses (#11090)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-06-18 13:22:04 -07:00
committed by GitHub
parent 530cd21c43
commit 8b77d06e2b
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/modules/client/preference_setup/loadout/loadout_eyes.dm
View File

@@ -196,20 +196,20 @@
) )
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/eyes/arglasses/visor /datum/gear/eyes/arglasses_visor
display_name = "AR visor" display_name = "AR visor"
path = /obj/item/clothing/glasses/omnihud/visor path = /obj/item/clothing/glasses/omnihud/visor
/datum/gear/eyes/arglasses/visor/New() /datum/gear/eyes/arglasses_visor/New()
..() ..()
gear_tweaks = list(gear_tweak_free_color_choice) gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/eyes/arglasses/sec /datum/gear/eyes/arglasses_sec
display_name = "AR-Security glasses" display_name = "AR-Security glasses"
path = /obj/item/clothing/glasses/omnihud/sec path = /obj/item/clothing/glasses/omnihud/sec
allowed_roles = list(JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_DETECTIVE) allowed_roles = list(JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_DETECTIVE)
/datum/gear/eyes/arglasses/sec/New() /datum/gear/eyes/arglasses_sec/New()
..() ..()
var/list/selector_uniforms = list( var/list/selector_uniforms = list(
"standard AR-Security glasses"=/obj/item/clothing/glasses/omnihud/sec, "standard AR-Security glasses"=/obj/item/clothing/glasses/omnihud/sec,
@@ -217,12 +217,12 @@
) )
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/eyes/arglasses/sci /datum/gear/eyes/arglasses_sci
display_name = "AR-Research glasses" display_name = "AR-Research glasses"
path = /obj/item/clothing/glasses/omnihud/rnd path = /obj/item/clothing/glasses/omnihud/rnd
allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST,JOB_ROBOTICIST) allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST,JOB_ROBOTICIST)
/datum/gear/eyes/arglasses/sci/New() /datum/gear/eyes/arglasses_sci/New()
..() ..()
var/list/selector_uniforms = list( var/list/selector_uniforms = list(
"standard AR-Research glasses"=/obj/item/clothing/glasses/omnihud/rnd, "standard AR-Research glasses"=/obj/item/clothing/glasses/omnihud/rnd,
@@ -230,12 +230,12 @@
) )
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/eyes/arglasses/eng /datum/gear/eyes/arglasses_eng
display_name = "AR-Engineering glasses" display_name = "AR-Engineering glasses"
path = /obj/item/clothing/glasses/omnihud/eng path = /obj/item/clothing/glasses/omnihud/eng
allowed_roles = list(JOB_ENGINEER,JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN) allowed_roles = list(JOB_ENGINEER,JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN)
/datum/gear/eyes/arglasses/eng/New() /datum/gear/eyes/arglasses_eng/New()
..() ..()
var/list/selector_uniforms = list( var/list/selector_uniforms = list(
"standard AR-Engineering glasses"=/obj/item/clothing/glasses/omnihud/eng, "standard AR-Engineering glasses"=/obj/item/clothing/glasses/omnihud/eng,
@@ -243,12 +243,12 @@
) )
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/eyes/arglasses/med /datum/gear/eyes/arglasses_med
display_name = "AR-Medical glasses" display_name = "AR-Medical glasses"
path = /obj/item/clothing/glasses/omnihud/med path = /obj/item/clothing/glasses/omnihud/med
allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST,JOB_FIELD_MEDIC) //CHOMP keep explo allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST,JOB_FIELD_MEDIC) //CHOMP keep explo
/datum/gear/eyes/arglasses/med/New() /datum/gear/eyes/arglasses_med/New()
..() ..()
var/list/selector_uniforms = list( var/list/selector_uniforms = list(
"standard AR-Medical glasses"=/obj/item/clothing/glasses/omnihud/med, "standard AR-Medical glasses"=/obj/item/clothing/glasses/omnihud/med,
@@ -256,13 +256,13 @@
) )
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/eyes/arglasses/all /datum/gear/eyes/arglasses_all
display_name = "AR-Command glasses" display_name = "AR-Command glasses"
path = /obj/item/clothing/glasses/omnihud/all path = /obj/item/clothing/glasses/omnihud/all
cost = 2 cost = 2
allowed_roles = list(JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL) allowed_roles = list(JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL)
/datum/gear/eyes/arglasses/all/New() /datum/gear/eyes/arglasses_all/New()
..() ..()
var/list/selector_uniforms = list( var/list/selector_uniforms = list(
"standard AR-Command glasses"=/obj/item/clothing/glasses/omnihud/all, "standard AR-Command glasses"=/obj/item/clothing/glasses/omnihud/all,