From e4264bb014b847fe23086f66ece87948f3161abc Mon Sep 17 00:00:00 2001 From: cib Date: Fri, 22 Feb 2013 17:01:41 +0100 Subject: [PATCH 1/2] Cryo now only injects as much chemicals as necessary. Fixes the problem of people who were in cryo getting headaches forever. --- code/game/machinery/cryo.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 1a78d4be758..4b095488f9d 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -10,7 +10,6 @@ var/temperature_archived var/mob/living/carbon/occupant = null var/beaker = null - var/next_trans = 0 var/current_heat_capacity = 50 @@ -164,12 +163,12 @@ var/heal_brute = occupant.getBruteLoss() ? min(1, 20/occupant.getBruteLoss()) : 0 var/heal_fire = occupant.getFireLoss() ? min(1, 20/occupant.getFireLoss()) : 0 occupant.heal_organ_damage(heal_brute,heal_fire) - if(beaker && (next_trans == 0)) + var/has_cryo = occupant.reagents.get_reagent_amount("cryoxadone") >= 1 + var/has_clonexa = occupant.reagents.get_reagent_amount("clonexadone") >= 1 + var/has_cryo_medicine = has_cryo || has_clonexa + if(beaker && !has_cryo_medicine) beaker:reagents.trans_to(occupant, 1, 10) beaker:reagents.reaction(occupant) - next_trans++ - if(next_trans == 10) - next_trans = 0 /obj/machinery/atmospherics/unary/cryo_cell/proc/heat_gas_contents() if(air_contents.total_moles() < 1) From a5a8caeb009d10e71fd6791d3158f2566b827208 Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Sat, 23 Feb 2013 02:30:32 +1000 Subject: [PATCH 2/2] fixed compile error Signed-off-by: Cael_Aislinn --- code/modules/events/infestation.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm index 1d484306802..d9505e3b53e 100644 --- a/code/modules/events/infestation.dm +++ b/code/modules/events/infestation.dm @@ -80,7 +80,6 @@ vermstring = "lizards" if(VERM_SPIDERS) spawn_types = list(/obj/effect/spider/spiderling) - max_number = 6 vermstring = "spiders" spawn(0) var/num = rand(1, 3)