Merge pull request #117 from AttorneyOnline/2.7

2.7

7 files changed, 15 insertions, 11 deletions

diff --git a/base/sounds/general/adminhelp.ogg b/base/sounds/general/adminhelp.ogg
new file mode 100644
index 00000000..704c0fd6
--- /dev/null
+++ b/base/sounds/general/adminhelp.ogg
diff --git a/base/sounds/general/case_announced.ogg b/base/sounds/general/case_announced.ogg
new file mode 100644
index 00000000..1e9c3d4e
--- /dev/null
+++ b/base/sounds/general/case_announced.ogg
diff --git a/base/sounds/music/failed_login.opus b/base/sounds/music/failed_login.opus
new file mode 100644
index 00000000..33532ee5
--- /dev/null
+++ b/base/sounds/music/failed_login.opus
diff --git a/base/themes/default/courtroom_design.ini b/base/themes/default/courtroom_design.ini
index eee76251..96abd8d2 100644
--- a/base/themes/default/courtroom_design.ini
+++ b/base/themes/default/courtroom_design.ini
@@ -104,12 +104,12 @@ pos_dropdown = 200, 470, 80, 20
 pre = 5, 490, 80, 21
 
 ; Flip button
-flip = 104, 490, 51, 21
+flip = 104, 490, 61, 21
 
 ; Guard button
-guard = 200, 580, 61, 21
+guard = 200, 580, 100, 21
 
-pre_no_interrupt = 200, 490, 80, 21
+pre_no_interrupt = 200, 490, 85, 21
 
 ; Penalty bars and judge's buttons for penalizing. Other than the bars, these
 ; ONLY show up on a character with /pos jud
@@ -125,13 +125,16 @@ witness_testimony = 290, 470, 85, 42
 cross_examination = 290, 515, 85, 42
 
 ; Buttons to change character/Reload theme/Call Mod
-change_character = 5, 610, 120, 23
-reload_theme = 5, 637, 94, 23
-call_mod = 104, 637, 64, 23
+change_character = 5, 610, 110, 23
+reload_theme = 5, 637, 110, 23
+call_mod = 120, 637, 90, 23
 
 ; Mute button
 mute_button = 150, 515, 42, 42
 
+; Screenshake
+screenshake = 51, 515, 42, 42
+
 ; Where the Mute list pops up when you click Mute
 mute_list = 280, 469, 210, 198
 
@@ -195,11 +198,11 @@ ao2_ic_chat_name = 200, 534, 78, 23
 ; This is useful if you suspect someone is impersonating others, for example,
 ; and they are using this in combination with ini-swapping to 'duplicate' a
 ; character.
-showname_enable = 200, 510, 80, 21
+showname_enable = 200, 510, 85, 21
 
 ; A simple button that opens up the settings menu.
 ; Equivalent to typing /settings in the OOC chat.
-settings = 130, 610, 60, 23
+settings = 120, 610, 90, 23
 
 ; The character search text input in the character selecton screen.
 ; The moment you enter some text, it immediately starts filtering.
@@ -242,4 +245,4 @@ area_locked_color = 165, 43, 43
 ; "casing_button" is an interface to help you announce a case (you have to be
 ; a CM first to be able to announce cases).
 casing = 200, 560, 80, 21
-casing_button = 173, 637, 60, 23
\ No newline at end of file
+casing_button = 215, 637, 50, 23
\ No newline at end of file
diff --git a/base/themes/default/courtroom_sounds.ini b/base/themes/default/courtroom_sounds.ini
index b24e2ce9..eba07a6c 100644
--- a/base/themes/default/courtroom_sounds.ini
+++ b/base/themes/default/courtroom_sounds.ini
@@ -3,6 +3,7 @@ witness_testimony = sfx-testimony2.wav
 cross_examination = sfx-testimony.wav
 evidence_present = sfx-evidenceshoop.wav
 word_call = sfx-gaspen-yeah!.wav
-mod_call = sfx-gallery.wav
+mod_call = adminhelp.ogg
 not_guilty = sfx-notguilty.wav
-guilty = sfx-guilty.wav
\ No newline at end of file
+guilty = sfx-guilty.wav
+case_call = case_announced.ogg
\ No newline at end of file
diff --git a/base/themes/default/screenshake.png b/base/themes/default/screenshake.png
new file mode 100644
index 00000000..5b71e3bc
--- /dev/null
+++ b/base/themes/default/screenshake.png
diff --git a/base/themes/default/screenshake_pressed.png b/base/themes/default/screenshake_pressed.png
new file mode 100644
index 00000000..43e01c85
--- /dev/null
+++ b/base/themes/default/screenshake_pressed.png