Rules 1.3.2

Resources/Locale/en-US/_Triad/guidebook/guides.ftl

@@ -9,7 +9,7 @@ guide-entry-section5 = Naming Section
 guide-entry-section6 = Roleplay Section
 guide-entry-section7 = Point Of Interest and Safe Zone Section
 guide-entry-section8 = Erotic/Extreme Roleplay Section
-guide-entry-section9 = Command, Security, and TDF Guidelines
+guide-entry-section9 = Command, Faction, and Self-Antag Guidelines
 guide-entry-section10 = Escalation Guidelines Section
 guide-entry-section11 = Ship Saving and Design
 guide-entry-section12 = Ship Saving Section

Resources/ServerInfo/Gameplay.txt

@@ -1,22 +1,17 @@
 If you’re new to roleplaying or are unfamiliar with IC and OOC please read on. If not, skip to the next section.
 
-SS14 is at its core a roleplaying game - You play a role on the station through your character which you can customise from the lobby prior to joining the game. You can select the roles or jobs your character plays via the customisation menu too. When you’re in a round playing your character, you are IC or In Character. When you’re in character you forget any knowledge of previous rounds or essentially of the outside world and you play as if you’re a member of the station's crew.
+SS14 is at its core a roleplaying game - You play a role in the Sector through your character which you can customise from the lobby prior to joining the game. You can select the roles or jobs your character plays via the customisation menu too. When you’re in a round playing your character, you are IC or In Character. When you’re in character you forget of the outside world and you play as if you’re a member of the sector's population.
 
-Therefore, OOC or Out of Character is any conversations you have outside of the game world e.g. in the OOC chat, on discord or with your friends. You shouldn’t discuss the current round or anything that’s IC (in character) in out of character OOC chats. Likewise anything you see or read in OOC cannot be used by your character in game such as if someone on discord names a traitor or tells you they’re dying in a certain location and for you to go help them. This is known as metagaming and will get you banned if discovered.
+Therefore, OOC or Out of Character is any conversations you have outside of the game world e.g. in the OOC chat, on discord or with your friends. Do not discuss anything that can give you an advantage in PvP (Player versus Player) interactions in OOC.  This form of metagaming will get you banned if discovered.
 
-If you suspect a player in game is metagaming (e.g. you’re a traitor and they just walk up to you and kill you without you doing anything to antagonise them) then report them via ahelp or discord.
+If you suspect a player in game is metagaming (e.g. they've perfectly flanked in combat without communication) then report them via ahelp or discord.
 
-To summarise, when you’re in game, don’t discuss the round anywhere else until the round is over and don’t share information about the round in OOC such as if you’re dying, where you are or if you find a traitor.
+Antagonists, factions and RDM
 
-
-Traitors, antagonists, RDM and “self antag”
-
-If in your character customisation settings you selected the chance to become an antagonist (antag) or other traitor role, it is not guaranteed that you will be one. When a traitor gamemode round starts there is a random roll of all the players who selected the chance to become a traitor and only some get selected. They will be notified they are a traitor in chat and will have a set of objectives they can view by pressing C.
-
-Being an antagonist is not an excuse to go on a murder spree. Your job is to complete your objectives which on occasion will include escaping alive or dying a glorious death. How you complete your objectives is up to you so murder is valid but try to have fun (ideally not at everyones expense but that’s up to you).
-
-If you suspect an antagonist such as a traitor or cultist etc report them to security as fast as possible and if necessary do what you can to protect yourself. Remember traitors are people too, so ideally they should be arrested and prosecuted under space law and not just murdered (but do what you need to do to survive).
+If in your character customisation settings you selected a Faction to be a part of, be they TDF, TFA, TiC or SD.  You are aligned with that faction and all others within it, and bound to their rules and to act as a member of this faction.
 
 RDM or random deathmatch is the act of killing someone for no reason or attempting to. If you are being attacked it is likely the other person could be an antag but if you’re unsure, ask the admins for help (ahelp) to check this when convenient.
 
-Self antag or self antagonising is when you are NOT an antagonist which is determined at round start on traitor modes, and you go out of your way to break the law, damage the station or commit murder. Breaking the law is not inherently self antagging, but murdering, attacking, attempting to break into high security areas etc are examples of self antagging and will get you banned. Unless you are an official antagonist then you are a normal member of the crew who’s only objective is to complete their shift in their designated role.
+Self antag or self antagonising is when you go out of your way to break the law, damage a station or commit murder. Breaking the law is not inherently self antagging, but murdering, attacking, attempting to break into high security areas etc are examples of self antagging and require strong roleplay and story reasons.
+
+Being an antagonist is not an excuse to go on a murder spree. Your job is to drive elements of a story which on occasion will include involving others and creating a narrative that's enjoyable to be a part of. Try to have fun, but not at everyones expense.

Resources/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml

@@ -30,28 +30,18 @@ This may have various effects on gameplay, as some clothing items have [color=#a
 
 You may also choose what bag you spawn in with.
 [color=#a4885c]Backpacks[/color] are medium sized but can carry large items easier. [color=#a4885c]Satchels[/color] have more total space than backpacks but have trouble carrying large items. [color=#a4885c]Duffel bags[/color] are large but incur a movement penalty.
-
-## Antags
-Turning on an [color=#a4885c]antagonist[/color] toggle will put you on the list of potentional antags at the start of the round. They do not guarantee your antagonist role, don't use this as an excuse to self-antag!
-Instead, like job priorities, a handful of players are chosen randomly from eligible players. If you are a command member or security officer, you cannot be chosen for an antag role.
-
-[textlink="For more information about antagonists, click here." link="Antagonists"]
-
-Joining multiple games or ghosting/disconnecting/commiting suicide upon not being chosen for an antag role is referred to as "antag-rolling" and it is against the rules.
-Plenty of people patiently wait for their turn to be antagonists, so [color=#a4885c]we kindly ask you to refrain from opting-in to an antagonist role if you aren't ready[/color].
-
 ## Traits
 Speech traits alter your speech, sometimes to an extreme degree.
 
 They include:
 - Accentless (disables the accent of your selected species)
-- Cowboy accent (word replacement, partner)
+- Trailhand (word replacement, partner)
 - Frontal lisp ("s" is replaced with "th")
-- Italian accent (Mamma-mia, word replacement)
-- Pathological liar (word replacement, changes words like "yes" to "no")
-- Pirate accent (Arrgh, word replacement)
-- Social anxiety (s-s-stutter)
-- Southern Drawl (replaces "-ing" with "-in'" and similar changes)
+- New Brooklyn (Mamma-mia, word replacement)
+- Freeport Corsair (Arrgh, word replacement)
+- Stutter (s-s-stutter)
+- Heartworld Gentry (replaces "-ing" with "-in'" and similar changes)
+- And many others
 
 You should be comfortable with talking normally or with a minor accent such as Social anxiety or Southern drawl before taking heavy accents like Italian or Cowboy.
 

Resources/ServerInfo/Guidebook/NewPlayer/Controls/Radio.xml

@@ -23,12 +23,12 @@ Your radio allows you to communicate across the entire station and to your speci
   <GuideEntityEmbed Entity="ClothingHeadsetGrey"/>
 </Box>
 
-To send a [color=#a4885c]station-wide[/color] message over the radio preface, use the [color=#32cd32]Common[/color] channel by beginning your text with [color=#32cd32]semi-colon (;)[/color].
+To send a [color=#a4885c]station-wide[/color] message over the radio preface, use the [color=#32cd32]Broadband[/color] channel by beginning your text with [color=#32cd32]semi-colon (;)[/color].
 People standing right next to you might catch bits of your radio message, even if they don't have the access to the relevant radio channel. Watch for eavesdroppers.
 
 ## Departmental Radio
 
-You are able to send messages over your departmental radio channels using [color=#32cd32]colon (:)[/color] followed by the department letter as long as you're wearing a headset with your department's encryption key.
+You are able to send messages over your departmental radio channels using [color=#32cd32]colon (:)[/color] followed by the department letter as long as you're wearing a headset with that departments encryption key.
 
 Examine your headset to see the department channels available to you.
 
@@ -43,22 +43,20 @@ For example, if you're a Station Engineer then [color=#a4885c]:h[/color] will de
 
 ## Encryption Keys
 [color=#a4885c]Encryption keys[/color] give you access to their respective channel.
-  
+
 Examining our engineering headset from earlier shows us [color=#32cd32]Common[/color] and [color=#f37746]Engineering[/color] because an engineer's headset starts with those [color=#a4885c]encryption keys[/color].
-  
+
 <Box>
   <GuideEntityEmbed Entity="EncryptionKeyCommon"/>
   <GuideEntityEmbed Entity="EncryptionKeyEngineering"/>
 </Box>
-  
+
 You can take out encryption keys by using a [color=#a4885c]screwdriver[/color] on a headset. New encryption keys are put into headsets by clicking on one with an encryption key in your hand.
 
 All command members have extras of their relevant encryption key, but you can also request one at the HoP's office when you're getting your job changed.
 
 ## OOC Channels
 OOC (out-of-character) channels exist outside of the game world. They are LOOC, OOC and Dead chat.
 
-LOOC is on during the rounds, OOC is typically off until the round ends and you can only see and talk in Dead chat when you are, well, dead.
-
-Do not discuss the current round in the Discord or in OOC if it's on during the round.
+LOOC is on during the rounds, OOC is available for asking questions and to get help playing the game, whilst you can only see and talk in Dead chat when you are, well, dead.
 </Document>

Resources/ServerInfo/Guidebook/NewPlayer/NewPlayer.xml

@@ -1,7 +1,8 @@
 <Document>
 # Welcome to Space Station 14!
 
-You've just begun your shift aboard an TSF colonial station.
+You've just begun your shift aboard the TFA's Venmar Station.
+
 You and your fellow crewmates are tasked with working together, surviving, and having fun!
 
 [bold]Make sure to follow all server rules.[/bold] You can ask questions or report rule breaks to the [color=#EB2D3A][bold]admin team[/bold][/color] by using the [bold]admin help menu[/bold]. ([italic]accessible by pressing [/italic][color=yellow][bold][keybind="OpenAHelp"/][/bold][/color])
@@ -32,7 +33,7 @@ A more comprehensive list can be found on the [textlink="controls" link="Control
 ## What is SS14?
 Space Station 14 is a multiplayer game about paranoia and chaos on a space station and a remake of the cult-classic Space Station 13.
 
-Join dozens of other players on an intricately designed and simulated space station, immersing yourself in roleplay and dealing with threats along the way.
+Triad Sector is that gameplay moved into a Ship based setting, where people can interact aboard space vessels, explore, fight, and tell your characters story.
 
 SS14 is an [italic]open-source game[/italic] developed by people [bold]just like you![/bold]
 It receives [color=lime]daily updates[/color] and may at times be [color=#EB2D3A][bold]unstable.[/bold][/color]

Resources/ServerInfo/_Triad/Guidebook/Rules/CoreRules/RuleC0.xml

@@ -46,7 +46,7 @@ It's easy to get immersed in what's happening or invested in your characters' st
   - [textlink="Section 6. Roleplay Section" link="TriadRuleC6"]
   - [textlink="Section 7. Point Of Interest and Safe Zone Section" link="TriadRuleC7"]
   - [textlink="Section 8. Erotic/Extreme Roleplay Section" link="TriadRuleC8"]
-  - [textlink="Section 9. Command, Security, and TDF Guidelines" link="TriadRuleC9"]
+  - [textlink="Section 9. Command, Faction, and Self-Antag Guidelines" link="TriadRuleC9"]
   - [textlink="Section 10. Escalation Guidelines" link="TriadRuleC10"]
   - [textlink="Section 11. Ship Saving and Design Section" link="TriadRuleC11"]
   <!-- not used for now -->

Resources/ServerInfo/_Triad/Guidebook/Rules/CoreRules/RuleC1.xml

@@ -21,5 +21,5 @@
 
   - [color=#a4885c]1.7C[/color] Never open a bolted door with someone else's privacy holobarrier on it.
 
-  - [color=#a4885c]1.7D[/color] Do not hide contraband or other antagonistic activity behind a holobarrier.  Keep all antagonistic activity in a location publicly accessible.
+  - [color=#a4885c]1.7D[/color] Do not hide contraband or other antagonistic activity behind a Privacy holobarrier.  Keep all antagonistic activity in a location publicly accessible.
 </Document>

Resources/ServerInfo/_Triad/Guidebook/Rules/CoreRules/RuleC10.xml

@@ -13,11 +13,20 @@
 
   -  [color=#a4885c]10.2D[/color] Defenders of aggression can escalate and set the amount of escalation for purposes of protecting themselves.
 
-[color=#a4885c]10.3[/color] If someone is surrendering, you must accept it, no matter how heated a situation is.  Surrendering is an 'opt-out' for PvP interactions, please talk in LOOC after a surrender, to determine what would be a preferred outcome to the scene.  ★
+[color=#a4885c]10.3[/color] If someone is surrendering, you must accept it, no matter how heated a situation is.  Surrendering is an 'opt-out' for PvP interactions, please talk in LOOC after a surrender, to determine what would be a preferred outcome to the scene. [color=#f1c232]★★[/color]
 
   - [color=#a4885c]10.3A[/color] Do not intentionally offer a false surrender.
 
 [color=#a4885c]10.4[/color] Do not intentionally round-remove Characters. If you kill someone, you are not expected to revive them, but you must not take any actions that would prevent Medical from reviving them. [color=#f1c232]★★[/color]
 
   -  [color=#a4885c]10.4A[/color] Emotional Support Pets, and Borgs also apply to this role when selected as Ghost Roles.  Other Ghost roles such as antagonistic ghost roles or vermin animals (mice, mothroaches) are exempt and can be round-removed.
+
+[color=#a4885c]10.5[/color] With Ship to Ship combat, follow all Escalation Guidelines as well as these.  Once a surrender has been made, all hostilities must cease. [color=#f1c232]★★[/color]
+
+  -  [color=#a4885c]10.5A[/color] When your opponents ship has stopped moving or firing it's guns at you, cease fire and request that they surrender.
+
+  -  [color=#a4885c]10.5B[/color] Do not fire upon a ship that has lost combat capabilities, but is still operational.  For example it's pilot has been killed.
+
+  -  [color=#a4885c]10.5C[/color] When demanded to surrender, you do not need to be accept, but you must respond if capable.  No response is considered a surrender.
+
 </Document>

Resources/ServerInfo/_Triad/Guidebook/Rules/CoreRules/RuleC11.xml

@@ -13,8 +13,6 @@
 
   -  [color=#a4885c]11.4B[/color] You may not load from a backup if your ship deed was lost. Recover that ship through IC means.
 
-  -  [color=#a4885c]11.4C[/color] Any ship that was not saved due to player negligence is not entitled to compensation from the administration for loss of progress when loading a backup. An ahelp is still required.
-
 [color=#a4885c]11.5[/color] Thrusters should be in a position where it is possible to hit them with ship weapons.  There should be no entities (except for 2 grilles) that block the path of thrusters being shot from another ship. [color=#f1c232]★★[/color]
 
   - [color=#a4885c]11.5A[/color] Thrusters should not be placed at the exhaust of another thruster.

Resources/ServerInfo/_Triad/Guidebook/Rules/CoreRules/RuleC3.xml

@@ -7,4 +7,10 @@
 
 [color=#a4885c]3.3[/color] Do not intentionally, repeatedly, and maliciously continue to target another player for reasons of an OOC dislike of them (metagrudging). IC grudges are fine and acceptable where all parties are consenting. Please speak with each other if you suspect the other party may be unhappy with an IC grudge. [color=#f1c232]★★[/color]
 
+[color=#a4885c]3.4[/color] Do not circumvent gameplay loops or encounters by utilising metaknowledge to modify them. [color=#f1c232]★★[/color]
+
+  -  [color=#a4885c]3.4A[/color] Do not build walls, windows or other entities to bypass encounters.
+
+  -  [color=#a4885c]3.4B[/color] TDF are to wait for alerts to dead drops before checking locations for them.
+
 </Document>

Resources/ServerInfo/_Triad/Guidebook/Rules/CoreRules/RuleC6.xml

@@ -5,7 +5,7 @@
 
 [color=#a4885c]6.2[/color] Playing a character accurately should never result in rulebreaks. Do not intentionally design your character in such a way that they break any other rule by existing. [color=#f1c232]★★[/color]
 
-[color=#a4885c]6.3[/color] If you choose a Command, Security, EMS, or faction role, you are required to participate in the round as that role when necessary. ★
+[color=#a4885c]6.3[/color] If you choose a Command, or Faction role, you are required to participate in the round as that role when your role is required. ★
 
   - [color=#a4885c]6.3A[/color] Choosing a job means you are actively playing that role during that shift. Do not change roles in quick succession.
 

Resources/ServerInfo/_Triad/Guidebook/Rules/CoreRules/RuleC7.xml

@@ -17,5 +17,5 @@
 
 [color=#a4885c]7.4[/color] Do not steal anything from a Point of Interest that is critical to its function. ★
 
-[color=#a4885c]7.5[/color]  If you've participated in a raid upon LPB or Sevatapol, please give a minimum of 3 shifts before you rush for the content again.  This is to give other players a chance to experience the content.  After 8 hours into the shift, this embargo is lifted.  [color=#f1c232]★★[/color]
+[color=#a4885c]7.5[/color] If you've participated in a raid upon LPB or Sevastopol, please give a minimum of 3 shifts before you rush for the content again.  This is to give other players a chance to experience the content.  After 6 hours into the shift, this embargo is lifted.  [color=#f1c232]★★[/color]
 </Document>