diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index a51d8a2af1..d48852823d 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -228,8 +228,9 @@ uplink-c20r-bundle-desc = Old faithful: The classic C-20r Submachine Gun, bundle uplink-buldog-bundle-name = Bulldog Bundle uplink-buldog-bundle-desc = Lean and mean: Contains the popular Bulldog Shotgun, a 12g beanbag drum and three 12g buckshot drums. -uplink-grenade-launcher-bundle-name = China-Lake Bundle -uplink-grenade-launcher-bundle-desc = An old China-Lake grenade launcher bundled with 11 rounds of various destruction capability. +# WD EDIT +uplink-grenade-launcher-bundle-name = Krait Bundle +uplink-grenade-launcher-bundle-desc = An old Krait grenade launcher bundled with 11 rounds of various destruction capability. uplink-l6-saw-bundle-name = L6 Saw Bundle uplink-l6-saw-bundle-desc = More dakka: The iconic L6 light machine gun, bundled with 2 box magazines. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl index 082710db4a..a4956f9ad1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl @@ -10,8 +10,8 @@ ent-ClothingBackpackDuffelSyndicateFilledRevolver = набор "Питон" .desc = Выступите громко и гордо с заряженным Магнум Питон и двумя спидлоадерами. ent-ClothingBackpackDuffelSyndicateFilledLMG = набор "L6 Saw" .desc = Еще больше дакки: культовый лёгкий пулемет L6 в комплекте с 2 коробами патронов. -ent-ClothingBackpackDuffelSyndicateFilledGrenadeLauncher = набор "China-Lake" - .desc = Старый гранатомет China-Lake, снабженный 11 гранатами различной поражающей способности. +ent-ClothingBackpackDuffelSyndicateFilledGrenadeLauncher = набор "Крайт" + .desc = Старый гранатомет Крайт, снабженный 11 гранатами различной поражающей способности. ent-ClothingBackpackDuffelSyndicateFilledCarbine = набор "М-90gl" .desc = Универсальная боевая винтовка с подствольным гранатометом, в комплекте с 3 магазинами и 6 гранатами различной мощности. ent-ClothingBackpackDuffelSyndicateAmmoFilled = набор боеприпасов diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/launchers/shinano.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/launchers/launchers.ftl similarity index 51% rename from Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/launchers/shinano.ftl rename to Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/launchers/launchers.ftl index ff1e63ee15..e86cd290c5 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/launchers/shinano.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/launchers/launchers.ftl @@ -1,2 +1,5 @@ ent-WeaponLauncherShinano = Синано - .desc = Однозарядный гранатомёт, которым снаряжаются колониальные полиции, охранные подразделения и наёмники везде, где есть влияние Нанотрейзен. Печально известен среди пикетирующих и революционеров, так как БЛУП - это первое, что они слышут, перед тем как начинается насилие. \ No newline at end of file + .desc = Однозарядный гранатомёт, которым снаряжаются колониальные полиции, охранные подразделения и наёмники везде, где есть влияние Нанотрейзен. Печально известен среди пикетирующих и революционеров, так как БЛУП - это первое, что они слышут, перед тем как начинается насилие. + +ent-WeaponLauncherKrait = Крайт + .desc = Лёгкий штурмовой трёхзарядный гранатомёт, который в прошлом был на вооружении многих наёмнических отрядов. Неизвестным образом, большие партии этого оружия оказались в руках Синдиката. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl index 4c35d521d9..d04c337310 100644 --- a/Resources/Locale/ru-RU/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/store/uplink-catalog.ftl @@ -239,8 +239,9 @@ uplink-c20r-bundle-desc = Старый добрый: классический п uplink-buldog-bundle-name = Набор Бульдога uplink-buldog-bundle-desc = Простое и эффективное: Содержит популярное ружье дробовик Бульдог, барабан дроби 12g и 3 барабана с картечью 12g. -uplink-grenade-launcher-bundle-name = Набор China Lake -uplink-grenade-launcher-bundle-desc = Старый гранатомет China Lake в комплекте с 11 снарядами различной разрушительной силы. +# WD EDIT +uplink-grenade-launcher-bundle-name = Набор Крайта +uplink-grenade-launcher-bundle-desc = Старый гранатомет Крайт в комплекте с 11 снарядами различной разрушительной силы. uplink-l6-saw-bundle-name = Набор L6 Saw uplink-l6-saw-bundle-desc = Еще имба: культовый ручной пулемет L6 в комплекте с 2 коробчатыми магазинами. diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index a91c3b2644..1b341ba8ef 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -97,15 +97,16 @@ - id: WeaponLightMachineGunL6 - id: MagazineLightRifleBox +# WD EDIT - type: entity parent: ClothingBackpackDuffelSyndicateBundle id: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher - name: China-Lake bundle - description: "An old China-Lake grenade launcher bundled with 11 rounds of various destruction capability." + name: Krait Bundle + description: "An old Krait grenade launcher bundled with 11 rounds of various destruction capability." components: - type: StorageFill contents: - - id: WeaponLauncherChinaLake + - id: WeaponLauncherKrait - id: GrenadeBlast amount: 4 - id: GrenadeFrag diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index af227990a0..beaa38cbcd 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -172,7 +172,7 @@ id: UplinkGrenadeLauncherBundle name: uplink-grenade-launcher-bundle-name description: uplink-grenade-launcher-bundle-desc - icon: { sprite: /Textures/White/Objects/Weapons/Guns/Launchers/china_lake-icons.rsi, state: icon } + icon: { sprite: /Textures/White/Objects/Weapons/Guns/Launchers/krait-icons.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher cost: Telecrystal: 25 diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/krait.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/krait.yml new file mode 100644 index 0000000000..1c7008e138 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/krait.yml @@ -0,0 +1,35 @@ +- type: entity + name: Krait + parent: BaseWeaponLauncher + id: WeaponLauncherKrait + description: A light assault three-shot grenade launcher, which in the past was in service with many mercenary units. In an unknown way, large quantities of these weapons ended up in the hands of the Syndicate. + components: + - type: Sprite + sprite: White/Objects/Weapons/Guns/Launchers/krait-icons.rsi + layers: + - state: icon + map: ["enum.GunVisualLayers.Base"] + - type: Item + sprite: White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi + - type: Clothing + sprite: White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi + slots: + - Back + - suitStorage + - type: AmmoCounter + - type: Gun + fireRate: 1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + - type: BallisticAmmoProvider + whitelist: + tags: + - Grenade + capacity: 3 + proto: GrenadeFrag + soundInsert: + path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + autoCycle: false \ No newline at end of file diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/shinano.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/shinano.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/shinano.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/shinano.yml diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-icons.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-icons.rsi/bolt-open.png new file mode 100644 index 0000000000..6c90341460 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-icons.rsi/bolt-open.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-icons.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-icons.rsi/icon.png new file mode 100644 index 0000000000..f2dcc7807e Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-icons.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-icons.rsi/meta.json new file mode 100644 index 0000000000..45c099c298 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-icons.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", + "size": { + "x": 48, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..d64db44fc6 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..d64db44fc6 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000..a01e84dea9 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000..8e223cc9f9 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/meta.json new file mode 100644 index 0000000000..fddba126c7 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +}