From 5fc26baddbc65935562a36015fa008ca695a0616 Mon Sep 17 00:00:00 2001 From: Tris0r <163807362+Tris0r@users.noreply.github.com> Date: Mon, 23 Dec 2024 11:13:24 +0500 Subject: [PATCH 1/8] i'm ghoul --- .../Entities/Clothing/Uniforms/jumpskirts.yml | 30 ++++++++++-------- .../hos.rsi/equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1134 bytes .../Jumpskirt/hos.rsi/inhand-left.png | Bin 0 -> 615 bytes .../Jumpskirt/hos.rsi/inhand-right.png | Bin 0 -> 635 bytes .../Uniforms/Jumpskirt/hos.rsi/meta.json | 12 +++++++ 5 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 1260093d9a92..c38db7445681 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -184,20 +184,22 @@ sprite: Clothing/Uniforms/Jumpskirt/hos.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/hos.rsi - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#C12D30" - sprite: Clothing/Uniforms/Jumpskirt/color.rsi - - state: overlay-inhand-left - sprite: Clothing/Uniforms/Jumpsuit/hos.rsi - right: - - state: inhand-right - color: "#C12D30" - sprite: Clothing/Uniforms/Jumpskirt/color.rsi - - state: overlay-inhand-right - sprite: Clothing/Uniforms/Jumpsuit/hos.rsi + #ss220 FIX START +# - type: Item +# inhandVisuals: +# left: +# - state: inhand-left +# color: "#C12D30" +# sprite: Clothing/Uniforms/Jumpskirt/color.rsi +# - state: overlay-inhand-left +# sprite: Clothing/Uniforms/Jumpskirt/hos.rsi +# right: +# - state: inhand-right +# color: "#C12D30" +# sprite: Clothing/Uniforms/Jumpskirt/color.rsi +# - state: overlay-inhand-right +# sprite: Clothing/Uniforms/Jumpskirt/hos.rsi + #ss220 FIX END - type: entity parent: [ClothingUniformSkirtBase] diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..2c2b70610caf7dfc96e8e8d45e7b7cc25e5f8edd GIT binary patch literal 1134 zcmV-!1d;oRP)Px(C`m*?RCt{2nn7sWW)#Q&w!cQ5oiwzKf}O^(y9IACGYO;vx0kLag9V!H&|ON) z1|>8JG>6^N9tPVX1bXmchn03vW+>}*B+$WNS?M7=WCs(-R?}_m)Y`>fm&UeaD>(ah z@TA&K0{&DhVeI|DJoHKW{!h=Jo`l{52!bF8f*}5P3U?VlC&SQ zoh~RU!#DCF0Kn4H-IlKeLqGT^hto2LqB3)z-&4Ut&Vh#kSy;d66_Czka7oLW+fz(} z+$Cd*N#@ukEsJy})9jQ&82W>57l7(T8$SRTbh|9+Hx;S5{s{MbDo|90J8Kn;9%S%) zDwzA*jTxu5Wn57iW*)4xY!z&$--uQHrdB{w+cfR{HWf*26N<`^FBG7ttZuya_*Su< ze&c?t`ddS}4HNH`F*H7nw^rwo{y2lhwj$DN9-yNd`TK1uUf=NG)3_Ji;V~Tf@^gHB zt!W=D=|gKb_b>9IWqsjg>h<+;N!pL^KI=tycnsOqdA#$a(emWC8~RP< z0E6g=iYH4_UA8qWP(gG=1s(`plMr_33;$cGM2vTb$F_`TSLYG>@O#^Hz+USU1VIo4 zK@bE%5ClOG1o7X-(nrKVFvJgZbU^YP001oixVR@DBacN-aRAWOJo1GC9z9G6`(erP zA0}Vr0PxYb)vxNZ_sFgX;aKz(&pmwt0QlH$d}w?cmy>>+*kG7q z5_C0>vpr#3nhr#JSRjS(v!> zO53ir$V4K;yivQoy&dUHM))=mstlbxJitd8gI~+ydKySd4gl5aOnzM#x`>w{Uns!; zZ&ylE+r*(Y4HtVgC``hg!vp;8v!7evAySK?GP5RUFx%-uAQ-a!HV6bme74hNZX5N% z+Ljp+gaU9Q?!)Bm3y6-WNbB5eN?6EM9nkf%B_~AC^)eKdVIk)*8za&>M|4ER+hSM^yvp}_m zZx_bgJ82ufiC}5D?q!Xh`U41pAP9mW2%;tY1NR3&F|NCd-T(jq07*qoM6N<$f)#Wn Ak^lez literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2d49b2e25ddc92e8ff283a666401b377de07d340 GIT binary patch literal 615 zcmV-t0+{`YP)Px%AxT6*RCt{2+A(X}KpX||Cr4Bzs?(u3gQ#ifP_RL0@X#uYL%>_&AzMCy`w>D1 z4IR36H5mgTA0XY@p|Eqa`H zdEB;ZDob9Pf<#Ee3lK#SwhDdxy$QQcMMY7Bh8JYY+jS}zS+-qMTZKNdn#aN0=y-%^?6_ zp;!a}l+7W+M8S`Bw3>rk$(v;64OnR(X&YV%mZ4!g0Q^`7FuHCBfMsad@Jd)|A6@I; zlFpk%Bm@BJ4=TzsMsWvshFJbNT6mZ!d^r0&^*qvf{~{9fXz7Vck^v0kF5bR;h{ftU zPCEN&cmc-aUyi%io=Z9}jY!C*RaGDF4PhEZeDC$JQ2cX^lOCQ%`cyA0>AW<$L`bVS zfb-5oxzLBN8#p}s0cYMA-TyN1tQljkeS3Ln#Ga-1&mSvmc?pZv^^38S&OX9}<4i9s z={zDLA|fIpA|fIp$}{OcLas>m5k&d{H%+pSkh>2I(*1$lodD_nK<+j`x<8P+M_^2< zKak4}kn9iSaswp$10wx^nU^4Y|aSW-L z^Y)fu_H73Vwg=byR(QoMcP?ZLynJC{Li2|Q3q!@)8@3;D-u8#-yLtNH@{UDnX}~g2OIv-?Z$JT1RI^&J@H*~jc}P4>&NALR=#d6U9AyT z#FT$NNaO4|h54KxU!7LHXEVp~wt2yg{YNtDw%?w!<9~kl?D9vvE3UI;{ASzL=wK(z z#PDoWBmMbBY=8I9Gs&*uami_KSg^ZHsoC|F$7gDuE%T}+e;JK{oE1U85*I|DcM$Q) zZvYAhYUF|`7p^tY=Nq`5UH~iM197x6>l=DNI+f;1{6Bd4|8w=uIUCd7|6bhzOic`) Lu6{1-oD!M Date: Mon, 23 Dec 2024 17:03:49 +0500 Subject: [PATCH 2/8] Update meta.json --- .../Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json index a8a18a711baf..443218e8ec40 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi.", + "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi., modified by dinazewwr (Discord) for SS220", "size": { "x": 32, "y": 32 From 0e09b68bf3066034801b7fc36243fea2bc564469 Mon Sep 17 00:00:00 2001 From: Tris0r <163807362+Tris0r@users.noreply.github.com> Date: Tue, 24 Dec 2024 09:22:55 +0500 Subject: [PATCH 3/8] Update meta.json --- .../Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json index 443218e8ec40..4b4544ac4c0f 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi., modified by dinazewwr (Discord) for SS220", + "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi., monkey and inhands sprited by dinazewwr (Discord) for SS220", "size": { "x": 32, "y": 32 From a47ee41d5b819430d25881ae9e3349dce715e9f8 Mon Sep 17 00:00:00 2001 From: Tris0r <163807362+Tris0r@users.noreply.github.com> Date: Tue, 24 Dec 2024 14:47:28 +0500 Subject: [PATCH 4/8] im gonna cry --- .../Entities/Clothing/Uniforms/jumpskirts.yml | 20 ++++++------ .../Uniforms/Jumpskirt/jumpskirts.yml | 12 +++++++ .../Uniforms/Jumpskirt/hos.rsi/meta.json | 15 ++------- .../hos.rsi/equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1134 bytes .../hos.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1463 bytes .../Uniforms/Jumpskirt/hos.rsi/icon.png | Bin 0 -> 689 bytes .../Jumpskirt/hos.rsi/inhand-left.png | Bin 0 -> 615 bytes .../Jumpskirt/hos.rsi/inhand-right.png | Bin 0 -> 635 bytes .../Uniforms/Jumpskirt/hos.rsi/meta.json | 30 ++++++++++++++++++ 9 files changed, 54 insertions(+), 23 deletions(-) create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index c38db7445681..dcb480fbccb2 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -174,17 +174,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/hop.rsi -- type: entity - parent: [ClothingUniformSkirtBase] - id: ClothingUniformJumpskirtHoS - name: head of security's jumpskirt - description: It's bright red and rather crisp, much like security's victims tend to be. - components: - - type: Sprite - sprite: Clothing/Uniforms/Jumpskirt/hos.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpskirt/hos.rsi #ss220 FIX START +#- type: entity +# parent: [ClothingUniformSkirtBase] +# id: ClothingUniformJumpskirtHoS +# name: head of security's jumpskirt +# description: It's bright red and rather crisp, much like security's victims tend to be. +# components: +# - type: Sprite +# sprite: Clothing/Uniforms/Jumpskirt/hos.rsi +# - type: Clothing +# sprite: Clothing/Uniforms/Jumpskirt/hos.rsi # - type: Item # inhandVisuals: # left: diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpskirt/jumpskirts.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpskirt/jumpskirts.yml index 9f55f2250f41..94a9f5a99fab 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpskirt/jumpskirts.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpskirt/jumpskirts.yml @@ -333,3 +333,15 @@ sprite: SS220/Clothing/Uniforms/Jumpskirt/professor.rsi - type: Clothing sprite: SS220/Clothing/Uniforms/Jumpskirt/professor.rsi + +# ГСБ +- type: entity + parent: [ClothingUniformSkirtBase] + id: ClothingUniformJumpskirtHoS + name: head of security's jumpskirt + description: It's bright red and rather crisp, much like security's victims tend to be. + components: + - type: Sprite + sprite: SS220/Clothing/Uniforms/Jumpskirt/hos.rsi + - type: Clothing + sprite: SS220/Clothing/Uniforms/Jumpskirt/hos.rsi diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json index 443218e8ec40..60705f71d40a 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi., modified by dinazewwr (Discord) for SS220", + "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi.", "size": { "x": 32, "y": 32 @@ -13,18 +13,7 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 } + ] } diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..2c2b70610caf7dfc96e8e8d45e7b7cc25e5f8edd GIT binary patch literal 1134 zcmV-!1d;oRP)Px(C`m*?RCt{2nn7sWW)#Q&w!cQ5oiwzKf}O^(y9IACGYO;vx0kLag9V!H&|ON) z1|>8JG>6^N9tPVX1bXmchn03vW+>}*B+$WNS?M7=WCs(-R?}_m)Y`>fm&UeaD>(ah z@TA&K0{&DhVeI|DJoHKW{!h=Jo`l{52!bF8f*}5P3U?VlC&SQ zoh~RU!#DCF0Kn4H-IlKeLqGT^hto2LqB3)z-&4Ut&Vh#kSy;d66_Czka7oLW+fz(} z+$Cd*N#@ukEsJy})9jQ&82W>57l7(T8$SRTbh|9+Hx;S5{s{MbDo|90J8Kn;9%S%) zDwzA*jTxu5Wn57iW*)4xY!z&$--uQHrdB{w+cfR{HWf*26N<`^FBG7ttZuya_*Su< ze&c?t`ddS}4HNH`F*H7nw^rwo{y2lhwj$DN9-yNd`TK1uUf=NG)3_Ji;V~Tf@^gHB zt!W=D=|gKb_b>9IWqsjg>h<+;N!pL^KI=tycnsOqdA#$a(emWC8~RP< z0E6g=iYH4_UA8qWP(gG=1s(`plMr_33;$cGM2vTb$F_`TSLYG>@O#^Hz+USU1VIo4 zK@bE%5ClOG1o7X-(nrKVFvJgZbU^YP001oixVR@DBacN-aRAWOJo1GC9z9G6`(erP zA0}Vr0PxYb)vxNZ_sFgX;aKz(&pmwt0QlH$d}w?cmy>>+*kG7q z5_C0>vpr#3nhr#JSRjS(v!> zO53ir$V4K;yivQoy&dUHM))=mstlbxJitd8gI~+ydKySd4gl5aOnzM#x`>w{Uns!; zZ&ylE+r*(Y4HtVgC``hg!vp;8v!7evAySK?GP5RUFx%-uAQ-a!HV6bme74hNZX5N% z+Ljp+gaU9Q?!)Bm3y6-WNbB5eN?6EM9nkf%B_~AC^)eKdVIk)*8za&>M|4ER+hSM^yvp}_m zZx_bgJ82ufiC}5D?q!Xh`U41pAP9mW2%;tY1NR3&F|NCd-T(jq07*qoM6N<$f)#Wn Ak^lez literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..45d32ad9c55a9a5c63a2dcfe07ea9a440d1849e4 GIT binary patch literal 1463 zcmV;o1xWgdP)+KGZV2MS{CM$w1W?V;O4VRVkJo7-$GWWlVRZQ8U6 ziP!U=+jEoMwO!85y@7D=_t10Cxu@s*&v(xK&&~aR4{Q!c0N5Ok0I)e60bp}D0>I`l zB*4SrElPCis%x#f)!6jtV~W1*uj`YB_@xB6`t7qyL)#ua{l<6Nq^Z0w7{tG0eab%* zL)h}#Y0HEV{O{~N#_J=>0yRW!DnpCMHXu~At(LMtC7Z^@08 z8aJld{~fyaN68|r#jl4^{(A~Ap33oVRBp`#Fz(7R16J=R?u-6rK+jLRo+i5*jPS23 zKwfyC@@mV0Vbh(sqHK|B81JO{r=&uKTXOG-0}rbU=!K zT>)rNTJ7Q6S)7@cL+*A?LHz0274)3*Emj`cNyj;ja1`Wz?v zVHkRTvBJcshu9&Iqd9$F1z)6b7hg@oAI_ zJwI{hMYt2fwzwp}^qb&RFo$${8D~G<%vGkBk7qu(2A^*OGYpo3xQRp9K%Al!?U<1p zvuFY6`6nWJ@tJ4!mp_@qeDWx-7q(MB)eo2p8kfpYeTeZU*DPiEixz;k*KEBX)z#{& z=UQbgdnDp8A6D@fB>;I}?)76S=IxjG+m;^m7A8&u>aTiZb6_QZQ34!(C5_%6eSC28 z`mq&5R6@0kJU~O`_%-$KD8c)elfNhd$Q%FO{fN@k9>z}}CNx8cP?X%zBO4JLol?EG ziLjEtXdj>+NjLaU(r)Jc^|1PmHswTY!qQzp9GCo6 z*vB|qs$J+k6i3AWH3mbqnvF8K3DP@&5*6qhJWZayz*4AMOPHvu!hTpM0-rqN5J?%t zO(8n*QIu?xg_Ho{q#FlnQkYI;Fud{&Uc~Q3!bCYBCQsaC11$vYNNOKoHby1JlHLJ= zm=G%vVLavH`2w-D8&-k%DEy`7B;;)%h=l;Mkb$%Sg)w)bK9!^1EZ-q!Muha>IRa=^ zMuSEfB>*W+p>UwD zpmhPU+W~~(*75_a1kVFV1~AOFI$e(pvc|!@O+1fC0#X7HVPQ;Olw)&IT!-s($AM*BnH&)-YglGw{RI@mZ;&5HXl49AWzs_^# z-Fz9f1bD11D@l7dnkjfpajxWSY%{Qhxw^l3-HpkRb6;BkNbXU_`;LflCCn!M!5{0p z>qx-EOC- z3%YLuhxT{Lm?Nst$(s@J}QIEGG4?x&?J{!RH~X-G*5U@X0+yqq{D`cEhD z^j4_}LWXW+(CIj|g&gNYQqncRi>BB3lRRNp|4!}ZQ|t-Am18oGcIn^zOV$DSuK>OQ X>mmvvDMfe400000NkvXXu0mjfx*s{1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2d49b2e25ddc92e8ff283a666401b377de07d340 GIT binary patch literal 615 zcmV-t0+{`YP)Px%AxT6*RCt{2+A(X}KpX||Cr4Bzs?(u3gQ#ifP_RL0@X#uYL%>_&AzMCy`w>D1 z4IR36H5mgTA0XY@p|Eqa`H zdEB;ZDob9Pf<#Ee3lK#SwhDdxy$QQcMMY7Bh8JYY+jS}zS+-qMTZKNdn#aN0=y-%^?6_ zp;!a}l+7W+M8S`Bw3>rk$(v;64OnR(X&YV%mZ4!g0Q^`7FuHCBfMsad@Jd)|A6@I; zlFpk%Bm@BJ4=TzsMsWvshFJbNT6mZ!d^r0&^*qvf{~{9fXz7Vck^v0kF5bR;h{ftU zPCEN&cmc-aUyi%io=Z9}jY!C*RaGDF4PhEZeDC$JQ2cX^lOCQ%`cyA0>AW<$L`bVS zfb-5oxzLBN8#p}s0cYMA-TyN1tQljkeS3Ln#Ga-1&mSvmc?pZv^^38S&OX9}<4i9s z={zDLA|fIpA|fIp$}{OcLas>m5k&d{H%+pSkh>2I(*1$lodD_nK<+j`x<8P+M_^2< zKak4}kn9iSaswp$10wx^nU^4Y|aSW-L z^Y)fu_H73Vwg=byR(QoMcP?ZLynJC{Li2|Q3q!@)8@3;D-u8#-yLtNH@{UDnX}~g2OIv-?Z$JT1RI^&J@H*~jc}P4>&NALR=#d6U9AyT z#FT$NNaO4|h54KxU!7LHXEVp~wt2yg{YNtDw%?w!<9~kl?D9vvE3UI;{ASzL=wK(z z#PDoWBmMbBY=8I9Gs&*uami_KSg^ZHsoC|F$7gDuE%T}+e;JK{oE1U85*I|DcM$Q) zZvYAhYUF|`7p^tY=Nq`5UH~iM197x6>l=DNI+f;1{6Bd4|8w=uIUCd7|6bhzOic`) Lu6{1-oD!M Date: Tue, 24 Dec 2024 14:57:15 +0500 Subject: [PATCH 5/8] dsada --- .../hos.rsi/equipped-INNERCLOTHING-monkey.png | Bin 1134 -> 0 bytes .../Uniforms/Jumpskirt/hos.rsi/inhand-left.png | Bin 615 -> 0 bytes .../Uniforms/Jumpskirt/hos.rsi/inhand-right.png | Bin 635 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png delete mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png delete mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png deleted file mode 100644 index 2c2b70610caf7dfc96e8e8d45e7b7cc25e5f8edd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1134 zcmV-!1d;oRP)Px(C`m*?RCt{2nn7sWW)#Q&w!cQ5oiwzKf}O^(y9IACGYO;vx0kLag9V!H&|ON) z1|>8JG>6^N9tPVX1bXmchn03vW+>}*B+$WNS?M7=WCs(-R?}_m)Y`>fm&UeaD>(ah z@TA&K0{&DhVeI|DJoHKW{!h=Jo`l{52!bF8f*}5P3U?VlC&SQ zoh~RU!#DCF0Kn4H-IlKeLqGT^hto2LqB3)z-&4Ut&Vh#kSy;d66_Czka7oLW+fz(} z+$Cd*N#@ukEsJy})9jQ&82W>57l7(T8$SRTbh|9+Hx;S5{s{MbDo|90J8Kn;9%S%) zDwzA*jTxu5Wn57iW*)4xY!z&$--uQHrdB{w+cfR{HWf*26N<`^FBG7ttZuya_*Su< ze&c?t`ddS}4HNH`F*H7nw^rwo{y2lhwj$DN9-yNd`TK1uUf=NG)3_Ji;V~Tf@^gHB zt!W=D=|gKb_b>9IWqsjg>h<+;N!pL^KI=tycnsOqdA#$a(emWC8~RP< z0E6g=iYH4_UA8qWP(gG=1s(`plMr_33;$cGM2vTb$F_`TSLYG>@O#^Hz+USU1VIo4 zK@bE%5ClOG1o7X-(nrKVFvJgZbU^YP001oixVR@DBacN-aRAWOJo1GC9z9G6`(erP zA0}Vr0PxYb)vxNZ_sFgX;aKz(&pmwt0QlH$d}w?cmy>>+*kG7q z5_C0>vpr#3nhr#JSRjS(v!> zO53ir$V4K;yivQoy&dUHM))=mstlbxJitd8gI~+ydKySd4gl5aOnzM#x`>w{Uns!; zZ&ylE+r*(Y4HtVgC``hg!vp;8v!7evAySK?GP5RUFx%-uAQ-a!HV6bme74hNZX5N% z+Ljp+gaU9Q?!)Bm3y6-WNbB5eN?6EM9nkf%B_~AC^)eKdVIk)*8za&>M|4ER+hSM^yvp}_m zZx_bgJ82ufiC}5D?q!Xh`U41pAP9mW2%;tY1NR3&F|NCd-T(jq07*qoM6N<$f)#Wn Ak^lez diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png deleted file mode 100644 index 2d49b2e25ddc92e8ff283a666401b377de07d340..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 615 zcmV-t0+{`YP)Px%AxT6*RCt{2+A(X}KpX||Cr4Bzs?(u3gQ#ifP_RL0@X#uYL%>_&AzMCy`w>D1 z4IR36H5mgTA0XY@p|Eqa`H zdEB;ZDob9Pf<#Ee3lK#SwhDdxy$QQcMMY7Bh8JYY+jS}zS+-qMTZKNdn#aN0=y-%^?6_ zp;!a}l+7W+M8S`Bw3>rk$(v;64OnR(X&YV%mZ4!g0Q^`7FuHCBfMsad@Jd)|A6@I; zlFpk%Bm@BJ4=TzsMsWvshFJbNT6mZ!d^r0&^*qvf{~{9fXz7Vck^v0kF5bR;h{ftU zPCEN&cmc-aUyi%io=Z9}jY!C*RaGDF4PhEZeDC$JQ2cX^lOCQ%`cyA0>AW<$L`bVS zfb-5oxzLBN8#p}s0cYMA-TyN1tQljkeS3Ln#Ga-1&mSvmc?pZv^^38S&OX9}<4i9s z={zDLA|fIpA|fIp$}{OcLas>m5k&d{H%+pSkh>2I(*1$lodD_nK<+j`x<8P+M_^2< zKak4}kn9iSaswp$10wx^nU^4Y|aSW-L z^Y)fu_H73Vwg=byR(QoMcP?ZLynJC{Li2|Q3q!@)8@3;D-u8#-yLtNH@{UDnX}~g2OIv-?Z$JT1RI^&J@H*~jc}P4>&NALR=#d6U9AyT z#FT$NNaO4|h54KxU!7LHXEVp~wt2yg{YNtDw%?w!<9~kl?D9vvE3UI;{ASzL=wK(z z#PDoWBmMbBY=8I9Gs&*uami_KSg^ZHsoC|F$7gDuE%T}+e;JK{oE1U85*I|DcM$Q) zZvYAhYUF|`7p^tY=Nq`5UH~iM197x6>l=DNI+f;1{6Bd4|8w=uIUCd7|6bhzOic`) Lu6{1-oD!M Date: Tue, 24 Dec 2024 16:12:13 +0500 Subject: [PATCH 6/8] Update meta.json --- Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json index 60705f71d40a..2b78bcd69837 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json @@ -14,6 +14,5 @@ "name": "equipped-INNERCLOTHING", "directions": 4 } - ] } From 8be73b8237fc1a7ea2dac01a719b4fc6fe7c8722 Mon Sep 17 00:00:00 2001 From: Tris0r <163807362+Tris0r@users.noreply.github.com> Date: Wed, 25 Dec 2024 10:08:28 +0500 Subject: [PATCH 7/8] NikoNikoNiiii --- .../Entities/Clothing/Uniforms/jumpskirts.yml | 24 +++++++++---------- .../Uniforms/Jumpskirt/jumpskirts.yml | 11 --------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index dcb480fbccb2..927bbe38e9b0 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -174,17 +174,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/hop.rsi - #ss220 FIX START -#- type: entity -# parent: [ClothingUniformSkirtBase] -# id: ClothingUniformJumpskirtHoS -# name: head of security's jumpskirt -# description: It's bright red and rather crisp, much like security's victims tend to be. -# components: -# - type: Sprite -# sprite: Clothing/Uniforms/Jumpskirt/hos.rsi -# - type: Clothing -# sprite: Clothing/Uniforms/Jumpskirt/hos.rsi +- type: entity + parent: [ClothingUniformSkirtBase] + id: ClothingUniformJumpskirtHoS + name: head of security's jumpskirt + description: It's bright red and rather crisp, much like security's victims tend to be. + components: + - type: Sprite + sprite: SS220/Clothing/Uniforms/Jumpskirt/hos.rsi #ss220 fix + - type: Clothing + sprite: SS220/Clothing/Uniforms/Jumpskirt/hos.rsi #ss220 fix + #ss220 fix start # - type: Item # inhandVisuals: # left: @@ -199,7 +199,7 @@ # sprite: Clothing/Uniforms/Jumpskirt/color.rsi # - state: overlay-inhand-right # sprite: Clothing/Uniforms/Jumpskirt/hos.rsi - #ss220 FIX END + #ss220 fix end - type: entity parent: [ClothingUniformSkirtBase] diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpskirt/jumpskirts.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpskirt/jumpskirts.yml index 94a9f5a99fab..b7ae0affe367 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpskirt/jumpskirts.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpskirt/jumpskirts.yml @@ -334,14 +334,3 @@ - type: Clothing sprite: SS220/Clothing/Uniforms/Jumpskirt/professor.rsi -# ГСБ -- type: entity - parent: [ClothingUniformSkirtBase] - id: ClothingUniformJumpskirtHoS - name: head of security's jumpskirt - description: It's bright red and rather crisp, much like security's victims tend to be. - components: - - type: Sprite - sprite: SS220/Clothing/Uniforms/Jumpskirt/hos.rsi - - type: Clothing - sprite: SS220/Clothing/Uniforms/Jumpskirt/hos.rsi From cbc82acffee824aaab666fa15931aca57b0d9ae3 Mon Sep 17 00:00:00 2001 From: Kirus59 <145689588+Kirus59@users.noreply.github.com> Date: Wed, 25 Dec 2024 11:05:04 +0300 Subject: [PATCH 8/8] Update jumpskirts.yml --- .../SS220/Entities/Clothing/Uniforms/Jumpskirt/jumpskirts.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpskirt/jumpskirts.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpskirt/jumpskirts.yml index b7ae0affe367..9f55f2250f41 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpskirt/jumpskirts.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpskirt/jumpskirts.yml @@ -333,4 +333,3 @@ sprite: SS220/Clothing/Uniforms/Jumpskirt/professor.rsi - type: Clothing sprite: SS220/Clothing/Uniforms/Jumpskirt/professor.rsi -