cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-20 22:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds multiple drinks to the shotglass list so they can be mixed within.

Browse Source 
Re-adds bottle of booze that got removed in a merge conflict a while back.
This commit is contained in:
TheVekter
2015-02-09 18:25:03 -06:00
parent ba18c0e925
commit f49abb5117
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/food&drinks/drinks/drinks.dm
View File

@@ -200,12 +200,18 @@
else
icon_state = "water_cup_e"
//Shot glasses!//
// This lets us add shots in here instead of lumping them in with drinks because >logic //
// The format for shots is the exact same as iconstates for the drinking glass, except you use a shot glass instead. //
// If it's a new drink, remember to add it to Chemistry-Reagents.dm and Chemistry-Recipes.dm as well. //
// You can still mix the ported drinks in a regular glass, but the sprites make more sense as shots. Might fully port them over later. //
/obj/item/weapon/reagent_containers/food/drinks/shotglass
name = "shot glass"
desc = "A shot glass - the universal symbol for bad decisions."
icon_state = "shotglass"
amount_per_transfer_from_this = 5
volume = 5
amount_per_transfer_from_this = 10
volume = 15
/obj/item/weapon/reagent_containers/food/drinks/shotglass/on_reagent_change()
if (reagents.reagent_list.len > 0)
@@ -226,6 +232,14 @@
icon_state = "shotglassbrown"
name = "shot of rum"
desc = "A shot of rum, you dirty pirate."
if("b52")
icon_state = "b52glass"
name = "B-52"
desc = "Kahlua, Irish Cream, and cognac. You will get bombed."
if("toxinsspecial")
icon_state = "toxinsspecialglass"
name = "Toxins Special"
desc = "Whoah, this thing is on FIRE"
else
icon_state = "shotglassbrown"
name = "shot of booze"

2
code/modules/food&drinks/drinks/drinks/drinkingglass.dm
View File

@@ -162,6 +162,7 @@
icon_state = "tequilasunriseglass"
name = "tequila Sunrise"
desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
// Toxins Special is also in drinks.dm because shot glasses, mirror any changes there. //
if("toxinsspecial")
icon_state = "toxinsspecialglass"
name = "Toxins Special"
@@ -186,6 +187,7 @@
icon_state = "cubalibreglass"
name = "Cuba Libre"
desc = "A classic mix of rum and cola."
// B-52 is also in drinks.dm because shot glasses, mirror any changes there. //
if("b52")
icon_state = "b52glass"
name = "B-52"