Space Ninja 3: an old enemy in a new environment (#20713)

Make Ninja more stable in terms of design

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index c9f19e010c90c608631a62c0cfab2dd989dec377..8d3bee7b1908ab3015a687cb8726e777d0615f88 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -940,7 +940,7 @@
   parent: UnsensoredClothingUniformBase
   id: ClothingUniformJumpsuitNinja
   name: ninja jumpsuit
-  description: A nano-enhanced jumpsuit designed for maximum comfort and tacticality.
+  description: Comfortable ninja suit, for convenience when relaxing and when you need to practice.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/ninja.rsi

diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET.png
index f5f0257ff7030e83d6fb6fe14e76dec159bd82c7..6a4f85e4190ae0e0b514c4b7b6e2595c8efd4a17 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET.png differ

diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png
index 78bbbcfd04171fa64c5745bcf6bfd45508be61d5..b814dfe5a57664f296a61fb5260deb400e0493c0 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-left.png
index 4585c268498ffa5884a4e922c0bf503aaea40c8a..e5b88c6c1a1457e2c0de528125a835c97ca07c33 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-right.png
index 7b005ddacb3c824635db3712325ca11a8dc8e90f..ffcd06463c7f02c9a8b445b89717f4d172204018 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json
index 922cbddb201d0489b6c1b9df2cb152660c7388db..5463bcbfd23c083ea440e1a33121611476f0e02f 100644 (file)
--- a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation (unknown commit)",
+  "copyright": "Taken from paradise https://github.com/ParadiseSS13/Paradise/tree/master/icons (unknown commit)",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK.png
index 920dd4912eba729b006cdd9444eecbc63d80330c..2c7c443e5d67289fa056f9244556282c0e4afd25 100644 (file)
Binary files a/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK.png and b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK.png differ

diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/icon.png b/Resources/Textures/Clothing/Mask/ninja.rsi/icon.png
index 43dca0a73027bccba6007c2451179a300514331e..59b716bffb4ff4c8df0734db74a26c9d15128f30 100644 (file)
Binary files a/Resources/Textures/Clothing/Mask/ninja.rsi/icon.png and b/Resources/Textures/Clothing/Mask/ninja.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-left.png
index 900114c31e1e004ba4ca3a58df0d6f15bd0023f9..f30ac5185d44643b1d599b46f04d119845c5f882 100644 (file)
Binary files a/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-left.png and b/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-right.png
index def44f1b59beb3bdbae0c6cda145b125efdb4964..20aba07f3ca32830e0e0a2751e5fe46f776391ea 100644 (file)
Binary files a/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-right.png and b/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json b/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json
index 25dfc5f68c97d8dba11c49bfe4082eaa63992bb8..be28392cdb489a13a410d247e64488384e33b17a 100644 (file)
--- a/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "By Jackal298 (github), based off of tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and paradise at commit https://github.com/ParadiseSS13/Paradise/commit/33f7c1ef477fa67db5dda48078b469ab59aa7997",
+  "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/33f7c1ef477fa67db5dda48078b469ab59aa7997",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING.png
index 0a73d1632135634436b740237bc187319793c735..5bb527e1b0235ad646571a751f4eb404c57bc693 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/icon.png
index 8c3605f8b544cc10a1e53198eaf6feacd6785e16..132d9aabf0df7bdbad4f178df5a16b115492b110 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-left.png
index ddebc2e4c3973acca240b51a239b59f92152a45a..e3b31316ccebce05b2aef77eb1f31fc3c996126b 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-right.png
index d91d2192feb087f2bfb31e9ba31a16b8c5882cd8..4d432569767c46f6e65326ee244827daead2036f 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json
index e482264df5f8b7f13d1a6a889a05f90ccba884a2..0174b889d2ee669736c89c0da7d552c11ab0c566 100644 (file)
--- a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from paradise https://github.com/ParadiseSS13/Paradise/tree/master/icons (unknown commit)",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/equipped-INNERCLOTHING.png
index 87282ec842052e4ba0f81867b5f574fd4dd8ca04..9c8f0d020dfdb679058404e893ca8c08f3460fad 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/icon.png
index 447174a09ebc78c57dc9f4a70c269e001daaa784..be42d7ae7eef072c50f3ce35a8fe8b1affba4413 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-left.png
index 558124e55c0d316d394a71f5296e3b55d89d58d0..24dfb6da1f767fd8f99d5d9d115fed84a49b9055 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-right.png
index e1db9b0bda2c09bf71dc67e16befed54285fdc14..38b78db1e1613bce395cf0cdc08ebfb76cf9076e 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/meta.json
index b503d4acdef6d830d256e13137be72c109af7b72..35a7a9f9df5381c22d9961355dff4e0accc9a63c 100644 (file)
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Modified by Jackal298 (github), based on paradise station at https://github.com/ParadiseSS13/Paradise/blob/ede55cc8f5b50abcd4f51d37779b56853a440a9a/icons/obj/clothing/uniforms.dmi",
+  "copyright": "sprite by prazat911 and modified by jackal298",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/icon.png b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/icon.png
index 19eeac4947d73bab0aa9918d7ab980fe9326606f..3dcf4ce7693a8151246fb47dc97cf8b6580af001 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-left.png
index 0b7ddbf8ff4a94050b716ffccf2e1d2542ba29b5..567bc8f6e8cd28d8d71b7c4e23b27e1af4b99203 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-right.png
index 9147eb7598d9f16cba99b5c7f4f3fc480e79712a..81ee9b51e246a5ab51ce31e2316d4f29f33ac86f 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/meta.json b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/meta.json
index 16c2ce2affb0b7eb8f689ee9fb0da52fe7fb2314..448b9155a1f8620646afe9130b1985c0ba59156b 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.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/db2efd4f0df2b630a8bb9851f53f4922b669a5b3",
+       "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/db2efd4f0df2b630a8bb9851f53f4922b669a5b3 and modified by Jackal298",
     "size": {
         "x": 32,
         "y": 32

diff --git a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/primed.png b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/primed.png
index a3a5df186335e83dda36a72cad67e10a354f723f..cbfd370b92043146baa92ef4420bd7e931829320 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/primed.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/equipped-BACKPACK.png
new file mode 100644 (file)
index 0000000..ba554a9
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/equipped-BACKPACK.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/equipped-BELT.png
index f31e92edce1fac09a849db38849c8644d7a9df46..abdef910aa969186d13623da053ea6b728501680 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/equipped-BELT.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/icon.png
index e185890fbf360ec5e9d1430d45e43b02e2574214..62ba976b34330e5699ee911ef450df92870261ed 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-left.png
index 5f35b502dac97511556b822fd2b9856ab39fe29b..39f26b42fc23191670f44c02367063f57751ca45 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-right.png
index 5926122d27bfe0b4623bcf94a44ba3a8ac46fa4f..6a365e772831904f5c7f0510d8e18b824333bcba 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
index 1dfa76c4e38dbb13bce23a45eb6a36979dff599e..de27e15fb759de84e9eac9719f0fe7bd0f55b0f6 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/energykatana.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/a9451f4d22f233d328b63490c2bcf64a640e42ff",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a9451f4d22f233d328b63490c2bcf64a640e42ff and modified by Jackal298",
   "size": {
     "x": 32,
     "y": 32
@@ -21,6 +21,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BACKPACK",
+      "directions": 4
     }
   ]
 }