From cef7d336f2dedb37f4cffb0e20055e5e389879f4 Mon Sep 17 00:00:00 2001
From: Ripmorld <60119809+UKNOWH@users.noreply.github.com>
Date: Wed, 20 Apr 2022 14:08:57 +0800
Subject: [PATCH] Flash payload (#7587)

---
 .../Catalog/Research/technologies.yml           |   1 +
 .../Entities/Objects/Devices/payload.yml        |  16 ++++++++++++++++
 .../Entities/Structures/Machines/lathe.yml      |   1 +
 Resources/Prototypes/Recipes/Lathes/devices.yml |  13 +++++++++++++
 .../Objects/Devices/payload.rsi/meta.json       |   5 +++++
 .../Devices/payload.rsi/payload-flash-armed.png | Bin 0 -> 1916 bytes
 6 files changed, 36 insertions(+)
 create mode 100644 Resources/Textures/Objects/Devices/payload.rsi/payload-flash-armed.png

diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml
index 83d7a601db..60c764eef5 100644
--- a/Resources/Prototypes/Catalog/Research/technologies.yml
+++ b/Resources/Prototypes/Catalog/Research/technologies.yml
@@ -152,6 +152,7 @@
     - Flash
     - Handcuffs
     - Stunbaton
+    - FlashPayload
 
 - type: technology
   name: "non-lethal technology"
diff --git a/Resources/Prototypes/Entities/Objects/Devices/payload.yml b/Resources/Prototypes/Entities/Objects/Devices/payload.yml
index 331924e5a2..86575c8563 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/payload.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/payload.yml
@@ -76,3 +76,19 @@
         enum.ChemicalPayloadFilledSlots.Left: payload-chemical-left
         enum.ChemicalPayloadFilledSlots.Right: payload-chemical-right
         enum.ChemicalPayloadFilledSlots.Both: payload-chemical-armed
+
+- type: entity
+  name: flash payload
+  parent: BasePayload
+  id: FlashPayload
+  description: A single-use flash payload.
+  components:
+    - type: Sprite
+      sprite: Objects/Devices/payload.rsi
+      state: payload-flash-armed
+    - type: DeleteOnTrigger
+    - type: FlashOnTrigger
+      range: 6
+    - type: EmitSoundOnTrigger
+      sound:
+        path: "/Audio/Effects/flash_bang.ogg"
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 25edf036d7..c290c2d87e 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -192,6 +192,7 @@
       - FlashlightLantern
       - TimerTrigger
       - ChemicalPayload
+      - FlashPayload
   - type: ActivatableUI
     key: enum.LatheUiKey.Key #Yes only having 1 of them here doesn't break anything
   - type: ActivatableUIRequiresPower
diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml
index b3cf8e9516..4ccbce8580 100644
--- a/Resources/Prototypes/Recipes/Lathes/devices.yml
+++ b/Resources/Prototypes/Recipes/Lathes/devices.yml
@@ -19,3 +19,16 @@
   materials:
     Steel: 200
     Plastic: 300
+
+- type: latheRecipe
+  id: FlashPayload
+  icon:
+    sprite: Objects/Devices/payload.rsi
+    state: payload-flash-armed
+  result: FlashPayload
+  completetime: 1
+  materials:
+    Steel: 50
+    Plastic: 100
+    Glass: 50
+    #one fourth of what making a flash would cost
diff --git a/Resources/Textures/Objects/Devices/payload.rsi/meta.json b/Resources/Textures/Objects/Devices/payload.rsi/meta.json
index 7f1958955b..74eee1d86f 100644
--- a/Resources/Textures/Objects/Devices/payload.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/payload.rsi/meta.json
@@ -30,6 +30,11 @@
             "name": "payload-explosive-armed",
             "directions": 1,
             "delays": [ [ 0.2, 0.2, 0.2 ] ]
+        },
+        {
+            "name": "payload-flash-armed",
+            "directions": 1,
+            "delays": [ [ 0.2, 0.2, 0.2 ] ]
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Devices/payload.rsi/payload-flash-armed.png b/Resources/Textures/Objects/Devices/payload.rsi/payload-flash-armed.png
new file mode 100644
index 0000000000000000000000000000000000000000..13215e53dcb68c397a31c7f5cdf8d9b4011df79d
GIT binary patch
literal 1916
zcmbVN4NMbP9Dj%ic7eIE#1Eoe&Y9u1_U=l1r56gt7NL#;fhGgCD97DvxzXMocLx-c
zDe49>Oyd%qiIK3)eSijVE&>@unfoxtME8}babmWag+(TbW2j4zy(^_rqWkc2@8jP4
zz5mDW{r~^lU0Pg_Y*=Lg03>?~-DPNW>Mdyr>W>KZV`x|^7gnkOJdvumIB@XL3IGyT
z3BC%g!dt{}Qpm*eQVlePLoz}GkewTrS*{LhSPcvaq642CK80ff@4#QSdP%SBg0({7
zRt1)CE%tF+>o_})=jLG9VFn2ZL5;=2p`fTTVFw<O%b>ZwOyF1qqSZO@JY6AH;Vs2n
zk^(WSi8gYSB@46JO%!b*GwByGGfCMAGK-)xjU>g8G-I`4(FaG`6yDF2xi?02p)Uts
zt7$Sr5KT=@rlw4jqyz}cZbvfAgxPFF2&398YHZjjs%z&ZxS`4^f~*OWi0Km98mU2Z
z;K<TB7eaDOtf)q5LWB`vRwgJDsk;;b@>~ojHz>h~a-Jh#5Qd<rsR&EOuyU=WNouY1
z2+^_a2NWP`z22CPhuRVf#Z;(Tej{=tO2|Xes;^mwL>W}228Dz9jmXTkx;HZ8QXs2I
zicgY)^A}Y*Z!%^^USk<vmJ>wXiS_p#fo@iV4%|#4wn>YTviK;Pp-A+;KxQ!{IS2Jh
zyx?zM0HuADjUjCeWqAOKf`(@`_Fus~$M_{B#3Gl45F3DmECz5aMkM2sf|7z1BkMBn
zU-!6NrHbSif@ni6E7*W}@?A7#r)i_vL`BT?dKr(XYOKgXkK2JGdQ5`AGqlA@+V~pU
z=x42@(PFb&jCS5?Gx}+}m88t(Ogo7bMedAoOI(8<1oP+l|9QSd5l|Ac!N-=Pr=}h~
zOrfBndu@&;PdTiQ&Vm9K2^fau^h9vroE`y?$D_-_V>2)(wy72(q5lvUb1+r%YfY>I
z^8$#i{}6cuGM~_scFq%Gp_7rl`x1N}j;e+}jg>3(5i595L{&~f<xHVQW&v1~<Z<Wu
z!iRo8NbNmMKI1-fbbp3-$N0dHbwlS8l(aANyN8l&?;ieWmr41>PzKW`5{`fO>nrr(
zWv5!5`~2p+o{2k0`)-gh=hBi(9pDjNQBF(A*{=PlboVxVe4<r7zr9UOId9)TR?{^*
zwJtTgKB2aE__MxGs=7)qTHm57dP~T!opqhBzxLaogK5jBQ0pZOqwVpdw-2<Qpo7<@
z1Ia&ao((tV&4%ywF7Da(gJZNR%{`esVyFuxtsebipyS)I#pRu#9$bL4Bb{meU50wl
z{uSP{qhiMQoYS*r<sWxPjvg_Du1rs_PDupL?=3@{`zzP9Ro%$@>%cj9>|_=I-A4@I
z*tN;@X`445RK~A(pIGX&EW7pd@YNLX&4AJWY2}?)O$R=Ao62sq#{<9>P1?5X?8iPl
zIsSC%rZ?H~E!RixIb2ig&OF=KawR-GOyri_+;!nSqOXP8*I=F!AIa8&4Mbk|;OU8b
zEgkOLi62yT1yZl3gQ?}utG5%cS9i?Bt>1le>G5~Yl%r+xvY{Gb{Jxnu*HgWXdwO!K
zGb)!CT%L*RSqZm0H*LI_PQEdC^U1<J-HXQFK3mfE5(vfzH|gCrkb1D9zS>`OOaDK5
M@{8Sl8>)By4Ny><W&i*H

literal 0
HcmV?d00001