shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update roundend.dm

Browse Source
This commit is contained in:
LetterJay
2017-12-24 02:40:05 -06:00
committed by GitHub
parent a912e14912
commit e2ba458400
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/roundend.dm
+1 -4
View File
@@ -62,9 +62,7 @@
var/result = O.check_completion() ? "SUCCESS" : "FAIL" var/result = O.check_completion() ? "SUCCESS" : "FAIL"
antag_info["objectives"] += list(list("objective_type"=O.type,"text"=O.explanation_text,"result"=result)) antag_info["objectives"] += list(list("objective_type"=O.type,"text"=O.explanation_text,"result"=result))
SSblackbox.record_feedback("associative", "antagonists", 1, antag_info) SSblackbox.record_feedback("associative", "antagonists", 1, antag_info)
<<<<<<< HEAD
=======
/datum/controller/subsystem/ticker/proc/gather_newscaster() /datum/controller/subsystem/ticker/proc/gather_newscaster()
var/json_file = file("[GLOB.log_directory]/newscaster.json") var/json_file = file("[GLOB.log_directory]/newscaster.json")
var/list/file_data = list() var/list/file_data = list()
@@ -91,7 +89,6 @@
if(GLOB.news_network.wanted_issue.active) if(GLOB.news_network.wanted_issue.active)
file_data["wanted"] = list("author" = "[GLOB.news_network.wanted_issue.scannedUser]", "criminal" = "[GLOB.news_network.wanted_issue.criminal]", "description" = "[GLOB.news_network.wanted_issue.body]", "photo file" = "[GLOB.news_network.wanted_issue.photo_file]") file_data["wanted"] = list("author" = "[GLOB.news_network.wanted_issue.scannedUser]", "criminal" = "[GLOB.news_network.wanted_issue.criminal]", "description" = "[GLOB.news_network.wanted_issue.body]", "photo file" = "[GLOB.news_network.wanted_issue.photo_file]")
WRITE_FILE(json_file, json_encode(file_data)) WRITE_FILE(json_file, json_encode(file_data))
>>>>>>> e940102... Makes newscaster feedback messages and comments always a list. (#33682)
/datum/controller/subsystem/ticker/proc/declare_completion() /datum/controller/subsystem/ticker/proc/declare_completion()
set waitfor = FALSE set waitfor = FALSE