cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9935 from GinjaNinja32/irc_notification

Browse Source 
Fixes certain modes not sending the 'A round of [x] has ended' notification at round-end
This commit is contained in:
Chinsky
2015-06-27 01:09:37 +03:00
parent 61cd53e265 94ffb49bfb
commit be24aa0272
6 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/gamemodes/cult/cult.dm
View File

@@ -280,6 +280,7 @@
/datum/game_mode/cult/declare_completion() /datum/game_mode/cult/declare_completion()
if(config.objectives_disabled) if(config.objectives_disabled)
..()
return 1 return 1
if(!check_cult_victory()) if(!check_cult_victory())
feedback_set_details("round_end_result","win - cult win") feedback_set_details("round_end_result","win - cult win")

3
code/game/gamemodes/nuclear/nuclear.dm
View File

@@ -243,6 +243,7 @@ var/global/list/turf/synd_spawn = list()
/datum/game_mode/nuclear/declare_completion() /datum/game_mode/nuclear/declare_completion()
if(config.objectives_disabled) if(config.objectives_disabled)
..()
return return
var/disk_rescued = 1 var/disk_rescued = 1
for(var/obj/item/weapon/disk/nuclear/D in world) for(var/obj/item/weapon/disk/nuclear/D in world)
@@ -343,4 +344,4 @@ var/global/list/turf/synd_spawn = list()
else else
synd_mind.current.name = choose_name synd_mind.current.name = choose_name
synd_mind.current.real_name = choose_name synd_mind.current.real_name = choose_name
return return

3
code/game/gamemodes/revolution/anti_revolution.dm
View File

@@ -191,6 +191,7 @@
feedback_add_details("head_objective","[objective.type]|FAIL") feedback_add_details("head_objective","[objective.type]|FAIL")
count++ count++
break // just print once break // just print once
..()
return 1 return 1
@@ -219,4 +220,4 @@
src.verbs -= /mob/proc/ResignFromHeadPosition src.verbs -= /mob/proc/ResignFromHeadPosition
src << "\red You resigned from your position, now you have the consequences." src << "\red You resigned from your position, now you have the consequences."

2
code/game/gamemodes/revolution/revolution.dm
View File

@@ -353,7 +353,7 @@
else if(finished == 2) else if(finished == 2)
feedback_set_details("round_end_result","loss - rev heads killed") feedback_set_details("round_end_result","loss - rev heads killed")
world << "\red <FONT size = 3><B> The heads of staff managed to stop the revolution!</B></FONT>" world << "\red <FONT size = 3><B> The heads of staff managed to stop the revolution!</B></FONT>"
..() ..()
return 1 return 1
/datum/game_mode/proc/auto_declare_completion_revolution() /datum/game_mode/proc/auto_declare_completion_revolution()

2
code/game/gamemodes/revolution/rp-revolution.dm
View File

@@ -270,6 +270,8 @@
text += "[head_mind.key] (character destroyed)" text += "[head_mind.key] (character destroyed)"
world << text world << text
..()
return 1 return 1

2
code/game/gamemodes/revolution/rp_revolution.dm
View File

@@ -146,7 +146,7 @@
else if(finished == 2) else if(finished == 2)
feedback_set_details("round_end_result","loss - revolution stopped") feedback_set_details("round_end_result","loss - revolution stopped")
world << "\red <FONT size = 3><B> The heads of staff managed to stop the revolution!</B></FONT>" world << "\red <FONT size = 3><B> The heads of staff managed to stop the revolution!</B></FONT>"
..() ..()
return 1 return 1
/datum/game_mode/revolution/proc/is_convertible(mob/M) /datum/game_mode/revolution/proc/is_convertible(mob/M)