Merge remote-tracking branch 'upstream/master'

code/WorkInProgress/Cael_Aislinn/MultiZ.dm

@@ -174,8 +174,9 @@
 						H.apply_damage(0.5*damage, BRUTE, "l_arm")
 						H.apply_damage(0.5*damage, BRUTE, "r_arm")
 
-						var/obj/effect/decal/cleanable/blood/B = new(src.loc)
-						B.blood_DNA = list(list(H.dna.unique_enzymes, H.dna.btype))
+						//var/obj/effect/decal/cleanable/blood/B = new(src.loc)
+						//B.blood_DNA = H.dna.unique_enzymes
+						//B.blood_type = H.b_type
 
 						H:weakened = max(H:weakened,2)
 						H:updatehealth()

code/WorkInProgress/Cael_Aislinn/Tajara/examine.dm

@@ -0,0 +1,198 @@
+/mob/living/carbon/human/tajaran/examine()
+	set src in view()
+
+	usr << "\blue *---------*"
+
+	usr << "\blue This is \icon[src.icon] <B>[src.name]</B>! One of the cat-like Tajarans."
+
+	// crappy hack because you can't do \his[src] etc
+	var/t_his = "its"
+	var/t_him = "it"
+	if (src.gender == MALE)
+		t_his = "his"
+		t_him = "him"
+	else if (src.gender == FEMALE)
+		t_his = "her"
+		t_him = "her"
+
+	if (src.w_uniform)
+		if (src.w_uniform.blood_DNA)
+			usr << "\red [src.name] is wearing a[src.w_uniform.blood_DNA ? " bloody " : " "] \icon[src.w_uniform] [src.w_uniform.name]!"
+		else
+			usr << "\blue [src.name] is wearing a \icon[src.w_uniform] [src.w_uniform.name]."
+
+	if (src.handcuffed)
+		usr << "\blue [src.name] is \icon[src.handcuffed] handcuffed!"
+
+	if (src.wear_suit)
+		if (src.wear_suit.blood_DNA)
+			usr << "\red [src.name] has a[src.wear_suit.blood_DNA ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name] on!"
+		else
+			usr << "\blue [src.name] has a \icon[src.wear_suit] [src.wear_suit.name] on."
+
+	if (src.l_ear)
+		usr << "\blue [src.name] has a \icon[src.l_ear] [src.l_ear.name] on [t_his] left ear."
+
+	if (src.r_ear)
+		usr << "\blue [src.name] has a \icon[src.r_ear] [src.r_ear.name] on [t_his] right ear."
+
+	if (src.wear_mask)
+		if (src.wear_mask.blood_DNA)
+			usr << "\red [src.name] has a[src.wear_mask.blood_DNA ? " bloody " : " "] \icon[src.wear_mask] [src.wear_mask.name] on [t_his] face!"
+		else
+			usr << "\blue [src.name] has a \icon[src.wear_mask] [src.wear_mask.name] on [t_his] face."
+
+	if (src.l_hand)
+		if (src.l_hand.blood_DNA)
+			usr << "\red [src.name] has a[src.l_hand.blood_DNA ? " bloody " : " "] \icon[src.l_hand] [src.l_hand.name] in [t_his] left hand!"
+		else
+			usr << "\blue [src.name] has a \icon[src.l_hand] [src.l_hand.name] in [t_his] left hand."
+
+	if (src.r_hand)
+		if (src.r_hand.blood_DNA)
+			usr << "\red [src.name] has a[src.r_hand.blood_DNA ? " bloody " : " "] \icon[src.r_hand] [src.r_hand.name] in [t_his] right hand!"
+		else
+			usr << "\blue [src.name] has a \icon[src.r_hand] [src.r_hand.name] in [t_his] right hand."
+
+	if (src.belt)
+		if (src.belt.blood_DNA)
+			usr << "\red [src.name] has a[src.belt.blood_DNA ? " bloody " : " "] \icon[src.belt] [src.belt.name] on [t_his] belt!"
+		else
+			usr << "\blue [src.name] has a \icon[src.belt] [src.belt.name] on [t_his] belt."
+	if(src.s_store)
+		if(src.s_store.blood_DNA)
+			usr << "\red [src.name] has a[src.s_store.blood_DNA ? " bloody " : " "] \icon[src.s_store] [src.s_store.name] on [t_his][src.wear_suit.blood_DNA ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name]!"
+		else
+			usr << "\blue [src.name] has a \icon[src.s_store] [src.s_store.name] on [t_his][src.wear_suit.blood_DNA ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name]."
+	if (src.shoes)
+		usr << "[src.shoes.blood_DNA ? "\red" : "\blue"][src.name] has a[src.shoes.blood_DNA ? " bloody " : " "] \icon[src.shoes] [src.shoes.name] on [t_his] feet."
+
+
+	if (src.gloves)
+		if (src.gloves.blood_DNA)
+			usr << "\red [src.name] has bloody \icon[src.gloves] [src.gloves.name] on [t_his] hands!"
+		else
+			usr << "\blue [src.name] has \icon[src.gloves] [src.gloves.name] on [t_his] hands."
+	else if (src.blood_DNA)
+		usr << "\red [src.name] has[src.blood_DNA ? " bloody " : " "] hands!"
+
+	if (src.back)
+		usr << "\blue [src.name] has a \icon[src.back] [src.back.name] on [t_his] back."
+
+	if (src.wear_id)
+		var/id
+		var/photo = 0
+		if(istype(src:wear_id, /obj/item/device/pda))
+			var/obj/item/device/pda/pda = src:wear_id
+			id = pda.owner
+		else
+			id = src.wear_id.registered
+			if (src.wear_id.PHOTO)
+				photo = 1
+		if (id != src.real_name && in_range(src, usr) && prob(10))
+			if (photo)
+				usr << "\red [src.name] is wearing \icon[src.wear_id] [src.wear_id.name] with a photo yet doesn't seem to be that person!!!"
+			else
+				usr << "\red [src.name] is wearing \icon[src.wear_id] [src.wear_id.name] yet doesn't seem to be that person!!!"
+		else
+			if (photo)
+				usr << "\blue [src.name] is wearing \icon[src.wear_id] [src.wear_id.name] with a photo."
+			else
+				usr << "\blue [src.name] is wearing \icon[src.wear_id] [src.wear_id.name]."
+
+
+	if (src.is_jittery)
+		switch(src.jitteriness)
+			if(300 to INFINITY)
+				usr << "\red [src] is violently convulsing."
+			if(200 to 300)
+				usr << "\red [src] looks extremely jittery."
+			if(100 to 200)
+				usr << "\red [src] is twitching ever so slightly."
+
+	if (src.suiciding)
+		switch(src.suiciding)
+			if(1)
+				usr << "\red [src.name] appears to have bitten [t_his] tongue off!"
+
+	var/distance = get_dist(usr,src)
+	if(istype(usr, /mob/dead/observer) || usr.stat == 2) // ghosts can see anything
+		distance = 1
+
+	if (src.stat == 1 || stat == 2)
+		usr << "\red [name] doesn't seem to be responding to anything around [t_him], [t_his] eyes closed as though asleep."
+		if(health < 0 && distance <= 3)
+			usr << "\red [name] does not appear to be breathing."
+		if(ishuman(src) && usr.stat == 0 && src.stat == 1 && distance <= 1)
+			for(var/mob/O in viewers(usr.loc, null))
+				O.show_message("[usr] checks [src]'s pulse.", 1)
+			sleep(15)
+			usr << "\blue [name] has a pulse!"
+
+	if (src.stat == 2 || (changeling && changeling.changeling_fakedeath == 1))
+		if(distance <= 1)
+			if(ishuman(usr) && usr.stat == 0)
+				for(var/mob/O in viewers(usr.loc, null) )
+					O.show_message("[usr] checks [src]'s pulse.", 1)
+			sleep(15)
+			usr << "\red [name] has no pulse!"
+	else
+		if (src.getBruteLoss())
+			if (src.getBruteLoss() < 30)
+				usr << "\red [src.name] looks slightly injured!"
+			else
+				usr << "\red <B>[src.name] looks severely injured!</B>"
+
+		if (src.cloneloss)
+			if (src.cloneloss < 30)
+				usr << "\red [src.name] looks slightly... unfinished?"
+			else
+				usr << "\red <B>[src.name] looks very... unfinished?</B>"
+
+		if (src.getFireLoss())
+			if (src.getFireLoss() < 30)
+				usr << "\red [src.name] looks slightly burned!"
+			else
+				usr << "\red <B>[src.name] looks severely burned!</B>"
+
+		if (src.nutrition < 100)
+			usr << "\red [src.name] looks like flesh and bones."
+		else if (src.nutrition >= 500)
+			if (usr.nutrition < 100)
+				usr << "\red [src.name] looks very round and delicious. Like a little piggy. A tasty piggy."
+			else
+				usr << "\blue [src.name] looks quite chubby."
+
+		else if (src.brainloss >= 60)
+			usr << "\red [src.name] has a stupid expression on [t_his] face."
+		if (!src.client)
+			usr << "\red [src.name] doesn't seem as though they want to talk."
+
+	for(var/named in organs)
+		var/datum/organ/external/temp = organs[named]
+		if(temp.destroyed)
+			usr << "\red [src.name] is missing [t_his] [temp.display_name]."
+		if(temp.wounds)
+			for(var/datum/organ/external/wound/w in temp.wounds)
+				var/size = w.wound_size
+				var/sizetext
+				switch(size)
+					if(1)
+						sizetext = "cut"
+					if(2)
+						sizetext = "deep cut"
+					if(3)
+						sizetext = "flesh wound"
+					if(4)
+						sizetext = "gaping wound"
+					if(5)
+						sizetext = "big gaping wound"
+					if(6)
+						sizetext = "massive wound"
+				if(w.bleeding)
+					usr << "\red [src.name] is bleeding from a [sizetext] on [t_his] [temp.display_name]."
+					continue
+
+	print_flavor_text()
+
+	usr << "\blue *---------*"

code/WorkInProgress/Cael_Aislinn/Tajara/say.dm

@@ -0,0 +1,522 @@
+//their language needs to hook into radios as well
+
+/mob/living/carbon/human/tajaran/say_quote(var/text,var/is_speaking_taj)
+	//work out if the listener can understand or not
+
+	var/ending = copytext(text, length(text))
+	if (src.disease_symptoms & DISEASE_HOARSE)
+		return "rasps, \"[text]\"";
+	if (src.stuttering)
+		return "stammers, \"[text]\"";
+	if (src.slurring)
+		return "slurrs, \"[text]\"";
+	if (src.brainloss >= 60)
+		return "gibbers, \"[text]\"";
+
+	if(is_speaking_taj)
+		return "mewls, \"[text]\""//pick("yowls, \"[text]\"", "growls, \"[text]\"","mewls, \"[text]\"", "mrowls, \"[text]\"", "meows, \"[text]\"", "purrs, \"[text]\"");
+
+	if (ending == "?")
+		return "asks, \"[text]\"";
+	else if (ending == "!")
+		return "exclaims, \"[text]\"";
+
+	return "says, \"[text]\"";
+
+//convert message to an indecipherable series of sounds for anyone who isnt tajaran
+/mob/living/carbon/human/tajaran/proc/tajspeak(var/message)
+	return stars(message)
+	var/te = html_decode(message)
+	var/t = ""
+	var/n = length(message)
+	var/p = 1
+	while(p <= n)
+		if (copytext(te, p, p + 1) != " ")
+			t = text("[][]", t, pick(tajspeak_letters))
+		p++
+	return html_encode(t)
+	/*if (pr == null)
+		pr = 25
+	if (pr <= 0)
+		return null
+	else
+		if (pr >= 100)
+			return n
+	var/te = html_decode(n)
+	var/t = ""
+	n = length(n)
+	var/p = null
+	p = 1
+	while(p <= n)
+		if ((copytext(te, p, p + 1) == " " || prob(pr)))
+			t = text("[][]", t, copytext(te, p, p + 1))
+		else
+			t = text("[]*", t)
+		p++
+	return html_encode(t)*/
+
+/mob/living/carbon/human/tajaran/say(var/message)
+	var/message_old = message
+	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
+
+	if (!message)
+		return
+
+	log_say("[name]/[key] : [message]")
+
+	if (length(message) >= 1)
+		if (miming && copytext(message, 1, 2) != "*")
+			return
+
+	if (stat == 2)
+		return say_dead(message)
+
+	if (silent)
+		return
+
+	if (src.client && (client.muted || src.client.muted_complete))
+		src << "You are muted."
+		return
+
+	// wtf?
+	if (stat)
+		return
+
+	// Mute disability
+	if (sdisabilities & 2)
+		return
+
+	if (istype(wear_mask, /obj/item/clothing/mask/muzzle))
+		return
+
+	// emotes
+	if (copytext(message, 1, 2) == "*" && !stat)
+		return emote(copytext(message, 2))
+
+	var/alt_name = ""
+	if (istype(src, /mob/living/carbon/human) && name != real_name)
+		var/mob/living/carbon/human/H = src
+		alt_name = " (as [H.get_visible_name()])"
+	var/italics = 0
+	var/message_range = null
+	var/message_mode = null
+
+	if (brainloss >= 60 && prob(50))
+		if (ishuman(src))
+			message_mode = "headset"
+	// Special message handling
+	else if (copytext(message, 1, 2) == ";")
+		if (ishuman(src))
+			message_mode = "headset"
+		else if(istype(src, /mob/living/silicon/pai) || istype(src, /mob/living/silicon/robot))
+			message_mode = "pAI"
+		message = copytext(message, 2)
+
+	else if (length(message) >= 2)
+		var/channel_prefix = copytext(message, 1, 3)
+
+		var/list/keys = list(
+			  ":r" = "right ear",
+			  ":l" = "left ear",
+			  ":i" = "intercom",
+			  ":h" = "department",
+			  ":c" = "Command",
+			  ":n" = "Science",
+			  ":m" = "Medical",
+			  ":e" = "Engineering",
+			  ":s" = "Security",
+			  ":w" = "whisper",
+			  ":b" = "binary",
+			  ":a" = "alientalk",
+			  ":t" = "Syndicate",
+			  ":d" = "Mining",
+			  ":q" = "Cargo",
+			  ":g" = "changeling",
+
+			  //kinda localization -- rastaf0
+			  //same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding.
+			  ":ê" = "right hand",
+			  ":ä" = "left hand",
+			  ":ø" = "intercom",
+			  ":ð" = "department",
+			  ":ñ" = "Command",
+			  ":ò" = "Science",
+			  ":ü" = "Medical",
+			  ":ó" = "Engineering",
+			  ":û" = "Security",
+			  ":ö" = "whisper",
+			  ":è" = "binary",
+			  ":ô" = "alientalk",
+			  ":å" = "Syndicate",
+			  ":â" = "Mining",
+			  ":é" = "Cargo",
+			  ":ï" = "changeling",
+		)
+
+		message_mode = keys[channel_prefix]
+		//world << "channel_prefix=[channel_prefix]; message_mode=[message_mode]"
+		if (message_mode)
+			message = trim(copytext(message, 3))
+			if (!ishuman(src) && (message_mode=="department" || (message_mode in radiochannels)))
+				message_mode = null //only humans can use headsets
+
+	if (!message)
+		return
+
+	//work out if we're speaking tajaran or not
+	var/is_speaking_taj = 0
+	if(copytext(message, 1, 4) == ":j ")
+		message = copytext(message, 4)
+		if(taj_talk_understand)
+			is_speaking_taj = 1
+
+	if( !message_mode && (disease_symptoms & DISEASE_WHISPER))
+		message_mode = "whisper"
+
+	if(src.stunned > 0 && (!(traumatic_shock > 61) && prob(50)))
+		message_mode = "" //Stunned people shouldn't be able to physically turn on their radio/hold down the button to speak into it
+
+
+	message = capitalize(message) //capitalize the first letter of what they actually say
+
+	// :downs:
+	if (brainloss >= 60)
+		message = dd_replacetext(message, " am ", " ")
+		message = dd_replacetext(message, " is ", " ")
+		message = dd_replacetext(message, " are ", " ")
+		message = dd_replacetext(message, "you", "u")
+		message = dd_replacetext(message, "help", "halp")
+		message = dd_replacetext(message, "grief", "grife")
+		message = dd_replacetext(message, "space", "spess")
+		message = dd_replacetext(message, "carp", "crap")
+		message = dd_replacetext(message, "reason", "raisin")
+		if(prob(50))
+			message = uppertext(message)
+			message += "[stutter(pick("!", "!!", "!!!"))]"
+		if(!stuttering && prob(15))
+			message = stutter(message)
+
+	if (stuttering)
+		message = stutter(message)
+	if (slurring)
+		message = slur(message)
+
+/* //qw do not have beesease atm.
+	if(virus)
+		if(virus.name=="beesease" && virus.stage>=2)
+			if(prob(virus.stage*10))
+				var/bzz = length(message)
+				message = "B"
+				for(var/i=0,i<bzz,i++)
+					message += "Z"
+*/
+	var/list/obj/item/used_radios = new
+
+	switch (message_mode)
+		if ("headset")
+			if (src:l_ear && istype(src:l_ear,/obj/item/device/radio))
+				src:l_ear.talk_into(src, message, 0, "[is_speaking_taj ? "tajaran" : "universal"]")
+				used_radios += src:l_ear
+			else if (src:r_ear)
+				src:r_ear.talk_into(src, message, 0, "[is_speaking_taj ? "tajaran" : "universal"]")
+				used_radios += src:r_ear
+
+			message_range = 1
+			italics = 1
+
+
+		if ("secure headset")
+			if (src:l_ear && istype(src:l_ear,/obj/item/device/radio))
+				src:l_ear.talk_into(src, message, 1, "[is_speaking_taj ? "tajaran" : "universal"]")
+				used_radios += src:l_ear
+			else if (src:r_ear)
+				src:r_ear.talk_into(src, message, 1, "[is_speaking_taj ? "tajaran" : "universal"]")
+				used_radios += src:r_ear
+
+			message_range = 1
+			italics = 1
+
+		if ("right ear")
+			if (src:r_ear)
+				src:r_ear.talk_into(src, message, 0, "[is_speaking_taj ? "tajaran" : "universal"]")
+				used_radios += src:r_ear
+
+			message_range = 1
+			italics = 1
+
+		if ("left ear")
+			if (src:l_ear)
+				src:l_ear.talk_into(src, message, 0, "[is_speaking_taj ? "tajaran" : "universal"]")
+				used_radios += src:l_ear
+
+			message_range = 1
+			italics = 1
+
+		if ("intercom")
+			for (var/obj/item/device/radio/intercom/I in view(1, null))
+				I.talk_into(src, message, 0, "[is_speaking_taj ? "tajaran" : "universal"]")
+				used_radios += I
+
+			message_range = 1
+			italics = 1
+
+		//I see no reason to restrict such way of whispering
+		if ("whisper")
+			whisper(trim(copytext(message_old, 3)))
+			return
+
+		if ("binary")
+			if(robot_talk_understand || binarycheck())
+			//message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) //seems redundant
+				robot_talk(message)
+			return
+
+		if ("alientalk")
+			if(alien_talk_understand || hivecheck())
+			//message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) //seems redundant
+				alien_talk(message)
+			return
+
+		if ("department")
+			if (src:l_ear && istype(src:l_ear,/obj/item/device/radio))
+				src:l_ear.talk_into(src, message, message_mode)
+				used_radios += src:l_ear
+			else if (src:r_ear)
+				src:r_ear.talk_into(src, message, message_mode)
+				used_radios += src:r_ear
+			message_range = 1
+			italics = 1
+		if("changeling")
+			if(src.changeling)
+				for(var/mob/living/carbon/aChangeling in world)
+					if(aChangeling.changeling)
+						aChangeling << "<i><font color=#800080><b>[gender=="male"?"Mr.":"Mrs."] [changeling.changelingID]:</b> [message]</font></i>"
+				return
+////SPECIAL HEADSETS START
+		else
+			//world << "SPECIAL HEADSETS"
+			if (message_mode in radiochannels)
+				if (src:l_ear && istype(src:l_ear,/obj/item/device/radio))
+					src:l_ear.talk_into(src, message, message_mode)
+					used_radios += src:l_ear
+				else if (src:r_ear)
+					src:r_ear.talk_into(src, message, message_mode)
+					used_radios += src:r_ear
+				message_range = 1
+				italics = 1
+/////SPECIAL HEADSETS END
+
+	var/list/listening
+/*
+	if(istype(loc, /obj/item/device/aicard)) // -- TLE
+		var/obj/O = loc
+		if(istype(O.loc, /mob))
+			var/mob/M = O.loc
+			listening = hearers(message_range, M)
+		else
+			listening = hearers(message_range, O)
+	else
+		listening = hearers(message_range, src)
+
+	for (var/obj/O in view(message_range, src))
+		for (var/mob/M in O)
+			listening += M // maybe need to check if M can hear src
+		spawn (0)
+			if (O)
+				O.hear_talk(src, message)
+
+	if (!(src in listening))
+		listening += src
+
+*/
+	var/turf/T = get_turf(src)
+	listening = hearers(message_range, T)
+	var/list/V = view(message_range, T)
+	var/list/W = V
+	//find mobs in lockers, cryo, intellicards, brains, MMIs, and so on.
+	for (var/mob/M in world)
+		if (!M.client)
+			continue //skip monkeys and leavers
+		if (istype(M, /mob/new_player))
+			continue
+		if (M.stat <2) //is alive
+			if (isturf(M.loc))
+				continue //if M can hear us it was already found by hearers()
+			if (get_turf(M) in V) //this is slow, but I don't think we'd have a lot of wardrobewhores every round --rastaf0
+				listening+=M
+		else
+			if (M.client && M.client.ghost_ears)
+				listening|=M
+
+	for (var/obj/O in ((W | contents)-used_radios))
+		W |= O
+
+	for (var/mob/M in W)
+		W |= M.contents
+		if(ishuman(M))
+			var/mob/living/carbon/human/G = M
+			for(var/name in G.organs)
+				var/datum/organ/external/F = G.organs[name]
+				W |= F.implant
+
+	for (var/obj/item/device/pda/M in W)
+		W |= M.contents
+
+	for (var/obj/O in W) //radio in pocket could work, radio in backpack wouldn't --rastaf0
+		spawn (0)
+			if(O && !istype(O.loc, /obj/item/weapon/storage))
+				O.hear_talk(src, message)
+
+	if(isbrain(src))//For brains to properly talk if they are in an MMI..or in a brain. Could be extended to other mobs I guess.
+		for(var/obj/O in loc)//Kinda ugly but whatever.
+			if(O)
+				spawn(0)
+					O.hear_talk(src, message)
+
+	var/list/heard_a = list() // understood us
+	var/list/heard_b = list() // didn't understand us
+
+	for (var/mob/M in listening)
+		//if speaking in tajaran, only let other tajs hear
+		if ( (M.say_understands(src) && !is_speaking_taj) || istype(M,/mob/living/carbon/human/tajaran) )
+			heard_a += M
+		else
+			heard_b += M
+
+	var/speech_bubble_test = say_test(message)
+	var/image/speech_bubble = image('talk.dmi',src,"h[speech_bubble_test]")
+
+	var/rendered = null
+	if (length(heard_a))
+		var/message_a = say_quote(message,0)
+		if (italics)
+			message_a = "<i>[message_a]</i>"
+		if (!istype(src, /mob/living/carbon/human))
+			rendered = "<span class='game say'><span class='name'>[name]</span> <span class='message'>[message_a]</span></span>"
+		else if(istype(wear_mask, /obj/item/clothing/mask/gas/voice))
+			if(wear_mask:vchange)
+				rendered = "<span class='game say'><span class='name'>[wear_mask:voice]</span> <span class='message'>[message_a]</span></span>"
+			else
+				rendered = "<span class='game say'><span class='name'>[name]</span> <span class='message'>[message_a]</span></span>"
+		else
+			rendered = "<span class='game say'><span class='name'>[real_name]</span>[alt_name] <span class='message'>[message_a]</span></span>"
+
+
+/*
+		// Create speech bubble
+		var/obj/effect/speech_bubble/B = new/obj/effect/speech_bubble
+		B.icon = 'speechbubble.dmi'
+		B.parent = src
+		B.mouse_opacity = 0
+		B.invisibility = invisibility
+		B.layer = 10
+
+		// Determine if the speech bubble's going to have a special look
+		var/presay = ""
+		if(istype(src, /mob/living/silicon))
+			presay = "bot"
+		if(istype(src, /mob/living/carbon/alien))
+			presay = "xeno"
+		if(istype(src, /mob/living/carbon/metroid))
+			presay = "metroid"
+*/
+		for (var/mob/M in heard_a)
+
+			M.show_message(rendered, 2)
+			M << speech_bubble
+		spawn(30) del(speech_bubble)
+		//spawn(30) del(speech_bubble)
+			/*
+			if(M.client)
+
+				// If this client has bubbles disabled, obscure the bubble
+				if(!M.client.bubbles || M == src)
+					var/image/I = image('speechbubble.dmi', B, "override")
+					I.override = 1
+					M << I
+			*/
+
+		/*
+		// find the suffix, if bot, human or monkey
+		var/punctuation = ""
+		if(presay == "bot" || presay == "")
+			var/ending = copytext(text, length(text))
+			if (ending == "?")
+				punctuation = "question"
+			else if (ending == "!")
+				punctuation = "exclamation"
+			else
+				punctuation = ""
+
+		// flick the bubble
+		flick("[presay]say[punctuation]", B)
+
+		if(istype(loc, /turf))
+			B.loc = loc
+		else
+			B.loc = loc.loc
+
+		spawn()
+			sleep(11)
+			del(B)
+		*/
+
+	if (length(heard_b))
+		var/message_b
+
+		if (voice_message)
+			message_b = voice_message
+		else
+			message_b = tajspeak(message)
+			message_b = say_quote(message_b,1)
+
+		if (italics)
+			message_b = "<i>[message_b]</i>"
+
+		rendered = "<span class='game say'><span class='name'>[voice_name]</span> <span class='message'>[message_b]</span></span>"
+
+
+		/*
+		// Create speech bubble
+		var/obj/effect/speech_bubble/B = new/obj/effect/speech_bubble
+		B.icon = 'speechbubble.dmi'
+		B.parent = src
+		B.mouse_opacity = 0
+		B.invisibility = invisibility
+		B.layer = 10
+
+		// Determine if the speech bubble's going to have a special look
+		var/presay = ""
+		if(istype(src, /mob/living/silicon))
+			presay = "bot"
+		if(istype(src, /mob/living/carbon/alien))
+			presay = "xeno"
+		if(istype(src, /mob/living/carbon/metroid))
+			presay = "metroid"
+		*/
+
+		for (var/mob/M in heard_b)
+			M.show_message(rendered, 2)
+			M << speech_bubble
+		spawn(30) del(speech_bubble)
+
+			/*
+			if(M.client)
+
+				if(!M.client.bubbles || M == src)
+					var/image/I = image('speechbubble.dmi', B, "override")
+					I.override = 1
+					M << I
+
+
+		flick("[presay]say", B)
+
+		if(istype(loc, /turf))
+			B.loc = loc
+		else
+			B.loc = loc.loc
+
+		spawn()
+			sleep(11)
+			del(B)
+		*/

code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm

@@ -0,0 +1,204 @@
+/mob/living/carbon/human/tajaran
+	name = "tajaran"
+	real_name = "tajaran"
+	voice_name = "tajaran"
+	icon = 'tajaran.dmi'
+	var/list/tajspeak_letters
+	//
+	universal_speak = 1
+	taj_talk_understand = 1
+	voice_message = "mrowls"
+
+/mob/living/carbon/human/tajaran/New()
+	tajspeak_letters = new/list("~","*","-")
+	var/datum/reagents/R = new/datum/reagents(1000)
+	reagents = R
+	R.my_atom = src
+
+	if(!dna)	dna = new /datum/dna(null)
+
+	new /datum/organ/external/chest(src)
+	new /datum/organ/external/groin(src)
+	new /datum/organ/external/head(src)
+	new /datum/organ/external/l_arm(src)
+	new /datum/organ/external/r_arm(src)
+	new /datum/organ/external/r_leg(src)
+	new /datum/organ/external/l_leg(src)
+
+	var/datum/organ/external/part = new /datum/organ/external/l_hand(src)
+	part.parent = organs["l_arm"]
+	part = new /datum/organ/external/l_foot(src)
+	part.parent = organs["l_leg"]
+	part = new /datum/organ/external/r_hand(src)
+	part.parent = organs["r_arm"]
+	part = new /datum/organ/external/r_foot(src)
+	part.parent = organs["r_leg"]
+
+	debug_leftarm = organs["l_arm"]
+	debug_lefthand = organs["l_hand"]
+
+	var/g = "m"
+	if (gender == MALE)
+		g = "m"
+	else if (gender == FEMALE)
+		g = "f"
+	else
+		gender = MALE
+		g = "m"
+
+	spawn (1)
+		if(!stand_icon)
+			stand_icon = new /icon('tajaran.dmi', "body_[g]_s")
+		if(!lying_icon)
+			lying_icon = new /icon('tajaran.dmi', "body_[g]_l")
+		icon = stand_icon
+		update_clothing()
+		src << "\blue Your icons have been generated!"
+
+	..()
+
+/mob/living/carbon/human/tajaran/update_body()
+	if(stand_icon)
+		del(stand_icon)
+	if(lying_icon)
+		del(lying_icon)
+
+	if (mutantrace)
+		return
+
+	var/g = "m"
+	if (gender == MALE)
+		g = "m"
+	else if (gender == FEMALE)
+		g = "f"
+
+	stand_icon = new /icon('tajaran.dmi', "torso_s")
+	lying_icon = new /icon('tajaran.dmi', "torso_l")
+
+	var/husk = (mutations & HUSK)
+	//var/obese = (mutations & FAT)
+
+	stand_icon.Blend(new /icon('tajaran.dmi', "chest_[g]_s"), ICON_OVERLAY)
+	lying_icon.Blend(new /icon('tajaran.dmi', "chest_[g]_l"), ICON_OVERLAY)
+
+	var/datum/organ/external/head = organs["head"]
+	if(!head.destroyed)
+		stand_icon.Blend(new /icon('tajaran.dmi', "head_[g]_s"), ICON_OVERLAY)
+		lying_icon.Blend(new /icon('tajaran.dmi', "head_[g]_l"), ICON_OVERLAY)
+
+	for(var/name in organs)
+		var/datum/organ/external/part = organs[name]
+		if(!istype(part, /datum/organ/external/groin) \
+			&& !istype(part, /datum/organ/external/chest) \
+			&& !istype(part, /datum/organ/external/head) \
+			&& !part.destroyed)
+			stand_icon.Blend(new /icon('tajaran.dmi', "[part.icon_name]_s"), ICON_OVERLAY)
+			lying_icon.Blend(new /icon('tajaran.dmi', "[part.icon_name]_l"), ICON_OVERLAY)
+
+	stand_icon.Blend(new /icon('tajaran.dmi', "groin_[g]_s"), ICON_OVERLAY)
+	lying_icon.Blend(new /icon('tajaran.dmi', "groin_[g]_l"), ICON_OVERLAY)
+
+	if (husk)
+		var/icon/husk_s = new /icon('tajaran.dmi', "husk_s")
+		var/icon/husk_l = new /icon('tajaran.dmi', "husk_l")
+
+		for(var/name in organs)
+			var/datum/organ/external/part = organs[name]
+			if(!istype(part, /datum/organ/external/groin) \
+				&& !istype(part, /datum/organ/external/chest) \
+				&& !istype(part, /datum/organ/external/head) \
+				&& part.destroyed)
+				husk_s.Blend(new /icon('dam_mask.dmi', "[part.icon_name]"), ICON_SUBTRACT)
+				husk_l.Blend(new /icon('dam_mask.dmi', "[part.icon_name]2"), ICON_SUBTRACT)
+
+		stand_icon.Blend(husk_s, ICON_OVERLAY)
+		lying_icon.Blend(husk_l, ICON_OVERLAY)
+	/*else if(obese)
+		stand_icon.Blend(new /icon('human.dmi', "fatbody_s"), ICON_OVERLAY)
+		lying_icon.Blend(new /icon('human.dmi', "fatbody_l"), ICON_OVERLAY)*/
+
+	// Skin tone
+	if (s_tone >= 0)
+		stand_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
+		lying_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
+	else
+		stand_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
+		lying_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
+
+	if (underwear > 0)
+		//if(!obese)
+		stand_icon.Blend(new /icon('tajaran.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
+		lying_icon.Blend(new /icon('tajaran.dmi', "underwear[underwear]_[g]_l"), ICON_OVERLAY)
+
+/mob/living/carbon/human/tajaran/update_face()
+	if(organs)
+		var/datum/organ/external/head = organs["head"]
+		if(head)
+			if(head.destroyed)
+				del(face_standing)
+				del(face_lying)
+				return
+
+	if(!facial_hair_style || !hair_style)	return//Seems people like to lose their icons, this should stop the runtimes for now
+	del(face_standing)
+	del(face_lying)
+
+	if (mutantrace)
+		return
+
+	var/g = "m"
+	if (gender == MALE)
+		g = "m"
+	else if (gender == FEMALE)
+		g = "f"
+
+	var/icon/eyes_s = new/icon("icon" = 'tajaran_face.dmi', "icon_state" = "eyes_s")
+	var/icon/eyes_l = new/icon("icon" = 'tajaran_face.dmi', "icon_state" = "eyes_l")
+	eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
+	eyes_l.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
+
+	var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
+	var/icon/hair_l = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_l")
+	hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)
+	hair_l.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)
+
+	var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
+	var/icon/facial_l = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_l")
+	facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
+	facial_l.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
+
+	var/icon/mouth_s = new/icon("icon" = 'tajaran_face.dmi', "icon_state" = "mouth_[g]_s")
+	var/icon/mouth_l = new/icon("icon" = 'tajaran_face.dmi', "icon_state" = "mouth_[g]_l")
+
+	// if the head or mask has the flag BLOCKHAIR (equal to 5), then do not apply hair
+	if((!(head && (head.flags & BLOCKHAIR))) && !(wear_mask && (wear_mask.flags & BLOCKHAIR)))
+		eyes_s.Blend(hair_s, ICON_OVERLAY)
+		eyes_l.Blend(hair_l, ICON_OVERLAY)
+
+	eyes_s.Blend(mouth_s, ICON_OVERLAY)
+	eyes_l.Blend(mouth_l, ICON_OVERLAY)
+
+	// if BLOCKHAIR, do not apply facial hair
+	if((!(head && (head.flags & BLOCKHAIR))) && !(wear_mask && (wear_mask.flags & BLOCKHAIR)))
+		eyes_s.Blend(facial_s, ICON_OVERLAY)
+		eyes_l.Blend(facial_l, ICON_OVERLAY)
+
+
+	face_standing = new /image()
+	face_lying = new /image()
+	face_standing.icon = eyes_s
+	face_standing.layer = MOB_LAYER
+	face_lying.icon = eyes_l
+	face_lying.layer = MOB_LAYER
+
+	del(mouth_l)
+	del(mouth_s)
+	del(facial_l)
+	del(facial_s)
+	del(hair_l)
+	del(hair_s)
+	del(eyes_l)
+	del(eyes_s)
+
+/mob/living/carbon/human/tajaran/co2overloadtime = null
+/mob/living/carbon/human/tajaran/temperature_resistance = T0C+70

code/WorkInProgress/Cael_Aislinn/Tajara/whisper.dm

@@ -0,0 +1,171 @@
+/mob/living/carbon/human/tajaran/whisper(message as text)
+	//Figured it out.  If you use say :w (message) it HTML encodes it, THEN passes it to the whisper code, which does so again.  Jeez.  --SkyMarshal
+	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
+
+	if (!message)
+		return
+
+	log_whisper("[src.name]/[src.key] : [message]")
+
+	if (src.client && (src.client.muted || src.client.muted_complete))
+		src << "You are muted."
+		return
+
+	if (src.stat == 2)
+		return src.say_dead(message)
+
+	if (src.stat)
+		return
+
+	var/alt_name = ""
+	if (istype(src, /mob/living/carbon/human) && src.name != src.real_name)
+		var/mob/living/carbon/human/H = src
+		alt_name = " (as [H.get_visible_name()])"
+	// Mute disability
+	if (src.sdisabilities & 2)
+		return
+
+	if (istype(src.wear_mask, /obj/item/clothing/mask/muzzle))
+		return
+
+	var/italics = 1
+	var/message_range = 1
+
+	//work out if we're speaking tajaran or not
+	var/is_speaking_taj = 0
+	if(copytext(message, 1, 4) == ":j ")
+		message = copytext(message, 4)
+		if(taj_talk_understand)
+			is_speaking_taj = 1
+
+	if(istype(src.wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja)&&src.wear_mask:voice=="Unknown")
+		if(copytext(message, 1, 2) != "*")
+			var/list/temp_message = dd_text2list(message, " ")
+			var/list/pick_list = list()
+			for(var/i = 1, i <= temp_message.len, i++)
+				pick_list += i
+			for(var/i=1, i <= abs(temp_message.len/3), i++)
+				var/H = pick(pick_list)
+				if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue
+				temp_message[H] = ninjaspeak(temp_message[H])
+				pick_list -= H
+			message = dd_list2text(temp_message, " ")
+			message = dd_replaceText(message, "o", "¤")
+			message = dd_replaceText(message, "p", "þ")
+			message = dd_replaceText(message, "l", "£")
+			message = dd_replaceText(message, "s", "§")
+			message = dd_replaceText(message, "u", "µ")
+			message = dd_replaceText(message, "b", "ß")
+
+	message = capitalize(message)
+
+	if (src.stuttering)
+		message = stutter(message)
+	if (src.slurring)
+		message = slur(message)
+
+	for (var/obj/O in view(message_range, src))
+		spawn (0)
+			if (O)
+				O.hear_talk(src, message)
+
+	var/list/listening = hearers(message_range, src)
+	listening -= src
+	listening += src
+	var/list/eavesdropping = hearers(2, src)
+	eavesdropping -= src
+	eavesdropping -= listening
+	var/list/watching  = hearers(5, src)
+	watching  -= src
+	watching  -= listening
+	watching  -= eavesdropping
+
+	var/list/heard_a = list() // understood us
+	var/list/heard_b = list() // didn't understand us
+
+	for (var/mob/M in listening)
+		if (M.say_understands(src))
+			heard_a += M
+		else
+			heard_b += M
+
+	var/rendered = null
+
+	for (var/mob/M in watching)
+		if ( (M.say_understands(src) && !is_speaking_taj) || istype(M,/mob/living/carbon/human/tajaran) )
+			rendered = "<span class='game say'><span class='name'>[src.name]</span> whispers something.</span>"
+		else
+			rendered = "<span class='game say'><span class='name'>[src.voice_name]</span> whispers something.</span>"
+		M.show_message(rendered, 2)
+
+	if (length(heard_a))
+		var/message_a = message
+
+		if (italics)
+			message_a = "<i>[message_a]</i>"
+		//This appears copied from carbon/living say.dm so the istype check for mob is probably not needed. Appending for src is also not needed as the game will check that automatically.
+		if (!istype(src, /mob/living/carbon/human))
+			rendered = "<span class='game say'><span class='name'>[name]</span> whispers, <span class='message'>\"[message_a]\"</span></span>"
+		else if (istype(wear_mask, /obj/item/clothing/mask/gas/voice))
+			if (wear_mask:vchange)
+				rendered = "<span class='game say'><span class='name'>[wear_mask:voice]</span> whispers, <span class='message'>\"[message_a]\"</span></span>"
+			else
+				rendered = "<span class='game say'><span class='name'>[name]</span> whispers, <span class='message'>\"[message_a]\"</span></span>"
+		else
+			rendered = "<span class='game say'><span class='name'>[real_name]</span>[alt_name] whispers, <span class='message'>\"[message_a]\"</span></span>"
+
+		for (var/mob/M in heard_a)
+			M.show_message(rendered, 2)
+
+	if (length(heard_b))
+		var/message_b
+
+		if (src.voice_message)
+			message_b = src.voice_message
+		else
+			message_b = stars(message)
+
+		if (italics)
+			message_b = "<i>[message_b]</i>"
+
+		rendered = "<span class='game say'><span class='name'>[src.voice_name]</span> whispers, <span class='message'>\"[message_b]\"</span></span>"
+
+		for (var/mob/M in heard_b)
+			M.show_message(rendered, 2)
+
+	for (var/mob/M in eavesdropping)
+		if (M.say_understands(src))
+			var/message_c
+			message_c = stars(message)
+			if (!istype(src, /mob/living/carbon/human))
+				rendered = "<span class='game say'><span class='name'>[name]</span> whispers, <span class='message'>\"[message_c]\"</span></span>"
+			else if(istype(wear_mask, /obj/item/clothing/mask/gas/voice))
+				if(wear_mask:vchange)
+					rendered = "<span class='game say'><span class='name'>[wear_mask:voice]</span> whispers, <span class='message'>\"[message_c]\"</span></span>"
+				else
+					rendered = "<span class='game say'><span class='name'>[name]</span> whispers, <span class='message'>\"[message_c]\"</span></span>"
+			else
+				rendered = "<span class='game say'><span class='name'>[real_name]</span>[alt_name] whispers, <span class='message'>\"[message_c]\"</span></span>"
+			M.show_message(rendered, 2)
+		else
+			rendered = "<span class='game say'><span class='name'>[src.voice_name]</span> whispers something.</span>"
+			M.show_message(rendered, 2)
+
+	if (italics)
+		message = "<i>[message]</i>"
+
+	if (!istype(src, /mob/living/carbon/human))
+		rendered = "<span class='game say'><span class='name'>[name]</span> whispers, <span class='message'>\"[message]\"</span></span>"
+	else if (istype(src.wear_mask, /obj/item/clothing/mask/gas/voice))
+		if(wear_mask:vchange)
+			rendered = "<span class='game say'><span class='name'>[wear_mask:voice]</span> whispers, <span class='message'>\"[message]\"</span></span>"
+		else
+			rendered = "<span class='game say'><span class='name'>[name]</span> whispers, <span class='message'>\"[message]\"</span></span>"
+	else
+		rendered = "<span class='game say'><span class='name'>[real_name]</span>[alt_name] whispers, <span class='message'>\"[message]\"</span></span>"
+
+	for (var/mob/M in world)
+		if (istype(M, /mob/new_player))
+			continue
+		if (M.stat > 1 && !(M in heard_a))
+			M.show_message(rendered, 2)

code/WorkInProgress/detective_work.dm

@@ -358,7 +358,7 @@ obj/machinery/computer/forensic_scanning
 					scan_process = 0
 					scan_name = scanning.name
 					scan_data = "<u>[scanning]</u><br><br>"
-					if (scanning.blood_DNA)
+					if (scanning.blood_DNA.len)
 						scan_data += "Blood Found:<br>"
 						for(var/i = 1, i < (scanning.blood_DNA.len + 1), i++)
 							var/list/templist = scanning.blood_DNA[i]

code/WorkInProgress/organs/organs.dm

@@ -265,6 +265,7 @@ the mob is also allowed to move without any sort of restriction. For instance, i
 	var/brainloss = 0//Carbon
 	var/robot_talk_understand = 0
 	var/alien_talk_understand = 0
+	var/taj_talk_understand = 0
 	var/universal_speak = 0 // Set to 1 to enable the mob to speak to everyone -- TLE
 	var/ear_deaf = null//Carbon
 	var/eye_blind = null//Carbon

code/defines/atom.dm

@@ -5,7 +5,7 @@
 	var/list/fingerprints = list()
 	var/list/fingerprintshidden = new/list()
 	var/fingerprintslast = null
-	var/list/blood_DNA = null
+	var/list/blood_DNA = list()
 	var/last_bumped = 0
 	var/pass_flags = 0
 

code/defines/mob/living/silicon/ai.dm

@@ -4,7 +4,7 @@
 	icon_state = "ai"
 	anchored = 1 // -- TLE
 	density = 1
-	var/network = "SS13"
+	var/list/networks
 	var/obj/machinery/camera/current = null
 	var/list/connected_robots = list()
 	var/aiRestorePowerRoutine = 0

code/defines/mob/mob.dm

@@ -231,6 +231,7 @@
 
 	var/robot_talk_understand = 0
 	var/alien_talk_understand = 0
+	var/taj_talk_understand = 0
 
 /*For ninjas and others. This variable is checked when a mob moves and I guess it was supposed to allow the mob to move
 through dense areas, such as walls. Setting density to 0 does the same thing. The difference here is that

code/defines/obj/computer.dm

@@ -207,19 +207,57 @@
 	name = "Security Cameras"
 	desc = "Used to access the various cameras on the station."
 	icon_state = "cameras"
-	circuit = "/obj/item/weapon/circuitboard/security"
+	circuit = "/obj/item/weapon/circuitboard/securitycam"
+	var/department = "Security"
+	var/network = ""
 	var/obj/machinery/camera/current = null
 	var/last_pic = 1.0
-	var/network = "SS13"
+	var/list/networks
 	var/maplevel = 1
 
+/obj/machinery/computer/security/mining
+	name = "Outpost Cameras"
+	desc = "Used to access the various cameras on the outpost."
+	icon_state = "miningcameras"
+	department = "Mining"
+	circuit = "/obj/item/weapon/circuitboard/miningcam"
+
+/obj/machinery/computer/security/cargo
+	name = "Cargo Cameras"
+	desc = "Used to access the cargo department cameras."
+	icon_state = "miningcameras"
+	department = "Cargo"
+	circuit = "/obj/item/weapon/circuitboard/cargocam"
+
+/obj/machinery/computer/security/engineering
+	name = "Engineering Cameras"
+	desc = "Used to access the various cameras in engineering."
+	icon_state = "engineeringcameras"
+	department = "Engineering"
+	circuit = "/obj/item/weapon/circuitboard/engineeringcam"
+
+/obj/machinery/computer/security/research
+	name = "Research Cameras"
+	desc = "Used to access the various cameras in the research division."
+	icon_state = "researchcameras"
+	department = "Research"
+	circuit = "/obj/item/weapon/circuitboard/researchcam"
+
+/obj/machinery/computer/security/medbay
+	name = "Medbay Cameras"
+	desc = "Used to access the various cameras in the research division."
+	icon_state = "medbaycameras"
+	department = "Medbay"
+	circuit = "/obj/item/weapon/circuitboard/medbaycam"
+
 
 /obj/machinery/computer/security/telescreen
 	name = "Telescreen"
 	desc = "Used for watching an empty arena."
 	icon = 'stationobjs.dmi'
 	icon_state = "telescreen"
-	network = "thunder"
+	department = ""
+	network = "Thunderdome"
 	density = 0
 	circuit = null
 
@@ -229,21 +267,6 @@
 	desc = "An old TV hooked into the stations camera network."
 	icon_state = "security_det"
 
-
-/obj/machinery/computer/security/mining
-	name = "Outpost Cameras"
-	desc = "Used to access the various cameras on the outpost."
-	icon_state = "miningcameras"
-	network = "MINE"
-	circuit = "/obj/item/weapon/circuitboard/mining"
-
-/obj/machinery/computer/security/engineering
-	name = "Engineering Cameras"
-	desc = "Used to access the various cameras in engineering."
-	icon_state = "engineeringcameras"
-	network = "ENGINEERING"
-	circuit = "/obj/item/weapon/circuitboard/engineeringcam"
-
 /obj/machinery/computer/lockdown
 	/*
 	name = "Lockdown Control"

code/game/atom_procs.dm

@@ -139,7 +139,7 @@
 		return 0
 	if (!( src.flags ) & 256)
 		return
-	if (src.blood_DNA)
+	if (src.blood_DNA.len)
 		if (istype(src, /obj/item)&&!istype(src, /obj/item/weapon/melee/energy))//Only regular items. Energy melee weapon are not affected.
 			var/obj/item/source2 = src
 			source2.icon_old = src.icon
@@ -148,13 +148,15 @@
 			I.Blend(new /icon('blood.dmi', "itemblood"),ICON_MULTIPLY)
 			I.Blend(new /icon(src.icon, src.icon_state),ICON_UNDERLAY)
 			src.icon = I
-			if(src.blood_DNA.len)
+			var/inthere = 0
+			for(var/i = 1, i <= src.blood_DNA.len, i++)
+				var/list/templist = src.blood_DNA[i]
+				if(templist[1] == M.dna.unique_enzymes && templist[2] == M.dna.b_type)
+					inthere = 1
+					break
+			if(!inthere)
 				src.blood_DNA.len++
 				src.blood_DNA[src.blood_DNA.len] = list(M.dna.unique_enzymes,M.dna.b_type)
-			else
-				var/list/blood_DNA_temp[1]
-				blood_DNA_temp[1] = list(M.dna.unique_enzymes, M.dna.b_type)
-				src.blood_DNA =  blood_DNA_temp
 		else if (istype(src, /turf/simulated))
 			var/turf/simulated/source2 = src
 			var/list/objsonturf = range(0,src)
@@ -172,13 +174,15 @@
 				this.viruses += newDisease
 				newDisease.holder = this
 		else if (istype(src, /mob/living/carbon/human))
-			if(src.blood_DNA.len)
+			var/inthere = 0
+			for(var/i = 1, i <= src.blood_DNA.len, i++)
+				var/list/templist = src.blood_DNA[i]
+				if(templist[1] == M.dna.unique_enzymes && templist[2] == M.dna.b_type)
+					inthere = 1
+					break
+			if(!inthere)
 				src.blood_DNA.len++
 				src.blood_DNA[src.blood_DNA.len] = list(M.dna.unique_enzymes,M.dna.b_type)
-			else
-				var/list/blood_DNA_temp[1]
-				blood_DNA_temp[1] = list(M.dna.unique_enzymes, M.dna.b_type)
-				src.blood_DNA =  blood_DNA_temp
 		else
 			return
 	else
@@ -235,21 +239,21 @@
 
 	if (!( src.flags ) & 256)
 		return
-	if ( src.blood_DNA )
+	if ( src.blood_DNA.len )
 		if (istype (src, /mob/living/carbon))
 			var/obj/item/source2 = src
-			source2.blood_DNA = null
+			source2.blood_DNA = list()
 			//var/icon/I = new /icon(source2.icon_old, source2.icon_state) //doesnt have icon_old
 			//source2.icon = I
 		if (istype (src, /obj/item))
 			var/obj/item/source2 = src
-			source2.blood_DNA = null
+			source2.blood_DNA = list()
 //			var/icon/I = new /icon(source2.icon_old, source2.icon_state)
 			source2.icon = source2.icon_old
 			source2.update_icon()
 		if (istype(src, /turf/simulated))
 			var/obj/item/source2 = src
-			source2.blood_DNA = null
+			source2.blood_DNA = list()
 			var/icon/I = new /icon(source2.icon_old, source2.icon_state)
 			source2.icon = I
 	if(src.fingerprints && src.fingerprints.len)

code/game/gamemodes/meteor/meteors.dm

@@ -3,8 +3,8 @@
 /var/const/meteor_wave_delay = 625 //minimum wait between waves in tenths of seconds
 //set to at least 100 unless you want evarr ruining every round
 
-/var/const/meteors_in_wave = 20
-/var/const/meteors_in_small_wave = 10
+/var/const/meteors_in_wave = 10 //THIS should be better, Spess.
+/var/const/meteors_in_small_wave = 4
 
 /proc/meteor_wave(var/number = meteors_in_wave)
 	if(!ticker || wavesecret)
@@ -96,9 +96,10 @@
 	pass_flags = PASSTABLE | PASSGRILLE
 
 /obj/effect/meteor/Move()
-	var/turf/T = src.loc
-	if (istype(T, /turf))
-		T.hotspot_expose(METEOR_TEMPERATURE, 1000)
+//	var/turf/T = src.loc
+	//FUCK YOU. FUCK YOU ALL, METEORS. ~Hawk.
+	/*if (istype(T, /turf))
+		T.hotspot_expose(METEOR_TEMPERATURE, 1000) */
 	..()
 	return
 

code/game/machinery/bots/ed209bot.dm

@@ -78,7 +78,7 @@
 		src.botcard.access = get_access("Detective")
 		src.cam = new /obj/machinery/camera(src)
 		src.cam.c_tag = src.name
-		src.cam.network = "SS13"
+		src.cam.network = "Security"
 		if(radio_controller)
 			radio_controller.add_object(src, control_freq, filter = RADIO_SECBOT)
 			radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)

code/game/machinery/bots/mulebot.dm

@@ -805,8 +805,7 @@
 	H.apply_damage(0.5*damage, BRUTE, "r_arm")
 
 	var/obj/effect/decal/cleanable/blood/B = new(src.loc)
-	B.blood_DNA.len++
-	B.blood_DNA[B.blood_DNA.len] = list(H.dna.unique_enzymes, H.dna.b_type)
+	B.blood_DNA = list(list(H.dna.unique_enzymes, H.dna.b_type))
 
 	bloodiness += 4
 

code/game/machinery/bots/secbot.dm

@@ -80,7 +80,7 @@
 			src.botcard.access = get_access("Detective")
 			src.cam = new /obj/machinery/camera(src)
 			src.cam.c_tag = src.name
-			src.cam.network = "SS13"
+			src.cam.network = "Security"
 			if(radio_controller)
 				radio_controller.add_object(src, control_freq, filter = RADIO_SECBOT)
 				radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)

code/game/machinery/camera.dm

@@ -14,7 +14,7 @@
 	var/best_dist = INFINITY //infinity
 	var/best_cam = null
 	for(var/obj/machinery/camera/C in A)
-		if(usr:network != C.network)	continue
+		if( !(C.network in usr:networks))	continue
 		if(!C.status)	continue	//	ignore disabled cameras
 		var/dist = get_dist(src, C)
 		if(dist < best_dist)
@@ -135,7 +135,7 @@
 					//check other cameras
 					var/obj/machinery/camera/closest = C
 					for(var/obj/machinery/camera/C2 in world)
-						if (C2.network == src.network)
+						if (C2.network in src.networks)
 							if (C2.z == target.z)
 								zmatched = 1
 								if (C2.status)
@@ -158,6 +158,30 @@
 
 			sleep(10)
 
+/proc/camera_network_sort(list/L)
+	var/obj/machinery/camera/a
+	var/obj/machinery/camera/b
+
+	//loop through once to get in network order
+	for (var/i = L.len, i > 0, i--)
+		for (var/j = 1 to i - 1)
+			a = L[j]
+			b = L[j + 1]
+			if (sorttext(a.network, b.network) < 0)
+				L.Swap(j, j + 1)
+
+	//loop through a second time to get alphabetical order within the network order
+	for (var/i = L.len, i > 0, i--)
+		for (var/j = 1 to i - 1)
+			a = L[j]
+			b = L[j + 1]
+			if ( sorttext(a.network, b.network) )
+				continue
+			if ( sorttext(a.c_tag, b.c_tag) < 0 )
+				L.Swap(j, j + 1)
+
+	return L
+
 /proc/camera_sort(list/L)
 	var/obj/machinery/camera/a
 	var/obj/machinery/camera/b
@@ -174,46 +198,6 @@
 					L.Swap(j, j + 1)
 	return L
 
-/obj/machinery/computer/security/attack_hand(var/mob/user as mob)
-	if (stat & (NOPOWER|BROKEN))
-		return
-
-	user.machine = src
-
-	var/list/L = list()
-	for (var/obj/machinery/camera/C in world)
-		L.Add(C)
-
-	camera_sort(L)
-
-	var/list/D = list()
-	D["Cancel"] = "Cancel"
-	for (var/obj/machinery/camera/C in L)
-		if (C.network == network)
-			D[text("[][]", C.c_tag, (C.status ? null : " (Deactivated)"))] = C
-
-	var/t = input(user, "Which camera should you change to?") as null|anything in D
-
-	if(!t)
-		user.machine = null
-		return 0
-
-	var/obj/machinery/camera/C = D[t]
-
-	if (t == "Cancel")
-		user.machine = null
-		return 0
-
-	if (C)
-		if ((get_dist(user, src) > 1 || user.machine != src || user.blinded || !( user.canmove ) || !( C.status )) && (!istype(user, /mob/living/silicon/ai)))
-			return 0
-		else
-			src.current = C
-			use_power(50)
-
-			spawn( 5 )
-				attack_hand(user)
-
 /mob/living/silicon/ai/attack_ai(var/mob/user as mob)
 	if (user != src)
 		return
@@ -232,7 +216,7 @@
 	var/list/D = list()
 	D["Cancel"] = "Cancel"
 	for (var/obj/machinery/camera/C in L)
-		if (C.network == src.network)
+		if ( C.network in src.networks )
 			D[text("[][]", C.c_tag, (C.status ? null : " (Deactivated)"))] = C
 
 	var/t = input(user, "Which camera should you change to?") as null|anything in D
@@ -281,7 +265,7 @@
 /obj/machinery/camera/attack_ai(var/mob/living/silicon/ai/user as mob)
 	if (!istype(user))
 		return
-	if (src.network != user.network || !(src.status))
+	if ( !(src.network in user.networks) || !(src.status))
 		return
 	user.current = src
 	user.reset_view(src)

code/game/machinery/camera_circuit.dm

@@ -11,9 +11,12 @@
 
 //when adding a new camera network, you should only need to update these two procs
 	New()
-		possibleNets["Engineering"] = access_engine
-		possibleNets["SS13"] = access_security
-		possibleNets["Outpost"] = access_mining
+		possibleNets["Engineering"] = access_ce
+		possibleNets["SS13"] = access_hos
+		possibleNets["Mining"] = access_mining
+		possibleNets["Cargo"] = access_qm
+		possibleNets["Research"] = access_rd
+		possibleNets["Medbay"] = access_cmo
 
 	proc/updateBuildPath()
 		build_path = ""
@@ -22,9 +25,15 @@
 				if("SS13")
 					build_path = "/obj/machinery/computer/security"
 				if("Engineering")
-					build_path = "/obj/machinery/computer/security/engineeringcam"
-				if("Outpost")
+					build_path = "/obj/machinery/computer/security/engineering"
+				if("Mining")
 					build_path = "/obj/machinery/computer/security/mining"
+				if("Research")
+					build_path = "/obj/machinery/computer/security/research"
+				if("Medbay")
+					build_path = "/obj/machinery/computer/security/medbay"
+				if("Cargo")
+					build_path = "/obj/machinery/computer/security/cargo"
 
 	attackby(var/obj/item/I, var/mob/user)//if(health > 50)
 		..()

code/game/machinery/computer/buildandrepair.dm

@@ -151,22 +151,38 @@
 	name = "Circuit board (Operating Computer)"
 	build_path = "/obj/machinery/computer/operating"
 	origin_tech = "programming=2;biotech=2"
+
 /obj/item/weapon/circuitboard/camera
 	name = "Circuit board (Camera)"
 	origin_tech = "programming=2"
-	build_path = ""		//build path has to be manually set
-/obj/item/weapon/circuitboard/security
+	build_path = ""		//build path has to be manually set via circuit interaction
+
+//the following camera circuit boards are for adminspawn / reference
+/obj/item/weapon/circuitboard/securitycam
 	name = "Circuit board (Security Monitoring)"
 	origin_tech = ""	//unresearchable
 	build_path = "/obj/machinery/computer/security"
-/obj/item/weapon/circuitboard/security/engineering
+/obj/item/weapon/circuitboard/engineeringcam
 	name = "Circuit board (Engineering Monitoring)"
 	origin_tech = ""	//unresearchable
 	build_path = "/obj/machinery/computer/security/engineering"
-/obj/item/weapon/circuitboard/security/mining
+/obj/item/weapon/circuitboard/miningcam
 	name = "Circuit board (Mining Outpost Monitoring)"
 	origin_tech = ""	//unresearchable
 	build_path = "/obj/machinery/computer/security/mining"
+/obj/item/weapon/circuitboard/cargocam
+	name = "Circuit board (Cargo Department Monitoring)"
+	origin_tech = ""	//unresearchable
+	build_path = "/obj/machinery/computer/security/cargo"
+/obj/item/weapon/circuitboard/medbaycam
+	name = "Circuit board (Mining Outpost Monitoring)"
+	origin_tech = ""	//unresearchable
+	build_path = "/obj/machinery/computer/security/medbay"
+/obj/item/weapon/circuitboard/researchcam
+	name = "Circuit board (Mining Outpost Monitoring)"
+	origin_tech = ""	//unresearchable
+	build_path = "/obj/machinery/computer/security/research"
+
 /obj/item/weapon/circuitboard/comm_monitor
 	name = "Circuit board (Telecommunications Monitor)"
 	build_path = "/obj/machinery/computer/telecomms/monitor"

code/game/machinery/computer/camera_monitor.dm

@@ -0,0 +1,67 @@
+
+/obj/machinery/computer/security
+	New()
+		if(network)
+			networks = list(network)
+		else
+			switch(department)
+				if("Security")
+					networks = list("Arrivals","SS13","Engineering","Research","Medbay","Tcomsat","Mess Hall","Security","Atmospherics","Cargo")
+				if("Engineering")
+					networks = list("Engineering","Tcomsat","Singularity","Atmospherics")
+				if("Research")
+					networks = list("Research","Bomb Testing")
+				if("Medbay")
+					networks = list("Medbay")
+				if("Cargo")
+					networks = list("Mine","Cargo")
+				if("Mining")
+					networks = list("Mine")
+				if("Thunderdome")
+					networks = list("thunder")
+				if("CREED")
+					networks = list("CREED")
+
+/obj/machinery/computer/security/attack_hand(var/mob/user as mob)
+	if (stat & (NOPOWER|BROKEN))
+		return
+
+	user.machine = src
+	if(src.current)
+		user.reset_view(src.current)
+
+	var/list/L = new/list
+	for (var/obj/machinery/camera/C in world)
+		L.Add(C)
+
+	camera_network_sort(L)
+
+	var/list/D = new()
+	D["Cancel"] = "Cancel"
+	for (var/obj/machinery/camera/C in L)
+		if ( C.network in src.networks )
+			D[text("[]: [][]", C.network, C.c_tag, (C.status ? null : " (Deactivated)"))] = C
+
+	var/t = input(user, "Which camera should you change to?") as null|anything in D
+
+	if(!t)
+		user.machine = null
+		user.reset_view(null)
+		return 0
+
+	var/obj/machinery/camera/C = D[t]
+
+	if (t == "Cancel")
+		user.cancel_camera()
+		return 0
+
+	if (C)
+		if ((get_dist(user, src) > 1 || user.machine != src || user.blinded || !( user.canmove ) || !( C.status )) && (!istype(user, /mob/living/silicon/ai)))
+			return 0
+		else
+			src.current = C
+			use_power(50)
+			user.reset_view(C)
+
+			spawn( 5 )
+				attack_hand(user)

code/game/machinery/computer/lockdown.dm

@@ -28,6 +28,13 @@
 				connectedDoorIds.Add("Atmospheric Storage Rad Shielding")
 				connectedDoorIds.Add("Construction Storage Rad Shielding")
 				connectedDoorIds.Add("Engineering Secure Storage")
+			if("Medbay")
+				connectedDoorIds.Add("Genetics Outer Shutters")
+				connectedDoorIds.Add("Genetics Inner Shutters")
+				connectedDoorIds.Add("Chemistry Outer Shutters")
+				connectedDoorIds.Add("Observation Shutters")
+				connectedDoorIds.Add("Patient Room 1 Shutters")
+				connectedDoorIds.Add("Patient Room 2 Shutters")
 
 		//loop through the world, grabbing all the relevant doors
 		spawn(1)

code/game/magic/cultist/ritual.dm

@@ -555,11 +555,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 				R.word2 = w2
 				R.word3 = w3
 				R.check_icon()
-				if(R.blood_DNA.len)
-					R.blood_DNA.len++
-					R.blood_DNA[R.blood_DNA.len] = list(H.dna.unique_enzymes, H.dna.b_type)
-				else
-					R.blood_DNA = list(list(H.dna.unique_enzymes, H.dna.b_type))
+				R.blood_DNA = list(list(H.dna.unique_enzymes, H.dna.b_type))
 			return
 		else
 			user << "The book seems full of illegible scribbles. Is this a joke?"

code/game/mecha/mech_bay.dm

@@ -31,7 +31,7 @@
 
 	proc/init_devices()
 		recharge_console = locate() in range(1,src)
-		recharge_port = locate(/obj/machinery/mech_bay_recharge_port, get_step(src, WEST))
+		recharge_port = locate(/obj/machinery/mech_bay_recharge_port, get_step(src, dir))	//gets the recharge poyrt from the facing dir
 		if(recharge_console)
 			recharge_console.recharge_floor = src
 			if(recharge_port)
@@ -49,6 +49,7 @@
 	name = "Mech Bay Power Port"
 	density = 1
 	anchored = 1
+	dir = 4
 	icon = 'mech_bay.dmi'
 	icon_state = "recharge_port"
 	var/turf/simulated/floor/mech_bay_recharge_floor/recharge_floor

code/game/mecha/mecha.dm

@@ -118,7 +118,8 @@
 				return
 		var/obj/mecha/Mech = M.loc
 		spawn() //this helps prevent clickspam fest.
-			if (Mech)
+			var/list/mob_contents = M.get_contents()
+			if (Mech && !(locate(object) in mob_contents))	//cael - make sure you cant drill shit in your invent
 				Mech.click_action(object,M)
 	else
 		return ..()

code/game/objects/devices/PDA/PDA.dm

@@ -738,7 +738,7 @@
 						user << "\blue No fingerprints found on [C]"
 				else
 					user << text("\blue [C]'s Fingerprints: [md5(C:dna.uni_identity)]")
-				if ( !(C:blood_DNA) )
+				if ( !(C:blood_DNA.len) )
 					user << "\blue No blood found on [C]"
 				else
 					user << "\blue Blood found on [C]. Analysing..."

code/game/objects/devices/scanners.dm

@@ -122,7 +122,7 @@ MASS SPECTROMETER
 
 				user << "\blue Done printing."
 			user << text("\blue [M]'s Fingerprints: [md5(M.dna.uni_identity)]")
-		if ( !(M.blood_DNA) )
+		if ( !(M.blood_DNA.len) )
 			user << "\blue No blood found on [M]"
 		else
 			user << "\blue Blood found on [M]. Analysing..."
@@ -145,10 +145,10 @@ MASS SPECTROMETER
 					user << "\blue Blood type: [templist[2]]\nDNA: [templist[1]]"
 			return
 		var/duplicate = 0
-		if ((!A.fingerprints || A.fingerprints.len == 0) && !(A.suit_fibers) && !(A.blood_DNA))
+		if ((!A.fingerprints || A.fingerprints.len == 0) && !(A.suit_fibers) && !(A.blood_DNA.len))
 			user << "\blue Unable to locate any fingerprints, materials, fibers, or blood on [A]!"
 			return 0
-		else if (A.blood_DNA)
+		else if (A.blood_DNA.len)
 			user << "\blue Blood found on [A]. Analysing..."
 			sleep(15)
 			if(!duplicate)
@@ -231,7 +231,7 @@ MASS SPECTROMETER
 				var/list/blood = temp[4]
 				if(!blood)
 					blood = list()
-				if(A.blood_DNA)
+				if(A.blood_DNA.len)
 					for(var/j = 1, j < (A.blood_DNA.len + 1), j++)	//Blood~~~
 						if(!blood.Find(A.blood_DNA[j]))	//It isn't!  Add!
 							blood += A.blood_DNA[j]

code/game/objects/gibs.dm

@@ -51,8 +51,7 @@
 								viruus.holder = gib
 								viruus.spread_type = CONTACT_FEET
 					if(MobDNA)
-						gib.blood_DNA.len++
-						gib.blood_DNA[gib.blood_DNA.len] = list(MobDNA.unique_enzymes, MobDNA.b_type)
+						gib.blood_DNA = list(list(MobDNA.unique_enzymes, MobDNA.b_type))
 						if(MobDNA.original_name != "Unknown")
 							gib.OriginalMob = MobDNA.original_name
 					var/list/directions = gibdirections[i]

code/game/objects/items/item.dm

@@ -100,7 +100,7 @@
 			t = "huge"
 		else
 	if ((usr.mutations & CLUMSY) && prob(50)) t = "funny-looking"
-	usr << text("This is a []\icon[][]. It is a [] item.", !src.blood_DNA ? "" : "bloody ",src, src.name, t)
+	usr << text("This is a []\icon[][]. It is a [] item.", !src.blood_DNA.len ? "" : "bloody ",src, src.name, t)
 	if(src.desc)
 		usr << src.desc
 	return

code/game/objects/items/weapons/surgery_tools.dm

@@ -1130,8 +1130,8 @@ CIRCULAR SAW
 
 /obj/item/weapon/surgical_tool/bonegel
 	name = "bone gel"
-	icon = 'janitor.dmi'
-	icon_state = "cleaner"
+	icon = 'surgery.dmi'
+	icon_state = "bone gel"
 
 /obj/item/weapon/surgical_tool/bonegel/New()
 	stage += 0
@@ -1154,8 +1154,8 @@ CIRCULAR SAW
 
 /obj/item/weapon/surgical_tool/bonesetter
 	name = "bone setter"
-	icon = 'items.dmi'
-	icon_state = "wrench"
+	icon = 'surgery.dmi'
+	icon_state = "bone setter"
 
 /obj/item/weapon/surgical_tool/bonesetter/New()
 	stage += 1

code/game/vote.dm

@@ -56,11 +56,11 @@
 			M << browse(null, "window=vote")
 			M.client.showvote = 0
 
+	calcwin()
+
 	if(winner == "none")
 		winner = "default"
 
-	calcwin()
-
 	if(mode == 2)
 		var/wintext = capitalize(winner)
 		world << "Result is [wintext]"

code/modules/chemical/Chemistry-Reagents.dm

@@ -155,8 +155,7 @@ datum
 					var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T //find some blood here
 					if(!blood_prop) //first blood!
 						blood_prop = new(T)
-						blood_prop.blood_DNA.len++
-						blood_prop.blood_DNA[blood_prop.blood_DNA.len] = list(self.data["blood_DNA"], self.data["blood_type"])
+						blood_prop.blood_DNA = list(list(self.data["blood_DNA"], self.data["blood_type"]))
 
 					for(var/datum/disease/D in self.data["viruses"])
 						var/datum/disease/newVirus = new D.type
@@ -180,7 +179,7 @@ datum
 					var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T
 					if(!blood_prop)
 						blood_prop = new(T)
-						blood_prop.blood_DNA = list(self.data["blood_DNA"])
+						blood_prop.blood_DNA = list(list(self.data["blood_DNA"]))
 					for(var/datum/disease/D in self.data["viruses"])
 						var/datum/disease/newVirus = new D.type
 						blood_prop.viruses += newVirus
@@ -197,7 +196,7 @@ datum
 					var/obj/effect/decal/cleanable/xenoblood/blood_prop = locate() in T
 					if(!blood_prop)
 						blood_prop = new(T)
-						blood_prop.blood_DNA = list(self.data["blood_DNA"])
+						blood_prop.blood_DNA = list(list(self.data["blood_DNA"]))
 					for(var/datum/disease/D in self.data["viruses"])
 						var/datum/disease/newVirus = new D.type
 						blood_prop.viruses += newVirus

code/modules/mob/living/carbon/carbon.dm

@@ -17,7 +17,7 @@
 			var/obj/item/I = user.equipped()
 			if(I && I.force)
 				var/d = rand(round(I.force / 4), I.force)
-				if(istype(src, /mob/living/carbon/human))
+				if(ishuman(src))
 					var/mob/living/carbon/human/H = src
 					var/organ = H.get_organ("chest")
 					if (istype(organ, /datum/organ/external))

code/modules/mob/living/carbon/human/examine.dm

@@ -16,8 +16,8 @@
 		t_him = "her"
 
 	if (src.w_uniform)
-		if (src.w_uniform.blood_DNA)
-			usr << "\red [src.name] is wearing a[src.w_uniform.blood_DNA ? " bloody " : " "] \icon[src.w_uniform] [src.w_uniform.name]!"
+		if (src.w_uniform.blood_DNA.len)
+			usr << "\red [src.name] is wearing a[src.w_uniform.blood_DNA.len ? " bloody " : " "] \icon[src.w_uniform] [src.w_uniform.name]!"
 		else
 			usr << "\blue [src.name] is wearing a \icon[src.w_uniform] [src.w_uniform.name]."
 
@@ -25,8 +25,8 @@
 		usr << "\blue [src.name] is \icon[src.handcuffed] handcuffed!"
 
 	if (src.wear_suit)
-		if (src.wear_suit.blood_DNA)
-			usr << "\red [src.name] has a[src.wear_suit.blood_DNA ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name] on!"
+		if (src.wear_suit.blood_DNA.len)
+			usr << "\red [src.name] has a[src.wear_suit.blood_DNA.len ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name] on!"
 		else
 			usr << "\blue [src.name] has a \icon[src.wear_suit] [src.wear_suit.name] on."
 
@@ -37,44 +37,44 @@
 		usr << "\blue [src.name] has a \icon[src.r_ear] [src.r_ear.name] on [t_his] right ear."
 
 	if (src.wear_mask)
-		if (src.wear_mask.blood_DNA)
-			usr << "\red [src.name] has a[src.wear_mask.blood_DNA ? " bloody " : " "] \icon[src.wear_mask] [src.wear_mask.name] on [t_his] face!"
+		if (src.wear_mask.blood_DNA.len)
+			usr << "\red [src.name] has a[src.wear_mask.blood_DNA.len ? " bloody " : " "] \icon[src.wear_mask] [src.wear_mask.name] on [t_his] face!"
 		else
 			usr << "\blue [src.name] has a \icon[src.wear_mask] [src.wear_mask.name] on [t_his] face."
 
 	if (src.l_hand)
-		if (src.l_hand.blood_DNA)
-			usr << "\red [src.name] has a[src.l_hand.blood_DNA ? " bloody " : " "] \icon[src.l_hand] [src.l_hand.name] in [t_his] left hand!"
+		if (src.l_hand.blood_DNA.len)
+			usr << "\red [src.name] has a[src.l_hand.blood_DNA.len ? " bloody " : " "] \icon[src.l_hand] [src.l_hand.name] in [t_his] left hand!"
 		else
 			usr << "\blue [src.name] has a \icon[src.l_hand] [src.l_hand.name] in [t_his] left hand."
 
 	if (src.r_hand)
-		if (src.r_hand.blood_DNA)
-			usr << "\red [src.name] has a[src.r_hand.blood_DNA ? " bloody " : " "] \icon[src.r_hand] [src.r_hand.name] in [t_his] right hand!"
+		if (src.r_hand.blood_DNA.len)
+			usr << "\red [src.name] has a[src.r_hand.blood_DNA.len ? " bloody " : " "] \icon[src.r_hand] [src.r_hand.name] in [t_his] right hand!"
 		else
 			usr << "\blue [src.name] has a \icon[src.r_hand] [src.r_hand.name] in [t_his] right hand."
 
 	if (src.belt)
-		if (src.belt.blood_DNA)
-			usr << "\red [src.name] has a[src.belt.blood_DNA ? " bloody " : " "] \icon[src.belt] [src.belt.name] on [t_his] belt!"
+		if (src.belt.blood_DNA.len)
+			usr << "\red [src.name] has a[src.belt.blood_DNA.len ? " bloody " : " "] \icon[src.belt] [src.belt.name] on [t_his] belt!"
 		else
 			usr << "\blue [src.name] has a \icon[src.belt] [src.belt.name] on [t_his] belt."
 	if(src.s_store)
-		if(src.s_store.blood_DNA)
-			usr << "\red [src.name] has a[src.s_store.blood_DNA ? " bloody " : " "] \icon[src.s_store] [src.s_store.name] on [t_his][src.wear_suit.blood_DNA ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name]!"
+		if(src.s_store.blood_DNA.len)
+			usr << "\red [src.name] has a[src.s_store.blood_DNA.len ? " bloody " : " "] \icon[src.s_store] [src.s_store.name] on [t_his][src.wear_suit.blood_DNA.len ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name]!"
 		else
-			usr << "\blue [src.name] has a \icon[src.s_store] [src.s_store.name] on [t_his][src.wear_suit.blood_DNA ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name]."
+			usr << "\blue [src.name] has a \icon[src.s_store] [src.s_store.name] on [t_his][src.wear_suit.blood_DNA.len ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name]."
 	if (src.shoes)
-		usr << "[src.shoes.blood_DNA ? "\red" : "\blue"] [src.name] has a[src.shoes.blood_DNA ? " bloody " : " "] \icon[src.shoes] [src.shoes.name] on [t_his] feet."
+		usr << "[src.shoes.blood_DNA.len ? "\red" : "\blue"] [src.name] has a[src.shoes.blood_DNA.len ? " bloody " : " "] \icon[src.shoes] [src.shoes.name] on [t_his] feet."
 
 
 	if (src.gloves)
-		if (src.gloves.blood_DNA)
+		if (src.gloves.blood_DNA.len)
 			usr << "\red [src.name] has bloody \icon[src.gloves] [src.gloves.name] on [t_his] hands!"
 		else
 			usr << "\blue [src.name] has \icon[src.gloves] [src.gloves.name] on [t_his] hands."
-	else if (src.blood_DNA)
-		usr << "\red [src.name] has[src.blood_DNA ? " bloody " : " "] hands!"
+	else if (src.blood_DNA.len)
+		usr << "\red [src.name] has[src.blood_DNA.len ? " bloody " : " "] hands!"
 
 	if (src.back)
 		usr << "\blue [src.name] has a \icon[src.back] [src.back.name] on [t_his] back."

code/modules/mob/living/carbon/human/human.dm

@@ -875,7 +875,7 @@
 				overlays += image("icon" = 'uniform_fat.dmi', "icon_state" = "[t1][!lying ? "_s" : "_l"]", "layer" = MOB_LAYER)
 			else*/
 			overlays += image("icon" = 'uniform.dmi', "icon_state" = text("[][]",t1, (!(lying) ? "_s" : "_l")), "layer" = MOB_LAYER)
-			if (w_uniform.blood_DNA)
+			if (w_uniform.blood_DNA.len)
 				var/icon/stain_icon = icon('blood.dmi', "uniformblood[!lying ? "" : "2"]")
 				overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
 
@@ -905,14 +905,14 @@
 			else if(ro.destroyed)
 				gloves_icon.Blend(new /icon('limb_mask.dmi', "left_[lying?"l":"s"]"), ICON_MULTIPLY)
 			overlays += image(gloves_icon, "layer" = MOB_LAYER)
-			if (gloves.blood_DNA)
+			if (gloves.blood_DNA.len)
 				var/icon/stain_icon = icon('blood.dmi', "bloodyhands[!lying ? "" : "2"]")
 				if(lo.destroyed)
 					stain_icon.Blend(new /icon('limb_mask.dmi', "right_[lying?"l":"s"]"), ICON_MULTIPLY)
 				else if(ro.destroyed)
 					stain_icon.Blend(new /icon('limb_mask.dmi', "left_[lying?"l":"s"]"), ICON_MULTIPLY)
 				overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
-		else if (blood_DNA)
+		else if (blood_DNA.len)
 			var/icon/stain_icon = icon('blood.dmi', "bloodyhands[!lying ? "" : "2"]")
 			if(lo.destroyed)
 				stain_icon.Blend(new /icon('limb_mask.dmi', "right_[lying?"l":"s"]"), ICON_MULTIPLY)
@@ -941,7 +941,7 @@
 		else if(ro.destroyed && !lying)
 			shoes_icon.Blend(new /icon('limb_mask.dmi', "left[lying?"_l":""]"), ICON_MULTIPLY)
 		overlays += image(shoes_icon, "layer" = MOB_LAYER)
-		if (shoes.blood_DNA)
+		if (shoes.blood_DNA.len)
 			var/icon/stain_icon = icon('blood.dmi', "shoesblood[!lying ? "" : "2"]")
 			if(lo.destroyed)
 				stain_icon.Blend(new /icon('limb_mask.dmi', "right_[lying?"l":"s"]"), ICON_MULTIPLY)
@@ -1000,7 +1000,7 @@
 			var/t1 = wear_suit.icon_state
 			overlays += image("icon" = 'suit.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
 		if (wear_suit)
-			if (wear_suit.blood_DNA)
+			if (wear_suit.blood_DNA.len)
 				var/icon/stain_icon = null
 				if (istype(wear_suit, /obj/item/clothing/suit/armor/vest || /obj/item/clothing/suit/storage/wcoat))
 					stain_icon = icon('blood.dmi', "armorblood[!lying ? "" : "2"]")
@@ -1036,7 +1036,7 @@
 			var/t1 = wear_mask.icon_state
 			overlays += image("icon" = 'mask.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
 			if (!istype(wear_mask, /obj/item/clothing/mask/cigarette))
-				if (wear_mask.blood_DNA)
+				if (wear_mask.blood_DNA.len)
 					var/icon/stain_icon = icon('blood.dmi', "maskblood[!lying ? "" : "2"]")
 					overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
 			wear_mask.screen_loc = ui_mask
@@ -1050,7 +1050,7 @@
 		overlays += image("icon" = head_icon, "layer" = MOB_LAYER)
 		if(gimmick_hat)
 			overlays += image("icon" = icon('gimmick_head.dmi', "[gimmick_hat][!lying ? "" : "2"]"), "layer" = MOB_LAYER)
-		if (head.blood_DNA)
+		if (head.blood_DNA.len)
 			var/icon/stain_icon = icon('blood.dmi', "helmetblood[!lying ? "" : "2"]")
 			overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
 		head.screen_loc = ui_head

code/modules/mob/living/silicon/ai/ai.dm

@@ -9,6 +9,25 @@
 				possibleNames -= pickedName
 				pickedName = null
 
+	networks = list("SS13",
+					"Medbay",
+					"Research",
+					"Engineering",
+					"Singularity",
+					"Tcomsat",
+					"Solars",
+					"Security",
+					"Cargo",
+					"Bomb Testing",
+					"Research",
+					"Medbay",
+					"Atmospherics",
+					"Mess Hall",
+					"Arrivals",
+					"Singularity",
+					"Arrivals",
+					"Mine")
+
 	real_name = pickedName
 	name = real_name
 	anchored = 1
@@ -347,7 +366,7 @@
 		machine = null
 		reset_view(null)
 		return 0
-	if (stat == 2 || !C.status || C.network != network) return 0
+	if (stat == 2 || !C.status || !(C.network in src.networks) ) return 0
 
 	// ok, we're alive, camera is good and in our network...
 
@@ -460,7 +479,7 @@
 //Addition by Mord_Sith to define AI's network change ability
 /mob/living/silicon/ai/proc/ai_network_change()
 	set category = "AI Commands"
-	set name = "Change Camera Network"
+	set name = "Jump to Camera Network"
 	reset_view(null)
 	machine = null
 	src:cameraFollow = null
@@ -480,12 +499,21 @@
 					if (mind == M)
 						cameralist[C.network] = C.network
 		else
-			if(C.network != "CREED" && C.network != "thunder" && C.network != "RD" && C.network != "toxins" && C.network != "Prison")
+			if(C.network != "CREED" && C.network != "thunder" && C.network != "Prison" )
 				cameralist[C.network] = C.network
 
-	network = input(usr, "Which network would you like to view?") as null|anything in cameralist
-	src << "\blue Switched to [network] camera network."
+	var/newnet = input(usr, "Which network would you like to view?") as null|anything in cameralist
+
+	cameralist = new/list
+	for(var/obj/machinery/camera/C in world)
+		if(C.network == newnet)
+			cameralist.Add(C)
+
+	switchCamera( pick(cameralist) )
+	src << "\blue Jumped to [newnet] camera network."
 //End of code by Mord_Sith
+//cael - with the multiple onstation networks all linked together, changing networks is legacy functionality
+//so i recycled it to instantly jump to any network
 
 
 /mob/living/silicon/ai/proc/choose_modules()

code/modules/mob/living/silicon/ai/move.dm

@@ -43,8 +43,8 @@
 	var/list/old_types = dd_text2list("[A.type]", "/")
 
 	for(var/obj/machinery/camera/current in world)
-		if(user.network != current.network)	continue
-		if(!current.status)	continue	//	ignore disabled cameras
+		if( !(current.network in user.networks) )	continue
+		if(!current.status)	continue			//	ignore disabled cameras
 
 		//make sure it's the right direction
 		if(dx && (current.x * dx <= old.x * dx))

code/modules/mob/mob_helpers.dm

@@ -50,6 +50,11 @@
 		return 1
 	return 0
 
+/proc/istajaran(A)
+	if(istype(A, /mob/living/carbon/human/tajaran))
+		return 1
+	return 0
+
 /*proc/ishivebot(A)
 	if(A && istype(A, /mob/living/silicon/hivebot))
 		return 1

code/modules/mob/new_player/new_player.dm

@@ -274,7 +274,7 @@
 	proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank)
 		if (ticker.current_state == GAME_STATE_PLAYING)
 			var/obj/item/device/radio/intercom/a = new /obj/item/device/radio/intercom(null)
-			a.autosay("[character.real_name] has arrived on the station.", "Arrivals Announcement Computer")
+			a.autosay("[character.real_name],[character.wear_id.assignment ? " [character.wear_id.assignment]," : "" ] has arrived on the station.", "Arrivals Announcement Computer")
 			del(a)
 
 

code/modules/mob/organ/organ_external.dm

@@ -92,7 +92,7 @@ obj/item/weapon/organ/New(loc, mob/living/carbon/human/H)
 	if(!istype(H))
 		return
 	if(H.dna)
-		if(blood_DNA)
+		if(blood_DNA.len)
 			blood_DNA.len++
 			blood_DNA[blood_DNA.len] = list(H.dna.unique_enzymes, H.dna.b_type)
 		else

code/modules/mob/say.dm

@@ -44,14 +44,16 @@
 				M.show_message(rendered, 2)
 
 /mob/proc/say_understands(var/mob/other)
-	if(!other)
-		return 1
+//	if(!other)
+//		return 1
 	if (src.stat == 2)
 		return 1
 	else if (istype(other, src.type))
 		return 1
 	else if(other.universal_speak || src.universal_speak)
 		return 1
+	else if(isAI(src) && ispAI(other))
+		return 1
 	return 0
 
 /mob/proc/say_quote(var/text)

code/modules/recycling/disposal.dm

@@ -439,7 +439,7 @@
 		del(H)
 
 	CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
-		if (istype(mover,/obj/item))
+		if (istype(mover,/obj/item) && !istype(mover,/obj/item/weapon/dummy))
 			var/obj/item/I = mover
 			if(prob(75))
 				I.loc = src

code/unused/pda2/scanners.dm

@@ -62,7 +62,7 @@
 					dat += "\blue Unable to scan [A]'s fingerprints.\n"
 				else
 					dat += "\blue [H]'s Fingerprints: [md5(H.dna.uni_identity)]\n"
-				if ( !(H.blood_DNA) )
+				if ( !(H.blood_DNA.len) )
 					dat += "\blue No blood found on [H]\n"
 				else
 					for(var/i = 1, i < H.blood_DNA.len, i++)

code/unused/toilets.dm

@@ -1,96 +1,96 @@
-/*
-CONTAINS:
-TOILET
-
-/obj/item/weapon/storage/toilet
-	name = "toilet"
-	w_class = 4.0
-	anchored = 1.0
-	density = 0.0
-	var/status = 0.0
-	var/clogged = 0.0
-	anchored = 1.0
-	icon = 'stationobjs.dmi'
-	icon_state = "toilet"
-	item_state = "syringe_kit"
-
-/obj/item/weapon/storage/toilet/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if (src.contents.len >= 7)
-		user << "The toilet is clogged!"
-		return
-	if (istype(W, /obj/item/weapon/disk/nuclear))
-		user << "This is far too important to flush!"
-		return
-	if (istype(W, /obj/item/weapon/storage/))
-		return
-	if (istype(W, /obj/item/weapon/grab))
-		playsound(src.loc, 'slosh.ogg', 50, 1)
-		for(var/mob/O in viewers(user, null))
-			O << text("\blue [] gives [] a swirlie!", user, W)
-		return
-	var/t
-	for(var/obj/item/weapon/O in src)
-		t += O.w_class
-	t += W.w_class
-	if (t > 30)
-		user << "You cannot fit the item inside."
-		return
-	user.u_equip(W)
-	W.loc = src
-	if ((user.client && user.s_active != src))
-		user.client.screen -= W
-	src.orient2hud(user)
-	W.dropped(user)
-	add_fingerprint(user)
-	for(var/mob/O in viewers(user, null))
-		O.show_message(text("\blue [] has put [] in []!", user, W, src), 1)
-	return
-
-/obj/item/weapon/storage/toilet/MouseDrop_T(mob/M as mob, mob/user as mob)
-	if (!ticker)
-		user << "You can't help relieve anyone before the game starts."
-		return
-	if ((!( istype(M, /mob) ) || get_dist(src, user) > 1 || M.loc != src.loc || user.restrained() || usr.stat))
-		return
-	if (M == usr)
-		for(var/mob/O in viewers(user, null))
-			if ((O.client && !( O.blinded )))
-				O << text("\blue [] sits on the toilet.", user)
-	else
-		for(var/mob/O in viewers(user, null))
-			if ((O.client && !( O.blinded )))
-				O << text("\blue [] is seated on the toilet by []!", M, user)
-	M.anchored = 1
-	M.buckled = src
-	M.loc = src.loc
-	src.add_fingerprint(user)
-	return
-
-/obj/item/weapon/storage/toilet/attack_hand(mob/user as mob)
-	for(var/mob/M in src.loc)
-		if (M.buckled)
-			if (M != user)
-				for(var/mob/O in viewers(user, null))
-					if ((O.client && !( O.blinded )))
-						O << text("\blue [] is zipped up by [].", M, user)
-			else
-				for(var/mob/O in viewers(user, null))
-					if ((O.client && !( O.blinded )))
-						O << text("\blue [] zips up.", M)
-//			world << "[M] is no longer buckled to [src]"
-			M.anchored = 0
-			M.buckled = null
-			src.add_fingerprint(user)
-	if((src.clogged < 1) || (src.contents.len < 7) || (user.loc != src.loc))
-		for(var/mob/O in viewers(user, null))
-			O << text("\blue [] flushes the toilet.", user)
-			src.clogged = 0
-			src.contents.len = 0
-	else if((src.clogged >= 1) || (src.contents.len >= 7) || (user.buckled != src.loc))
-		for(var/mob/O in viewers(user, null))
-			O << text("\blue The toilet is clogged!")
-	return
-
-
+/*
+CONTAINS:
+TOILET
+
+/obj/item/weapon/storage/toilet
+	name = "toilet"
+	w_class = 4.0
+	anchored = 1.0
+	density = 0.0
+	var/status = 0.0
+	var/clogged = 0.0
+	anchored = 1.0
+	icon = 'stationobjs.dmi'
+	icon_state = "toilet"
+	item_state = "syringe_kit"
+
+/obj/item/weapon/storage/toilet/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	..()
+	if (src.contents.len >= 7)
+		user << "The toilet is clogged!"
+		return
+	if (istype(W, /obj/item/weapon/disk/nuclear))
+		user << "This is far too important to flush!"
+		return
+	if (istype(W, /obj/item/weapon/storage/))
+		return
+	if (istype(W, /obj/item/weapon/grab))
+		playsound(src.loc, 'slosh.ogg', 50, 1)
+		for(var/mob/O in viewers(user, null))
+			O << text("\blue [] gives [] a swirlie!", user, W)
+		return
+	var/t
+	for(var/obj/item/weapon/O in src)
+		t += O.w_class
+	t += W.w_class
+	if (t > 30)
+		user << "You cannot fit the item inside."
+		return
+	user.u_equip(W)
+	W.loc = src
+	if ((user.client && user.s_active != src))
+		user.client.screen -= W
+	src.orient2hud(user)
+	W.dropped(user)
+	add_fingerprint(user)
+	for(var/mob/O in viewers(user, null))
+		O.show_message(text("\blue [] has put [] in []!", user, W, src), 1)
+	return
+
+/obj/item/weapon/storage/toilet/MouseDrop_T(mob/M as mob, mob/user as mob)
+	if (!ticker)
+		user << "You can't help relieve anyone before the game starts."
+		return
+	if ((!( istype(M, /mob) ) || get_dist(src, user) > 1 || M.loc != src.loc || user.restrained() || usr.stat))
+		return
+	if (M == usr)
+		for(var/mob/O in viewers(user, null))
+			if ((O.client && !( O.blinded )))
+				O << text("\blue [] sits on the toilet.", user)
+	else
+		for(var/mob/O in viewers(user, null))
+			if ((O.client && !( O.blinded )))
+				O << text("\blue [] is seated on the toilet by []!", M, user)
+	M.anchored = 1
+	M.buckled = src
+	M.loc = src.loc
+	src.add_fingerprint(user)
+	return
+
+/obj/item/weapon/storage/toilet/attack_hand(mob/user as mob)
+	for(var/mob/M in src.loc)
+		if (M.buckled)
+			if (M != user)
+				for(var/mob/O in viewers(user, null))
+					if ((O.client && !( O.blinded )))
+						O << text("\blue [] is zipped up by [].", M, user)
+			else
+				for(var/mob/O in viewers(user, null))
+					if ((O.client && !( O.blinded )))
+						O << text("\blue [] zips up.", M)
+//			world << "[M] is no longer buckled to [src]"
+			M.anchored = 0
+			M.buckled = null
+			src.add_fingerprint(user)
+	if((src.clogged < 1) || (src.contents.len < 7) || (user.loc != src.loc))
+		for(var/mob/O in viewers(user, null))
+			O << text("\blue [] flushes the toilet.", user)
+			src.clogged = 0
+			src.contents.len = 0
+	else if((src.clogged >= 1) || (src.contents.len >= 7) || (user.buckled != src.loc))
+		for(var/mob/O in viewers(user, null))
+			O << text("\blue The toilet is clogged!")
+	return
+
+
 */