cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Browse Source
This commit is contained in:
Chinsky
2013-02-23 00:12:26 +04:00
parent b208a953d0 5ab07cc64f
commit 039de3df1a
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/game/machinery/cryo.dm
View File

@@ -10,7 +10,6 @@
var/temperature_archived var/temperature_archived
var/mob/living/carbon/occupant = null var/mob/living/carbon/occupant = null
var/beaker = null var/beaker = null
var/next_trans = 0
var/current_heat_capacity = 50 var/current_heat_capacity = 50
@@ -164,12 +163,12 @@
var/heal_brute = occupant.getBruteLoss() ? min(1, 20/occupant.getBruteLoss()) : 0 var/heal_brute = occupant.getBruteLoss() ? min(1, 20/occupant.getBruteLoss()) : 0
var/heal_fire = occupant.getFireLoss() ? min(1, 20/occupant.getFireLoss()) : 0 var/heal_fire = occupant.getFireLoss() ? min(1, 20/occupant.getFireLoss()) : 0
occupant.heal_organ_damage(heal_brute,heal_fire) 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.trans_to(occupant, 1, 10)
beaker:reagents.reaction(occupant) beaker:reagents.reaction(occupant)
next_trans++
if(next_trans == 10)
next_trans = 0
/obj/machinery/atmospherics/unary/cryo_cell/proc/heat_gas_contents() /obj/machinery/atmospherics/unary/cryo_cell/proc/heat_gas_contents()
if(air_contents.total_moles() < 1) if(air_contents.total_moles() < 1)

1
code/modules/events/infestation.dm
View File

@@ -83,7 +83,6 @@
vermstring = "lizards" vermstring = "lizards"
if(VERM_SPIDERS) if(VERM_SPIDERS)
spawn_types = list(/obj/effect/spider/spiderling) spawn_types = list(/obj/effect/spider/spiderling)
max_number = 6
vermstring = "spiders" vermstring = "spiders"
spawn(0) spawn(0)