Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hair

# Conflicts:

code/_onclick/hud/_defines.dm

@@ -89,6 +89,7 @@
 //Generic living
 #define ui_living_pull "EAST-1:28,CENTER-2:15"
 #define ui_living_health "EAST-1:28,CENTER:15"
+#define ui_living_healthdoll "EAST-1:28,CENTER-1:15"
 
 //Monkeys
 #define ui_monkey_head "CENTER-5:13,SOUTH:5"

code/_onclick/hud/screen_objects.dm

@@ -637,6 +637,11 @@
 	name = "health doll"
 	screen_loc = ui_healthdoll
 
+/obj/screen/healthdoll/living
+	icon_state = "fullhealth0"
+	screen_loc = ui_living_healthdoll
+	var/filtered = FALSE //so we don't repeatedly create the mask of the mob every update
+
 /obj/screen/mood
 	name = "mood"
 	icon_state = "mood5"