Merge pull request #3535 from Heroman3003/fixocillin

Fixed size-affecting reagents not working when ingested
This commit is contained in:
Aronai Sieyes
2018-04-22 11:24:13 -04:00
committed by GitHub
@@ -10,9 +10,9 @@
reagent_state = LIQUID
color = "#FFFF00" // rgb: 255, 255, 0
metabolism = 0.01
mrate_static = TRUE
/datum/reagent/macrocillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(M.size_multiplier < RESIZE_HUGE)
M.resize(M.size_multiplier+0.01)//Incrrease 1% per tick.
return
@@ -24,9 +24,9 @@
reagent_state = LIQUID
color = "#800080"
metabolism = 0.01
mrate_static = TRUE
/datum/reagent/microcillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(M.size_multiplier > RESIZE_TINY)
M.resize(M.size_multiplier-0.01) //Decrease 1% per tick.
return
@@ -39,9 +39,9 @@
reagent_state = LIQUID
color = "#00FFFF"
metabolism = 0.01 //One unit will be just enough to bring someone from 200% to 100%
mrate_static = TRUE
/datum/reagent/normalcillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(M.size_multiplier > RESIZE_NORMAL)
M.resize(M.size_multiplier-0.01) //Decrease by 1% size per tick.
else if(M.size_multiplier < RESIZE_NORMAL)
@@ -58,7 +58,6 @@
overdose = REAGENTS_OVERDOSE
/datum/reagent/sizeoxadone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
..()
M.make_dizzy(1)
if(!M.confused) M.confused = 1
M.confused = max(M.confused, 20)
@@ -76,7 +75,6 @@
overdose = REAGENTS_OVERDOSE
/datum/reagent/ickypak/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
..()
M.make_dizzy(1)
M.adjustHalLoss(2)
@@ -100,7 +98,6 @@
overdose = REAGENTS_OVERDOSE
/datum/reagent/unsorbitol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
..()
M.make_dizzy(1)
M.adjustHalLoss(1)
if(!M.confused) M.confused = 1