Morbo f032966976 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/ISSUE_TEMPLATE/config.yml # .github/PULL_REQUEST_TEMPLATE.md # Resources/Prototypes/Recipes/Lathes/medical.yml # Resources/Textures/Structures/Machines/microwave.rsi/meta.json		2022-12-07 08:34:29 +03:00
..
cabinets.rsi	Filing Cabinet Resprites (#8043)	2022-05-09 17:46:23 -07:00
canister.rsi	Add access locks to gas canisters (#10575)	2022-09-16 07:06:29 -07:00
closet.rsi	Reorganizes Resources/Constructible (#4252)	2021-07-15 18:30:50 +00:00
Crates	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-12-07 08:34:29 +03:00
kvass.rsi	Kvass (#9082)	2022-07-11 23:11:12 -07:00
morgue.rsi	Reorganizes Resources/Constructible (#4252)	2021-07-15 18:30:50 +00:00
tanks.rsi	[Resprite] Structures (#314)	2022-07-20 01:46:32 +03:00
wall_locker.rsi	wall mounted lockers (#11382)	2022-09-17 13:05:39 -07:00