Morb0 3cb4017c90 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Audio/Announcements/license.txt # Resources/Audio/Effects/Shuttle/licenses.txt # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/Textures/Structures/Storage/tanks.rsi/meta.json		2023-11-14 16:35:33 +03:00
..
cabinets.rsi	Filing Cabinet Resprites (#8043)	2022-05-09 17:46:23 -07:00
canister.rsi	Frezon Canister Tweaks (#14442)	2023-03-13 23:42:07 -04:00
closet.rsi	Lockers for clown, mime and NT Representative (#21504)	2023-11-07 18:38:18 -05:00
Crates	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-05 00:12:02 +03:00
morgue.rsi	Reorganizes Resources/Constructible (#4252)	2021-07-15 18:30:50 +00:00
orebox.rsi	Ore boxes (#19838)	2023-09-16 21:49:54 +10:00
suit_storage.rsi	Lockable Suit Storages (#20950)	2023-10-17 18:33:02 -07:00
tanks.rsi	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-14 16:35:33 +03:00
wall_locker.rsi	wall mounted lockers (#11382)	2022-09-17 13:05:39 -07:00