From dce680065d5af1a7b7e15f246c205a7ccca4306b Mon Sep 17 00:00:00 2001 From: AsikKEsel <115815982+AsikKEsel@users.noreply.github.com> Date: Fri, 21 Apr 2023 02:54:31 +0300 Subject: [PATCH] [Entity] Add new medals (#15577) * Add 6 new medals * Update medalcase.yml * Update medals.yml * Update medalcase.yml --- .../Catalog/Fills/Lockers/heads.yml | 3 +- .../Entities/Clothing/Neck/medals.yml | 72 +++++++++++++++++- .../Entities/Objects/Misc/medalcase.yml | 23 ++++++ .../Medals/cargomedal.rsi/equipped-NECK.png | Bin 0 -> 202 bytes .../Neck/Medals/cargomedal.rsi/icon.png | Bin 0 -> 357 bytes .../Neck/Medals/cargomedal.rsi/meta.json | 18 +++++ .../Medals/clownmedal.rsi/equipped-NECK.png | Bin 0 -> 205 bytes .../Neck/Medals/clownmedal.rsi/icon.png | Bin 0 -> 280 bytes .../Neck/Medals/clownmedal.rsi/meta.json | 18 +++++ .../engineermedal.rsi/equipped-NECK.png | Bin 0 -> 207 bytes .../Neck/Medals/engineermedal.rsi/icon.png | Bin 0 -> 362 bytes .../Neck/Medals/engineermedal.rsi/meta.json | 18 +++++ .../Medals/medicalmedal.rsi/equipped-NECK.png | Bin 0 -> 212 bytes .../Neck/Medals/medicalmedal.rsi/icon.png | Bin 0 -> 409 bytes .../Neck/Medals/medicalmedal.rsi/meta.json | 18 +++++ .../Medals/sciencemedal.rsi/equipped-NECK.png | Bin 0 -> 218 bytes .../Neck/Medals/sciencemedal.rsi/icon.png | Bin 0 -> 322 bytes .../Neck/Medals/sciencemedal.rsi/meta.json | 18 +++++ .../securitymedal.rsi/equipped-NECK.png | Bin 0 -> 206 bytes .../Neck/Medals/securitymedal.rsi/icon.png | Bin 0 -> 331 bytes .../Neck/Medals/securitymedal.rsi/meta.json | 18 +++++ .../Objects/Storage/medalcase.rsi/icon.png | Bin 0 -> 467 bytes .../Objects/Storage/medalcase.rsi/meta.json | 14 ++++ 23 files changed, 215 insertions(+), 5 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Misc/medalcase.yml create mode 100644 Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/meta.json create mode 100644 Resources/Textures/Objects/Storage/medalcase.rsi/icon.png create mode 100644 Resources/Textures/Objects/Storage/medalcase.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 26f0841619..53707fe2d8 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -55,11 +55,10 @@ - id: ClothingNeckCloakCapFormal - id: ClothingUniformJumpsuitCapFormal - id: ClothingUniformJumpskirtCapFormalDress - - id: ClothingNeckBronzeheart - - id: ClothingNeckGoldmedal - id: RubberStampCaptain - id: WeaponAntiqueLaser - id: JetpackCaptainFilled + - id: MedalCase - type: entity id: LockerHeadOfPersonnelFilled diff --git a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml index 67e3a3fa3e..3ac3fb126e 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml @@ -3,13 +3,13 @@ parent: ClothingNeckBase id: ClothingNeckBronzeheart name: bronzeheart medal - description: Given to crewmates for exemplary bravery in the face of danger. + description: Given to crewmates for exemplary bravery in the face of danger. components: - type: Sprite sprite: Clothing/Neck/Medals/bronzeheart.rsi - type: Clothing sprite: Clothing/Neck/Medals/bronzeheart.rsi - + - type: entity parent: ClothingNeckBase id: ClothingNeckGoldmedal @@ -19,4 +19,70 @@ - type: Sprite sprite: Clothing/Neck/Medals/gold.rsi - type: Clothing - sprite: Clothing/Neck/Medals/gold.rsi \ No newline at end of file + sprite: Clothing/Neck/Medals/gold.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCargomedal + name: cargo medal + description: Given for the best work in the cargo department. + components: + - type: Sprite + sprite: Clothing/Neck/Medals/cargomedal.rsi + - type: Clothing + sprite: Clothing/Neck/Medals/cargomedal.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckEngineermedal + name: engineer medal + description: Given for the best work in the engineering department. + components: + - type: Sprite + sprite: Clothing/Neck/Medals/engineermedal.rsi + - type: Clothing + sprite: Clothing/Neck/Medals/engineermedal.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckMedicalmedal + name: medical medal + description: Given for the best work in the medical department. + components: + - type: Sprite + sprite: Clothing/Neck/Medals/medicalmedal.rsi + - type: Clothing + sprite: Clothing/Neck/Medals/medicalmedal.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckSciencemedal + name: science medal + description: Given for the best work in the science department. + components: + - type: Sprite + sprite: Clothing/Neck/Medals/sciencemedal.rsi + - type: Clothing + sprite: Clothing/Neck/Medals/sciencemedal.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckSecuritymedal + name: security medal + description: Given for the best work in the security department. + components: + - type: Sprite + sprite: Clothing/Neck/Medals/securitymedal.rsi + - type: Clothing + sprite: Clothing/Neck/Medals/securitymedal.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckClownmedal + name: clown medal + description: Given for the best joke in the universe. HONK! + components: + - type: Sprite + sprite: Clothing/Neck/Medals/clownmedal.rsi + - type: Clothing + sprite: Clothing/Neck/Medals/clownmedal.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml b/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml new file mode 100644 index 0000000000..4826179114 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml @@ -0,0 +1,23 @@ +- type: entity + id: MedalCase + name: medal case + description: Case with medals. + parent: BaseStorageItem + components: + - type: Sprite + sprite: Objects/Storage/medalcase.rsi + - type: Item + sprite: Objects/Storage/medalcase.rsi + size: 80 + - type: Storage + capacity: 80 + - type: StorageFill + contents: + - id: ClothingNeckGoldmedal + - id: ClothingNeckBronzeheart + - id: ClothingNeckCargomedal + - id: ClothingNeckEngineermedal + - id: ClothingNeckMedicalmedal + - id: ClothingNeckSciencemedal + - id: ClothingNeckSecuritymedal + - id: ClothingNeckClownmedal diff --git a/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..dc7f5ed4ea5299a4516334ea1fa25d22a50055fa GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|T0C7GLn`LH zy|j^&$x)!~qP(erNX|h!og;s42~2+da8b9;p*Wr#2LlnlNMY?A(bt~r%~;f*ID>_O zA)!rCv;Xxz9?zfO^@`VMnH;}!kdUXVpUXO@geCyN;Ye!$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b5c4245c2a6e297b5cef6ea2f20675ac4032936f GIT binary patch literal 357 zcmV-r0h<1aP)Px$A4x<(R9J=Wl%Z0?KoCG5B%&fBQ&)q?R8WJ8XV9Gr6f^Jv={I0HF?>Vw0o903 zH9rtllL{sR6PtkuL_0yE|jJ3r9eC@`|)Y}KMoi>f! ze3N=DKyMh@x%cN9fb-c-oKLi2lX|TwyjpG<4H}9nU_9}yh*Uy#4a>Z?#YcmN)pDyz zBNO=CeNhEmT%CQ9=nX^ri+)|eQ06r^w|$zoSE4vPkkB9&h~kj-(~FHw@uCV;0_sCp z=JkQZc;c%Lq52(&;{9zfw?M=HdI!D}(H3?%91g<=-~wn`W11Ju00000NkvXXu0mjf DCR>-# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/meta.json b/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/meta.json new file mode 100644 index 0000000000..1a18a12dbf --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by AsikKEsel", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..78b556680a27662fcedc077896ede1b4986e2c1c GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|+C5zyLn`LH zy|Pj8kOL3Pf$Fw1PiJUpHdwu}EAUlnXkcmD&d$GK_MWEey;C$885;Iqsgll?(e^Bg zy%e={mFn`3a=Ucy?wnutBDZGi6La1DovY@o4hpq=Z|mLv_*TQt)QTyGZ};!d@>(@% u)}&k2)8y`&KRB6Mw?{gK5okFKyuQm2AR-em^E0C#NXXOG&t;ucLK6ValT8c& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..25aa78b0b571ce87ad1d69c8a50753f1ee94747e GIT binary patch literal 280 zcmV+z0q6dSP)Px#(n&-?R9J=WltBu@Fc3w5#H$!^(N!Kv#tn^f2FrO&G<+%+ykZc`%fO zZXNf=JJ1Z|6*}gPHStNzJ$_(BoxEQDE5NdR>zu5L7WFNV%mDJs5Hf(9 zN5snK-?Qsl1!N^WRWKPSOLB^FHQ_N}ZowJAJWbMAYscouHWU$?m;alAxAU;V!0zwB e?k`~w1i=&jU83sn>X4WK0000dKG|%z`%kV(m!8IYMe8>#0e7eboFyt=akR{07*4c4*&oF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f7f607915c8a4b0d516623456253df2e3e4777fb GIT binary patch literal 362 zcmV-w0hRuVP)Px$BuPX;R9J=Wm9c8WFc5~n1`mw~LkE*=E)>#c?-=?Jd4W8eUmy=rN~iA4lEIsU z3k45$3&QSDEGcBs9dxR`Nw($t|C8<{h(sd)ovYxPPmFf_FoVaX`}S7DVQ|mS;c;id z2L6a}1EE<7vIj^clU?v(gxbA73}WF4)la~AO(?}dx&j_$%g^BHE zX}2g8aSfQR<$iUG`R+;5j3URH&>-G|B+dBxbW1*oS52=nASxJt8%)=pnYb$!>|bhe zC#dg&B+W?D%!+Ff_wB_wFc|i)AAs&0P#>XwwQGbUkw|3X2e1=nOqBn+RiF^X@J#(=RXq-2elp{xTSE5KK5R{q$Fmkf*Dk%Q~loCIGmG BN*w?I literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..092a6843e972eaafcc47ed2d5b97796882797388 GIT binary patch literal 409 zcmV;K0cQS*P)Px$Q%OWYR9J=Wl`(6BKorOSmTnfILnB!#NWi7IwNS7_3C-L&8A3unKt4*pLCBDP z2ur2}0?8&>Tm+|}-Gm!DU8lR6*5$oMO2OZB_tbkoz4uO_q2Z4)s1LM)p;Y61JvYA3 zsq39{lDE4LFdYv7WM@2qNMjt9E3|^4q)MDoZUzAJ#?|A_cv2a!Rp8Y8FM)hLH^e@v zye9TZ{Y9uG0LXUtD|T3}SjhoK8!CR=ehTszP+VMJ>T%9pgd^bgrxE~qgOQGffCPZ# z^`+h#aQjoK5^uIUn2raL##$x>BvpddhEZ1N-b1P8K!Z(Ddv-t}B17ir8AAQen`8=|Z@lDNOSMYx!eJAwT# z@NEmeZRzA($bDOR4lHH>c;^872rXATCvihVLxbWI!ncSjQJQeK00000NkvXXu0mjf DUt_S3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/meta.json b/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/meta.json new file mode 100644 index 0000000000..1a18a12dbf --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by AsikKEsel", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..9d618bbc577d070ad2b620aa08fe16e33908dc8b GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|rg*wIhE&XX zds&f-DN%s!!ug}KIphur-$Px#{7FPXR9J=WltBu@Fc3w5f{UJ@xC%nS11J={L03vI(?fU}>CPJn1wBB)O;({N z=&IvF5?btL28t+oP)deQ=1s{2h(sb%>Xs&NAxfH9>M9hz3}^8^nw?R%RO*WCkikEt zu1NYP_yVVG==Oel%*K}$7}KN}zJ3Pe{L2)u6Mf-g$U^L@pJEYKLa8hAg&Xu( zs}7D*gUlpp2KiJ>=mI8`q+CMB`|=VzHGoLiEfo-WM5@Wb1; z@WHQ$>z7r}8l~2LJ-T=8)@uC?+ojkgW~X{h+US&BeEiaZ;(g`&H}0N#tSsO$^RLef teJAY$iktEooO$m*iAOXFXgdrz?9|`QEa;ubwR;Un$kWx&Wt~$(69BH_M|J=J literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f682bdbccb24daba16aabc091206daad4d077985 GIT binary patch literal 331 zcmV-R0kr;!P)Px$1xZ9fR9J=Wlrav1KoCX0i_xGa8lxmy(%5(dD+{mSB|L+bXYdkU!pa-a*ib^E z#tPVIfVGhoqRosZHv2j@+4*n7%m4<%pQ({A%r^?{Ayj|zI=dc$_zbmQlj{lUg@?296fkUQX;fb#Cx-G%g=2t_VqBHE>iB>_stJwv9x} zvW%iiu%^Jzavk2XZFo`4DMJ$|zdn%?vu5K>VmTUDdgG@81%8%e(d!~iQ@EC>NN^wv zxR$`-cGurUcp@cBfYdPM-{5C?MPk}%V;2VGNno#H*Aj3op~Jb5=l0Vc*o6TA-X8e- dCNvlfh6m9?Yyx9+(k1`^002ovPDHLkV1nB5hxq^i literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/meta.json b/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/meta.json new file mode 100644 index 0000000000..1a18a12dbf --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by AsikKEsel", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/Objects/Storage/medalcase.rsi/icon.png b/Resources/Textures/Objects/Storage/medalcase.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1a3618ef0b0546d2f3fcb5d64624b288af33af14 GIT binary patch literal 467 zcmV;^0WAKBP)Px$jY&j7R9J=WmcL5FP!z_$h=!(VZml3lvsyZd;0u_!kKiCUh@HFHxm55C#Hk(h z1;n|p&^op1*ebz68xm9V&!MzfrOnN;p@{t;5OO}g^W)sZCBRZk{dWmGri0^?fD(Rn zc@dhwI;&VJl>){XI^8D}G>yU#gh9*%_^xbzm)qNGH@SRV00m7OH{ajva0OqtxolYB zvmsLRDB=c)qd5?92fpfT=Ma02gRG+9#

KS108}I)XSv2FM5kOaMK@Kt|xYPUZ_R zk~!u3!+jg-I*SjW*s4JnMd+f4Vyi}tp)cV;uHfh~2hX!$p^T(mov0iAJ`$1?nnRkv zK(0WNRYCOn0HfxlNuwF9?}1`3)6N7>?rSi}4L0LG!la}+z57XDkl)F;t&bwX(LDIfp<002ov JPDHLkV1ly&(R2U+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/medalcase.rsi/meta.json b/Resources/Textures/Objects/Storage/medalcase.rsi/meta.json new file mode 100644 index 0000000000..384aae8a73 --- /dev/null +++ b/Resources/Textures/Objects/Storage/medalcase.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by AsikKEsel", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] + } -- 2.51.2