From 94d649dbe6a1c65f0dc631e10861d22e4541997f Mon Sep 17 00:00:00 2001 From: alex-gh Date: Fri, 18 Apr 2014 07:17:36 +0200 Subject: [PATCH 1/2] Reworked 'speciesist' objective --- code/game/gamemodes/objective.dm | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 587a43b7302..b4511a60145 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -323,22 +323,14 @@ datum/objective/hijack return 1 datum/objective/speciesist - var/datum/species/speciesist_target = null - + var/is_human = 0 find_target() - var/list/possible_targets = list() - var/mob/living/carbon/human/O = owner.current - for(var/datum/mind/possible_target in ticker.minds) - if(ishuman(possible_target.current)) - var/mob/living/carbon/human/M = possible_target.current - if (M.species != O.species) - possible_targets += M.species - if(possible_targets.len > 0) - speciesist_target = pick(possible_targets) - explanation_text = "Do not allow any [speciesist_target.name]s to escape on the shuttle." + if(istype(owner.current,/mob/living/carbon/human/human)) + explanation_text = "Do not allow any non-humans to escape on the shuttle." + is_human = 1 else - explanation_text = "Free Objective" - return speciesist_target + explanation_text = "Do not allow any humans to escape on the shuttle." + return 1 check_completion() if(emergency_shuttle.location<2) @@ -346,7 +338,7 @@ datum/objective/speciesist var/area/shuttle = locate(/area/shuttle/escape/centcom) for(var/mob/living/carbon/human/player in player_list) if (player.mind) - if (player.species == speciesist_target) + if (is_human ? !istype(player,/mob/living/carbon/human/human) : istype(player,/mob/living/carbon/human/human)) if(player.stat != DEAD) //they're not dead! if(get_turf(player) in shuttle) return 0 From d30973b93246f6ee212d8ed19a3fc45e685c01ed Mon Sep 17 00:00:00 2001 From: alex-gh Date: Fri, 18 Apr 2014 07:20:59 +0200 Subject: [PATCH 2/2] Tweaked traitor probabilities --- code/game/gamemodes/traitor/traitor.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index f975ecbcc20..815a766f805 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -96,12 +96,12 @@ else switch(rand(1,100)) - if(1 to 25) + if(1 to 30) var/datum/objective/assassinate/kill_objective = new kill_objective.owner = traitor kill_objective.find_target() traitor.objectives += kill_objective - if(26 to 40) + if(31 to 40) var/datum/objective/debrain/debrain_objective = new debrain_objective.owner = traitor debrain_objective.find_target()