Vigers Ray e99ff5dc82 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs # Resources/Prototypes/Entities/Structures/Machines/nuke.yml # Resources/migration.yml		2024-12-01 18:21:33 +03:00
..
_Sunrise	Ребаланс-Исправление Вооружения (#747)	2024-12-01 17:56:53 +03:00
Actions/Implants/implants.rsi
Changeling	Говнокрад (#268)	2024-08-08 09:28:44 +03:00
Clothing	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-13 04:35:52 +03:00
Decals	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-19 16:09:00 +03:00
deprecated.rsi
Effects	Энергетические щиты (#404)	2024-09-26 20:09:00 +03:00
Fluids	Make puddle smoothing better (#26171)	2024-03-18 10:15:45 +11:00
Interface	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-26 17:50:59 +03:00
LobbyScreens	upstream	2024-09-16 12:40:23 +03:00
Logo	Большие изменения (#345)	2024-09-16 19:05:38 +03:00
Markers	Adds Hellspawn (Nar'Sie demon mob) (#20291)	2024-01-04 05:53:15 -07:00
Mobs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-01 18:21:33 +03:00
Objects	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-26 17:50:59 +03:00
Parallaxes	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00
Shaders	ayo (#545)	2024-10-30 10:42:02 +03:00
Structures	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-29 00:28:18 +03:00
Template	Sign Resprite (#29806)	2024-07-17 14:35:18 +10:00
Tiles	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-29 00:28:18 +03:00
Tips/tippy.rsi	Tippy, the helpful hint clown! (#26767)	2024-04-28 21:38:16 -07:00