null 5ab73ea298 Merge remote-tracking branch 'refs/remotes/upstream/master' into 2024/06/06-upstream-merge ... # Conflicts: # Resources/Prototypes/Maps/submarine.yml		2024-06-08 21:03:00 +02:00
..
Consumable	Fix Cigars Sprites + YAML fix for Inhand unlit cigars/cigs (#28641)	2024-06-08 20:23:19 +02:00
Decoration	Stalagmite Changes (#25646)	2024-03-07 01:04:08 +01:00
Devices	Add a handy security radio (#25913)	2024-05-06 01:27:41 +02:00
Economy/cash.rsi	Plates & Cash gridinv visuals (#24075)	2024-01-26 22:50:12 +01:00
Fun	Add default whistle + whistles reorganize (#27676)	2024-05-07 04:33:39 +02:00
Magic/magicactions.rsi	Infinity books (#25840)	2024-04-07 14:30:40 +02:00
Materials	New plant mutation: Pyrotton (#27200)	2024-05-07 02:04:39 +02:00
Misc	Adds the Justice Department (#660)	2024-06-07 15:22:37 +02:00
Power	Little rework of existing yaml flatpacks (#24814)	2024-03-05 09:46:21 +01:00
Specific	Add "fill level" sprites to mops and damp rag (#28590)	2024-06-08 20:17:06 +02:00
Storage	Throwing Knives: Syndicate Kit (#26026)	2024-03-24 00:14:18 +01:00
Tanks	Emergency Tank + Plasma Can visible on suit storage slot (#27598)	2024-05-07 04:34:00 +02:00
Tiles	Clockwork structures and furniture (#24673)	2024-03-07 01:26:19 +01:00
Tools	Admin access configurator (#28107)	2024-06-01 16:52:38 +02:00
Vehicles	ATV resprite (#25885)	2024-03-15 11:24:47 +01:00
Weapons	Fix dud modular grenade visuals (#28265)	2024-06-01 16:57:19 +02:00