mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
- User interface updates.
(Screenshots do not use the right icon set.) Screenshots: The new minimal interface can be seen here: http://www.kamletos.si/hud%20update%204%20-%20minimum%20interface.png The full interface can be seen here: (except the nutrition indicator is not visible) http://www.kamletos.si/hud%20update%203.1.png git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3646 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz@gmail.com
@@ -266,6 +266,8 @@
|
||||
var/obj/screen/l_hand_hud_object = null
|
||||
var/list/obj/screen/intent_small_hud_objects = null
|
||||
var/show_intent_icons = 0
|
||||
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!
|
||||
|
||||
|
||||
+24
-21
@@ -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"
|
||||
@@ -42,35 +43,37 @@
|
||||
#define ui_zonesel "14:28,1:5"
|
||||
|
||||
|
||||
//Middle right (damage indicators)
|
||||
#define ui_pressure "14:28,6:13"
|
||||
#define ui_oxygen "14:28,7:15"
|
||||
#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"
|
||||
|
||||
|
||||
//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_ears "3:10,3:9"
|
||||
|
||||
#define ui_mask "1:6,4:11"
|
||||
#define ui_head "2:8,4:11"
|
||||
#define ui_ears "3:10,4:11"
|
||||
|
||||
|
||||
|
||||
|
||||
//Intent small buttons
|
||||
@@ -111,7 +114,7 @@ obj/hud/New(var/type = 0)
|
||||
if(mymob:shoes) mymob:shoes:screen_loc = ui_shoes
|
||||
if(mymob:gloves) mymob:gloves:screen_loc = ui_gloves
|
||||
if(mymob:ears) mymob:ears:screen_loc = ui_ears
|
||||
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
|
||||
@@ -122,7 +125,7 @@ obj/hud/New(var/type = 0)
|
||||
if(mymob:shoes) mymob:shoes:screen_loc = null
|
||||
if(mymob:gloves) mymob:gloves:screen_loc = null
|
||||
if(mymob:ears) mymob:ears: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
|
||||
|
||||
@@ -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"
|
||||
@@ -148,7 +149,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 +270,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 )
|
||||
@@ -512,6 +513,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
|
||||
@@ -579,6 +581,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
|
||||
@@ -711,7 +714,7 @@
|
||||
|
||||
//, mymob.i_select, mymob.m_select
|
||||
mymob.client.screen += list( 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.hands, mymob.rest, mymob.sleep) //, 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
|
||||
|
||||
@@ -747,4 +750,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
|
||||
|
||||
|
||||
|
||||
+5
-1
@@ -53,9 +53,13 @@ should be listed in the changelog upon commit tho. Thanks. -->
|
||||
<li class="rscadd">-Reverted default UI sprites to Erro's old-style UI. Config options for UI color styles coming soon. -Driest Martinis will no longer be invisible. -Braincakes are now sliceable.</li>
|
||||
<li class="tweak">-Medical borg overhaul. Instead of a dozen random pills and syringes, they get a hypospray that can switch between auto-replenishing tricordrazine, inprovaline, and spaceacillin.</li>
|
||||
</ul>
|
||||
<h3 class="author">Errorage updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="tweak">Some of the more pressing issues with the new user interface were addressed. These include the health indicator being too far up, the open inventory taking a lot of space, hotkey buttons not being removable and suit storage not being accessible enough.</li>
|
||||
<li class="rscadd">A toggle-hotkey-buttons verb was added to the OOC tab, which hides the pull, drop and throw buttons for people who prefer to use hotkeys and never use the buttons.</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="commit sansserif">
|
||||
<h2 class="date">Tuesday, May 22nd</h2>
|
||||
<h3 class="author">Icarus updated:</h3>
|
||||
|
||||
Reference in New Issue
Block a user