rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Server/GameTicking
History
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
..
Commands Глобальная оптимизация и фиксы культа плоти 2025-01-03 11:51:48 +03:00
Events Metagame improvements to antag-before-job selection system (#35830) 2025-03-19 18:28:25 +01:00
Presets Merge remote-tracking branch 'space-wizards/master' 2025-03-25 11:30:01 +03:00
Rules Merge remote-tracking branch 'space-wizards/master' 2025-03-27 20:37:49 +03:00
GameTicker.cs Refactor map loading & saving 2024-12-23 02:42:17 +13:00
GameTicker.CVars.cs Fix RA0032 (#32514) 2024-09-29 02:25:21 +02:00
GameTicker.GamePreset.cs Update GameTicker.GamePreset.cs (#888) 2024-12-21 18:12:21 +03:00
GameTicker.GameRule.cs Глобальная оптимизация и фиксы культа плоти 2025-01-03 11:51:48 +03:00
GameTicker.Lobby.cs Фикс возможность узнать геймрул через хаб и вебхук. Добавил 3 выбора попимо секрета в геймрул 2024-12-02 03:26:33 +03:00
GameTicker.LobbyBackground.cs Анимации в лобби. Кастомный выбор фона в лобби. (#562) 2024-10-30 20:14:26 +03:00
GameTicker.Player.cs Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-10-02 06:45:10 +03:00
GameTicker.Replays.cs Fix RA0032 (#32514) 2024-09-29 02:25:21 +02:00
GameTicker.RoundFlow.cs Merge remote-tracking branch 'space-wizards/master' 2025-02-26 22:01:48 +03:00
GameTicker.Spawning.cs Merge remote-tracking branch 'space-wizards/master' 2025-03-25 11:30:01 +03:00
GameTicker.StatusShell.cs ы 2025-01-16 20:20:51 +03:00
ManifestEntry.cs Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00