diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 85c9856ad68..54458f47b30 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -970,10 +970,11 @@ /obj/item/clothing/under/pants/camo = 1,/obj/item/clothing/under/pants/blackjeans=2,/obj/item/clothing/under/pants/khaki=2, /obj/item/clothing/under/pants/white=2,/obj/item/clothing/under/pants/red=1,/obj/item/clothing/under/pants/black=2, /obj/item/clothing/under/pants/tan=2,/obj/item/clothing/under/pants/blue=1,/obj/item/clothing/under/pants/track=1, - /obj/item/clothing/tie/waistcoat=1,/obj/item/clothing/under/sundress=2,/obj/item/clothing/under/blacktango=1, - /obj/item/clothing/suit/jacket=3,/obj/item/clothing/glasses/regular=2,/obj/item/clothing/head/sombrero=1, - /obj/item/clothing/suit/poncho=1,/obj/item/clothing/suit/ianshirt=1,/obj/item/clothing/shoes/laceup=2, - /obj/item/clothing/shoes/sneakers/black=4,/obj/item/clothing/shoes/sandal=1) + /obj/item/clothing/tie/redscarf=2,/obj/item/clothing/tie/greenscarf=1,/obj/item/clothing/tie/waistcoat=1, + /obj/item/clothing/under/sundress=2,/obj/item/clothing/under/blacktango=1,/obj/item/clothing/suit/jacket=3, + /obj/item/clothing/glasses/regular=2,/obj/item/clothing/head/sombrero=1,/obj/item/clothing/suit/poncho=1, + /obj/item/clothing/suit/ianshirt=1,/obj/item/clothing/shoes/laceup=2,/obj/item/clothing/shoes/sneakers/black=4, + /obj/item/clothing/shoes/sandal=1) contraband = list(/obj/item/clothing/under/syndicate/tacticool=1,/obj/item/clothing/mask/balaclava=1,/obj/item/clothing/head/ushanka=1,/obj/item/clothing/under/soviet=1) premium = list(/obj/item/clothing/under/suit_jacket/checkered=1,/obj/item/clothing/head/mailman=1,/obj/item/clothing/under/rank/mailman=1,/obj/item/clothing/suit/jacket/leather=1,/obj/item/clothing/under/pants/mustangjeans=1) refill_canister = /obj/item/weapon/vending_refill/clothing diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm index 7b14099d374..50ea0ac3ff2 100644 --- a/code/game/objects/items/weapons/vending_items.dm +++ b/code/game/objects/items/weapons/vending_items.dm @@ -61,4 +61,4 @@ /obj/item/weapon/vending_refill/clothing machine_name = "ClothesMate" icon_state = "refill_clothes" - charges = 16// of 48 + charges = 17// of 51 diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index 75cd9b7f17b..f10544a76a6 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -195,4 +195,20 @@ name = "medical guard armband" desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is white and blue." icon_state = "medblueband" - item_color = "medblueband" \ No newline at end of file + item_color = "medblueband" + +//////// +//MISC// +//////// + +/obj/item/clothing/tie/redscarf + name = "red scarf" + desc = "A stylish red scarf. The perfect winter accessory for those with a keen fashion sense." + icon_state = "redscarf" + item_color = "redscarf" + +/obj/item/clothing/tie/greenscarf + name = "green scarf" + desc = "For fashion enthusiasts, and those who just can't handle a cold breeze on their necks." + icon_state = "greenscarf" + item_color = "greenscarf" diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index c2befc32eaa..b635dca13e3 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 80722813075..2f4fba35c91 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ