From f1dc0ce4b27a15197a6f737d9b41143efba043f9 Mon Sep 17 00:00:00 2001
From: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Date: Thu, 7 Mar 2024 22:18:39 +0300
Subject: [PATCH 1/2] Cherry-picked commit
 4b359466ccf1cfb7642a048dc142d12ffbefc3e9 from
 space-wizards/space-station-14/master

---
 .../Locale/en-US/advertisements/vending/lawdrobe.ftl   | 10 ++++++++++
 .../VendingMachines/Advertisements/lawdrobe.yml        | 10 ++++++++++
 .../Catalog/VendingMachines/Inventories/lawdrobe.yml   |  8 ++++++--
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl
index 054e9c2beca..d91ca5e3dfe 100644
--- a/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl
@@ -1,3 +1,13 @@
 advertisement-lawdrobe-1 = OBJECTION! Get the rule of law for yourself!
 advertisement-lawdrobe-2 = Go pester security until they abide by your own rules!
 advertisement-lawdrobe-3 = A new case just came in? Go get them out of jail!
+advertisement-lawdrobe-4 = A dougnut a day keeps security away!
+advertisement-lawdrobe-5 = No one is above the law!
+advertisement-lawdrobe-6 = No officer, I do not consent to a search!
+advertisement-lawdrobe-7 = Injecting space drugs leaves no evidence!
+advertisement-lawdrobe-8 = You or a loved one hurt by Nanotrasen? Too bad!
+thankyou-lawdrobe-1 = You can win any case in that outfit!
+thankyou-lawdrobe-2 = Get one for your client as well!
+thankyou-lawdrobe-3 = Win or lose, you get paid either way!
+thankyou-lawdrobe-4 = Remember: Its only illegal if you get caught!
+thankyou-lawdrobe-5 = OBJECTION! That outfit is too cool for court!
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml
index 8d3c0ca53dd..5f3892d0f95 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml
@@ -4,5 +4,15 @@
     - advertisement-lawdrobe-1
     - advertisement-lawdrobe-2
     - advertisement-lawdrobe-3
+    - advertisement-lawdrobe-4
+    - advertisement-lawdrobe-5
+    - advertisement-lawdrobe-6
+    - advertisement-lawdrobe-7
+    - advertisement-lawdrobe-8
   thankyous:
     - vending-machine-thanks
+    - thankyou-lawdrobe-1
+    - thankyou-lawdrobe-2
+    - thankyou-lawdrobe-3
+    - thankyou-lawdrobe-4
+    - thankyou-lawdrobe-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
index 69dec7c2416..b1478a7cfc4 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -14,7 +14,11 @@
     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
   emaggedInventory:
     CyberPen: 1

From 0a82c3b7a3be926302ac0b67916ecb3f76885741 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Sat, 4 May 2024 18:51:54 -0400
Subject: [PATCH 2/2] Fixing Merge Conflict

---
 .../Catalog/VendingMachines/Inventories/lawdrobe.yml         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
index b1478a7cfc4..fd91bc71ed8 100644
--- 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