Vigers Ray 3355febe9b Merge remote-tracking branch 'space-wizards/master' ... # 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		2025-02-09 22:17:22 +03:00
..
Guidebook	Merge remote-tracking branch 'space-wizards/master'	2025-02-09 22:17:22 +03:00
Gameplay.txt	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Intro.txt	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Sandbox.txt	Rename "Server Info" to ServerInfo (#15436)	2023-04-16 10:55:59 +10:00