From 749eea8cb1cd570dd884febfac65b32093a051cd Mon Sep 17 00:00:00 2001 From: Geeves Date: Sun, 27 Sep 2020 17:41:21 +0200 Subject: [PATCH] Ammo Display Fix (#10096) Fixed HUD ammo displays being lopsided when ammo counts were between 20 and 9. --- code/modules/projectiles/gun.dm | 10 +++++++--- html/changelogs/geeves-ammo_display_fix.yml | 6 ++++++ 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/geeves-ammo_display_fix.yml diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index df58bbbfb61..e65e98369b8 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -928,8 +928,12 @@ if(!ismob(loc) && !ismob(loc.loc)) maptext = "" return - if(get_ammo() > 9) - maptext_x = 18 + var/ammo = get_ammo() + if(ammo > 9) + if(ammo < 20) + maptext_x = 20 + else + maptext_x = 18 else maptext_x = 22 - maptext = "[get_ammo()]" + maptext = "[ammo]" diff --git a/html/changelogs/geeves-ammo_display_fix.yml b/html/changelogs/geeves-ammo_display_fix.yml new file mode 100644 index 00000000000..f01b467140a --- /dev/null +++ b/html/changelogs/geeves-ammo_display_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Fixed HUD ammo displays being lopsided when ammo counts were between 20 and 9." \ No newline at end of file