diff --git a/Resources/Changelog/ChangelogHonk.yml b/Resources/Changelog/ChangelogHonk.yml index 66246a428c..934e4c725e 100644 --- a/Resources/Changelog/ChangelogHonk.yml +++ b/Resources/Changelog/ChangelogHonk.yml @@ -99,3 +99,9 @@ type: Tweak id: 15 time: '2024-11-20T18:00:13.0000000+00:00' +- author: BIG_Zi_348 + changes: + - message: "Добавлен Ручной Пулемёт Калашникова. Доступен для покупки в карго." + type: Add + id: 16 + time: '2024-11-21T18:00:13.0000000+00:00' diff --git a/Resources/Locale/ru-RU/_honk/klmg.ftl b/Resources/Locale/ru-RU/_honk/klmg.ftl new file mode 100644 index 0000000000..2abf366dea --- /dev/null +++ b/Resources/Locale/ru-RU/_honk/klmg.ftl @@ -0,0 +1,5 @@ +ent-WeaponKalashnikovLightMachineGun = РПК + .desc = Ручной Пулемёт Калашникова на столько же надёжен как и автомат. Использует патроны калибра .30 винтовочный. +ent-MagazineKalashLightRifleBox = короб патронов РПК (.30 винтовочные) +ent-CrateArmoryKLMG = ящик с РПК + .desc = Содержит комплект из одного РПК и двух коробов с патронами к нему. Чтобы открыть необходим уровень доступа Оружейная. diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml index 7259d71529..f680041740 100644 --- a/Resources/Prototypes/Procedural/salvage_rewards.yml +++ b/Resources/Prototypes/Procedural/salvage_rewards.yml @@ -64,6 +64,7 @@ CrateArmoryLaser: 1.0 CrateArmoryShotgun: 1.0 CrateArmoryPistols: 1.0 + CrateArmoryKLMG: 1.0 # HONK EDIT # rare armor ClothingOuterArmorRiot: 1.0 # rare chemicals diff --git a/Resources/Prototypes/_Honk/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/_Honk/Catalog/Cargo/cargo_armory.yml new file mode 100644 index 0000000000..c7ce5d4b2b --- /dev/null +++ b/Resources/Prototypes/_Honk/Catalog/Cargo/cargo_armory.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: ArmoryKLMG + icon: + sprite: _Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi + state: icon + product: CrateArmoryKLMG + cost: 10000 + category: cargoproduct-category-name-armory + group: market diff --git a/Resources/Prototypes/_Honk/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/_Honk/Catalog/Fills/Crates/armory.yml new file mode 100644 index 0000000000..97edabd79d --- /dev/null +++ b/Resources/Prototypes/_Honk/Catalog/Fills/Crates/armory.yml @@ -0,0 +1,12 @@ +- type: entity + id: CrateArmoryKLMG + parent: CrateWeaponSecure + name: KLMG crate + description: Contains a set of one KLMG and two boxes of ammo for it. Requires Armory access to open. + components: + - type: StorageFill + contents: + - id: WeaponKalashnikovLightMachineGun + amount: 1 + - id: MagazineKalashLightRifleBox + amount: 2 diff --git a/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml new file mode 100644 index 0000000000..e85ae624bb --- /dev/null +++ b/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -0,0 +1,110 @@ +- type: entity + name: Kalashnikov LMG + id: WeaponKalashnikovLightMachineGun + parent: BaseWeaponLightMachineGun + description: Kalashnikov Light Machine Gun is as reliable as the assault rifle. Uses .30 rifle ammo. + components: + - type: Sprite + sprite: _Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-4 + map: [ "enum.GunVisualLayers.Mag" ] + - state: barrel_module + visible: false + map: [ "enum.ModuleVisualState.BarrelModule" ] + - state: handguard_module + visible: false + map: [ "enum.ModuleVisualState.HandGuardModule" ] + - state: aim_module + visible: false + sprite: White/Objects/Weapons/modulesOnWeapon.rsi + map: [ "enum.ModuleVisualState.AimModule" ] + - type: Item + sprite: _Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi + size: Huge + - type: Clothing + sprite: _Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: WeaponModules + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineKalashLightRifleBox + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineKalashLightRifleBox + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifle + priority: 1 + whitelist: + tags: + - CartridgeLightRifle + handguard_module: + name: Handguard Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 2 + whitelist: + tags: + - BaseHandGuardModule + barrel_module: + name: Barrel Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseBarrelModule + aim_module: + name: Aim Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseAimModule + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + handguard_module: !type:ContainerSlot + barrel_module: !type:ContainerSlot + aim_module: !type:ContainerSlot + - type: PointLight + enabled: false + autoRot: true + - type: Gun + fireRate: 5 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/ak.ogg + +- type: entity + id: MagazineKalashLightRifleBox + name: "Kalashnikov LMG magazine box (.30 rifle)" + parent: BaseMagazineLightRifle + components: + - type: Tag + tags: + - MagazineKalashLightRifleBox + - type: BallisticAmmoProvider + proto: CartridgeLightRifle + capacity: 70 + - type: Item + - type: Sprite + sprite: White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi + - type: MagazineVisuals + magState: mag + steps: 6 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/_Honk/tags.yml b/Resources/Prototypes/_Honk/tags.yml index 46a0d634e8..6f3185242f 100644 --- a/Resources/Prototypes/_Honk/tags.yml +++ b/Resources/Prototypes/_Honk/tags.yml @@ -16,3 +16,5 @@ - type: Tag id: EnergyCellMakeshift +- type: Tag + id: MagazineKalashLightRifleBox diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/accelerator.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/accelerator.png new file mode 100644 index 0000000000..550bc84f88 Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/accelerator.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/barrel_module.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/barrel_module.png new file mode 100644 index 0000000000..c0c7b0f19e Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/barrel_module.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/base.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/base.png new file mode 100644 index 0000000000..8a17808976 Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/base.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/bolt-open.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/bolt-open.png new file mode 100644 index 0000000000..7337c78586 Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/bolt-open.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/flamehider.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/flamehider.png new file mode 100644 index 0000000000..3d6b2c83da Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/flamehider.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/handguard_module.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/handguard_module.png new file mode 100644 index 0000000000..b6877b66f6 Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/handguard_module.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/icon.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/icon.png new file mode 100644 index 0000000000..75dbe0c6bc Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/icon.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/laser.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/laser.png new file mode 100644 index 0000000000..b6877b66f6 Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/laser.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/light.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/light.png new file mode 100644 index 0000000000..2651285124 Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/light.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/mag-0.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/mag-0.png new file mode 100644 index 0000000000..a59e49acdb Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/mag-0.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/mag-1.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/mag-1.png new file mode 100644 index 0000000000..c62e708eaa Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/mag-1.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/mag-2.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/mag-2.png new file mode 100644 index 0000000000..571c0b7ca1 Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/mag-2.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/mag-3.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/mag-3.png new file mode 100644 index 0000000000..46521878df Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/mag-3.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/mag-4.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/mag-4.png new file mode 100644 index 0000000000..06c08a1083 Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/mag-4.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/meta.json b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/meta.json new file mode 100644 index 0000000000..42eaabd0ac --- /dev/null +++ b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi, edited by rikkatakanashi_tweworld", + "size": { + "x": 48, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "silencer" + }, + { + "name": "light" + }, + { + "name": "laser" + }, + { + "name": "flamehider" + }, + { + "name": "accelerator" + }, + { + "name": "barrel_module" + }, + { + "name": "handguard_module" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/silencer.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/silencer.png new file mode 100644 index 0000000000..c0c7b0f19e Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi/silencer.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/equipped-BACKPACK.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..8ef2d19238 Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..8ef2d19238 Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/inhand-left.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000..bb4feded4f Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/inhand-right.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000..32cf641e4c Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/meta.json b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/meta.json new file mode 100644 index 0000000000..e3ad2d04b9 --- /dev/null +++ b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi, edited by rikkatakanashi_tweworld", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/wielded-inhand-left.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..567cdea0fd Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/wielded-inhand-right.png b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..cc68dc0d3a Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Weapons/Guns/LMGs/klmg-inhands.rsi/wielded-inhand-right.png differ