From f76d93a3687f4cd5719f770a342c9e355113f44e Mon Sep 17 00:00:00 2001 From: Ragolution Date: Fri, 14 Dec 2018 01:26:34 -0500 Subject: [PATCH 1/6] Update drinks.dm * Changes flavor text to reflect status as not a carton. --- code/modules/food_and_drinks/drinks/drinks.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 9256f5bdd1..3c541c7b3b 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -328,9 +328,9 @@ desc = "Milk for cool kids!" foodtype = SUGAR if("eggnog") - icon_state = "nog2" - name = "carton of eggnog" - desc = "For enjoying the most wonderful time of the year." + icon_state = "nog3" + name = "glass of eggnog" + desc = "The traditional way to get hammered at a Christmas party." foodtype = MEAT else icon_state = "juicebox" From 8dd8fb41674fe0eee7b7a5f08d349620afe452d0 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Fri, 14 Dec 2018 01:41:45 -0500 Subject: [PATCH 2/6] Update drinks.dmi Adds new icon for glass of eggnog as state nog3 --- icons/obj/drinks.dmi | Bin 71840 -> 72826 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index e6e8ff9eb71f5703747621ab8ac21accc9b37532..a32d0234d6832289a1d5e7bd54bf14a00f897e08 100644 GIT binary patch delta 16599 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 VSFQROKSO{?PD)v_O58N~{{RY%0dW8T delta 15605 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 From 517a6d71efc5c2b3105b75483ddd68dc9b647afc Mon Sep 17 00:00:00 2001 From: Ragolution Date: Fri, 14 Dec 2018 01:45:39 -0500 Subject: [PATCH 3/6] Revert "Update drinks.dm" This reverts commit f76d93a3687f4cd5719f770a342c9e355113f44e. --- code/modules/food_and_drinks/drinks/drinks.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 3c541c7b3b..9256f5bdd1 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -328,9 +328,9 @@ desc = "Milk for cool kids!" foodtype = SUGAR if("eggnog") - icon_state = "nog3" - name = "glass of eggnog" - desc = "The traditional way to get hammered at a Christmas party." + icon_state = "nog2" + name = "carton of eggnog" + desc = "For enjoying the most wonderful time of the year." foodtype = MEAT else icon_state = "juicebox" From 2b97d32dd27d949740ed8e2bca335e03f3200720 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Fri, 14 Dec 2018 01:49:05 -0500 Subject: [PATCH 4/6] Improves Eggnog Changes icon state to new icon, rather than standard glass of yellow juice. Also adds flavorful description. --- .../modules/reagents/chemistry/reagents/alcohol_reagents.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 From 01c589f1724fd497fa1939395e9b2ca48186c53e Mon Sep 17 00:00:00 2001 From: Ragolution Date: Sat, 15 Dec 2018 06:38:32 -0500 Subject: [PATCH 5/6] 5th Port Sweater Adjustments Puts 5th port sweaters into the correct category and file. Fixes sweaters not spawning. --- .../code/modules/client/loadout/suit.dm | 36 ------------------- .../code/modules/client/loadout/uniform.dm | 36 +++++++++++++++++++ 2 files changed, 36 insertions(+), 36 deletions(-) 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..63505d0814 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -123,6 +123,42 @@ 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 + cost = 1 + +/datum/gear/blacksweater + name = "Black Commando Sweater" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/bb_sweater/black + cost = 1 + +/datum/gear/purpsweater + name = "Purple Commando Sweater" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/bb_sweater/purple + cost = 1 + +/datum/gear/greensweater + name = "Green Commando Sweater" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/bb_sweater/green + cost = 1 + +/datum/gear/redsweater + name = "Red Commando Sweater" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/bb_sweater/red + cost = 1 + +/datum/gear/bluesweater + name = "Navy Commando Sweater" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/bb_sweater/blue + cost = 1 + /datum/gear/polykilt name = "Polychromic Kilt" category = SLOT_W_UNIFORM From ff8a2337ca90afc2aa6edc234bbe5697bf32771d Mon Sep 17 00:00:00 2001 From: Ragolution Date: Sat, 15 Dec 2018 16:02:51 -0500 Subject: [PATCH 6/6] Removes outfitting cost Removes loadout cost from sweaters because they're just sweaters. --- modular_citadel/code/modules/client/loadout/uniform.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 63505d0814..e4e2f063d3 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -118,6 +118,8 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/pants/track +// Pantsless Sweaters + /datum/gear/turtleneck name = "Tactitool Turtleneck" category = SLOT_W_UNIFORM @@ -127,37 +129,31 @@ name = "Cream Commando Sweater" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/bb_sweater - cost = 1 /datum/gear/blacksweater name = "Black Commando Sweater" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/bb_sweater/black - cost = 1 /datum/gear/purpsweater name = "Purple Commando Sweater" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/bb_sweater/purple - cost = 1 /datum/gear/greensweater name = "Green Commando Sweater" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/bb_sweater/green - cost = 1 /datum/gear/redsweater name = "Red Commando Sweater" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/bb_sweater/red - cost = 1 /datum/gear/bluesweater name = "Navy Commando Sweater" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/bb_sweater/blue - cost = 1 /datum/gear/polykilt name = "Polychromic Kilt"