From 53ff974e67f66059ba6af503b1d28b764f658eb1 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Sun, 31 Jul 2022 03:31:50 +0100 Subject: [PATCH] Salvage vendor (#10112) * adds basics for salvage vendor * adds floodlights to vendor * adds knife and pka to vendor * adds the mining vendor sprite * fixes flashlight ID...smh --- .../VendingMachines/Inventories/mining.yml | 6 --- .../VendingMachines/Inventories/salvage.yml | 15 +++++++ .../Structures/Machines/vending_machines.yml | 32 ++++++++++++++ .../VendingMachines/mining.rsi/broken.png | Bin 0 -> 860 bytes .../mining.rsi/deny-unshaded.png | Bin 0 -> 768 bytes .../VendingMachines/mining.rsi/meta.json | 39 ++++++++++++++++++ .../mining.rsi/normal-unshaded.png | Bin 0 -> 858 bytes .../VendingMachines/mining.rsi/off.png | Bin 0 -> 665 bytes .../VendingMachines/mining.rsi/panel.png | Bin 0 -> 198 bytes 9 files changed, 86 insertions(+), 6 deletions(-) delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/mining.yml create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/broken.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/deny-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/off.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/panel.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/mining.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/mining.yml deleted file mode 100644 index 9fd31f65c6..0000000000 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/mining.yml +++ /dev/null @@ -1,6 +0,0 @@ -- type: vendingMachineInventory - id: DwarvenMiningEquipmentInventory - name: Dwarven Mining Equipment - spriteName: mining - startingInventory: - Pickaxe: 4 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml new file mode 100644 index 0000000000..2b41c9c482 --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml @@ -0,0 +1,15 @@ +- type: vendingMachineInventory + id: SalvageEquipmentInventory + name: Salvage Equipment + spriteName: mining + startingInventory: + Crowbar: 2 + Pickaxe: 4 + OreBag: 4 + Flare: 4 + FlashlightLantern: 2 + Floodlight: 2 + HandheldGPSBasic: 2 + RadioHandheld: 2 + WeaponProtoKineticAccelerator: 2 + SurvivalKnife: 2 diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 7777ff1dd3..9983064159 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -887,6 +887,38 @@ energy: 1.6 color: "#ffe599" +- type: entity + parent: VendingMachine + id: VendingMachineSalvage + name: salvage vendor + description: A dwarves best friend! + components: + - type: VendingMachine + pack: SalvageEquipmentInventory + - type: Sprite + sprite: Structures/Machines/VendingMachines/mining.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Unlit"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Appearance + visuals: + - type: VendingMachineVisualizer + normalUnshaded: true + eject: true + ejectUnshaded: false + denyUnshaded: true + broken: true + - type: WiresVisualizer + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#9dc5c9" + # job clothing - type: entity diff --git a/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..7c51ef95edc813250a5be0e49f38c34c058ab87c GIT binary patch literal 860 zcmV-i1Ec(jP)Px&7D+@wR9J=Om)lPhK@`S+T$;MHP$;0ZRH+RXi2>3`j7A}mHxpk?^w09Y;N3?P z9!Q9Z!62y#wp0RyF87wgwxx3Oq0DygyM_3~_cS{@Gv}LgzL|3d?mAik5|1NS|I^6$ zK&$Tiusxx++ePE;=snX!sbe32YNh{H1m3+IF!Y=Q@cCfRI$V z6#)SGVAG;EVI~lg0&07CH^p>3%a@-Wt_Bq4luvIiJ(0=EC6dt)fSEw4S_WX^!IF-Q zKX5@$cY{drsG|GMWljNDOsAL}TXHn6g^s}QQWQ$j>m4ZoydU53vMCjlV@oOtD>7o| z0KMmHv>F!}jV2k5CJ6?EoE+~pWn4=lvpQq>&*%XY0bisGU!;qHpuO^k;$cSui|G_6 zr$x(9XgvTH8gPS~allpsTJZ^(JmAIn#(KeVTxNBK#dOM+gf3+$gZ`$C8^vc!z!&LqT<9jo!7M%jH3Zp{*o_vpLt=Ww(>RqtvUAJRgrRuY zRRjGm?t5AbEJ7eexTEY_PH;N`0&DXb!ej2^Os8N)&axtBQ51#FF7r<0e9iG&z-tI} z9(Wp(8R)f7y+#4b`I@CD_rLFX4ui=9A{%;z7fm=p^?)cuobV^txTL~;4d)qkG4f;% zicJy_W!GWxFWU3)Z1`MlU-Vxhb^CdEB~d)8@alC0sCyxoXFd44bc%3s zR(BGNNyw2vpA;sbDaW+XdZ0YFNnqxY$+$?z+7O7V*s&y2q5Pn%=(}p=Hhg99A+e*> zfHr>l+hAcE{609l0PJf4LBdF&1z>7w>I&-DvGyJ)Rm*B&DvoE!#xqWsUr+KOwWjOK z$|bh)p}Gh1TR8?}!`BH(dj>jy#ydffYz899Mf>!j%F1cL@H88Y4U^x>SuQjf8&=zP mW9;Vip0AnyX`g3z8~*_K9~+;Jg0*A-0000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/deny-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..647877bda62c598a33590301e0811e9c4f3538a2 GIT binary patch literal 768 zcmV+b1ONPqP)Px%x=BPqRA_H`T_Co zbz1=_a!=n0{kDoM5?NvEa}yv4K)#p&0L0gGNT)f1ebWuW52KizFf}pKw$$LP5+LBTq2q096UsVCShu1Lalt}1WcA&vqO&SkH z7Ku?JnTub$dd2pEV};jmzE}#zOMPYqOwZ0BnGCrqp3T-Q&-GHDc?eS0Ry&AXYGG}) zgTqQi?~fFkh!mOwb3c9PjC`h-Q@qgUehpF<7G`jA@_RtMa{aKmQ`kwO#YSPTFVm}{6i(a*1=Q@wp|aSrXhQ-j%))8{6jT5X|v zaT;iS1_1nM^~UDU^K7)kDtvhs_|xtDrhTQi4c(obJ~sh&_pIAYTHnXV1)e{OliPPg zSl;c;AOLv<5CU-ZP2U6o;QrP_!vLP9A2VNYD&H$;9REeReP~6-b^R=W5kg|?2zpM0000Px&6iGxuRA_MX5~)M4+XR5QV0wCoi73>y5+%F(&vC zJlMn-Zr=C|deE4F)KZa%jVP-S(iCi=Sfs1a3Tu@0u-zrw&c2mpF}lBGGtWHp@}GG+ z^XwKdF)=YQ`F|;sYn*&A#PaslJJYg#^&D%Yez{abaKyn=G5}U9Ff-=|01Wnr5gc)_{Dev{O!0WF7^N>60EXcPCO_Q7%p7O)6Dq;? zZLN00*)>tpFKCoLF#vqDXXgAE?4Q7DUbwZ|t#bKX#GPFe`8mRxu7Q#I#08CyI#_-n zf1LPI4TWR)xkks;1;9vs;tAl7AHx7zlUE_Z5eLi9r4}RgiIZQt*uj$gN9EP*Csmsn z@OK`Iek8o8?gUg+Rbpt!sjK+(bW(L+d)+Bq4m9bi|01+W^jqWx_4ef8I!B|oCx^9o zT=2UhX}BV3QQ!CPaz%CiDV2^k3mi=}I@&BqCe{VNFJyr)BwqUBLVZ!4f8>yS4f532 zS0a=7Db!t&G~xq|MRvE>CfaPb*CyCU34-0;fSsLfq3#P=5Dgp@*`1z@XtSN3j9_zq z@(Cc`$-os4>vr2nO(heHR-y@r=rM9)ak54!%C|4@fPM`^x43DM&}U(D%0N8>Ui8q0|%7y)N{y}VTA)5nSku)fe2LMoAlM=Nl-RtigS;4MtuEFkdR;D)@U&w-&UM~QkrZy^SQ%Y{R ztv$iEovy+j$oi52NF-<^&Q<{QM*zS!eb`plAT@?dmaXTjfM0p%XYQ50E4$oc(q9-n zYX`7D3jp}Bf7sU8l#&?3mClxOIDgx@NXd%N7+G-X+R@C)s|Il1S2Kgm5! zlfhrzyI%W)W7NZEJ1H77VsPp9EX>BoM2(HgES6V#9vO^S{{j9z0BVwv0IXa4Sb1)t zT5cz5Xnn~uuK<8dFJ50`Sl1U2FOVh5&6c!;TEa#Y8@e$($g# z$ebICb214trFht;h63z0+y19_oJ!|9v65e^*}0YCoWU0Q^ToL5q~ihTlX(oQ51TEV zoiFyqEXR|s9qQlk@P5l;pHeQ|ria{QmW@T^;sekgo3$F7k7d6F3{@giE`oq9U#IQ? z+GDrQjvcpmPTcFmIiym>FUwzX_d1g>+)#k9ra5X!0q$N+_MIRSfa}qE72jK*2P!mC zJdHb7tnTrf&0y)v^S|N&kfx0}RJAGP8q3~=Z3nxoFm==K9R~%!X`J0B(p)8grfIlj zoX5%OqG}oRx{eL=T_8^84fm@uH}-SjXT8P7C@3cTB`R#(9vpyP8bz@yGbNdln3!AE zW#`AD0YqIqWg=w6px&?1%Bi!;V<-Yt8dTKgV_!R&4w;$DHS#T+OsFkrtp^7(8A5T-G@yGywpXiBYZq literal 0 HcmV?d00001