Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

code/modules/mob/dead/observer/observer.dm

@@ -265,23 +265,16 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 	//find a viable mouse candidate
 	var/mob/living/simple_animal/mouse/host
-	var/list/mouse_candidates = list()
-	for(var/mob/living/simple_animal/mouse/M in world)
-		if(!M.ckey && !M.stat)
-			mouse_candidates.Add(M)
-	if(mouse_candidates.len)
-		host = pick(mouse_candidates)
+	var/obj/machinery/atmospherics/unary/vent_pump/vent_found
+	var/list/found_vents = list()
+	for(var/obj/machinery/atmospherics/unary/vent_pump/v in world)
+		if(!v.welded && v.z == src.z)
+			found_vents.Add(v)
+	if(found_vents.len)
+		vent_found = pick(found_vents)
+		host = new /mob/living/simple_animal/mouse(vent_found.loc)
 	else
-		var/obj/machinery/atmospherics/unary/vent_pump/vent_found
-		var/list/found_vents = list()
-		for(var/obj/machinery/atmospherics/unary/vent_pump/v in world)
-			if(!v.welded && v.z == src.z)
-				found_vents.Add(v)
-		if(found_vents.len)
-			vent_found = pick(found_vents)
-			host = new /mob/living/simple_animal/mouse(vent_found.loc)
-		else
-			src << "<span class='warning'>Unable to find any live mice, or unwelded vents to spawn one at.</span>"
+		src << "<span class='warning'>Unable to find any unwelded vents to spawn mice at.</span>"
 
 	if(host)
 		host.ckey = src.ckey

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

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/assemblies.dmi'
 	icon_state = "posibrain"
 	w_class = 3
-	origin_tech = "engineering=4;materials=4;bluespace=2;programming=6"
+	origin_tech = "engineering=4;materials=4;bluespace=2;programming=4"
 
 	var/list/construction_cost = list("metal"=500,"glass"=500,"silver"=200,"gold"=200,"plasma"=100,"diamond"=10)
 	var/construction_time = 75
@@ -68,7 +68,8 @@
 
 		src.brainmob << "<b>You are a positronic brain, brought into existence on [station_name()].</b>"
 		src.brainmob << "<b>As a synthetic intelligence, you answer to all crewmembers, as well as the AI.</b>"
-		src.brainmob << "Use say :b to speak to other artificial intelligences on the station."
+		src.brainmob << "<b>Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm.</b>"
+		src.brainmob << "Use say :b to speak to other artificial intelligences."
 		src.brainmob.mind.assigned_role = "Positronic Brain"
 
 		var/turf/T = get_turf_or_move(src.loc)

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

@@ -591,8 +591,8 @@
 
 
 /mob/living/carbon/human/verb/pose()
-	set name = "Set pose"
-	set desc = "Sets description which will be shown when someone examines you"
+	set name = "Set Pose"
+	set desc = "Sets a description which will be shown when someone examines you."
 	set category = "IC"
 
 	pose =  copytext(sanitize(input(usr, "This is [src]. \He is...", "Pose", null)  as text), 1, MAX_MESSAGE_LEN)

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

@@ -419,6 +419,8 @@
 
 	msg += "*---------*</span>"
 	if (pose)
-		msg += "\n[t_He] is [pose]."
+		if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 )
+			pose = addtext(pose,".") //Makes sure all emotes end with a period.
+		msg += "\n[t_He] is [pose]"
 
 	usr << msg

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

@@ -899,7 +899,12 @@
 					H.brainmob.mind.transfer_to(src)
 					del(H)
 
+	var/datum/organ/external/chest/E = get_organ("chest")
+	if(E.ruptured_lungs == 1)
+		E.ruptured_lungs = 0
 
+	for (var/datum/disease/virus in viruses)
+		virus.cure()
 	..()
 
 /mob/living/carbon/human/proc/is_lung_ruptured()

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

@@ -174,10 +174,12 @@
 	switch(damagetype)
 		if(BRUTE)
 			damageoverlaytemp = 20
-			if(organ.take_damage(damage, 0, sharp, used_weapon))				UpdateDamageIcon()
+			if(organ.take_damage(damage, 0, sharp, used_weapon))
+				UpdateDamageIcon()
 		if(BURN)
 			damageoverlaytemp = 20
-			if(organ.take_damage(damage, 0, sharp, used_weapon))				UpdateDamageIcon()
+			if(organ.take_damage(0, damage, sharp, used_weapon))
+				UpdateDamageIcon()
 
 	// Will set our damageoverlay icon to the next level, which will then be set back to the normal level the next mob.Life().
 

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

@@ -99,6 +99,8 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 
 	handle_pain()
 
+	handle_medical_side_effects()
+
 	//Status updates, death etc.
 	handle_regular_status_updates()		//TODO: optimise ~Carn
 	update_canmove()
@@ -209,7 +211,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 					continue
 				for(var/datum/wound/W in temp.wounds) if(W.bleeding())
 					blood_max += W.damage / 4
-				if(temp.status & ORGAN_DESTROYED && !(temp.status & ORGAN_GAUZED))
+				if(temp.status & ORGAN_DESTROYED && !(temp.status & ORGAN_GAUZED) && !temp.amputated)
 					blood_max += 20 //Yer missing a fucking limb.
 			drip(blood_max)
 
@@ -1106,7 +1108,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 				handle_dreams()
 				adjustHalLoss(-5)
 				if (mind)
-					if(mind.active || immune_to_ssd)
+					if((mind.active && client != null) || immune_to_ssd) //This also checks whether a client is connected, if not, sleep is not reduced.
 						sleeping = max(sleeping-1, 0)
 				blinded = 1
 				stat = UNCONSCIOUS

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

@@ -101,7 +101,8 @@
 			message = "[uppertext(message)]!!" //because I don't know how to code properly in getting vars from other files -Bro
 
 	if (src.slurring)
-		message = slur(message)
+		if(copytext(message, 1, 2) != "*")
+			message = slur(message)
 	..(message)
 
 /mob/living/carbon/human/say_understands(var/other)

code/modules/mob/living/logout.dm

@@ -4,4 +4,4 @@
 		if(!key)	//key and mind have become seperated.
 			mind.active = 0	//This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.
 		if(!immune_to_ssd && sleeping < 2 && mind.active)
-			sleeping = 2
+			sleeping = 2	//This causes instant sleep, but does not prolong it. See life.dm for furthering SSD.

code/modules/mob/living/simple_animal/friendly/mouse.dm

@@ -9,6 +9,7 @@
 	speak_emote = list("squeeks","squeeks","squiks")
 	emote_hear = list("squeeks","squeaks","squiks")
 	emote_see = list("runs in a circle", "shakes", "scritches at something")
+	pass_flags = PASSTABLE
 	speak_chance = 1
 	turns_per_move = 5
 	see_in_dark = 6
@@ -17,13 +18,14 @@
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
 	response_help  = "pets the"
 	response_disarm = "gently pushes aside the"
-	response_harm   = "splats the"
+	response_harm   = "stamps on the"
 	density = 0
 	var/color //brown, gray and white, leave blank for random
-	layer = 2.5		//so they can hide under objects
+	layer = MOB_LAYER
 	min_oxy = 16 //Require atleast 16kPA oxygen
 	minbodytemp = 223		//Below -50 Degrees Celcius
 	maxbodytemp = 323	//Above 50 Degrees Celcius
+	universal_speak = 0
 
 /mob/living/simple_animal/mouse/Life()
 	..()
@@ -135,8 +137,12 @@
 			open += O
 			*/
 
-mob/living/simple_animal/mouse/restrained() //Hotfix to stop mice from doing things with MouseDrop
-	return 1
+///mob/living/simple_animal/mouse/restrained() //Hotfix to stop mice from doing things with MouseDrop
+//	return 1
+
+/mob/living/simple_animal/mouse/start_pulling(var/atom/movable/AM)//Prevents mouse from pulling things
+	src << "<span class='warning'>You are too small to pull anything.</span>"
+	return
 
 /mob/living/simple_animal/mouse/HasEntered(AM as mob|obj)
 	if( ishuman(AM) )
@@ -168,4 +174,4 @@ mob/living/simple_animal/mouse/restrained() //Hotfix to stop mice from doing thi
 	desc = "Jerry the cat is not amused."
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
-	response_harm   = "splats"
+	response_harm   = "splats"

code/modules/mob/living/simple_animal/hostile/carp.dm

@@ -13,7 +13,7 @@
 	response_help = "pets the"
 	response_disarm = "gently pushes aside the"
 	response_harm = "hits the"
-	speed = -1
+	speed = 4
 	maxHealth = 25
 	health = 25
 
@@ -34,6 +34,8 @@
 	max_n2 = 0
 	minbodytemp = 0
 
+	break_stuff_probability = 2
+
 	faction = "carp"
 
 /mob/living/simple_animal/hostile/carp/Process_Spacemove(var/check_drift = 0)

code/modules/mob/living/simple_animal/hostile/creature.dm

@@ -13,3 +13,4 @@
 	attacktext = "chomps"
 	attack_sound = 'sound/weapons/bite.ogg'
 	faction = "creature"
+	speed = 4

code/modules/mob/living/simple_animal/hostile/faithless.dm

@@ -28,6 +28,7 @@
 	min_n2 = 0
 	max_n2 = 0
 	minbodytemp = 0
+	speed = 4
 
 	faction = "faithless"
 

code/modules/mob/living/simple_animal/hostile/giant_spider.dm

@@ -33,6 +33,7 @@
 	var/busy = 0
 	pass_flags = PASSTABLE
 	move_to_delay = 6
+	speed = 3
 
 //nursemaids - these create webs and eggs
 /mob/living/simple_animal/hostile/giant_spider/nurse

code/modules/mob/living/simple_animal/hostile/hivebot.dm

@@ -26,6 +26,7 @@
 	min_n2 = 0
 	max_n2 = 0
 	minbodytemp = 0
+	speed = 4
 
 /mob/living/simple_animal/hostile/hivebot/range
 	name = "Hivebot"

code/modules/mob/living/simple_animal/hostile/hostile.dm

@@ -10,7 +10,9 @@
 	var/casingtype
 	var/move_to_delay = 2 //delay for the automated movement.
 	var/list/friends = list()
+	var/break_stuff_probability = 10
 	stop_automated_movement_when_pulled = 0
+	var/destroy_surroundings = 1
 
 /mob/living/simple_animal/hostile/proc/FindTarget()
 
@@ -18,6 +20,9 @@
 	stop_automated_movement = 0
 	for(var/atom/A in ListTargets())
 
+		if(A == src)
+			continue
+
 		var/atom/F = Found(A)
 		if(F)
 			T = F
@@ -116,11 +121,13 @@
 				target_mob = FindTarget()
 
 			if(HOSTILE_STANCE_ATTACK)
-				DestroySurroundings()
+				if(destroy_surroundings)
+					DestroySurroundings()
 				MoveToTarget()
 
 			if(HOSTILE_STANCE_ATTACKING)
-				DestroySurroundings()
+				if(destroy_surroundings)
+					DestroySurroundings()
 				AttackTarget()
 
 /mob/living/simple_animal/hostile/proc/OpenFire(target_mob)
@@ -170,7 +177,8 @@
 	return
 
 /mob/living/simple_animal/hostile/proc/DestroySurroundings()
-	for(var/dir in cardinal) // North, South, East, West
-		var/obj/structure/obstacle = locate(/obj/structure, get_step(src, dir))
-		if(istype(obstacle, /obj/structure/window) || istype(obstacle, /obj/structure/closet) || istype(obstacle, /obj/structure/table) || istype(obstacle, /obj/structure/grille))
-			obstacle.attack_animal(src)
+	if(prob(break_stuff_probability))
+		for(var/dir in cardinal) // North, South, East, West
+			var/obj/structure/obstacle = locate(/obj/structure, get_step(src, dir))
+			if(istype(obstacle, /obj/structure/window) || istype(obstacle, /obj/structure/closet) || istype(obstacle, /obj/structure/table) || istype(obstacle, /obj/structure/grille))
+				obstacle.attack_animal(src)

code/modules/mob/living/simple_animal/hostile/mimic.dm

@@ -13,7 +13,7 @@
 	response_help = "touches the"
 	response_disarm = "pushes the"
 	response_harm = "hits the"
-	speed = -1
+	speed = 4
 	maxHealth = 250
 	health = 250
 

code/modules/mob/living/simple_animal/hostile/pirate.dm

@@ -9,7 +9,7 @@
 	response_help = "pushes the"
 	response_disarm = "shoves"
 	response_harm = "hits the"
-	speed = -1
+	speed = 4
 	stop_automated_movement_when_pulled = 0
 	maxHealth = 100
 	health = 100

code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm

@@ -0,0 +1,275 @@
+
+//malfunctioning combat drones
+/mob/living/simple_animal/hostile/retaliate/malf_drone
+	name = "combat drone"
+	desc = "An automated combat drone armed with state of the art weaponry and shielding."
+	icon_state = "drone3"
+	icon_living = "drone3"
+	icon_dead = "drone_dead"
+	ranged = 1
+	rapid = 1
+	speak_chance = 5
+	turns_per_move = 3
+	response_help = "pokes the"
+	response_disarm = "gently pushes aside the"
+	response_harm = "hits the"
+	speak = list("ALERT.","Hostile-ile-ile entities dee-twhoooo-wected.","Threat parameterszzzz- szzet.","Bring sub-sub-sub-systems uuuup to combat alert alpha-a-a.")
+	emote_see = list("beeps menacingly","whirrs threateningly","scans its immediate vicinity")
+	a_intent = "harm"
+	stop_automated_movement_when_pulled = 0
+	health = 300
+	maxHealth = 300
+	speed = 4
+	projectiletype = /obj/item/projectile/beam/drone
+	projectilesound = 'sound/weapons/laser3.ogg'
+	destroy_surroundings = 0
+	var/datum/effect/effect/system/ion_trail_follow/ion_trail
+
+	//the drone randomly switches between these states because it's malfunctioning
+	var/hostile_drone = 0
+	//0 - retaliate, only attack enemies that attack it
+	//1 - hostile, attack everything that comes near
+
+	var/turf/patrol_target
+	var/explode_chance = 1
+	var/disabled = 0
+	var/exploding = 0
+
+	min_oxy = 0
+	max_tox = 0
+	max_co2 = 0
+	minbodytemp = 0
+	maxbodytemp = 600
+
+	var/has_loot = 1
+	faction = "malf_drone"
+
+/mob/living/simple_animal/hostile/retaliate/malf_drone/New()
+	..()
+	if(prob(5))
+		projectiletype = /obj/item/projectile/beam/pulse/drone
+		projectilesound = 'sound/weapons/pulse2.ogg'
+	ion_trail = new
+	ion_trail.set_up(src)
+	ion_trail.start()
+
+/mob/living/simple_animal/hostile/retaliate/malf_drone/Process_Spacemove(var/check_drift = 0)
+	return 1
+
+/mob/living/simple_animal/hostile/retaliate/malf_drone/ListTargets()
+	if(hostile_drone)
+		return view(src, 10)
+	else
+		return ..()
+
+//self repair systems have a chance to bring the drone back to life
+/mob/living/simple_animal/hostile/retaliate/malf_drone/Life()
+
+	//emps and lots of damage can temporarily shut us down
+	if(disabled > 0)
+		stat = UNCONSCIOUS
+		icon_state = "drone_dead"
+		disabled--
+		wander = 0
+		speak_chance = 0
+		if(disabled <= 0)
+			stat = CONSCIOUS
+			icon_state = "drone0"
+			wander = 1
+			speak_chance = 5
+
+	//repair a bit of damage
+	if(prob(1))
+		src.visible_message("\red \icon[src] [src] shudders and shakes as some of it's damaged systems come back online.")
+		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+		s.set_up(3, 1, src)
+		s.start()
+		health += rand(25,100)
+
+	//spark for no reason
+	if(prob(5))
+		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+		s.set_up(3, 1, src)
+		s.start()
+
+	//sometimes our targetting sensors malfunction, and we attack anyone nearby
+	if(prob(disabled ? 0 : 1))
+		if(hostile_drone)
+			src.visible_message("\blue \icon[src] [src] retracts several targetting vanes, and dulls it's running lights.")
+			hostile_drone = 0
+		else
+			src.visible_message("\red \icon[src] [src] suddenly lights up, and additional targetting vanes slide into place.")
+			hostile_drone = 1
+
+	if(health / maxHealth > 0.9)
+		icon_state = "drone3"
+		explode_chance = 0
+	else if(health / maxHealth > 0.7)
+		icon_state = "drone2"
+		explode_chance = 0
+	else if(health / maxHealth > 0.5)
+		icon_state = "drone1"
+		explode_chance = 0.5
+	else if(health / maxHealth > 0.3)
+		icon_state = "drone0"
+		explode_chance = 5
+	else if(health > 0)
+		//if health gets too low, shut down
+		icon_state = "drone_dead"
+		exploding = 0
+		if(!disabled)
+			if(prob(50))
+				src.visible_message("\blue \icon[src] [src] suddenly shuts down!")
+			else
+				src.visible_message("\blue \icon[src] [src] suddenly lies still and quiet.")
+			disabled = rand(150, 600)
+			walk(src,0)
+
+	if(exploding && prob(20))
+		if(prob(50))
+			src.visible_message("\red \icon[src] [src] begins to spark and shake violenty!")
+		else
+			src.visible_message("\red \icon[src] [src] sparks and shakes like it's about to explode!")
+		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+		s.set_up(3, 1, src)
+		s.start()
+
+	if(!exploding && !disabled && prob(explode_chance))
+		exploding = 1
+		stat = UNCONSCIOUS
+		wander = 1
+		walk(src,0)
+		spawn(rand(50,150))
+			if(!disabled && exploding)
+				explosion(get_turf(src), 0, 1, 4, 7)
+				//proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1)
+	..()
+
+//ion rifle!
+/mob/living/simple_animal/hostile/retaliate/malf_drone/emp_act(severity)
+	health -= rand(3,15) * (severity + 1)
+	disabled = rand(150, 600)
+	hostile_drone = 0
+	walk(src,0)
+
+/mob/living/simple_animal/Die()
+	src.visible_message("\blue \icon[src] [src] suddenly breaks apart.")
+	..()
+	del(src)
+
+/mob/living/simple_animal/hostile/retaliate/malf_drone/Del()
+	//some random debris left behind
+	if(has_loot)
+		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+		s.set_up(3, 1, src)
+		s.start()
+		var/obj/O
+
+		//shards
+		O = new /obj/item/weapon/shard(src.loc)
+		step_to(O, get_turf(pick(view(7, src))))
+		if(prob(75))
+			O = new /obj/item/weapon/shard(src.loc)
+			step_to(O, get_turf(pick(view(7, src))))
+		if(prob(50))
+			O = new /obj/item/weapon/shard(src.loc)
+			step_to(O, get_turf(pick(view(7, src))))
+		if(prob(25))
+			O = new /obj/item/weapon/shard(src.loc)
+			step_to(O, get_turf(pick(view(7, src))))
+
+		//rods
+		O = new /obj/item/stack/rods(src.loc)
+		step_to(O, get_turf(pick(view(7, src))))
+		if(prob(75))
+			O = new /obj/item/stack/rods(src.loc)
+			step_to(O, get_turf(pick(view(7, src))))
+		if(prob(50))
+			O = new /obj/item/stack/rods(src.loc)
+			step_to(O, get_turf(pick(view(7, src))))
+		if(prob(25))
+			O = new /obj/item/stack/rods(src.loc)
+			step_to(O, get_turf(pick(view(7, src))))
+
+		//plasteel
+		O = new /obj/item/stack/sheet/plasteel(src.loc)
+		step_to(O, get_turf(pick(view(7, src))))
+		if(prob(75))
+			O = new /obj/item/stack/sheet/plasteel(src.loc)
+			step_to(O, get_turf(pick(view(7, src))))
+		if(prob(50))
+			O = new /obj/item/stack/sheet/plasteel(src.loc)
+			step_to(O, get_turf(pick(view(7, src))))
+		if(prob(25))
+			O = new /obj/item/stack/sheet/plasteel(src.loc)
+			step_to(O, get_turf(pick(view(7, src))))
+
+		//also drop dummy circuit boards deconstructable for research (loot)
+		var/obj/item/weapon/circuitboard/C
+
+		//spawn 1-4 boards of a random type
+		var/spawnees = 0
+		var/num_boards = rand(1,4)
+		var/list/options = list(1,2,4,8,16,32,64,128,256, 512)
+		for(var/i=0, i<num_boards, i++)
+			var/chosen = pick(options)
+			options.Remove(options.Find(chosen))
+			spawnees |= chosen
+
+		if(spawnees & 1)
+			C = new(src.loc)
+			C.name = "Drone CPU motherboard"
+			C.origin_tech = "programming=[rand(3,6)]"
+
+		if(spawnees & 2)
+			C = new(src.loc)
+			C.name = "Drone neural interface"
+			C.origin_tech = "biotech=[rand(3,6)]"
+
+		if(spawnees & 4)
+			C = new(src.loc)
+			C.name = "Drone suspension processor"
+			C.origin_tech = "magnets=[rand(3,6)]"
+
+		if(spawnees & 8)
+			C = new(src.loc)
+			C.name = "Drone shielding controller"
+			C.origin_tech = "bluespace=[rand(3,6)]"
+
+		if(spawnees & 16)
+			C = new(src.loc)
+			C.name = "Drone power capacitor"
+			C.origin_tech = "powerstorage=[rand(3,6)]"
+
+		if(spawnees & 32)
+			C = new(src.loc)
+			C.name = "Drone hull reinforcer"
+			C.origin_tech = "materials=[rand(3,6)]"
+
+		if(spawnees & 64)
+			C = new(src.loc)
+			C.name = "Drone auto-repair system"
+			C.origin_tech = "engineering=[rand(3,6)]"
+
+		if(spawnees & 128)
+			C = new(src.loc)
+			C.name = "Drone plasma overcharge counter"
+			C.origin_tech = "plasma=[rand(3,6)]"
+
+		if(spawnees & 256)
+			C = new(src.loc)
+			C.name = "Drone targetting circuitboard"
+			C.origin_tech = "combat=[rand(3,6)]"
+
+		if(spawnees & 512)
+			C = new(src.loc)
+			C.name = "Corrupted drone morality core"
+			C.origin_tech = "illegal=[rand(3,6)]"
+
+	..()
+
+/obj/item/projectile/beam/drone
+	damage = 15
+
+/obj/item/projectile/beam/pulse/drone
+	damage = 10

code/modules/mob/living/simple_animal/hostile/russian.dm

@@ -10,7 +10,7 @@
 	response_help = "pokes the"
 	response_disarm = "shoves the"
 	response_harm = "hits the"
-	speed = -1
+	speed = 4
 	stop_automated_movement_when_pulled = 0
 	maxHealth = 100
 	health = 100

code/modules/mob/living/simple_animal/hostile/syndicate.dm

@@ -10,7 +10,7 @@
 	response_help = "pokes the"
 	response_disarm = "shoves the"
 	response_harm = "hits the"
-	speed = -1
+	speed = 4
 	stop_automated_movement_when_pulled = 0
 	maxHealth = 100
 	health = 100

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -227,8 +227,10 @@
 /mob/living/simple_animal/emote(var/act)
 	if(act)
 		if(act == "scream")	act = "makes a loud and pained whimper" //ugly hack to stop animals screaming when crushed :P
+		if( findtext(act,".",lentext(act)) == 0 && findtext(act,"!",lentext(act)) == 0 && findtext(act,"?",lentext(act)) == 0 )
+			act = addtext(act,".") //Makes sure all emotes end with a period.
 		for (var/mob/O in viewers(src, null))
-			O.show_message("<B>[src]</B> [act].")
+			O.show_message("<B>[src]</B> [act]")
 
 
 /mob/living/simple_animal/attack_animal(mob/living/simple_animal/M as mob)
@@ -444,7 +446,7 @@
 /mob/living/simple_animal/proc/SA_attackable(target_mob)
 	if (isliving(target_mob))
 		var/mob/living/L = target_mob
-		if(!L.stat)
+		if(!L.stat || L.health <= 0)
 			return (0)
 	if (istype(target_mob,/obj/mecha))
 		var/obj/mecha/M = target_mob

code/modules/mob/mob_helpers.dm

@@ -121,7 +121,7 @@ proc/isorgan(A)
 	return 0
 
 proc/hasorgans(A)
-	return (ishuman(A) || ismonkey(A))
+	return ishuman(A)
 
 /proc/hsl2rgb(h, s, l)
 	return
@@ -170,7 +170,7 @@ proc/hasorgans(A)
 	zone = check_zone(zone)
 
 	// you can only miss if your target is standing and not restrained
-	if(!target.buckled && !target.lying) 
+	if(!target.buckled && !target.lying)
 		var/miss_chance = max(10 + miss_chance_mod, 0)
 		switch(zone)
 			if("head")

code/modules/mob/new_player/new_player.dm

@@ -319,9 +319,8 @@
 			if(job && IsJobAvailable(job.title))
 				var/active = 0
 				// Only players with the job assigned and AFK for less than 10 minutes count as active
-				for(var/mob/M in player_list)
-					if(M.mind && M.mind.assigned_job == job && M.client && M.client.inactivity <= 10 * 60 * 10)
-						active++
+				for(var/mob/M in player_list) if(M.mind && M.client && M.mind.assigned_role == job.title && M.client.inactivity <= 10 * 60 * 10)
+					active++
 				dat += "<a href='byond://?src=\ref[src];SelectedJob=[job.title]'>[job.title] ([job.current_positions]) (Active: [active])</a><br>"
 
 		dat += "</center>"

code/modules/mob/new_player/sprite_accessories.dm

@@ -420,10 +420,85 @@
 
 	taj_ears
 		name = "Tajaran Ears"
-		icon_state = "tajears"
+		icon_state = "ears_plain"
 		species_allowed = list("Tajaran")
 
+	taj_ears_clean
+		name = "Clean"
+		icon_state = "hair_clean"
+		species_allowed = list("Tajaran")
 
+	taj_ears_shaggy
+		name = "Shaggy"
+		icon_state = "hair_shaggy"
+		species_allowed = list("Tajaran")
+
+	taj_ears_mohawk
+		name = "Tajaran Mohawk"
+		icon_state = "hair_mohawk"
+		species_allowed = list("Tajaran")
+
+	taj_ears_plait
+		name = "Plait"
+		icon_state = "hair_plait"
+		species_allowed = list("Tajaran")
+
+	taj_ears_straight
+		name = "Straight"
+		icon_state = "hair_straight"
+		species_allowed = list("Tajaran")
+
+	taj_ears_long
+		name = "Long"
+		icon_state = "hair_long"
+		species_allowed = list("Tajaran")
+
+	taj_ears_rattail
+		name = "Rat Tail"
+		icon_state = "hair_rattail"
+		species_allowed = list("Tajaran")
+
+	taj_ears_spiky
+		name = "Tajaran Spiky"
+		icon_state = "hair_tajspiky"
+		species_allowed = list("Tajaran")
+
+	taj_ears_messy
+		name = "Messy"
+		icon_state = "hair_messy"
+		species_allowed = list("Tajaran")
+
+/datum/sprite_accessory/facial_hair
+
+	taj_sideburns
+		name = "Sideburns"
+		icon_state = "facial_mutton"
+		species_allowed = list("Tajaran")
+
+	taj_mutton
+		name = "Mutton"
+		icon_state = "facial_mutton"
+		species_allowed = list("Tajaran")
+
+	taj_pencilstache
+		name = "Pencilstache"
+		icon_state = "facial_pencilstache"
+		species_allowed = list("Tajaran")
+
+	taj_moustache
+		name = "Moustache"
+		icon_state = "facial_moustache"
+		species_allowed = list("Tajaran")
+
+	taj_goatee
+		name = "Goatee"
+		icon_state = "facial_goatee"
+		species_allowed = list("Tajaran")
+
+	taj_smallstache
+		name = "Smallsatche"
+		icon_state = "facial_smallstache"
+		species_allowed = list("Tajaran")
 //skin styles - WIP
 //going to have to re-integrate this with surgery
 //let the icon_state hold an icon preview for now

code/modules/mob/say.dm

@@ -75,11 +75,11 @@
 		//tcomms code is still runtiming somewhere here
 	var/ending = copytext(text, length(text))
 	if (is_speaking_soghun)
-		return "hisses, \"<span class='species'>[text]</span>\"";
+		return "hisses, \"<span class='soghun'>[text]</span>\"";
 	if (is_speaking_skrell)
-		return "warbles, \"<span class='species'>[text]</span>\"";
+		return "warbles, \"<span class='skrell'>[text]</span>\"";
 	if (is_speaking_tajaran)
-		return "mrowls, \"<span class='species'>[text]</span>\"";
+		return "mrowls, \"<span class='tajaran'>[text]</span>\"";
 //Needs Virus2
 //	if (src.disease_symptoms & DISEASE_HOARSE)
 //		return "rasps, \"[text]\"";
@@ -115,4 +115,4 @@
 		return "1"
 	else if (ending == "!")
 		return "2"
-	return "0"
+	return "0"