From 2cc4f59c784b9becad2054a2f2dacfe1bcbb931c Mon Sep 17 00:00:00 2001 From: Helm4142 Date: Fri, 17 Jan 2025 12:14:28 +0600 Subject: [PATCH] Deleting past PR --- .../ru-RU/ss220/markings/human_hair.ftl | 6 --- .../Mobs/Customization/Markings/human.yml | 49 ------------------ .../Customization/human_hair.rsi/bob6.png | Bin 790 -> 0 bytes .../Customization/human_hair.rsi/frieren.png | Bin 760 -> 0 bytes .../Customization/human_hair.rsi/long5.png | Bin 917 -> 0 bytes .../Customization/human_hair.rsi/longwavy.png | Bin 884 -> 0 bytes .../Customization/human_hair.rsi/meta.json | 35 ------------- .../human_hair.rsi/shortwavy.png | Bin 635 -> 0 bytes .../Customization/human_hair.rsi/uraraka.png | Bin 654 -> 0 bytes 9 files changed, 90 deletions(-) delete mode 100644 Resources/Locale/ru-RU/ss220/markings/human_hair.ftl delete mode 100644 Resources/Prototypes/SS220/Entities/Mobs/Customization/Markings/human.yml delete mode 100644 Resources/Textures/SS220/Mobs/Customization/human_hair.rsi/bob6.png delete mode 100644 Resources/Textures/SS220/Mobs/Customization/human_hair.rsi/frieren.png delete mode 100644 Resources/Textures/SS220/Mobs/Customization/human_hair.rsi/long5.png delete mode 100644 Resources/Textures/SS220/Mobs/Customization/human_hair.rsi/longwavy.png delete mode 100644 Resources/Textures/SS220/Mobs/Customization/human_hair.rsi/meta.json delete mode 100644 Resources/Textures/SS220/Mobs/Customization/human_hair.rsi/shortwavy.png delete mode 100644 Resources/Textures/SS220/Mobs/Customization/human_hair.rsi/uraraka.png diff --git a/Resources/Locale/ru-RU/ss220/markings/human_hair.ftl b/Resources/Locale/ru-RU/ss220/markings/human_hair.ftl deleted file mode 100644 index fca744671c64..000000000000 --- a/Resources/Locale/ru-RU/ss220/markings/human_hair.ftl +++ /dev/null @@ -1,6 +0,0 @@ -marking-HumanHairBob6 = Каре 6 -marking-HumanHairFrieren = Фрирен -marking-HumanHairLong5 = Длинная 5 -marking-HumanHairLongWavy = Вьющиеся (Длинная) -marking-HumanHairShortWavy = Вьющиеся (Короткая) -marking-HumanHairUraraka = Урарака \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Entities/Mobs/Customization/Markings/human.yml b/Resources/Prototypes/SS220/Entities/Mobs/Customization/Markings/human.yml deleted file mode 100644 index 5f83075e950d..000000000000 --- a/Resources/Prototypes/SS220/Entities/Mobs/Customization/Markings/human.yml +++ /dev/null @@ -1,49 +0,0 @@ -# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt - -- type: marking - id: HumanHairBob6 - bodyPart: Hair - markingCategory: Hair - sprites: - - sprite: SS220/Mobs/Customization/human_hair.rsi - state: bob6 - -- type: marking - id: HumanHairFrieren - bodyPart: Hair - markingCategory: Hair - sprites: - - sprite: SS220/Mobs/Customization/human_hair.rsi - state: frieren - -- type: marking - id: HumanHairLong5 - bodyPart: Hair - markingCategory: Hair - sprites: - - sprite: SS220/Mobs/Customization/human_hair.rsi - state: long5 - -- type: marking - id: HumanHairLongWavy - bodyPart: Hair - markingCategory: Hair - sprites: - - sprite: SS220/Mobs/Customization/human_hair.rsi - state: longwavy - -- type: marking - id: HumanHairShortWavy - bodyPart: Hair - markingCategory: Hair - sprites: - - sprite: SS220/Mobs/Customization/human_hair.rsi - state: shortwavy - -- type: marking - id: HumanHairUraraka - bodyPart: Hair - markingCategory: Hair - sprites: - - sprite: SS220/Mobs/Customization/human_hair.rsi - state: uraraka \ No newline at end of file diff --git a/Resources/Textures/SS220/Mobs/Customization/human_hair.rsi/bob6.png b/Resources/Textures/SS220/Mobs/Customization/human_hair.rsi/bob6.png deleted file mode 100644 index 9e5c829d206aafc035f95aa21d0b7b5482b5986e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 790 zcmV+x1L^#UP)Px%&`Cr=RCt{2nmvxIFcgK4pI%9A$&wd9=ZZer#IQ!Q38zm*m-I+T-h^NA<~oKU zgH1vv(%erP5wP+7!Lc)(3;c3KZpRQp{M>b2kW#{X4?2E)e8jPY$R0MEz3l(Z?RdRj zL*Mt1Qo6soG4WVxy;k+$zanpg^+Y|;6= zUk=%8z&MVR<9w>k+xLLR)>>m2hA+o0wzFq|_kMEBX%8Vh^fw=$zJm1iBPe)U7)vNx zFs!vfN{Qp~_~kz5T=3qbZQIy34+8jpi<j*33z8X0YB})PxF!lENzGH z!duROS0-%N1kh^!%2l0V7=~dOhG7_nVVG4m{i9AoDR7gkmc)`hAq_C~V~Y>PFGQ@h zfrL;JLzPlduvn6{9$`r?BOm5|d?%XRqbLE+xj+&%>2sva8e=v&P>QuSkPJ??Ngy@G z?57R`H;Ft|WC6sQ0pNe7Mp~}&C_;$%6=pGISK`&UVsuGvWC6EvId|acbJ|N9F zUE4D4O1bw|S!*3-@^nU))Cd&s0%;=NiPFG{>;$xJE0zol!?0^%)IFSYVQIRT7D;Sc zt*KH&DTTi8VT?iF_h{Qz?4|9ev)4GlmGw#07*qoM6N<$f`Kt@3;+NC diff --git a/Resources/Textures/SS220/Mobs/Customization/human_hair.rsi/frieren.png b/Resources/Textures/SS220/Mobs/Customization/human_hair.rsi/frieren.png deleted file mode 100644 index 9726560d66da456c9da3f75a947f075893fca985..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 760 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 KMNUMnLSTZLPp0nx diff --git a/Resources/Textures/SS220/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/SS220/Mobs/Customization/human_hair.rsi/meta.json deleted file mode 100644 index f4c7ba214a14..000000000000 --- a/Resources/Textures/SS220/Mobs/Customization/human_hair.rsi/meta.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "sprited by Dinazewwr (discord) for SS220", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "bob6", - "directions": 4 - }, - { - "name": "frieren", - "directions": 4 - }, - { - "name": "long5", - "directions": 4 - }, - { - "name": "longwavy", - "directions": 4 - }, - { - "name": "shortwavy", - "directions": 4 - }, - { - "name": "uraraka", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/SS220/Mobs/Customization/human_hair.rsi/shortwavy.png b/Resources/Textures/SS220/Mobs/Customization/human_hair.rsi/shortwavy.png deleted file mode 100644 index c206c1dabad0830d45fded05cd0cba791d23f980..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 635 zcmV->0)+jEP)Px%HAzH4RCt{2nlXy&Fc5}+KekkD5cmM;RQUj@bAX)D2S}|0q;jVN2n4Ft>lI)TBGG9R3$)U z0HBl_rfGswYACPwq)h(aDKDXx!wIm~W|7FC%cBI>Iu&dDz#|#*k@FV+p#&_;l1s^c zs-=`R!O8vK#ojNT5CUFZukn8zxoI3nXsxlXD^91=m(^Bg!m=#c7<1Hpn9>hC1|DMs z0K^z!jDhza>$;-We|YOiDP@sdE|=$^<-6PM24f7$b>TY^e+U6u>t_-qIdZ+$e`p2( zkGCvSe=kr<4bHjTYw+T**5(-FmwmsS@~>tnA%qY@2qA0IciUl!WT?IPjTyDNoPy z3;>&edLa&RN(>THclKQwDWzw3h+OaGE;~`gyYCq3<=zBP4t_u2o&4B zi=!n{nJxPTq$t{R4Je;2Gr@cRT!dS?RI1hhX+n^idPx%NJ&INRCt{2nm?}NAP~mCthRKGgv0^Txyk`@3ZIcvZ~#~CH~&bZ(2;^#^6-j{J40RTDY>c_Gyn5Ic=|CeNPjIjpqoP%=?!!TUh zaj63m+TfjY)eis|#}Pf1C`tgsfphTe#L*aIs{O4$?YM;935YQkHq^fL_Oo;DuqyE0 z7i%qY&JV|VIY_HucLJPqXxIK0Yc1w^KD-)kw;KQ;rBwHy_P&(e31CCd0_6KV@6#A# zuq?~d=ckmgEQ@#<{N6h;=L{lxIp@3acOW7dW9kxkbT!6^eb`+Ae8jza1MR#|GfmTl zh`{>*5q-H@Ye7WfqfqQ@jIms=*MGkE?EVov+UR5o4D6-7}LMNt$*Q4~c{ z6h%>#57G5kviH6iW2!oPraTV(?GM=6?$HE*js&no-AZ9BO!R8>5;%Ca+4|9AUnGyW z!Kaj}QHHhqBWZ(Xt&oM%o*n^F0*oRx{6-)tCWm+nZ?oI%g zUP=i>RE=@)+n#}=;C+TWMEIo;5mHL9)tD*ylh