Merge branch 'arumoon-server' of https://github.com/Tenteratus/space-…

…station-14 into arumoon-server

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl

@@ -55,3 +55,6 @@ ent-WeaponPistolCHIMPUpgraded = experimental C.H.I.M.P. handcannon
 ent-WeaponBehonkerLaser = Eye of a behonker
     .desc = The eye of a behonker, it fires a laser when squeezed.
     .suffix = { "" }
+ent-WeaponEmitterGun = emitter gun
+    .desc = A homemade emitter cannon, powerful, but the charging is poor.
+    .suffix = { "" }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl

@@ -64,3 +64,6 @@ ent-WeaponCutter = ионный резак
 ent-WeaponCutterAdv = улучшенный ионный резак
     .desc = Инструмент шахтеров, предназначенный для расчистки горных пород. Обладает усовершенствованной батареей и усиленной концентрирующей линзой.
     .suffix = { "" }
+ent-WeaponEmitterGun = эмиттерная пушка
+    .desc = Самодельная эммитерная пушка, мощная, но скорость зарядки оставляет желать лучшего.
+    .suffix = { "" }

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml

@@ -808,6 +808,10 @@
       materialRequirements:
         CableHV: 5
         Glass: 2
+    - type: Tag
+      tags:
+        - DroneUsable
+        - EmitterCircuitBoard
 
 - type: entity
   id: SurveillanceCameraRouterCircuitboard

Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -584,3 +584,29 @@
       proto: BulletCutterAdv
       fireCost: 100
     - type: Appearance
+
+- type: entity
+  name: Emitter Gun
+  id: WeaponEmitterGun
+  parent: BaseWeaponBattery
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Battery/emitter_gun.rsi
+    state: emittercannon
+  - type: Item
+    size: 30
+  - type: AmmoCounter
+  - type: Gun
+    fireRate: 0.5
+    soundGunshot:
+      path: /Audio/Weapons/Guns/emitter.ogg
+    zeroVisible: false
+  - type: Appearance
+  - type: StaticPrice
+    price: 500
+  - type: ProjectileBatteryAmmoProvider
+    proto: EmitterBoltGun
+    fireCost: 200
+  - type: Construction
+    graph: EmitterGun
+    node: emittergunnode

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -807,3 +807,15 @@
     lifetime: 0.4
   - type: StaminaDamageOnCollide
     damage: 65
+
+- type: entity
+  name: emitter bolt
+  id: EmitterBoltGun
+  parent: EmitterBolt
+  noSpawn: true
+  components:
+  - type: Projectile
+#   soundHit:  Waiting on serv3
+    damage:
+      types:
+        Heat: 30

Resources/Prototypes/Recipes/Crafting/Graphs/improvised/emitter_gun.yml

@@ -0,0 +1,39 @@
+#In its own file and not improvised-shotgun.yml in case anyone ever wants to add more guns that use it.
+- type: constructionGraph
+  id: EmitterGun
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: emittergunnode
+      steps:
+      - tag: Pipe
+        icon:
+          sprite: Structures/Piping/Atmospherics/pipe.rsi
+          state: pipeStraight
+        name: pipe
+      - tag: CapacitorStockPart
+        icon:
+          sprite: Objects/Misc/stock_parts.rsi
+          state: capacitor
+        name: capacitor
+      - tag: PowerCellSmall
+        icon:
+          sprite: Objects/Power/power_cells.rsi
+          state: small
+        name: power cell small
+      - tag: PowerCellSmall
+        icon:
+          sprite: Objects/Power/power_cells.rsi
+          state: small
+        name: power cell small
+      - tag: EmitterCircuitBoard
+        icon:
+          sprite: Objects/Misc/module.rsi
+          state: engineering
+        name: emitter circuit board
+      - material: Plasteel
+        amount: 10
+        doAfter: 10
+  - node: emittergunnode
+    entity: WeaponEmitterGun

Resources/Prototypes/Recipes/Crafting/improvised.yml

@@ -162,3 +162,16 @@
   icon:
     sprite: Objects/Misc/rifle_stock.rsi
     state: icon
+
+- type: construction
+  name: emitter gun
+  id: emittergun
+  graph: EmitterGun
+  startNode: start
+  targetNode: emittergunnode
+  category: construction-category-weapons
+  objectType: Item
+  description: A gun that used to be a simple emitter.
+  icon:
+    sprite: Objects/Weapons/Guns/Battery/emitter_gun.rsi
+    state: emittercannon

Resources/Prototypes/tags.yml

@@ -1053,3 +1053,6 @@
 - type: Tag
   id: ModularReceiver
 
+- type: Tag
+  id: EmitterCircuitBoard
+

Resources/Textures/Objects/Weapons/Guns/Battery/emitter_gun.rsi/meta.json

@@ -0,0 +1,34 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "emittercannon",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "emittercannon_charge"
+    },
+    {
+      "name": "emittercannon_empty"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}