Cherrypicks 5 (#399)
* Give moldy food the "Trash" tag (#29380) Make moldy food items have the "Trash" tag, so they can be collected. * Add "Structure" tag to switches, buttons, and levers (#29378) shit Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es> * Revamped Meteor Swarm (#28974) * meteor code and balanced values * Meteor Swarms * Update meteors.yml * Update meteors.yml * HOO! (fix overkill bug and buff space dust) * undo BloodstreamComponent.cs changes * DamageDistribution -> DamageTypes * part 2. * meteor fixes * improve meteor spawning (#29057) * Decrease meteor frequency (#29194) * Make Projectiles Only Hit a Variety of Station Objects Unless Clicked on (#28571) * Revert "Make Projectiles Only Hit a Variety of Station Objects Unless Clicked on (#28571)" This reverts commit 4f934f02f17ce55cabc03b965eb1df7738d63148. * Makes machine parts stackable, removes unused field in stack prototypes (#28434) * Makes machine parts stacks, removes unused field in stack prototypes * forgor * Fix tests * Fixes lathe construction. Yes. This sucks but there's no better way that doesnt involve refactoring machine parts completely * detail * a * Add pressure and temperature warning text to firelocks (#28341) * fix firelocks * missing nukies can be filled in by ghost roles (#28316) * Revert "missing nukies can be filled in by ghost roles (#28316)" This reverts commit 99f13e1e45bc778a4941316fde5d89d7b91337ce. * welding gas mask (#27108) * welding gas mask * eek * Canes + Cane Blade for Syndicate Librarians (#25873) * Cane + Cane Blade * Add - type: ContainerContainer * Add another - type: ContainerContainer * Fix and add proper ContainerContainer component * Add UserInterface component * Remove Space * Stat Changes * review --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Fix stupid NPC. (#26868) * init commit * Review --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * fixes --------- Co-authored-by: VeritableCalamity <34698192+Veritable-Calamity@users.noreply.github.com> Co-authored-by: eoineoineoin <github@eoinrul.es> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Ps3Moira <113228053+ps3moira@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
This commit is contained in:
@@ -158,25 +158,6 @@
|
||||
duration: 240
|
||||
- type: KudzuGrowthRule
|
||||
|
||||
- type: entity
|
||||
id: MeteorSwarm
|
||||
parent: BaseGameRule
|
||||
noSpawn: true
|
||||
components:
|
||||
- type: StationEvent
|
||||
earliestStart: 30
|
||||
weight: 7.5
|
||||
minimumPlayers: 10 #Enough to hopefully have at least one engineering guy
|
||||
startAnnouncement: station-event-meteor-swarm-start-announcement
|
||||
endAnnouncement: station-event-meteor-swarm-end-announcement
|
||||
startAudio:
|
||||
path: /Audio/Announcements/meteors.ogg
|
||||
params:
|
||||
volume: -4
|
||||
duration: null #ending is handled by MeteorSwarmRule
|
||||
startDelay: 30
|
||||
- type: MeteorSwarmRule
|
||||
|
||||
- type: entity
|
||||
id: MouseMigration
|
||||
parent: BaseGameRule
|
||||
|
||||
111
Resources/Prototypes/GameRules/meteorswarms.yml
Normal file
111
Resources/Prototypes/GameRules/meteorswarms.yml
Normal file
@@ -0,0 +1,111 @@
|
||||
- type: entity
|
||||
parent: BaseGameRule
|
||||
id: GameRuleMeteorScheduler
|
||||
noSpawn: true
|
||||
components:
|
||||
- type: GameRule
|
||||
minPlayers: 25
|
||||
- type: MeteorScheduler
|
||||
|
||||
- type: weightedRandomEntity
|
||||
id: DefaultConfig
|
||||
weights:
|
||||
GameRuleSpaceDustMinor: 44
|
||||
GameRuleSpaceDustMajor: 22
|
||||
GameRuleMeteorSwarmSmall: 18
|
||||
GameRuleMeteorSwarmMedium: 10
|
||||
GameRuleMeteorSwarmLarge: 5
|
||||
GameRuleUristSwarm: 0.05
|
||||
|
||||
- type: entity
|
||||
parent: BaseGameRule
|
||||
id: GameRuleMeteorSwarm
|
||||
noSpawn: true
|
||||
components:
|
||||
- type: GameRule
|
||||
- type: MeteorSwarm
|
||||
|
||||
- type: entity
|
||||
parent: GameRuleMeteorSwarm
|
||||
id: GameRuleSpaceDustMinor
|
||||
noSpawn: true
|
||||
components:
|
||||
- type: MeteorSwarm
|
||||
announcement: null
|
||||
announcementSound: null
|
||||
nonDirectional: true
|
||||
meteors:
|
||||
MeteorSpaceDust: 1
|
||||
waves:
|
||||
min: 2
|
||||
max: 3
|
||||
meteorsPerWave:
|
||||
min: 3
|
||||
max: 5
|
||||
|
||||
- type: entity
|
||||
parent: GameRuleMeteorSwarm
|
||||
id: GameRuleSpaceDustMajor
|
||||
noSpawn: true
|
||||
components:
|
||||
- type: MeteorSwarm
|
||||
announcement: station-event-space-dust-start-announcement
|
||||
announcementSound: /Audio/Announcements/attention.ogg
|
||||
nonDirectional: true
|
||||
meteors:
|
||||
MeteorSpaceDust: 1
|
||||
waves:
|
||||
min: 2
|
||||
max: 3
|
||||
meteorsPerWave:
|
||||
min: 8
|
||||
max: 12
|
||||
|
||||
- type: entity
|
||||
parent: GameRuleMeteorSwarm
|
||||
id: GameRuleMeteorSwarmSmall
|
||||
noSpawn: true
|
||||
components:
|
||||
- type: MeteorSwarm
|
||||
meteors:
|
||||
MeteorSmall: 7
|
||||
MeteorMedium: 3
|
||||
|
||||
- type: entity
|
||||
parent: GameRuleMeteorSwarm
|
||||
id: GameRuleMeteorSwarmMedium
|
||||
noSpawn: true
|
||||
components:
|
||||
- type: MeteorSwarm
|
||||
meteors:
|
||||
MeteorSmall: 3
|
||||
MeteorMedium: 6
|
||||
MeteorLarge: 1
|
||||
|
||||
- type: entity
|
||||
parent: GameRuleMeteorSwarm
|
||||
id: GameRuleMeteorSwarmLarge
|
||||
noSpawn: true
|
||||
components:
|
||||
- type: MeteorSwarm
|
||||
meteors:
|
||||
MeteorSmall: 2
|
||||
MeteorMedium: 4
|
||||
MeteorLarge: 4
|
||||
|
||||
- type: entity
|
||||
parent: GameRuleMeteorSwarm
|
||||
id: GameRuleUristSwarm
|
||||
noSpawn: true
|
||||
components:
|
||||
- type: MeteorSwarm
|
||||
announcement: station-event-meteor-urist-start-announcement
|
||||
announcementSound: /Audio/Announcements/attention.ogg
|
||||
meteors:
|
||||
MeteorUrist: 1
|
||||
waves:
|
||||
min: 3
|
||||
max: 3
|
||||
meteorsPerWave:
|
||||
min: 10
|
||||
max: 10
|
||||
Reference in New Issue
Block a user