cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9524 from Heroman3003/shadehud2

Browse Source 
Consolidates and updates shadekin energy/darkness HUD
This commit is contained in:
Novacat
2020-12-27 02:32:55 -05:00
committed by Chompstation Bot
parent c4e352dad2
commit e8bebaf761
6 changed files with 39 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/_onclick/hud/_defines_vr.dm
View File

@@ -1,3 +1,2 @@
#define ui_shadekin_dark_display "EAST-1:28,CENTER-3:15"
#define ui_shadekin_energy_display "EAST-1:28,CENTER-4:15"
#define ui_shadekin_display "EAST-1:28,CENTER-3:15"
#define ui_xenochimera_danger_display "EAST-1:28,CENTER-3:15"

15
code/_onclick/hud/human.dm
View File

@@ -14,7 +14,7 @@
var/other = list()
var/hotkeybuttons = list()
var/slot_info = list()
HUD.adding = adding
HUD.other = other
HUD.hotkeybuttons = hotkeybuttons //These can be disabled for hotkey users
@@ -258,15 +258,10 @@
hud_elements |= healths
//VOREStation Addition begin
shadekin_dark_display = new /obj/screen/shadekin/darkness()
shadekin_dark_display.screen_loc = ui_shadekin_dark_display
shadekin_dark_display.icon_state = "dark"
hud_elements |= shadekin_dark_display
shadekin_energy_display = new /obj/screen/shadekin/energy()
shadekin_energy_display.screen_loc = ui_shadekin_energy_display
shadekin_energy_display.icon_state = "energy0"
hud_elements |= shadekin_energy_display
shadekin_display = new /obj/screen/shadekin()
shadekin_display.screen_loc = ui_shadekin_display
shadekin_display.icon_state = "shadekin"
hud_elements |= shadekin_display
xenochimera_danger_display = new /obj/screen/xenochimera/danger_level()
xenochimera_danger_display.screen_loc = ui_xenochimera_danger_display