fish-station/Content.Shared/Chemistry
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
..
Components Рефактор мехов, правки в системе медицины (#507) 2024-10-30 10:53:00 +03:00
Dispenser Add limited-reagent dispensers (#23907) 2024-01-17 16:43:48 -05:00
EntitySystems Returned functionality to industrial reagent grinders (#31903) 2024-09-07 17:47:02 -06:00
Reaction Fix reagents with ReagentData being duplicated (#30983) 2024-08-16 12:47:53 +02:00
Reagent Better DNA forensics & ReagentData (#26699) 2024-08-09 09:27:27 +10:00
InjectOverTimeEvent.cs Syringe gun! (#32112) 2024-10-23 00:03:42 +11:00
MetabolismMovespeedModifierSystem.cs Remove 700 usages of Component.Owner (#21100) 2023-10-19 12:34:31 -07:00
ReactiveSystem.cs Turn ReagentEffects into generic EntityEffects (#28168) 2024-06-30 13:43:43 +10:00
SharedChemistryGuideDataSystem.cs Chem guidebook (#17123) 2023-06-04 15:45:02 -05:00
SharedChemMaster.cs Revert 'Revert 'Solution Entities'' (#23168) 2023-12-29 08:47:43 -04:00
SharedReagentDispenser.cs Reagent dispenser UI (Again) (#27958) 2024-05-13 17:46:16 -04:00
SharedSolutionHeater.cs Hotplate overhaul (#17586) 2023-06-24 14:09:24 -04:00
SharedTransferAmount.cs Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
SolutionScannerSystem.cs Add chemical scanning goggles (#18373) 2023-08-01 15:57:22 -04:00
SolutionVisuals.cs Added sink (#14348) 2023-06-30 18:10:47 -04:00