Skip to content
This repository was archived by the owner on Apr 16, 2021. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions code/datums/chemistry/tools/food_and_drink.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
15 changes: 15 additions & 0 deletions code/datums/supply_packs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 12 additions & 0 deletions code/obj/item/clothing/hats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Binary file modified icons/mob/head.dmi
Binary file not shown.
Binary file modified icons/mob/inhand/hand_food.dmi
Binary file not shown.
Binary file modified icons/mob/inhand/hand_headgear.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/item_hats.dmi
Binary file not shown.
Binary file modified icons/obj/drink.dmi
Binary file not shown.