ed0a30bb64
# Conflicts: # Content.Client/Weapons/Ranged/Systems/GunSystem.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Entry/EntryPoint.cs # Content.Server/Ghost/GhostSystem.cs # Content.Server/IoC/ServerContentIoC.cs # Content.Server/Shuttles/Systems/ArrivalsSystem.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs # Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs # Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs # Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs # Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs # Content.Server/Weapons/Ranged/Systems/GunSystem.cs # Content.Shared/Damage/Systems/DamageableSystem.cs # Content.Shared/Follower/FollowerSystem.cs # Resources/Locale/en-US/_strings/actions/actions/dna-scrambler.ftl # Resources/Locale/en-US/_strings/administration/commands/change-cvar-command.ftl # Resources/Locale/en-US/discord/vote-notifications.ftl # Resources/Prototypes/Catalog/Fills/Crates/armory.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml # Resources/Prototypes/Voice/speech_emotes.yml |
||
|---|---|---|
| .. | ||
| AbsorbentSystem.cs | ||
| DrainSystem.cs | ||
| PuddleDebugDebugOverlaySystem.cs | ||
| PuddleSystem.cs | ||
| PuddleSystem.Evaporation.cs | ||
| PuddleSystem.Spillable.cs | ||
| PuddleSystem.Transfers.cs | ||
| SmokeSystem.cs | ||
| SpraySystem.cs | ||