From 81fd26f5dbdbf024a6c73faa3e08803bd5a5a75e Mon Sep 17 00:00:00 2001 From: scuffedjays Date: Thu, 8 Aug 2019 12:34:05 -0500 Subject: [PATCH] Capitan --- .../Entities/items/clothing/hats.yml | 17 ++++ .../Entities/items/clothing/shoes.yml | 18 +++++ .../Entities/items/clothing/uniforms.yml | 19 ++++- .../Clothing/captain_hat.rsi/captain.png | Bin 0 -> 219 bytes .../captain_hat.rsi/equipped-HELMET.png | Bin 0 -> 418 bytes .../Clothing/captain_hat.rsi/meta.json | 26 ++++++ .../Clothing/captain_uniform.rsi/captain.png | Bin 0 -> 509 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1317 bytes .../captain_uniform.rsi/inhand-left.png | Bin 0 -> 713 bytes .../captain_uniform.rsi/inhand-right.png | Bin 0 -> 754 bytes .../Clothing/captain_uniform.rsi/meta.json | 74 ++++++++++++++++++ .../Clothing/shoes_brown.rsi/brown.png | Bin 0 -> 319 bytes .../shoes_brown.rsi/equipped-FEET.png | Bin 0 -> 428 bytes .../Clothing/shoes_brown.rsi/meta.json | 1 + 14 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/captain_hat.rsi/captain.png create mode 100644 Resources/Textures/Clothing/captain_hat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/captain_hat.rsi/meta.json create mode 100644 Resources/Textures/Clothing/captain_uniform.rsi/captain.png create mode 100644 Resources/Textures/Clothing/captain_uniform.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/captain_uniform.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/captain_uniform.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/captain_uniform.rsi/meta.json create mode 100644 Resources/Textures/Clothing/shoes_brown.rsi/brown.png create mode 100644 Resources/Textures/Clothing/shoes_brown.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Clothing/shoes_brown.rsi/meta.json diff --git a/Resources/Prototypes/Entities/items/clothing/hats.yml b/Resources/Prototypes/Entities/items/clothing/hats.yml index 8aac885ef1..e5888b251a 100644 --- a/Resources/Prototypes/Entities/items/clothing/hats.yml +++ b/Resources/Prototypes/Entities/items/clothing/hats.yml @@ -23,3 +23,20 @@ sprite: Clothing/chef_hat.rsi Slots: - helmet + +- type: entity + parent: HatBase + id: HatCaptain + name: Captain's Hat + description: It's good being the king. + components: + - type: Sprite + sprite: Clothing/captain_hat.rsi + state: captain + - type: Icon + sprite: Clothing/captain_hat.rsi + state: captain + - type: Clothing + sprite: Clothing/captain_hat.rsi + Slots: + - helmet \ No newline at end of file diff --git a/Resources/Prototypes/Entities/items/clothing/shoes.yml b/Resources/Prototypes/Entities/items/clothing/shoes.yml index 59c970247b..1d7d2a03be 100644 --- a/Resources/Prototypes/Entities/items/clothing/shoes.yml +++ b/Resources/Prototypes/Entities/items/clothing/shoes.yml @@ -83,3 +83,21 @@ - type: Sound - type: FootstepModifier footstepSoundCollection: footstep_heavy + + +- type: entity + parent: ShoesBase + id: ShoesBrown + name: Brown Shoes + description: A pair of brown shoes. + components: + - type: Sprite + sprite: Clothing/shoes_brown.rsi + state: brown + + - type: Icon + sprite: Clothing/shoes_brown.rsi + state: brown + + - type: Clothing + sprite: Clothing/shoes_brown.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/items/clothing/uniforms.yml b/Resources/Prototypes/Entities/items/clothing/uniforms.yml index 2e36d893f5..fa65553d34 100644 --- a/Resources/Prototypes/Entities/items/clothing/uniforms.yml +++ b/Resources/Prototypes/Entities/items/clothing/uniforms.yml @@ -124,4 +124,21 @@ state: chef - type: Clothing - sprite: Clothing/chef_uniform.rsi + sprite: Clothing/chef_uniform.rsi + +- type: entity + parent: UniformBase + id: UniformCaptain + name: Captain's Jumpsuit + description: It's a blue jumpsuit with some gold markings denoting the rank of "Captain". + components: + - type: Sprite + sprite: Clothing/captain_uniform.rsi + state: captain + + - type: Icon + sprite: Clothing/captain_uniform.rsi + state: captain + + - type: Clothing + sprite: Clothing/captain_uniform.rsi diff --git a/Resources/Textures/Clothing/captain_hat.rsi/captain.png b/Resources/Textures/Clothing/captain_hat.rsi/captain.png new file mode 100644 index 0000000000000000000000000000000000000000..c546f5370b23afb0fbd3134d9e48ccc0a8ce0cb5 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}i#%N%Ln`LHy|j^&$x!0x z$Nl2c;RS79ww+qK?E<6Bf#`#$L`8D)8)TAXFI>AP8FTQMa+rFPLL8s={q<+3Pv?(w zaB*4E{I~Ch>Eh`{CnLlemmOAaf6dbHOK8%jO;e5=&wkv^(4fyW^Xz=@zcr0+k&Bp__{b%jGVy~#A^r>D> Y>Y9$AZCghQ0|Nttr>mdKI;Vst05gMG0RR91 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/captain_hat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/captain_hat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..93a7d44571fefe3d4959a4aba1a91f235cd2d042 GIT binary patch literal 418 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE>BqOt&dfk-Fw2qmT|?e70b6;hzb-fW!!#`W%b)a#i{$=2>)37uOTgL zv-v@@{hzrE`15AiH9kJ5b}#Pk><7%fRVCN2UdY@q!Asq-F?Z+xeLwz%&9B>I!@Ey6 z*UBZUH?HycZ1y{{AM>zfX*CXdd z87uy;k$yQ_U6O&#vH8R4Z5QWkyZGp*(2`3$O>AD83{!%5n%I_Hy75z}@Ab*OEDQBdBZYT<142hOdlO!*q&Oj+L!kFYJ*lqOBRcCqEh z?r9ml7r7Y@TOF7j{%JkWhvfHlW$$;)J94riQ?{d?{gi0r88#6v)>BWVuCjJ7KP|bh z{!NgzXw81F-FKheF73Nu-(kBxkiqAC@>2EpZ0YjK*TpC5{*^1KlVnW@;baWT>YNhg z^vjmbk@@9!rMLA4zk5!JPW9cByVE{N TEnmgJz`)??>gTe~DWM4f_6hAc literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/captain_uniform.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..f64c76e54c3706d6d904001c12d2012881554fdf GIT binary patch literal 1317 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE)~j)L?|>l$vkL@*$S_GyDe?PVcM=;Rj+!zGyNwnGIEL0RR7ngW$C~w z9yG=6&IF+-0YTFQWmhI=Rz;R659CelnAoXwes$*wzaGP-@pBt5|9v)(*;@$Uy9E+ zD7|_;mvQMO`)sxk3+&k$Dt>+8W@+yIP~|QdG5Nx6>xR~e5^l~d2?h;k&-yZ)uc&=+ ziG7}8gUYXe9{r{drWr^nEuGK4@8u%(og$kUPA#loxzaUr-^~t%&1YAiH)UqX(6ZA$ zDmZ=3%Y8{#8MN-@xD>oCo?le+^3-vLh7a+R+unR+XJB}Bcjf-|>6ee+R&-vrqi|am z+iIEBuUO^2gg4D>IW9PVhrXgs-i;Q;S9f1VYWSC@Xa8z{aHN9apZcEfj0V$~jh5F| z$fW;09#*i;`R4a3&PnZ&U^cDojSW)MFx36{rO5Qoeb!&5oWe63jH?pv z*Q~lb`GS*##8>ToAColLBj)I-Tz?*T`N^@cqf@_d9*vvJx+$zfU;c0N5jT#|baqw+gKq{#NQeihq`j~f%NZ2P&Xr`kp?NZj33*xohv zONGrmoxL%3^Vq{Tt;qc>IJJI(%FJESy2-xRY8e<97(8A5T-G@yGywpLu5@z% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/inhand-left.png b/Resources/Textures/Clothing/captain_uniform.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c48c84c07feb53329b5919996e2a9aa14ad7a8ab GIT binary patch literal 713 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE^J`9JXq)bplt1W`FkDu zj2o>P5-O9WtLrSvx9V(eTrzpXia!tB4sXi!i=`TI|{ zr;@M1)VP%kIzZz2_`ZHw)+m{xyJObm*8c0dCh)q ztJk(UzA=H#><862Ha|<PlsuMpd>L0Sr_*84Zlhdrx{`A8CssI1yH8I@R zyDzl%|AV8i=gZ8EyRUUUXxAMxhyk~fDuU+=~>iXT+obA`cLK+n2 zuf#sqN7vr>kNM27PGvL4B5UW~Fl)nO7Ec*tJktanDwvi%Z@=mH!B2gXj;;DxB?;sC zt_H^fe$I7`m~un+R>oH0iU_#_Q&YqobFy{rO0KI2b=&crF~&1h(B(VZ=iNJ9U86p! zY~omCtFV85yva(PrW-6z9_y$^Pt*Dx9u(Q)H0{85|M!|om#5D%-C@AF&1si-;kVbq zSDfwS?TfSaE%Ft3kojGuT0(P{i`c>mH3#5IP6| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/inhand-right.png b/Resources/Textures/Clothing/captain_uniform.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6b5de1dfa51a68a2c0047155b65a23eb7867302f GIT binary patch literal 754 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE#EMj+4L2?Ctcj3kfCtY zdF4bA5hDpM!&eVZ=&#hdy;f%Dm!G_Wu_b4rzxmM%=gkV88cp z{H+^|2eiX1t+xE~j55)lyMWmrdP%QN z?9zyn;y2dMlrVW_J=y+B?lr@Pyxre7^^_?a-8-TCKy>w!Ppx&kU*C{;8|U7=i}hML z|F8V2SryLV3M8dWZK=g~7sOoL+hbRLtY>$=ZyxSw)qdVF9 zJ=^t-hT;8>yUYBVI(PT^-a6rCC%uccioNaI>F8On*NfdvlU*ONH0I)*Ics&_Fmg0c zm0ok@{rvmxcJ^gTQQ7~$wH}UpIqmJ)YCrwyE4Lb@)IAZmVq`cPzKs9FpIal?zr{45*)Yk%ZI3i~6IXZ(`Ctdh-k=vd$B8?zT4XH*F_Hn7_J~&6{)?Do z%6xco|L3-Hs3@{nLqEEHUAe+!;@^bWqUu*KkCEju_;X zb7R&7uFHrye$4uJ!|NM+XEk>Jyv7qTZ7SEhpO52mjpsAoUw1EQ-MvkF%g?`jD!O$w zkL0I~Y@%+Otk<9a(b?Z)%4xiRt4cQ8mTUX&d_Vq1Tud#3W#tE-76t|e22WQ%mvv4F FO#mPAXEp!; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/meta.json b/Resources/Textures/Clothing/captain_uniform.rsi/meta.json new file mode 100644 index 0000000000..dd23dd26be --- /dev/null +++ b/Resources/Textures/Clothing/captain_uniform.rsi/meta.json @@ -0,0 +1,74 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "captain", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/shoes_brown.rsi/brown.png b/Resources/Textures/Clothing/shoes_brown.rsi/brown.png new file mode 100644 index 0000000000000000000000000000000000000000..13c6a7cdaf5c0e7e28da785ec4f8e94b8dbd01f2 GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANNfY@RNTAr*7pPTcLq>?qQ< zUuE~}CUK_QRgDdTZ}ybf9azG#Y-U=VV+~)t>RFLPKlr$oZP~c-a)UxgM~b;x@?wb+ z;o~7q&$a(s8vies5MXf>_-8$}QqOerjry};Vyl*J-n+Xd?f81uS&?tHZ<1(u5&O8# z;906gTC!zQy6In?{jwM8<<3s&aPsOk+!xk3vHjK5$G;L!+)C;#+0T67*O50ze`*E_ z?YrL3bWCFX6sK(7hON_e4)wP`y;E7XiRIBtIjoZgBwRTa`pxn3K@N2#}>UxRb?=U z=Xf`djiKRmRPO7_%g^fTH23)JpQhQS!UA6m9Xx`p6F5w|A9J<4@*aepSqm zaSwmH=eH>*wEn+&RJS?#SI^|)>bo{7NumCN(F(Ivg4eF7!F7Do3qOPnT21@qZ~8m_18~-5iybC)fC~{SUc~z>bZZ6DLM02PId2WWME)m N@O1TaS?83{1OP+#vRwcG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/shoes_brown.rsi/meta.json b/Resources/Textures/Clothing/shoes_brown.rsi/meta.json new file mode 100644 index 0000000000..d58bf644cd --- /dev/null +++ b/Resources/Textures/Clothing/shoes_brown.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/mob/feet.dmi", "states": [{"name": "brown", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-FEET", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}