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

SYNC: Alter promethean changes

Browse Source
This commit is contained in:
Arokha Sieyes
2018-05-25 15:05:39 -04:00
parent 088eee3d96
commit 2308c70a8f
2 changed files with 11 additions and 9 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

@@ -95,8 +95,8 @@
if(alien == IS_DIONA) if(alien == IS_DIONA)
strength_mod = 0 strength_mod = 0
if(alien == IS_SLIME) if(alien == IS_SLIME)
M.adjustToxLoss(removed) //Sterilizing, if only by a little bit. Also already doubled above. strength_mod *= 2 // VOREStation Edit - M.adjustToxLoss(removed)
M.add_chemical_effect(CE_ALCOHOL, 1) M.add_chemical_effect(CE_ALCOHOL, 1)
if(dose * strength_mod >= strength) // Early warning if(dose * strength_mod >= strength) // Early warning
@@ -139,7 +139,7 @@
if(alien == IS_DIONA) if(alien == IS_DIONA)
strength_mod = 0 strength_mod = 0
if(alien == IS_SLIME) if(alien == IS_SLIME)
M.adjustToxLoss(removed * 2) //Sterilizing, if only by a little bit. strength_mod *= 2 // VOREStation Edit - M.adjustToxLoss(removed * 2)
M.add_chemical_effect(CE_ALCOHOL, 1) M.add_chemical_effect(CE_ALCOHOL, 1)

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

@@ -527,8 +527,10 @@
M.bodytemperature = min(310, M.bodytemperature + (adj_temp * TEMPERATURE_DAMAGE_COEFFICIENT)) M.bodytemperature = min(310, M.bodytemperature + (adj_temp * TEMPERATURE_DAMAGE_COEFFICIENT))
if(adj_temp < 0 && M.bodytemperature > 310) if(adj_temp < 0 && M.bodytemperature > 310)
M.bodytemperature = min(310, M.bodytemperature - (adj_temp * TEMPERATURE_DAMAGE_COEFFICIENT)) M.bodytemperature = min(310, M.bodytemperature - (adj_temp * TEMPERATURE_DAMAGE_COEFFICIENT))
/* VOREStation Removal
if(alien == IS_SLIME) if(alien == IS_SLIME)
M.adjustToxLoss(removed * 2) M.adjustToxLoss(removed * 2)
*/ //VOREStation Removal End
/datum/reagent/drink/overdose(var/mob/living/carbon/M, var/alien) //Add special interactions here in the future if desired. /datum/reagent/drink/overdose(var/mob/living/carbon/M, var/alien) //Add special interactions here in the future if desired.
..() ..()
@@ -816,7 +818,7 @@
M.bodytemperature -= 0.5 M.bodytemperature -= 0.5
if(M.bodytemperature < T0C) if(M.bodytemperature < T0C)
M.bodytemperature += 0.5 M.bodytemperature += 0.5
M.adjustToxLoss(5 * removed) //M.adjustToxLoss(5 * removed) //VOREStation Removal
/datum/reagent/drink/tea/icetea/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) /datum/reagent/drink/tea/icetea/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
..() ..()
@@ -825,7 +827,7 @@
M.bodytemperature -= 0.5 M.bodytemperature -= 0.5
if(M.bodytemperature < T0C) if(M.bodytemperature < T0C)
M.bodytemperature += 0.5 M.bodytemperature += 0.5
M.adjustToxLoss(5 * removed) //M.adjustToxLoss(5 * removed) //VOREStation Removal
/datum/reagent/drink/tea/minttea /datum/reagent/drink/tea/minttea
name = "Mint Tea" name = "Mint Tea"
@@ -956,7 +958,7 @@
M.bodytemperature -= 0.5 M.bodytemperature -= 0.5
if(M.bodytemperature < T0C) if(M.bodytemperature < T0C)
M.bodytemperature += 0.5 M.bodytemperature += 0.5
M.adjustToxLoss(5 * removed) //M.adjustToxLoss(5 * removed) //VOREStation Removal
/datum/reagent/drink/coffee/icecoffee/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) /datum/reagent/drink/coffee/icecoffee/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
..() ..()
@@ -965,7 +967,7 @@
M.bodytemperature -= 0.5 M.bodytemperature -= 0.5
if(M.bodytemperature < T0C) if(M.bodytemperature < T0C)
M.bodytemperature += 0.5 M.bodytemperature += 0.5
M.adjustToxLoss(5 * removed) //M.adjustToxLoss(5 * removed) //VOREStation Removal
/datum/reagent/drink/coffee/soy_latte /datum/reagent/drink/coffee/soy_latte
name = "Soy Latte" name = "Soy Latte"
@@ -1432,7 +1434,7 @@
M.bodytemperature -= rand(1,3) M.bodytemperature -= rand(1,3)
if(M.bodytemperature < T0C) if(M.bodytemperature < T0C)
M.bodytemperature += rand(1,3) M.bodytemperature += rand(1,3)
M.adjustToxLoss(5 * removed) //M.adjustToxLoss(5 * removed) //VOREStation Removal
/datum/reagent/drink/ice/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) /datum/reagent/drink/ice/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..() ..()
@@ -1441,7 +1443,7 @@
M.bodytemperature -= rand(1,3) M.bodytemperature -= rand(1,3)
if(M.bodytemperature < T0C) if(M.bodytemperature < T0C)
M.bodytemperature += rand(1,3) M.bodytemperature += rand(1,3)
M.adjustToxLoss(5 * removed) //M.adjustToxLoss(5 * removed) //VOREStation Removal
/datum/reagent/drink/nothing /datum/reagent/drink/nothing
name = "Nothing" name = "Nothing"