Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

Conflicts:
	maps/tgstation.2.0.8.dmm

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

@@ -63,7 +63,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 /mob/proc/ghost()
 	set category = "Ghost"
 	set name = "Ghost"
-	set desc = "You cannot be revived as a ghost."
 
 	/*if(stat != 2) //this check causes nothing but troubles. Commented out for Nar-Sie's sake. --rastaf0
 		src << "Only dead people and admins get to ghost, and admins don't use this verb to ghost while alive."

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

@@ -486,8 +486,9 @@
 		head = null
 		if(prev_head && (prev_head.flags & BLOCKHAIR))
 			// rebuild face
-			del(face_standing)
-			del(face_lying)
+//			del(face_standing)
+//			del(face_lying)
+			update_face()
 
 	else if (W == l_ear)
 		l_ear = null
@@ -506,8 +507,9 @@
 		wear_mask = null
 		if(prev_mask && (prev_mask.flags & BLOCKHAIR))
 			// rebuild face
-			del(face_standing)
-			del(face_lying)
+//			del(face_standing)
+//			del(face_lying)
+			update_face()
 
 	else if (W == wear_id)
 		wear_id = null
@@ -1255,7 +1257,6 @@
 	// Should be called only when something about the clothing itself changed
 	// which is not handled by the equip code.
 	rebuild_appearance()
-	update_face() //Fixes hair not coming back after using a BLOCKHAIR mask/helmet
 	return
 
 	// TODO: once I have replaced the udpate_clothing() calls with update_lying() or
@@ -1770,6 +1771,8 @@ It can still be worn/put on as normal.
 					return
 				var/obj/item/clothing/W = target.wear_mask
 				target.u_equip(W)
+				if (W.flags & BLOCKHAIR)
+					target.update_face()
 				if (target.client)
 					target.client.screen -= W
 				if (W)
@@ -1899,6 +1902,8 @@ It can still be worn/put on as normal.
 				target.u_equip(W)
 				if (target.client)
 					target.client.screen -= W
+				if (W.flags & BLOCKHAIR)
+					target.update_face()
 				if (W)
 					W.loc = target.loc
 					W.dropped(target)

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

@@ -123,6 +123,8 @@
 	var/list/icons = list("Blue", "Monochrome", "Rainbow", "Inverted", "Firewall", "Green", "Text", "Smiley", "Angry", "Dorf", "Matrix", "Bliss", "Red", "Static")
 	if (src.name == "B.A.N.N.E.D." && src.ckey == "spaceman96")
 		icons += "B.A.N.N.E.D."
+	if (src.name == "M00X-BC" && src.ckey == "searif")
+		icons += "M00X-BC"
 	icontype = input("Please, select a display!", "AI", null/*, null*/) in icons
 	if(icontype == "Blue")
 		icon_state = "ai"
@@ -148,6 +150,8 @@
 		icon_state = "ai-bliss"
 	else if(icontype == "B.A.N.N.E.D.")
 		icon_state = "ai-banned"
+	else if(icontype == "M00X-BC")
+		icon_state = "ai-searif"
 	else if(icontype == "Red")
 		icon_state = "ai-malf"
 	else if(icontype == "Static")