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
..
boxes.rsi	nitrile gloves (#21509)	2023-11-08 13:31:24 -07:00
boxicons.rsi	Zipties (#5727)	2021-12-13 22:17:26 -07:00
Briefcases/briefcase_brown.rsi	Bunch of resprites (#996)	2023-04-19 00:22:44 -07:00
donkpocket.rsi	Use new validate-rsis for workflow (#12997)	2022-12-20 06:31:17 +01:00
Happyhonk	[entity] jonk bot	2023-04-23 20:32:32 -06:00
medalcase.rsi	[Entity] Add new medals (#15577)	2023-04-20 17:54:31 -06:00
penbox.rsi	[Tweak] Syndi pens are bought in boxes now (#15190)	2023-04-12 12:44:52 -06:00
petcarrier.rsi	Pet Carrier (Zookeeper gameplay?) (#21545)	2023-11-13 16:55:47 -07:00