cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-22 04:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5842 from Fox-McCloud/reagent-reorganization

Browse Source 
Reagent Reorganization
This commit is contained in:
Crazy Lemon
2016-11-21 16:54:41 -08:00
committed by GitHub
parent f215041315 feecce9d2e
commit 405fe1bb54
84 changed files with 7651 additions and 7929 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/organ_internal.dm
+2 -2
View File
@@ -327,7 +327,7 @@
// Coffee is really bad for you with busted kidneys.
// This should probably be expanded in some way, but fucked if I know
// what else kidneys can process in our reagent list.
var/datum/reagent/coffee = locate(/datum/reagent/drink/coffee) in owner.reagents.reagent_list
var/datum/reagent/coffee = locate(/datum/reagent/consumable/drink/coffee) in owner.reagents.reagent_list
if(coffee)
if(is_bruised())
owner.adjustToxLoss(0.1 * PROCESS_ACCURACY)
@@ -416,7 +416,7 @@
if(src.damage >= src.min_bruised_damage)
for(var/datum/reagent/R in owner.reagents.reagent_list)
// Ethanol and all drinks are bad
if(istype(R, /datum/reagent/ethanol))
if(istype(R, /datum/reagent/consumable/ethanol))
owner.adjustToxLoss(0.1 * PROCESS_ACCURACY)
// Can't cope with toxins at all