From 5342d41549cdfb4a1e1d8c31245c03ee126866a2 Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Tue, 8 Sep 2020 01:11:54 +0800 Subject: [PATCH] Loadout fixes (#9907) --- .../preference_setup/loadout/loadout_eyes.dm | 37 +++++++++++-- .../preference_setup/loadout/loadout_suit.dm | 2 +- .../loadout/loadout_utility.dm | 3 +- code/modules/clothing/glasses/glasses.dm | 54 +++++++++++++++---- html/changelogs/wezzy_loadoutfixes.yml | 44 +++++++++++++++ 5 files changed, 123 insertions(+), 17 deletions(-) create mode 100644 html/changelogs/wezzy_loadoutfixes.yml diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index 35031a0c7ba..b154914c294 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -7,7 +7,7 @@ /datum/gear/eyes/glasses display_name = "glasses selection" - description = "A selection of eyewear, tinted and tintedn't" + description = "A selection of glasses." path = /obj/item/clothing/glasses/regular /datum/gear/eyes/glasses/New() @@ -19,9 +19,36 @@ glasses["glasses, jamjar"] = /obj/item/clothing/glasses/regular/jamjar glasses["glasses, monocle"] = /obj/item/clothing/glasses/monocle glasses["glasses, safety"] = /obj/item/clothing/glasses/safety - glasses["sunglasses, fat"] = /obj/item/clothing/glasses/sunglasses/big - glasses["sunglasses, prescription"] = /obj/item/clothing/glasses/sunglasses/prescription - glasses["sunglasses, aviator"] = /obj/item/clothing/glasses/sunglasses/aviator + gear_tweaks += new/datum/gear_tweak/path(glasses) + +/datum/gear/eyes/fakesunglasses + display_name = "sunglasses selection" + description = "A selection of sunglasses." + path = /obj/item/clothing/glasses/sunglasses + +/datum/gear/eyes/fakesunglasses/New() + ..() + var/glasses = list() + glasses["sunglasses, regular"] = /obj/item/clothing/glasses/fakesunglasses + 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" + 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") + +/datum/gear/eyes/sunglasses/New() + ..() + var/glasses = list() + glasses["flash-proof sunglasses, regular"] = /obj/item/clothing/glasses/sunglasses + glasses["flash-proof sunglasses, aviator"] = /obj/item/clothing/glasses/sunglasses/aviator + glasses["flash-proof sunglasses, prescription"] = /obj/item/clothing/glasses/sunglasses/prescription + glasses["flash-proof sunglasses, fat"] = /obj/item/clothing/glasses/sunglasses/big gear_tweaks += new/datum/gear_tweak/path(glasses) /datum/gear/eyes/goggles @@ -58,7 +85,7 @@ path = /obj/item/clothing/glasses/sunglasses/sechud/aviator allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician") -/datum/gear/eyes/medhuds/New() +/datum/gear/eyes/sechuds/New() ..() var/sechud = list() sechud["aviators, security"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 2f444a044a2..c53dd900137 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -246,7 +246,7 @@ /datum/gear/suit/dep_jacket display_name = "department jackets selection" - description = "A selection of department jackets." + description = "A selection of departmental jackets." path = /obj/item/clothing/suit/storage/toggle/engi_dep_jacket /datum/gear/suit/dep_jacket/New() diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index 67529beb3e3..24132aa09e2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -68,8 +68,9 @@ path = /obj/item/device/paicard /datum/gear/utility/wallet - display_name = "wallet, selection" + display_name = "wallet selection" path = /obj/item/storage/wallet + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION /datum/gear/utility/wallet/New() ..() diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index f03dc079b35..fef93b70951 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -358,13 +358,17 @@ BLIND // can't see anything item_state = "circle_glasses" /obj/item/clothing/glasses/sunglasses - desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes." name = "sunglasses" + desc = "Strangely ancient technology used to help provide rudimentary eye cover." icon_state = "sun" item_state = "sun" darkness_view = -1 flash_protection = FLASH_PROTECTION_MODERATE +/obj/item/clothing/glasses/fakesunglasses/Initialize() + . = ..() + desc += " Enhanced shielding blocks many flashes." + /obj/item/clothing/glasses/sunglasses/aviator name = "aviators" desc = "A pair of designer sunglasses. They should put HUDs in these." @@ -372,6 +376,45 @@ BLIND // can't see anything item_state = "aviator" prescription = 1 +/obj/item/clothing/glasses/sunglasses/prescription + name = "prescription sunglasses" + prescription = 1 + +/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" + icon_state = "sun" + item_state = "sun" + darkness_view = -1 + +/obj/item/clothing/glasses/fakesunglasses/Initialize() + . = ..() + desc += " Doesn't seem like it'll block flashes." + + +/obj/item/clothing/glasses/fakesunglasses/aviator + name = "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" + prescription = 1 + +/obj/item/clothing/glasses/fakesunglasses/big + desc = "Strangely ancient technology used to help provide rudimentary eye cover." + icon_state = "bigsunglasses" + item_state = "sun" + /obj/item/clothing/glasses/welding name = "welding goggles" desc = "Protects the eyes from welders, approved by the mad scientist association." @@ -442,15 +485,6 @@ BLIND // can't see anything item_state = null w_class = ITEMSIZE_TINY -/obj/item/clothing/glasses/sunglasses/prescription - name = "prescription sunglasses" - prescription = 1 - -/obj/item/clothing/glasses/sunglasses/big - desc = "Strangely ancient technology used to help provide rudimentary eye cover. Larger than average enhanced shielding blocks many flashes." - icon_state = "bigsunglasses" - item_state = "sun" - /obj/item/clothing/glasses/sunglasses/sechud name = "HUDsunglasses" desc = "Sunglasses with a HUD." diff --git a/html/changelogs/wezzy_loadoutfixes.yml b/html/changelogs/wezzy_loadoutfixes.yml new file mode 100644 index 00000000000..87b57642221 --- /dev/null +++ b/html/changelogs/wezzy_loadoutfixes.yml @@ -0,0 +1,44 @@ +################################ +# 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: "Sechuds and medhuds should no longer be jumbled up now." + - bugfix: "Wallets are actually re-colorable now." + - balance: "Flash proof sunglasses have been job restricted again. This is mainly to avoid powergaming issues." + - rscadd: "Non-flash proof sunglasses have been readded."