diff --git a/code/modules/lore_codex/legal_code_data/main.dm b/code/modules/lore_codex/legal_code_data/main.dm index 953980d1fd..d47a8d8e7c 100644 --- a/code/modules/lore_codex/legal_code_data/main.dm +++ b/code/modules/lore_codex/legal_code_data/main.dm @@ -1,7 +1,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 VGA/SolGov \ + the Vir 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.\

\ @@ -96,4 +96,4 @@ HTML += "" data = data + HTML - ..() \ No newline at end of file + ..() 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 05b45d840a..c8ac8ce9ce 100644 --- a/code/modules/lore_codex/legal_code_data/sif_law.dm +++ b/code/modules/lore_codex/legal_code_data/sif_law.dm @@ -1,6 +1,6 @@ /datum/lore/codex/category/sif_law - name = "Sif Law" - data = "This section contains the abbreviated Sif Govermental Authority legal code's potential charges for crimes that are relevant to \ + name = "Vir Law" + data = "This section contains the abbreviated Vir Govermental Authority legal code's potential charges for crimes that are relevant to \ the reader." children = list( /datum/lore/codex/page/legal_punishments, @@ -10,16 +10,16 @@ /datum/lore/codex/page/legal_punishments name = "Punishments (Law)" - data = "A violation of Sif Law is considered far more serious then a violation of corporate regulations. \ + data = "A violation of Vir Law is considered far more serious than a violation of corporate regulations. \ As a result, its expected that a member of Internal Affairs be present to observe and assist security with the paperwork if they are able. \ - Unlike Corporate Regulations, all violations of Sif Law will require a fax detailing the events to be sent to the \ - Sif Governmental Authority within a certain amount of time based on whether or not it was a minor or major violation. \ + Unlike Corporate Regulations, all violations of Vir Law will require a fax detailing the events to be sent to the \ + Vir Governmental Authority within a certain amount of time based on whether or not it was a minor or major violation. \ Punishments will usually include brig time with fines still remaining an option for the far less serious crimes. \ It should be noted that a majority of major violations carry a 'Hold till Transfer' order." /datum/lore/codex/category/law_minor_violations name = "Minor Violations (Law)" - data = "Here is a list of the less severe violations of local Sif Law that might occur on your facility. A fax to the Sif Governmental Authority \ + data = "Here is a list of the less severe violations of local Vir Law that might occur on your facility. A fax to the Vir Governmental Authority \ is required to be sent within 24 hours of a violation being comitted, for minor violations listed here." children = list( /datum/lore/codex/page/law/theft, @@ -106,7 +106,7 @@ /datum/lore/codex/category/law_major_violations name = "Major Violations (Law)" - data = "Here is a list of the serious violations of local Sif Law that might occur on your facility. A fax to the Sif Governmental Authority \ + data = "Here is a list of the serious violations of local Vir Law that might occur on your facility. A fax to the Vir Governmental Authority \ is required to be sent within one hour, or when it is safe to do so, for major crimes listed here." children = list( /datum/lore/codex/page/law/aggravated_battery, @@ -282,4 +282,4 @@ notes = "This includes the use of mass bombings, mass murder, releasing harmful biological agents, nuclear weapons, \ radiological weapons, and chemical weapons." mandated = TRUE - ..() \ No newline at end of file + ..() diff --git a/code/modules/lore_codex/legal_code_data/sop.dm b/code/modules/lore_codex/legal_code_data/sop.dm index 10d14b1632..78fe95240d 100644 --- a/code/modules/lore_codex/legal_code_data/sop.dm +++ b/code/modules/lore_codex/legal_code_data/sop.dm @@ -116,7 +116,7 @@ Internal Affairs Agents are to work with the Command crew when possible. An agent is to not go above the authority of the Command crew unless said Command crew \ member is involved, or otherwise unable to assist in the matter. Any member of the crew can be subject to an Internal Affairs investigation. This includes \ the Command crew and other Internal Affairs agents. If the Internal Affairs investigation reveals wrongdoing, including SOP breach, the investigated party is to \ - be punished according to Corporate Regulations or Sif Law, whichever is applicable, or from orders from Central Command." + be punished according to Corporate Regulations or Vir Law, whichever is applicable, or from orders from Central Command." /datum/lore/codex/page/engineering_sop name = "Engineering SOP" diff --git a/code/modules/lore_codex/legal_code_data/sop/security.dm b/code/modules/lore_codex/legal_code_data/sop/security.dm index a41b0fd797..ec2329bde1 100644 --- a/code/modules/lore_codex/legal_code_data/sop/security.dm +++ b/code/modules/lore_codex/legal_code_data/sop/security.dm @@ -45,7 +45,7 @@ The Prisoner is to be informed of their Sentencing Options, if available. These will vary depending on the violation in question, and \ the exact circumstances involved. For minor violations of Corp Regs, generally the Prisoner will have a choice of paying a Fine, or \ serving time within the brig. For major violations, generally a demotion is recommended, however this is at the discretion of the Prisoner's \ - Superior, and not the Arresting Officer. For minor violations of Sif Law, the same rules generally apply as if it was a minor Corp Reg violation, however \ + Superior, and not the Arresting Officer. For minor violations of Vir Law, the same rules generally apply as if it was a minor Corp Reg violation, however \ major Law violations generally require a long brig sentence, or Holding until Transfer, as well as a fax to the VGA. See the specific violation contained \ in this book for more details." @@ -78,7 +78,7 @@ // Sad that we need this page to exist. /datum/lore/codex/page/sop_prisoner_rights name = "Prisoners' Rights" - data = "Prisoners are still under the protections of local Sif Law and Corporate Regulations, and still have their Sapient Rights (if applicable), sans their freedom of movement. \ + data = "Prisoners are still under the protections of local Vir Law and Corporate Regulations, and still have their Sapient Rights (if applicable), sans their freedom of movement. \ Prisoners are entitled to have their communication devices (Radio, PDA, Communicator), provided they do not abuse them. Departmental radios must be \ exchanged for general radios, if the prisoner has been sentenced to Holding until Transfer, or otherwise has been demoted by their Superior. Prisoners \ are also entitled to receive medical care. Their timer continues to run while they are outside their cell in order to receive medical treatment, if \ @@ -116,4 +116,4 @@ /datum/lore/codex/page/sop_hostage name = "Hostage Response" data = "In the event of a serious hostage situation, the hostage's life is the highest priority. Do not do anything that will present \ - undue risk to the hostage, or otherwise will get them killed. Negotiation should be the first response, as opposed to violently rushing the hostage taker." \ No newline at end of file + undue risk to the hostage, or otherwise will get them killed. Negotiation should be the first response, as opposed to violently rushing the hostage taker." diff --git a/code/modules/lore_codex/lore_data/important_locations.dm b/code/modules/lore_codex/lore_data/important_locations.dm index 224dbd4470..5d0e90f9f9 100644 --- a/code/modules/lore_codex/lore_data/important_locations.dm +++ b/code/modules/lore_codex/lore_data/important_locations.dm @@ -21,7 +21,7 @@ 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 \ has a white glow, and a diameter that is about 34% larger than Sol. It has six major planets in its orbit.\

\ - Vir is mainly administered on [quick_link("Sif")] by the [quick_link("Sif Governmental Authority")], as Sif \ + Vir is mainly administered on [quick_link("Sif")] by the [quick_link("Vir Governmental Authority")], as Sif \ was the first planet to be colonized, however VGA lays claim to all planets orbiting Vir. The planets \ are named after figures in ancient human mythology (Norse), due to the original surveyor for the system deciding to do so. \ Some installations carry on this tradition." @@ -67,7 +67,7 @@ keywords += list("Sif") data = "Sif is a terrestrial planet and third closest planet to Vir. It possesses oceans, a breathable atmosphere, \ a magnetic field, weather, and acceptable gravity. It is currently the capital planet of Vir. Its center of government is the \ - equatorial city and site of the first settlement, New Reykjavik, which houses the [quick_link("Sif Governmental Authority")].\ + equatorial city and site of the first settlement, New Reykjavik, which houses the [quick_link("Vir Governmental Authority")].\

\ Sif has many desirable traits which made it the first planet to be colonized in Vir, however it also has various quirks which \ may disorient humans used to conditions on planet Earth. Atmospheric pressure is lower than 'normal', which may cause difficulty \ @@ -80,7 +80,7 @@ keywords += list("Vir Interstellar Spaceport") data = "The Vir Interstellar Spaceport is a large facility in orbit of the planet [quick_link("Sif")] which handles the loading and \ unloading, refuelling, and general maintenance of large spacecraft. The main structure is owned by the \ - [quick_link("Sif Governmental Authority")], but individual offices, docking/loading bays, and warehouses are often leased to individuals \ + [quick_link("Vir Governmental Authority")], but individual offices, docking/loading bays, and warehouses are often leased to individuals \ or organisations. The position of the spaceport allows it to function not only as a key node for transport inside the Vir \ system, especially to and from the planet Sif, but also as a key stopping point interstellar craft travelling via Vir which need refuelling. \

\ diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 6aa67f03b0..709792edf4 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -1,5 +1,5 @@ var/global/list/obj/machinery/photocopier/faxmachine/allfaxes = list() -var/global/list/admin_departments = list("[using_map.boss_name]", "Sif Governmental Authority", "Supply") +var/global/list/admin_departments = list("[using_map.boss_name]", "Vir Governmental Authority", "Supply") var/global/list/alldepartments = list() var/global/list/adminfaxes = list() //cache for faxes that have been sent to admins @@ -200,8 +200,8 @@ var/global/list/adminfaxes = list() //cache for faxes that have been sent to adm // Sadly, we can't use a switch statement here due to not using a constant value for the current map's centcom name. if(destination == using_map.boss_name) message_admins(sender, "[uppertext(using_map.boss_short)] FAX", rcvdcopy, "CentComFaxReply", "#006100") - else if(destination == "Sif Governmental Authority") - message_admins(sender, "SIF GOVERNMENT FAX", rcvdcopy, "CentComFaxReply", "#1F66A0") + else if(destination == "Vir Governmental Authority") + message_admins(sender, "VIR GOVERNMENT FAX", rcvdcopy, "CentComFaxReply", "#1F66A0") else if(destination == "Supply") message_admins(sender, "[uppertext(using_map.boss_short)] SUPPLY FAX", rcvdcopy, "CentComFaxReply", "#5F4519") else @@ -236,7 +236,7 @@ var/global/list/adminfaxes = list() //cache for faxes that have been sent to adm if(check_rights((R_ADMIN|R_MOD|R_EVENT),0,C)) to_chat(C,msg) C << 'sound/machines/printer.ogg' - + // Webhooks don't parse the HTML on the paper, so we gotta strip them out so it's still readable. var/summary = make_summary(sent) summary = paper_html_to_plaintext(summary)