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
..
Marker	Proto-kinetic crusher (#16277)	2023-05-14 13:15:18 +10:00
Melee	Fix hitting through directional windows (and more!) (#34793)	2025-02-02 23:03:31 +01:00
Misc	Use non-generic TryComp() for metadata & transform (#28133)	2024-05-20 22:40:35 -07:00
Ranged	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-12 02:27:31 +03:00