From 94ffb49bfbf6e151f2026526755f55794fcb0678 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Fri, 26 Jun 2015 01:04:03 +0100 Subject: [PATCH] Fixes certain modes not sending the 'A round of [x] has ended' notification at round-end --- code/game/gamemodes/cult/cult.dm | 1 + code/game/gamemodes/nuclear/nuclear.dm | 3 ++- code/game/gamemodes/revolution/anti_revolution.dm | 3 ++- code/game/gamemodes/revolution/revolution.dm | 2 +- code/game/gamemodes/revolution/rp-revolution.dm | 2 ++ code/game/gamemodes/revolution/rp_revolution.dm | 2 +- 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index b86f46fa89..9ff016d7e5 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -280,6 +280,7 @@ /datum/game_mode/cult/declare_completion() if(config.objectives_disabled) + ..() return 1 if(!check_cult_victory()) feedback_set_details("round_end_result","win - cult win") diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index b2e54da0d9..a9ecba29a7 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -243,6 +243,7 @@ var/global/list/turf/synd_spawn = list() /datum/game_mode/nuclear/declare_completion() if(config.objectives_disabled) + ..() return var/disk_rescued = 1 for(var/obj/item/weapon/disk/nuclear/D in world) @@ -343,4 +344,4 @@ var/global/list/turf/synd_spawn = list() else synd_mind.current.name = choose_name synd_mind.current.real_name = choose_name - return \ No newline at end of file + return diff --git a/code/game/gamemodes/revolution/anti_revolution.dm b/code/game/gamemodes/revolution/anti_revolution.dm index fce1cace91..823b7d5fb3 100644 --- a/code/game/gamemodes/revolution/anti_revolution.dm +++ b/code/game/gamemodes/revolution/anti_revolution.dm @@ -191,6 +191,7 @@ feedback_add_details("head_objective","[objective.type]|FAIL") count++ break // just print once + ..() return 1 @@ -219,4 +220,4 @@ src.verbs -= /mob/proc/ResignFromHeadPosition - src << "\red You resigned from your position, now you have the consequences." \ No newline at end of file + src << "\red You resigned from your position, now you have the consequences." diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 71e9704606..428757245a 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -353,7 +353,7 @@ else if(finished == 2) feedback_set_details("round_end_result","loss - rev heads killed") world << "\red The heads of staff managed to stop the revolution!" - ..() + ..() return 1 /datum/game_mode/proc/auto_declare_completion_revolution() diff --git a/code/game/gamemodes/revolution/rp-revolution.dm b/code/game/gamemodes/revolution/rp-revolution.dm index 815b3be3cb..8af3deabc3 100644 --- a/code/game/gamemodes/revolution/rp-revolution.dm +++ b/code/game/gamemodes/revolution/rp-revolution.dm @@ -270,6 +270,8 @@ text += "[head_mind.key] (character destroyed)" world << text + + ..() return 1 diff --git a/code/game/gamemodes/revolution/rp_revolution.dm b/code/game/gamemodes/revolution/rp_revolution.dm index 5cf1bcc08d..94581909dd 100644 --- a/code/game/gamemodes/revolution/rp_revolution.dm +++ b/code/game/gamemodes/revolution/rp_revolution.dm @@ -146,7 +146,7 @@ else if(finished == 2) feedback_set_details("round_end_result","loss - revolution stopped") world << "\red The heads of staff managed to stop the revolution!" - ..() + ..() return 1 /datum/game_mode/revolution/proc/is_convertible(mob/M)