From 0956ac7ddde7f16b23baa0a3fe91102bc23fd292 Mon Sep 17 00:00:00 2001 From: lzk228 <124214523+lzk228@users.noreply.github.com> Date: Mon, 24 Apr 2023 22:55:12 +0300 Subject: [PATCH] Added outlaw glasses to uplink catalog (#15316) --- .../Locale/en-US/store/uplink-catalog.ftl | 3 ++ .../Prototypes/Catalog/uplink_catalog.yml | 10 +++++++ .../Entities/Clothing/Eyes/glasses.yml | 13 +++++++++ .../outlawglasses.rsi/equipped-EYES.png | Bin 0 -> 948 bytes .../Eyes/Glasses/outlawglasses.rsi/icon.png | Bin 0 -> 810 bytes .../Glasses/outlawglasses.rsi/inhand-left.png | Bin 0 -> 693 bytes .../outlawglasses.rsi/inhand-right.png | Bin 0 -> 679 bytes .../Eyes/Glasses/outlawglasses.rsi/meta.json | 26 ++++++++++++++++++ 8 files changed, 52 insertions(+) create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/equipped-EYES.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index dbb18e6d94..cea89d8817 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -232,6 +232,9 @@ uplink-cat-ears-desc = UwU uplink-outlaw-hat-name = Outlaw Hat uplink-outlaw-hat-desc = A hat that makes you look like you carry a notched pistol, numbered one and nineteen more. +uplink-outlaw-glasses-name = Outlaw Glasses +uplink-outlaw-glasses-desc = A must for every self-respecting undercover agent. + uplink-costume-pyjama-name = Syndicate Pyjama Duffel Bag uplink-costume-pyjama-desc = Contains 3 pairs of syndicate pyjamas and 3 plushies for the ultimate sleepover. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 44b78418dd..f3bf002909 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -903,6 +903,16 @@ categories: - UplinkPointless +- type: listing + id: UplinkOutlawGlasses + name: uplink-outlaw-glasses-name + description: uplink-outlaw-glasses-desc + productEntity: ClothingEyesGlassesOutlawGlasses + cost: + Telecrystal: 1 + categories: + - UplinkPointless + - type: listing id: UplinkCostumePyjama name: uplink-costume-pyjama-name diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 5c80c73793..4d68aeca73 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -87,6 +87,19 @@ sprite: Clothing/Eyes/Glasses/glasses.rsi - type: VisionCorrection +- type: entity + parent: ClothingEyesBase + id: ClothingEyesGlassesOutlawGlasses + name: outlaw glasses + description: A must for every self-respecting undercover agent. + components: + - type: Sprite + sprite: Clothing/Eyes/Glasses/outlawglasses.rsi + - type: Clothing + sprite: Clothing/Eyes/Glasses/outlawglasses.rsi + - type: VisionCorrection + - type: IdentityBlocker + - type: entity parent: ClothingEyesBase id: ClothingEyesGlassesSunglasses diff --git a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..56ce8dd4ad2bcac0857863ba4c1c68bf278c0d9c GIT binary patch literal 948 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|*86aP zNSl22(j;xy5`n@K3zU)^MUDi%eh}ocsws53+Bav9+Y`2U6pF^ku&`e|y8dAOg4GXJ zDR6WtJbL!-x{}cOTrS;3=6B|_f4}#=;1gSo;pG#S{|Zk$?Jld)TBWNZw)FsaUDFo9 zG=)ryYe&xb^weK}F3Y>>o?FQJ|L_0qY|_>|-q4ozF!1oE?n6er8@Dc6TH(Fp@Cmi> z7XDWDT*-hRUN3hYKi_36w_khP^GA~(1lw-)k$qj7lk#>>!TtjOb2^e&E3Zs%3Htdn za%JqM-Gv>-t|Gj1g;viH>GU}3omT(5O>18!*CWFxxq-*T+}qYvu)FGdUY~Mh%L~m) zpHo`j?^jyAoS3-2T7%2if8FnE+>Nq7?v>qLuYCQlUE4AD9Vf2;VLh4o#`(+JS=Wjg z9`ai3UX%GtZ%)3`^X92rCX22N+@?Rb?Rs#AufuQNEjpEvq311kw(l(c>3V&`cK+HT z`#pb{znEvR%qnfK07d|3fk$L90|U1Z2s2)~TlWVT9dA5c978JN-p*3=KjI+JTCQ(# ziRCg&N%!%&YmY2gu%Dq@J>!FfjaXruy+f9Vh4TcJEnJMVp0TtQUEZ)nv2piXpPhcc zW|?e%dH2ko%FlOatvkEv49`y~-kp`NWZ4=T8m%`xyIns?MXhU5*Q2gQ8_t^AUf#B{ z>OEtkM3{Pb|7Dx=XRqJd@wMJ${<6&6f9GFsf8NcOQ|l_sxZM1GdGx^(GI=rm=jVN2 z_W7&Dyt}ttkN)~mtIfP(;;V;?j9$+^b|$X(uH~=1d)F_7&VIC)-QwWKe?M1k?Y{C| z&0$Ga|D=liCfiGTN~~-hH&$41as=4e2)IgkRZt{v-ji7oXg#_;Ev|>yxlSd`9jHxN5cMv#U+2+ zD=m2GW{~luZkyAwSd^yg>mHY?cOliQ`MrkAn=))2T>K&@%~BMPE^m`{EOBJWiZ>`~S-Kih)1n*lT^PMZ@I1j~q2@12PLrRa@6@!wA^0}o{HmsD zdvLJ@eUE0+O8!b7+3s{2-p-(F5qfT+W4W5u-#Mobkl2u4bOZYbFeLYVD?d4oXe3>N zD^>si010qNS#tmY3labT3lag+-G2N400Cl2L_t(oN9|OxN&`U<-3y)&Ig0}kQW}wj z>m+`P*Q>pyU*IR$>K};yK`Of>*j*#ort?HEf;n-$w{ea=T%9E-Sj@mM?7o>dGjEeq zN=y_G1w?`Wu0R~e8Z$;wWTI_!M>)&v5^zP-Bn(4UmZd6+qOL(>+`(Kp#|?aiOX~M} zjg;|ZQlGcG-7n=f&T+H&-e91~PKU1=jyn{(FdJvdKNDC5kasbDYw*z!gmuZ|+MC%? zq;gu0++fL6m%8`wEdq{X!=G2x{sYThU!5_C3te@w* ztfjxDc^Z#K&DxT+r}VpwL;nTjs6H}&5N7*#rq#7q5$B^SA0|F@unWKT|5;%CrA(1$ z&zF2VEq6f8uf?Fw z_`~espH<5;s|z-=*7m1e^7`i`ck^9|)V*^HvIVR17AEhUb@jgGa{dW7Cd8L8|7JH( z`ChASZ`qfj65FI528;mC0*}aI1_o{+5N5n|x9$&6@U5qdV@O5Z+goROn+zlv0+tmp zx*cHUEq-}&sYR&$WGTKG8PSp3}9YU=qdE+%f^5KwSvU|?ioK`=r%dmhhNCA5d* zU)a56dzby5rGHv@!M2yBHBWl4Zh3g^pET8K!Z_(KF_0|6F4W;pKmtRRzvqV^fX|ccy^$*wo^F+UQ zeeqp_TYLMR?tmLk|2K$L3;yyCyymdK II;Vst0K~a7!2kdN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..72ac291aa99586855f3e5b6273e1d2103f0feb02 GIT binary patch literal 679 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|+MC%? zq;gu0++fL6m%8`wEdq{X!=G2x{sYThU!5_C3te@w* ztfjxDc^Z#K&DxT+r}VpwL;nTjs6H}&5N7*#rq#7q5$B^SA0|F@unWKT|5;%CrA(1$ z&zF2VEq6f8uf?Fw z_`~espH<5;s|z-=*7m1e^7`i`ck^9|)V*^HvIVR17AEhUb@jgGa{dW7Cd8L8|7JH( z`ChASZ`qfj65FI528;mC0*}aI1_o{+5N5n|x9$&6@V=*uV@O5Z+gpxY%?1Lj0sa@c zD_E)zKH7OJRR8HIqt-^TJ1s0ePk1>ZRUV%|JlEK_i-D1eg+oBWp#jb~u<(G*`QIES zzQzB{qT_GNT{U)k(miM9My|*Ebnd4GZrr!_{QhUQPA>OONLC6fUppH4IUug8+WuQb zm-O5Mh0SViE*ef2w_?6(&TS}|vYq2$%b7S&gz0c=V2lOjjTiq(n|+kY&0BDC>E@Fi w#mr|J+~!HIaNBX{j)Q3v8`OD?+MG2E^WWBA?VP&#JJ72Pp00i_>zopr0H-`D-v9sr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json new file mode 100644 index 0000000000..36eed5db12 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da and modified by лазік#7305", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} -- 2.51.2