rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Server/GameTicking
History
VigersRay 5f10d21fa6 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Server/Administration/Commands/PlayTimeCommands.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/StationEvents/Events/BreakerFlipRule.cs
#	Content.Shared/Roles/JobPrototype.cs
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
#	Resources/Prototypes/Entities/Mobs/base.yml
#	Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Roles/Antags/traitor.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
2024-06-04 09:41:27 +03:00
..
Commands Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
Components make GameRule use entity category (#28294) 2024-06-03 08:39:25 -04:00
Events Add job whitelist system (#28085) 2024-06-01 05:08:31 -07:00
Presets Make all prototype types partial (#21374) 2023-11-01 19:56:23 -07:00
Prototypes Make all prototype types partial (#21374) 2023-11-01 19:56:23 -07:00
Rules LoadMapRule grid storage rework (#28210) 2024-06-03 20:04:19 -04:00
GameTicker.cs Add job whitelist system (#28085) 2024-06-01 05:08:31 -07:00
GameTicker.CVars.cs Make the round end sound collection a cvar (#25741) 2024-03-01 21:08:48 +11:00
GameTicker.GamePreset.cs Fix ghosts getting spawned in nullspace (#27617) 2024-05-11 11:03:40 -04:00
GameTicker.GameRule.cs Fix gamerule display issues (#28178) 2024-05-25 16:18:05 -04:00
GameTicker.Lobby.cs Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
GameTicker.LobbyBackground.cs Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
GameTicker.Player.cs Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
GameTicker.Replays.cs Add server name into the replay final (#25564) 2024-02-25 23:44:05 +01:00
GameTicker.RoundFlow.cs Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
GameTicker.Spawning.cs Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-04 09:41:27 +03:00
GameTicker.StatusShell.cs Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
ManifestEntry.cs Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00