From 7806e2feee3fce9f50fbb09bb43779dbc6e09c77 Mon Sep 17 00:00:00 2001 From: Daniel <77834935+Orvex07@users.noreply.github.com> Date: Tue, 13 Jan 2026 16:02:50 +0100 Subject: [PATCH] =?UTF-8?q?Fix:=20=D0=91=D0=B0=D0=BB=D0=BB=D0=BE=D0=BD?= =?UTF-8?q?=D1=87=D0=B8=D0=BA=D0=B8=20=D1=81=20=D0=BA=D1=80=D0=B0=D1=81?= =?UTF-8?q?=D0=BA=D0=BE=D0=B9=20=D0=B2=20=D0=BC=D0=B0=D0=B3=D0=B0=D0=B7?= =?UTF-8?q?=D0=B8=D0=BD=D0=B5=20=D1=81=D0=BF=D0=BE=D0=BD=D1=81=D0=BE=D1=80?= =?UTF-8?q?=D0=B0=20(#3717)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_sunrise/store/sponsor-uplink-catalog.ftl | 11 ++++++ .../_sunrise/store/sponsor-uplink-catalog.ftl | 11 ++++++ .../Catalog/sponsor_uplink_catalog.yml | 14 ++++++++ .../Entities/Objects/Fun/spray_paint.yml | 21 ++++++++++++ .../Misc/spray_paint_icons.rsi/meta.json | 32 ++++++++++++++++++ .../spray_paint_icons.rsi/spray_black.png | Bin 0 -> 274 bytes .../Misc/spray_paint_icons.rsi/spray_blue.png | Bin 0 -> 277 bytes .../spray_paint_icons.rsi/spray_green.png | Bin 0 -> 277 bytes .../spray_paint_icons.rsi/spray_orange.png | Bin 0 -> 277 bytes .../spray_paint_icons.rsi/spray_purple.png | Bin 0 -> 276 bytes .../Misc/spray_paint_icons.rsi/spray_red.png | Bin 0 -> 274 bytes .../spray_paint_icons.rsi/spray_white.png | Bin 0 -> 274 bytes 12 files changed, 89 insertions(+) create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_black.png create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_blue.png create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_green.png create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_orange.png create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_purple.png create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_red.png create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_white.png diff --git a/Resources/Locale/en-US/_strings/_sunrise/store/sponsor-uplink-catalog.ftl b/Resources/Locale/en-US/_strings/_sunrise/store/sponsor-uplink-catalog.ftl index a6140b2849..bf9986a962 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/store/sponsor-uplink-catalog.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/store/sponsor-uplink-catalog.ftl @@ -258,3 +258,14 @@ uplink-sunrise-mob-mothroach-name = Mothroach uplink-sunrise-player-borg-generic-name = Borg uplink-sunrise-boombox-name = Boombox uplink-sunrise-tape-player-name = Tape player + +## Paint + +uplink-sunrise-spray-paint-desc = A tin of spray paint. +uplink-sunrise-spray-paint-blue-name = Spray paint (blue) +uplink-sunrise-spray-paint-black-name = Spray paint (black) +uplink-sunrise-spray-paint-red-name = Spray paint (red) +uplink-sunrise-spray-paint-green-name = Spray paint (green) +uplink-sunrise-spray-paint-orange-name = Spray paint (orange) +uplink-sunrise-spray-paint-purple-name = Spray paint (purple) +uplink-sunrise-spray-paint-white-name = Spray paint (white) diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/store/sponsor-uplink-catalog.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/store/sponsor-uplink-catalog.ftl index d62ff7417d..e5862f0682 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/store/sponsor-uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/sponsor-uplink-catalog.ftl @@ -261,3 +261,14 @@ uplink-sunrise-mob-mothroach-name = Таракан uplink-sunrise-player-borg-generic-name = Борг uplink-sunrise-boombox-name = Бумбокс uplink-sunrise-tape-player-name = Магнитофон + +## Paint + +uplink-sunrise-spray-paint-desc = Баночка аэрозольной краски. +uplink-sunrise-spray-paint-blue-name = Баллончик краски (синий) +uplink-sunrise-spray-paint-black-name = Баллончик краски (чёрный) +uplink-sunrise-spray-paint-red-name = Баллончик краски (красный) +uplink-sunrise-spray-paint-green-name = Баллончик краски (зелёный) +uplink-sunrise-spray-paint-orange-name = Баллончик краски (оранжевый) +uplink-sunrise-spray-paint-purple-name = Баллончик краски (фиолетовый) +uplink-sunrise-spray-paint-white-name = Баллончик краски (белый) diff --git a/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml index 99f6242c39..e720113808 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml @@ -2089,6 +2089,8 @@ - type: listing id: UplinkSunriseSprayPaint + name: uplink-sunrise-spray-paint-blue-name + description: uplink-sunrise-spray-paint-desc productEntity: SprayPaintBlue cost: Suntick: 10 @@ -2100,6 +2102,8 @@ - type: listing id: UplinkSunriseSprayPaintBlack + name: uplink-sunrise-spray-paint-black-name + description: uplink-sunrise-spray-paint-desc productEntity: SprayPaintBlack cost: Suntick: 20 @@ -2111,6 +2115,8 @@ - type: listing id: UplinkSunriseSprayPaintRed + name: uplink-sunrise-spray-paint-red-name + description: uplink-sunrise-spray-paint-desc productEntity: SprayPaintRed cost: Suntick: 10 @@ -2122,6 +2128,8 @@ - type: listing id: UplinkSunriseSprayPaintGreen + name: uplink-sunrise-spray-paint-green-name + description: uplink-sunrise-spray-paint-desc productEntity: SprayPaintGreen cost: Suntick: 10 @@ -2133,6 +2141,8 @@ - type: listing id: UplinkSunriseSprayPaintOrange + name: uplink-sunrise-spray-paint-orange-name + description: uplink-sunrise-spray-paint-desc productEntity: SprayPaintOrange cost: Suntick: 10 @@ -2144,6 +2154,8 @@ - type: listing id: UplinkSunriseSprayPaintPurple + name: uplink-sunrise-spray-paint-purple-name + description: uplink-sunrise-spray-paint-desc productEntity: SprayPaintPurple cost: Suntick: 10 @@ -2155,6 +2167,8 @@ - type: listing id: UplinkSunriseSprayPaintWhite + name: uplink-sunrise-spray-paint-white-name + description: uplink-sunrise-spray-paint-desc productEntity: SprayPaintWhite cost: Suntick: 10 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/spray_paint.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/spray_paint.yml index bcbd7d1f08..034e95eb81 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/spray_paint.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/spray_paint.yml @@ -142,6 +142,9 @@ id: SprayPaintBlue suffix: Blue components: + - type: Icon + sprite: _Sunrise/Interface/Misc/spray_paint_icons.rsi + state: spray_blue - type: Sprite sprite: Objects/Fun/spraycans.rsi layers: @@ -165,6 +168,9 @@ id: SprayPaintRed suffix: Red components: + - type: Icon + sprite: _Sunrise/Interface/Misc/spray_paint_icons.rsi + state: spray_red - type: Sprite sprite: Objects/Fun/spraycans.rsi layers: @@ -188,6 +194,9 @@ id: SprayPaintGreen suffix: Green components: + - type: Icon + sprite: _Sunrise/Interface/Misc/spray_paint_icons.rsi + state: spray_green - type: Sprite sprite: Objects/Fun/spraycans.rsi layers: @@ -211,6 +220,9 @@ id: SprayPaintBlack suffix: Black components: + - type: Icon + sprite: _Sunrise/Interface/Misc/spray_paint_icons.rsi + state: spray_black - type: Sprite sprite: Objects/Fun/spraycans.rsi layers: @@ -234,6 +246,9 @@ id: SprayPaintOrange suffix: Orange components: + - type: Icon + sprite: _Sunrise/Interface/Misc/spray_paint_icons.rsi + state: spray_orange - type: Sprite sprite: Objects/Fun/spraycans.rsi layers: @@ -257,6 +272,9 @@ id: SprayPaintPurple suffix: Purple components: + - type: Icon + sprite: _Sunrise/Interface/Misc/spray_paint_icons.rsi + state: spray_purple - type: Sprite sprite: Objects/Fun/spraycans.rsi layers: @@ -280,6 +298,9 @@ id: SprayPaintWhite suffix: White components: + - type: Icon + sprite: _Sunrise/Interface/Misc/spray_paint_icons.rsi + state: spray_white - type: Sprite sprite: Objects/Fun/spraycans.rsi layers: diff --git a/Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/meta.json b/Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/meta.json new file mode 100644 index 0000000000..79fed884a3 --- /dev/null +++ b/Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Derived from Objects/Fun/spraycans.rsi (tgstation c6e3401f2e7e1e55c57060cdf956a98ef1fefc24)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spray_blue" + }, + { + "name": "spray_red" + }, + { + "name": "spray_green" + }, + { + "name": "spray_black" + }, + { + "name": "spray_orange" + }, + { + "name": "spray_purple" + }, + { + "name": "spray_white" + } + ] +} diff --git a/Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_black.png b/Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_black.png new file mode 100644 index 0000000000000000000000000000000000000000..422e2184828cdc5146515ce544c8d40051b2b137 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;BrqF$B+p3w^I&sG8^)+#7>tk%6xZV>yPI_ zdN~mX+b*j!YW80~P~;|drmkkKMpyicz437svfb*}3UvAWS3Qi9nHO?+tA)+Vw(P=+ zAl~bbJ}i-1chvA$!BLKPJH*&kiqFlK*?fg5E{J>0R=Y`259SnWH$+A??)@IU;-Jo6 zhJ96j`U(0EDp?gwR!()i#P#6h%qySP{C5!jk!lvI6;>1s;*b3=DjSL74G){)!Z!;3`iS$B+p3w^I&sG8^)+#HLvlSid|ZyF=`M zjN3eMvo#5aUruJ$?7w`V$W81_UCmmJE^V86>ko6UPyTpBYTeO?o~AL~hbL$45NlVz zTA<74zv^L>%)F4pTP>>Iuah_^d;L*EN>AaWzopr03t$X^8f$< literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_green.png b/Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_green.png new file mode 100644 index 0000000000000000000000000000000000000000..7af21fbcec3f0575b1c9285f5a18014988dc39ff GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;3`iS$B+p3w^I&sG8^)+++DlBQRFFKOn3b{ zMbVfW8=82R`|~Za@nb$M8ENqQps-j^6BsCJ1U&LL#$o>YJo1F|Eh;kGV?+X zZ?&*l*_K^c5yX4_(TlyilUT}Qx|t^#9`o#r%wp7E$@*+gyr=Gl?{=aGbk-h-daZmV zVOktRyzO%F4dMm+nFMBCIi--v`r(OB*3Rqo3%LGlW!NAz%Va0x!nVhc+@q?Q<@|-e UN3Y!{26Q!pr>mdKI;Vst01j?tLjV8( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_orange.png b/Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_orange.png new file mode 100644 index 0000000000000000000000000000000000000000..65e3673a2983859a2cb52bdbdde39c8440b0b21f GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;3`iS$B+p3w^I&sG8^)++>PfdOlB;95cQ{6 z{Ab*a4Nbhu{rQ&I_%WZBj5PTDaqA+Dbswti`1JSm9Tm>rA=a*bwLq88f7Qb%nRy|H zw_4b&Y|AdJ2;#l|=*8aMNi5|t-OQ5=k9qb*W-;ooWPLU#-cxtOcRSGoI%^L^y;i=G zFfEQD-gde82JwRZOaim6oKnbS{qV#mYv=X)1zdl&GHeiFVdQ&MBb@03SnTC;$Ke literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_purple.png b/Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_purple.png new file mode 100644 index 0000000000000000000000000000000000000000..044e3765ce191bf35200fb90b8519813a5146165 GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;7U&y$B+p3w^Izcm<@SY{$3ZUn^ph7>U_cT z@FjjXHZ<`rf5x{&WO?J$9-SGvHET7xv~A?qZx@d{{;1P5ru*>ZtQ}(Q>Q@VN`TSQs zjFOoba(JtS&C0gy!Y}t?4V$dj9c4Tz@mS%w&en$MSD1>=&0ivRqgtLTVOm(i+OMKn z2HyG&>*rnOzQMgCo{_^hD|Nyarivo9t#@AA2eAH&Vu;}Mopq-n;BaB#q-%B}^VQgY T@ts))bTosftDnm{r-UW|>*8jA literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_red.png b/Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_red.png new file mode 100644 index 0000000000000000000000000000000000000000..2073430cdca1adf608f28b6bfbe9ac6c7163f06e GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;BrqF$B+p3w^I&s9x>oyxf{+^l=<$!)*sJ< zguX=_l)LzxZ;8#KMpZYlGj(&qM2_0eIbK-xuvBMW#Nn+LHY?k*3oC+nuRr>*L~7m9 zhn}V}-G?V$NEPg>0L@ zF#ULCxwm0&!*|h!3roV-JhdCt(}Pa${>L2p;3CrjuZ&Ai*jl9ey5%$9GVw|OTJz@C SBpaZU89ZJ6T-G@yGywqc;A->$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_white.png b/Resources/Textures/_Sunrise/Interface/Misc/spray_paint_icons.rsi/spray_white.png new file mode 100644 index 0000000000000000000000000000000000000000..1af89544a1343dd38377a9aa3a8ca2c1ac16a47c GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;BrqF$B+p3w^I&sG8^)+++FKk%)aiZ{r3lK zdN~mX+b*j!YW80~P~;|drmkkKMpwMW^O(2_*>3e~1-g9xs~$$l%nLcZ)xu_FTXtbZ z5byOzAC^e1J9@FY{3yq}9b)V%$vv}WHeX?i3*tUwX+J3{;eD-kLu6Fr)@#u#4(jY> z*jMGJpP>Jsl2yTE