diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index ba66bf6e26..7f28b88ad6 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -166,15 +166,10 @@ icon_state = "sweater_uglyxmas" item_state = "sweater_uglyxmas" -/obj/item/clothing/accessory/sweater/uglyxmas - name = "ugly xmas sweater" - icon_state = "sweater_uglyxmas" - item_state = "sweater_uglyxmas" - /obj/item/clothing/accessory/sweater/flower name = "flower sweater" - icon_state = "sweater_uglyxmas" - item_state = "sweater_uglyxmas" + icon_state = "sweater_flower" + item_state = "sweater_flower" //////////////// //Suit Jackets// @@ -223,6 +218,11 @@ icon_state = "turtleneck_red" item_state = "turtleneck_red" +/obj/item/clothing/accessory/turtleneck/comfy + name = "comfy turtleneck" + icon_state = "turtleneck_comfy" + item_state = "turtleneck_comfy" + /obj/item/clothing/accessory/turtleneck/tactifool name = "black sweaterneck" desc = "Extra fool. Extra cool." diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 4c69f6bb27..8d19d46530 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -34,7 +34,6 @@ /obj/item/clothing/under/costume/kilt = 3, /obj/item/clothing/under/misc/overalls = 3, /obj/item/clothing/under/suit/sl = 3, - /obj/item/clothing/under/sweater = 3, /obj/item/clothing/accessory/sweater = 3, /obj/item/clothing/accessory/sweater/pink = 3, /obj/item/clothing/accessory/sweater/heart = 3, @@ -45,9 +44,11 @@ /obj/item/clothing/accessory/sweater/flower = 3, /obj/item/clothing/accessory/turtleneck = 2, /obj/item/clothing/accessory/turtleneck/red = 2, + /obj/item/clothing/accessory/turtleneck/comfy = 2, /obj/item/clothing/accessory/turtleneck/tactifool = 2, /obj/item/clothing/accessory/turtleneck/tactifool/green = 2, /obj/item/clothing/accessory/turtleneck/tactifool/blue = 2, + /obj/item/clothing/under/sweater = 3, /obj/item/clothing/under/sweater/black = 3, /obj/item/clothing/under/sweater/purple = 3, /obj/item/clothing/under/sweater/green = 3, diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi index 96308a6e70..3d1f58743c 100644 Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index fd03e2279f..95d0422b7e 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -15,6 +15,18 @@ name = "Black beret" path = /obj/item/clothing/head/beret/black +/datum/gear/head/redberet + name = "Red beret" + path = /obj/item/clothing/head/beret + +/datum/gear/head/purpleberet + name = "{Purple beret" + path = /obj/item/clothing/head/beret/purple + +/datum/gear/head/blueberet + name = "Blue beret" + path = /obj/item/clothing/head/beret/blue + /datum/gear/head/flatcap name = "Flat cap" path = /obj/item/clothing/head/flatcap