From b88556578988a3d390e23bcf0738728744d368ad Mon Sep 17 00:00:00 2001 From: "W.xyz()" <84605679+pirakaplant@users.noreply.github.com> Date: Thu, 2 Jul 2026 21:34:08 +0930 Subject: [PATCH 01/12] initial commit --- .../GameTicking/SharedGameTicker.cs | 2 +- .../_Funkystation/job/department-desc.ftl | 2 ++ .../en-US/_Funkystation/job/department.ftl | 2 ++ .../_Funkystation/job/job-description.ftl | 1 + .../en-US/_Funkystation/job/job-names.ftl | 1 + .../Locale/en-US/job/department-desc.ftl | 3 +- .../Locale/en-US/job/job-description.ftl | 3 +- .../VendingMachines/Inventories/hydrobe.yml | 3 +- .../VendingMachines/Inventories/janidrobe.yml | 3 +- .../VendingMachines/Inventories/lawdrobe.yml | 3 +- .../Roles/Jobs/Civilian/assistant.yml | 4 +-- .../Roles/Jobs/Civilian/bartender.yml | 4 +-- .../Roles/Jobs/Civilian/botanist.yml | 14 +++++---- .../Prototypes/Roles/Jobs/Civilian/chef.yml | 4 +-- .../Roles/Jobs/Civilian/janitor.yml | 7 +++-- .../Prototypes/Roles/Jobs/Civilian/lawyer.yml | 7 +++-- .../Roles/Jobs/Civilian/service_worker.yml | 6 ++-- .../Prototypes/Roles/Jobs/departments.yml | 29 ++++++++++--------- .../_Funkystation/Roles/Jobs/departments.yml | 17 +++++++++++ 19 files changed, 74 insertions(+), 41 deletions(-) create mode 100644 Resources/Locale/en-US/_Funkystation/job/department-desc.ftl create mode 100644 Resources/Locale/en-US/_Funkystation/job/department.ftl create mode 100644 Resources/Locale/en-US/_Funkystation/job/job-description.ftl create mode 100644 Resources/Locale/en-US/_Funkystation/job/job-names.ftl create mode 100644 Resources/Prototypes/_Funkystation/Roles/Jobs/departments.yml diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs index 83c9dfb5063..d28ca3d08eb 100644 --- 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 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/job/department-desc.ftl b/Resources/Locale/en-US/_Funkystation/job/department-desc.ftl new file mode 100644 index 00000000000..c9b59e35ecb --- /dev/null +++ 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 the crew satisfied with food, drink, and entertainment for their breaks. diff --git a/Resources/Locale/en-US/_Funkystation/job/department.ftl b/Resources/Locale/en-US/_Funkystation/job/department.ftl new file mode 100644 index 00000000000..295ff78dec1 --- /dev/null +++ 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 new file mode 100644 index 00000000000..b9765bc38a4 --- /dev/null +++ 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 new file mode 100644 index 00000000000..ed29bc8c06f --- /dev/null +++ b/Resources/Locale/en-US/_Funkystation/job/job-names.ftl @@ -0,0 +1 @@ +job-name-assistant = Assistant diff --git a/Resources/Locale/en-US/job/department-desc.ftl b/Resources/Locale/en-US/job/department-desc.ftl index 63577274322..5c08bbca179 100644 --- 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 = Carry out miscellaneous odd jobs and grunt work. 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 index 15a9c9a1730..2df1d3c8604 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/Resources/Locale/en-US/job/job-description.ftl @@ -41,7 +41,8 @@ job-description-reporter = Entertain & inform the crew with your vibrant journal 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/Catalog/VendingMachines/Inventories/hydrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml index a699ecd38d9..e0dc3c017aa 100644 --- 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/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml index 2df87ea4218..c1915f38a05 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml @@ -7,7 +7,8 @@ ClothingShoesColorBlack: 2 ClothingHeadHatPurplesoft: 2 ClothingBeltJanitor: 2 - ClothingHeadsetService: 2 + #ClothingHeadsetService: 2 # Funky - No longer part of Service + ClothingHeadsetGrey: 2 # Funky - Now part of Civilian ClothingOuterWinterJani: 2 ClothingNeckScarfStripedPurple: 3 contrabandInventory: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml index 319a34c4f82..1ae614b2413 100644 --- 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/Roles/Jobs/Civilian/assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml index c1da684db17..fb0b1295179 100644 --- 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 index 2d32b87f68b..8b5de6a8b23 100644 --- 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 index 2bf121d0207..2e75c930021 100644 --- 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 index b3a5deab15a..77082efe97f 100644 --- 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/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml index 15a19b65555..08e8da77343 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml @@ -5,9 +5,9 @@ playTimeTracker: JobJanitor startingGear: JanitorGear icon: "JobIconJanitor" - supervisors: job-supervisors-hop + supervisors: job-supervisors-everyone # Funky - No longer a part of Service access: - - Service + #- Service # Funky - No longer part of Service - Janitor - Maintenance special: @@ -20,7 +20,8 @@ equipment: shoes: ClothingShoesGaloshes id: JanitorPDA - ears: ClothingHeadsetService + #ears: ClothingHeadsetService # Funky - No longer part of Service + ears: ClothingHeadsetGrey # Funky - Now part of Civilian belt: ClothingBeltJanitorFilled #storage: #back: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 11f07252a31..a093895814e 100644 --- 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-everyone # Funky - No longer part of Service 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 index 0c839718272..23318bea06b 100644 --- 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 diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 6294657ab35..f0bf45c791c 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -1,9 +1,10 @@ - type: department id: Cargo - name: department-Cargo - description: department-Cargo-description + name: department-Logistics + description: department-Logistics-description color: "#A46106" roles: + - Botanist # Funky - Moved from Civilian - CargoTechnician - Quartermaster - SalvageSpecialist @@ -12,24 +13,24 @@ id: Civilian name: department-Civilian description: department-Civilian-description - color: "#9FED58" + color: "#808080" # Funky - Changed color to gray, like the icons. Service is now green weight: -10 roles: - - Bartender - - Botanist - - Chaplain - - Chef - - Clown - - HeadOfPersonnel + #- Bartender # Funky - All the commented out jobs are moving to Service + #- Botanist # Except Botanist which is moving to Logistics + #- Chaplain + #- Chef + #- Clown + #- HeadOfPersonnel - Janitor - Lawyer - - Librarian - - Mime - - Musician + #- Librarian + #- Mime + #- Musician - Passenger - - Reporter + #- Reporter - Visitor - - ServiceWorker + #- ServiceWorker - type: department id: CentralCommand diff --git a/Resources/Prototypes/_Funkystation/Roles/Jobs/departments.yml b/Resources/Prototypes/_Funkystation/Roles/Jobs/departments.yml new file mode 100644 index 00000000000..ef932ae0687 --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Roles/Jobs/departments.yml @@ -0,0 +1,17 @@ +- type: department + id: Service + name: department-Service + description: department-Service-description + color: "#9FED58" + weight: -5 # Between Science (0) and Civilian (-10) + roles: + - Bartender + - Chaplain + - Chef + - Clown + - HeadOfPersonnel + - Librarian + - Mime + - Musician + - Reporter + - ServiceWorker From 5984ab031a6a0e2dd744fed0e62747ce3ef8aeb7 Mon Sep 17 00:00:00 2001 From: "W.xyz()" <84605679+pirakaplant@users.noreply.github.com> Date: Fri, 3 Jul 2026 00:35:32 +0930 Subject: [PATCH 02/12] did more of the logistics rename. everything done except guidebook stuff --- .../_Funkystation/cargo/cargo-accounts.ftl | 2 ++ .../_Funkystation/devices/device-network.ftl | 1 + .../headset/headset-component.ftl | 1 + .../_Funkystation/lathe/lathe-categories.ftl | 1 + .../navmap-beacons/station-beacons.ftl | 1 + Resources/Locale/en-US/chat/highlights.ftl | 22 ++++++++++++------- .../Locale/en-US/job/job-description.ftl | 3 ++- .../Prototypes/Catalog/cargo_accounts.yml | 4 ++-- .../Device/devicenet_frequencies.yml | 4 ++-- .../Entities/Clothing/Ears/headsets.yml | 9 +++++--- .../Entities/Clothing/Neck/medals.yml | 6 +++-- .../Objects/Devices/station_beacon.yml | 2 +- Resources/Prototypes/radio_channels.yml | 4 ++-- 13 files changed, 39 insertions(+), 21 deletions(-) create mode 100644 Resources/Locale/en-US/_Funkystation/cargo/cargo-accounts.ftl create mode 100644 Resources/Locale/en-US/_Funkystation/devices/device-network.ftl create mode 100644 Resources/Locale/en-US/_Funkystation/headset/headset-component.ftl create mode 100644 Resources/Locale/en-US/_Funkystation/lathe/lathe-categories.ftl create mode 100644 Resources/Locale/en-US/_Funkystation/navmap-beacons/station-beacons.ftl diff --git a/Resources/Locale/en-US/_Funkystation/cargo/cargo-accounts.ftl b/Resources/Locale/en-US/_Funkystation/cargo/cargo-accounts.ftl new file mode 100644 index 00000000000..a31f049cc2d --- /dev/null +++ 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 new file mode 100644 index 00000000000..6a002e1b694 --- /dev/null +++ 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 new file mode 100644 index 00000000000..c316a53db48 --- /dev/null +++ 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/lathe/lathe-categories.ftl b/Resources/Locale/en-US/_Funkystation/lathe/lathe-categories.ftl new file mode 100644 index 00000000000..5202f5796ac --- /dev/null +++ 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 new file mode 100644 index 00000000000..537e11a8927 --- /dev/null +++ b/Resources/Locale/en-US/_Funkystation/navmap-beacons/station-beacons.ftl @@ -0,0 +1 @@ +station-beacon-supply = Logistics diff --git a/Resources/Locale/en-US/chat/highlights.ftl b/Resources/Locale/en-US/chat/highlights.ftl index c6ec41bc6c7..cc9539c0bff 100644 --- 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,16 +39,17 @@ 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" +# Funky - Replaced Serv(ice) with Civ(ilian) +highlights-janitor = Janitor, "Jani", Civilian, "Civ" +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 diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index 2df1d3c8604..57560b63502 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/Resources/Locale/en-US/job/job-description.ftl @@ -34,7 +34,8 @@ 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. diff --git a/Resources/Prototypes/Catalog/cargo_accounts.yml b/Resources/Prototypes/Catalog/cargo_accounts.yml index 1b366de8c61..7a12a152b66 100644 --- 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 index 89df762380f..6653ae4d1c9 100644 --- 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 index c5c4f269f14..a5e155d067b 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -30,7 +30,8 @@ - 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 @@ -38,8 +39,10 @@ - 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 index 136f921148a..17bdbebfa8c 100644 --- 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 index 2b6e4bdd357..646b5d088c3 100644 --- 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/radio_channels.yml b/Resources/Prototypes/radio_channels.yml index b4ef2b4ff51..0deac1a2547 100644 --- a/Resources/Prototypes/radio_channels.yml +++ b/Resources/Prototypes/radio_channels.yml @@ -57,7 +57,7 @@ - type: radioChannel id: Supply - name: chat-radio-supply + name: chat-radio-logistics # Funky - Logistics rename keycode: 'u' frequency: 1347 color: "#b48b57" @@ -112,4 +112,4 @@ frequency: 2003 color: "#ff2222" # long range since I don't wanna make a special xenoborg telecomm server - longRange: true \ No newline at end of file + longRange: true From b19bbdc373bb9ad77d40de1826fe7615d0c21d09 Mon Sep 17 00:00:00 2001 From: "W.xyz()" <84605679+pirakaplant@users.noreply.github.com> Date: Fri, 3 Jul 2026 01:08:50 +0930 Subject: [PATCH 03/12] forgot to rename a localisation string key. fixed --- .../en-US/_Funkystation/navmap-beacons/station-beacons.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/_Funkystation/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/_Funkystation/navmap-beacons/station-beacons.ftl index 537e11a8927..7ac7744aafd 100644 --- a/Resources/Locale/en-US/_Funkystation/navmap-beacons/station-beacons.ftl +++ b/Resources/Locale/en-US/_Funkystation/navmap-beacons/station-beacons.ftl @@ -1 +1 @@ -station-beacon-supply = Logistics +station-beacon-logistics = Logistics From 1ba39a6ca867d4bc140f6718f34912f14e4d090d Mon Sep 17 00:00:00 2001 From: "W.xyz()" <84605679+pirakaplant@users.noreply.github.com> Date: Fri, 3 Jul 2026 15:44:15 +0930 Subject: [PATCH 04/12] gave cargo tech skeleton crew hydroponics access --- Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index dcf7add35ea..7ee808a378c 100644 --- 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 From 63559efed21ae4c7e9553c3c27fb23ed0f57efb0 Mon Sep 17 00:00:00 2001 From: "W.xyz()" <84605679+pirakaplant@users.noreply.github.com> Date: Fri, 3 Jul 2026 15:46:39 +0930 Subject: [PATCH 05/12] gave the quartermaster hydroponics access because I forgot --- Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index bf69f568e47..079d06a1d29 100644 --- 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 From d303bfc08d3ea27c8d2b5ba378261f1a6008d01b Mon Sep 17 00:00:00 2001 From: "W.xyz()" <84605679+pirakaplant@users.noreply.github.com> Date: Sat, 11 Jul 2026 04:24:39 +0930 Subject: [PATCH 06/12] made changes per maintainer feedback --- .../Locale/en-US/_Funkystation/job/job-supervisors.ftl | 1 + Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml | 7 +++---- Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml | 2 +- Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml | 7 ++++--- Resources/Prototypes/Roles/Jobs/departments.yml | 4 ++-- .../Prototypes/_Funkystation/Roles/Jobs/departments.yml | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 Resources/Locale/en-US/_Funkystation/job/job-supervisors.ftl diff --git a/Resources/Locale/en-US/_Funkystation/job/job-supervisors.ftl b/Resources/Locale/en-US/_Funkystation/job/job-supervisors.ftl new file mode 100644 index 00000000000..9ff202b24d9 --- /dev/null +++ b/Resources/Locale/en-US/_Funkystation/job/job-supervisors.ftl @@ -0,0 +1 @@ +job-supervisors-audience = your audience diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml index 08e8da77343..15a19b65555 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml @@ -5,9 +5,9 @@ playTimeTracker: JobJanitor startingGear: JanitorGear icon: "JobIconJanitor" - supervisors: job-supervisors-everyone # Funky - No longer a part of Service + supervisors: job-supervisors-hop access: - #- Service # Funky - No longer part of Service + - Service - Janitor - Maintenance special: @@ -20,8 +20,7 @@ equipment: shoes: ClothingShoesGaloshes id: JanitorPDA - #ears: ClothingHeadsetService # Funky - No longer part of Service - ears: ClothingHeadsetGrey # Funky - Now part of Civilian + ears: ClothingHeadsetService belt: ClothingBeltJanitorFilled #storage: #back: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index a093895814e..10e6461aed8 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -8,7 +8,7 @@ time: 2.5h startingGear: LawyerGear icon: "JobIconLawyer" - supervisors: job-supervisors-everyone # Funky - No longer part of Service + supervisors: job-supervisors-hire # Funky - Now a contracted Civilian job access: #- Service # Funky - No longer part of Service - Lawyer diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml index c3c61acd967..51ca055f332 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml @@ -5,9 +5,9 @@ playTimeTracker: JobReporter startingGear: ReporterGear icon: "JobIconReporter" - supervisors: job-supervisors-hop + supervisors: job-supervisors-audience # Funky - Now a contracted Civilian job access: - - Service + - Service # Funky - No longer a part of Service, but at the moment they do not have their own access type. So they get to keep this in the meantime so they can walk into their own office. TODO: Add Newsroom access. - Maintenance - type: startingGear @@ -15,7 +15,8 @@ equipment: shoes: ClothingShoesColorWhite id: ReporterPDA - ears: ClothingHeadsetService + #ears: ClothingHeadsetService + ears: ClothingHeadsetGrey # Funky - No longer a part of Service #storage: #back: #- Stuff diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index f0bf45c791c..ac1dbee3d84 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -22,13 +22,13 @@ #- Chef #- Clown #- HeadOfPersonnel - - Janitor + #- Janitor - Lawyer #- Librarian #- Mime #- Musician - Passenger - #- Reporter + - Reporter - Visitor #- ServiceWorker diff --git a/Resources/Prototypes/_Funkystation/Roles/Jobs/departments.yml b/Resources/Prototypes/_Funkystation/Roles/Jobs/departments.yml index ef932ae0687..9c8d0bd1146 100644 --- a/Resources/Prototypes/_Funkystation/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_Funkystation/Roles/Jobs/departments.yml @@ -9,9 +9,9 @@ - Chaplain - Chef - Clown + - Janitor - HeadOfPersonnel - Librarian - Mime - Musician - - Reporter - ServiceWorker From 29c3261d4ca03341000604edfcf351466bd10773 Mon Sep 17 00:00:00 2001 From: "W.xyz()" <84605679+pirakaplant@users.noreply.github.com> Date: Sat, 11 Jul 2026 04:24:39 +0930 Subject: [PATCH 07/12] made changes per maintainer feedback --- .../Locale/en-US/_Funkystation/job/job-supervisors.ftl | 1 + Resources/Locale/en-US/job/department-desc.ftl | 2 +- .../Catalog/VendingMachines/Inventories/janidrobe.yml | 3 +-- Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml | 7 +++---- Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml | 2 +- Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml | 7 ++++--- Resources/Prototypes/Roles/Jobs/departments.yml | 4 ++-- .../Prototypes/_Funkystation/Roles/Jobs/departments.yml | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 Resources/Locale/en-US/_Funkystation/job/job-supervisors.ftl diff --git a/Resources/Locale/en-US/_Funkystation/job/job-supervisors.ftl b/Resources/Locale/en-US/_Funkystation/job/job-supervisors.ftl new file mode 100644 index 00000000000..9ff202b24d9 --- /dev/null +++ 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/job/department-desc.ftl b/Resources/Locale/en-US/job/department-desc.ftl index 5c08bbca179..a17aad7b53c 100644 --- a/Resources/Locale/en-US/job/department-desc.ftl +++ b/Resources/Locale/en-US/job/department-desc.ftl @@ -1,6 +1,6 @@ department-Cargo-description = Complete bounties, earn Spessos, and order useful supplies for the crew. # Funky - Changed Civilian description to be more in line with what the department is now -department-Civilian-description = Carry out miscellaneous odd jobs and grunt work. +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/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml index c1915f38a05..2df87ea4218 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml @@ -7,8 +7,7 @@ ClothingShoesColorBlack: 2 ClothingHeadHatPurplesoft: 2 ClothingBeltJanitor: 2 - #ClothingHeadsetService: 2 # Funky - No longer part of Service - ClothingHeadsetGrey: 2 # Funky - Now part of Civilian + ClothingHeadsetService: 2 ClothingOuterWinterJani: 2 ClothingNeckScarfStripedPurple: 3 contrabandInventory: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml index 08e8da77343..15a19b65555 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml @@ -5,9 +5,9 @@ playTimeTracker: JobJanitor startingGear: JanitorGear icon: "JobIconJanitor" - supervisors: job-supervisors-everyone # Funky - No longer a part of Service + supervisors: job-supervisors-hop access: - #- Service # Funky - No longer part of Service + - Service - Janitor - Maintenance special: @@ -20,8 +20,7 @@ equipment: shoes: ClothingShoesGaloshes id: JanitorPDA - #ears: ClothingHeadsetService # Funky - No longer part of Service - ears: ClothingHeadsetGrey # Funky - Now part of Civilian + ears: ClothingHeadsetService belt: ClothingBeltJanitorFilled #storage: #back: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index a093895814e..10e6461aed8 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -8,7 +8,7 @@ time: 2.5h startingGear: LawyerGear icon: "JobIconLawyer" - supervisors: job-supervisors-everyone # Funky - No longer part of Service + supervisors: job-supervisors-hire # Funky - Now a contracted Civilian job access: #- Service # Funky - No longer part of Service - Lawyer diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml index c3c61acd967..51ca055f332 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml @@ -5,9 +5,9 @@ playTimeTracker: JobReporter startingGear: ReporterGear icon: "JobIconReporter" - supervisors: job-supervisors-hop + supervisors: job-supervisors-audience # Funky - Now a contracted Civilian job access: - - Service + - Service # Funky - No longer a part of Service, but at the moment they do not have their own access type. So they get to keep this in the meantime so they can walk into their own office. TODO: Add Newsroom access. - Maintenance - type: startingGear @@ -15,7 +15,8 @@ equipment: shoes: ClothingShoesColorWhite id: ReporterPDA - ears: ClothingHeadsetService + #ears: ClothingHeadsetService + ears: ClothingHeadsetGrey # Funky - No longer a part of Service #storage: #back: #- Stuff diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index f0bf45c791c..ac1dbee3d84 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -22,13 +22,13 @@ #- Chef #- Clown #- HeadOfPersonnel - - Janitor + #- Janitor - Lawyer #- Librarian #- Mime #- Musician - Passenger - #- Reporter + - Reporter - Visitor #- ServiceWorker diff --git a/Resources/Prototypes/_Funkystation/Roles/Jobs/departments.yml b/Resources/Prototypes/_Funkystation/Roles/Jobs/departments.yml index ef932ae0687..9c8d0bd1146 100644 --- a/Resources/Prototypes/_Funkystation/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_Funkystation/Roles/Jobs/departments.yml @@ -9,9 +9,9 @@ - Chaplain - Chef - Clown + - Janitor - HeadOfPersonnel - Librarian - Mime - Musician - - Reporter - ServiceWorker From 6244e827b7bc1cb8fc79ea0ad97c4d4860e9a851 Mon Sep 17 00:00:00 2001 From: "W.xyz()" <84605679+pirakaplant@users.noreply.github.com> Date: Sat, 11 Jul 2026 04:44:39 +0930 Subject: [PATCH 08/12] I was kind of thinking about it for a bit but honestly the Service department description should be changed too --- Resources/Locale/en-US/_Funkystation/job/department-desc.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/_Funkystation/job/department-desc.ftl b/Resources/Locale/en-US/_Funkystation/job/department-desc.ftl index c9b59e35ecb..062adcb8b60 100644 --- a/Resources/Locale/en-US/_Funkystation/job/department-desc.ftl +++ b/Resources/Locale/en-US/_Funkystation/job/department-desc.ftl @@ -1,2 +1,2 @@ department-Logistics-description = Produce raw materials, purchase goods, and distribute them across the station. -department-Service-description = Keep the crew satisfied with food, drink, and entertainment for their breaks. +department-Service-description = Keep crew morale high by providing catering and entertainment. From 15f17bd6baaac5a13af3bfcbf4e3ea39d8eb0da9 Mon Sep 17 00:00:00 2001 From: "W.xyz()" <84605679+pirakaplant@users.noreply.github.com> Date: Sat, 11 Jul 2026 16:17:16 +0930 Subject: [PATCH 09/12] added newsroom access --- .../Components/IdCardConsoleComponent.cs | 3 ++- .../prototypes/access/accesses.ftl | 1 + Resources/Prototypes/Access/misc.yml | 1 + .../Roles/Jobs/Wildcards/reporter.yml | 3 ++- .../_Funkystation/Access/civilian.yml | 3 +++ .../Devices/Electronics/door_access.yml | 7 ++++++ .../Structures/Doors/Airlocks/access.yml | 23 +++++++++++++++++++ 7 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/en-US/_Funkystation/prototypes/access/accesses.ftl create mode 100644 Resources/Prototypes/_Funkystation/Access/civilian.yml create mode 100644 Resources/Prototypes/_Funkystation/Entities/Objects/Devices/Electronics/door_access.yml create mode 100644 Resources/Prototypes/_Funkystation/Entities/Structures/Doors/Airlocks/access.yml diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index 89c24940ba3..f19aa413862 100644 --- 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> AccessLevels = new() { @@ -67,6 +67,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List Date: Sat, 11 Jul 2026 16:27:45 +0930 Subject: [PATCH 10/12] news manager console is now Newsroom access locked instead of Service access locked --- .../Entities/Structures/Machines/Computers/computers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index fd4a6711c3a..95223488be4 100644 --- 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" ]] - type: ActivatableUI key: enum.NewsWriterUiKey.Key - type: ActivatableUIRequiresVision From 244bd0acbe8ae1590ae6127ccb1a1d5aa6b51c17 Mon Sep 17 00:00:00 2001 From: "W.xyz()" <84605679+pirakaplant@users.noreply.github.com> Date: Sun, 12 Jul 2026 13:28:56 +0930 Subject: [PATCH 11/12] wait I forgot to commit the news manager changes --- .../Entities/Structures/Machines/Computers/computers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 95223488be4..4acdf51afb2 100644 --- 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: [[ "Newsroom" ]] + access: [[ "Newsroom" ]] # Funky - Reporters now have a separate access - type: ActivatableUI key: enum.NewsWriterUiKey.Key - type: ActivatableUIRequiresVision From fd3c6d62802dca25c4ec9fc23b6063cd54eb11af Mon Sep 17 00:00:00 2001 From: "W.xyz()" <84605679+pirakaplant@users.noreply.github.com> Date: Sat, 25 Jul 2026 05:10:33 +0930 Subject: [PATCH 12/12] last minute highlight change because I forgot to update that with the last commit --- Resources/Locale/en-US/chat/highlights.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/chat/highlights.ftl b/Resources/Locale/en-US/chat/highlights.ftl index cc9539c0bff..d0a5fbccdd1 100644 --- a/Resources/Locale/en-US/chat/highlights.ftl +++ b/Resources/Locale/en-US/chat/highlights.ftl @@ -42,8 +42,7 @@ highlights-bartender = Bartender, Barkeeper, Barkeep, "Bar", Service, "Serv" highlights-chaplain = Chaplain, "Chap", Chapel, Service, "Serv" highlights-chef = Chef, "Cook", Kitchen, Service, "Serv" highlights-clown = Clown, Theatre, Theater, Service, "Serv" -# Funky - Replaced Serv(ice) with Civ(ilian) -highlights-janitor = Janitor, "Jani", Civilian, "Civ" +highlights-janitor = Janitor, "Jani", Service, "Serv" highlights-lawyer = Lawyer, Attorney, "Law", Civilian, "Civ" highlights-librarian = Librarian, Library, Service, "Serv" highlights-mime = Mime, Theatre, Theater, Service, "Serv" @@ -53,7 +52,8 @@ highlights-passenger = Passenger, Greytider, Graytider, "Tider", "Tide", Assista 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