Added disabler SMG! (#23051)

* Added disabler SMG!

* Changed a few errors

* errors.. again

* Update battery_guns.yml

* Update security.yml

* Update lathe.yml

* Update security.yml

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 3c4dc98543f173bea988b295ede110f4c0dffda0..5522dc8dd55904d4eb8056292d228c76163d60f2 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -377,6 +377,42 @@
       guides:
       - Security
 
+- type: entity
+  name: disabler SMG
+  parent: BaseWeaponBattery
+  id: WeaponDisablerSMG
+  description: Advanced weapon that exhausts organic targets, weakening them until they collapse.
+  components:
+  - type: Item
+    size: Large
+  - type: Tag
+    tags:
+      - Taser
+      - Sidearm
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Battery/disabler_smg.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-unshaded-0
+        map: ["enum.GunVisualLayers.MagUnshaded"]
+        shader: unshaded
+  - type: Gun
+    selectedMode: FullAuto
+    fireRate: 4
+    availableModes:
+      - SemiAuto
+      - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletDisablerSmg
+    fireCost: 33
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
+
 - type: entity
   name: practice disabler
   parent: WeaponDisabler

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index d5bca926b9995e39c15dc8aa91d42c7dee34a1dd..29f10f38fee1d3ca7226fe4f68e2e9252863ab12 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -796,3 +796,46 @@
             - Impassable
             - HighImpassable
     - type: GrapplingProjectile
+
+- type: entity
+  name : disabler bolt smg
+  id: BulletDisablerSmg
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: Reflective
+    reflective:
+    - Energy
+  - type: FlyBySound
+    sound:
+      collection: EnergyMiss
+      params:
+        volume: 5
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
+    layers:
+    - state: omnilaser
+      shader: unshaded
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.15,-0.3,0.15,0.3"
+        hard: false
+        mask:
+        - Impassable
+        - BulletImpassable
+      fly-by: *flybyfixture
+  - type: Ammo
+  - type: StaminaDamageOnCollide
+    damage: 15
+  - type: Projectile
+    impactEffect: BulletImpactEffectDisabler
+    damage:
+      types:
+        Heat: 2
+    soundHit:
+      path: "/Audio/Weapons/tap.ogg"
+    soundForce: true

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index d7c5b12477c6ef018966a5b0b3dd67589d6ba263..20008c6a97144ea67614a5c7d1b86f06b45d7611 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -611,7 +611,9 @@
       - TimerTrigger
       - Truncheon
       - VoiceTrigger
+      - WeaponDisablerPractice
       - WeaponAdvancedLaser
+      - WeaponDisablerSMG
       - WeaponLaserCannon
       - WeaponLaserCarbine
       - WeaponXrayCannon

diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index ade8bd9ebf7e32d5f6f4654e6076b4288d8e8bfd..7d5b020cb4a03e92c255e070b86e50731ebd99b4 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -535,3 +535,12 @@
   materials:
     Plastic: 950
     Uranium: 95
+    
+- type: latheRecipe
+  id: WeaponDisablerSMG
+  result: WeaponDisablerSMG
+  completetime: 6
+  materials:
+    Steel: 1000
+    Glass: 500
+    Plastic: 500

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 670472a6a8be5d817e3cd6c9588603c0dd5f18b0..b32ecae6a3427c2f15763e6bd602e3f1443d6973 100644 (file)
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -147,6 +147,7 @@
   - Truncheon
   - TelescopicShield
   - HoloprojectorSecurity
+  - WeaponDisablerSMG
 
 # Tier 3
 

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/base.png
new file mode 100644 (file)
index 0000000..c50bf18
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/base.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-left-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-left-0.png
new file mode 100644 (file)
index 0000000..ba7a9ff
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-left-0.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-left-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-left-1.png
new file mode 100644 (file)
index 0000000..7885177
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-left-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-left-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-left-2.png
new file mode 100644 (file)
index 0000000..8b34b27
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-left-2.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-left-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-left-3.png
new file mode 100644 (file)
index 0000000..ebd1879
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-left-3.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-left-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-left-4.png
new file mode 100644 (file)
index 0000000..561c5eb
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-left-4.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..561c5eb
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-right-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-right-0.png
new file mode 100644 (file)
index 0000000..91de8ce
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-right-0.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-right-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-right-1.png
new file mode 100644 (file)
index 0000000..75780ae
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-right-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-right-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-right-2.png
new file mode 100644 (file)
index 0000000..f77a6b6
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-right-2.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-right-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-right-3.png
new file mode 100644 (file)
index 0000000..262620a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-right-3.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-right-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-right-4.png
new file mode 100644 (file)
index 0000000..e53f4d7
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-right-4.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..e53f4d7
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-0.png
new file mode 100644 (file)
index 0000000..99d7e73
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-0.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-1.png
new file mode 100644 (file)
index 0000000..be58210
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-2.png
new file mode 100644 (file)
index 0000000..91cf214
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-2.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-3.png
new file mode 100644 (file)
index 0000000..c8fc471
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-3.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-4.png
new file mode 100644 (file)
index 0000000..115e288
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-4.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/meta.json
new file mode 100644 (file)
index 0000000..6322804
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/meta.json
@@ -0,0 +1,73 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/26818af618762ff52319b3417be8cdc1279e99b7/icons/obj/weapons/guns/energy.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-0",
+            "delays": [
+                [
+                    0.4,
+                    0.4
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-0"
+        },
+        {
+            "name": "inhand-left-1"
+        },
+        {
+            "name": "inhand-left-2"
+        },
+        {
+            "name": "inhand-left-3"
+        },
+        {
+            "name": "inhand-left-4"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-0"
+        },
+        {
+            "name": "inhand-right-1"
+        },
+        {
+            "name": "inhand-right-2"
+        },
+        {
+            "name": "inhand-right-3"
+        },
+        {
+            "name": "inhand-right-4"
+        }
+    ]
+}