From 95f7c80fe5be9992dd7ea25550b49029a278ab6d Mon Sep 17 00:00:00 2001 From: HitPanda <104197232+EnefFlow@users.noreply.github.com> Date: Wed, 10 Jan 2024 13:06:03 +0300 Subject: [PATCH] [Sponsor] Fluff geraldiy (#621) * [Sponsor] Fluff Geraldiy * fix --- Resources/Locale/ru-RU/paper/stamp-component.ftl | 1 + Resources/Prototypes/White/Fluff/fluff.yml | 15 +++++++++++++++ Resources/Prototypes/White/Fluff/sponsor.yml | 8 ++++++-- .../Objects/Misc/bureaucracy.rsi/meta.json | 5 ++++- .../bureaucracy.rsi/paper_stamp-geraldiy.png | Bin 0 -> 2038 bytes .../White/Fluff/Geraldiy/stamp.rsi/meta.json | 14 ++++++++++++++ .../Fluff/Geraldiy/stamp.rsi/stamp-geraldiy.png | Bin 0 -> 246 bytes 7 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-geraldiy.png create mode 100644 Resources/Textures/White/Fluff/Geraldiy/stamp.rsi/meta.json create mode 100644 Resources/Textures/White/Fluff/Geraldiy/stamp.rsi/stamp-geraldiy.png diff --git a/Resources/Locale/ru-RU/paper/stamp-component.ftl b/Resources/Locale/ru-RU/paper/stamp-component.ftl index 3a840246f1..6a2d4df451 100644 --- a/Resources/Locale/ru-RU/paper/stamp-component.ftl +++ b/Resources/Locale/ru-RU/paper/stamp-component.ftl @@ -17,3 +17,4 @@ stamp-component-stamped-name-trader = Торговец stamp-component-stamped-name-syndicate = Синдикат stamp-component-stamped-name-ce = Старший инженер stamp-component-stamped-name-iaa = Агент внутренних дел +stamp-component-stamped-name-geraldiy = Древние diff --git a/Resources/Prototypes/White/Fluff/fluff.yml b/Resources/Prototypes/White/Fluff/fluff.yml index 3d35247fc0..774b84b543 100644 --- a/Resources/Prototypes/White/Fluff/fluff.yml +++ b/Resources/Prototypes/White/Fluff/fluff.yml @@ -851,6 +851,21 @@ - type: Clothing sprite: White/Fluff/Geraldiy/ussp_mask.rsi +- type: entity + parent: RubberStampBase + id: GeraldiyRubberStamp + name: печать древних + description: Старая и потёртая печать с логотипом "Древние". На ней почти высохли чернила, но она все ещё может послужить убедительным аргументом в руках нужных людей. + suffix: fluff + components: + - type: Stamp + stampedName: stamp-component-stamped-name-geraldiy + stampState: "paper_stamp-geraldiy" + stampedColor: "#a23e3e" + - type: Sprite + sprite: White/Fluff/Geraldiy/stamp.rsi + state: stamp-geraldiy + # KnifeCappy - type: entity parent: ClothingOuterStorageBase diff --git a/Resources/Prototypes/White/Fluff/sponsor.yml b/Resources/Prototypes/White/Fluff/sponsor.yml index 58eb28ff6c..b7c3960f4e 100644 --- a/Resources/Prototypes/White/Fluff/sponsor.yml +++ b/Resources/Prototypes/White/Fluff/sponsor.yml @@ -309,9 +309,13 @@ entity: ClothingOuterCoatUSSPOvercoatBlack sponsorOnly: true +#- type: loadout +# id: GeraldiyUSSPMask +# entity: ClothingMaskGasGeraldiy +# sponsorOnly: true - type: loadout - id: GeraldiyUSSPMask - entity: ClothingMaskGasGeraldiy + id: GeraldiyStamp + entity: GeraldiyRubberStamp sponsorOnly: true # KnifeCappy diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 8e710a60a1..cfa5fb3095 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -253,6 +253,9 @@ }, { "name": "paper_stamp-generic" - } + }, + { + "name": "paper_stamp-geraldiy" + } ] } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-geraldiy.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-geraldiy.png new file mode 100644 index 0000000000000000000000000000000000000000..cd65a1b4e52c913804ec0cac29ee8cdbde7ec95c GIT binary patch literal 2038 zcmcIleQeZZ9PTl}F<=fbGMTtqjDXVX$KCF(m2*4p=5`Amx9x-*imV@Rx4OHwwB7DD zFuTY%5(p3?5(&<)WFnZDAR&v{76Azm!iTs(Os0l}Ka4C0`~yLKyZewBAp6HAZ~L}= z-sgRO&+pe?w?yh|rWMUDLJ(wHxHi-Xuc$o=C&9DX-F+KD99|_Dj07Z20BB>)Vst*m zFunx{GJofu9RqdWN1om^P*#1ScUj?Yzv%NCBJs;Z+rn>dMPmnpyAFkedxRP4;hwuC z+toR5{rv8Pc{M|Uo0HcToakE@Tt9W<`y;pak1)@jb9^cc@88(4@mB0$=cS#8ub;Ux zOWr#nUBCD9&VwCD$-LFaOGicv)5Bc<4fn}=J#_gObp>-<`pduzn~Tm5T`8H;7s z&wL4*FWz`5@ZydqKiq!Kb*y~Tmb#gjFEq?LHCoU@mB+nvjx9U#)pvJ#{_;;Bz6I0+ zHHB3R{j-__sa|K#8>O%A{$2P%f3|p(?~Y3SUj3+J%F*g?S8Vw6nMK7t$l%GP_ir^- zo`OzJ)@z$h1er3^9u8#RN2Lfd@q!YKSut)2D{2WRZ~N;^C3J{JkVTa#ofq4Ig$kfm zQT^Cx{{V(6k{?@M!I7LE1Z_%fw*i{E>!V_KyU0jbN6T_hMmn*8ICCvr4sO%aL;w|9EXp(m0B!!c{ zC`Gd_H|t_vp-7e_Gf)neg2Y?=_`sT^$X(-savU30O^a7W5DxhbmiV}JlH z^NPU7yF9$)!ca+MWz9(NuvC-;-wFs_ZN<=k)daP;W^kGWJ$Km!4cTE7wTcO|*OmQ5 zn!xJpEUutqb;t6eUG9ENwDSxkEc;k_h}kHs!kc`b z1}daBU>Dwe&2a&Ca5WqXL}MHN_-SbJAUU<5s&7r#?9s|~cl&xru1>7{qzb(@eg9BN z(+tn>k$q~~F{!jA?dWmTZoO8VmhNB2j~7OMo!+o~WYd)Jq5JC>VA1R6*33lS9y)z? zS>V$1C?d&U7dXzldhLaSH`8US^lw&v28Q521}O%yu*`AD%Wz%@hkaaZ+HGIL)%Bsn Ii(B6N2h|Lx@&Et; literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Fluff/Geraldiy/stamp.rsi/meta.json b/Resources/Textures/White/Fluff/Geraldiy/stamp.rsi/meta.json new file mode 100644 index 0000000000..addefbf537 --- /dev/null +++ b/Resources/Textures/White/Fluff/Geraldiy/stamp.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "White Dream SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stamp-geraldiy" + } + ] +} diff --git a/Resources/Textures/White/Fluff/Geraldiy/stamp.rsi/stamp-geraldiy.png b/Resources/Textures/White/Fluff/Geraldiy/stamp.rsi/stamp-geraldiy.png new file mode 100644 index 0000000000000000000000000000000000000000..d3eebd5990fe792e4b75edb84073844b9b4faf80 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}8$4YcLn2z= zPCmX=_O~e7pmM}R;-!8xu?O_Ma>}2wfTy+ityffOuA2mIHfdx<%zxc`LbVw zqv=7?jY%vG%Q6q8=fsAm+3BYnDJWTV<=;-bWX;RK#;=MGo+hVwBl3QFr_4dy4V{rdX&wOKEDe4or=YzPru#l8tu0GM($ch+ t&M@_{o&EghhFkZ3_ooT4I12m`&i`@I!)p4Hc#sbnJYD@<);T3K0RS)lUn>9r literal 0 HcmV?d00001