TG: Changes rev objectives to use the proper objective so heads being off station

actually works
Changelings faking death can no longer have their brains cut out.
Revision: r3501
Author: 	 VivianFoxfoot
This commit is contained in:
Erthilo
2012-05-06 00:54:50 +01:00
parent 5eddc86f6b
commit 98ef1bdb18
3 changed files with 11 additions and 7 deletions
+4 -4
View File
@@ -454,8 +454,8 @@ datum/mind
// copy targets
var/datum/mind/valid_head = locate() in ticker.mode.head_revolutionaries
if (valid_head)
for (var/datum/objective/assassinate/O in valid_head.objectives)
var/datum/objective/assassinate/rev_obj = new
for (var/datum/objective/mutiny/O in valid_head.objectives)
var/datum/objective/mutiny/rev_obj = new
rev_obj.owner = src
rev_obj.target = O.target
rev_obj.explanation_text = "Assassinate [O.target.current.real_name], the [O.target.assigned_role]."
@@ -1011,8 +1011,8 @@ datum/mind
// copy targets
var/datum/mind/valid_head = locate() in ticker.mode.head_revolutionaries
if (valid_head)
for (var/datum/objective/assassinate/O in valid_head.objectives)
var/datum/objective/assassinate/rev_obj = new
for (var/datum/objective/mutiny/O in valid_head.objectives)
var/datum/objective/mutiny/rev_obj = new
rev_obj.owner = src
rev_obj.target = O.target
rev_obj.explanation_text = "Assassinate [O.target.current.real_name], the [O.target.assigned_role]."
+3 -3
View File
@@ -75,7 +75,7 @@
for(var/datum/mind/rev_mind in head_revolutionaries)
for(var/datum/mind/head_mind in heads)
var/datum/objective/assassinate/rev_obj = new
var/datum/objective/mutiny/rev_obj = new
rev_obj.owner = rev_mind
rev_obj.target = head_mind
rev_obj.explanation_text = "Assassinate [head_mind.current.real_name], the [head_mind.role_alt_title ? head_mind.role_alt_title : head_mind.assigned_role]."
@@ -95,7 +95,7 @@
/datum/game_mode/revolution/process()
checkwin_counter++
if(checkwin_counter >= 20)
if(checkwin_counter >= 5)
if(!finished)
ticker.mode.check_win()
checkwin_counter = 0
@@ -370,7 +370,7 @@
var/list/heads = get_all_heads()
var/list/targets = new
for (var/datum/mind/i in head_revolutionaries)
for (var/datum/objective/assassinate/o in i.objectives)
for (var/datum/objective/mutiny/o in i.objectives)
targets |= o.target
if (head_revolutionaries.len!=0 || \
revolutionaries.len!=0 || \
@@ -1548,6 +1548,10 @@ CIRCULAR SAW
return
if(3.0)
if(M.changeling && M.changeling.changeling_fakedeath)
user << "\red The neural tissue regrows before your eyes as you cut it."
return
if(M != user)
for(var/mob/O in (viewers(M) - user - M))
O.show_message("\red [M] has \his spine's connection to the brain severed with [src] by [user].", 1)