Clockwork fix and removal of station traits

This commit is contained in:
keronshb
2021-09-14 21:53:08 -04:00
parent 7ed5f622f4
commit 4f5071cc87
2 changed files with 2 additions and 11 deletions
-8
View File
@@ -280,14 +280,6 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
G.on_report()
. += G.get_report()
if(SSstation.station_traits.len)
. += "<hr><b>Identified shift divergencies:</b><BR>"
for(var/i in SSstation.station_traits)
var/datum/station_trait/station_trait_iterator = i
if(!station_trait_iterator.show_in_report)
continue
. += "[station_trait_iterator.get_report()]<BR>"
print_command_report(., "Central Command Status Summary", announce=FALSE)
priority_announce("A summary has been copied and printed to all communications consoles.", "Enemy communication intercepted. Security level elevated.", "intercept")
if(GLOB.security_level < SEC_LEVEL_BLUE)
@@ -470,14 +470,13 @@
for(var/datum/mind/M in assigned)
var/datum/antagonist/clockcult/new_cultist = new antag_datum()
new_cultist.clock_team = main_clockcult
new_cultist.equip_servant()
new_cultist.SSticker.mode.equip_servant()
M.add_antag_datum(new_cultist)
main_clockcult.setup_objectives()
return TRUE
/datum/dynamic_ruleset/roundstart/clockcult/round_result()
..()
if(main_clockcult.check_cult_victory())
if(main_clockcult.check_clockwork_victory())
SSticker.mode_result = "win - servants completed their objective (summon ratvar)"
SSticker.news_report = CLOCK_SUMMON
else