From e22d3a4cb032198c4b760bf8cb108a54c770ed24 Mon Sep 17 00:00:00 2001 From: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Date: Mon, 30 Oct 2023 01:09:18 +0100 Subject: [PATCH] Space Asshole Gear (#21243) * Add Space Asshole Coat * Add sledgehammer * Adjust sledgehammer damage values * Add copyright string to sledgehammer --- .../Entities/Clothing/OuterClothing/coats.yml | 11 +++++++ .../Objects/Weapons/Melee/sledgehammer.yml | 22 +++++++++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 718 bytes .../Coats/space_asshole.rsi/icon.png | Bin 0 -> 359 bytes .../Coats/space_asshole.rsi/inhand-left.png | Bin 0 -> 344 bytes .../Coats/space_asshole.rsi/inhand-right.png | Bin 0 -> 342 bytes .../Coats/space_asshole.rsi/meta.json | 26 +++++++++++++++ .../Weapons/Melee/sledgehammer.rsi/icon.png | Bin 0 -> 357 bytes .../Melee/sledgehammer.rsi/inhand-left.png | Bin 0 -> 428 bytes .../Melee/sledgehammer.rsi/inhand-right.png | Bin 0 -> 427 bytes .../Weapons/Melee/sledgehammer.rsi/meta.json | 30 ++++++++++++++++++ .../sledgehammer.rsi/wielded-inhand-left.png | Bin 0 -> 402 bytes .../sledgehammer.rsi/wielded-inhand-right.png | Bin 0 -> 389 bytes 13 files changed, 89 insertions(+) create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index a7c3a55338..1118a9efc7 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -344,3 +344,14 @@ modifiers: coefficients: Caustic: 0.75 + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatSpaceAsshole + name: the coat of space asshole + description: And there he was... + components: + - type: Sprite + sprite: Clothing/OuterClothing/Coats/space_asshole.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Coats/space_asshole.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml new file mode 100644 index 0000000000..8a3754c035 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml @@ -0,0 +1,22 @@ +- type: entity + name: sledgehammer + parent: BaseItem + id: Sledgehammer + description: The perfect tool for wanton carnage. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/sledgehammer.rsi + state: icon + - type: MeleeWeapon + damage: + types: + Blunt: 14 + Structural: 15 + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 10 + Structural: 60 + - type: Item + size: 80 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..d0b9d06f5e5d60196cfb5935b1e57611c999857b GIT binary patch literal 718 zcmV;<0x|uGP)Px#1ZP1_K>z@;j|==^1poj58&FJCMUbksw!p+%e2Fk67(X;7U{F16UQL2>VE_OC z4C)r900009bW%=J|NsC0|NsC008>wR5&!@I32;bRa{vGi!Ts4% zKZ-U)01kNE_x3A@ka~D9S;LT3Q*~98y@eV8Fu^nUr*i^c#Lus{P$Pieak&;Q(85(1 z7cl`gDO~=o$oE@7!HyMbE!zhGR)>#Ptk=f|0k2 z4CqJvQpef91VjSzL^#IhO?L$F)HP?4un=+wCI_oM5gWQN%fJ!65N*+^*QpFBzXL$0 zUZ-*lxbHs$crYwuP)%_1A_%?yC59k6^*WWNz%9SoG|3AojO?=n@B#jfCsqqd+qfv z@oQ&~l?Ocfsd0))vknQ+)vFWr4lBTq^aA$%7nZMec9;LK`Tzg`07*qoM6N<$f}R>O A<^TWy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..41a9647456b6b0284076797ee95e2b7230f699ef GIT binary patch literal 359 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUC#>4K?Z6QORSA0&wS)lMrlQ2$INzw6PN4kXSv)U*6lY10U+{k@ zULFz4{4tqf^xh8Yug3JNELs&6q` zEoR85@5aXQR!9CCZ^qM$_rJ7;OJ8FZ5M3v;jz_L_W-?P5;~Ulj4WmitT8a|I3>(+A zFg&T0{}#IBh?R1Vt(UaJ*}!$Pp8CCU2<5y`$7~WIe1RvMOWfgZAj8%78%k=08}}Z$ rmw)HVg5~NP+7xmRRR3izkl~N9l5SnJWz7?yUl=@H{an^LB{Ts5u%(95 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..afafe245134fb96d45111938e05ae08158f6784e GIT binary patch literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uw+MB2~6(#1z`6dL|8mLN4ShY2(rV}Xns$s_rAjMG<C>5%6whfdu$`1$;B@!wkYgw(i=bE*n0f=;X?)Q*B@FV4C~Y?A^SQ zn1lK)3M_6MP6;g!@>x$C^RsM_lfCt~nxXRF$-N2!OQ#-d=Il7fV)-&L@k2t>W&a%? dw=I~$y;d>zs7%_FH9!wAc)I$ztaD0e0sw)DfGq$3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..144d4d7e4487d7b5d307556a801fe36d22a4a26c GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uw+MB2~6(#1z`6dL|8mLN4ShY2(rV}Xns$s_rAjMG<S%Xe6T!|iAA{r|n}r+9Ar&WzoZ z@=!(hNX?vAp{<3Jg{B)P ze98hAH%_mFDG&a$sBg1iektvw(8nP!u}?c-&)LsP3!bQ|3#nIKmjAzekL<&He0@K* bCiJk+Hp@M#dv<9U(D@9Wu6{1-oD!McgYb90@Yo%Qwg15EfjqvZ}X>H;MX&iP^rq&P}~{DS{O0K>iJ zy^%mM&H|6fVg?4j!ywFfJby(BQ1Fnai(`m|f9s`ap~DIstN{+f-}gU`JMhCvSN`mk zYPAOfTJ>4%88&wqlH~l99qhUoI$UQgox8qa(t@CRcNT#YvpE=)BByI9DV$ZDbbcd~ zu$kLjg5iSYNoUcJ~%f*1O43cFogf ze^}d}aKiV;<+`=Y_Jp$k-qY-S?||n21BUA#%(33_gsVf(l7aKGWq5;sbKg$JoNv2x qb>=#XNB=)|>B;TW+w>-eY1%K^EAE%p*!~3Q8wO8TKbLh*2~7aI+=w#( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d728c4112be202cddeeacf7cc1a830342e8baf1d GIT binary patch literal 428 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uw%E`$&J3Hs*=IZO~A86DKFyZTrmIF!(CJTxIDUOmLzu^B6z;Lg5 zZzNERv%n*=n1O-sFbFdq&tH)Ow20Hw#W5tp{q3}yLd^<142}-}|MyE91hbm;9sg31 z5YN$=vsYusQ$=S37D*us$HTlnToX#_W-T*&-}GJT+609o98C)X4_7v_>1uea6wkQb z$n;*G%jrX!Be$=~y@*TO*y=UUN`?H1Yw&blkjolvuexAoyr@M~#f&X1TZ(?XZ(t3V zXi_}Eb181s9$d;c3j-aJFXUcgD2aO}8ezUe6JBc$@p_jqR^}9Z$8b zO?rE=Etw-|&eItiq|fZNY-(f;nm_Bh+FlnnkttOTJQ@bCx*ZprYixM6*|FKYhWi%N z^1O!&_VI*0u3&99@&B~Tf#-Md6W+#}5PsIH>Sf*=(mCX~r#)p|@hV56+2PP^U`R1| My85}Sb4q9e03I`k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uw%E`$&J3Hs*=IZO~A86DKFyZTrmIF!(CJTxIDUOmLzu^B6z;Lg5 zZzNERv%n*=n1O-sFbFdq&tH)Ow1~sg#W5tp{p~bIz7_=@*OdV~|M#-b(K@e);f#pR7ygC|(B=sBi#XT6HEjF|Rx9V5f3?(f&y3!(-720MP~V%X?>;9Fk4 z?E&Y;bne#+X1uFE)^R1xiz8g?)}BxSYnGf>{H(U#Kl%?aist?ZQTq_G<>7uA?c+0= zG*9>(%x3-6v5{Xk_dw_DrkbJ!HvZ4wWY(Q>w!DyC;+T8lr`*Bo2i_^HOnw&1n8v)j zImfncPN4{6o9SJ#8xHT*9yIW9JoWhH=B08`Y>GENaZPjN==qbjV3iZcni{i!K*i|} zYn`e&Gmp8($vbP0l+XkKT_U6h literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/meta.json new file mode 100644 index 0000000000..b8bbd26672 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Made by Github user Psychpsyo for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c0ae12785efb97f6cdbcb55d4de141abda3f2ed5 GIT binary patch literal 402 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uw%E`&)=H}|_>j#+dIXgRdM#~*&)CEdTh>f`nq&P}~{DS{O0K>iJ zy^%mM&H|6fVg?4j!ywFfJby(BQ1HE{i(^QH``c+Z`Hm=XxE4zP|KH!9z0xb%cY0-p z+MVgA9&t(qFZdI{X26ir5YE`~ZsWDsCv&WQKYVJfW91NuU82ym+&^l~qjgcbj4GcD zgMK+^9$b97G4xL8>QHS42QCNB+1jn9YZZ(SytWno*qD{a{DZqeZ@aGEo@Tr6f7Uhf zBru#{U~Ay{V8rnMt@@6@EtVG_9G8{5sFAJ8`rx0|F~1{@cR#x3x^wXT-CB~q|8%ND zXF>3_i+mq68P0H2#&a@QZmcj0V7Fb9U@f~r;=y!@^FqfN?i}24n7KgWEkljB@Bxim lKj-aho^5nMo}uU;)2Z9pGmZ<3TmyQY!PC{xWt~$(696yyniT*5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..21c9a32a7fe85bacdd52cfe6c0f940e41755192d GIT binary patch literal 389 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uw%E`&)=H}|_>j#+dIXgRdM#~*&)CEdTh>f`nq&P}~{DS{O0K>iJ zy^%mM&H|6fVg?4j!ywFfJby(BQ1Fqbi(^QH``c+3`3@^^xK4cZ=fC~Eqh3MUyG-vo zZ!U;i;m~(%Mu3(%rz6J{0h=&~FMF@QUNU9UHL>FTCQxWlp~)K8_!Aj{iEOYShp4=_>m`PG2FW$<+Mb6Mw<&;$T(JfBnm literal 0 HcmV?d00001 -- 2.51.2