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: -

"} - +

"} + departments = {"Engineering
Operations"} title_suffix = "Hepht" allowed_role_types = HEPH_ROLES diff --git a/code/game/jobs/faction/idris.dm b/code/game/jobs/faction/idris.dm index 3a29feae023..21b15dc9619 100644 --- a/code/game/jobs/faction/idris.dm +++ b/code/game/jobs/faction/idris.dm @@ -8,13 +8,8 @@ payment enforced by the infamous Idris Reclamation Units, shell IPCs sent to claim payment from negligent loan takers. In recent years, they have begun diversifying into more service-based industries. -

-

Idris Incorporated employees can be in the following departments: -

"} - +

"} + departments = {"Security
Service"} title_suffix = "Idris" allowed_role_types = IDRIS_ROLES diff --git a/code/game/jobs/faction/nanotrasen.dm b/code/game/jobs/faction/nanotrasen.dm index e67d6b709b1..fa42b406408 100644 --- a/code/game/jobs/faction/nanotrasen.dm +++ b/code/game/jobs/faction/nanotrasen.dm @@ -1,24 +1,14 @@ /datum/faction/nano_trasen name = "NanoTrasen" description = {"

- 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: - -

"} - + Considered the largest megacorporation within the Orion Spur, many will find themselves doing the biddings of NanoTrasen. + Initially a biotechnical research company, it rapidly grew in size after the discovery of phoron. + NanoTrasen's continued monopoly on the resource catapulted it into the limelight, where it has remained for the last forty-odd years. + During the Phoron Scarcity, NanoTrasen's power has since begun to waver, resulting in their profit margins diminishing considerably. + Nonetheless, NanoTrasen has managed to secure itself as a crucial member of the newly-founded Stellar Corporate Conglomerate + allowing themselves to remain as a dominant corporate presence within the Orion Spur. +

"} + departments = {"Medicalbr>Science
Service"} title_suffix = "NT" is_default = TRUE diff --git a/code/game/jobs/faction/orion_express.dm b/code/game/jobs/faction/orion_express.dm index ceacb28fc53..08724b07fa6 100644 --- a/code/game/jobs/faction/orion_express.dm +++ b/code/game/jobs/faction/orion_express.dm @@ -7,12 +7,8 @@ to cargo services and transport, but also features a fledgling robotics division, mainly focused on industrial synthetics to aid in its logistics missions. The Orion Express is expected to become an integral part of the Stellar Corporate Conglomerate's future through delivering supplies and merchandise throughout the Orion Spur. -

-

Orion Express employees can be in the following departments: -

"} - +

"} + departments = {"Operations"} title_suffix = "Orion" allowed_role_types = ORION_ROLES diff --git a/code/game/jobs/faction/pmc.dm b/code/game/jobs/faction/pmc.dm index a15bab5422c..a243af83c5b 100644 --- a/code/game/jobs/faction/pmc.dm +++ b/code/game/jobs/faction/pmc.dm @@ -1,18 +1,15 @@ /datum/faction/pmc name = "Private Military Contracting Group" description = {"

- 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: -

- "} + The Private Military Contracting Group is a coalition of security and medical contractors; + borne from the necessity of protecting the Stellar Corporate Conglomerate and its holdings. + Following the ever-growing corporate empire, mercenaries and contractors from all across the spur are deployed accordingly; + from mere office buildings to outposts in the Corporate Reconstruction Zone. + 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 part of several organizations contracted to supply the PMCG. +

"} + departments = {"Medical
Security"} title_suffix = "PMCG" allowed_role_types = PMC_ROLES diff --git a/code/game/jobs/faction/scc.dm b/code/game/jobs/faction/scc.dm index c308bed9544..eddeea579a6 100644 --- a/code/game/jobs/faction/scc.dm +++ b/code/game/jobs/faction/scc.dm @@ -1,20 +1,15 @@ /datum/faction/scc name = "Stellar Corporate Conglomerate" description = {"

- 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: -

- "} - + The Stellar Corporate Conglomerate (SCC) was formed at the height of corporate power in the galaxy, + originally to secure Tau Ceti assets during the Second Solarian Incursion. + Chainlink now exercises undisputed economic dominance over the Orion Spur, + and is now willing and eager to supersede any and all higher authority placed before it. + Cooperation has been deemed essential ever since Einstein Engines resurfaced due to the emerging prominence of warp travel. + They've remained in a shaky peace, puppeteered to carry out the engimatic whims of the Trasen family. + Of course, this doesn't stop their greed for power and glory - they're just corporations, after all. +

"} + departments = {"Command
Equipment"} title_suffix = "SCC" allowed_role_types = SCC_ROLES diff --git a/code/game/jobs/faction/unaffiliated.dm b/code/game/jobs/faction/unaffiliated.dm index c9648a7d4da..6d1a56bc732 100644 --- a/code/game/jobs/faction/unaffiliated.dm +++ b/code/game/jobs/faction/unaffiliated.dm @@ -8,10 +8,7 @@ for the mega corporations, is often necessary to forward the facade of economic freedom that Tau Ceti reports to have.

"} - + departments = {"Civilian"} allowed_role_types = INDEP_ROLES title_suffix = "INDEP" - -/datum/faction/unaffiliated/get_logo_name() - return "faction_unaffiliated.png" diff --git a/code/game/jobs/faction/zavodskoi.dm b/code/game/jobs/faction/zavodskoi.dm index 22a8af0f1fc..b257f1b54f9 100644 --- a/code/game/jobs/faction/zavodskoi.dm +++ b/code/game/jobs/faction/zavodskoi.dm @@ -7,28 +7,8 @@ other major armaments companies, Zavodskoi weapons can be found in the hands of nearly every military force across the Orion Spur. They are the main corporation found in the Empire of Dominia, and are at the forefront of weapons development technology. -

- -

Some character examples are: -

"} +

"} + departments = {"Science
Security"} title_suffix = "Zavod" allowed_role_types = ZAVOD_ROLES diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm index 2e89a89c366..6ec1ac3ef5c 100644 --- a/code/game/jobs/faction/zeng_hu.dm +++ b/code/game/jobs/faction/zeng_hu.dm @@ -9,14 +9,9 @@ years, they were also the first mega-corporation to partner with the newly-discovered Skrell, working closely with this alien species to pioneer cloning, a once controversial field that is now more accepted today. -

-

Zeng-Hu Pharmaceuticals employees can be in the following departments: -

"} - +

"} + departments = {"Medical
Science"} title_suffix = "Zeng" allowed_role_types = ZENG_ROLES diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index 9e252594de2..b48c59cadec 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -358,16 +358,16 @@ var/list/asset_datums = list() /datum/asset/simple/faction_icons assets = list( - "faction_EPMC.png" = 'icons/misc/factions/ECFlogo.png', - "faction_Zeng.png" = 'icons/misc/factions/ZhenHulogo.png', - "faction_Zavod.png" = 'icons/misc/factions/Zavodlogo.png', - "faction_NT.png" = 'icons/misc/factions/NanoTrasenlogo.png', - "faction_Idris.png" = 'icons/misc/factions/Idrislogo.png', - "faction_Hepht.png" = 'icons/misc/factions/Hephaestuslogo.png', - "faction_unaffiliated.png" = 'icons/misc/factions/Unaffiliatedlogo.png', - "faction_PMCG.png" = 'icons/misc/factions/pmcglogo.png', - "faction_Orion.png" = 'icons/misc/factions/Orionlogo.png', - "faction_SCC.png" = 'icons/misc/factions/SCClogo.png' + "faction_EPMC.png" = 'html/images/factions/ECFlogo.png', + "faction_Zeng.png" = 'html/images/factions/zenghulogo.png', + "faction_Zavod.png" = 'html/images/factions/zavodlogo.png', + "faction_NT.png" = 'html/images/factions/nanotrasenlogo.png', + "faction_Idris.png" = 'html/images/factions/idrislogo.png', + "faction_Hepht.png" = 'html/images/factions/hephlogo.png', + "faction_INDEP.png" = 'html/images/factions/unaffiliatedlogo.png', + "faction_PMCG.png" = 'html/images/factions/pmcglogo.png', + "faction_Orion.png" = 'html/images/factions/orionlogo.png', + "faction_SCC.png" = 'html/images/factions/scclogo.png' ) /datum/asset/simple/jquery @@ -413,16 +413,17 @@ var/list/asset_datums = list() "barcode1.png" = 'html/images/barcode1.png', "barcode2.png" = 'html/images/barcode2.png', "barcode3.png" = 'html/images/barcode3.png', - "scclogo.png" = 'html/images/scclogo.png', + "scclogo.png" = 'html/images/factions/scclogo.png', "ntlogo.png" = 'html/images/ntlogo.png', "ntlogo_small.png" = 'html/images/ntlogo_small.png', - "zhlogo.png" = 'html/images/zhlogo.png', - "idrislogo.png" = 'html/images/idrislogo.png', - "eridanilogo.png" = 'html/images/eridanilogo.png', - "pmcglogo.png" = 'html/images/pmcglogo.png', - "zavodlogo.png" = 'html/images/zavodlogo.png', - "orionlogo.png" = 'html/images/orionlogo.png', - "hplogo.png" = 'html/images/hplogo.png', + "zhlogo.png" = 'html/images/factions/zenghulogo.png', + "idrislogo.png" = 'html/images/factions/idrislogo.png', + "eridanilogo.png" = 'html/images/factions/ECFlogo.png', + "pmcglogo.png" = 'html/images/factions/pmcglogo.png', + "zavodlogo.png" = 'html/images/factions/zavodlogo.png', + "orionlogo.png" = 'html/images/factions/orionlogo.png', + "hplogolarge.png" = 'html/images/hplogolarge.png', + "hplogo.png" = 'html/images/factions/hephlogo.png', "beflag.png" = 'html/images/beflag.png', "elyraflag.png" = 'html/images/elyraflag.png', "solflag.png" = 'html/images/solflag.png', diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm index a890ff135af..90c215d1d41 100644 --- a/code/modules/client/preference_setup/occupation/occupation.dm +++ b/code/modules/client/preference_setup/occupation/occupation.dm @@ -144,7 +144,7 @@ var/list/dat = list( "", - "
Character faction
", + "
Character Faction
", "This will influence the jobs you can select from, and the starting equipment.
", "[pref.faction]

" ) @@ -158,7 +158,7 @@ var/index = -1 var/datum/faction/faction = SSjobs.name_factions[pref.faction] || SSjobs.default_faction - for(var/datum/job/job in faction.get_occupations()) + for(var/datum/job/job in SSjobs.occupations) index += 1 if((index >= limit) || (job.title in splitJobs)) dat += "" @@ -181,6 +181,9 @@ else if(!LAZYLEN(pref.GetValidTitles(job))) // we have no available jobs the character is old enough for dat += "[dispRank]" continue + if(!(job in faction.get_occupations())) + dat += "[dispRank]" + continue else if (ban_reason) dat += "[dispRank]" continue @@ -407,10 +410,10 @@ pref.player_alt_titles.Cut() -/datum/category_item/player_setup_item/occupation/proc/show_faction_menu(mob/user, selected_faction) +/datum/category_item/player_setup_item/occupation/proc/show_faction_menu(mob/user, selected_faction) //note : selected faction is what you choose to see, pref.faction is the actual chosen faction simple_asset_ensure_is_sent(user, /datum/asset/simple/faction_icons) - var/list/dat = list("
") + var/list/dat = list("

") var/list/factions = list() for (var/datum/faction/faction in SSjobs.factions) @@ -419,30 +422,37 @@ else factions += "[faction.name]" - dat += factions.Join(" | ") + "" + dat += factions.Join(" ") var/datum/faction/faction = SSjobs.name_factions[selected_faction] if(!istype(faction)) to_client_chat(SPAN_DANGER("Invalid faction chosen. Resetting to default.")) selected_faction = SSjobs.default_faction.name + dat += "

" + dat += "
\[MINIMUM AGE: [LAZYLEN(job.alt_ages) ? min(job.get_alt_character_age(), job.get_minimum_character_age(user.get_species())) : job.get_minimum_character_age(user.get_species())]]
\[FACTION RESTRICTED]
\[BANNED]
" + dat += "" + dat += "" + dat += "" + dat += "" + dat += "
[faction.description]" + dat += {""} + + dat += "
Departments:
" + dat += "[faction.departments]" + dat += "
" + + dat += "You can learn more about this faction on the wiki.
" + if (selected_faction == pref.faction) - dat += "
\[Faction already selected\]" + dat += "
\[selected\]" else if (faction.can_select(pref)) - dat += "
\[Select faction\]" + dat += "
\[select\]" else dat += "
[faction.get_selection_error(pref)]" - dat += "
[faction.name]" - dat += {"
"} - - if (faction.is_default) - dat += "
This faction is the default faction aboard this installation.
" - - dat += "

Read the Wiki
" - dat += "
[faction.description]" - - show_browser(user, dat.Join(), "window=factionpreview;size=400x600") + send_theme_resources(user) + user << browse(enable_ui_theme(user, dat.Join()), "window=factionpreview;size=750x450") /datum/category_item/player_setup_item/occupation/proc/validate_and_set_faction(selected_faction) var/datum/faction/faction = SSjobs.name_factions[selected_faction] diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 55c68e2d783..215f9094635 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -289,7 +289,7 @@ datum/preferences dat += player_setup.content(user) send_theme_resources(user) winshow(user, "preferences_window", TRUE) - var/datum/browser/popup = new(user, "preferences_browser", "Character Setup", 1000, 1000) + var/datum/browser/popup = new(user, "preferences_browser", "Character Setup", 1400, 1000) popup.set_content(dat) popup.open(FALSE) // Skip registering onclose on the browser pane onclose(user, "preferences_window", src) // We want to register on the window itself diff --git a/html/changelogs/wezzy_new_faction_screen.yml b/html/changelogs/wezzy_new_faction_screen.yml new file mode 100644 index 00000000000..9e824dd541c --- /dev/null +++ b/html/changelogs/wezzy_new_faction_screen.yml @@ -0,0 +1,44 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Updates the faction selection screen." + - imageadd: "Tweaks corporation logo images to be more consistent." + - bugfix: "Faction restrictions now properly cross out jobs instead of not spawning them." + diff --git a/html/images/eridanilogo.png b/html/images/eridanilogo.png deleted file mode 100644 index e7b59eed031..00000000000 Binary files a/html/images/eridanilogo.png and /dev/null differ diff --git a/html/images/factions/ECFlogo.png b/html/images/factions/ECFlogo.png new file mode 100644 index 00000000000..0529a5ee8dd Binary files /dev/null and b/html/images/factions/ECFlogo.png differ diff --git a/html/images/factions/hephlogo.png b/html/images/factions/hephlogo.png new file mode 100644 index 00000000000..81211957913 Binary files /dev/null and b/html/images/factions/hephlogo.png differ diff --git a/html/images/factions/idrislogo.png b/html/images/factions/idrislogo.png new file mode 100644 index 00000000000..e3ae9ebd919 Binary files /dev/null and b/html/images/factions/idrislogo.png differ diff --git a/html/images/factions/nanotrasenlogo.png b/html/images/factions/nanotrasenlogo.png new file mode 100644 index 00000000000..b0e0bc54cca Binary files /dev/null and b/html/images/factions/nanotrasenlogo.png differ diff --git a/html/images/factions/orionlogo.png b/html/images/factions/orionlogo.png new file mode 100644 index 00000000000..99fdfd9e554 Binary files /dev/null and b/html/images/factions/orionlogo.png differ diff --git a/html/images/factions/pmcglogo.png b/html/images/factions/pmcglogo.png new file mode 100644 index 00000000000..f41dab54f73 Binary files /dev/null and b/html/images/factions/pmcglogo.png differ diff --git a/html/images/factions/scclogo.png b/html/images/factions/scclogo.png new file mode 100644 index 00000000000..4d6ec5acbac Binary files /dev/null and b/html/images/factions/scclogo.png differ diff --git a/html/images/factions/unaffiliatedlogo.png b/html/images/factions/unaffiliatedlogo.png new file mode 100644 index 00000000000..0d29baac5df Binary files /dev/null and b/html/images/factions/unaffiliatedlogo.png differ diff --git a/html/images/factions/zavodlogo.png b/html/images/factions/zavodlogo.png new file mode 100644 index 00000000000..70c8ab1ba98 Binary files /dev/null and b/html/images/factions/zavodlogo.png differ diff --git a/html/images/factions/zenghulogo.png b/html/images/factions/zenghulogo.png new file mode 100644 index 00000000000..dbc4a0fdc0b Binary files /dev/null and b/html/images/factions/zenghulogo.png differ diff --git a/html/images/hplogo.png b/html/images/hplogolarge.png similarity index 100% rename from html/images/hplogo.png rename to html/images/hplogolarge.png diff --git a/html/images/idrislogo.png b/html/images/idrislogo.png deleted file mode 100644 index c15a2a54b0f..00000000000 Binary files a/html/images/idrislogo.png and /dev/null differ diff --git a/html/images/orionlogo.png b/html/images/orionlogo.png deleted file mode 100644 index dd69e3cbd15..00000000000 Binary files a/html/images/orionlogo.png and /dev/null differ diff --git a/html/images/pmcglogo.png b/html/images/pmcglogo.png deleted file mode 100644 index bc04ab4b787..00000000000 Binary files a/html/images/pmcglogo.png and /dev/null differ diff --git a/html/images/scclogo.png b/html/images/scclogo.png deleted file mode 100644 index 47762ac02d1..00000000000 Binary files a/html/images/scclogo.png and /dev/null differ diff --git a/html/images/zavodlogo.png b/html/images/zavodlogo.png deleted file mode 100644 index 6a7f53ec0bd..00000000000 Binary files a/html/images/zavodlogo.png and /dev/null differ diff --git a/html/images/zhlogo.png b/html/images/zhlogo.png deleted file mode 100644 index 6b1a8e66b08..00000000000 Binary files a/html/images/zhlogo.png and /dev/null differ diff --git a/icons/misc/factions/ECFlogo.png b/icons/misc/factions/ECFlogo.png index c54e489a7b6..0529a5ee8dd 100644 Binary files a/icons/misc/factions/ECFlogo.png and b/icons/misc/factions/ECFlogo.png differ diff --git a/icons/misc/factions/Hephaestuslogo.png b/icons/misc/factions/Hephaestuslogo.png deleted file mode 100644 index b8aa76a437d..00000000000 Binary files a/icons/misc/factions/Hephaestuslogo.png and /dev/null differ diff --git a/icons/misc/factions/Idrislogo.png b/icons/misc/factions/Idrislogo.png index 7223d9a829d..e3ae9ebd919 100644 Binary files a/icons/misc/factions/Idrislogo.png and b/icons/misc/factions/Idrislogo.png differ diff --git a/icons/misc/factions/NanoTrasenlogo.png b/icons/misc/factions/NanoTrasenlogo.png index 8f8d30646a5..b0e0bc54cca 100644 Binary files a/icons/misc/factions/NanoTrasenlogo.png and b/icons/misc/factions/NanoTrasenlogo.png differ diff --git a/icons/misc/factions/Orionlogo.png b/icons/misc/factions/Orionlogo.png index 38956466575..077b3abd619 100644 Binary files a/icons/misc/factions/Orionlogo.png and b/icons/misc/factions/Orionlogo.png differ diff --git a/icons/misc/factions/SCClogo.png b/icons/misc/factions/SCClogo.png index dfe7ab3f6f6..4d6ec5acbac 100644 Binary files a/icons/misc/factions/SCClogo.png and b/icons/misc/factions/SCClogo.png differ diff --git a/icons/misc/factions/Unaffiliatedlogo.png b/icons/misc/factions/Unaffiliatedlogo.png index bec0e234c64..0d29baac5df 100644 Binary files a/icons/misc/factions/Unaffiliatedlogo.png and b/icons/misc/factions/Unaffiliatedlogo.png differ diff --git a/icons/misc/factions/Zavodlogo.png b/icons/misc/factions/Zavodlogo.png index b56e6b98498..70c8ab1ba98 100644 Binary files a/icons/misc/factions/Zavodlogo.png and b/icons/misc/factions/Zavodlogo.png differ diff --git a/icons/misc/factions/ZhenHulogo.png b/icons/misc/factions/ZhenHulogo.png deleted file mode 100644 index 31ade926fde..00000000000 Binary files a/icons/misc/factions/ZhenHulogo.png and /dev/null differ diff --git a/icons/misc/factions/hephlogo.png b/icons/misc/factions/hephlogo.png new file mode 100644 index 00000000000..81211957913 Binary files /dev/null and b/icons/misc/factions/hephlogo.png differ diff --git a/icons/misc/factions/pmcglogo.png b/icons/misc/factions/pmcglogo.png index bc04ab4b787..f41dab54f73 100644 Binary files a/icons/misc/factions/pmcglogo.png and b/icons/misc/factions/pmcglogo.png differ diff --git a/icons/misc/factions/zenghulogo.png b/icons/misc/factions/zenghulogo.png new file mode 100644 index 00000000000..dbc4a0fdc0b Binary files /dev/null and b/icons/misc/factions/zenghulogo.png differ