diff --git a/code/datums/trading/weaponry.dm b/code/datums/trading/weaponry.dm index 65d99337e2c..c01ad823fe0 100644 --- a/code/datums/trading/weaponry.dm +++ b/code/datums/trading/weaponry.dm @@ -130,7 +130,8 @@ /obj/item/gun/projectile/shotgun/foldable = TRADER_THIS_TYPE, /obj/item/gun/projectile/automatic/rifle/adhomian = TRADER_THIS_TYPE, /obj/item/gun/projectile/automatic/rifle/dpra = TRADER_ALL, - /obj/item/gun/projectile/revolver/knife = TRADER_THIS_TYPE + /obj/item/gun/projectile/revolver/knife = TRADER_THIS_TYPE, + /obj/item/gun/projectile/shotgun/pump/rifle/dominia = TRADER_BLACKLIST ) diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index 3fede267071..a75efab3e21 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -344,6 +344,8 @@ ..() if(!(ammo_magazine && ammo_magazine.stored_ammo.len)) icon_state = "[icon_state]-e" + else + icon_state = "pistol" /obj/item/gun/projectile/pirate name = "zip gun" diff --git a/html/changelogs/alberyk-iconfgixes.yml b/html/changelogs/alberyk-iconfgixes.yml new file mode 100644 index 00000000000..5f79fd37b5a --- /dev/null +++ b/html/changelogs/alberyk-iconfgixes.yml @@ -0,0 +1,8 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Fixed the dpra brooch having no icon." + - bugfix: "Fixed the dominian service pistol and the 9mm pistol icons breaking." + - bugfix: "The dominian sniper rifle should no longer spawn in the tajara weapons trader." diff --git a/icons/obj/guns/dominia_pistol.dmi b/icons/obj/guns/dominia_pistol.dmi index 3862bd9cd3b..98f7e6f8c48 100644 Binary files a/icons/obj/guns/dominia_pistol.dmi and b/icons/obj/guns/dominia_pistol.dmi differ diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi index c6ead2b284a..49c264a2308 100644 Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ