Fixed potential duplicate engraved lighter steal objective (#27177)

* Fixed potential duplicate engraved lighter steal objective

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* Implement pigeonpeas' suggestion

* Also replaced the one if the vending machine, unsure if this vending machine is used or if vended items retain their fills, but figure can't hurt

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

diff --git a/Resources/Maps/Dungeon/lava_brig.yml b/Resources/Maps/Dungeon/lava_brig.yml
index 8885dce43235028eaf0cafa7992d2601675b3c5d..ebf267a9c2e879fe6be5d6a462185481d8de5367 100644 (file)
--- a/Resources/Maps/Dungeon/lava_brig.yml
+++ b/Resources/Maps/Dungeon/lava_brig.yml
@@ -7345,7 +7345,7 @@ entities:
     - type: Transform
       pos: 18.47467,24.458666
       parent: 588
-- proto: ClothingOuterCoatDetective
+- proto: ClothingOuterCoatDetectiveLoadout
   entities:
   - uid: 574
     components:

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
index f45dd229a2ac50088309916aca9ef408b0638cb5..91e45c83916ff59a822896abc4a957660e802947 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
@@ -4,7 +4,7 @@
     ClothingUniformJumpsuitDetective: 2
     ClothingUniformJumpskirtDetective: 2
     ClothingShoesColorBrown: 2
-    ClothingOuterCoatDetective: 2
+    ClothingOuterCoatDetectiveLoadout: 2
     ClothingHeadHatFedoraBrown: 2
     ClothingUniformJumpsuitDetectiveGrey: 2
     ClothingUniformJumpskirtDetectiveGrey: 2

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
index c9316f4b3a814bfb303c319a8e7c785edd52f756..7a78eca2ff0fd50517ab4016051b4d5a5373d99f 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -31,6 +31,15 @@
         Piercing: 0.70
         Heat: 0.80
 
+- type: entity
+  parent: ClothingOuterCoatDetective
+  id: ClothingOuterCoatDetectiveLoadout
+  components:
+  - type: StorageFill
+    contents:
+    - id: SmokingPipeFilledTobacco
+    - id: FlippoLighter #Not the steal objective, only difference from normal detective trenchcoat
+
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatGentle

diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
index c102277e457d336149432a1e119338ae36d57659..c16d24e5b83a63108e81428f6b85584716a1e251 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
@@ -109,4 +109,4 @@
 - type: startingGear
   id: DetectiveCoat
   equipment:
-    outerClothing: ClothingOuterCoatDetective
\ No newline at end of file
+    outerClothing: ClothingOuterCoatDetectiveLoadout
\ No newline at end of file