From ae7c0f2a747f052393fda7c6442b3aeace0b4cd1 Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Wed, 9 Sep 2020 00:10:24 +0800 Subject: [PATCH] Sunglasses fix (#9918) --- .../preference_setup/loadout/loadout_eyes.dm | 5 +-- code/modules/clothing/glasses/glasses.dm | 26 ++++++------ html/changelogs/wezzy_sunglasses_fix.yml | 42 +++++++++++++++++++ 3 files changed, 58 insertions(+), 15 deletions(-) create mode 100644 html/changelogs/wezzy_sunglasses_fix.yml diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index c86d06b7969..609fb410e58 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -33,14 +33,13 @@ glasses["sunglasses, aviator"] = /obj/item/clothing/glasses/fakesunglasses/aviator glasses["sunglasses, prescription"] = /obj/item/clothing/glasses/fakesunglasses/prescription glasses["sunglasses, fat"] = /obj/item/clothing/glasses/fakesunglasses/big - gear_tweaks += new/datum/gear_tweak/path(glasses) /datum/gear/eyes/sunglasses - display_name = "flash-proof sunglasses selection" + display_name = "flash-proof sunglasses selection (Security/Command)" description = "A selection of flash-proof sunglasses." path = /obj/item/clothing/glasses/sunglasses - allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician") + allowed_roles = list("Security Officer", "Head of Security", "Warden", "Captain", "Head of Personnel", "Quartermaster", "Internal Affairs Agent", "Detective", "Forensic Technician") /datum/gear/eyes/sunglasses/New() ..() diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index fef93b70951..ed86345495c 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -121,7 +121,6 @@ BLIND // can't see anything attack_self(usr) - /obj/item/clothing/glasses/hud/health/aviator name = "medical HUD aviators" desc = "Modified aviator glasses with a toggled health HUD. Comes with bonus prescription overlay." @@ -139,7 +138,6 @@ BLIND // can't see anything attack_self(usr) - /obj/item/clothing/glasses/science name = "science goggles" desc = "Used to protect your eyes against harmful chemicals!" @@ -186,7 +184,6 @@ BLIND // can't see anything attack_self(usr) - /obj/item/clothing/glasses/safety name = "safety glasses" desc = "A simple pair of safety glasses. Thinner than their goggle counterparts, for those who can't decide between safety and style." @@ -365,7 +362,7 @@ BLIND // can't see anything darkness_view = -1 flash_protection = FLASH_PROTECTION_MODERATE -/obj/item/clothing/glasses/fakesunglasses/Initialize() +/obj/item/clothing/glasses/sunglasses/Initialize() . = ..() desc += " Enhanced shielding blocks many flashes." @@ -380,38 +377,43 @@ BLIND // can't see anything name = "prescription sunglasses" prescription = 1 +/obj/item/clothing/glasses/sunglasses/prescription/Initialize() + . = ..() + desc += " Comes with built-in prescription lenses." + /obj/item/clothing/glasses/sunglasses/big - desc = "Strangely ancient technology used to help provide rudimentary eye cover." icon_state = "bigsunglasses" item_state = "sun" //For style with no powergaming connotations. /obj/item/clothing/glasses/fakesunglasses - desc = "Strangely ancient technology used to help provide rudimentary eye cover." - name = "sunglasses" + name = "stylish sunglasses" + desc = "A pair of designer sunglasses." icon_state = "sun" item_state = "sun" darkness_view = -1 /obj/item/clothing/glasses/fakesunglasses/Initialize() . = ..() - desc += " Doesn't seem like it'll block flashes." - + desc += " Doesn't seem like it'll block flashes." /obj/item/clothing/glasses/fakesunglasses/aviator - name = "aviators" + name = "stylish aviators" desc = "A pair of designer sunglasses. They should put HUDs in these." icon_state = "aviator" item_state = "aviator" prescription = 1 /obj/item/clothing/glasses/fakesunglasses/prescription - name = "prescription sunglasses" + name = "stylish prescription sunglasses" prescription = 1 +/obj/item/clothing/glasses/fakesunglasses/prescription/Initialize() + . = ..() + desc += " Comes with built-in prescription lenses." + /obj/item/clothing/glasses/fakesunglasses/big - desc = "Strangely ancient technology used to help provide rudimentary eye cover." icon_state = "bigsunglasses" item_state = "sun" diff --git a/html/changelogs/wezzy_sunglasses_fix.yml b/html/changelogs/wezzy_sunglasses_fix.yml new file mode 100644 index 00000000000..deca23471eb --- /dev/null +++ b/html/changelogs/wezzy_sunglasses_fix.yml @@ -0,0 +1,42 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Command staff can now get sunglasses again as per last time." + - bugfix: "Descriptions have been fixed for sunglasses and stylish sunglasses." \ No newline at end of file