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 2686db6f6a..99c63068de 100644
--- a/Resources/Prototypes/GameRules/unknown_shuttles.yml
+++ b/Resources/Prototypes/GameRules/unknown_shuttles.yml
@@ -8,9 +8,9 @@
     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
     preloadedGrid: ShuttleCargoLost
 
@@ -24,9 +24,9 @@
     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
     preloadedGrid: TravelingCuisine
 
@@ -40,9 +40,9 @@
     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
     preloadedGrid: DisasterEvacPod
 
@@ -56,9 +56,9 @@
     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
     preloadedGrid: Honki
 
@@ -72,9 +72,10 @@
     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
+    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