diff --git a/code/datums/trading/goods.dm b/code/datums/trading/goods.dm index 218051b2c33..512e0c81173 100644 --- a/code/datums/trading/goods.dm +++ b/code/datums/trading/goods.dm @@ -149,7 +149,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/fluff = TRADER_BLACKLIST_ALL, /obj/item/clothing/suit/storage/toggle/labcoat = TRADER_ALL, /obj/item/clothing/suit/storage/toggle/labcoat/fluff = TRADER_BLACKLIST_ALL, - /obj/item/clothing/suit/varsity = TRADER_ALL, + /obj/item/clothing/suit/storage/toggle/varsity = TRADER_ALL, /obj/item/clothing/suit/storage/toggle/track = TRADER_ALL, /obj/item/clothing/suit/jacket/puffer = TRADER_ALL, /obj/item/clothing/suit/storage/toggle/flannel = TRADER_ALL diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 12f5fa6551f..87736619250 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -294,13 +294,13 @@ /datum/gear/suit/varsity display_name = "varsity jacket selection" - path = /obj/item/clothing/suit/varsity + path = /obj/item/clothing/suit/storage/toggle/varsity /datum/gear/suit/varsity/New() ..() var/list/varsities = list() - for(var/varsity_style in typesof(/obj/item/clothing/suit/varsity)) - var/obj/item/clothing/suit/varsity/varsity = varsity_style + for(var/varsity_style in typesof(/obj/item/clothing/suit/storage/toggle/varsity)) + var/obj/item/clothing/suit/storage/toggle/varsity/varsity = varsity_style varsities[initial(varsity.name)] = varsity gear_tweaks += new/datum/gear_tweak/path(sortAssoc(varsities)) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 868c4f6baec..b2e6fe8f593 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -500,37 +500,49 @@ icon_closed = "trackjacketwhite" contained_sprite = 1 -/obj/item/clothing/suit/varsity +/obj/item/clothing/suit/storage/toggle/varsity name = "black varsity jacket" desc = "A favorite of jocks everywhere from Sol to the Coalition." icon_state = "varsity" item_state = "varsity" + icon_open = "varsity_open" + icon_closed = "varsity" allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/device/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask) -/obj/item/clothing/suit/varsity/red +/obj/item/clothing/suit/storage/toggle/varsity/red name = "red varsity jacket" icon_state = "varsity_red" item_state = "varsity_red" + icon_open = "varsity_red_open" + icon_closed = "varsity_red" -/obj/item/clothing/suit/varsity/purple +/obj/item/clothing/suit/storage/toggle/varsity/purple name = "purple varsity jacket" icon_state = "varsity_purple" item_state = "varsity_purple" + icon_open = "varsity_purple_open" + icon_closed = "varsity_purple" -/obj/item/clothing/suit/varsity/green +/obj/item/clothing/suit/storage/toggle/varsity/green name = "green varsity jacket" icon_state = "varsity_green" item_state = "varsity_green" + icon_open = "varsity_green_open" + icon_closed = "varsity_green" -/obj/item/clothing/suit/varsity/blue +/obj/item/clothing/suit/storage/toggle/varsity/blue name = "blue varsity jacket" icon_state = "varsity_blue" item_state = "varsity_blue" + icon_open = "varsity_blue_open" + icon_closed = "varsity_blue" -/obj/item/clothing/suit/varsity/brown +/obj/item/clothing/suit/storage/toggle/varsity/brown name = "brown varsity jacket" icon_state = "varsity_brown" item_state = "varsity_brown" + icon_open = "varsity_brown_open" + icon_closed = "varsity_brown" /obj/item/clothing/suit/storage/legion name = "tcfl jacket" diff --git a/html/changelogs/YourDaddy117-varsity.yml b/html/changelogs/YourDaddy117-varsity.yml new file mode 100644 index 00000000000..d7bd5cc8e0b --- /dev/null +++ b/html/changelogs/YourDaddy117-varsity.yml @@ -0,0 +1,41 @@ +################################ +# 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: YourDaddy117 + +# 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: + - imageadd: "Replaces varsity jackets with new sprites that have both an opened and closed state. Also gives them pockets." \ No newline at end of file diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index ca28398f60c..87155c44234 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 25e939cfbff..fb6d41fd69f 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ