From 134b2d59b8b6cbf1b59be13e655bf14d9a30bacd Mon Sep 17 00:00:00 2001 From: "Proxy also works :3" <98499019+Proxysseia@users.noreply.github.com> Date: Fri, 16 Jan 2026 19:59:31 +0100 Subject: [PATCH] remove prison knife (#4934) * remove prison knife * as per suggestion * topy i cant accept changes to lines that no longer exist, its not letting me this is your fault i had to redo all of this cmon --- .../Catalog/Fills/Lockers/wardrobe_job.yml | 5 +---- .../Inventories/unlockedchefvend.yml | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml index f6b0e2c4de6..310a6ad5b5f 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml @@ -78,10 +78,7 @@ - id: GroundCannabis amount: !type:RangeNumberSelector range: 1, 6 - # Begin DeltaV modifications - - id: ClothingHeadsetPrison # Added prisoner headsets - - id: PrisonKnife # Bread cutting knife, does 4 damage total. - # End DeltaV modifications + - id: ClothingHeadsetPrison # DeltaV - Added prisoner headsets #- type: entity # id: WardrobePajamaFilled diff --git a/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedchefvend.yml b/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedchefvend.yml index e5b00cb45c1..a650b6dec5e 100644 --- a/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedchefvend.yml +++ b/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedchefvend.yml @@ -18,3 +18,25 @@ FoodMeatDuck: 2 ReagentContainerSalt: 1 ReagentContainerPepper: 1 + FoodCondimentPacketAstrotame: 5 + FoodCondimentPacketBbq: 5 + FoodCondimentPacketColdsauce: 5 + FoodCondimentPacketHorseradish: 5 + FoodCondimentPacketHotsauce: 5 + FoodCondimentPacketKetchup: 5 + FoodCondimentPacketMustard: 5 + FoodCondimentPacketPepper: 5 + FoodCondimentPacketSalt: 5 + FoodCondimentPacketSoy: 5 + FoodCondimentPacketSugar: 5 + FoodCondimentPacketCornoil: 5 + ForkPlastic: 10 + SpoonPlastic: 10 + KnifePlastic: 10 + FoodPlatePlastic: 10 + FoodPlateSmallPlastic: 10 + contrabandInventory: + FoodShakerSalt: 1 + FoodShakerPepper: 1 + FoodCondimentBottleKetchup: 1 + ReagentContainerMayo: 1