shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7823 from Ragolution/master

Browse Source 
Adjusts Egg Nog to be more immersive (and just in time for the Winter Ball)
This commit is contained in:
nik707
2018-12-15 15:16:26 -06:00
committed by GitHub
parent 2852daa27d ff8a2337ca
commit a88434f69e
4 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+3 -3
View File
@@ -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
icons/obj/drinks.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 71 KiB

modular_citadel/code/modules/client/loadout/suit.dm
-36
View File
@@ -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"
modular_citadel/code/modules/client/loadout/uniform.dm
+32
View File
@@ -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