diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm index f1fc300fef903..4cd51969584fd 100755 --- a/code/game/objects/effects/landmarks/landmarks.dm +++ b/code/game/objects/effects/landmarks/landmarks.dm @@ -243,6 +243,7 @@ weapon_list = list( /obj/item/weapon/gun/energy/lasgun/M43/practice, /obj/item/weapon/gun/energy/lasgun/lasrifle/tesla, + /obj/item/weapon/gun/rifle/pepperball, /obj/item/weapon/gun/grenade_launcher/single_shot/flare, /obj/item/weapon/gun/pistol/standard_pistol, /obj/item/weapon/gun/pistol/standard_pocketpistol, @@ -258,11 +259,15 @@ /obj/item/weapon/gun/pistol/highpower, /obj/item/weapon/gun/pistol/vp70, /obj/item/weapon/gun/pistol/vp78, + /obj/item/weapon/gun/pistol/som, + /obj/item/weapon/gun/pistol/icc_dpistol, /obj/item/weapon/gun/revolver/standard_revolver, /obj/item/weapon/gun/revolver/single_action/m44, /obj/item/weapon/gun/revolver/upp, /obj/item/weapon/gun/revolver/small, /obj/item/weapon/gun/revolver/cmb, + /obj/item/weapon/gun/revolver/judge, + /obj/item/weapon/gun/shotgun/double/derringer, /obj/item/weapon/claymore/mercsword/machete, /obj/item/weapon/katana/replica, /obj/item/weapon/combat_knife, @@ -285,9 +290,11 @@ /obj/item/weapon/gun/shotgun/pump/lever, /obj/item/weapon/gun/pistol/g22/tranq, /obj/item/weapon/gun/pistol/m1911/custom, + /obj/item/weapon/gun/pistol/plasma_pistol, /obj/item/weapon/gun/revolver/mateba, /obj/item/weapon/gun/revolver/mateba/notmarine, /obj/item/weapon/gun/revolver/mateba/custom, + /obj/item/weapon/gun/revolver/standard_magnum, /obj/item/weapon/gun/smg/standard_machinepistol, /obj/item/weapon/gun/smg/standard_smg, /obj/item/weapon/gun/smg/m25, @@ -295,6 +302,9 @@ /obj/item/weapon/gun/smg/skorpion, /obj/item/weapon/gun/smg/ppsh, /obj/item/weapon/gun/smg/uzi, + /obj/item/weapon/gun/smg/icc_machinepistol/medic, + /obj/item/weapon/gun/smg/icc_pdw/standard, + /obj/item/weapon/gun/smg/som/veteran, /obj/item/weapon/claymore, /obj/item/weapon/claymore/mercsword, /obj/item/weapon/claymore/mercsword/captain, @@ -303,6 +313,10 @@ /obj/item/weapon/twohanded/fireaxe, /obj/item/weapon/twohanded/spear, /obj/item/weapon/twohanded/glaive, + /obj/item/weapon/gun/rifle/garand, + /obj/item/weapon/gun/shotgun/pump/lever/repeater, + /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol, + /obj/item/weapon/gun/shotgun/double/martini, ) /obj/effect/landmark/weapon_spawn/tier3_weapon_spawn @@ -316,6 +330,7 @@ /obj/item/weapon/gun/rifle/m412, /obj/item/weapon/gun/rifle/m41a, /obj/item/weapon/gun/rifle/mpi_km, + /obj/item/weapon/gun/rifle/mpi_km/black, /obj/item/weapon/gun/rifle/m16, /obj/item/weapon/gun/rifle/famas, /obj/item/weapon/gun/rifle/alf_machinecarbine, @@ -330,16 +345,35 @@ /obj/item/weapon/gun/shotgun/pump/t35, /obj/item/weapon/gun/shotgun/combat, /obj/item/weapon/gun/shotgun/combat/standardmarine, + /obj/item/weapon/gun/shotgun/som/pointman, + /obj/item/weapon/gun/shotgun/som/support, + /obj/item/weapon/gun/shotgun/pump/trenchgun, /obj/item/weapon/gun/flamer/big_flamer, /obj/item/weapon/gun/pistol/auto9, /obj/item/weapon/gun/rifle/chambered, /obj/item/weapon/gun/rifle/tx11, + /obj/item/weapon/gun/rifle/standard_skirmishrifle, + /obj/item/weapon/gun/rifle/mkh, + /obj/item/weapon/gun/rifle/som, + /obj/item/weapon/gun/rifle/som_carbine, + /obj/item/weapon/gun/rifle/som_mg, + /obj/item/weapon/gun/rifle/icc_sharpshooter, + /obj/item/weapon/gun/rifle/icc_battlecarbine, + /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_rifle/rifleman, + /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/scout, + /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_sniper, + /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_mlaser, + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/standard, + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/standard, + /obj/item/weapon/gun/standard_mmg, + /obj/item/weapon/gun/launcher/rocket/oneuse, ) /obj/effect/landmark/weapon_spawn/tier4_weapon_spawn name = "Tier 4 Weapon Spawn" icon_state = "weapon4" weapon_list = list( + /obj/item/weapon/gun/rifle/lmg_d, /obj/item/weapon/gun/rifle/type71/commando, /obj/item/weapon/gun/rifle/m412/elite, /obj/item/weapon/gun/rifle/sniper/elite, @@ -347,6 +381,7 @@ /obj/item/weapon/gun/rifle/sniper/elite/xmas, /obj/item/weapon/gun/rifle/sniper/antimaterial, /obj/item/weapon/gun/rifle/railgun, + /obj/item/weapon/gun/rifle/icc_coilgun, /obj/item/weapon/gun/rifle/sniper/svd, /obj/item/weapon/gun/grenade_launcher/single_shot, /obj/item/weapon/gun/rifle/standard_smartmachinegun, @@ -357,9 +392,19 @@ /obj/item/weapon/gun/shotgun/pump/cmb, /obj/item/weapon/gun/shotgun/double, /obj/item/weapon/gun/shotgun/double/sawn, + /obj/item/weapon/gun/shotgun/zx76, /obj/item/weapon/gun/flamer/big_flamer/marinestandard, + /obj/item/weapon/gun/flamer/som, /obj/item/weapon/gun/rifle/standard_autosniper, /obj/item/weapon/energy/axe, + /obj/item/weapon/gun/rifle/tx54, + /obj/item/weapon/gun/rifle/tx55, + /obj/item/weapon/gun/rifle/som/veteran, + /obj/item/weapon/gun/rifle/icc_confrontationrifle/leader, + /obj/item/weapon/gun/energy/lasgun/lasrifle/xray, + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta, + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/culverin, + /obj/item/weapon/gun/launcher/rocket/recoillessrifle, ) /obj/effect/landmark/weapon_spawn/tier5_weapon_spawn @@ -368,9 +413,13 @@ weapon_list = list( /obj/item/weapon/gun/launcher/rocket, /obj/item/weapon/gun/launcher/rocket/m57a4, + /obj/item/weapon/gun/launcher/rocket/m57a4/t57, + /obj/item/weapon/gun/launcher/rocket/som, + /obj/item/weapon/gun/launcher/rocket/icc, /obj/item/weapon/gun/minigun, /obj/item/weapon/gun/grenade_launcher/multinade_launcher, /obj/item/weapon/gun/energy/lasgun/pulse, + /obj/item/weapon/gun/tl102/death, // memes ) /obj/effect/landmark/weapon_spawn/tier6_weapon_spawn diff --git a/code/game/sound.dm b/code/game/sound.dm index 038e159e51b17..a4ae2cee89d72 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -235,8 +235,10 @@ A good representation is: 'byond applies a volume reduction to the sound every X S = pick('sound/weapons/guns/fire/smartgun1.ogg', 'sound/weapons/guns/fire/smartgun2.ogg', 'sound/weapons/guns/fire/smartgun3.ogg') if("gun_flamethrower") S = pick('sound/weapons/guns/fire/flamethrower1.ogg', 'sound/weapons/guns/fire/flamethrower2.ogg', 'sound/weapons/guns/fire/flamethrower3.ogg') - if("gun_t12") - S = pick('sound/weapons/guns/fire/autorifle-1.ogg','sound/weapons/guns/fire/autorifle-2.ogg','sound/weapons/guns/fire/autorifle-3.ogg') + if("gun_ar12") + S = pick('sound/weapons/guns/fire/tgmc/kinetic/gun_ar12_1.ogg','sound/weapons/guns/fire/tgmc/kinetic/gun_ar12_2.ogg','sound/weapons/guns/fire/tgmc/kinetic/gun_ar12_3.ogg') + if("gun_fb12") // idk why i called it "fb-12", ah too late now + S = pick('sound/weapons/guns/fire/tgmc/kinetic/gun_fb12_1.ogg','sound/weapons/guns/fire/tgmc/kinetic/gun_fb12_2.ogg','sound/weapons/guns/fire/tgmc/kinetic/gun_fb12_3.ogg') if("shotgun_som") S = pick('sound/weapons/guns/fire/v51_1.ogg','sound/weapons/guns/fire/v51_2.ogg','sound/weapons/guns/fire/v51_3.ogg','sound/weapons/guns/fire/v51_4.ogg') if("gun_pulse") diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 2815915b537e4..57b6031c6d24f 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -216,7 +216,7 @@ scatter_unwielded = 25 //------------------------------------------------------- -//A practice version of M43, only for the marine hq map. +//A practice version of M43, only for memes /obj/item/weapon/gun/energy/lasgun/M43/practice name = "\improper M43-P Sunfury Lasgun MK1" @@ -795,6 +795,8 @@ radial_icon_state = "laser_ricochet" description = "Fires an experiment laser pulse capable of bouncing off many wall surfaces. The laser increases in potency when bouncing, before collapsing entirely after exceeding its threshold." +// TE Standard MG + /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_mlaser name = "\improper Terra Experimental laser machine gun" desc = "A Terra Experimental standard issue machine laser gun, often called as the TE-M by marines. High efficiency modulators ensure the TE-M has an extremely high fire count, and multiple firemodes makes it a flexible infantry support gun. Uses standard Terra Experimental (abbreviated as TE) power cells. As with all TE Laser weapons, they use a lightweight alloy combined without the need for bullets any longer decreases their weight and aiming speed quite some vs their ballistic counterparts." @@ -903,6 +905,8 @@ radial_icon_state = "laser_heat" description = "Fires an unusual laser pulse that applies a melting effect which severely sunders xenomorph armor over time, as well as applying further damage." +// TE X-Ray + /obj/item/weapon/gun/energy/lasgun/lasrifle/xray name = "\improper Terra Experimental X-Ray laser rifle" desc = "A Terra Experimental X-Ray laser rifle, abbreviated as the TE-X. It has an integrated charge selector for normal and high settings. Uses standard Terra Experimental (abbreviated as TE) power cells. As with all TE Laser weapons, they use a lightweight alloy combined without the need for bullets any longer decreases their weight and aiming speed quite some vs their ballistic counterparts." diff --git a/code/modules/projectiles/guns/mounted.dm b/code/modules/projectiles/guns/mounted.dm index 391e1a58eddcc..5d867d668017b 100644 --- a/code/modules/projectiles/guns/mounted.dm +++ b/code/modules/projectiles/guns/mounted.dm @@ -355,7 +355,8 @@ force = 40 aim_slowdown = 1.2 wield_delay = 2 SECONDS - fire_sound = 'sound/weapons/guns/fire/t27.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_mg27.ogg' + fire_rattle = 'sound/weapons/guns/fire/tgmc/kinetic/gun_mg27_low.ogg' dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg' unload_sound = 'sound/weapons/guns/interact/T42_unload.ogg' reload_sound = 'sound/weapons/guns/interact/T42_reload.ogg' diff --git a/code/modules/projectiles/guns/pistols.dm b/code/modules/projectiles/guns/pistols.dm index f300a3977bb66..e3cf50f14a675 100644 --- a/code/modules/projectiles/guns/pistols.dm +++ b/code/modules/projectiles/guns/pistols.dm @@ -50,7 +50,7 @@ item_state = "tp14" caliber = CALIBER_9X19 //codex max_shells = 21 //codex - fire_sound = 'sound/weapons/guns/fire/tp14.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_p14.ogg' reload_sound = 'sound/weapons/guns/interact/tp14_reload.ogg' default_ammo_type = /obj/item/ammo_magazine/pistol/standard_pistol allowed_ammo_types = list(/obj/item/ammo_magazine/pistol/standard_pistol) @@ -171,7 +171,7 @@ item_state = "tp23" caliber = CALIBER_45ACP //codex max_shells = 14 //codex - fire_sound = 'sound/weapons/guns/fire/tp23.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_p23.ogg' unload_sound = 'sound/weapons/guns/interact/colt_unload.ogg' reload_sound = 'sound/weapons/guns/interact/colt_reload.ogg' cocked_sound = 'sound/weapons/guns/interact/colt_cocked.ogg' @@ -428,7 +428,7 @@ fire_animation = "tp17_fire" caliber = CALIBER_380ACP //codex max_shells = 8 //codex - fire_sound = 'sound/weapons/guns/fire/tp17.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_p17.ogg' default_ammo_type = /obj/item/ammo_magazine/pistol/standard_pocketpistol allowed_ammo_types = list(/obj/item/ammo_magazine/pistol/standard_pocketpistol) w_class = WEIGHT_CLASS_TINY @@ -484,13 +484,13 @@ //VP70 /obj/item/weapon/gun/pistol/vp70 - name = "\improper 88 Mod 4 combat pistol" + name = "\improper MK88 Mod 4 combat pistol" desc = "An uncommon automatic handgun used for self defense, based on the original VP70 more than a century ago. Fires 9mm armor piercing rounds and is capable of 3-round burst or automatic fire." icon_state = "88m4" item_state = "88m4" caliber = CALIBER_9X19 //codex max_shells = 18 //codex - fire_sound = 'sound/weapons/guns/fire/vp70.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_88mod4.ogg' dry_fire_sound = 'sound/weapons/guns/fire/vp70_empty.ogg' unload_sound = 'sound/weapons/guns/interact/vp70_unload.ogg' reload_sound = 'sound/weapons/guns/interact/vp70_reload.ogg' diff --git a/code/modules/projectiles/guns/revolvers.dm b/code/modules/projectiles/guns/revolvers.dm index a5a25a4a91ceb..84872f11f1fa2 100644 --- a/code/modules/projectiles/guns/revolvers.dm +++ b/code/modules/projectiles/guns/revolvers.dm @@ -62,6 +62,7 @@ desc = "The R-44 standard combat revolver, produced by Terran Armories. A sturdy and hard hitting firearm that loads .44 Magnum rounds. Holds 7 rounds in the cylinder. Due to an error in the cylinder rotation system the fire rate of the gun is much faster than intended, it ended up being billed as a feature of the system." icon_state = "tp44" item_state = "tp44" + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_r44.ogg' caliber = CALIBER_44 //codex max_chamber_items = 7 //codex default_ammo_type = /obj/item/ammo_magazine/revolver/standard_revolver @@ -299,7 +300,7 @@ windup_delay = 0.5 SECONDS aim_slowdown = 0.1 windup_sound = 'sound/weapons/guns/fire/t76_start.ogg' - fire_sound = 'sound/weapons/guns/fire/t76.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_r76.ogg' fire_delay = 0.75 SECONDS akimbo_additional_delay = 0.6 accuracy_mult_unwielded = 0.85 diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 020ff31a30212..20d7cfc37a895 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -27,10 +27,10 @@ /obj/item/weapon/gun/rifle/standard_carbine name = "\improper AR-18 Kauser carbine" - desc = "The Kauser and Hoch AR-18 carbine is one of the standard rifles used by the TerraGov Marine Corps. It's commonly used by people who prefer greater mobility in combat, like scouts and other light infantry. Uses 10x24mm caseless ammunition." + desc = "The Keckler and Hoch AR-18 carbine is one of the standard rifles used by the TerraGov Marine Corps. It's commonly used by people who prefer greater mobility in combat, like scouts and other light infantry. Uses 10x24mm caseless ammunition." icon_state = "t18" item_state = "t18" - fire_sound = "gun_t12" + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_ar18.ogg' dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg' unload_sound = 'sound/weapons/guns/interact/t18_unload.ogg' reload_sound = 'sound/weapons/guns/interact/t18_reload.ogg' @@ -112,7 +112,7 @@ desc = "The Keckler and Hoch AR-12 assault rifle used to be the TerraGov Marine Corps standard issue rifle before the AR-18 carbine replaced it. It is, however, still used widely despite that. The gun itself is very good at being used in most situations however it suffers in engagements at close quarters and is relatively hard to shoulder than some others. It uses 10x24mm caseless ammunition." icon_state = "t12" item_state = "t12" - fire_sound = "gun_t12" + fire_sound = "gun_ar12" dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg' unload_sound = 'sound/weapons/guns/interact/t18_unload.ogg' reload_sound = 'sound/weapons/guns/interact/t18_reload.ogg' @@ -187,7 +187,7 @@ /obj/item/weapon/gun/rifle/standard_dmr name = "\improper DMR-37 SCA designated marksman rifle" - desc = "The San Cristo Arms DMR-37 is the TerraGov Marine Corps designated marksman rifle. It is rather well-known for it's very consistent target placement at longer than usual range, it however lacks a burst fire mode or an automatic mode. It is mostly used by people who prefer to do more careful shooting than most. Uses 10x27mm caseless caliber." + desc = "The San Cristo Arms DMR-37 is the TerraGov Marine Corps designated marksman rifle. It is rather well-known for it's very consistent target placement at longer than usual range, it however lacks a burst fire mode or an automatic mode. It is mostly used by people who prefer to do more careful shooting than most. Uses 10x27mm caseless caliber." icon = 'icons/Marine/gun64.dmi' icon_state = "t37" item_state = "t37" @@ -199,8 +199,8 @@ inhand_y_dimension = 32 muzzleflash_iconstate = "muzzle_flash_medium" - fire_sound = 'sound/weapons/guns/fire/DMR.ogg' - fire_rattle = 'sound/weapons/guns/fire/DMR_low.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_dmr37.ogg' + fire_rattle = 'sound/weapons/guns/fire/tgmc/kinetic/gun_dmr37_low.ogg' dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg' unload_sound = 'sound/weapons/guns/interact/m41a_unload.ogg' reload_sound = 'sound/weapons/guns/interact/m41a_reload.ogg' @@ -265,7 +265,7 @@ /obj/item/weapon/gun/rifle/standard_br name = "\improper BR-64 SCA battle rifle" - desc = "The San Cristo Arms BR-64 is the TerraGov Marine Corps main battle rifle. It is known for its consistent ability to perform well at most ranges, and close range stopping power. It is mostly used by people who prefer a bigger round than the average. Uses 10x26.5smm caseless caliber." + desc = "The San Cristo Arms BR-64 is the TerraGov Marine Corps main battle rifle. It is known for its consistent ability to perform well at most ranges, and medium range stopping power with bursts. It is mostly used by people who prefer a bigger round than the average. Uses 10x26.5smm caseless caliber." icon_state = "t64" item_state = "t64" icon = 'icons/Marine/gun64.dmi' @@ -277,8 +277,8 @@ inhand_y_dimension = 32 muzzleflash_iconstate = "muzzle_flash_medium" - fire_sound = 'sound/weapons/guns/fire/t64.ogg' - fire_rattle = 'sound/weapons/guns/fire/t64_low.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_br64.ogg' + fire_rattle = 'sound/weapons/guns/fire/tgmc/kinetic/gun_br64_low.ogg' dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg' unload_sound = 'sound/weapons/guns/interact/m41a_unload.ogg' reload_sound = 'sound/weapons/guns/interact/m41a_reload.ogg' @@ -676,7 +676,7 @@ /obj/item/weapon/gun/rifle/m16 name = "\improper FN M16A4 assault rifle" - desc = "A light, versatile assault rifle with a 30 round magazine, chambered to fire the 5.56x45mm NATO cartridge. The 4th generation in the M16 platform, this FN variant has added automatic fire selection and retains relevance among mercenaries and militias thanks to its high customizability. it is incredibly good at rapid burst fire, but must be paced correctly." + desc = "A light, versatile assault rifle with a 30 round magazine, chambered to fire the 5.56x45mm NATO cartridge. The 4th generation in the M16 platform, this FN variant has added automatic fire selection and retains relevance among mercenaries and militias thanks to its high customizability. It is incredibly good at rapid burst fire, but must be paced correctly." icon = 'icons/Marine/gun64.dmi' icon_state = "m16a4" item_state = "m16a4" @@ -747,7 +747,7 @@ /obj/item/weapon/gun/rifle/famas name = "\improper FAMAS assault rifle" - desc = "A light, versatile fast firing assault rifle with a 24 round magazine and short range scope, chambered to fire the 5.56x45mm NATO cartridge in 24 round magazines." + desc = "A light, versatile fast firing assault rifle with a 24 round magazine and short range scope, chambered to fire the 5.56x45mm NATO cartridge within a short amount of time." icon = 'icons/Marine/gun64.dmi' icon_state = "famas" item_state = "famas" @@ -820,7 +820,7 @@ force = 30 aim_slowdown = 0.8 wield_delay = 1 SECONDS - fire_sound = 'sound/weapons/guns/fire/t40.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_mg42.ogg' dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg' unload_sound = 'sound/weapons/guns/interact/T42_unload.ogg' reload_sound = 'sound/weapons/guns/interact/T42_reload.ogg' @@ -895,8 +895,8 @@ force = 35 aim_slowdown = 1.2 wield_delay = 1.5 SECONDS - fire_sound = 'sound/weapons/guns/fire/GPMG.ogg' - fire_rattle = 'sound/weapons/guns/fire/GPMG_low.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_mg60.ogg' + fire_rattle = 'sound/weapons/guns/fire/tgmc/kinetic/gun_mg60_low.ogg' dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg' unload_sound = 'sound/weapons/guns/interact/T42_unload.ogg' reload_sound = 'sound/weapons/guns/interact/T42_reload.ogg' @@ -954,7 +954,7 @@ /obj/item/weapon/gun/rifle/m412l1_hpr name = "\improper PR-412L1 heavy pulse rifle" - desc = "A large weapon capable of laying down supressing fire, based on the PR-412 pulse rifle platform. Uses 10x24mm caseless ammunition." + desc = "A large weapon capable of laying down supressing fire, based on the PR-412 pulse rifle platform. Effective in burst fire. Uses 10x24mm caseless ammunition." icon = 'icons/Marine/gun64.dmi' icon_state = "m412l1" item_state = "m412l1" @@ -1128,14 +1128,14 @@ desc = "The primary rifle of many space pirates and militias, the Type 71 is a reliable rifle chambered in 7.62x39mm, firing in three round bursts to conserve ammunition." //------------------------------------------------------- -//TX-16 AUTOMATIC SHOTGUN +//SH-15 AUTOMATIC SHOTGUN /obj/item/weapon/gun/rifle/standard_autoshotgun name = "\improper Zauer SH-15 automatic shotgun" - desc = "The Zauer SH-15 Automatic Assault Shotgun, produced by Terran Armories. Another iteration of the ZX series of firearms, taking over the SX as the semi-automatic shotgun provided to the TGMC. Compared to the SX, this Shotgun is rifled, and loads primarily longer ranged munitions, being incompatible with buckshot shells. Takes 12-round 16 gauge magazines." + desc = "The Zauer SH-15 Automatic Assault Shotgun, this is a Terran Armories variant. Another iteration of the ZX series of firearms though it has been since regulated as part of the TGMC arsenal, hence the SH designation. It took over the various shotgun models as the semi-automatic shotgun provided to the TGMC. It is rifled, and loads primarily longer ranged munitions, being incompatible with buckshot shells. Takes 12-round 16 gauge magazines." icon_state = "tx15" item_state = "tx15" - fire_sound = 'sound/weapons/guns/fire/shotgun.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_sh15.ogg' dry_fire_sound = 'sound/weapons/guns/fire/shotgun_empty.ogg' caliber = CALIBER_16G //codex max_shells = 12 //codex @@ -1294,7 +1294,7 @@ /obj/item/weapon/gun/rifle/chambered name = "\improper SR-127 Bauer bolt action rifle" - desc = "The Bauer SR-127 is the standard issue bolt action rifle used by the TGMC. Known for its long range accuracy and use by marksmen despite its age and lack of IFF. It has an irremoveable scope. Uses 8.6×70mm box magazines." + desc = "The Bauer SR-127 is the standard issue bolt action rifle used by the TGMC. Known for its long range accuracy and use by marksmen despite its age and lack of IFF, though careful aim allows fire support from behind. It has an irremoveable scope. Uses 8.6×70mm box magazines." icon = 'icons/Marine/gun64.dmi' icon_state = "tl127" item_state = "tl127" @@ -1305,8 +1305,8 @@ inhand_x_dimension = 64 inhand_y_dimension = 32 - fire_sound = 'sound/weapons/guns/fire/tl127.ogg' - fire_rattle = 'sound/weapons/guns/fire/tl127_low.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_sr127.ogg' + fire_rattle = 'sound/weapons/guns/fire/tgmc/kinetic/gun_sr127_low.ogg' cocked_sound = 'sound/weapons/guns/interact/tl-127_bolt.ogg' dry_fire_sound = 'sound/weapons/guns/fire/sniper_empty.ogg' unload_sound = 'sound/weapons/guns/interact/m41a_unload.ogg' @@ -1368,7 +1368,7 @@ /obj/item/weapon/gun/rifle/standard_autosniper name = "\improper SR-81 Kauser-KT automatic sniper rifle" - desc = "The Kauser-KT SR-81 is the TerraGov Marine Corps's automatic sniper rifle usually married to it's iconic NVG/KTLD scope combo. It's users use it for it's high rate of fire for it's class, and has decent performance in any range. Uses 8.6x70mm caseless with specialized pressures for IFF fire." + desc = "The Kauser-KT SR-81 is the TerraGov Marine Corps's automatic sniper rifle usually married to it's iconic NVG/KTLD scope combo. It is notable for its high rate of fire for its class, and has decent performance in any range. Uses 8.6x70mm caseless with specialized pressures for IFF fire." icon_state = "t81" item_state = "t81" fire_sound = 'sound/weapons/guns/fire/sniper.ogg' @@ -1421,7 +1421,7 @@ caliber = CALIBER_492X34_CASELESS //codex max_shells = 70 //codex wield_delay = 0.65 SECONDS - fire_sound = 'sound/weapons/guns/fire/M412.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_ar11.ogg' dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg' unload_sound = 'sound/weapons/guns/interact/T42_unload.ogg' reload_sound = 'sound/weapons/guns/interact/T42_reload.ogg' @@ -1477,7 +1477,7 @@ /obj/item/weapon/gun/rifle/standard_skirmishrifle name = "\improper AR-21 Kauser skirmish rifle" - desc = "The Kauser AR-21 is a versatile rifle is developed to bridge a gap between higher caliber weaponry and a normal rifle. It fires a strong 10x25 round, which has decent stopping power. It however suffers in magazine size and movement capablity compared to smaller peers. It uses 10x25mm caseless ammunition." + desc = "The Kauser AR-21 is a versatile rifle is developed to bridge a gap between higher caliber weaponry and a normal rifle. It fires a strong 10x25mm round, which has decent stopping power. It however suffers in magazine size and movement capablity compared to smaller peers." icon = 'icons/Marine/gun64.dmi' icon_state = "t21" item_state = "t21" @@ -1488,7 +1488,7 @@ inhand_x_dimension = 64 inhand_y_dimension = 32 - fire_sound = 'sound/weapons/guns/fire/t21.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_ar21.ogg' dry_fire_sound = 'sound/weapons/guns/fire/t21_empty.ogg' unload_sound = 'sound/weapons/guns/interact/t21_unload.ogg' reload_sound = 'sound/weapons/guns/interact/t21_reload.ogg' @@ -1611,7 +1611,7 @@ /obj/item/weapon/gun/rifle/mkh name = "\improper MKH-98 storm rifle" - desc = "A certified classic, this design was hailed as the first successful assault rifle concept, generally termed a 'storm rifle'. Has a higher than usual firerate for it's class, but suffers in capacity. This version of it chambers 7.62x39mm." + desc = "A certified classic, this reproduction design was hailed as the first successful assault rifle concept, generally termed a 'storm rifle'. Has a higher than usual firerate for its class, but suffers in capacity. This version of it chambers 7.62x39mm." icon = 'icons/Marine/gun64.dmi' icon_state = "mkh98" item_state = "mkh98" @@ -1653,7 +1653,7 @@ // GL-54 grenade launcher /obj/item/weapon/gun/rifle/tx54 name = "\improper GL-54 grenade launcher" - desc = "A magazine fed, semiautomatic grenade launcher designed to shoot airbursting smart grenades. Requires a T49 scope for precision aiming." + desc = "A magazine fed, semi-automatic grenade launcher designed to shoot airbursting smart grenades. Requires a T49 scope for precision aiming." icon = 'icons/Marine/gun64.dmi' icon_state = "tx54" item_state = "tx54" ///todo @@ -1725,10 +1725,10 @@ /obj/item/weapon/gun/rifle/tx55 name = "\improper AR-55 assault rifle" - desc = "Officially designated an Objective Individual Combat Weapon, The AR-55 features an upper bullpup 20mm grenade launcher designed to fire a variety of specialised rounds, and an underslung assault rifle using 10x24mm caseless ammunition. Somewhat cumbersome to use due to its size and weight. Requires a T49 scope for precision aiming." + desc = "Officially designated an Objective Individual Combat Weapon, the AR-55 features an upper bullpup 20mm grenade launcher designed to fire a variety of specialised rounds, and an underslung assault rifle using 10x24mm caseless ammunition. Somewhat cumbersome to use due to its size and weight. Requires a T49 scope for precision aiming." icon_state = "tx55" item_state = "tx55" - fire_sound = "gun_t12" + fire_sound = "gun_ar12" dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg' unload_sound = 'sound/weapons/guns/interact/t18_unload.ogg' reload_sound = 'sound/weapons/guns/interact/t18_reload.ogg' @@ -1802,7 +1802,7 @@ /obj/item/weapon/gun/rifle/garand name = "\improper CAU C1 Garand self loading rifle" - desc = "The Carlford-1 is a remastered classic made by Carlford Armories, made to fit in the modern day. Most of the noticeable differences are minor rail modifications, other than that. It is a faithful recreation with the trademark ping sound and all. Uses .30-06 enbloc clips." + desc = "The Carlford-1 is a remastered classic made by Carlford Armories, made to fit in the modern day. Most of the noticeable differences are minor rail modifications. Other than that, it is a faithful recreation with the trademark ping sound and all. Uses .30-06 enbloc clips." icon = 'icons/Marine/gun64.dmi' icon_state = "garand" item_state = "garand" @@ -1866,7 +1866,7 @@ /obj/item/weapon/gun/rifle/som name = "\improper V-31 assault rifle" - desc = "The V-31 was the primary rifle of the Sons of Mars until the introduction of more advanced energy weapons. Nevertheless the V-31 continues to see common use due to it's comparative ease of production and maintenance, and due to the inbuilt low velocity railgun designed for so called 'micro' grenades. Has good handling due to its compact bullpup design, and is generally effective at all ranges. Uses 10x25mm caseless ammunition." + desc = "The V-31 was the primary rifle of the Sons of Mars until the introduction of more advanced energy weapons. Nevertheless, the V-31 continues to see common use due to its comparative ease of production and maintenance, and due to the inbuilt low velocity railgun designed for so called 'micro' grenades. Has good handling due to its compact bullpup design, and is generally effective at all ranges. Uses 10x25mm caseless ammunition." icon_state = "v31" icon = 'icons/Marine/gun64.dmi' item_state = "v31" @@ -1964,7 +1964,7 @@ // V-34 SOM carbine /obj/item/weapon/gun/rifle/som_carbine name = "\improper V-34 carbine" - desc = "An old but robust weapon that saw extensive use in the Martian uprising. A comparatively light and compact weapon, it still packs a considerable punch thanks to a good rate of fire and high calibre, although at range its effective drops off considerably. Chambers 7.62x39mm." + desc = "An old but robust weapon that saw extensive use in the Martian uprising. A comparatively light and compact weapon, it still packs a considerable punch thanks to a good rate of fire and high calibre, although at range its effective drops off considerably. It is chambered in 7.62x39mm." icon = 'icons/Marine/gun64.dmi' icon_state = "v34" item_state = "v34" @@ -2013,7 +2013,7 @@ starting_attachment_types = list(/obj/item/attachable/foldable/som_carbine, /obj/item/attachable/magnetic_harness) /obj/item/weapon/gun/rifle/som_carbine/black - desc = "A modern redesign by the SOM of an ancient weapon that saw extensive use in the Martian uprising. A comparatively light and compact weapon, it still packs a considerable punch thanks to a good rate of fire and high calibre, although at range its effective drops off considerably. Chambers 7.62x39mm." + desc = "A modern redesign by the SOM of an ancient weapon that saw extensive use in the Martian uprising. A comparatively light and compact weapon, it still packs a considerable punch thanks to a good rate of fire and high calibre, although at range its effective drops off considerably. It is chambered in 7.62x39mm." icon_state = "v34_black" item_state = "v34_black" default_ammo_type = /obj/item/ammo_magazine/rifle/mpi_km/carbine/black @@ -2036,7 +2036,7 @@ /obj/item/weapon/gun/rifle/som_mg name = "\improper V-41 machine gun" - desc = "The V-41 is a large man portable machine used by the SOM, allowing for sustained, accurate suppressive firepower at the cost of mobility and handling. Commonly seen where their preferred tactics of fast, mobile aggression is ill suited." + desc = "The V-41 is a large man portable machine used by the SOM, allowing for sustained, accurate suppressive firepower at the cost of mobility and handling. Commonly seen where their preferred tactics of fast, mobile aggression is ill suited. Takes 10x26mm Caseless." icon = 'icons/Marine/gun64.dmi' icon_state = "v41" item_state = "v41" @@ -2104,7 +2104,7 @@ /obj/item/weapon/gun/rifle/icc_sharpshooter name = "\improper L-11 sharpshooter rifle" - desc = "The L-11 is a venerable and battle-tested rifle used by the ICCAF, although rather heavy, long and unwieldy compared to most ICCAF rifles, which focus on getting up close and personal. It easily makes up with excellent long-range potential when compared to most of its peers, mostly seen in use by reserve troops who expect to fight at distance, rather than up close. Uses 10x27mm magazines." + desc = "The L-11 is a venerable and battle-tested rifle used by the ICCAF. Although rather heavy, long and unwieldy compared to most ICCAF rifles, which focus on getting up close and personal, it easily makes up with excellent long-range potential when compared to most of its peers, mostly seen in use by reserve troops who expect to fight at distance, rather than up close. Uses 10x27mm magazines." icon = 'icons/Marine/gun64.dmi' icon_state = "l11" item_state = "l11" @@ -2176,8 +2176,8 @@ // L-15 ICC Battlecarbine /obj/item/weapon/gun/rifle/icc_battlecarbine - name = "\improper L-15 Battlecarbine" - desc = "The L-15 battlecarbine is the standard rifle of the ICCAF, boasting a high caliber round and a menacing profile, it presents an excellent CQC firearm, however it struggles at range due to high dropoff from the short barrel, units that use it say that you need to close the gap at any cost to see the true efficacy of this weapon. Uses 10x25mm caseless ammunition." + name = "\improper L-15 battlecarbine" + desc = "The L-15 battlecarbine is the standard rifle of the ICCAF, boasting a high caliber round and a menacing profile, it presents an excellent CQC firearm. However it struggles at range due to high dropoff from the short barrel, units that use it say that you need to close the gap at any cost to see the true efficacy of this weapon. Uses 10x25mm caseless ammunition." icon = 'icons/Marine/gun64.dmi' icon_state = "l15" item_state = "l15" @@ -2249,7 +2249,7 @@ /obj/item/weapon/gun/rifle/icc_confrontationrifle name = "\improper ML-12 confrontation rifle" - desc = "The ML-12 confrontation rifle is an absolute beast of a weapon used by the ICCAF, featuring a high caliber round in a short package, it will absolutely shred enemy targets at close quarters, a operator must mind the incredible recoil while making followup shots, however. Uses 10x28mm caseless ammunition." + desc = "The ML-12 confrontation rifle is an absolute beast of a weapon used by the ICCAF. Featuring a high caliber round in a short package, it will absolutely shred enemy targets at close quarters, a operator must mind the incredible recoil while making followup shots, however. Uses 10x28mm caseless ammunition." icon = 'icons/Marine/gun64.dmi' icon_state = "ml12" item_state = "ml12" diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm index 2e1c697501a6a..98d81be85c249 100644 --- a/code/modules/projectiles/guns/shotguns.dm +++ b/code/modules/projectiles/guns/shotguns.dm @@ -78,7 +78,7 @@ icon = 'icons/Marine/gun64.dmi' icon_state = "t39" item_state = "t39" - fire_sound = 'sound/weapons/guns/fire/shotgun_automatic.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_sh39.ogg' flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER default_ammo_type = /datum/ammo/bullet/shotgun/buckshot attachable_allowed = list( @@ -144,7 +144,7 @@ item_state = "dshotgun" max_chamber_items = 2 //codex default_ammo_type = /datum/ammo/bullet/shotgun/buckshot - fire_sound = 'sound/weapons/guns/fire/shotgun_heavy.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_sh34.ogg' reload_sound = 'sound/weapons/guns/interact/shotgun_db_insert.ogg' cocked_sound = null //We don't want this. attachable_allowed = list( @@ -195,7 +195,7 @@ item_state = "ts34" max_chamber_items = 2 //codex default_ammo_type = /datum/ammo/bullet/shotgun/buckshot - fire_sound = 'sound/weapons/guns/fire/shotgun_heavy.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_sh34.ogg' hand_reload_sound = 'sound/weapons/guns/interact/shotgun_db_insert.ogg' cocked_sound = null //We don't want this. attachable_allowed = list( @@ -377,7 +377,8 @@ icon = 'icons/Marine/gun64.dmi' icon_state = "mosin" item_state = "mosin" - fire_sound = 'sound/weapons/guns/fire/mosin.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_mosin.ogg' + fire_rattle = 'sound/weapons/guns/fire/tgmc/kinetic/gun_mosin_low.ogg' dry_fire_sound = 'sound/weapons/guns/fire/sniper_empty.ogg' reload_sound = 'sound/weapons/guns/interact/mosin_reload.ogg' caliber = CALIBER_762X54 //codex @@ -449,7 +450,7 @@ ammo_datum_type = /datum/ammo/bullet/sniper/martini default_ammo_type = /datum/ammo/bullet/sniper/martini gun_skill_category = SKILL_RIFLES - fire_sound = 'sound/weapons/guns/fire/martini.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_martinihenry.ogg' reload_sound = 'sound/weapons/guns/interact/martini_reload.ogg' cocked_sound = 'sound/weapons/guns/interact/martini_cocked.ogg' opened_sound = 'sound/weapons/guns/interact/martini_open.ogg' @@ -573,7 +574,7 @@ icon = 'icons/Marine/gun64.dmi' icon_state = "leicrepeater" item_state = "leicrepeater" - fire_sound = 'sound/weapons/guns/fire/leveraction.ogg'//I like how this one sounds. + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_repeater.ogg' dry_fire_sound = 'sound/weapons/guns/fire/sniper_empty.ogg' reload_sound = 'sound/weapons/guns/interact/mosin_reload.ogg' caliber = CALIBER_4570 //codex @@ -664,7 +665,7 @@ item_state = "t35" cock_animation = "t35_pump" default_ammo_type = /datum/ammo/bullet/shotgun/buckshot - fire_sound = 'sound/weapons/guns/fire/t35.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_sh35.ogg' max_chamber_items = 8 attachable_allowed = list( /obj/item/attachable/bayonet, diff --git a/code/modules/projectiles/guns/smgs.dm b/code/modules/projectiles/guns/smgs.dm index 43517a4aa78b9..5f72ff33d5906 100644 --- a/code/modules/projectiles/guns/smgs.dm +++ b/code/modules/projectiles/guns/smgs.dm @@ -34,6 +34,7 @@ desc = "The MP-19 is the TerraGov Marine Corps standard-issue machine pistol. It's known for it's low recoil and scatter when used one handed. It's usually carried by specialized troops who do not have the space to carry a much larger gun like medics and engineers. It uses 10x20mm caseless rounds." icon_state = "t19" item_state = "t19" + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_mp19.ogg' caliber = CALIBER_10X20_CASELESS //codex gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC, GUN_FIREMODE_AUTOBURST) max_shells = 30 //codex @@ -98,7 +99,7 @@ /obj/item/weapon/gun/smg/standard_smg name = "\improper SMG-90 submachinegun" desc = "The SMG-90 is the TerraGov Marine Corps standard issue SMG. Its known for it's compact size and ease of use inside the field. It's usually carried by troops who want a lightweight firearm to rush with. It uses 10x20mm caseless rounds." - fire_sound = 'sound/weapons/guns/fire/t90.ogg' + fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_smg90.ogg' icon_state = "t90" item_state = "t90" caliber = CALIBER_10X20_CASELESS //codex diff --git a/code/modules/projectiles/guns/specialist.dm b/code/modules/projectiles/guns/specialist.dm index 0bdc28b6a3281..507adee31eb2a 100644 --- a/code/modules/projectiles/guns/specialist.dm +++ b/code/modules/projectiles/guns/specialist.dm @@ -483,6 +483,7 @@ Note that this means that snipers will have a slowdown of 3, due to the scope flags_equip_slot = ITEM_SLOT_BACK|ITEM_SLOT_BELT max_shells = 100 //codex caliber = CALIBER_PEPPERBALL + fire_sound = "gun_fb12" // idk why i called it "fb-12", ah too late now default_ammo_type = /obj/item/ammo_magazine/rifle/pepperball allowed_ammo_types = list(/obj/item/ammo_magazine/rifle/pepperball) force = 30 // two shots weeds as it has no bayonet @@ -590,6 +591,7 @@ Note that this means that snipers will have a slowdown of 3, due to the scope flags_gun_features = GUN_WIELDED_FIRING_ONLY|GUN_WIELDED_STABLE_FIRING_ONLY|GUN_AMMO_COUNTER reciever_flags = AMMO_RECIEVER_MAGAZINES|AMMO_RECIEVER_AUTO_EJECT|AMMO_RECIEVER_AUTO_EJECT_LOCKED gun_skill_category = SKILL_FIREARMS + fire_sound = 'sound/weapons/guns/fire/launcher.ogg' dry_fire_sound = 'sound/weapons/guns/fire/launcher_empty.ogg' reload_sound = 'sound/weapons/guns/interact/launcher_reload.ogg' unload_sound = 'sound/weapons/guns/interact/launcher_reload.ogg' diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_88mod4.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_88mod4.ogg new file mode 100644 index 0000000000000..57ba0a347c842 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_88mod4.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_ar11.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_ar11.ogg new file mode 100644 index 0000000000000..ac019439552e9 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_ar11.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_ar12_1.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_ar12_1.ogg new file mode 100644 index 0000000000000..b8bbdaf8043c0 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_ar12_1.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_ar12_2.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_ar12_2.ogg new file mode 100644 index 0000000000000..4a93cddcdd726 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_ar12_2.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_ar12_3.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_ar12_3.ogg new file mode 100644 index 0000000000000..e55831930da99 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_ar12_3.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_ar18.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_ar18.ogg new file mode 100644 index 0000000000000..096fd8e6c17fd Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_ar18.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_ar21.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_ar21.ogg new file mode 100644 index 0000000000000..fa9ef89f0a8d4 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_ar21.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_br64.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_br64.ogg new file mode 100644 index 0000000000000..46b752e19e095 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_br64.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_br64_low.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_br64_low.ogg new file mode 100644 index 0000000000000..706360e95d273 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_br64_low.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_dmr37.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_dmr37.ogg new file mode 100644 index 0000000000000..ee607980d4948 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_dmr37.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_dmr37_low.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_dmr37_low.ogg new file mode 100644 index 0000000000000..08ab5137a260d Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_dmr37_low.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_fb12_1.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_fb12_1.ogg new file mode 100644 index 0000000000000..ebe429579134e Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_fb12_1.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_fb12_2.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_fb12_2.ogg new file mode 100644 index 0000000000000..4d9353c272fc6 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_fb12_2.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_fb12_3.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_fb12_3.ogg new file mode 100644 index 0000000000000..213742e8eb6ed Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_fb12_3.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_martinihenry.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_martinihenry.ogg new file mode 100644 index 0000000000000..03cfeeee6e830 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_martinihenry.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_mg27.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_mg27.ogg new file mode 100644 index 0000000000000..c30460a3a09f3 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_mg27.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_mg27_low.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_mg27_low.ogg new file mode 100644 index 0000000000000..a2973b28061a7 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_mg27_low.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_mg42.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_mg42.ogg new file mode 100644 index 0000000000000..f3f98b0d55eba Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_mg42.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_mg60.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_mg60.ogg new file mode 100644 index 0000000000000..0df58d7c5d629 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_mg60.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_mg60_low.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_mg60_low.ogg new file mode 100644 index 0000000000000..77a11a524a782 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_mg60_low.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_mosin.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_mosin.ogg new file mode 100644 index 0000000000000..d390bdbb85b5d Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_mosin.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_mosin_low.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_mosin_low.ogg new file mode 100644 index 0000000000000..bc8ae477d5c58 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_mosin_low.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_mp19.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_mp19.ogg new file mode 100644 index 0000000000000..6820c70a4b198 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_mp19.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_p14.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_p14.ogg new file mode 100644 index 0000000000000..1bbd95e405bcf Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_p14.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_p17.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_p17.ogg new file mode 100644 index 0000000000000..cd014f5eda8a0 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_p17.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_p23.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_p23.ogg new file mode 100644 index 0000000000000..34e0412f823d0 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_p23.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_r44.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_r44.ogg new file mode 100644 index 0000000000000..d02d1c750c24d Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_r44.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_r76.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_r76.ogg new file mode 100644 index 0000000000000..4beb4d1e4648a Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_r76.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_repeater.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_repeater.ogg new file mode 100644 index 0000000000000..959c5264ec8f8 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_repeater.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_sh15.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_sh15.ogg new file mode 100644 index 0000000000000..3745a9619ff96 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_sh15.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_sh34.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_sh34.ogg new file mode 100644 index 0000000000000..167262d33fd4d Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_sh34.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_sh35.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_sh35.ogg new file mode 100644 index 0000000000000..383dc6638a9de Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_sh35.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_sh39.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_sh39.ogg new file mode 100644 index 0000000000000..fcbe5bd70e07d Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_sh39.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_smg90.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_smg90.ogg new file mode 100644 index 0000000000000..202d9ae5a81d5 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_smg90.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_sr127.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_sr127.ogg new file mode 100644 index 0000000000000..356ec0ed95614 Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_sr127.ogg differ diff --git a/sound/weapons/guns/fire/tgmc/kinetic/gun_sr127_low.ogg b/sound/weapons/guns/fire/tgmc/kinetic/gun_sr127_low.ogg new file mode 100644 index 0000000000000..0515f4237667c Binary files /dev/null and b/sound/weapons/guns/fire/tgmc/kinetic/gun_sr127_low.ogg differ