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

Porting More Stuff

Browse Source 
Ports Moana Lou
https://github.com/tgstation/tgstation/pull/46539
Ports Moscow Mule, Sol Dry
https://github.com/tgstation/tgstation/pull/48466
Ports Hivemind Eraser
https://github.com/tgstation/tgstation/pull/49325
This commit is contained in:
Winter Flare
2020-03-22 15:13:00 -04:00
parent 5c3037b5d0
commit cd3f8f5df5
7 changed files with 84 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/drinks/drinks.dm
+7
View File
@@ -503,6 +503,13 @@
. = ..()
name = "lemon-lime soda"
/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry
name = "Sol Dry"
desc = "Maybe this will help your tummy feel better. Maybe not."
icon_state = "ginger_ale"
list_reagents = list(/datum/reagent/consumable/sol_dry = 30)
foodtype = SUGAR
/obj/item/reagent_containers/food/drinks/soda_cans/space_up
name = "Space-Up!"
desc = "Tastes like a hull breach in your mouth."
code/modules/food_and_drinks/recipes/drinks_recipes.dm
+19
View File
@@ -234,6 +234,12 @@
results = list(/datum/reagent/consumable/ethanol/black_russian = 5)
required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 3, /datum/reagent/consumable/ethanol/kahlua = 2)
/datum/chemical_reaction/hiveminderaser
name = "Hivemind Eraser"
id = /datum/reagent/consumable/ethanol/hiveminderaser
results = list(/datum/reagent/consumable/ethanol/hiveminderaser = 4)
required_reagents = list(/datum/reagent/consumable/ethanol/black_russian = 2, /datum/reagent/consumable/ethanol/thirteenloko = 1, /datum/reagent/consumable/grenadine = 1)
/datum/chemical_reaction/manhattan
name = "Manhattan"
id = /datum/reagent/consumable/ethanol/manhattan
@@ -300,6 +306,13 @@
results = list(/datum/reagent/consumable/ethanol/barefoot = 3)
required_reagents = list(/datum/reagent/consumable/berryjuice = 1, /datum/reagent/consumable/cream = 1, /datum/reagent/consumable/ethanol/vermouth = 1)
/datum/chemical_reaction/moscow_mule
name = "Moscow Mule"
id = /datum/reagent/consumable/ethanol/moscow_mule
results = list(/datum/reagent/consumable/ethanol/moscow_mule = 10)
required_reagents = list(/datum/reagent/consumable/sol_dry = 5, /datum/reagent/consumable/ethanol/vodka = 5, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/ice = 1)
mix_sound = 'sound/effects/bubbles2.ogg'
/datum/chemical_reaction/painkiller
name = "Painkiller"
id = /datum/reagent/consumable/ethanol/painkiller
@@ -833,6 +846,12 @@
results = list(/datum/reagent/consumable/red_queen = 10)
required_reagents = list(/datum/reagent/consumable/tea = 6, /datum/reagent/mercury = 2, /datum/reagent/consumable/blackpepper = 1, /datum/reagent/growthserum = 1)
/datum/chemical_reaction/mauna_loa
name = "Mauna Loa"
id = /datum/reagent/consumable/ethanol/mauna_loa
results = list(/datum/reagent/consumable/ethanol/mauna_loa = 5)
required_reagents = list(/datum/reagent/consumable/capsaicin = 2, /datum/reagent/consumable/ethanol/kahlua = 1, /datum/reagent/consumable/ethanol/bahama_mama = 2)
/datum/chemical_reaction/catnip_tea
name = "Catnip Tea"
id = /datum/reagent/consumable/catnip_tea