Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'WD-core/master' into upstream-core

Browse Source
This commit is contained in:
BIGZi0348
2025-02-22 17:38:28 +03:00
parent f0558c3a67 643ff7e810
commit 734b30c5d5
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
View File

@@ -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

7
Resources/Prototypes/GameRules/unknown_shuttles.yml
View File

@@ -11,6 +11,7 @@
# reoccurrenceDelay: 30 # Amour EDIT
maxOccurrences: 1 # Amour EDIT
duration: 1
maxOccurrences: 1 # WD
- type: LoadMapRule
preloadedGrid: ShuttleCargoLost
@@ -27,6 +28,7 @@
# reoccurrenceDelay: 30 # Amour EDIT
maxOccurrences: 1 # Amour EDIT
duration: 1
maxOccurrences: 1 # WD
- type: LoadMapRule
preloadedGrid: TravelingCuisine
@@ -43,6 +45,7 @@
# reoccurrenceDelay: 30 # Amour EDIT
maxOccurrences: 1 # Amour EDIT
duration: 1
maxOccurrences: 1 # WD
- type: LoadMapRule
preloadedGrid: DisasterEvacPod
@@ -59,6 +62,7 @@
# reoccurrenceDelay: 30 # Amour EDIT
maxOccurrences: 1 # Amour EDIT
duration: 1
maxOccurrences: 1 # WD
- type: LoadMapRule
preloadedGrid: Honki
@@ -76,5 +80,8 @@
maxOccurrences: 1 # Amour EDIT
minimumPlayers: 30 # Amour EDIT
duration: 1
maxOccurrences: 1 # WD
earliestStart: 40 # WD
minimumPlayers: 30 # WD
- type: LoadMapRule
preloadedGrid: SyndieEvacPod

8
Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
View File

@@ -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