cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-28 19:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

The last of the hydration/hunger fixes. (#5396)

Browse Source 
* Added

* more changes

* oops
This commit is contained in:
BurgerLUA
2018-10-10 14:17:32 -07:00
committed by Werner
parent c0480946e4
commit fe136b58ac
9 changed files with 70 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,6 +117,8 @@
glass_name = "glass of coder fuckups"
glass_desc = "A glass of distilled maintainer tears."
var/blood_to_ingest_scale = 2
/datum/reagent/alcohol/Destroy()
if (caffeine_mod)
QDEL_NULL(caffeine_mod)
@@ -128,8 +130,8 @@
L.adjust_fire_stacks((amount / (flammability_divisor || 1)) * (strength / 100))
/datum/reagent/alcohol/affect_blood(mob/living/carbon/M, alien, removed)
M.adjustToxLoss(removed * 2)
affect_ingest(M,alien,removed * 2)
M.adjustToxLoss(removed * blood_to_ingest_scale * (strength/100) )
affect_ingest(M,alien,removed * blood_to_ingest_scale)
return
/datum/reagent/alcohol/affect_ingest(mob/living/carbon/M, alien, removed)

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

@@ -701,6 +701,7 @@
var/caffeine = 0 // strength of stimulant effect, since so many drinks use it
var/datum/modifier/modifier = null
unaffected_species = IS_MACHINE
var/blood_to_ingest_scale = 2
/datum/reagent/drink/Destroy()
if (modifier)
@@ -708,8 +709,8 @@
return ..()
/datum/reagent/drink/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
M.adjustToxLoss(removed) // Probably not a good idea; not very deadly though
digest(M,alien,removed * 2, FALSE)
M.adjustToxLoss(removed * blood_to_ingest_scale) // Probably not a good idea; not very deadly though
digest(M,alien,removed * blood_to_ingest_scale, FALSE)
/datum/reagent/drink/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
digest(M,alien,removed)
@@ -1434,6 +1435,8 @@
glass_desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place."
glass_center_of_mass = list("x"=16, "y"=8)
blood_to_ingest_scale = 1
/datum/reagent/drink/doctor_delight/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(alien != IS_DIONA)
@@ -1450,6 +1453,7 @@
description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water."
reagent_state = SOLID
nutrition = 1
hydration = 0
color = "#302000"
taste_description = "dry and cheap noodles"
@@ -1460,6 +1464,7 @@
reagent_state = LIQUID
color = "#302000"
nutrition = 5
hydration = 5
adj_temp = 5
taste_description = "wet and cheap noodles"
@@ -1470,6 +1475,7 @@
reagent_state = LIQUID
color = "#302000"
nutrition = 5
hydration = 5
taste_description = "wet and cheap noodles on fire"
/datum/reagent/drink/hell_ramen/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
@@ -1485,6 +1491,7 @@
adj_temp = -5
taste_description = "ice"
taste_mult = 1.5
hydration = 8
glass_icon_state = "iceglass"
glass_name = "glass of ice"
@@ -2463,6 +2470,9 @@
glass_desc = "A drink that is guaranteed to knock you silly."
glass_center_of_mass = list("x"=16, "y"=8)
blood_to_ingest_scale = 1
metabolism = REM * 5
/datum/reagent/alcohol/ethanol/neurotoxin/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(alien != IS_DIONA)