diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index f9dbd1928b..6e4d5e5a7d 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -1398,15 +1398,15 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/eggnog name = "Eggnog" id = "eggnog" - description = "For enjoying the most wonderful time of the year." + description = "The traditional way to get absolutely hammered at a Christmas party." color = "#fcfdc6" // rgb: 252, 253, 198 nutriment_factor = 2 * REAGENTS_METABOLISM boozepwr = 1 quality = DRINK_VERYGOOD taste_description = "custard and alcohol" - glass_icon_state = "glass_yellow" + glass_icon_state = "nog3" glass_name = "eggnog" - glass_desc = "For enjoying the most wonderful time of the year." + glass_desc = "The traditional way to get absolutely hammered at a Christmas party." /datum/reagent/consumable/ethanol/narsour diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index e6e8ff9eb7..a32d0234d6 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index 773366c81e..9d3a6b9a02 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -18,42 +18,6 @@ category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/cloak/david cost = 3 - -/datum/gear/creamsweater - name = "Cream Commando Sweater" - category = SLOT_WEAR_SUIT - path = /obj/item/clothing/under/bb_sweater - cost = 1 - -/datum/gear/blacksweater - name = "Black Commando Sweater" - category = SLOT_WEAR_SUIT - path = /obj/item/clothing/under/bb_sweater/black - cost = 1 - -/datum/gear/purpsweater - name = "Purple Commando Sweater" - category = SLOT_WEAR_SUIT - path = /obj/item/clothing/under/bb_sweater/purple - cost = 1 - -/datum/gear/greensweater - name = "Green Commando Sweater" - category = SLOT_WEAR_SUIT - path = /obj/item/clothing/under/bb_sweater/green - cost = 1 - -/datum/gear/redsweater - name = "Red Commando Sweater" - category = SLOT_WEAR_SUIT - path = /obj/item/clothing/under/bb_sweater/red - cost = 1 - -/datum/gear/bluesweater - name = "Navy Commando Sweater" - category = SLOT_WEAR_SUIT - path = /obj/item/clothing/under/bb_sweater/blue - cost = 1 /datum/gear/jacketbomber name = "Bomber jacket" diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 7c592c60e1..e4e2f063d3 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -118,11 +118,43 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/pants/track +// Pantsless Sweaters + /datum/gear/turtleneck name = "Tactitool Turtleneck" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/syndicate/cosmetic +/datum/gear/creamsweater + name = "Cream Commando Sweater" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/bb_sweater + +/datum/gear/blacksweater + name = "Black Commando Sweater" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/bb_sweater/black + +/datum/gear/purpsweater + name = "Purple Commando Sweater" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/bb_sweater/purple + +/datum/gear/greensweater + name = "Green Commando Sweater" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/bb_sweater/green + +/datum/gear/redsweater + name = "Red Commando Sweater" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/bb_sweater/red + +/datum/gear/bluesweater + name = "Navy Commando Sweater" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/bb_sweater/blue + /datum/gear/polykilt name = "Polychromic Kilt" category = SLOT_W_UNIFORM