HUD Update

TG: - User interface updates.
Revision: r3646
Author: 	 baloh.matevz

TG: - Added a character setup option which allows you to pick between the Midnight,
Orange and Old icon sets for the user interface.
- Deleted most of the unneeded icons from screen1_Midnight.dmi Use that as the
reference for making new icon sets.
Revision: r3647
Author: 	 baloh.matevz

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

@@ -54,34 +54,38 @@
 	using = new src.h_type( src )
 	using.name = "help"
 	using.icon = 'screen1_alien.dmi'
-	using.icon_state = "help_small"
+	using.icon_state = (mymob.a_intent == "help" ? "help_small_active" : "help_small")
 	using.screen_loc = ui_help_small
 	using.layer = 21
-	src.intent_small_hud_objects += using
+	src.adding += using
+	help_intent = using
 
 	using = new src.h_type( src )
 	using.name = "disarm"
 	using.icon = 'screen1_alien.dmi'
-	using.icon_state = "disarm_small"
+	using.icon_state = (mymob.a_intent == "disarm" ? "disarm_small_active" : "disarm_small")
 	using.screen_loc = ui_disarm_small
 	using.layer = 21
-	src.intent_small_hud_objects += using
+	src.adding += using
+	disarm_intent = using
 
 	using = new src.h_type( src )
 	using.name = "grab"
 	using.icon = 'screen1_alien.dmi'
-	using.icon_state = "grab_small"
+	using.icon_state = (mymob.a_intent == "grab" ? "grab_small_active" : "grab_small")
 	using.screen_loc = ui_grab_small
 	using.layer = 21
-	src.intent_small_hud_objects += using
+	src.adding += using
+	grab_intent = using
 
 	using = new src.h_type( src )
 	using.name = "harm"
 	using.icon = 'screen1_alien.dmi'
-	using.icon_state = "harm_small"
+	using.icon_state = (mymob.a_intent == "hurt" ? "harm_small_active" : "harm_small")
 	using.screen_loc = ui_harm_small
 	using.layer = 21
-	src.intent_small_hud_objects += using
+	src.adding += using
+	hurt_intent = using
 
 //end intent small hud objects
 
@@ -90,7 +94,7 @@
 	using.dir = SOUTHWEST
 	using.icon = 'screen1_alien.dmi'
 	using.icon_state = (mymob.m_intent == "run" ? "running" : "walking")
-	using.screen_loc = ui_movi
+	using.screen_loc = ui_movi_old
 	using.layer = 20
 	src.adding += using
 	move_intent = using
@@ -257,7 +261,7 @@
 	mymob.throw_icon.icon = 'screen1_alien.dmi'
 	mymob.throw_icon.icon_state = "act_throw_off"
 	mymob.throw_icon.name = "throw"
-	mymob.throw_icon.screen_loc = ui_throw
+	mymob.throw_icon.screen_loc = ui_throw_old
 
 	mymob.oxygen = new /obj/screen( null )
 	mymob.oxygen.icon = 'screen1_alien.dmi'
@@ -287,7 +291,7 @@
 	mymob.pullin.icon = 'screen1_alien.dmi'
 	mymob.pullin.icon_state = "pull0"
 	mymob.pullin.name = "pull"
-	mymob.pullin.screen_loc = ui_pull
+	mymob.pullin.screen_loc = ui_pull_old
 
 	mymob.blind = new /obj/screen( null )
 	mymob.blind.icon = 'screen1_alien.dmi'

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

@@ -56,7 +56,7 @@
 	using.dir = SOUTHWEST
 	using.icon = 'screen1_alien.dmi'
 	using.icon_state = (mymob.m_intent == "run" ? "running" : "walking")
-	using.screen_loc = ui_movi
+	using.screen_loc = ui_movi_old
 	using.layer = 20
 	src.adding += using
 	move_intent = using
@@ -179,7 +179,7 @@
 	mymob.pullin.icon = 'screen1_alien.dmi'
 	mymob.pullin.icon_state = "pull0"
 	mymob.pullin.name = "pull"
-	mymob.pullin.screen_loc = ui_pull
+	mymob.pullin.screen_loc = ui_pull_old
 
 	mymob.blind = new /obj/screen( null )
 	mymob.blind.icon = 'screen1_alien.dmi'

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

@@ -1,6 +1,6 @@
 /obj/hud/proc/brain_hud(var/ui_style='screen1_old.dmi')
 
-	ui_style='screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
+	//ui_style='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"

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

@@ -1,6 +1,6 @@
 /obj/hud/proc/human_hud(var/ui_style='screen1_old.dmi')
 
-	ui_style='screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
+	//ui_style='screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
 
 	src.adding = list(  )
 	src.other = list(  )
@@ -11,6 +11,7 @@
 	src.vimpaired = list(  )
 	src.darkMask = list(  )
 	src.intent_small_hud_objects = 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"
@@ -60,34 +61,38 @@
 	using = new src.h_type( src )
 	using.name = "help"
 	using.icon = ui_style
-	using.icon_state = "help_small"
+	using.icon_state = (mymob.a_intent == "help" ? "help_small_active" : "help_small")
 	using.screen_loc = ui_help_small
 	using.layer = 21
-	src.intent_small_hud_objects += using
+	src.adding += using
+	help_intent = using
 
 	using = new src.h_type( src )
 	using.name = "disarm"
 	using.icon = ui_style
-	using.icon_state = "disarm_small"
+	using.icon_state = (mymob.a_intent == "disarm" ? "disarm_small_active" : "disarm_small")
 	using.screen_loc = ui_disarm_small
 	using.layer = 21
-	src.intent_small_hud_objects += using
+	src.adding += using
+	disarm_intent = using
 
 	using = new src.h_type( src )
 	using.name = "grab"
 	using.icon = ui_style
-	using.icon_state = "grab_small"
+	using.icon_state = (mymob.a_intent == "grab" ? "grab_small_active" : "grab_small")
 	using.screen_loc = ui_grab_small
 	using.layer = 21
-	src.intent_small_hud_objects += using
+	src.adding += using
+	grab_intent = using
 
 	using = new src.h_type( src )
 	using.name = "harm"
 	using.icon = ui_style
-	using.icon_state = "harm_small"
+	using.icon_state = (mymob.a_intent == "hurt" ? "harm_small_active" : "harm_small")
 	using.screen_loc = ui_harm_small
 	using.layer = 21
-	src.intent_small_hud_objects += using
+	src.adding += using
+	hurt_intent = using
 
 //end intent small hud objects
 
@@ -148,7 +153,7 @@
 	using.icon_state = "act_drop"
 	using.screen_loc = ui_dropbutton
 	using.layer = 19
-	src.adding += using
+	src.hotkeybuttons += using
 
 	using = new src.h_type( src )
 	using.name = "i_clothing"
@@ -269,7 +274,7 @@
 	using.icon_state = "belt"
 	using.screen_loc = ui_sstore1
 	using.layer = 19
-	src.other += using
+	src.adding += using
 
 /*
 	using = new src.h_type( src )
@@ -520,6 +525,7 @@
 	mymob.throw_icon.icon_state = "act_throw_off"
 	mymob.throw_icon.name = "throw"
 	mymob.throw_icon.screen_loc = ui_throw
+	src.hotkeybuttons += mymob.throw_icon
 
 	mymob.oxygen = new /obj/screen( null )
 	mymob.oxygen.icon = ui_style
@@ -528,7 +534,7 @@
 	mymob.oxygen.screen_loc = ui_oxygen
 
 	mymob.pressure = new /obj/screen( null )
-	mymob.pressure.icon = 'screen1_old.dmi'
+	mymob.pressure.icon = ui_style
 	mymob.pressure.icon_state = "pressure0"
 	mymob.pressure.name = "pressure"
 	mymob.pressure.screen_loc = ui_pressure
@@ -587,6 +593,7 @@
 	mymob.pullin.icon_state = "pull0"
 	mymob.pullin.name = "pull"
 	mymob.pullin.screen_loc = ui_pull
+	src.hotkeybuttons += mymob.pullin
 
 	mymob.blind = new /obj/screen( null )
 	mymob.blind.icon = ui_style
@@ -728,7 +735,7 @@
 
 	//, mymob.i_select, mymob.m_select
 	mymob.client.screen += list( mymob.pain, mymob.throw_icon, mymob.zone_sel, mymob.oxygen, mymob.pressure, mymob.toxin, mymob.bodytemp, mymob.internals, mymob.fire, mymob.healths, mymob.nutrition_icon, mymob.pullin, mymob.blind, mymob.flash, mymob.gun_setting_icon) //, mymob.hands, mymob.rest, mymob.sleep, mymob.gun_setting_icon) //, mymob.mach )
-	mymob.client.screen += src.adding + src.other
+	mymob.client.screen += src.adding + src.other + src.hotkeybuttons
 
 	//if(istype(mymob,/mob/living/carbon/monkey)) mymob.client.screen += src.mon_blo
 
@@ -764,4 +771,18 @@
 	using.screen_loc = "1,1 to 2,2"
 	using.layer = 19
 	src.adding += using
-	*/
+	*/
+
+/mob/living/carbon/human/verb/toggle_hotkey_verbs()
+	set category = "OOC"
+	set name = "Toggle hotkey buttons"
+	set desc = "This disables or enables the user interface buttons which can be used with hotkeys."
+
+	if(hud_used.hotkey_ui_hidden)
+		client.screen += src.hud_used.hotkeybuttons
+		src.hud_used.hotkey_ui_hidden = 0
+	else
+		client.screen -= src.hud_used.hotkeybuttons
+		src.hud_used.hotkey_ui_hidden = 1
+
+

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

@@ -1,6 +1,6 @@
 /obj/hud/proc/monkey_hud(var/ui_style='screen1_old.dmi')
 
-	ui_style='screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
+	//ui_style='screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
 
 	src.adding = list(  )
 	src.other = list(  )
@@ -62,34 +62,38 @@
 	using = new src.h_type( src )
 	using.name = "help"
 	using.icon = ui_style
-	using.icon_state = "help_small"
+	using.icon_state = (mymob.a_intent == "help" ? "help_small_active" : "help_small")
 	using.screen_loc = ui_help_small
 	using.layer = 21
-	src.intent_small_hud_objects += using
+	src.adding += using
+	help_intent = using
 
 	using = new src.h_type( src )
 	using.name = "disarm"
 	using.icon = ui_style
-	using.icon_state = "disarm_small"
+	using.icon_state = (mymob.a_intent == "disarm" ? "disarm_small_active" : "disarm_small")
 	using.screen_loc = ui_disarm_small
 	using.layer = 21
-	src.intent_small_hud_objects += using
+	src.adding += using
+	disarm_intent = using
 
 	using = new src.h_type( src )
 	using.name = "grab"
 	using.icon = ui_style
-	using.icon_state = "grab_small"
+	using.icon_state = (mymob.a_intent == "grab" ? "grab_small_active" : "grab_small")
 	using.screen_loc = ui_grab_small
 	using.layer = 21
-	src.intent_small_hud_objects += using
+	src.adding += using
+	grab_intent = using
 
 	using = new src.h_type( src )
 	using.name = "harm"
 	using.icon = ui_style
-	using.icon_state = "harm_small"
+	using.icon_state = (mymob.a_intent == "hurt" ? "harm_small_active" : "harm_small")
 	using.screen_loc = ui_harm_small
 	using.layer = 21
-	src.intent_small_hud_objects += using
+	src.adding += using
+	hurt_intent = using
 
 //end intent small hud objects
 
@@ -447,7 +451,7 @@
 	mymob.oxygen.screen_loc = ui_oxygen
 
 	mymob.pressure = new /obj/screen( null )
-	mymob.pressure.icon = 'screen1_old.dmi'
+	mymob.pressure.icon = ui_style
 	mymob.pressure.icon_state = "pressure0"
 	mymob.pressure.name = "pressure"
 	mymob.pressure.screen_loc = ui_pressure

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

@@ -47,7 +47,7 @@
 	using.dir = SOUTHWEST
 	using.icon = 'screen1_robot.dmi'
 	using.icon_state = "radio"
-	using.screen_loc = ui_movi
+	using.screen_loc = ui_movi_old
 	using.layer = 20
 	src.adding += using
 
@@ -166,7 +166,7 @@
 	using.name = "panel"
 	using.icon = 'screen1_robot.dmi'
 	using.icon_state = "panel"
-	using.screen_loc = ui_throw
+	using.screen_loc = ui_throw_old
 	using.layer = 19
 	src.adding += using
 
@@ -202,7 +202,7 @@
 	mymob.pullin.icon = 'screen1_robot.dmi'
 	mymob.pullin.icon_state = "pull0"
 	mymob.pullin.name = "pull"
-	mymob.pullin.screen_loc = ui_pull
+	mymob.pullin.screen_loc = ui_pull_old
 
 	mymob.blind = new /obj/screen( null )
 	mymob.blind.icon = 'screen1_robot.dmi'

code/modules/mob/mob_movement.dm

@@ -76,11 +76,17 @@
 				else
 					usr.a_intent = "disarm"
 					usr.hud_used.action_intent.icon_state = "disarm"
-
+					usr.hud_used.hurt_intent.icon_state = "harm_small"
+					usr.hud_used.help_intent.icon_state = "help_small"
+					usr.hud_used.grab_intent.icon_state = "grab_small"
+					usr.hud_used.disarm_intent.icon_state = "disarm_small_active"
 			if("disarm")
 				usr.a_intent = "hurt"
 				usr.hud_used.action_intent.icon_state = "harm"
-
+				usr.hud_used.hurt_intent.icon_state = "harm_small_active"
+				usr.hud_used.help_intent.icon_state = "help_small"
+				usr.hud_used.grab_intent.icon_state = "grab_small"
+				usr.hud_used.disarm_intent.icon_state = "disarm_small"
 			if("hurt")
 				if(issilicon(usr))
 					usr.a_intent = "help"
@@ -88,10 +94,17 @@
 				else
 					usr.a_intent = "grab"
 					usr.hud_used.action_intent.icon_state = "grab"
-
+					usr.hud_used.hurt_intent.icon_state = "harm_small"
+					usr.hud_used.help_intent.icon_state = "help_small"
+					usr.hud_used.grab_intent.icon_state = "grab_small_active"
+					usr.hud_used.disarm_intent.icon_state = "disarm_small"
 			if("grab")
 				usr.a_intent = "help"
 				usr.hud_used.action_intent.icon_state = "help"
+				usr.hud_used.hurt_intent.icon_state = "harm_small"
+				usr.hud_used.help_intent.icon_state = "help_small_active"
+				usr.hud_used.grab_intent.icon_state = "grab_small"
+				usr.hud_used.disarm_intent.icon_state = "disarm_small"
 		usr << "\blue Your intent is now \"[usr.a_intent]\"."
 	else
 		usr << "\red This mob type does not use intents."

code/modules/mob/new_player/preferences.dm

@@ -47,95 +47,95 @@ var/const
 
 
 datum/preferences
-	var
-		real_name
-		be_random_name = 0
-		gender = MALE
-		age = 30.0
-		b_type = "A+"
+	var/real_name
+	var/be_random_name = 0
+	var/gender = MALE
+	var/age = 30.0
+	var/b_type = "A+"
 
 		//Special role selection
-		be_special = 0
+	var/be_special = 0
 		//Play admin midis
-		midis = 1
+	var/midis = 1
 		//Toggle ghost ears
-		ghost_ears = 1
-		ghost_sight = 1
+	var/ghost_ears = 1
+	var/ghost_sight = 1
 		//Play pregame music
-		pregame_music = 1
+	var/pregame_music = 1
 		//Saved changlog filesize to detect if there was a change
-		lastchangelog = 0
+	var/lastchangelog = 0
 
 		//Just like it sounds
-		ooccolor = "#b82e00"
-		underwear = 1
-		list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "None") //Curse whoever made male/female underwear diffrent colours
-		list/underwear_f = list("Red", "White", "Yellow", "Blue", "Black", "None")
-		backbag = 2
-		list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt")
+	var/ooccolor = "#b82e00"
+	var/underwear = 1
+	var/list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "None") //Curse whoever made male/female underwear diffrent colours
+	var/list/underwear_f = list("Red", "White", "Yellow", "Blue", "Black", "None")
+	var/backbag = 2
+	var/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt")
 
 		//Hair type
-		h_style = "Short Hair"
-		datum/sprite_accessory/hair/hair_style
+	var/h_style = "Short Hair"
+	var/datum/sprite_accessory/hair/hair_style
 		//Hair color
-		r_hair = 0
-		g_hair = 0
-		b_hair = 0
+	var/r_hair = 0
+	var/g_hair = 0
+	var/b_hair = 0
 
 		//Face hair type
-		f_style = "Shaved"
-		datum/sprite_accessory/facial_hair/facial_hair_style
+	var/f_style = "Shaved"
+	var/datum/sprite_accessory/facial_hair/facial_hair_style
 		//Face hair color
-		r_facial = 0
-		g_facial = 0
-		b_facial = 0
+	var/r_facial = 0
+	var/g_facial = 0
+	var/b_facial = 0
 
 		//Species
-		species = "Human"
+	var/species = "Human"
 
 		//Skin color
-		s_tone = 0
+	var/s_tone = 0
 
 		//Eye color
-		r_eyes = 0
-		g_eyes = 0
-		b_eyes = 0
+	var/r_eyes = 0
+	var/g_eyes = 0
+	var/b_eyes = 0
 
 		//UI style
-		UI = UI_OLD
+		//UI = UI_OLD
+	var/UI_style = "Midnight"
 
 		//Mob preview
-		icon/preview_icon = null
-		preview_dir = SOUTH
+	var/icon/preview_icon = null
+	var/preview_dir = SOUTH
 
 		//Jobs, uses bitflags
-		job_civilian_high = 0
-		job_civilian_med = 0
-		job_civilian_low = 0
+	var/job_civilian_high = 0
+	var/job_civilian_med = 0
+	var/job_civilian_low = 0
 
-		job_medsci_high = 0
-		job_medsci_med = 0
-		job_medsci_low = 0
+	var/job_medsci_high = 0
+	var/job_medsci_med = 0
+	var/job_medsci_low = 0
 
-		job_engsec_high = 0
-		job_engsec_med = 0
-		job_engsec_low = 0
+	var/job_engsec_high = 0
+	var/job_engsec_med = 0
+	var/job_engsec_low = 0
 
-		list/job_alt_titles = new()		// the default name of a job like "Medical Doctor"
+	var/list/job_alt_titles = new()		// the default name of a job like "Medical Doctor"
 
-		flavor_text = ""
+	var/flavor_text = ""
 
 		// slot stuff (Why were they var/var?  --SkyMarshal)
-		slotname
-		curslot = 0
-		disabilities = 0
+	var/slotname
+	var/curslot = 0
+	var/disabilities = 0
 
-		used_skillpoints = 0
-		skill_specialization = null
-		list/skills = list() // skills can range from 0 to 3
+	var/used_skillpoints = 0
+	var/skill_specialization = null
+	var/list/skills = list() // skills can range from 0 to 3
 
 		// OOC Metadata:
-		metadata = ""
+	var/metadata = ""
 
 
 	New()
@@ -262,7 +262,7 @@ datum/preferences
 		dat += "<b>Age:</b> <a href='byond://?src=\ref[user];preferences=1;age=input'>[age]</a>"
 
 		dat += "<br>"
-		//dat += "<b>UI Style:</b> <a href=\"byond://?src=\ref[user];preferences=1;UI=input\"><b>[UI == UI_NEW ? "New" : "Old"]</b></a><br>" -- UI Style no longer a thing
+		dat += "<b>UI Style:</b> <a href=\"byond://?src=\ref[user];preferences=1;UI=input\"><b>[UI_style]</b></a><br>"
 		dat += "<b>Play admin midis:</b> <a href=\"byond://?src=\ref[user];preferences=1;midis=input\"><b>[midis == 1 ? "Yes" : "No"]</b></a><br>"
 		dat += "<b>Ghost ears:</b> <a href=\"byond://?src=\ref[user];preferences=1;ghost_ears=input\"><b>[ghost_ears == 0 ? "Nearest Creatures" : "All Speech"]</b></a><br>"
 		dat += "<b>Ghost sight:</b> <a href=\"byond://?src=\ref[user];preferences=1;ghost_sight=input\"><b>[ghost_sight == 0 ? "Nearest Creatures" : "All Emotes"]</b></a><br>"
@@ -270,7 +270,7 @@ datum/preferences
 		if(config.allow_Metadata)
 			dat += "<b>OOC Notes:</b> <a href='byond://?src=\ref[user];preferences=1;OOC=input'> Edit </a><br>"
 
-		if((user.client) && (user.client.holder) && (user.client.holder.rank) && (user.client.holder.rank == "Game Master"))
+		if((user.client) && (user.client.holder) && (user.client.holder.rank) && (user.client.holder.level >= 5))
 			dat += "<hr><b>OOC</b><br>"
 			dat += "<a href='byond://?src=\ref[user];preferences=1;ooccolor=input'>Change colour</a> <font face=\"fixedsys\" size=\"3\" color=\"[ooccolor]\"><table style='display:inline;'  bgcolor=\"[ooccolor]\"><tr><td>__</td></tr></table></font>"
 
@@ -847,10 +847,15 @@ datum/preferences
 				gender = MALE
 
 		if(link_tags["UI"])
-			if(UI == UI_OLD)
-				UI = UI_NEW
-			else
-				UI = UI_OLD
+			switch(UI_style)
+				if("Midnight")
+					UI_style = "Orange"
+				if("Orange")
+					UI_style = "old"
+				if("old")
+					UI_style = "Midnight"
+				else
+					UI_style = "Midnight"
 
 		if(link_tags["midis"])
 			midis = !midis
@@ -983,7 +988,8 @@ datum/preferences
 			b_eyes = 0.0
 			s_tone = 0.0
 			b_type = "A+"
-			UI = UI_OLD
+			//UI = UI_OLD
+			UI_style = "Midnight"
 			midis = 1
 			ghost_ears = 1
 			disabilities = 0
@@ -1028,11 +1034,15 @@ datum/preferences
 		character.h_style = h_style
 		character.f_style = f_style
 
-		switch (UI)
-			if(UI_OLD)
+		switch(UI_style)
+			if("Midnight")
+				character.UI = 'screen1_Midnight.dmi'
+			if("Orange")
+				character.UI = 'screen1_Orange.dmi'
+			if("old")
 				character.UI = 'screen1_old.dmi'
-			if(UI_NEW)
-				character.UI = 'screen1.dmi'
+			else
+				character.UI = 'screen1_Midnight.dmi'
 
 		character.hair_style = hair_style
 		character.facial_hair_style = facial_hair_style
@@ -1093,4 +1103,4 @@ datum/preferences
 		character.disabilities = disabilities
 
 #undef UI_OLD
-#undef UI_NEW
+#undef UI_NEW

code/modules/mob/new_player/savefile.dm

@@ -139,7 +139,10 @@ datum/preferences/proc/savefile_save(mob/user, slot)
 
 
 	F["be_special"] << src.be_special
-	F["UI"] << src.UI
+	//F["UI"] << src.UI
+	if(isnull(UI_style))
+		UI_style = "Midnight"
+	F["UI_style"] << UI_style
 	F["midis"] << src.midis
 	F["ghost_ears"] << src.ghost_ears
 	F["ghost_sight"] << src.ghost_sight
@@ -222,7 +225,10 @@ datum/preferences/proc/savefile_load(mob/user, slot)
 	if(isnull(ghost_sight)) ghost_sight = 1 //Hotfix
 	F["ooccolor"] >> src.ooccolor
 	F["lastchangelog"] >> src.lastchangelog
-	F["UI"] >> src.UI
+	//F["UI"] >> src.UI
+	F["UI_style"] >> src.UI_style
+	if(isnull(UI_style))
+		UI_style = "Midnight"
 	F["be_special"] >> src.be_special
 
 	F["job_civilian_high"] >> src.job_civilian_high

code/modules/mob/screen.dm

@@ -452,21 +452,37 @@
 		if("help")
 			usr.a_intent = "help"
 			usr.hud_used.action_intent.icon_state = "help"
+			usr.hud_used.hurt_intent.icon_state = "harm_small"
+			usr.hud_used.help_intent.icon_state = "help_small_active"
+			usr.hud_used.grab_intent.icon_state = "grab_small"
+			usr.hud_used.disarm_intent.icon_state = "disarm_small"
 			usr.hud_used.show_intent_icons = 0
 			usr.client.screen -= usr.hud_used.intent_small_hud_objects
 		if("harm")
 			usr.a_intent = "hurt"
 			usr.hud_used.action_intent.icon_state = "harm"
+			usr.hud_used.hurt_intent.icon_state = "harm_small_active"
+			usr.hud_used.help_intent.icon_state = "help_small"
+			usr.hud_used.grab_intent.icon_state = "grab_small"
+			usr.hud_used.disarm_intent.icon_state = "disarm_small"
 			usr.hud_used.show_intent_icons = 0
 			usr.client.screen -= usr.hud_used.intent_small_hud_objects
 		if("grab")
 			usr.a_intent = "grab"
 			usr.hud_used.action_intent.icon_state = "grab"
+			usr.hud_used.hurt_intent.icon_state = "harm_small"
+			usr.hud_used.help_intent.icon_state = "help_small"
+			usr.hud_used.grab_intent.icon_state = "grab_small_active"
+			usr.hud_used.disarm_intent.icon_state = "disarm_small"
 			usr.hud_used.show_intent_icons = 0
 			usr.client.screen -= usr.hud_used.intent_small_hud_objects
 		if("disarm")
 			usr.a_intent = "disarm"
 			usr.hud_used.action_intent.icon_state = "disarm"
+			usr.hud_used.hurt_intent.icon_state = "harm_small"
+			usr.hud_used.help_intent.icon_state = "help_small"
+			usr.hud_used.grab_intent.icon_state = "grab_small"
+			usr.hud_used.disarm_intent.icon_state = "disarm_small_active"
 			usr.hud_used.show_intent_icons = 0
 			usr.client.screen -= usr.hud_used.intent_small_hud_objects
 		if("pull")