mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-10 17:52:36 +00:00
Blood tea and coffee (#3995)
## About The Pull Request Adds some new drinks for hemophages, hemoglobin iced tea and blood coffee! Hemoglobin iced tea is made by mixing 2u of blood with 1u of iced tea, and gives hemophages blood upon consumption, effectively acting just like blood. The recipe results in 2u of hemoglobin iced tea, to prevent effective blood duplication. It also has the same properties as iced tea. Blood coffee is made by mixing 2u of blood with 1u of coffee, and gives hemophages blood upon consumption, just like hemoglobin iced tea. The recipe also results in 2u of blood coffee, also to prevent effective blood duplication. The sprites for the drinks were made by myself by recoloring the sprites for iced tea and blood mead. They are shown below, left is hemoglobin iced tea, right is blood coffee. Special thanks to Artur for helping figure this one out! Without his help I would have been spinning my wheels trying to figure out how to add it to the hosts blood volume for a good long while. This also modifies the soda can for Hemoglobin Iced Tea to now contain this tea in it instead of blood. ## Why It's Good For The Game More lovely drinks to enjoy! Also makes hemoglobin iced tea an actual functional drink! ## Proof Of Testing Tested locally! Hemophages gain blood as they should, blood coffee overdoses like it should, non-hemophages do not gain any blood from this (intended!). ## Changelog 🆑 add: Two new hemophage themed drinks! /🆑  --------- Co-authored-by: Roxy <75404941+TealSeer@users.noreply.github.com>
This commit is contained in:
@@ -0,0 +1,7 @@
|
||||
/datum/chemical_reaction/drink/blood_tea
|
||||
results = list(/datum/reagent/consumable/icetea/blood_tea = 2) //Results in 2u instead of 3
|
||||
required_reagents = list(/datum/reagent/consumable/icetea = 1, /datum/reagent/blood = 2)
|
||||
|
||||
/datum/chemical_reaction/drink/blood_coffee
|
||||
results = list(/datum/reagent/consumable/coffee/blood_coffee = 2) //Results in 2u instead of 3
|
||||
required_reagents = list(/datum/reagent/consumable/coffee = 1, /datum/reagent/blood = 2)
|
||||
@@ -17,3 +17,59 @@
|
||||
. = ..()
|
||||
|
||||
AddComponent(/datum/component/udder, reagent_produced_override = /datum/reagent/consumable/moth_milk)
|
||||
|
||||
|
||||
/datum/reagent/consumable/icetea/blood_tea
|
||||
name = "Hemoglobin Iced Tea"
|
||||
description = "A mix of blood and iced tea, with a slice of juicy blood tomato as a garnish."
|
||||
color = "#B85D52"//rgb(184, 93, 82)
|
||||
quality = DRINK_GOOD
|
||||
taste_description = "chilly sweet tea with an iron bite"
|
||||
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
|
||||
chemical_flags_skyrat = REAGENT_BLOOD_REGENERATING
|
||||
|
||||
/datum/reagent/consumable/icetea/blood_tea/on_transfer(atom/A, methods=INGEST, trans_volume)
|
||||
if(!(methods & INGEST))
|
||||
return
|
||||
var/obj/item/organ/stomach/stomach = A
|
||||
if(!istype(stomach) || !stomach.owner || !ishemophage(stomach.owner) || trans_volume <= 0)
|
||||
return
|
||||
|
||||
stomach.owner.blood_volume = min(stomach.owner.blood_volume + trans_volume, BLOOD_VOLUME_MAXIMUM)
|
||||
|
||||
..()
|
||||
|
||||
/datum/glass_style/drinking_glass/blood_tea
|
||||
required_drink_type = /datum/reagent/consumable/icetea/blood_tea
|
||||
icon = 'modular_zubbers/icons/obj/drinks/mixed_drinks.dmi'
|
||||
icon_state = "bloodteaglass"
|
||||
name = "cup of hemoglobin iced tea"
|
||||
desc = "Delicious sweet ice tea flavored with blood."
|
||||
|
||||
|
||||
/datum/reagent/consumable/coffee/blood_coffee
|
||||
name = "Blood Coffee"
|
||||
description = "Hot black coffee mixed with rich blood, a hemophage's favorite!"
|
||||
color = "#8E272B"//rgb(142, 39, 43)
|
||||
quality = DRINK_GOOD
|
||||
taste_description = "bitter iron"
|
||||
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
|
||||
chemical_flags_skyrat = REAGENT_BLOOD_REGENERATING
|
||||
|
||||
/datum/reagent/consumable/coffee/blood_coffee/on_transfer(atom/A, methods=INGEST, trans_volume)
|
||||
if(!(methods & INGEST))
|
||||
return
|
||||
var/obj/item/organ/stomach/stomach = A
|
||||
if(!istype(stomach) || !stomach.owner || !ishemophage(stomach.owner) || trans_volume <= 0)
|
||||
return
|
||||
|
||||
stomach.owner.blood_volume = min(stomach.owner.blood_volume + trans_volume, BLOOD_VOLUME_MAXIMUM)
|
||||
|
||||
..()
|
||||
|
||||
/datum/glass_style/drinking_glass/blood_coffee
|
||||
required_drink_type = /datum/reagent/consumable/coffee/blood_coffee
|
||||
icon = 'modular_zubbers/icons/obj/drinks/mixed_drinks.dmi'
|
||||
icon_state = "bloodcoffeeglass"
|
||||
name = "mug of blood coffee"
|
||||
desc = "A mug of hot black coffee mixed with fresh blood."
|
||||
|
||||
@@ -6,4 +6,4 @@
|
||||
desc = "Kinda like that rich golfer, but it's actually blood!"
|
||||
icon = 'modular_zubbers/icons/obj/drinks/soda.dmi'
|
||||
icon_state = "blood_tea"
|
||||
list_reagents = list(/datum/reagent/blood = 25, /datum/reagent/consumable/ethanol/bloodshot = 5)
|
||||
list_reagents = list(/datum/reagent/consumable/icetea/blood_tea = 25, /datum/reagent/consumable/ethanol/bloodshot = 5)
|
||||
|
||||
BIN
modular_zubbers/icons/obj/drinks/mixed_drinks.dmi
Normal file
BIN
modular_zubbers/icons/obj/drinks/mixed_drinks.dmi
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
@@ -9322,6 +9322,7 @@
|
||||
#include "modular_zubbers\code\modules\experisci\experiment\types\scanning_fish.dm"
|
||||
#include "modular_zubbers\code\modules\fluff\flora\ash_flora.dm"
|
||||
#include "modular_zubbers\code\modules\food_and_drinks\machinery\stove.dm"
|
||||
#include "modular_zubbers\code\modules\food_and_drinks\recipes\drinks\drinks_non-alcoholic.dm"
|
||||
#include "modular_zubbers\code\modules\food_and_drinks\recipes\tablecraft\recipes_pizza.dm"
|
||||
#include "modular_zubbers\code\modules\food_and_drinks\recipes\tablecraft\recipes_seafood.dm"
|
||||
#include "modular_zubbers\code\modules\GAGS\greyscale_configs.dm"
|
||||
|
||||
Reference in New Issue
Block a user