From caff63710c033b68aafa99b27ed5bfb5499f9029 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sat, 22 Feb 2025 17:35:53 +0300 Subject: [PATCH 1/2] Odds do not look good --- Resources/Prototypes/Entities/Mobs/Player/humanoid.yml | 4 +++- Resources/Prototypes/GameRules/unknown_shuttles.yml | 7 +++++++ Resources/Prototypes/Shuttles/shuttle_incoming_event.yml | 8 ++++---- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 38d805aa4d..1ddebceb4f 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -20,7 +20,7 @@ - type: randomHumanoidSettings id: Nanotrasen - speciesBlacklist: + speciesBlacklist: - Arachnid - Diona - Moth @@ -706,6 +706,7 @@ - type: RandomMetadata nameSegments: - names_clown + - type: Pacified # WD - type: randomHumanoidSettings id: ClownTroupeBanana @@ -721,6 +722,7 @@ - type: RandomMetadata nameSegments: - names_clown + - type: Pacified # WD # Traveling exotic chef diff --git a/Resources/Prototypes/GameRules/unknown_shuttles.yml b/Resources/Prototypes/GameRules/unknown_shuttles.yml index 359d7bffc0..99c63068de 100644 --- a/Resources/Prototypes/GameRules/unknown_shuttles.yml +++ b/Resources/Prototypes/GameRules/unknown_shuttles.yml @@ -10,6 +10,7 @@ weight: 5 reoccurrenceDelay: 30 duration: 1 + maxOccurrences: 1 # WD - type: LoadMapRule preloadedGrid: ShuttleCargoLost @@ -25,6 +26,7 @@ weight: 5 reoccurrenceDelay: 30 duration: 1 + maxOccurrences: 1 # WD - type: LoadMapRule preloadedGrid: TravelingCuisine @@ -40,6 +42,7 @@ weight: 5 reoccurrenceDelay: 30 duration: 1 + maxOccurrences: 1 # WD - type: LoadMapRule preloadedGrid: DisasterEvacPod @@ -55,6 +58,7 @@ weight: 2 reoccurrenceDelay: 30 duration: 1 + maxOccurrences: 1 # WD - type: LoadMapRule preloadedGrid: Honki @@ -70,5 +74,8 @@ weight: 2 reoccurrenceDelay: 30 duration: 1 + maxOccurrences: 1 # WD + earliestStart: 40 # WD + minimumPlayers: 30 # WD - type: LoadMapRule preloadedGrid: SyndieEvacPod diff --git a/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml b/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml index 5819a934bf..f3abb6796f 100644 --- a/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml +++ b/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml @@ -6,17 +6,17 @@ - type: preloadedGrid id: ShuttleCargoLost path: /Maps/Shuttles/ShuttleEvent/lost_cargo.yml - copies: 2 + copies: 1 # WD from 2 to 1 - type: preloadedGrid id: TravelingCuisine path: /Maps/Shuttles/ShuttleEvent/traveling_china_cuisine.yml - copies: 2 + copies: 1 # WD from 2 to 1 - type: preloadedGrid id: DisasterEvacPod path: /Maps/Shuttles/ShuttleEvent/disaster_evacpod.yml - copies: 3 + copies: 1 # WD from 3 to 1 - type: preloadedGrid id: Honki @@ -26,4 +26,4 @@ - type: preloadedGrid id: SyndieEvacPod path: /Maps/Shuttles/ShuttleEvent/syndie_evacpod.yml - copies: 2 + copies: 1 # WD from 2 to 1 From c9007dfbe5059d1c5c42fce3f63da51859dfe647 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sat, 22 Feb 2025 17:40:37 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/GameRules/unknown_shuttles.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/GameRules/unknown_shuttles.yml b/Resources/Prototypes/GameRules/unknown_shuttles.yml index 0a899ea140..99c63068de 100644 --- a/Resources/Prototypes/GameRules/unknown_shuttles.yml +++ b/Resources/Prototypes/GameRules/unknown_shuttles.yml @@ -8,8 +8,7 @@ startAudio: path: /Audio/Announcements/attention.ogg weight: 5 - # reoccurrenceDelay: 30 # Amour EDIT - maxOccurrences: 1 # Amour EDIT + reoccurrenceDelay: 30 duration: 1 maxOccurrences: 1 # WD - type: LoadMapRule @@ -25,8 +24,7 @@ startAudio: path: /Audio/Announcements/attention.ogg weight: 5 - # reoccurrenceDelay: 30 # Amour EDIT - maxOccurrences: 1 # Amour EDIT + reoccurrenceDelay: 30 duration: 1 maxOccurrences: 1 # WD - type: LoadMapRule @@ -42,8 +40,7 @@ startAudio: path: /Audio/Announcements/attention.ogg weight: 5 - # reoccurrenceDelay: 30 # Amour EDIT - maxOccurrences: 1 # Amour EDIT + reoccurrenceDelay: 30 duration: 1 maxOccurrences: 1 # WD - type: LoadMapRule @@ -59,8 +56,7 @@ startAudio: path: /Audio/Announcements/attention.ogg weight: 2 - # reoccurrenceDelay: 30 # Amour EDIT - maxOccurrences: 1 # Amour EDIT + reoccurrenceDelay: 30 duration: 1 maxOccurrences: 1 # WD - type: LoadMapRule @@ -76,9 +72,7 @@ startAudio: path: /Audio/Announcements/attention.ogg weight: 2 - # reoccurrenceDelay: 30 # Amour EDIT - maxOccurrences: 1 # Amour EDIT - minimumPlayers: 30 # Amour EDIT + reoccurrenceDelay: 30 duration: 1 maxOccurrences: 1 # WD earliestStart: 40 # WD