Skip to content

D&R RDS 17 Siren #53

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.

Sign up for GitHub

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

Merged
JoshPiper merged 18 commits into from
Oct 29, 2019
Merged

D&R RDS 17 Siren #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
bf00818
D&R RDS 17 Siren
ANorthCanadianFriend Oct 29, 2019
f22e5b5
rds 17
ANorthCanadianFriend Oct 29, 2019
54c2ad8
rds 17
ANorthCanadianFriend Oct 29, 2019
561ae3b
Revert "rds 17"
ANorthCanadianFriend Oct 29, 2019
cf008ca
d&r rds 17.lua
ANorthCanadianFriend Oct 29, 2019
91dcff0
d&r rds 17 canada
ANorthCanadianFriend Oct 29, 2019
3ffe6cc
Update ancf_d&r_rds17.lua
ANorthCanadianFriend Oct 29, 2019
d6e676d
Moved D&R RDS 17 to sirens folder.
JoshPiper Oct 29, 2019
75a563c
Moved the intimidator / rds-17 into their own folders.
JoshPiper Oct 29, 2019
bd83de9
renamed the files to be shorter.
JoshPiper Oct 29, 2019
dd024b9
Point the sirens at the new folder.
JoshPiper Oct 29, 2019
6bda6a9
That needs an i for if.
JoshPiper Oct 29, 2019
6ff542b
Short table format.
JoshPiper Oct 29, 2019
32bb1c9
Abd adjust the intimidator to point.at their new files too.
JoshPiper Oct 29, 2019
cd00c09
Added Icons and Loop Points
Oct 29, 2019
4965cef
Merge pull request #1 from DatedGore/development
ANorthCanadianFriend Oct 29, 2019
f5f402f
Fixed wav.wav and random spaces at the ends.
JoshPiper Oct 29, 2019
90e009d
Merge branch 'development' into development
JoshPiper Oct 29, 2019
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 lua/autorun/photon/library/emv_sirens.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,11 @@ local sirenTable = {
[22] = { -- provided by Super Mighty
Name = "Intimidator",
Category = "D&R",
Set = { --
{Name = "WAIL", Sound = "emv/sirens/canada/emv_wail.wav", Icon="wail"},
{Name = "YELP", Sound = "emv/sirens/canada/emv_yelp.wav", Icon="yelp"},
{Name = "HPYP", Sound = "emv/sirens/canada/emv_phaser.wav", Icon="phaser"},
{Name = "HILO", Sound = "emv/sirens/canada/emv_hilo.wav", Icon="hilo"},
Set = {
{Name = "WAIL", Sound = "emv/sirens/d&r/intimidator/emv_wail.wav", Icon="wail"},
{Name = "YELP", Sound = "emv/sirens/d&r/intimidator/emv_yelp.wav", Icon="yelp"},
{Name = "HPYP", Sound = "emv/sirens/d&r/intimidator/emv_phaser.wav", Icon="phaser"},
{Name = "HILO", Sound = "emv/sirens/d&r/intimidator/emv_hilo.wav", Icon="hilo"},
},
Horn = "emv/sirens/canada/emv_bullhorn.wav",
},
Expand Down
26 changes: 26 additions & 0 deletions lua/autorun/photon/library/sirens/ancf_d&r_rds17.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
if not EMVU then return end

EMVU.AddCustomSiren("ancf_d&r_rds_17", {
Name = "RDS 17",
Category = "D&R",
Set = {
{
Name = "INTER-CLEAR",
Sound = "emv/sirens/d&r/rds-17/inter-clear.wav",
Icon = "phaser"
}, {
Name = "WAIL",
Sound = "emv/sirens/d&r/rds-17/wail.wav",
Icon = "wail"
}, {
Name = "YELP",
Sound = "emv/sirens/d&r/rds-17/yelp.wav",
Icon = "yelp"
}, {
Name = "STINGER",
Sound = "emv/sirens/d&r/rds-17/stinger.wav",
Icon = "phaser"
}
},
Horn = "emv/sirens/d&r/rds-17/airhorn.wav"
})
0 sound/emv/sirens/canada/emv_bullhorn.wav → ...v/sirens/d&r/intimidator/emv_bullhorn.wav
View file
Open in desktop
File renamed without changes.
0 sound/emv/sirens/canada/emv_hilo.wav → ...d/emv/sirens/d&r/intimidator/emv_hilo.wav
View file
Open in desktop
File renamed without changes.
0 sound/emv/sirens/canada/emv_phaser.wav → ...emv/sirens/d&r/intimidator/emv_phaser.wav
View file
Open in desktop
File renamed without changes.
0 sound/emv/sirens/canada/emv_wail.wav → ...d/emv/sirens/d&r/intimidator/emv_wail.wav
View file
Open in desktop
File renamed without changes.
0 sound/emv/sirens/canada/emv_yelp.wav → ...d/emv/sirens/d&r/intimidator/emv_yelp.wav
View file
Open in desktop
File renamed without changes.
Binary file added sound/emv/sirens/d&r/rds-17/airhorn.wav
View file
Open in desktop
Binary file not shown.
Binary file added sound/emv/sirens/d&r/rds-17/inter-clear.wav
View file
Open in desktop
Binary file not shown.
Binary file added sound/emv/sirens/d&r/rds-17/stinger.wav
View file
Open in desktop
Binary file not shown.
Binary file added sound/emv/sirens/d&r/rds-17/wail.wav
View file
Open in desktop
Binary file not shown.
Binary file added sound/emv/sirens/d&r/rds-17/yelp.wav
View file
Open in desktop
Binary file not shown.