Merge branch 'master' of https://github.com/Baystation12/Baystation12

Conflicts:
	code/game/machinery/computer/lockdown.dm

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

code/WorkInProgress/Cael_Aislinn/Tajara/tajara_transformation.dm

@@ -1,30 +1,35 @@
 /mob/living/carbon/human/proc/Tajaraize()
 	if (monkeyizing)
 		return
-	for(var/obj/item/W in src)
-		drop_from_slot(W)
-	update_clothing()
 	monkeyizing = 1
 	canmove = 0
 	icon = null
 	invisibility = 101
+	overlays = list()
 
 	var/atom/movable/overlay/animation = new /atom/movable/overlay( loc )
 	animation.icon_state = "blank"
 	animation.icon = 'mob.dmi'
 	animation.master = src
 	flick("h2monkey", animation)
-	sleep(48)
+	sleep(18)
 	//animation = null
 	var/mob/living/carbon/human/tajaran/O = new /mob/living/carbon/human/tajaran( loc )
 	del(animation)
 	del(O.organs)
 	O.organs = organs
-	for(var/name in O.organs)
+	for(var/name in O.organs) //Ensuring organ trasnfer
 		var/datum/organ/external/organ = O.organs[name]
 		organ.owner = O
 		for(var/obj/item/weapon/implant/implant in organ.implant)
 			implant.imp_in = O
+	for(var/obj/hud/H in contents) //Lets not get a duplicate hud
+		del(H)
+	for(var/named in vars) //Making them keep their crap.
+		if(istype(vars[named], /obj/item))
+			O.vars[named] = vars[named]
+		else if (named == "contents")
+			O.vars[named] = vars[named]
 
 	O.real_name = real_name
 	O.name = name
@@ -32,6 +37,7 @@
 	updateappearance(O,O.dna.uni_identity)
 	O.loc = loc
 	O.viruses = viruses
+	O.s_tone = s_tone
 	viruses = list()
 	for(var/datum/disease/D in O.viruses)
 		D.affected_mob = O
@@ -42,9 +48,14 @@
 		client.mob = O
 	if(mind)
 		mind.transfer_to(O)
+
+	del(O.stand_icon)  //Force it to update.
+	del(O.lying_icon)
+
 	O.update_body()
 	O.update_face()
-	O.update_clothing()
+	spawn(1)
+		O.update_clothing()
 	O << "<B>You are now a Tajara.</B>"
 	spawn(0)//To prevent the proc from returning null.
 		del(src)

code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm

@@ -9,7 +9,7 @@
 	universal_speak = 1 //hacky fix until someone can figure out how to make them only understand humans
 	taj_talk_understand = 1
 	voice_message = "mrowls"
-	examine_text = "one of the cat-like Tajarans."
+	examine_text = "one of the cat-like Tajarans"
 
 /mob/living/carbon/human/tajaran/New()
 	var/g = "m"
@@ -28,7 +28,7 @@
 	..()
 
 /mob/living/carbon/human/tajaran/update_clothing()
-	..()
+//	..()
 
 	if (monkeyizing)
 		return
@@ -303,7 +303,12 @@
 		if ( istype(wear_suit, /obj/item/clothing/suit/bio_suit) || istype(wear_suit, /obj/item/clothing/suit/bomb_suit) || istype(wear_suit, /obj/item/clothing/suit/space) )
 			tail_shown = 0
 	if(tail_shown)
-		overlays += image("icon" = icon('tajaran.dmi', "tail_[gender==FEMALE ? "f" : "m"]_[lying ? "l" : "s"]"), "layer" = MOB_LAYER)
+		var/icon/tail_icon = image("icon" = icon('tajaran.dmi', "tail_[gender==FEMALE ? "f" : "m"]_[lying ? "l" : "s"]"), "layer" = MOB_LAYER)
+		if (s_tone >= 0)
+			tail_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
+		else
+			tail_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
+		overlays += tail_icon
 
 	if (lying)
 		if (face_lying)
@@ -339,7 +344,12 @@
 		var/datum/organ/external/head = organs["head"]
 		if(!head.destroyed)
 		//if not wearing anything on the head, show the ears
-			overlays += image("icon" = icon('tajaran.dmi', "ears_[gender==FEMALE ? "f" : "m"]_[lying ? "l" : "s"]"), "layer" = MOB_LAYER)
+			var/icon/ears_icon = image("icon" = icon('tajaran.dmi', "ears_[gender==FEMALE ? "f" : "m"]_[lying ? "l" : "s"]"), "layer" = MOB_LAYER)
+			if (s_tone >= 0)
+				ears_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
+			else
+				ears_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
+			overlays += ears_icon
 
 	// Belt
 	if (belt)
@@ -589,94 +599,3 @@
 
 /mob/living/carbon/human/tajaran/co2overloadtime = null
 /mob/living/carbon/human/tajaran/temperature_resistance = T0C+70
-
-
-/* //This is silly. -- Erthilo
-/mob/living/carbon/human/tajaran/Emissary/
-	unacidable = 1
-	var/aegis = 1
-
-/mob/living/carbon/human/tajaran/Emissary/New()
-
-	..()
-
-	reagents.add_reagent("hyperzine", 5000)		//From the dark, to the light, it's a supersonic flight!
-													// Gotta keep it going!
-	if (!(mutations & HULK))
-		mutations |= HULK
-
-	if (!(mutations & LASER))
-		mutations |= LASER
-
-	if (!(mutations & XRAY))
-		mutations |= XRAY
-		sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
-		see_in_dark = 8
-		see_invisible = 2
-
-	if (!(mutations & COLD_RESISTANCE))
-		mutations |= COLD_RESISTANCE
-
-	if (!(mutations & TK))
-		mutations |= TK
-
-	if(!(mutations & HEAL))
-		mutations |= HEAL
-
-	spawn(0)
-		while(src)
-			adjustBruteLoss(-10)
-			adjustToxLoss(-10)
-			adjustOxyLoss(-10)
-			adjustFireLoss(-10)
-			sleep(10)
-
-
-/mob/living/carbon/human/tajaran/Emissary/ex_act()
-	return
-
-/mob/living/carbon/human/tajaran/Emissary/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, inrange, params)
-	if(istype(target , /obj/machinery/door/airlock))
-		if(target:locked)
-			target:locked = 0
-		if(!target:density)
-			return 1
-		if(target:operating > 0)
-			return
-		if(!ticker)
-			return 0
-		if(!target:operating)
-			target:operating = 1
-
-		target:animate("opening")
-		target:sd_SetOpacity(0)
-		sleep(10)
-		target:layer = 2.7
-		target:density = 0
-		target:update_icon()
-		target:sd_SetOpacity(0)
-		target:update_nearby_tiles()
-
-		target:operating = -1
-
-		user << "You force the door open, shearing the bolts and burning out the motor."
-
-		if(target:operating)
-			target:operating = -1
-	else if(istype(target , /obj/machinery/door/firedoor))
-		target:open()
-
-/mob/living/carbon/human/tajaran/Emissary/Life()
-
-	..()
-
-	if (!(mutations & HULK))
-		mutations |= HULK
-
-
-	if((stat == 2) && aegis)
-		src.show_message("\red [src]'s eyes open suddenlly.", 3, "\red \"I gave a solemn vow to never die for long.\"", 2)
-		src.heal_overall_damage(9001,9001)
-		src.stat = 0
-		aegis = 0
-*/