cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 05:51:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed runtime errors in cryo and mining.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1308 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rastaf.zero@gmail.com
2011-03-29 17:00:42 +00:00
parent 21b859d864
commit e4907537b5
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/WorkInProgress/mining.dm
View File

@@ -2584,7 +2584,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
origin_tech = "materials=4"
perunit = 2000
/obj/item/stack/sheet/gold/New()
/obj/item/stack/sheet/gold/New(loc,amount)
..()
pixel_x = rand(0,4)-4
pixel_y = rand(0,4)-4
@@ -2600,7 +2600,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
origin_tech = "materials=3"
perunit = 2000
/obj/item/stack/sheet/silver/New()
/obj/item/stack/sheet/silver/New(loc,amount)
..()
pixel_x = rand(0,4)-4
pixel_y = rand(0,4)-4
@@ -2615,7 +2615,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
origin_tech = "materials=6"
perunit = 1000
/obj/item/stack/sheet/diamond/New()
/obj/item/stack/sheet/diamond/New(loc,amount)
..()
pixel_x = rand(0,4)-4
pixel_y = rand(0,4)-4
@@ -2664,7 +2664,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
origin_tech = "materials=4"
perunit = 2000
/obj/item/stack/sheet/clown/New()
/obj/item/stack/sheet/clown/New(loc,amount)
..()
pixel_x = rand(0,4)-4
pixel_y = rand(0,4)-4

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

@@ -170,7 +170,9 @@
//severe damage should heal waaay slower without proper chemicals
if(occupant.bodytemperature < 225)
occupant.toxloss = max(0, occupant.toxloss - min(1, 20/occupant.toxloss))
occupant.heal_organ_damage(min(1, 20/occupant.bruteloss),min(1, 20/occupant.fireloss))
var/heal_brute = occupant.bruteloss ? min(1, 20/occupant.bruteloss) : 0
var/heal_fire = occupant.fireloss ? min(1, 20/occupant.fireloss) : 0
occupant.heal_organ_damage(heal_brute,heal_fire)
if(beaker && (next_trans == 0))
beaker:reagents.trans_to(occupant, 1, 10)
beaker:reagents.reaction(occupant)