Vigers Ray 84c607c84a Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs # Content.Server/Ghost/GhostSystem.cs # Resources/Locale/en-US/_strings/administration/antag.ftl # Resources/Locale/en-US/_strings/administration/commands/adminnotes.ftl # Resources/Locale/en-US/_strings/construction/components/block-anchor-component.ftl # Resources/Locale/en-US/_strings/power/commands.ftl # Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/eggy.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce.png		2025-03-27 20:37:49 +03:00
..
cargo_gifts.yml	Звук оповещения из сс13	2024-11-29 03:23:45 +03:00
events.yml	Merge remote-tracking branch 'space-wizards/master'	2025-03-27 20:37:49 +03:00
meteorswarms.yml	фиксы апстрима	2025-02-27 00:13:48 +03:00
pests.yml	fix: Snail event wasnt tabled (#31884)	2024-09-06 17:27:51 -06:00
random_sentience.yml	Re-add improved random sentience event (#29123)	2024-08-18 17:41:12 -06:00
roundstart.yml	Merge remote-tracking branch 'space-wizards/master'	2025-03-27 20:37:49 +03:00
subgamemodes.yml	Merge remote-tracking branch 'space-wizards/master'	2025-03-25 11:30:01 +03:00
survivor.yml	Fix/Addition - Wizard Survivor Antag Status (#35226)	2025-02-23 12:24:36 -05:00
unknown_shuttles.yml	Обновления Снаряжения Пиратов и новый случайный шаттл (#1408)	2025-02-19 12:55:48 +03:00
variation.yml	make GameRule use entity category (#28294)	2024-06-03 08:39:25 -04:00