diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 9ad0948a62b..c62c12baee1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -23,6 +23,7 @@ - Belt - type: AmmoCounter - type: Gun + damageModifier: 1.5 # Mono selectedMode: SemiAuto fireRate: 1.5 availableModes: @@ -124,6 +125,7 @@ - type: Clothing sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi - type: Gun + damageModifier: 1.2 # Mono fireRate: 3 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/mateba.ogg diff --git a/Resources/Prototypes/Entities/Structures/Walls/grille.yml b/Resources/Prototypes/Entities/Structures/Walls/grille.yml index dee4ed1601a..b5d3f65c668 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml @@ -60,7 +60,7 @@ !type:PhysShapeAabb bounds: "-0.5,-0.5,0.5,0.5" layer: - - GlassLayer + - DiagonalGlassLayer # ThisTotallyWontGoWrong.trvst - Monolith edit - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index bbb3336a160..dbf5e8a6a31 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -19,7 +19,7 @@ maxAngle: 20 angleIncrease: 5 angleDecay: 25 - fireRate: 3 + fireRate: 4 # Mono - 4 selectedMode: SemiAuto availableModes: - SemiAuto diff --git a/Resources/Prototypes/_Mono/Catalogs/selectable_sets.yml b/Resources/Prototypes/_Mono/Catalogs/selectable_sets.yml index d0e6539374a..f74726abfc9 100644 --- a/Resources/Prototypes/_Mono/Catalogs/selectable_sets.yml +++ b/Resources/Prototypes/_Mono/Catalogs/selectable_sets.yml @@ -71,8 +71,8 @@ - Hypopen - NocturineChemistryBottle - WeaponSubMachineGunMla73 - - Magazine635x40mmCaselessBig - AgentIDCard + - SyringeCaseAltFilled - type: thiefBackpackSet # sabateour set id: KitSelectorPDVInfiltratorSabateour @@ -95,7 +95,7 @@ - SyndiHypo - NocturineChemistryBottle - WeaponSubMachineGunMla73 - - Magazine635x40mmCaselessBig + - SyringeCaseAltFilled # PDV Tarkhan 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 5f96e7e069f..b3e838812e4 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/phaethon_dynasty.yml +++ b/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/phaethon_dynasty.yml @@ -49,7 +49,7 @@ parent: [ ClothingOuterHardsuitSyndie, BaseFactionGearPDVT2 ] id: ClothingOuterHardsuitAshen name: PDV CV-32 combat hardsuit - description: A combat hardsuit designed by the Phaethon Dynasty. A heavier but still general-purpose hardsuit, effective but not stellar against most damage types. + description: A combat hardsuit designed by the Phaethon Dynasty. A heavier but still general-purpose hardsuit. Sacrifices most of it protection against ballistic damage. components: - type: Sprite sprite: _Mono/Clothing/OuterClothing/Hardsuits/syndicate.rsi @@ -63,9 +63,25 @@ head: ClothingHeadHelmetHardsuitAshen helmetcover: ClothingHeadHelmetCoverBlock helmetattachment: ClothingHeadHelmetAttachmentBlock + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.75 + Piercing: 0.35 + Heat: 0.75 + Radiation: 0.7 + Caustic: 0.9 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.7 - type: Tag tags: - RogueHardsuit + - type: StaminaDamageResistance + coefficient: 0.75 - type: entity parent: [ ClothingOuterHardsuitBase, BaseFactionGearPDVT2 ] @@ -89,15 +105,15 @@ coefficients: Blunt: 0.67 Slash: 0.34 - Piercing: 0.67 - Heat: 0.5 + Piercing: 0.625 + Heat: 0.55 Radiation: 0.1 Caustic: 0.1 - type: StaminaDamageResistance # Mono - Stamres coefficient: 0.67 - type: ClothingSpeedModifier - walkModifier: 0.95 - sprintModifier: 0.95 + walkModifier: 1.05 + sprintModifier: 1.05 - 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/Clothing/OuterClothing/Hardsuits/tsfmc.yml b/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/tsfmc.yml index 571ea0578b4..4ece1ec42de 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/tsfmc.yml +++ b/Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/tsfmc.yml @@ -58,7 +58,7 @@ modifiers: coefficients: Blunt: 0.6 - Slash: 0.6 + Slash: 0.5 Piercing: 0.7 Heat: 0.6 Radiation: 0.2 @@ -134,7 +134,7 @@ - type: FireProtection # Mono reduction: 0.5 - type: ExplosionResistance - damageCoefficient: 0.5 + damageCoefficient: 0.3 - type: Armor # Mono - Armor Value Changes modifiers: coefficients: @@ -183,9 +183,9 @@ coefficients: Blunt: 0.5 Slash: 0.5 - Piercing: 0.6 - Heat: 0.7 - Radiation: 0.5 + Piercing: 0.5 + Heat: 0.6 + Radiation: 0.45 Caustic: 0.8 Poison: 0.8 # Mono - type: ClothingSpeedModifier # Mono - Armor Value Changes diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Battery/pdv.yml b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Battery/pdv.yml index b00bf49e975..ed3edc7e588 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Battery/pdv.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Battery/pdv.yml @@ -13,10 +13,10 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: GunWieldBonus - minAngle: -5 + minAngle: -35 maxAngle: -50 - type: Gun - minAngle: 5 + minAngle: 35 maxAngle: 53 fireRate: 1 selectedMode: SemiAuto diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/SMGs/pdv.yml b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/SMGs/pdv.yml index 6a6fbedd39f..093702f6a7f 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/SMGs/pdv.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/SMGs/pdv.yml @@ -190,6 +190,7 @@ minAngle: 21 maxAngle: 32 shotsPerBurst: 5 + fireRate: 8.5 damageModifier: 0.85 availableModes: - Burst 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 f6b7f7319a3..1edd163ebae 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -20,6 +20,7 @@ sprite: _Mono/Objects/Weapons/Guns/SMGs/vector.rsi - type: Gun fireRate: 7.5 + damageModifier: 0.8 selectedMode: Burst soundGunshot: path: /Audio/Weapons/Guns/Gunshots/atreides.ogg diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Shotguns/pdv.yml b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Shotguns/pdv.yml index 6f755b002ab..1c08a8ca4d8 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Shotguns/pdv.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Shotguns/pdv.yml @@ -31,7 +31,6 @@ proto: ShellShotgun23x75mmBuckshot soundInsert: path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg - autoCycle: false - type: StaticPrice vendPrice: 43000 - type: SpeedModifiedOnWield 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 aaddd543bbf..6b1d459d9e2 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -168,7 +168,7 @@ name: GS-004-A Jack (4 gauge) parent: [BaseItem, BaseGunWieldable] id: WeaponShotgunJack - description: An incredibly heavy burst fire 23x75mm shotgun that loads from a belt and a specialized backpack. + description: An incredibly heavy automated fire 23x75mm shotgun that loads from a belt and a specialized backpack. components: - type: Sprite sprite: _Mono/Objects/Weapons/Guns/Shotguns/jack.rsi @@ -189,18 +189,14 @@ modifiedDelay: 2 preventFiring: true - type: Gun - damageModifier: 0.65 minAngle: 35 # Might need increasing for slugs. maxAngle: 60 angleIncrease: 4 angleDecay: 16 - fireRate: 0.2 - selectedMode: Burst + fireRate: 2 + selectedMode: FullAuto availableModes: - - Burst - burstCooldown: 4 - burstFireRate: 4.5 - shotsPerBurst: 3 + - FullAuto soundGunshot: path: /Audio/_Mono/Weapons/Guns/SmallArms/Gunshots/bigshotgun_fire.ogg - type: GunSpreadModifier diff --git a/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Energy/launcher.yml b/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Energy/launcher.yml index 6775e102757..3d22c5fee50 100644 --- a/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Energy/launcher.yml +++ b/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Energy/launcher.yml @@ -66,7 +66,7 @@ parent: - BallisticArtillery - BallisticArtilleryTier3HP - suffix: Medium, T2 + suffix: Medium, T3 description: Borrowing from the design of the Marauder, the Cerberus fires very similar shots, but in a tight spread of 3 blasts components: - type: StaticPrice @@ -123,7 +123,7 @@ id: WeaponTurretType54 name: Type-54C plasma autopulser parent: - - BallisticArtillery + - BallisticArtilleryUnanchorable - BallisticArtilleryTier2HP suffix: Medium, T2 description: A rapidly firing energy weapon, well known for its devastating burst followed by a constant stream of plasma. @@ -147,7 +147,7 @@ recoil: 5 # 1/5x minAngle: 0 maxAngle: 5 - projectileSpeed: 220 + projectileSpeed: 320 shootThermalSignature: 500000 # ~5.6km with continuous fire soundGunshot: path: /Audio/_Mono/Weapons/Guns/Gunshots/autopulse_laser_fire_01.ogg @@ -314,8 +314,8 @@ name: TPC Scylla plasma impulse driver parent: - BallisticArtilleryUnanchorable - - BallisticArtilleryTier3HP - suffix: Large, T3 + - BallisticArtilleryTier4HP + suffix: Large, T4 description: A more specialized energy weapon, the Scylla fires a massive burst of plasma projectiles down range, in a huge spew to erase large and small targets alike. components: - type: StaticPrice @@ -333,14 +333,14 @@ - type: WirelessNetworkConnection range: 500 - type: Gun - projectileSpeed: 240 + projectileSpeed: 350 minAngle: 0 maxAngle: 6 fireRate: 1 recoil: 10 # 2/5x burstCooldown: 5.5 - burstFireRate: 100 - shotsPerBurst: 100 + burstFireRate: 15 + shotsPerBurst: 35 selectedMode: Burst availableModes: Burst shootThermalSignature: 500000 # ~5.6km with continuous fire @@ -372,7 +372,7 @@ - type: ShipGunType shipType: Energy - type: ShipGunClass - shipClass: Heavy + shipClass: SuperHeavy - type: ShipRepairable repairTime: 70 repairCost: 150 @@ -598,19 +598,17 @@ - type: Appearance - type: AmmoCounter - type: Battery - maxCharge: 56250 # 20 seconds of constant fire, 375 rock walls destroyed per full mag. 5 mining pulsers needed to equal its output. + maxCharge: 56250 startingCharge: 56250 - type: BatterySelfRecharger - autoRechargePause: true - autoRechargePauseTime: 30 autoRecharge: true - autoRechargeRate: 56250 + autoRechargeRate: 2500 - type: FireControlRotate - type: ExaminableBattery - type: WirelessNetworkConnection range: 500 - type: Gun - fireRate: 20 + fireRate: 25 recoil: 0 minAngle: 0 maxAngle: 0 diff --git a/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Energy/projectiles.yml b/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Energy/projectiles.yml index 23e707578a9..6567a5290a6 100644 --- a/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Energy/projectiles.yml +++ b/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Energy/projectiles.yml @@ -129,9 +129,9 @@ - type: Projectile damage: types: - Radiation: 5 - Structural: 10 - Heat: 10 + Radiation: 15 + Structural: 35 + Heat: 65 - type: Sprite sprite: _Impstation/Objects/Weapons/Guns/Projectiles/energybolts.rsi layers: @@ -147,11 +147,11 @@ - type: PointLight radarColor: "#00e5ff" - type: ExplodeOnTrigger - - type: Explosive + - type: Explosive # worse than hitler explosionType: Default - totalIntensity: 3 - intensitySlope: 3 - maxIntensity: 3 + totalIntensity: 16 + intensitySlope: 4 + maxIntensity: 4 # Type 241 diff --git a/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Kinetic/projectiles.yml b/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Kinetic/projectiles.yml index 369be4e31c7..6e79eea5d52 100644 --- a/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Kinetic/projectiles.yml +++ b/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Kinetic/projectiles.yml @@ -98,7 +98,7 @@ shape: triangle radarColor: "#1df1f5" - type: TimedDespawn - lifetime: 7 + lifetime: 4.5 - type: PointLight color: "#FCBA03" - type: ExplodeOnTrigger @@ -318,7 +318,7 @@ scale: 2.5 shape: triangle - type: TimedDespawn - lifetime: 7 + lifetime: 5.5 - type: PointLight color: "#fc5a03" - type: ExplodeOnTrigger @@ -438,7 +438,7 @@ scale: 4 shape: triangle - type: TimedDespawn - lifetime: 1.7 + lifetime: 3.1 # ~2.4 km range - type: PointLight color: "#19AFFF" - type: ExplodeOnTrigger @@ -508,15 +508,15 @@ requireNoGrid: true shape: star - type: TimedDespawn - lifetime: 3.6 #2.5km + lifetime: 7.2 #3.2km - Its 520mm after all. - type: PointLight color: "#fc5a03" - type: ExplodeOnTrigger - type: Explosive explosionType: Default - totalIntensity: 1400 - intensitySlope: 10 - maxIntensity: 30 + totalIntensity: 1900 + intensitySlope: 8 + maxIntensity: 90 maxTileBreak: 6 - type: GatheringProjectile - type: MiningGatheringSoft diff --git a/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Kinetic/standardlarge_kinetic.yml b/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Kinetic/standardlarge_kinetic.yml index a83be4056c3..1e25881f3e9 100644 --- a/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Kinetic/standardlarge_kinetic.yml +++ b/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Kinetic/standardlarge_kinetic.yml @@ -35,7 +35,7 @@ layer: - MachineLayer - type: Gun - projectileSpeed: 275 + projectileSpeed: 380 minAngle: 0 maxAngle: 1 fireRate: 0.2 @@ -123,7 +123,7 @@ projectileSpeed: 360 minAngle: 0 maxAngle: 0.5 - fireRate: 2.5 + fireRate: 3.5 recoil: 10 selectedMode: FullAuto availableModes: FullAuto @@ -204,7 +204,7 @@ layer: - MachineLayer - type: Gun - projectileSpeed: 350 + projectileSpeed: 550 minAngle: 0 maxAngle: 1 fireRate: 0.1 @@ -285,7 +285,7 @@ layer: - MachineLayer - type: Gun - projectileSpeed: 350 + projectileSpeed: 550 minAngle: 0 maxAngle: 0 fireRate: 0.2 diff --git a/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Kinetic/standardmedium_kinetic.yml b/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Kinetic/standardmedium_kinetic.yml index 573b8c07e5e..6f724cb108e 100644 --- a/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Kinetic/standardmedium_kinetic.yml +++ b/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Kinetic/standardmedium_kinetic.yml @@ -28,7 +28,7 @@ - type: Gun fireRate: 3 recoil: 10 # 2/5x - projectileSpeed: 204 + projectileSpeed: 320 minAngle: 0 maxAngle: 3 burstCooldown: 0.4 diff --git a/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Kinetic/syndicate_kinetic.yml b/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Kinetic/syndicate_kinetic.yml index 6c1e9b4321e..a07d6fc0a45 100644 --- a/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Kinetic/syndicate_kinetic.yml +++ b/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Kinetic/syndicate_kinetic.yml @@ -152,7 +152,7 @@ - type: entity id: WeaponTurretHydra name: Hydra 220mm battery - suffix: Large, T3 + suffix: Large, T$ parent: BallisticArtilleryUnanchorable description: A main cannonade of syndicate origin, the hydra is a monstrous tri-barreled battery of 220-millimeter pain, designed to shatter corpations' toughest vessels. Loads with a similar mechanism as the anaconda handgun. components: @@ -183,11 +183,11 @@ layer: - MachineLayer - type: Gun - projectileSpeed: 325 + projectileSpeed: 410 recoil: 50 # 2x minAngle: 0 maxAngle: 3 - fireRate: 0.2 + fireRate: 0.3 burstCooldown: 10 burstFireRate: 2 shotsPerBurst: 3 @@ -281,7 +281,7 @@ layer: - MachineLayer - type: Gun - projectileSpeed: 720 + projectileSpeed: 450 recoil: 100 # 4x minAngle: 0 maxAngle: 1 diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/clothing-eva.yml b/Resources/Prototypes/_NF/Recipes/Lathes/clothing-eva.yml index 41959df02cc..c7eaeb156a7 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/clothing-eva.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/clothing-eva.yml @@ -6,7 +6,6 @@ categories: - EVASuits - ArmorNF # Mono - materialDiscountScale: 0 completetime: 5 materials: Steel: 300