diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index 2d638d22119..19cc02cf170 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -530,7 +530,6 @@ var/path = pick(list( /obj/item/clothing/glasses/eyepatch, /obj/item/clothing/glasses/regular, - /obj/item/clothing/glasses/gglasses, /obj/item/clothing/glasses/regular/hipster, /datum/gear/eyes/glasses/monocle, /datum/gear/eyes/shades/aviator, diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 36b085ad657..e4b77dc4ec7 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -136,7 +136,7 @@ new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc) new /obj/item/clothing/head/flatcap(src.loc) new /obj/item/clothing/suit/storage/toggle/labcoat/mad(src.loc) - new /obj/item/clothing/glasses/gglasses(src.loc) + new /obj/item/clothing/glasses/regular(src.loc) delete_me = 1 /obj/effect/landmark/costume/elpresidente/New() @@ -256,4 +256,4 @@ icon_state = "yellow" /obj/effect/landmark/distress_team_equipment - name = "distress equipment" \ No newline at end of file + name = "distress equipment" diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index f9f5c164c59..220e9ce2cf5 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -9,14 +9,18 @@ display_name = "glasses, prescription" path = /obj/item/clothing/glasses/regular -/datum/gear/eyes/glasses/green - display_name = "glasses, green" - path = /obj/item/clothing/glasses/gglasses - /datum/gear/eyes/glasses/prescriptionhipster display_name = "glasses, hipster" path = /obj/item/clothing/glasses/regular/hipster +/datum/gear/eyes/glasses/prescriptionhipster + display_name = "glasses, circle" + path = /obj/item/clothing/glasses/regular/circle + +/datum/gear/eyes/glasses/prescriptionhipster + display_name = "glasses, jamjar" + path = /obj/item/clothing/glasses/regular/jamjar + /datum/gear/eyes/glasses/monocle display_name = "monocle" path = /obj/item/clothing/glasses/monocle @@ -140,4 +144,4 @@ /datum/gear/eyes/circuitry display_name = "goggles, circuitry (empty)" - path = /obj/item/clothing/glasses/circuitry \ No newline at end of file + path = /obj/item/clothing/glasses/circuitry diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 134d1e49363..bd0ff67f5f5 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -326,12 +326,17 @@ BLIND // can't see anything item_state = "3d" body_parts_covered = 0 -/obj/item/clothing/glasses/gglasses - name = "green glasses" - desc = "Forest green glasses, like the kind you'd wear when hatching a nasty scheme." - icon_state = "gglasses" - item_state = "gglasses" - body_parts_covered = 0 +/obj/item/clothing/glasses/regular/jamjar + name = "jamjar glasses" + desc = "Also known as Virginity Protectors." + icon_state = "jamjar_glasses" + item_state = "jamjar_glasses" + +/obj/item/clothing/glasses/regular/circle + name = "circle glasses" + desc = "Why would you wear something so controversial yet so brave?" + icon_state = "circle_glasses" + 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." @@ -776,4 +781,4 @@ BLIND // can't see anything tint = TINT_MODERATE else flash_protection = FLASH_PROTECTION_NONE - tint = TINT_NONE \ No newline at end of file + tint = TINT_NONE diff --git a/html/changelogs/wezzy_dork_glasses.yml b/html/changelogs/wezzy_dork_glasses.yml new file mode 100644 index 00000000000..06c44aafea0 --- /dev/null +++ b/html/changelogs/wezzy_dork_glasses.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: + - rscadd: "Adds new jamjar and circle glasses in the loadout. Check them out." + - rscdel: "Removes green glasses for being practically useless." diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index e77e822e7cb..50d0ba2c1ce 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index f38c925f22b..c013ab11845 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ