Ed
3409e0f752
Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Overlays/StencilOverlay.cs
# Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
# Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
# Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
# Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
# Content.Shared/Clothing/Components/ClothingComponent.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Content.Shared/Humanoid/SkinColor.cs
# Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
2025-09-15 13:50:49 +03:00
SweetAplle
ff54410d6a
"idk" no longer shrugs, instead sanitizing to "I don't know" ( #39024 )
...
* idk no longer shrugs
* accidentally had this in here!
* this was accidentally in here too!
* fucked up the removal
* fucked it up again this should HOPEFULLY be the last one
turns out it's hard to revert the edit of a file that's just numbers and spaces who woulda thunk?
* Restore SpaceStation14.sln to master
* Restore development.toml
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
2025-09-10 13:09:58 -07:00
Ed
f2d9608a62
Merge remote-tracking branch 'upstream/stable' into ed-04-08-2025-upstream-sync
...
# Conflicts:
# Content.Server/Chat/Managers/ChatSanitizationManager.cs
# Content.Shared/Damage/Systems/SharedStaminaSystem.cs
# Content.Shared/Eye/VisibilityFlags.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
# Resources/Prototypes/Recipes/Reactions/chemicals.yml
# Tools/actions_changelogs_since_last_run.py
2025-08-04 12:44:29 +03:00
Deserty0
e637747b06
Chatsan Пустыня эдишн ( #1592 )
...
* оп
* Update speech-chatsan.ftl
2025-08-01 00:36:13 +03:00
Pieter-Jan Briers
444180c20d
Optimizations from server profile ( #38290 )
...
* Properly cache regexes in chat sanitization/accents
Wow I wonder if `new Regex()` has a cost to it *looks at server profile*.
* Avoid lag caused by Tippy command completions
CompletionHelper.PrototypeIDs explicitly says *not* to use it with EntityPrototype. Unsurprisingly, reporting a completion result for every entity prototype in the game is a *bad idea*.
* Add active count metrics to some high-load systems
Mover & NPCs
I suspect the thing that caused the Leviathan round to shit itself on performance is NPC spam in space or something. So let's verify that.
* Enable parallel processing on pow3r again
Originally disabled due to a theory of it causing bugs, it was re-enabled on Vulture, and I'm not aware of it having caused any issues there.
* Replace hashset with bitflags for AtmosMonitor alert types.
Allocating these hashsets was like 20% of the CPU of atmos, somehow.
* Cache HashSet used for space movement collider checks
Turns out this was a ton of server allocations. Huh.
2025-07-26 11:44:34 +02:00
Ed
42d39a7c67
Merge remote-tracking branch 'upstream/stable' into ed-10-06-2025-upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Lock/LockSystem.cs
2025-06-10 11:33:34 +03:00
Simon
a9f36e6592
Fix admin chat relay sending to every player online ( #37795 )
2025-05-25 00:11:01 +02:00
Simon
7867cbec00
Add basic discord client integration with ooc and admin chat support ( #33840 )
...
* Add basic discord client integration with ooc and admin chat support
* Use username instead of global name
WHY IS GLOBAL NAME NOT JUST THE USERNAME??? WHY ARE THERE NO DOC COMMENTS???
* stuff
* Reviews, methinks.
* Reviews
* reviews
2025-05-24 20:49:52 +02:00
Ed
ef6d973301
Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync
...
# Conflicts:
# Content.Client/Parallax/ParallaxControl.cs
# Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
# Content.Server/Labels/Label/LabelSystem.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Fluids/Components/EvaporationComponent.cs
# Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
# README.md
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Maps/Pools/deathmatch.yml
# Resources/Prototypes/Maps/arenas.yml
2025-04-30 20:31:50 +03:00
Milon
3fc9bcbbbe
remove Session from MindComponent ( #34753 )
...
* yummy
* fix tests
2025-04-19 00:23:01 +02:00
Ed
39ca6175e6
Simple sponsorship system ( #1189 )
...
* simple sponsorship system
* priority Join
* OOC Sponsor Color
* Update CP14SponsorRolePrototype.cs
* loadout sponsorship
* bruh
* refactor to interfaces
* Update CP14ClientSponsorManager.cs
* finish loadout option
* role pass
2025-04-17 19:55:25 +03:00
Ed
9d6e023bd0
Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2
...
# Conflicts:
# Content.Client/Administration/AdminNameOverlay.cs
# Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
# Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
# Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
# Content.Client/SubFloor/SubFloorHideSystem.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/Cloning/CloningSystem.cs
# Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
# Content.Server/GameTicking/Rules/ParadoxCloneRuleSystem.cs
# Content.Server/Roles/ParadoxCloneRoleComponent.cs
# Content.Shared.Database/LogType.cs
# Content.Shared/CCVar/CCVars.Interface.cs
# Content.Shared/Cloning/CloningEvents.cs
# Content.Shared/Cloning/CloningSettingsPrototype.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Light/Components/SunShadowCycleComponent.cs
# Content.Shared/Storage/StorageComponent.cs
# Resources/Changelog/Admin.yml
# Resources/Changelog/Changelog.yml
# Resources/Credits/GitHub.txt
# Resources/Locale/en-US/paradox-clone/role.ftl
# Resources/Maps/bagel.yml
# Resources/Maps/loop.yml
# Resources/Prototypes/Chemistry/mixing_types.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Entities/Effects/puddle.yml
# Resources/Prototypes/Entities/Mobs/Player/clone.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
# Resources/Prototypes/Entities/Objects/Devices/pda.yml
# Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/Objectives/paradoxClone.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Textures/Clothing/Eyes/Glasses/jensen.rsi/equipped-EYES-arachnid.png
2025-03-31 12:41:37 +03:00
ScarKy0
87be2dde27
Fix codermins appearing as red in-game OOC ( #36148 )
...
init
2025-03-29 12:33:25 +01:00
Ed
176267ef7b
OOC Relay experiment ( #821 )
2025-01-30 15:42:03 +03:00
Ed
ae3cbd6092
Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream
...
# Conflicts:
# Content.Server/Chat/Managers/ChatSanitizationManager.cs
# Content.Server/Temperature/Systems/TemperatureSystem.cs
# Content.Shared/Localizations/ContentLocalizationManager.cs
2024-10-29 11:16:56 +03:00
Thomas
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
Thomas
876c44cd66
Sanitize shorthand emotes throughought the whole message ( #28645 )
...
* Rename ChatSanitizationManager to ChatEmoteSanitizationManager
The prior name was kind of confusing as there's a emote one and
then now there's also chat expansion happening in the accent system,
so knowing which I actually need to edit is useful.
So, I just need to keep myself not confused.
* Rename smileyToEmote and remove punctuation duplicates
The name SmileyToEmote is just... Bad.
Plus, I needed to remove the punctuation duplicates as that would
break any kind of regex parsing that I tried.
* Switch to regex from checking end of string
I also changed from System.Globalization to ILocalizationManager.
Writing that regex was definitely an experience.
* Document regex and the manager
* Rename it back
* Simplify regex
2024-10-17 16:01:32 +02:00
Ed
ab1e071fdf
Merge remote-tracking branch 'upstream/master' into ed-03-10-2024-upstream
...
# Conflicts:
# Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
2024-10-03 17:34:08 +03:00
Leon Friedrich
f1f1fc1dc3
Add interaction rate limits ( #32527 )
...
* Move PlayerRateLimitManager to shared
* Add interaction rate limits
* uncap tests
2024-09-29 22:19:00 +10:00
Ed
5b2020d708
Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
2024-09-08 21:20:54 +03:00
nikthechampiongr
9a63144636
Allow for respawn and erase verb to be used on offline players. Also minor rewrite on respawn command and new erase command ( #30433 )
...
* Localize respawn command, allow for it to use userids, and make it use [Dependency] attributes
* Make respawn verb available for offline players
* Make erase available for offline players
A thousand admins rejoice
* Reorder verbs in code
* Add erase command
* Fix localisation for erase command
* Address reviews and add completion to respawn command
* Complete reviews which I forgor
2024-08-31 21:38:03 +10:00
Ed
c82b17a65e
Merge remote-tracking branch 'upstream/master' into ed-19-08-2024-upstream
...
# Conflicts:
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
# Content.Shared/Clothing/Components/ClothingComponent.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/Maps/atlas.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/europa.yml
# Resources/Prototypes/Maps/omega.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/Prototypes/Traits/speech.yml
# Resources/Prototypes/Voice/disease_emotes.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/secret_weights.yml
2024-08-19 19:06:38 +03:00
tosatur
8eb4e4fa2d
added a few chatsan entries ( #31085 )
...
* added a few chatsan entries
* added 2 more
* added 4 more and fixed errors
* fixed error again
* added allg
* removed fullstops
2024-08-20 00:03:07 +10:00
Errant
40b9fd4ea3
Namespace cleanup around Mind Roles ( #30965 )
...
* namespaces
* Comment does not need a semicolon
---------
Co-authored-by: Vasilis <vascreeper@yahoo.com >
2024-08-15 20:26:57 +02:00
Ed
d9336781f1
Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream
...
# Conflicts:
# Content.Shared/Inventory/InventorySystem.Equip.cs
# Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
2024-08-12 14:40:15 +03:00
deathride58
7e44e75d74
#30851 followup - murderficates links ( #30863 )
...
kneecaps links while we're at it
2024-08-11 02:15:05 +10:00
deathride58
7f23634450
[S] hopefully prevents a repeat of 4 am on 8/10/2024 in the #server-leviathan-use channel ( #30851 )
...
cant test this because the documentation sucks ass but fuck it we ball
2024-08-10 19:18:13 +10:00
Ed
3a910a7f7f
Merge remote-tracking branch 'upstream/master' into ed-21-06-2024-upstream-sync
...
# Conflicts:
# Resources/Prototypes/Maps/europa.yml
# Resources/Prototypes/Maps/train.yml
2024-06-21 18:30:31 +03:00
Pieter-Jan Briers
c33644532d
Rate limit ahelps ( #29219 )
...
* Make chat rate limits a general-purpose system.
Intending to use this with ahelps next.
* Rate limt ahelps
Fixes #28762
* Review comments
2024-06-21 00:13:02 +02:00
Deserty0
14da5bbc63
additional shorthand ( #222 )
...
* Update ChatSanitizationManager.cs
ru-RU
* Update ChatSanitizationManager.cs
2024-06-06 18:16:04 +03:00
Repo
90d3699c1d
Fix gamerule display issues ( #28178 )
...
* A comprehensive rule list for joining admins and mid round command to get rule list added
* Fix up for when a rule is added vs started and some logging
* fix command help localization, fix admin flags and spam anouncement.
* Send admin message only to the joining player not all admins.
* Bit better formatting in chat box
2024-05-25 16:18:05 -04:00
Aexxie
7ced9d42f0
OOC Patron Color Toggle ( #26653 )
...
* Adds the option for you to toggle your OOC Patron color visibility to yourself and others.
* Makes the button magically disappear if you arent a patron
2024-04-04 18:20:06 +11:00
nikthechampiongr
dca0c6694b
Add stealthmins ( #26263 )
...
* Add stealthmin command.
* Update Content.Server/Administration/Commands/AdminWhoCommand.cs
As suggested by CE.
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com >
* Add admin notifications for admins toggling stealthmin.
* Localize stealthmin command
---------
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com >
2024-03-24 10:39:53 -05:00
lzk
325349965d
Remove 07 from emote chatsan ( #25767 )
...
1
2024-03-03 01:10:44 +11:00
James Simonson
44ae7d234c
Added "wink" and "tearfully smiles" emotes + more cry emote variations ( #25129 )
...
Added wink and tearfully smiles emote + more cries variations
2024-02-13 16:43:20 +01:00
LordCarve
05a2e6b3a2
Obsolete refactor - ConnectedClient to Channel ( #24409 )
2024-01-23 09:14:13 +11:00
Pieter-Jan Briers
8bf807a9b5
Basic rate limiting for chat messages ( #21907 )
2023-11-27 14:08:30 +11:00
DrSmugleaf
c540b61390
Fix erase verb not removing chat messages in some cases ( #21355 )
...
* Fix erase verb not removing chat messages in some cases
* Admin changelog
* Fix deleting messages with entity id 0
2023-11-05 19:19:59 -07:00
Leon Friedrich
e685cb626b
Un-revert IPlayerManager refactor ( #21244 )
2023-10-28 09:59:53 +11:00
metalgearsloth
a2bbda43cc
Revert "Update submodule to 172.0.0 ( #21222 )" ( #21225 )
2023-10-24 21:55:20 +11:00
Leon Friedrich
7ba0ea2926
IPlayerManager refactor ( #21215 )
2023-10-24 20:19:08 +11:00
Mr. 27
e2227c6b09
Make common netspeak get replaced in the chat ( #20180 )
...
* added more slang to the sanitization manager
* idk why this file is here
* Added new sanitization accent
* No longer is an acccent, instead is a dictionary
* Reverted back to a system similar to before, added the new netspeak from the dictionary
* Added some new words to the chat san
* Added (wdym --> what do you mean) to the chatsan
* merge conflict
* removed boolvalue
* remove space
* Upcoming
* Added MF and ETC to chatsan :))
* upcoming
* added FYI and WYD to speech-chatsan.ftl
* Made the chatsan accent string a const string with [ValidatePrototypeId<AccentPrototype>]
* forgot the ';' :(((
* fixed error throw [AccentPrototype] --> [ReplacementAccentPrototype]
2023-10-21 15:43:11 -04:00
Whisper
e5f5a28829
adds "idk." to the text to emote list ( #21015 )
2023-10-15 14:06:55 -07:00
DrSmugleaf
5be0df32ad
Add admin Erase verb, add checkbox to erase from the ban panel ( #20985 )
2023-10-14 02:02:56 -07:00
metalgearsloth
5a0fc68be2
Content update for NetEntities ( #18935 )
2023-09-11 09:42:41 +10:00
DrSmugleaf
3f3ba6ac62
Move minds, roles, jobs and objectives to shared ( #19679 )
2023-08-30 21:46:11 -07:00
DrSmugleaf
15c0211fb2
Refactor minds to be entities with components, make roles components ( #19591 )
...
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com >
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com >
2023-08-28 16:53:24 -07:00
ShadowCommander
dd7032a860
Mind ECS ( #16826 )
2023-06-19 04:33:19 +10:00
Leon Friedrich
b03d9a90ab
Add support for client-side replays ( #17168 )
2023-06-19 03:23:31 +10:00
Leon Friedrich
a8eee5878a
Misc replay related changes ( #17102 )
2023-06-05 14:33:49 +10:00