From ed89b55ce9dc536a238d796b006028a910dd990b Mon Sep 17 00:00:00 2001
From: Valtor <156955117+Samirakis@users.noreply.github.com>
Date: Sat, 25 May 2024 16:09:03 +0300
Subject: [PATCH] bugfix: Incorrect display of ammo in the clip (#5083)
* fix
* update_appearance
---
code/game/objects/items/weapons/storage/boxes.dm | 2 +-
code/modules/projectiles/guns/projectile.dm | 4 ++--
code/modules/projectiles/guns/projectile/automatic.dm | 2 +-
code/modules/projectiles/guns/projectile/saw.dm | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 8354967b9e0..ffbedc986a3 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -1030,7 +1030,7 @@
gun.attackby(MA, user)
if(magazine)
magazine.loc = src
- magazine.update_icon()
+ magazine.update_appearance(UPDATE_ICON | UPDATE_DESC)
return
/obj/item/storage/box/sec
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index cfd7ce2cce3..d7ba9b9b010 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -109,7 +109,7 @@
else
to_chat(user, span_notice("You perform a tactical reload on \the [src], replacing the magazine."))
magazine.loc = get_turf(loc)
- magazine.update_icon()
+ magazine.update_appearance(UPDATE_ICON | UPDATE_DESC)
magazine = null
reload(AM, user)
return TRUE
@@ -162,7 +162,7 @@
if(magazine)
magazine.loc = get_turf(loc)
user.put_in_hands(magazine)
- magazine.update_icon()
+ magazine.update_appearance(UPDATE_ICON | UPDATE_DESC)
magazine = null
update_weight()
to_chat(user, span_notice("You pull the magazine out of \the [src]!"))
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 121f53aef71..18ea045c42d 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -40,7 +40,7 @@
if(magazine)
to_chat(user, "You perform a tactical reload on \the [src], replacing the magazine.")
magazine.loc = get_turf(loc)
- magazine.update_icon()
+ magazine.update_appearance(UPDATE_ICON | UPDATE_DESC)
magazine = null
else
to_chat(user, "You insert the magazine into \the [src].")
diff --git a/code/modules/projectiles/guns/projectile/saw.dm b/code/modules/projectiles/guns/projectile/saw.dm
index 5767634b752..93c1c9c598b 100644
--- a/code/modules/projectiles/guns/projectile/saw.dm
+++ b/code/modules/projectiles/guns/projectile/saw.dm
@@ -46,7 +46,7 @@
..()
else if(cover_open && magazine)
//drop the mag
- magazine.update_icon()
+ magazine.update_appearance(UPDATE_ICON | UPDATE_DESC)
magazine.loc = get_turf(loc)
user.put_in_hands(magazine)
magazine = null