diff --git a/code/game/objects/banners.dm b/code/game/objects/banners.dm index 445df1dff5..5208336aa5 100644 --- a/code/game/objects/banners.dm +++ b/code/game/objects/banners.dm @@ -32,4 +32,4 @@ /obj/item/weapon/banner/virgov name = "\improper VirGov banner" icon_state = "banner-virgov" - desc = "A banner with the symbol of the local government, the Vir Governmental Authority, also known as SifGov." \ No newline at end of file + desc = "A banner with the symbol of the local government, the Vir Governmental Authority, also known as VirGov." \ No newline at end of file diff --git a/code/modules/busy_space/organizations.dm b/code/modules/busy_space/organizations.dm index 94f2872711..a7d205a62f 100644 --- a/code/modules/busy_space/organizations.dm +++ b/code/modules/busy_space/organizations.dm @@ -476,19 +476,28 @@ // Governments +<<<<<<< HEAD /datum/lore/organization/gov/sifgov name = "Sif Governmental Authority" short_name = "SifGov" desc = "SifGov is the sole governing administration for the Vir system, based in New Reykjavik, Sif. It is a representative \ democratic government, and a fully recognized member of the Solar Central Government. Anyone operating inside of Vir must \ comply with SifGov's legislation and regulations." // Vorestation Edit. Confederate -> Central +======= +/datum/lore/organization/gov/virgov + name = "Vir Governmental Authority" + short_name = "VirGov" + desc = "VirGov is the sole governing administration for the Vir system, based in New Reykjavik, Sif. It is a representative \ + democratic government, and a fully recognized member of the Solar Confederate Government. Anyone operating inside of Vir must \ + comply with VirGov's legislation and regulations." +>>>>>>> 03ac1aa... Merge pull request #5795 from Cerebulon/virgov history = "" // Todo like the rest of them - work = "governing body of Sif" + work = "governing body of Vir" headquarters = "New Reykjavik, Sif, Vir" motto = "" autogenerate_destination_names = FALSE - ship_prefixes = list("SGA" = "hauling", "SGA" = "energy relay") + ship_prefixes = list("VGA" = "hauling", "VGA" = "energy relay") destination_names = list( "New Reykjavik on Sif", "Radiance Energy Chain", @@ -544,7 +553,7 @@ "Firnir orbit", "Tyr orbit", "Magni orbit", - "a wreck in SifGov territory", + "a wreck in VirGov territory", "a military outpost", ) */ diff --git a/code/modules/lore_codex/legal_code_data/main.dm b/code/modules/lore_codex/legal_code_data/main.dm index de9d5ee4c2..a16d7d35d6 100644 --- a/code/modules/lore_codex/legal_code_data/main.dm +++ b/code/modules/lore_codex/legal_code_data/main.dm @@ -3,7 +3,7 @@ /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 \ - the Sif Governmental Authority and the Solar Confederate Government. The legal interactions between Nanotrasen corporate policy and SGA/SolGov \ + the Sif Governmental Authority and the Solar Confederate Government. The legal interactions between Nanotrasen corporate policy and VGA/SolGov \ law can make for some confusing legalese. This book was written by the Vir division of NanoTrasen in order for employees, visitors, and residents \ at NanoTrasen installations such as the Northen Star and the Southen Cross to know what isn't allowed, without needing to be a lawyer to read it.\

\ @@ -14,8 +14,8 @@ Also contained inside are our Standard Operating Procedures, that all employees of NanoTrasen are expected to follow, and for the local facility's \ Command team and Internal Affairs to enforce.\

\ - It should be noted that by being on-board our facility, you agree to follow the rules of Corporate Regulations. By being within SGA space, \ - you are also required to follow the laws of SifGov." + It should be noted that by being on-board our facility, you agree to follow the rules of Corporate Regulations. By being within VGA space, \ + you are also required to follow the laws of VirGov." children = list( /datum/lore/codex/category/standard_operating_procedures, /datum/lore/codex/category/corporate_regulations, @@ -36,7 +36,7 @@ var/suggested_brig_time = null var/suggested_fine = null var/notes = null - var/mandated = FALSE // If true, changes 'suggested' to 'mandated' for punishments, used for sifgov laws and some high corporate regs. + var/mandated = FALSE // If true, changes 'suggested' to 'mandated' for punishments, used for virgov laws and some high corporate regs. /datum/lore/codex/page/law/add_content() data = "[definition]\ diff --git a/code/modules/lore_codex/legal_code_data/sif_law.dm b/code/modules/lore_codex/legal_code_data/sif_law.dm index e143f7f6c5..05b45d840a 100644 --- a/code/modules/lore_codex/legal_code_data/sif_law.dm +++ b/code/modules/lore_codex/legal_code_data/sif_law.dm @@ -90,11 +90,11 @@ /datum/lore/codex/page/law/drone_id_failure name = "Failure to Present Drone ID" definition = "Failing to carry or present an EIO-issued Drone Identification card as a Drone intelligence." - suggested_punishments = "200 thaler fine. Give Drone a temporary paper stating that it is a drone, if the ID was lost. Fax SifGov. Inform owner of \ + suggested_punishments = "200 thaler fine. Give Drone a temporary paper stating that it is a drone, if the ID was lost. Fax VirGov. Inform owner of \ Drone if possible. Instruct Drone to obtain new ID at its earliest opportunity, if it was lost." notes = "This is only applicable to Drone intelligences which possess autonomous capability. It must be proven that the offender is a Drone, which can be \ accomplished in various ways, generally with the expertise of a Roboticist. Lawbound synthetics, maintenance drones, and \ - simple bots do not require an ID card. No fine or SifGov fax should be sent if the Drone's ID was lost due to theft and the ID is able to be recovered." + simple bots do not require an ID card. No fine or VirGov fax should be sent if the Drone's ID was lost due to theft and the ID is able to be recovered." mandated = TRUE /datum/lore/codex/page/law/slander @@ -148,7 +148,7 @@ /datum/lore/codex/page/law/embezzlement name = "Embezzlement" definition = "Stealing money that is entrusted to you by a corporation or person." - suggested_punishments = "Hold until Transfer. Termination. Reimbursement of embezzled funds. Fax Central Command and SifGov." + suggested_punishments = "Hold until Transfer. Termination. Reimbursement of embezzled funds. Fax Central Command and VirGov." notes = "This includes funneling Departmental, Facility, or Crew funds into the offender's account. It also includes pocketing \ transactions directly that are meant to go to a seperate account." mandated = TRUE @@ -166,7 +166,7 @@ /datum/lore/codex/page/law/manslaughter/add_content() name = "Manslaughter" definition = "To kill a sapient being without intent." - suggested_punishments = "Hold until Transfer, if unjustified. Fax SifGov." + suggested_punishments = "Hold until Transfer, if unjustified. Fax VirGov." notes = "Includes provoked manslaughter, negligent manslaughter, and impassioned killing. The important distinction between this \ and [quick_link("Murder")] is intent. Manslaughter can be justified if force was nessecary and it was intented to prevent further loss of life or \ grievous injury to self or others, however persons involved in the kill will still be required to answer to higher legal authority \ @@ -177,7 +177,7 @@ /datum/lore/codex/page/law/murder/add_content() name = "Murder" definition = "To kill or attempt to kill a sapient being with malicious intent." - suggested_punishments = "Hold until Transfer. Termination. Fax SifGov." + suggested_punishments = "Hold until Transfer. Termination. Fax VirGov." notes = "The distinction between this and [quick_link("Manslaughter")] is intent. Sapients held within synthetic bodies, lawbound or otherwise, which receive \ critical damage from someone can be considered a murder attempt." mandated = TRUE @@ -194,7 +194,7 @@ name = "Experimentation with Transgressive Technology" keywords += list("Transgressive", "Illegal Technology") definition = "Experimenting with technologies deemed unsafe or are otherwise federally restricted by the Solar Confederate Government." - suggested_punishments = "Hold until Transfer. Termination. Fax SifGov. Delete, destroy, or otherwise remove the experiments." + suggested_punishments = "Hold until Transfer. Termination. Fax VirGov. Delete, destroy, or otherwise remove the experiments." notes = "Unsafe technologies include unrestricted nanomachinery, massive sapient body bio-augmentation, massive sapient brain augmentation, \ massively self-improving AI, and animal uplifting." mandated = TRUE @@ -225,14 +225,14 @@ /datum/lore/codex/page/law/unlawful_law_changes name = "Unlawful Alteration of Bound Synthetics" definition = "Modifying a bound synthetic's lawset or chassis, in order to force it to do illegal, humiliating, dangerous, or other unlawful acts." - suggested_punishments = "Hold until Transfer. Termination. Fax SifGov." + suggested_punishments = "Hold until Transfer. Termination. Fax VirGov." notes = "If the synthetic is a cyborg or positronic, this is also an offense against the Sapient Rights laws federally mandated by the Solar Confederate Government." mandated = TRUE /datum/lore/codex/page/law/grand_theft name = "Grand Theft" definition = "To steal items that are dangerous, of a high value, or a sensitive nature." - suggested_punishments = "Hold until Transfer. Termination. Fax SifGov." + suggested_punishments = "Hold until Transfer. Termination. Fax VirGov." notes = "This can include the following;\