diff --git a/code/modules/newscaster/defines.dm b/code/modules/newscaster/defines.dm index 03b6868c58d..e5842a24b21 100644 --- a/code/modules/newscaster/defines.dm +++ b/code/modules/newscaster/defines.dm @@ -5,36 +5,12 @@ GLOBAL_DATUM_INIT(news_network, /datum/feed_network, new) GLOBAL_LIST_EMPTY(allNewscasters) // Screen indexes -/// Main Menu screen index. -#define NEWSCASTER_MAIN 0 -/// Feed Channel List screen index. -#define NEWSCASTER_FC_LIST 1 -/// Create Feed Channel screen index. -#define NEWSCASTER_CREATE_FC 2 -/// Create Feed Message screen index. -#define NEWSCASTER_CREATE_FM 3 -/// Print Newspaper screen index. -#define NEWSCASTER_PRINT 4 -/// Read Feed Channel screen index. -#define NEWSCASTER_VIEW_FC 5 -/// Nanotrasen Feed Censorship Tool screen index. -#define NEWSCASTER_NT_CENSOR 6 -/// Nanotrasen D-Notice Handler screen index. -#define NEWSCASTER_D_NOTICE 7 -/// Censor Feed Channel screen index. -#define NEWSCASTER_CENSOR_FC 8 -/// D-Notice Feed Channel screen index. -#define NEWSCASTER_D_NOTICE_FC 9 -/// Wanted Issue Handler screen index. -#define NEWSCASTER_W_ISSUE_H 10 -/// Stationwide Wanted Issue screen index. -#define NEWSCASTER_W_ISSUE 11 -/// Available Jobs screen index. -#define NEWSCASTER_JOBS 12 /// Headlines screen index. -#define NEWSCASTER_HEADLINES 13 +#define NEWSCASTER_HEADLINES 0 +/// Available Jobs screen index. +#define NEWSCASTER_JOBS 1 /// View Channel screen index. -#define NEWSCASTER_CHANNEL 14 +#define NEWSCASTER_CHANNEL 2 // Censor flags /// Censor author name. diff --git a/code/modules/newscaster/obj/newscaster.dm b/code/modules/newscaster/obj/newscaster.dm index f94e6fecd3e..7670804c22d 100644 --- a/code/modules/newscaster/obj/newscaster.dm +++ b/code/modules/newscaster/obj/newscaster.dm @@ -235,19 +235,6 @@ if(screen == NEWSCASTER_CHANNEL && C != viewing_channel) continue last_views[user_name][C.UID()] = now - if(NEWSCASTER_PRINT) - var/total_num = length(GLOB.news_network.channels) - var/active_num = total_num - var/message_num=0 - for(var/datum/feed_channel/FC in GLOB.news_network.channels) - if(!FC.censored) - message_num += length(FC.messages) - else - active_num-- - data["total_num"] = total_num - data["active_num"] = active_num - data["message_num"] = message_num - data["paper_remaining"] = paper_remaining * 100 if(NEWSCASTER_JOBS) var/list/jobs = list() data["jobs"] = jobs