diff --git a/code/_globalvars/lists/reagents.dm b/code/_globalvars/lists/reagents.dm index 833da2a9879..0684be758cd 100644 --- a/code/_globalvars/lists/reagents.dm +++ b/code/_globalvars/lists/reagents.dm @@ -40,7 +40,7 @@ GLOBAL_LIST_INIT(drinks, list("beer2","hot_coco","orangejuice","tomatojuice","li "booger","bloodymary","gargleblaster","bravebull","tequilasunrise","toxinsspecial", "beepskysmash","salglu_solution","irishcream","manlydorf","longislandicedtea", "moonshine","b52","irishcoffee","margarita","blackrussian","manhattan", - "manhattan_proj","whiskeysoda","antifreeze","barefoot","snowwhite","demonsblood", + "manhattan_proj","whiskeysoda","adminfreeze","antifreeze","barefoot","snowwhite","demonsblood", "vodkatonic","ginfizz","bahama_mama","singulo","sbiten","devilskiss","red_mead", "mead","iced_beer","grog","aloe","andalusia","alliescocktail","soy_latte", "cafe_latte","acidspit","amasec","neurotoxin","hippiesdelight","bananahonk", diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index ad15e19856b..94172e14f0e 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -688,6 +688,25 @@ M.bodytemperature = min(330, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 return ..() +/datum/reagent/consumable/ethanol/adminfreeze + name = "Admin Freeze" + id = "adminfreeze" + description = "Ultimate Punishment." + reagent_state = LIQUID + color = "#30F0FF" // rgb: 048, 240, 255 + dizzy_adj = 4 + alcohol_perc = 1.5 // oof + drink_icon = "adminfreeze" + drink_name = "Admin Freeze" + drink_desc = "The ultimate punishment." + taste_description = "a series of bad decisions" + +/datum/reagent/consumable/ethanol/adminfreeze/reaction_mob(mob/living/M, method = REAGENT_INGEST, volume) + ..() + if(method == REAGENT_INGEST) + M.apply_status_effect(/datum/status_effect/freon/watcher) + M.adjust_bodytemperature(-110) + /datum/reagent/consumable/ethanol/barefoot name = "Barefoot" id = "barefoot" diff --git a/code/modules/reagents/chemistry/recipes/drinks.dm b/code/modules/reagents/chemistry/recipes/drinks.dm index 34ea484d712..1bdb91f1ab6 100644 --- a/code/modules/reagents/chemistry/recipes/drinks.dm +++ b/code/modules/reagents/chemistry/recipes/drinks.dm @@ -443,6 +443,15 @@ result_amount = 4 mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' +/datum/chemical_reaction/adminfreeze + name = "Admin Freeze" + id = "adminfreeze" + result = "adminfreeze" + required_reagents = list("neurotoxin" = 1, "toxinsspecial" = 1, "fernet" = 1, "moonshine" = 1, "morphine" = 1) + min_temp = T0C + 100 + result_amount = 5 + mix_sound = 'sound/effects/adminhelp.ogg' + /datum/chemical_reaction/barefoot name = "Barefoot" id = "barefoot" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 6d30e966c31..fb7c28c3f6d 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ