cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-13 16:12:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5011 from Anewbe/metabolism

Browse Source 
Ingested reagents act half as quickly, rather than half as well
This commit is contained in:
Atermonera
2018-03-06 13:07:17 -08:00
committed by GitHub
parent 11b17819f7 2d452be603
commit 82a38c7ff6
7 changed files with 85 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon.dm
+3 -3
View File
@@ -1,8 +1,8 @@
/mob/living/carbon/New()
//setup reagent holders
bloodstr = new/datum/reagents/metabolism(1000, src, CHEM_BLOOD)
ingested = new/datum/reagents/metabolism(1000, src, CHEM_INGEST)
touching = new/datum/reagents/metabolism(1000, src, CHEM_TOUCH)
bloodstr = new/datum/reagents/metabolism/bloodstream(500, src)
ingested = new/datum/reagents/metabolism/ingested(500, src)
touching = new/datum/reagents/metabolism/touch(500, src)
reagents = bloodstr
if (!default_language && species_language)
default_language = all_languages[species_language]
code/modules/mob/living/carbon/carbon_defines.dm
+3 -3
View File
@@ -17,9 +17,9 @@
//Active emote/pose
var/pose = null
var/list/chem_effects = list()
var/datum/reagents/metabolism/bloodstr = null
var/datum/reagents/metabolism/ingested = null
var/datum/reagents/metabolism/touching = null
var/datum/reagents/metabolism/bloodstream/bloodstr = null
var/datum/reagents/metabolism/ingested/ingested = null
var/datum/reagents/metabolism/touch/touching = null
var/pulse = PULSE_NORM //current pulse level