diff --git a/Actors/Objects/Door/Door.gd b/Actors/Objects/Door/Door.gd index 4a7fb94..3412f8e 100644 --- a/Actors/Objects/Door/Door.gd +++ b/Actors/Objects/Door/Door.gd @@ -5,8 +5,8 @@ class_name GameObjectDoor export(NodePath) var interlockTargetPath var interlockTarget: GameObjectDoor = null -var open_sound = preload("res://Sounds/SFX/door-open.wav") -var close_sound = preload("res://Sounds/SFX/door-close.wav") +var open_sound = preload("res://Sounds/SFX/effects/door-open.wav") +var close_sound = preload("res://Sounds/SFX/effects/door-close.wav") export var idle_usage = 2 export var active_usage = 10 @@ -76,7 +76,7 @@ master func _close_timer_triggered(): func serialize(): return {} -func deserialize(data): +func deserialize(_data): pass func _open_sensor_triggered(): diff --git a/CREDITS.md b/CREDITS.md index bf3987e..fef6c90 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -1,17 +1,21 @@ # Graphics - Title screen background: [Star Nest by Pablo Roman Andrioli](https://www.shadertoy.com/view/XlfGRj) (MIT) -- All graphics in `Graphics/tgstation` is from [/tg/station](https://github.com/tgstation/tgstation) (CC 3.0 BY-SA) +- All graphics in `Graphics/tgstation` is from [/tg/station](https://github.com/tgstation/tgstation) (CC BY-SA 3.0) # Music -- Title screen music: [Je suis un Phoenix by BlueMillenium](http://ccmixter.org/files/Bluemillenium/61325) (CC 3.0 BY-NC) +- Title screen music: [Je suis un Phoenix by BlueMillenium](http://ccmixter.org/files/Bluemillenium/61325) (CC BY-NC 3.0) # Sound effects - Door open/close sounds: - - [Hatch Seal.wav by Paul368 (freesound)](https://freesound.org/people/Paul368/sounds/264063/) (CC0) - - [SFX Door Open.wav by Paul368 (freesound)](https://freesound.org/people/Paul368/sounds/264061/) (CC0) + - [Hatch Seal.wav by Paul368 (freesound)](https://freesound.org/people/Paul368/sounds/264063/) (CC0 1.0) + - [SFX Door Open.wav by Paul368 (freesound)](https://freesound.org/people/Paul368/sounds/264061/) (CC0 1.0) +- Notification/beeps: + - [Chord Alert Notification by graham_makes (freesound)](https://freesound.org/people/graham_makes/sounds/457518/) (CC BY 3.0) + - [Messenger Notification Sounds by zzwerty (freesound)](https://freesound.org/people/zzwerty/sounds/315878/) (CC BY-NC 3.0) + - [Radio Sign Off by dylanh.sound (freesound)](https://freesound.org/people/dylanh.sound/sounds/524205/) (CC0 1.0) # Code diff --git a/Scenes/UI.gd b/Scenes/UI.gd index ea44736..54d8737 100644 --- a/Scenes/UI.gd +++ b/Scenes/UI.gd @@ -14,6 +14,9 @@ enum PopupName { } onready var logs = $Logs +onready var scene = $"/root/scene" + +const CHAT_RADIUS = 32*6 func _ready() -> void: # Add options to menu buttons @@ -39,3 +42,6 @@ func close_popup(map_name) -> void: $MapPopup.visible = false PopupName.EnergyUsage: pass + +func _send_chat(text): + scene.rpc("broadcast_zone", text + "\n", scene.world.player.global_position, CHAT_RADIUS) diff --git a/Sounds/SFX/door-close.wav b/Sounds/SFX/effects/door-close.wav similarity index 100% rename from Sounds/SFX/door-close.wav rename to Sounds/SFX/effects/door-close.wav diff --git a/Sounds/SFX/door-close.wav.import b/Sounds/SFX/effects/door-close.wav.import similarity index 50% rename from Sounds/SFX/door-close.wav.import rename to Sounds/SFX/effects/door-close.wav.import index ef5e1e8..455575f 100644 --- a/Sounds/SFX/door-close.wav.import +++ b/Sounds/SFX/effects/door-close.wav.import @@ -2,12 +2,12 @@ importer="wav" type="AudioStreamSample" -path="res://.import/door-close.wav-1faad6bf3be9b5e52678e401977fe00a.sample" +path="res://.import/door-close.wav-f2186a53d65333241246e455153168e4.sample" [deps] -source_file="res://Sounds/SFX/door-close.wav" -dest_files=[ "res://.import/door-close.wav-1faad6bf3be9b5e52678e401977fe00a.sample" ] +source_file="res://Sounds/SFX/effects/door-close.wav" +dest_files=[ "res://.import/door-close.wav-f2186a53d65333241246e455153168e4.sample" ] [params] diff --git a/Sounds/SFX/door-open.wav b/Sounds/SFX/effects/door-open.wav similarity index 100% rename from Sounds/SFX/door-open.wav rename to Sounds/SFX/effects/door-open.wav diff --git a/Sounds/SFX/door-open.wav.import b/Sounds/SFX/effects/door-open.wav.import similarity index 50% rename from Sounds/SFX/door-open.wav.import rename to Sounds/SFX/effects/door-open.wav.import index b251b74..bdc61ea 100644 --- a/Sounds/SFX/door-open.wav.import +++ b/Sounds/SFX/effects/door-open.wav.import @@ -2,12 +2,12 @@ importer="wav" type="AudioStreamSample" -path="res://.import/door-open.wav-3c5c5376563179dedddb5fd7fd542243.sample" +path="res://.import/door-open.wav-50d5fc4e7eea744e9b203efe71dc9b86.sample" [deps] -source_file="res://Sounds/SFX/door-open.wav" -dest_files=[ "res://.import/door-open.wav-3c5c5376563179dedddb5fd7fd542243.sample" ] +source_file="res://Sounds/SFX/effects/door-open.wav" +dest_files=[ "res://.import/door-open.wav-50d5fc4e7eea744e9b203efe71dc9b86.sample" ] [params] diff --git a/Sounds/SFX/door-sound.wav b/Sounds/SFX/effects/door-sound.wav similarity index 100% rename from Sounds/SFX/door-sound.wav rename to Sounds/SFX/effects/door-sound.wav diff --git a/Sounds/SFX/door-sound.wav.import b/Sounds/SFX/effects/door-sound.wav.import similarity index 50% rename from Sounds/SFX/door-sound.wav.import rename to Sounds/SFX/effects/door-sound.wav.import index cc5e939..43bbec4 100644 --- a/Sounds/SFX/door-sound.wav.import +++ b/Sounds/SFX/effects/door-sound.wav.import @@ -2,12 +2,12 @@ importer="wav" type="AudioStreamSample" -path="res://.import/door-sound.wav-ac68dc9d9bb353e0d4a064d3f6b8439c.sample" +path="res://.import/door-sound.wav-a7dd359f7d7f7690a94b538a2bf51d4e.sample" [deps] -source_file="res://Sounds/SFX/door-sound.wav" -dest_files=[ "res://.import/door-sound.wav-ac68dc9d9bb353e0d4a064d3f6b8439c.sample" ] +source_file="res://Sounds/SFX/effects/door-sound.wav" +dest_files=[ "res://.import/door-sound.wav-a7dd359f7d7f7690a94b538a2bf51d4e.sample" ] [params] diff --git a/Sounds/SFX/ui/neutral-bi-beep.ogg b/Sounds/SFX/ui/neutral-bi-beep.ogg new file mode 100644 index 0000000..3052c37 Binary files /dev/null and b/Sounds/SFX/ui/neutral-bi-beep.ogg differ diff --git a/Sounds/SFX/ui/neutral-bi-beep.ogg.import b/Sounds/SFX/ui/neutral-bi-beep.ogg.import new file mode 100644 index 0000000..cc18f0e --- /dev/null +++ b/Sounds/SFX/ui/neutral-bi-beep.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/neutral-bi-beep.ogg-b80d5dd9b7ca71aa0d191c8ef7940dc5.oggstr" + +[deps] + +source_file="res://Sounds/SFX/ui/neutral-bi-beep.ogg" +dest_files=[ "res://.import/neutral-bi-beep.ogg-b80d5dd9b7ca71aa0d191c8ef7940dc5.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/Sounds/SFX/ui/pleasant-notification.ogg b/Sounds/SFX/ui/pleasant-notification.ogg new file mode 100644 index 0000000..78cd92c Binary files /dev/null and b/Sounds/SFX/ui/pleasant-notification.ogg differ diff --git a/Sounds/SFX/ui/pleasant-notification.ogg.import b/Sounds/SFX/ui/pleasant-notification.ogg.import new file mode 100644 index 0000000..a8c97cd --- /dev/null +++ b/Sounds/SFX/ui/pleasant-notification.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/pleasant-notification.ogg-0bcbc33b236bc8b1ae34be188fe18751.oggstr" + +[deps] + +source_file="res://Sounds/SFX/ui/pleasant-notification.ogg" +dest_files=[ "res://.import/pleasant-notification.ogg-0bcbc33b236bc8b1ae34be188fe18751.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/Sounds/SFX/ui/radio-message.wav b/Sounds/SFX/ui/radio-message.wav new file mode 100644 index 0000000..e8b439d Binary files /dev/null and b/Sounds/SFX/ui/radio-message.wav differ diff --git a/Sounds/SFX/ui/radio-message.wav.import b/Sounds/SFX/ui/radio-message.wav.import new file mode 100644 index 0000000..3616076 --- /dev/null +++ b/Sounds/SFX/ui/radio-message.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/radio-message.wav-ce2c91f356066e01259b32b652b758a3.sample" + +[deps] + +source_file="res://Sounds/SFX/ui/radio-message.wav" +dest_files=[ "res://.import/radio-message.wav-ce2c91f356066e01259b32b652b758a3.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0