Попытка в баланс.

Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml

@@ -409,7 +409,7 @@
 #ANTAG HARDSUITS
 #Blood-red Hardsuit
 - type: entity
-  parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
+  parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase, ShowSecurityIcons ] # LuaM add ShowSecurityIcons
   id: ClothingHeadHelmetHardsuitSyndie
   name: blood-red hardsuit helmet
   description: A heavily armored helmet designed for work in special operations. Property of Gorlex Marauders.
@@ -431,6 +431,11 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+  - type: ThermalVision # LuaM add
+    flashDurationMultiplier: 2
+    pulseTime: 3
+    isEquipment: true
+    toggleAction: PulseThermalVision
 
 #Blood-red Medic Hardsuit
 - type: entity
@@ -456,10 +461,15 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+  - type: ThermalVision # LuaM add
+    flashDurationMultiplier: 2
+    pulseTime: 3
+    isEquipment: true
+    toggleAction: PulseThermalVision
 
 #Syndicate Elite Hardsuit
 - type: entity
-  parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
+  parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase, ShowMedicalIcons, ShowSecurityIcons ] # LuaM add ShowMedicalIcons ShowSecurityIcons
   id: ClothingHeadHelmetHardsuitSyndieElite
   name: syndicate elite helmet
   description: An elite version of the blood-red hardsuit's helmet, with improved armor and fireproofing. Property of Gorlex Marauders.
@@ -486,6 +496,9 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+  - type: NightVision # LuaM add
+    flashDurationMultiplier: 2.25
+    isEquipment: true
 
 #Syndicate Commander Hardsuit
 - type: entity

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -679,9 +679,9 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.5
-        Slash: 0.5
-        Piercing: 0.5
+        Blunt: 0.45 # LuaM: 0.5 > 0.45
+        Slash: 0.45 # LuaM: 0.5 > 0.45
+        Piercing: 0.4 # LuaM: 0.5 > 0.4
         Heat: 0.5
         Radiation: 0.5
         Caustic: 0.5
@@ -719,15 +719,15 @@
   - type: Armor # Mono
     modifiers:
       coefficients:
-        Blunt: 0.55
-        Slash: 0.55
-        Piercing: 0.5
-        Heat: 0.5
+        Blunt: 0.5 # LuaM: 0.55 > 0.5
+        Slash: 0.5 # LuaM: 0.55 > 0.5
+        Piercing: 0.45 # LuaM: 0.5 > 0.45
+        Heat: 0.4 # LuaM: 0.5 > 0.4
         Radiation: 0.35
         Caustic: 0.2
   - type: ClothingSpeedModifier # Mono
-    walkModifier: 0.93
-    sprintModifier: 0.93
+    walkModifier: 1.0 # LuaM: 0.93 > 1.0
+    sprintModifier: 1.0 # LuaM: 0.93 > 1.0
   - type: ToggleableClothing # Goobstation - Modsuits change - Mono - this is a solution for helmet attachment/cover to not fit on hardsuits
     requiredSlot: outerclothing
     blockUnequipWhenAttached: false
@@ -765,17 +765,17 @@
   - type: Armor # Mono - Armor Value Changes
     modifiers:
       coefficients:
-        Blunt: 0.6
-        Slash: 0.6
-        Piercing: 0.6
+        Blunt: 0.5 # LuaM: 0.6 > 0.5
+        Slash: 0.5 # LuaM: 0.6 > 0.5
+        Piercing: 0.5 # LuaM: 0.6 > 0.5
         Heat: 0.35
         Radiation: 0.01
         Caustic: 0.5
   - type: Item
     size: Huge
   - type: ClothingSpeedModifier
-    walkModifier: 1.0
-    sprintModifier: 1.0 # 0.9-> 1 Mono
+    walkModifier: 1.1 # LuaM: 1.0 > 1.1
+    sprintModifier: 1.1 # 0.9-> 1 Mono # LuaM: 1.0 > 1.1
   - type: HeldSpeedModifier
   - type: StaminaDamageResistance # Mono - Stamres
     coefficient: 0.45

Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -25,9 +25,9 @@
     burstFireRate: 12
     burstCooldown: 0.8
     shotsPerBurst: 4
-    fireRate: 6.5
-    projectileSpeed: 42.5 # Mono
-    damageModifier: 0.9
+    fireRate: 7.0 # LuaM: 6.5 > 7.0
+    projectileSpeed: 50 # Mono # LuaM: 42.5 > 50
+    damageModifier: 1.0 # LuaM: 0.9 > 1.0
     soundGunshot:
       path: /Audio/_Goobstation/Weapons/Guns/Gunshots/thock.ogg
   - type: ChamberMagazineAmmoProvider
@@ -178,8 +178,8 @@
   - type: Clothing
     sprite: _Mono/Objects/Weapons/Guns/Rifles/wspr_inhands_32x.rsi # Mono
   - type: GunWieldBonus
-    minAngle: -14
-    maxAngle: -41
+    minAngle: -20 # LuaM: -14 > -20
+    maxAngle: -31 # LuaM: -41 > -31
   - type: Gun
     availableModes:
     - Burst
@@ -188,7 +188,7 @@
     burstCooldown: 0.6 # Mono
     projectileSpeed: 45 # Mono
     fireRate: 7.5 # Mono, does nothing because its burst only but it makes it clear it can fire at this rate.
-    damageModifier: 0.9
+    damageModifier: 1.2 # LuaM: 0.9 > 1.2 EXP UP
     soundGunshot:
       path: /Audio/_Mono/Weapons/Guns/SmallArms/Gunshots/wspr_fire.ogg # Mono change - Changed audio path
   - type: ItemSlots

Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/phaethon_dynasty.yml

@@ -47,7 +47,7 @@
     - HeadSide
 
 - type: entity
-  parent: [ClothingHeadHelmetHardsuitSyndieElite, ShowSecurityIcons]
+  parent: [ClothingHeadHelmetHardsuitSyndieElite, ShowSecurityIcons, ShowMedicalIcons ] # LuaM add ShowMedicalIcons
   id: ClothingHeadHelmetHardsuitAshenElite
   name: PDV CV-53 combat tacsuit helmet
   description: Based off of the CV-32 hardsuit, this tacsuit sacrifices heavy armor plates for environmental protection.
@@ -59,7 +59,7 @@
     sprite: _Mono/Clothing/Head/Hardsuits/syndieelite.rsi
 
 - type: entity
-  parent: [ClothingHeadHelmetHardsuitSyndieElite, ShowSecurityIcons]
+  parent: [ClothingHeadHelmetHardsuitSyndieElite, ShowSecurityIcons, ShowMedicalIcons ] # LuaM add ShowMedicalIcons
   id: ClothingHeadHelmetHardsuitVizier
   name: PDV CV-67 combat hardsuit helmet
   description: An adorned tacsuit designed with an imperfect nanolaminate composition. High maneuverability, sturdy armor.

Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/scaf_pirate.yml

@@ -23,10 +23,10 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.95
-        Slash: 0.95
-        Piercing: 0.95
-        Heat: 0.95
+        Blunt: 0.9 # LuaM: 0.95 > 0.9
+        Slash: 0.9 # LuaM: 0.95 > 0.9
+        Piercing: 0.9 # LuaM: 0.95 > 0.9
+        Heat: 0.9 # LuaM: 0.95 > 0.9
   - type: HideLayerClothing
     slots:
     - Hair

Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/tsfmc.yml

@@ -18,10 +18,10 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.95
-        Slash: 0.95
-        Piercing: 0.95
-        Heat: 0.95
+        Blunt: 0.9 # LuaM: 0.95 > 0.9
+        Slash: 0.9 # LuaM: 0.95 > 0.9
+        Piercing: 0.9 # LuaM: 0.95 > 0.9
+        Heat: 0.9 # LuaM: 0.95 > 0.9
   - type: HideLayerClothing
     slots:
     - Hair
@@ -30,7 +30,7 @@
     - HeadSide
 
 - type: entity
-  parent: [ClothingHeadHardsuitBase, ShowMedicalIcons]
+  parent: [ClothingHeadHardsuitBase, ShowMedicalIcons, ShowSecurityIcons ] # LuaM add ShowSecurityIcons
   id: ClothingHeadHelmetHardsuitM86
   name: M86 helmet
   description: Modified from M82 series helmets, outfitted with night-vision equipment and refined gel-layers.
@@ -50,9 +50,9 @@
     modifiers:
       coefficients:
         Blunt: 0.9
-        Slash: 0.95
-        Piercing: 0.95
-        Heat: 0.95
+        Slash: 0.9 # LuaM: 0.95 > 0.9
+        Piercing: 0.9 # LuaM: 0.95 > 0.9
+        Heat: 0.9 # LuaM: 0.95 > 0.9
   - type: HideLayerClothing
     slots:
     - Hair

Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/phaethon_dynasty.yml

@@ -63,6 +63,26 @@
       head: ClothingHeadHelmetHardsuitAshen
       helmetcover: ClothingHeadHelmetCoverBlock
       helmetattachment: ClothingHeadHelmetAttachmentBlock
+# LuaM-start:
+  - type: ExplosionResistance
+    damageCoefficient: 0.35
+  - type: FireProtection
+    reduction: 0.5
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.35
+        Slash: 0.35
+        Piercing: 0.35
+        Heat: 0.5
+        Radiation: 0.5
+        Caustic: 0.5
+  - type: Item
+    size: Huge
+  - type: ClothingSpeedModifier
+    walkModifier: 0.95
+    sprintModifier: 0.95
+# LuaM-end.
   - type: Tag
     tags:
     - RogueHardsuit
@@ -140,24 +160,24 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.35 # LuaM 0.25 > 0.35
-        Slash: 0.35 # LuaM 0.25 > 0.35
+        Blunt: 0.35 # LuaM: 0.25 > 0.35
+        Slash: 0.35 # LuaM: 0.25 > 0.35
         Piercing: 0.25
-        Heat: 0.25
+        Heat: 0.5 # LuaM: 0.25 > 0.5
         Radiation: 0.25
         Caustic: 0.5
   - type: Item
     size: Huge
   - type: ClothingSpeedModifier
-    walkModifier: 1.0
-    sprintModifier: 1.0
+    walkModifier: 1.05 # LuaM: 1.0 > 1.05
+    sprintModifier: 1.05 # LuaM: 1.0 > 1.05
 # LuaM-end.
   - type: Tag
     tags:
     - RogueHardsuit
 
 - type: entity
-  parent: [ ClothingOuterHardsuitSyndieElite, EnergyShieldClothing ]
+  parent: ClothingOuterHardsuitSyndieElite # LuaM: removed EnergyShieldClothing
   id: ClothingOuterHardsuitAshenElite
   name: PDV CV-53 combat tacsuit
   description: Originally based off of the CV-32 hardsuit, the CV-53 tacsuit sacrifices conventional armor plating for environmental protection, and a rechargeable hard-shield.
@@ -175,67 +195,60 @@
       helmetcover: ClothingHeadHelmetCoverBlock
       helmetattachment: ClothingHeadHelmetAttachmentBlock
   - type: ExplosionResistance
-    damageCoefficient: 0.3
+    damageCoefficient: 0.15 # LuaM: 0.3 > 0.15
   - type: FireProtection
     reduction: 0.8
   - type: Armor # Mono - Armor Value Changes
     modifiers:
       coefficients:
-        Blunt: 0.75
-        Slash: 0.75
-        Piercing: 0.7
+        Blunt: 0.4 # LuaM: 0.75 > 0.4
+        Slash: 0.4 # LuaM: 0.75 > 0.4
+        Piercing: 0.4 # LuaM: 0.7 > 0.4
         Heat: 0.2
         Radiation: 0.01
-        Caustic: 0.5
+        Caustic: 0.4 # LuaM: 0.5 > 0.4
   - type: Item
     size: Huge
   - type: ClothingSpeedModifier
-    walkModifier: 1.0
-    sprintModifier: 1.0 # 0.9-> 1 Mono
+    walkModifier: 1.05 # LuaM: 1.0 > 1.05
+    sprintModifier: 1.05 # 0.9-> 1 Mono # LuaM: 1.0 > 1.05
   - type: Tag
     tags:
     - RogueHardsuit
   # Shielding
-  - type: Blocking
-    passiveBlockModifier:
-      coefficients:
-        Blunt: 0.1
-        Slash: 0.1
-        Piercing: 0.1
-        Heat: 0.1
-    activeBlockModifier:
-      coefficients:
-        Blunt: 0.1
-        Slash: 0.1
-        Piercing: 0.1
-        Heat: 0.1
-      flatReductions:
-        Heat: 5
-    passiveBlockFraction: 1.0
-    activeBlockFraction: 1.0
-    isClothing: true
-  - type: Damageable
-    damageContainer: Shield
-  - type: Battery
-    maxCharge: 30 # LuaM: 10 > 30
-    startingCharge: 30 # LuaM: 10 > 30
-  - type: BatterySelfRecharger
-    autoRecharge: true
-    autoRechargeRate: 1
-  - type: RechargeableBlocking
-    chargedRechargeRate: 0.5 # LuaM: 0 > 0.5
-    dischargedRechargeRate: 1 # LuaM: 0.3 > 1
-  - type: UseDelay
-    delay: 10
-  - type: PointLight
-    enabled: false
-    radius: 1.4
-    energy: 2
-    color: "#5dd439"
-# LuaM-start:
-  - type: EmpResistance
-    coefficient: 0.000001
-  - type: Reflect
-    reflects: Energy
-    reflectProb: 0.4
- # LuaM-end.
+#  - type: Blocking # Commented by LuaM
+#    passiveBlockModifier:
+#      coefficients:
+#        Blunt: 0.1
+#        Slash: 0.1
+#        Piercing: 0.1
+#        Heat: 0.1
+#    activeBlockModifier:
+#      coefficients:
+#        Blunt: 0.1
+#        Slash: 0.1
+#        Piercing: 0.1
+#        Heat: 0.1
+#      flatReductions:
+#        Heat: 5
+#    passiveBlockFraction: 1.0
+#    activeBlockFraction: 1.0
+#    isClothing: true
+#  - type: Damageable
+#    damageContainer: Shield
+#  - type: Battery
+#    maxCharge: 30 # LuaM: 10 > 30
+#    startingCharge: 30 # LuaM: 10 > 30
+#  - type: BatterySelfRecharger
+#    autoRecharge: true
+#    autoRechargeRate: 1
+#  - type: RechargeableBlocking
+#    chargedRechargeRate: 0.5 # LuaM: 0 > 0.5
+#    dischargedRechargeRate: 1 # LuaM: 0.3 > 1
+#  - type: UseDelay
+#    delay: 10
+#  - type: PointLight
+#    enabled: false
+#    radius: 1.4
+#    energy: 2
+#    color: "#5dd439"