Pupchansky
b7763588aa
Musical automat changes ( #400 )
...
* рефакторинг JukeboxSystem и добавление новых треков
* МИНИ ФИКСЫ
* еще фиксы
* чучучут
* мир фиксов
* фиксы от кодрэббита
* TinTinOnTheMoonRemix добавлена в лобби
* добавлены треки от MRX и mrjajkes. +чучут отредачены attributions.yml
* забыл убрать тире
* добавлены почему-то не добавленные раньше wl-changes теги
* ебал в рот названия коммитов
* трек фури добавлен в лобби
2025-12-15 00:14:31 +03:00
Dmitry
f01a60f5c7
upstream 9.1
2025-09-17 06:41:33 +07:00
Pieter-Jan Briers
0c97520276
Fix usages of TryIndex() ( #39124 )
...
* Fix usages of TryIndex()
Most usages of TryIndex() were using it incorrectly. Checking whether prototype IDs specified in prototypes actually existed before using them. This is not appropriate as it's just hiding bugs that should be getting caught by the YAML linter and other tools. (#39115 )
This then resulted in TryIndex() getting modified to log errors (94f98073b0#39098 )
This commit goes through and checks every call site of TryIndex() to see whether they were correct. Most call sites were replaced with the new Resolve(), which is suitable for these "defensive programming" use cases.
Fixes #39115
Breaking change: while doing this I noticed IdCardComponent and related systems were erroneously using ProtoId<AccessLevelPrototype> for job prototypes. This has been corrected.
* fix tests
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2025-09-09 18:17:56 +02:00
Dmitry
871b3b3123
upstream
2025-09-07 22:54:54 +07:00
Kyle Tyo
a8e0001f34
Cleanup of resolves and usings. ( #39865 )
...
* commit
* commit
2025-08-24 03:29:55 +02:00
Dmitry
4948a136f1
stable upstream syns
2025-07-17 14:36:21 +07:00
Tayrtahn
75db49f9c0
Clean up all missing EntitySystem proxy method uses ( #38353 )
2025-06-26 16:50:49 -07:00
Dmitry
76f0d2d12b
upstream syns
2025-06-19 15:45:02 +07:00
Kyle Tyo
9d22f6147c
Command resolve killing, LEC conversions, and general cleanup. ( #38338 )
...
* i'm just gonna put this here.
* I'm just gonna do it.
* Update ShowHTNCommand.cs
* I feel dumb.
* may as well with this too.
* this does in fact not work
* :/
2025-06-17 20:08:12 +02:00
Dmitry
a6ecbc3410
Merge remote-tracking branch 'upstream/master'
2025-05-24 22:35:13 +07:00
Tayrtahn
33f111c090
Cleanup more SpriteComponent warnings (part 2) ( #37522 )
...
* Cleanup warnings in DamageMarkerSystem
* Cleanup warnings in CuffableSystem
* Cleanup warnings in DeployableTurretSystem
* Cleanup warnings in StorageContainerVisualsSystem
* Cleanup warnings in ItemMapperSystem
* Cleanup warnings in ItemCounterSystem
* Cleanup warnings in RandomSpriteSystem
* Cleanup warnings in PowerCellSystem
* Cleanup warnings in ParticleAcceleratorPartVisualizerSystem
* Cleanup warnings in PaperVisualizerSystem
* Cleanup warnings in PoweredLightVisualizerSystem
* Cleanup warnings in LightBulbSystem
* Cleanup warnings in EmergencyLightSystem
* Cleanup warnings in DoorSystem
* Cleanup warnings in ClockSystem
* Cleanup warnings in BuckleSystem
* Cleanup warnings in JukeboxSystem
2025-05-17 13:02:36 +10:00
Zekins
7d6f564344
Merge remote-tracking branch 'upstream/master' into upstream
2025-03-18 02:40:46 +03:00
pathetic meowmeow
fabfdd0673
Refactor audio system to send collection IDs over the network ( #33610 )
2025-02-23 23:14:56 +11:00
Morb0
3ab6d3ef71
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/VoiceMask/VoiceMaskComponent.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Command/captain.yml
# Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/blue_circuit.png
# Resources/Textures/Tiles/green_circuit.png
# Resources/Textures/Tiles/steel.png
2024-10-04 19:47:54 +03:00
nikthechampiongr
a5840b925b
Fix RA0032 ( #32514 )
2024-09-29 02:25:21 +02:00
Morb0
34d3cf6293
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Security/Defusal.xml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
2024-09-19 10:30:01 +03:00
Leon Friedrich
974c08596b
Fix AudioSystem nullability checks for engine PR ( #32233 )
2024-09-18 11:43:30 +10:00
Morb0
acf1ff4ec0
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Systems/ChatSystem.cs
# Resources/Prototypes/AlertLevels/alert_levels.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/StatusIcon/faction.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
# Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
2024-08-12 13:18:43 +03:00
Mervill
c25c5ec666
Remove uses of Component.Owner from AmbientSoundSystem ( #30842 )
...
Remove Component.Owner from AmbientSoundSystem
2024-08-11 12:39:37 +10:00
Morb0
e853272357
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
2024-07-21 12:48:56 +03:00
metalgearsloth
edb05e36bb
Reapply "Remove some BUI boilerplate" ( #30214 ) ( #30219 )
...
* Reapply "Remove some BUI boilerplate" (#30214 )
This reverts commit cb0ba66be3
2024-07-21 14:48:13 +10:00
Morb0
a5980baa7d
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
# Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/court.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/law.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/security.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/space.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png
# Resources/migration.yml
2024-07-21 07:20:43 +03:00
Nemanja
cb0ba66be3
Revert "Remove some BUI boilerplate" ( #30214 )
...
Revert "Remove some BUI boilerplate (#28399 )"
This reverts commit cbf329a82d
2024-07-20 20:42:27 -04:00
metalgearsloth
cbf329a82d
Remove some BUI boilerplate ( #28399 )
...
* Remove some BUI boilerplate
- The disposals overrides got removed due to the helper method handling it.
- Replace window creation with CreateWindow helper.
- Fixed some stinky code which would cause exceptions.
* More
* moar
* weh
* done
* More BUIs
* More updates
* weh
* moar
* look who it is
* weh
* merge
* weh
* fixes
2024-07-20 15:40:16 +10:00
Pieter-Jan Briers
c0593fb328
Fix invalid UI hover/click sounds breaking client ( #30067 )
...
fixes #29561
2024-07-15 16:55:05 +02:00
Ed
1c74ffb8e4
Ambient music rules refactor ( #29921 )
...
* refactor
* dutypo
2024-07-14 23:58:48 +10:00
Morb0
d97a09543d
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/IoC/ClientContentIoC.cs
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
2024-05-15 18:53:52 +03:00
Kara
1596e04d0f
Resolve all non-obsoleting warnings in content ( #27934 )
...
* Resolve all non-obsoleting warnings in content
* Update ClientGameTicker.cs
* Update SkeletonAccentSystem.cs
* Update BwoinkSystem.cs
2024-05-11 20:13:58 -07:00
Morb0
38506f90df
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Entities/Clothing/Hands/specific.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
2024-04-27 13:24:36 +03:00
metalgearsloth
5896e68752
Content update for UI prediction ( #27214 )
...
* Content update for UI refactor
* Big update
* Sharing
* Remaining content updates
* First big update
* Prototype updates
* AUGH
* Fix UI comp ref
* Cleanup
- Fix predicted message, fix item slots, fix interaction range check.
* Fix regressions
* Make this predictive
idk why it wasn't.
* Fix slime merge
* Merge conflict
* Fix merge
2024-04-26 18:16:24 +10:00
Morb0
2aa1d62e55
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
2024-04-17 15:45:55 +03:00
metalgearsloth
2db374988c
Added Jukebox ( #26736 )
...
* Added Jukebox, along with music for jukebox
* Fixed Jukebox meta.json copyright
* Removed songs I couldn't find a license for.
* Renamed files to solve check failures from spaces
* Added missing attributions.yml
* Fixed lack of description in Jukebox
* Jukebox is now constructable.
* Change Jukebox menu to FancyWindow
* Moved Jukebox messages out of jukebox component
* Removed Jukebox OnValueChanged.
* JukeboxComp now uses AutoGenerateComponentState
* Removed state code, since it's auto generated
* Fixed various Jukebox code to match conventions.
* Updated Standard.yml to match changed song list.
* fixes
* Jukebox workin
* Fix
* Polishing
* Finalising
* Revert
* bad
* jukey
* Reviews
* name
* Update submodule to 218.2.0
---------
Co-authored-by: iNVERTED <alextjorgensen@gmail.com >
2024-04-17 19:27:00 +10:00
Morb0
c44d509701
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png
# Resources/Textures/Interface/Alerts/essence_counter.rsi/essence16.png
2024-03-29 11:43:30 +03:00
metalgearsloth
a25801b35b
Update audioparams ( #26387 )
...
Drops busname + attenuation.
2024-03-29 16:55:05 +11:00
Morb0
4f43e73d14
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
2024-03-11 08:37:54 +03:00
Gregg
e47f84568e
fix: ambient music fade in ( #25874 ) ( #25969 )
2024-03-11 04:08:05 +11:00
Morb0
b70efe1fa8
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Audio/ContentAudioSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
# Resources/Prototypes/Datasets/Names/first_male.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
# Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/herringbone.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/offset.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png
# Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# Resources/Textures/Structures/Windows/directional.rsi/meta.json
2024-03-08 16:05:59 +03:00
Fildrance
4c87dcd3cb
fix: lobby music volume will be changed on options change without restart (also lobby music not looped anymore) ( #25530 )
...
* fix: lobby music volume will be changed on options change without restart (also lobby music not looped anymore)
* refactor: now lobby music is part of ContentAudioSystem. Lobby playlist is used instead of single track. Client now selects next lobby soundtrack after previous finished.
* refactor: incapsulated info on current lobby track in simple record
* refactor: fixed inconsistent naming between song and soundtrack for lobbymusic
* refactor: xml-doc for LobbyPlaylistChangedEvent
* fix: inverted invalid _audio.PlayGlobal check to return only if lobby soundtrack play call failed
---------
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru >
2024-03-02 15:40:04 -05:00
Morb0
92bd0148fe
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Resources/Locale/en-US/chat/sanitizer-replacements.ftl
# Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
# Resources/Prototypes/StatusIcon/antag.yml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png
2024-02-17 12:43:04 +03:00
Pieter-Jan Briers
68ce53ae17
Random spontaneous cleanup PR ( #25131 )
...
* Use new Subs.CVar helper
Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe.
This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown.
* Fix a bunch of warnings
* More warning fixes
* Use new DateTime serializer to get rid of ISerializationHooks in changelog code.
* Get rid of some more ISerializationHooks for enums
* And a little more
* Apply suggestions from code review
Co-authored-by: 0x6273 <0x40@keemail.me >
---------
Co-authored-by: 0x6273 <0x40@keemail.me >
2024-02-13 16:48:39 -05:00
Morb0
70e63172f7
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# README.md
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
# Resources/ServerInfo/Guidebook/Medical/Cloning.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json
# Resources/Textures/Objects/Tools/t-ray.rsi/meta.json
# Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png
# Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png
2024-02-12 12:53:34 +03:00
nikthechampiongr
09daa534bd
Fix end of round messages looping forever ( #24920 )
...
* Fix End of Round messages looping forever and ever and ever
* Use the correct setting for round restart sounds
2024-02-04 03:43:50 +11:00
Hannah Giovanna Dawson
2e7d23674e
Actually fix round restart audio this time ( #24754 )
...
In which I'm a goober and don't clean up after
myself and accientally don't fix the issue I tried
to fix in my last round restart PR.
The audio is now maintained just like music during
restarts (yippee to ContentAudioSystem::OnRoundRestart)
This needs a refactor but at least the defect is fixed now.
2024-02-03 13:11:53 +11:00
Morb0
d8367b411c
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
2024-01-21 04:05:37 +03:00
metalgearsloth
4a13dbea76
Fix some test warnings ( #24324 )
...
Extracted from smug's pr.
2024-01-20 17:15:10 +11:00
Hannah Giovanna Dawson
5af1d0ea8b
Fixes round restart audio clipping ( #24044 )
...
* Fix round end audio clipping
* weh
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2024-01-20 14:40:00 +11:00
Morb0
1e0bee212f
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/ServerInfo/Gameplay.txt
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml
# Resources/Textures/Clothing/Mask/bat.rsi/meta.json
# Resources/Textures/Clothing/Mask/bear.rsi/meta.json
# Resources/Textures/Clothing/Mask/bee.rsi/meta.json
# Resources/Textures/Clothing/Mask/breath.rsi/meta.json
# Resources/Textures/Clothing/Mask/clown.rsi/meta.json
# Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json
# Resources/Textures/Clothing/Mask/ert.rsi/meta.json
# Resources/Textures/Clothing/Mask/fox.rsi/meta.json
# Resources/Textures/Clothing/Mask/gas.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json
# Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
# Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json
# Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json
# Resources/Textures/Clothing/Mask/jackal.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/medical.rsi/meta.json
# Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json
# Resources/Textures/Clothing/Mask/merc.rsi/meta.json
# Resources/Textures/Clothing/Mask/mime.rsi/meta.json
# Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json
# Resources/Textures/Clothing/Mask/rat.rsi/meta.json
# Resources/Textures/Clothing/Mask/raven.rsi/meta.json
# Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json
# Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Mask/sterile.rsi/meta.json
# Resources/Textures/Clothing/Mask/swat.rsi/meta.json
2024-01-10 00:23:02 +03:00
metalgearsloth
bc07cbc97c
Fix audio fades ( #23684 )
...
Audio refactor casualty
2024-01-08 00:23:22 +11:00
Morb0
8ba54ec466
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Audio/ContentAudioSystem.cs
# Content.Client/Options/UI/Tabs/AudioTab.xaml
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png
2023-12-29 16:58:52 +03:00
metalgearsloth
4023134cf0
Add UI click sounds ( #22410 )
...
* Add UI click sounds
* tweaks
* Significant cleanup
* Audio options and numerous fixes
* Fix the remaining UI elements
* new click sound
---------
Co-authored-by: Kara <lunarautomaton6@gmail.com >
2023-12-29 15:43:36 +11:00
