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	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-07-29 17:59:17 +03:00
Debugging	Clothing/item ECS & cleanup (#9706)	2022-07-27 03:53:47 -07:00
Effects	Fix vomit mopping (#9358)	2022-07-02 19:13:11 -07:00
Markers	Vampire cloak (#10073)	2022-07-27 01:15:47 -07:00
Mobs	Fix identity bug (#10117)	2022-07-29 09:21:47 +10:00
Objects	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-07-29 17:59:17 +03:00
Structures	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-07-29 17:59:17 +03:00
Virtual	Legally distinct gravity gun (#8114)	2022-05-13 12:24:34 +10:00