From 25f2573b12d270a141d5f8db4bf60f096a9cbcb0 Mon Sep 17 00:00:00 2001 From: OctoRocket <88291550+OctoRocket@users.noreply.github.com> Date: Sat, 20 May 2023 19:52:23 -0500 Subject: [PATCH] [Add] Adds winterdrobe (#16652) * winterdrobe added * changed timings * more coats * fix typo * add bomber jacket to the winterdrobe * remove winterdrobe items from clothesmate * restock box added --- .../Inventories/clothesmate.yml | 2 - .../Inventories/winterdrobe.yml | 15 ++++++ .../Service/vending_machine_restock.yml | 1 + .../Structures/Machines/vending_machines.yml | 33 +++++++++++++ .../winterdrobe.rsi/broken.png | Bin 0 -> 942 bytes .../winterdrobe.rsi/deny-unshaded.png | Bin 0 -> 392 bytes .../VendingMachines/winterdrobe.rsi/meta.json | 44 ++++++++++++++++++ .../winterdrobe.rsi/normal-unshaded.png | Bin 0 -> 2465 bytes .../VendingMachines/winterdrobe.rsi/off.png | Bin 0 -> 470 bytes .../VendingMachines/winterdrobe.rsi/panel.png | Bin 0 -> 190 bytes 10 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/broken.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/deny-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/off.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/panel.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 3acf7c4ab8..20057aa6a0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -54,8 +54,6 @@ ClothingHeadHatRedsoft: 2 ClothingHeadHatPurplesoft: 2 ClothingHeadHatCorpsoft: 2 - ClothingOuterWinterCoat: 3 - ClothingOuterCoatBomber: 3 ClothingHeadFishCap: 2 ClothingHeadRastaHat: 2 ClothingBeltStorageWaistbag: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml new file mode 100644 index 0000000000..ba60084367 --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml @@ -0,0 +1,15 @@ +- type: vendingMachineInventory + id: WinterDrobeInventory + startingInventory: + ClothingNeckScarfStripedRed: 3 + ClothingNeckScarfStripedGreen: 3 + ClothingNeckScarfStripedBlue: 3 + ClothingNeckScarfStripedBlack: 3 + ClothingNeckScarfStripedBrown: 3 + ClothingNeckScarfStripedLightBlue: 3 + ClothingNeckScarfStripedOrange: 3 + ClothingNeckScarfStripedPurple: 3 + ClothingOuterWinterCoat: 6 + ClothingOuterCoatBomber: 3 + ClothingHeadHatSantahat: 2 + ClothingHeadHatXmasCrown: 2 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml index 950267aa8b..74168fc8f0 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -103,6 +103,7 @@ - SciDrobeInventory - SecDrobeInventory - ViroDrobeInventory + - WinterDrobeInventory - type: Sprite layers: - state: base diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index a662bafc99..b213383162 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -293,6 +293,39 @@ energy: 1.6 color: "#3db83b" +- type: entity + parent: VendingMachine + id: VendingMachineWinter + name: WinterDrobe + description: The best place to enjoy the cold! + components: + - type: VendingMachine + pack: WinterDrobeInventory + offState: off + brokenState: broken + normalState: normal-unshaded + denyState: deny-unshaded + - type: Advertise + pack: ClothesMateAds + - type: Speech + - type: Tag + tags: + - DroneUsable + - type: Sprite + sprite: Structures/Machines/VendingMachines/winterdrobe.rsi + layers: + - state: "off" + map: [ "enum.VendingMachineVisualLayers.Base" ] + - state: "off" + map: [ "enum.VendingMachineVisualLayers.BaseUnshaded" ] + shader: unshaded + - state: panel + map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + - type: PointLight + radius: 1.8 + energy: 1.6 + color: "#3db83b" + - type: entity parent: VendingMachine id: VendingMachineCoffee diff --git a/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..682af2e6ec2a9f10ae170d79a356b70d72cc13fe GIT binary patch literal 942 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 O0<6vL%&OsDkN*XF@9F;l literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..93f88d1a7e39a4938b55aeab7f121cbb580127f1 GIT binary patch literal 470 zcmV;{0V)28P)Px$kV!;AR9J=Wmc43(KoG~rGmzs7t9t`MI4lI)gpfB#W0flL$}MG|LM$!sqe^9y zH%O5#QMiBz7Yz3RA;l#G2^^+UjJWIUoi^cqjl1sb%ztOcbtPzkQkpltKNQz>C6pnh zH20KYzS(SApBNiY8Ro1-4LV(7g)~i3c8w{al;)1(93&u)W6*WI?0cTqxCN*T#BnSX zxCmafd7Q8YvMl5FS*WU73MtyWxl94|J;d&*=$u9YVHgSrYlG#JnE?QR`Et=oaQo(# zImQ$~2!Z)>!JW+FZ05swa0*wFT>7$YTTFoO`+xeA$)q)Kk|Y2CFqKDKUsaf&At6L4 zc-3xu{SH4DAC121aBE;+l)Ew7wwI%Lw)=+re222_B?I*u;L%G4>NUXQSOdozIMx74 zKyk)n?WXdm{1LT*-U6%$QCbCbbtl+c006+Hc@EKfCFI!D40wnhyAe=eSr*DJ2m-WE zlz?cx0#h^K?d28a)YJ@g#!v#bU!SOS?gLjq`1IUMP?P}HCGy|#3#P!zIk-VRR{#J2 M07*qoM6N<$f~HZTD@E@bvU_NvA($#wnr(!Xc+! zxY-SW0LU@E^H5*bg578Khv|+_lg$sW*?jCvdBeJOdWZj3DYB`nt4B%rOPnz=`)6-p h#&6~hvQUMA!DX(Lkd@zrT|fshc)I$ztaD0e0svz&KxzO0 literal 0 HcmV?d00001