Merge branch 'master' into justice-stamps

Resources/Changelog/DeltaVChangelog.yml

@@ -1,16 +1,4 @@
 Entries:
-- author: Adrian16199
-  changes:
-  - message: Crew has learned how to make a straw hat out of wheat bushels!
-    type: Add
-  id: 165
-  time: '2023-12-13T20:13:45.0000000+00:00'
-- author: IamVelcroboy
-  changes:
-  - message: Added Yule! Happy Holidays!
-    type: Add
-  id: 166
-  time: '2023-12-13T20:21:34.0000000+00:00'
 - author: ps3moira
   changes:
   - message: Added Fish n' Chips. Thank the British!
@@ -3720,3 +3708,17 @@
   id: 664
   time: '2024-11-09T19:44:28.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2152
+- author: Colin-Tel
+  changes:
+  - message: Removed the "Raise Glimmer" objective for traitors.
+    type: Remove
+  id: 665
+  time: '2024-11-10T20:18:53.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2107
+- author: Colin-Tel
+  changes:
+  - message: Adjusted antagonist rule C3 and the line about bribery in C1.
+    type: Tweak
+  id: 666
+  time: '2024-11-10T20:20:26.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2164

Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml

@@ -50,18 +50,3 @@
 #      components:
 #      - BecomePsionicCondition
 #  - type: BecomeGolemCondition
-
-- type: entity
-  id: RaiseGlimmerObjective
-  parent: BaseTraitorObjective
-  name: Raise Glimmer.
-  description: Get the glimmer above the specified amount.
-  components:
-  - type: Objective
-    difficulty: 2.5
-    #unique: false
-    icon:
-      sprite: Nyanotrasen/Icons/psi.rsi
-      state: psi
-  - type: RaiseGlimmerCondition
-    target: 500

Resources/Prototypes/Objectives/objectiveGroups.yml

@@ -49,8 +49,6 @@
   weights:
     RandomTraitorAliveObjective: 1
     RandomTraitorProgressObjective: 1
-    RaiseGlimmerObjective: 0.5 # Nyanotrasen - Raise glimmer to a target amount, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
-
 
 #Thief groups
 - type: weightedRandom

Resources/ServerInfo/Guidebook/DeltaV/Rules/GameRules/2_Metagaming.xml

@@ -116,7 +116,6 @@
   - Giving a character additional access or a job because you are friends with the player who is playing that character.
   - Trusting a character because you are friends with the player who is playing that character.
   - Not fighting a character because you are friends with the player who is playing that character.
-  - Ignoring your objective to kill a character because your character and theirs became friends in a previous round.
 
   ## Metagrudging Examples
   These are all examples of things that are prohibited by at least one metashield item that is never revealed IC.

Resources/ServerInfo/Guidebook/DeltaV/Rules/RoleRules/C1_CommandSecurityJustice.xml

@@ -4,7 +4,7 @@ Security, Justice, and Command roles are held to a higher standard of roleplay,
   - Your character must act in a manner that NanoTrasen would reasonably hire them to this position.
     - Your character is presumed to be sane, competent in their duties, and able to make decisions to the benefit of the station. 
     - Giving away Traitor objective items and sensitive equipment should be avoided in these roles. Your character should value them deeply. 
-      - Leeway is given to making deals with criminals if the deal benefits the safety or situation of the crew and station.
+      - Leeway is given to making deals with criminals if the deal benefits the safety or situation of the crew and station OR if the deal involves items of a primarily sentimental value (e.g. HoP's Ian scrapbook, LO's lucky dollar).
       - Leeway can be given in [color=#ff0000]extreme circumstances[/color] of emergency/crisis.
   - The three departments are required to read and follow Delta-V Space Law, Standard Operating Procedure, Alert Procedure, and Company Policy to the best of their ability.
     - [color=#ff0000]Circumstances and context may permit you to break these laws. However, the fact that this rule is malleable is not an excuse to ignore it entirely.[/color]

Resources/ServerInfo/Guidebook/DeltaV/Rules/RoleRules/C3_Antags.xml

@@ -1,9 +1,12 @@
 <Document>
   # Rule C3: Antagonist Guidelines
+[color=#ffff00]Being an antagonist does not allow you to stop playing a character. Determine how your character would react to being given these objectives, and work through it appropriately.[/color]
+
 Through engaging in antagonistic activity, you should seek to make the round more engaging and fun as the primary driver of the narrative of a round. Succeeding as an antagonist should not be your goal, but rather telling the most interesting story for everyone involved. 
   - [color=#ff0000]Antagonists are free to complete their objectives through committing proportional damage. Through roleplay, damage becomes more proportional.[/color] Example: Holding the singulo hostage for a theft objective is acceptable, while simply singuloosing and using that chaos is unacceptable. 
     - Killing players unrelated to your immediate objective in a manner that results in their round removal should be avoided. Crew that do not make an attempt at self preservation, or engage in valid-hunting, are exempt from this. 
     - If you are concerned as to whether or not what you're about to do is allowed, feel free to AHelp and ask an admin for clarification. [color=#ff0000]Lack of administrator response does not constitute approval.[/color]
+  - While antagonists are [color=#ffff00]not required[/color] to complete their objectives, they are still encouraged to act as an antagonist in the round while roleplaying. 
   - Other antagonists are not necessarily your friends. Other antagonists are often free agents that you may negotiate with at your own risk. 
     - If you are a team antagonist, you must work with your partners to complete any shared objectives.
   - Excessively lame tactics are strictly forbidden for all antags except for station-destroying antags, such as nuclear operatives or space dragons. Examples include: