Readds martyr and hijack objectives for spy/traitor (#3366)

## About The Pull Request
title
## Why It's Good For The Game
I can't actually find where we originally removed these, before they
were just re-removed at least, and the reasons I was given for their
latest removal were a bunch of 'what if' scenarios that are incredibly
easy to administrate (like, one of the very few cut and dry things
admins will look at across the board and go "no this is bad") those
examples being "what if the traitor delams the SM to cause an early
shuttle call so they can do the hijack sooner" and pretty much the same
thing, but instead of hijacking, doing it to kill themself for "die a
glorious death"
Both of these scenarios I have (in my 1.5 years adminning here) never
seen happen and I whole heartedly believe that any admin on the team
would be able to pretty quickly identify what is currently/about to
happen on the off chance they were to start occuring and put a stop to
it.
As a design philosophy, I don't want us removing things off the what-if
potential that they could go wrong (if we did that we'd gut
xenobio/botany/chemistry)
## Proof Of Testing
it works
<details>
<summary>Screenshots/Videos</summary>

</details>

## Changelog
🆑
add: hijack/martyr objectives to tot/spy
/🆑

Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
Co-authored-by: Roxy <75404941+TealSeer@users.noreply.github.com>
This commit is contained in:
Odairu
2025-07-09 20:57:56 -04:00
committed by GitHub
parent 6b875256df
commit 57d7f9bb36
2 changed files with 0 additions and 7 deletions
-2
View File
@@ -160,7 +160,6 @@
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
@@ -170,7 +169,6 @@
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()
@@ -127,11 +127,9 @@
/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)
@@ -146,13 +144,11 @@
* 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)
@@ -165,7 +161,6 @@
ending_objective.owner = owner
objectives += ending_objective
return
*/ // BUBBER EDIT END
ending_objective = new /datum/objective/escape
ending_objective.owner = owner