From d4c5381a093738e46765c73855701d5e8e0bd26b Mon Sep 17 00:00:00 2001 From: Ablankmann <103340990+Ablankmann@users.noreply.github.com> Date: Fri, 8 Jul 2022 22:40:49 -0400 Subject: [PATCH] BEHOLD! The MagiVend! (#9440) * Magivend Sprites, and Entity stuffs * Oopsie! --- .../en-US/advertisements/vending/magivend.ftl | 3 +- .../Structures/Machines/vending_machines.yml | 32 ++++++++++++++++++ .../VendingMachines/magivend.rsi/broken.png | Bin 0 -> 872 bytes .../VendingMachines/magivend.rsi/meta.json | 31 +++++++++++++++++ .../magivend.rsi/normal-unshaded.png | Bin 0 -> 802 bytes .../VendingMachines/magivend.rsi/off.png | Bin 0 -> 571 bytes .../VendingMachines/magivend.rsi/panel.png | Bin 0 -> 244 bytes 7 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/broken.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/off.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/panel.png diff --git a/Resources/Locale/en-US/advertisements/vending/magivend.ftl b/Resources/Locale/en-US/advertisements/vending/magivend.ftl index b447bce16d..b889a43465 100644 --- a/Resources/Locale/en-US/advertisements/vending/magivend.ftl +++ b/Resources/Locale/en-US/advertisements/vending/magivend.ftl @@ -1,4 +1,4 @@ -advertisement-magivend-1 = Sling spells the proper way with MagiVend! +advertisement-magivend-1 = Sling spells the proper way with MagiVend! advertisement-magivend-2 = Be your own Houdini! Use MagiVend! advertisement-magivend-3 = FJKLFJSD advertisement-magivend-4 = AJKFLBJAKL @@ -7,4 +7,5 @@ advertisement-magivend-6 = HONK! advertisement-magivend-7 = EI NATH advertisement-magivend-8 = Destroy the station! advertisement-magivend-9 = Space-time bending hardware! +advertisement-magivend-10 = 1234 LOONIES LOL! diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index c78c0e1e24..7777ff1dd3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -338,6 +338,38 @@ energy: 1.6 color: "#4b93ad" +- type: entity + parent: VendingMachine + id: VendingMachineMagivend + name: MagiVend + description: A magic vending machine. + components: + - type: VendingMachine + pack: MagiVendInventory + - type: Advertise + pack: MagiVendAds + - type: Sprite + sprite: Structures/Machines/VendingMachines/magivend.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Unlit"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - texture: Structures/Machines/VendingMachines/maintenance_panel.png + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Appearance + visuals: + - type: VendingMachineVisualizer + normalUnshaded: true + ejectUnshaded: true + broken: true + - type: WiresVisualizer + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#9a18d6" + - type: entity parent: VendingMachine id: VendingMachineDiscount diff --git a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..17d7f7e59551fbbe52623d3dea5d65792920ab6c GIT binary patch literal 872 zcmV-u1DE`XP)O(L$7YP;5CjQp;U;vMw97W4?ZPn0q?hzW$6kvP9iE_qWS}I1Ma{YM&UD{&?{miY z><`2JzUOz&J$Gg@pwPKv9lvn^`mo-g=I&DhklLC%u=BYvC5E$4uV8qrUpb})P-*u2 zb5T|wy{>HUN4@}3X?R}%2LZA#05?c7N(d0R8pd|yIC9EYMO&`xq?%8qFM!pZ2+Z&| ztWABfTGlhgBXV7*f9DruXNf&M1F+85U2r_`5(S<2=j`PhfFgi& zyWU#WXjiJNXLJxnE$vubilVfnSafHOzQ%546I!kI$lN$4W+~|m1oQGm1jJr`0b~zZ z%aU=qkBl=6slBrk<1fb$%zcGtler1^-xGksizUlT!}e14oPnrZHX!Px!M;9GnxIH* zCI`Thy=1R5t-6SYRp)+Kd2q3MH7*B|24KS+`qJ1ju*cj_P_QEA&Vi%>$N(KdsT6Lw zj)TSt$e3G5Z4S`&Dr#xOBAT2tXDBkxaNJKyX%2|HZ5gKX-i@8L?71jQ+T-AYWtE=1 z_XGgRFnLPG7$Q!wBO#ez4dHz-52?ukaTP7qS`WQw_7dknQnz4usuyP)4v8F)imF;;H=2Ywn((|YX<@JZf9y)0O$f&(RhA0QR zUpQm*ahch$f5&P9>c67f-Pgq0zYYxf18_sohH@l00;&%UuVLd9F`cvkwCL%R5oaTc zKs5aZyolykbF~0u{N|ljr>qIs{hZ+{HC|~J3CPA}2QJ?#^9Nvud)|Q<=(f+A zjFTai7>x2FB{@LnOh>^vF#RA)ykrLZj6};6#`Q`Fz}Ky1%vAzJx89`TKj{y~xU#jFDDsK`0000ZPVYbG@Xjoj^2d`^b+Ia^W3PJO3dfbEA)FpKtIJdKafS}-syVKBCldHhPY z9PD8pGko=&VSU{RNOR#;ZS|Sg6~}Z0g8*CrJOE@piHb;WepOrD;;d!*>x|q)KnSTv zInrEMovcw&#GOk^*uQ(hNO)bmeqKGwA-Q>VvRL$WR{#Jc6LAED5R!>_$?It@jDQe= z^yCHrYgYgOq~>Pf_47#0m45P)dwFucz8PcI*PVcTEDC2^x0-xD7RAcjaJF@;D8Q`noHC_tygedXFB){ksoK_8GkPL394|i*+l&-_QsEXx+C5 zFDG7=>~m`5ljgjA%DBFv8UO&P>&MZ1W+Q)o6*;;0Y?sa za8GJh+nzsO()5XRxisyOE|;Y>pn2z3OyoGV?Ls22>C-1THSK+Zlc@&$ks>(We?{{S z{_P?tKDupKzw8Ai<5PkWLvKh$=5sQ#$xW!?=9wnJZhcG-af*`hDbqvTn*WfPiD9?C z=>T>oV1@pg16d|+x4zv^z*haLPr!;8)tms;0E_fhl#I`CFqXd6qE8S6K@bE%5dRqD z56}xh{s8g^kUxO@0pt&0g!}>I4u4^P)OnL~4tW0KD#L@bZy8=3 zy#?d}@lluzG8-4bR4>871~!vu2f%=ZwLRPi#DoGa--A4Z3*dCXiyv1QPMzpvU^oF4 zIDsU2f&n)`Q}^KWCk8vNR?;0H!J)(O=r;qyZ#@?VQbD?_KEu9EyBQ9gI|4V0WCwsk zfPtBTEHJOP7fdVg@_|DDY!;~wpadip7o&s#K0p%(poaiO4tRL;49N~?8&)A8uWmxJ z1Cr2k0YwfV2T(Nx$N^N%1>_{cd6)Kp>7gA0>yEZFnAkBfsQmmuvIEf50LUzPO-0fi zaP{yXhBJp)z;tazEdx2Axucmu+m;7x1}=cp0U%2u2C#tXsSPVhvOK#X9IO}Nffb}V z0NoKF1Bnd@m>yz653d7|4FZM0Bj#A58~{=a3jvTB_#A=L0qB;)04#-L15SRf@C1nN z2(L6%(j0&u{4hs=EC*SH4In#=CTZYQH5ZGZQ2I zw4JX^$y#tC@t4(s+{psXr}p#nl%8F~!_)NRYS4Yg%wzv0)8?k`VHWpTzL~jU+F=>T io}ybR&PuxMj11R=v?F4y!$pBEX7F_Nb6Mw<&;$Um9a~)h literal 0 HcmV?d00001