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
..
StatusIconOverlay.cs	Cleans up StatusIconSystem and fixing some bugs (#28270)	2024-06-03 12:12:21 -04:00
StatusIconSystem.cs	Merge remote-tracking branch 'space-wizards/master'	2025-02-09 22:17:22 +03:00