Skip to content

Commit

Permalink
Fixes ammo counter hud position, hard del, and cleans up unused defin…
Browse files Browse the repository at this point in the history
…es (#533)

* Fixes ammo counter hud position, hard del, and borg pda ui position

* These are unused now as well
  • Loading branch information
vinylspiders authored and FFMirrorBot committed Jan 20, 2024
1 parent 8dff395 commit a9e0167
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 17 deletions.
18 changes: 1 addition & 17 deletions code/__DEFINES/~nova_defines/hud.dm
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
// ERP stuff
#define ui_vagina "LEFT+1:8,BOTTOM+4:14"
#define ui_vagina_down "LEFT+1:8,BOTTOM+1:8"
#define ui_anus "LEFT+2:10,BOTTOM+4:14"
#define ui_anus_down "LEFT+2:10,BOTTOM+1:8"
#define ui_nipples "LEFT:6,BOTTOM+5:17"
#define ui_nipples_down "LEFT:6,BOTTOM+2:11"
#define ui_penis "LEFT+1:8,BOTTOM+5:17"
#define ui_penis_down "LEFT+1:8,BOTTOM+2:11"
#define ui_erp_inventory "LEFT:6,BOTTOM+1:8"
#define ui_erp_inventory_up "LEFT:6,BOTTOM+4:14"

// Cyborg PDA
#define ui_borg_pda_send "CENTER+5:21,BOTTOM:5" // To the right of the alert panel
#define ui_borg_pda_log "CENTER+6:21,BOTTOM:5"

// Ammo counter
#define ui_ammocounter "RIGHT-1:28,CENTER-5:9"
#define ui_ammocounter "EAST-1:28,CENTER-5:9"

//Families
#define ui_wanted_lvl "NORTH,11"
2 changes: 2 additions & 0 deletions modular_nova/modules/gunhud/code/gun_hud_component.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@
if(H.is_holding(parent))
if(H.hud_used)
hud = H.hud_used.ammo_counter
RegisterSignal(user, COMSIG_QDELETING, PROC_REF(turn_off))
turn_on()
else
UnregisterSignal(user, COMSIG_QDELETING)
turn_off()

/datum/component/ammo_hud/proc/turn_on()
Expand Down

0 comments on commit a9e0167

Please sign in to comment.