Arthur b877259791 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml		2022-07-29 17:59:17 +03:00
..
Clothing	missing sprites for syndi bags (#9956)	2022-07-28 09:32:43 +10:00
Corvax/Clothing	Move custom sprites to separate folder	2022-05-28 17:15:17 +03:00
Decals	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-07-15 15:39:41 +03:00
Effects	Frezon (#9980)	2022-07-27 04:55:28 -05:00
Fluids	Mopping Puddle Dilution and Wet Floor Sparkles (#6273)	2022-02-04 19:26:11 -07:00
Interface	Port boxer from Nyano (#9080)	2022-07-26 18:34:19 -07:00
LobbyScreens	Adds new "Pharmacy" Lobby Art by Solbusaur (#9339)	2022-07-01 19:54:04 -05:00
Logo	Add ru logo & update title (#66)	2022-01-14 01:45:37 +03:00
Markers	Port boxer from Nyano (#9080)	2022-07-26 18:34:19 -07:00
Mobs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-07-29 17:59:17 +03:00
Objects	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-07-29 17:59:17 +03:00
Parallaxes	Per-map parallax support (#9786)	2022-07-25 00:10:23 -05:00
Shaders	[2 lines] fix blinding (#9690)	2022-07-14 06:58:24 -05:00
Structures	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-07-29 17:59:17 +03:00
Tiles	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-07-29 17:59:17 +03:00