faint
076d2e339b
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
# Content.Client/LateJoin/LateJoinGui.cs
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png
# RobustToolbox
2023-07-10 07:03:24 +03:00
Flareguy
54a7a4a9a1
extends shuttle timer to 20m green / 10m on blue ( #17826 )
2023-07-04 22:38:08 -06:00
Morb
5461f689dd
New nuke music ( #827 )
2023-02-14 17:17:23 -08:00
Flipp Syder
e789e1df2a
Makes delta alert louder ( #10907 )
...
* switches to smaller floats for volume
* ok, larger numbers again
2022-08-29 21:34:29 -05:00
Kara
e0a680a670
Change yellow alert elight color to goldenrod ( #9577 )
2022-07-09 05:23:14 -07:00
Kara
7e34124244
Emergency light goodies ( #9352 )
...
Co-authored-by: Jacob Tong <10494922+ShadowCommander@users.noreply.github.com>
2022-07-07 09:16:48 -07:00
T-Stalker
3046599924
Add and replace alert sounds ( #9360 )
2022-07-02 20:52:40 -07:00
Kara
43b0f303c3
Lower shuttle time + recall turning point ( #9328 )
2022-07-01 13:40:36 -07:00
Júlio César Ueti
bda1999675
Adjust alert level volumes ( #9145 )
...
* Finally
* Requested adjustments
2022-06-27 13:45:01 -07:00
metalgearsloth
521ed99766
Evac shuttle ( #8931 )
...
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-06-26 15:20:45 +10:00
Flipp Syder
74c7aa9510
Alert level reloads ( #8530 )
...
* adds prototype reload for AlertLevelSystem, reorganizes selectable alerts a bit
* makes alert levels not necessarily require localization
* oops
* sus
* does the same for announcements as well
* oh, that's not how that works at all
* ok, NOW it works
* fixes localization, adds event for when alerts are reloaded
* addresses review
2022-06-01 17:40:11 +10:00
Morbo
69a4deda34
Gamma & Epsilon alerts levels ( #8517 )
...
* Add Gamma & Epsilon alert levels
* Add license for epsilon sound
* Remove mention about gamma armory
* Add missing license sources
* Delete unused sound
2022-05-29 01:35:08 -07:00
Flipp Syder
dcdda39048
Station alert levels ( #8226 )
2022-05-18 14:05:31 +10:00
