diff --git a/Resources/Prototypes/DeltaV/GameRules/events.yml b/Resources/Prototypes/DeltaV/GameRules/events.yml index a3fb69cf73..16ecb05283 100644 --- a/Resources/Prototypes/DeltaV/GameRules/events.yml +++ b/Resources/Prototypes/DeltaV/GameRules/events.yml @@ -38,7 +38,7 @@ - type: StationEvent startAnnouncement: true reoccurrenceDelay: 12 - minimumPlayers: 1 + minimumPlayers: 5 - type: VentCrittersRule entries: - id: MobXeno @@ -78,8 +78,8 @@ noSpawn: true components: - type: StationEvent - weight: 7.5 - minimumPlayers: 10 + weight: 8.5 + minimumPlayers: 40 maxOccurrences: 1 duration: 1 - type: PirateRadioSpawnRule diff --git a/Resources/Prototypes/GameRules/cargo_gifts.yml b/Resources/Prototypes/GameRules/cargo_gifts.yml index 799805272d..546f60ccfd 100644 --- a/Resources/Prototypes/GameRules/cargo_gifts.yml +++ b/Resources/Prototypes/GameRules/cargo_gifts.yml @@ -46,7 +46,7 @@ - type: StationEvent weight: 4 startDelay: 10 - duration: 240 + duration: 180 earliestStart: 30 minimumPlayers: 10 - type: CargoGiftsRule @@ -67,11 +67,11 @@ noSpawn: true components: - type: StationEvent - weight: 4 + weight: 5 startDelay: 10 duration: 120 - minimumPlayers: 40 - earliestStart: 30 + minimumPlayers: 30 + earliestStart: 45 - type: CargoGiftsRule description: cargo-gift-vending sender: cargo-gift-default-sender @@ -90,7 +90,7 @@ noSpawn: true components: - type: StationEvent - weight: 8 + weight: 6 startDelay: 10 duration: 120 minimumPlayers: 30 diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 66a8f6ada8..713c00efcc 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -29,8 +29,8 @@ components: - type: StationEvent weight: 1 - maxOccurrences: 4 # Very annoying, makes containers unusable - earliestStart: 1 + maxOccurrences: 5 # Very annoying, makes containers unusable + earliestStart: 15 reoccurrenceDelay: 15 duration: 1 - type: BluespaceLockerRule @@ -43,7 +43,7 @@ - type: StationEvent weight: 10 duration: 1 - minimumPlayers: 7 + minimumPlayers: 10 reoccurrenceDelay: 5 - type: BreakerFlipRule @@ -54,8 +54,8 @@ components: - type: StationEvent startAnnouncement: true - minimumPlayers: 25 - weight: 5 + minimumPlayers: 35 + weight: 4 duration: 1 reoccurrenceDelay: 5 - type: BureaucraticErrorRule @@ -67,8 +67,8 @@ components: - type: StationEvent startAnnouncement: true - minimumPlayers: 15 - weight: 5 + minimumPlayers: 30 + weight: 4 duration: 1 reoccurrenceDelay: 5 - type: ClericalErrorRule @@ -79,9 +79,9 @@ noSpawn: true components: - type: StationEvent - weight: 10 + weight: 9 duration: 1 - minimumPlayers: 15 + minimumPlayers: 20 reoccurrenceDelay: 25 - type: RandomEntityStorageSpawnRule prototype: MobSkeletonCloset @@ -96,7 +96,7 @@ duration: 1 earliestStart: 45 reoccurrenceDelay: 60 - minimumPlayers: 20 + minimumPlayers: 35 - type: RandomSpawnRule prototype: SpawnPointGhostDragon @@ -110,7 +110,7 @@ duration: 1 earliestStart: 45 reoccurrenceDelay: 45 - minimumPlayers: 20 + minimumPlayers: 25 - type: NinjaSpawnRule # TODO there's already a glimmer revenant rule. One of them might be broken. @@ -133,7 +133,7 @@ noSpawn: true components: - type: StationEvent - weight: 10 + weight: 9 duration: 1 reoccurrenceDelay: 4 # Please no 10 false alarms in a row. - type: FalseAlarmRule @@ -175,8 +175,8 @@ - type: StationEvent earliestStart: 30 reoccurrenceDelay: 5 - weight: 7.5 - minimumPlayers: 7 #Enough to hopefully have at least one engineering guy + weight: 7 + minimumPlayers: 15 #Enough to hopefully have at least one engineering guy startAnnouncement: true endAnnouncement: true duration: null #ending is handled by MeteorSwarmRule @@ -267,7 +267,7 @@ noSpawn: true components: - type: StationEvent - weight: 5 + weight: 4 duration: 1 reoccurrenceDelay: 10 maxOccurrences: 3 # Annoying and rarely if ever interesting @@ -339,7 +339,7 @@ startDelay: 10 earliestStart: 20 reoccurrenceDelay: 12 - minimumPlayers: 15 + minimumPlayers: 20 weight: 5 duration: 60 - type: VentCrittersRule @@ -361,7 +361,7 @@ startDelay: 10 earliestStart: 20 reoccurrenceDelay: 15 - minimumPlayers: 15 + minimumPlayers: 20 weight: 5 duration: 60 - type: VentCrittersRule @@ -376,7 +376,7 @@ noSpawn: true components: - type: StationEvent - minimumPlayers: 1 + minimumPlayers: 7 - type: VentCrittersRule entries: - id: MobAdultSlimesBlueAngry @@ -392,7 +392,7 @@ noSpawn: true components: - type: StationEvent - minimumPlayers: 1 + minimumPlayers: 7 - type: VentCrittersRule entries: - id: MobGiantSpiderAngry @@ -423,9 +423,9 @@ - type: StationEvent id: VentCritters earliestStart: 15 - minimumPlayers: 15 + minimumPlayers: 25 weight: 4 - duration: 60 + duration: 45 - type: VentCrittersRule entries: - id: MobGiantSpiderVampireAngry @@ -439,7 +439,7 @@ - type: StationEvent earliestStart: 60 reoccurrenceDelay: 60 - minimumPlayers: 15 + minimumPlayers: 25 weight: 2 duration: 1 - type: ZombieRule @@ -474,7 +474,7 @@ - type: StationEvent earliestStart: 60 weight: 3 - minimumPlayers: 15 + minimumPlayers: 25 reoccurrenceDelay: 45 duration: 1 - type: LoadMapRule @@ -547,9 +547,9 @@ noSpawn: true components: - type: StationEvent - earliestStart: 0 + earliestStart: 10 reoccurrenceDelay: 5 minimumPlayers: 20 - weight: 5 + weight: 4 - type: MobReplacementRule numberToReplace: 1 diff --git a/Resources/Prototypes/GameRules/midround.yml b/Resources/Prototypes/GameRules/midround.yml index bb870f6007..d8d44ffbde 100644 --- a/Resources/Prototypes/GameRules/midround.yml +++ b/Resources/Prototypes/GameRules/midround.yml @@ -40,12 +40,10 @@ maxRange: min: 1 max: 3 - playerRatio: 1 + playerRatio: 10 allowNonHumans: true multiAntagSetting: All startingGear: ThiefGear - components: - - type: Pacified mindComponents: - type: ThiefRole prototype: Thief diff --git a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml index 524bf4d4b7..0e905c0b9e 100644 --- a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml +++ b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml @@ -48,7 +48,7 @@ components: - type: StationEvent # Favor glimmer events just a little more than regular events. - weight: 12 + weight: 11 - type: GlimmerEvent ## Glimmer events @@ -84,7 +84,7 @@ noSpawn: true components: - type: GlimmerEvent - minimumGlimmer: 550 + minimumGlimmer: 600 maximumGlimmer: 1000 - type: NoosphericFryRule @@ -94,7 +94,7 @@ noSpawn: true components: - type: GlimmerEvent - minimumGlimmer: 590 + minimumGlimmer: 650 maximumGlimmer: 1000 glimmerBurnLower: 18 glimmerBurnUpper: 40 @@ -106,7 +106,7 @@ noSpawn: true components: - type: GlimmerEvent - minimumGlimmer: 900 + minimumGlimmer: 850 glimmerBurnLower: 350 glimmerBurnUpper: 450 # Unless epistemics badly f-d up, this will restore the glimmer balance for a while. - type: MassMindSwapRule @@ -147,8 +147,8 @@ reoccurrenceDelay: 15 minimumPlayers: 10 - type: GlimmerEvent - minimumGlimmer: 500 - maximumGlimmer: 900 + minimumGlimmer: 400 + maximumGlimmer: 800 report: glimmer-event-report-signatures - type: GlimmerRandomSentienceRule @@ -158,7 +158,7 @@ noSpawn: true components: - type: GlimmerEvent - minimumGlimmer: 700 + minimumGlimmer: 650 maximumGlimmer: 900 report: glimmer-event-report-signatures - type: GlimmerRevenantRule diff --git a/Resources/Prototypes/Traits/skills.yml b/Resources/Prototypes/Traits/skills.yml index f1f133d0f8..af683af5db 100644 --- a/Resources/Prototypes/Traits/skills.yml +++ b/Resources/Prototypes/Traits/skills.yml @@ -280,7 +280,7 @@ - type: trait id: TrapAvoider category: Physical - points: -6 + points: -4 components: - type: StepTriggerImmune whitelist: