diff --git a/code/modules/projectiles/ammunition/ballistic/pistol.dm b/code/modules/projectiles/ammunition/ballistic/pistol.dm index 13a284e9..ad962ebb 100644 --- a/code/modules/projectiles/ammunition/ballistic/pistol.dm +++ b/code/modules/projectiles/ammunition/ballistic/pistol.dm @@ -1,3 +1,9 @@ +// lato +/obj/item/ammo_casing/latob + name = "Lato-class bullet casing" + desc = "A Lato-class bullet casing. Signiature with lotus engravings." + projectile_type = /obj/item/projectile/bullet/latob + // 10mm (Stechkin) /obj/item/ammo_casing/c10mm diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm index 47c5c6d6..9c151667 100644 --- a/code/modules/projectiles/ammunition/ballistic/rifle.dm +++ b/code/modules/projectiles/ammunition/ballistic/rifle.dm @@ -26,3 +26,10 @@ caliber = "40mm" icon_state = "40mmHE" projectile_type = /obj/item/projectile/bullet/a40mm + +// bratonmag (Braton) +/obj/item/ammo_casing/bratonmag + name = "Braton-class bullet casing" + desc = "A signiature shell from a Braton, lined with engravings." + caliber = "bratonb" + projectile_type = /obj/item/projectile/bullet/bratonb diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm index dbde572d..93f3c86f 100644 --- a/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -1,3 +1,11 @@ +//Lato Ammo +/obj/item/ammo_box/magazine/latomag + name = "pistol magazine (lato)" + desc = "A magazine fitted for lato-class weapons. A lotus decal is inscribed on the backside." + icon_state = "latomag" + ammo_type = /obj/item/ammo_casing/latob + max_ammo = 15 + /obj/item/ammo_box/magazine/m10mm name = "pistol magazine (10mm)" desc = "A gun magazine." diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm index 4512ba58..436822ef 100644 --- a/code/modules/projectiles/boxes_magazines/external/rifle.dm +++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm @@ -19,3 +19,11 @@ caliber = "a556" max_ammo = 30 multiple_sprites = 2 + +//braton +/obj/item/ammo_box/magazine/bratonmag + name = "toploader magazine (braton)" + icon_state = "bratonmag" + ammo_type = /obj/item/ammo_casing/bratonmag + caliber = "bratonb" + max_ammo = 60 \ No newline at end of file diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 4bd65a7b..36f1fcfd 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -208,6 +208,21 @@ update_icon() return +//WARFRAME WEAPONS INSERT +/obj/item/gun/ballistic/automatic/braton + name = "\improper Braton" + desc = "An unusual weapon in design; sporting a high firing rate and capacity, but low damage. There is a lotus decal on the underside of the barrel." + icon_state = "braton" + item_state = "braton" + w_class = WEIGHT_CLASS_HUGE + slot_flags = 0 + mag_type = /obj/item/ammo_box/magazine/bratonmag + fire_sound = 'sound/weapons/gunshot_braton.ogg' + can_suppress = FALSE + burst_size = 5 + fire_delay = 1 +//ENDS HERE + /obj/item/gun/ballistic/automatic/tommygun name = "\improper Thompson SMG" desc = "Based on the classic 'Chicago Typewriter'." diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index 5f67194b..43e98d6f 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -21,6 +21,20 @@ var/obj/item/suppressor/S = new(src) install_suppressor(S) +//WARFRAME WEAPONS INSERT +/obj/item/gun/ballistic/automatic/pistol/lato + name = "\improper Lato" + desc = "A strange sidearm, sporting low damage but a high firing rate and capacity. There is a lotus decal on the barrel." + icon_state = "lato" + item_state = "lato" + w_class = WEIGHT_CLASS_NORMAL + mag_type = /obj/item/ammo_box/magazine/latomag + can_suppress = FALSE + fire_sound = 'sound/weapons/gunshot_lato.ogg' + fire_delay = 0 +//ENDS HERE + + /obj/item/gun/ballistic/automatic/pistol/m1911 name = "\improper M1911" desc = "A classic .45 handgun with a small magazine capacity." diff --git a/code/modules/projectiles/projectile/bullets/pistol.dm b/code/modules/projectiles/projectile/bullets/pistol.dm index b68c3847..1f94de17 100644 --- a/code/modules/projectiles/projectile/bullets/pistol.dm +++ b/code/modules/projectiles/projectile/bullets/pistol.dm @@ -14,6 +14,11 @@ damage = 10 fire_stacks = 1 +// lato +/obj/item/projectile/bullet/latob + name = "Lato-class bullet" + damage = 13 + // 10mm (Stechkin) /obj/item/projectile/bullet/c10mm diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm index ae1611cb..e54d3141 100644 --- a/code/modules/projectiles/projectile/bullets/rifle.dm +++ b/code/modules/projectiles/projectile/bullets/rifle.dm @@ -14,3 +14,8 @@ name = "enchanted 7.62 bullet" damage = 5 stamina = 80 + +// bratonmag (Braton) +/obj/item/projectile/bullet/bratonb + name = "braton bullet" + damage = 10 \ No newline at end of file diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi index 5b3efeb7..7c411c33 100644 Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi index b5c60fc8..f1152c77 100644 Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index f6f55f8b..e31c340a 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 588f58e5..6975fa1a 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ diff --git a/sound/weapons/gunshot_braton.ogg b/sound/weapons/gunshot_braton.ogg new file mode 100644 index 00000000..6929d4d6 Binary files /dev/null and b/sound/weapons/gunshot_braton.ogg differ diff --git a/sound/weapons/gunshot_lato.ogg b/sound/weapons/gunshot_lato.ogg new file mode 100644 index 00000000..c29201eb Binary files /dev/null and b/sound/weapons/gunshot_lato.ogg differ