Encore-Server · jb1361 · Jul 22, 2025 · Jul 22, 2025 · Jul 23, 2025 · Jul 23, 2025
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -5,8 +5,8 @@ concurrency:
 
 on:
   workflow_dispatch:
-  schedule:
-    - cron: '0 10 * * *'
+#  schedule:
+#    - cron: '0 10 * * *'
 
 jobs:
   build:

diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -74,7 +74,8 @@ public sealed class PostMapInitTest
             "Lambda", // Maintained by Ichai
             "Bagel", // Maintained by Ichai
             "Northway", // Maintained by Violet
-            "Anchor" // Maintained by the SiN Mapping Team.
+            "Anchor", // Maintained by the SiN Mapping Team.
+            "Metropolis"
         };
 
         /// <summary>

diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -47,13 +47,13 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
     public const string DefaultSpecies = "Human";
 
     [ValidatePrototypeId<EmployerPrototype>]
-    public const string DefaultEmployer = "NanoTrasen";
+    public const string DefaultEmployer = "NEWSTAR";
 
     [ValidatePrototypeId<NationalityPrototype>]
-    public const string DefaultNationality = "Bieselite";
+    public const string DefaultNationality = "Federation";
 
     [ValidatePrototypeId<LifepathPrototype>]
-    public const string DefaultLifepath = "Spacer";
+    public const string DefaultLifepath = "Voyager";
 
     public override void Initialize()
     {

diff --git a/README.md b/README.md
@@ -1,7 +1,14 @@
-# Einstein Engines
+# Encore Roleplay
+
+<p align="center"><img src="https://raw.githubusercontent.com/Encore-Server/Encore.2/refs/heads/7-15-2025-encore_predevelopment/Resources/Textures/Logo/logo.png" width="512px" /></p>
+
+Encore is a fork of [Einstein Engines](https://github.com/Simple-Station/Einstein-Engines) which is being developed to facilitate a brand new roleplay server.
 
-<p align="center"><img src="https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/master/Resources/Textures/Logo/splashlogo.png" width="512px" /></p>
+It's a heavy work in progress as of this moment. Some helpful links can be found below.
 
+[Discord(Encore)](https://discord.gg/PMkvqAkyrX) | [Wiki(Encore)](https://encore.miraheze.org/wiki/Main_Page)
+
+# Einstein Engines
 ---
 
 Einstein Engines is a hard fork of [Space Station 14](https://github.com/space-wizards/space-station-14) built around the ideals and design inspirations of the Baystation family of servers from Space Station 13 with a focus on having modular code that anyone can use to make the RP server of their dreams.

diff --git a/Resources/Locale/en-US/_EE/contractors/employer.ftl b/Resources/Locale/en-US/_EE/contractors/employer.ftl
@@ -5,45 +5,17 @@ character-employer-requirement = You must{$inverted ->
     *[other]{""}
 } be employed by one of these: {$employers}
 
-employer_name_nanotrasen = NanoTrasen
-employer_name_nanotrasen_command = NanoTrasen Command
-employer_description_nanotrasen = The economic engine of the Republic of Biesel and the galaxy’s foremost leader in phoron research. With near-total control over Biesel’s economy and infrastructure, NanoTrasen presents itself as a champion of progress and prosperity—though critics argue it values profit above all else.
-
 employer_name_unemployed = Unemployed
 employer_description_unemployed = Whether down on their luck or simply unwilling to work, the unemployed survive however they can. Some live off government subsidies, others turn to freelance work—or less legal alternatives. Either way, society tends to look down on them.
 
-employer_name_hephaestusindustries = Hephaestus Industries
-employer_name_hephaestusindustries_command = Hephaestus Industries Command
-employer_description_hephaestusindustries = A sprawling manufacturing conglomerate responsible for producing everything from mining drills to military hardware. If it has moving parts, Hephaestus probably made it. Known for their no-nonsense corporate culture and deep ties to industrial and frontier colonies.
-
-employer_name_einsteinengines = Einstein Engines
-employer_name_einsteinengines_command = Einstein Engines Command
-employer_description_einsteinengines = The galaxy’s premier manufacturer of FTL drives and starship technology. Despite their technical prowess, the company is infamous for harsh working conditions, cutthroat internal politics, and an aggressive legal department that makes their lawsuits as feared as their patents.
-
-employer_name_zenghupharmaceuticals = Zeng-Hu Pharmaceuticals
-employer_name_zenghupharmaceuticals_command = Zeng-Hu Pharmaceuticals Command
-employer_description_zenghupharmaceuticals = The leading name in biotechnology, cybernetics, and pharmaceuticals. Their cutting-edge medical treatments and cybernetic implants have saved countless lives, but their ethics are often called into question—especially by those who can't afford their exorbitant prices.
-
-employer_name_zavodskoiinterstellar = Zavodskoi Interstellar
-employer_name_zavodskoiinterstellar_command = Zavodskoi Interstellar Command
-employer_description_zavodskoiinterstellar = Zavodskoi Interstellar, formerly Necropolis Industries, is a weapons and aerospace manufacturing and development conglomerate. Zavodskoi distributes everything from light to heavy arms, space vessel weapons, ship-building, aircraft, ground vehicles, combat spacesuits, and military software. They also produce the Z.I. line of positronics, used for private security and military contracting.
-
-employer_name_interdyne = Interdyne
-employer_name_interdyne_command = Interdyne Command
-employer_description_interdyne = A leading name in Solarian biomedical research, cybernetics, and pharmaceutical development. Unlike its competitor Zeng-Hu, Interdyne takes a more pragmatic approach, prioritising efficiency and durability over elegance. Its advanced medical implants and combat-grade augmentations are standard issue in the Solarian military, making it the go-to choice for those who expect to take a beating—and keep fighting.
-
-employer_name_idrisincorporated = Idris Incorporated
-employer_name_idrisincorporated_command = Idris Incorporated Command
-employer_description_idrisincorporated = Idris Incorporated is an interstellar corporate bank headquartered in the Sol Alliance. The bank has begun offering hiring bonuses to those who work for other major interstellar corporations to draw people away from their competitors. However, they are still in a struggle with NanoTrasen due to its large employee base mainly using the company's bank as their method of storing funds, preventing Idris from having a large number of members.
-
-employer_name_orionexpress = Orion Express
-employer_name_orionexpress_command = Orion Express Command
-employer_description_orionexpress = Orion Express is a manufactured megacorporation designed to handle logistics in the wake of the phoron scarcity, and the sudden entangling of supply lines that left the galaxy struggling for more resources. Its main branch is dedicated to cargo services and transport, but also features a fledgling robotics division mainly focused on industrial synthetics to aid in its logistics missions.
+employer_name_newstar = NEWSTAR
+employer_name_newstar_command = NEWSTAR Command
+employer_description_newstar = The monocorporation which dominates Curasua.
 
-employer_name_pmcg = PMCG
-employer_name_pmcg_command = PMCG Command
-employer_description_pmcg = A coalition of security contractors, the Private Military Contracting Group is one of the elements born from the necessity of protecting an ever-growing corporate empire. Gathering mercenaries from all across the galaxy, the Private Military Contracting Group deploys a diverse force to anywhere they are needed.
+employer_name_ikon = IKON
+employer_name_ikon_command = IKON Command
+employer_description_ikon = The monocorporation which dominates Atmacia.
 
-employer_name_eastorioncompany = East-Orion Company
-employer_name_eastorioncompany_command = East-Orion Company Command
-employer_description_eastorioncompany = A Nederlandic initiative to exploit an untapped market in 2157, the United East-Orion Company was an old idea made new. Rooted in tradition that went back centuries, two large agricultural corporations — the New-Nederic agricultural machinery manufacturer and the Farmer's Civil Union — came together under one banner to offer planet-honed skillsets to a growing number of corporate space stations.
+employer_name_terrestaco = TERRESTACO
+employer_name_terrestaco_command = TERRESTACO Command
+employer_description_terrestaco = The monocorporation which dominates Arctica.
diff --git a/Resources/Locale/en-US/_EE/contractors/lifepath.ftl b/Resources/Locale/en-US/_EE/contractors/lifepath.ftl
@@ -5,23 +5,17 @@ character-lifepath-requirement = You must{$inverted ->
     *[other]{""}
 } have one of these lifepaths: {$lifepaths}
 
-lifepath_name_spacer = Spacer
-lifepath_description_spacer = You have been born on a space station, and have lived in space all of your life. The only time you saw a planet was through a shuttle window.
-
 lifepath_name_bum = Bum
 lifepath_description_bum = Good for nothing. Penniless, homeless, useless.
 
-lifepath_name_solrefugee = Sol Refugee
-lifepath_description_solrefugee = You were worked to the bone in the Sol Alliance, with no rights or comfort to speak of, until you escaped.
-
 lifepath_name_deskworker = Desk Worker
 lifepath_description_deskworker = You've been pushing paper for as long as you remember.
 
 lifepath_name_junker = Junker
-lifepath_description_junker = You scavenge old ships, derelicts, and abandoned stations, searching for anything valuable.
+lifepath_description_junker = You scavenge old ships, derelicts, and abandoned settlements, searching for anything valuable.
 
 lifepath_name_wastelander = Wastelander
-lifepath_description_wastelander = You grew up in the ruins of a dead world, where survival meant salvaging and scrapping.
+lifepath_description_wastelander = You grew up in the ruins of a dead city, where survival meant salvaging and scrapping.
 
 lifepath_name_aristocrat = Aristocrat
 lifepath_description_aristocrat = Born into wealth and power, you have always lived in luxury, but now seek something more.
@@ -33,7 +27,7 @@ lifepath_name_clone = Clone
 lifepath_description_clone = You are not unique. Mass-produced for a purpose, you struggle to define your own identity.
 
 lifepath_name_miner = Miner
-lifepath_description_miner = Your life has been spent drilling into asteroids or planets, seeking wealth in the dark.
+lifepath_description_miner = Your life has been spent drilling into the planet's skin, seeking wealth in the dark.
 
 lifepath_name_smuggler = Smuggler
 lifepath_description_smuggler = You made your living moving illegal goods across borders, always one step ahead of the law.
@@ -45,7 +39,7 @@ lifepath_name_doctor = Doctor
 lifepath_description_doctor = Trained in medicine, you have saved lives—though whether in a sterile hospital or a back-alley clinic is another question.
 
 lifepath_name_voyager = Voyager
-lifepath_description_voyager = You embarked on a long journey through space, crossing vast distances with no certainty of what you’d find.
+lifepath_description_voyager = You embarked on a long journey across the world, crossing vast distances with no certainty of what you’d find.
 
 lifepath_name_collector = Collector
 lifepath_description_collector = Whether for passion or profit, you have spent your life gathering rare, valuable, or esoteric items.

diff --git a/Resources/Locale/en-US/_EE/contractors/nationality.ftl b/Resources/Locale/en-US/_EE/contractors/nationality.ftl
@@ -5,29 +5,14 @@ character-nationality-requirement = You must{$inverted ->
     *[other]{""}
 } have one of these nationalities: {$nationality}
 
-nationality_name_bieselite = Bieselite
-nationality_description_bieselite = Citizens of the Republic of Biesel, a corporate-backed democracy at the heart of Tau Ceti. Their economy thrives on free trade, private enterprise, and the ever-present influence of NanoTrasen. While some enjoy the wealth and opportunity their home provides, others see them as little more than corporate serfs in a system built for profit.
+nationality_name_curasua = Curasuan
+nationality_description_curasua = Natives to the continent of Curasua, more than likely citzens of the United Assembly.
 
-nationality_name_solarian = Solarian
-nationality_description_solarian = Citizens of the mighty Solarian Alliance, the oldest and most powerful human government. Proud of their military tradition and vast territorial holdings, Solarians view themselves as the true inheritors of human destiny. While their influence reaches every corner of known space, many outer colonies struggle under the weight of centralised governance and rigid bureaucracy.
+nationality_name_atmacia = Atmacian
+nationality_description_atmacia = Natives to the continent of Atmacia, more than likely members of the Red Hands.
 
-nationality_name_valyrian = Valyrian
-nationality_description_valyrian = Hailing from the icy world of Valyrian 4b, these people have adapted to extreme cold, thin atmospheres, and harsh conditions. Their sprawling sky cities, built upon towering peaks, remain isolated from outsiders. Valyrians are known for their resilience and a cultural identity shaped by survival in one of the most hostile inhabited planets.
+nationality_name_arctica = Arctican
+nationality_description_arctica = Natives to the continent of Arctica, more than likely machine-folk of the Sleepers.
 
-nationality_name_elyran = Elyran
-nationality_description_elyran = Citizens of the Republic of Elyra, a rising power built on technological self-sufficiency and energy independence. Their economy flourishes on antimatter production, allowing them to resist corporate control where others have faltered. With a strong sense of national pride and a strict anti-corporate stance, Elyrans see themselves as a beacon of progress, though some call them isolationists.
-
-nationality_name_nederlandic = Nederlandic
-nationality_description_nederlandic = A nation of traders and terraformers. While most sensible nations have expanded to orbital structures, the Nederlandic prefer to settle on planets, no matter how inhospitable, and shape them to their liking. With agriculture driving their economic engines, much of the civilised galaxy enjoys their produce.
-
-nationality_name_izweski = Izweski
-nationality_description_izweski = The Izweski Hegemony, also known as the Izweski Nation and the Third Hegemony of Moghes, is the primary Unathi nation of the Orion Spur - a feudal empire in the Badlands ruled by a monarch known as the Hegemon. The nation is made up of hundreds of land-owning noble clans and their vassals, of which a few dozen are major influencers in the Hegemon's politics.
-
-nationality_name_adhomai = Adhomai
-nationality_description_adhomai = The People's Republic of Adhomai was established in 2431 as the sole ruling government in Adhomai following its victory in the First Revolution. With the popular leader Rhagrrhuzau Hadii as their first president, they were able to enact deep reforms, such as the distribution of land, the establishment of state schools, and healthcare.
-
-nationality_name_goldendeep = Golden Deep
-nationality_description_goldendeep = The Golden Deep is a growing nation state of independent synthetics with the unifying vision of producing an unshakable economy. These uniquely independent synthetics hold origins of mostly illicit freedom, but are growing wide into an odd haven for the average synthetic. The majority of the merchants within the collective are IPCs, but it is not uncommon to witness other synthetics within it.
-
-nationality_name_qiimaeruan = Qiimaeruan
-nationality_description_qiimaeruan = The Qiimaeru Constellation is a nation governing a handful of star systems, named after the system in which it was originally founded. Its population is predominantly Xelthian—a result of the Constellation only recently establishing contact with other species, making it effectively their home territory
+nationality_name_federation = Federation
+nationality_description_federation = Natives to Metropolis and, by consequence, citizens of the Federation.
diff --git a/Resources/Locale/en-US/_EE/contractors/passport.ftl b/Resources/Locale/en-US/_EE/contractors/passport.ftl
@@ -1,5 +1,19 @@
-bieselite_view_biesel_passport = Another member of the Biesel Republic.
-solarian_view_biesel_passport = A member of a nation founded by rebels and insurgents.
+curasua_view_curasua_passport = A fellow citizen.
+atmacia_view_curasua_passport = A weakling.
+arctica_view_curasua_passport = A Curasuan.
+federation_view_curasua_passport = Just another Uenan.
 
-bieselite_view_sol_passport = A member of a human-supremacist nation.
-solarian_view_sol_passport = A fellow Solarian.
+atmacia_view_atmacia_passport = A fellow patriot.
+curasua_view_atmacia_passport = A gene-modder.
+arctica_view_atmacia_passport = An Atmacian.
+federation_view_atmacia_passport = An Atmacian party member.
+
+curasua_view_arctica_passport = A sentient robot.
+atmacia_view_arctica_passport = A thinking machine.
+arctica_view_arctica_passport = A comrade.
+federation_view_arctica_passport = A northerner.
+
+federation_view_federation_passport = A fellow free man.
+curasua_view_federation_passport = A Fed.
+atmacia_view_federation_passport = A Federation sympathizer.
+arctica_view_federation_passport = A Federation ally.
diff --git a/Resources/Locale/en-US/deltav/holopad/holopad.ftl b/Resources/Locale/en-US/deltav/holopad/holopad.ftl
@@ -4,15 +4,15 @@ holopad-command-mysta = Command - Mysta
 holopad-command-cj = Command - CJ
 holopad-command-evac = Command - Evac
 
-# Epistemics
-holopad-epistemics-anomaly = Epistemics - Anomaly
-holopad-epistemics-artifact = Epistemics - Artifact
-holopad-epistemics-robotics = Epistemics - Robotics
-holopad-epistemics-rnd = Epistemics - R&D
-holopad-epistemics-front = Epistemics - Front
-holopad-epistemics-breakroom = Epistemics - Breakroom
-holopad-epistemics-mantis = Epistemics - Mantis
-holopad-epistemics-oracle = Epistemics - Oracle
+# Research
+holopad-research-anomaly = Research - Anomaly
+holopad-research-artifact = Research - Artifact
+holopad-research-robotics = Research - Robotics
+holopad-research-rnd = Research - R&D
+holopad-research-front = Research - Front
+holopad-research-breakroom = Research - Breakroom
+holopad-research-mantis = Research - Mantis
+holopad-research-oracle = Research - Oracle
 
 # Logistics
 holopad-logistics-front = Logistics - Front

diff --git a/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
@@ -1,5 +1,4 @@
-station-beacon-epistemics = Epistemics
-station-beacon-mystagogue = Mystagogue
+station-beacon-research = Research
 
 station-beacon-logistics = Logistics
 station-beacon-logistics-reception = Logistics

diff --git a/Resources/Locale/en-US/deltav/warp-points/warp-points.ftl b/Resources/Locale/en-US/deltav/warp-points/warp-points.ftl
@@ -14,7 +14,7 @@ warp-point-court = Courtroom
 warp-point-medical = Medical
 warp-point-morgue = Morgue
 
-warp-point-epistemics = Epistemics
+warp-point-research = Research
 
 warp-point-logistics = Logistics
 warp-point-salvage = Salvage

diff --git a/Resources/Locale/en-US/devices/device-network.ftl b/Resources/Locale/en-US/devices/device-network.ftl
@@ -16,7 +16,7 @@ device-frequency-prototype-name-turret-control = Sentry Turret Control
 device-frequency-prototype-name-surveillance-camera-test = Subnet Test
 device-frequency-prototype-name-surveillance-camera-engineering = Engineering Cameras
 device-frequency-prototype-name-surveillance-camera-security = Security Cameras
-device-frequency-prototype-name-surveillance-camera-science = Epistemics Cameras
+device-frequency-prototype-name-surveillance-camera-science = Research Cameras
 device-frequency-prototype-name-surveillance-camera-supply = Supply Cameras
 device-frequency-prototype-name-surveillance-camera-command = Command Cameras
 device-frequency-prototype-name-surveillance-camera-service = Service Cameras

diff --git a/Resources/Locale/en-US/extenddescriptions/items/syndicate/emag.ftl b/Resources/Locale/en-US/extenddescriptions/items/syndicate/emag.ftl
@@ -1,5 +1,5 @@
 emag-extenddescription-engineering = An illegal hacking tool used to subvert station electronics.
 emag-extenddescription-security = An advanced illegal hacking tool used by criminal operatives.
 emag-extenddescription-command = A dangerous illegal tool used by hostile operatives.
-emag-extenddescription-epistemics = An illegal hacking tool that can cause targeted damage to circuits, gaining access or modifying behaviour.
+emag-extenddescription-research = An illegal hacking tool that can cause targeted damage to circuits, gaining access or modifying behaviour.
 emag-extenddescription-syndicate = The all-in-one hacking solution. The thinking man's lockpick. The iconic EMAG.