VigersRay 0a91b468b4 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs # Content.Client/Voting/UI/VotePopup.xaml.cs # Content.Client/Voting/VoteManager.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/Power/EntitySystems/BatterySystem.cs # Content.Server/Radio/EntitySystems/RadioSystem.cs # Content.Server/VoiceMask/VoiceMaskComponent.cs # Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Content.Server/VoiceMask/VoiceMaskerComponent.cs # Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs # Content.Server/Voting/Managers/VoteManager.cs # Content.Shared/VendingMachines/SharedVendingMachineSystem.cs # Content.Shared/Voting/MsgVoteData.cs # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Recipes/Crafting/crates.yml # Resources/Prototypes/Recipes/Crafting/improvised.yml		2024-09-26 20:17:14 +03:00
..
Consumable	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-26 20:17:14 +03:00
Materials	increase material prices (#30869)	2024-08-18 21:28:46 -06:00
biological.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-22 06:50:04 +03:00
botany.yml	Fix that space (#32149)	2024-09-14 14:28:35 +03:00
chemicals.yml	Hivelord mob (#31322)	2024-09-11 09:52:27 -04:00
cleaning.yml	Nerf & standardised slip times (#27879)	2024-07-17 09:26:02 +10:00
elements.yml	Chem colors (#28367)	2024-05-31 12:44:22 -07:00
fun.yml	Humans can no longer honk on command (#28566)	2024-06-04 01:45:00 +02:00
gases.yml	Chem colors (#28367)	2024-05-31 12:44:22 -07:00
medicine.yml	make epinephrine adrenaline (#32076)	2024-09-19 01:00:48 +02:00
narcotics.yml	фиксы апстрима	2024-09-16 13:13:35 +03:00
pyrotechnic.yml	phlog now ignites when consumed as well (#30955)	2024-08-17 12:49:11 +10:00
toxins.yml	Lizards now metabolize chocolate (#32147)	2024-09-16 14:45:15 +02:00