Vigers Ray 0c1e15e516 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Info/LinkBanner.cs # Resources/Locale/en-US/_strings/atmos/gas-pipe-sensor.ftl # Resources/Locale/en-US/_strings/station-events/events/greytide-virus.ftl # Resources/Prototypes/Datasets/Names/diona.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml		2024-11-26 17:50:59 +03:00
..
Consumable	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-13 10:55:12 +03:00
Decoration	Stalagmite Changes (#25646)	2024-02-27 22:24:17 +03:00
Devices	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-30 13:26:32 +03:00
Economy/cash.rsi	Plates & Cash gridinv visuals (#24075)	2024-01-14 11:44:17 -05:00
Fun	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-01 00:48:22 +03:00
Magic/magicactions.rsi	Ethereal Jaunt Spell for Wizard & Jaunt ECS (#33201)	2024-11-14 00:36:37 +01:00
Materials	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-26 17:50:59 +03:00
Misc	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-19 18:34:32 +03:00
Power	Portable Recharger: Arsenal T3 (#26655)	2024-04-28 13:19:33 +10:00
Specific	Хирургия (#607)	2024-11-13 04:05:51 +03:00
Storage	Большие изменения (#345)	2024-09-16 19:05:38 +03:00
Tanks	Resprite the equipped gas canister suit slots (#30809)	2024-08-09 20:32:55 +10:00
Tiles	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 15:50:00 +03:00
Tools	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-30 13:26:32 +03:00
Vehicles	ATV resprite (#25885)	2024-03-07 08:36:00 +03:00
Weapons	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-19 18:34:32 +03:00