From 2b346676c1173ee63dfe5df08a576b47ae6e7a97 Mon Sep 17 00:00:00 2001 From: TheVekter Date: Tue, 10 Feb 2015 11:50:28 -0600 Subject: [PATCH] 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?" --- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 2 +- code/game/machinery/vending.dm | 2 +- code/modules/food&drinks/drinks/drinks.dm | 48 ----------- .../drinks/drinks/drinkingglass.dm | 79 ++++++++++++++++++ icons/obj/drinks.dmi | Bin 56739 -> 56989 bytes 5 files changed, 81 insertions(+), 50 deletions(-) diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index b8fd1d6e334..92f9f04289c 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -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) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index dfee356f9a0..3d1ee4fe829 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -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?" diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm index bc57682f522..d8d6d835674 100644 --- a/code/modules/food&drinks/drinks/drinks.dm +++ b/code/modules/food&drinks/drinks/drinks.dm @@ -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 diff --git a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm index 1aaef89fe8b..9823f497ad3 100644 --- a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm @@ -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() ..() diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 2f8f89346aac764b51027fb84c9af433c780084c..9ad989e7ff13847e5ca6e61ee4131bc1cb1b492e 100644 GIT binary patch delta 2409 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 QaR2}S07*qoM6N<$g89o3>;M1&