Grenade resprites part 1, stinger sound change, projectile grenade animation fix...

* flashbang resprite

* emp grenade resprite

* smoke grenade resprite

* tear gas resprite

* stinger grenade resprite

* adds missing animations for projectile grenades

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
index 07c2a7ad3cdec1100789547b4dd0026df5865680..375d24c29e4e6db94ae03e3ad916463a640aabb4 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
@@ -18,6 +18,13 @@
     containers:
       cluster-payload: !type:Container
   - type: ProjectileGrenade
+  - type: AnimationPlayer
+  - type: GenericVisualizer
+    visuals:
+      enum.Trigger.TriggerVisuals.VisualState:
+        enum.ConstructionVisuals.Layer:
+          Primed: { state: primed }
+          Unprimed: { state: icon }
 
 - type: entity
   parent: [ProjectileGrenadeBase, BaseRestrictedContraband]
@@ -41,10 +48,6 @@
   - type: SpawnOnTrigger
     proto: GrenadeFlashEffect
   - type: OnUseTimerTrigger
-    beepSound:
-      path: "/Audio/Effects/beep1.ogg"
-      params:
-        volume: 5
     initialBeepDelay: 0
     beepInterval: 2
     delay: 3.5

diff --git a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png
index 5f43e51ee0637a48a0eeae727eeed3ba37ffaffd..4251b56a0f0a35103178ad4ad45280ed7a5eaf6e 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json
index 889ac5cb4c67a4cc6eb652ed7e3d1c2a67746a10..b5584b9e38c35a9eba726fd95d5e8caef815598d 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e52683d3872347af447bb0ff74c420d4a4e91ea8",
+  "copyright": "Derived from /tg/station 13 at https://github.com/tgstation/tgstation/blob/8231234a64b80635369e8da43011ad20bde631ce/icons/obj/grenade.dmi, created by K-Dynamic (github)",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png
index a11f70171fb12c11e8743cfe80ccc3becd152252..4e964288827625338cb6519edd667d8038c5b278 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png differ

diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/equipped-BELT.png
index 6fc92446678a0433900d2030d5e39e5aa8539cee..28006d22b05ced0416a7b39c4e8d8569f3fc49f5 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/equipped-BELT.png differ

diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png
index aec9818274f64e56a647a4a539048b4731ff0d84..6151b7f44ce3b89d0d154eb9c326b3a6c6ae3fe5 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
index 28d3e6969a9d4f92980b4a322bcb1ca503751aaf..b5584b9e38c35a9eba726fd95d5e8caef815598d 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5",
+  "copyright": "Derived from /tg/station 13 at https://github.com/tgstation/tgstation/blob/8231234a64b80635369e8da43011ad20bde631ce/icons/obj/grenade.dmi, created by K-Dynamic (github)",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png
index 596bfb6a15c14918271fb488990f29baac30b05f..d396f4226181690efddba064bfdcc74fa2c0894d 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png differ

diff --git a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/equipped-BELT.png
new file mode 100644 (file)
index 0000000..d3eca30
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/equipped-BELT.png differ

diff --git a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/icon.png
index c6365e6404e75ccc4863b7ea3cdba4089d6ecade..54cdd4064048499ef2ca79c105d3a1e6ae0f1dcf 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/meta.json
index 525248ce94ed3804ba851df40533a0685868a001..cfe6901719fe221f3f33da6ab62670b36421aaa5 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/524270a5bcc1e0ea844b98c5a204986cec9721ac/icons/obj/weapons/grenade.dmi",
+  "copyright": "Derived from /tg/station 13 at https://github.com/tgstation/tgstation/blob/83624574e59e68746965ef528604663b16983473/icons/obj/grenade.dmi, created by K-Dynamic (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -12,6 +12,10 @@
     },
     {
       "name": "primed"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/primed.png
index ef7ca55e19a52bbd00108a9f268f68a3d2c89a26..25d11b7fda506211dd05543e4bfa0ce4b0ebd58d 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/primed.png differ

diff --git a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/equipped-BELT.png
index 85a06f2d4d8362e5da14ef191ad065e22cfce242..cfc9b2a94fc2ee7be035f2a7ac6cf6888e3b67a5 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/equipped-BELT.png differ

diff --git a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png
index 1fae8574536ff08bf95e04ac20e0fcb91328959c..ca4383378ba59c7efeec64b99e93f839a6a02124 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
index 28d3e6969a9d4f92980b4a322bcb1ca503751aaf..2f3dee4f0a8866e7d46cceb972e696f10b9cd1ce 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5",
+  "copyright": "Derived from Arendian (https://github.com/space-wizards/space-station-14/commit/3e766402b9d6c17f41f9e7e814b70eef83a95568), created by K-Dynamic",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png
index 32d39cb89f66efbf046e39041247ad7a3bb9031e..dd9542f61f6db71b529d45476f244e51d571b373 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png differ

diff --git a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/icon.png
index e3980eaf108fc61e6138ab0c6c89624faa807425..5faf46b224c5f6586b9630d0cfb933a0fc4e68b1 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/meta.json
index 60b919588c3b93d175b200790641bbebe9f8a2a1..69413f3b8c4986d2ae543cac6c6f40ff0e757777 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/524270a5bcc1e0ea844b98c5a204986cec9721ac/icons/obj/weapons/grenade.dmi and modified by deltanedas (github)",
+  "copyright": "Derived from deltanedas (https://github.com/space-wizards/space-station-14/commit/7dd472c934e61e4087a3f991ed9b51f0eb99271c), created by K-Dynamic (github)",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/primed.png
index ca49e02fe31aa947cc6a3f45a5e5f971bb6e709e..61d03a6a7918fb1d670e5f05624383c9abc3b6bb 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/primed.png differ