SerbiaStrong-220 · stalengd · Oct 16, 2024 · Sep 13, 2024 · Sep 13, 2024 · Sep 13, 2024
diff --git a/Content.Shared/SS220/DarkReaper/DarkReaperComponent.cs b/Content.Shared/SS220/DarkReaper/DarkReaperComponent.cs
@@ -248,7 +248,8 @@ public sealed partial class DarkReaperComponent : Component
         {
             Coefficients = new()
             {
-                {"Radiation", 0}
+                {"Radiation", 0},
+                {"Piercing", 0.8f}
             }
         },
 
@@ -257,7 +258,8 @@ public sealed partial class DarkReaperComponent : Component
         {
             Coefficients = new()
             {
-                {"Radiation", 0}
+                {"Radiation", 0},
+                {"Piercing", 0.6f}
             }
         },
 

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -121,6 +121,11 @@
   - type: Grammar
     attributes:
       gender: male
+    # ss220 lowTTKUpdate
+  - type: Damageable
+    damageContainer: Biological
+    damageModifierSet: RatKing
+    # ss220 lowTTKUpdate
   - type: Sharp
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -152,6 +152,11 @@
     - DoorBumpOpener
   - type: ReplacementAccent #SS220 No talking dragons
     accent: genericAggressive
+    # ss220 lowTTKUpdate
+  - type: Damageable
+    damageContainer: Biological
+    damageModifierSet: Dragon
+    ## ss220 lowTTKUpdate
   - type: Puller
     needsHands: false
 

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
@@ -7,7 +7,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 40
+        Piercing: 60 #ss220lowTTKUpdate
         Structural: 30
-        Stamina: 35
+        Stamina: 50 #ss220lowTTKUpdate
     ignoreResistances: true
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
@@ -7,7 +7,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 19
+        Piercing: 24 #ss220lowTTKUpdate
 
 - type: entity
   id: BulletCaselessRiflePractice

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
@@ -7,7 +7,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 19
+        Piercing: 32 #ss220lowTTKUpdate
 
 - type: entity
   id: BulletMinigun
@@ -18,4 +18,4 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 5
+        Piercing: 10 #ss220lowTTKUpdate
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
@@ -7,7 +7,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 19
+        Piercing: 33 #ss220lowTTKUpdate
 
 - type: entity
   id: BulletLightRiflePractice
@@ -42,4 +42,4 @@
     damage:
       types:
         Radiation: 9
-        Piercing: 10
+        Piercing: 14 #ss220lowTTKUpdate
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
@@ -7,7 +7,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 35
+        Piercing: 40 #ss220lowTTKUpdate
 
 - type: entity
   id: BulletMagnumPractice
@@ -29,7 +29,7 @@
   - type: Projectile
     damage:
       types:
-        Blunt: 32 #weaponBalance
+        Blunt: 38 #weaponBalance
         Heat: 3 #weaponBalance
 
 - type: entity
@@ -41,7 +41,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 26 # 20% decrease
+        Piercing: 32 # 20% decrease #ss220lowTTKUpdate
     ignoreResistances: true
 
 - type: entity
@@ -54,4 +54,4 @@
     damage:
       types:
         Radiation: 15
-        Piercing: 20
+        Piercing: 26 #ss220lowTTKUpdate
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
@@ -7,7 +7,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 16
+        Piercing: 20 #ss220lowTTKUpdate
 
 - type: entity
   id: BulletPistolPractice
@@ -29,7 +29,7 @@
   - type: Projectile
     damage:
       types:
-        Blunt: 14 #weaponBalance
+        Blunt: 16 #weaponBalance
         Heat: 2 #weaponBalance
 
 - type: entity
@@ -42,4 +42,4 @@
     damage:
       types:
         Radiation: 6
-        Piercing: 10
+        Piercing: 14 #ss220lowTTKUpdate
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
@@ -7,7 +7,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 17
+        Piercing: 29 #ss220lowTTKUpdate
 
 - type: entity
   id: BulletRiflePractice
@@ -30,7 +30,7 @@
     damage:
       types:
         Blunt: 15 #weaponBalance
-        Heat: 2 #weaponBalance
+        Heat: 5 #weaponBalance #ss220lowTTKUpdate
 
 - type: entity
   id: BulletRifleUranium
@@ -42,5 +42,5 @@
     damage:
       types:
         Radiation: 7
-        Piercing: 8
+        Piercing: 12 #ss220lowTTKUpdate
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -10,7 +10,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 28
+        Piercing: 40 #ss220lowTTKUpdate
 
 - type: entity
   id: PelletShotgunBeanbag
@@ -24,8 +24,8 @@
   - type: Projectile
     damage:
       types:
-        Blunt: 10
-        Stamina: 40 # 3 hits to stun
+        Blunt: 16 #ss220lowTTKUpdate
+        Stamina: 60 # 2 hits to stun #ss220lowTTKUpdate
 
 - type: entity
   id: PelletShotgun
@@ -39,7 +39,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 10
+        Piercing: 15 #ss220lowTTKUpdate
 
 - type: entity
   id: PelletShotgunSpread
@@ -49,7 +49,7 @@
   - type: ProjectileSpread
     proto: PelletShotgun
     count: 6
-    spread: 15
+    spread: 22 #ss220lowTTKUpdate
 
 - type: entity
   id: PelletShotgunIncendiary
@@ -63,8 +63,8 @@
   - type: Projectile
     damage:
       types:
-        Blunt: 7 #weaponBalance
-        Heat: 3 #weaponBalance
+        Blunt: 11 #weaponBalance
+        Heat: 5 #weaponBalance
   - type: IgnitionSource
     ignited: true
 
@@ -114,8 +114,8 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 4 #ss220 handmade gun buff
-        Slash: 5 #ss220 handmade gun buff
+        Piercing: 6 #ss220 handmade gun buff
+        Slash: 7 #ss220 handmade gun buff
 
 - type: entity
   id: PelletShotgunImprovisedSpread
@@ -214,7 +214,7 @@
     damage:
       types:
         Radiation: 5
-        Piercing: 5
+        Piercing: 7 #ss220lowTTKUpdate
 
 - type: entity
   id: PelletShotgunUraniumSpread

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@@ -88,6 +88,12 @@
     steps: 4
     zeroVisible: true
   - type: Appearance
+    #ss220lowTTKUpdate btw lmg too OP ^^^^
+  - type: HeldSpeedModifier
+    walkModifier: 0.8
+    sprintModifier: 0.8
+    mirrorClothingModifier: false
+    #ss220lowTTKUpdate
 
 - type: entity
   name: L6C ROW

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@@ -20,7 +20,7 @@
   id: RedLaser
   damage:
     types:
-      Heat: 14
+      Heat: 28 #ss220lowTTKUpdate
   muzzleFlash:
     sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
     state: muzzle_laser
@@ -50,7 +50,7 @@
   id: RedMediumLaser
   damage:
     types:
-      Heat: 17
+      Heat: 24 #ss220lowTTKUpdate
   muzzleFlash:
     sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
     state: muzzle_laser
@@ -65,7 +65,7 @@
   id: RedLightLaser
   damage:
     types:
-      Heat: 7
+      Heat: 13 #ss220lowTTKUpdate
   muzzleFlash:
     sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
     state: muzzle_laser
@@ -80,8 +80,8 @@
   id: XrayLaser
   damage:
     types:
-      Heat: 10
-      Radiation: 10
+      Heat: 15 #ss220lowTTKUpdate
+      Radiation: 15 #ss220lowTTKUpdate
   muzzleFlash:
     sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
     state: muzzle_xray
@@ -96,7 +96,7 @@
   id: RedHeavyLaser
   damage:
     types:
-      Heat: 28
+      Heat: 35 #ss220lowTTKUpdate
   muzzleFlash:
     sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
     state: muzzle_beam_heavy
@@ -111,7 +111,7 @@
   id: Pulse
   damage:
     types:
-      Heat: 35
+      Heat: 40 #ss220lowTTKUpdate
   muzzleFlash:
     sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
     state: muzzle_blue
@@ -127,8 +127,8 @@
   maxLength: 60
   damage:
     types:
-      Heat: 45
-      Structural: 10
+      Heat: 50 #ss220lowTTKUpdate
+      Structural: 20 #ss220lowTTKUpdate
   muzzleFlash:
     sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
     state: muzzle_beam_heavy2

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -73,8 +73,8 @@
         map: ["enum.GunVisualLayers.Mag"]
   #SS220 increase-automatic-rifles-spread begin
   - type: GunWieldBonus
-    minAngle: -19
-    maxAngle: -20
+    minAngle: -18
+    maxAngle: -24
   #SS220 increase-automatic-rifles-spread end
   - type: Gun
    #ss220 gunmodes start
@@ -84,8 +84,8 @@
    #ss220 gunmodes end
     fireRate: 5
     #SS220 increase-automatic-rifles-spread begin
-    angleIncrease: 2
-    angleDecay: 12
+    angleIncrease: 4
+    angleDecay: 14
     #SS220 increase-automatic-rifles-spread end
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -108,6 +108,14 @@
       map: [ "blade" ]
   - type: Item
     sprite: Objects/Weapons/Melee/e_sword-inhands.rsi
+  - type: Reflect
+    reflectProb: 0.75
+    reflects:
+      - NonEnergy
+      - Energy #SS220-FixReflects
+    spread: 80
+    reflectProbProjectile: 0.60 #ss220lowTTKUpdate
+    spreadProjectile: 180
 
 - type: entity
   name: energy dagger
@@ -384,7 +392,7 @@
       - NonEnergy
       - Energy #SS220-FixReflects
     spread: 45
-    reflectProbProjectile: 0.5
+    reflectProbProjectile: 0.8 #ss220lowTTKUpdate
     spreadProjectile: 180
 # ss220 FixESword
 

diff --git a/Resources/Prototypes/SS220/Damage/modifier_sets.yml b/Resources/Prototypes/SS220/Damage/modifier_sets.yml
@@ -79,3 +79,27 @@
     Slash: 0.8
     Heat: 0.8
     Poison: 0.2
+
+- type: damageModifierSet
+  id: Dragon
+  coefficients:
+    Blunt: 1
+    Slash: 1.2
+    Piercing: 0.6
+    Shock: 1
+    Cold: 1
+    Poison: 1
+    Cellular: 1
+    Radiation: 0.5
+
+- type: damageModifierSet
+  id: RatKing
+  coefficients:
+    Blunt: 1
+    Slash: 1
+    Piercing: 0.7
+    Shock: 1.0
+    Cold: 1
+    Poison: 1
+    Cellular: 1
+    Radiation: 1