obj/hud is now datum/hud. There was no need for it to be an object.

Moved some of the static overlays such as the dither effects, druggy effect and blurry-eyes into datum/global_hud. Meaning that only one object is instanced per server rather than per mob. It reduces on code.
Commented out a green and red overlay which aren't used, which were being instanced for every mob.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4767 316c924e-a436-60f5-8080-3fe189b3f50e

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

@@ -1,3 +1,3 @@
 
-/obj/hud/proc/ghost_hud()
+/datum/hud/proc/ghost_hud()
 	return

code/modules/mob/living/carbon/alien/humanoid/hud.dm

@@ -1,37 +1,7 @@
-/obj/hud/proc/alien_hud()
+/datum/hud/proc/alien_hud()
 
 	src.adding = list(  )
 	src.other = list(  )
-	src.vimpaired = list(  )
-	src.darkMask = list(  )
-
-	src.g_dither = new src.h_type( src )
-	src.g_dither.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.g_dither.name = "Mask"
-	src.g_dither.icon_state = "dither12g"
-	src.g_dither.layer = 18
-	src.g_dither.mouse_opacity = 0
-
-	src.alien_view = new src.h_type(src)
-	src.alien_view.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.alien_view.name = "Alien"
-	src.alien_view.icon_state = "alien"
-	src.alien_view.layer = 18
-	src.alien_view.mouse_opacity = 0
-
-	src.blurry = new src.h_type( src )
-	src.blurry.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.blurry.name = "Blurry"
-	src.blurry.icon_state = "blurry"
-	src.blurry.layer = 17
-	src.blurry.mouse_opacity = 0
-
-	src.druggy = new src.h_type( src )
-	src.druggy.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.druggy.name = "Druggy"
-	src.druggy.icon_state = "druggy"
-	src.druggy.layer = 17
-	src.druggy.mouse_opacity = 0
 
 	var/obj/screen/using
 	var/obj/screen/inventory/inv_box
@@ -206,42 +176,6 @@
 	src.adding += using
 */
 
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = 'icons/mob/screen1_alien.dmi'
-	using.icon_state = "dither50"
-	using.screen_loc = "1,1 to 5,15"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.vimpaired += using
-
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = 'icons/mob/screen1_alien.dmi'
-	using.icon_state = "dither50"
-	using.screen_loc = "5,1 to 10,5"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.vimpaired += using
-
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = 'icons/mob/screen1_alien.dmi'
-	using.icon_state = "dither50"
-	using.screen_loc = "6,11 to 10,15"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.vimpaired += using
-
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = 'icons/mob/screen1_alien.dmi'
-	using.icon_state = "dither50"
-	using.screen_loc = "11,1 to 15,15"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.vimpaired += using
-
 	mymob.throw_icon = new /obj/screen(null)
 	mymob.throw_icon.icon = 'icons/mob/screen1_alien.dmi'
 	mymob.throw_icon.icon_state = "act_throw_off"

code/modules/mob/living/carbon/alien/humanoid/life.dm

@@ -486,9 +486,7 @@
 		//NOTE: the alerts dont reset when youre out of danger. dont blame me,
 		//blame the person who coded them. Temporary fix added.
 
-		client.screen -= hud_used.blurry
-		client.screen -= hud_used.druggy
-		client.screen -= hud_used.vimpaired
+		client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired)
 
 		if ((blind && stat != 2))
 			if ((blinded))
@@ -497,13 +495,13 @@
 				blind.layer = 0
 
 				if (disabilities & NEARSIGHTED)
-					client.screen += hud_used.vimpaired
+					client.screen += global_hud.vimpaired
 
 				if (eye_blurry)
-					client.screen += hud_used.blurry
+					client.screen += global_hud.blurry
 
 				if (druggy)
-					client.screen += hud_used.druggy
+					client.screen += global_hud.druggy
 
 		if (stat != 2)
 			if (machine)

code/modules/mob/living/carbon/alien/larva/hud.dm

@@ -1,39 +1,9 @@
 
 
-/obj/hud/proc/larva_hud()
+/datum/hud/proc/larva_hud()
 
 	src.adding = list(  )
 	src.other = list(  )
-	src.vimpaired = list(  )
-	src.darkMask = list(  )
-
-	src.g_dither = new src.h_type( src )
-	src.g_dither.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.g_dither.name = "Mask"
-	src.g_dither.icon_state = "dither12g"
-	src.g_dither.layer = 18
-	src.g_dither.mouse_opacity = 0
-
-	src.alien_view = new src.h_type(src)
-	src.alien_view.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.alien_view.name = "Alien"
-	src.alien_view.icon_state = "alien"
-	src.alien_view.layer = 18
-	src.alien_view.mouse_opacity = 0
-
-	src.blurry = new src.h_type( src )
-	src.blurry.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.blurry.name = "Blurry"
-	src.blurry.icon_state = "blurry"
-	src.blurry.layer = 17
-	src.blurry.mouse_opacity = 0
-
-	src.druggy = new src.h_type( src )
-	src.druggy.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.druggy.name = "Druggy"
-	src.druggy.icon_state = "druggy"
-	src.druggy.layer = 17
-	src.druggy.mouse_opacity = 0
 
 	var/obj/screen/using
 
@@ -108,43 +78,6 @@
 	src.adding += using
 */
 
-
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = 'icons/mob/screen1_alien.dmi'
-	using.icon_state = "dither50"
-	using.screen_loc = "1,1 to 5,15"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.vimpaired += using
-
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = 'icons/mob/screen1_alien.dmi'
-	using.icon_state = "dither50"
-	using.screen_loc = "5,1 to 10,5"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.vimpaired += using
-
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = 'icons/mob/screen1_alien.dmi'
-	using.icon_state = "dither50"
-	using.screen_loc = "6,11 to 10,15"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.vimpaired += using
-
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = 'icons/mob/screen1_alien.dmi'
-	using.icon_state = "dither50"
-	using.screen_loc = "11,1 to 15,15"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.vimpaired += using
-
 	mymob.oxygen = new /obj/screen( null )
 	mymob.oxygen.icon = 'icons/mob/screen1_alien.dmi'
 	mymob.oxygen.icon_state = "oxy0"

code/modules/mob/living/carbon/alien/larva/life.dm

@@ -385,9 +385,7 @@
 		//blame the person who coded them. Temporary fix added.
 
 
-		client.screen -= hud_used.blurry
-		client.screen -= hud_used.druggy
-		client.screen -= hud_used.vimpaired
+		client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired)
 
 		if ((blind && stat != 2))
 			if ((blinded))
@@ -396,13 +394,13 @@
 				blind.layer = 0
 
 				if (disabilities & NEARSIGHTED)
-					client.screen += hud_used.vimpaired
+					client.screen += global_hud.vimpaired
 
 				if (eye_blurry)
-					client.screen += hud_used.blurry
+					client.screen += global_hud.blurry
 
 				if (druggy)
-					client.screen += hud_used.druggy
+					client.screen += global_hud.druggy
 
 		if (stat != 2)
 			if (machine)

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

@@ -1,26 +1,10 @@
-/obj/hud/proc/brain_hud(var/ui_style='icons/mob/screen1_old.dmi')
+/datum/hud/proc/brain_hud(var/ui_style='icons/mob/screen1_old.dmi')
 
 	//ui_style='icons/mob/screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
 
-	blurry = new h_type( src )
-	blurry.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	blurry.name = "Blurry"
-	blurry.icon = ui_style
-	blurry.icon_state = "blurry"
-	blurry.layer = 17
-	blurry.mouse_opacity = 0
-
-	druggy = new h_type( src )
-	druggy.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	druggy.name = "Druggy"
-	druggy.icon = ui_style
-	druggy.icon_state = "druggy"
-	druggy.layer = 17
-	druggy.mouse_opacity = 0
-
 	mymob.blind = new /obj/screen( null )
 	mymob.blind.icon = 'icons/mob/screen1_full.dmi'
 	mymob.blind.icon_state = "blackimageoverlay"
 	mymob.blind.name = " "
 	mymob.blind.screen_loc = "1,1"
-	mymob.blind.layer = 0
+	mymob.blind.layer = 0

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

@@ -246,9 +246,7 @@
 
 		if(pullin)	pullin.icon_state = "pull[pulling ? 1 : 0]"
 
-		client.screen -= hud_used.blurry
-		client.screen -= hud_used.druggy
-		client.screen -= hud_used.vimpaired
+		client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired)
 
 		if ((blind && stat != 2))
 			if ((blinded))
@@ -257,13 +255,13 @@
 				blind.layer = 0
 
 				if (disabilities & NEARSIGHTED)
-					client.screen += hud_used.vimpaired
+					client.screen += global_hud.vimpaired
 
 				if (eye_blurry)
-					client.screen += hud_used.blurry
+					client.screen += global_hud.blurry
 
 				if (druggy)
-					client.screen += hud_used.druggy
+					client.screen += global_hud.druggy
 
 		if (stat != 2)
 			if (machine)

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

@@ -1,43 +1,9 @@
-/obj/hud/proc/human_hud(var/ui_style='icons/mob/screen1_old.dmi')
+/datum/hud/proc/human_hud(var/ui_style='icons/mob/screen1_old.dmi')
 
 	src.adding = list(  )
 	src.other = list(  )
-	src.vimpaired = list(  )
-	src.darkMask = list(  )
 	src.hotkeybuttons = list(  ) //These can be disabled for hotkey usersx
 
-	src.g_dither = new src.h_type( src )
-	src.g_dither.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.g_dither.name = "Mask"
-	src.g_dither.icon = ui_style
-	src.g_dither.icon_state = "dither12g"
-	src.g_dither.layer = 18
-	src.g_dither.mouse_opacity = 0
-
-	src.alien_view = new src.h_type(src)
-	src.alien_view.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.alien_view.name = "Alien"
-	src.alien_view.icon = ui_style
-	src.alien_view.icon_state = "alien"
-	src.alien_view.layer = 18
-	src.alien_view.mouse_opacity = 0
-
-	src.blurry = new src.h_type( src )
-	src.blurry.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.blurry.name = "Blurry"
-	src.blurry.icon = ui_style
-	src.blurry.icon_state = "blurry"
-	src.blurry.layer = 17
-	src.blurry.mouse_opacity = 0
-
-	src.druggy = new src.h_type( src )
-	src.druggy.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.druggy.name = "Druggy"
-	src.druggy.icon = ui_style
-	src.druggy.icon_state = "druggy"
-	src.druggy.layer = 17
-	src.druggy.mouse_opacity = 0
-
 	var/obj/screen/using
 	var/obj/screen/inventory/inv_box
 
@@ -388,107 +354,6 @@
 	src.mov_int += using
 */
 
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = ui_style
-	using.icon_state = "dither50"
-	using.screen_loc = "1,1 to 5,15"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.vimpaired += using
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = ui_style
-	using.icon_state = "dither50"
-	using.screen_loc = "5,1 to 10,5"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.vimpaired += using
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = ui_style
-	using.icon_state = "dither50"
-	using.screen_loc = "6,11 to 10,15"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.vimpaired += using
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = ui_style
-	using.icon_state = "dither50"
-	using.screen_loc = "11,1 to 15,15"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.vimpaired += using
-
-	//welding mask dither
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = ui_style
-	using.icon_state = "dither50"
-	using.screen_loc = "3,3 to 5,13"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.darkMask += using
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = ui_style
-	using.icon_state = "dither50"
-	using.screen_loc = "5,3 to 10,5"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.darkMask += using
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = ui_style
-	using.icon_state = "dither50"
-	using.screen_loc = "6,11 to 10,13"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.darkMask += using
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = ui_style
-	using.icon_state = "dither50"
-	using.screen_loc = "11,3 to 13,13"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.darkMask += using
-
-	//welding mask blackness
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = ui_style
-	using.icon_state = "black"
-	using.screen_loc = "1,1 to 15,2"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.darkMask += using
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = ui_style
-	using.icon_state = "black"
-	using.screen_loc = "1,3 to 2,15"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.darkMask += using
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = ui_style
-	using.icon_state = "black"
-	using.screen_loc = "14,3 to 15,15"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.darkMask += using
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = ui_style
-	using.icon_state = "black"
-	using.screen_loc = "3,14 to 13,15"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.darkMask += using
-
 	mymob.throw_icon = new /obj/screen(null)
 	mymob.throw_icon.icon = ui_style
 	mymob.throw_icon.icon_state = "act_throw_off"

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

@@ -926,7 +926,7 @@
 			if(copytext(hud.icon_state,1,4) == "hud") //ugly, but icon comparison is worse, I believe
 				del(hud)
 
-		client.screen.Remove(hud_used.blurry, hud_used.druggy, hud_used.vimpaired, hud_used.darkMask)
+		client.screen.Remove(global_hud.blurry, global_hud.druggy, global_hud.vimpaired, global_hud.darkMask)
 
 		update_action_buttons()
 
@@ -1147,18 +1147,18 @@
 				else			blind.layer = 0
 
 			if( disabilities & NEARSIGHTED && !istype(glasses, /obj/item/clothing/glasses/regular) )
-				client.screen += hud_used.vimpaired
-			if(eye_blurry)			client.screen += hud_used.blurry
-			if(druggy)				client.screen += hud_used.druggy
+				client.screen += global_hud.vimpaired
+			if(eye_blurry)			client.screen += global_hud.blurry
+			if(druggy)				client.screen += global_hud.druggy
 
 			if( istype(head, /obj/item/clothing/head/welding) )
 				var/obj/item/clothing/head/welding/O = head
 				if(!O.up && tinted_weldhelh)
-					client.screen += hud_used.darkMask
+					client.screen += global_hud.darkMask
 
 			if(eye_stat > 20)
-				if(eye_stat > 30)	client.screen += hud_used.darkMask
-				else				client.screen += hud_used.vimpaired
+				if(eye_stat > 30)	client.screen += global_hud.darkMask
+				else				client.screen += global_hud.vimpaired
 
 			if(machine)
 				if(!machine.check_eye(src))		reset_view(null)

code/modules/mob/living/carbon/metroid/hud.dm

@@ -5,7 +5,7 @@
 			del(hud)
 
 /*
-/obj/hud/proc/metroid_hud()
+/datum/hud/proc/metroid_hud()
 
 	src.adding = list(  )
 	src.other = list(  )

code/modules/mob/living/carbon/monkey/hud.dm

@@ -1,46 +1,12 @@
-/obj/hud/proc/monkey_hud(var/ui_style='icons/mob/screen1_old.dmi')
+/datum/hud/proc/monkey_hud(var/ui_style='icons/mob/screen1_old.dmi')
 
 	//ui_style='icons/mob/screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
 
 	src.adding = list(  )
 	src.other = list(  )
-	src.vimpaired = list(  )
-	src.darkMask = list(  )
 
 	//var/icon/blocked = icon(ui_style,"blocked")
 
-	src.g_dither = new src.h_type( src )
-	src.g_dither.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.g_dither.name = "Mask"
-	src.g_dither.icon = ui_style
-	src.g_dither.icon_state = "dither12g"
-	src.g_dither.layer = 18
-	src.g_dither.mouse_opacity = 0
-
-	src.alien_view = new src.h_type(src)
-	src.alien_view.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.alien_view.name = "Alien"
-	src.alien_view.icon = ui_style
-	src.alien_view.icon_state = "alien"
-	src.alien_view.layer = 18
-	src.alien_view.mouse_opacity = 0
-
-	src.blurry = new src.h_type( src )
-	src.blurry.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.blurry.name = "Blurry"
-	src.blurry.icon = ui_style
-	src.blurry.icon_state = "blurry"
-	src.blurry.layer = 17
-	src.blurry.mouse_opacity = 0
-
-	src.druggy = new src.h_type( src )
-	src.druggy.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.druggy.name = "Druggy"
-	src.druggy.icon = ui_style
-	src.druggy.icon_state = "druggy"
-	src.druggy.layer = 17
-	src.druggy.mouse_opacity = 0
-
 	var/obj/screen/using
 	var/obj/screen/inventory/inv_box
 
@@ -357,39 +323,6 @@
 	src.mov_int += using
 */
 
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = ui_style
-	using.icon_state = "dither50"
-	using.screen_loc = "1,1 to 5,15"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.vimpaired += using
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = ui_style
-	using.icon_state = "dither50"
-	using.screen_loc = "5,1 to 10,5"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.vimpaired += using
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = ui_style
-	using.icon_state = "dither50"
-	using.screen_loc = "6,11 to 10,15"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.vimpaired += using
-	using = new src.h_type( src )
-	using.name = null
-	using.icon = ui_style
-	using.icon_state = "dither50"
-	using.screen_loc = "11,1 to 15,15"
-	using.layer = 17
-	using.mouse_opacity = 0
-	src.vimpaired += using
-
 	mymob.throw_icon = new /obj/screen(null)
 	mymob.throw_icon.icon = ui_style
 	mymob.throw_icon.icon_state = "act_throw_off"
@@ -408,18 +341,6 @@
 	mymob.pressure.name = "pressure"
 	mymob.pressure.screen_loc = ui_pressure
 
-/*
-	mymob.i_select = new /obj/screen( null )
-	mymob.i_select.icon_state = "selector"
-	mymob.i_select.name = "intent"
-	mymob.i_select.screen_loc = "16:-11,15"
-
-	mymob.m_select = new /obj/screen( null )
-	mymob.m_select.icon_state = "selector"
-	mymob.m_select.name = "moving"
-	mymob.m_select.screen_loc = "16:-11,14"
-*/
-
 	mymob.toxin = new /obj/screen( null )
 	mymob.toxin.icon = ui_style
 	mymob.toxin.icon_state = "tox0"

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

@@ -532,24 +532,22 @@
 				else
 					bodytemp.icon_state = "temp-4"
 
-		client.screen -= hud_used.blurry
-		client.screen -= hud_used.druggy
-		client.screen -= hud_used.vimpaired
+		client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired)
 
-		if ((blind && stat != 2))
-			if ((blinded))
+		if(blind && stat != DEAD)
+			if(blinded)
 				blind.layer = 18
 			else
 				blind.layer = 0
 
-				if (disabilities & NEARSIGHTED)
-					client.screen += hud_used.vimpaired
+				if(disabilities & NEARSIGHTED)
+					client.screen += global_hud.vimpaired
 
-				if (eye_blurry)
-					client.screen += hud_used.blurry
+				if(eye_blurry)
+					client.screen += global_hud.blurry
 
-				if (druggy)
-					client.screen += hud_used.druggy
+				if(druggy)
+					client.screen += global_hud.druggy
 
 		if (stat != 2)
 			if (machine)

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

@@ -1,2 +1,2 @@
-/obj/hud/proc/ai_hud()
+/datum/hud/proc/ai_hud()
 	return

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

@@ -1,38 +1,8 @@
 
-/obj/hud/proc/robot_hud()
+/datum/hud/proc/robot_hud()
 
 	src.adding = list(  )
 	src.other = list(  )
-	src.vimpaired = list(  )
-	src.darkMask = list(  )
-
-	src.g_dither = new src.h_type( src )
-	src.g_dither.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.g_dither.name = "Mask"
-	src.g_dither.icon_state = "dither12g"
-	src.g_dither.layer = 18
-	src.g_dither.mouse_opacity = 0
-//
-	src.alien_view = new src.h_type(src)
-	src.alien_view.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.alien_view.name = "Alien"
-	src.alien_view.icon_state = "alien"
-	src.alien_view.layer = 18
-	src.alien_view.mouse_opacity = 0
-
-	src.blurry = new src.h_type( src )
-	src.blurry.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.blurry.name = "Blurry"
-	src.blurry.icon_state = "blurry"
-	src.blurry.layer = 17
-	src.blurry.mouse_opacity = 0
-
-	src.druggy = new src.h_type( src )
-	src.druggy.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	src.druggy.name = "Druggy"
-	src.druggy.icon_state = "druggy"
-	src.druggy.layer = 17
-	src.druggy.mouse_opacity = 0
 
 	var/obj/screen/using
 

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

@@ -237,23 +237,21 @@
 //	if (src.oxygen) src.oxygen.icon_state = "oxy[src.oxygen_alert ? 1 : 0]"
 //	if (src.fire) src.fire.icon_state = "fire[src.fire_alert ? 1 : 0]"
 
-	src.client.screen -= src.hud_used.blurry
-	src.client.screen -= src.hud_used.druggy
-	src.client.screen -= src.hud_used.vimpaired
+	client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired)
 
 	if ((src.blind && src.stat != 2))
-		if ((src.blinded))
+		if(src.blinded)
 			src.blind.layer = 18
 		else
 			src.blind.layer = 0
 			if (src.disabilities & NEARSIGHTED)
-				src.client.screen += src.hud_used.vimpaired
+				src.client.screen += global_hud.vimpaired
 
 			if (src.eye_blurry)
-				src.client.screen += src.hud_used.blurry
+				src.client.screen += global_hud.blurry
 
 			if (src.druggy)
-				src.client.screen += src.hud_used.druggy
+				src.client.screen += global_hud.druggy
 
 	if (src.stat != 2)
 		if (src.machine)

code/modules/mob/login.dm

@@ -35,7 +35,7 @@
 	client.images = null				//remove the images such as AIs being unable to see runes
 	client.screen = null				//remove hud items just in case
 	if(hud_used)	del(hud_used)		//remove the hud objects
-	hud_used = new/obj/hud( src )
+	hud_used = new /datum/hud(src)
 
 	if(!dna)
 		dna = new /datum/dna(null)

code/modules/mob/mob_defines.dm

@@ -120,7 +120,7 @@
 
 	var/seer = 0 //for cult//Carbon, probably Human
 
-	var/obj/hud/hud_used = null
+	var/datum/hud/hud_used = null
 
 	//var/list/organs = list(  ) //moved to human.
 	var/list/grabbed_by = list(  )

code/modules/mob/mob_helpers.dm

@@ -328,4 +328,50 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 		else
 			usr << "\red Inventory hiding is currently only supported for human mobs, sorry."
 	else
-		usr << "\red This mob type does not use a HUD."
+		usr << "\red This mob type does not use a HUD."
+
+//converts intent-strings into numbers and back
+var/list/intents = list("help","disarm","grab","hurt")
+/proc/intent_numeric(argument)
+	if(istext(argument))
+		switch(argument)
+			if("help")		return 0
+			if("disarm")	return 1
+			if("grab")		return 2
+			else			return 3
+	else
+		switch(argument)
+			if(0)			return "help"
+			if(1)			return "disarm"
+			if(2)			return "grab"
+			else			return "hurt"
+
+//change a mob's act-intent. Input the intent as a string such as "help" or use "right"/"left
+/mob/verb/a_intent_change(input as text)
+	set name = "a-intent"
+	set hidden = 1
+
+	if(ishuman(src) || istype(src,/mob/living/carbon/alien/humanoid))
+		switch(input)
+			if("help","disarm","grab","hurt")
+				a_intent = input
+			if("right")
+				a_intent = intent_numeric((intent_numeric(a_intent)+1) % 4)
+			if("left")
+				a_intent = intent_numeric((intent_numeric(a_intent)+3) % 4)
+		if(hud_used && hud_used.action_intent)
+			hud_used.action_intent.icon_state = "intent_[a_intent]"
+
+	else if(isrobot(src) || ismonkey(src) || islarva(src))
+		switch(input)
+			if("help")
+				a_intent = "help"
+			if("hurt")
+				a_intent = "hurt"
+			if("right","left")
+				a_intent = intent_numeric(intent_numeric(a_intent) - 3)
+		if(hud_used && hud_used.action_intent)
+			if(a_intent == "hurt")
+				hud_used.action_intent.icon_state = "harm"
+			else
+				hud_used.action_intent.icon_state = "help"

code/modules/mob/new_player/hud.dm

@@ -1,3 +1,3 @@
 
-/obj/hud/proc/unplayer_hud()
+/datum/hud/proc/unplayer_hud()
 	return

code/modules/mob/screen.dm

@@ -1,5 +1,5 @@
 /obj/screen
-	name = "screen"
+	name = ""
 	icon = 'icons/mob/screen1.dmi'
 	layer = 20.0
 	unacidable = 1