diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 11986942739..a6d44a46c32 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index cd475e29dfe..156a8d4ee3f 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/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 diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index e14588e1b2b..bdedac3a37b 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/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 diff --git a/Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/phaethon_dynasty.yml b/Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/phaethon_dynasty.yml index a53fd965779..34f7bafcf75 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/phaethon_dynasty.yml +++ b/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. diff --git a/Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/scaf_pirate.yml b/Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/scaf_pirate.yml index 5745e896707..ea55bd5b0af 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/scaf_pirate.yml +++ b/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 diff --git a/Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/tsfmc.yml b/Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/tsfmc.yml index 5c451b5f5c0..fe85f534aed 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/Head/Hardsuits/tsfmc.yml +++ b/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 diff --git a/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/phaethon_dynasty.yml b/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/phaethon_dynasty.yml index 33c0226c5a1..99318c6a669 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/phaethon_dynasty.yml +++ b/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" diff --git a/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/tsfmc.yml b/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/tsfmc.yml index 2665ce8e036..bb79410d0c3 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/tsfmc.yml +++ b/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/tsfmc.yml @@ -69,7 +69,7 @@ sprintModifier: 0.95 - type: entity - parent: [ClothingOuterHardsuitBase, BaseFactionGearTSFT3, EnergyShieldClothing] # LuaM: added EnergyShieldClothing + parent: [ClothingOuterHardsuitBase, BaseFactionGearTSFT3] id: ClothingOuterHardsuitM86 name: M86 Mk.3(R) hardsuit description: An armored hardsuit, designed to be an upgrade for the M82 series. The extra general armor gives it significant weight to move around. @@ -88,66 +88,19 @@ - type: Armor modifiers: coefficients: - Blunt: 0.75 # LuaM: 0.4 > 0.75 - Slash: 0.75 # LuaM: 0.4 > 0.75 - Piercing: 0.7 # LuaM: 0.4 > 0.7 + Blunt: 0.4 + Slash: 0.4 + Piercing: 0.4 # Shock: 0.8 # Commented by LuaM - Heat: 0.3 # LuaM: 0.5 > 0.3 - Radiation: 0.35 # LuaM: 0.5 > 0.35 - Caustic: 0.5 # LuaM: 0.6 > 0.5 + Heat: 0.5 + Radiation: 0.4 # LuaM: 0.5 > 0.4 + Caustic: 0.4 # LuaM: 0.6 > 0.4 - type: ClothingSpeedModifier walkModifier: 1.1 # LuaM: 0.8 > 1.1 sprintModifier: 1.1 # LuaM: 0.8 > 1.1 # - type: HeldSpeedModifier # Commented by LuaM - type: StaminaDamageResistance coefficient: 0.2 -# LuaM-start: - - 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: 20 - startingCharge: 20 - - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 1 - - type: RechargeableBlocking - chargedRechargeRate: 0.5 - dischargedRechargeRate: 1 - - type: UseDelay - delay: 10 - - type: PointLight - enabled: false - radius: 1.4 - energy: 2 - color: "#5dd439" - - type: EmpResistance - coefficient: 0.000001 - - type: Reflect - reflects: Energy - reflectProb: 0.4 - # LuaM-end. - type: ToggleableClothing # Goobstation - Modsuits change - Mono - this is a solution for helmet attachment/cover to not fit on hardsuits requiredSlot: outerclothing blockUnequipWhenAttached: false @@ -181,22 +134,22 @@ - type: FireProtection # Mono reduction: 0.5 - type: ExplosionResistance - damageCoefficient: 0.2 # LuaM 0.5 > 0.2 + damageCoefficient: 0.2 # LuaM: 0.5 > 0.2 - type: Armor # Mono - Armor Value Changes modifiers: coefficients: - Blunt: 0.35 # LuaM 0.4 > 0.35 - Slash: 0.35 # LuaM 0.4 > 0.35 - Piercing: 0.35 # LuaM 0.4 > 0.35 + Blunt: 0.35 # LuaM: 0.4 > 0.35 + Slash: 0.35 # LuaM: 0.4 > 0.35 + Piercing: 0.35 # LuaM: 0.4 > 0.35 Heat: 0.45 Radiation: 0.4 Caustic: 0.5 Poison: 0.8 # Mono - type: ClothingSpeedModifier # Mono - Armor Value Changes - walkModifier: 1.1 # LuaM 0.9 > 1.1 - sprintModifier: 1.1 # LuaM 1 > 1.1 + walkModifier: 1.1 # LuaM: 0.9 > 1.1 + sprintModifier: 1.1 # LuaM: 1 > 1.1 - type: StaminaDamageResistance # Mono - Stamres - coefficient: 0.55 # LuaM 0.35 > 0.55 + coefficient: 0.55 # LuaM: 0.35 > 0.55 - type: PirateBountyItem # Mono id: ClothingOuterHardsuitTacsuitHighValue @@ -281,7 +234,7 @@ # MARSOC only - type: entity - parent: [EnergyShieldClothing, ClothingOuterHardsuitM86, BaseFactionGearTSFT3] + parent: [ClothingOuterHardsuitM86, BaseFactionGearTSFT3] # LuaM: removed EnergyShieldClothing id: ClothingOuterHardsuitM86Mk4 name: M86 Mk.4(B) hardsuit description: A limited-production redesign proposal for the M86 Mk.3(R), outfitted with an inbuilt personal shield generator. @@ -294,18 +247,18 @@ highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 - type: ExplosionResistance - damageCoefficient: 0.4 + damageCoefficient: 0.15 # LuaM: 0.4 > 0.15 - type: Armor modifiers: coefficients: - Blunt: 0.55 - Slash: 0.45 - Piercing: 0.45 + Blunt: 0.3 # LuaM: 0.55 > 0.3 + Slash: 0.3 # LuaM: 0.45 > 0.3 + Piercing: 0.3 #LuaM: 0.45 > 0.3 Shock: 0.95 - Heat: 0.7 + Heat: 0.3 # LuaM: 0.7 > 0.3 Poison: 0.825 - Radiation: 0.5 + Radiation: 0.3 # LuaM: 0.5 > 0.3 Caustic: 0.6 - type: ClothingSpeedModifier - walkModifier: 0.9 - sprintModifier: 0.875 + walkModifier: 1.1 # LuaM: 0.9 > 1.1 + sprintModifier: 1.1 # LuaM: 0.875 > 1.1 diff --git a/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/ui.yml b/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/ui.yml index 2f085868ca4..0d8711e9bf1 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/ui.yml +++ b/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/ui.yml @@ -38,7 +38,7 @@ coefficient: 0.55 - type: entity - parent: [ ClothingOuterHardsuitBase, EnergyShieldClothing, BaseFactionGearOtherFactionT2 ] + parent: [ ClothingOuterHardsuitBase, BaseFactionGearOtherFactionT2 ] # LuaM: removed EnergyShieldClothing id: ClothingOuterHardsuitUIEnforcerMKII name: U.I. ENFORCER MKII combat tacsuit description: Based off of the infamous MKI design with versatility in mind. This is Ullman Industries' top of the line combat suit. Whether it be slipping away from the feds, taking out the competition, or serving your corporate overlords, this marvel of engineering will make sure that you get it done. @@ -55,34 +55,34 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.75 - Piercing: 0.6 + Blunt: 0.5 # LuaM 0.7 > 0.5 + Slash: 0.5 # LuaM 0.75 > 0.5 + Piercing: 0.5 # LuaM 0.6 > 0.5 Heat: 0.5 Radiation: 0.6 Caustic: 0.7 - - type: Blocking - passiveBlockModifier: - coefficients: - Blunt: 0.4 - Slash: 0.25 - Piercing: 0.5 - Heat: 0.3 - flatReductions: - Heat: 15 - Piercing: 5 - passiveBlockFraction: 0.5 - activeBlockFraction: 1.0 - isClothing: true - - type: Battery - maxCharge: 15 - startingCharge: 15 - - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 0.1 +# - type: Blocking # Commented by LuaM +# passiveBlockModifier: +# coefficients: +# Blunt: 0.4 +# Slash: 0.25 +# Piercing: 0.5 +# Heat: 0.3 +# flatReductions: +# Heat: 15 +# Piercing: 5 +# passiveBlockFraction: 0.5 +# activeBlockFraction: 1.0 +# isClothing: true +# - type: Battery # Commented by LuaM +# maxCharge: 15 +# startingCharge: 15 +# - type: BatterySelfRecharger # Commented by LuaM +# autoRecharge: true +# autoRechargeRate: 0.1 - type: ClothingSpeedModifier - walkModifier: 1 - sprintModifier: 0.85 # Temporary till shield toggling doesnt break movement speed modifiers + walkModifier: 0.9 # LuaM 1 > 0.9 + sprintModifier: 0.9 # Temporary till shield toggling doesnt break movement speed modifiers # LuaM 0.85 > 0.9 - type: HeldSpeedModifier - type: ToggleableClothing # Goobstation - Modsuits change - Mono - this is a solution for helmet attachment/cover to not fit on hardsuits requiredSlot: outerclothing diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index c0615a00952..302be3f49b2 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -600,8 +600,8 @@ offset: 0.21870, 0 # Reduce by 0.0005 to prevent gaps - map: ["opticAttachment"] - type: GunWieldBonus - minAngle: -21 - maxAngle: -47 + minAngle: -20 # LuaM: -21 > -20 + maxAngle: -56 # LuaM: -47 > -56 - type: Gun minAngle: 21 maxAngle: 58 @@ -609,7 +609,7 @@ angleDecay: 20 fireRate: 7 selectedMode: FullAuto - damageModifier: 0.95 # Brings it down to 152.95 DPS from 161 DPS (assuming perfect accuracy with FMJ on an unarmored target); Lecter has less DPS, but Lecter also has really fucking good accuracy and is free roundstart. + damageModifier: 1.0 # Brings it down to 152.95 DPS from 161 DPS (assuming perfect accuracy with FMJ on an unarmored target); Lecter has less DPS, but Lecter also has really fucking good accuracy and is free roundstart. # LuaM: 0.95 > 1.0 availableModes: - SemiAuto - FullAuto diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index aa248880fc2..386f12989d1 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -184,7 +184,7 @@ - type: entity name: LWC Vector (9x19mm) - parent: [BaseWeaponSubMachineGun, BaseGunWieldable] + parent: BaseWeaponSubMachineGun # LuaM: removed BaseGunWieldable id: WeaponSubMachineGunVector9x19mm description: An excellent fully automatic SMG. Uses 9x19mm ammo. An Erebus railmount is present on the top of the reciever and the bottom of the handguard for optics and grips. components: @@ -197,12 +197,16 @@ map: ["enum.GunVisualLayers.Mag"] - map: ["gripAttachment"] - map: ["opticAttachment"] - - type: GunWieldBonus - minAngle: -5 - maxAngle: -5 + #- type: GunWieldBonus # Commented by LuaM + # minAngle: -5 + # maxAngle: -5 - type: Clothing sprite: _Mono/Objects/Weapons/Guns/SMGs/vector.rsi - type: Gun + # LuaM start + minAngle: 2 + maxAngle: 12 + # LuaM end fireRate: 7.5 selectedMode: Burst soundGunshot: @@ -309,7 +313,7 @@ - type: entity name: LWC Vector (.45 ACP) - parent: [BaseWeaponSubMachineGun, BaseGunWieldable] + parent: BaseWeaponSubMachineGun # LuaM: removed BaseGunWieldable id: WeaponSubMachineGunVector45_ACP description: An excellent fully automatic SMG. Uses .45 ACP ammo. An Erebus railmount is present on the top of the reciever and the bottom of the handguard for optics and grips. components: @@ -322,12 +326,16 @@ map: ["enum.GunVisualLayers.Mag"] - map: ["gripAttachment"] - map: ["opticAttachment"] - - type: GunWieldBonus - minAngle: -5 - maxAngle: -5 + #- type: GunWieldBonus # Commented by LuaM + # minAngle: -5 + # maxAngle: -5 - type: Clothing sprite: _Mono/Objects/Weapons/Guns/SMGs/vector.rsi - type: Gun + # LuaM start + minAngle: 2 + maxAngle: 12 + # LuaM end fireRate: 6 selectedMode: Burst soundGunshot: @@ -435,7 +443,7 @@ # Corpo War .45 Mag Vector - type: entity name: NTSF-HCLM-45 (.45 magnum) - parent: [BaseWeaponSubMachineGun, BaseGunWieldable] + parent: BaseWeaponSubMachineGun # LuaM: removed BaseGunWieldable id: WeaponSubMachineGunVectorNtsfHclm description: The NTSF Heavy Caliber Light Machinegun. A very high-quality heavy SMG chambered in .45 magnum for use for the Nano Trasen Security Force and NT spec-ops, from the corporate war. components: @@ -446,12 +454,16 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - - type: GunWieldBonus - minAngle: -5 - maxAngle: -5 + #- type: GunWieldBonus # Commented by LuaM + # minAngle: -5 + # maxAngle: -5 - type: Clothing sprite: _Mono/Objects/Weapons/Guns/SMGs/ntsf_hclm_45.rsi - type: Gun + # LuaM start + minAngle: 2 + maxAngle: 12 + # LuaM end fireRate: 6 selectedMode: FullAuto soundGunshot: diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 8f51c1d7a48..38073aa2a03 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -223,7 +223,7 @@ - SemiAuto - FullAuto - type: GunSpreadModifier - spread: 0.4 + spread: 1.0 # LuaM: 0.4 > 1.0 - type: BallisticAmmoProvider whitelist: tags: