diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index e72d5abeb76..51c45980420 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -369,8 +369,13 @@ BLIND // can't see anything name = "tactical goggles" desc = "A stylish pair of tactical goggles that protect the eyes from aerosolized chemicals, debris and bright flashes." var/brand_name - icon = 'icons/clothing/eyes/goon_goggles.dmi' + icon_state = "military_goggles" var/sprite_state = "military_goggles" + // Implementing this temporarily to use the generic goggle inhands until unique sprites are made. + item_state_slots = list( + slot_l_hand_str = "plaingoggles", + slot_r_hand_str = "plaingoggles" + ) flash_protection = FLASH_PROTECTION_MODERATE //This needs to be set even if the state changes later, otherwise it spawns with no flash protection while appearing to be down change_item_state_on_flip = TRUE @@ -386,6 +391,7 @@ BLIND // can't see anything flash_protection = up ? FLASH_PROTECTION_NONE : FLASH_PROTECTION_MODERATE /obj/item/clothing/glasses/safety/goggles/tactical/generic + icon_state = "security_goggles" sprite_state = "security_goggles" //security hud @@ -393,8 +399,13 @@ BLIND // can't see anything name = "tactical goggles" desc = "A stylish pair of tactical goggles that protect the eyes from aerosolized chemicals, debris and bright flashes. Comes with a security HUD." var/brand_name - icon = 'icons/clothing/eyes/goon_goggles.dmi' + icon_state = "security_goggles" var/sprite_state = "security_goggles" + // Implementing this temporarily to use the generic goggle inhands until unique sprites are made. + item_state_slots = list( + slot_l_hand_str = "plaingoggles", + slot_r_hand_str = "plaingoggles" + ) flash_protection = FLASH_PROTECTION_MODERATE change_item_state_on_flip = TRUE @@ -418,14 +429,17 @@ BLIND // can't see anything /obj/item/clothing/glasses/safety/goggles/goon/pmc sprite_state = "pmc_goggles" + icon_state = "pmc_goggles" brand_name = "PMCG" /obj/item/clothing/glasses/safety/goggles/goon/zavod sprite_state = "zavod_goggles" + icon_state = "zavod_goggles" brand_name = "Zavodskoi" /obj/item/clothing/glasses/safety/goggles/goon/idris sprite_state = "idris_goggles" + icon_state = "idris_goggles" brand_name = "Idris" //medical hud @@ -433,8 +447,13 @@ BLIND // can't see anything name = "medical goggles" desc = "A stylish pair of medical goggles that protect the eyes from aerosolized chemicals and debris. Comes with a medical HUD." var/brand_name - icon = 'icons/clothing/eyes/goon_goggles.dmi' + icon_state = "security_goggles" var/sprite_state = "security_goggles" + // Implementing this temporarily to use the generic goggle inhands until unique sprites are made. + item_state_slots = list( + slot_l_hand_str = "plaingoggles", + slot_r_hand_str = "plaingoggles" + ) change_item_state_on_flip = TRUE /obj/item/clothing/glasses/safety/goggles/medical/Initialize(mapload, material_key) @@ -457,10 +476,12 @@ BLIND // can't see anything /obj/item/clothing/glasses/safety/goggles/medical/pmc sprite_state = "pmc_goggles" + icon_state = "pmc_goggles" brand_name = "PMCG" /obj/item/clothing/glasses/safety/goggles/medical/zeng sprite_state = "zeng_goggles" + icon_state = "zeng_goggles" brand_name = "Zeng-Hu" /obj/item/clothing/glasses/eyepatch diff --git a/html/changelogs/hazelmouse-fixediconstates.yml b/html/changelogs/hazelmouse-fixediconstates.yml new file mode 100644 index 00000000000..65c392ef827 --- /dev/null +++ b/html/changelogs/hazelmouse-fixediconstates.yml @@ -0,0 +1,60 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: hazelmouse + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Tactical goggles now have generic inhand sprites." + - qol: "Several weapons and goggle variants now appear with proper icons in map editing software." + - bugfix: "The sprite for the wasteland goggles no longer disappears when toggled off your eyes." diff --git a/icons/clothing/eyes/goon_goggles.dmi b/icons/clothing/eyes/goon_goggles.dmi deleted file mode 100644 index 08445d6094e..00000000000 Binary files a/icons/clothing/eyes/goon_goggles.dmi and /dev/null differ diff --git a/icons/obj/guns/bloodpike.dmi b/icons/obj/guns/bloodpike.dmi index c9119684713..e5b19f21368 100644 Binary files a/icons/obj/guns/bloodpike.dmi and b/icons/obj/guns/bloodpike.dmi differ diff --git a/icons/obj/guns/himeo_blaster.dmi b/icons/obj/guns/himeo_blaster.dmi index 427d465393e..716ad177ffe 100644 Binary files a/icons/obj/guns/himeo_blaster.dmi and b/icons/obj/guns/himeo_blaster.dmi differ diff --git a/icons/obj/guns/himeo_pistol.dmi b/icons/obj/guns/himeo_pistol.dmi index c65bb043084..9f30d94e9a6 100644 Binary files a/icons/obj/guns/himeo_pistol.dmi and b/icons/obj/guns/himeo_pistol.dmi differ diff --git a/icons/obj/guns/nralakkpistol.dmi b/icons/obj/guns/nralakkpistol.dmi index e4410c85a19..4f083839dbd 100644 Binary files a/icons/obj/guns/nralakkpistol.dmi and b/icons/obj/guns/nralakkpistol.dmi differ diff --git a/icons/obj/guns/nralakksmg.dmi b/icons/obj/guns/nralakksmg.dmi index f830a784a6c..3162f9cb806 100644 Binary files a/icons/obj/guns/nralakksmg.dmi and b/icons/obj/guns/nralakksmg.dmi differ diff --git a/icons/obj/guns/scythe.dmi b/icons/obj/guns/scythe.dmi index a4f477187ae..3716760bdcb 100644 Binary files a/icons/obj/guns/scythe.dmi and b/icons/obj/guns/scythe.dmi differ diff --git a/icons/obj/item/clothing/eyes/safety.dmi b/icons/obj/item/clothing/eyes/safety.dmi index d0d4f787137..c6875111af8 100644 Binary files a/icons/obj/item/clothing/eyes/safety.dmi and b/icons/obj/item/clothing/eyes/safety.dmi differ diff --git a/icons/obj/unathi_items.dmi b/icons/obj/unathi_items.dmi index c6a190391da..24e62f14e3c 100644 Binary files a/icons/obj/unathi_items.dmi and b/icons/obj/unathi_items.dmi differ