From 4f30c9a7ac4e30b8709f9c8930077eb100f1747c Mon Sep 17 00:00:00 2001 From: "n3ophyt3@gmail.com" Date: Sun, 13 Mar 2011 02:40:30 +0000 Subject: [PATCH] Waistcoats should have a working suit storage now, allowing PDAs and pens Cryo no longer makes people inside the tube only process reagents every 10th tick (which was fucking retarded, considering that the cryoxadone happens to BE a reagent) Clonexadone now heals non-cloneloss at the same rate as regular cryo reagent, so it's not strictly better in all cases. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1179 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/Chemistry-Reagents.dm | 10 +++++----- code/defines/obj/clothing/suit.dm | 2 +- code/game/machinery/cryo.dm | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/WorkInProgress/Chemistry-Reagents.dm b/code/WorkInProgress/Chemistry-Reagents.dm index 4435062fcaf..dfba4eddbcb 100644 --- a/code/WorkInProgress/Chemistry-Reagents.dm +++ b/code/WorkInProgress/Chemistry-Reagents.dm @@ -1018,11 +1018,11 @@ datum on_mob_life(var/mob/M) if(!M) M = holder.my_atom if(M.bodytemperature < 170) - if(M:cloneloss) M:cloneloss = max(0, M:cloneloss-6) - if(M:oxyloss) M:oxyloss = max(0, M:oxyloss-6) - if(M:bruteloss) M:bruteloss = max(0, M:bruteloss-6) - if(M:fireloss) M:fireloss = max(0, M:fireloss-6) - if(M:toxloss) M:toxloss = max(0, M:toxloss-6) + if(M:cloneloss) M:cloneloss = max(0, M:cloneloss-3) + if(M:oxyloss) M:oxyloss = max(0, M:oxyloss-3) + if(M:bruteloss) M:bruteloss = max(0, M:bruteloss-3) + if(M:fireloss) M:fireloss = max(0, M:fireloss-3) + if(M:toxloss) M:toxloss = max(0, M:toxloss-3) ..() return diff --git a/code/defines/obj/clothing/suit.dm b/code/defines/obj/clothing/suit.dm index f473dd0a083..eca75728eee 100644 --- a/code/defines/obj/clothing/suit.dm +++ b/code/defines/obj/clothing/suit.dm @@ -101,7 +101,7 @@ icon_state = "vest" item_state = "wcoat" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS - allowed = list() + allowed = list(/obj/item/device/pda) /obj/item/clothing/suit/apron name = "apron" diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 4987faacb37..33b1a407b50 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -206,7 +206,7 @@ src.occupant.client.eye = src.occupant.client.mob src.occupant.client.perspective = MOB_PERSPECTIVE src.occupant.loc = src.loc - src.occupant.metabslow = 0 +// src.occupant.metabslow = 0 src.occupant = null build_icon() return @@ -226,7 +226,7 @@ M.pulling = null M.loc = src src.occupant = M - M.metabslow = 1 +// M.metabslow = 1 src.add_fingerprint(usr) build_icon() return 1