diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/doors/secretdoor/secret_door.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/doors/secretdoor/secret_door.ftl index 3e12906f9d..a8a8b5a646 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/doors/secretdoor/secret_door.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/doors/secretdoor/secret_door.ftl @@ -1,9 +1,9 @@ -ent-BaseReinforcedSecretDoor = укрепленная стена +ent-BaseReinforcedSecretDoor = укреплённая стена .desc = Удерживает воздух внутри, а ассистентов снаружи. .suffix = Потайная дверь ent-ReinforcedSecretDoorAssembly = каркас укрепленной секретной двери .desc = Оно пока что не открывается и не закрывается. Но определенно сможет вас раздавить. -ent-ReinforcedSecretDoor = укрепленная стена +ent-ReinforcedSecretDoor = укреплённая стена .desc = { ent-BaseSecretDoor.desc } ent-BaseReinforcedSecretDoorAssembly = каркас укрепленной потайной двери .desc = Он открывается, он закрывается, и он может вас раздавить. diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 24e705c4a6..edde0e4bb1 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -13,17 +13,17 @@ - type: damageModifierSet id: StructuralMetallicStrong coefficients: - Blunt: 0.5 - Slash: 0.5 - Piercing: 0.5 + Blunt: 0.75 + Slash: 0.75 + Piercing: 0.75 Shock: 1.2 - Structural: 0.25 + Structural: 0.5 flatReductions: - Blunt: 10 - Slash: 10 - Piercing: 10 - Heat: 10 - Structural: 10 + Blunt: 25 # TODO: reduce this once PKA damage is reduced. + Slash: 20 + Piercing: 20 + Heat: 15 + Structural: 25 - type: damageModifierSet id: StructuralMetallic @@ -36,7 +36,7 @@ Slash: 10 Piercing: 10 Heat: 10 - Structural: 10 + Structural: 15 - type: damageModifierSet id: Rock diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 47192c9b1d..2952468cc9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -375,7 +375,8 @@ # soundHit: Waiting on serv3 damage: types: - Heat: 14 + Heat: 15 + Structural: 35 # Sunrise-added # mining laser real - type: GatheringProjectile - type: Tag @@ -552,7 +553,7 @@ damage: types: Blunt: 15 - Structural: 30 + Structural: 20 # Short lifespan - type: TimedDespawn lifetime: 0.22 # roughly 5.5 tiles diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index 56825075f8..c2dfa9591f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -26,7 +26,7 @@ groups: Brute: 10 types: - Structural: 30 + Structural: 25 - type: Item size: Normal shape: @@ -163,7 +163,7 @@ types: Blunt: 6 Slash: 2 - Structural: 30 + Structural: 25 - type: GunRequiresWield - type: DisarmMalus - type: Prying diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml index 635cdee16e..08ff49af14 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml @@ -43,7 +43,7 @@ isPlaceable: false # defaults to closed. - type: Damageable damageContainer: StructuralInorganic - damageModifierSet: Metallic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index 28415c0a7a..e46b9a3343 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -48,6 +48,10 @@ path: /Audio/Effects/break_stone.ogg params: volume: -6 + - type: Gatherable + toolWhitelist: + tags: + - Pickaxe - type: Fixtures fixtures: fix1: @@ -94,6 +98,11 @@ intensitySlope: 2.5 maxIntensity: 10 canCreateVacuum: false + # Sunrise-start + - type: Gatherable # nasty hack to cover the fact that this needs to not be single-hit destruction. + toolWhitelist: + tags: [ ] + # Sunrise-end - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/e_pickaxe.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/e_pickaxe.yml index d6a02bfe92..fd9c039066 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/e_pickaxe.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/e_pickaxe.yml @@ -16,7 +16,7 @@ types: Heat: 8 Piercing: 2 - Structural: 40 + Structural: 30 deactivatedSecret: true - type: Sprite sprite: _Sunrise/Objects/Weapons/Melee/energy_pickaxe.rsi