Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ports revolver sound from TGMC #19793

Merged
merged 2 commits into from
Jul 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions code/modules/projectiles/guns/ballistic/revolver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
desc = "A suspicious revolver. Uses .357 magnum ammo." //usually used by syndicates
icon_state = "revolver"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder
fire_sound = 'sound/weapons/revolver357shot.ogg'
fire_sound = 'sound/weapons/revolver357tgmc.ogg' // See attributions.txt
load_sound = 'sound/weapons/revolverload.ogg'
eject_sound = 'sound/weapons/revolverempty.ogg'
vary_fire_sound = FALSE
Expand Down Expand Up @@ -74,7 +74,7 @@
/obj/item/gun/ballistic/revolver/detective
name = "\improper Colt Detective Special"
desc = "A classic, if not outdated, law enforcement firearm. Uses .38 special rounds."
fire_sound = 'sound/weapons/revolver38shot.ogg'
fire_sound = 'sound/weapons/revolver38tgmc.ogg' // See attributions.txt
icon_state = "detective"
fire_delay = 0
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38
Expand Down Expand Up @@ -106,7 +106,7 @@
return TRUE
magazine.caliber = "357"
fire_delay = 8 //What no you don't get to mag dump plus the bullet isn't meant for this cylinder. Plus, if you perfectly slam fire with the .38 and hit all your shots, you (should) do more lethal damage than using .357 at this fire_delay
fire_sound = 'sound/weapons/revolver357shot.ogg'
fire_sound = 'sound/weapons/revolver357tgmc.ogg' // See attributions.txt
desc = "The barrel and chamber assembly seems to have been modified."
to_chat(user, span_notice("You reinforce the barrel of [src]. Now it will fire .357 rounds."))
else
Expand All @@ -122,7 +122,7 @@
magazine.caliber = "38"
fire_delay = 0 //Blessed mag dump
spread = 0
fire_sound = 'sound/weapons/revolver38shot.ogg'
fire_sound = 'sound/weapons/revolver38tgmc.ogg' // See attributions.txt
desc = initial(desc)
to_chat(user, span_notice("You remove the modifications on [src]. Now it will fire .38 rounds."))
return TRUE
Expand Down Expand Up @@ -158,7 +158,7 @@
desc = "An old model of revolver that originated in Russia. Able to be suppressed. Uses 7.62x38mmR ammo."
icon_state = "nagant"
fire_delay = 5 //Mild trigger pull, the gun was known for it
fire_sound = 'sound/weapons/revolver38shot.ogg' //Lower caliber = lesser smack
fire_sound = 'sound/weapons/revolver38tgmc.ogg' // See attributions.txt //Lower caliber = lesser smack
can_suppress = TRUE
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev762

Expand Down
2 changes: 2 additions & 0 deletions sound/weapons/attributions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ captured by the BBC
bbc.co.uk - (c) copyright 2018 BBC

splatter.ogg adapted from https://freesound.org/people/Rocktopus/sounds/233418/

revolver357tgmc.ogg & revolver38tgmc.ogg ported from https://github.com/tgstation/TerraGov-Marine-Corps/pull/5261 and uses CC-BY-NC-SA 3.0 US - https://creativecommons.org/licenses/by-nc-sa/3.0/us/
Binary file added sound/weapons/revolver357tgmc.ogg
Binary file not shown.
Binary file added sound/weapons/revolver38tgmc.ogg
Binary file not shown.
Loading