3355febe9b
# Conflicts: # Content.Client/StatusIcon/StatusIconSystem.cs # Content.Server/Implants/ImplantedSystem.cs # Resources/Audio/Effects/attributions.yml # Resources/Locale/en-US/markings/ears.ftl # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Catalog/uplink_catalog.yml # Resources/Prototypes/Entities/Mobs/Player/observer.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/LootTables/suspicion_loot_table.yml # Resources/Prototypes/Research/arsenal.yml # Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml # Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json # Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png # Resources/manifest.yml # Resources/migration.yml # RobustToolbox |
||
|---|---|---|
| .. | ||
| Fixtures | ||
| event_spells.yml | ||
| forcewall_spells.yml | ||
| knock_spell.yml | ||
| mindswap_spell.yml | ||
| projectile_spells.yml | ||
| recall_spell.yml | ||
| rune_spells.yml | ||
| spawn_spells.yml | ||
| staves.yml | ||
| teleport_spells.yml | ||
| touch_spells.yml | ||
| utility_spells.yml | ||