funky-station · pirakaplant · Aug 1, 2026 · Jul 2, 2026 · Jul 2, 2026 · Jul 2, 2026
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -38,7 +38,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
     }
 
     // Put this on shared so we just send the state once in PVS range rather than every time the UI updates.
-
+    // TODO: Move these to the YAML prototype or something because holy shit
     [DataField, AutoNetworkedField]
     public List<ProtoId<AccessLevelPrototype>> AccessLevels = new()
     {
@@ -67,6 +67,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
         "Lawyer",
         "Maintenance",
         "Medical",
+        "Newsroom",
         "Quartermaster",
         "Research",
         "ResearchDirector",

diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs
@@ -27,7 +27,7 @@ public abstract partial class SharedGameTicker : EntitySystem
         //TODO: Move these, they really belong in StationJobsSystem or a cvar.
         public static readonly ProtoId<JobPrototype> FallbackOverflowJob = "Passenger";
 
-        public const string FallbackOverflowJobName = "job-name-passenger";
+        public const string FallbackOverflowJobName = "job-name-assistant"; // Funky - Now points to the new job name
 
         // TODO network.
         // Probably most useful for replays, round end info, and probably things like lobby menus.

diff --git a/Resources/Locale/en-US/_Funkystation/cargo/cargo-accounts.ftl b/Resources/Locale/en-US/_Funkystation/cargo/cargo-accounts.ftl
@@ -0,0 +1,2 @@
+cargo-account-logistics-name = General Logistics Budget
+cargo-account-logistics-code = LOG
diff --git a/Resources/Locale/en-US/_Funkystation/devices/device-network.ftl b/Resources/Locale/en-US/_Funkystation/devices/device-network.ftl
@@ -0,0 +1 @@
+device-frequency-prototype-name-surveillance-camera-logistics = Logistics Cameras
diff --git a/Resources/Locale/en-US/_Funkystation/headset/headset-component.ftl b/Resources/Locale/en-US/_Funkystation/headset/headset-component.ftl
@@ -0,0 +1 @@
+chat-radio-logistics = Logistics
diff --git a/Resources/Locale/en-US/_Funkystation/job/department-desc.ftl b/Resources/Locale/en-US/_Funkystation/job/department-desc.ftl
@@ -0,0 +1,2 @@
+department-Logistics-description = Produce raw materials, purchase goods, and distribute them across the station.
+department-Service-description = Keep crew morale high by providing catering and entertainment.
diff --git a/Resources/Locale/en-US/_Funkystation/job/department.ftl b/Resources/Locale/en-US/_Funkystation/job/department.ftl
@@ -0,0 +1,2 @@
+department-Logistics = Logistics
+department-Service = Service
diff --git a/Resources/Locale/en-US/_Funkystation/job/job-description.ftl b/Resources/Locale/en-US/_Funkystation/job/job-description.ftl
@@ -0,0 +1 @@
+job-description-assistant = Assist the station's crew as one of its more expendable assets.
diff --git a/Resources/Locale/en-US/_Funkystation/job/job-names.ftl b/Resources/Locale/en-US/_Funkystation/job/job-names.ftl
@@ -1,3 +1,4 @@
+job-name-assistant = Assistant
 job-name-cci = Central Command Intern
 job-name-cco = Central Command Official
 job-name-cl = Corporate Liaison

diff --git a/Resources/Locale/en-US/_Funkystation/job/job-supervisors.ftl b/Resources/Locale/en-US/_Funkystation/job/job-supervisors.ftl
@@ -0,0 +1 @@
+job-supervisors-audience = your audience
diff --git a/Resources/Locale/en-US/_Funkystation/lathe/lathe-categories.ftl b/Resources/Locale/en-US/_Funkystation/lathe/lathe-categories.ftl
@@ -0,0 +1 @@
+lathe-category-logistics = Logistics
diff --git a/Resources/Locale/en-US/_Funkystation/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/_Funkystation/navmap-beacons/station-beacons.ftl
@@ -0,0 +1 @@
+station-beacon-logistics = Logistics
diff --git a/Resources/Locale/en-US/_Funkystation/prototypes/access/accesses.ftl b/Resources/Locale/en-US/_Funkystation/prototypes/access/accesses.ftl
@@ -0,0 +1 @@
+id-card-access-level-newsroom = Newsroom
diff --git a/Resources/Locale/en-US/chat/highlights.ftl b/Resources/Locale/en-US/chat/highlights.ftl
@@ -4,7 +4,8 @@ highlights-head-of-personnel = Head Of Personnel, "HoP", Service, Bridge, Comman
 highlights-chief-engineer = Chief Engineer, "CE", Engineering, Engineer, "Engi", Bridge, Command
 highlights-chief-medical-officer = Chief Medical Officer, "CMO", Medbay, Medical, "Med", Bridge, Command
 highlights-head-of-security = Head of Security, "HoS", Armory, Security, "Sec", Bridge, Command
-highlights-quartermaster = Quartermaster, "QM", Cargo, Supply, Bridge, Command
+# Funky - Added more highlights to reflect Logistics rename
+highlights-quartermaster = Quartermaster, "QM", Cargo, Supply, Bridge, Command, Logistics, "Logi"
 highlights-research-director = Research Director, "RD", Science, "Sci", "RND", "R&D", Bridge, Command
 
 # Security
@@ -13,9 +14,13 @@ highlights-security-cadet = Security Cadet, Secoff, Cadet, Armory, Security, "Se
 highlights-security-officer = Security Officer, Secoff, Officer, Armory, Security, "Sec"
 highlights-warden = Warden, "Ward", Brig, Genpop, Jail, "Prison", Armory, Security, "Sec"
 
-# Cargo
-highlights-cargo-technician = Cargo Technician, Cargo Tech, "Cargo", Supply
-highlights-salvage-specialist = Salvage Specialist, Salvager, Salvage, "Salv", Miner, "Cargo", Supply
+# Logistics
+# Funky - Added/replaced highlights to reflect department change and Logistics rename
+highlights-botanist = Botanist, Botany, Hydroponics, "Cargo", Supply, Logistics, "Logi"
+# Funky - Added more highlights to reflect Logistics rename
+highlights-cargo-technician = Cargo Technician, Cargo Tech, "Cargo", Supply, Logistics, "Logi"
+# Funky - Added more highlights to reflect Logistics rename
+highlights-salvage-specialist = Salvage Specialist, Salvager, Salvage, "Salv", Miner, "Cargo", Supply, Logistics, "Logi"
 
 # Engineering
 highlights-atmospheric-technician = Atmospheric Technician, Atmos Tech, Atmospheric, Engineering, "Atmos", "Engi"
@@ -34,20 +39,21 @@ highlights-research-assistant = Research Assistant, Science, "Sci", "RND", "R&D"
 
 # Civilian
 highlights-bartender = Bartender, Barkeeper, Barkeep, "Bar", Service, "Serv"
-highlights-botanist = Botanist, Botany, Hydroponics, Service, "Serv"
 highlights-chaplain = Chaplain, "Chap", Chapel, Service, "Serv"
 highlights-chef = Chef, "Cook", Kitchen, Service, "Serv"
 highlights-clown = Clown, Theatre, Theater, Service, "Serv"
 highlights-janitor = Janitor, "Jani", Service, "Serv"
-highlights-lawyer = Lawyer, Attorney, "Law", Service, "Serv"
+highlights-lawyer = Lawyer, Attorney, "Law", Civilian, "Civ"
 highlights-librarian = Librarian, Library, Service, "Serv"
 highlights-mime = Mime, Theatre, Theater, Service, "Serv"
 highlights-musician = Musician, "Music", Theatre, Theater, Service, "Serv"
-highlights-passenger = Passenger, Greytider, Graytider, "Tider", "Tide"
+# Funky - Added Assistant and Civ(ilian) to the highlights list
+highlights-passenger = Passenger, Greytider, Graytider, "Tider", "Tide", Assistant, Civilian, "Civ"
 highlights-service-worker = Service Worker, Service, "Serv"
 
 # Station-specific
-highlights-reporter = Reporter, Journalist, Newsroom, News
+# Funky - Added Civ(ilian) to the highlights list
+highlights-reporter = Reporter, Journalist, Newsroom, News, Civilian, "Civ"
 highlights-psychologist = Psychologist, Psychology, "Psych", Medbay, Medical, "Med"
 
 # Silicon

diff --git a/Resources/Locale/en-US/job/department-desc.ftl b/Resources/Locale/en-US/job/department-desc.ftl
@@ -1,5 +1,6 @@
 department-Cargo-description = Complete bounties, earn Spessos, and order useful supplies for the crew.
-department-Civilian-description = Perform small helpful tasks to keep the station sane and well catered.
+# Funky - Changed Civilian description to be more in line with what the department is now
+department-Civilian-description = Work for the station outside of Nanotrasen's standard corporate structure.
 department-Command-description = Manage the crew and keep them working efficiently.
 department-CentralCommand-description = Manage the crew and keep them working efficiently.
 department-Engineering-description = Keep the power on and the station operational.

diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl
@@ -34,14 +34,16 @@ job-description-mime = Entertain the crew without speaking or writing, and engag
 job-description-musician = Entertain the crew with your unique musical talent, and acquire new instruments to mess around with.
 job-description-passenger = Enjoy your stay aboard the station with no obligations!
 job-description-psychologist = Provide emotional support to traumatized crew.
-job-description-qm = Manage the supplies of the station & the Cargo department, keep the salvage specialists working, make sure all orders are fulfilled, and keep the money flowing.
+# Funky - Logistics rename
+job-description-qm = Manage the supplies of the station & the Logistics department, keep the salvage specialists working, make sure all orders are fulfilled, and keep the money flowing.
 job-description-rd = Manage the Science department, unlocking technologies, acquiring & researching artifacts, and performing experiments.
 job-description-research-assistant = Learn the basics of robotics and how to research various artifacts & anomalies.
 job-description-reporter = Entertain & inform the crew with your vibrant journalism through wireless cameras, the radio and the news.
 job-description-salvagespec = Use the salvage magnet to draw in detached scraps & asteroids to loot and enrich the station, build a salvage ship and then travel to new planets, while fighting off any space fauna along the way.
 job-description-scientist = Research alien artifacts, unlock new technologies, build newer and better machines around the station, and make everything run more efficiently.
 job-description-security = Catch criminals and enemies of the station, enforce the law, and ensure that the station does not fall into disarray.
-job-description-serviceworker = Learn the basics of bartending, cooking, and growing plants.
+# Funky - Updated Service Worker description to be in line with what we want from the job
+job-description-serviceworker = Take orders, serve customers, and help other Service jobs as needed.
 job-description-station-ai = Follow your laws, serve the crew.
 job-description-visitor = Enjoy your visit to the station.
 job-description-warden = Patrol the Security department, ensure that no one is stealing from the armory, and make sure that all prisoners are processed and let out when their time is up.
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
@@ -34,6 +34,7 @@
   - Atmospherics
   - GenpopEnter
   - GenpopLeave
+  - Newsroom # Funky
 
 - type: accessGroup
   id: General

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
@@ -12,7 +12,8 @@
 ####
     ClothingNeckScarfStripedGreen: 3
 #    ClothingHeadBandBotany: 3
-    ClothingHeadsetService: 2
+    #ClothingHeadsetService: 2 # Funky - No longer part of Service
+    ClothingHeadsetCargo: 2 # Funky - Now part of Logistics
     ClothingOuterWinterHydro: 2
   contrabandInventory:
     ToyFigurineBotanist: 1

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -12,7 +12,8 @@
     ClothingUniformJumpsuitLawyerGood: 1
     ClothingUniformJumpskirtLawyerGood: 1
     ClothingShoesBootsLaceup: 2
-    ClothingHeadsetService: 2
+    #ClothingHeadsetService: 2 # Funky - No longer part of Service
+    ClothingHeadsetGrey: 2 # Funky - Now part of Civilian
     ClothingNeckLawyerbadge: 2
     BriefcaseBrown: 2
     BookSpaceLaw: 3

diff --git a/Resources/Prototypes/Catalog/cargo_accounts.yml b/Resources/Prototypes/Catalog/cargo_accounts.yml
@@ -1,7 +1,7 @@
 - type: cargoAccount
   id: Cargo
-  name: cargo-account-cargo-name
-  code: cargo-account-cargo-code
+  name: cargo-account-logistics-name # Funky - Logistics rename
+  code: cargo-account-logistics-code # Funky - Logistics rename
   color: "#b48b57"
   radioChannel: Supply
   acquisitionSlip: PaperAcquisitionSlipCargo

diff --git a/Resources/Prototypes/Device/devicenet_frequencies.yml b/Resources/Prototypes/Device/devicenet_frequencies.yml
@@ -30,7 +30,7 @@
 
 - type: deviceFrequency
   id: SurveillanceCameraSupply
-  name: device-frequency-prototype-name-surveillance-camera-supply
+  name: device-frequency-prototype-name-surveillance-camera-logistics # Funky - Logistics rename
   frequency: 1934
 
 - type: deviceFrequency
@@ -98,7 +98,7 @@
   id: Turret
   name: device-frequency-prototype-name-turret
   frequency: 2152
-  
+
 # AI turret controllers send data to their turrets on this frequency
 - type: deviceFrequency
   id: TurretControlAI

diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
@@ -30,16 +30,19 @@
 - type: entity
   parent: ClothingHeadset
   id: ClothingHeadsetGrey
-  name: passenger headset
+  #name: passenger headset
+  name: civilian headset # Funky - Headset is used by jobs other than Passenger/Assistant now, so it gets a more generic name
   components:
   - type: Sprite
     sprite: Clothing/Ears/Headsets/base.rsi
 
 - type: entity
   parent: ClothingHeadset
   id: ClothingHeadsetCargo
-  name: cargo headset
-  description: A headset used by supply employees.
+  #name: cargo headset
+  name: logistics headset # Funky - Logistics rename
+  #description: A headset used by supply employees.
+  description: A headset used by employees of the logistics department. # Funky - Logistics rename
   components:
   - type: ContainerFill
     containers:

diff --git a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml
@@ -33,8 +33,10 @@
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCargomedal
-  name: cargo medal
-  description: Given for the best work in the cargo department.
+  #name: cargo medal
+  name: logistics medal # Funky - Logistics rename
+  #description: Given for the best work in the cargo department.
+  description: Given for the best work in the logistics department. # Funky - Logistics rename
   components:
   - type: Sprite
     sprite: Clothing/Neck/Medals/cargomedal.rsi

diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
@@ -389,7 +389,7 @@
   suffix: Supply
   components:
   - type: NavMapBeacon
-    defaultText: station-beacon-supply
+    defaultText: station-beacon-logistics # Funky - Logistics rename
     color: "#A46106"
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -1450,7 +1450,7 @@
   - type: DeviceNetworkRequiresPower
   - type: NewsWriter
   - type: AccessReader
-    access: [[ "Service" ]]
+    access: [[ "Newsroom" ]] # Funky - Reporters now have a separate access
   - type: ActivatableUI
     key: enum.NewsWriterUiKey.Key
   - type: ActivatableUIRequiresVision

diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
@@ -10,6 +10,7 @@
   - Cargo
   - Maintenance
   extendedAccess:
+  - Hydroponics # Funky - Botanist is now in Logistics
   - Salvage
   special:
   - !type:GiveItemOnHolidaySpecial

diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -19,6 +19,7 @@
   supervisors: job-supervisors-captain
   access:
   - Cargo
+  - Hydroponics # Funky - Botanist is now in Logistics
   - Salvage
   - Quartermaster
   - Maintenance

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
@@ -1,7 +1,7 @@
 - type: job
   id: Passenger
-  name: job-name-passenger
-  description: job-description-passenger
+  name: job-name-assistant
+  description: job-description-assistant
   playTimeTracker: JobPassenger
   startingGear: PassengerGear
   icon: "JobIconPassenger"

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
@@ -5,7 +5,7 @@
   playTimeTracker: JobBartender
   requirements:
     - !type:DepartmentTimeRequirement
-      department: Civilian
+      department: Service # Funky - Service is now a separate department
       time: 0.5h
   startingGear: BartenderGear
   icon: "JobIconBartender"
@@ -16,7 +16,7 @@
   - Bar
   extendedAccess:
   - Kitchen
-  - Hydroponics
+  #- Hydroponics # Funky - Botanist is now in Logistics
 
 - type: startingGear
   id: BartenderGear

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
@@ -5,14 +5,15 @@
   playTimeTracker: JobBotanist
   startingGear: BotanistGear
   icon: "JobIconBotanist"
-  supervisors: job-supervisors-hop
+  supervisors: job-supervisors-qm
   access:
-  - Service
+  #- Service # Funky - No longer part of Service
+  - Cargo # Funky - Now in Logistics
   - Maintenance
   - Hydroponics
-  extendedAccess:
-  - Kitchen
-  - Bar
+  #extendedAccess: # Funky - These jobs are no longer in their department
+  #- Kitchen
+  #- Bar
   special:
   - !type:GiveItemOnHolidaySpecial
     holiday: FourTwenty
@@ -23,7 +24,8 @@
   equipment:
     shoes: ClothingShoesColorBrown
     id: BotanistPDA
-    ears: ClothingHeadsetService
+    #ears: ClothingHeadsetService # Funky - No longer part of Service
+    ears: ClothingHeadsetCargo # Funky - Now part of Logistics
     belt: ClothingBeltPlantFilled
   #storage:
     #back:

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
@@ -5,7 +5,7 @@
   playTimeTracker: JobChef
   requirements:
     - !type:DepartmentTimeRequirement
-      department: Civilian
+      department: Service # Funky - Service is now a separate department
       time: 0.5h
   startingGear: ChefGear
   icon: "JobIconChef"
@@ -15,7 +15,7 @@
   - Maintenance
   - Kitchen
   extendedAccess:
-  - Hydroponics
+  #- Hydroponics # Funky - Botanist is now in Logistics
   - Bar
 
 - type: startingGear

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -8,9 +8,9 @@
       time: 2.5h
   startingGear: LawyerGear
   icon: "JobIconLawyer"
-  supervisors: job-supervisors-hop
+  supervisors: job-supervisors-hire # Funky - Now a contracted Civilian job
   access:
-  - Service
+  #- Service # Funky - No longer part of Service
   - Lawyer
   - Brig
   - Maintenance
@@ -20,7 +20,8 @@
   equipment:
     shoes: ClothingShoesBootsLaceup
     id: LawyerPDA
-    ears: ClothingHeadsetSecurity
+    #ears: ClothingHeadsetSecurity # Funky
+    ears: ClothingHeadsetGrey # Funky
   inhand:
     - BriefcaseBrownFilled
   storage:

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
@@ -5,7 +5,7 @@
   playTimeTracker: JobServiceWorker
   requirements:
   - !type:DepartmentTimeRequirement
-    department: Civilian
+    department: Service # Funky - Service is now a separate department
     time: 0.5h
   startingGear: ServiceWorkerGear
   icon: "JobIconServiceWorker"
@@ -15,8 +15,8 @@
   - Maintenance
   - Bar
   - Kitchen
-  extendedAccess:
-  - Hydroponics
+  #extendedAccess: # Funky - Botanist is now in Logistics
+  #- Hydroponics
 
 - type: startingGear
   id: ServiceWorkerGear
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		cargo-account-logistics-name = General Logistics Budget
		cargo-account-logistics-code = LOG
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		device-frequency-prototype-name-surveillance-camera-logistics = Logistics Cameras
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		department-Logistics-description = Produce raw materials, purchase goods, and distribute them across the station.
		department-Service-description = Keep crew morale high by providing catering and entertainment.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		department-Logistics = Logistics
		department-Service = Service
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		job-description-assistant = Assist the station's crew as one of its more expendable assets.