Morb0 804c99fcc5 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Shared/CCVar/CCVars.cs # Resources/Prototypes/Datasets/Names/borg.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml # Resources/Prototypes/SoundCollections/lobby.yml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/Textures/Structures/Piping/disposal.rsi/meta.json # Resources/Textures/Tiles/attributions.yml # Resources/Textures/Tiles/steel.png		2023-11-22 20:22:45 +03:00
..
Construction	Make shuttle walls/windows constructable (#19255)	2023-11-20 17:20:24 -08:00
Cooking	Added Bananadine (#21759)	2023-11-21 20:08:53 -05:00
Crafting	change artifact recipe to use material (#21728)	2023-11-17 23:31:50 -05:00
Lathes	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-22 20:22:45 +03:00
Reactions	egg rework (#21606)	2023-11-12 16:18:48 -07:00