cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-04 06:22:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

small update for soft mixed drinks

Browse Source
This commit is contained in:
Killian
2021-02-09 20:42:14 +00:00
parent 2491dc89e9
commit 4c4dc6fee1
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
View File

@@ -83,7 +83,7 @@
var/nutriment_factor = 0
var/strength = 10 // This is, essentially, units between stages - the lower, the stronger. Less fine tuning, more clarity.
var/allergen_type = GENERIC // What potential allergens does this contain?
var/allergen_factor = 0.5 // If the potential allergens are mixed and low-volume, they're a bit less dangerous
var/allergen_factor = 0.5 // If the potential allergens are mixed and low-volume, they're a bit less dangerous. Needed for drinks because they're a single reagent compared to food which contains multiple seperate reagents.
var/toxicity = 1
var/druggy = 0

9
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
View File

@@ -860,6 +860,7 @@
var/adj_temp = 0
var/water_based = TRUE
var/allergen_type = GENERIC // What potential allergens does this contain?
var/allergen_factor = 1 // If the potential allergens are mixed and low-volume, they're a bit less dangerous. Needed for drinks because they're a single reagent compared to food which contains multiple seperate reagents.
/datum/reagent/drink/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
var/strength_mod = 1
@@ -867,12 +868,12 @@
strength_mod = 3
M.adjustToxLoss(removed * strength_mod) // Probably not a good idea; not very deadly though
if(M.species.allergens & allergen_type) // Unless you're allergic, in which case...
M.adjustToxLoss((M.species.allergen_severity*2) * removed)
M.adjustToxLoss(((M.species.allergen_severity*allergen_factor)*2) * removed)
return
/datum/reagent/drink/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
if(M.species.allergens & allergen_type)
M.adjustToxLoss(M.species.allergen_severity * removed)
M.adjustToxLoss((M.species.allergen_severity*allergen_factor) * removed)
else //delicious
M.adjust_nutrition(nutrition * removed)
M.dizziness = max(0, M.dizziness + adj_dizzy)
@@ -1379,7 +1380,7 @@
cup_icon_state = "cup_latte"
cup_name = "cup of soy latte"
cup_desc = "A nice and refreshing beverage while you are reading."
allergen_type = BEANS
allergen_type = COFFEE|BEANS
/datum/reagent/drink/coffee/soy_latte/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
@@ -1399,6 +1400,7 @@
cup_icon_state = "cup_latte"
cup_name = "cup of cafe latte"
cup_desc = "A nice and refreshing beverage while you are reading."
allergen_type = COFFEE|DAIRY
/datum/reagent/drink/coffee/cafe_latte/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
@@ -1623,7 +1625,6 @@
adj_drowsy = -3
adj_sleepy = -2
glass_name = "Coffee Milkshake"
glass_desc = "An energizing coffee milkshake, perfect for hot days at work.."
allergen_type = DAIRY|COFFEE