diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index ff757df0346..295015278c8 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -6040,3 +6040,12 @@ type: Remove id: 415 time: '2024-11-13T10:37:23.398349+00:00' +- author: VigersRay + changes: + - message: "\u041E\u0442\u043A\u043B\u044E\u0447\u0435\u043D\u044B \u0430\u0432\u0442\ + \u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0435 \u043C\u0435\ + \u0442\u0435\u043E\u0440\u0438\u0442\u043D\u044B\u0435 \u0434\u043E\u0436\u0434\ + \u0438." + type: Remove + id: 416 + time: '2024-11-14T01:46:47.182799+00:00' diff --git a/Resources/Prototypes/GameRules/meteorswarms.yml b/Resources/Prototypes/GameRules/meteorswarms.yml index c231e34f923..2f93ba5ae78 100644 --- a/Resources/Prototypes/GameRules/meteorswarms.yml +++ b/Resources/Prototypes/GameRules/meteorswarms.yml @@ -56,35 +56,38 @@ id: MeteorSwarmScheduler components: - type: GameRule - - type: BasicStationEventScheduler - minimumTimeUntilFirstEvent: 600 # 10 min - minMaxEventTiming: - min: 750 # 12.5 min - max: 930 # 17.5 min - scheduledGameRules: !type:NestedSelector - tableId: BasicMeteorSwarmEventsTable +# Sunrise-Edit: No meteorites +# - type: BasicStationEventScheduler +# minimumTimeUntilFirstEvent: 600 # 10 min +# minMaxEventTiming: +# min: 750 # 12.5 min +# max: 930 # 17.5 min +# scheduledGameRules: !type:NestedSelector +# tableId: BasicMeteorSwarmEventsTable - type: entity parent: BaseGameRule id: MeteorSwarmMildScheduler components: - type: GameRule - - type: BasicStationEventScheduler - minimumTimeUntilFirstEvent: 600 # 10 min - minMaxEventTiming: - min: 750 # 12.5 min - max: 930 # 17.5 min - scheduledGameRules: !type:NestedSelector - tableId: MeteorSwarmMildTable +# Sunrise-Edit: No meteorites +# - type: BasicStationEventScheduler +# minimumTimeUntilFirstEvent: 600 # 10 min +# minMaxEventTiming: +# min: 750 # 12.5 min +# max: 930 # 17.5 min +# scheduledGameRules: !type:NestedSelector +# tableId: MeteorSwarmMildTable - type: entity parent: BaseGameRule id: KesslerSyndromeScheduler components: - type: GameRule - - type: RampingStationEventScheduler - scheduledGameRules: !type:NestedSelector - tableId: BasicMeteorSwarmEventsTable +# Sunrise-Edit: No meteorites +# - type: RampingStationEventScheduler +# scheduledGameRules: !type:NestedSelector +# tableId: BasicMeteorSwarmEventsTable # Game Rules diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml index 8a6962de55f..7ac2c58842b 100644 --- a/Resources/Prototypes/game_presets.yml +++ b/Resources/Prototypes/game_presets.yml @@ -20,7 +20,7 @@ - junk - meteorhell name: kessler-syndrome-title - showInVote: true # Sunrise-Edit + showInVote: false # Sunrise-Edit hide: true # Sunrise-Edit description: kessler-syndrome-description rules: @@ -208,7 +208,7 @@ description: rev-description showInVote: true # Sunrise-Edit hide: true # Sunrise-Edit - minPlayers: 15 # Sunrise-Edit: 50 players for REVOLUTIONARY + minPlayers: 15 # Sunrise-Edit: 15 players for REVOLUTIONARY rules: - Revolutionary - SubGamemodesRule @@ -245,9 +245,9 @@ - meteombies name: zombieteors-title description: zombieteors-description - showInVote: true # Sunrise-Edit + showInVote: false # Sunrise-Edit hide: true # Sunrise-Edit - minPlayers: 20 # Sunrise-Edit: 50 players for ZOMBIES + minPlayers: 20 # Sunrise-Edit: 20 players for ZOMBIES rules: - Zombie - BasicStationEventScheduler @@ -271,7 +271,7 @@ - BasicStationEventScheduler - MeteorSwarmScheduler - BasicRoundstartVariation - + - type: gamePreset id: Vampire alias: