Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/datums/organs/organ_internal.dm
	code/datums/vote.dm
	code/defines/atom.dm
	code/defines/procs/gamehelpers.dm
	code/defines/turf.dm
	code/game/algorithm.dm
	code/game/cellautomata.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/computer/ai_core.dm
	code/game/machinery/computer/law.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/teleporter.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/electricchair.dm
	code/game/turfs/turf.dm
	code/game/vote.dm
	code/hub.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client defines.dm
	code/modules/food/food.dm
	code/modules/food/meat.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/login.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/photocopier.dm
	code/setup.dm
	icons/effects/genetics.dmi
	interface/interface.dm
	interface/skin.dmf
	maps/RandomZLevels/fileList.txt

various misc mergefixes and todos

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/reagents/Chemistry-Reagents.dm

@@ -73,12 +73,12 @@ datum
 			on_update(var/atom/A)
 				return
 
-		metroid
-			name = "Metroid Jam"
-			id = "metroid"
-			description = "A green semi-liquid produced from one of the deadliest lifeforms in existence."
+		rorojelly
+			name = "Roro Jelly"
+			id = "rorojelly"
+			description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL."
 			reagent_state = LIQUID
-			color = "#005020" // rgb: 0, 50, 20
+			color = "#801E28" // rgb: 128, 30, 40
 			on_mob_life(var/mob/living/M as mob)
 				if(prob(10))
 					M << "\red Your insides are burning!"
@@ -790,9 +790,18 @@ datum
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
+
+				var/needs_update = M.mutations.len > 0
+
 				M.mutations = list()
 				M.disabilities = 0
 				M.sdisabilities = 0
+
+				// Might need to update appearance for hulk etc.
+				if(needs_update && ishuman(M))
+					var/mob/living/carbon/human/H = M
+					H.update_mutations()
+
 				..()
 				return
 
@@ -1111,9 +1120,9 @@ datum
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
 				if(M.bodytemperature > 310)
-					M.bodytemperature = max(310, M.bodytemperature - (20 * TEMPERATURE_DAMAGE_COEFFICIENT))
+					M.bodytemperature = max(310, M.bodytemperature - (40 * TEMPERATURE_DAMAGE_COEFFICIENT))
 				else if(M.bodytemperature < 311)
-					M.bodytemperature = min(310, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT))
+					M.bodytemperature = min(310, M.bodytemperature + (40 * TEMPERATURE_DAMAGE_COEFFICIENT))
 				..()
 				return
 
@@ -2356,7 +2365,7 @@ datum
 				if(M.getToxLoss() && prob(20))
 					M.adjustToxLoss(-1)
 				if (M.bodytemperature < 310)  //310 is the normal bodytemp. 310.055
-					M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
+					M.bodytemperature = min(310, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT))
 				..()
 				return
 
@@ -2373,7 +2382,7 @@ datum
 				M.drowsyness = max(0,M.drowsyness-3)
 				M.sleeping = max(0,M.sleeping-2)
 				if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
-					M.bodytemperature = min(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
+					M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
 				M.make_jittery(5)
 				..()
 				return
@@ -2393,7 +2402,7 @@ datum
 				if(M.getToxLoss() && prob(20))
 					M.adjustToxLoss(-1)
 				if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
-					M.bodytemperature = min(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
+					M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
 				return
 
 		space_cola
@@ -3684,8 +3693,8 @@ datum
 			color = "#664300" // rgb: 102, 67, 0
 
 			on_mob_life(var/mob/living/M as mob)
-				if (M.bodytemperature < 270)
-					M.bodytemperature = min(270, M.bodytemperature - (40 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
+				if(M.bodytemperature > 270)
+					M.bodytemperature = max(270, M.bodytemperature - (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
 				if(!data) data = 1
 				data++
 				M.make_dizzy(3)

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -180,6 +180,18 @@
 			something.loc = get_turf(src)
 	..()
 
+/obj/item/weapon/reagent_containers/food/snacks/attack_animal(var/mob/M)
+	if(isanimal(M))
+		if(iscorgi(M))
+			if(bitecount == 0 || prob(50))
+				M.emote("nibbles away at the [src]")
+			bitecount++
+			if(bitecount >= 5)
+				var/sattisfaction_text = pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where the [src] was")
+				if(sattisfaction_text)
+					M.emote("[sattisfaction_text]")
+				del(src)
+
 
 ////////////////////////////////////////////////////////////////////////////////
 /// FOOD END
@@ -222,18 +234,6 @@
 //		reagents.add_reagent("nutriment", 2)							//	this line of code for all the contents.
 //		bitesize = 3													//This is the amount each bite consumes.
 
-/obj/item/weapon/reagent_containers/food/snacks/attack_animal(var/mob/M)
-	if(isanimal(M))
-		if(iscorgi(M))
-			if(bitecount == 0 || prob(50))
-				M.emote("nibbles away at the [src]")
-			bitecount++
-			if(bitecount >= 5)
-				var/sattisfaction_text = pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where the [src] was")
-				if(sattisfaction_text)
-					M.emote("[sattisfaction_text]")
-				del(src)
-
 
 
 
@@ -353,7 +353,7 @@
 			if(6)
 				reagents.add_reagent("coco", 3)
 			if(7)
-				reagents.add_reagent("metroid", 3)
+				reagents.add_reagent("rorojelly", 3)
 			if(8)
 				reagents.add_reagent("banana", 3)
 			if(9)
@@ -472,20 +472,17 @@
 /obj/item/weapon/reagent_containers/food/snacks/appendix //yes, this is the same as meat. I might do something different in future
 	name = "appendix"
 	desc = "An appendix which looks perfectly healthy."
+	icon = 'icons/obj/surgery.dmi'
 	icon_state = "appendix"
 	New()
 		..()
 		reagents.add_reagent("nutriment", 3)
 		src.bitesize = 3
 
-/obj/item/weapon/reagent_containers/food/snacks/appendixinflamed
+/obj/item/weapon/reagent_containers/food/snacks/appendix/inflamed
 	name = "inflamed appendix"
 	desc = "An appendix which appears to be inflamed."
 	icon_state = "appendixinflamed"
-	New()
-		..()
-		reagents.add_reagent("nutriment", 1)
-		src.bitesize = 1
 
 /obj/item/weapon/reagent_containers/food/snacks/tofu
 	name = "Tofu"
@@ -1120,13 +1117,13 @@
 		reagents.add_reagent("water", 5)
 		bitesize = 5
 
-/obj/item/weapon/reagent_containers/food/snacks/metroidsoup
-	name = "Metroid soup"
-	desc = "Tasty"
-	icon_state = "metroidsoup"
+/obj/item/weapon/reagent_containers/food/snacks/rorosoup
+	name = "Roro soup"
+	desc = "If no water is available, you may substitute tears."
+	icon_state = "rorosoup"
 	New()
 		..()
-		reagents.add_reagent("metroid", 5)
+		reagents.add_reagent("rorojelly", 5)
 		reagents.add_reagent("water", 10)
 		bitesize = 5
 
@@ -1206,7 +1203,7 @@
 				reagents.add_reagent("nutriment", 6)
 				reagents.add_reagent("blood", 10)
 			if(7)
-				reagents.add_reagent("metroid", 10)
+				reagents.add_reagent("rorojelly", 10)
 				reagents.add_reagent("water", 10)
 			if(8)
 				reagents.add_reagent("carbon", 10)
@@ -1443,25 +1440,25 @@
 		reagents.add_reagent("water", 5)
 		bitesize = 10
 
-/obj/item/weapon/reagent_containers/food/snacks/metroidtoast
-	name = "Metroid Toast"
+/obj/item/weapon/reagent_containers/food/snacks/rorotoast
+	name = "Roro Toast"
 	desc = "A slice of bread covered with delicious jam."
-	icon_state = "metroidtoast"
+	icon_state = "rorotoast"
 	trash = /obj/item/trash/plate
 	New()
 		..()
 		reagents.add_reagent("nutriment", 1)
-		reagents.add_reagent("metroid", 5)
+		reagents.add_reagent("rorojelly", 5)
 		bitesize = 3
 
-/obj/item/weapon/reagent_containers/food/snacks/metroidburger
-	name = "Metroid Burger"
+/obj/item/weapon/reagent_containers/food/snacks/roroburger
+	name = "Roro Burger"
 	desc = "A very toxic and tasty burger."
-	icon_state = "metroidburger"
+	icon_state = "roroburger"
 	New()
 		..()
 		reagents.add_reagent("nutriment", 1)
-		reagents.add_reagent("metroid", 5)
+		reagents.add_reagent("rorojelly", 5)
 		bitesize = 2
 
 /obj/item/weapon/reagent_containers/food/snacks/milosoup
@@ -1581,24 +1578,24 @@
 		reagents.add_reagent("nutriment", 2)
 		bitesize = 3
 
-/obj/item/weapon/reagent_containers/food/snacks/metroidsandwich
-	name = "Metroid Sandwich"
-	desc = "A sandwich is green stuff."
-	icon_state = "metroidsandwich"
+/obj/item/weapon/reagent_containers/food/snacks/rorosandwich
+	name = "Roro Sandwich"
+	desc = "You think you can see someone's face in the toast!"
+	icon_state = "rorosandwich"
 	trash = /obj/item/trash/plate
 	New()
 		..()
 		reagents.add_reagent("nutriment", 2)
-		reagents.add_reagent("metroid", 5)
+		reagents.add_reagent("rorojelly", 5)
 		bitesize = 3
 
-/obj/item/weapon/reagent_containers/food/snacks/boiledmetroidcore
-	name = "Boiled Metroid Core"
+/obj/item/weapon/reagent_containers/food/snacks/boiledrorocore
+	name = "Boiled Roro Core"
 	desc = "A boiled red thing."
-	icon_state = "boiledmetroidcore"
+	icon_state = "boiledrorocore"
 	New()
 		..()
-		reagents.add_reagent("metroid", 5)
+		reagents.add_reagent("rorojelly", 5)
 		bitesize = 3
 
 /obj/item/weapon/reagent_containers/food/snacks/mint
@@ -2277,4 +2274,9 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/cracker
 	name = "Cracker"
-	desc = "It's a salted cracker."
+	desc = "It's a salted cracker."
+	icon_state = "cracker"
+
+	New()
+		..()
+		reagents.add_reagent("nutriment", 1)

code/modules/reagents/reagent_containers/glass.dm

@@ -115,7 +115,7 @@
 		overlays = null
 
 		if(reagents.total_volume)
-			var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10", src.layer)
+			var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
 
 			var/percent = round((reagents.total_volume / volume) * 100)
 			switch(percent)
@@ -146,6 +146,12 @@
 		reagents.add_reagent("cryoxadone", 30)
 		update_icon()
 
+/obj/item/weapon/reagent_containers/glass/beaker/roro
+	New()
+		..()
+		reagents.add_reagent("rorojelly", 50)
+		update_icon()
+
 /obj/item/weapon/reagent_containers/glass/bucket
 	desc = "It's a bucket."
 	name = "bucket"

code/modules/reagents/reagent_containers/syringes.dm

@@ -181,7 +181,7 @@
 		item_state = "syringe_[rounded_vol]"
 
 		if(reagents.total_volume)
-			var/image/filling = image('icons/obj/reagentfillings.dmi', src, "syringe10", src.layer)
+			var/image/filling = image('icons/obj/reagentfillings.dmi', src, "syringe10")
 
 			switch(rounded_vol)
 				if(5)	filling.icon_state = "syringe5"