From 02638d1a60feb341939695c67100f5e9f01c07a2 Mon Sep 17 00:00:00 2001 From: SamCroswell Date: Sun, 22 Mar 2015 21:54:49 -0400 Subject: [PATCH] Adds admin boozes --- .../reagents/reagent_containers/food/cans.dm | 37 ++++++++++++++++++ icons/obj/drinks.dmi | Bin 59677 -> 60811 bytes 2 files changed, 37 insertions(+) diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 088eee89287..a2eee3c62ed 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -173,6 +173,43 @@ src.pixel_x = rand(-10.0, 10) src.pixel_y = rand(-10.0, 10) +/obj/item/weapon/reagent_containers/food/drinks/cans/adminbooze + name = "Admin Booze" + desc = "Bottled Griffon tears. Drink with caution." + icon_state = "adminbooze" + New() + ..() + reagents.add_reagent("admorinazine", 5) + reagents.add_reagent("capsaicin", 5) + reagents.add_reagent("hyperzine", 20) + reagents.add_reagent("thirteenloko", 20) + src.pixel_x = rand(-10.0, 10) + src.pixel_y = rand(-10.0, 10) + +/obj/item/weapon/reagent_containers/food/drinks/cans/madminmalt + name = "Madmin Malt" + desc = "Bottled essence of angry admins. Drink with EXTREME caution." + icon_state = "madminmalt" + New() + ..() + reagents.add_reagent("hellwater", 20) + reagents.add_reagent("neurotoxin", 15) + reagents.add_reagent("thirteenloko", 15) + src.pixel_x = rand(-10.0, 10) + src.pixel_y = rand(-10.0, 10) + +/obj/item/weapon/reagent_containers/food/drinks/cans/badminbrew + name = "Badmin Brew" + desc = "Bottled trickery and terrible admin work. Probably shouldn't drink this one at all." + icon_state = "badminbrew" + New() + ..() + reagents.add_reagent("mutagen", 25) + reagents.add_reagent("anti_toxin", 10) + reagents.add_reagent("thirteenloko", 15) + src.pixel_x = rand(-10.0, 10) + src.pixel_y = rand(-10.0, 10) + /obj/item/weapon/reagent_containers/food/drinks/cans/ale name = "Magm-Ale" desc = "A true dorf's drink of choice." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 92950367876ff7bfc5c8c96bbf776e82d4f3e077..d2e691b633a54ec3293671eca590937d3039a0c2 100644 GIT binary patch delta 5635 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 delta 4491 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