mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-27 15:17:01 +01:00
Moved shotglasses back to drinkingglass.dm. Again.
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
@@ -1596,7 +1596,7 @@
|
||||
"aEJ" = (/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 1},/area/ai_monitored/nuke_storage)
|
||||
"aEK" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "vault"},/area/ai_monitored/nuke_storage)
|
||||
"aEL" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/camera/motion{c_tag = "Vault"; dir = 1; network = list("MiniSat")},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 10},/area/ai_monitored/nuke_storage)
|
||||
"aEM" = (/obj/structure/safe,/obj/item/clothing/head/bearpelt,/obj/item/weapon/reagent_containers/food/drinks/shotglass,/obj/item/weapon/gun/projectile/revolver/russian,/obj/item/ammo_box/a357,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka,/obj/item/weapon/reagent_containers/food/drinks/shotglass,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/ai_monitored/nuke_storage)
|
||||
"aEM" = (/obj/structure/safe,/obj/item/clothing/head/bearpelt,/obj/item/weapon/gun/projectile/revolver/russian,/obj/item/ammo_box/a357,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/ai_monitored/nuke_storage)
|
||||
"aEN" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/meter,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint)
|
||||
"aEO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/gateway)
|
||||
"aEP" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/gateway)
|
||||
|
||||
@@ -609,7 +609,7 @@
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 4,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/tonic = 8,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola = 8, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/sodawater = 15,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 30,/obj/item/weapon/reagent_containers/food/drinks/ice = 9,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/shotglass = 8)
|
||||
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass = 8)
|
||||
contraband = list(/obj/item/weapon/reagent_containers/food/drinks/tea = 10)
|
||||
vend_delay = 15
|
||||
product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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()
|
||||
..()
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 56 KiB |
Reference in New Issue
Block a user