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
Dmitry
1a975ebdbe
merge remote wizden/stable
2026-03-07 03:16:30 +07:00
Moony and GitHub
04b4b7d51c
Non-obsoletion warnings as errors in Release. ( #42983 )
...
* Non-obsoletion warnings as errors in Release.
* Add two other obsoletions related to collection expressions.
These are not present in the codebase, but may become so in the future.
* Exempt NU1903 so the project can't mysteriously stop building.
* Fix some FULL_RELEASE mistakes.
* diff fix
* Resharper caught this one. Note to self: Wire up resharper to CI in another PR.
2026-02-23 21:07:22 +00:00
Dmitry
da0796d7d3
merge remote stable upstream
2025-11-10 21:59:58 +07:00
sleepyyapril and GitHub
7c0ba70b74
Fix TryProccessRadioMessage Typo ( #41139 )
...
fix proccess typo
2025-10-27 10:44:11 +00:00
Dmitry
c682eb80b4
merge remote master, upstream
2025-10-26 22:31:58 +07:00
1469b9484d
Add virtual chat API methods in Shared ( #40895 )
...
* move chat stuff to shared
* refactor: using cleanup +whitespaces + xml-doc
* review
---------
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru >
2025-10-19 19:08:27 +00:00
ee9d1032bb
Move ChatSystem.Emotes to shared ( #40866 )
...
* move to shared
* entity effect to shared
* refactor: whitespaces+xml-doc typo fixups
* refactor: a little bit more of xml-doc typos fixups
---------
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru >
2025-10-13 18:06:01 +00:00
Dmitry
871b3b3123
upstream
2025-09-07 22:54:54 +07:00
Dmitry
995424bb90
corvax code fix
2025-08-21 22:01:24 +07:00
5ea928863f
Cleanup warnings in ChatSystem ( #36773 )
...
* Cleanup warnings in ChatSystem
* fix after merge
---------
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru >
2025-08-17 08:39:23 -04:00
Dmitry
57307b718c
upstream master sync
2025-08-11 18:16:45 +07:00
slarticodefast and GitHub
2c40a950f7
Trigger Refactor ( #39034 )
2025-08-03 21:20:37 +02:00
Dmitry
60c835f02c
master 21.7 syns
2025-07-21 00:27:46 +07:00
Tayrtahn and GitHub
c565b44965
Replace ValidatePrototypeId uses with ProtoId or EntProtoId ( #38814 )
...
* The easy ones
* For certain values of easy
* Easy test
* Hair
* Fix sandbox violations
* Sort usings
2025-07-07 21:57:05 +02:00
Morb0
be480aced1
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Managers/ChatSanitizationManager.cs
# Content.Shared/Localizations/ContentLocalizationManager.cs
# Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
2024-10-30 16:38:56 +03:00
7e526da521
Fix Bug With Uppercase Radio Keys ( #32997 ) (master) ( #33031 )
...
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com >
2024-10-28 00:35:23 +01:00
Thomas and GitHub
d4da9923ea
Fix Emote Chat Sanitizer ( #32940 )
...
* Fix bug?
* Fix :)
* aaaa
* AAAA!!!
* comment
* Nicer code
* What's a pull requestWhat's a pull request?
2024-10-24 16:10:13 +11:00
Morb0
721f7bfecf
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Mobs/base.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
# SpaceStation14.sln
2024-08-28 16:40:36 +03:00
SlamBamActionman and GitHub
61a1e89339
Add codeword highlighting ( #30092 )
...
* Added codeword highlighting
* Updated to support more codeword roles, color is set serverside
* Review feedback
* Change to a Component-based system using SessionSpecific
* Tidied up CanGetState, set Access restrictions on component
* Clean-up
* Makes the injection ignore brackets, restore some codewords, remove "Taste/Touch" from adjectives
2024-08-23 11:14:38 +02:00
Morb0
0546051cb0
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/tips.yml
2024-05-17 10:07:13 +03:00
Pieter-Jan Briers and GitHub
b35dc427e1
Fix sandbox check failure when compiling with latest .NET SDK. ( #28077 )
...
Roslyn now compiles char + string with string.Concat(ROS<char>). This means doing ref char -> ROS<char> which is not sandbox safe. Actually fixing this in the sandboxer is difficult so I'm gonna just pass on that for now.
2024-05-16 19:55:32 +02:00
Morb and GitHub
c9e5afdd60
TTS optimization ( #1873 )
2024-02-16 13:34:14 +03: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
SlamBamActionman and GitHub
247be5b5c7
Add option for character name colors in chat & move coloration to clientside ( #24625 )
...
* Adds option to disable character names in chat/speechbubbles
* Moved the coloring of names to clientside
* Move string functions to SharedChatSystem to avoid duplicate code in SpeechBubble.cs
* Changed to be put under Accessibility section
* Cache CVar
2024-02-10 22:38:55 -08:00
Morb0
d8282512a2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Structures/Wallmounts/camera.rsi/meta.json
2024-01-21 16:10:42 +03:00
Kot and GitHub
8c5898b006
Add chat.max_announcement_length cvar ( #23571 )
...
* Add announce message length to UI and make a cvar for it
* Update comm console server-side trim to use the cvar
* Rely on the new OnTextChanged event
Because OnKeyBindUp only works for keys that have binds
* Add a similar indicator to nukies' war declaration UI
* Remove message length indicators for now cuz it requires the engine update
* Rename cvar slightly
* Refactor duplicated code to a helper method
* Remove message trimming from *Window class as it's better to live in the BoundUserInterface where the other message handling happens
* Rename to chat.max_announcement_length
2024-01-21 20:14:01 +11:00
lzk and GitHub
33ddee4280
Change looc prefix ( #1676 )
2023-12-26 00:20:05 +03:00
Morb0
4426394d78
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/regalrat.yml
# Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png
2023-12-23 02:53:18 +03:00
Leon Friedrich and GitHub
b6bd82caa6
Use ECS prototype-reload events ( #22613 )
...
* Use ECS prototype-reload events
* better constructors
* Maybe this fixes tests?
2023-12-23 01:13:45 +11:00
Morb0
75443d7fb6
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Communications/CommunicationsConsoleSystem.cs
# README.md
# Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
# Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json
2023-10-11 16:56:19 +03:00
9eede28d8c
Using capital letter for radio channel prefixes works now ( #20846 )
...
Co-authored-by: gus <august.eymann@gmail.ccom >
2023-10-08 22:07:54 -07:00
Morb0
4516e1ceef
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/skeleton_first.yml
2023-08-22 08:22:56 +03:00
Interrobang01 and GitHub
93f85751f7
Autocapitalize the word I in IC chat ( #18633 )
2023-08-21 21:43:37 -07:00
Morb0
0b053a65ba
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Server/Chat/Systems/ChatSystem.cs
# Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
2023-08-17 06:19:53 +03:00
Kara and GitHub
7db8c781e7
Speech verbs & conditional markup modification ( #18980 )
2023-08-15 13:03:05 -07:00
Morb0
22283a01f1
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Nuke/NukeSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Content.Shared/Chat/SharedChatSystem.cs
2023-08-15 00:08:39 +03:00
Vordenburg and GitHub
7582474f1a
Lint more const string prototypes ( #18922 )
2023-08-13 20:26:59 -04:00
faint
31f283cc8e
Merge remote-tracking branch 'wizards/master' into upstream-sync
2023-07-04 03:14:11 +03:00
HerCoyote23 and GitHub
2a47302f1e
Add secondary prefix for selecting radio channel, '.' ( #16964 )
2023-07-03 18:55:08 +10:00
Morb0
82b4572421
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Chat/SharedChatSystem.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2023-06-28 16:02:06 +03:00
router and GitHub
33f823e6be
Add alternative emotes channel ( #15965 )
2023-06-26 17:20:08 -04:00
ssdaniel24 and GitHub
e8a98a58da
Changed emote chat prefix ( #850 )
2023-03-02 09:36:41 -08:00
lapatison and GitHub
d7f694eab2
Default channel key tweak ( #848 )
2023-02-24 22:49:53 -08:00
Leon Friedrich and GitHub
75a559fa55
Update radio prefix parsing ( #13777 )
2023-02-19 04:27:56 +11:00
ef452b38a9
Audible emotes ( #12708 )
...
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com >
2023-01-25 08:29:41 -08:00
metalgearsloth and GitHub
1ac5df5e4a
SpeechBubble occlusion ( #8018 )
2022-05-08 01:54:56 -07:00
Charlotte Tezuka