diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index f4500c7ce6d..68c6264b0a3 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -490,3 +490,12 @@ /obj/item/ammo_box/magazine/laser/update_icon() ..() icon_state = "[initial(icon_state)]-[Ceiling(ammo_count(0)/20)*20]" + +/obj/item/ammo_box/magazine/toy/smgm45 + name = "donksoft SMG magazine" + ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot + max_ammo = 20 + +/obj/item/ammo_box/magazine/toy/smgm45/update_icon() + ..() + icon_state = "c20r45-[round(ammo_count(),2)]" diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 1683f109cfd..a19a5bf8ed9 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -159,3 +159,21 @@ dismemberment = 0 weaken = 0 breakthings = FALSE + +//toy magazine +/obj/item/ammo_box/magazine/toy/sniper_rounds + name = "donksoft Sniper magazine" + icon_state = ".50mag" + ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot + max_ammo = 6 + +/obj/item/ammo_box/magazine/toy/sniper_rounds/update_icon() + overlays.Cut() + + var/ammo = ammo_count() + if(ammo && istype(contents[contents.len], /obj/item/ammo_casing/caseless/foam_dart/riot)) + overlays += image('icons/obj/ammo.dmi', icon_state = ".50mag-r") + else if(ammo) + overlays += image('icons/obj/ammo.dmi', icon_state = ".50mag-f") + else + icon_state = "[initial(icon_state)]" \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm index 8937fad6047..e4431f6552d 100644 --- a/code/modules/projectiles/guns/projectile/toy.dm +++ b/code/modules/projectiles/guns/projectile/toy.dm @@ -116,3 +116,15 @@ item_state = "shotgun" mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/tommygun w_class = WEIGHT_CLASS_SMALL + +/obj/item/gun/projectile/automatic/sniper_rifle/toy + name = "donksoft sniper rifle" + desc = "A recoil-operated, semi-automatic donksoft sniper rifle. Perfect to annoy/kill the neighbour’s cat! Ages 8 and up." + icon = 'icons/obj/guns/toy.dmi' + can_suppress = 0 + needs_permit = 0 + zoomable = FALSE + mag_type = /obj/item/ammo_box/magazine/toy/sniper_rounds + +/obj/item/gun/projectile/automatic/sniper_rifle/toy/process_chamber(eject_casing = 0, empty_chamber = 1) + ..() \ No newline at end of file diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index d1aa0e9805a..68e8e326c51 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/guns/toy.dmi b/icons/obj/guns/toy.dmi index a0f2a539c54..8b8a8ba2fa3 100644 Binary files a/icons/obj/guns/toy.dmi and b/icons/obj/guns/toy.dmi differ