From 09f188c4954b9d9641262ccff5f4d24555cfc876 Mon Sep 17 00:00:00 2001
From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com>
Date: Sat, 18 Jun 2022 19:16:00 +0800
Subject: [PATCH] Improves faction selection screen (#14300)
---
code/__defines/jobs.dm | 6 +--
code/_helpers/text.dm | 2 +
code/game/jobs/faction/faction.dm | 1 +
code/game/jobs/faction/hephaestus.dm | 9 +---
code/game/jobs/faction/idris.dm | 9 +---
code/game/jobs/faction/nanotrasen.dm | 26 ++++-------
code/game/jobs/faction/orion_express.dm | 8 +---
code/game/jobs/faction/pmc.dm | 21 ++++-----
code/game/jobs/faction/scc.dm | 23 ++++-----
code/game/jobs/faction/unaffiliated.dm | 5 +-
code/game/jobs/faction/zavodskoi.dm | 24 +---------
code/game/jobs/faction/zeng_hu.dm | 9 +---
code/modules/client/asset_cache.dm | 37 ++++++++-------
.../preference_setup/occupation/occupation.dm | 44 +++++++++++-------
code/modules/client/preferences.dm | 2 +-
html/changelogs/wezzy_new_faction_screen.yml | 44 ++++++++++++++++++
html/images/eridanilogo.png | Bin 4754 -> 0 bytes
html/images/factions/ECFlogo.png | Bin 0 -> 11310 bytes
html/images/factions/hephlogo.png | Bin 0 -> 15633 bytes
html/images/factions/idrislogo.png | Bin 0 -> 7364 bytes
html/images/factions/nanotrasenlogo.png | Bin 0 -> 7545 bytes
html/images/factions/orionlogo.png | Bin 0 -> 15793 bytes
html/images/factions/pmcglogo.png | Bin 0 -> 12931 bytes
html/images/factions/scclogo.png | Bin 0 -> 16691 bytes
html/images/factions/unaffiliatedlogo.png | Bin 0 -> 23870 bytes
html/images/factions/zavodlogo.png | Bin 0 -> 10580 bytes
html/images/factions/zenghulogo.png | Bin 0 -> 21663 bytes
html/images/{hplogo.png => hplogolarge.png} | Bin
html/images/idrislogo.png | Bin 4479 -> 0 bytes
html/images/orionlogo.png | Bin 26617 -> 0 bytes
html/images/pmcglogo.png | Bin 18353 -> 0 bytes
html/images/scclogo.png | Bin 1766 -> 0 bytes
html/images/zavodlogo.png | Bin 4996 -> 0 bytes
html/images/zhlogo.png | Bin 9635 -> 0 bytes
icons/misc/factions/ECFlogo.png | Bin 6682 -> 11310 bytes
icons/misc/factions/Hephaestuslogo.png | Bin 1024544 -> 0 bytes
icons/misc/factions/Idrislogo.png | Bin 9196 -> 7364 bytes
icons/misc/factions/NanoTrasenlogo.png | Bin 18972 -> 7545 bytes
icons/misc/factions/Orionlogo.png | Bin 11864 -> 21547 bytes
icons/misc/factions/SCClogo.png | Bin 9948 -> 16691 bytes
icons/misc/factions/Unaffiliatedlogo.png | Bin 8275 -> 23870 bytes
icons/misc/factions/Zavodlogo.png | Bin 21173 -> 10580 bytes
icons/misc/factions/ZhenHulogo.png | Bin 18725 -> 0 bytes
icons/misc/factions/hephlogo.png | Bin 0 -> 15633 bytes
icons/misc/factions/pmcglogo.png | Bin 18353 -> 12931 bytes
icons/misc/factions/zenghulogo.png | Bin 0 -> 21663 bytes
46 files changed, 134 insertions(+), 136 deletions(-)
create mode 100644 html/changelogs/wezzy_new_faction_screen.yml
delete mode 100644 html/images/eridanilogo.png
create mode 100644 html/images/factions/ECFlogo.png
create mode 100644 html/images/factions/hephlogo.png
create mode 100644 html/images/factions/idrislogo.png
create mode 100644 html/images/factions/nanotrasenlogo.png
create mode 100644 html/images/factions/orionlogo.png
create mode 100644 html/images/factions/pmcglogo.png
create mode 100644 html/images/factions/scclogo.png
create mode 100644 html/images/factions/unaffiliatedlogo.png
create mode 100644 html/images/factions/zavodlogo.png
create mode 100644 html/images/factions/zenghulogo.png
rename html/images/{hplogo.png => hplogolarge.png} (100%)
delete mode 100644 html/images/idrislogo.png
delete mode 100644 html/images/orionlogo.png
delete mode 100644 html/images/pmcglogo.png
delete mode 100644 html/images/scclogo.png
delete mode 100644 html/images/zavodlogo.png
delete mode 100644 html/images/zhlogo.png
delete mode 100644 icons/misc/factions/Hephaestuslogo.png
delete mode 100644 icons/misc/factions/ZhenHulogo.png
create mode 100644 icons/misc/factions/hephlogo.png
create mode 100644 icons/misc/factions/zenghulogo.png
diff --git a/code/__defines/jobs.dm b/code/__defines/jobs.dm
index ac470b8ff02..b4a0f95e75c 100644
--- a/code/__defines/jobs.dm
+++ b/code/__defines/jobs.dm
@@ -8,9 +8,8 @@
#define SCIENCE_ROLES list(/datum/job/scientist, /datum/job/xenobiologist, /datum/job/xenobotanist, /datum/job/intern_sci)
#define SECURITY_ROLES list(/datum/job/warden, /datum/job/investigator, /datum/job/officer, /datum/job/intern_sec)
#define EQUIPMENT_ROLES list(/datum/job/ai, /datum/job/cyborg)
-#define INDEP_ROLES list(/datum/job/merchant, /datum/job/passenger, /datum/job/consular, /datum/job/journalist, /datum/job/chaplain)
#define ALL_FACTION_ROLES list(/datum/job/assistant, /datum/job/visitor, /datum/job/representative)
-#define ALL_JOBS list(COMMAND_ROLES, ENGINEERING_ROLES, SERVICE_ROLES, CIVILIAN_ROLES, CARGO_ROLES, MEDICAL_ROLES, SCIENCE_ROLES, SECURITY_ROLES, EQUIPMENT_ROLES, INDEP_ROLES)
+#define ALL_JOBS list(COMMAND_ROLES, ENGINEERING_ROLES, SERVICE_ROLES, CIVILIAN_ROLES, OPERATIONS_ROLES, MEDICAL_ROLES, SCIENCE_ROLES, SECURITY_ROLES, EQUIPMENT_ROLES, INDEP_ROLES)
// Factions
#define IDRIS_ROLES list(SECURITY_ROLES, SERVICE_ROLES, ALL_FACTION_ROLES)
@@ -20,4 +19,5 @@
#define ZENG_ROLES list(SCIENCE_ROLES, MEDICAL_ROLES, ALL_FACTION_ROLES)
#define HEPH_ROLES list(OPERATIONS_ROLES, ENGINEERING_ROLES, ALL_FACTION_ROLES)
#define ORION_ROLES list(OPERATIONS_ROLES, ALL_FACTION_ROLES)
-#define SCC_ROLES list(COMMAND_ROLES, EQUIPMENT_ROLES)
\ No newline at end of file
+#define SCC_ROLES list(COMMAND_ROLES, EQUIPMENT_ROLES)
+#define INDEP_ROLES list(CIVILIAN_ROLES, /datum/job/merchant, /datum/job/consular, /datum/job/journalist, /datum/job/chaplain)
diff --git a/code/_helpers/text.dm b/code/_helpers/text.dm
index 2abd2bc93e9..dc3badbf3e8 100644
--- a/code/_helpers/text.dm
+++ b/code/_helpers/text.dm
@@ -543,6 +543,7 @@
t = replacetext(t, "\[logo_idris\]", "
")
t = replacetext(t, "\[logo_eridani\]", "
")
t = replacetext(t, "\[logo_zavod\]", "
")
+ t = replacetext(t, "\[logo_hp_large\]", "
")
t = replacetext(t, "\[logo_hp\]", "
")
t = replacetext(t, "\[logo_orion\]", "
")
t = replacetext(t, "\[logo_pmcg\]", "
")
@@ -606,6 +607,7 @@
t = replacetext(t, "
", "\[logo_idris\]")
t = replacetext(t, "
", "\[logo_eridani\]")
t = replacetext(t, "
", "\[logo_zavod\]")
+ t = replacetext(t, "
", "\[logo_hp_large\]")
t = replacetext(t, "
", "\[logo_hp\]")
t = replacetext(t, "
", "\[flag_be\]")
t = replacetext(t, "
", "\[flag_elyra\]")
diff --git a/code/game/jobs/faction/faction.dm b/code/game/jobs/faction/faction.dm
index fefe885dd1d..19d76c2969c 100644
--- a/code/game/jobs/faction/faction.dm
+++ b/code/game/jobs/faction/faction.dm
@@ -2,6 +2,7 @@
var/name
var/description
var/title_suffix
+ var/departments
var/list/allowed_role_types
var/list/allowed_species_types
diff --git a/code/game/jobs/faction/hephaestus.dm b/code/game/jobs/faction/hephaestus.dm
index 458fadb3936..403b2054870 100644
--- a/code/game/jobs/faction/hephaestus.dm
+++ b/code/game/jobs/faction/hephaestus.dm
@@ -9,13 +9,8 @@
from SolGov and securing several crucial production contracts, they have slowly
worked their way to become the dominant manufacturing mega-corporation in the
Sol Alliance, pioneering interstellar logistics and construction on an awe-inspiring scale.
-
Hephaestus Industries employees can be in the following departments: -
Idris Incorporated employees can be in the following departments: -
- Considered the largest megacorporation within the Orion Spur, many will find themselves doing the biddings of NanoTrasen -- be it direct or indirect. Initially a biotechnical - research company, it rapidly grew in size after the discovery of Phoron. The corporation's monopoly on the resource catapulted it into the limelight, where it has remained for the last - forty-odd years. Its acceleration into the spotlight has prompted many prying eyes to uncover evidence of rather questionable actions, with rumours perpetuating that they've instigated - wars on both Adhomai and Moghes in an attempt to exploit the species for a profit. NanoTrasen's power has since begun to waver as their ability to supply Phoron dwindled -- resulting in - their profit margins diminishing considerably. Whilst the corporation has attempted its best to hide its waning influence, the facade has begun to crumble with scrutinizing individuals - being able to see its vulnerability. Despite the effects of the Phoron Scarcity on the megacorporation, NanoTrasen has managed to secure itself as a crucial member of the newly-founded - Stellar Corporate Conglomerate (SCC) with Miranda Trasen serving as the Acting Director of Operations -- which has managed to bolster the company and secure themselves as the dominant - corporate presence within the Orion Spur. - -
-NanoTrasen employees can be in the following departments: - -
Orion Express employees can be in the following departments: -
- A coalition of security and medical contractors in service of the Stellar Corporate Conglomerate. 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 spur, the PMCG deploys a diverse force to anywhere they are needed; from mere - office buildings to outposts in the Corporate Reconstruction Zone. As the megacorporations expand, these contractors follow to secure their holdings. - Unlike the other members of the Corporate Conglomerate, the Private Military Contracting Group has few employees of its own. Only some liaisons and bureaucrats work behind the scenes to - hire and manage the contractors. The rest of its members are in fact part of several organizations contracted to supply the PMCG. -
-Private Military Contracting Group employees can be in the following departments: -
- Formed at the height of corporate power in the galaxy, the SCC - or more officially, the Stellar Corporate Conglomerate is a group exercising undisputed economic dominance - over the Orion Spur. The Chainlink was founded to secure privately owned assets within Tau Ceti owned by the various megacorporations during the Second Solarian Incursion. After the invasion, - the SCC has found itself willing and eager to supersede any and all higher authority placed before it, with no signs of stopping any time soon. The Conglomerate has basically bound the - largest shareholders and chief executive officers of the corporations to the whim and will of the Trasen family, who hold an unsteady authority over the colorful cast. Cooperation has been - deemed essential at this point in time. The corporations remain in a shaky peace, to contrast the cutthroat, espionage-ridden past. Of course, this doesn't stop the greed or the lust for - power and glory - they're just corporations, after all. The SCC's largest threat is Einstein Engines - this growing giant is older than all others on the galactic stage, and - recently resurfaced in power due to the growing prominence of warp travel. -
-Stellar Corporate Conglomerate employees can be in the following departments: -
Some character examples are: -
Zeng-Hu Pharmaceuticals employees can be in the following departments: -