From 259e34c23b2299aed35c6bdf32abf3af135258d3 Mon Sep 17 00:00:00 2001 From: MaxSMokeSkaarj Date: Thu, 9 Jan 2025 00:03:12 +1000 Subject: [PATCH] add some flags --- Corvax-SS14 | 2 +- .../Entities/Objects/Misc/handy_flags.yml | 11 +++++++++ .../Structures/Wallmounts/Signs/flags.yml | 9 +++++++ .../dominion_handy_flag.rsi/icon.png | Bin 0 -> 290 bytes .../dominion_handy_flag.rsi/inhand-left.png | Bin 0 -> 343 bytes .../dominion_handy_flag.rsi/inhand-right.png | Bin 0 -> 333 bytes .../dominion_handy_flag.rsi/meta.json | 22 ++++++++++++++++++ .../{blank_flag.png => dominion_flag.png} | Bin .../Structures/Wallmounts/flags.rsi/meta.json | 16 ++----------- 9 files changed, 45 insertions(+), 15 deletions(-) create mode 100644 Resources/Prototypes/SMoA/Entities/Objects/Misc/handy_flags.yml create mode 100644 Resources/Prototypes/SMoA/Entities/Structures/Wallmounts/Signs/flags.yml create mode 100644 Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/icon.png create mode 100644 Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/inhand-left.png create mode 100644 Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/inhand-right.png create mode 100644 Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/meta.json rename Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/{blank_flag.png => dominion_flag.png} (100%) diff --git a/Corvax-SS14 b/Corvax-SS14 index bfa80bf86f..ccd1fb1a58 160000 --- a/Corvax-SS14 +++ b/Corvax-SS14 @@ -1 +1 @@ -Subproject commit bfa80bf86f5c8a97c648e07923406b684b15935f +Subproject commit ccd1fb1a58451016acfc44f6153fc872c32e8d39 diff --git a/Resources/Prototypes/SMoA/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/SMoA/Entities/Objects/Misc/handy_flags.yml new file mode 100644 index 0000000000..5fe865cfaa --- /dev/null +++ b/Resources/Prototypes/SMoA/Entities/Objects/Misc/handy_flags.yml @@ -0,0 +1,11 @@ +- type: entity + parent: BaseItem + id: DominionHandyFlag + name: Ручной флажок Доминиона + description: Символ едниства станций + components: + - type: Sprite + sprite: SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi + state: icon + - type: Item + sprite: SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi diff --git a/Resources/Prototypes/SMoA/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/SMoA/Entities/Structures/Wallmounts/Signs/flags.yml new file mode 100644 index 0000000000..4e938e4cb4 --- /dev/null +++ b/Resources/Prototypes/SMoA/Entities/Structures/Wallmounts/Signs/flags.yml @@ -0,0 +1,9 @@ +- type: entity + parent: BaseFlag + id: DominionFlag + name: Флаг Доминиона + description: Символ единства станций + components: + - type: Sprite + sprite: SMoA/Structures/Wallmounts/flags.rsi/ + state: dominion_flag diff --git a/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/icon.png b/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5ddc8efa5ffa5f738f32a30e81877b19eeffb970 GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij?1AIbUZES2bG&EMNT6OH$v8z|F-o1MlC^PNQ4o@J(UJ~RN{2vS$q`aBk zfI^%F9+AZi419+{nDKc2iWHz=v!{z=h=u>wi{5+(6gXT1_rIw>DOwvE*dcqvT9Y^3 zVbNme@W#&)E=(;_brTs3m(JOo!j-Z21dB{J;~e{@AFLb;n>=;gjaDoY=KSH-Fp29_ z9fu#Q%r|Kc#syct8!N2pXAoM<^3=^Ib}fT*ci?OugI#RLdb4G>yuW9fFz*A??)!`v ZnV&0(oSM@1c{|WK44$rjF6*2UngFoyWheju literal 0 HcmV?d00001 diff --git a/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/inhand-left.png b/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1863e624f32d2b06182fd83dbc1f8e97ad173f9f GIT binary patch literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=yYG`QK*x0OEwd(HOyT^_lyL$C1Q09H$0Yf0gUJ~RN{2vS$q`aBk zfI^%F9+AZi419+{nDKc2iWH#W4o?@ykO=p;*Sz@-8*s1$9G8Dr|KygKZ*wDC(#ls& zk*!Dfuy%?F<)}3W2Tn zVjD{KSup&pF=W2=Gl@NI{(ODA1^4AG=52h>a9(`QIgr#w=J}sn-&|ze;~am4xdG@D a28K8{nK;f0l}SE8HiM_DpUXO@geCyHnt}oV literal 0 HcmV?d00001 diff --git a/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/inhand-right.png b/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2963932a966aa10de2427bf755c36995fed62c41 GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=y+Su4=XlSfjwd(HOyT^_lyL$C1P-Y_Mb9W%cUJ~RN{2vS$q`aBk zfI^%F9+AZi419+{nDKc2iWH#WI!_nJkO=p;*Us{_7;v~_7e`@#cs-FoZBL1~A$%R)n8ox^bU< zO7&75Mt(!)XHzc)-#@S`sETXDx+(LR)@Uy^XQ)Yx*1W?p$M5c3CJqL{kIW9&;<(&> SSSA2n&fw|l=d#Wzp$P!F<8x2| literal 0 HcmV?d00001 diff --git a/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/meta.json b/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/meta.json new file mode 100644 index 0000000000..439243d149 --- /dev/null +++ b/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by MaxSMokeSkaarj", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/blank_flag.png b/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/dominion_flag.png similarity index 100% rename from Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/blank_flag.png rename to Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/dominion_flag.png diff --git a/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/meta.json b/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/meta.json index 36d69f0e42..c52ea29645 100644 --- a/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/meta.json +++ b/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/meta.json @@ -1,26 +1,14 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Derived by sprites from tgstation at https://github.com/tgstation/tgstation/commit/d0d81185f09ca30d3b0856d476544240dba0de53 and adapted by Saveliy360", + "copyright": "Created by MaxSMokeSkaarj", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "blank_flag" - }, - { - "name": "NT_flag" - }, - { - "name": "syndie_flag" - }, - { - "name": "lgbtq_flag" - }, - { - "name": "pirate_flag" + "name": "dominion_flag" } ] } -- 2.52.0