From 9d19cdb94084b51b3476d66eccea26da77da857c Mon Sep 17 00:00:00 2001 From: M1and1B <153716654+M1and1B@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:52:19 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=821?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VendingMachines/Inventories/musmat.yml | 15 +++++++ .../Entities/Structures/vending_machines.yml | 33 +++++++++++++++ .../VendingMachines/musmat.rsi/broken.png | Bin 0 -> 1445 bytes .../musmat.rsi/deny-unshaded.png | Bin 0 -> 609 bytes .../VendingMachines/musmat.rsi/meta.json | 40 ++++++++++++++++++ .../musmat.rsi/normal-unshaded.png | Bin 0 -> 819 bytes .../VendingMachines/musmat.rsi/off.png | Bin 0 -> 1168 bytes .../VendingMachines/musmat.rsi/panel.png | Bin 0 -> 198 bytes 8 files changed, 88 insertions(+) create mode 100644 Resources/Prototypes/Stories/Catalog/VendingMachines/Inventories/musmat.yml create mode 100644 Resources/Textures/Stories/Structures/Machines/VendingMachines/musmat.rsi/broken.png create mode 100644 Resources/Textures/Stories/Structures/Machines/VendingMachines/musmat.rsi/deny-unshaded.png create mode 100644 Resources/Textures/Stories/Structures/Machines/VendingMachines/musmat.rsi/meta.json create mode 100644 Resources/Textures/Stories/Structures/Machines/VendingMachines/musmat.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Stories/Structures/Machines/VendingMachines/musmat.rsi/off.png create mode 100644 Resources/Textures/Stories/Structures/Machines/VendingMachines/musmat.rsi/panel.png diff --git a/Resources/Prototypes/Stories/Catalog/VendingMachines/Inventories/musmat.yml b/Resources/Prototypes/Stories/Catalog/VendingMachines/Inventories/musmat.yml new file mode 100644 index 0000000000..6903ceccd6 --- /dev/null +++ b/Resources/Prototypes/Stories/Catalog/VendingMachines/Inventories/musmat.yml @@ -0,0 +1,15 @@ +- type: vendingMachineInventory + id: MusVendInventory + startingInventory: + ElectricGuitarInstrument: 1 + BassGuitarInstrument: 1 + RockGuitarInstrument: 1 + ViolinInstrument: 2 + SaxophoneInstrument: 1 + AccordionInstrument: 2 + ClarinetInstrument: 1 + MicrophoneInstrument: 2 + SynthesizerInstrument: 1 + TromboneInstrument: 2 + emaggedInventory: + SuperSynthesizerInstrument: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Stories/Entities/Structures/vending_machines.yml b/Resources/Prototypes/Stories/Entities/Structures/vending_machines.yml index a5ef1cb4b8..4e234b960e 100644 --- a/Resources/Prototypes/Stories/Entities/Structures/vending_machines.yml +++ b/Resources/Prototypes/Stories/Entities/Structures/vending_machines.yml @@ -57,3 +57,36 @@ radius: 1 energy: 1.2 color: "#78645c" + +- type: entity + parent: VendingMachine + id: MusicalVendingMachine + name: МузМат + description: Торговый автомат с музыкальными инструментами". + components: + - type: VendingMachine + pack: MusVendInventory + offState: off + brokenState: broken + normalState: normal-unshaded + denyState: deny-unshaded + - type: Advertise + pack: SecTechAds + - type: SpeakOnUIClosed + pack: SecTechGoodbyes + - type: Sprite + sprite: Stories/Structures/Machines/VendingMachines/musmat.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: AccessReader + access: [["Prison"]] + - type: PointLight + radius: 1 + energy: 1.2 + color: "#6f42d6" diff --git a/Resources/Textures/Stories/Structures/Machines/VendingMachines/musmat.rsi/broken.png b/Resources/Textures/Stories/Structures/Machines/VendingMachines/musmat.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..f7a81f0c0493a528300847238da378bf6e3fad05 GIT binary patch literal 1445 zcmV;W1zP%vP)Px)Ur9tkR9J<*mrG9@R}{y8V3>@@V_xyZ358H$@-TtYKpRzABzS(i{KJ(WPT|EaO0PxoF_ld;}qQ=0B%ei@O z-~5q6{w~SkDb8Q`D&%+l_wST`W^NuwRIzQrlhqpl9GHM7j;IFCC({=dmWpd3d%yl= zUx4n{CGcOwBhg9T2!U4x@XLeDwb0#xOVHR62WQklo~+)WkiVmTb{Z5=Zi*46PSo7qQXBZxtpj6DiUK7@~i$uD1a72};9>Eb+q^RJC zL85vD-55lQN=IDJ{jJV}LkTLS$HZcT)V7PjYxIDuRx-xLKsp*jA3F>AtP5>padDNKcLh$Skd|bi|);{sMrg7lH)9U9%_C7fB9J;fQKz zb)FeXssE*v=(>)SlJw*lQc9&eal}H?`a-y}wn(M)fIFF=!Wr;Or_Gj%Xl&=6plR-# zw_3YMDFX;@b8hFJD0@GiPfRhGILW7Pe}Z8q0pApqig^;&FtJ!1+pZ}r74rbp>vc@i zRD^nZx@om`LkM7+rn2|&*MI&5;Cy1reNKrN1Zvww8askY=`s2Bwh9u}BQ$o}q()~c z0EKo#>Adv&v0it_FyoZC_|YHeZ*59zO>_87Q;+;zj(yWVJ$FMTiRuCP~NHH5` z?yLRKVJJUqW7}n7u^}RfH1CZqldvoRE?@owfDbMdNm!OT2MDxmw=U_)F*3_JHP=qn zt-C+{@S+Dc3r%dhOnP#RdObqbYfkp1=m5E{Ww7|MWYnox(e)uQSF@7^$zth5^t)i8`WAdrrM z9u=WIU>I@MA`%=45x|jX(LT!EyU=I2BiLsI_W(dPK7`2Du&gnp38P+ErAeQG@C7j zekm0pVTFSO^!B=sZ8jyoY}0JIeWD+m4v(Q1u#?z!S#_=uHJ&4JM4M7Ejvn1r!5zoO z5p7zr1T!Cgqh?-i+zC9-e^vzUWfw?|&MJnUbIU2Rc4v{%n%Kf4UOiW)=n`&v{TT-L5%30J49NN>5w)Oox{OBG=w7~uK(p~i-VXC#QWyc$$mZiTi1Sm|C{^^zV}sWlNN}o00000NkvXXu0mjf(g?~D literal 0 HcmV?d00001 diff --git a/Resources/Textures/Stories/Structures/Machines/VendingMachines/musmat.rsi/deny-unshaded.png b/Resources/Textures/Stories/Structures/Machines/VendingMachines/musmat.rsi/deny-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..d62b1d00de99e4fbff4ef4f3a3e5cbb64e266d49 GIT binary patch literal 609 zcmV-n0-pVeP)Px%8%ab#RA_VAhVy+-P9|3bnlc4AWsF+`%AnB7=K)TEj6`~Tm#4LMb z{^m9(gL7$&;W^Hh;t%_&rX_bI>OcbA_l7h`H+g z6KKOcP;(BLh?i^g`<42z^-vKN0^wi?EUw8Dpz7b;<`whVx*+M*u7I(SI|rIwpd8!c zMew-MbBCG-{!)NxgEwlr|GVGcTHOWaI>&5rjk(_5)yw7+o#R+|B)!@Kgo9zD!Q~#% z7UoQE;x>%=u{(qmE=jMp0AE$QbwN2_3xWc)rzG5M-$xD z_zY$j2uraIF7#y&y4ka3^S@MwM`5!(@81QQEZa7?(hA4ItC&wpSK@sjUx(jkQ;fL4 vQ|4ld9G|i&H5E-i`Cj{ffW>05SoYu!R?;nz1Dt(J00000NkvXXu0mjfqvIIZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Stories/Structures/Machines/VendingMachines/musmat.rsi/meta.json b/Resources/Textures/Stories/Structures/Machines/VendingMachines/musmat.rsi/meta.json new file mode 100644 index 0000000000..40b47e583d --- /dev/null +++ b/Resources/Textures/Stories/Structures/Machines/VendingMachines/musmat.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "Собственная лицензия. Копирование, модификация и использование вне проекта Space Stories полностью запрещено без предварительного согласия текущего владельца проекта", + "copyright": "M1and1B DS", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/Stories/Structures/Machines/VendingMachines/musmat.rsi/normal-unshaded.png b/Resources/Textures/Stories/Structures/Machines/VendingMachines/musmat.rsi/normal-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..54fab506854aa35851247b9a0f21a31ffde0e5d4 GIT binary patch literal 819 zcmV-31I+x1P)Px%?MXyIRCt{2o4s%1KoG^p2*qY2u;e0DQe1P*r9*U~xh8+}HEFo+L>C$w3a3h8 z$%$g@Q-rTD>oZ`2nO&~|zh5)BVBd!Qnsw$80RR91000000ByqJe5wEBr}Fdrd`8`# zpx)iL?D^*%t4*%{Hs_|_<#r;uxy>5z7t|S!DIp^J^@ZCUTffLT>UX#uaFU2t(+Pbp zqx{(G5uoXz#ah0 z^{D^-2U)I1X&B_u6qf5z^gN}{Wz?8{QJ1UF-hyIVkmY(C(Il}g@)g*WzU6xK_Gdy% zf5FyguK?MJVl>Uw!(*o3hg|tndbq|osb9=uuwQSq24*&oF0000000000 z0010`vOi!OllA%U^BGYXP=EBlGR?Fg1)jpK$_$L59KUK zIz-x-1?kW)^#{m9)AB3G3E3>5nM2C^g}HFH-eDE4~V7LZ3)I3*6a)s=m!Th5CGYc+B+I&rSFP xidi810fzN;WP$JpDCifnK$H3a0002cz(0cwv(PxsmT&+7002ovPDHLkV1lVMi(~)* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Stories/Structures/Machines/VendingMachines/musmat.rsi/off.png b/Resources/Textures/Stories/Structures/Machines/VendingMachines/musmat.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..5cb2e9dccce85f500dd20cd2e5ba39c7148d7b86 GIT binary patch literal 1168 zcmV;B1aJF^P)Px(N=ZaPR9J<@mt9jERT#&AVac+)*@S>u-b(EZ6oD$%R_%CY)fsQ~(tZHHir>Ny zpclPq@9lI(Z`u*82($uWcqtSTNt$HO9`XWSEPL2ZNC;y)J~Nqr&Ng6|vm&yRZ-CH+#@_dh#=Q1fhW)RxHB`# z{O^!)EKD=e;^TRc&k63#j4J%OqcbwWQ{3+d@i-VHij$v2BY=<*dDycGl7LR9g%z zB0^6TTRvfXe|%DX4{sh|U{ga5x}NHY=Mv~-lbTLx^Ch}&0e;G*lo149oTbf|%D){3 zrb>{{?UHfENF^G`vtvUUMVJHo(czN!AIY7o41O|Ed@D=ft#UaNKU~>jcLqiq| z#6oG863p}fORMwDOx&SXtB2OwYe3gi>>nJcu`k{f=b0iPiv?DeAE+Apfr8l^-$Vl9 zaRX?tfq2{?9`7ZaeTQteK`cE&>e>yCyc~U|qmb?SrVONY0IrNDRZTat0yC{M$?aC= z9W!WOJlDy=23Z5t}l+N$|HtT(D)>R4715N$PJ zSxL4v37!NE@FcpK;;<*wf+;I{4gh46gNSSyIQy9`M47FgV{U)&HA1|`bq~AJfUc)_ z@!}`qaRb}#4`t>xwVGsl`d(`Wdfhy8A4V@EAzo9f)fI-VQW230DSQ#dB{%U9h0>#)WX63NE zSIQ35sV@D`0|e54|45j4%Ny*Omw7JWa)_t#X-NqQiHHfh^Aod9C8Q^x|M2I8BU@V@ lYuoel`WG&}3pB7`V9?8vtgML=T>^9qgQu&X%Q~loCIDRkL^J>Z literal 0 HcmV?d00001