diff --git a/code/datums/chemistry/tools/food_and_drink.dm b/code/datums/chemistry/tools/food_and_drink.dm index 28ececbc..2808cc9c 100644 --- a/code/datums/chemistry/tools/food_and_drink.dm +++ b/code/datums/chemistry/tools/food_and_drink.dm @@ -883,6 +883,34 @@ rc_flags = RC_SPECTRO initial_volume = 15 + +/obj/item/reagent_containers/food/drinks/duo + name = "red duo cup" + desc = "Can't imagine a party without a few dozen these on the lawn afterward." + icon_state = "duo" + item_state = "duo" + initial_volume = 30 + var/image/fluid_image + + New() + ..() + fluid_image = image(src.icon, "fluid-duo") + update_icon() + + on_reagent_change() + src.update_icon() + + proc/update_icon() + src.overlays = null + if (src.reagents.total_volume == 0) + icon_state = "duo" + if (src.reagents.total_volume > 0) + var/datum/color/average = reagents.get_average_color() + if (!fluid_image) + fluid_image = image(src.icon, "fluid-duo") + fluid_image.color = average.to_rgba() + src.overlays += src.fluid_image + /obj/item/reagent_containers/food/drinks/pitcher name = "glass pitcher" desc = "A big container for holding a lot of liquid that you then serve to people. Probably alcohol, let's be honest." diff --git a/code/datums/supply_packs.dm b/code/datums/supply_packs.dm index af831b0f..a3fdd50d 100644 --- a/code/datums/supply_packs.dm +++ b/code/datums/supply_packs.dm @@ -491,6 +491,21 @@ containername = "Holiday Supplies" #endif +/datum/supply_packs/bday + name = "Birthday Supplies" + desc = "Perfect for celebrating that special day!" + contains = list(/obj/item/clothing/head/birthday = 3, + /obj/item/clothing/head/birthday/blue = 3, + /obj/item/wrapping_paper = 2, + /obj/item/scissors, + /obj/item/reagent_containers/food/drinks/duo = 6, + /obj/item/reagent_containers/food/drinks/bottle/beer = 6, + /obj/item/reagent_containers/food/snacks/cake/chocolate = 1) + cost = 750 + containertype = /obj/storage/crate + containername = "Birthday Supplies" + + /datum/supply_packs/banking_kit name = "Banking Kit" desc = "Circuit Boards: 1x Bank Records, 1x ATM" diff --git a/code/obj/item/clothing/hats.dm b/code/obj/item/clothing/hats.dm index 615d18e8..e0c0cc78 100644 --- a/code/obj/item/clothing/hats.dm +++ b/code/obj/item/clothing/hats.dm @@ -175,6 +175,18 @@ target.reagents.temperature_reagents(2500,10) return +/obj/item/clothing/head/birthday + name = "Birthday Hat" + icon_state = "birthday-pink" + item_state = "birthday-pink" + desc = "Happy birthday to you, happy birthday to you, the rest of this hat is copyrighted." + +/obj/item/clothing/head/birthday/blue + name = "Birthday Hat" + icon_state = "birthday-blue" + item_state = "birthday-blue" + desc = "Happy birthday to you, happy birthday to you, in 200 years nobody will remember you." + /obj/item/clothing/head/caphat name = "Captain's hat" icon_state = "captain" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 4360be17..94c83c4f 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/inhand/hand_food.dmi b/icons/mob/inhand/hand_food.dmi index 4384ad08..a947eb1b 100644 Binary files a/icons/mob/inhand/hand_food.dmi and b/icons/mob/inhand/hand_food.dmi differ diff --git a/icons/mob/inhand/hand_headgear.dmi b/icons/mob/inhand/hand_headgear.dmi index 70acaa4d..f78234f9 100644 Binary files a/icons/mob/inhand/hand_headgear.dmi and b/icons/mob/inhand/hand_headgear.dmi differ diff --git a/icons/obj/clothing/item_hats.dmi b/icons/obj/clothing/item_hats.dmi index a61612ef..da83e550 100644 Binary files a/icons/obj/clothing/item_hats.dmi and b/icons/obj/clothing/item_hats.dmi differ diff --git a/icons/obj/drink.dmi b/icons/obj/drink.dmi index cf698154..06276015 100644 Binary files a/icons/obj/drink.dmi and b/icons/obj/drink.dmi differ