Public Affairs Official (#1814)

* Public Affairs Official Almost donezo just needs a badge and a stampo and its good. * oops * cry * FIX * Cry * Update pao_loadout_groups.yml * aaaaaaaaaaaaaaa aaaaaaaaaaaa * Fixed badge scaling yee * NFSD Spawn point Added spawn point to office room on NFSD outpost. * Added formatted paperwork forms and stamp to inventory. * Format Fix * fix * Linter fuggofff * Fix PAO stamp parrent * public affairs stamp fixes * Write out "Public Affairs Official" in stamp name * public affairs job to _NF * public affairs official to liaison * Remove lawyer, add missing lawyer stuff to cntrctr * PAL Cleanup * NFSD, SR form revisions * Missing forms * Green speech bubble for the PAL * Linter issues * forms, gloves, detective PDA * Department weights to ~0 (maintaining order) * PAO: consistent ID colours & icon width * NFSD/SR form revisions * Medical forms, restore second paper * Unindent pen_red * Fix PAL loadouts * More PAL loadout fixes * noSpawn->categories, minor form rewrites * PAL cleanup (all "PAL folder", stamp clr) --------- Co-authored-by: Whatstone <[email protected]> Co-authored-by: Dvir <[email protected]>
new-frontiers-14 · Sep 11, 2024 · 7369068 · 7369068
1 parent e60891d
commit 7369068
Show file tree

Hide file tree

Showing 83 changed files with 1,201 additions and 267 deletions.
diff --git a/Resources/Locale/en-US/_NF/job/job-description.ftl b/Resources/Locale/en-US/_NF/job/job-description.ftl
@@ -10,6 +10,7 @@ job-description-pilot = Pilot spaceships from point A to B, outmaneuver pirates
 job-description-pirate = Drink grog, follow orders, swab the deck, and adhere to your Captain and your code.
 job-description-pirate-captain = Lead a crew of ne'er-do-wells across the open space and plunder, respectfully, always following the code.
 job-description-pirate-first-mate = Assist your captain in any hijinks you find yourselves in.
+job-description-public-affairs-liaison = Interface with the public, hand out and fill out forms and assist the NFSD chain of command with administrative tasks.
 job-description-security-guard = Patrol the empty halls, whistle simple tunes you heard on radio, jingle your keychain and scurry away at the sight of danger.
 job-description-senior-officer = Teach new deputies the basics of searches, preforming arrests, prison times and how to properly shoot a firearm.
 job-description-sheriff = Manage your department and keep them efficient, quell dissent, and keep the sector safe.

diff --git a/Resources/Locale/en-US/_NF/job/job-names.ftl b/Resources/Locale/en-US/_NF/job/job-names.ftl
@@ -15,6 +15,7 @@ job-name-security-guard = Security Guard
 job-name-sheriff = Sheriff
 job-name-stc = Station Traffic Controller
 job-name-sr = Station Representative
+job-name-pal = Public Affairs Liaison
 
 # Role timers - Make these alphabetical or I cut you
 JobERTMailCarrier = ERT Mail Carrier

diff --git a/Resources/Locale/en-US/_NF/paper/stamp-component.ftl b/Resources/Locale/en-US/_NF/paper/stamp-component.ftl
@@ -4,6 +4,7 @@ stamp-component-signee-name = {$user}
 
 stamp-component-stamped-name-doctor = Doctor
 stamp-component-stamped-name-engineer = Engineer
+stamp-component-stamped-name-pal = Public Affairs Liaison
 stamp-component-stamped-name-psychologist = Psychologist
 stamp-component-stamped-name-stc = Station Traffic Controller
 stamp-component-stamped-name-sr = Station Representative
diff --git a/Resources/Maps/_NF/POI/nfsd.yml b/Resources/Maps/_NF/POI/nfsd.yml
@@ -13290,7 +13290,7 @@ entities:
     - type: Transform
       pos: -17.44856,3.5854774
       parent: 1
-- proto: PaperWrittenNfsdSearchWarrant
+- proto: PaperWrittenNfsdWarrant
   entities:
   - uid: 906
     components:
@@ -14836,7 +14836,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,-2.5
       parent: 1
-- proto: SpawnPointLawyer
+- proto: SpawnPointPublicAffairsLiaison
   entities:
   - uid: 2106
     components:

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -3,31 +3,24 @@
   name: job-name-lawyer
   description: job-description-lawyer
   playTimeTracker: JobLawyer
+  setPreference: false # Frontier
   requirements:
     - !type:OverallPlaytimeRequirement
       time: 21600
   startingGear: LawyerGear
   icon: "JobIconLawyer"
-  supervisors: job-supervisors-hire # Frontier
-  weight: 50 # Frontier
-  displayWeight: 10 # Frontier
+  supervisors: job-supervisors-hire
   canBeAntag: false
-  accessGroups: # Frontier
-  - GeneralNfsdBrigAccess # Frontier
-  special: # Frontier
-  - !type:GiveItemOnHolidaySpecial # Frontier
-    holiday: FrontierBirthday # Frontier
-    prototype: FrontierBirthdayGift # Frontier
 
 - type: startingGear
   id: LawyerGear
   equipment:
     shoes: ClothingShoesBootsLaceup
     id: LawyerPDA
-    ears: ClothingHeadsetNfsdGreen # Frontier ClothingHeadsetSecurity<ClothingHeadsetNfsdGreen
+    ears: ClothingHeadsetSecurity
   inhand:
     - BriefcaseBrownFilled
   storage:
     back:
     - RubberStampLawyer
-    - HyperlinkBookSpaceLaw # Frontier: BookSpaceLaw<HyperlinkBookSpaceLaw
+    - BookSpaceLaw
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -12,7 +12,7 @@
   name: department-Civilian
   description: department-Civilian-description
   color: "#9FED58"
-  weight: -10
+  weight: 0 # Frontier: -10<0 accounted for in jobs
   roles:
   - Bartender
   - Borg
@@ -60,7 +60,7 @@
   - Sheriff  # Frontier
   - StationTrafficController # Frontier
   primary: false
-  weight: 100
+  weight: 2 # Frontier: 100<2 - accounted for in jobs
 
 - type: department
   id: Engineering
@@ -85,7 +85,7 @@
   name: department-Security
   description: department-Security-description
   color: "#5C7D4D" # Frontier: DE3A3A<5C7D4D
-  weight: 20
+  weight: 1 # Frontier: 20<1 - accounted for in jobs
   roles:
   - Detective # Frontier - No Longer Usable
   - HeadOfSecurity # Frontier - No Longer Usable
@@ -101,6 +101,7 @@
   - Bailiff # Frontier
   - Sheriff # Frontier
   - SeniorOfficer # Frontier
+  - PublicAffairsLiaison # Frontier
 
 - type: department
   id: Science

diff --git a/Resources/Prototypes/_NF/Access/security.yml b/Resources/Prototypes/_NF/Access/security.yml
@@ -16,6 +16,7 @@
   - Maintenance
   - External
   - Security
+  - Brig
 
 - type: accessGroup
   id: GeneralNfsdAccess

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Paper/forms_medical.yml b/Resources/Prototypes/_NF/Catalog/Fills/Paper/forms_medical.yml
@@ -7,7 +7,7 @@
   id: BoxFolderMedicalDoctor
   parent: BoxFolderBase
   name: medical doctor folder
-  description: A folder filled with paperwork templates.
+  description: A folder filled with medical paperwork templates.
   suffix: Forms
   components:
   - type: Sprite
@@ -30,8 +30,8 @@
 # Forms
 - type: entity # Loosely based on form made by Scratchie (Nova Howe) for Formal Complaint
   id: PaperWrittenMedicalFormPatientInfo
-  name: Medical Patient Record
-  suffix: MappedPaper
+  name: medical patient record
+  categories: [ HideSpawnMenu ]
   parent: Paper
   components:
   - type: Paper
@@ -75,12 +75,12 @@
 
 
 
-      [color=#AAAAAA]This Form is void without the signature and stamp of a medical specialist[/color]
+      [color=#AAAAAA]This Form is void without the signature and stamp of a medical specialist.[/color]
 
 - type: entity
   id: PaperWrittenMedicalFormPrescription
-  name: Medical Prescription
-  suffix: MappedPaper
+  name: medical prescription
+  categories: [ HideSpawnMenu ]
   parent: Paper
   components:
   - type: Paper
@@ -104,12 +104,12 @@
 
 
 
-      [color=#AAAAAA]This Form is void without the signature and stamp of a medical specialist[/color]
+      [color=#AAAAAA]This Form is void without the signature and stamp of a medical specialist.[/color]
 
 - type: entity # Based on form made by Radiantflash (Lykaon Rahmer)
   id: PaperWrittenMedicalFormHealthInsurance
-  name: Health Insurance Contract
-  suffix: MappedPaper
+  name: health insurance contract
+  categories: [ HideSpawnMenu ]
   parent: Paper
   components:
   - type: Paper
@@ -138,12 +138,12 @@
           [bold]$XX,XXX[/bold]
 
 
-      [color=#AAAAAA]This Form is void without the signatures of borth Parties and the stamp of a medical specialist[/color]
+      [color=#AAAAAA]This Form is void without the signatures of borth Parties and the stamp of a medical specialist.[/color]
 
 - type: entity
   id: PaperWrittenMedicalFormServiceInvoice
-  name: Medical Service Invoice
-  suffix: MappedPaper
+  name: medical service invoice
+  categories: [ HideSpawnMenu ]
   parent: Paper
   components:
   - type: Paper
@@ -177,4 +177,4 @@
 
 
 
-      [color=#AAAAAA]This Form is void without the signature and stamp of a medical specialist[/color]
+      [color=#AAAAAA]This Form is void without the signature and stamp of a medical specialist.[/color]