From 7d30b5ae63c99d10394dac4841d20dc99465946d Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Sat, 6 Jan 2024 10:18:35 +0300
Subject: [PATCH] Tesla Gun (#23175)

* add content

* u cant pickup lightning

* -5 heat damage

* Update battery_guns.yml
---
 .../EntitySystem/LightningArcShooterSystem.cs |   2 +-
 .../Weapons/Guns/Battery/battery_guns.yml     |  29 ++++++++++++
 .../Weapons/Guns/Projectiles/projectiles.yml  |  33 ++++++++++++++
 .../Prototypes/Procedural/salvage_loot.yml    |   3 ++
 .../Guns/Battery/tesla_gun.rsi/base.png       | Bin 0 -> 569 bytes
 .../Battery/tesla_gun.rsi/inhand-left.png     | Bin 0 -> 666 bytes
 .../Battery/tesla_gun.rsi/inhand-right.png    | Bin 0 -> 660 bytes
 .../Battery/tesla_gun.rsi/mag-unshaded-0.png  | Bin 0 -> 139 bytes
 .../Battery/tesla_gun.rsi/mag-unshaded-1.png  | Bin 0 -> 205 bytes
 .../Battery/tesla_gun.rsi/mag-unshaded-2.png  | Bin 0 -> 202 bytes
 .../Battery/tesla_gun.rsi/mag-unshaded-3.png  | Bin 0 -> 196 bytes
 .../Battery/tesla_gun.rsi/mag-unshaded-4.png  | Bin 0 -> 199 bytes
 .../Guns/Battery/tesla_gun.rsi/meta.json      |  43 ++++++++++++++++++
 13 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/base.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/mag-unshaded-0.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/mag-unshaded-1.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/mag-unshaded-2.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/mag-unshaded-3.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/mag-unshaded-4.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/meta.json

diff --git a/Content.Server/Tesla/EntitySystem/LightningArcShooterSystem.cs b/Content.Server/Tesla/EntitySystem/LightningArcShooterSystem.cs
index 80cfab7035..e901a93288 100644
--- a/Content.Server/Tesla/EntitySystem/LightningArcShooterSystem.cs
+++ b/Content.Server/Tesla/EntitySystem/LightningArcShooterSystem.cs
@@ -23,7 +23,7 @@ public sealed class LightningArcShooterSystem : EntitySystem
 
     private void OnShooterMapInit(EntityUid uid, LightningArcShooterComponent component, ref MapInitEvent args)
     {
-        component.NextShootTime = _gameTiming.CurTime;
+        component.NextShootTime = _gameTiming.CurTime + TimeSpan.FromSeconds(component.ShootMaxInterval);
     }
 
     private void OnShooterUnpaused(EntityUid uid, LightningArcShooterComponent component, ref EntityUnpausedEvent args)
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 445abaf2a1..49c79bb8fc 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -168,6 +168,35 @@
     maxCharge: 500
     startingCharge: 500
 
+- type: entity
+  name: tesla gun
+  parent: BaseWeaponBattery
+  id: WeaponTeslaGun
+  description: The power of the primordial element of lightning in your hands.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Battery/tesla_gun.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-unshaded-4
+        map: ["enum.GunVisualLayers.MagUnshaded"]
+        shader: unshaded
+  - type: Gun
+    projectileSpeed: 10
+    soundGunshot:
+      path: /Audio/Effects/Lightning/lightningshock.ogg
+      params:
+        variation: 0.2
+  - type: ProjectileBatteryAmmoProvider
+    proto: TeslaGunBullet
+    fireCost: 300
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
+  - type: Appearance
+
 - type: entity
   name: laser rifle
   parent: BaseWeaponBattery
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 29f10f38fe..9ea27c6cbc 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -839,3 +839,36 @@
     soundHit:
       path: "/Audio/Weapons/tap.ogg"
     soundForce: true
+
+- type: entity
+  name: tesla gun lightning
+  id: TeslaGunBullet
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: TimedDespawn
+    lifetime: 5
+  - type: Sprite
+    sprite: Structures/Power/Generation/Tesla/energy_miniball.rsi
+    layers:
+    - state: tesla_projectile
+      shader: unshaded
+  - type: StaminaDamageOnCollide
+    damage: 15
+  - type: EmbeddableProjectile
+  - type: Projectile
+    deleteOnCollide: false
+    soundHit:
+      path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg
+  - type: LightningArcShooter
+    arcDepth: 1
+    maxLightningArc: 3
+    shootMinInterval: 2.5
+    shootMaxInterval: 4.5
+    shootRange: 5
+    lightningPrototype: Lightning
+  - type: Electrified
+    requirePower: false
+  - type: Tag
+    tags:
+      - HideContextMenu
diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml
index 5456603ef9..175e9ea9a3 100644
--- a/Resources/Prototypes/Procedural/salvage_loot.yml
+++ b/Resources/Prototypes/Procedural/salvage_loot.yml
@@ -110,6 +110,9 @@
         - proto: WaterTankHighCapacity
         - proto: WeldingFuelTankHighCapacity
           cost: 3
+        - proto: WeaponTeslaGun
+          prob: 0.1
+          cost: 2
 
 # Mob loot table
 
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..874ad2ea23c9bd2f5dba5a2d0262e92d83a97f93
GIT binary patch
literal 569
zcmV-90>=G`P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<S>q$gGRCt{2l)p;?VI0Q4g3zG5(&8Wv;c!D+A=KoM1c6%+Vt+tj
zKMq`?2IDG(rlv%KHiw1=ZPCT4$st0-!A<`Fx4`cE()04(dnZ`Yx!eQCbKd*)eLmm!
z-h0EHPKTDMFfCaDKmZT`1OPt<xUueLxIZ<ILg%&CY+mg}F&p|7fEqHHOehwMNsq_l
zj=Iao8ns(p+Rkpe{5ZQayRBA2T*t8Rxd2>%phBTQ!{Lwyg8`*dDd~+yL(~Gw4iUd!
zs^oIRFvOghOvd3VL|6?UO{YZBsF)byP}NP-q<XzBYWSWZp=2^i&1RE&y`BhXXHbS`
z!B0wMu`&_>;h*U>O7HGb|EfZkWr+Y?2+!y9qDB`#XK^@QAsT`sTmtYw!X_QPe^B4P
z5|IdzeR&076?jbT60eS55x@bVj<dT~020B9u<6F*vGA4JJw0!cBRp3sQ~R|`x&1@w
zmQ|6Rav1-YgW;|fK%rN+j^$h5pw;i^48`Kz{`T}>`<Zm!fC$0ds;l$M6~F)&apyXK
zK8{YV4~k+}tFDKrFnWWoa{#2g#OP9`SHpP>pOo&4$_2n*1i}%7uDuSDziOeQ*lX$j
z1%NxmuGe>~F97NZ=$9M->gVW3_bvcGgXaSHtpFeZSUSKLo<dWZXWrLh00000NkvXX
Hu0mjfMgImQ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..03054122c1dc673c5ef582939dec29a0c849d395
GIT binary patch
literal 666
zcmV;L0%iS)P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%R7pfZRCt{2+P`bmU>FDR?}?k;G9;Tgxd<<WxTHhy77205ECi&Jt3x3UQaaSB
z{SUfGJ9oKKZn@)zc4;ZR;7})VOE^L&=hxxPnbh-=GkK$@-_LT8pYQYJy*Gj90f>l*
zh=_=Yh^RToc9mnh>Q9fOj{7<;YMLf2%K`v(b$!v(agVm#({a($vy)zuBoIQtv0ddw
z@k+D7i{jD@TBjLR68NFoIU1<R^tN^qyeL+a>8;v18kCM-yCgWatF~UfR*vn~PC_yG
z{QR!Q+p1#lb(63t_~Ngwv1(ZZ06<EK7jND|N(mtZ1_yf>56`hNy;*qt#`Ff`;W-8e
zdk{jD&euun3LW^Ndirv!6chj~dNbrtxfuNA@gYvnPPC3u`zxxL1OUjg42EHplHk~`
z%C`gPEO?-U1OT%Dg%B8xMlcLx{*<q-FM9btDJ8NjL%-jj@9Sc0oqeP{diYowh5^$w
zk*4WSGa%odWf?wy`Se$RJpH!74}ZC$JGQF=KU~k(9uW}{5fKp)5fS~rx-4S0aj(|<
z1G?%B$m<D7k~F%GmH`HSs4UBZloAh~c$j>6-`ah=C{|xTPLK!Rw0fkaLnKX80J9R;
zv*(+52dFlZ;6<_8-QUJ|xQWZ-!})!h&{iF`ENfm7-re8Es$C*?{Rn<mLH_<XYpnGI
z6l;COvUrmu+zq~X{ichcmKm^WZ$K5Dy#v}-=~a3Is_5(;=&V5kSlk;>MR)Ij_A>Oc
z-hjI2>g*lpqz=EVH=xQt(>t)NH=qi82Z*%!2GXmiG80k{;s5{u07*qoM6N<$f)IN<
A!~g&Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..8eae981c9f610aec46bdeee7f6b4a16ac4a61a83
GIT binary patch
literal 660
zcmV;F0&D$=P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%PDw;TRCt{2+P`btKoke?uS>RO(;#i7Q<s83sEaa)dMU<TJQoBdQ`Zg#WeCAT
zIywJAmXgd}TuK%P56O}cIOvc}rJIF0GIhQT>8bLM%1ZRZmHYin2Fvojr+25}J%EUa
zh=_=Yh=``Sj;CD5Q>$J_S)QbQ={laWZ5yU(R<)kWElhwPgh~fL9*^<$+m}Yw3wx~D
zigg`N`9YYyg8d*=qsgt>I~u5Vt5d7eU$kBKjs|Kpxy_b@Wbm%zsqOb4YQ6vU`qPrI
zp+ERRsCxY_PEXD-IM|16+Ymy)wrv1VmsjVt+6Kw>4-WPL?4Z~0Vi!=O&!6I0;xk}#
zay=LP+mAaCLaZc+yprqJNjN<@!{+3A>bf`+y3~`wUmPFS>HwV8ZgteFciU4B6#$ae
z+yL%_mr}wo3;<Y*;I(8D06@p7lh8=+7bzv0%_f8psMDTbM#nfD4q+HZTn(33=Z&}m
zOw&XZMUYbB$IqL!30`~t?1eH613J#R2kbgt?cVzj)oyia{aPm?A|fIpA|fK96{~V~
zpsfGeSboXhnWhQLvVf9%hsjob(Q+@k-RdaIvLJ-O)0aMyjmNzFAXLA;k5J~ELaqt`
zfGCOp+_%$SzuB7WzCPBUZuJ%}jt}GiDO&1?Ojed<#ogClzl#S=WGpb-s{g&sN|7r8
zi~8_+laMy2P{tvcy8^QI;j^lGPN9%PB}*SZtE%S|3cKmDK71Cdm{Tb9#%X={tiP>#
uPNDFdFYUvpSerS8Jbn28VNQYQA94pxC7mgNs!3Y_0000<MNUMnLSTaX%RBA>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/mag-unshaded-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..f17c98d680d4f66d332df9b1d1ccdae1bdb82b47
GIT binary patch
literal 139
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a$G%K978f1
z-(GSQJmA2=d|*%3ih1XR&%J7kdf_8)b0bthNQi-<;jPw7uPUqK9bUgYcNM?YOMLq=
l-lzWf&dbLgfJS_{&duT{!g?fvHxI~T@O1TaS?83{1OOOGE{OmD

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/mag-unshaded-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..b90deab11e0d55d8d82cabb55b97bb3e98245b72
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C|K|5
z;uumf=k4W<oDBv7tQX`tnp%Y;XE^2<x9@0gj+ocF*rGW>SlH3qkt43_|7>r;9mfmP
zU0G&r4B%sA5pZB&Ol2&4?zC!a$4}V_v$k(ETVZhgdwd7`1gUk`S@`C1-s#wW{_X>(
z{fu>|*#B&4IjwO_IseoyCMFJr1_maM3nw_^D`dJJtUE6WbP9u~tDnm{r-UW|I|W7F

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/mag-unshaded-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..60ab1cca16466dcc7afd9e3d17f1e93026ddf9bf
GIT binary patch
literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C|Kj^
z;uumf=k4W<oDBv7tQX`x)W!4`CQB6XwV&i-R4-r@7dU4)=aAr{%r&A;dPo2JuKV5p
zILVb|*2VxnMiv1F2F6mxbytsmDcd~bQA3E`SBKjSw~ePe?P&<vk)8Lz`(wqf7h(t6
wYYxP_SMVg&I9$8(m77DMfq{ub!9m%4S(fykiQ8jd0Nugh>FVdQ&MBb@06lv|dH?_b

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/mag-unshaded-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e3dd971157a64f06cfbb87f7b8266d7dfe61f4e
GIT binary patch
literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C|Ks{
z;uumf=k4W<yayC`SPr-^Y85r|=&G2q#_6z=&V!ywq7e-pYNbkwJ|FMz_%k`RI<z&_
zrpK9qkww7aKvYB2(yx+>cfD+g(_?C3n4**`_K5Y1Q|Mvd8cjR1%-@_(O!$7h=2#yc
o>nAa5>%ImCCJqH4q4S9$OJC~1ixr<f16{!2>FVdQ&MBb@06wWf@Bjb+

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/mag-unshaded-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..9918cff25c82deb6fb65cca94d04d4261d101de3
GIT binary patch
literal 199
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C|K#~
z;uumf=k4W<ybT6CEC>2UE*@miX<mLp<4dM72dk(M_l&6#3KQC-mS`;dk^ktO|Fp-U
zqSHPa@G-IoI505&XIc_mRQcR7w%9>ap7q7A>U*l&oopI{W?U&?&hNVJ`AO}7&}&9}
r*+h#gtsSd=Ue{M>U|`|^65TOolchI?WM9|<bOeK^tDnm{r-UW|w<|(>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/meta.json
new file mode 100644
index 0000000000..c591453e1c
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "taken from TGStation on commit https://github.com/tgstation/tgstation/commit/26818af618762ff52319b3417be8cdc1279e99b7",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+          "name": "mag-unshaded-0",
+          "delays": [
+            [
+              0.3,
+              0.3
+            ]
+          ]
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        }
+    ]
+}
\ No newline at end of file
-- 
2.51.2