From c22712e310f5d4a2ac8948bce0e7a016db6cd6e5 Mon Sep 17 00:00:00 2001 From: Aiden Date: Mon, 6 Jan 2025 15:05:51 -0600 Subject: [PATCH] Merge pull request #19 from CerberusWolfie/SOPHotFix Rework SOP with Tables --- .../en-US/_Goobstation/guidebook/guides.ftl | 8 +- .../Prototypes/_Goobstation/Guidebook/sop.yml | 13 +- .../SOP/AlertLevels/AlertLevelsSOP.xml | 135 ++++++++++++++---- .../Guidebook/SOP/Jobs/Cargo/CargoSOP.xml | 4 +- .../SOP/Jobs/Command/BlueshieldOfficerSOP.xml | 6 +- .../Guidebook/SOP/Jobs/Command/CommandSOP.xml | 2 +- .../SOP/Jobs/Command/LogisticsOfficerSOP.xml | 25 ++++ .../SOP/Jobs/Command/NanotrasenRepSOP.xml | 6 +- .../SOP/Jobs/Command/QuartermasterSOP.xml | 25 ---- .../Guidebook/SOP/Legal/PunishmentsSOP.xml | 3 + .../StandardProcedures/CommandSuccession.xml | 4 +- 11 files changed, 163 insertions(+), 68 deletions(-) create mode 100644 Resources/ServerInfo/Guidebook/SOP/Jobs/Command/LogisticsOfficerSOP.xml delete mode 100644 Resources/ServerInfo/Guidebook/SOP/Jobs/Command/QuartermasterSOP.xml diff --git a/Resources/Locale/en-US/_Goobstation/guidebook/guides.ftl b/Resources/Locale/en-US/_Goobstation/guidebook/guides.ftl index 7ab06a0a2c..bc630eea44 100644 --- a/Resources/Locale/en-US/_Goobstation/guidebook/guides.ftl +++ b/Resources/Locale/en-US/_Goobstation/guidebook/guides.ftl @@ -1,8 +1,8 @@ # Goob SOP # - Main Directories guide-entry-sop = SOP -guide-entry-sop-alert-levels = Alert Levels -guide-entry-sop-emergencies = Emergencies +guide-entry-sop-alert-levels = _Alert Levels +guide-entry-sop-emergencies = _Emergencies guide-entry-sop-jobs = Jobs guide-entry-sop-legal = Legal guide-entry-sop-standards = Standard Procedures @@ -51,10 +51,12 @@ guide-entry-sop-bso = Blueshield Officer guide-entry-sop-captain = Captain guide-entry-sop-hop = Head of Personnel guide-entry-sop-hos = Head of Security +# Mystagogue changed by Delta-V (original: Research Director) guide-entry-sop-mg = Mystagogue guide-entry-sop-cmo = Chief Medical Ofc. guide-entry-sop-ce = Chief Engineer -guide-entry-sop-qm = Quartermaster +# Logistics Officer changed by Delta-V (original: Quartermaster) +guide-entry-sop-lo = Logistics Officer # - Engineering guide-entry-sop-atmostech = Atmos Tech guide-entry-sop-stationengineer = Station Engineer diff --git a/Resources/Prototypes/_Goobstation/Guidebook/sop.yml b/Resources/Prototypes/_Goobstation/Guidebook/sop.yml index 698a1fa250..03e1d8c662 100644 --- a/Resources/Prototypes/_Goobstation/Guidebook/sop.yml +++ b/Resources/Prototypes/_Goobstation/Guidebook/sop.yml @@ -4,7 +4,6 @@ name: guide-entry-sop text: "/ServerInfo/Guidebook/SOP/SoP.xml" children: - - Emergencies SOP - Jobs SOP - Legal SOP - StandardProcedures SOP @@ -47,6 +46,7 @@ text: "/ServerInfo/Guidebook/SOP/StandardProcedures/StandardProceduresSOP.xml" children: - Alert Levels + - Emergencies SOP - Demoting SOP - Hiring SOP - Succession @@ -93,10 +93,10 @@ - Captain SOP - HeadOfPersonnel SOP - HeadOfSecurity SOP - - Mystagogue SOP + - Mystagogue SOP # Changed for Delta-V Naming Scheme - Original: Research Director - ChiefMedicalOfficer SOP - ChiefEngineer SOP - - Quartermaster SOP + - LogisticsOfficer SOP # Changed for Delta-V Naming Scheme - Original: Quartermaster - type: guideEntry id: Engineering SOP @@ -116,6 +116,7 @@ - Cataloguer SOP - Researcher SOP - Golemancer SOP + - Sacrifices SOP - type: guideEntry id: Medical SOP @@ -327,9 +328,9 @@ text: "/ServerInfo/Guidebook/SOP/Jobs/Command/ChiefEngineerSOP.xml" - type: guideEntry - id: Quartermaster SOP - name: guide-entry-sop-qm - text: "/ServerInfo/Guidebook/SOP/Jobs/Command/QuartermasterSOP.xml" + id: LogisticsOfficer SOP + name: guide-entry-sop-lo + text: "/ServerInfo/Guidebook/SOP/Jobs/Command/LogisticsOfficerSOP.xml" # Engineering SOP Entries - type: guideEntry diff --git a/Resources/ServerInfo/Guidebook/SOP/AlertLevels/AlertLevelsSOP.xml b/Resources/ServerInfo/Guidebook/SOP/AlertLevels/AlertLevelsSOP.xml index 8cc7a31824..67adb7a082 100644 --- a/Resources/ServerInfo/Guidebook/SOP/AlertLevels/AlertLevelsSOP.xml +++ b/Resources/ServerInfo/Guidebook/SOP/AlertLevels/AlertLevelsSOP.xml @@ -5,57 +5,138 @@ Below are the listed pop-ups for each alert and the color associated with them. There are individual entries for each alert level and what they entail for station personnel. -[head=2][bold][color=#388c34]Green Alert[/color][/bold][/head] - -Attention! Station alert level is now green! It is now safe to return to your workplace! + + + + [bold][color=#ffffff][head=1]Green Alert[/head][/color][/bold] + + + + + Attention! Station alert level is now green! It is now safe to return to your workplace! + + +
The [color=#388c34]Green Alert[/color] will always appear at the start of shift and is the default station alert level. -[head=2][bold][color=#1b67a5]Blue Alert[/color][/bold][/head] - -Attention! Station alert level is now blue! There is a confirmed threat to the station. Security should perform random checks. Crewmembers are advised to be vigilant and report suspicious activity to security. + + + + [bold][color=#ffffff][head=1]Blue Alert[/head][/color][/bold] + + + + + Attention! Station alert level is now blue! There is a confirmed threat to the station. Security should perform random checks. Crewmembers are advised to be vigilant and report suspicious activity to security. + + +
The [color=#1b67a5]Blue Alert[/color] will appear when a threat or significant amount of crimes have been reported. This often stays around for a while. -[head=2][bold][color=#c8a404]Yellow Alert[/color][/bold][/head] - -Attention! Station alert level is now yellow! There is a structural or atmospheric threat within the station. Engineering staff are advised to immediately respond and perform safety measures. Crewmembers are advised to stay away from the threat, and stay in their workplaces if necessary. + + + + [bold][color=#ffffff][head=1]Yellow Alert[/head][/color][/bold] + + + + + Attention! Station alert level is now yellow! There is a structural or atmospheric threat within the station. Engineering staff are advised to immediately respond and perform safety measures. Crewmembers are advised to stay away from the threat, and stay in their workplaces if necessary. + + +
The [color=#c8a404]Yellow Alert[/color] will appear for massive damage to the station or gas leaks. -[head=2][bold][color=#ba292c]Red Alert[/color][/bold][/head] - -Attention! Station alert level is now red! There is an immediate threat to the station. Security should prepare to use lethal force if necessary. Crewmembers should find a safe place to shelter in, and are advised to follow any present authorities. + + + + [bold][color=#ffffff][head=1]Red Alert[/head][/color][/bold] + + + + + Attention! Station alert level is now red! There is an immediate threat to the station. Security should prepare to use lethal force if necessary. Crewmembers should find a safe place to shelter in, and are advised to follow any present authorities. + + +
The [color=#ba292c]Red Alert[/color] will appear for major hostile activities and/or threats to the station. -[head=2][bold][color=#8b0000]Delta Alert[/color][/bold][/head] - -Attention! Station alert level is now delta! The station is currently under threat of imminent destruction. Crewmembers are advised to listen to heads of staff for more information. + + + + [bold][color=#ffffff][head=1]Delta Alert[/head][/color][/bold] + + + + + Attention! Station alert level is now delta! The station is currently under threat of imminent destruction. Crewmembers are advised to listen to heads of staff for more information. + + +
The [color=#8b0000]Delta Alert[/color] will appear in situations where the station is actively about to self-destruct or be destroyed by other means. -[head=2][bold][color=#9400d3]Epsilon Alert[/color][/bold][/head] - -Attention! Station alert level is now epsilon! Central Command has ordered the Epsilon security level on the station. Consider all contracts terminated. + + + + [bold][color=#ffffff][head=1]Epsilon Alert[/head][/color][/bold] + + + + + Attention! Station alert level is now epsilon! Central Command has ordered the Epsilon security level on the station. Consider all contracts terminated. + + +
The [color=#9400d3]Epsilon Alert[/color] is only set when Central Command intervenes on the station for whatever reason. -[head=2][bold][color=#db7093]Gamma Alert[/color][/bold][/head] - -Attention! Station alert level is now gamma! Central Command has ordered the Gamma security level on the station. Security is to have weapons at all times, and all civilians are to immediately seek their nearest head for transportation to a secure location. + + + + [bold][color=#ffffff][head=1]Gamma Alert[/head][/color][/bold] + + + + + Attention! Station alert level is now gamma! Central Command has ordered the Gamma security level on the station. Security is to have weapons at all times, and all civilians are to immediately seek their nearest head for transportation to a secure location. + + +
The [color=#db7093]Gamma Alert[/color] is rare and often only used in extreme cases. -[head=2][bold][color=#cc74fc]Violet Alert[/color][/bold][/head] - -Attention! Station alert level is now violet! There is a viral threat on the station. Medical staff are advised to isolate crewmembers with any symptoms. Crewmembers are advised to distance themselves from others and perform safety measures to prevent further spread. + + + + [bold][color=#ffffff][head=1]Violet Alert[/head][/color][/bold] + + + + + Attention! Station alert level is now violet! There is a viral threat on the station. Medical staff are advised to isolate crewmembers with any symptoms. Crewmembers are advised to distance themselves from others and perform safety measures to prevent further spread. + + +
The [color=#cc74fc]Violet Alert[/color] is set for viral outbreaks when a zombie infection or other disease occurs. -[head=2][bold][color=#ffffff]White Alert[/color][/bold][/head] - -Attention! Station alert level has been set to white! The station is suffering dangerously high levels of glimmer, there are several active psionic threats, or there is another significant epistemic emergency. Turn off all glimmer probers. Seek psionic insulation. Psychics should report for mindbreaking. + + + + [bold][color=#000000][head=1]White Alert[/head][/color][/bold] + + + + + Attention! Station alert level has been set to white! The station is suffering dangerously high levels of glimmer, there are several active psionic threats, or there is another significant epistemic emergency. Turn off all glimmer probers. Seek psionic insulation. Psychics should report for mindbreaking. + + +
The [bold][color=#ffffff]White Alert[/color][/bold] is set for high levels of glimmer or Epistemics emergencies. diff --git a/Resources/ServerInfo/Guidebook/SOP/Jobs/Cargo/CargoSOP.xml b/Resources/ServerInfo/Guidebook/SOP/Jobs/Cargo/CargoSOP.xml index c5ebc94eb4..dad18b98ff 100644 --- a/Resources/ServerInfo/Guidebook/SOP/Jobs/Cargo/CargoSOP.xml +++ b/Resources/ServerInfo/Guidebook/SOP/Jobs/Cargo/CargoSOP.xml @@ -4,8 +4,8 @@ These are the list of SOPs that Cargo Personnel should follow. These are, as sta For simplicity, [color=#846326]Cargo Technician[/color] and [color=#846326]Courier[/color] have been combined. -The following jobs have entries in this Department, the [color=#1b67a5][bold]Quartermaster[/bold][/color] being the Head of Staff: -- [textlink="Quartermaster" link="Quartermaster SOP"] +The following jobs have entries in this Department, the [color=#1b67a5][bold]Logistics Officer[/bold][/color] being the Head of Staff: +- [textlink="Logistics Officer" link="LogisticsOfficer SOP"] - [textlink="Cargo Technician" link="CargoTech SOP"] - [textlink="Courier" link="CargoTech SOP"] - [textlink="Salvage Specialist" link="SalvageSpecialist SOP"] diff --git a/Resources/ServerInfo/Guidebook/SOP/Jobs/Command/BlueshieldOfficerSOP.xml b/Resources/ServerInfo/Guidebook/SOP/Jobs/Command/BlueshieldOfficerSOP.xml index fe79ee8b82..603791ea8b 100644 --- a/Resources/ServerInfo/Guidebook/SOP/Jobs/Command/BlueshieldOfficerSOP.xml +++ b/Resources/ServerInfo/Guidebook/SOP/Jobs/Command/BlueshieldOfficerSOP.xml @@ -2,7 +2,11 @@ # Blueshield Officer (BSO) SOP This is the list of procedures, responsibilities, and duties of the [color=#1b67a5][bold]Blueshield Officer[/bold][/color] of this station. -The [color=#1b67a5][bold]Blueshield Officer[/bold][/color] should never be Captain nor Head of Staff. + + + The [color=#1b67a5][bold]Blueshield Officer[/bold][/color] should never be Captain nor Head of Staff. + + The [bold][color=#fcd12a]most important[/color][/bold] rule of the Blueshield Officer is to protect and maintain the lives of Command personnel on the station. Command personnel are personnel hired by Nanotrasen (confirmed personnel in command) and any Central Command officials (including NTR). diff --git a/Resources/ServerInfo/Guidebook/SOP/Jobs/Command/CommandSOP.xml b/Resources/ServerInfo/Guidebook/SOP/Jobs/Command/CommandSOP.xml index 186c7d2ba0..892dcd66c6 100644 --- a/Resources/ServerInfo/Guidebook/SOP/Jobs/Command/CommandSOP.xml +++ b/Resources/ServerInfo/Guidebook/SOP/Jobs/Command/CommandSOP.xml @@ -19,6 +19,6 @@ The following jobs have entries in this Department, the Chain of Command being l - [textlink="Mystagogue" link="Mystagogue SOP"] - [textlink="Chief Medical Officer" link="ChiefMedicalOfficer SOP"] - [textlink="Chief Engineer" link="ChiefEngineer SOP"] -- [textlink="Quartermaster" link="Quartermaster SOP"] +- [textlink="Logistics Officer" link="LogisticsOfficer SOP"] diff --git a/Resources/ServerInfo/Guidebook/SOP/Jobs/Command/LogisticsOfficerSOP.xml b/Resources/ServerInfo/Guidebook/SOP/Jobs/Command/LogisticsOfficerSOP.xml new file mode 100644 index 0000000000..e61fb5f829 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/SOP/Jobs/Command/LogisticsOfficerSOP.xml @@ -0,0 +1,25 @@ + +# Logistics Officer (LO) SOP +This is the list of procedures, responsibilities, and duties of the [color=#1b67a5][bold]Logistics Officer[/bold][/color] of this station. + +1. The Logistics Officer must ensure that every approved order is delivered within 15 minutes of having been placed and approved. + +2. In the event of a major crisis, such as Nuclear Operatives, Blob, and/or Delta Alert, expediency is to be favored over paperwork, as excessive bureaucracy may be detrimental to the well-being of the station. + +3. The Logistics Officer is permitted to hack the Autolathe, or to have a Cargo Technician do so, assuming they do not produce illegal materials. + +4. The Logistics Officer is not permitted to authorize the ordering of Security equipment and/or gear without express permission from the Head of Security and/or Captain. +An exception is made during extreme emergencies, such as Nuclear Operatives, Blob, and/or Delta Alert, where said equipment is to be delivered to Security, post haste. + +5. The Logistics Officer is permitted to authorize non-departmental orders (such as a Medical Doctor asking for Insulated Gloves) without express permission from the respective Head of Staff (in this example, the Chief Engineer), utilizing their best judgement, although they may still request a stamped form. +However, any breach of Standard Operating Procedure and/or Space Law that results from said order will also implicate the Logistics Officer. + +6. The Logistics Officer is not permitted to authorize a Supermatter Crate without express permission from the Chief Engineer. + +7. The Logistics Officer is required to follow the guidelines put in place for Cargo Technicians. + +8. The Logistics Officer must carry a handheld radio to keep in contact with Salvage in case of emergencies or general communication when they are on an expedition or too far from the station. + +9. The Logistics Officer is permitted to carry a telescopic baton and flash during all alert levels. + + diff --git a/Resources/ServerInfo/Guidebook/SOP/Jobs/Command/NanotrasenRepSOP.xml b/Resources/ServerInfo/Guidebook/SOP/Jobs/Command/NanotrasenRepSOP.xml index 24ba851f1e..6b464a3159 100644 --- a/Resources/ServerInfo/Guidebook/SOP/Jobs/Command/NanotrasenRepSOP.xml +++ b/Resources/ServerInfo/Guidebook/SOP/Jobs/Command/NanotrasenRepSOP.xml @@ -2,7 +2,11 @@ # Nanotrasen Representative (NTR) SOP This is the list of procedures, responsibilities, and duties of the [color=#1b67a5][bold]Nanotrasen Representative[/bold][/color] of this station. -The [color=#1b67a5][bold]Nanotrasen Representative[/bold][/color] should never be Captain nor Head of Staff. + + + The [color=#1b67a5][bold]Nanotrasen Representative[/bold][/color] should never be Captain nor Head of Staff. + + The [bold][color=#fcd12a]most important[/color][/bold] rule of the Nanotrasen Representative is to assist Command Personnel and ensure they are following SOP. Command personnel are personnel hired by Nanotrasen (confirmed personnel in command) and any Central Command officials (including NTR). diff --git a/Resources/ServerInfo/Guidebook/SOP/Jobs/Command/QuartermasterSOP.xml b/Resources/ServerInfo/Guidebook/SOP/Jobs/Command/QuartermasterSOP.xml deleted file mode 100644 index 510614ca77..0000000000 --- a/Resources/ServerInfo/Guidebook/SOP/Jobs/Command/QuartermasterSOP.xml +++ /dev/null @@ -1,25 +0,0 @@ - -# Quartermaster (QM) SOP -This is the list of procedures, responsibilities, and duties of the [color=#1b67a5][bold]Quartermaster[/bold][/color] of this station. - -1. The Quartermaster must ensure that every approved order is delivered within 15 minutes of having been placed and approved. - -2. In the event of a major crisis, such as Nuclear Operatives, Blob, and/or Delta Alert, expediency is to be favored over paperwork, as excessive bureaucracy may be detrimental to the well-being of the station. - -3. The Quartermaster is permitted to hack the Autolathe, or to have a Cargo Technician do so, assuming they do not produce illegal materials. - -4. The Quartermaster is not permitted to authorize the ordering of Security equipment and/or gear without express permission from the Head of Security and/or Captain. -An exception is made during extreme emergencies, such as Nuclear Operatives, Blob, and/or Delta Alert, where said equipment is to be delivered to Security, post haste. - -5. The Quartermaster is permitted to authorize non-departmental orders (such as a Medical Doctor asking for Insulated Gloves) without express permission from the respective Head of Staff (in this example, the Chief Engineer), utilizing their best judgement, although they may still request a stamped form. -However, any breach of Standard Operating Procedure and/or Space Law that results from said order will also implicate the Quartermaster. - -6. The Quartermaster is not permitted to authorize a Supermatter Crate without express permission from the Chief Engineer. - -7. The Quartermaster is required to follow the guidelines put in place for Cargo Technicians. - -8. The Quartermaster must carry a handheld radio to keep in contact with Salvage in case of emergencies or general communication when they are on an expedition or too far from the station. - -9. The Quartermaster is permitted to carry a telescopic baton and flash during all alert levels. - - diff --git a/Resources/ServerInfo/Guidebook/SOP/Legal/PunishmentsSOP.xml b/Resources/ServerInfo/Guidebook/SOP/Legal/PunishmentsSOP.xml index 3dd91c341e..811e795514 100644 --- a/Resources/ServerInfo/Guidebook/SOP/Legal/PunishmentsSOP.xml +++ b/Resources/ServerInfo/Guidebook/SOP/Legal/PunishmentsSOP.xml @@ -24,4 +24,7 @@ Should the ten (10) minutes expire without any evidence of any crimes coming to 8. After searching has been done on PDA, clothing, and headset, they are to be returned unless they are contraband or have been tampered with. In such cases, they should be replaced. +9. Prisoners should never be deprived of equipment that is necessary for their vital operations. +This includes batteries for IPCs, N2 Gas Tanks and Masks for Voxes, and regular equipment as stated above (PDA, Headset, Clothes). + diff --git a/Resources/ServerInfo/Guidebook/SOP/StandardProcedures/CommandSuccession.xml b/Resources/ServerInfo/Guidebook/SOP/StandardProcedures/CommandSuccession.xml index 8f7781012d..8f8eeae6cb 100644 --- a/Resources/ServerInfo/Guidebook/SOP/StandardProcedures/CommandSuccession.xml +++ b/Resources/ServerInfo/Guidebook/SOP/StandardProcedures/CommandSuccession.xml @@ -16,10 +16,10 @@ This is the ideal list for passing down the Captain role in command. There are s Head of Personnel (HoP) Head of Security (HoS) Warden -Research Director (RD) +Mystagogue (MG) Chief Medical Officer (CMO) Chief Engineer (CE) -Quartermaster (QM) +Logistics Officer (LO) Security Officer ~