diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml index a7877681931..974e05194ab 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml @@ -39,7 +39,7 @@ Piercing: 0.3 Heat: 0.3 - type: ClothingSpecialModifier - strengthModifier: 4 + strengthModifier: 8 - type: entity parent: ClothingOuterBase @@ -54,12 +54,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 + Blunt: 0.5 + Slash: 0.5 Piercing: 0.4 Heat: 0.4 - type: ClothingSpecialModifier - strengthModifier: 2 + strengthModifier: 4 - type: entity parent: ClothingOuterBase @@ -72,15 +72,15 @@ - type: Clothing sprite: Corvax/Clothing/OuterClothing/Armor/heavyarmor.rsi - type: ClothingSpeedModifier - walkModifier: 0.85 - sprintModifier: 0.85 + walkModifier: 0.95 + sprintModifier: 0.95 - type: Armor modifiers: coefficients: - Blunt: 0.55 - Slash: 0.55 - Piercing: 0.55 - Heat: 0.55 + Blunt: 0.65 + Slash: 0.65 + Piercing: 0.65 + Heat: 0.65 - type: ClothingSpecialModifier strengthModifier: 1 @@ -97,10 +97,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.6 - Heat: 0.6 + Blunt: 0.55 + Slash: 0.55 + Piercing: 0.55 + Heat: 0.55 - type: entity parent: ClothingOuterBase @@ -118,8 +118,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 + Blunt: 0.65 + Slash: 0.65 Piercing: 0.6 Heat: 0.6 @@ -141,8 +141,8 @@ coefficients: Blunt: 0.6 Slash: 0.6 - Piercing: 0.7 - Heat: 0.7 + Piercing: 0.65 + Heat: 0.65 - type: entity parent: ClothingOuterBase @@ -178,10 +178,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.75 - Slash: 0.75 - Piercing: 0.75 - Heat: 0.75 + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.7 + Heat: 0.7 - type: entity parent: ClothingOuterBase @@ -199,10 +199,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.75 - Heat: 0.75 + Blunt: 0.75 + Slash: 0.75 + Piercing: 0.7 + Heat: 0.7 - type: entity parent: ClothingOuterBase @@ -220,10 +220,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.75 - Slash: 0.75 - Piercing: 0.8 - Heat: 0.8 + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.75 + Heat: 0.75 - type: entity parent: ClothingOuterBase @@ -259,7 +259,7 @@ - type: Armor modifiers: coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + Heat: 0.8 diff --git a/Resources/Prototypes/Maps/N14/sunnyvale.yml b/Resources/Prototypes/Maps/N14/sunnyvale.yml index d92c55e0d2d..3847fac166e 100644 --- a/Resources/Prototypes/Maps/N14/sunnyvale.yml +++ b/Resources/Prototypes/Maps/N14/sunnyvale.yml @@ -12,8 +12,8 @@ mapNameTemplate: 'Саннивейл' - type: CP14StationAdditionalMap mapPaths: -# - /Maps/N14/SunnyvaleUnderground.yml - - /Maps/Corvax/CorvaxSunnyvaleUnderground.yml # Corvax-Maps + - /Maps/N14/SunnyvaleUnderground.yml + #- /Maps/Corvax/CorvaxSunnyvaleUnderground.yml Removed for refactoring - type: StationJobs overflowJobs: - Wastelander @@ -48,11 +48,11 @@ CaravanLeader: [ 1, 1 ] CaravanTrader: [ 1, 1 ] CaravanGuard: [ 2, 2 ] - BoSWashingtonCommander: [ 1, 1 ] - BoSWashingtonCaptain: [ 1, 1 ] - BoSWashingtonResearcher: [ 2, 2 ] - BoSWashingtonSoldier: [ 2, 2 ] - BoSWashingtonRecruit: [ 3, 3 ] + #BoSWashingtonCommander: [ 1, 1 ] + #BoSWashingtonCaptain: [ 1, 1 ] + #BoSWashingtonResearcher: [ 2, 2 ] + #BoSWashingtonSoldier: [ 2, 2 ] + #BoSWashingtonRecruit: [ 2, 2 ] BoSMidPaladinCommander: [ 1, 1 ] BoSMidPaladin: [ 1, 1 ] BoSMidKnight: [ 2, 3 ]