]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Buff holo and mild structural adjustment (#23515)
authorEmisse <99158783+Emisse@users.noreply.github.com>
Thu, 4 Jan 2024 12:03:28 +0000 (05:03 -0700)
committerGitHub <noreply@github.com>
Thu, 4 Jan 2024 12:03:28 +0000 (23:03 +1100)
buff holo

Resources/Prototypes/Damage/modifier_sets.yml
Resources/Prototypes/Entities/Mobs/Player/guardian.yml

index bdfcae9e7463620b3ab643a81d428e49b5dbda09..71871405c3943787e37883f04c7494b64cef5685 100644 (file)
   id: StructuralMetallicStrong
   coefficients:
     Shock: 1.2
+    Structural: 0.5
   flatReductions:
-    Blunt: 25
-    Slash: 25
-    Piercing: 25
-    Heat: 25
-    Structural: 40
+    Blunt: 20
+    Slash: 20
+    Piercing: 20
+    Heat: 20
+    Structural: 15
 
 - type: damageModifierSet
   id: StructuralMetallic
   coefficients:
     Shock: 1.2
+    Structural: 0.5
   flatReductions:
     Blunt: 10
     Slash: 10
     Piercing: 10
     Heat: 10
-    Structural: 20
+    Structural: 10
 
 - type: damageModifierSet
   id: PerforatedMetallic
@@ -89,7 +91,7 @@
     Slash: 5
     Piercing: 5
     Heat: 5
-    Structural: 10
+    Structural: 5
 
 - type: damageModifierSet
   id: RGlass
     Piercing: 0.6
     Heat: 0.5
     Shock: 0
+    Structural: 0.5
   flatReductions:
     Blunt: 5
     Slash: 5
     Piercing: 5
     Heat: 5
-    Structural: 12.5
+    Structural: 10
 
 - type: damageModifierSet
   id: Wood
index 1e863aa80f8e6551e1b4a6fa88b603e693d68717..08c37b56febefb9e8edbc9cc9e7312d4a79e2e3f 100644 (file)
       proto: guardian
     - type: Pullable
     - type: MeleeWeapon
-      hidden: true
-      angle: 30
+      hidden: false
+      altDisarm: false
       animation: WeaponArcFist
-      attackRate: 1.5
+      attackRate: 1.8
       damage:
         types:
           Blunt: 20
+          Structural: 20
     - type: MeleeSpeech
     - type: UserInterface
       interfaces:
           map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
           color: "#40a7d7"
           shader: unshaded
-    - type: NpcFactionMember
-      factions:
-        - Syndicate
     - type: HTN
       rootTask:
         task: SimpleHumanoidHostileCompound