From: Jackal298 <129199891+Jackal298@users.noreply.github.com> Date: Wed, 4 Oct 2023 22:18:28 +0000 (+0300) Subject: Space Ninja 3: an old enemy in a new environment (#20713) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=09b2151e0865e607833b230e35c1637fa2f14927;p=space-station-14.git 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 c9f19e010c..8d3bee7b19 100644 --- 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 f5f0257ff7..6a4f85e419 100644 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 78bbbcfd04..b814dfe5a5 100644 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 4585c26849..e5b88c6c1a 100644 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 7b005ddacb..ffcd06463c 100644 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 922cbddb20..5463bcbfd2 100644 --- 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 920dd4912e..2c7c443e5d 100644 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 43dca0a730..59b716bffb 100644 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 900114c31e..f30ac5185d 100644 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 def44f1b59..20aba07f3c 100644 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 25dfc5f68c..be28392cdb 100644 --- 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 0a73d16321..5bb527e1b0 100644 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 8c3605f8b5..132d9aabf0 100644 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 ddebc2e4c3..e3b31316cc 100644 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 d91d2192fe..4d43256976 100644 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 e482264df5..0174b889d2 100644 --- 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 87282ec842..9c8f0d020d 100644 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 447174a09e..be42d7ae7e 100644 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 558124e55c..24dfb6da1f 100644 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 e1db9b0bda..38b78db1e1 100644 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 b503d4acde..35a7a9f9df 100644 --- 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 19eeac4947..3dcf4ce769 100644 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 0b7ddbf8ff..567bc8f6e8 100644 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 9147eb7598..81ee9b51e2 100644 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 16c2ce2aff..448b9155a1 100644 --- 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 a3a5df1863..cbfd370b92 100644 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 index 0000000000..ba554a95b5 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 f31e92edce..abdef910aa 100644 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 e185890fbf..62ba976b34 100644 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 5f35b502da..39f26b42fc 100644 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 5926122d27..6a365e7728 100644 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 1dfa76c4e3..de27e15fb7 100644 --- 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 } ] }