From 872ad201984d0df07c8207c823a629f41986a341 Mon Sep 17 00:00:00 2001 From: ps3moira <113228053+ps3moira@users.noreply.github.com> Date: Wed, 20 Dec 2023 19:39:08 -0800 Subject: [PATCH 1/2] Added Three-Sword Style --- .../Entities/Objects/Weapons/Melee/sword.yml | 6 +++++- .../Entities/Objects/Weapons/Melee/dulled.yml | 5 +++++ .../Weapons/Melee/katana.rsi/equipped-MASK.png | Bin 0 -> 222 bytes .../Objects/Weapons/Melee/katana.rsi/meta.json | 6 +++++- .../Weapons/Melee/katana.rsi/equipped-MASK.png | Bin 0 -> 225 bytes .../Objects/Weapons/Melee/katana.rsi/meta.json | 6 +++++- 6 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/katana.rsi/equipped-MASK.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index bc676f2f095..5906095dcfe 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -51,7 +51,11 @@ - type: Item size: 15 sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV - - type: DisarmMalus + - type: Clothing #DeltaV + sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV + slots: + - mask + - type: DisarmMalus #DeltaV - type: entity name: energy katana diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/dulled.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/dulled.yml index 3d0783d01f0..53fc4408688 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/dulled.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/dulled.yml @@ -19,6 +19,11 @@ - type: Item size: 15 sprite: Objects/Weapons/Melee/katana.rsi + - type: Clothing #DeltaV + sprite: Objects/Weapons/Melee/katana.rsi + slots: + - mask + - type: DisarmMalus #DeltaV - type: entity name: claymore diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/equipped-MASK.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..4b1035818795ec0e4ae8943a7e70a7c4139c50e0 GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|W_Y?dhE&XX zduuQ6Ap-%n3(lt$%mkSihgR7yBH1v*5g$lud`t9|ZU=|3fghLw5K zgZG#47q3uKDmquIsT$So0==U zVOt&0J`nhp-EF_+>Xb*%We!H9J(zCyR1j#$Ws}oSM7CKlf>r#PY|R{QoLaNx#BLDZ M)78&qol`;+0Ag!aY5)KL literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/meta.json index 2934026c5eb..3d067c2ece6 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf. Further modified by TJohnson.", + "copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf. Further modified by TJohnson. Mask-equip sprite made by ps3moira", "size": { "x": 32, "y": 32 @@ -17,6 +17,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/equipped-MASK.png b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..3a238b1fac31ac473cd8bc6c58a623bab24166a4 GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|W_!9ghE&XX zd&`io$v}kdLHZ%b4)p@1IcIlNO7>kcu-vipi`ouJVG+fN48LlVf45!#mit$kp<(5@ z<+a;O`0od}xGb5nYfkZ$)SsI)p5KYy9osJ`7#P}q+;z*_RCDM4#iqWOtEVh9-g{d* zHCK4UwmP7dAW(N*tUjY#^XPfYriEt?%&~ha7~~Zjd;Rnik!==?U=@ERTQ56g>@e5+ QO$3PV>FVdQ&MBb@0Aom2g#Z8m literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json index b2c66cff5b2..9918be39cab 100644 --- a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf", + "copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf. Mask-equip sprite made by ps3moira", "size": { "x": 32, "y": 32 @@ -17,6 +17,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK", + "directions": 4 } ] } From 2664104c57ba49305016fe4eca44cae2dd242365 Mon Sep 17 00:00:00 2001 From: ps3moira <113228053+ps3moira@users.noreply.github.com> Date: Wed, 20 Dec 2023 19:44:50 -0800 Subject: [PATCH 2/2] Removed Unnecessary Delta-V tag --- Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 5906095dcfe..eb4b1cd80db 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -55,7 +55,7 @@ sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV slots: - mask - - type: DisarmMalus #DeltaV + - type: DisarmMalus - type: entity name: energy katana