diff --git a/Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml b/Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml index 92c1b7570e1..81664ae892f 100644 --- a/Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml +++ b/Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml @@ -138,6 +138,10 @@ - type: Wieldable - type: UseDelay delay: 2.5 + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 0.6 + - type: HeldSpeedModifier - type: entity name: EarthGov laser carbine @@ -324,6 +328,10 @@ - type: Item sprite: Backmen/Objects/Weapons/Gunsx64/Pistols/acp14/tiny.rsi - type: Gun + angleIncrease: 2 + angleDecay: 10 + maxAngle: 15 + minAngle: 1 selectedMode: SemiAuto availableModes: - SemiAuto @@ -370,6 +378,10 @@ - type: Item sprite: Backmen/Objects/Weapons/Gunsx64/Pistols/vp78/tiny.rsi - type: Gun + angleIncrease: 2 + angleDecay: 10 + maxAngle: 15 + minAngle: 1 selectedMode: FullAuto availableModes: - FullAuto @@ -417,6 +429,10 @@ - type: Item sprite: Backmen/Objects/Weapons/Gunsx64/Pistols/deagle/tiny.rsi - type: Gun + angleDecay: 15 + angleIncrease: 10 + maxAngle: 15 + minAngle: 1 selectedMode: SemiAuto availableModes: - SemiAuto @@ -508,6 +524,10 @@ - type: Item sprite: Backmen/Objects/Weapons/Gunsx64/Pistols/glock22/tiny.rsi - type: Gun + angleDecay: 7 + angleIncrease: 2 + maxAngle: 15 + minAngle: 1 soundGunshot: path: /Audio/Weapons/Guns64/Pistols/beretta_shot.ogg soundEmpty: @@ -570,6 +590,10 @@ - type: Item sprite: Backmen/Objects/Weapons/Gunsx64/Pistols/hi_power_br/tiny.rsi - type: Gun + angleDecay: 15 + angleIncrease: 5 + maxAngle: 15 + minAngle: 1 soundGunshot: path: /Audio/Weapons/Guns64/Pistols/vp70_shot.ogg soundEmpty: @@ -614,6 +638,10 @@ - type: Item sprite: Backmen/Objects/Weapons/Gunsx64/Pistols/service_pistol23/tiny.rsi - type: Gun + angleDecay: 15 + angleIncrease: 5 + maxAngle: 15 + minAngle: 1 selectedMode: SemiAuto availableModes: - SemiAuto @@ -826,10 +854,12 @@ sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/akms/tiny.rsi - type: GunWieldBonus minAngle: -23 - maxAngle: -43 + maxAngle: 0 - type: Gun + angleDecay: 20 + angleIncrease: 2 minAngle: 24 - maxAngle: 45 + maxAngle: 35 fireRate: 5 soundGunshot: path: /Audio/Weapons/Guns64/Rifles/ak47.ogg @@ -883,8 +913,10 @@ size: NormalLarge - type: GunWieldBonus minAngle: -23 - maxAngle: -43 + maxAngle: 0 - type: Gun + angleDecay: 20 + angleIncrease: 5 minAngle: 24 maxAngle: 45 fireRate: 5 @@ -942,8 +974,10 @@ sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/ar18/tiny.rsi - type: GunWieldBonus minAngle: -23 - maxAngle: -43 + maxAngle: 0 - type: Gun + angleDecay: 20 + angleIncrease: 3 minAngle: 24 maxAngle: 45 soundGunshot: @@ -1001,8 +1035,10 @@ sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/g36/tiny.rsi - type: GunWieldBonus minAngle: -23 - maxAngle: -43 + maxAngle: 0 - type: Gun + angleDecay: 20 + angleIncrease: 2 minAngle: 24 maxAngle: 45 soundGunshot: @@ -1060,8 +1096,10 @@ sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/m28/tiny.rsi - type: GunWieldBonus minAngle: -23 - maxAngle: -43 + maxAngle: 0 - type: Gun + angleDecay: 30 + angleIncrease: 2 minAngle: 24 maxAngle: 45 soundGunshot: @@ -1135,8 +1173,10 @@ sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/stg44/tiny.rsi - type: GunWieldBonus minAngle: -23 - maxAngle: -43 + maxAngle: 0 - type: Gun + angleDecay: 15 + angleIncrease: 2 minAngle: 24 maxAngle: 45 fireRate: 8 @@ -1194,8 +1234,10 @@ sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/m16/tiny.rsi - type: GunWieldBonus minAngle: -23 - maxAngle: -43 + maxAngle: 0 - type: Gun + angleDecay: 15 + angleIncrease: 3 minAngle: 24 maxAngle: 45 soundGunshot: @@ -1251,12 +1293,19 @@ sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/famas/tiny.rsi - type: GunWieldBonus minAngle: -23 - maxAngle: -43 + maxAngle: 0 - type: Gun + angleDecay: 30 + angleIncrease: 5 minAngle: 24 maxAngle: 45 + fireRate: 14 soundGunshot: path: /Audio/Weapons/Guns64/Rifles/famas.ogg + selectedMode: Burst + availableModes: + - SemiAuto + - Burst - type: ItemSlots slots: gun_magazine: @@ -1308,8 +1357,10 @@ sprite: Backmen/Objects/Weapons/Gunsx64/SMGs/mp5/tiny.rsi - type: GunWieldBonus minAngle: -22 - maxAngle: -28 + maxAngle: 0 - type: Gun + angleDecay: 20 + angleIncrease: 5 minAngle: 24 maxAngle: 45 fireRate: 6 @@ -1378,11 +1429,13 @@ - type: Item sprite: Backmen/Objects/Weapons/Gunsx64/SMGs/mp7/tiny.rsi - type: GunWieldBonus - minAngle: -22 - maxAngle: -28 + minAngle: -10 + maxAngle: 0 - type: Gun - minAngle: 24 - maxAngle: 45 + angleDecay: 20 + angleIncrease: 3 + minAngle: 14 + maxAngle: 35 fireRate: 8 soundGunshot: path: /Audio/Weapons/Guns64/SMGs/mp7.ogg @@ -1435,6 +1488,8 @@ minAngle: -22 maxAngle: -28 - type: Gun + angleDecay: 40 + angleIncrease: 5 minAngle: 24 maxAngle: 45 fireRate: 10 @@ -1482,8 +1537,10 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Gun + angleDecay: 40 + angleIncrease: 7 minAngle: 2 - maxAngle: 56 + maxAngle: 36 fireRate: 7 soundGunshot: path: /Audio/Weapons/Guns64/SMGs/skorpion.ogg @@ -1534,8 +1591,10 @@ sprite: Backmen/Objects/Weapons/Gunsx64/SMGs/mp38/tiny.rsi - type: GunWieldBonus minAngle: -22 - maxAngle: -28 + maxAngle: 0 - type: Gun + angleDecay: 20 + angleIncrease: 2 minAngle: 24 maxAngle: 45 fireRate: 5 @@ -1684,8 +1743,8 @@ - type: Gun minAngle: 2 maxAngle: 46 - angleIncrease: 9 - angleDecay: 36 + angleDecay: 40 + angleIncrease: 7 fireRate: 12 soundGunshot: path: /Audio/Weapons/Guns64/SMGs/uzi.ogg @@ -1736,8 +1795,10 @@ sprite: Backmen/Objects/Weapons/Gunsx64/SMGs/ppsh41/tiny.rsi - type: GunWieldBonus minAngle: -22 - maxAngle: -28 + maxAngle: 0 - type: Gun + angleDecay: 40 + angleIncrease: 7 minAngle: 24 maxAngle: 45 fireRate: 9 @@ -1788,8 +1849,10 @@ map: ["enum.GunVisualLayers.Mag"] - type: GunWieldBonus minAngle: -22 - maxAngle: -28 + maxAngle: 0 - type: Gun + angleDecay: 40 + angleIncrease: 5 minAngle: 24 maxAngle: 45 fireRate: 9 @@ -1842,12 +1905,13 @@ - type: Item sprite: Backmen/Objects/Weapons/Gunsx64/Battery/EG-S/tiny.rsi - type: GunRequiresWield - - type: GunWieldBonus - minAngle: -93 - maxAngle: -94 + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 0.8 + - type: HeldSpeedModifier - type: Gun - minAngle: 94 - maxAngle: 95 + minAngle: 1 + maxAngle: 10 fireRate: 1.5 selectedMode: SemiAuto availableModes: @@ -1959,6 +2023,8 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] + - type: Gun + fireRate: 3 - type: Item sprite: Backmen/Objects/Weapons/Gunsx64/Shotguns/zauer/tiny.rsi - type: Clothing @@ -3090,6 +3156,10 @@ - type: Wieldable - type: UseDelay delay: 1.9 + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 0.8 + - type: HeldSpeedModifier - type: entity name: MG-42 @@ -3145,6 +3215,10 @@ - type: UseDelay delay: 1.9 - type: GunRequiresWield + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 0.5 + - type: HeldSpeedModifier - type: entity id: MagazineHeavyMachineGunDrum @@ -3240,6 +3314,10 @@ - type: UseDelay delay: 1.9 - type: GunRequiresWield + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 0.6 + - type: HeldSpeedModifier - type: entity name: M-41 @@ -3295,6 +3373,10 @@ - type: UseDelay delay: 1.9 - type: GunRequiresWield + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 0.7 + - type: HeldSpeedModifier - type: entity id: MagazineHeavyRifleV41 @@ -3404,6 +3486,10 @@ - type: UseDelay delay: 2.3 - type: GunRequiresWield + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 0.9 + - type: HeldSpeedModifier - type: entity name: Огнемет М6 diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 7a08a7e0465..4d6b6377e1d 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -551,7 +551,7 @@ Telecrystal: 2 categories: - UplinkUtility - + - type: listing id: UplinkClothingEyesHudSyndicate name: uplink-clothing-eyes-hud-syndicate-name @@ -724,7 +724,7 @@ whitelist: tags: - NukeOpsUplink - + - type: listing id: UplinkUplinkImplanter # uplink uplink real name: uplink-uplink-implanter-name @@ -1858,7 +1858,7 @@ - type: listing id: UplinkZauerBundle name: набор "Zauer" - description: Простой и надеждный, штурмовой автоматически дробовик зауер. содержит барабан пуль и 3 барабана дроби. + description: Простой и надеждный, штурмовой автоматически дробовик зауер. содержит 2 барабан пуль и 4 барабана дроби. icon: { sprite: Backmen/Objects/Weapons/Gunsx64/Shotguns/zauer/big.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateFilledZauer cost: @@ -1874,9 +1874,11 @@ - type: StorageFill contents: - id: WeaponShotgunZauer + - id: MagazineShotgunMagnum12 - id: MagazineShotgun - - id: MagazineShotgun - - id: MagazineShotgunBeanbag + amount: 2 + - id: MagazineShotgunSlug + amount: 2 - type: listing id: UplinkGrenadeLauncher79Bundle @@ -1902,6 +1904,30 @@ - id: GrenadeBlast amount: 4 +- type: listing + id: UplinkGrenadeLauncherM81Bundle + name: набор "M-81" + description: Однозарядный армейский штатный гранатомёт, используется пехотными подраздилениями для блокирывания зон и поддержки, имеет 6 гранат в комплекте + icon: { sprite: Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi, state: base } + productEntity: ClothingBackpackDuffelSyndicateFilledGL79 + cost: + Telecrystal: 13 + categories: + - UplinkBundles + +- type: entity + parent: ClothingBackpackDuffelSyndicate + id: ClothingBackpackDuffelSyndicateFilledM81 + name: набор "M-81" + components: + - type: StorageFill + contents: + - id: WeaponLauncherM81 + - id: GrenadeFrag + amount: 3 + - id: GrenadeBlast + amount: 3 + - type: listing id: UplinkRPDBundle name: Набор "RPD" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 1472c5f1494..973ec4fec39 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -55,6 +55,7 @@ name: RPG-7 parent: BaseWeaponLauncher id: WeaponLauncherRocket + noSpawn: true description: A modified ancient rocket-propelled grenade launcher. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 641c86fafcc..d2891122ca7 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -183,6 +183,8 @@ - CartridgePistolRubber - CartridgeMagnumRubber - ShellShotgunBeanbag + - GrenadeTearGas + - GrenadeNonletal - CartridgeRifleRubber - CartridgeLightRifleRubber - MagazineBoxPistolRubber @@ -338,6 +340,7 @@ emagDynamicRecipes: - ExplosivePayload - WeaponLaserCarbine + - WeaponLaserPistol - WeaponAdvancedLaser - WeaponLaserCannon - WeaponXrayCannon @@ -725,6 +728,8 @@ - GrenadeEMP - GrenadeFlash - ShellShotgunBeanbag + - GrenadeTearGas + - GrenadeNonletal - ShellShotgunIncendiary - ShellShotgunUranium - Signaller @@ -738,6 +743,7 @@ - WeaponDisablerSMG - WeaponLaserCannon - WeaponLaserCarbine + - WeaponLaserPistol - WeaponLaserCarbinePractice - InsulativeHeadcage - ClothingHeadHelmetInsulated diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 63f2a53245e..6cd2dce564f 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -32,7 +32,7 @@ - type: latheRecipe id: WeaponLaserCarbine - result: WeaponEarthGovLaserRifle + result: WeaponEarthGovLaserCarbine category: Weapons completetime: 8 materials: @@ -40,6 +40,16 @@ Glass: 800 Plastic: 500 +- type: latheRecipe + id: WeaponLaserPistol + result: WeaponEarthGovLaserPistol + category: Weapons + completetime: 8 + materials: + Steel: 500 + Glass: 100 + Plastic: 200 + - type: latheRecipe id: WeaponAdvancedLaser result: WeaponAdvancedLaser @@ -137,6 +147,24 @@ Plastic: 200 Steel: 100 +- type: latheRecipe + id: GrenadeTearGas + result: GrenadeTearGas + category: Ammo + completetime: 5 + materials: + Plastic: 15 + Steel: 10 + +- type: latheRecipe + id: GrenadeNonletal + result: GrenadeNonletal + category: Ammo + completetime: 5 + materials: + Plastic: 20 + Steel: 10 + - type: latheRecipe id: ShellShotgunBeanbag result: ShellShotgunBeanbag diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 38ed0ceec82..c9c141093dd 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -45,6 +45,7 @@ cost: 7500 recipeUnlocks: - WeaponLaserCarbine + - WeaponLaserPistol - type: technology id: NonlethalAmmunition @@ -57,6 +58,8 @@ cost: 5000 recipeUnlocks: - ShellShotgunBeanbag + - GrenadeTearGas + - GrenadeNonletal - CartridgePistolRubber - CartridgeMagnumRubber - CartridgeLightRifleRubber @@ -149,7 +152,7 @@ - type: technology id: BasicShuttleArmament name: research-technology-basic-shuttle-armament - icon: + icon: sprite: Structures/Power/cage_recharger.rsi state: full discipline: Arsenal @@ -192,11 +195,11 @@ cost: 15000 recipeUnlocks: - WeaponLaserSvalinn - + - type: technology id: AdvancedShuttleWeapon name: research-technology-advanced-shuttle-weapon - icon: + icon: sprite: Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi state: icon discipline: Arsenal diff --git a/Resources/migration.yml b/Resources/migration.yml index c29bd19dd26..c2c13240c22 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -363,9 +363,13 @@ Observationskit: null CrateBaseWeldable: CrateGenericSteel # 2024-09-03 Backmen -WeaponRifleLecterRubber: WeaponRifleM28Rubber +WeaponRifleLecterRubber: WeaponRifleFamas WeaponTaser: WeaponDominatorNT +# 2024-03-11 +WeaponLauncherRocket: WeaponLauncherRL5 + + # 2024-03-7 AirlockExternalEasyPry: AirlockExternal AirlockExternalGlassEasyPry: AirlockExternalGlass