diff --git a/code/datums/mind.dm b/code/datums/mind.dm index f64557c03f3..4644c924cfc 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -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]." diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 75e608b8d76..95fabebab6e 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -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 || \ diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index b233fc7f6c1..527b13f4caf 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -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)