From 4dbf394c4ed4c7768f30fc708f112e38d7408dd9 Mon Sep 17 00:00:00 2001 From: Gorox221 <139872389+Gorox221@users.noreply.github.com> Date: Mon, 18 Mar 2024 22:50:04 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=A4=D0=BB=D0=B0=D0=B3=D0=B8=20=D0=B3?= =?UTF-8?q?=D0=BE=D1=81=D1=83=D0=B4=D0=B0=D1=80=D1=81=D1=82=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ganimed/entities/misc/flags.ftl | 6 +++ .../Structures/Wallmounts/Signs/flags.yml | 35 +++++++++++++++++- .../Structures/Wallmounts/flags.rsi/elz.png | Bin 0 -> 374 bytes .../Structures/Wallmounts/flags.rsi/meta.json | 20 ++++++++++ .../Structures/Wallmounts/flags.rsi/tsf.png | Bin 0 -> 322 bytes .../Structures/Wallmounts/flags.rsi/ussp.png | Bin 0 -> 386 bytes 6 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/ru-RU/ganimed/entities/misc/flags.ftl create mode 100644 Resources/Textures/Ganimed/Structures/Wallmounts/flags.rsi/elz.png create mode 100644 Resources/Textures/Ganimed/Structures/Wallmounts/flags.rsi/meta.json create mode 100644 Resources/Textures/Ganimed/Structures/Wallmounts/flags.rsi/tsf.png create mode 100644 Resources/Textures/Ganimed/Structures/Wallmounts/flags.rsi/ussp.png diff --git a/Resources/Locale/ru-RU/ganimed/entities/misc/flags.ftl b/Resources/Locale/ru-RU/ganimed/entities/misc/flags.ftl new file mode 100644 index 000000000000..6b2b307bbe2c --- /dev/null +++ b/Resources/Locale/ru-RU/ganimed/entities/misc/flags.ftl @@ -0,0 +1,6 @@ +ent-FlagElizium = флаг Элизиума + .desc = Иди и убей пару ксеносов! +ent-FlagTSF = флаг ТСФ + .desc = Выглядит не так уж и технологично. +ent-FlagUSSP = флаг СССП + .desc = Клюква. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml index 13d353bfe844..91922f7e3eaa 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml @@ -61,4 +61,37 @@ description: "Raise the jolly roger, scallywags!" components: - type: Sprite - state: pirate_flag \ No newline at end of file + state: pirate_flag + +- type: entity + parent: BaseFlag + id: FlagElizium + name: Elizium flag + description: "Go to kill xenos!" + components: + - type: Sprite + drawdepth: WallTops + sprite: Ganimed/Structures/Wallmounts/flags.rsi + state: elz + +- type: entity + parent: BaseFlag + id: FlagTSF + name: TSF flag + description: "It doesn't look technologically advanced." + components: + - type: Sprite + drawdepth: WallTops + sprite: Ganimed/Structures/Wallmounts/flags.rsi + state: tsf + +- type: entity + parent: BaseFlag + id: FlagUSSP + name: USSP flag + description: "Сranberry." + components: + - type: Sprite + drawdepth: WallTops + sprite: Ganimed/Structures/Wallmounts/flags.rsi + state: ussp \ No newline at end of file diff --git a/Resources/Textures/Ganimed/Structures/Wallmounts/flags.rsi/elz.png b/Resources/Textures/Ganimed/Structures/Wallmounts/flags.rsi/elz.png new file mode 100644 index 0000000000000000000000000000000000000000..9d94874e0d9bbad3e01da72b0ab674650584f2cd GIT binary patch literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijS1AIbUO-)Uclap&}YmXf}cJ=DjyLa#ECKwrHm>FeT+&z^CRJG=immHAd zE(!7r{tpKXUjB@qfWn*w9+AZi417mGm~pB$pEOYLxTlL_h=u>tNw@i$4S1X*^QZj# z&wjpak=cPQZ!`5b3k1EnEMS`RxVesbPvVrkeqB{_KQGRSGv;_NvS|pJHfL=;6T?-l z=v7nw&RIAwFlAnp@Mf)VLVMMBo>z1I7`hrXBvKh?I5PO%a%M2La5!Yw_`HCrt%$vb zzopr E03>*euK)l5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Ganimed/Structures/Wallmounts/flags.rsi/meta.json b/Resources/Textures/Ganimed/Structures/Wallmounts/flags.rsi/meta.json new file mode 100644 index 000000000000..84a2faf695c5 --- /dev/null +++ b/Resources/Textures/Ganimed/Structures/Wallmounts/flags.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "By AltMapper for Enterprise server exclusive use.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "elz" + }, + { + "name": "tsf" + }, + { + "name": "ussp" + } + ] +} diff --git a/Resources/Textures/Ganimed/Structures/Wallmounts/flags.rsi/tsf.png b/Resources/Textures/Ganimed/Structures/Wallmounts/flags.rsi/tsf.png new file mode 100644 index 0000000000000000000000000000000000000000..a2e2ab8ea9a3e55f5abbb28d31b08658b56b0aa2 GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijS1AIbUO-)Uclap&}YlT&tNw@i$6$DrdMZPEju*6V$nnDmevr@pdHPIqLtQ%7AgxSXn9GMc5 zo3mn>h+u-h{FfTt8@-k*SZ$}?=ey6Uk+4HP+&Y2p+nmqojfdi!!w&p#o>#|nE8C8T z?;hWq&wY&Q%WM>6cIHi*!?+}$B}cQ?barP2o$ zF&qnGxEjfDH->>BvYjD*B17_YpaHtG(|LiENJ)@i@PACe;P3xj5Gc=C;1OBOz`%C| zgc+x5^GO2**L%7+hFJJNo#ZWcNP&mJkn;h5SJD67vs!M5y;{Ai@bQ~Tk}nqR_|p@grIYk97TRB`9E!OdZv0qtb6-{DbmT) zCa#>~TQL8p)rI@F**67VWpWJjJs%Xojkg;V&J@N+4MZ<`D~!m89ZJ6 KT-G@yGywo%S)Ee= literal 0 HcmV?d00001 From 2a86e15dff9476839e333a5bf4b603a0193a8b2f Mon Sep 17 00:00:00 2001 From: Gorox221 <139872389+Gorox221@users.noreply.github.com> Date: Tue, 19 Mar 2024 20:17:53 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=A4=D0=BB=D0=B0=D0=B6=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ganimed/entities/misc/flags.ftl | 8 +++- .../Entities/Objects/Misc/handy_flags.yml | 40 ++++++++++++++++++ .../Handy_Flags/Elz_handy_flag.rsi/icon.png | Bin 0 -> 370 bytes .../Elz_handy_flag.rsi/inhand-left.png | Bin 0 -> 381 bytes .../Elz_handy_flag.rsi/inhand-right.png | Bin 0 -> 374 bytes .../Handy_Flags/Elz_handy_flag.rsi/meta.json | 22 ++++++++++ .../Handy_Flags/TSF_handy_flag.rsi/icon.png | Bin 0 -> 361 bytes .../TSF_handy_flag.rsi/inhand-left.png | Bin 0 -> 405 bytes .../TSF_handy_flag.rsi/inhand-right.png | Bin 0 -> 401 bytes .../Handy_Flags/TSF_handy_flag.rsi/meta.json | 22 ++++++++++ .../Handy_Flags/USSP_handy_flag.rsi/icon.png | Bin 0 -> 364 bytes .../USSP_handy_flag.rsi/inhand-left.png | Bin 0 -> 386 bytes .../USSP_handy_flag.rsi/inhand-right.png | Bin 0 -> 380 bytes .../Handy_Flags/USSP_handy_flag.rsi/meta.json | 22 ++++++++++ 14 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Misc/Handy_Flags/Elz_handy_flag.rsi/icon.png create mode 100644 Resources/Textures/Objects/Misc/Handy_Flags/Elz_handy_flag.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/Handy_Flags/Elz_handy_flag.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/Handy_Flags/Elz_handy_flag.rsi/meta.json create mode 100644 Resources/Textures/Objects/Misc/Handy_Flags/TSF_handy_flag.rsi/icon.png create mode 100644 Resources/Textures/Objects/Misc/Handy_Flags/TSF_handy_flag.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/Handy_Flags/TSF_handy_flag.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/Handy_Flags/TSF_handy_flag.rsi/meta.json create mode 100644 Resources/Textures/Objects/Misc/Handy_Flags/USSP_handy_flag.rsi/icon.png create mode 100644 Resources/Textures/Objects/Misc/Handy_Flags/USSP_handy_flag.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/Handy_Flags/USSP_handy_flag.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/Handy_Flags/USSP_handy_flag.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ganimed/entities/misc/flags.ftl b/Resources/Locale/ru-RU/ganimed/entities/misc/flags.ftl index 6b2b307bbe2c..0c7ca5eead5b 100644 --- a/Resources/Locale/ru-RU/ganimed/entities/misc/flags.ftl +++ b/Resources/Locale/ru-RU/ganimed/entities/misc/flags.ftl @@ -3,4 +3,10 @@ ent-FlagElizium = флаг Элизиума ent-FlagTSF = флаг ТСФ .desc = Выглядит не так уж и технологично. ent-FlagUSSP = флаг СССП - .desc = Клюква. \ No newline at end of file + .desc = Пролетарии всех стран, соединяйтесь! +ent-FlagHandyUSSP = флажок СССП + .desc = Пролетарии всех стран, соединяйтесь! +ent-FlagHandyElz = флажок Элизиума + .desc = Иди и убей пару ксеносов! +ent-FlagHandyTSF = флажок ТСФ + .desc = Выглядит не так уж и технологично. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml index 5e0024236a4a..53d7e805ba3c 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml @@ -69,3 +69,43 @@ state: icon - type: Item sprite: Objects/Misc/Handy_Flags/pirate_handy_flag.rsi + + +- type: entity + parent: BaseItem + id: FlagHandyElz + name: Elizium handheld flag + description: "Go to kill xenos!" + components: + - type: Sprite + sprite: Objects/Misc/Handy_Flags/Elz_handy_flag.rsi + state: icon + - type: Item + sprite: Objects/Misc/Handy_Flags/Elz_handy_flag.rsi + +- type: entity + parent: BaseItem + id: FlagHandyUSSP + name: USSP handheld flag + description: "Proletarians of all countries, unite!" + components: + - type: Sprite + sprite: Objects/Misc/Handy_Flags/USSP_handy_flag.rsi + state: icon + - type: Item + sprite: Objects/Misc/Handy_Flags/USSP_handy_flag.rsi + +- type: entity + parent: BaseItem + id: FlagHandyTSF + name: TSF handheld flag + description: "It looks technologically advanced." + components: + - type: Sprite + sprite: Objects/Misc/Handy_Flags/TSF_handy_flag.rsi + state: icon + - type: Item + sprite: Objects/Misc/Handy_Flags/TSF_handy_flag.rsi + + + diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/Elz_handy_flag.rsi/icon.png b/Resources/Textures/Objects/Misc/Handy_Flags/Elz_handy_flag.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1347f50c0e1847cc8ddef17d718de7dd0af939c1 GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilo1AIbUZES2bG&EMNT6OH$v8z|F-o1NQH^Imt!^|k#;_j(D^eY?E>&qLu`E$`N< Bmk0m= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/Elz_handy_flag.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/Handy_Flags/Elz_handy_flag.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..f573bfd37c73da379130f4e54b8155253528d833 GIT binary patch literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E1o(uw+Su4=XlSfjwaO^l;_ltM$BrF4us&WrSX(#2$RNY)>eZ`2g_CdAB*-uLKLRia-9L8@D9%~n5n0T@z;_6Q8AUa`8i0bQJY5_^BHZ6zyUW*Pz|)rK z#oo00|L?7;#=E{AH$BEYd7pd22TzBjeM{>inK%pnv*}#mi*s!(&22yLbbzTNRiVk@ z;KU1z&8@tJ>W{CT+sVODFem-y#u_$|m*5jHtgK#--raahoGU`G_x5QOk~AhJJxt0(UtIh0iyL zv8Ih9X_Z&dZNqXtk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E1o(uw+Su4=XlSfjwaO^l;_ltM$BrF4us&WrSX(#2$RNY)>eZ`2g_CdAB*-uLKLRia-9L8@D9%~n5n0T@z;_6Q8AUa`8i0a_JzX3_BHZ6z^X6+d;BmcZ z!6)+S@B8iBo^1IUpvt%EO5=MLiGm4AZ2A|@$`m;KGFE7~Cy~`4@wIH15J$s|H7>j= zCc>%=(vQv^bDqCHtTuGL%z?srna8*A9NA&`QD&ciz@E?~7blr=2F0|#4FXXK>$nea z)V7!>{O+z!uw<8+05r7dfp|md(in!@BHyK?s=Wn_&*9@xN>L4LZB39fk$L90|Vb75M~tB@M-`GuJUwo46*Rv zdhw!AivkC0fHLnL-~a!M#U~W$-i^C++gT%BBCX`7VsK;hnv6>f5eKU`EMCf(=)8zS zD1W-`0>$%>zl2rK5(}tt6%^g^RItVT-5qsD=MCi!TT@mZ#ak44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=y+Su4=XlSgOz#yPtB&y|jcQ?bTRjcmay(_G0b#)8F)vH&J9XlqX zVSj7|Py<6$inbe&;x7sE3;vG+7_Quzu@ET5S>O>_%)r2R2!t6$HM|;tg4aA<977`9 z-(I`O*JQxs5O~UL1<$wt^IyBAZFz0A@)-N%d+G*{Qxq=xy*$lhu;5Gn0hX^1W{S;- zwXIpgr1s&U{*(ZwgTJQ=)jA|FI`6x;zSvejlYwDR?$2Kz>ew&*mAKPWc>mjV-W3gZ z9vR3z(d5#0RTNHPu3F$5b%G`HVQItuqv=8gmdrdFk_iqc8{!!*o!=h9p5T09gV+mR z#lsc_=LD{IiZwi*<7o4jTkgm_#=L4pJ9e=%EV52*h6k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=y+Su4=XlSgOz#yPtB&y|jcQ?bTRjcmay(_G0b#)8F)vH&J9XlqX zVSj7|Py<6$inbe&;x7sE3;vG+7_Quzu@ET5S>O>_%)r2R2!t6$HM|;tf|op9977`9 z-(EY-*Q_AG8sP4*e8K1c^P>%Je7bNTVOEJ@xw4Lhkikd4F9u8;0-w?kuoNEfU_7J6 zw|g>^aK>VBwTaAbucvx0VOa3-^;fIoKXW&2Ken8oVc(kg{8`pJn6LEYZH_KxW;wY^ zL^(=i*WOx|?+yyLq))U6y*SN!pk?17_6M~`O$}riSvUk88Uz^Y7z?6Lu^!0QR6UTV zX<9I)r*08Tg1uMQyPxjzE6*{!73(NWaP%+PGR0Wb!OQYZhGx2vf}hB9rQ!#fS7kdH em;?m(GT!=j>vI3f7r@|TVDNPHb6Mw<&;$Txcbato literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/TSF_handy_flag.rsi/meta.json b/Resources/Textures/Objects/Misc/Handy_Flags/TSF_handy_flag.rsi/meta.json new file mode 100644 index 000000000000..29e66fba33dd --- /dev/null +++ b/Resources/Textures/Objects/Misc/Handy_Flags/TSF_handy_flag.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Drawn by Saveliy360, modified by AltMapper, see repo CLA.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/USSP_handy_flag.rsi/icon.png b/Resources/Textures/Objects/Misc/Handy_Flags/USSP_handy_flag.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0594c6dce8f40c0902fb7173dc5d575940497e50 GIT binary patch literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijK0(?STZES2bG&Ckkima3szpzGPuY%N#&5{Qfh;NgZJQl=oHIjiLvVE01 z1A|WqL;OUbrh~VODuI+hNswRge^kKmKsi(GAi3=QRnPx0dw_UE8lB21!AbkFO$F;15Us7 o&uRF!yG-)Nx(f&Q?Qf2{uesE4TZUtXHPF!vp00i_>zopr022U(s{jB1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/USSP_handy_flag.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/Handy_Flags/USSP_handy_flag.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ffb2820468006b802ad4ca3e577713bd0883404d GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0Z1^9%x+Su4=XlP876xpjFb$2(zjm?tBf*9_`Ffc^6GsI848p*)mQ?kk( zsG31x+nXyuimxQdFZe$)U~oNf=LArOv%n*=7^vV72s4Umcr^e8k9)c}hD5l(y>^$c z$$+OV@ze~zXYc-(#TFjBV6Sk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0Z1^9%x+Su4=XlP876xpjFb$2(zjm?tBf*9_`Ffc^6GsI848p*)mQ?kk( zsG31x+nXyuimxQdFZe$)U~oNf=LArOv%n*=7^vV72s4Umcr^e84|=*dhD5l(y>^!G zkb;0)poXj9obUCqGgAWoU6JhQ?A|&1lB@sZW!>iwq;Y99{FO}5k!2}8PdMN^F!=S*KSMJ{3eluI9Y zcW5s)VW>=UIp?Lx%TT^_ic~{hg?4LJgTe~ HDWM4fu6~ou literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/USSP_handy_flag.rsi/meta.json b/Resources/Textures/Objects/Misc/Handy_Flags/USSP_handy_flag.rsi/meta.json new file mode 100644 index 000000000000..7fc21e61ab4d --- /dev/null +++ b/Resources/Textures/Objects/Misc/Handy_Flags/USSP_handy_flag.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Drawn by Saveliy360", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}