Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	code/modules/mob/mob.dm

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

@@ -227,7 +227,7 @@
 					chance = !hand ? 40 : 20
 
 				if (prob(chance))
-					visible_message("<spawn class=danger>[src]'s [W] goes off during struggle!")
+					visible_message("<span class='danger'>[src]'s [W] goes off during struggle!</span>")
 					var/list/turfs = list()
 					for(var/turf/T in view())
 						turfs += T

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

@@ -192,10 +192,11 @@ This saves us from having to call add_fingerprint() any time something is put in
 //This is an UNSAFE proc. Use mob_can_equip() before calling this one! Or rather use equip_to_slot_if_possible() or advanced_equip_to_slot_if_possible()
 //set redraw_mob to 0 if you don't wish the hud to be updated - if you're doing it manually in your own proc.
 /mob/living/carbon/human/equip_to_slot(obj/item/W as obj, slot, redraw_mob = 1)
+
 	if(!slot) return
 	if(!istype(W)) return
 	if(!has_organ_for_slot(slot)) return
-
+	if(!species || !species.hud || !(slot in species.hud.equip_slots)) return
 	W.loc = src
 	switch(slot)
 		if(slot_back)
@@ -314,7 +315,7 @@ This saves us from having to call add_fingerprint() any time something is put in
 
 	W.layer = 20
 
-	return
+	return 1
 
 /*
 	MouseDrop human inventory menu

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

@@ -92,6 +92,7 @@
 
 	if(health < 1)
 		death()
+		return
 
 	if(health > maxHealth)
 		health = maxHealth