From 030c4a07ce5dcd5ad01be56c463fbb926adf2d4d Mon Sep 17 00:00:00 2001 From: Swept Date: Tue, 17 Aug 2021 19:42:50 -0700 Subject: [PATCH] Can now equip fireaxe, claymore, spear and baseball back on your back (#4484) * Can equip spears and claymores on your back now * Adds fireaxe and baseball bat back equip --- .../Objects/Weapons/Melee/baseball_bat.yml | 7 +-- .../Objects/Weapons/Melee/fireaxe.yml | 6 ++- .../Entities/Objects/Weapons/Melee/spear.yml | 5 ++- .../Entities/Objects/Weapons/Melee/sword.yml | 10 ++--- .../baseball_bat.rsi/equipped-BACKPACK.png | Bin 0 -> 463 bytes .../Weapons/Melee/baseball_bat.rsi/meta.json | 8 +++- .../Melee/claymore.rsi/equipped-BACKPACK.png | Bin 0 -> 600 bytes .../Weapons/Melee/claymore.rsi/meta.json | 42 ++++++++++-------- .../Melee/fireaxe.rsi/equipped-BACKPACK.png | Bin 0 -> 494 bytes .../Weapons/Melee/fireaxe.rsi/meta.json | 6 ++- .../Melee/spear.rsi/equipped-BACKPACK.png | Bin 0 -> 420 bytes .../Objects/Weapons/Melee/spear.rsi/meta.json | 6 ++- 12 files changed, 54 insertions(+), 36 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/claymore.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-BACKPACK.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml index 7ccf30b227..029ccd21da 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml @@ -9,10 +9,11 @@ state: icon - type: MeleeWeapon damage: 15 - - type: Item - size: 24 + - type: Clothing + size: 15 sprite: Objects/Weapons/Melee/baseball_bat.rsi - prefix: inhand + Slots: + - back - type: Construction graph: WoodenBat node: bat diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index 0fe1ac7dc0..643d250a87 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -12,6 +12,8 @@ state: icon - type: MeleeWeapon damage: 25 - - type: Item + - type: Clothing + size: 20 sprite: Objects/Weapons/Melee/fireaxe.rsi - prefix: inhand + Slots: + - back diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index 3e151f89e4..42d092684a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -17,10 +17,11 @@ arc: spear - type: DamageOtherOnHit amount: 15 - - type: Item + - type: Clothing size: 24 sprite: Objects/Weapons/Melee/spear.rsi - prefix: inhand + Slots: + - back - type: Construction graph: spear node: spear diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index c2e58883f2..5c80e445df 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -12,7 +12,6 @@ - type: Item size: 15 sprite: Objects/Weapons/Melee/captain_sabre.rsi - prefix: inhand - type: Tag tags: - CaptainSabre @@ -34,7 +33,6 @@ - type: Item size: 15 sprite: Objects/Weapons/Melee/katana.rsi - prefix: inhand - type: entity name: machete @@ -53,7 +51,6 @@ - type: Item size: 15 sprite: Objects/Weapons/Melee/machete.rsi - prefix: inhand - type: entity name: claymore @@ -66,7 +63,8 @@ state: icon - type: MeleeWeapon damage: 25 - - type: Item - size: 15 + - type: Clothing + size: 20 sprite: Objects/Weapons/Melee/claymore.rsi - prefix: inhand + Slots: + - back diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..ddab849d4fd58a45095257e42b7c8ede25d58e8c GIT binary patch literal 463 zcmV;=0WkiFP)ZffRI9E`mbk8_;n94wJ)h0Zx$$6bdT36aj=1N|#21v?!us*4brd zoc|qGv=XG^Vv%9B1#~(@`IvSS5 zmt}%Zo-?V;BjGqvrDzh&zkjTw^olCLlljrGjG8P_1z278H}&~XP-_MtwU(&9YKx*@h zn*ef{XIuo3%RJ+z0&=9IAEhnG!q^GxzxAhp2U&+Wyh@Gc+#0~%C800uOu zf&dI?Pz3=P(4YzeFrYyd1YkgeDhR-U22~J%0S&6`eE?Cv#60u}Z1)F95LdwV*?T>$ z@;TUnF8u+~OQ6dM>^~B%O?1QTc0zBTO?!G$m~WI|g4Sd$GJOUCNCt69@zInQSSxEz z7C@gt00uOuf&e6gcux(@NFHFVUcOlX000000MLMlz5tXko15V}A#nfz002ovPDHLk FV1jjIzT*G@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json index 2c493b673f..e9f97dc260 100644 --- a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json @@ -1,12 +1,15 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a", + "copyright": "Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "icon" + }, { "name": "inhand-left", "directions": 4 @@ -16,7 +19,8 @@ "directions": 4 }, { - "name": "icon" + "name": "equipped-BACKPACK", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..89c21dcf3c63b5e2f7f762877058b0e0eccdd9c9 GIT binary patch literal 600 zcmV-e0;m0nP)oLd97nJ*TL8_!x<13+L91lYr-W2>51#l#fQnuDsCFb_Df z2ADDroTDgQ!Sg)S@l2Wr&;wXyJRV137{WVpmtahr2gpu=LzoAQR=~asqG|Jh=>YaY z!t^m|9xxgJhG>)K0kRcAwas-~b3{unGr2K!a5{00J7U!T}J_U=Zb2Dufm)@Wel)W;@DyTCGpqcaa^ zZ-X{_gG`|OPtjvDp1?nZ2xzbh2S7lBRZczt%7>#n14rv<&C;#`O&Px;K1{`Hmv;<# mbNP3Kwit$C7=}Sb2=NcfWD@dzRUZHV0000BZ%Vm(SCtPB>>ea5Dk^(G`0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRL zOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DJ`=oHL)VqK#7YpC9|j)q>qa;ttc@!6~s2= zQdV&Fa{-$S0FuZXA}MdeG5`Po{7FPXR7i>KlsyiDKoEro`B|kRoC`-28dG(-kM=2iwidwBpET(!87BzOg>gUh#fh;16W$hT1V2ia zA|NM%0{h-h8srGb|J&PRKad7+4m9w#Ec?(EtDd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json index 200e7edafe..36566042fe 100644 --- a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json @@ -7,6 +7,9 @@ "y": 32 }, "states": [ + { + "name": "icon" + }, { "name": "inhand-left", "directions": 4 @@ -16,7 +19,8 @@ "directions": 4 }, { - "name": "icon" + "name": "equipped-BACKPACK", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..dfc3bd6b6e882d6038d5fa7eb56bd7d70dd08698 GIT binary patch literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|el>na**8>L*%slgd>hi4#Rqfi^ z+Ee-Y|1&T|Mn;y$8)|838A<@vF}RthZ3R+{B|(0{3=Yq3qyaevRUr{2E~&-IMVSR9 znfZAP3>9;N!wQN@zkdlX`1tjSmbb3fxija3H-s8oG=A_%=e&>RNrs}H-W?XkLB^Mj zy%gp=nsj7Rh(hqn9SWu!HEh*4?zrL5*=?-4d4}E`C#NX5brG6td{3qNeASj^gL-q;|$VP?ZB zhHg%lyABsvn(`bzvZ^n$xpu*oQLjZrz@)K=)tf_8f;ECc`6$;65e^N3V__bO%u^Yd zxNgXBXmF@6X;{Gd<~HYwgv12(1eR+`ETRe8oG){j661TC5*Zkt#ER)mos=35bUlNo LtDnm{r-UW|E3J`c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json index 2d727ff632..a380e9796e 100644 --- a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json @@ -7,6 +7,9 @@ "y": 32 }, "states": [ + { + "name": "spear" + }, { "name": "inhand-left", "directions": 4 @@ -16,7 +19,8 @@ "directions": 4 }, { - "name": "spear" + "name": "equipped-BACKPACK", + "directions": 4 } ] }