bee5d0410f
# Conflicts: # Content.Client/Lobby/LobbyUIController.cs # Resources/Locale/en-US/chemistry/components/mixing-component.ftl # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Recipes/Crafting/crates.yml # Resources/ServerInfo/Guidebook/Mobs/Diona.xml # Resources/ServerInfo/Guidebook/Mobs/Species.xml # Resources/ServerInfo/Guidebook/Science/Science.xml # Resources/ServerInfo/Guidebook/Science/Technologies.xml # Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png # Resources/Textures/Tiles/attributions.yml # Resources/migration.yml |
||
|---|---|---|
| .. | ||
| AnomalousResearch.xml | ||
| APE.xml | ||
| ArtifactReports.xml | ||
| Cyborgs.xml | ||
| Robotics.xml | ||
| ScannersAndVessels.xml | ||
| Science.xml | ||
| Technologies.xml | ||
| TraversalDistorter.xml | ||
| Xenoarchaeology.xml | ||