From d3917dc021e996f594382c202ec88981bebc9061 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 28 Jul 2023 23:16:03 +0300 Subject: [PATCH 01/81] CuddlyCritterVend --- .../_NF/Catalog/Fills/AstroVend.yml | 59 -------- .../VendingMachines/Inventories/astro.yml | 13 ++ .../VendingMachines/Inventories/circuit.yml | 21 +++ .../VendingMachines/Inventories/contra.yml | 22 +++ .../Inventories/cuddlycritter.yml | 4 + .../Structures/Machines/vending_machines.yml | 135 ++++++++++++++++++ .../_NF/Entities/Structures/machines.yml | 105 -------------- .../VendingMachines/astro.rsi}/broken.png | Bin .../VendingMachines/astro.rsi}/meta.json | 0 .../astro.rsi}/normal-unshaded.png | Bin .../VendingMachines/astro.rsi}/off.png | Bin .../VendingMachines/astro.rsi}/panel.png | Bin .../VendingMachines/contra.rsi}/broken.png | Bin .../contra.rsi}/deny-unshaded.png | Bin .../contra.rsi}/eject-unshaded.png | Bin .../VendingMachines/contra.rsi}/meta.json | 0 .../contra.rsi}/normal-unshaded.png | Bin .../VendingMachines/contra.rsi}/off.png | Bin .../VendingMachines/contra.rsi}/panel.png | Bin .../VendingMachines/contra.rsi}/screen.png | Bin .../cuddlycritter.rsi/broken.png | Bin 0 -> 582 bytes .../cuddlycritter.rsi/meta.json | 31 ++++ .../cuddlycritter.rsi/normal-unshaded.png | Bin 0 -> 452 bytes .../VendingMachines/cuddlycritter.rsi/off.png | Bin 0 -> 462 bytes .../cuddlycritter.rsi/panel.png | Bin 0 -> 606 bytes 25 files changed, 226 insertions(+), 164 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astro.yml create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuit.yml create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contra.yml create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml rename Resources/Textures/_NF/Structures/{astrovend.rsi => Machines/VendingMachines/astro.rsi}/broken.png (100%) rename Resources/Textures/_NF/Structures/{astrovend.rsi => Machines/VendingMachines/astro.rsi}/meta.json (100%) rename Resources/Textures/_NF/Structures/{astrovend.rsi => Machines/VendingMachines/astro.rsi}/normal-unshaded.png (100%) rename Resources/Textures/_NF/Structures/{astrovend.rsi => Machines/VendingMachines/astro.rsi}/off.png (100%) rename Resources/Textures/_NF/Structures/{astrovend.rsi => Machines/VendingMachines/astro.rsi}/panel.png (100%) rename Resources/Textures/{Structures/Machines/VendingMachines/syndicateArmor.rsi => _NF/Structures/Machines/VendingMachines/contra.rsi}/broken.png (100%) rename Resources/Textures/{Structures/Machines/VendingMachines/syndicateArmor.rsi => _NF/Structures/Machines/VendingMachines/contra.rsi}/deny-unshaded.png (100%) rename Resources/Textures/{Structures/Machines/VendingMachines/syndicateArmor.rsi => _NF/Structures/Machines/VendingMachines/contra.rsi}/eject-unshaded.png (100%) rename Resources/Textures/{Structures/Machines/VendingMachines/syndicateArmor.rsi => _NF/Structures/Machines/VendingMachines/contra.rsi}/meta.json (100%) rename Resources/Textures/{Structures/Machines/VendingMachines/syndicateArmor.rsi => _NF/Structures/Machines/VendingMachines/contra.rsi}/normal-unshaded.png (100%) rename Resources/Textures/{Structures/Machines/VendingMachines/syndicateArmor.rsi => _NF/Structures/Machines/VendingMachines/contra.rsi}/off.png (100%) rename Resources/Textures/{Structures/Machines/VendingMachines/syndicateArmor.rsi => _NF/Structures/Machines/VendingMachines/contra.rsi}/panel.png (100%) rename Resources/Textures/{Structures/Machines/VendingMachines/syndicateArmor.rsi => _NF/Structures/Machines/VendingMachines/contra.rsi}/screen.png (100%) create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/broken.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/normal-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/off.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/panel.png diff --git a/Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml b/Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml deleted file mode 100644 index 1106ec00366..00000000000 --- a/Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml +++ /dev/null @@ -1,59 +0,0 @@ -- type: vendingMachineInventory - id: AstroVendInventory - startingInventory: - ClothingOuterHardsuitSpatio: 5 - ClothingShoesBootsMag: 15 - ClothingOuterHardsuitBasic: 5 - ClothingOuterHardsuitEVA: 10 - ClothingHeadHelmetEVA: 15 - RadioHandheld: 15 - HandheldGPSBasic: 15 - AirTank: 10 - JetpackMiniFilled: 10 - EncryptionKeyCommand: 30 - - -- type: vendingMachineInventory - id: CircuitVendInventory - startingInventory: -## SalvageExpeditionsComputerCircuitboard: 8 - OreProcessorMachineCircuitboard: 10 - CircuitImprinterMachineCircuitboard: 6 - ProtolatheMachineCircuitboard: 6 - AutolatheMachineCircuitboard: 6 - ResearchComputerCircuitboard: 6 - ResearchAndDevelopmentServerMachineCircuitboard: 12 - TelecomServerCircuitboard: 6 - ComputerIFFCircuitboard: 4 - EngineeringTechFabCircuitboard: 4 - MedicalTechFabCircuitboard: 4 - ServiceTechFabCircuitboard: 4 - ScienceTechFabCircuitboard: 4 - MaterialReclaimerMachineCircuitboard: 4 - ExosuitFabricatorMachineCircuitboard: 4 - UniformPrinterMachineCircuitboard: 4 - HydroponicsTrayMachineCircuitboard: 16 - DawInstrumentMachineCircuitboard: 4 - -- type: vendingMachineInventory - id: ContraVendInventory - startingInventory: - CigPackSyndicate: 8 - Stimpack: 6 - StimkitFilled: 4 - SyndicateJawsOfLife: 4 - ToolboxSyndicateFilled: 4 - RadioJammer: 8 - PowerSink: 2 - BoxEncryptionKeySyndie: 8 - AgentIDCard: 8 - StealthBox: 6 - ClothingMaskGasVoiceChameleon: 6 - ClothingBackpackChameleonFill: 4 - HypopenBox: 4 - Emag: 2 - StorageImplanter: 4 - ClothingShoesBootsMagSyndie: 4 - ClothingShoesChameleonNoSlips: 8 - ClothingBackpackDuffelSyndicateEVABundle: 12 - BoxHoloparasite: 2 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astro.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astro.yml new file mode 100644 index 00000000000..434c9bc38ff --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astro.yml @@ -0,0 +1,13 @@ +- type: vendingMachineInventory + id: AstroVendInventory + startingInventory: + ClothingOuterHardsuitSpatio: 5 + ClothingShoesBootsMag: 15 + ClothingOuterHardsuitBasic: 5 + ClothingOuterHardsuitEVA: 10 + ClothingHeadHelmetEVA: 15 + RadioHandheld: 15 + HandheldGPSBasic: 15 + AirTank: 10 + JetpackMiniFilled: 10 + EncryptionKeyCommand: 30 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuit.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuit.yml new file mode 100644 index 00000000000..556ea665486 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuit.yml @@ -0,0 +1,21 @@ +- type: vendingMachineInventory + id: CircuitVendInventory + startingInventory: +## SalvageExpeditionsComputerCircuitboard: 8 + OreProcessorMachineCircuitboard: 10 + CircuitImprinterMachineCircuitboard: 6 + ProtolatheMachineCircuitboard: 6 + AutolatheMachineCircuitboard: 6 + ResearchComputerCircuitboard: 6 + ResearchAndDevelopmentServerMachineCircuitboard: 12 + TelecomServerCircuitboard: 6 + ComputerIFFCircuitboard: 4 + EngineeringTechFabCircuitboard: 4 + MedicalTechFabCircuitboard: 4 + ServiceTechFabCircuitboard: 4 + ScienceTechFabCircuitboard: 4 + MaterialReclaimerMachineCircuitboard: 4 + ExosuitFabricatorMachineCircuitboard: 4 + UniformPrinterMachineCircuitboard: 4 + HydroponicsTrayMachineCircuitboard: 16 + DawInstrumentMachineCircuitboard: 4 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contra.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contra.yml new file mode 100644 index 00000000000..f9bff9fe51a --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contra.yml @@ -0,0 +1,22 @@ +- type: vendingMachineInventory + id: ContraVendInventory + startingInventory: + CigPackSyndicate: 8 + Stimpack: 6 + StimkitFilled: 4 + SyndicateJawsOfLife: 4 + ToolboxSyndicateFilled: 4 + RadioJammer: 8 + PowerSink: 2 + BoxEncryptionKeySyndie: 8 + AgentIDCard: 8 + StealthBox: 6 + ClothingMaskGasVoiceChameleon: 6 + ClothingBackpackChameleonFill: 4 + HypopenBox: 4 + Emag: 2 + StorageImplanter: 4 + ClothingShoesBootsMagSyndie: 4 + ClothingShoesChameleonNoSlips: 8 + ClothingBackpackDuffelSyndicateEVABundle: 12 + BoxHoloparasite: 2 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml new file mode 100644 index 00000000000..3353fc1baec --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml @@ -0,0 +1,4 @@ +- type: vendingMachineInventory + id: CuddlyCritterVendInventory + startingInventory: + CigPackSyndicate: 1 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml new file mode 100644 index 00000000000..d012b76261d --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -0,0 +1,135 @@ +- type: entity + parent: VendingMachine + id: VendingMachineAstroVend + name: AstroVend + description: Essential gear for the space-men on the go + components: + - type: Anchorable + delay: 999999 + - type: VendingMachine + pack: AstroVendInventory + offState: off + brokenState: broken + normalState: normal-unshaded + # ejectState: eject-unshaded No sprite, see chefvend/dinnerware/BODA/etc for expamples + - type: Advertise + pack: AstroVendAds + - type: Sprite + sprite: _NF/Structures/Machines/VendingMachines/astro.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.5 + energy: 1.6 + color: "#4b93ad" + +- type: entity + parent: VendingMachine + id: VendingMachineCircuitVend + name: CircuitVend + description: Essential tech for the space-men on the go + components: + - type: Anchorable + delay: 999999 + - type: VendingMachine + pack: CircuitVendInventory + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + - type: Advertise + pack: AstroVendAds + - type: Sprite + sprite: Structures/Machines/VendingMachines/robotics.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.5 + energy: 1.6 + color: "#4b93ad" + +- type: entity + parent: VendingMachine + id: VendingMachineSyndieContraband + name: ContraVend + description: Wanted across multiple sectors! + components: + - type: VendingMachine + pack: ContraVendInventory + dispenseOnHitChance: 0.25 + dispenseOnHitThreshold: 2 + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + screenState: screen + ejectDelay: 3 + - type: Advertise + pack: SyndieDrobeAds + - type: Speech + - type: Anchorable + delay: 999999 + - type: Sprite + sprite: _NF/Structures/Machines/VendingMachines/contra.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: "screen" + map: ["enum.VendingMachineVisualLayers.Screen"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.3 + color: "#ad2c2b" + - type: MarketModifier + mod: 50 + +- type: entity + parent: VendingMachine + id: VendingMachineCuddlyCritterVend + name: CuddlyCritterVend + description: Step into the world of wonder and warmth with Cuddly Critters Vending Machine, a haven for plushie and toy enthusiasts alike. + components: + - type: Anchorable + delay: 999999 + - type: VendingMachine + pack: CuddlyCritterVendInventory + offState: off + brokenState: broken + normalState: normal-unshaded + # ejectState: eject-unshaded No sprite, see chefvend/dinnerware/BODA/etc for expamples +# - type: Advertise +# pack: AstroVendAds + - type: Sprite + sprite: _NF/Structures/Machines/VendingMachines/cuddlycritter.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.5 + energy: 1.6 + color: "#4b93ad" \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Structures/machines.yml b/Resources/Prototypes/_NF/Entities/Structures/machines.yml index 560b61fe9d4..bb237c3e950 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/machines.yml @@ -157,108 +157,3 @@ state: id_key - type: AccessReader access: [["HeadOfPersonnel"]] - -- type: entity - parent: VendingMachine - id: VendingMachineAstroVend - name: AstroVend - description: Essential gear for the space-men on the go - components: - - type: Anchorable - delay: 999999 - - type: VendingMachine - pack: AstroVendInventory - offState: off - brokenState: broken - normalState: normal-unshaded - # ejectState: eject-unshaded No sprite, see chefvend/dinnerware/BODA/etc for expamples - - type: Advertise - pack: AstroVendAds - - type: Sprite - sprite: _NF/Structures/astrovend.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.5 - energy: 1.6 - color: "#4b93ad" - -- type: entity - parent: VendingMachine - id: VendingMachineCircuitVend - name: CircuitVend - description: Essential tech for the space-men on the go - components: - - type: Anchorable - delay: 999999 - - type: VendingMachine - pack: CircuitVendInventory - offState: off - brokenState: broken - normalState: normal-unshaded - ejectState: eject-unshaded - denyState: deny-unshaded - - type: Advertise - pack: AstroVendAds - - type: Sprite - sprite: Structures/Machines/VendingMachines/robotics.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.5 - energy: 1.6 - color: "#4b93ad" - -- type: entity - parent: VendingMachine - id: VendingMachineSyndieContraband - name: ContraVend - description: Wanted across multiple sectors! - components: - - type: VendingMachine - pack: ContraVendInventory - dispenseOnHitChance: 0.25 - dispenseOnHitThreshold: 2 - offState: off - brokenState: broken - normalState: normal-unshaded - ejectState: eject-unshaded - denyState: deny-unshaded - screenState: screen - ejectDelay: 3 - - type: Advertise - pack: SyndieDrobeAds - - type: Speech - - type: Anchorable - delay: 999999 - - type: Sprite - sprite: Structures/Machines/VendingMachines/syndicateArmor.rsi - layers: - - state: "off" - map: ["enum.VendingMachineVisualLayers.Base"] - - state: "off" - map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] - shader: unshaded - - state: "screen" - map: ["enum.VendingMachineVisualLayers.Screen"] - shader: unshaded - - state: panel - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: PointLight - radius: 1.5 - energy: 1.3 - color: "#ad2c2b" - - type: MarketModifier - mod: 50 \ No newline at end of file diff --git a/Resources/Textures/_NF/Structures/astrovend.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/astro.rsi/broken.png similarity index 100% rename from Resources/Textures/_NF/Structures/astrovend.rsi/broken.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/astro.rsi/broken.png diff --git a/Resources/Textures/_NF/Structures/astrovend.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/VendingMachines/astro.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Structures/astrovend.rsi/meta.json rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/astro.rsi/meta.json diff --git a/Resources/Textures/_NF/Structures/astrovend.rsi/normal-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/astro.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/_NF/Structures/astrovend.rsi/normal-unshaded.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/astro.rsi/normal-unshaded.png diff --git a/Resources/Textures/_NF/Structures/astrovend.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/astro.rsi/off.png similarity index 100% rename from Resources/Textures/_NF/Structures/astrovend.rsi/off.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/astro.rsi/off.png diff --git a/Resources/Textures/_NF/Structures/astrovend.rsi/panel.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/astro.rsi/panel.png similarity index 100% rename from Resources/Textures/_NF/Structures/astrovend.rsi/panel.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/astro.rsi/panel.png diff --git a/Resources/Textures/Structures/Machines/VendingMachines/syndicateArmor.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/contra.rsi/broken.png similarity index 100% rename from Resources/Textures/Structures/Machines/VendingMachines/syndicateArmor.rsi/broken.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/contra.rsi/broken.png diff --git a/Resources/Textures/Structures/Machines/VendingMachines/syndicateArmor.rsi/deny-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/contra.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/Structures/Machines/VendingMachines/syndicateArmor.rsi/deny-unshaded.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/contra.rsi/deny-unshaded.png diff --git a/Resources/Textures/Structures/Machines/VendingMachines/syndicateArmor.rsi/eject-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/contra.rsi/eject-unshaded.png similarity index 100% rename from Resources/Textures/Structures/Machines/VendingMachines/syndicateArmor.rsi/eject-unshaded.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/contra.rsi/eject-unshaded.png diff --git a/Resources/Textures/Structures/Machines/VendingMachines/syndicateArmor.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/VendingMachines/contra.rsi/meta.json similarity index 100% rename from Resources/Textures/Structures/Machines/VendingMachines/syndicateArmor.rsi/meta.json rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/contra.rsi/meta.json diff --git a/Resources/Textures/Structures/Machines/VendingMachines/syndicateArmor.rsi/normal-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/contra.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Structures/Machines/VendingMachines/syndicateArmor.rsi/normal-unshaded.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/contra.rsi/normal-unshaded.png diff --git a/Resources/Textures/Structures/Machines/VendingMachines/syndicateArmor.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/contra.rsi/off.png similarity index 100% rename from Resources/Textures/Structures/Machines/VendingMachines/syndicateArmor.rsi/off.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/contra.rsi/off.png diff --git a/Resources/Textures/Structures/Machines/VendingMachines/syndicateArmor.rsi/panel.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/contra.rsi/panel.png similarity index 100% rename from Resources/Textures/Structures/Machines/VendingMachines/syndicateArmor.rsi/panel.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/contra.rsi/panel.png diff --git a/Resources/Textures/Structures/Machines/VendingMachines/syndicateArmor.rsi/screen.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/contra.rsi/screen.png similarity index 100% rename from Resources/Textures/Structures/Machines/VendingMachines/syndicateArmor.rsi/screen.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/contra.rsi/screen.png diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..d44ddccb07d61e969349c83e4e4015dce276105a GIT binary patch literal 582 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik*1AIbUtx?Blvxbnrfyk^($e1+>Tcnn*N|QY;Db3;s_4Fw8%AK@q5!v%n*=n1O-sFbFdq&tH)O^o+fyi(`m| zfA6H;vL*wb)TZ44KUG4X2-D6TZqGUBgb%DWq zt%joQ&P)9|c1?d*di_2_|Mm;lr++=9WiRtfKO4cxy)sgEadvtc~|m@KG?90 z|~SVVxo9)bCTE5wGgZ`XW$*V^NegP`#D7!XNoWy&Rb(-&O55Ibu^!xY~X@!tvO`=)^I38R1PV|5Y8>wnQ!~);>_w&K}Wt^u*eL z4WB}M7pHtP&<}g)z-Sv0I&ZF%%Ys9059V;!%~U+7f2CBncM#VRH`5zJ6HQO7 zeiNYC`u6QV1E(blg7a(VYn|~AOFPrTnk2ETljFL9&xNhx$IDZAj|3U4SJAO3IlV_y zrGO=uP2^s9Da)>Pj?Bz^nbsMIm$htNFn#{D1&0rvlM-6vG^_9r!^C%{^-q{jGy*-v N;OXk;vd$@?2>^%-vF-o> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..67790b67bbb5a5cb5b1d2dab705a1a13a118d1bb GIT binary patch literal 462 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijQ0(?STt7YGON5MFJ^e#~TC?^U^hfab&zNUqW7*Fs$~aSm(Qw`xBO~uj{h7(q{Gx(0r}6t$ zOa!Xr3SaLAq!dbm{DS}E2MjSW(rYkFCR U1l*R~2lN($r>mdKI;Vst0I%q}E&u=k literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/panel.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..764df36583ddcd34d88e367a2c80f2d3d010fa37 GIT binary patch literal 606 zcmV-k0-^nhP)4Tx04UFukv&MmP!xqvQ>CI+hh`9Q$WWauh>AE$6pLV?v=v%)FnRrjCJjl7 zi=*ILaPVib>fqw6tAnc`2>yULIyou2NQw6)g%+WL7as59ymt=w-3JKuGSjTC2|&|r zGZB@gbY@iwyrK^w_%HxbVU`g~E~e12zV7KJ)m?;V;eXYi%~=faNyKx^Fm2)u;+aj` z;Ji;PvZ9hDJ|`YGsX^jLuB#ruaW1$l@J!K6CFY4mVyV!^Y8$hnsS!^ThqIba`9j*` zEaxrGTDi)aeexFubNWh>>$FA?#S&tOLxPGbN+`odgm#@23kf=xJNSoPf1F$@xk_N< zSU?3D6xR>_2ft@)<)Gj$xlnj=YjV#`lbvJx&?aIyty^carywHXjaQNz`-Ff zR-o+l4)5-1pWB~z-1$NN0WsxrjcwyHNdN!<7*I@9MU#`0W@cuOkB_>vAtWRu05h4H zGcy1H06&@~LI3~&2y{|TQ~&?}|NsC00N#VWSpWb432;bRa{vG?A^-p`A_1!6-I4$R z07pqgK~y+TV_+u$MioH7r~(L}l>!DvMkW{&N}~csW)?;$6Nds8Rssr`Sy-V=9ByD^ s#IJx2N&^9Q1xPAzC_sQApn#nn07_#Uq{{FIga7~l07*qoM6N<$f^|~(3;+NC literal 0 HcmV?d00001 From 37113e1c584351cb7e6b080d3b617f7521ab0eb6 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 29 Jul 2023 15:00:42 +0300 Subject: [PATCH 02/81] Vend --- .../UI/VendingMachineMenu.xaml.cs | 11 ++++ Content.Server/Cargo/Systems/PricingSystem.cs | 45 ++++++++++++++++ .../VendingMachines/VendingMachineSystem.cs | 6 +++ .../Cargo/Components/MarketPriceComponent.cs | 14 +++++ .../Prototypes/Entities/Objects/Fun/toys.yml | 51 ++++++++++++++++++ .../Inventories/cuddlycritter.yml | 28 +++++++++- .../cuddlycritter.rsi/broken.png | Bin 582 -> 954 bytes .../cuddlycritter.rsi/normal-unshaded.png | Bin 452 -> 3238 bytes .../VendingMachines/cuddlycritter.rsi/off.png | Bin 462 -> 992 bytes .../cuddlycritter.rsi/panel.png | Bin 606 -> 681 bytes 10 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 Content.Shared/Cargo/Components/MarketPriceComponent.cs diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs index f3b30527af2..30bfab70b4a 100644 --- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs +++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs @@ -112,6 +112,17 @@ public void Populate(List inventory, float priceMo cost = (int) (cost * priceModifier); } + // This block exists to allow the MatketPrice flag to set a price + if (prototype != null && prototype.TryGetComponent(out var marketPriceComponent)) + { + if (marketPriceComponent.Price != 0) + { + var price = (float) marketPriceComponent.Price; + cost = (int) (price); + } + } + // This block exists to allow the MatketPrice flag to set a price + vendingItem.Text = $"[${cost}] {itemName} [{entry.Amount}]"; vendingItem.Icon = icon; } diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs index 3035af8e023..489e34cc0be 100644 --- a/Content.Server/Cargo/Systems/PricingSystem.cs +++ b/Content.Server/Cargo/Systems/PricingSystem.cs @@ -164,6 +164,26 @@ public double GetEstimatedPrice(EntityPrototype prototype) return price; } + public double GetEstimatedMarketPrice(EntityPrototype prototype) + { + var ev = new EstimatedPriceCalculationEvent() + { + Prototype = prototype, + }; + + RaiseLocalEvent(ref ev); + + if (ev.Handled) + return ev.Price; + + var price = ev.Price; + price += GetMarketPrice(prototype); + + // TODO: Proper container support. + + return price; + } + /// /// Appraises an entity, returning it's price. /// @@ -328,6 +348,31 @@ private double GetStaticPrice(EntityPrototype prototype) return price; } + private double GetMarketPrice(EntityUid uid) + { + var price = 0.0; + + if (TryComp(uid, out var marketPrice)) + { + price += marketPrice.Price; + } + + return price; + } + + private double GetMarketPrice(EntityPrototype prototype) + { + var price = 0.0; + + if (prototype.Components.TryGetValue(_factory.GetComponentName(typeof(MarketPriceComponent)), out var marketProto)) + { + var marketPrice = (MarketPriceComponent) marketProto.Component; + price += marketPrice.Price; + } + + return price; + } + /// /// Appraises a grid, this is mainly meant to be used by yarrs. /// diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index d30c48fe2fb..a7c35401c73 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -345,6 +345,12 @@ public void AuthorizedVend(EntityUid uid, EntityUid sender, InventoryType type, var totalPrice = ((int) price); + // This block exists to allow the MatketPrice flag to set a price + var priceMarket = _pricing.GetEstimatedMarketPrice(proto); + if (priceMarket == null || priceMarket == 0) { } + else { totalPrice = ((int) priceMarket); } + // This block exists to allow the MatketPrice flag to set a price + if (totalPrice > bank.Balance) { _popupSystem.PopupEntity(Loc.GetString("bank-insufficient-funds"), uid); diff --git a/Content.Shared/Cargo/Components/MarketPriceComponent.cs b/Content.Shared/Cargo/Components/MarketPriceComponent.cs new file mode 100644 index 00000000000..777866ea2c0 --- /dev/null +++ b/Content.Shared/Cargo/Components/MarketPriceComponent.cs @@ -0,0 +1,14 @@ +namespace Content.Shared.Cargo.Components; + +/// +/// This is used for setting a static, unchanging price for selling an object. +/// +[RegisterComponent] +public sealed class MarketPriceComponent : Component +{ + /// + /// The price of the object this component is on. + /// + [DataField("price", required: true)] + public double Price; +} diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 26392094a43..c947b257e71 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -33,6 +33,8 @@ Cloth: 100 - type: StaticPrice price: 5 + - type: MarketPrice + price: 100 - type: entity parent: BasePlushie @@ -167,6 +169,7 @@ radius: 1.5 energy: 2 netsync: false + - type: entity parent: BasePlushie id: PlushieLizard #Weh! @@ -670,6 +673,10 @@ heldPrefix: bask - type: TileFrictionModifier modifier: 0.5 + - type: StaticPrice + price: 5 + - type: MarketPrice + price: 100 - type: entity parent: BaseItem @@ -684,6 +691,10 @@ size: 12 sprite: Objects/Fun/toys.rsi heldPrefix: footb + - type: StaticPrice + price: 5 + - type: MarketPrice + price: 100 - type: entity parent: BaseItem @@ -703,6 +714,10 @@ heldPrefix: beachb - type: TileFrictionModifier modifier: 0.05 + - type: StaticPrice + price: 5 + - type: MarketPrice + price: 100 - type: entity parent: BaseItem @@ -717,6 +732,10 @@ size: 24 sprite: Objects/Fun/toys.rsi heldPrefix: synb + - type: StaticPrice + price: 5 + - type: MarketPrice + price: 1000 - type: entity parent: BaseItem @@ -731,6 +750,10 @@ size: 24 sprite: Objects/Fun/toys.rsi heldPrefix: corgib + - type: StaticPrice + price: 5 + - type: MarketPrice + price: 1000 - type: entity parent: BaseItem @@ -751,6 +774,10 @@ size: 12 sprite: Objects/Fun/toys.rsi heldPrefix: singularitytoy + - type: StaticPrice + price: 5 + - type: MarketPrice + price: 100 - type: entity parent: BaseItem @@ -771,6 +798,10 @@ heldPrefix: orb - type: TileFrictionModifier modifier: 0.001 + - type: StaticPrice + price: 5 + - type: MarketPrice + price: 1000 - type: entity id: ToySword @@ -855,6 +886,10 @@ - type: Item size: 15 sprite: Objects/Weapons/Melee/cutlass.rsi + - type: StaticPrice + price: 5 + - type: MarketPrice + price: 100 - type: entity parent: BaseItem @@ -876,6 +911,10 @@ - type: Tag tags: - ClownRecorder + - type: StaticPrice + price: 5 + - type: MarketPrice + price: 100 - type: entity parent: BaseItem @@ -914,6 +953,10 @@ damage: types: Blunt: 0 + - type: StaticPrice + price: 5 + - type: MarketPrice + price: 100 - type: entity parent: BaseItem @@ -972,6 +1015,10 @@ density: 30 mask: - ItemMask + - type: StaticPrice + price: 5 + - type: MarketPrice + price: 100 - type: entity name: banana @@ -992,6 +1039,10 @@ reagents: - ReagentId: Nothing Quantity: 100 + - type: StaticPrice + price: 5 + - type: MarketPrice + price: 100 - type: entity parent: DrinkBase diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml index 3353fc1baec..d2c34de59b0 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml @@ -1,4 +1,30 @@ - type: vendingMachineInventory id: CuddlyCritterVendInventory startingInventory: - CigPackSyndicate: 1 + PlushieBee: 10 + PlushieRGBee: 10 + PlushieHampter: 10 + PlushieNuke: 10 + PlushieXeno: 10 + PlushieRouny: 10 + PlushieLizard: 10 + PlushieSpaceLizard: 10 + PlushieVox: 10 + PlushieMoff: 10 + PlushieMoffsician: 10 + PlushieMoffbar: 10 + PlushieDiona: 10 + PlushieSharkGrey: 10 + PlushieSharkBlue: 10 + PlushieSharkPink: 10 + PlushieRatvar: 10 + PlushieNar: 10 + PlushieSlime: 10 + PlushieSnake: 10 + BeachBall: 1 + Basketball: 1 + Football: 1 + BalloonCorgi: 1 + PonderingOrb: 1 + contrabandInventory: + BalloonSyn: 1 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/broken.png index d44ddccb07d61e969349c83e4e4015dce276105a..c84c3985a505ddb1b146a9cd56b9c8f7914a443b 100644 GIT binary patch delta 428 zcmV;d0aO0Q1iA;1BYy#fX+uL$Nkc;*P;zf(X>4Tx04UFukv&MmP!xqvQ>CI+hh`9Q z$WWauh>AE$6pLV?v=v%)FnRrjCJjl7i=*ILaPVib>fqw6tAnc`2>yULIyou2NQw6) zg%+WL7as59ymt=w-3JKuGSjTC2|&|rGZB@gbY@iwyrK^w_YpXW@UpA5N3N?Lzi}?OEbvUx zOeN-tMPjMY#%de0qNx#26Nj^!PWeLG<1FVb&RV(3ntk#Y26OsKlIyfa5XBN=h(m&k zDoQBBMuc{q6n_f|I+r{6hh2Z1Tq?OrVB}ap1sW9B5B>+gXKUrBCcUJf40OLZ&c`Sa z*aaFj$N4^XoW=>@e+I7fmcLR5WlJ54hX`hMo+?R9wkVOUUPe z_cQvY3=p~nde^+UHP3PS0HkPE%QwKmAuv{;?DY=s?h_{XvU delta 55 zcmV-70LcHk2gU@DBO3q#b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1(UJ?rV9?k000id N0mpBsWV2%eR{_?G5nTWP diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/normal-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/normal-unshaded.png index fb377fe528cfbc1787ad020ec48533bd98829807..fbbb0030b96c260749cbe03b14398b811fde7dcf 100644 GIT binary patch literal 3238 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 Y3$%OvVmy!Hi2wiq07*qoM6N<$f_0E8xBvhE literal 452 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil00(?STt$*V^NegP`#D7!XNoWy&Rb(-&O55Ibu^!xY~X@!tvO`=)^I38R1PV|5Y8>wnQ!~);>_w&K}Wt^u*eL z4WB}M7pHtP&<}g)z-Sv0I&ZF%%Ys9059V;!%~U+7f2CBncM#VRH`5zJ6HQO7 zeiNYC`u6QV1E(blg7a(VYn|~AOFPrTnk2ETljFL9&xNhx$IDZAj|3U4SJAO3IlV_y zrGO=uP2^s9Da)>Pj?Bz^nbsMIm$htNFn#{D1&0rvlM-6vG^_9r!^C%{^-q{jGy*-v N;OXk;vd$@?2>^%-vF-o> diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/off.png index 67790b67bbb5a5cb5b1d2dab705a1a13a118d1bb..754bbb96c660c1a98b42a9c5fa1dfdcaff42cc27 100644 GIT binary patch delta 981 zcmV;`11kK^1KQIX)_Im zOQ7KdTE1G;G>!2t6JO^m!<~h1(=_q4BYcqoYHz+SAnx>(uYHb9v*(?CDSd5|B z9s1h}C3U_LmD<(N>`tK!A6hwIi;_yEN-=9vU?QZ_0X#lJ2QU%Zl_F5?voJSb-!A}I zU4LFd2!Y4r`8IJrpGVhqB9RF8kzi}@iS5(&`p*DRN*)M&e+wFhfe?Z~U+>3EyE9cF zll-%tadXSbdK*)t&p)ezdf~VNwZc`vRlrriRbXsjgt38>nODTLs~8SjsM$OggK8W!orT zFP9e=(z};cOo~AIDnt4z^Y>@qt7h`o2~=yN{~g`|(?F_)PGzhq00000NkvXXu0mjf Dw9v6L literal 462 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijQ0(?STt7YGON5MFJ^e#~TC?^U^hfab&zNUqW7*Fs$~aSm(Qw`xBO~uj{h7(q{Gx(0r}6t$ zOa!Xr3SaLAq!dbm{DS}E2MjSW(rYkFCR U1l*R~2lN($r>mdKI;Vst0I%q}E&u=k diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/panel.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/panel.png index 764df36583ddcd34d88e367a2c80f2d3d010fa37..dcb37dea9df067c27cafacd4f6c7781166d58bbc 100644 GIT binary patch delta 668 zcmV;N0%QH&1gQm(8Gi-<0047(dh`GQ0flKpLr_UWLm+T+Z)Rz1WdHyuk$sUpNW)MR zg-=tZqE&}x5OK&*oh*ooI7$_ZV4<`XT6Hja=^r#{NK#xJ1=oUuKZ{id7iV1^Tm?b! z2gK3INzp}0yss&=i1EVXeVljC;l29+pAIEM!_f;1p^EiX<_K($&>$IzI>U1fq{WRQ&W?n zu&@xPJuI|vz~#%A8AAMaGh`Jo6I9DYtDwy)U}m_(UpjCOm^R@rgUZKlhFNEg>F)qt zU0sIz^+F6zPEG@pvS%6_{~z$|H7Fc03P!<@02Kg4of;BFSAg{Z0000OXZ8Gi!+002a!ipBr{0flKpLr_UWLm*IcZ)Rz1WdHyu&y|rqNW)MR zg-=tZqE&}x5OK&*oh*ooI7$?YV4<`XT6Hja{e>nCNs5c3;979-XR+$w;;gHKs~`ye zfH*oiDY{6B_a%iEp@J74@8i684)@&$2=y}4tgZ<_(`_>mm4BslW>pHjq7NbXFaS|u zmJv%XrqHpz?&&7gU4&=hf7PGOSq$(=#B2$nN8c^yiY8$qLL*(CmuJcLE=ZQ zs~*2`F1Rf4Owmjw=7~jOsnEu18?&OR5l<6`vzku%LfYdj=Pk}!xyqV-@)rhk`bv`P zv_=rc5@Lu$f`5uCN+`odgm#@23kf=xJNSoPf1F$@xk_N_2ft@)<)Gj$xlnj=YjV#`lbvJx&?aIyty^carywHXjaQNz<_xUBmgs+nKLs0002LlB|-oI00?wa zPE-H?|NsC0{{Y^Dy;%SN010qNS#tmYE+PN`E+PS{;@y$}002ixL_t(IPh(&w07ex+ zz^DQUph=Yi21Z6E7!yjP0!C&QMko`90v1*R3Yb|~p-dcZU}MCufDK9m0d@sQDsU)3 efFYoOogDy5V;iK(@CSqd0000 Date: Sat, 29 Jul 2023 18:07:43 +0300 Subject: [PATCH 03/81] Vend --- .../VendingMachines/Inventories/cola.yml | 18 +++++++++--------- .../VendingMachines/Inventories/discount.yml | 10 +++++----- .../Objects/Consumable/Drinks/drinks_cans.yml | 7 ++++++- .../Prototypes/Entities/Objects/Fun/toys.yml | 8 ++++---- .../Inventories/cuddlycritter.yml | 2 +- 5 files changed, 25 insertions(+), 20 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml index 3b4484728d9..ccf5f08196e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml @@ -1,13 +1,13 @@ - type: vendingMachineInventory id: RobustSoftdrinksInventory startingInventory: - DrinkColaCan: 4 - DrinkGrapeCan: 2 - DrinkRootBeerCan: 2 - DrinkIcedTeaCan: 2 - DrinkLemonLimeCan: 2 - DrinkDrGibbCan: 2 - DrinkFourteenLokoCan: 2 + DrinkColaCan: 45 + DrinkGrapeCan: 30 + DrinkRootBeerCan: 30 + DrinkIcedTeaCan: 30 + DrinkLemonLimeCan: 30 + DrinkDrGibbCan: 30 + DrinkFourteenLokoCan: 30 emaggedInventory: - DrinkNukieCan: 2 - DrinkChangelingStingCan: 2 + DrinkNukieCan: 3 + DrinkChangelingStingCan: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml index d175f6a5dd1..c5ba6d42892 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml @@ -1,8 +1,8 @@ - type: vendingMachineInventory id: DiscountDansInventory startingInventory: - FoodSnackCheesie: 3 - FoodSnackChips: 3 - FoodSnackBoritos: 2 - FoodSnackPopcorn: 1 - FoodSnackEnergy: 2 + FoodSnackCheesie: 30 + FoodSnackChips: 30 + FoodSnackBoritos: 20 + FoodSnackPopcorn: 10 + FoodSnackEnergy: 20 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 58a31f440b1..b7eb273c964 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -56,8 +56,11 @@ - type: PhysicalComposition materialComposition: Steel: 50 #reduce, reuse, recycle + - type: MarketPrice + price: 20 - type: StaticPrice - price: 5.5 + price: 5 + - type: entity parent: DrinkCanBaseFull @@ -321,6 +324,8 @@ sprite: Objects/Consumable/Drinks/robustnukie.rsi - type: Item sprite: Objects/Consumable/Drinks/robustnukie.rsi + - type: MarketPrice + price: 100 - type: entity parent: DrinkCanBaseFull diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index c947b257e71..3a633029994 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -953,10 +953,10 @@ damage: types: Blunt: 0 - - type: StaticPrice - price: 5 - - type: MarketPrice - price: 100 + - type: StaticPrice + price: 5 + - type: MarketPrice + price: 100 - type: entity parent: BaseItem diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml index d2c34de59b0..5d1f4f56fcd 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml @@ -26,5 +26,5 @@ Football: 1 BalloonCorgi: 1 PonderingOrb: 1 - contrabandInventory: + emaggedInventory: BalloonSyn: 1 From 51c237f17b3fd8fde4d114dcd5e58c1dc7f481a4 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 29 Jul 2023 20:29:42 +0300 Subject: [PATCH 04/81] Vends & more --- Resources/Audio/_NF/Items/Toys/wehhelp.ogg | Bin 0 -> 8074 bytes .../Prototypes/Catalog/Fills/Crates/fun.yml | 2 + .../VendingMachines/Inventories/chang.yml | 12 ++--- .../VendingMachines/Inventories/coffee.yml | 8 +-- .../VendingMachines/Inventories/donut.yml | 8 +-- .../VendingMachines/Inventories/happyhonk.yml | 8 +-- .../VendingMachines/Inventories/pwrgame.yml | 16 +++--- .../Inventories/shamblersjuice.yml | 14 ++--- .../VendingMachines/Inventories/snack.yml | 12 ++--- .../VendingMachines/Inventories/soda.yml | 14 ++--- .../Inventories/sovietsoda.yml | 4 +- .../VendingMachines/Inventories/spaceup.yml | 18 +++---- .../VendingMachines/Inventories/starkist.yml | 16 +++--- .../Inventories/sustenance.yml | 8 +-- .../Objects/Consumable/Drinks/drinks.yml | 4 +- .../Objects/Consumable/Drinks/drinks_cups.yml | 4 +- .../Consumable/Drinks/drinks_flasks.yml | 32 +++++++++++- .../Objects/Consumable/Food/Baked/donut.yml | 4 +- .../Consumable/Food/Containers/condiments.yml | 4 +- .../Objects/Consumable/Food/snacks.yml | 27 +++++++--- .../Prototypes/Entities/Objects/Fun/toys.yml | 2 +- .../Entities/Objects/Misc/utensils.yml | 4 ++ .../Inventories/cuddlycritter.yml | 49 +++++++++--------- .../_NF/Entities/Objects/Fun/toys.yml | 25 +++++++++ .../_NF/Objects/Fun/toys.rsi/meta.json | 14 +++++ .../Objects/Fun/toys.rsi/plushie_jester.png | Bin 0 -> 585 bytes .../cuddlycritter.rsi/normal-unshaded.png | Bin 3238 -> 617 bytes .../VendingMachines/cuddlycritter.rsi/off.png | Bin 992 -> 778 bytes 28 files changed, 204 insertions(+), 105 deletions(-) create mode 100644 Resources/Audio/_NF/Items/Toys/wehhelp.ogg create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml create mode 100644 Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_jester.png diff --git a/Resources/Audio/_NF/Items/Toys/wehhelp.ogg b/Resources/Audio/_NF/Items/Toys/wehhelp.ogg new file mode 100644 index 0000000000000000000000000000000000000000..c16495a5305dbfbe9c794b48be63746d69322e1b GIT binary patch literal 8074 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/normal-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/normal-unshaded.png index fbbb0030b96c260749cbe03b14398b811fde7dcf..8cd03ee9ad627260655dd5f7e2ac91f99c5a2dd9 100644 GIT binary patch delta 593 zcmV-X0Px%2}wjjRCt{2+CfN@VI0Ttuafby#-c>f z)kP5N6hfh=fxWOGFS(25)k6nwNuGyiAur;g!#qjRWizNiXbRrO6zw1yxftXSVhkih zgII@&`4Z2Zd*8i+{XUoXdEa+?fB!vuc(%hIL_|bHME*-nUVlF9&frt)Xn6Q3^|I{c zvm2FfoPcm7R`&3d>1G(>=`CYlI^)#&4wmdEexY4JG$0z_0w~YDGMF zI6%HPN_%-1fYEf1;|Rd~WybEeFt#=2cyBV1VBzB--}3eE0e<9H-2@jtya!;nsT~0O zc{8(pznw37^otjZz^!MF%WhYIU-_r*0Vh3~{Lbs~wtwTJiI;moqw|d`zzPH%=ke|g z%t0#9Nh%)13RJ1ygFV2neB%VfyE8Qvy1%(ZM_Z7+)_cT<(@eaw0r&p{{K_{@z{Kau z&(6WmA6S8)v7jrr`=OX6RLn9p9fH=%b+;?vyz@mwL_|bHL_|d7Vp4yA>4y3PTvC64 z`UCz_e@cM*1L~vx0QCnnK41L-rW@)HP=A1kh=|C=_6I_fUwf6hS}_0s01jnXNoGw= f04e|g00;m8000000Mb*F00000NkvXXu0mjfk!K(C delta 3235 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 V{bD?i;)wtN002ovPDHLkV1mE@GtB@1 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/off.png index 754bbb96c660c1a98b42a9c5fa1dfdcaff42cc27..4a57de8fb4d87dadda19182333fc02f6af51e4ba 100644 GIT binary patch delta 755 zcmVPx%s!2paR9J=WmR(4bQ5eU6v#+_?m;D3r#E1j)WO9Ozo* z7|f|Nuyvu1z3+S8?VV1%sQ=A5?{l8#Jpc1Q&pGFXe;qoxp@05bcXB%ujz4rtau#f7 zGA;N|V8;pU78zsF2qtq8v1kN9($@-6yvbaYoj|%{dVnZc3keaSj06By+>dikmJKrt zF-n@QW+xE#Pg4$DY+j|XxEv0ghlL?UyF4FcaAX%~^u61^Hn$v#i|AzA_2fR^a6T3- z!G;1;{r4m}Reu%uURJ%Oge7y6w6?di80_QYw*)g&Vg-aXkS`3lTua4LIu7Ka2IO#7c%csl4aXRC8qph6=ha*T8MnY$;mtIh z!s4efN`DR+i51o2yyBtzi5vdPfU^fNVe20<6@wV6|#fDiH9ik`~^C^5o<0 z{QnecD@?$(aceQu}0000E lWmrjOO-%qQ00008000000002eQEX>4Tx04R}tkv&MmP!xqvQ>CI+hh`9Q z$WWauh>AE$6^me@v=v%)FnQ@8G-*guTpR`0f`dPcRRu? zK@}yGVIxAjPJfDpB%Mb+{KHLuf?Nu@N?_zzKm{7)rXTzde$Up*PffZ>!6?xE;y53p zKwuYW)Ewvg*l`*sfd3h|(%b$@9hm(jz1G&kN5J4VaB&aHKh(+40;vs%6Z4i15_0%fmzynnl=b8i3kwC48%G39cNoUm(3 z00006VoOIv0QLZp0GF(d%Ax=O010qNS#tmYE+YT{E+YYWr9XB6000McNliru<_i-8 z833U3j2-|002y>eSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00Fm2L_t(o z!|j&6OMk;a7{-5!RKZakY$(;CItVv7s1yY!2UG0asiM-otBRk0K*2GHAFECk9o!V9 zAleF{4w^wrNOW-&w2Kb4MM|sJ8ZAhk>2mjeJon_@ySIr7NF)+(#c_PopueY^>$`gr z(*a~q%_km@HTa|@%ele?Tc$Og8(-uFD9C%p{i8s%gK5h zQ=`v6tAcvrxB|7pRlrriRlrqXY+!`3fsvp01E24B*|z}TICJJqLjs`dIzot2aGBT8 zv5p8}ae1k6Em;whY6#1=YYMD*z3d+zI7C|o;c!^WE}2X^tAJ(OC|)m@7Z=jImsL!P tK>8{}`YQAHXW*-5^4AGeYoq@i-T~7 Date: Sat, 29 Jul 2023 22:56:32 +0300 Subject: [PATCH 05/81] Vends --- Resources/Locale/en-US/_NF/adventure/adventure.ftl | 3 --- .../en-US/_NF/advertisements/vending/astro.ftl | 2 ++ .../_NF/advertisements/vending/cuddlycritter.ftl | 8 ++++++++ .../Catalog/VendingMachines/Inventories/donut.yml | 1 + .../Entities/Objects/Consumable/Drinks/drinks.yml | 2 ++ .../Objects/Consumable/Drinks/drinks_flasks.yml | 8 ++++---- .../Objects/Consumable/Food/Containers/box.yml | 2 ++ .../Objects/Consumable/Food/Containers/plate.yml | 14 +++++++++++++- .../Entities/Objects/Consumable/Food/snacks.yml | 8 ++++++++ Resources/Prototypes/Entities/Objects/Fun/toys.yml | 4 ++-- .../Advertisements/astro.yml} | 0 .../Advertisements/cuddlycritter.yml | 11 +++++++++++ .../VendingMachines/Inventories/cuddlycritter.yml | 6 ++++++ .../Structures/Machines/vending_machines.yml | 4 ++-- .../Objects/Consumable/Drinks/drinks_cups.yml | 6 +++++- 15 files changed, 66 insertions(+), 13 deletions(-) create mode 100644 Resources/Locale/en-US/_NF/advertisements/vending/astro.ftl create mode 100644 Resources/Locale/en-US/_NF/advertisements/vending/cuddlycritter.ftl rename Resources/Prototypes/_NF/Catalog/{Fills/AstroVendAds.yml => VendingMachines/Advertisements/astro.yml} (100%) create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/cuddlycritter.yml diff --git a/Resources/Locale/en-US/_NF/adventure/adventure.ftl b/Resources/Locale/en-US/_NF/adventure/adventure.ftl index 640467e28ba..6088ccc4c6f 100644 --- a/Resources/Locale/en-US/_NF/adventure/adventure.ftl +++ b/Resources/Locale/en-US/_NF/adventure/adventure.ftl @@ -9,9 +9,6 @@ adventure-title = New Frontier Adventure Mode adventure-description = Join a ship crew or buy your own and explore, research, salvage, or haul your way to riches! currency = Spesos -advertisement-astrovend-1 = Spessman's Choice! -advertisement-astrovend-2 = Don't leave home without a suit! - guide-entry-adventure = New Frontiers Program guide-entry-bank = NT Galactic Bank guide-entry-shipyard = Frontier Shipyards diff --git a/Resources/Locale/en-US/_NF/advertisements/vending/astro.ftl b/Resources/Locale/en-US/_NF/advertisements/vending/astro.ftl new file mode 100644 index 00000000000..edb1a7df4fc --- /dev/null +++ b/Resources/Locale/en-US/_NF/advertisements/vending/astro.ftl @@ -0,0 +1,2 @@ +advertisement-astrovend-1 = Spessman's Choice! +advertisement-astrovend-2 = Don't leave home without a suit! \ No newline at end of file diff --git a/Resources/Locale/en-US/_NF/advertisements/vending/cuddlycritter.ftl b/Resources/Locale/en-US/_NF/advertisements/vending/cuddlycritter.ftl new file mode 100644 index 00000000000..0a73137580a --- /dev/null +++ b/Resources/Locale/en-US/_NF/advertisements/vending/cuddlycritter.ftl @@ -0,0 +1,8 @@ +advertisement-cuddlycritter-1 = Brighten your day with a fluffy friend! +advertisement-cuddlycritter-2 = Hug therapy starts here! +advertisement-cuddlycritter-3 = Give in to the plushie temptation! +advertisement-cuddlycritter-4 = You won't resist their charm! +advertisement-cuddlycritter-5 = Warning: Extreme cuteness ahead! +advertisement-cuddlycritter-6 = Help me I'm trapped in a NanoTrasen factory forced to make Plushies! +advertisement-cuddlycritter-7 = Softer then asbestos! +advertisement-cuddlycritter-8 = The best crayon colors in space, proposition 65 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml index f718654a08d..d5ff970298a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml @@ -5,5 +5,6 @@ FoodDonutApple: 30 FoodDonutPink: 30 FoodDonutBungo: 30 + FoodBoxDonut: 5 emaggedInventory: FoodDonutPoison: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 44c77d95ce8..69417a77cf4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -1322,6 +1322,8 @@ - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/nothing.rsi + - type: MarketPrice + price: 1 - type: entity parent: DrinkGlassBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml index 2d74b3fd0d6..6383b291d68 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml @@ -74,10 +74,10 @@ - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/barflask.rsi - - type: StaticPrice - price: 10 - - type: MarketPrice - price: 30 + - type: StaticPrice + price: 10 + - type: MarketPrice + price: 30 - type: entity parent: DrinkBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index 4d7c06cd434..e42aac9719e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -64,6 +64,8 @@ - box5 - pink-box6 - type: Appearance + - type: MarketPrice + price: 100 # Egg diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml index 80493bfdad3..91e5430708e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml @@ -49,7 +49,9 @@ Glass: 100 - type: SpaceGarbage - type: StaticPrice - price: 3 + price: 2 + - type: MarketPrice + price: 10 - type: entity name: broken plate @@ -66,6 +68,8 @@ - type: SpaceGarbage - type: StaticPrice price: 1 + - type: MarketPrice + price: 5 # Small Plate @@ -97,6 +101,8 @@ acts: [ "Destruction" ] - type: StaticPrice price: 2 + - type: MarketPrice + price: 10 - type: entity parent: FoodPlateTrash @@ -105,6 +111,8 @@ - type: Sprite sprite: Objects/Consumable/Food/plates.rsi state: plate-small-trash + - type: StaticPrice + price: 1 # Plastic Plate @@ -122,6 +130,8 @@ - Trash - type: StaticPrice price: 1 + - type: MarketPrice + price: 5 - type: entity name: plastic plate @@ -137,6 +147,8 @@ - Trash - type: StaticPrice price: 1 + - type: MarketPrice + price: 5 # Pie Tin diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index 0ebbaf9a935..b5f95eb0bf2 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -94,6 +94,10 @@ - id: FoodSnackChocolateBar sound: path: /Audio/Effects/unwrap.ogg + - type: StaticPrice + price: 5 + - type: MarketPrice + price: 30 - type: entity name: chocolate bar @@ -116,6 +120,10 @@ Quantity: 10 - ReagentId: Theobromine Quantity: 3 + - type: StaticPrice + price: 5 + - type: MarketPrice + price: 30 - type: entity name: energy bar diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 7ee4427c562..8308e0f9da0 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -777,7 +777,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 100 + price: 10000 - type: entity parent: BaseItem @@ -914,7 +914,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 100 + price: 300 - type: entity parent: BaseItem diff --git a/Resources/Prototypes/_NF/Catalog/Fills/AstroVendAds.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/astro.yml similarity index 100% rename from Resources/Prototypes/_NF/Catalog/Fills/AstroVendAds.yml rename to Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/astro.yml diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/cuddlycritter.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/cuddlycritter.yml new file mode 100644 index 00000000000..b74f4cef0ce --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/cuddlycritter.yml @@ -0,0 +1,11 @@ +- type: advertisementsPack + id: CuddlyCritterAds + advertisements: + - advertisement-cuddlycritter-1 + - advertisement-cuddlycritter-2 + - advertisement-cuddlycritter-3 + - advertisement-cuddlycritter-4 + - advertisement-cuddlycritter-5 + - advertisement-cuddlycritter-6 + - advertisement-cuddlycritter-7 + - advertisement-cuddlycritter-8 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml index a614ed7c2d1..48fd36b01b8 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml @@ -21,11 +21,17 @@ PlushieNar: 3 PlushieSlime: 3 PlushieSnake: 3 + PlushieCarp: 3 + PlasticBanana: 3 BeachBall: 2 Basketball: 2 Football: 2 BalloonCorgi: 2 + ToyHammer: 2 + WhoopieCushion: 2 + ClownRecorder: 1 PonderingOrb: 1 emaggedInventory: PlushieJester: 3 BalloonSyn: 1 + SingularityToy: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index d012b76261d..bfbb86a7f7f 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -117,8 +117,8 @@ brokenState: broken normalState: normal-unshaded # ejectState: eject-unshaded No sprite, see chefvend/dinnerware/BODA/etc for expamples -# - type: Advertise -# pack: AstroVendAds + - type: Advertise + pack: CuddlyCritterAds - type: Sprite sprite: _NF/Structures/Machines/VendingMachines/cuddlycritter.rsi layers: diff --git a/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 5dbe313ced8..7f837959663 100644 --- a/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -14,4 +14,8 @@ sprite: Nyanotrasen/Objects/Consumable/Drinks/sakecup.rsi state: icon - type: TrashOnEmpty - solution: drink \ No newline at end of file + solution: drink + - type: StaticPrice + price: 5 + - type: MarketPrice + price: 20 \ No newline at end of file From a7f2aafeb6dee0c8266ba9fe1e972150ac88f18f Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 29 Jul 2023 23:32:56 +0300 Subject: [PATCH 06/81] Vends --- Resources/Prototypes/Entities/Objects/Fun/crayons.yml | 2 ++ .../_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml index 49113f18fd7..81d63eb58e7 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml @@ -97,6 +97,8 @@ - Crayon - Recyclable - Trash + - type: MarketPrice + price: 200 - type: entity parent: Crayon diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml index 48fd36b01b8..d97fcb06b29 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml @@ -31,6 +31,7 @@ WhoopieCushion: 2 ClownRecorder: 1 PonderingOrb: 1 + CrayonRainbow: 5 emaggedInventory: PlushieJester: 3 BalloonSyn: 1 From fc7df82341c9b51dba2d4bb7caf7068fcd233f97 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 29 Jul 2023 23:54:47 +0300 Subject: [PATCH 07/81] Restock --- .../catalog/cargo/cargo-vending.ftl | 5 +++- .../catalog/fills/crates/vending-crates.ftl | 7 ++++-- .../_NF/Catalog/Cargo/cargo_vending.yml | 10 ++++++++ .../_NF/Catalog/Fills/Crates/vending.yml | 9 +++++++ .../Service/vending_machine_restock.yml | 25 ++++++++++++++----- 5 files changed, 47 insertions(+), 9 deletions(-) diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-vending.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-vending.ftl index bf60f433b57..efca148a5bc 100644 --- a/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-vending.ftl +++ b/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-vending.ftl @@ -5,4 +5,7 @@ ent-CrateVendingMachineRestockAmmo = { ent-CrateVendingMachineRestockAmmoFilled .desc = { ent-CrateVendingMachineRestockAmmoFilled.desc } ent-CrateVendingMachineRestockCircuitVend = { ent-CrateVendingMachineRestockCircuitVendFilled } - .desc = { ent-CrateVendingMachineRestockCircuitVendFilled.desc } \ No newline at end of file + .desc = { ent-CrateVendingMachineRestockCircuitVendFilled.desc } + +ent-CrateVendingMachineRestockCuddlyCritterVend = { ent-CrateVendingMachineRestockCuddlyCritterVendFilled } + .desc = { ent-CrateVendingMachineRestockCuddlyCritterVendFilled.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl index baa70b0a40c..b4f82c609d9 100644 --- a/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl +++ b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl @@ -1,8 +1,11 @@ ent-CrateVendingMachineRestockAstroVendFilled = AstroVend restock crate - .desc = Contains two restock boxes for the AstroVend vendor. + .desc = Contains two restock boxes for the AstroVend vending machine. ent-CrateVendingMachineRestockAmmoFilled = Liberation restock crate .desc = Contains two restock boxes for the Liberation vending machine. ent-CrateVendingMachineRestockCircuitVendFilled = CircuitVend restock crate - .desc = Contains two restock boxes for a CircuitVend vending machine. \ No newline at end of file + .desc = Contains two restock boxes for a CircuitVend vending machine. + +ent-CrateVendingMachineRestockCuddlyCritterVendFilled = CuddlyCritterVend restock crate + .desc = Contains two restock boxes for a CuddlyCritterVend vending machine. \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml index 9d74715c531..c4ac8ef57f0 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml @@ -35,3 +35,13 @@ cost: 100 category: Science group: market + +- type: cargoProduct + id: CrateVendingMachineRestockCuddlyCritterVend + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: CrateVendingMachineRestockCuddlyCritterVendFilled + cost: 100 + category: fun + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml index 8373ba1289a..4ab8b13dadc 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml @@ -23,4 +23,13 @@ - type: StorageFill contents: - id: VendingMachineRestockCircuitVend + amount: 2 + +- type: entity + id: CrateVendingMachineRestockCuddlyCritterVendFilled + parent: CratePlastic + components: + - type: StorageFill + contents: + - id: VendingMachineRestockCuddlyCritterVend amount: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml index d9637d573e3..69eb95633a4 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -61,8 +61,7 @@ - state: base - state: green_bit shader: unshaded - - state: refill_salvage # Update this later with a new sprite - - type: CargoSellBlacklist + - state: refill_salvage # TODO Update this later with a new sprite - type: entity parent: SecuredVendingMachineRestock @@ -78,8 +77,7 @@ - state: base - state: green_bit shader: unshaded - - state: refill_sec # Update this later with a new sprite - - type: CargoSellBlacklist + - state: refill_sec # TODO Update this later with a new sprite - type: entity parent: SecuredVendingMachineRestock @@ -95,5 +93,20 @@ - state: base - state: green_bit shader: unshaded - - state: refill_parts # Update this later with a new sprite - - type: CargoSellBlacklist + - state: refill_parts # TODO Update this later with a new sprite + +- type: entity + parent: SecuredVendingMachineRestock + id: VendingMachineRestockCuddlyCritterVend + name: CuddlyCritterVend restock box + description: A box containing toys and plushies for the Cuddly Critter vending machine. A label reads THE BOX IS TAMPER PROOF AND WILL DESTROY IT'S CONTENT ON HARM. + components: + - type: VendingMachineRestock + canRestock: + - CuddlyCritterVendInventory + - type: Sprite + layers: + - state: base + - state: green_bit + shader: unshaded + - state: refill_parts # TODO Update this later with a new sprite \ No newline at end of file From f8d9151ced2e2e2a354acb1c5a5ae4547e983fba Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sun, 30 Jul 2023 00:04:11 +0300 Subject: [PATCH 08/81] Update MarketPriceComponent.cs --- Content.Shared/Cargo/Components/MarketPriceComponent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Cargo/Components/MarketPriceComponent.cs b/Content.Shared/Cargo/Components/MarketPriceComponent.cs index 777866ea2c0..9354da55201 100644 --- a/Content.Shared/Cargo/Components/MarketPriceComponent.cs +++ b/Content.Shared/Cargo/Components/MarketPriceComponent.cs @@ -1,7 +1,7 @@ namespace Content.Shared.Cargo.Components; /// -/// This is used for setting a static, unchanging price for selling an object. +/// This is used for setting a static, unchanging price for buying an object. /// [RegisterComponent] public sealed class MarketPriceComponent : Component From 52d6b00b47760e9ab933f166787a4fc9414fed01 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sun, 30 Jul 2023 00:14:56 +0300 Subject: [PATCH 09/81] Small price fix --- .../Entities/Objects/Consumable/Food/snacks.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index b5f95eb0bf2..8d11c60978f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -22,7 +22,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 20 + price: 50 # Snacks # "Snacks" means food in a packet. Down the line this stuff can have multiple @@ -97,7 +97,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 30 + price: 50 - type: entity name: chocolate bar @@ -123,7 +123,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 30 + price: 50 - type: entity name: energy bar @@ -323,7 +323,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 20 + price: 50 - type: entity id: FoodSnackNutribrickOpen @@ -349,7 +349,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 20 + price: 50 - type: entity id: FoodSnackMREBrownie @@ -369,7 +369,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 20 + price: 50 - type: entity id: FoodSnackMREBrownieOpen @@ -395,7 +395,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 20 + price: 50 # Trash From 1bd594309168af54321cd8657a815151349c1fc6 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sun, 30 Jul 2023 00:22:39 +0300 Subject: [PATCH 10/81] Another price fix --- .../Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml | 2 +- .../Entities/Objects/Consumable/Food/Containers/box.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml index 0769c43983e..fba71efaf42 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml @@ -25,7 +25,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 20 + price: 30 # Tastes like donut. # The sprinkles are now an overlay, so you can put them on any donut! If we really diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index e42aac9719e..ac77841e041 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -65,7 +65,7 @@ - pink-box6 - type: Appearance - type: MarketPrice - price: 100 + price: 120 # Egg From 01c72f0c5ba0e115561d5321487fccb7608410f9 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:19:46 +0300 Subject: [PATCH 11/81] Update chang.yml --- .../Catalog/VendingMachines/Inventories/chang.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml index 3699c06ca0c..c8316183f76 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml @@ -1,10 +1,10 @@ - type: vendingMachineInventory id: ChangInventory startingInventory: - FoodCondimentPacketSoy: 40 - FoodSnackCookieFortune: 40 - DrinkRamen: 20 - DrinkHellRamen: 20 - FoodSnackChowMein: 20 - FoodSnackDanDanNoodles: 20 + FoodCondimentPacketSoy: 10 + FoodSnackCookieFortune: 10 + DrinkRamen: 5 + DrinkHellRamen: 5 + FoodSnackChowMein: 5 + FoodSnackDanDanNoodles: 5 # rice? From e7b151ab03ace084d92e2375e46d885bff8ddf40 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:20:07 +0300 Subject: [PATCH 12/81] Update coffee.yml --- .../Catalog/VendingMachines/Inventories/coffee.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml index d9256418c3d..24b4a9ddc12 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml @@ -1,9 +1,9 @@ - type: vendingMachineInventory id: HotDrinksMachineInventory startingInventory: - DrinkHotCoffee: 30 - DrinkCafeLatte: 30 - DrinkTeacup: 30 - DrinkGreenTea: 30 + DrinkHotCoffee: 10 + DrinkCafeLatte: 10 + DrinkTeacup: 10 + DrinkGreenTea: 10 emaggedInventory: DrinkNothing: 2 From 1432a5ce59fe3222be239710cc55e2833e091c7e Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:21:05 +0300 Subject: [PATCH 13/81] Update cola.yml --- .../VendingMachines/Inventories/cola.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml index ccf5f08196e..b0686f8a972 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml @@ -1,13 +1,13 @@ - type: vendingMachineInventory id: RobustSoftdrinksInventory startingInventory: - DrinkColaCan: 45 - DrinkGrapeCan: 30 - DrinkRootBeerCan: 30 - DrinkIcedTeaCan: 30 - DrinkLemonLimeCan: 30 - DrinkDrGibbCan: 30 - DrinkFourteenLokoCan: 30 + DrinkColaCan: 8 + DrinkGrapeCan: 5 + DrinkRootBeerCan: 5 + DrinkIcedTeaCan: 5 + DrinkLemonLimeCan: 5 + DrinkDrGibbCan: 5 + DrinkFourteenLokoCan: 5 emaggedInventory: - DrinkNukieCan: 3 - DrinkChangelingStingCan: 3 + DrinkNukieCan: 2 + DrinkChangelingStingCan: 2 From fdba051ff782d90edef22e3a897d92aec994be97 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:21:33 +0300 Subject: [PATCH 14/81] Update discount.yml --- .../Catalog/VendingMachines/Inventories/discount.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml index c5ba6d42892..57964182965 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml @@ -1,8 +1,8 @@ - type: vendingMachineInventory id: DiscountDansInventory startingInventory: - FoodSnackCheesie: 30 - FoodSnackChips: 30 - FoodSnackBoritos: 20 - FoodSnackPopcorn: 10 - FoodSnackEnergy: 20 + FoodSnackCheesie: 5 + FoodSnackChips: 5 + FoodSnackBoritos: 5 + FoodSnackPopcorn: 5 + FoodSnackEnergy: 5 From b7d97d8879f7a7612f85c5f06f8102f7d4ad132a Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:21:55 +0300 Subject: [PATCH 15/81] Update donut.yml --- .../Catalog/VendingMachines/Inventories/donut.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml index d5ff970298a..9219575a586 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml @@ -1,10 +1,10 @@ - type: vendingMachineInventory id: DonutInventory startingInventory: - FoodDonutChocolate: 30 - FoodDonutApple: 30 - FoodDonutPink: 30 - FoodDonutBungo: 30 + FoodDonutChocolate: 5 + FoodDonutApple: 5 + FoodDonutPink: 5 + FoodDonutBungo: 5 FoodBoxDonut: 5 emaggedInventory: FoodDonutPoison: 1 From c0b4a75977857bf56a80a5791616b05122d742e7 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:22:22 +0300 Subject: [PATCH 16/81] Update happyhonk.yml --- .../Catalog/VendingMachines/Inventories/happyhonk.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml index fd387c1cd84..f58c2613913 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml @@ -1,8 +1,8 @@ - type: vendingMachineInventory id: HappyHonkDispenserInventory startingInventory: - HappyHonk: 30 - HappyHonkMime: 30 + HappyHonk: 10 + HappyHonkMime: 10 emaggedInventory: - HappyHonkCluwne: 3 - HappyHonkNukie: 3 + HappyHonkCluwne: 2 + HappyHonkNukie: 2 From 03eeee5718dcf16ee15f915a1480f100fb80ed3a Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:22:53 +0300 Subject: [PATCH 17/81] Update pwrgame.yml --- .../VendingMachines/Inventories/pwrgame.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml index 0d13dbef229..4919d80e839 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml @@ -1,11 +1,11 @@ - type: vendingMachineInventory id: PwrGameInventory startingInventory: - DrinkPwrGameCan: 45 - DrinkEnergyDrinkCan: 45 - DrinkGrapeCan: 30 - DrinkRootBeerCan: 30 - DrinkIcedTeaCan: 30 - DrinkLemonLimeCan: 30 - DrinkDrGibbCan: 30 - DrinkFourteenLokoCan: 30 + DrinkPwrGameCan: 8 + DrinkEnergyDrinkCan: 8 + DrinkGrapeCan: 5 + DrinkRootBeerCan: 5 + DrinkIcedTeaCan: 5 + DrinkLemonLimeCan: 5 + DrinkDrGibbCan: 5 + DrinkFourteenLokoCan: 5 From 0509e2f7634777a533536cb58daecdcb61e6b1ce Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:23:17 +0300 Subject: [PATCH 18/81] Update snack.yml --- .../Catalog/VendingMachines/Inventories/snack.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml index 4094a86f723..914d3ccace3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml @@ -1,10 +1,10 @@ - type: vendingMachineInventory id: GetmoreChocolateCorpInventory startingInventory: - FoodSnackRaisins: 30 - FoodSnackChocolate: 30 - FoodSnackPopcorn: 30 - FoodSnackSyndi: 30 + FoodSnackRaisins: 5 + FoodSnackChocolate: 5 + FoodSnackPopcorn: 5 + FoodSnackSyndi: 5 # DrinkRamen: 3 # DrinkHellRamen: 2 From 0365160646a0ee76136ae5895a596d562ff07771 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:23:49 +0300 Subject: [PATCH 19/81] Update sovietsoda.yml --- .../Catalog/VendingMachines/Inventories/sovietsoda.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml index df01016f1d5..0e10018ddef 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml @@ -1,6 +1,6 @@ - type: vendingMachineInventory id: BodaInventory startingInventory: - DrinkSodaWaterCan: 45 #typically hacked product. Default product is "soda" + DrinkSodaWaterCan: 15 #typically hacked product. Default product is "soda" emaggedInventory: - DrinkColaCan: 45 + DrinkColaCan: 15 From b6b10e07df5bfd6e8cb0942353e8ffdab608b26b Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:24:11 +0300 Subject: [PATCH 20/81] Update sovietsoda.yml --- .../Catalog/VendingMachines/Inventories/sovietsoda.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml index 0e10018ddef..3862b293f5b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml @@ -1,6 +1,6 @@ - type: vendingMachineInventory id: BodaInventory startingInventory: - DrinkSodaWaterCan: 15 #typically hacked product. Default product is "soda" + DrinkSodaWaterCan: 12 #typically hacked product. Default product is "soda" emaggedInventory: - DrinkColaCan: 15 + DrinkColaCan: 12 From 0ce91e2242385b68e7abee0176059585e7ab4419 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:24:36 +0300 Subject: [PATCH 21/81] Update spaceup.yml --- .../VendingMachines/Inventories/spaceup.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml index 33e484965ab..5f9e188f58c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml @@ -1,13 +1,13 @@ - type: vendingMachineInventory id: SpaceUpInventory startingInventory: - DrinkSpaceUpCan: 45 - DrinkSpaceMountainWindCan: 45 - DrinkGrapeCan: 30 - DrinkRootBeerCan: 30 - DrinkIcedTeaCan: 30 - DrinkLemonLimeCan: 30 - DrinkDrGibbCan: 30 - DrinkFourteenLokoCan: 30 + DrinkSpaceUpCan: 8 + DrinkSpaceMountainWindCan: 8 + DrinkGrapeCan: 5 + DrinkRootBeerCan: 5 + DrinkIcedTeaCan: 5 + DrinkLemonLimeCan: 5 + DrinkDrGibbCan: 5 + DrinkFourteenLokoCan: 5 emaggedInventory: - DrinkChangelingStingCan: 3 + DrinkChangelingStingCan: 2 From e1127ec48644e2888c2fc21d5aa278f1e15b26d5 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:25:05 +0300 Subject: [PATCH 22/81] Update starkist.yml --- .../VendingMachines/Inventories/starkist.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml index 0802f9e39e7..ad56eee921d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml @@ -1,12 +1,12 @@ - type: vendingMachineInventory id: StarkistInventory startingInventory: - DrinkStarkistCan: 45 - DrinkGrapeCan: 30 - DrinkRootBeerCan: 30 - DrinkIcedTeaCan: 30 - DrinkLemonLimeCan: 30 - DrinkDrGibbCan: 30 - DrinkFourteenLokoCan: 30 + DrinkStarkistCan: 8 + DrinkGrapeCan: 5 + DrinkRootBeerCan: 5 + DrinkIcedTeaCan: 5 + DrinkLemonLimeCan: 5 + DrinkDrGibbCan: 5 + DrinkFourteenLokoCan: 5 emaggedInventory: - DrinkChangelingStingCan: 3 + DrinkChangelingStingCan: 2 From 895d4e3f9e2e7bdae051b972b5d3d8fb72b57bb8 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:25:31 +0300 Subject: [PATCH 23/81] Update sustenance.yml --- .../Catalog/VendingMachines/Inventories/sustenance.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml index 8af4400f756..ded2ab87f2d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml @@ -1,10 +1,10 @@ - type: vendingMachineInventory id: SustenanceInventory startingInventory: - DrinkMREFlask: 20 - FoodSnackNutribrick: 20 - FoodSnackMREBrownie: 20 - FoodCondimentPacketKetchup: 40 + DrinkMREFlask: 5 + FoodSnackNutribrick: 8 + FoodSnackMREBrownie: 8 + FoodCondimentPacketKetchup: 10 emaggedInventory: KitchenKnife: 2 SpaceMedipen: 3 From 04ec84761659e9d00db4dac781812086f3514dcf Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:30:05 +0300 Subject: [PATCH 24/81] Update drinks.yml --- .../Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 69417a77cf4..0b00024d2f0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -2159,7 +2159,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 20 + price: 50 - type: entity parent: DrinkRamen From 5d1e1199e5b6d6d47e87b1161c6e1789a4f6177a Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:31:02 +0300 Subject: [PATCH 25/81] Update drinks_cans.yml --- .../Entities/Objects/Consumable/Drinks/drinks_cans.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index b7eb273c964..6775e1e7e94 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -57,7 +57,7 @@ materialComposition: Steel: 50 #reduce, reuse, recycle - type: MarketPrice - price: 20 + price: 50 - type: StaticPrice price: 5 @@ -325,7 +325,7 @@ - type: Item sprite: Objects/Consumable/Drinks/robustnukie.rsi - type: MarketPrice - price: 100 + price: 200 - type: entity parent: DrinkCanBaseFull From 132b53a89a9bd2dec2f4904d9b5bec9cc51cbf60 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:31:53 +0300 Subject: [PATCH 26/81] Update drinks_cups.yml --- .../Entities/Objects/Consumable/Drinks/drinks_cups.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index a282b63c671..1fdec2729c1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -41,7 +41,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 20 + price: 35 - type: entity parent: DrinkBaseCup From ae1c3c185d9b56e9a3a219f9be732b0bdb9fd6bb Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:32:55 +0300 Subject: [PATCH 27/81] Update drinks_flasks.yml --- .../Objects/Consumable/Drinks/drinks_flasks.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml index 6383b291d68..c7c0c69217f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml @@ -13,7 +13,7 @@ - type: StaticPrice price: 10 - type: MarketPrice - price: 30 + price: 70 - type: entity parent: DrinkBase @@ -35,7 +35,7 @@ - type: StaticPrice price: 10 - type: MarketPrice - price: 30 + price: 70 - type: entity parent: DrinkBase @@ -49,7 +49,7 @@ - type: StaticPrice price: 10 - type: MarketPrice - price: 30 + price: 70 - type: entity parent: DrinkBase @@ -63,7 +63,7 @@ - type: StaticPrice price: 10 - type: MarketPrice - price: 30 + price: 70 - type: entity parent: DrinkBase @@ -77,7 +77,7 @@ - type: StaticPrice price: 10 - type: MarketPrice - price: 30 + price: 70 - type: entity parent: DrinkBase @@ -91,7 +91,7 @@ - type: StaticPrice price: 10 - type: MarketPrice - price: 30 + price: 70 - type: entity parent: DrinkBase @@ -105,7 +105,7 @@ - type: StaticPrice price: 10 - type: MarketPrice - price: 30 + price: 70 - type: entity parent: DrinkBase @@ -119,4 +119,4 @@ - type: StaticPrice price: 10 - type: MarketPrice - price: 30 + price: 70 From 92b0527db2eb304d29098c269b0e66c380e025ff Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:33:27 +0300 Subject: [PATCH 28/81] Update donut.yml --- .../Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml index fba71efaf42..7c6d40b1577 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml @@ -25,7 +25,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 30 + price: 50 # Tastes like donut. # The sprinkles are now an overlay, so you can put them on any donut! If we really From d209aa493d95317db59a214e05d724bead8b6309 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:34:39 +0300 Subject: [PATCH 29/81] Update snacks.yml --- .../Entities/Objects/Consumable/Food/snacks.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index 8d11c60978f..3a1603bb5c5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -22,7 +22,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 50 + price: 70 # Snacks # "Snacks" means food in a packet. Down the line this stuff can have multiple @@ -97,7 +97,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 50 + price: 70 - type: entity name: chocolate bar @@ -123,7 +123,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 50 + price: 70 - type: entity name: energy bar @@ -323,7 +323,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 50 + price: 70 - type: entity id: FoodSnackNutribrickOpen @@ -349,7 +349,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 50 + price: 70 - type: entity id: FoodSnackMREBrownie @@ -369,7 +369,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 50 + price: 70 - type: entity id: FoodSnackMREBrownieOpen @@ -395,7 +395,7 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 50 + price: 70 # Trash From ccd1d9b8a062bb10ab6bb81e14f0d2b006e696dc Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:35:42 +0300 Subject: [PATCH 30/81] Update drinks_cups.yml --- .../_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 7f837959663..8313d87a533 100644 --- a/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -18,4 +18,4 @@ - type: StaticPrice price: 5 - type: MarketPrice - price: 20 \ No newline at end of file + price: 50 From 0eabea51c467d79839f440028953aa4fe5b7a68a Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:36:21 +0300 Subject: [PATCH 31/81] Update shamblersjuice.yml --- .../VendingMachines/Inventories/shamblersjuice.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml index c4e94c19ccb..88e261ab1a3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml @@ -1,10 +1,10 @@ - type: vendingMachineInventory id: ShamblersJuiceInventory startingInventory: - DrinkShamblersJuiceCan: 45 - DrinkGrapeCan: 30 - DrinkRootBeerCan: 30 - DrinkIcedTeaCan: 30 - DrinkLemonLimeCan: 30 - DrinkDrGibbCan: 30 - DrinkFourteenLokoCan: 30 + DrinkShamblersJuiceCan: 8 + DrinkGrapeCan: 5 + DrinkRootBeerCan: 5 + DrinkIcedTeaCan: 5 + DrinkLemonLimeCan: 5 + DrinkDrGibbCan: 5 + DrinkFourteenLokoCan: 5 From 45cb80e19e16799ab53b772f7d568e8b7dbc3ff3 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:36:49 +0300 Subject: [PATCH 32/81] Update soda.yml --- .../VendingMachines/Inventories/soda.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml index 33cb9305b6d..29bbe21b483 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml @@ -1,13 +1,13 @@ - type: vendingMachineInventory id: SodaInventory startingInventory: - DrinkColaCan: 30 - DrinkGrapeCan: 30 - DrinkRootBeerCan: 30 - DrinkIcedTeaCan: 30 - DrinkLemonLimeCan: 30 - DrinkDrGibbCan: 30 - DrinkFourteenLokoCan: 30 + DrinkColaCan: 5 + DrinkGrapeCan: 5 + DrinkRootBeerCan: 5 + DrinkIcedTeaCan: 5 + DrinkLemonLimeCan: 5 + DrinkDrGibbCan: 5 + DrinkFourteenLokoCan: 5 emaggedInventory: - DrinkNukieCan: 3 - DrinkChangelingStingCan: 3 + DrinkNukieCan: 2 + DrinkChangelingStingCan: 2 From d669a31b4d6347f11bc3d7d6de658cfb74a61b68 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 14:08:27 +0300 Subject: [PATCH 33/81] Update cuddlycritter.yml --- .../VendingMachines/Inventories/cuddlycritter.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml index d97fcb06b29..5d24be07401 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml @@ -4,9 +4,8 @@ PlushieBee: 3 PlushieRGBee: 3 PlushieHampter: 3 - PlushieNuke: 3 - PlushieXeno: 3 - PlushieRouny: 3 +# PlushieXeno: 3 +# PlushieRouny: 3 PlushieLizard: 3 PlushieSpaceLizard: 3 PlushieVox: 3 @@ -26,7 +25,6 @@ BeachBall: 2 Basketball: 2 Football: 2 - BalloonCorgi: 2 ToyHammer: 2 WhoopieCushion: 2 ClownRecorder: 1 @@ -34,5 +32,7 @@ CrayonRainbow: 5 emaggedInventory: PlushieJester: 3 - BalloonSyn: 1 - SingularityToy: 1 \ No newline at end of file + PlushieNuke: 3 + BalloonCorgi: 2 +# BalloonSyn: 1 +# SingularityToy: 1 From 93c260459b6a08858d0f96a73573e4e18c615936 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 14:41:20 +0300 Subject: [PATCH 34/81] Update cuddlycritter.yml --- .../_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml index 5d24be07401..f3e77bea73b 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml @@ -2,7 +2,6 @@ id: CuddlyCritterVendInventory startingInventory: PlushieBee: 3 - PlushieRGBee: 3 PlushieHampter: 3 # PlushieXeno: 3 # PlushieRouny: 3 @@ -33,6 +32,7 @@ emaggedInventory: PlushieJester: 3 PlushieNuke: 3 + PlushieRGBee: 3 BalloonCorgi: 2 # BalloonSyn: 1 # SingularityToy: 1 From f64a80fb251821f34a7105fe6f6dc9e30be670eb Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 14:41:48 +0300 Subject: [PATCH 35/81] Update drinks_cups.yml --- .../_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 8313d87a533..e6f8f124174 100644 --- a/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -17,5 +17,5 @@ solution: drink - type: StaticPrice price: 5 - - type: MarketPrice - price: 50 +# - type: MarketPrice +# price: 50 From 297888161c573a3f1685b4b946b1e65343ceacae Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 14:43:22 +0300 Subject: [PATCH 36/81] Update drinks.yml --- .../Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 0b00024d2f0..bb78de34ce2 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -2158,8 +2158,8 @@ - type: SpaceGarbage - type: StaticPrice price: 5 - - type: MarketPrice - price: 50 +# - type: MarketPrice +# price: 50 - type: entity parent: DrinkRamen From 9693f862aa22879b6f5c0ac5d8fb8d96d65a032b Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 14:45:19 +0300 Subject: [PATCH 37/81] Update drinks_cans.yml --- .../Entities/Objects/Consumable/Drinks/drinks_cans.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 6775e1e7e94..f35126d34c4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -56,10 +56,10 @@ - type: PhysicalComposition materialComposition: Steel: 50 #reduce, reuse, recycle - - type: MarketPrice - price: 50 - type: StaticPrice price: 5 +# - type: MarketPrice +# price: 50 - type: entity @@ -324,8 +324,10 @@ sprite: Objects/Consumable/Drinks/robustnukie.rsi - type: Item sprite: Objects/Consumable/Drinks/robustnukie.rsi - - type: MarketPrice - price: 200 + - type: StaticPrice + price: 20 +# - type: MarketPrice +# price: 200 - type: entity parent: DrinkCanBaseFull From 548c78c8b5f4830de4d3e679c75e7d2ee2f95d49 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 14:48:15 +0300 Subject: [PATCH 38/81] Update drinks_cups.yml --- .../Entities/Objects/Consumable/Drinks/drinks_cups.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 1fdec2729c1..ee0b160b375 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -39,9 +39,9 @@ Blunt: 0 - type: ItemCooldown - type: StaticPrice - price: 5 - - type: MarketPrice - price: 35 + price: 4 +# - type: MarketPrice +# price: 35 - type: entity parent: DrinkBaseCup From 0976b6144847ccdacae99b0ff9e75b9a136beb68 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 14:49:35 +0300 Subject: [PATCH 39/81] Update drinks_flasks.yml --- .../Consumable/Drinks/drinks_flasks.yml | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml index c7c0c69217f..382af7cadd7 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml @@ -11,7 +11,7 @@ materialComposition: Steel: 50 - type: StaticPrice - price: 10 + price: 7 - type: MarketPrice price: 70 @@ -33,9 +33,9 @@ - type: TrashOnEmpty solution: drink - type: StaticPrice - price: 10 - - type: MarketPrice - price: 70 + price: 7 +# - type: MarketPrice +# price: 70 - type: entity parent: DrinkBase @@ -47,9 +47,9 @@ - type: Sprite sprite: Objects/Consumable/Drinks/detflask.rsi - type: StaticPrice - price: 10 - - type: MarketPrice - price: 70 + price: 7 +# - type: MarketPrice +# price: 70 - type: entity parent: DrinkBase @@ -61,9 +61,9 @@ - type: Sprite sprite: Objects/Consumable/Drinks/flask.rsi - type: StaticPrice - price: 10 - - type: MarketPrice - price: 70 + price: 7 +# - type: MarketPrice +# price: 70 - type: entity parent: DrinkBase @@ -75,9 +75,9 @@ - type: Sprite sprite: Objects/Consumable/Drinks/barflask.rsi - type: StaticPrice - price: 10 - - type: MarketPrice - price: 70 + price: 7 +# - type: MarketPrice +# price: 70 - type: entity parent: DrinkBase @@ -89,9 +89,9 @@ - type: Sprite sprite: Objects/Consumable/Drinks/flask_old.rsi - type: StaticPrice - price: 10 - - type: MarketPrice - price: 70 + price: 7 +# - type: MarketPrice +# price: 70 - type: entity parent: DrinkBase @@ -103,9 +103,9 @@ - type: Sprite sprite: Objects/Consumable/Drinks/lithiumflask.rsi - type: StaticPrice - price: 10 - - type: MarketPrice - price: 70 + price: 7 +# - type: MarketPrice +# price: 70 - type: entity parent: DrinkBase @@ -117,6 +117,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/vacuumflask.rsi - type: StaticPrice - price: 10 - - type: MarketPrice - price: 70 + price: 7 +# - type: MarketPrice +# price: 70 From 8d5c739ce9296a472872165f43510e3b0e38d0e3 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 14:50:02 +0300 Subject: [PATCH 40/81] Update donut.yml --- .../Entities/Objects/Consumable/Food/Baked/donut.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml index 7c6d40b1577..5ed96bca4cd 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml @@ -24,8 +24,9 @@ size: 1 - type: StaticPrice price: 5 - - type: MarketPrice - price: 50 +# - type: MarketPrice +# price: 50 + # Tastes like donut. # The sprinkles are now an overlay, so you can put them on any donut! If we really From 0edc50a608002ac291de257a061b23b8895b78c7 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 14:56:59 +0300 Subject: [PATCH 41/81] Update toys.yml --- .../Prototypes/Entities/Objects/Fun/toys.yml | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 8308e0f9da0..b67cfdedf41 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -32,9 +32,9 @@ materialComposition: Cloth: 100 - type: StaticPrice - price: 5 - - type: MarketPrice - price: 100 + price: 10 +# - type: MarketPrice +# price: 100 - type: entity parent: BasePlushie @@ -674,9 +674,9 @@ - type: TileFrictionModifier modifier: 0.5 - type: StaticPrice - price: 5 - - type: MarketPrice - price: 100 + price: 10 +# - type: MarketPrice +# price: 100 - type: entity parent: BaseItem @@ -692,9 +692,9 @@ sprite: Objects/Fun/toys.rsi heldPrefix: footb - type: StaticPrice - price: 5 - - type: MarketPrice - price: 100 + price: 10 +# - type: MarketPrice +# price: 100 - type: entity parent: BaseItem @@ -715,9 +715,9 @@ - type: TileFrictionModifier modifier: 0.05 - type: StaticPrice - price: 5 - - type: MarketPrice - price: 100 + price: 10 +# - type: MarketPrice +# price: 100 - type: entity parent: BaseItem @@ -732,10 +732,10 @@ size: 24 sprite: Objects/Fun/toys.rsi heldPrefix: synb - - type: StaticPrice - price: 5 - - type: MarketPrice - price: 1000 +# - type: StaticPrice +# price: 5 +# - type: MarketPrice +# price: 1000 - type: entity parent: BaseItem @@ -751,9 +751,9 @@ sprite: Objects/Fun/toys.rsi heldPrefix: corgib - type: StaticPrice - price: 5 - - type: MarketPrice - price: 100 + price: 10 +# - type: MarketPrice +# price: 100 - type: entity parent: BaseItem @@ -775,9 +775,9 @@ sprite: Objects/Fun/toys.rsi heldPrefix: singularitytoy - type: StaticPrice - price: 5 - - type: MarketPrice - price: 10000 + price: 10 +# - type: MarketPrice +# price: 10000 - type: entity parent: BaseItem @@ -799,7 +799,7 @@ - type: TileFrictionModifier modifier: 0.001 - type: StaticPrice - price: 5 + price: 10 - type: MarketPrice price: 1000 @@ -887,9 +887,9 @@ size: 15 sprite: Objects/Weapons/Melee/cutlass.rsi - type: StaticPrice - price: 5 - - type: MarketPrice - price: 100 + price: 10 +# - type: MarketPrice +# price: 100 - type: entity parent: BaseItem @@ -912,9 +912,9 @@ tags: - ClownRecorder - type: StaticPrice - price: 5 + price: 10 - type: MarketPrice - price: 300 + price: 500 - type: entity parent: BaseItem @@ -954,9 +954,9 @@ types: Blunt: 0 - type: StaticPrice - price: 5 - - type: MarketPrice - price: 100 + price: 10 +# - type: MarketPrice +# price: 100 - type: entity parent: BaseItem @@ -1016,9 +1016,9 @@ mask: - ItemMask - type: StaticPrice - price: 5 - - type: MarketPrice - price: 100 + price: 10 +# - type: MarketPrice +# price: 100 - type: entity name: banana @@ -1040,9 +1040,9 @@ - ReagentId: Nothing Quantity: 100 - type: StaticPrice - price: 5 - - type: MarketPrice - price: 100 + price: 10 +# - type: MarketPrice +# price: 100 - type: entity parent: DrinkBase From bb267f1c4d0ee492830d7f88d5665d43d8c2d239 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 14:58:12 +0300 Subject: [PATCH 42/81] Update crayons.yml --- Resources/Prototypes/Entities/Objects/Fun/crayons.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml index 81d63eb58e7..c4ed961734a 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml @@ -98,7 +98,7 @@ - Recyclable - Trash - type: MarketPrice - price: 200 + price: 350 - type: entity parent: Crayon From 29959f389547f47f0f5717b1dbca685e832e205c Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 14:59:00 +0300 Subject: [PATCH 43/81] Update drinks_flasks.yml --- .../Entities/Objects/Consumable/Drinks/drinks_flasks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml index 382af7cadd7..c2d34889ffb 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml @@ -12,8 +12,8 @@ Steel: 50 - type: StaticPrice price: 7 - - type: MarketPrice - price: 70 +# - type: MarketPrice +# price: 70 - type: entity parent: DrinkBase From af80c720e32cb7bda28f2c647b9bd9f7224047fb Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 14:59:59 +0300 Subject: [PATCH 44/81] Update box.yml --- .../Entities/Objects/Consumable/Food/Containers/box.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index ac77841e041..a0bc4c75408 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -64,8 +64,8 @@ - box5 - pink-box6 - type: Appearance - - type: MarketPrice - price: 120 +# - type: MarketPrice +# price: 200 # Egg From 3087186d7906422586ccfeb11bff1d991a5ea786 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 31 Jul 2023 15:01:44 +0300 Subject: [PATCH 45/81] Update snacks.yml --- .../Objects/Consumable/Food/snacks.yml | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index 3a1603bb5c5..0caea0934b4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -20,9 +20,10 @@ heldPrefix: packet size: 3 - type: StaticPrice - price: 5 - - type: MarketPrice - price: 70 + price: 7 +# - type: MarketPrice +# price: 70 + # Snacks # "Snacks" means food in a packet. Down the line this stuff can have multiple @@ -95,9 +96,9 @@ sound: path: /Audio/Effects/unwrap.ogg - type: StaticPrice - price: 5 - - type: MarketPrice - price: 70 + price: 7 +# - type: MarketPrice +# price: 70 - type: entity name: chocolate bar @@ -121,9 +122,9 @@ - ReagentId: Theobromine Quantity: 3 - type: StaticPrice - price: 5 - - type: MarketPrice - price: 70 + price: 7 +# - type: MarketPrice +# price: 70 - type: entity name: energy bar @@ -321,9 +322,9 @@ sound: path: /Audio/Effects/unwrap.ogg - type: StaticPrice - price: 5 - - type: MarketPrice - price: 70 + price: 7 +# - type: MarketPrice +# price: 70 - type: entity id: FoodSnackNutribrickOpen @@ -347,9 +348,9 @@ - ReagentId: Nutriment Quantity: 25 - type: StaticPrice - price: 5 - - type: MarketPrice - price: 70 + price: 7 +# - type: MarketPrice +# price: 70 - type: entity id: FoodSnackMREBrownie @@ -367,9 +368,9 @@ sound: path: /Audio/Effects/unwrap.ogg - type: StaticPrice - price: 5 - - type: MarketPrice - price: 70 + price: 7 +# - type: MarketPrice +# price: 70 - type: entity id: FoodSnackMREBrownieOpen From 85f9e6c3e1a33b264ecf528ef776e122e80ce672 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 1 Aug 2023 15:51:48 +0300 Subject: [PATCH 46/81] Update VendingMachineSystem.cs --- Content.Server/VendingMachines/VendingMachineSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index a7c35401c73..a36e30f9f11 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -345,11 +345,11 @@ public void AuthorizedVend(EntityUid uid, EntityUid sender, InventoryType type, var totalPrice = ((int) price); - // This block exists to allow the MatketPrice flag to set a price + // This block exists to allow the MarketPrice flag to set a price var priceMarket = _pricing.GetEstimatedMarketPrice(proto); if (priceMarket == null || priceMarket == 0) { } else { totalPrice = ((int) priceMarket); } - // This block exists to allow the MatketPrice flag to set a price + // This block exists to allow the MarketPrice flag to set a price if (totalPrice > bank.Balance) { From a6ecc974c341aba385a5650cc59c30a0c66c836f Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 1 Aug 2023 17:18:37 +0300 Subject: [PATCH 47/81] Update VendingMachineMenu.xaml.cs --- Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs index 30bfab70b4a..c584d158749 100644 --- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs +++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs @@ -112,7 +112,7 @@ public void Populate(List inventory, float priceMo cost = (int) (cost * priceModifier); } - // This block exists to allow the MatketPrice flag to set a price + // This block exists to allow the MarketPrice flag to set a price if (prototype != null && prototype.TryGetComponent(out var marketPriceComponent)) { if (marketPriceComponent.Price != 0) @@ -121,7 +121,7 @@ public void Populate(List inventory, float priceMo cost = (int) (price); } } - // This block exists to allow the MatketPrice flag to set a price + // This block exists to allow the MarketPrice flag to set a price vendingItem.Text = $"[${cost}] {itemName} [{entry.Amount}]"; vendingItem.Icon = icon; From 85030d3b56ed77865bea1fc769b65e6ac26add9c Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 1 Aug 2023 18:49:40 +0300 Subject: [PATCH 48/81] Update cuddlycritter.yml --- .../_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml index f3e77bea73b..d23dbcc39fc 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml @@ -29,6 +29,8 @@ ClownRecorder: 1 PonderingOrb: 1 CrayonRainbow: 5 + contrabandInventory: + PlushieLamp: 3 emaggedInventory: PlushieJester: 3 PlushieNuke: 3 From 8e860695c5140b717817f36c2d1a4166650c1468 Mon Sep 17 00:00:00 2001 From: Dvir Date: Thu, 3 Aug 2023 02:07:25 +0300 Subject: [PATCH 49/81] Revert "Update snacks.yml" This reverts commit 3087186d7906422586ccfeb11bff1d991a5ea786. --- .../Objects/Consumable/Food/snacks.yml | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index 0caea0934b4..3a1603bb5c5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -20,10 +20,9 @@ heldPrefix: packet size: 3 - type: StaticPrice - price: 7 -# - type: MarketPrice -# price: 70 - + price: 5 + - type: MarketPrice + price: 70 # Snacks # "Snacks" means food in a packet. Down the line this stuff can have multiple @@ -96,9 +95,9 @@ sound: path: /Audio/Effects/unwrap.ogg - type: StaticPrice - price: 7 -# - type: MarketPrice -# price: 70 + price: 5 + - type: MarketPrice + price: 70 - type: entity name: chocolate bar @@ -122,9 +121,9 @@ - ReagentId: Theobromine Quantity: 3 - type: StaticPrice - price: 7 -# - type: MarketPrice -# price: 70 + price: 5 + - type: MarketPrice + price: 70 - type: entity name: energy bar @@ -322,9 +321,9 @@ sound: path: /Audio/Effects/unwrap.ogg - type: StaticPrice - price: 7 -# - type: MarketPrice -# price: 70 + price: 5 + - type: MarketPrice + price: 70 - type: entity id: FoodSnackNutribrickOpen @@ -348,9 +347,9 @@ - ReagentId: Nutriment Quantity: 25 - type: StaticPrice - price: 7 -# - type: MarketPrice -# price: 70 + price: 5 + - type: MarketPrice + price: 70 - type: entity id: FoodSnackMREBrownie @@ -368,9 +367,9 @@ sound: path: /Audio/Effects/unwrap.ogg - type: StaticPrice - price: 7 -# - type: MarketPrice -# price: 70 + price: 5 + - type: MarketPrice + price: 70 - type: entity id: FoodSnackMREBrownieOpen From 01cfcdd013e93c1aef368acf9f680233454a32bc Mon Sep 17 00:00:00 2001 From: Dvir Date: Thu, 3 Aug 2023 02:07:41 +0300 Subject: [PATCH 50/81] Revert "Update box.yml" This reverts commit af80c720e32cb7bda28f2c647b9bd9f7224047fb. --- .../Entities/Objects/Consumable/Food/Containers/box.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index a0bc4c75408..ac77841e041 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -64,8 +64,8 @@ - box5 - pink-box6 - type: Appearance -# - type: MarketPrice -# price: 200 + - type: MarketPrice + price: 120 # Egg From 7925df1627dcc31e467e1cce2dfc1023be6a95b3 Mon Sep 17 00:00:00 2001 From: Dvir Date: Thu, 3 Aug 2023 02:07:47 +0300 Subject: [PATCH 51/81] Revert "Update drinks_flasks.yml" This reverts commit 29959f389547f47f0f5717b1dbca685e832e205c. --- .../Entities/Objects/Consumable/Drinks/drinks_flasks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml index c2d34889ffb..382af7cadd7 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml @@ -12,8 +12,8 @@ Steel: 50 - type: StaticPrice price: 7 -# - type: MarketPrice -# price: 70 + - type: MarketPrice + price: 70 - type: entity parent: DrinkBase From d504b506fa775bf73aadbfc79c4891ff6e858e2c Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:11:05 +0300 Subject: [PATCH 52/81] Update chang.yml --- .../Catalog/VendingMachines/Inventories/chang.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml index c8316183f76..282f58535b0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml @@ -1,10 +1,10 @@ - type: vendingMachineInventory id: ChangInventory startingInventory: - FoodCondimentPacketSoy: 10 - FoodSnackCookieFortune: 10 - DrinkRamen: 5 - DrinkHellRamen: 5 - FoodSnackChowMein: 5 - FoodSnackDanDanNoodles: 5 + FoodCondimentPacketSoy: 5 + FoodSnackCookieFortune: 5 + DrinkRamen: 3 + DrinkHellRamen: 3 + FoodSnackChowMein: 3 + FoodSnackDanDanNoodles: 3 # rice? From 8e32f1a0e1a2649b0d1815758fdca198c9056b74 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:11:35 +0300 Subject: [PATCH 53/81] Update coffee.yml --- .../Catalog/VendingMachines/Inventories/coffee.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml index 24b4a9ddc12..acb15b217cd 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml @@ -1,9 +1,9 @@ - type: vendingMachineInventory id: HotDrinksMachineInventory startingInventory: - DrinkHotCoffee: 10 - DrinkCafeLatte: 10 - DrinkTeacup: 10 - DrinkGreenTea: 10 + DrinkHotCoffee: 5 + DrinkCafeLatte: 5 + DrinkTeacup: 5 + DrinkGreenTea: 5 emaggedInventory: DrinkNothing: 2 From 6082720b938746f4fe9a0ee186e9982e8a57221e Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:12:10 +0300 Subject: [PATCH 54/81] Update cola.yml --- .../Catalog/VendingMachines/Inventories/cola.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml index b0686f8a972..3b4484728d9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml @@ -1,13 +1,13 @@ - type: vendingMachineInventory id: RobustSoftdrinksInventory startingInventory: - DrinkColaCan: 8 - DrinkGrapeCan: 5 - DrinkRootBeerCan: 5 - DrinkIcedTeaCan: 5 - DrinkLemonLimeCan: 5 - DrinkDrGibbCan: 5 - DrinkFourteenLokoCan: 5 + DrinkColaCan: 4 + DrinkGrapeCan: 2 + DrinkRootBeerCan: 2 + DrinkIcedTeaCan: 2 + DrinkLemonLimeCan: 2 + DrinkDrGibbCan: 2 + DrinkFourteenLokoCan: 2 emaggedInventory: DrinkNukieCan: 2 DrinkChangelingStingCan: 2 From e6592bdfa980b2e43653208f79dec546052d4fe3 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:12:32 +0300 Subject: [PATCH 55/81] Update donut.yml --- .../Catalog/VendingMachines/Inventories/donut.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml index 9219575a586..46eba3a81c6 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml @@ -1,10 +1,8 @@ - type: vendingMachineInventory id: DonutInventory startingInventory: - FoodDonutChocolate: 5 - FoodDonutApple: 5 - FoodDonutPink: 5 - FoodDonutBungo: 5 - FoodBoxDonut: 5 + FoodDonutApple: 3 + FoodDonutPink: 3 + FoodDonutBungo: 3 emaggedInventory: FoodDonutPoison: 1 From 51869926429657125c19d91f0f7476594aa7ab84 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:12:54 +0300 Subject: [PATCH 56/81] Update pwrgame.yml --- .../VendingMachines/Inventories/pwrgame.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml index 4919d80e839..acfe12960ba 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml @@ -1,11 +1,11 @@ - type: vendingMachineInventory id: PwrGameInventory startingInventory: - DrinkPwrGameCan: 8 - DrinkEnergyDrinkCan: 8 - DrinkGrapeCan: 5 - DrinkRootBeerCan: 5 - DrinkIcedTeaCan: 5 - DrinkLemonLimeCan: 5 - DrinkDrGibbCan: 5 - DrinkFourteenLokoCan: 5 + DrinkPwrGameCan: 4 + DrinkEnergyDrinkCan: 4 + DrinkGrapeCan: 2 + DrinkRootBeerCan: 2 + DrinkIcedTeaCan: 2 + DrinkLemonLimeCan: 2 + DrinkDrGibbCan: 2 + DrinkFourteenLokoCan: 2 From 28e2abce851a8d825000da6c16507c25a40c2b8b Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:13:21 +0300 Subject: [PATCH 57/81] Update spaceup.yml --- .../VendingMachines/Inventories/spaceup.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml index 5f9e188f58c..30586d13b4d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml @@ -1,13 +1,13 @@ - type: vendingMachineInventory id: SpaceUpInventory startingInventory: - DrinkSpaceUpCan: 8 - DrinkSpaceMountainWindCan: 8 - DrinkGrapeCan: 5 - DrinkRootBeerCan: 5 - DrinkIcedTeaCan: 5 - DrinkLemonLimeCan: 5 - DrinkDrGibbCan: 5 - DrinkFourteenLokoCan: 5 + DrinkSpaceUpCan: 3 + DrinkSpaceMountainWindCan: 3 + DrinkGrapeCan: 2 + DrinkRootBeerCan: 2 + DrinkIcedTeaCan: 2 + DrinkLemonLimeCan: 2 + DrinkDrGibbCan: 2 + DrinkFourteenLokoCan: 2 emaggedInventory: DrinkChangelingStingCan: 2 From a36353df1cae9a3a15231d1c8051f5823d4cf5c3 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:13:41 +0300 Subject: [PATCH 58/81] Update starkist.yml --- .../VendingMachines/Inventories/starkist.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml index ad56eee921d..53a84d0beb6 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml @@ -1,12 +1,12 @@ - type: vendingMachineInventory id: StarkistInventory startingInventory: - DrinkStarkistCan: 8 - DrinkGrapeCan: 5 - DrinkRootBeerCan: 5 - DrinkIcedTeaCan: 5 - DrinkLemonLimeCan: 5 - DrinkDrGibbCan: 5 - DrinkFourteenLokoCan: 5 + DrinkStarkistCan: 4 + DrinkGrapeCan: 2 + DrinkRootBeerCan: 2 + DrinkIcedTeaCan: 2 + DrinkLemonLimeCan: 2 + DrinkDrGibbCan: 2 + DrinkFourteenLokoCan: 2 emaggedInventory: DrinkChangelingStingCan: 2 From 88f7cc1a130904a7bcd5a66b5028c0b068246b1d Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:14:09 +0300 Subject: [PATCH 59/81] Update drinks_cups.yml --- .../Entities/Objects/Consumable/Drinks/drinks_cups.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index ee0b160b375..2477cc33b0b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -40,8 +40,6 @@ - type: ItemCooldown - type: StaticPrice price: 4 -# - type: MarketPrice -# price: 35 - type: entity parent: DrinkBaseCup From cc1644816c95f97bb437c208812e79594acf8a72 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:15:01 +0300 Subject: [PATCH 60/81] Update drinks_cups.yml --- .../_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml index e6f8f124174..e0a1231069f 100644 --- a/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -15,7 +15,3 @@ state: icon - type: TrashOnEmpty solution: drink - - type: StaticPrice - price: 5 -# - type: MarketPrice -# price: 50 From 38518b5dc9f1184e155e6d9581bf063908556075 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:15:46 +0300 Subject: [PATCH 61/81] Update happyhonk.yml --- .../Catalog/VendingMachines/Inventories/happyhonk.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml index f58c2613913..50695edc194 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml @@ -2,7 +2,7 @@ id: HappyHonkDispenserInventory startingInventory: HappyHonk: 10 - HappyHonkMime: 10 + HappyHonkMime: 4 emaggedInventory: - HappyHonkCluwne: 2 - HappyHonkNukie: 2 + HappyHonkCluwne: 1 + HappyHonkNukie: 1 From 4c1e17adec0d06d1bb6d18ef794db1b446d46664 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:16:16 +0300 Subject: [PATCH 62/81] Update shamblersjuice.yml --- .../VendingMachines/Inventories/shamblersjuice.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml index 88e261ab1a3..665a1d9c326 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml @@ -1,10 +1,10 @@ - type: vendingMachineInventory id: ShamblersJuiceInventory startingInventory: - DrinkShamblersJuiceCan: 8 - DrinkGrapeCan: 5 - DrinkRootBeerCan: 5 - DrinkIcedTeaCan: 5 - DrinkLemonLimeCan: 5 - DrinkDrGibbCan: 5 - DrinkFourteenLokoCan: 5 + DrinkShamblersJuiceCan: 4 + DrinkGrapeCan: 2 + DrinkRootBeerCan: 2 + DrinkIcedTeaCan: 2 + DrinkLemonLimeCan: 2 + DrinkDrGibbCan: 2 + DrinkFourteenLokoCan: 2 From 843b8a713f16acc133930953b37516eb9b4a4687 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:17:23 +0300 Subject: [PATCH 63/81] Update snack.yml --- .../Catalog/VendingMachines/Inventories/snack.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml index 914d3ccace3..ca801f142f8 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml @@ -1,10 +1,9 @@ - type: vendingMachineInventory id: GetmoreChocolateCorpInventory startingInventory: - FoodSnackRaisins: 5 - FoodSnackChocolate: 5 - FoodSnackPopcorn: 5 - FoodSnackSyndi: 5 -# DrinkRamen: 3 -# DrinkHellRamen: 2 - + FoodSnackRaisins: 3 + FoodSnackChocolate: 3 + FoodSnackPopcorn: 3 + FoodSnackSyndi: 3 + DrinkRamen: 3 + DrinkHellRamen: 2 From 0a61f6304b83e1a2bba526fd90ee7f393d541a17 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:17:43 +0300 Subject: [PATCH 64/81] Update soda.yml --- .../Catalog/VendingMachines/Inventories/soda.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml index 29bbe21b483..f101839b72b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml @@ -1,13 +1,13 @@ - type: vendingMachineInventory id: SodaInventory startingInventory: - DrinkColaCan: 5 - DrinkGrapeCan: 5 - DrinkRootBeerCan: 5 - DrinkIcedTeaCan: 5 - DrinkLemonLimeCan: 5 - DrinkDrGibbCan: 5 - DrinkFourteenLokoCan: 5 + DrinkColaCan: 3 + DrinkGrapeCan: 3 + DrinkRootBeerCan: 3 + DrinkIcedTeaCan: 3 + DrinkLemonLimeCan: 3 + DrinkDrGibbCan: 3 + DrinkFourteenLokoCan: 3 emaggedInventory: DrinkNukieCan: 2 DrinkChangelingStingCan: 2 From 8b195ab586faac7bde76a0e7038dc92533446c0e Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:18:13 +0300 Subject: [PATCH 65/81] Update drinks_cans.yml --- .../Entities/Objects/Consumable/Drinks/drinks_cans.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index f35126d34c4..6c4dd033ce4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -57,9 +57,7 @@ materialComposition: Steel: 50 #reduce, reuse, recycle - type: StaticPrice - price: 5 -# - type: MarketPrice -# price: 50 + price: 5.5 - type: entity From 6590c623f0d0fda865968b351327c528cefcd274 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:19:07 +0300 Subject: [PATCH 66/81] Update drinks_flasks.yml --- .../Objects/Consumable/Drinks/drinks_flasks.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml index 382af7cadd7..fcdff5bfcab 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml @@ -12,8 +12,6 @@ Steel: 50 - type: StaticPrice price: 7 - - type: MarketPrice - price: 70 - type: entity parent: DrinkBase @@ -34,8 +32,6 @@ solution: drink - type: StaticPrice price: 7 -# - type: MarketPrice -# price: 70 - type: entity parent: DrinkBase @@ -48,8 +44,6 @@ sprite: Objects/Consumable/Drinks/detflask.rsi - type: StaticPrice price: 7 -# - type: MarketPrice -# price: 70 - type: entity parent: DrinkBase @@ -62,8 +56,6 @@ sprite: Objects/Consumable/Drinks/flask.rsi - type: StaticPrice price: 7 -# - type: MarketPrice -# price: 70 - type: entity parent: DrinkBase @@ -76,8 +68,6 @@ sprite: Objects/Consumable/Drinks/barflask.rsi - type: StaticPrice price: 7 -# - type: MarketPrice -# price: 70 - type: entity parent: DrinkBase @@ -90,8 +80,6 @@ sprite: Objects/Consumable/Drinks/flask_old.rsi - type: StaticPrice price: 7 -# - type: MarketPrice -# price: 70 - type: entity parent: DrinkBase @@ -104,8 +92,6 @@ sprite: Objects/Consumable/Drinks/lithiumflask.rsi - type: StaticPrice price: 7 -# - type: MarketPrice -# price: 70 - type: entity parent: DrinkBase @@ -118,5 +104,3 @@ sprite: Objects/Consumable/Drinks/vacuumflask.rsi - type: StaticPrice price: 7 -# - type: MarketPrice -# price: 70 From 2bc5cb3b3e80cfda96edb7a456fce446691951bb Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:19:41 +0300 Subject: [PATCH 67/81] Update donut.yml --- .../Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml index 5ed96bca4cd..e33046e21e1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml @@ -24,8 +24,6 @@ size: 1 - type: StaticPrice price: 5 -# - type: MarketPrice -# price: 50 # Tastes like donut. From 00bd876274b4e8a5714918763079bf2011d9c386 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:20:38 +0300 Subject: [PATCH 68/81] Update box.yml --- .../Entities/Objects/Consumable/Food/Containers/box.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index ac77841e041..aae4f7c920d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -64,8 +64,8 @@ - box5 - pink-box6 - type: Appearance - - type: MarketPrice - price: 120 + - type: StaticPrice + price: 12 # Egg From 04ac2e260332fc1b065282278d7d56d316839379 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:21:52 +0300 Subject: [PATCH 69/81] Update snacks.yml --- .../Objects/Consumable/Food/snacks.yml | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index 3a1603bb5c5..3ea5ac261e1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -20,9 +20,7 @@ heldPrefix: packet size: 3 - type: StaticPrice - price: 5 - - type: MarketPrice - price: 70 + price: 7 # Snacks # "Snacks" means food in a packet. Down the line this stuff can have multiple @@ -121,9 +119,7 @@ - ReagentId: Theobromine Quantity: 3 - type: StaticPrice - price: 5 - - type: MarketPrice - price: 70 + price: 7 - type: entity name: energy bar @@ -321,9 +317,7 @@ sound: path: /Audio/Effects/unwrap.ogg - type: StaticPrice - price: 5 - - type: MarketPrice - price: 70 + price: 7 - type: entity id: FoodSnackNutribrickOpen @@ -347,9 +341,7 @@ - ReagentId: Nutriment Quantity: 25 - type: StaticPrice - price: 5 - - type: MarketPrice - price: 70 + price: 7 - type: entity id: FoodSnackMREBrownie @@ -367,9 +359,7 @@ sound: path: /Audio/Effects/unwrap.ogg - type: StaticPrice - price: 5 - - type: MarketPrice - price: 70 + price: 7 - type: entity id: FoodSnackMREBrownieOpen @@ -393,9 +383,7 @@ - ReagentId: Theobromine Quantity: 3 - type: StaticPrice - price: 5 - - type: MarketPrice - price: 70 + price: 7 # Trash From 40e50c5c7e2ee11e2569b1621d00de22a11db231 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:22:27 +0300 Subject: [PATCH 70/81] Update discount.yml --- .../Catalog/VendingMachines/Inventories/discount.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml index 57964182965..d175f6a5dd1 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml @@ -1,8 +1,8 @@ - type: vendingMachineInventory id: DiscountDansInventory startingInventory: - FoodSnackCheesie: 5 - FoodSnackChips: 5 - FoodSnackBoritos: 5 - FoodSnackPopcorn: 5 - FoodSnackEnergy: 5 + FoodSnackCheesie: 3 + FoodSnackChips: 3 + FoodSnackBoritos: 2 + FoodSnackPopcorn: 1 + FoodSnackEnergy: 2 From 3b3812460a0f6203bf950768869f72bb5a9c5db3 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:23:03 +0300 Subject: [PATCH 71/81] Update donut.yml --- .../Prototypes/Catalog/VendingMachines/Inventories/donut.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml index 46eba3a81c6..16dc3e628f8 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml @@ -1,6 +1,7 @@ - type: vendingMachineInventory id: DonutInventory startingInventory: + FoodDonutChocolate: 5 FoodDonutApple: 3 FoodDonutPink: 3 FoodDonutBungo: 3 From fcb75645abf4b24fe6fd9b3a1526a572b4cab89e Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:23:29 +0300 Subject: [PATCH 72/81] Update sovietsoda.yml --- .../Catalog/VendingMachines/Inventories/sovietsoda.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml index 3862b293f5b..e9b60e816aa 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml @@ -1,6 +1,6 @@ - type: vendingMachineInventory id: BodaInventory startingInventory: - DrinkSodaWaterCan: 12 #typically hacked product. Default product is "soda" + DrinkSodaWaterCan: 10 #typically hacked product. Default product is "soda" emaggedInventory: - DrinkColaCan: 12 + DrinkColaCan: 10 From c8dcded355e795900791455bdb7d6964682db723 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:23:54 +0300 Subject: [PATCH 73/81] Update sustenance.yml --- .../Catalog/VendingMachines/Inventories/sustenance.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml index ded2ab87f2d..9fa3499e15c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml @@ -1,10 +1,10 @@ - type: vendingMachineInventory id: SustenanceInventory startingInventory: - DrinkMREFlask: 5 - FoodSnackNutribrick: 8 - FoodSnackMREBrownie: 8 - FoodCondimentPacketKetchup: 10 + DrinkMREFlask: 3 + FoodSnackNutribrick: 5 + FoodSnackMREBrownie: 5 + FoodCondimentPacketKetchup: 5 emaggedInventory: KitchenKnife: 2 SpaceMedipen: 3 From 1eb0df9a6a2cc51de0b727ea45bd44091495b0d3 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:25:09 +0300 Subject: [PATCH 74/81] Update drinks.yml --- .../Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index bb78de34ce2..81a33d18da3 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -2158,8 +2158,6 @@ - type: SpaceGarbage - type: StaticPrice price: 5 -# - type: MarketPrice -# price: 50 - type: entity parent: DrinkRamen From 0ea9587b66622d71f48e95f4deade4b11d783151 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:28:38 +0300 Subject: [PATCH 75/81] Update snacks.yml --- .../Prototypes/Entities/Objects/Consumable/Food/snacks.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index 3ea5ac261e1..734340ade96 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -93,9 +93,7 @@ sound: path: /Audio/Effects/unwrap.ogg - type: StaticPrice - price: 5 - - type: MarketPrice - price: 70 + price: 7 - type: entity name: chocolate bar From 3f4f33e8d1ce0c92f187e85b390d3b4d4aaedf48 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:29:43 +0300 Subject: [PATCH 76/81] Update toys.yml --- .../Prototypes/Entities/Objects/Fun/toys.yml | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index b67cfdedf41..8ecb1b2071a 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -33,8 +33,6 @@ Cloth: 100 - type: StaticPrice price: 10 -# - type: MarketPrice -# price: 100 - type: entity parent: BasePlushie @@ -675,8 +673,6 @@ modifier: 0.5 - type: StaticPrice price: 10 -# - type: MarketPrice -# price: 100 - type: entity parent: BaseItem @@ -693,8 +689,6 @@ heldPrefix: footb - type: StaticPrice price: 10 -# - type: MarketPrice -# price: 100 - type: entity parent: BaseItem @@ -716,8 +710,6 @@ modifier: 0.05 - type: StaticPrice price: 10 -# - type: MarketPrice -# price: 100 - type: entity parent: BaseItem @@ -732,10 +724,6 @@ size: 24 sprite: Objects/Fun/toys.rsi heldPrefix: synb -# - type: StaticPrice -# price: 5 -# - type: MarketPrice -# price: 1000 - type: entity parent: BaseItem @@ -752,8 +740,6 @@ heldPrefix: corgib - type: StaticPrice price: 10 -# - type: MarketPrice -# price: 100 - type: entity parent: BaseItem @@ -776,8 +762,6 @@ heldPrefix: singularitytoy - type: StaticPrice price: 10 -# - type: MarketPrice -# price: 10000 - type: entity parent: BaseItem @@ -888,8 +872,6 @@ sprite: Objects/Weapons/Melee/cutlass.rsi - type: StaticPrice price: 10 -# - type: MarketPrice -# price: 100 - type: entity parent: BaseItem @@ -955,8 +937,6 @@ Blunt: 0 - type: StaticPrice price: 10 -# - type: MarketPrice -# price: 100 - type: entity parent: BaseItem From ee8fd6b6d793d3e3e28d7e814e0a3a2f545ba9ac Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:31:20 +0300 Subject: [PATCH 77/81] Update drinks_cans.yml --- .../Entities/Objects/Consumable/Drinks/drinks_cans.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 6c4dd033ce4..8c3c19cc6ec 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -324,8 +324,6 @@ sprite: Objects/Consumable/Drinks/robustnukie.rsi - type: StaticPrice price: 20 -# - type: MarketPrice -# price: 200 - type: entity parent: DrinkCanBaseFull From e7c8dac7e4808bfe922768d3948dfa948c43be2f Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:32:54 +0300 Subject: [PATCH 78/81] Update toys.yml --- Resources/Prototypes/Entities/Objects/Fun/toys.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 8ecb1b2071a..857c1cc7394 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -997,8 +997,6 @@ - ItemMask - type: StaticPrice price: 10 -# - type: MarketPrice -# price: 100 - type: entity name: banana @@ -1021,8 +1019,6 @@ Quantity: 100 - type: StaticPrice price: 10 -# - type: MarketPrice -# price: 100 - type: entity parent: DrinkBase From 006234788c757708d0696a724ef0087c5a899db7 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:35:18 +0300 Subject: [PATCH 79/81] Update drinks.yml --- .../Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 81a33d18da3..4fdfbbba533 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -2157,7 +2157,7 @@ - Trash - type: SpaceGarbage - type: StaticPrice - price: 5 + price: 5.5 - type: entity parent: DrinkRamen From 50819f8d95b20e092a5acf76ec36310715d299ee Mon Sep 17 00:00:00 2001 From: Dvir Date: Thu, 3 Aug 2023 20:16:24 +0300 Subject: [PATCH 80/81] Vend --- Resources/Audio/_NF/Items/Toys/wehhelp.ogg | Bin 8074 -> 0 bytes .../advertisements/vending/cuddlycritter.ftl | 8 ---- .../catalog/cargo/cargo-vending.ftl | 5 +-- .../catalog/fills/crates/vending-crates.ftl | 5 +-- .../_NF/Catalog/Cargo/cargo_vending.yml | 10 ----- .../Advertisements/cuddlycritter.yml | 11 ----- .../Inventories/cuddlycritter.yml | 40 ------------------ .../_NF/Entities/Objects/Fun/toys.yml | 25 ----------- .../Structures/Machines/vending_machines.yml | 33 +-------------- .../_NF/Objects/Fun/toys.rsi/meta.json | 14 ------ .../Objects/Fun/toys.rsi/plushie_jester.png | Bin 585 -> 0 bytes .../cuddlycritter.rsi/broken.png | Bin 954 -> 0 bytes .../cuddlycritter.rsi/meta.json | 31 -------------- .../cuddlycritter.rsi/normal-unshaded.png | Bin 617 -> 0 bytes .../VendingMachines/cuddlycritter.rsi/off.png | Bin 778 -> 0 bytes .../cuddlycritter.rsi/panel.png | Bin 681 -> 0 bytes 16 files changed, 3 insertions(+), 179 deletions(-) delete mode 100644 Resources/Audio/_NF/Items/Toys/wehhelp.ogg delete mode 100644 Resources/Locale/en-US/_NF/advertisements/vending/cuddlycritter.ftl delete mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/cuddlycritter.yml delete mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml delete mode 100644 Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json delete mode 100644 Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_jester.png delete mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/broken.png delete mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/meta.json delete mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/normal-unshaded.png delete mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/off.png delete mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/panel.png diff --git a/Resources/Audio/_NF/Items/Toys/wehhelp.ogg b/Resources/Audio/_NF/Items/Toys/wehhelp.ogg deleted file mode 100644 index c16495a5305dbfbe9c794b48be63746d69322e1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8074 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 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/broken.png deleted file mode 100644 index c84c3985a505ddb1b146a9cd56b9c8f7914a443b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 954 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U~J8Fb`J1#c2)=|%1_J8No8Qr zI6rlwt;gX2kyiiUrHew_(*z1n1kBax=(6w<=}uUap1s~Ek zzIyOz&FbdW3LO6$EUYXwcX@PvS8Wwr*d#9Z{_&o2zVCP0IldZQUbBwV;c~9A;MAoh zX`x(u7V#_oFklEwoF?e4x9q~keeYhXU5#x?e^`HY{@F;L51vPg&lu!B;(avJ_x6K5 z{yLi$O;WW}mos1K_{e?TYPtP|dOLJJ_+0c+eb(ukwDQ8SEa}aQRtowHw{M>1_tWXt zW1Z)^=c0C=npOKroUQnm*QD25+yssaC3QGAb!mBN9Cm9dn=8W2X*J#YM|*7joEWX0 zUI|Yk99X49uJiw6-=CiSbh+BzB@1{;_FJ4gt|4%PRm$}EPrI@?$2cF&a%D>|dW7|BQqaiUT{k=~-Z~SijYZ;HgF4n5+dv=+hI{srcd|K3-``E}67%#~IJ|V7F>5XOy<@!Ns z#!-dr?Cinr0XkuM3{FnQN=gBREyAKAJ@s}yJw46Y@*>8rQnrCDEiHNhX+p-Xp8g>j zlKlM<{Jup^HPe>*6}DEUYWh1WYG}zC*;x8jOjJ%uk#O?@+T(mpBpOI5mIV0)|0e(# z<{!ME2vp2j;1OBOz@VoD!i=jP-JJwXLH3?5jv*HQy_0&&nhbba6TNS{m}M0Pe`o&j z&;O4_yTwq7ydUqYkbF?dt1+#+s5|s&a6yP$p`zkFlGO~=1qSc68j7|%FZJu#HT_-b_4^F{+b>+7 z{`HWSz05BGrQ;f26ZHfu{ZnLqIZP?}d1Q(L!>b280xYrO4(}WGM7!Vkn30HUCAfsk0|Cy8Wr? z58i6j@Xg)6>f2-AdrU_kiYFA#sL=U;Q}X(b!Wqj<58Ip%WxG1%^{Sh19&OZ{uD$k& W({G2veCvVX%i!ti=d#Wzp$Py%->C2a diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/meta.json deleted file mode 100644 index f634aaed47e..00000000000 --- a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/meta.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "gentlejester-148196053781315584", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "broken" - }, - { - "name": "off" - }, - { - "name": "panel" - }, - { - "name": "normal-unshaded", - "delays": [ - [ - 1.5, - 0.1, - 1.5, - 0.1 - ] - ] - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/normal-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/normal-unshaded.png deleted file mode 100644 index 8cd03ee9ad627260655dd5f7e2ac91f99c5a2dd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 617 zcmV-v0+#)WP)Px%2}wjjRCt{2+CfN@VI0Ttuafby#-c>f)kP5N6hfh=fxWOGFS(25)k6nwNuGyi zAur;g!#qjRWizNiXbRrO6zw1yxftXSVhkihgII@&`4Z2Zd*8i+{XUoXdEa+?fB!vu zc(%hIL_|bHME*-nUOw#3;8W{pc=##xvh3xv8A8M4S_T*@WB_;*?yaqIptIyGW+j(9^D^)&-?#$$ZeFbn3h=he#sUh z%-Cy$BQeHrr2l!}K@>+!bZqluS$K%?`GE5Hf_9p~}x49r0)&`ByD#0pfY-h(~BuYBVK#Je*!6}rE< zL`PeYz1Dlghto{FvH|!11N_Q2PQb+H%FoWh&mUNUps}DUxBH=(B~;8ZH64Q1%5}FZ z;JouiL_|bHL_|bHPx%s!2paR9J=WmR(4bQ5eU6v#+_?m;D3r#E1j)WO9Ozo*7|f|Nuyvu1z3+S8?VV1%sQ=A5?{l8# zJpc1Q&pGFXe;qoxq5fKTayt`_KXgiR7HnrSE%;Ah#|i8f8Dr51CUX(7Xaqpg*9uX* z$y}73K)PdkfGAiC2@#=;1OQgtk8@6z4KoWdN}8@_ClK~eQx05gUZt?O91fg^g&{?| zJRf9mWEW`kz1zPww;YO#=w#dVEVmBbFXT#UY4VK%tQ8UPp_c>zFJ zX92)|vw%luR;5lCeskv)aN>roAvlelg*VbL(rJAUY1@p$6n| zR(PQg1`Wp;bQ;kcROi)P0~xo#S>eqzoWkO#F-i^@i51o2yyBtzi5vdPfU^ zfIrm&tkkw(wQ5r;5b&##7T$#N zPk}0d?Sh=Zj^i)#V>~=}wRi&n000hUSV?A0O#mtY000O800000007cclK=n!07*qo IM6N<$f{Za%>;M1& diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/panel.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/panel.png deleted file mode 100644 index dcb37dea9df067c27cafacd4f6c7781166d58bbc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 681 zcmV;a0#^NrP)EX>4Tx04R}tkv&MmP!xqvQ>CI+hh`9Q$WWauh>AE$6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRnoci*4YujVWU_$1;vW|%hd2Jy_M zZE)Tv7FkhNiO-40O}ZfQBi9v|-#8bVEbvUxOeg1wMPjMY!Ab|SqNx#26Ngnzr+gvf zvdVdjvsSLM);;+PgE@UA#dTUEh+zqFBp^XS6(y8mBSO1QiiISdM?L(*O@D%13b{&P z_CX>@2HM@dakSAh-}0001hNklR9;3>ax)=;XB6)+Q2%S5Z7%_?AKxWivMa1NL@ z;V*;A$8LsMXN~Fa09{>OhWqtG3{Fl?1Cz368XNx~@a#1x95D(;!H@s|M4cKEMOT3J P00000NkvXXu0mjf?`akP From c2995ee68c4beaf4629778441edaff79404c9f0f Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 5 Aug 2023 20:53:49 +0300 Subject: [PATCH 81/81] Update fun.yml --- Resources/Prototypes/Catalog/Fills/Crates/fun.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index fd0c1abfd2d..d44765826f2 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -245,8 +245,6 @@ - id: ClothingHeadBandRed - id: FoamCutlass amount: 2 - - id: ClothingEyesEyepatch - amount: 2 - type: entity id: CrateFunToyBox