diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index f1a7f222484..a3a8d563725 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -114,8 +114,10 @@ #define ui_temp "EAST-1:28,CENTER-2:13" #define ui_health "EAST-1:28,CENTER-1:15" #define ui_internal "EAST-1:28,CENTER:17" +#define ui_under_health "EAST-1:28,CENTER-2:13" //borgs #define ui_borg_health "EAST-1:28,CENTER-2:13" //borgs have the health display where humans have the pressure damage indicator. +#define ui_borg_under_health "EAST-1:31,CENTER-3:13" #define ui_alien_health "EAST-1:28,CENTER-2:13" //aliens have the health display where humans have the pressure damage indicator. #define ui_ling_chemical_display "EAST-1:28,CENTER-3:15" diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 1b4d2cb92e2..38b20bb8b75 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -160,6 +160,15 @@ using.alpha = HUD.ui_alpha adding += using + using = new /obj/screen() + using.icon = HUD.ui_style + using.icon_state = "use" + using.name = "use held item on self" + using.screen_loc = ui_swaphand2 + using.color = HUD.ui_color + using.alpha = HUD.ui_alpha + adding |= using + inv_box = new /obj/screen/inventory/hand() inv_box.hud = HUD inv_box.name = "r_hand" @@ -261,16 +270,53 @@ autowhisper_display.icon = 'icons/mob/screen/minimalist.dmi' autowhisper_display.icon_state = "autowhisper" autowhisper_display.name = "autowhisper" - autowhisper_display.screen_loc = "EAST-1:28,CENTER-2:13" + autowhisper_display.screen_loc = ui_under_health hud_elements |= autowhisper_display var/obj/screen/aw = new /obj/screen() aw.icon = 'icons/mob/screen/minimalist.dmi' aw.icon_state = "aw-select" aw.name = "autowhisper mode" - aw.screen_loc = "EAST-1:28,CENTER-2:13" + aw.screen_loc = ui_under_health hud_elements |= aw + aw = new /obj/screen() + aw.icon = 'icons/mob/screen/minimalist.dmi' + aw.icon_state = "lang" + aw.name = "check known languages" + aw.screen_loc = ui_under_health + hud_elements |= aw + + aw = new /obj/screen() + aw.icon = 'icons/mob/screen/minimalist.dmi' + aw.icon_state = "pose" + aw.name = "set pose" + aw.screen_loc = ui_under_health + hud_elements |= aw + + aw = new /obj/screen() + aw.icon = 'icons/mob/screen/minimalist.dmi' + aw.icon_state = "up" + aw.name = "move upwards" + aw.screen_loc = ui_under_health + hud_elements |= aw + + aw = new /obj/screen() + aw.icon = 'icons/mob/screen/minimalist.dmi' + aw.icon_state = "down" + aw.name = "move downwards" + aw.screen_loc = ui_under_health + hud_elements |= aw + + aw = new /obj/screen() + aw.icon = HUD.ui_style + aw.icon_state = "use" + aw.name = "use held item on self" + aw.screen_loc = ui_swaphand2 + using.color = HUD.ui_color + using.alpha = HUD.ui_alpha + adding |= using + //VOREStation Addition begin shadekin_display = new /obj/screen/shadekin() shadekin_display.screen_loc = ui_shadekin_display diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 123557a4667..055b9153842 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -94,16 +94,43 @@ var/obj/screen/robot_inventory autowhisper_display.icon = 'icons/mob/screen/minimalist.dmi' autowhisper_display.icon_state = "autowhisper" autowhisper_display.name = "autowhisper" - autowhisper_display.screen_loc = "EAST-1:31,CENTER-3:13" + autowhisper_display.screen_loc = ui_borg_under_health other |= autowhisper_display var/obj/screen/aw = new /obj/screen() aw.icon = 'icons/mob/screen/minimalist.dmi' aw.icon_state = "aw-select" aw.name = "autowhisper mode" - aw.screen_loc = "EAST-1:31,CENTER-3:13" + aw.screen_loc = ui_borg_under_health other |= aw + aw = new /obj/screen() + aw.icon = 'icons/mob/screen/minimalist.dmi' + aw.icon_state = "lang" + aw.name = "check known languages" + aw.screen_loc = ui_borg_under_health + other |= aw + + aw = new /obj/screen() + aw.icon = 'icons/mob/screen/minimalist.dmi' + aw.icon_state = "pose" + aw.name = "set pose" + aw.screen_loc = ui_borg_under_health + other |= aw + + aw = new /obj/screen() + aw.icon = 'icons/mob/screen/minimalist.dmi' + aw.icon_state = "up" + aw.name = "move upwards" + aw.screen_loc = ui_borg_under_health + other |= aw + + aw = new /obj/screen() + aw.icon = 'icons/mob/screen/minimalist.dmi' + aw.icon_state = "down" + aw.name = "move downwards" + aw.screen_loc = ui_borg_under_health + other |= aw //Installed Module hands = new /obj/screen() diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 581d8579b45..c16e5c7cfa4 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -462,6 +462,28 @@ if(isliving(usr)) var/mob/living/u = usr u.autowhisper_mode() + if("check known languages") + usr.check_languages() + if("set pose") + if(ishuman(usr)) + var/mob/living/carbon/human/u = usr + u.pose() + else if (issilicon(usr)) + var/mob/living/silicon/u = usr + u.pose() + if("move upwards") + usr.up() + if("move downwards") + usr.down() + + if("use held item on self") + if(ishuman(usr)) + var/mob/living/carbon/human/u = usr + var/obj/item/i = u.get_active_hand() + if(i) + i.attack(usr, usr) + else + to_chat(usr, "You're not holding anything to use.") if("module") if(isrobot(usr)) diff --git a/code/modules/mob/living/silicon/pai/pai_hud.dm b/code/modules/mob/living/silicon/pai/pai_hud.dm index db9581a4f34..2c53c3d26a0 100644 --- a/code/modules/mob/living/silicon/pai/pai_hud.dm +++ b/code/modules/mob/living/silicon/pai/pai_hud.dm @@ -339,6 +339,33 @@ aw.screen_loc = "EAST-1:28,CENTER-2:13" hud_elements |= aw + aw = new /obj/screen() + aw.icon = 'icons/mob/screen/minimalist.dmi' + aw.icon_state = "lang" + aw.name = "check known languages" + aw.screen_loc = ui_under_health + hud_elements |= aw + + aw = new /obj/screen() + aw.icon = 'icons/mob/screen/minimalist.dmi' + aw.icon_state = "pose" + aw.name = "set pose" + aw.screen_loc = ui_under_health + hud_elements |= aw + + aw = new /obj/screen() + aw.icon = 'icons/mob/screen/minimalist.dmi' + aw.icon_state = "up" + aw.name = "move upwards" + aw.screen_loc = ui_under_health + hud_elements |= aw + + aw = new /obj/screen() + aw.icon = 'icons/mob/screen/minimalist.dmi' + aw.icon_state = "down" + aw.name = "move downwards" + aw.screen_loc = ui_under_health + hud_elements |= aw if(client) client.screen = list() diff --git a/code/modules/mob/living/simple_mob/simple_hud.dm b/code/modules/mob/living/simple_mob/simple_hud.dm index 1dc784be967..fd1a79c4404 100644 --- a/code/modules/mob/living/simple_mob/simple_hud.dm +++ b/code/modules/mob/living/simple_mob/simple_hud.dm @@ -172,6 +172,26 @@ aw.screen_loc = "EAST-1:28,CENTER-2:13" hud_elements |= aw + aw = new /obj/screen() + aw.icon = 'icons/mob/screen/minimalist.dmi' + aw.icon_state = "lang" + aw.name = "check known languages" + aw.screen_loc = ui_under_health + hud_elements |= aw + + aw = new /obj/screen() + aw.icon = 'icons/mob/screen/minimalist.dmi' + aw.icon_state = "up" + aw.name = "move upwards" + aw.screen_loc = ui_under_health + hud_elements |= aw + + aw = new /obj/screen() + aw.icon = 'icons/mob/screen/minimalist.dmi' + aw.icon_state = "down" + aw.name = "move downwards" + aw.screen_loc = ui_under_health + hud_elements |= aw pain = new /obj/screen( null ) diff --git a/icons/mob/screen/holo.dmi b/icons/mob/screen/holo.dmi index 5bfc9e53249..5c368b9deb0 100644 Binary files a/icons/mob/screen/holo.dmi and b/icons/mob/screen/holo.dmi differ diff --git a/icons/mob/screen/midnight.dmi b/icons/mob/screen/midnight.dmi index 868e1db2c97..a8f7e37cdc3 100644 Binary files a/icons/mob/screen/midnight.dmi and b/icons/mob/screen/midnight.dmi differ diff --git a/icons/mob/screen/minimalist.dmi b/icons/mob/screen/minimalist.dmi index 4b5d91252fc..45fe481bb37 100644 Binary files a/icons/mob/screen/minimalist.dmi and b/icons/mob/screen/minimalist.dmi differ diff --git a/icons/mob/screen/old-noborder.dmi b/icons/mob/screen/old-noborder.dmi index 384362d7307..fc982a16644 100644 Binary files a/icons/mob/screen/old-noborder.dmi and b/icons/mob/screen/old-noborder.dmi differ diff --git a/icons/mob/screen/old.dmi b/icons/mob/screen/old.dmi index b625199f0fc..6009288af24 100644 Binary files a/icons/mob/screen/old.dmi and b/icons/mob/screen/old.dmi differ diff --git a/icons/mob/screen/orange.dmi b/icons/mob/screen/orange.dmi index 3abd4dc7b7a..e56e148b124 100644 Binary files a/icons/mob/screen/orange.dmi and b/icons/mob/screen/orange.dmi differ diff --git a/icons/mob/screen/white.dmi b/icons/mob/screen/white.dmi index b2250c7ccf9..e075560fb81 100644 Binary files a/icons/mob/screen/white.dmi and b/icons/mob/screen/white.dmi differ