diff --git a/code/datums/trading/weaponry.dm b/code/datums/trading/weaponry.dm index 0e6d4ebf126..a51c290cf5c 100644 --- a/code/datums/trading/weaponry.dm +++ b/code/datums/trading/weaponry.dm @@ -126,6 +126,7 @@ /obj/item/gun/projectile/recoilless_rifle = TRADER_THIS_TYPE, /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 ) diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 7290a916813..a4aefdb4714 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -497,13 +497,19 @@ allowed_magazines = list(/obj/item/ammo_magazine/c762/dpra) /obj/item/gun/projectile/automatic/rifle/dpra/update_icon() - ..() if(ammo_magazine) icon_state = "mrrazhak" item_state = "mrrazhak" else icon_state = "mrrazhak_nomag" item_state = "mrrazhak_nomag" + ..() + +/obj/item/gun/projectile/automatic/rifle/dpra/gold + name = "gold plated adhomian assault rifle" + desc = "The Mrrazhak Model-1 is the newest Al'mariist automatic rifle. The Mrrazhak is notorious for its simple and reliable design; it can be fabricated and assembled without the \ + need of a specialized industry or a highly trained workforce. This one is golden plated." + icon = 'icons/obj/guns/golden_mrrazhak.dmi' /obj/item/gun/projectile/automatic/tommygun name = "submachine gun" diff --git a/html/changelogs/alberyk-gunsprite.yml b/html/changelogs/alberyk-gunsprite.yml new file mode 100644 index 00000000000..62ffdd7839d --- /dev/null +++ b/html/changelogs/alberyk-gunsprite.yml @@ -0,0 +1,7 @@ +author: Alberyk, Wowzewow (Wezzy) + +delete-after: True + +changes: + - imageadd: "Added sprites for wielding the adhomian assault rifle." + - rscadd: "Added golden plated version of the adhomian assault rifle." diff --git a/icons/obj/guns/golden_mrrazhak.dmi b/icons/obj/guns/golden_mrrazhak.dmi new file mode 100644 index 00000000000..c84ac327e61 Binary files /dev/null and b/icons/obj/guns/golden_mrrazhak.dmi differ diff --git a/icons/obj/guns/mrrazhak.dmi b/icons/obj/guns/mrrazhak.dmi index 2a361083aaf..a55ff26e268 100644 Binary files a/icons/obj/guns/mrrazhak.dmi and b/icons/obj/guns/mrrazhak.dmi differ