cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14807 from SatinIsle/Chocolate-Allergy

Browse Source 
Chocolate Allergy
This commit is contained in:
Heroman3003
2023-04-20 16:04:40 +10:00
committed by CHOMPStation2
parent 95d6752941
commit c4f4980adf
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/__defines/species_languages.dm
View File

@@ -38,6 +38,7 @@
#define ALLERGEN_SUGARS 0x400 // For unathi-like reactions #define ALLERGEN_SUGARS 0x400 // For unathi-like reactions
#define ALLERGEN_EGGS 0x800 // For Skrell eggs allergy #define ALLERGEN_EGGS 0x800 // For Skrell eggs allergy
#define ALLERGEN_STIMULANT 0x1000 // Stimulants are what makes the Tajaran heart go ruh roh - not just coffee! #define ALLERGEN_STIMULANT 0x1000 // Stimulants are what makes the Tajaran heart go ruh roh - not just coffee!
#define ALLERGEN_CHOCOLATE 0x2000 // Makes dogs die if they want to?
// Allergen reactions // Allergen reactions
#define AG_PHYS_DMG 0x1 // brute #define AG_PHYS_DMG 0x1 // brute

7
code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
View File

@@ -311,6 +311,13 @@
custom_only = FALSE custom_only = FALSE
allergen = ALLERGEN_COFFEE allergen = ALLERGEN_COFFEE
/datum/trait/neutral/allergy/chocolate
name = "Allergy: Chocolate"
desc = "You're highly allergic to coco and chocolate in specific. NB: By taking this trait, you acknowledge there is a significant risk your character may suffer a fatal reaction if exposed to this substance."
cost = 0
custom_only = FALSE
allergen = ALLERGEN_CHOCOLATE
/datum/trait/neutral/allergy_reaction /datum/trait/neutral/allergy_reaction
name = "Allergy Reaction: Disable Toxicity" name = "Allergy Reaction: Disable Toxicity"
desc = "Take this trait to disable the toxic damage effect of being exposed to one of your allergens. Combine with the Disable Suffocation trait to have purely nonlethal reactions." desc = "Take this trait to disable the toxic damage effect of being exposed to one of your allergens. Combine with the Disable Suffocation trait to have purely nonlethal reactions."

7
code/modules/reagents/reagents/food_drinks.dm
View File

@@ -435,6 +435,7 @@
reagent_state = SOLID reagent_state = SOLID
nutriment_factor = 5 nutriment_factor = 5
color = "#302000" color = "#302000"
allergen_type = ALLERGEN_CHOCOLATE
/datum/reagent/nutriment/chocolate /datum/reagent/nutriment/chocolate
name = "Chocolate" name = "Chocolate"
@@ -444,6 +445,7 @@
color = "#582815" color = "#582815"
nutriment_factor = 5 nutriment_factor = 5
taste_mult = 1.3 taste_mult = 1.3
allergen_type = ALLERGEN_CHOCOLATE
/datum/reagent/nutriment/instantjuice /datum/reagent/nutriment/instantjuice
name = "Juice Powder" name = "Juice Powder"
@@ -691,6 +693,7 @@
description = "A dry mix for making delicious brownies." description = "A dry mix for making delicious brownies."
reagent_state = SOLID reagent_state = SOLID
color = "#441a03" color = "#441a03"
allergen_type = ALLERGEN_CHOCOLATE
/datum/reagent/cakebatter /datum/reagent/cakebatter
name = "Cake Batter" name = "Cake Batter"
@@ -1224,6 +1227,7 @@
glass_name = "chocolate milk" glass_name = "chocolate milk"
glass_desc = "Deliciously fattening!" glass_desc = "Deliciously fattening!"
allergen_type = ALLERGEN_CHOCOLATE
/datum/reagent/drink/milk/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) /datum/reagent/drink/milk/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..() ..()
@@ -1664,6 +1668,7 @@
cup_icon_state = "cup_coco" cup_icon_state = "cup_coco"
cup_name = "cup of hot chocolate" cup_name = "cup of hot chocolate"
cup_desc = "Made with love! And cocoa beans." cup_desc = "Made with love! And cocoa beans."
allergen_type = ALLERGEN_CHOCOLATE
/datum/reagent/drink/soda/sodawater /datum/reagent/drink/soda/sodawater
name = "Soda Water" name = "Soda Water"
@@ -1845,7 +1850,7 @@
glass_name = "Chocolate Milkshake" glass_name = "Chocolate Milkshake"
glass_desc = "A refreshing chocolate milkshake, just like mom used to make." glass_desc = "A refreshing chocolate milkshake, just like mom used to make."
allergen_type = ALLERGEN_DAIRY //Made with dairy products allergen_type = ALLERGEN_DAIRY|ALLERGEN_CHOCOLATE //Made with dairy products
/datum/reagent/drink/milkshake/berryshake /datum/reagent/drink/milkshake/berryshake
name = "Berry Milkshake" name = "Berry Milkshake"