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
..
Bombs/c4.rsi	C4 (#7486)	2022-04-14 15:00:50 -07:00
Grenades	Add Modular grenades (chemnades). (#7138)	2022-03-25 15:17:29 +11:00
Guns	guns (#9958)	2022-07-24 21:25:41 +10:00
Melee	Revert "Fireaxe resprite" (#9676)	2022-07-13 10:22:31 +02:00
pflash.rsi	[Resprite] Structures (#314)	2022-07-20 01:46:32 +03:00
Throwable/bola.rsi	Adds bola and a crafting recipe for them. (#6185)	2022-01-17 12:21:57 -07:00