Vigers Ray 389ed704e1 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Entry/EntryPoint.cs # Content.Client/IoC/ClientContentIoC.cs # Content.Server/Administration/Managers/BanManager.cs # Content.Server/Chat/Managers/ChatSanitizationManager.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/Traitor/Uplink/UplinkSystem.cs # Content.Shared/Interaction/SharedInteractionSystem.cs # Content.Shared/Localizations/ContentLocalizationManager.cs # Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs # Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs # Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs # Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs # Resources/Audio/Ambience/Antag/attributions.yml # Resources/Audio/Weapons/Guns/Gunshots/attributions.yml # Resources/Locale/en-US/_strings/advertisements/other/firebot.ftl # Resources/Locale/en-US/_strings/shuttles/commands.ftl # Resources/Prototypes/Datasets/Names/last.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Roles/Jobs/Science/borg.yml # Resources/Prototypes/Shuttles/shuttle_incoming_event.yml # Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml # Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json # Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json # RobustToolbox		2024-10-30 13:26:32 +03:00
..
ActiveSolutionHeaterComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
BaseSolutionInjectOnEventComponent.cs	Combine solution injection systems; Fix embeddable injectors (#26268)	2024-04-01 14:39:34 +11:00
ChemMasterComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
DeleteOnSolutionEmptyComponent.cs	Soapy Water & Edible Soap (#20364)	2023-10-31 13:39:12 -07:00
MeleeChemicalInjectorComponent.cs	Combine solution injection systems; Fix embeddable injectors (#26268)	2024-04-01 14:39:34 +11:00
RandomFillSolutionComponent.cs	Moves SolutionContainerManagerComponent to Shared. (#20944)	2023-10-15 03:45:28 +11:00
ReagentDispenserComponent.cs	Use old reagent dispenser beaker slot ID (#24209)	2024-01-17 17:30:30 -08:00
SolutionHeaterComponent.cs	Rip out remaining machine upgrades (#24413)	2024-01-23 09:13:04 +11:00
SolutionInjectOnEmbedComponent.cs	Combine solution injection systems; Fix embeddable injectors (#26268)	2024-04-01 14:39:34 +11:00
SolutionInjectOnProjectileHitComponent.cs	Combine solution injection systems; Fix embeddable injectors (#26268)	2024-04-01 14:39:34 +11:00
SolutionInjectWhileEmbeddedComponent.cs	Syringe gun! (#32112)	2024-10-23 00:03:42 +11:00
SolutionPurgeComponent.cs	Use new ComponentPauseGenerator (#25183)	2024-02-26 14:36:19 +11:00
SolutionRegenerationComponent.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-19 16:09:00 +03:00
TransformableContainerComponent.cs	Add a system for modifying entity names without causing conflicts (#27863)	2024-06-16 15:38:53 -04:00
VaporComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00