cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 15:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24348 from dannno/vendy

Browse Source 
Sodie pops
This commit is contained in:
WJohn
2017-02-23 07:55:34 -05:00
committed by GitHub
parent 57e6c9b121 d300e2d5bf
commit a13a52a98f
12 changed files with 134 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/drinks/drinks.dm
+11 -1
View File
@@ -351,7 +351,7 @@
name = "Lemon-Lime Soda"
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_up
name = "Space-Up"
name = "Space-Up!"
desc = "Tastes like a hull breach in your mouth."
icon_state = "space-up"
list_reagents = list("space_up" = 30)
@@ -380,4 +380,14 @@
icon_state = "dr_gibb"
list_reagents = list("dr_gibb" = 30)
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/pwr_game
name = "Pwr Game"
desc = "The only drink with the PWR that true gamers crave."
icon_state = "purple_can"
list_reagents = list("pwr_game" = 30)
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/shamblers
name = "Shambler's Juice"
desc = "~Shake me up some of that Shambler's Juice!~"
icon_state = "shamblers"
list_reagents = list("shamblers" = 30)
code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+9 -1
View File
@@ -265,6 +265,14 @@
icon_state = "space-up_glass"
name = "glass of Space-up"
desc = "Space-up. It helps you keep your cool."
if("pwr_game")
icon_state = "glass_red"
name = "glass of Pwr Game"
desc = "Goes well with a Vlad's salad."
if("shamblers")
icon_state = "glass_red"
name = "glass of Shambler's Juice"
desc = "Mmm mm, shambly."
if("lemon_lime")
icon_state = "glass_yellow"
name = "glass of Lemon-Lime"
@@ -648,7 +656,7 @@
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/cola
name = "Space Cola"
list_reagents = list("cola" = 50)
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
name = "Nuka Cola"
list_reagents = list("nuka_cola" = 50)
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+2
View File
@@ -317,6 +317,8 @@
"tonic",
"sodawater",
"lemon_lime",
"pwr_game",
"shamblers",
"sugar",
"orangejuice",
"limejuice",
code/modules/reagents/chemistry/reagents/drink_reagents.dm
+21
View File
@@ -392,6 +392,27 @@
M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
..()
/datum/reagent/consumable/pwr_game
name = "Pwr Game"
description = "The only drink with the PWR that true gamers crave."
id = "pwr_game"
color = "#9385bf" // rgb: 58, 52, 75
/datum/reagent/consumable/pwr_game/on_mob_life(mob/living/M)
if (M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
..()
/datum/reagent/consumable/shamblers
name = "Shambler's Juice"
description = "~Shake me up some of that Shambler's Juice!~"
id = "shamblers"
color = "#f00060" // rgb: 94, 0, 38
/datum/reagent/consumable/shamblers/on_mob_life(mob/living/M)
if (M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
..()
/datum/reagent/consumable/sodawater
name = "Soda Water"
id = "sodawater"