0e350ab6d3
# Conflicts: # Content.Client/Actions/ActionsSystem.cs # Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml # Content.Server/GameTicking/GameTicker.GamePreset.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/Station/Systems/StationSpawningSystem.cs # Content.Shared/Actions/BaseActionComponent.cs # Content.Shared/Actions/SharedActionsSystem.cs # Content.Shared/Weapons/Reflect/ReflectComponent.cs # Content.Shared/Weapons/Reflect/ReflectSystem.cs # README.md # Resources/Prototypes/Actions/types.yml # Resources/Prototypes/Entities/Clothing/Eyes/hud.yml # Resources/Prototypes/Entities/Mobs/NPCs/animals.yml # Resources/Prototypes/Entities/Mobs/Player/dragon.yml # Resources/Prototypes/Recipes/Lathes/security.yml # Resources/Prototypes/ai_factions.yml |
||
|---|---|---|
| .. | ||
| Names | ||
| adjectives.yml | ||
| corporations.yml | ||
| criminal_records.yml | ||
| damage_force_say.yml | ||
| deliveries.yml | ||
| figurines.yml | ||
| ion_storm.yml | ||
| news.yml | ||
| rat_king_commands.yml | ||
| spooky_speakers.yml | ||
| story_generation.yml | ||
| tips.yml | ||
| verbs.yml | ||