Skip to content

Commit

Permalink
The Gun Sound Overhaul 2.0 + More Weapons to EORD (PART 1) (#13409)
Browse files Browse the repository at this point in the history
* ahug

* and all of the required sounds.

* fixes and pepperball sounds

* pepper

* big aghu

* why did i do this

* sometimes, people need change

* make rpg go bang

* decreased vol
  • Loading branch information
XSlayer300 authored Jul 26, 2023
1 parent 0c252fe commit 55c465c
Show file tree
Hide file tree
Showing 46 changed files with 117 additions and 56 deletions.
49 changes: 49 additions & 0 deletions code/game/objects/effects/landmarks/landmarks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -285,16 +290,21 @@
/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,
/obj/item/weapon/gun/smg/mp7,
/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,
Expand All @@ -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
Expand All @@ -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,
Expand All @@ -330,23 +345,43 @@
/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,
/obj/item/weapon/gun/smg/m25/elite,
/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,
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions code/game/sound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 5 additions & 1 deletion code/modules/projectiles/guns/energy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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."
Expand Down Expand Up @@ -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."
Expand Down
3 changes: 2 additions & 1 deletion code/modules/projectiles/guns/mounted.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
10 changes: 5 additions & 5 deletions code/modules/projectiles/guns/pistols.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down
3 changes: 2 additions & 1 deletion code/modules/projectiles/guns/revolvers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit 55c465c

Please sign in to comment.