mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-15 12:43:13 +00:00
Fixes a missing config check in autotraitor
Also adds a config check to the various forge_* procs just to be sure.
This commit is contained in:
@@ -188,7 +188,8 @@
|
|||||||
//message_admins("The probability of a new traitor is [traitor_prob]%")
|
//message_admins("The probability of a new traitor is [traitor_prob]%")
|
||||||
if(prob(traitor_prob))
|
if(prob(traitor_prob))
|
||||||
message_admins("New traitor roll passed. Making a new Traitor.")
|
message_admins("New traitor roll passed. Making a new Traitor.")
|
||||||
forge_traitor_objectives(character.mind)
|
if (!config.objectives_disabled)
|
||||||
|
forge_traitor_objectives(character.mind)
|
||||||
equip_traitor(character)
|
equip_traitor(character)
|
||||||
traitors += character.mind
|
traitors += character.mind
|
||||||
character << "\red <B>You are the traitor.</B>"
|
character << "\red <B>You are the traitor.</B>"
|
||||||
|
|||||||
@@ -88,6 +88,9 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
|
|||||||
//No escape alone because changelings aren't suited for it and it'd probably just lead to rampant robusting
|
//No escape alone because changelings aren't suited for it and it'd probably just lead to rampant robusting
|
||||||
//If it seems like they'd be able to do it in play, add a 10% chance to have to escape alone
|
//If it seems like they'd be able to do it in play, add a 10% chance to have to escape alone
|
||||||
|
|
||||||
|
if (config.objectives_disabled)
|
||||||
|
return
|
||||||
|
|
||||||
var/datum/objective/absorb/absorb_objective = new
|
var/datum/objective/absorb/absorb_objective = new
|
||||||
absorb_objective.owner = changeling
|
absorb_objective.owner = changeling
|
||||||
absorb_objective.gen_amount_goal(2, 3)
|
absorb_objective.gen_amount_goal(2, 3)
|
||||||
|
|||||||
@@ -108,6 +108,9 @@
|
|||||||
|
|
||||||
|
|
||||||
/datum/game_mode/proc/forge_meme_objectives(var/datum/mind/meme, var/datum/mind/first_host)
|
/datum/game_mode/proc/forge_meme_objectives(var/datum/mind/meme, var/datum/mind/first_host)
|
||||||
|
if (config.objectives_disabled)
|
||||||
|
return
|
||||||
|
|
||||||
// meme always needs to attune X hosts
|
// meme always needs to attune X hosts
|
||||||
var/datum/objective/meme_attune/attune_objective = new
|
var/datum/objective/meme_attune/attune_objective = new
|
||||||
attune_objective.owner = meme
|
attune_objective.owner = meme
|
||||||
|
|||||||
@@ -85,6 +85,8 @@
|
|||||||
return 1
|
return 1
|
||||||
|
|
||||||
/datum/game_mode/ninja/proc/forge_ninja_objectives(var/datum/mind/ninja)
|
/datum/game_mode/ninja/proc/forge_ninja_objectives(var/datum/mind/ninja)
|
||||||
|
if (config.objectives_disabled)
|
||||||
|
return
|
||||||
|
|
||||||
var/objective_list = list(1,2,3,4,5)
|
var/objective_list = list(1,2,3,4,5)
|
||||||
for(var/i=rand(2,4),i>0,i--)
|
for(var/i=rand(2,4),i>0,i--)
|
||||||
|
|||||||
@@ -186,6 +186,8 @@
|
|||||||
|
|
||||||
|
|
||||||
/datum/game_mode/proc/forge_syndicate_objectives(var/datum/mind/syndicate)
|
/datum/game_mode/proc/forge_syndicate_objectives(var/datum/mind/syndicate)
|
||||||
|
if (config.objectives_disabled)
|
||||||
|
return
|
||||||
var/datum/objective/nuclear/syndobj = new
|
var/datum/objective/nuclear/syndobj = new
|
||||||
syndobj.owner = syndicate
|
syndobj.owner = syndicate
|
||||||
syndicate.objectives += syndobj
|
syndicate.objectives += syndobj
|
||||||
|
|||||||
@@ -78,6 +78,9 @@
|
|||||||
|
|
||||||
|
|
||||||
/datum/game_mode/proc/forge_traitor_objectives(var/datum/mind/traitor)
|
/datum/game_mode/proc/forge_traitor_objectives(var/datum/mind/traitor)
|
||||||
|
if (config.objectives_disabled)
|
||||||
|
return
|
||||||
|
|
||||||
if(istype(traitor.current, /mob/living/silicon))
|
if(istype(traitor.current, /mob/living/silicon))
|
||||||
var/datum/objective/assassinate/kill_objective = new
|
var/datum/objective/assassinate/kill_objective = new
|
||||||
kill_objective.owner = traitor
|
kill_objective.owner = traitor
|
||||||
|
|||||||
@@ -64,6 +64,9 @@
|
|||||||
|
|
||||||
|
|
||||||
/datum/game_mode/proc/forge_wizard_objectives(var/datum/mind/wizard)
|
/datum/game_mode/proc/forge_wizard_objectives(var/datum/mind/wizard)
|
||||||
|
if (config.objectives_disabled)
|
||||||
|
return
|
||||||
|
|
||||||
switch(rand(1,100))
|
switch(rand(1,100))
|
||||||
if(1 to 30)
|
if(1 to 30)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user