From 4591477a89824c4b09ab508e032dc0fbf0a69ef8 Mon Sep 17 00:00:00 2001 From: Mateja Milosevic Date: Mon, 18 Jul 2016 20:50:30 +0200 Subject: [PATCH] Conflicts and a fix --- code/game/machinery/newscaster.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 32be91c8863..3a6ef2dbd81 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -228,7 +228,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co else for(var/datum/feed_channel/CHANNEL in news_network.network_channels) if(CHANNEL.is_admin_channel) - dat+="[CHANNEL.channel_name]
" + dat+="[CHANNEL.channel_name]
" else dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
" /*for(var/datum/feed_channel/CHANNEL in src.channel_list) @@ -440,7 +440,9 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" - human_or_robot_user << browse(dat, "window=newscaster_main;size=400x600") + var/datum/browser/popup = new(user, "newscaster_main", name, 400, 600) + popup.set_content(dat) + popup.open(0) onclose(human_or_robot_user, "newscaster_main") /*if(src.isbroken) //debugging shit @@ -815,7 +817,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co switch(screen) if(0) //Cover dat+="
The Griffon
" - dat+="
Nanotrasen-standard newspaper, for use on Nanotrasen© Space Facilities
" + dat+="
Nanotrasen-standard newspaper, for use on Nanotrasen Space Facilities
" if(isemptylist(src.news_content)) if(src.important_message) dat+="Contents:
"