Fixing Merge Conflict

Simple-Station · May 4, 2024 · 0a82c3b · 0a82c3b
1 parent f1dc0ce
commit 0a82c3b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -14,11 +14,12 @@
     ClothingShoesBootsLaceup: 2
     ClothingHeadsetService: 2
     ClothingNeckLawyerbadge: 2
+    ClothingOuterCoatOvercoat: 2 # DeltaV - add overcoat to LawDrobe
+    RubberStampLawyer: 1 # DeltaV
     LuxuryPen: 2
   contrabandInventory:
     ClothingOuterRobesJudge: 1
     ClothingHeadHatPwig: 1
-    # "Legally" obtained currency
-    SpaceCash100: 2
+    SpaceCash100: 2 # "Legally" obtained currency
   emaggedInventory:
     CyberPen: 1