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

Moved shotglasses back to drinkingglass.dm. Again.

Browse Source 
Added a bunch more iconstates for each drink in the booze-o-mat. Any drink the shot doesn't recognize comes up as a "shot of... what?"
This commit is contained in:
TheVekter
2015-02-10 11:50:28 -06:00
parent f26ceabf3a
commit 2b346676c1
5 changed files with 81 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food&drinks/drinks/drinks.dm
-48
View File
@@ -200,55 +200,7 @@
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 = 10
volume = 15
/obj/item/weapon/reagent_containers/food/drinks/shotglass/on_reagent_change()
if (reagents.reagent_list.len > 0)
switch(reagents.get_master_reagent_id())
if("vodka")
icon_state = "shotglassclear"
name = "shot of vodka"
desc = "A shot of vodka. Good for cold weather."
if("water")
icon_state = "shotglassclear"
name = "shot of water"
desc = "A shot of water. You're not sure why someone would drink this from a shot glass."
if("whiskey")
icon_state = "shotglassbrown"
name = "shot of whiskey"
desc = "A shot of whiskey. Just like the old west."
if("rum")
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"
desc = "A shot of booze. Now it's a party."
else
icon_state = "shotglass"
name = "shot glass"
desc = "A shot glass - the universal symbol for bad decisions."
return
//////////////////////////drinkingglass and shaker//
//Note by Darem: This code handles the mixing of drinks. New drinks go in three places: In Chemistry-Reagents.dm (for the drink
code/modules/food&drinks/drinks/drinks/drinkingglass.dm
+79
View File
@@ -444,6 +444,85 @@
desc = "Your standard drinking glass"
return
//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 only mix the ported-over drinks in shot glasses for now (they'll mix in a shaker, but the sprite won't change for glasses). //
// This is on a case-by-case basis, and you can even make a seperate sprite for shot glasses if you want. //
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass
name = "shot glass"
desc = "A shot glass - the universal symbol for bad decisions."
icon_state = "shotglass"
amount_per_transfer_from_this = 10
volume = 15
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change()
if (reagents.reagent_list.len > 0)
switch(reagents.get_master_reagent_id())
if("vodka")
icon_state = "shotglassclear"
name = "shot of vodka"
desc = "A shot of vodka. Good for cold weather."
if("water")
icon_state = "shotglassclear"
name = "shot of water"
desc = "A shot of water. You're not sure why someone would drink this from a shot glass."
if("whiskey")
icon_state = "shotglassbrown"
name = "shot of whiskey"
desc = "A shot of whiskey. Just like the old west."
if("rum")
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"
if ("vermouth")
icon_state = "shotglassclear"
name = "shot of vermouth"
desc = "This better be going in a martini."
if ("tequila")
icon_state = "shotglassgold"
name = "shot of tequila"
desc = "A shot of cheap tequila. Bad decisions ahead!"
if ("patron")
icon_state = "shotglassclear"
name = "shot of patron"
desc = "A shot of Patron. Goes great with a lime wedge."
if ("kahlua")
icon_state = "shotglasscream"
name = "shot of coffee liqueur"
desc = "Doesn't look too appetizing..."
if ("nothing")
icon_state = "shotglass"
name = "shot of nothing"
desc = "The mime insists there's booze in the glass. You're not so sure."
if ("goldschlager")
icon_state = "shotglassschlag"
name = "shot of goldschlager"
desc = "Yup. You're officially a college girl."
if ("cognac")
icon_state = "shotglassbrown"
name = "shot of cognac"
desc = "A shot of cognac. You get the feeling this would piss off a rich person somewhere."
else
icon_state = "shotglassbrown"
name = "shot of... what?"
desc = "You can't really tell what's in the glass."
else
icon_state = "shotglass"
name = "shot glass"
desc = "A shot glass - the universal symbol for bad decisions."
return
// for /obj/machinery/vending/sovietsoda
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/New()
..()