cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 19:13:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tea and Coffee Fixes

Browse Source 
Fixes indentation issues preventing subtypes of coffee from inheriting
the base traits of coffee.

Adds indentation to allow Ice Tea to inherit base traits of Tea, just as
Iced Coffee does for Coffee. (standardization)

Adds Tea to the recognized list of Drinking Glass contents. Now it won't
show as a "Glass of ...What?"
This commit is contained in:
FalseIncarnate
2015-01-30 15:25:26 -05:00
parent 07c3dad77d
commit 5575ca217c
2 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents.dm
+37 -36
View File
@@ -3132,40 +3132,41 @@ datum
if(adj_temp > 0 && holder.has_reagent("frostoil"))
holder.remove_reagent("frostoil", 10*REAGENTS_METABOLISM)
holder.remove_reagent(src.id, 0.1)
icecoffee
name = "Iced Coffee"
id = "icecoffee"
description = "Coffee and ice, refreshing and cool."
color = "#102838" // rgb: 16, 40, 56
adj_temp = -5
soy_latte
name = "Soy Latte"
id = "soy_latte"
description = "A nice and tasty beverage while you are reading your hippie books."
color = "#664300" // rgb: 102, 67, 0
adj_sleepy = 0
adj_temp = 5
icecoffee
name = "Iced Coffee"
id = "icecoffee"
description = "Coffee and ice, refreshing and cool."
color = "#102838" // rgb: 16, 40, 56
adj_temp = -5
on_mob_life(var/mob/living/M as mob)
..()
M.sleeping = 0
if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
return
soy_latte
name = "Soy Latte"
id = "soy_latte"
description = "A nice and tasty beverage while you are reading your hippie books."
color = "#664300" // rgb: 102, 67, 0
adj_sleepy = 0
adj_temp = 5
cafe_latte
name = "Cafe Latte"
id = "cafe_latte"
description = "A nice, strong and tasty beverage while you are reading."
color = "#664300" // rgb: 102, 67, 0
adj_sleepy = 0
adj_temp = 5
on_mob_life(var/mob/living/M as mob)
..()
M.sleeping = 0
if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
return
on_mob_life(var/mob/living/M as mob)
..()
M.sleeping = 0
if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
return
cafe_latte
name = "Cafe Latte"
id = "cafe_latte"
description = "A nice, strong and tasty beverage while you are reading."
color = "#664300" // rgb: 102, 67, 0
adj_sleepy = 0
adj_temp = 5
on_mob_life(var/mob/living/M as mob)
..()
M.sleeping = 0
if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
return
tea
name = "Tea"
@@ -3183,12 +3184,12 @@ datum
M.adjustToxLoss(-1)
return
icetea
name = "Iced Tea"
id = "icetea"
description = "No relation to a certain rap artist/ actor."
color = "#104038" // rgb: 16, 64, 56
adj_temp = -5
icetea
name = "Iced Tea"
id = "icetea"
description = "No relation to a certain rap artist/ actor."
color = "#104038" // rgb: 16, 64, 56
adj_temp = -5
kahlua
name = "Kahlua"
code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+4
View File
@@ -516,6 +516,10 @@
icon_state = "brownstar"
name = "Brown Star"
desc = "Its not what it sounds like..."
if("tea")
icon_state = "glass_brown"
name = "Glass of Tea"
desc = "A glass of hot tea. Perhaps a cup with a handle would have been smarter?"
if("icetea")
icon_state = "icetea"
name = "Iced Tea"