From fa1170c7e893607307393d4a4c08f4c42724c08d Mon Sep 17 00:00:00 2001 From: killer653 Date: Mon, 9 Oct 2017 23:42:08 -0400 Subject: [PATCH] Should fix all the corp regs & codex issues --- .../loadout/loadout_utility.dm | 6 +- code/modules/lore_codex/codex.dm | 5 +- .../lore_codex/legal_code_data/main.dm | 4 +- .../lore_data/important_locations.dm | 2 +- code/modules/lore_codex/lore_data_vr/orgs.dm | 1 + .../lore_data_vr/political_parties.dm | 84 ------------------- vorestation.dme | 8 -- 7 files changed, 11 insertions(+), 99 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index f15d97fe42d..a31af49fec2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -15,14 +15,14 @@ /datum/gear/utility/codex display_name = "the traveler's guide to vir" - path = /obj/item/weapon/book/codex/lore/vir + path = /obj/item/weapon/book/codex //VOREStation Edit cost = 0 - +/* //VORESTATION REMOVAL /datum/gear/utility/corp_regs display_name = "corporate regulations and legal code" path = /obj/item/weapon/book/codex/corp_regs cost = 0 - +*/ /datum/gear/utility/folder_blue display_name = "folder, blue" path = /obj/item/weapon/folder/blue diff --git a/code/modules/lore_codex/codex.dm b/code/modules/lore_codex/codex.dm index 288123e233c..937e46a66d4 100644 --- a/code/modules/lore_codex/codex.dm +++ b/code/modules/lore_codex/codex.dm @@ -24,7 +24,7 @@ has the words 'Don't Panic' in small, friendly letters on the cover." icon_state = "codex" root_type = /datum/lore/codex/category/main_vir_lore - +/* //VORESTATION REMOVAL // Combines SOP/Regs/Law /obj/item/weapon/book/codex/corp_regs name = "NanoTrasen Regulatory Compendium" @@ -32,4 +32,5 @@ Internal Affairs." icon_state = "corp_regs" root_type = /datum/lore/codex/category/main_corp_regs - throwforce = 5 // Throw the book at 'em. \ No newline at end of file + throwforce = 5 // Throw the book at 'em. +*/ \ No newline at end of file diff --git a/code/modules/lore_codex/legal_code_data/main.dm b/code/modules/lore_codex/legal_code_data/main.dm index 10d4f60f223..de9d5ee4c2a 100644 --- a/code/modules/lore_codex/legal_code_data/main.dm +++ b/code/modules/lore_codex/legal_code_data/main.dm @@ -1,3 +1,5 @@ + +/* //VORESTATION REMOVAL /datum/lore/codex/category/main_corp_regs // The top-level categories for SOP/Regs/Law/etc name = "Index" data = "This book is meant to act as a reference for both NanoTrasen regulations, Standard Operating Procedure, and important laws of both \ @@ -44,7 +46,7 @@

\

Comments:

\ [notes]" - +*/ // Autogenerates a table which will resemble the traditional wiki table. /datum/lore/codex/page/overview name = "Overview" diff --git a/code/modules/lore_codex/lore_data/important_locations.dm b/code/modules/lore_codex/lore_data/important_locations.dm index 7fb72cebc65..17e05c14ca7 100644 --- a/code/modules/lore_codex/lore_data/important_locations.dm +++ b/code/modules/lore_codex/lore_data/important_locations.dm @@ -15,7 +15,7 @@ /datum/lore/codex/page/rota ) -/datum/lore/codex/page/vir/add_content() +/datum/lore/codex/page/virgo_erigone/add_content() name = "Vir (Star)" keywords += list("Vir") data = "Vir is an A-type main sequence star with 81% more mass than Sol (the humans' home star), and almost nine times as bright. It \ diff --git a/code/modules/lore_codex/lore_data_vr/orgs.dm b/code/modules/lore_codex/lore_data_vr/orgs.dm index 8b409e54595..5f4c6cc6504 100644 --- a/code/modules/lore_codex/lore_data_vr/orgs.dm +++ b/code/modules/lore_codex/lore_data_vr/orgs.dm @@ -1,5 +1,6 @@ // Pulls data from organizations data /datum/lore/codex/category/auto_org + var/desired_type = null var/auto_keywords = list() /datum/lore/codex/category/auto_org/New(var/new_holder, var/new_parent) diff --git a/code/modules/lore_codex/lore_data_vr/political_parties.dm b/code/modules/lore_codex/lore_data_vr/political_parties.dm index 4cbea1cdeb0..5f6a251669e 100644 --- a/code/modules/lore_codex/lore_data_vr/political_parties.dm +++ b/code/modules/lore_codex/lore_data_vr/political_parties.dm @@ -12,87 +12,3 @@ name = "Blank Page" keywords += list("Blank") data = "For some weird reason, this page is blank. This looks like a publishing error." - -/* -/datum/lore/codex/page/icarus_front/add_content() - name = "Icarus Front" - keywords += list("Icarus", "IF") - data = "The political group with the most seats in the [quick_link("SolGov")] legislature and control over the heartworlds of humanity, the Icarus Front is a \ - conservative body with a long history, tracing its linage back to the political unrest that created the Sol Confederate Government. Icarus calls \ - for severe restrictions on \"transformative technologies\" any technology with the power to fundamentally alter humanity, such as advanced artificial \ - intelligence and human genetic augmentation. Previously an unbeatable political force, recent changes have lead to its power backsliding. It remains a \ - popular party among those from Sol, Tau Ceti, and other heavily settled systems." - -/datum/lore/codex/page/shadow_coalition/add_content() - name = "Shadow Coalition" - data = "A disorganized liberal party, originating in an anti-[quick_link("Icarus")] shadow government. 'Shadow' in this case, refers to acting as an opposition \ - party to the Icarus majority. The Shadow Coalition calls for the lifting of certain Icarus-restricted technologies, especially medical \ - technologies with the ability to drastically improve quality of life. While fractious and prone to infighting, the Shadow Coalition and affiliated \ - parties remain the most popular political groups in the large towns and small cities of humanity, including [quick_link("Virgo-Erigone")]." - - -/datum/lore/codex/page/sol_economic_organization/add_content() - name = "Sol Economic Organization" - keywords += list("SEO") - data = "The newest force in [quick_link("SolGov")] politics, backed by the massive [quick_link("TSC", "Trans-Stellar Corporations")] and the [quick_link("Free Trade Union")], \ - as well as former [quick_link("Icarus")] warhawks. The SEO campaigns for minimal regulation on the development of new technologies, seeing them as anti-capitalist and \ - inefficient, and have gained significant traction among futurists, those wishing for a more impressive human military, and employee-residents of TSC \ - corporate towns, such as the [quick_link("Northern Star")].\ -

\ - [quick_link("NanoTrasen")], a R&D firm, is generally regarded as the most enthusiastic supporter of the SEO. Other contributing TSCs include the next six largest corporations \ - in human space: "+quick_link(TSC_WT)+" GMC, "+TSC_GIL+" Exports, Grayson Manufacturing Ltd., Aether Atmospherics and Recycling, [quick_link("Zeng-Hu Pharmaceuticals")] and "+TSC_HEPH+" \ - Industries, as well as, notably, [quick_link("Vey-Med")]. The Free Trade Union's participation in the SEO is a contentious issue that many of its members disagree with, but \ - most FTU representatives caucus with the SEO." - -/datum/lore/codex/page/mercurials/add_content() - name = "Mercurials" - keywords += list("Mercurial") - data = "[quick_link("Positronics")] and the rare augmented human who want to follow a different cultural path from the rest of humanity, viewing themselves as fundamentally \ - separate from unaugmented biological humans. Previously an illegal movement, proscribed due to the preceived dangers of unfettered self-modification and the threat \ - posed by positronics without human values in mind, self-described Mercurials still often find themselves persecuted or used by bioconservatives as scapegoats \ - and 'boogiemen'. As a technoprogressive group, they tend to vote along with the [quick_link("Shadow Coalition")]." - -/datum/lore/codex/page/positronic_rights_group/add_content() - name = "Positronic Rights Group" - keywords += list("PRG") - data = "The other side of the coin from the [quick_link("Mercurials")], the PRG wants full integration of [quick_link("positronics")] into human society, with equal wages, opportunities \ - to advancement, and representation in the media. Their current pet cause is a tax credit for humans who wish to adopt or sponsor the creation of a positronic, \ - a measure supported due to its potential to counteract the aging positronic population and to bring the average positronic closer to human culture. They tend to vote \ - along with the [quick_link("Shadow Coalition")], due to being technoprogressive." - -/datum/lore/codex/page/church_of_unitarian_god - name = "The Church of the Unitarian God" - keywords = list("Unitarian Church") - data = "An often-imperfect fusion of various human religions such as Christianity, Islam, and Judaism, the Unitarian Church represents the dim voice of \ - religion in a time of increased atheism. With the threat of singularity looming once more, their power is increasing with more converts and more donations, \ - and they use this power to protect the fundamental human soul from corruption by dangerous technologies and to spread their faith among aliens and positronics, \ - who they view as fellow children of God. They tend to side with bioconservatives." - -/datum/lore/codex/page/friends_of_ned/add_content() - name = "Friends of Ned" - keywords += list("Ned") - data = "The metaphorical reincarnation of a human named Ned Ludd's original Luddites, disdaining that name's negative connotations and embracing their original \ - purpose-- the restriction of technology that poses a threat to people's livelihoods. In addition to [quick_link("Icarus Front")] technological restrictions, the Friends demand \ - the complete prohibition of [quick_link("Drone", "drone intelligence and AGI research")], with most also opposing the [quick_link("FTU", "FTU's")] plans for wide spread \ - nanofabrication deployment. While the party refrains from making a definitive statement on their view of [quick_link("positronics")], many Friends have taken it upon themselves to label \ - them \"anti-labor technology\", and nominally-unsanctioned lynchings have marred the faction's reputation." - -/datum/lore/codex/page/multinational_movement/add_content() - name = "Multinational Movement" - keywords += list("Multinational") - data = "The barely-unified voice of [quick_link("SolGov", "SolGov's")] various independence movements, encompassing Terran governments wishing for a lighter touch \ - from SolGov, fringe colonies who balk at the call of distant masters, anarchist movements who want the freedom to live without government oversight, and the rare \ - Trans-Stellar who no longer see a benefit in working with SolGov. Full colonial independence is still a political impossibility so long as the \ - [quick_link("Icarus Front")] holds any sway, and so the Movement is focused primarily on securing more autonomy in governance, although a growing revolutionary sub-group \ - wants to force their change on the government en masse. The Multinational Movement finds themselves in an uneasy alliance with the [quick_link("SEO")], connected by their corporate, \ - fringe-system membership, and often provide a dissenting voice to SEO's war hawks." - -/datum/lore/codex/page/free_trade_union/add_content() - name = "Free Trade Union" - keywords += list("FTU") - data = "A softer counterpoint to the [quick_link("SEO")], the FTU is a party representing small businesses, workers' syndicates, and trade unions, who advocate for government \ - measures to reduce the amount of power held by the TSCs. In many ways a holdover from the days before the [quick_link("Shadow Coalition")], where corporate malfeasance took \ - the place of technological development as the primary issue of debate, the FTU has found itself adopting technological positions similar to the SEO as a matter \ - of pragmatism, although the views of individual members vary. The FTU is known for their intense lobbying of SolGov to add tax rebates to the purchases of \ - personal lathes and the creation of open-source firmware for experimental autolathes, but have thus far found little success." -*/ // No \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index 13edb0eefd5..8ecbda2e268 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1666,15 +1666,7 @@ #include "code\modules\lore_codex\codex.dm" #include "code\modules\lore_codex\codex_tree.dm" #include "code\modules\lore_codex\pages.dm" -#include "code\modules\lore_codex\legal_code_data\corporate_regulations.dm" -#include "code\modules\lore_codex\legal_code_data\main.dm" -#include "code\modules\lore_codex\legal_code_data\sif_law.dm" -#include "code\modules\lore_codex\legal_code_data\sop.dm" -#include "code\modules\lore_codex\lore_data\important_locations.dm" #include "code\modules\lore_codex\lore_data\main.dm" -#include "code\modules\lore_codex\lore_data\orgs.dm" -#include "code\modules\lore_codex\lore_data\political_parties.dm" -#include "code\modules\lore_codex\lore_data\species.dm" #include "code\modules\lore_codex\lore_data_vr\important_locations.dm" #include "code\modules\lore_codex\lore_data_vr\orgs.dm" #include "code\modules\lore_codex\lore_data_vr\political_parties.dm"