From 70fea88a391608784e8dcac65e18c0d42fd52571 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 30 Dec 2017 13:22:54 -0600 Subject: [PATCH] Update cryo.dm --- .../atmospherics/machinery/components/unary_devices/cryo.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 74c2302ee9..87d6387b99 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -348,12 +348,7 @@ else data["occupant"]["temperaturestatus"] = "bad" -<<<<<<< HEAD - - var/datum/gas_mixture/air1 = AIR1 -======= var/datum/gas_mixture/air1 = airs[1] ->>>>>>> 6a7dbaa... removes silly garbage defines (#33621) data["cellTemperature"] = round(air1.temperature, 1) data["isBeakerLoaded"] = beaker ? TRUE : FALSE