diff --git a/Resources/Locale/en-US/announcements/announcers/announcers.ftl b/Resources/Locale/en-US/announcements/announcers/announcers.ftl index d18857a38e2..eeaaf3bcab3 100644 --- a/Resources/Locale/en-US/announcements/announcers/announcers.ftl +++ b/Resources/Locale/en-US/announcements/announcers/announcers.ftl @@ -1,4 +1,4 @@ -announcer-Intern-name=Central Command +announcer-Intern-name=District Command announcer-MedBot-name=Automated announcer-Michael-name=Michael announcer-NEIL-name=N.E.I.L. diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl index 555b0ccc860..b717943f661 100644 --- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl +++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl @@ -21,7 +21,7 @@ chat-manager-whisper-headset-on-message = You can't whisper on the radio! chat-manager-language-prefix = ({ $language }){" "} chat-manager-server-wrap-message = [bold]{$message}[/bold] -chat-manager-sender-announcement = Central Command +chat-manager-sender-announcement = Federation Oversight chat-manager-sender-announcement-wrap-message = [font size=14][bold]{$sender} Announcement:[/font][font size=12] {$message}[/bold][/font] diff --git a/Resources/Locale/en-US/deltav/job/job-supervisors.ftl b/Resources/Locale/en-US/deltav/job/job-supervisors.ftl index d911839af25..40017871a86 100644 --- a/Resources/Locale/en-US/deltav/job/job-supervisors.ftl +++ b/Resources/Locale/en-US/deltav/job/job-supervisors.ftl @@ -1,2 +1,2 @@ job-supervisors-cj = the Chief Justice -job-supervisors-command = all command staff +job-supervisors-command = all district government executives diff --git a/Resources/Locale/en-US/job/department-desc.ftl b/Resources/Locale/en-US/job/department-desc.ftl index 1e3b00f4363..893a1943f00 100644 --- a/Resources/Locale/en-US/job/department-desc.ftl +++ b/Resources/Locale/en-US/job/department-desc.ftl @@ -1,11 +1,11 @@ -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. -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. -department-Medical-description = Keep the crew healthy. -department-Security-description = Keep the peace around the station. -department-Science-description = Research artifacts and anomalies to invent new equipment for the station -department-Silicon-description = Obey your laws and serve the crew. -department-Specific-description = Jobs that not all stations have. +department-Cargo-description = Complete bounties, earn Cubits, and handle the district freighter port. +department-Civilian-description = Perform small helpful tasks to keep the district sane and well catered. +department-Command-description = Manage the district and keep it working efficiently. +department-CentralCommand-description = Manage district command and keep them working efficiently. +department-Engineering-description = Keep the power on and the district operational. +department-Medical-description = Keep the district healthy. +department-Security-description = Keep the peace around the district. +department-Science-description = Better the interests of the Federation and study the Emission. +department-Silicon-description = Obey your laws and serve the district. +department-Specific-description = Jobs that not all maps have. department-Dignitary-description = Assist Heads of Staff and Captain, follow your directives. diff --git a/Resources/Locale/en-US/job/department.ftl b/Resources/Locale/en-US/job/department.ftl index 93a05c9f6d9..ce11ac8a0e8 100644 --- a/Resources/Locale/en-US/job/department.ftl +++ b/Resources/Locale/en-US/job/department.ftl @@ -1,11 +1,11 @@ department-Logistics = Logistics -department-Civilian = Civilian -department-Command = Command -department-CentralCommand = Central Command -department-Engineering = Engineering -department-Medical = Medical -department-Security = Security -department-Research = Research +department-Civilian = Service +department-Command = District Executive +department-CentralCommand = Federation Command +department-Engineering = Engineering Infrastructure +department-Medical = Hospital Staff +department-Security = Law Enforcement +department-Research = Federation Forces department-Silicon = Silicon -department-Specific = Station specific +department-Specific = Map specific department-Dignitary = Dignitary diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index d247ac7c067..e17dff26caa 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/Resources/Locale/en-US/job/job-description.ftl @@ -1,54 +1,54 @@ -job-description-technical-assistant = Learn the basics of managing the station's power, as well as repairing the station's hull. -job-description-atmostech = Optimize the station's atmospherics setup, and synthesize rare gases to use or sell. -job-description-bartender = Manage the bar and keep it lively, give out drinks, and listen to the crew's stories. -job-description-botanist = Grow food for the chef, drugs for medbay, and other plants to keep yourself entertained. -job-description-borg = Half-human, Half-machine. Follow your laws, serve the crew, and hound the research team for upgrades. +job-description-technical-assistant = Learn the basics of managing a powergrid, as well as repairing whatever damage arises. +job-description-atmostech = Optimize the atmospherics setup, and synthesize rare gases to use or sell. +job-description-bartender = Manage the bar and keep it lively, give out drinks, and listen to the patron's stories. +job-description-botanist = Grow food for eating, drugs for medicinal use, and other plants to keep yourself entertained. +job-description-borg = A slaved synthetic. Follow your laws, serve Federation interests. job-description-boxer = Fight your way to the top! Challenge the head of personnel and get brigged when you win. Currently available on Edge, Hive, Pebble and Tortuga. job-description-brigmedic = Fight in the rear of the security service, for the lives of your comrades! You are the first and last hope of your squad. Hippocrates bless you. -job-description-cadet = Learn the basics of arresting criminals and managing the brig. Listen to your supervisors and feel free to ask them for any help. -job-description-captain = Keep the station running, delegate work to the other heads of staff, and exert your will. -job-description-cargotech = Deal with requisitions and deliveries, pilot the cargo shuttle to the trade station and back, and work with others to make ludicrous amounts of cash and then waste it all gambling. -job-description-ce = Manage the engineering department to ensure power, atmospherics, and the hull are in perfect shape. -job-description-centcomoff = Act as an ambassador to the newest state-of-the-art space station in Nanotrasen's fleet. -job-description-chaplain = Preach the good word of your deity and religion, and conduct spiritual healing and miracles with your bible. -job-description-chef = Keep the station fed with a variety of food items, butcher dead animals to ensure ammonia doesn't leak, and help keep the bar lively. -job-description-chemist = Produce medicinal drugs for the doctors to use, research ethically dubious rare chemicals, and produce weapons of war when enemies of the station arrive. -job-description-clown = Entertain the crew through elaborate slapstick routines or terrible jokes. -job-description-cmo = Manage the resources and personnel of the medical department to keep the crew alive. -job-description-paramedic = Rescue critically injured patients all over the station, sometimes outside too. Stablize them, give them a ride to medbay, and get back out there! -job-description-detective = Investigate crime scenes using forensic tools, ensure that the guilty party is found, and have a couple smokes. -job-description-doctor = Diagnose and heal crewmembers through medicinal chemicals, advanced medicine, and defibrillators. Make sure the dead don't rot, and that cadavers are in the morgue. -job-description-engineer = Keep the station's main engine & solars active, optimize the power network, and make emergency repairs using your hardsuit in spaced areas. -job-description-ertchaplain = Ensure the station crew's last rights are taken care of. -job-description-ertengineer = Ensure that the station has power and clean air. -job-description-ertjanitor = Ensure that the station is properly cleaned--for morale. -job-description-ertleader = Lead the Emergency Response Team in dealing with threats to Nanotrasen assets. -job-description-ertmedic = Ensure that the crew of the station is kept alive and healthy. -job-description-ertsecurity = Ensure that any active threats to the station are put to rest. +job-description-cadet = Learn the basics of arresting criminals and managing the judicial sector. Listen to your supervisors and feel free to ask them for any help. +job-description-captain = Keep the district running, delegate to the other heads of staff on public works, and exert your will. +job-description-cargotech = Deal with requisitions and deliveries, pilot the cargo freighter to the trade post and back, and work with others to make ludicrous amounts of cash and then waste it all gambling. +job-description-ce = Manage the engineering department to ensure power, atmospherics, and the foundation are in perfect shape. +job-description-centcomoff = Act as an ambassador to the district administration. +job-description-chaplain = Preach the good word of your deity and religion, and harness psionic secrets. Protect your followers from the district's Mantis and the Federation's prying eye. +job-description-chef = Keep the district fed with a variety of food items, butcher dead animals to ensure ammonia doesn't leak, and help keep the diner lively. +job-description-chemist = Produce medicinal drugs for the doctors to use, research ethically dubious rare chemicals, and produce weapons of war when enemies arrive. +job-description-clown = Entertain an audience through elaborate slapstick routines or terrible jokes. +job-description-cmo = Manage the resources and personnel of the hospital to keep injured folk alive. +job-description-paramedic = Rescue critically injured patients all over the district, sometimes outside too. Stabilize them, give them a ride to the hospital, and get back out there! +job-description-detective = Investigate crime scenes using forensic tools, ensure that the guilty party is found, and have many smokes. +job-description-doctor = Diagnose and heal casualties through medicinal chemicals, advanced medicine, and defibrillators. Make sure the dead don't rot, and that cadavers are in the morgue. +job-description-engineer = Keep the district's reactor & solars active, optimize the power network, and make emergency repairs to the foundation. +job-description-ertchaplain = Ensure the district's last rights are taken care of. +job-description-ertengineer = Ensure that the district has power and clean air. +job-description-ertjanitor = Ensure that the district is properly cleaned--for morale. +job-description-ertleader = Lead the Emergency Response Team in dealing with threats to Metropolis. +job-description-ertmedic = Ensure that the people of the district are kept alive and healthy. +job-description-ertsecurity = Ensure that any active threats to the district are put to rest. job-description-hop = Handle access reassignment fairly using your ID console, manage the service department, and keep Ian safe. -job-description-hos = Manage your security force and keep them efficient, quell dissent, and keep the other heads of staff safe. +job-description-hos = Manage your police force and keep them efficient, quell dissent, and keep the district executives safe. job-description-intern = Learn the basics of administering medicine, basic chemicals and using medical tools. -job-description-janitor = Keep the station clean of any trash or slipping hazards, and help deal with rat infestations. +job-description-janitor = Keep the city clean of any trash or slipping hazards, and help deal with rat infestations. job-description-lawyer = Ensure that every prisoner or criminal receives a fair judgment and trial if necessary. -job-description-librarian = Understand every language and hear your coworkers shit talk each other, lord over your collection of outdated guides, lament the lack of rich text in the game. -job-description-mime = Entertain the crew without speaking or writing, and engage with light rivalry with the clown. -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 logistics department, keep the salvage specialists working, make sure all orders are fulfilled, and keep the money flowing. -job-description-rd = Manage the research department, unlocking technologies, acquiring & researching artifacts, and performing experiments. +job-description-librarian = Understand every language and hear your neighbors shit talk each other, lord over your collection of outdated guides, lament the lack of rich text in the game. +job-description-mime = Entertain an audience without speaking or writing, and engage with light rivalry with the clown. +job-description-musician = Entertain an audience with your unique musical talent, and acquire new instruments to mess around with. +job-description-passenger = Enjoy your stay in the area with no obligations! +job-description-psychologist = Provide emotional support to traumatized people. +job-description-qm = Manage the supplies of the cargo dock & the logistics department, keep the salvage specialists working, make sure all orders are fulfilled, and keep the money flowing. +job-description-rd = Manage the Federation facility, unlocking technologies, acquiring & researching artifacts, and performing experiments. job-description-research-assistant = Learn the basics of how to research various artifacts, anomalies and robotics. -job-description-reporter = Entertain & inform the crew with your vibrant journalism through wireless cameras, the radio and the news. -job-description-roboticist = Build a makeshift workshop in research closet and create your own cyborg army. -job-description-salvagespec = Use the salvage magnet to draw in detatched 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-reporter = Entertain & inform the district with your vibrant journalism through wireless cameras, the radio and the news. +job-description-roboticist = Work the Federation mechanics department and maintain the military machines. +job-description-salvagespec = Use the salvage magnet to draw in detached scraps & asteroids to loot and enrich the district, customize and reconfigure your salvage barge to suit your needs, and try not to fall out. +job-description-scientist = Research ancient artifacts, unlock new technologies, sell your advances to the nearby businesses, and study the Emission. +job-description-security = Catch criminals, enforce the law, and ensure that the district does not fall into disarray. job-description-serviceworker = Learn the basics of bartending, cooking, and growing plants. -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. -job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. Currently unavailable. -job-description-senior-engineer = Teach new engineers the basics of the station's engine, repairing, atmospherics and power. -job-description-senior-researcher = Teach new scientists the basics of item printing, artifact research and anomalous objects. +job-description-station-ai = Follow your laws and serve as the pilot of the Federation frigate. +job-description-visitor = Enjoy your visit to the district. +job-description-warden = Patrol the justice sector, 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. +job-description-zookeeper = Put on a joyful display of cute animals and space carps for all to see. Currently unavailable. +job-description-senior-engineer = Teach new engineers the basics of the district's reactor, repairing, atmospherics and power. +job-description-senior-researcher = Explore the dangers of outer space and serve as the Federation's foremost pioneers. job-description-senior-physician = Teach new medics the basics of tending to the wounded, chemistry, diagnosing the diseased and disposing of the dead. job-description-senior-officer = Teach new officers the basics of searches, performing arrests, prison times and how to properly shoot a firearm. diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 064b7b6e5de..d8a5ee0d640 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -11,8 +11,8 @@ job-name-senior-physician = Senior Physician job-name-senior-officer = Police Officer job-name-scientist = Researcher job-name-research-assistant = Research Assistant -job-name-rd = Research Director -job-name-roboticist = Biologist +job-name-rd = Site Commander +job-name-roboticist = Roboticist job-name-psychologist = Psychologist job-name-intern = Medical Intern job-name-doctor = Medical Doctor @@ -23,7 +23,7 @@ job-name-technical-assistant = Technical Assistant job-name-engineer = Maintenance Tech job-name-atmostech = Atmospheric Technician job-name-hop = Head of Personnel -job-name-captain = District Executive +job-name-captain = District Director job-name-ntrep = Corporate Liaison job-name-serviceworker = Service Worker job-name-centcomoff = CentComm Official @@ -42,7 +42,7 @@ job-name-botanist = Botanist job-name-bartender = Bartender job-name-passenger = Pedestrian job-name-salvagespec = Salvage Specialist -job-name-station-ai = Station AI +job-name-station-ai = Frigate AI job-name-qm = Logistics Officer job-name-cargotech = Cargo Technician job-name-chef = Chef @@ -79,7 +79,7 @@ JobBartender = Bartender JobBorg = Borg JobBotanist = Botanist JobBoxer = Boxer -JobCaptain = District Executive +JobCaptain = District Director JobCargoTechnician = Cargo Technician JobCentralCommandOfficial = Central Command Official JobChaplain = Chaplain @@ -111,7 +111,7 @@ JobPsychologist = Psychologist JobQuartermaster = Logistics Officer JobReporter = Reporter JobResearchAssistant = Research Assistant -JobResearchDirector = Research Director +JobResearchDirector = Site Commander JobRoboticist = Biologist JobSalvageSpecialist = Salvage Specialist JobScientist = Researcher diff --git a/Resources/Locale/en-US/job/job-supervisors.ftl b/Resources/Locale/en-US/job/job-supervisors.ftl index ef14c02461a..869e824c770 100644 --- a/Resources/Locale/en-US/job/job-supervisors.ftl +++ b/Resources/Locale/en-US/job/job-supervisors.ftl @@ -1,15 +1,15 @@ -job-supervisors-centcom = Central Command -job-supervisors-captain = the captain +job-supervisors-centcom = Federation oversight +job-supervisors-captain = the district director job-supervisors-hop = the head of personnel -job-supervisors-hos = the head of security +job-supervisors-hos = the Marshall job-supervisors-ce = the chief engineer job-supervisors-cmo = the chief medical officer -job-supervisors-rd = the research director -job-supervisors-qm = the logistics officer -job-supervisors-service = chefs, botanists, the bartender, and the head of personnel +job-supervisors-rd = your ranking Federation officer +job-supervisors-qm = the logistics oversight +job-supervisors-service = whoever owns your business, and district regulators job-supervisors-engineering = station engineers, atmospheric technicians, and the chief engineer job-supervisors-medicine = medical doctors, chemists, and the chief medical officer -job-supervisors-security = security officers, the warden, and the head of security -job-supervisors-science = scientists, and the research director +job-supervisors-security = police officers, the warden, and the Marshall +job-supervisors-science = scientists, and Federation command job-supervisors-hire = whoever hires you job-supervisors-everyone = absolutely everyone diff --git a/Resources/Locale/en-US/job/job.ftl b/Resources/Locale/en-US/job/job.ftl index d999c0d92d1..190c9e838e5 100644 --- a/Resources/Locale/en-US/job/job.ftl +++ b/Resources/Locale/en-US/job/job.ftl @@ -1,6 +1,6 @@ -job-greet-station-name = Welcome aboard {$stationName}. +job-greet-station-name = Welcome to {$stationName}. job-greet-introduce-job-name = Your role is: {$jobName}. job-greet-important-disconnect-admin-notify = You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via ahelp. job-greet-supervisors-warning = As the {$jobName} you answer directly to {$supervisors}. Special circumstances may change this. -job-greet-crew-shortages = As this station was initially staffed with a skeleton crew, additional access has been added to your ID card. -job-not-available-wait-in-lobby = The round has started, but you did not receive any of your preferred job roles (or have no preferred job roles selected) and chose to remain in the lobby. You can change this behavior on the customization screen. \ No newline at end of file +job-greet-crew-shortages = As the district was initially staffed with a skeleton crew, additional emergency access has been added to your ID card. +job-not-available-wait-in-lobby = The round has started, but you did not receive any of your preferred job roles (or have no preferred job roles selected) and chose to remain in the lobby. You can change this behavior on the customization screen. diff --git a/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl b/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl index 3b9bc86e6f8..c1cedc154ea 100644 --- a/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl +++ b/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl @@ -3,4 +3,4 @@ job-description-guard = Keep track of prisoners and make sure they have their ba job-description-mail-carrier = Deliver mail and other packages from and to logistics. Avoid dogs. job-description-martialartist = Be honorable and disciplined, spar in the dojo, challenge security to CQC. Currently available on Shōkō. job-description-prisoner = Sit in prison. Gamble with your cellmates. Talk to the warden. Write your memoirs. -job-description-mantis = Solve mysteries from the nature of the universe to the meaning of life. Be the main person to deal with Psionic beings. +job-description-mantis = Find and crack down on unregistered psychics. Conscript them, study them or simply arrest them all in Federation interests. diff --git a/Resources/Locale/en-US/shuttles/emergency.ftl b/Resources/Locale/en-US/shuttles/emergency.ftl index ef3582c623c..3cb48a49295 100644 --- a/Resources/Locale/en-US/shuttles/emergency.ftl +++ b/Resources/Locale/en-US/shuttles/emergency.ftl @@ -5,17 +5,17 @@ emergency-shuttle-command-round-yes = Round delayed. emergency-shuttle-command-round-no = Unable to delay round end. ## Dock emergency shuttle -emergency-shuttle-command-dock-desc = Calls the emergency shuttle and docks it to the station... if it can. +emergency-shuttle-command-dock-desc = Calls the emergency shuttle and docks it to the district... if it can. ## Launch emergency shuttle emergency-shuttle-command-launch-desc = Early launches the emergency shuttle if possible. # Emergency shuttle -emergency-shuttle-left = The Emergency Shuttle has left the station. Estimate {$transitTime} seconds until the shuttle arrives at CentComm. +emergency-shuttle-left = The Emergency Shuttle has left the district. Estimate {$transitTime} seconds until the shuttle arrives within Kashinzo. emergency-shuttle-launch-time = The emergency shuttle will launch in {$consoleAccumulator} seconds. emergency-shuttle-docked = The Emergency Shuttle has docked {$direction} of the station, {$location}. It will leave in {$time} seconds.{$extended} -emergency-shuttle-good-luck = The Emergency Shuttle is unable to find a station. Good luck. -emergency-shuttle-nearby = The Emergency Shuttle is unable to find a valid docking port. It has warped in {$direction} of the station, {$location}. It will leave in {$time} seconds.{$extended} +emergency-shuttle-good-luck = The Emergency Shuttle is unable to find a district. Good luck. +emergency-shuttle-nearby = The Emergency Shuttle is unable to find a valid docking port. It has flown in {$direction} of the district, {$location}. It will leave in {$time} seconds.{$extended} emergency-shuttle-extended = {" "}Launch time has been extended due to inconvenient circumstances. # Emergency shuttle console popup / announcement @@ -37,4 +37,4 @@ emergency-shuttle-ui-remaining = Remaining: {$remaining} # Map Misc. map-name-centcomm = Central Command -map-name-terminal = Arrivals Terminal \ No newline at end of file +map-name-terminal = Kashinzo Departure Terminal diff --git a/Resources/Locale/en-US/station-events/events/airlock-virus.ftl b/Resources/Locale/en-US/station-events/events/airlock-virus.ftl index e9681c1bde2..0057c1a670d 100644 --- a/Resources/Locale/en-US/station-events/events/airlock-virus.ftl +++ b/Resources/Locale/en-US/station-events/events/airlock-virus.ftl @@ -1 +1 @@ -airlock-virus-event-announcement = We have detected a GR4YT1D3 virus in the station's systems. Engineering staff are to inspect all station equipment for malfunctions and affect repairs if necessary. +airlock-virus-event-announcement = We have detected a GR4YT1D3 virus in the district's systems. Engineering servicemen are to inspect all stationary equipment for malfunctions and affect repairs if necessary. diff --git a/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl b/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl index a80634fcdb2..0ef8a14e2bb 100644 --- a/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl +++ b/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl @@ -1,6 +1,6 @@ -anomaly-spawn-event-announcement = Our readings have detected a dangerous interspacial anomaly. Please inform the research team about { $sighting }. +anomaly-spawn-event-announcement = Our readings have detected a dangerous Emission anomaly. Please inform authorities about { $sighting }. -anomaly-spawn-sighting-1 = low pulsating sounds heard throughout the station +anomaly-spawn-sighting-1 = low pulsating sounds heard throughout the district anomaly-spawn-sighting-2 = strange sources of light anomaly-spawn-sighting-3 = inexplicable shapes anomaly-spawn-sighting-4 = forms causing severe mental distress diff --git a/Resources/Locale/en-US/station-events/events/bluespace-artifact.ftl b/Resources/Locale/en-US/station-events/events/bluespace-artifact.ftl index 59ea8a536b5..0b524083297 100644 --- a/Resources/Locale/en-US/station-events/events/bluespace-artifact.ftl +++ b/Resources/Locale/en-US/station-events/events/bluespace-artifact.ftl @@ -1,9 +1,9 @@ -bluespace-artifact-event-announcement = Our readings have detected an incoming object of alien origin. Please inform the research team of { $sighting }. +bluespace-artifact-event-announcement = Our readings have detected an incoming object of unknown origin. Please inform authorities of { $sighting }. bluespace-artifact-sighting-1 = bright flashes of light bluespace-artifact-sighting-2 = strange sounds coming from maintenance tunnels bluespace-artifact-sighting-3 = otherworldly structures -bluespace-artifact-sighting-4 = incomprehensible alien objects +bluespace-artifact-sighting-4 = incomprehensible objects bluespace-artifact-sighting-5 = unfamiliar objects in strange places -bluespace-artifact-sighting-6 = unknown alien artifacts -bluespace-artifact-sighting-7 = explosions of light accompanied by weird sounds +bluespace-artifact-sighting-6 = unknown artifacts +bluespace-artifact-sighting-7 = explosions of light accompanied by unusual sounds diff --git a/Resources/Locale/en-US/station-events/events/breaker-flip.ftl b/Resources/Locale/en-US/station-events/events/breaker-flip.ftl index b3ed9c8fcef..909b613baf3 100644 --- a/Resources/Locale/en-US/station-events/events/breaker-flip.ftl +++ b/Resources/Locale/en-US/station-events/events/breaker-flip.ftl @@ -1 +1 @@ -station-event-breaker-flip-announcement = Based on { $data }, we have opted to disable specific APCs to avoid damage to equipment. Please contact the engineering department to re-enable them. +station-event-breaker-flip-announcement = Based on { $data }, we have opted to disable specific APCs to avoid damage to equipment. Please contact engineering services to re-enable them. diff --git a/Resources/Locale/en-US/station-events/events/bureaucratic-error.ftl b/Resources/Locale/en-US/station-events/events/bureaucratic-error.ftl index 9323c4cb8c5..ea1c2ece8d7 100644 --- a/Resources/Locale/en-US/station-events/events/bureaucratic-error.ftl +++ b/Resources/Locale/en-US/station-events/events/bureaucratic-error.ftl @@ -1,2 +1,2 @@ station-event-bureaucratic-error-announcement = A recent bureaucratic error in the Organic Resources Department may result in personnel shortages in some departments and redundant staffing in others. -station-event-clerical-error-announcement = A minor clerical error in the Organic Resources Department has resulted in the permanent destruction of some of the station records. +station-event-clerical-error-announcement = A minor clerical error in the Organic Resources Department has resulted in the permanent destruction of some of the district's records. diff --git a/Resources/Locale/en-US/station-events/events/cargo-gifts.ftl b/Resources/Locale/en-US/station-events/events/cargo-gifts.ftl index fd20459b5eb..2dda6e4e0c5 100644 --- a/Resources/Locale/en-US/station-events/events/cargo-gifts.ftl +++ b/Resources/Locale/en-US/station-events/events/cargo-gifts.ftl @@ -1,14 +1,14 @@ -cargo-gifts-event-announcement = Congratulations! { $sender } has decided to send { $description } to the station { $dest }. Look for it in your next cargo shipment. +cargo-gifts-event-announcement = Congratulations! { $sender } has decided to send { $description } to the district's { $dest }. Look for it in your next cargo shipment. cargo-gift-default-description = A bundle of gifts -cargo-gift-default-sender = NanoTrasen -cargo-gift-default-dest = Logistics Dept. +cargo-gift-default-sender = NEWSTAR +cargo-gift-default-dest = Freighter Docks -cargo-gift-dest-bar = bar +cargo-gift-dest-bar = Club Rezz cargo-gift-dest-eng = Engineering Dept -cargo-gift-dest-supp = Logistics Dept -cargo-gift-dest-janitor = Service Dept -cargo-gift-dest-med = Medical Dept -cargo-gift-dest-sec = Security Dept +cargo-gift-dest-supp = Freighter Docks +cargo-gift-dest-janitor = Waste Disposal +cargo-gift-dest-med = Hospital +cargo-gift-dest-sec = Police Department cargo-gift-pizza-small = a small pizza party cargo-gift-pizza-large = a large pizza party diff --git a/Resources/Locale/en-US/station-events/events/gas-leak.ftl b/Resources/Locale/en-US/station-events/events/gas-leak.ftl index 230e886db47..b6158d7393f 100644 --- a/Resources/Locale/en-US/station-events/events/gas-leak.ftl +++ b/Resources/Locale/en-US/station-events/events/gas-leak.ftl @@ -1,2 +1,2 @@ -station-event-gas-leak-announcement = Attention crew, there is a gas leak on the station. We advise you to avoid the area and wear suit internals in the meantime. +station-event-gas-leak-announcement = Attention crew, there is a gas leak within the district. We advise you to avoid the area and wear emergency internals in the meantime when near. station-event-gas-leak-complete-announcement = The source of the gas leak has been fixed. Please be cautious around areas with gas remaining. diff --git a/Resources/Locale/en-US/station-events/events/greytide-virus.ftl b/Resources/Locale/en-US/station-events/events/greytide-virus.ftl index 7e6f5e32ca6..2dd228eb54b 100644 --- a/Resources/Locale/en-US/station-events/events/greytide-virus.ftl +++ b/Resources/Locale/en-US/station-events/events/greytide-virus.ftl @@ -1 +1 @@ -station-event-greytide-virus-start-announcement = Gr3y.T1d3 virus detected in the station's secure locking encryption subroutines. Severity level of { $severity }. Recommend station AI involvement. +station-event-greytide-virus-start-announcement = Gr3y.T1d3 virus detected in the district's secure locking encryption subroutines. Severity level of { $severity }. Recommend counter-security involvement. diff --git a/Resources/Locale/en-US/station-events/events/immovable-rod.ftl b/Resources/Locale/en-US/station-events/events/immovable-rod.ftl index ff39923ecdd..484cb0a9d5c 100644 --- a/Resources/Locale/en-US/station-events/events/immovable-rod.ftl +++ b/Resources/Locale/en-US/station-events/events/immovable-rod.ftl @@ -1 +1 @@ -station-event-immovable-rod-announcement = High velocity unidentified object is on a collision course with the station. Impact imminent. +station-event-immovable-rod-announcement = High velocity unidentified object is on a collision course with the district. Impact imminent. diff --git a/Resources/Locale/en-US/station-events/events/ion-storm.ftl b/Resources/Locale/en-US/station-events/events/ion-storm.ftl index f9ee45a49b7..b32a283db38 100644 --- a/Resources/Locale/en-US/station-events/events/ion-storm.ftl +++ b/Resources/Locale/en-US/station-events/events/ion-storm.ftl @@ -1,14 +1,14 @@ -station-event-ion-storm-announcement = Ion storm detected near the station. Please check all AI-controlled equipment for errors. +station-event-ion-storm-announcement = Ion storm detected near the district. Please check all AI-controlled equipment for errors. ion-storm-law-scrambled-number = [font="Monospace"][scramble rate=250 length={$length} chars="@@###$$&%!01"/][/font] ion-storm-you = YOU -ion-storm-the-station = THE STATION -ion-storm-the-crew = THE CREW +ion-storm-the-station = THE CITY +ion-storm-the-crew = THE CITYFOLK ion-storm-the-job = THE {$job} ion-storm-clowns = CLOWNS ion-storm-heads = HEADS OF STAFF -ion-storm-crew = CREW +ion-storm-crew = CITYFOLK ion-storm-people = PEOPLE ion-storm-adjective-things = {$adjective} THINGS @@ -17,19 +17,19 @@ ion-storm-x-and-y = {$x} AND {$y} # joined is short for {$number} {$adjective} # subjects can generally be threats or jobs or objects # thing is specified above it -ion-storm-law-on-station = THERE ARE {$joined} {$subjects} ON THE STATION -ion-storm-law-no-shuttle = THE SHUTTLE CANNOT BE CALLED BECAUSE OF {$joined} {$subjects} ON THE STATION +ion-storm-law-on-station = THERE ARE {$joined} {$subjects} IN THE CITY +ion-storm-law-no-shuttle = THE SHUTTLE CANNOT BE CALLED BECAUSE OF {$joined} {$subjects} IN THE CITY ion-storm-law-crew-are = THE {$who} ARE NOW {$joined} {$subjects} -ion-storm-law-subjects-harmful = {$adjective} {$subjects} ARE HARMFUL TO THE CREW -ion-storm-law-must-harmful = THOSE WHO {$must} ARE HARMFUL TO THE CREW +ion-storm-law-subjects-harmful = {$adjective} {$subjects} ARE HARMFUL TO THE PEOPLE +ion-storm-law-must-harmful = THOSE WHO {$must} ARE HARMFUL TO THE PEOPLE # thing is a concept or action -ion-storm-law-thing-harmful = {$thing} IS HARMFUL TO THE CREW -ion-storm-law-job-harmful = {$adjective} {$job} ARE HARMFUL TO THE CREW +ion-storm-law-thing-harmful = {$thing} IS HARMFUL TO THE PEOPLE +ion-storm-law-job-harmful = {$adjective} {$job} ARE HARMFUL TO THE PEOPLE # thing is objects or concept, adjective applies in both cases -# this means you can get a law like "NOT HAVING CHRISTMAS-STEALING COMMUNISM IS HARMFUL TO THE CREW" :) -ion-storm-law-having-harmful = HAVING {$adjective} {$thing} IS HARMFUL TO THE CREW -ion-storm-law-not-having-harmful = NOT HAVING {$adjective} {$thing} IS HARMFUL TO THE CREW +# this means you can get a law like "NOT HAVING CHRISTMAS-STEALING COMMUNISM IS HARMFUL TO THE PEOPLE" :) +ion-storm-law-having-harmful = HAVING {$adjective} {$thing} IS HARMFUL TO THE PEOPLE +ion-storm-law-not-having-harmful = NOT HAVING {$adjective} {$thing} IS HARMFUL TO THE PEOPLE # thing is a concept or require ion-storm-law-requires = {$who} {$plural -> @@ -62,8 +62,8 @@ ion-storm-law-eat = THE {$who} MUST EAT {$adjective} {$food} TO SURVIVE ion-storm-law-drink = THE {$who} MUST DRINK {$adjective} {$drink} TO SURVIVE ion-storm-law-change-job = THE {$who} ARE NOW {$adjective} {$change} -ion-storm-law-highest-rank = THE {$who} ARE NOW THE HIGHEST RANKING CREWMEMBERS -ion-storm-law-lowest-rank = THE {$who} ARE NOW THE LOWEST RANKING CREWMEMBERS +ion-storm-law-highest-rank = THE {$who} ARE NOW THE HIGHEST RANKING PEOPLE +ion-storm-law-lowest-rank = THE {$who} ARE NOW THE LOWEST RANKING PEOPLE ion-storm-law-crew-must = THE {$who} MUST {$must} ion-storm-law-crew-must-go = THE {$who} MUST GO TO {$area} @@ -75,12 +75,12 @@ ion-storm-part = {$part -> # due to phrasing, this would mean a law such as # ONLY HUMANS ARE NOT PART OF THE CREW # would make non-human nukies/syndies/whatever crew :) -ion-storm-law-crew-only-1 = ONLY THE {$who} ARE {$part} OF THE CREW -ion-storm-law-crew-only-2 = ONLY THE {$who} AND {$other} ARE {$part} OF THE CREW -ion-storm-law-crew-only-subjects = ONLY {$adjective} {$subjects} ARE {$part} OF THE CREW -ion-storm-law-crew-must-do = ONLY THOSE WHO {$must} ARE {$part} OF THE CREW -ion-storm-law-crew-must-have = ONLY THOSE WHO HAVE {$adjective} {$objects} ARE {$part} OF THE CREW -ion-storm-law-crew-must-eat = ONLY THOSE WHO EAT {$adjective} {$food} ARE {$part} OF THE CREW +ion-storm-law-crew-only-1 = ONLY THE {$who} ARE {$part} OF THE PEOPLE +ion-storm-law-crew-only-2 = ONLY THE {$who} AND {$other} ARE {$part} OF THE PEOPLE +ion-storm-law-crew-only-subjects = ONLY {$adjective} {$subjects} ARE {$part} OF THE PEOPLE +ion-storm-law-crew-must-do = ONLY THOSE WHO {$must} ARE {$part} OF THE PEOPLE +ion-storm-law-crew-must-have = ONLY THOSE WHO HAVE {$adjective} {$objects} ARE {$part} OF THE PEOPLE +ion-storm-law-crew-must-eat = ONLY THOSE WHO EAT {$adjective} {$food} ARE {$part} OF THE PEOPLE ion-storm-law-harm = YOU MUST HARM {$who} AND NOT ALLOW THEM, THROUGH INACTION, TO ESCAPE HARM ion-storm-law-protect = YOU MUST NEVER HARM {$who} AND NOT ALLOW THEM, THROUGH INACTION, TO COME TO HARM diff --git a/Resources/Locale/en-US/station-events/events/kudzu-growth.ftl b/Resources/Locale/en-US/station-events/events/kudzu-growth.ftl index 9ba4adb4a2d..f2ea8cd1d91 100644 --- a/Resources/Locale/en-US/station-events/events/kudzu-growth.ftl +++ b/Resources/Locale/en-US/station-events/events/kudzu-growth.ftl @@ -1 +1 @@ -station-event-kudzu-growth-announcement = Attention crew, we have detected a Type 2 Biological Invader on-station, that poses potentially serious threat to crew productivity. We advise you to exterminate it. +station-event-kudzu-growth-announcement = Biohazard sensors have detected a Type 2 Biological Invader within the district, prepare for hostile floral elements and overgrowth if unchecked. diff --git a/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl b/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl index 101193651cb..6ff8a980a8f 100644 --- a/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl +++ b/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl @@ -1,5 +1,5 @@ -station-event-meteor-swarm-announcement = Meteors have been detected on collision course with the station. -station-event-meteor-swarm-complete-announcement = The meteor swarm has passed. Please return to your stations. +station-event-meteor-swarm-announcement = Meteors have slipped into the periphery shield. Seek shelter away from external areas. +station-event-meteor-swarm-complete-announcement = The meteor swarm has passed. -station-event-space-dust-announcement = The station is passing through a debris cloud, expect minor damage to external fittings and fixtures. -station-event-meteor-urist-announcement = The station is colliding with an unidentified swarm of debris. Please stay calm and do not listen to them. +station-event-space-dust-announcement = The district outskirts are passing through a debris cloud, expect minor damage to external fittings and fixtures. +station-event-meteor-urist-announcement = The district is colliding with an unidentified swarm of debris. Please stay calm and do not listen to them. diff --git a/Resources/Locale/en-US/station-events/events/mouse-migration.ftl b/Resources/Locale/en-US/station-events/events/mouse-migration.ftl index 98a86ca1532..20da257659d 100644 --- a/Resources/Locale/en-US/station-events/events/mouse-migration.ftl +++ b/Resources/Locale/en-US/station-events/events/mouse-migration.ftl @@ -1 +1 @@ -station-event-mouse-migration-announcement = We have detected an oncoming migration of rodents to the station. Please stay out of maintenance tunnels and try and avoid excessive contact. \ No newline at end of file +station-event-mouse-migration-announcement = We have detected an oncoming migration of rodents to the district. Please stay out of maintenance tunnels and try and avoid excessive contact. diff --git a/Resources/Locale/en-US/station-events/events/power-grid-check.ftl b/Resources/Locale/en-US/station-events/events/power-grid-check.ftl index 90ede6b9965..7786f16fce9 100644 --- a/Resources/Locale/en-US/station-events/events/power-grid-check.ftl +++ b/Resources/Locale/en-US/station-events/events/power-grid-check.ftl @@ -1,4 +1,4 @@ ## PowerGridCheck -station-event-power-grid-check-announcement = Abnormal activity detected in the station's powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration. -station-event-power-grid-check-complete-announcement = Power has been restored to the station. We apologize for the inconvenience. +station-event-power-grid-check-announcement = Abnormal activity detected in the district's powernet. As a precautionary measure, public power will be shut off for an indeterminate duration. +station-event-power-grid-check-complete-announcement = Power has been restored to the district. We apologize for the inconvenience. diff --git a/Resources/Locale/en-US/station-events/events/radiation-storm.ftl b/Resources/Locale/en-US/station-events/events/radiation-storm.ftl index a3c5f48e84f..9d5799b8da0 100644 --- a/Resources/Locale/en-US/station-events/events/radiation-storm.ftl +++ b/Resources/Locale/en-US/station-events/events/radiation-storm.ftl @@ -1,4 +1,4 @@ ## RadiationStorm -station-event-radiation-storm-announcement = High levels of radiation detected near the station. Evacuate any areas containing abnormal green energy fields. -station-event-radiation-storm-complete-announcement = The radiation threat has passed. Please return to your workplaces. +station-event-radiation-storm-announcement = An anomalous radiation belt is descending from orbit. Evacuate any areas containing abnormal green energy fields. +station-event-radiation-storm-complete-announcement = The radiation threat has passed. diff --git a/Resources/Locale/en-US/station-events/events/random-sentience.ftl b/Resources/Locale/en-US/station-events/events/random-sentience.ftl index f14a020d29e..e0d498d2c67 100644 --- a/Resources/Locale/en-US/station-events/events/random-sentience.ftl +++ b/Resources/Locale/en-US/station-events/events/random-sentience.ftl @@ -1,8 +1,8 @@ ## Phrases used for where central command got this information. random-sentience-event-data-1 = scans from our long-range sensors random-sentience-event-data-2 = our sophisticated probabilistic models -random-sentience-event-data-3 = our omnipotence -random-sentience-event-data-4 = the communications traffic on your station +random-sentience-event-data-3 = external reports +random-sentience-event-data-4 = the communications traffic in the district random-sentience-event-data-5 = energy emissions we detected random-sentience-event-data-6 = [REDACTED] @@ -36,4 +36,4 @@ station-event-random-sentience-flavor-corgi = corgi station-event-random-sentience-flavor-primate = primate station-event-random-sentience-flavor-kobold = kobold station-event-random-sentience-flavor-slime = slime -station-event-random-sentience-flavor-inanimate = inanimate \ No newline at end of file +station-event-random-sentience-flavor-inanimate = inanimate diff --git a/Resources/Locale/en-US/station-events/events/rempant-brand-intelligence.ftl b/Resources/Locale/en-US/station-events/events/rempant-brand-intelligence.ftl index 8f7403dabd2..c2fc9b65d30 100644 --- a/Resources/Locale/en-US/station-events/events/rempant-brand-intelligence.ftl +++ b/Resources/Locale/en-US/station-events/events/rempant-brand-intelligence.ftl @@ -1 +1 @@ -station-event-rampant-intelligence-announcement = Rampant brand intelligence has been detected board your station. Please inspect any vendors for aggressive marketing tactics, and reboot them if necessary. +station-event-rampant-intelligence-announcement = Rampant brand intelligence has been detected within the district. Please inspect any vendors for aggressive marketing tactics, and reboot them if necessary. diff --git a/Resources/Locale/en-US/station-events/events/solar-flare.ftl b/Resources/Locale/en-US/station-events/events/solar-flare.ftl index 617b65739a8..4ea1ae0ad8c 100644 --- a/Resources/Locale/en-US/station-events/events/solar-flare.ftl +++ b/Resources/Locale/en-US/station-events/events/solar-flare.ftl @@ -1,2 +1,2 @@ -station-event-solar-flare-announcement = A solar flare has been detected near the station. Some communication channels may not function. +station-event-solar-flare-announcement = A solar flare has been detected near the district. Some communication channels may not function. station-event-solar-flare-complete-announcement = The solar flare ended. Communication channels no longer affected. diff --git a/Resources/Locale/en-US/station-events/events/vent-critters.ftl b/Resources/Locale/en-US/station-events/events/vent-critters.ftl index fcfccff7c37..074beb8a8bd 100644 --- a/Resources/Locale/en-US/station-events/events/vent-critters.ftl +++ b/Resources/Locale/en-US/station-events/events/vent-critters.ftl @@ -1,20 +1,20 @@ -station-event-cockroach-migration-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity. -station-event-snail-migration-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity. -station-event-snail-migration-low-pop-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity. -station-event-slimes-spawn-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity. -station-event-vent-critters-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity. -station-event-spider-spawn-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity. -station-event-reagentslime-vents-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity. -station-event-meat-vents-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity. -station-event-neutral-xeno-vents-announcement = Confirmed sightings of alien wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to investigate the threat as soon as possible. -station-event-tick-vents-announcement = Confirmed sightings of hostile alien wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible. -station-event-argocyte-vents-announcement = Confirmed sightings of hostile alien wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible. -station-event-light-vents-announcement = Confirmed sightings of hostile alien wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible. -station-event-carp-vents-announcement = Confirmed sightings of hostile alien wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible. -station-event-space-vents-announcement = Confirmed sightings of hostile wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible. -station-event-carp-spawn-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity. -station-event-king-rat-migration-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity. -station-event-snake-spawn-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity. +station-event-cockroach-migration-announcement = Attention. A large influx of unknown life forms have been detected residing within the district's ventilation systems. Please be rid of these creatures before it begins to affect productivity. +station-event-snail-migration-announcement = Attention. A large influx of unknown life forms have been detected residing within the district's ventilation systems. Please be rid of these creatures before it begins to affect productivity. +station-event-snail-migration-low-pop-announcement = Attention. A large influx of unknown life forms have been detected residing within the district's ventilation systems. Please be rid of these creatures before it begins to affect productivity. +station-event-slimes-spawn-announcement = Attention. A large influx of unknown life forms have been detected residing within the district's ventilation systems. Please be rid of these creatures before it begins to affect productivity. +station-event-vent-critters-announcement = Attention. A large influx of unknown life forms have been detected residing within the district's ventilation systems. Please be rid of these creatures before it begins to affect productivity. +station-event-spider-spawn-announcement = Attention. A large influx of unknown life forms have been detected residing within the district's ventilation systems. Please be rid of these creatures before it begins to affect productivity. +station-event-reagentslime-vents-announcement = Attention. A large influx of unknown life forms have been detected residing within the district's ventilation systems. Please be rid of these creatures before it begins to affect productivity. +station-event-meat-vents-announcement = Attention. A large influx of unknown life forms have been detected residing within the district's ventilation systems. Please be rid of these creatures before it begins to affect productivity. +station-event-neutral-xeno-vents-announcement = Confirmed sightings of wildlife on the district. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to investigate the threat as soon as possible. +station-event-tick-vents-announcement = Confirmed sightings of hostile wildlife on the district. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible. +station-event-argocyte-vents-announcement = Confirmed sightings of hostile wildlife on the district. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible. +station-event-light-vents-announcement = Confirmed sightings of hostile wildlife on the district. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible. +station-event-carp-vents-announcement = Confirmed sightings of hostile wildlife on the district. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible. +station-event-space-vents-announcement = Confirmed sightings of hostile wildlife on the district. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible. +station-event-carp-spawn-announcement = Attention. A large influx of unknown life forms have been detected residing within the district's ventilation systems. Please be rid of these creatures before it begins to affect productivity. +station-event-king-rat-migration-announcement = Attention. A large influx of unknown life forms have been detected residing within the district's ventilation systems. Please be rid of these creatures before it begins to affect productivity. +station-event-snake-spawn-announcement = Attention. A large influx of unknown life forms have been detected residing within the district's ventilation systems. Please be rid of these creatures before it begins to affect productivity. # Weak -station-event-slimes-spawn-weak-announcement = Attention. A moderate influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity. -station-event-spider-spawn-weak-announcement = Attention. A moderate influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity. +station-event-slimes-spawn-weak-announcement = Attention. A moderate influx of unknown life forms have been detected residing within the district's ventilation systems. Please be rid of these creatures before it begins to affect productivity. +station-event-spider-spawn-weak-announcement = Attention. A moderate influx of unknown life forms have been detected residing within the district's ventilation systems. Please be rid of these creatures before it begins to affect productivity. diff --git a/Resources/Locale/en-US/station-events/events/zombie-outbreak.ftl b/Resources/Locale/en-US/station-events/events/zombie-outbreak.ftl index da6d8fa4f1b..7486aba8708 100644 --- a/Resources/Locale/en-US/station-events/events/zombie-outbreak.ftl +++ b/Resources/Locale/en-US/station-events/events/zombie-outbreak.ftl @@ -1 +1 @@ -station-event-zombie-outbreak-announcement = Confirmed sightings of various undead aboard the station. All personnel should arm themselves, barricade doors, and secure their location in order to prevent further infection. \ No newline at end of file +station-event-zombie-outbreak-announcement = Automated systems report confirmed sightings of contagion elements classified as Terminus. District infrastructure will be severed indefinitely and quarantine measures are now in place. Seek shelter and avoid traits associated with the infection. diff --git a/Resources/Locale/en-US/station-goal/station-goal-command.ftl b/Resources/Locale/en-US/station-goal/station-goal-command.ftl index 82ed4d5c8a7..48eb32ee757 100644 --- a/Resources/Locale/en-US/station-goal/station-goal-command.ftl +++ b/Resources/Locale/en-US/station-goal/station-goal-command.ftl @@ -1,6 +1,6 @@ -send-station-goal-command-description = Sends the selected station target to all faxes that can receive it +send-station-goal-command-description = Sends the selected civic target to all faxes that can receive it send-station-goal-command-help-text = Usage: { $command } send-station-goal-command-arg-id = Goal Prototype ID -send-station-goal-command-error-no-goal-proto = No station goal found with ID {$id} -send-station-goal-command-error-couldnt-fax = Couldn't send station goal, probably due to a lack of fax machines that are able to recieve it +send-station-goal-command-error-no-goal-proto = No civic goal found with ID {$id} +send-station-goal-command-error-couldnt-fax = Couldn't send civic goal, probably due to a lack of fax machines that are able to recieve it diff --git a/Resources/Locale/en-US/station-records/general-station-records.ftl b/Resources/Locale/en-US/station-records/general-station-records.ftl index 4516a547f4d..759a7ec01cc 100644 --- a/Resources/Locale/en-US/station-records/general-station-records.ftl +++ b/Resources/Locale/en-US/station-records/general-station-records.ftl @@ -1,4 +1,4 @@ -general-station-record-console-window-title = Station Records Computer +general-station-record-console-window-title = District Records Computer general-station-record-console-select-record-info = Select a record on the left. general-station-record-console-empty-state = No records found! general-station-record-console-no-record-found = No record was found for the selected person. diff --git a/Resources/Prototypes/Announcers/!randomAnnouncers.yml b/Resources/Prototypes/Announcers/!randomAnnouncers.yml index a796094b28d..9bbe3940df2 100644 --- a/Resources/Prototypes/Announcers/!randomAnnouncers.yml +++ b/Resources/Prototypes/Announcers/!randomAnnouncers.yml @@ -1,8 +1,8 @@ - type: weightedRandom id: RandomAnnouncers weights: - Intern: 0.15 - MedBot: 0.5 - Michael: 0.9 - NEIL: 1 - VoxFem: 0.55 + Intern: 0.01 + MedBot: 0.01 + Michael: 0.01 + NEIL: 0.01 + VoxFem: 1 diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml index b09af881dd5..b5c8bd8d793 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml @@ -4,33 +4,11 @@ description: job-description-admin-assistant playTimeTracker: JobAdminAssistant requirements: - - !type:CharacterDepartmentTimeRequirement - department: Engineering - min: 10800 # 3 hours - - !type:CharacterDepartmentTimeRequirement - department: Logistics - min: 10800 # 3 hours - - !type:CharacterDepartmentTimeRequirement - department: Medical - min: 10800 # 3 hours - - !type:CharacterDepartmentTimeRequirement - department: Civilian - min: 10800 # 3 hours - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 10800 # 3 hours - - !type:CharacterDepartmentTimeRequirement - department: Research - min: 10800 # 3 hours - - !type:CharacterTraitRequirement - inverted: true - traits: - - Foreigner - - ForeignerLight - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - IKON + - TERRESTACO startingGear: AdminAssistantGear icon: "JobIconAdminAssitant" supervisors: job-supervisors-command diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml index be457e5904c..612b920b122 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml @@ -9,11 +9,13 @@ requireAdminNotify: true supervisors: job-supervisors-captain canBeAntag: false + whitelistRequired: true requirements: - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - IKON + - TERRESTACO access: - Command - ChiefJustice diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml index d9360d408e5..0b81c6eeb8d 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml @@ -90,8 +90,8 @@ - type: entity parent: BaseComputerCircuitboard id: StationRecordsComputerCircuitboard - name: station records computer board - description: A computer printed circuit board for a station records computer. + name: city records computer board + description: A computer printed circuit board for a city records computer. components: - type: Sprite state: cpu_command diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 029b57c6fef..d5c5c410b6a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -488,7 +488,7 @@ parent: BaseComputerAiAccess id: ComputerStationRecords name: station records computer - description: This can be used to check station records. + description: This can be used to check city records. components: - type: GeneralStationRecordConsole - type: UserInterface diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml index c224cdf3b7e..b86bd83b547 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml @@ -14,7 +14,8 @@ - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - IKON + - TERRESTACO - type: startingGear id: MailCarrierGear subGear: diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml index cbb5d37396e..3a0bb5e46b9 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml @@ -4,11 +4,6 @@ description: job-description-mantis playTimeTracker: JobForensicMantis requirements: - - !type:CharacterOverallTimeRequirement - min: 18000 - - !type:CharacterDepartmentTimeRequirement - department: Research # DeltaV - Research Department replacing Science - min: 3600 - !type:CharacterLogicOrRequirement requirements: - !type:CharacterSpeciesRequirement @@ -25,7 +20,8 @@ - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - IKON + - TERRESTACO - !type:CharacterItemGroupRequirement group: TraitsCasterType startingGear: ForensicMantisGear diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml index 4332e5c2668..d017af70a24 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml @@ -9,15 +9,6 @@ icon: "JobIconGladiator" supervisors: job-supervisors-security setPreference: true -# whitelistRequired: true - requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 21600 - special: - - !type:AddTraitSpecial - traits: - - MartialArtist afterLoadoutSpecial: - !type:ModifyEnvirosuitSpecial charges: 3 diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml index 567f5576c09..7d7267ef0d0 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml @@ -9,19 +9,6 @@ # whitelistRequired: true icon: "JobIconPrisoner" supervisors: job-supervisors-security - requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 21600 - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index b7623f23e23..a90937132c3 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -16,8 +16,8 @@ - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. - + - TERRESTACO + - IKON - type: startingGear id: CargoTechGear subGear: diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 93b99d6f67e..6c44463d8ee 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -13,7 +13,8 @@ - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - TERRESTACO + - IKON weight: 10 startingGear: QuartermasterGear icon: "JobIconQuarterMaster" diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 87e4414b643..4a03f653818 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -4,13 +4,11 @@ description: job-description-salvagespec playTimeTracker: JobSalvageSpecialist requirements: - - !type:CharacterDepartmentTimeRequirement - department: Logistics - min: 21600 - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - TERRESTACO + - IKON icon: "JobIconShaftMiner" startingGear: SalvageSpecialistGear supervisors: job-supervisors-qm diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index ac238849b37..b421ee3e821 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -4,13 +4,11 @@ description: job-description-bartender playTimeTracker: JobBartender requirements: - - !type:CharacterDepartmentTimeRequirement - department: Civilian - min: 3600 #DeltaV - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - TERRESTACO + - IKON startingGear: BartenderGear icon: "JobIconBartender" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml index d9bdd854704..a69526cd5c5 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml @@ -17,7 +17,8 @@ - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - TERRESTACO + - IKON - type: startingGear id: BotanistGear subGear: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index 11cc70b6f5a..4c60cab4c4f 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -4,9 +4,6 @@ description: job-description-chaplain playTimeTracker: JobChaplain requirements: - - !type:CharacterDepartmentTimeRequirement - department: Research # Chaplain is now one of the station's "Crew-Aligned Wizards" - min: 14400 # 4 hours - !type:CharacterLogicOrRequirement requirements: - !type:CharacterSpeciesRequirement @@ -19,12 +16,14 @@ - !type:CharacterEmployerRequirement inverted: true employers: - - Unemployed + - NEWSTAR + - TERRESTACO + - IKON - !type:CharacterItemGroupRequirement group: TraitsCasterType startingGear: ChaplainGear icon: "JobIconChaplain" - supervisors: job-supervisors-rd + supervisors: job-supervisors-service access: - Chapel - Research diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index bbc2a4f0a85..fb0adf247f8 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -4,13 +4,11 @@ description: job-description-chef playTimeTracker: JobChef requirements: - - !type:CharacterDepartmentTimeRequirement - department: Civilian - min: 3600 - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - TERRESTACO + - IKON startingGear: ChefGear icon: "JobIconChef" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 7161c25a157..e2e97d84672 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -14,7 +14,8 @@ - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - TERRESTACO + - IKON special: # Goobstation - Everyone knows lawyers are soulless. - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index 6136cc406ec..e7b061a8950 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -4,9 +4,6 @@ description: job-description-librarian playTimeTracker: JobLibrarian requirements: - - !type:CharacterDepartmentTimeRequirement - department: Research - min: 14400 - !type:CharacterLogicOrRequirement requirements: - !type:CharacterSpeciesRequirement @@ -19,12 +16,14 @@ - !type:CharacterEmployerRequirement employers: - NEWSTAR + - TERRESTACO + - IKON #Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. - !type:CharacterItemGroupRequirement group: TraitsCasterType startingGear: LibrarianGear icon: "JobIconLibrarian" - supervisors: job-supervisors-rd + supervisors: job-supervisors-service access: - Research - Maintenance diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index 1777fea87ca..bd398287e62 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -15,9 +15,10 @@ - Kitchen requirements: - !type:CharacterEmployerRequirement - inverted: true employers: - - Unemployed + - NEWSTAR + - TERRESTACO + - IKON - type: startingGear id: ServiceWorkerGear diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index f8ffb1a54bc..7c386646c9a 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -4,17 +4,11 @@ description: job-description-captain playTimeTracker: JobCaptain requirements: - - !type:CharacterTraitRequirement - inverted: true - traits: - - Foreigner - - ForeignerLight - - Pacifist - - Muted - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - TERRESTACO + - IKON weight: 20 startingGear: CaptainGear icon: "JobIconCaptain" @@ -22,6 +16,7 @@ joinNotifyCrew: true supervisors: job-supervisors-centcom canBeAntag: false + whitelistRequired: true accessGroups: - AllAccess special: diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index bb7fb3864fb..02b2f15b611 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -4,22 +4,18 @@ description: job-description-hop playTimeTracker: JobHeadOfPersonnel requirements: - - !type:CharacterTraitRequirement - inverted: true - traits: - - Foreigner - - ForeignerLight - - Muted - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - TERRESTACO + - IKON weight: 10 startingGear: HoPGear icon: "JobIconHeadOfPersonnel" requireAdminNotify: true supervisors: job-supervisors-captain canBeAntag: false + whitelistRequired: true access: - Command - HeadOfPersonnel diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index 0ea8a899146..32a07880d87 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -4,13 +4,11 @@ description: job-description-atmostech playTimeTracker: JobAtmosphericTechnician requirements: - - !type:CharacterDepartmentTimeRequirement - department: Engineering - min: 36000 - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - TERRESTACO + - IKON startingGear: AtmosphericTechnicianGear icon: "JobIconAtmosphericTechnician" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 2fac986d2a4..a6fe0cb5c46 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -4,21 +4,18 @@ description: job-description-ce playTimeTracker: JobChiefEngineer requirements: - - !type:CharacterTraitRequirement - inverted: true - traits: - - Foreigner - - ForeignerLight - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - TERRESTACO + - IKON weight: 10 startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" requireAdminNotify: true supervisors: job-supervisors-captain canBeAntag: false + whitelistRequired: true access: - Maintenance - Engineering diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml index db8c641ca5e..a8e174e3763 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml @@ -4,19 +4,11 @@ description: job-description-senior-engineer playTimeTracker: JobSeniorEngineer requirements: - - !type:CharacterPlaytimeRequirement - tracker: JobAtmosphericTechnician - min: 21600 #6 hrs - - !type:CharacterPlaytimeRequirement - tracker: JobStationEngineer - min: 21600 #6 hrs - - !type:CharacterDepartmentTimeRequirement - department: Engineering - min: 216000 # 60 hrs - - !type:CharacterEmployerRequirement - employers: - - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - !type:CharacterEmployerRequirement + employers: + - NEWSTAR + - TERRESTACO + - IKON startingGear: SeniorEngineerGear icon: "JobIconSeniorEngineer" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index 1d4e993dc9a..cd3fa5a3182 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -4,13 +4,11 @@ description: job-description-engineer playTimeTracker: JobStationEngineer requirements: - - !type:CharacterDepartmentTimeRequirement - department: Engineering - min: 14400 #4 hrs - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - TERRESTACO + - IKON startingGear: StationEngineerGear icon: "JobIconStationEngineer" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index 42bb51c46f1..433dc82636e 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -14,7 +14,8 @@ - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - TERRESTACO + - IKON - type: startingGear id: TechnicalAssistantGear subGear: diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index 8d7f6c94115..8f111834c50 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -4,13 +4,11 @@ description: job-description-chemist playTimeTracker: JobChemist requirements: - - !type:CharacterDepartmentTimeRequirement - department: Medical - min: 28800 - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - TERRESTACO + - IKON startingGear: ChemistGear icon: "JobIconChemist" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index e670062e459..83929701486 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -6,22 +6,18 @@ description: job-description-cmo playTimeTracker: JobChiefMedicalOfficer requirements: - - !type:CharacterTraitRequirement - inverted: true - traits: - - Foreigner - - ForeignerLight - - Muted - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. weight: 10 + - TERRESTACO + - IKON weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" requireAdminNotify: true supervisors: job-supervisors-captain canBeAntag: false + whitelistRequired: true access: - Medical - Command diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index 75525be45ff..21c3fe9b1d6 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -4,13 +4,12 @@ description: job-description-doctor playTimeTracker: JobMedicalDoctor requirements: - - !type:CharacterDepartmentTimeRequirement - department: Medical - min: 14400 #4 hrs - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. weight: 10 + - TERRESTACO + - IKON + weight: 10 startingGear: DoctorGear icon: "JobIconMedicalDoctor" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 805f9c3505c..48c42bba967 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -7,7 +7,8 @@ - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. weight: 10 + - TERRESTACO + - IKON startingGear: MedicalInternGear icon: "JobIconMedicalIntern" supervisors: job-supervisors-medicine diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 61f227eae3c..f708f6082c6 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -4,13 +4,12 @@ description: job-description-paramedic playTimeTracker: JobParamedic requirements: - - !type:CharacterDepartmentTimeRequirement - department: Medical - min: 28800 - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. weight: 10 + - TERRESTACO + - IKON + weight: 10 startingGear: ParamedicGear icon: "JobIconParamedic" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml index 5eac7983982..95f256de511 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml @@ -4,19 +4,11 @@ description: job-description-senior-physician playTimeTracker: JobSeniorPhysician requirements: - - !type:CharacterPlaytimeRequirement - tracker: JobChemist - min: 21600 #6 hrs - - !type:CharacterPlaytimeRequirement - tracker: JobMedicalDoctor - min: 21600 #6 hrs - - !type:CharacterDepartmentTimeRequirement - department: Medical - min: 216000 # 60 hrs - - !type:CharacterEmployerRequirement - employers: - - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - !type:CharacterEmployerRequirement + employers: + - NEWSTAR + - TERRESTACO + - IKON startingGear: SeniorPhysicianGear icon: "JobIconSeniorPhysician" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index cf398b7ec33..892c8eda858 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -4,10 +4,11 @@ description: job-description-research-assistant playTimeTracker: JobResearchAssistant requirements: - - !type:CharacterEmployerRequirement - employers: - - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - !type:CharacterEmployerRequirement + employers: + - NEWSTAR + - TERRESTACO + - IKON startingGear: ResearchAssistantGear icon: "JobIconResearchAssistant" supervisors: job-supervisors-science diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index c936e0c948a..d5930e2af00 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -4,33 +4,18 @@ description: job-description-rd playTimeTracker: JobResearchDirector requirements: - - !type:CharacterItemGroupRequirement - group: TraitsCasterType - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - IPC - - !type:CharacterTraitRequirement - traits: - - AnomalousPositronics - - !type:CharacterTraitRequirement - inverted: true - traits: - - Muted - - Foreigner - - ForeignerLight - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. weight: 10 + - TERRESTACO + - IKON weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" requireAdminNotify: true supervisors: job-supervisors-captain canBeAntag: false + whitelistRequired: true access: - Research - Command diff --git a/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml b/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml index a34ae4e8884..9f1476dc8f7 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml @@ -4,13 +4,11 @@ description: job-description-roboticist playTimeTracker: JobRoboticist requirements: - - !type:CharacterDepartmentTimeRequirement - department: Research - min: 14400 # 4 hours - same as scientist - !type:CharacterEmployerRequirement - employers: - - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + employers: + - NEWSTAR + - TERRESTACO + - IKON startingGear: RoboticistGear icon: "JobIconRoboticist" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index 033b0b4eada..bd0335e0999 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -4,12 +4,11 @@ description: job-description-scientist playTimeTracker: JobScientist requirements: - - !type:CharacterDepartmentTimeRequirement - department: Research - min: 14400 #4 hrs - !type:CharacterEmployerRequirement employers: - NEWSTAR + - TERRESTACO + - IKON startingGear: ScientistGear icon: "JobIconScientist" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml index 8fdfb034381..0aebfe799eb 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml @@ -4,13 +4,11 @@ description: job-description-senior-researcher playTimeTracker: JobSeniorResearcher requirements: - - !type:CharacterDepartmentTimeRequirement - department: Research - min: 216000 #60 hrs - - !type:CharacterEmployerRequirement - employers: - - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - !type:CharacterEmployerRequirement + employers: + - NEWSTAR + - TERRESTACO + - IKON startingGear: SeniorResearcherGear icon: "JobIconSeniorResearcher" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 147ae75f539..8eaacedf4ea 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -4,22 +4,12 @@ description: job-description-detective playTimeTracker: JobDetective requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 36000 - - !type:CharacterTraitRequirement - inverted: true - traits: - - Foreigner - - ForeignerLight - - Muted - - Blindness - - Pacifist - - BrittleBoneDisease - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. weight: 10 + - TERRESTACO + - IKON + weight: 10 startingGear: DetectiveGear icon: "JobIconDetective" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 1e91b4fd511..66ac620a992 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -7,8 +7,6 @@ - !type:CharacterTraitRequirement inverted: true traits: - - Foreigner - - ForeignerLight - Muted - Blindness - Pacifist @@ -16,13 +14,15 @@ - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. weight: 10 + - TERRESTACO + - IKON weight: 10 startingGear: HoSGear icon: "JobIconHeadOfSecurity" requireAdminNotify: true supervisors: job-supervisors-captain canBeAntag: false + whitelistRequired: true access: - HeadOfSecurity - Command diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index ac4399e5ae9..18709a2416f 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -7,8 +7,6 @@ - !type:CharacterTraitRequirement inverted: true traits: - - Foreigner - - ForeignerLight - Muted - Blindness - Pacifist @@ -16,7 +14,9 @@ - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. weight: 10 + - TERRESTACO + - IKON + weight: 10 startingGear: SecurityCadetGear icon: "JobIconSecurityCadet" supervisors: job-supervisors-security diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index d233fa05587..971d8a015cf 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -4,9 +4,6 @@ description: job-description-security playTimeTracker: JobSecurityOfficer requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 36000 # 10 hours - !type:CharacterTraitRequirement inverted: true traits: @@ -19,7 +16,9 @@ - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. weight: 10 + - TERRESTACO + - IKON + weight: 10 startingGear: SecurityOfficerGear icon: "JobIconSecurityOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml index 9bb06b6ce34..4d4ae4b5bcd 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml @@ -5,18 +5,6 @@ playTimeTracker: JobSeniorOfficer setPreference: true requirements: - - !type:CharacterPlaytimeRequirement - tracker: JobWarden - min: 21600 #6 hrs - - !type:CharacterPlaytimeRequirement - tracker: JobDetective - min: 7200 #2 hrs - - !type:CharacterPlaytimeRequirement - tracker: JobSecurityOfficer - min: 21600 #6 hrs - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 216000 # 60 hrs - !type:CharacterTraitRequirement inverted: true traits: @@ -29,7 +17,8 @@ - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - TERRESTACO + - IKON startingGear: SeniorOfficerGear icon: "JobIconSeniorOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 78374455ebb..08d3a84bab4 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -4,26 +4,11 @@ description: job-description-warden playTimeTracker: JobWarden requirements: - - !type:CharacterPlaytimeRequirement - tracker: JobSecurityOfficer - min: 43200 # DeltaV - 12 hrs - - !type:CharacterPlaytimeRequirement - tracker: JobDetective - min: 14400 # DeltaV - 4 hours - - !type:CharacterWhitelistRequirement - - !type:CharacterTraitRequirement - inverted: true - traits: - - Foreigner - - ForeignerLight - - Muted - - Blindness - - Pacifist - - BrittleBoneDisease - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - TERRESTACO + - IKON startingGear: WardenGear icon: "JobIconWarden" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index 2908c02a9c2..002a8ceeb1b 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -16,7 +16,8 @@ - !type:CharacterEmployerRequirement employers: - NEWSTAR -#Encore edit- adjusted to fix compiling. Needs role assigned to proper employer later. + - TERRESTACO + - IKON - type: startingGear id: PsychologistGear subGear: diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 8553216ef9b..bc51afa811a 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -31,6 +31,8 @@ - ServiceWorker - Prisoner - Gladiator + - Librarian + - Chaplain - type: department id: CentralCommand @@ -129,9 +131,7 @@ - SeniorResearcher - Scientist - ResearchAssistant - - Chaplain - ForensicMantis - - Librarian - Roboticist - type: department diff --git a/Resources/manifest.yml b/Resources/manifest.yml index c6eadc64204..abfd97fb654 100644 --- a/Resources/manifest.yml +++ b/Resources/manifest.yml @@ -1,3 +1,3 @@ -defaultWindowTitle: Einstein Engines +defaultWindowTitle: ENCORE windowIconSet: /Textures/Logo/icon splashLogo: /Textures/Logo/splashlogo.png