Merge pull request #4615 from VOREStation/upstream-merge-5795

[MIRROR] Standardises SifGov to VirGov
This commit is contained in:
Novacat
2019-03-27 03:40:16 -04:00
committed by GitHub
6 changed files with 27 additions and 27 deletions

View File

@@ -32,4 +32,4 @@
/obj/item/weapon/banner/virgov /obj/item/weapon/banner/virgov
name = "\improper VirGov banner" name = "\improper VirGov banner"
icon_state = "banner-virgov" icon_state = "banner-virgov"
desc = "A banner with the symbol of the local government, the Vir Governmental Authority, also known as SifGov." desc = "A banner with the symbol of the local government, the Vir Governmental Authority, also known as VirGov."

View File

@@ -476,19 +476,19 @@
// Governments // Governments
/datum/lore/organization/gov/sifgov /datum/lore/organization/gov/virgov
name = "Sif Governmental Authority" name = "Vir Governmental Authority"
short_name = "SifGov" short_name = "VirGov"
desc = "SifGov is the sole governing administration for the Vir system, based in New Reykjavik, Sif. It is a representative \ 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 Central Government. Anyone operating inside of Vir must \ democratic government, and a fully recognized member of the Solar Confederate Government. Anyone operating inside of Vir must \
comply with SifGov's legislation and regulations." // Vorestation Edit. Confederate -> Central comply with VirGov's legislation and regulations."
history = "" // Todo like the rest of them history = "" // Todo like the rest of them
work = "governing body of Sif" work = "governing body of Vir"
headquarters = "New Reykjavik, Sif, Vir" headquarters = "New Reykjavik, Sif, Vir"
motto = "" motto = ""
autogenerate_destination_names = FALSE autogenerate_destination_names = FALSE
ship_prefixes = list("SGA" = "hauling", "SGA" = "energy relay") ship_prefixes = list("VGA" = "hauling", "VGA" = "energy relay")
destination_names = list( destination_names = list(
"New Reykjavik on Sif", "New Reykjavik on Sif",
"Radiance Energy Chain", "Radiance Energy Chain",
@@ -544,7 +544,7 @@
"Firnir orbit", "Firnir orbit",
"Tyr orbit", "Tyr orbit",
"Magni orbit", "Magni orbit",
"a wreck in SifGov territory", "a wreck in VirGov territory",
"a military outpost", "a military outpost",
) )
*/ */

View File

@@ -3,7 +3,7 @@
/datum/lore/codex/category/main_corp_regs // The top-level categories for SOP/Regs/Law/etc /datum/lore/codex/category/main_corp_regs // The top-level categories for SOP/Regs/Law/etc
name = "Index" name = "Index"
data = "This book is meant to act as a reference for both NanoTrasen regulations, Standard Operating Procedure, and important laws of both \ 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 \ 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.\ 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.\
<br><br>\ <br><br>\
@@ -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 \ 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.\ Command team and Internal Affairs to enforce.\
<br><br>\ <br><br>\
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, \ 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 SifGov." you are also required to follow the laws of VirGov."
children = list( children = list(
/datum/lore/codex/category/standard_operating_procedures, /datum/lore/codex/category/standard_operating_procedures,
/datum/lore/codex/category/corporate_regulations, /datum/lore/codex/category/corporate_regulations,
@@ -36,7 +36,7 @@
var/suggested_brig_time = null var/suggested_brig_time = null
var/suggested_fine = null var/suggested_fine = null
var/notes = 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() /datum/lore/codex/page/law/add_content()
data = "<i>[definition]</i>\ data = "<i>[definition]</i>\

View File

@@ -90,11 +90,11 @@
/datum/lore/codex/page/law/drone_id_failure /datum/lore/codex/page/law/drone_id_failure
name = "Failure to Present Drone ID" name = "Failure to Present Drone ID"
definition = "Failing to carry or present an EIO-issued Drone Identification card as a Drone intelligence." 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." 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 \ 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 \ 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 mandated = TRUE
/datum/lore/codex/page/law/slander /datum/lore/codex/page/law/slander
@@ -148,7 +148,7 @@
/datum/lore/codex/page/law/embezzlement /datum/lore/codex/page/law/embezzlement
name = "Embezzlement" name = "Embezzlement"
definition = "Stealing money that is entrusted to you by a corporation or person." 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 \ 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." transactions directly that are meant to go to a seperate account."
mandated = TRUE mandated = TRUE
@@ -166,7 +166,7 @@
/datum/lore/codex/page/law/manslaughter/add_content() /datum/lore/codex/page/law/manslaughter/add_content()
name = "Manslaughter" name = "Manslaughter"
definition = "To kill a sapient being without intent." 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 \ 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 \ 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 \ 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() /datum/lore/codex/page/law/murder/add_content()
name = "Murder" name = "Murder"
definition = "To kill or attempt to kill a sapient being with malicious intent." 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 \ 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." critical damage from someone can be considered a murder attempt."
mandated = TRUE mandated = TRUE
@@ -194,7 +194,7 @@
name = "Experimentation with Transgressive Technology" name = "Experimentation with Transgressive Technology"
keywords += list("Transgressive", "Illegal Technology") keywords += list("Transgressive", "Illegal Technology")
definition = "Experimenting with technologies deemed unsafe or are otherwise federally restricted by the Solar Confederate Government." 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, \ notes = "Unsafe technologies include unrestricted nanomachinery, massive sapient body bio-augmentation, massive sapient brain augmentation, \
massively self-improving AI, and animal uplifting." massively self-improving AI, and animal uplifting."
mandated = TRUE mandated = TRUE
@@ -225,14 +225,14 @@
/datum/lore/codex/page/law/unlawful_law_changes /datum/lore/codex/page/law/unlawful_law_changes
name = "Unlawful Alteration of Bound Synthetics" 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." 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." 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 mandated = TRUE
/datum/lore/codex/page/law/grand_theft /datum/lore/codex/page/law/grand_theft
name = "Grand Theft" name = "Grand Theft"
definition = "To steal items that are dangerous, of a high value, or a sensitive nature." 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;\ notes = "This can include the following;\
<br><ul>\ <br><ul>\
<li>Deadly Weapons or Firearms.</li>\ <li>Deadly Weapons or Firearms.</li>\
@@ -259,7 +259,7 @@
/datum/lore/codex/page/law/sabotage/add_content() /datum/lore/codex/page/law/sabotage/add_content()
name = "Sabotage" name = "Sabotage"
definition = "To deliberately damage, or attempt to damage the facility, or critical systems of the facility." definition = "To deliberately damage, or attempt to damage the facility, or critical systems of the facility."
suggested_punishments = "Hold until Transfer. Termination. Fax SifGov." suggested_punishments = "Hold until Transfer. Termination. Fax VirGov."
notes = "This includes causing hull breaches, arson, sabotaging air supplies, stealing vital equipment, tampering with AI or telecomm systems, and sabotaging the \ notes = "This includes causing hull breaches, arson, sabotaging air supplies, stealing vital equipment, tampering with AI or telecomm systems, and sabotaging the \
Engine. If someone has only caused minor damage, the [quick_link("Vandalism")] charge should be used instead." Engine. If someone has only caused minor damage, the [quick_link("Vandalism")] charge should be used instead."
mandated = TRUE mandated = TRUE
@@ -269,7 +269,7 @@
name = "Kidnapping / Hostage Taking" name = "Kidnapping / Hostage Taking"
keywords += list("Kidnapping", "Hostage Taking") keywords += list("Kidnapping", "Hostage Taking")
definition = "To unlawfully confine, transport, or hold a sapient being against that individual's will." definition = "To unlawfully confine, transport, or hold a sapient being against that individual's will."
suggested_punishments = "Hold until Transfer. Termination. Fax SifGov." suggested_punishments = "Hold until Transfer. Termination. Fax VirGov."
notes = "Persons held for ransom or exchange are also considered to be hostages for this charge." notes = "Persons held for ransom or exchange are also considered to be hostages for this charge."
mandated = TRUE mandated = TRUE
..() ..()
@@ -278,7 +278,7 @@
name = "Terrorist Acts" name = "Terrorist Acts"
keywords += list("Terrorism") keywords += list("Terrorism")
definition = "To engage in maliciously destructive actions, which seriously threaten the crew or facility, or the usage of weapons of mass destruction." definition = "To engage in maliciously destructive actions, which seriously threaten the crew or facility, or the usage of weapons of mass destruction."
suggested_punishments = "Hold until Transfer. Termination. Fax SifGov." suggested_punishments = "Hold until Transfer. Termination. Fax VirGov."
notes = "This includes the use of mass bombings, mass murder, releasing harmful biological agents, nuclear weapons, \ notes = "This includes the use of mass bombings, mass murder, releasing harmful biological agents, nuclear weapons, \
radiological weapons, and chemical weapons." radiological weapons, and chemical weapons."
mandated = TRUE mandated = TRUE

View File

@@ -46,7 +46,7 @@
the exact circumstances involved. For minor violations of Corp Regs, generally the Prisoner will have a choice of paying a Fine, or \ 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 \ 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 Sif 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 SGA. See the specific violation contained \ 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." in this book for more details."
/datum/lore/codex/page/sop_brigging /datum/lore/codex/page/sop_brigging

View File

@@ -22,7 +22,7 @@
has a white glow, and a diameter that is about 34% larger than Sol. It has six major planets in its orbit.\ has a white glow, and a diameter that is about 34% larger than Sol. It has six major planets in its orbit.\
<br><br>\ <br><br>\
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("Sif Governmental Authority")], as Sif \
was the first planet to be colonized, however SGA lays claim to all planets orbiting Vir. The planets \ 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. \ 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." Some installations carry on this tradition."