fish-station/Content.Shared/Fluids
Vigers Ray 5c219f5105 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Server/Entry/EntryPoint.cs
#	Content.Server/Ghost/Roles/GhostRoleSystem.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Resources/Locale/en-US/_strings/administration/antag.ftl
#	Resources/Locale/en-US/_strings/advertisements/vending/pride.ftl
#	Resources/Locale/en-US/_strings/mind/role-types.ftl
#	Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
#	Resources/Prototypes/Entities/Mobs/Player/dragon.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-01-14 18:46:45 +03:00
..
Components Merge remote-tracking branch 'refs/remotes/wizards/master' 2025-01-14 18:46:45 +03:00
EntitySystems Replace BlockSolutionAccessComponent with an attempt event (#26988) 2024-06-21 13:04:02 +10:00
AbsorbentComponent.cs Статистика конца раунда (#239) 2024-07-25 02:01:01 +03:00
Events.cs fire extinguisher using item toggle (#29906) 2024-07-13 14:17:10 +10:00
PuddleVisuals.cs Puddles & spreader refactor (#15191) 2023-04-10 15:37:03 +10:00
SharedAbsorbentSystem.cs Puddles & spreader refactor (#15191) 2023-04-10 15:37:03 +10:00
SharedDrainSystem.cs Random spontaneous cleanup PR (#25131) 2024-02-13 16:48:39 -05:00
SharedPuddleDebugOverlaySystem.cs Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
SharedPuddleSystem.cs Add prediction to Spill Container verb, add dummy TrySpill methods to shared (#25813) 2024-03-29 02:00:09 -07:00
SharedPuddleSystem.Evaporation.cs Add prediction for puddle and spillable examines (#25794) 2024-03-03 16:36:36 +11:00
SharedPuddleSystem.Spillable.cs Make mobs without hands unable to spill jugs (#31438) 2024-09-09 14:02:15 +03:00
SharedSprayComponent.cs Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
SpraySafetySystem.cs fire extinguisher using item toggle (#29906) 2024-07-13 14:17:10 +10:00