Пушка пиратикам

Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl

@@ -207,3 +207,5 @@ uplink-pirate-greengrenade-name = Зелёная граната
 uplink-pirate-greengrenade-desc = Граната с отвратным газом, от которой в голове становится мутно.
 uplink-pirate-graygrenade-name = Серая граната
 uplink-pirate-graygrenade-desc = Тяжёлая граната, словно пушечное ядро в руке.
+uplink-pirate-shuttle-cannon-pirate-flatpack-name = Упаковка пушки пиратского карабля
+uplink-pirate-shuttle-cannon-pirate-flatpack-desc = Кабум! Новая пушка на ваш корабль! Ну разве не здорово?

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/flatpack.ftl

@@ -26,3 +26,5 @@ ent-SpaceHeaterFlatpack = упаковка термостата
     .desc = Универсально-сборная упаковка, используемая для сборки термостата.
 ent-FaxMachineFlatpack = упаковка факса
     .desc = Универсально-сборная упаковка, используемая для сборки факса.
+ent-ShuttleGunPirateCannonFlatpack = упаковка пушки пиратского корабля
+    .desc = Упакованная пушка пиратского коробля.

Resources/Prototypes/Entities/Objects/Devices/flatpack.yml

@@ -215,4 +215,16 @@
     layers:
     - state: fax-machine
   - type: Flatpack
-    entity: FaxMachineBase
+    entity: FaxMachineBase
+
+- type: entity # Corvax-Frontier
+  parent: BaseFlatpack
+  id: ShuttleGunPirateCannonFlatpack
+  name: pirate shuttle gun flatpack
+  description: This is a packaged pirate ship cannon.
+  components:
+  - type: Sprite
+    layers:
+    - state: pirate-gun
+  - type: Flatpack
+    entity: ShuttleGunPirateCannon

Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml

@@ -399,3 +399,19 @@
       whitelist:
         tags:
           - PirateUplink
+
+- type: listing # Corvax-Frontier
+  id: UplinkShuttleGunPirateCannonFlatpack
+  name:  uplink-pirate-shuttle-cannon-pirate-flatpack-name
+  description: uplink-pirate-shuttle-cannon-pirate-flatpack-desc
+  productEntity: ShuttleGunPirateCannonFlatpack
+  icon: { sprite: Objects/Devices/flatpack.rsi, state: pirate-gun }
+  cost:
+    Doubloon: 10
+  categories:
+    - UplinkPirateWeapons
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - PirateUplink

Resources/Textures/Objects/Devices/flatpack.rsi/meta.json

@@ -1,50 +1,53 @@
 {
-    "version": 1,
-    "license": "CC0-1.0",
-    "copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas. fax-machine made by moomoobeef",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "base"
-        },
-        {
-            "name": "overlay"
-        },
-        {
-            "name": "icon-default"
-        },
-        {
-            "name": "solar-assembly-part"
-        },
-        {
-            "name": "ame-part"
-        },
-        {
-            "name": "singularity-generator"
-        },
-        {
-            "name": "tesla-generator"
-        },
-        {
-            "name": "radiation-collector"
-        },
-        {
-            "name": "tesla-coil"
-        },
-        {
-            "name": "grounding-rod"
-        },
-        {
-            "name": "containment-field-generator"
-        },
-		{
-            "name": "emitter"
-        },
-        {
-            "name": "fax-machine"
-        }
-    ]
-}
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas. fax-machine made by moomoobeef",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "overlay"
+    },
+    {
+      "name": "icon-default"
+    },
+    {
+      "name": "solar-assembly-part"
+    },
+    {
+      "name": "ame-part"
+    },
+    {
+      "name": "singularity-generator"
+    },
+    {
+      "name": "tesla-generator"
+    },
+    {
+      "name": "radiation-collector"
+    },
+    {
+      "name": "tesla-coil"
+    },
+    {
+      "name": "grounding-rod"
+    },
+    {
+      "name": "containment-field-generator"
+    },
+    {
+      "name": "emitter"
+    },
+    {
+      "name": "fax-machine"
+    },
+    {
+      "name": "pirate-gun"
+    }
+  ]
+}