diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm index 9c151667..62f52e83 100644 --- a/code/modules/projectiles/ammunition/ballistic/rifle.dm +++ b/code/modules/projectiles/ammunition/ballistic/rifle.dm @@ -33,3 +33,11 @@ desc = "A signiature shell from a Braton, lined with engravings." caliber = "bratonb" projectile_type = /obj/item/projectile/bullet/bratonb + +//FAL bullet +/obj/item/ammo_casing/fal762 + name = "7.62x51 bullet casing" + desc = "A 7.62x51 bullet casing. Looks to be a bit shorter than the also ancient 7.62x54r, just without the rim." + icon_state = "762fal-casing" + caliber = "762fal" + projectile_type = /obj/item/projectile/bullet/fal762 diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm index 436822ef..82f6c049 100644 --- a/code/modules/projectiles/boxes_magazines/external/rifle.dm +++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm @@ -26,4 +26,13 @@ icon_state = "bratonmag" ammo_type = /obj/item/ammo_casing/bratonmag caliber = "bratonb" - max_ammo = 60 \ No newline at end of file + max_ammo = 60 + +//FAL +/obj/item/ammo_box/magazine/falMag + name = "FAL Magazine (20rnd.)" + icon_state = "fal-mag" + ammo_type = /obj/item/ammo_casing/fal762 + caliber = "762fal" + max_ammo = 20 + multiple_sprites = 2 \ 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 36f1fcfd..c307a8db 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -223,6 +223,20 @@ fire_delay = 1 //ENDS HERE +//FAL +/obj/item/gun/ballistic/automatic/fal + name = "\improper FAL" + desc = "An ancient, but reliable battle rifle. As long as you dont get any dirt in it." + icon_state = "fal-wood" + item_state = "fal-wood" + w_class = WEIGHT_CLASS_HUGE + slot_flags = 0 + mag_type = /obj/item/ammo_box/magazine/falMag + fire_sound = 'sound/weapons/falshot.ogg' + can_suppress = FALSE + burst_size = 4 + fire_delay = 1 + /obj/item/gun/ballistic/automatic/tommygun name = "\improper Thompson SMG" desc = "Based on the classic 'Chicago Typewriter'." diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm index e54d3141..bdc93a29 100644 --- a/code/modules/projectiles/projectile/bullets/rifle.dm +++ b/code/modules/projectiles/projectile/bullets/rifle.dm @@ -18,4 +18,9 @@ // bratonmag (Braton) /obj/item/projectile/bullet/bratonb name = "braton bullet" - damage = 10 \ No newline at end of file + damage = 10 + +//FAL ammo +/obj/item/projectile/bullet/fal762 + name = "7.62x51 bullet" + damage = 42 \ 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 7c411c33..12e73096 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 f1152c77..78f7fdbf 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 e31c340a..d3532f52 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 6975fa1a..895299be 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ diff --git a/sound/weapons/falshot.ogg b/sound/weapons/falshot.ogg new file mode 100644 index 00000000..4cade964 Binary files /dev/null and b/sound/weapons/falshot.ogg differ