From 88c8893cdb7bccc12957247799c3e322bd7102cc Mon Sep 17 00:00:00 2001
From: cib <cib123@googlemail.com>
Date: Sun, 4 Mar 2012 16:28:41 -0800
Subject: [PATCH 1/6] Fuel tanks can now be ignited by fire.

---
 code/modules/chemical/Chemistry-Tools.dm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm
index a9b1353f519..229cd01a91a 100644
--- a/code/modules/chemical/Chemistry-Tools.dm
+++ b/code/modules/chemical/Chemistry-Tools.dm
@@ -2970,6 +2970,13 @@
 	if(src)
 		del(src)
 
+/obj/structure/reagent_dispensers/fueltank/temperature_expose(datum/gas_mixture/air, temperature, volume)
+	if(temperature > T0C+500)
+		explosion(src.loc,-1,0,2)
+		if(src)
+			del(src)
+	return ..()
+
 /obj/structure/reagent_dispensers/water_cooler
 	name = "Water-Cooler"
 	desc = "A machine that dispenses water to drink"

From 4c93cda368a49eccb0d71a55bbb5cb13da1d7cbb Mon Sep 17 00:00:00 2001
From: cib <cib123@googlemail.com>
Date: Sun, 4 Mar 2012 17:15:43 -0800
Subject: [PATCH 2/6] Slowed down the rate at which most chemicals are
 absorbed. This may still need balancing in some areas.

---
 code/modules/chemical/Chemistry-Reagents.dm | 104 +++++++++++++++++---
 code/setup.dm                               |   3 +-
 2 files changed, 95 insertions(+), 12 deletions(-)

diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm
index 7c4db6492fd..1cc9721fa58 100644
--- a/code/modules/chemical/Chemistry-Reagents.dm
+++ b/code/modules/chemical/Chemistry-Reagents.dm
@@ -362,7 +362,7 @@ datum
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
-				M:adjustToxLoss(1.5)
+				M:adjustToxLoss(0.3)
 				..()
 				return
 
@@ -403,6 +403,7 @@ datum
 //					if(50 to INFINITY)
 //						M:adjustToxLoss(0.1)
 				data++
+				holder.remove_reagent(src.id, 0.1)
 				..()
 				return
 
@@ -602,7 +603,7 @@ datum
 				if(M.canmove && istype(M.loc, /turf/space))
 					step(M, pick(cardinal))
 				if(prob(5)) M:emote(pick("twitch","drool","moan"))
-				M:adjustToxLoss(1)
+				M:adjustToxLoss(0.2)
 				..()
 				return
 
@@ -634,7 +635,8 @@ datum
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
-				M.take_organ_damage(1, 0)
+				if(prob(50))
+					M.take_organ_damage(1, 0)
 				..()
 				return
 
@@ -647,7 +649,7 @@ datum
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
-				M:adjustToxLoss(1)
+				M:adjustToxLoss(0.3)
 				..()
 				return
 
@@ -702,7 +704,8 @@ datum
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
 				M:adjustToxLoss(1)
-				M.take_organ_damage(0, 1)
+				if(prob(50))
+					M.take_organ_damage(0, 1)
 				..()
 				return
 			reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
@@ -756,7 +759,7 @@ datum
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
-				M:adjustToxLoss(1)
+				M:adjustToxLoss(0.2)
 				M.take_organ_damage(0, 1)
 				..()
 				return
@@ -1209,7 +1212,7 @@ datum
 				if(M.stat == 2.0)
 					return
 				if(!M) M = holder.my_atom
-				if(prob(33))
+				if(prob(30))
 					M.take_organ_damage(1, 0)
 				M:adjustOxyLoss(3)
 				if(prob(20)) M:emote("gasp")
@@ -1229,7 +1232,9 @@ datum
 				if(!M) M = holder.my_atom
 				if(!data) data = 1
 				data++
-				M:heal_organ_damage(0,2)
+				M:heal_organ_damage(0,1)
+				if(volume > REAGENTS_OVERDOSE)
+					M:adjustToxLoss(1)
 				if(data >= 125)
 					M:adjustToxLoss(0.1)
 				..()
@@ -1249,6 +1254,8 @@ datum
 				if(!data) data = 1
 				data++
 				M:heal_organ_damage(0,3)
+				if(volume > REAGENTS_OVERDOSE)
+					M:adjustToxLoss(1)
 				if(data >= 125)
 					M:adjustToxLoss(0.2)
 				..()
@@ -1270,6 +1277,8 @@ datum
 				M:adjustOxyLoss(-2)
 				if(holder.has_reagent("lexorin"))
 					holder.remove_reagent("lexorin", 2)
+				if(volume > REAGENTS_OVERDOSE)
+					M:adjustToxLoss(1)
 				if(data >= 125)
 					M:adjustToxLoss(0.2)
 				..()
@@ -1291,6 +1300,8 @@ datum
 				M:oxyloss = 0
 				if(holder.has_reagent("lexorin"))
 					holder.remove_reagent("lexorin", 2)
+				if(volume > REAGENTS_OVERDOSE)
+					M:adjustToxLoss(1)
 				if(data >= 50)
 					M:adjustToxLoss(0.2)
 				..()
@@ -1311,6 +1322,8 @@ datum
 				if(M:getBruteLoss() && prob(40)) M:heal_organ_damage(1,0)
 				if(M:getFireLoss() && prob(40)) M:heal_organ_damage(0,1)
 				if(M:getToxLoss() && prob(40)) M:adjustToxLoss(-1)
+				if(volume > REAGENTS_OVERDOSE)
+					M:adjustToxLoss(1)
 				..()
 				return
 
@@ -1389,6 +1402,8 @@ datum
 				M.AdjustStunned(-1)
 				M.AdjustWeakened(-1)
 				if(prob(60))	M.adjustToxLoss(1)
+				if(volume > REAGENTS_OVERDOSE)
+					M:adjustToxLoss(1)
 				..()
 				return
 
@@ -1421,6 +1436,8 @@ datum
 				if(prob(80)) M:adjustBrainLoss(1)
 				if(prob(50)) M:drowsyness = max(M:drowsyness, 3)
 				if(prob(10)) M:emote("drool")
+				if(volume > REAGENTS_OVERDOSE)
+					M:adjustToxLoss(1)
 				if(data >= 50)
 					M:adjustToxLoss(0.4)
 				..()
@@ -1436,6 +1453,8 @@ datum
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
 				M:radiation = max(M:radiation-3,0)
+				if(volume > REAGENTS_OVERDOSE)
+					M:adjustToxLoss(1)
 				if(data >= 50)
 					M:adjustToxLoss(0.2)
 				..()
@@ -1459,6 +1478,8 @@ datum
 				if(prob(15))
 					M.take_organ_damage(1, 0)
 				..()
+				if(volume > REAGENTS_OVERDOSE)
+					M:adjustToxLoss(1)
 				if(data >= 50)
 					M:adjustToxLoss(0.3)
 				return
@@ -1474,6 +1495,8 @@ datum
 				if(!M) M = holder.my_atom
 				M:adjustBrainLoss(-3)
 				M:adjustToxLoss(0.1)
+				if(volume > REAGENTS_OVERDOSE)
+					M:adjustToxLoss(1)
 				..()
 				return
 
@@ -1491,6 +1514,8 @@ datum
 				M:eye_blurry = max(M:eye_blurry-5 , 0)
 				M:eye_blind = max(M:eye_blind-5 , 0)
 				M:disabilities &= ~1
+				if(volume > REAGENTS_OVERDOSE)
+					M:adjustToxLoss(1)
 				if(data >= 100)
 					M:adjustToxLoss(0.2)
 				..()
@@ -1510,6 +1535,8 @@ datum
 				if(!data) data = 1
 				data++
 				M:heal_organ_damage(2,0)
+				if(volume > REAGENTS_OVERDOSE)
+					M:adjustToxLoss(1)
 				if(data >= 125)
 					M:adjustToxLoss(0.2)
 				..()
@@ -1528,6 +1555,8 @@ datum
 				data++
 				if(prob(5)) M:emote(pick("twitch","blink_r","shiver"))
 				holder.remove_reagent(src.id, 0.2)
+				if(volume > REAGENTS_OVERDOSE)
+					M:adjustToxLoss(1)
 				if(data >= 50)
 					M:adjustToxLoss(0.2)
 				..()
@@ -1580,6 +1609,8 @@ datum
 				if(!data) data = 1
 				data++
 				holder.remove_reagent(src.id, 0.1)
+				if(volume > REAGENTS_OVERDOSE)
+					M:adjustToxLoss(1)
 				if(data >= 100)
 					M:adjustToxLoss(0.1)
 				return
@@ -1593,7 +1624,7 @@ datum
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
-				M:adjustToxLoss(2)
+				M:adjustToxLoss(1)
 				..()
 				return
 
@@ -1773,7 +1804,7 @@ datum
 						M:sleeping += 1
 					if(51 to INFINITY)
 						M:sleeping += 1
-						M:adjustToxLoss(data - 50)
+						M:adjustToxLoss(2)
 				..()
 				return
 
@@ -1795,7 +1826,7 @@ datum
 						M:sleeping += 1
 					if(51 to INFINITY)
 						M:sleeping += 1
-						M:adjustToxLoss(data - 50)
+						M:adjustToxLoss(2)
 				data++
 				..()
 				return
@@ -2596,6 +2627,8 @@ datum
 					if (!M:confused) M:confused = 1
 					M:confused += 2
 
+				holder.remove_reagent(src.id, 0.2)
+
 				..()
 				return
 
@@ -2615,6 +2648,7 @@ datum
 					M.slurring += 3
 				else if(data >= 125 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -2634,6 +2668,7 @@ datum
 					M.slurring += 3
 				else if(data >= 125 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -2654,6 +2689,7 @@ datum
 					M.slurring += 3
 				else if(data >= 125 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -2673,6 +2709,7 @@ datum
 					M.slurring += 3
 				else if(data >= 125 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -2692,6 +2729,7 @@ datum
 					M.slurring += 3
 				else if(data >= 125 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -2734,6 +2772,7 @@ datum
 					M.slurring += 3
 				else if(data >= 125 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -2753,6 +2792,7 @@ datum
 					M.slurring += 3
 				else if(data >= 125 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -2772,6 +2812,7 @@ datum
 					M.slurring += 3
 				else if(data >= 145 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -2825,6 +2866,7 @@ datum
 					M.slurring += 3
 				else if(data >= 115 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -2844,6 +2886,7 @@ datum
 					M.slurring += 5
 				else if(data >= 90 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -2863,6 +2906,7 @@ datum
 					M.slurring += 3
 				else if(data >= 125 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -2918,6 +2962,7 @@ datum
 				if(data >= 40 && prob(33))
 					if (!M:confused) M:confused = 1
 					M:confused += 2
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -2939,6 +2984,7 @@ datum
 				switch(data)
 					if(51 to INFINITY)
 						M:sleeping += 1
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -2959,6 +3005,7 @@ datum
 					M.slurring += 3
 				else if(data >= 90)
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -2978,6 +3025,7 @@ datum
 					M.slurring += 3
 				else if(data >= 125 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -2997,6 +3045,7 @@ datum
 					M.slurring += 3
 				else if(data >= 125 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3016,6 +3065,7 @@ datum
 					M.slurring += 3
 				else if(data >= 135 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3035,6 +3085,7 @@ datum
 					M.slurring += 3
 				else if(data >= 135 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3054,6 +3105,7 @@ datum
 					M.slurring += 3
 				else if(data >= 125 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3073,6 +3125,7 @@ datum
 					M.slurring += 3
 				else if(data >= 135 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3092,6 +3145,7 @@ datum
 					M.slurring += 3
 				else if(data >= 135 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3111,6 +3165,7 @@ datum
 					M.slurring += 3
 				else if(data >= 165 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3130,6 +3185,7 @@ datum
 					M.slurring += 3
 				else if(data >= 165 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3149,6 +3205,7 @@ datum
 					M.slurring += 4
 				else if(data >= 165 && prob(33))
 					M.confused = max(M:confused+4,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3168,6 +3225,7 @@ datum
 					M.slurring += 3
 				else if(data >= 165 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3189,6 +3247,7 @@ datum
 					M.confused = max(M:confused+3,0)
 				else if(data >=55)
 					M.druggy = max(M.druggy, 55)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3208,6 +3267,7 @@ datum
 					M.slurring += 3
 				else if(data >= 145 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3227,6 +3287,7 @@ datum
 					M.slurring += 3
 				else if(data >= 165 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3248,6 +3309,7 @@ datum
 					M.slurring += 3
 				else if(data >= 165 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3268,6 +3330,7 @@ datum
 					M.slurring += 3
 				else if(data >= 165 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3305,6 +3368,7 @@ datum
 					M.slurring += 3
 				else if(data >= 145 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3324,6 +3388,7 @@ datum
 					M.slurring += 3
 				else if(data >= 115 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3343,6 +3408,7 @@ datum
 					M.slurring += 3
 				else if(data >= 165 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3362,6 +3428,7 @@ datum
 					M.slurring += 4
 				else if(data >= 60 && prob(40))
 					M.confused = max(M:confused+5,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3381,6 +3448,7 @@ datum
 					M.slurring += 4
 				else if(data >= 90 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3400,6 +3468,7 @@ datum
 					M.slurring += 3
 				else if(data >= 150 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3419,6 +3488,7 @@ datum
 					M.slurring += 3
 				else if(data >= 150 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3438,6 +3508,7 @@ datum
 					M.slurring += 3
 				else if(data >= 115 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3457,6 +3528,7 @@ datum
 					M.slurring += 3
 				else if(data >= 115 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3477,6 +3549,7 @@ datum
 					M.slurring += 3
 				else if(data >= 115 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3496,6 +3569,7 @@ datum
 					M.slurring += 3
 				else if(data >= 115 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3515,6 +3589,7 @@ datum
 					M.slurring += 5
 				else if(data >= 115 && prob(33))
 					M.confused = max(M:confused+5,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3534,6 +3609,7 @@ datum
 					M.slurring += 5
 				else if(data >= 115 && prob(33))
 					M.confused = max(M:confused+5,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3553,6 +3629,7 @@ datum
 					M.slurring += 4
 				else if(data >= 115 && prob(30))
 					M.confused = max(M:confused+4,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3572,6 +3649,7 @@ datum
 					M.slurring += 10
 				else if(data >= 115 && prob(90))
 					M.confused = max(M:confused+10,10)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3591,6 +3669,7 @@ datum
 					M.slurring += 3
 				else if(data >= 115 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3610,6 +3689,7 @@ datum
 					M.slurring += 3
 				else if(data >= 125 && prob(33))
 					M.confused = max(M:confused+2,0)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3631,6 +3711,7 @@ datum
 					M.confused = max(M:confused+2,0)
 				if (M.bodytemperature > 310)
 					M.bodytemperature = max(310, M.bodytemperature-5)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
@@ -3650,6 +3731,7 @@ datum
 					M.slurring += 15
 				else if(data >= 115 && prob(33))
 					M.confused = max(M:confused+15,15)
+				holder.remove_reagent(src.id, 0.2)
 				..()
 				return
 
diff --git a/code/setup.dm b/code/setup.dm
index 9a46ddb6ae4..b7d49a7a7de 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -20,7 +20,8 @@
 
 // Factor of how fast mob nutrition decreases
 #define	HUNGER_FACTOR 0.1
-#define	REAGENTS_METABOLISM 0.4
+#define	REAGENTS_METABOLISM 0.05
+#define REAGENTS_OVERDOSE 30
 
 #define MINIMUM_AIR_RATIO_TO_SUSPEND 0.05
 	//Minimum ratio of air that must move to/from a tile to suspend group processing

From cd30ab13b353ff54d7ba43c6264bc02fea604913 Mon Sep 17 00:00:00 2001
From: cib <cib123@googlemail.com>
Date: Mon, 5 Mar 2012 09:46:19 -0800
Subject: [PATCH 3/6] Fixed machinery operating skill description.

---
 code/modules/mob/new_player/skill.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/new_player/skill.dm b/code/modules/mob/new_player/skill.dm
index fafdf41eba5..da880d7c697 100644
--- a/code/modules/mob/new_player/skill.dm
+++ b/code/modules/mob/new_player/skill.dm
@@ -101,7 +101,7 @@ datum/skill/computer
 datum/skill/pilot
     ID = "pilot"
     name = "Heavy Machinery Operation"
-    desc = "Describes your experience and understanding of operating heavy machinery, which includes mechs and other large exosuits. Used in piloting mechs and creating them"
+    desc = "Describes your experience and understanding of operating heavy machinery, which includes mechs and other large exosuits. Used in piloting mechs."
     field = "Engineering"
 
 datum/skill/medical

From 93c91b6018f0badc5c6164f6282d3008ef243f75 Mon Sep 17 00:00:00 2001
From: cib <cib123@googlemail.com>
Date: Mon, 5 Mar 2012 10:45:26 -0800
Subject: [PATCH 4/6] You can no longer extract chemicals directly from blood.

Derp me, I didn't know extracted blood had a trace chemicals variable.
---
 code/modules/chemical/Chemistry-Tools.dm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm
index 229cd01a91a..f6c919c7d94 100644
--- a/code/modules/chemical/Chemistry-Tools.dm
+++ b/code/modules/chemical/Chemistry-Tools.dm
@@ -960,7 +960,7 @@
 						user << "\red There is already a blood sample in this syringe"
 						return
 					if(istype(target, /mob/living/carbon))//maybe just add a blood reagent to all mobs. Then you can suck them dry...With hundreds of syringes. Jolly good idea.
-						var/amount = max(src.reagents.maximum_volume - src.reagents.total_volume - 2, 0)
+						var/amount = src.reagents.maximum_volume - src.reagents.total_volume
 						var/mob/living/carbon/T = target
 						var/datum/reagent/B = new /datum/reagent/blood
 						if(!T.dna)
@@ -1007,9 +1007,6 @@
 						//	world << "Data [D] = [B.data[D]]"
 						//debug
 
-						// also transfer some of the reagents other than blood
-						T.reagents.trans_to(src, 2)
-
 						src.reagents.reagent_list += B
 						src.reagents.update_total()
 						src.on_reagent_change()

From 37f6e216c1c805fc489fe1377bbc3bd8577ac461 Mon Sep 17 00:00:00 2001
From: cib <cib123@googlemail.com>
Date: Mon, 5 Mar 2012 23:50:59 -0800
Subject: [PATCH 5/6] Fixes to available skills.

---
 code/modules/mob/new_player/skill.dm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/code/modules/mob/new_player/skill.dm b/code/modules/mob/new_player/skill.dm
index da880d7c697..a30ce96699e 100644
--- a/code/modules/mob/new_player/skill.dm
+++ b/code/modules/mob/new_player/skill.dm
@@ -22,11 +22,6 @@ datum/skill/management
     name = "Command"
     desc = "Your ability to manage and commandeer other crew members."
 
-datum/skill/knowledge/law
-    ID = "law"
-    name = "NanoTrasen Law"
-    desc = "Your knowledge of NanoTrasen law and procedures. This includes space law, as well as general station rulings and procedures. A low level in this skill is typical for security officers, a high level in this skill is typical for captains."
-
 datum/skill/combat
 	ID = "combat"
 	name = "Close Combat"
@@ -107,7 +102,7 @@ datum/skill/pilot
 datum/skill/medical
     ID = "medical"
     name = "Medicine"
-    desc = "Covers an understanding of the human body and medicine. At a low level, this skill is vital to perform basic first aid, such as CPR or applying bandages. At a high level, this skill implies a good understanding of the various medicines that can be found on a space station."
+    desc = "Covers an understanding of the human body and medicine. At a low level, this skill gives a basic understanding of applying common types of medicine, and a rough understanding of medical devices like the health analyzer. At a high level, this skill grants exact knowledge of all the medicine available on the station, as well as the ability to use complex medical devices like the body scanner or mass spectrometer."
     field = "Medical"
 
 datum/skill/anatomy

From 209162c25e74a79baca719aab15312da10ea67dd Mon Sep 17 00:00:00 2001
From: cib <cib123@googlemail.com>
Date: Tue, 6 Mar 2012 19:50:03 -0800
Subject: [PATCH 6/6] Renamed the "None" skill level to "Layman".

---
 code/modules/mob/new_player/preferences.dm | 2 +-
 code/modules/mob/new_player/skill.dm       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm
index 09b86aab34a..f3c1755db16 100644
--- a/code/modules/mob/new_player/preferences.dm
+++ b/code/modules/mob/new_player/preferences.dm
@@ -188,7 +188,7 @@ datum/preferences
 				var/level = skills[S.ID]
 				HTML += "<tr style='text-align:left;'>"
 				HTML += "<th><a href='byond://?src=\ref[user];preferences=1;skills=1;skillinfo=\ref[S]'>[S.name]</a></th>"
-				HTML += "<th><a href='byond://?src=\ref[user];preferences=1;skills=1;setskill=\ref[S];newvalue=[SKILL_NONE]'><font color=[(level == SKILL_NONE) ? "red" : "black"]>\[None\]</font></a></th>"
+				HTML += "<th><a href='byond://?src=\ref[user];preferences=1;skills=1;setskill=\ref[S];newvalue=[SKILL_NONE]'><font color=[(level == SKILL_NONE) ? "red" : "black"]>\[Layman\]</font></a></th>"
 				HTML += "<th><a href='byond://?src=\ref[user];preferences=1;skills=1;setskill=\ref[S];newvalue=[SKILL_BASIC]'><font color=[(level == SKILL_BASIC) ? "red" : "black"]>\[Basic\]</font></a></th>"
 				HTML += "<th><a href='byond://?src=\ref[user];preferences=1;skills=1;setskill=\ref[S];newvalue=[SKILL_ADEPT]'><font color=[(level == SKILL_ADEPT) ? "red" : "black"]>\[Adept\]</font></a></th>"
 				HTML += "<th><a href='byond://?src=\ref[user];preferences=1;skills=1;setskill=\ref[S];newvalue=[SKILL_EXPERT]'><font color=[(level == SKILL_EXPERT) ? "red" : "black"]>\[Expert\]</font></a></th>"
diff --git a/code/modules/mob/new_player/skill.dm b/code/modules/mob/new_player/skill.dm
index a30ce96699e..fe9ba9cebc0 100644
--- a/code/modules/mob/new_player/skill.dm
+++ b/code/modules/mob/new_player/skill.dm
@@ -206,7 +206,7 @@ proc/show_skill_window(var/mob/user, var/mob/living/carbon/human/M)
 			var/level = M.skills[S.ID]
 			HTML += "<tr style='text-align:left;'>"
 			HTML += "<th>[S.name]</th>"
-			HTML += "<th><font color=[(level == SKILL_NONE) ? "red" : "black"]>\[None\]</font></th>"
+			HTML += "<th><font color=[(level == SKILL_NONE) ? "red" : "black"]>\[Layman\]</font></th>"
 			HTML += "<th><font color=[(level == SKILL_BASIC) ? "red" : "black"]>\[Basic\]</font></th>"
 			HTML += "<th><font color=[(level == SKILL_ADEPT) ? "red" : "black"]>\[Adept\]</font></th>"
 			HTML += "<th><font color=[(level == SKILL_EXPERT) ? "red" : "black"]>\[Expert\]</font></th>"