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

This reverts commit 09b2151
space-syndicate · Oct 5, 2023 · ab79ed1 · ab79ed1
1 parent 5a4438c
commit ab79ed1
Show file tree

Hide file tree

Showing 31 changed files with 6 additions and 10 deletions.
diff --git 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: Comfortable ninja suit, for convenience when relaxing and when you need to practice.
+  description: A nano-enhanced jumpsuit designed for maximum comfort and tacticality.
   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
diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-right.png
diff --git 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 paradise https://github.com/ParadiseSS13/Paradise/tree/master/icons (unknown commit)",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation (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
diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/icon.png b/Resources/Textures/Clothing/Mask/ninja.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-right.png
diff --git 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": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/33f7c1ef477fa67db5dda48078b469ab59aa7997",
+  "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",
   "size": {
     "x": 32,
     "y": 32

diff --git a/...Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING.png b/...Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-right.png
diff --git 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": "sprite by prazat911 and modified by jackal298",
+  "copyright": "Modified by Jackal298 (github), based on paradise station at https://github.com/ParadiseSS13/Paradise/blob/ede55cc8f5b50abcd4f51d37779b56853a440a9a/icons/obj/clothing/uniforms.dmi",
   "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
diff --git a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Bombs/spidercharge.rsi/inhand-right.png
diff --git 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 and modified by Jackal298",
+	"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/db2efd4f0df2b630a8bb9851f53f4922b669a5b3",
     "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
diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/icon.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-right.png
diff --git 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 and modified by Jackal298",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a9451f4d22f233d328b63490c2bcf64a640e42ff",
   "size": {
     "x": 32,
     "y": 32
@@ -21,10 +21,6 @@
     {
       "name": "inhand-right",
       "directions": 4
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
     }
   ]
 }