From ed9ca03ea905d388c2562ffab834ca7b98e53efd Mon Sep 17 00:00:00 2001 From: Avalon Date: Fri, 20 Sep 2024 20:58:15 -0400 Subject: [PATCH 1/6] 1984 Autmoadrobe, move robes --- .../VendingMachines/Inventories/robodrobe.yml | 3 +++ .../Fills/Vending/Inventories/automatrobe.yml | 20 +++++++++---------- .../Structures/Machines/vending_machines.yml | 16 +++++++-------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml index 4aa4ce6972d..53b69d9ad6d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml @@ -11,3 +11,6 @@ ClothingHeadsetRobotics: 2 ClothingOuterWinterRobo: 2 ClothingShoesBootsWinterRobo: 2 #Delta V: Add departmental winter boots + contrabandInventory: + ClothingHeadTechPriest: 2 + ClothingOuterRobeTechPriest: 2 diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/automatrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/automatrobe.yml index 3fa44256cd7..57bf2b23d91 100644 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/automatrobe.yml +++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/automatrobe.yml @@ -1,10 +1,10 @@ -- type: vendingMachineInventory - id: AutomatrobeInventory - startingInventory: - ClothingUniformJumpsuitColorBlack: 2 - ClothingUniformJumpskirtColorBlack: 2 - ClothingShoesColorBlack: 2 - ClothingHeadTechPriest: 2 - ClothingOuterRobeTechPriest: 2 - ClothingHeadsetScience: 2 - ClothingOuterWinterRobo: 2 +#- type: vendingMachineInventory +# id: AutomatrobeInventory +# startingInventory: +# ClothingUniformJumpsuitColorBlack: 2 +# ClothingUniformJumpskirtColorBlack: 2 +# ClothingShoesColorBlack: 2 +# ClothingHeadTechPriest: 2 +# ClothingOuterRobeTechPriest: 2 +# ClothingHeadsetScience: 2 +# ClothingOuterWinterRobo: 2 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml index 7b80180526e..808a4a4fe24 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml @@ -92,11 +92,11 @@ - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] -- type: entity - parent: VendingMachineRoboDrobe - id: VendingMachineAutomatrobe - name: Automatrobe - description: Automatically good. - components: - - type: VendingMachine - pack: AutomatrobeInventory +#- type: entity +# parent: VendingMachineRoboDrobe +# id: VendingMachineAutomatrobe +# name: Automatrobe +# description: Automatically good. +# components: +# - type: VendingMachine +# pack: AutomatrobeInventory From 9f3ac410ee12398cb87f1b53355cc39e43af5efb Mon Sep 17 00:00:00 2001 From: Avalon Date: Fri, 20 Sep 2024 21:45:33 -0400 Subject: [PATCH 2/6] Addedcommentgahhhhhhh --- .../Catalog/VendingMachines/Inventories/robodrobe.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml index 53b69d9ad6d..68eae065cff 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml @@ -11,6 +11,6 @@ ClothingHeadsetRobotics: 2 ClothingOuterWinterRobo: 2 ClothingShoesBootsWinterRobo: 2 #Delta V: Add departmental winter boots - contrabandInventory: + contrabandInventory: #Delta V: Added Techpriest Robe to Contra Inventory ClothingHeadTechPriest: 2 ClothingOuterRobeTechPriest: 2 From 68823f817c6bd28113f3a3c1a5b754ad65790d84 Mon Sep 17 00:00:00 2001 From: Avalon Date: Fri, 20 Sep 2024 22:00:01 -0400 Subject: [PATCH 3/6] TO THE AUTODROBE!!! --- .../Catalog/VendingMachines/Inventories/robodrobe.yml | 3 --- .../Catalog/VendingMachines/Inventories/theater.yml | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml index 68eae065cff..4aa4ce6972d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml @@ -11,6 +11,3 @@ ClothingHeadsetRobotics: 2 ClothingOuterWinterRobo: 2 ClothingShoesBootsWinterRobo: 2 #Delta V: Add departmental winter boots - contrabandInventory: #Delta V: Added Techpriest Robe to Contra Inventory - ClothingHeadTechPriest: 2 - ClothingOuterRobeTechPriest: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index dd711b18926..c5796d53e00 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -89,6 +89,10 @@ ClothingShoesBootsCowboyBrown: 1 ClothingShoesBootsCowboyBlack: 1 ClothingShoesBootsCowboyWhite: 1 + contrabandInventory: #Delta V: Added Techpriest Robe to Contra Inventory + ClothingHeadTechPriest: 2 + ClothingOuterRobeTechPriest: 2 + emaggedInventory: ClothingShoesBling: 1 ClothingShoesBootsCowboyFancy: 1 From cb9b737c741624d40e8a9127a52f4b730c6d0dcd Mon Sep 17 00:00:00 2001 From: Avalon Date: Sat, 21 Sep 2024 07:02:44 -0400 Subject: [PATCH 4/6] Delete the things, move the things --- .../Catalog/VendingMachines/Inventories/theater.yml | 3 +-- .../Catalog/Fills/Vending/Inventories/automatrobe.yml | 10 ---------- .../Entities/Structures/Machines/vending_machines.yml | 8 -------- 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/automatrobe.yml diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index c5796d53e00..6a2a936332d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -89,8 +89,7 @@ ClothingShoesBootsCowboyBrown: 1 ClothingShoesBootsCowboyBlack: 1 ClothingShoesBootsCowboyWhite: 1 - contrabandInventory: #Delta V: Added Techpriest Robe to Contra Inventory - ClothingHeadTechPriest: 2 + ClothingHeadTechPriest: 2 #Delta V: Added Techpriest Robe to Contra Inventory ClothingOuterRobeTechPriest: 2 emaggedInventory: diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/automatrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/automatrobe.yml deleted file mode 100644 index 57bf2b23d91..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/automatrobe.yml +++ /dev/null @@ -1,10 +0,0 @@ -#- type: vendingMachineInventory -# id: AutomatrobeInventory -# startingInventory: -# ClothingUniformJumpsuitColorBlack: 2 -# ClothingUniformJumpskirtColorBlack: 2 -# ClothingShoesColorBlack: 2 -# ClothingHeadTechPriest: 2 -# ClothingOuterRobeTechPriest: 2 -# ClothingHeadsetScience: 2 -# ClothingOuterWinterRobo: 2 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml index 808a4a4fe24..77224fad3cc 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml @@ -92,11 +92,3 @@ - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] -#- type: entity -# parent: VendingMachineRoboDrobe -# id: VendingMachineAutomatrobe -# name: Automatrobe -# description: Automatically good. -# components: -# - type: VendingMachine -# pack: AutomatrobeInventory From ccb8e23d2a8549f348ea2c9bf391a17550e39eb2 Mon Sep 17 00:00:00 2001 From: Avalon Date: Sat, 21 Sep 2024 07:09:56 -0400 Subject: [PATCH 5/6] Delete the things, move the things --- Resources/Migrations/deltaMigrations.yml | 3 +++ .../Prototypes/Catalog/VendingMachines/Inventories/theater.yml | 2 +- .../Catalog/Fills/Vending/Inventories/automatrobe.yml | 0 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/automatrobe.yml diff --git a/Resources/Migrations/deltaMigrations.yml b/Resources/Migrations/deltaMigrations.yml index d4a7e300f1a..b6c578490b2 100644 --- a/Resources/Migrations/deltaMigrations.yml +++ b/Resources/Migrations/deltaMigrations.yml @@ -122,3 +122,6 @@ FoodMealSoftTaco: FoodTacoShell # 2024-08-18 BoxMagazinePistolSubMachineGunRubber: MagazineBoxPistolRubber + +# 2024-09-21 +VendingMachineAutomatrobe: null diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 6a2a936332d..2f72cf2e1c2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -89,7 +89,7 @@ ClothingShoesBootsCowboyBrown: 1 ClothingShoesBootsCowboyBlack: 1 ClothingShoesBootsCowboyWhite: 1 - ClothingHeadTechPriest: 2 #Delta V: Added Techpriest Robe to Contra Inventory + ClothingHeadTechPriest: 2 #Delta V: Added Techpriest Robe to Inventory ClothingOuterRobeTechPriest: 2 emaggedInventory: diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/automatrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/automatrobe.yml new file mode 100644 index 00000000000..e69de29bb2d From 843213b902d3fdaee34856cda48bed2dd4dbadb0 Mon Sep 17 00:00:00 2001 From: "Tad \"Taddy\" Johnson" <120885811+TadJohnson00@users.noreply.github.com> Date: Sat, 21 Sep 2024 23:01:14 +1000 Subject: [PATCH 6/6] change price to 2100 Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> --- Resources/Prototypes/Catalog/Cargo/cargo_vending.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index e37794c03dd..a194a791852 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -43,7 +43,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockAutoDrobeFilled - cost: 2000 # DeltaV + cost: 2100 # DeltaV category: cargoproduct-category-name-service group: market