cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-20

Browse Source
This commit is contained in:
Leshana
2018-01-21 00:23:00 -05:00
parent 7b55206351 c79a75abce
commit 805897eafb
15 changed files with 283 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents.dm
+2 -1
View File
@@ -44,7 +44,8 @@
var/list/glass_special = null // null equivalent to list()
/datum/reagent/proc/remove_self(var/amount) // Shortcut
holder.remove_reagent(id, amount)
if(holder)
holder.remove_reagent(id, amount)
// This doesn't apply to skin contact - this is for, e.g. extinguishers and sprays. The difference is that reagent is not directly on the mob's skin - it might just be on their clothing.
/datum/reagent/proc/touch_mob(var/mob/M, var/amount)
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+4 -4
View File
@@ -2489,13 +2489,13 @@
/datum/reagent/ethanol/euphoria
name = "Euphoria"
id = "euphoria"
description = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existance."
description = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence."
taste_description = "impossibly rich alcohol"
color = "#614126"
strength = 9
glass_name = "Euphoria"
glass_desc = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existance."
glass_desc = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence."
/datum/reagent/ethanol/xanaducannon
name = "Xanadu Cannon"
@@ -2583,7 +2583,7 @@
/datum/reagent/ethanol/winebrandy
name = "Wine Brandy"
id = "winebrandy"
description = "An premium spirit made from distilled wine."
description = "A premium spirit made from distilled wine."
taste_description = "very sweet dried fruit with many elegant notes"
color = "#4C130B" // rgb(76,19,11)
strength = 20
@@ -2735,7 +2735,7 @@
color = "#a0692e" // rgb(160, 105, 46)
strength = 20
glass_name = "Whisker Sour"
glass_name = "Whiskey Sour"
glass_desc = "A smokey, refreshing lemoned whiskey."
/datum/reagent/ethanol/oldfashioned
code/modules/reagents/Chemistry-Recipes.dm
+1 -1
View File
@@ -1868,7 +1868,7 @@
required_reagents = list("tea" = 5, "limejuice" = 1)
result_amount = 6
/datum/chemical_reaction/drinks/limetea
/datum/chemical_reaction/drinks/orangetea
name = "Orange Tea"
id = "orangetea"
result = "orangetea"