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

Merge pull request #260 from frosty-dev/upstream-core

Browse Source 
Upstream core
This commit is contained in:
BIGZi0348
2025-02-23 04:42:04 +03:00
committed by GitHub
parent 43d5033ae7 c9007dfbe5
commit 3e1d03e306
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -706,6 +706,7 @@
- type: RandomMetadata - type: RandomMetadata
nameSegments: nameSegments:
- names_clown - names_clown
- type: Pacified # WD
- type: randomHumanoidSettings - type: randomHumanoidSettings
id: ClownTroupeBanana id: ClownTroupeBanana
@@ -721,6 +722,7 @@
- type: RandomMetadata - type: RandomMetadata
nameSegments: nameSegments:
- names_clown - names_clown
- type: Pacified # WD
# Traveling exotic chef # Traveling exotic chef

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

@@ -8,9 +8,9 @@
startAudio: startAudio:
path: /Audio/Announcements/attention.ogg path: /Audio/Announcements/attention.ogg
weight: 5 weight: 5
# reoccurrenceDelay: 30 # Amour EDIT reoccurrenceDelay: 30
maxOccurrences: 1 # Amour EDIT
duration: 1 duration: 1
maxOccurrences: 1 # WD
- type: LoadMapRule - type: LoadMapRule
preloadedGrid: ShuttleCargoLost preloadedGrid: ShuttleCargoLost
@@ -24,9 +24,9 @@
startAudio: startAudio:
path: /Audio/Announcements/attention.ogg path: /Audio/Announcements/attention.ogg
weight: 5 weight: 5
# reoccurrenceDelay: 30 # Amour EDIT reoccurrenceDelay: 30
maxOccurrences: 1 # Amour EDIT
duration: 1 duration: 1
maxOccurrences: 1 # WD
- type: LoadMapRule - type: LoadMapRule
preloadedGrid: TravelingCuisine preloadedGrid: TravelingCuisine
@@ -40,9 +40,9 @@
startAudio: startAudio:
path: /Audio/Announcements/attention.ogg path: /Audio/Announcements/attention.ogg
weight: 5 weight: 5
# reoccurrenceDelay: 30 # Amour EDIT reoccurrenceDelay: 30
maxOccurrences: 1 # Amour EDIT
duration: 1 duration: 1
maxOccurrences: 1 # WD
- type: LoadMapRule - type: LoadMapRule
preloadedGrid: DisasterEvacPod preloadedGrid: DisasterEvacPod
@@ -56,9 +56,9 @@
startAudio: startAudio:
path: /Audio/Announcements/attention.ogg path: /Audio/Announcements/attention.ogg
weight: 2 weight: 2
# reoccurrenceDelay: 30 # Amour EDIT reoccurrenceDelay: 30
maxOccurrences: 1 # Amour EDIT
duration: 1 duration: 1
maxOccurrences: 1 # WD
- type: LoadMapRule - type: LoadMapRule
preloadedGrid: Honki preloadedGrid: Honki
@@ -72,9 +72,10 @@
startAudio: startAudio:
path: /Audio/Announcements/attention.ogg path: /Audio/Announcements/attention.ogg
weight: 2 weight: 2
# reoccurrenceDelay: 30 # Amour EDIT reoccurrenceDelay: 30
maxOccurrences: 1 # Amour EDIT
minimumPlayers: 30 # Amour EDIT
duration: 1 duration: 1
maxOccurrences: 1 # WD
earliestStart: 40 # WD
minimumPlayers: 30 # WD
- type: LoadMapRule - type: LoadMapRule
preloadedGrid: SyndieEvacPod preloadedGrid: SyndieEvacPod

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

@@ -6,17 +6,17 @@
- type: preloadedGrid - type: preloadedGrid
id: ShuttleCargoLost id: ShuttleCargoLost
path: /Maps/Shuttles/ShuttleEvent/lost_cargo.yml path: /Maps/Shuttles/ShuttleEvent/lost_cargo.yml
copies: 2 copies: 1 # WD from 2 to 1
- type: preloadedGrid - type: preloadedGrid
id: TravelingCuisine id: TravelingCuisine
path: /Maps/Shuttles/ShuttleEvent/traveling_china_cuisine.yml path: /Maps/Shuttles/ShuttleEvent/traveling_china_cuisine.yml
copies: 2 copies: 1 # WD from 2 to 1
- type: preloadedGrid - type: preloadedGrid
id: DisasterEvacPod id: DisasterEvacPod
path: /Maps/Shuttles/ShuttleEvent/disaster_evacpod.yml path: /Maps/Shuttles/ShuttleEvent/disaster_evacpod.yml
copies: 3 copies: 1 # WD from 3 to 1
- type: preloadedGrid - type: preloadedGrid
id: Honki id: Honki
@@ -26,4 +26,4 @@
- type: preloadedGrid - type: preloadedGrid
id: SyndieEvacPod id: SyndieEvacPod
path: /Maps/Shuttles/ShuttleEvent/syndie_evacpod.yml path: /Maps/Shuttles/ShuttleEvent/syndie_evacpod.yml
copies: 2 copies: 1 # WD from 2 to 1