5d2cdd3f44
# Conflicts: # Content.Client/Humanoid/HumanoidAppearanceSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.cs # Content.Server/Roles/Jobs/JobSystem.cs # Content.Shared/Humanoid/HumanoidAppearanceComponent.cs # Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml # Resources/Prototypes/Entities/Mobs/Species/vox.yml # Resources/Prototypes/Entities/Objects/Misc/paper.yml # Resources/Prototypes/Entities/Objects/Tools/lighters.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml # Resources/Prototypes/Recipes/Lathes/categories.yml # Resources/Prototypes/Recipes/Lathes/machine_boards.yml # Resources/Prototypes/Species/vox.yml |
||
|---|---|---|
| .. | ||
| Conditions | ||
| NameGenerators | ||
| GameMapCondition.cs | ||
| GameMapManager.cs | ||
| GameMapPoolPrototype.cs | ||
| GameMapPrototype.cs | ||
| GameMapPrototype.MapSelection.cs | ||
| GridDraggingCommand.cs | ||
| GridDraggingSystem.cs | ||
| IGameMapManager.cs | ||
| MapMigrationSystem.cs | ||
| PlanetCommand.cs | ||
| ResaveCommand.cs | ||