Charlotte Tezuka
284bc8ecf3
Merge remote-tracking branch 'dimo2/fix-something' into upstream30.04
2026-05-10 23:22:37 +02:00
Pieter-Jan Briers and GitHub
5168b5f3d4
IoC source gen compatibility ( #43863 )
...
* IoC source gen compatibility
Can be merged before or after https://github.com/space-wizards/RobustToolbox/pull/6549 doesn't really matter.
* Missed a spot
2026-05-09 03:29:58 +00:00
Charlotte Tezuka
3cdf543efa
Merge remote-tracking branch 'wizards/master' into upstream30.04
2026-05-01 20:14:19 +02:00
00d4c4f8fe
Changeling voice mimicry ( #43675 )
...
* working yay
* fixed the thing I had removed
* there it works
* i know my coding I hope
* Update Resources/Textures/Interface/Actions/changeling2.rsi/meta.json
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com >
* Update Content.Server/VoiceMask/VoiceMaskSystem.cs
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com >
* Update Content.Server/VoiceMask/VoiceMaskSystem.cs
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com >
* Update Content.Server/VoiceMask/VoiceMaskSystem.cs
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com >
* Update Content.Server/VoiceMask/VoiceMaskSystem.cs
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com >
* Apply suggestions from code review
oh god you can just do batches oh my god
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com >
* Update changeling-catalog.ftl
new line at EOF
* Update changeling.yml
same
* Update changeling.yml
line
* Update StoreSystem.Ui.cs
* Update StoreSystem.Ui.cs
* Update StoreSystem.Ui.cs
just reverted it to master
* Apply suggestions from code review
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com >
* Update VoiceMaskSystem.cs
there ya go skar
* fixed the bug, yay
* clean
* GITHUB, DO YOUR THING
* [DataField] is in the air? WRONG.
* minor spelling mistake
* all is well all is well sometimes
* minor fix
* apathy
* it works
* VIVE LA RÉVOLUTION
* minor spelling mistake *dies*
* why the fuck are high-rez vest making tests fail
* stuff
* NEWLINENEWLINENEWLINE
* Update Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* Update Content.Server/VoiceMask/VoiceMaskSystem.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
---------
Co-authored-by: nomdéraisonnablementlong <you@example.com >
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com >
Co-authored-by: ScarKy0 <scarky0@onet.eu >
Co-authored-by: beck-thompson <beck314159@hotmail.com >
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2026-04-26 16:58:20 +00:00
Dmitry
1a9a79cbba
upstream codefix
...
kek
2026-01-08 18:11:46 +07:00
Dmitry
6187a5a7bd
merge remote stable wizden
2026-01-08 10:32:52 +07:00
alexalexmax and GitHub
4ff7411fb7
Voice mask effects are toggleable and hide your accent ( #41965 )
...
* apply negate accents system
* add toggle to voice mask ui
* roll negateaccents into voice mask system, delete negate accents comp&system, update yml entries
* convert button to ToggleButton and some cleanup
* retry for heisenfail
* accent toggle
* update names and add mask active check for accent hiding
2025-12-26 02:47:05 +00:00
Dmitry
4f4b71e8de
merge remote wizden stable
2025-12-22 00:33:29 +07:00
beck-thompson and GitHub
dd79254a0f
Add voice mask implant ( #41551 )
...
* Add voice mask implant
* Remove voice mask
* Voice mask implant now overrides your identity
* voice mask implant can now be extracted, when taking out the voice mask implant it now updates your name proplery
* Simplify logic
2025-12-07 02:35:46 +00:00
Dmitry
57307b718c
upstream master sync
2025-08-11 18:16:45 +07:00
beck-thompson and GitHub
80375370f8
Add voice locks to various hidden syndicate items ( #39310 )
2025-08-10 11:10:13 -07:00
Dmitry
a6ecbc3410
Merge remote-tracking branch 'upstream/master'
2025-05-24 22:35:13 +07:00
āda and GitHub
de24413bd5
HumanoidCharacterProfile and IdCardConsoleComponent constants moved to cvar. Sync id card length with character name length ( #35407 )
...
* commit
* mark TODOs
* compiles
* cleanup
* cleanup
* oops
* changed my mind
* requested changes
* genpop fix
2025-05-17 15:27:39 +10: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
beck-thompson and GitHub
fe2145d3b9
Voice Mask refactor ( #30798 )
...
* First commit
* Added base.Initialize()
* Voice wire fix (Electricty name)
* Various minor cleanups
* Localized default voice mask name
* Added VoiceOverride stuff
* Removed unused stuff
* Typo
* Better localized stuff
* Typo / spelling stuff / comments
* Blessed
2024-09-26 18:55:59 +02: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
Morb0
3e015c6f67
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
# Resources/Prototypes/GameRules/midround.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/StatusEffects/health.yml
# Resources/Prototypes/StatusIcon/antag.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/ServerInfo/Guidebook/Engineering/Construction.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/Networking.xml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
# Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
2024-04-26 11:19:50 +03:00
metalgearsloth and GitHub
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
Tayrtahn and GitHub
50631f430d
Add clothing equipped/unequipped events ( #27155 )
...
* Added ClothingGotEquipped/ClothingGotUnequipped events
* Better version
* Implemented in a few places
* More implementations
* Add ClothingDidEquipped/ClothingDidUnequipped events
2024-04-21 11:00:50 -04: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
d13da2837d
voicemask can select speech verb ( #25768 )
...
* add Name field to SpeechVerbPrototype
* extra locale for voice mask ui
* SpeechVerb ui and handling
* raaaaaaaaa
* reeeeeeeeal
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
* fix sort
* did you hear john syndicate died of ligma
* Update Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2024-03-28 17:36:43 +11:00
Morb0
5aa1642ba2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/VoiceMask/VoiceMaskComponent.cs
# Resources/Prototypes/SoundCollections/lobby.yml
# Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Structures/Walls/solidrust.rsi/full.png
# Resources/Textures/Structures/Walls/solidrust.rsi/meta.json
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust0.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust1.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust2.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust3.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust4.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust5.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust6.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust7.png
2024-01-26 01:14:50 +03:00
Tayrtahn and GitHub
b4046bc2bb
Fix sloshing electricity & enable SpeechVerb masking ( #24238 )
...
* Implemented electricity speech verb masking
* Handle speech verb override elsewhere in the system, even though we're not using it
* Fix that protoId business
* No nullable component fields
* Use ProtoId, and try going back to a nullable.
Specifiy DataFields on VoiceMaskComponent.
2024-01-23 17:12:18 -05:00
Morb0
7d4b894002
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
2023-12-16 03:05:40 +03:00
DrSmugleaf and GitHub
af3a1e5900
Fix masks not toggling voice mask component ( #22506 )
2023-12-14 20:39:11 -05:00
Morb0
33942c412a
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png
2023-12-14 00:57:14 +03:00
DrSmugleaf and GitHub
ad6dc94c60
Move MaskComponent to shared and add toggle events ( #22395 )
...
* Move MaskComponent to shared and add toggle events
* Datafield and network IsToggled
* Add missing dirty
2023-12-12 19:02:35 -07:00
Morb0
3cb4017c90
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Audio/Announcements/license.txt
# Resources/Audio/Effects/Shuttle/licenses.txt
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/Textures/Structures/Storage/tanks.rsi/meta.json
2023-11-14 16:35:33 +03:00
Bakke and GitHub
91a2479b66
Fix voice mask popup location ( #21638 )
...
The voice mask confirmation and error popups were placed at the cursor,
which made the popup render hidden under the voice mask UI. This moves
the message to the player entity, and colors the error feedback red to
make it more distinct.
2023-11-13 15:55:24 -07:00
Morb0
259233ad78
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/UI/CharacterSetupGui.xaml
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Resources/Prototypes/Catalog/Fills/Boxes/general.yml
# Resources/Prototypes/Entities/Clothing/Back/satchel.yml
# Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-11-04 12:16:53 +03:00
Leon Friedrich and GitHub
f308adffaf
Move ActorComponent to shared ( #21293 )
2023-10-29 04:21:02 +11:00
Morb0
e21ee44f9e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-09-13 16:51:52 +03:00
metalgearsloth and GitHub
5a0fc68be2
Content update for NetEntities ( #18935 )
2023-09-11 09:42:41 +10:00
DrSmugleaf and GitHub
c71f97e3a2
Refactor actions to be entities with components ( #19900 )
2023-09-08 18:16:05 -07:00
Morb0
5277dceed2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
2023-08-24 22:01:46 +03:00
DrSmugleaf and GitHub
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
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
TemporalOroboros and GitHub
3ac4cf85db
Cleaner BoundUserInterfaces ( #17736 )
2023-07-09 02:02:17 +10:00
Morbo
8cdd0cda60
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Server Info/Guidebook/Controls/Controls.xml
2023-02-12 03:57:54 +03:00
Chief-Engineer and GitHub
5c06c4c3ef
Add voice changer logs ( #14040 )
...
* add set voice log
* add used identity to chat message logs
* please tell me there's a better way
2023-02-11 19:26:44 +00:00
Morb and GitHub
d98e077db8
TTS voice mask support ( #748 )
2023-01-15 07:13:18 -08:00
Leon Friedrich and GitHub
881a2b2ece
PopupSystem public methods rejig ( #12830 )
2022-12-19 08:41:47 +11:00
Flipp Syder and GitHub
0385f1387c
Voice mask ( #10458 )
2022-09-29 12:22:27 +10:00
Charlotte Tezuka