From d5328f7d7cd8f77b97d6620785dfc412ec3c1198 Mon Sep 17 00:00:00 2001 From: Adri <33333517+Miraviel@users.noreply.github.com> Date: Tue, 19 Sep 2023 20:38:39 +0200 Subject: [PATCH] Fixes oversight about prescription glasses (#22445) Co-authored-by: Miraviel --- code/controllers/subsystem/SSjobs.dm | 3 +-- code/modules/clothing/glasses/glasses.dm | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/SSjobs.dm b/code/controllers/subsystem/SSjobs.dm index 7ba5195c2a4..b720526e60a 100644 --- a/code/controllers/subsystem/SSjobs.dm +++ b/code/controllers/subsystem/SSjobs.dm @@ -511,8 +511,7 @@ SUBSYSTEM_DEF(jobs) if(equipped != 1) var/obj/item/clothing/glasses/G = H.glasses if(istype(G) && !G.prescription) - G.prescription = TRUE - G.name = "prescription [G.name]" + G.upgrade_prescription() H.update_nearsighted_effects() H.create_log(MISC_LOG, "Spawned as \an [H.dna?.species ? H.dna.species : "Undefined species"] named [H]. [joined_late ? "Joined during the round" : "Roundstart joined"] as job: [rank].") diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 796238c8de9..2cd1691d979 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -204,6 +204,7 @@ desc = "Yarr." icon_state = "eyepatch" item_state = "eyepatch" + prescription_upgradable = TRUE sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', @@ -263,7 +264,7 @@ desc = "Made by Nerd. Co." icon_state = "glasses" item_state = "glasses" - prescription = 1 + prescription = TRUE sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', @@ -330,6 +331,8 @@ see_in_dark = 0 flash_protect = FLASH_PROTECTION_NONE tint = FLASH_PROTECTION_NONE + prescription_upgradable = TRUE + sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', @@ -516,6 +519,7 @@ actions_types = list(/datum/action/item_action/toggle) up = FALSE tint = FLASH_PROTECTION_NONE + prescription_upgradable = TRUE sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',