From ae14135ce1923fe5c70a0e503655ee8af7682fa4 Mon Sep 17 00:00:00 2001 From: TadJohnson00 Date: Fri, 20 Sep 2024 15:07:01 +1000 Subject: [PATCH] clean up det removal / addition, nerf coat --- .../Prototypes/Catalog/Fills/Lockers/security.yml | 1 + .../VendingMachines/Inventories/theater.yml | 8 ++++++++ .../Entities/Clothing/OuterClothing/coats.yml | 14 +++++++------- .../Catalog/Fills/Vending/Inventories/repdrobe.yml | 9 +++++++++ 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index b279919e281..fff245e1f52 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -192,6 +192,7 @@ # - id: ClothingOuterVestDetective # DeltaV - removed for incongruence # - id: ClothingOuterCoatDetective # DeltaV - removed for incongruence - id: ClothingHeadsetSecurity # DeltaV - add spare headset. + - id: FlippoEngravedLighter # DeltaV - add due to removal of trench coat - id: FlashlightSeclite - id: ForensicScanner - id: LogProbeCartridge diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index dd711b18926..151c9b5f9d0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -82,6 +82,14 @@ ClothingOuterSuitCarp: 2 # DeltaV - Move carp suit out of syndicate uplink into the AutoDrobe ClothingShoesBootsWinterClown: 2 #Delta V: Add departmental winter boots ClothingShoesBootsWinterMime: 2 #Delta V: Add departmental winter boots + ClothingUniformJumpsuitDetective: 1 # DeltaV - moved from detdrobe + ClothingUniformJumpskirtDetective: 1 # DeltaV - moved from detdrobe + ClothingUniformJumpsuitDetectiveGrey: 1 # DeltaV - moved from detdrobe + ClothingUniformJumpskirtDetectiveGrey: 1 # DeltaV - moved from detdrobe + ClothingOuterCoatDetectiveLoadout: 1 # DeltaV - moved from detdrobe + ClothingNeckTieDet: 1 # DeltaV - moved from detdrobe + ClothingHeadHatFedoraBrown: 1 # DeltaV - moved from detdrobe + ClothingHeadHatFedoraGrey: 1 # DeltaV - moved from detdrobe ClothingHeadHatCowboyBrown: 1 ClothingHeadHatCowboyBlack: 1 ClothingHeadHatCowboyWhite: 1 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index b1c10aaf51b..559e9d36686 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -23,13 +23,13 @@ contents: - id: SmokingPipeFilledTobacco - id: FlippoEngravedLighter - - type: Armor #same as regular sec armor - modifiers: - coefficients: - Blunt: 0.70 - Slash: 0.70 - Piercing: 0.70 - Heat: 0.80 +# - type: Armor #same as regular sec armor # DeltaV - remove armour as it is no longer security equipment. +# modifiers: +# coefficients: +# Blunt: 0.70 +# Slash: 0.70 +# Piercing: 0.70 +# Heat: 0.80 - type: entity parent: ClothingOuterCoatDetective diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/repdrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/repdrobe.yml index 349f819404e..994691fffa1 100644 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/repdrobe.yml +++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/repdrobe.yml @@ -4,7 +4,16 @@ ClothingUniformJumpsuitReporter: 2 ClothingShoesColorBlack: 2 ClothingShoesColorWhite: 2 + ClothingShoesBootsLaceup: 2 # DeltaV - added for more shoe options + ClothingShoesBootsLeather: 2 # DeltaV - added for more shoe options ClothingOuterVestFlakPress: 2 + ClothingUniformJumpsuitDetective: 2 # DeltaV - moved from detdrobe + ClothingUniformJumpskirtDetective: 2 # DeltaV - moved from detdrobe + ClothingUniformJumpsuitDetectiveGrey: 2 # DeltaV - moved from detdrobe + ClothingUniformJumpskirtDetectiveGrey: 2 # DeltaV - moved from detdrobe + ClothingOuterCoatDetectiveLoadout: 2 # DeltaV - moved from detdrobe + ClothingNeckTieDet: 2 # DeltaV - moved from detdrobe + ClothingHeadHatFedoraBrown: 2 # DeltaV - moved from detdrobe ClothingHeadHatFedoraGrey: 2 RadioHandheld: 2 ClothingHeadsetService: 2