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
..
Drinks	[Resprite] Cans (#1365)	2023-08-24 21:22:17 +03:00
Food	Adds slices for banana cream pie and mime tart (#21043)	2023-11-19 12:15:02 -08:00
Smokeables	Dan's Soaked Smokes (#19150)	2023-08-15 18:27:18 -06:00
TrashDrinks	Rename Kahlua to Coffee Liqueur (#12525)	2022-11-16 12:59:43 -08:00