VigersRay 7d0476aab0 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Shared/Roles/JobPrototype.cs # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Roles/Antags/nukeops.yml # Resources/Prototypes/Roles/Antags/revolutionary.yml # Resources/Prototypes/Roles/Antags/traitor.yml # Resources/Prototypes/Roles/Antags/zombie.yml		2024-06-07 11:28:58 +03:00
..
Drinks	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Food	Add fill levels to bowls (#25639)	2024-02-29 16:41:14 -05:00
Smokeables	Fix Cigars Sprites + YAML fix for Inhand unlit cigars/cigs (#28641)	2024-06-05 17:16:32 -04:00
TrashDrinks	Gildlager empty bottle fix (#27581)	2024-05-01 11:24:05 -04:00