diff --git a/code/WorkInProgress/Mloc/Shortcuts.dm b/code/WorkInProgress/Mloc/Shortcuts.dm index 8d537d15830..361e647cbc3 100644 --- a/code/WorkInProgress/Mloc/Shortcuts.dm +++ b/code/WorkInProgress/Mloc/Shortcuts.dm @@ -7,27 +7,59 @@ if("help") 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") 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" else if(changeto == -1) switch(usr.a_intent) if("help") 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("disarm") 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" if("hurt") 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("grab") 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" return \ No newline at end of file diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 7e1a3fce727..83700c3686e 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -402,7 +402,9 @@ var/obj/screen/r_hand_hud_object = null var/obj/screen/l_hand_hud_object = null var/list/obj/screen/intent_small_hud_objects = null - var/show_intent_icons = 0 + var/show_intent_icons = 1 + var/list/obj/screen/hotkeybuttons = null + var/hotkey_ui_hidden = 0 //This is to hide the buttons that can be used via hotkeys. (hotkeybuttons list of buttons) var/h_type = /obj/screen //this is like...the most pointless thing ever. Use a god damn define! diff --git a/code/game/hud.dm b/code/game/hud.dm index c100d0ca7e4..5539c8c3c40 100644 --- a/code/game/hud.dm +++ b/code/game/hud.dm @@ -12,6 +12,7 @@ //Lower center, persistant menu +#define ui_sstore1 "3:10,1:5" #define ui_id "4:12,1:5" #define ui_belt "5:14,1:5" #define ui_back "6:14,1:5" @@ -34,11 +35,12 @@ #define ui_monkey_back "6:14,1:5" //monkey //Lower right, persistant menu -#define ui_dropbutton "12:24,2:7" -#define ui_throw "13:26,2:7" -#define ui_pull "14:28,2:7" +#define ui_dropbutton "13:26,1:5" +#define ui_throw "13:26,1:5" +#define ui_pull "13:26,2:7" #define ui_acti "12:24,1:5" -#define ui_movi "13:26,1:5" + +#define ui_movi "13:26,2:7" #define ui_zonesel "14:28,1:5" //Gun buttons @@ -53,36 +55,47 @@ #define ui_fire "14:28,8:17" #define ui_toxin "14:28,9:19" +//Upper-middle right (damage indicators) +#define ui_toxin "14:28,13:27" +#define ui_fire "14:28,12:25" +#define ui_oxygen "14:28,11:23" +#define ui_pressure "14:28,10:21" + +//Middle right (status indicators) +#define ui_nutrition "14:28,5:11" +#define ui_temp "14:28,6:13" +#define ui_health "14:28,7:15" +#define ui_internal "14:28,8:17" + + //borgs #define ui_borg_health "14:28,6:13" //borgs have the health display where humans have the pressure damage indicator. #define ui_alien_health "14:28,6:13" //aliens have the health display where humans have the pressure damage indicator. - - -//Upper right (status indicators) -#define ui_nutrition "11:22,15:-5" -#define ui_internal "12:24,15:-5" -#define ui_health "13:26,15:-5" -#define ui_temp "14:28,15:-5" - +#define ui_throw_old "13:26,2:7" +#define ui_movi_old "12:24,2:7" +#define ui_pull_old "14:28,2:7" //Pop-up inventory -#define ui_shoes "1:6,2:7" -#define ui_iclothing "2:8,2:7" +#define ui_shoes "2:8,1:5" + +#define ui_iclothing "1:6,2:7" +#define ui_oclothing "2:8,2:7" #define ui_gloves "3:10,2:7" -#define ui_sstore1 "1:6,3:9" -#define ui_oclothing "2:8,3:9" -#define ui_glasses "3:10,3:9" +#define ui_glasses "1:6,3:9" +#define ui_mask "2:8,3:9" +#define ui_lear "3:10,3:9" +#define ui_rear "3:10,4:11" -#define ui_mask "1:6,4:11" #define ui_head "2:8,4:11" -#define ui_lear "3:10,4:11" -#define ui_rear "4:12,4:11" + + + //Intent small buttons -#define ui_help_small "12:8,1:1" -#define ui_disarm_small "12:15,1:18" -#define ui_grab_small "12:32,1:18" -#define ui_harm_small "12:39,1:1" +#define ui_help_small "12:16,1:-3" +#define ui_disarm_small "12:16,1:12" +#define ui_grab_small "12:32,1:12" +#define ui_harm_small "12:32,1:-3" @@ -117,7 +130,7 @@ obj/hud/New(var/type = 0) if(mymob:gloves) mymob:gloves:screen_loc = ui_gloves if(mymob:l_ear) mymob:l_ear:screen_loc = ui_lear if(mymob:r_ear) mymob:r_ear:screen_loc = ui_rear - if(mymob:s_store) mymob:s_store:screen_loc = ui_sstore1 + //if(mymob:s_store) mymob:s_store:screen_loc = ui_sstore1 if(mymob:glasses) mymob:glasses:screen_loc = ui_glasses if(mymob:w_uniform) mymob:w_uniform:screen_loc = ui_iclothing if(mymob:wear_suit) mymob:wear_suit:screen_loc = ui_oclothing @@ -129,7 +142,7 @@ obj/hud/New(var/type = 0) if(mymob:gloves) mymob:gloves:screen_loc = null if(mymob:l_ear) mymob:l_ear:screen_loc = null if(mymob:r_ear) mymob:r_ear:screen_loc = null - if(mymob:s_store) mymob:s_store:screen_loc = null + //if(mymob:s_store) mymob:s_store:screen_loc = null if(mymob:glasses) mymob:glasses:screen_loc = null if(mymob:w_uniform) mymob:w_uniform:screen_loc = null if(mymob:wear_suit) mymob:wear_suit:screen_loc = null @@ -139,6 +152,10 @@ obj/hud/New(var/type = 0) /obj/hud/var/show_otherinventory = 1 /obj/hud/var/obj/screen/action_intent +/obj/hud/var/obj/screen/hurt_intent +/obj/hud/var/obj/screen/disarm_intent +/obj/hud/var/obj/screen/help_intent +/obj/hud/var/obj/screen/grab_intent /obj/hud/var/obj/screen/move_intent /obj/hud/proc/instantiate(var/type = 0) diff --git a/code/modules/mob/living/carbon/alien/humanoid/hud.dm b/code/modules/mob/living/carbon/alien/humanoid/hud.dm index 9b48bde3e6b..67223c85fb2 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/hud.dm +++ b/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' diff --git a/code/modules/mob/living/carbon/alien/larva/hud.dm b/code/modules/mob/living/carbon/alien/larva/hud.dm index aeaba01f239..9da16a0b3bf 100644 --- a/code/modules/mob/living/carbon/alien/larva/hud.dm +++ b/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' diff --git a/code/modules/mob/living/carbon/brain/hud.dm b/code/modules/mob/living/carbon/brain/hud.dm index 1ce2c9726e3..0362b10938a 100644 --- a/code/modules/mob/living/carbon/brain/hud.dm +++ b/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" diff --git a/code/modules/mob/living/carbon/human/hud.dm b/code/modules/mob/living/carbon/human/hud.dm index 8a9cf5edbd1..086271d8d6f 100644 --- a/code/modules/mob/living/carbon/human/hud.dm +++ b/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 - */ \ No newline at end of file + */ + +/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 + + diff --git a/code/modules/mob/living/carbon/monkey/hud.dm b/code/modules/mob/living/carbon/monkey/hud.dm index 39a3d29af9b..79fe7e37c98 100644 --- a/code/modules/mob/living/carbon/monkey/hud.dm +++ b/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 diff --git a/code/modules/mob/living/silicon/robot/hud.dm b/code/modules/mob/living/silicon/robot/hud.dm index 8d74866ccf4..d272c96f3a4 100644 --- a/code/modules/mob/living/silicon/robot/hud.dm +++ b/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' diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index d0b5ae9c2f6..9cda9325cf4 100644 --- a/code/modules/mob/mob_movement.dm +++ b/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." diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index 66c5ed464a6..1e776e3dbb2 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/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 += "Age: [age]" dat += "
" - //dat += "UI Style: [UI == UI_NEW ? "New" : "Old"]
" -- UI Style no longer a thing + dat += "UI Style: [UI_style]
" dat += "Play admin midis: [midis == 1 ? "Yes" : "No"]
" dat += "Ghost ears: [ghost_ears == 0 ? "Nearest Creatures" : "All Speech"]
" dat += "Ghost sight: [ghost_sight == 0 ? "Nearest Creatures" : "All Emotes"]
" @@ -270,7 +270,7 @@ datum/preferences if(config.allow_Metadata) dat += "OOC Notes: Edit
" - 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 += "
OOC
" dat += "Change colour
__
" @@ -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 \ No newline at end of file diff --git a/code/modules/mob/new_player/savefile.dm b/code/modules/mob/new_player/savefile.dm index 177248d4ab8..30c49843a89 100644 --- a/code/modules/mob/new_player/savefile.dm +++ b/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 diff --git a/code/modules/mob/screen.dm b/code/modules/mob/screen.dm index 7bec0b2f96f..1647152ada4 100644 --- a/code/modules/mob/screen.dm +++ b/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") diff --git a/code/unused/hivebot/hud.dm b/code/unused/hivebot/hud.dm index 29414fb51b4..859b6013ac8 100644 --- a/code/unused/hivebot/hud.dm +++ b/code/unused/hivebot/hud.dm @@ -55,7 +55,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 diff --git a/icons/mob/screen1.dmi b/icons/mob/screen1.dmi index 1b935639a4e..49556de231c 100644 Binary files a/icons/mob/screen1.dmi and b/icons/mob/screen1.dmi differ diff --git a/icons/mob/screen1_Midnight.dmi b/icons/mob/screen1_Midnight.dmi index ccee9d5748d..42d15482c22 100644 Binary files a/icons/mob/screen1_Midnight.dmi and b/icons/mob/screen1_Midnight.dmi differ diff --git a/icons/mob/screen1_Orange.dmi b/icons/mob/screen1_Orange.dmi index c8d7e48afe2..e3762ef4b2b 100644 Binary files a/icons/mob/screen1_Orange.dmi and b/icons/mob/screen1_Orange.dmi differ diff --git a/icons/mob/screen1_alien.dmi b/icons/mob/screen1_alien.dmi index be825eee1e2..f13ec67347f 100644 Binary files a/icons/mob/screen1_alien.dmi and b/icons/mob/screen1_alien.dmi differ diff --git a/icons/mob/screen1_old.dmi b/icons/mob/screen1_old.dmi index 4827370a329..15ec8c958fd 100644 Binary files a/icons/mob/screen1_old.dmi and b/icons/mob/screen1_old.dmi differ