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

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

@@ -1084,4 +1084,21 @@
 		if (germs == 2500)
 			world << "Reached stage 3 in [ticks] ticks"
 	world << "Mob took [tdamage] tox damage"
-*/
+*/
+//returns 1 if made bloody, returns 0 otherwise
+
+/mob/living/carbon/human/add_blood(mob/living/carbon/human/M as mob)
+	if (!..())
+		return 0
+	//if this blood isn't already in the list, add it
+	if(blood_DNA[M.dna.unique_enzymes])
+		return 0 //already bloodied with this blood. Cannot add more.
+	blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
+	src.update_inv_gloves()	//handles bloody hands overlays and updating
+	return 1 //we applied blood to the item
+
+/mob/living/carbon/human/clean_blood()
+	.=..()
+	if(istype(feet_blood_DNA, /list) && feet_blood_DNA.len)
+		del(feet_blood_DNA)
+		return 1

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

@@ -88,7 +88,6 @@
 
 	if (getCloneLoss() < 1)
 		for (var/datum/organ/external/O in organs)
-			world << "[O.display_name]!"
 			if (O.status & ORGAN_MUTATED)
 				O.unmutate()
 				src << "<span class = 'notice'>Your [O.display_name] is shaped normally again.</span>"

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

@@ -145,6 +145,8 @@ emp_act
 	if(!I || !user)	return 0
 
 	var/target_zone = get_zone_with_miss_chance(user.zone_sel.selecting, src)
+	if(user == src) // Attacking yourself can't miss
+		target_zone = user.zone_sel.selecting
 	if(!target_zone)
 		visible_message("\red <B>[user] misses [src] with \the [I]!")
 		return

code/modules/mob/living/login.dm

@@ -8,8 +8,6 @@
 	//Round specific stuff like hud updates
 	if(ticker && ticker.mode)
 		switch(ticker.mode.name)
-			if("sandbox")
-				CanBuild()
 			if("revolution")
 				if((mind in ticker.mode.revolutionaries) || (src.mind in ticker.mode:head_revolutionaries))
 					ticker.mode.update_rev_icons_added(src.mind)

code/modules/mob/living/silicon/robot/emote.dm

@@ -198,6 +198,15 @@
 				m_type = 2
 			else
 				src << "You are not THE LAW, pal."
+
+		if("halt")
+			if (istype(module,/obj/item/weapon/robot_module/security))
+				message = "<B>[src]</B>'s speakers skreech, \"Halt! Security!\"."
+
+				playsound(src.loc, 'sound/voice/halt.ogg', 50, 0)
+				m_type = 2
+			else
+				src << "You are not security."
 		else
 			src << text("Invalid Emote: []", act)
 	if ((message && src.stat == 0))