Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ChatSan hotfix #56

Closed
wants to merge 4 commits into from
+12 −9
Closed

ChatSan hotfix #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a7348f
Chatsan ligado, mais alguns chatsans adicionados
JoaoMagal Feb 19, 2025
16669ed
retirar lmao do smiley system
JoaoMagal Feb 24, 2025
ac0e0eb
comentar algumas coisas que estão causando conflito
JoaoMagal Feb 24, 2025
938f019
Merge branch 'EE-Andromeda' into ChatSanitization
JoaoMagal Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Content.Server/Chat/Managers/ChatSanitizationManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,9 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
{ "kkkkk", "chatsan-laughs" }, // mas como não tem sistema que usa regex pronto
{ "kkkk", "chatsan-laughs" }, // vai assim mesmo até segunda ordem
{ "kkk", "chatsan-laughs" }, // também odeio muito que isso não tá no locale de pt-br
{ "kk", "chatsan-laughs" }, // c'est lá vie... eh a vida...
{ "k", "chatsan-laughs" }, // ah, a ordem importa; os maiores tem que vir primeiro, se não ele vai pegar um dos menores e enviar o resto da mensagem
// { "kk", "chatsan-laughs" }, // c'est lá vie... eh a vida...
// { "k", "chatsan-laughs" }, // ah, a ordem importa; os maiores tem que vir primeiro, se não ele vai pegar um dos menores e enviar o resto da mensagem
// COMENTADOS POR QUE OK APARENTEMENTE PEGA ISSO TAMBÉM
{ "o7", "chatsan-salutes" },
{ ";_;7", "chatsan-tearfully-salutes"},
{ "idk", "chatsan-shrugs" },
Expand Down
10 changes: 6 additions & 4 deletions Resources/Locale/pt-BR/speech/speech-chatsan.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,11 +336,13 @@ chatsan-replacement-1119 = chefe da segurança
chatsan-word-1120 = hop
chatsan-replacement-1120 = chefe dos funcionários

chatsan-word-1121 = n
chatsan-replacement-1121 = não
# comentados até segunda ordem por que o radio de sec e sci (:n e :s) usam esses caras

chatsan-word-1122 = s
chatsan-replacement-1122 = sim
# chatsan-word-1121 = n
# chatsan-replacement-1121 = não

# chatsan-word-1122 = s
# chatsan-replacement-1122 = sim

chatsan-word-1123 = mn
chatsan-replacement-1123 = mano
4 changes: 2 additions & 2 deletions Resources/Prototypes/Accents/word_replacements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,8 +503,8 @@
chatsan-word-1118: chatsan-replacement-1118
chatsan-word-1119: chatsan-replacement-1119
chatsan-word-1120: chatsan-replacement-1120
chatsan-word-1121: chatsan-replacement-1121
chatsan-word-1122: chatsan-replacement-1122
# chatsan-word-1121: chatsan-replacement-1121
# chatsan-word-1122: chatsan-replacement-1122

- type: accent
id: liar
Expand Down
2 changes: 1 addition & 1 deletion RobustToolbox
Open in desktop
Submodule RobustToolbox updated 89 files
+1 −1 MSBuild/Robust.Engine.Version.props
+0 −146 RELEASE-NOTES.md
+0 −6 Resources/EnginePrototypes/Shaders/stockshaders.yml
+0 −96 Robust.Benchmarks/EntityManager/HasComponentBenchmark.cs
+1 −23 Robust.Client/GameObjects/ClientEntityManager.cs
+0 −61 Robust.Client/GameObjects/EntitySystems/UserInterfaceSystem.cs
+237 −282 Robust.Client/GameStates/ClientGameStateManager.cs
+5 −1 Robust.Client/GameStates/IClientGameStateManager.cs
+0 −5 Robust.Client/GameStates/PvsOverrideSystem.cs
+6 −23 Robust.Client/Graphics/Clyde/Clyde.HLR.cs
+52 −71 Robust.Client/Graphics/Clyde/Clyde.LightRendering.cs
+3 −26 Robust.Client/Graphics/Clyde/Clyde.RenderTargets.cs
+35 −117 Robust.Client/Graphics/Clyde/Clyde.Rendering.cs
+2 −2 Robust.Client/Graphics/Clyde/Clyde.Viewport.cs
+1 −2 Robust.Client/Graphics/Clyde/Clyde.cs
+2 −19 Robust.Client/Graphics/Clyde/ClydeHeadless.cs
+0 −21 Robust.Client/Graphics/IClyde.cs
+2 −3 Robust.Client/Graphics/IClydeViewport.cs
+0 −39 Robust.Client/Graphics/IRenderTarget.cs
+0 −13 Robust.Client/Graphics/Lighting/GetClearColorEvent.cs
+1 −0 Robust.Client/Graphics/Lighting/LightManager.cs
+3 −14 Robust.Client/Graphics/Overlays/OverlayDrawArgs.cs
+1 −1 Robust.Client/Physics/PhysicsSystem.Predict.cs
+1 −3 Robust.Client/Replays/Loading/ReplayLoadManager.Checkpoints.cs
+2 −2 Robust.Client/Replays/Playback/ReplayPlaybackManager.Update.cs
+3 −53 Robust.Client/UserInterface/BoundUserInterfaceExt.cs
+3 −3 Robust.Client/UserInterface/Control.Styling.cs
+1 −1 Robust.Client/UserInterface/Control.cs
+1 −0 Robust.Client/UserInterface/Controllers/Implementations/TileSpawningUIController.cs
+9 −30 Robust.Client/UserInterface/Controls/EntityPrototypeView.cs
+1 −1 Robust.Client/UserInterface/Controls/SpriteView.cs
+12 −13 Robust.Client/UserInterface/CustomControls/BaseWindow.cs
+0 −7 Robust.Client/UserInterface/CustomControls/TileSpawnWindow.xaml.cs
+3 −3 Robust.Client/UserInterface/CustomControls/ViewportContainer.cs
+0 −11 Robust.Client/UserInterface/IUserInterfaceManager.cs
+2 −4 Robust.Client/UserInterface/UserInterfaceManager.Input.cs
+1 −1 Robust.Client/UserInterface/UserInterfaceManager.Roots.cs
+3 −28 Robust.Client/UserInterface/UserInterfaceManager.cs
+1 −5 Robust.Server/GameStates/PvsData.cs
+6 −17 Robust.Server/GameStates/PvsOverrideSystem.cs
+3 −7 Robust.Server/GameStates/PvsSystem.cs
+1 −1 Robust.Server/Maps/MapChunkSerializer.cs
+0 −3 Robust.Server/Upload/GamePrototypeLoadManager.cs
+1 −1 Robust.Shared.CompNetworkGenerator/ComponentNetworkGenerator.cs
+1 −0 Robust.Shared.Maths/Angle.cs
+2 −4 Robust.Shared/Audio/Systems/SharedAudioSystem.cs
+3 −2 Robust.Shared/CVars.cs
+45 −53 Robust.Shared/Configuration/ConfigurationCommands.cs
+0 −4 Robust.Shared/Containers/SharedContainerSystem.Insert.cs
+1 −6 Robust.Shared/Enums/OverlaySpaces.cs
+8 −12 Robust.Shared/GameObjects/Components/UserInterface/BoundUserInterface.cs
+1 −23 Robust.Shared/GameObjects/EntityManager.ComponentDeltas.cs
+9 −55 Robust.Shared/GameObjects/EntityManager.Components.cs
+0 −7 Robust.Shared/GameObjects/EntitySystem.Proxy.cs
+0 −17 Robust.Shared/GameObjects/IEntityManager.Components.cs
+1 −1 Robust.Shared/GameObjects/Systems/CollisionWakeSystem.cs
+48 −60 Robust.Shared/GameObjects/Systems/EntityLookup.Queries.cs
+44 −61 Robust.Shared/GameObjects/Systems/EntityLookupSystem.ComponentQueries.cs
+8 −4 Robust.Shared/GameObjects/Systems/SharedMapSystem.Grid.cs
+7 −21 Robust.Shared/GameObjects/Systems/SharedTransformSystem.Component.cs
+0 −4 Robust.Shared/GameObjects/Systems/SharedTransformSystem.cs
+66 −118 Robust.Shared/GameObjects/Systems/SharedUserInterfaceSystem.cs
+0 −50 Robust.Shared/GameStates/SharedPvsOverrideSystem.cs
+3 −2 Robust.Shared/Map/Components/MapLightComponent.cs
+10 −10 Robust.Shared/Map/IMapManager.cs
+45 −48 Robust.Shared/Map/MapManager.Queries.cs
+7 −18 Robust.Shared/Map/Tile.cs
+3 −3 Robust.Shared/Physics/Collision/CollisionManager.Overlap.cs
+7 −8 Robust.Shared/Physics/Collision/DistanceProxy.cs
+1 −3 Robust.Shared/Physics/Collision/IManifoldManager.cs
+0 −33 Robust.Shared/Physics/Dynamics/Contacts/Contact.cs
+10 −33 Robust.Shared/Physics/Shapes/Polygon.cs
+9 −17 Robust.Shared/Physics/Systems/SharedBroadphaseSystem.cs
+64 −50 Robust.Shared/Physics/Systems/SharedPhysicsSystem.Components.cs
+3 −15 Robust.Shared/Physics/Systems/SharedPhysicsSystem.Contacts.cs
+0 −55 Robust.Shared/Physics/Systems/SharedPhysicsSystem.Pool.cs
+11 −11 Robust.Shared/Physics/Systems/SharedPhysicsSystem.Queries.cs
+1 −29 Robust.Shared/Physics/Systems/SharedPhysicsSystem.cs
+4 −10 Robust.Shared/Prototypes/IPrototypeManager.cs
+2 −3 Robust.Shared/Prototypes/PrototypeManager.YamlLoad.cs
+57 −82 Robust.Shared/Prototypes/PrototypeManager.cs
+16 −32 Robust.Shared/Serialization/Manager/SerializationManager.Composition.cs
+3 −1 Robust.Shared/Serialization/Manager/SerializationManager.FlagsAndConstants.cs
+0 −21 Robust.Shared/Serialization/Markdown/Mapping/MappingDataNode.cs
+1 −0 Robust.Shared/Upload/SharedPrototypeLoadManager.cs
+0 −446 Robust.UnitTesting/Server/GameStates/DetachedParentTest.cs
+4 −4 Robust.UnitTesting/Shared/Map/MapGrid_Tests.cs
+1 −1 Robust.UnitTesting/Shared/Map/SingleTileRemoveTest.cs
+0 −515 Robust.UnitTesting/Shared/Physics/CollisionPredictionTest.cs
Loading