From e97c0a9f8c87beb79c1c718c56a53cd09ac755f5 Mon Sep 17 00:00:00 2001 From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com> Date: Sat, 4 May 2024 16:26:15 -0700 Subject: [PATCH] Mirror: Lawdrobe update (#113) ## Mirror of PR #25299: [Lawdrobe update](https://github.com/space-wizards/space-station-14/pull/25299) from space-wizards [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `4b359466ccf1cfb7642a048dc142d12ffbefc3e9` PR opened by beck-thompson at 2024-02-16 01:39:38 UTC PR merged by web-flow at 2024-03-07 19:18:39 UTC --- PR changed 3 files with 26 additions and 0 deletions. The PR had the following labels: - No C# ---

Original Body

> > > > ## About the PR > > Some basic changes to the Lawdrobe. > > ## Why / Balance > > The lawdrobe was, overall, pretty dull so I added a few new things that greatly improve its role play potential! > ## Technical details > > - Added 5 new advertisements. > - Added 5 new thank you messages. > - Added Luxury Pen to Lawdrobe 2x. > - Added Judge robe and Hair to contraband. > - Added 100 space cash to contraband Inventory 2x. > ## Media > > > [Meda.webm](https://github.com/space-wizards/space-station-14/assets/107373427/2d774ba3-1aaf-467c-b4e0-eac903e98a1a) > > **Changelog** > > > :cl: Beck Thompson > - add: Lawdrobe has some new items and new ads!
--------- Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Co-authored-by: VMSolidus --- .../Locale/en-US/advertisements/vending/lawdrobe.ftl | 10 ++++++++++ .../VendingMachines/Advertisements/lawdrobe.yml | 10 ++++++++++ .../Catalog/VendingMachines/Inventories/lawdrobe.yml | 5 +++++ 3 files changed, 25 insertions(+) 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..fd91bc71ed8 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml @@ -16,5 +16,10 @@ ClothingNeckLawyerbadge: 2 ClothingOuterCoatOvercoat: 2 # DeltaV - add overcoat to LawDrobe RubberStampLawyer: 1 # DeltaV + LuxuryPen: 2 + contrabandInventory: + ClothingOuterRobesJudge: 1 + ClothingHeadHatPwig: 1 + SpaceCash100: 2 # "Legally" obtained currency emaggedInventory: CyberPen: 1