diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm index 12c53468180..a7185b20f2c 100644 --- a/code/defines/obj/vending.dm +++ b/code/defines/obj/vending.dm @@ -35,8 +35,8 @@ name = "Booze-O-Mat" desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one." icon_state = "boozeomat" //////////////18 drink entities below, plus the glasses, in case someone wants to edit the number of bottles - product_paths = "/obj/item/weapon/reagent_containers/food/drinks/bottle/gin;/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey;/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla;/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka;/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth;/obj/item/weapon/reagent_containers/food/drinks/bottle/rum;/obj/item/weapon/reagent_containers/food/drinks/bottle/wine;/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac;/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua;/obj/item/weapon/reagent_containers/food/drinks/beer;/obj/item/weapon/reagent_containers/food/drinks/ale;/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/cream;/obj/item/weapon/reagent_containers/food/drinks/tonic;/obj/item/weapon/reagent_containers/food/drinks/cola;/obj/item/weapon/reagent_containers/food/drinks/sodawater;/obj/item/weapon/reagent_containers/food/drinks/drinkingglass" - product_amounts = "5;5;5;5;5;5;5;5;5;6;6;4;4;4;4;8;8;8;30" + product_paths = "/obj/item/weapon/reagent_containers/food/drinks/bottle/gin;/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey;/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla;/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka;/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth;/obj/item/weapon/reagent_containers/food/drinks/bottle/rum;/obj/item/weapon/reagent_containers/food/drinks/bottle/wine;/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac;/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua;/obj/item/weapon/reagent_containers/food/drinks/beer;/obj/item/weapon/reagent_containers/food/drinks/ale;/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/cream;/obj/item/weapon/reagent_containers/food/drinks/tonic;/obj/item/weapon/reagent_containers/food/drinks/cola;/obj/item/weapon/reagent_containers/food/drinks/sodawater;/obj/item/weapon/reagent_containers/food/drinks/drinkingglass;/obj/item/weapon/reagent_containers/food/drinks/ice" + product_amounts = "5;5;5;5;5;5;5;5;5;6;6;4;4;4;4;8;8;8;30;" vend_delay = 15 product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/tea" product_hideamt = "10" diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index 7d46a32bf8d..591b370cdb5 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -1260,10 +1260,11 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M:drowsyness = max(M:drowsyness-5, 0) - if(M:paralysis) M:paralysis-- - if(M:stunned) M:stunned-- - if(M:weakened) M:weakened-- + M:silent = 0 + M:drowsyness = 0 + M:paralysis = 0 + M:stunned = 0 + M:weakened = 0 ..() return @@ -2207,7 +2208,7 @@ datum ..() return -/* nuka_cola + nuka_cola name = "Nuka Cola" id = "nuka_cola" description = "Cola, cola never changes." @@ -2224,7 +2225,7 @@ datum M.bodytemperature = max(310, M.bodytemperature-5) M:nutrition += 1 ..() - return*/ + return spacemountainwind name = "Space Mountain Wind" diff --git a/code/modules/chemical/Chemistry-Recipes.dm b/code/modules/chemical/Chemistry-Recipes.dm index 8ae2a03a51f..d57be3db7bb 100644 --- a/code/modules/chemical/Chemistry-Recipes.dm +++ b/code/modules/chemical/Chemistry-Recipes.dm @@ -772,6 +772,7 @@ datum ////////////////////////////////////////// COCKTAILS ////////////////////////////////////// + goldschlager name = "Goldschlager" id = "goldschlager" @@ -807,6 +808,13 @@ datum required_reagents = list("ice" = 1, "coffee" = 3) result_amount = 4 + nuka_cola + name = "Nuka Cola" + id = "nuka_cola" + result = "nuka_cola" + required_reagents = list("uranium" = 1, "cola" = 6) + result_amount = 6 + moonshine name = "Moonshine" id = "moonshine" @@ -1139,13 +1147,6 @@ datum required_reagents = list("rum" = 1, "water" = 1) result_amount = 2 - nuka_cola - name = "Nuka Cola" - id = "nuka_cola" - result = "nuka_cola" - required_reagents = list("uranium" = 1, "cola" = 5) - result_amount = 5 - soy_latte name = "Soy Latte" id = "soy_latte" diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index 132099b8840..548b5d8928a 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -2790,6 +2790,10 @@ icon_state = "glass_brown" name = "Glass of Space Cola" desc = "A glass of refreshing Space Cola" + if("nuka_cola") + icon_state = "nuka_colaglass" + name = "Nuka Cola" + desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland" if("orangejuice") icon_state = "glass_orange" name = "Glass of Orange juice" @@ -3087,10 +3091,6 @@ icon_state = "grogglass" name = "Grog" desc = "A fine and cepa drink for Space." - if("nuka_cola") - icon_state = "nuka_colaglass" - name = "Nuka Cola" - desc = "A high quality Cola promised to make you jitter." if("soy_latte") icon_state = "soy_latte" name = "Soy Latte" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 5e71b4ae60f..c2a108a9c95 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ