From aa1c20c361b1ba2dede8b20d170ccfc3d2a8da51 Mon Sep 17 00:00:00 2001
From: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Date: Thu, 20 Mar 2025 10:02:57 +0100
Subject: [PATCH] Removes the martyr and hijack objs, again. Also removes some
 heavily disruptive spy OBJs (#3343)

## About The Pull Request

See name, removes the martyr and hijack objs from traitor and spy

## Why it's good for the game

Giving these out for free on a random chance on the most common antag
types is a bad idea. Especially when it gives the potential
justification to bypass the station integrity rule. Also it's a mess to
admin + we aren't trying to be Manuel, despite what it might seem like
at times.

## Changelog
:cl:
del: Removes the martyr and hijack objs from traitor and spy
/:cl:
---
 code/modules/antagonists/spy/spy.dm               | 2 ++
 code/modules/antagonists/traitor/datum_traitor.dm | 5 +++++
 strings/antagonist_flavor/spy_objective.json      | 3 ---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/code/modules/antagonists/spy/spy.dm b/code/modules/antagonists/spy/spy.dm
index 65dba0ef2eb..bcbde789b49 100644
--- a/code/modules/antagonists/spy/spy.dm
+++ b/code/modules/antagonists/spy/spy.dm
@@ -160,6 +160,7 @@
 				cage_the_jailbird.no_failure = TRUE
 				objectives += cage_the_jailbird
 
+	/* // BUBBER EDIT BEGIN
 	if(prob(10))
 		var/datum/objective/martyr/leave_no_trace = new()
 		leave_no_trace.owner = owner
@@ -169,6 +170,7 @@
 		var/datum/objective/hijack/steal_the_shuttle = new()
 		steal_the_shuttle.owner = owner
 		objectives += steal_the_shuttle
+	*/ // BUBBER EDIT END
 
 	else if(prob(10)) //10% chance on 87.3% chance
 		var/datum/objective/exile/hit_the_bricks = new()
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index 77563f914b4..3fc355d91e4 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -130,9 +130,11 @@
 /datum/antagonist/traitor/proc/forge_traitor_objectives()
 	var/objective_count = 0
 
+	/* // BUBBER EDIT BEGIN
 	if((GLOB.joined_player_list.len >= HIJACK_MIN_PLAYERS) && prob(HIJACK_PROB))
 		is_hijacker = TRUE
 		objective_count++
+	*/ // BUBBER EDIT END
 
 	var/objective_limit = CONFIG_GET(number/traitor_objectives_amount)
 
@@ -147,11 +149,13 @@
  * Forges the endgame objective and adds it to this datum's objective list.
  */
 /datum/antagonist/traitor/proc/forge_ending_objective()
+	/* // BUBBER EDIT BEGIN
 	if(is_hijacker)
 		ending_objective = new /datum/objective/hijack
 		ending_objective.owner = owner
 		return
 
+
 	var/martyr_compatibility = TRUE
 
 	for(var/datum/objective/traitor_objective in objectives)
@@ -164,6 +168,7 @@
 		ending_objective.owner = owner
 		objectives += ending_objective
 		return
+	*/ // BUBBER EDIT END
 
 	ending_objective = new /datum/objective/escape
 	ending_objective.owner = owner
diff --git a/strings/antagonist_flavor/spy_objective.json b/strings/antagonist_flavor/spy_objective.json
index 908a8da2b82..23de994ebd6 100644
--- a/strings/antagonist_flavor/spy_objective.json
+++ b/strings/antagonist_flavor/spy_objective.json
@@ -1,8 +1,6 @@
 {
 	"objective_body": [
 		"Assassinate a high profile crewmember without being caught.",
-		"Cause a disaster to shake the station.",
-		"Cause a station evacuation.",
 		"Deprive the station of as many @pick(stealables) as you can.",
 		"Ensure @pick(department) is @pick(affected) by the end of the shift.",
 		"Ensure @pick(location) is @pick(affected) by the end of the shift.",
@@ -26,7 +24,6 @@
 		"Keep everyone out of @pick(location).",
 		"Make it difficult but not impossible to @pick(escape) the station.",
 		"Protect the station's @pick(happenings).",
-		"Sabotage the station's power grid or engine.",
 		"Steal all the @pick(stealables) from @pick(department).",
 		"Steal all the @pick(stealables) from @pick(location).",
 		"Steal as many @pick(stealables) as you can.",