diff --git a/code/controllers/subsystem/SSticker.dm b/code/controllers/subsystem/SSticker.dm index 2bf7969f4f7..c69207c53e5 100644 --- a/code/controllers/subsystem/SSticker.dm +++ b/code/controllers/subsystem/SSticker.dm @@ -690,36 +690,8 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/proc/setup_news_feeds() - var/datum/feed_channel/newChannel = new /datum/feed_channel - newChannel.channel_name = "Station Announcements Log" - newChannel.author = "Automated Announcement Listing" - newChannel.icon = "bullhorn" - newChannel.frozen = TRUE - newChannel.admin_locked = TRUE - GLOB.news_network.channels += newChannel - - newChannel = new /datum/feed_channel - newChannel.channel_name = "Public Station Announcements" - newChannel.author = "Automated Announcement Listing" - newChannel.icon = "users" - newChannel.is_public = TRUE - GLOB.news_network.channels += newChannel - - newChannel = new /datum/feed_channel - newChannel.channel_name = "Nyx Daily" - newChannel.author = "CentComm Minister of Information" - newChannel.icon = "meteor" - newChannel.frozen = TRUE - newChannel.admin_locked = TRUE - GLOB.news_network.channels += newChannel - - newChannel = new /datum/feed_channel - newChannel.channel_name = "The Gibson Gazette" - newChannel.author = "Editor Mike Hammers" - newChannel.icon = "star" - newChannel.frozen = TRUE - newChannel.admin_locked = TRUE - GLOB.news_network.channels += newChannel + for(var/feed_channel_type in subtypesof(/datum/feed_channel)) + GLOB.news_network.channels += new feed_channel_type for(var/loc_type in subtypesof(/datum/trade_destination)) var/datum/trade_destination/D = new loc_type diff --git a/code/datums/news_channels.dm b/code/datums/news_channels.dm new file mode 100644 index 00000000000..dcfb6119458 --- /dev/null +++ b/code/datums/news_channels.dm @@ -0,0 +1,26 @@ +/datum/feed_channel/station_announcements + channel_name = "Station Announcements Log" + author = "Automated Announcement Listing" + icon = "bullhorn" + frozen = TRUE + admin_locked = TRUE + +/datum/feed_channel/public_announcements + channel_name = "Public Station Announcements" + author = "Automated Announcement Listing" + icon = "users" + is_public = TRUE + +/datum/feed_channel/nyx_daily + channel_name = "Nyx Daily" + author = "CentComm Minister of Information" + icon = "meteor" + frozen = TRUE + admin_locked = TRUE + +/datum/feed_channel/gibson_gazette + channel_name = "The Gibson Gazette" + author = "Editor Mike Hammers" + icon = "star" + frozen = TRUE + admin_locked = TRUE diff --git a/code/modules/newscaster/datums.dm b/code/modules/newscaster/newsfeed_datums.dm similarity index 100% rename from code/modules/newscaster/datums.dm rename to code/modules/newscaster/newsfeed_datums.dm diff --git a/paradise.dme b/paradise.dme index 4cec028e1b4..9435d85b2fc 100644 --- a/paradise.dme +++ b/paradise.dme @@ -423,6 +423,7 @@ #include "code\datums\move_manager.dm" #include "code\datums\movement_detector.dm" #include "code\datums\mutable_appearance.dm" +#include "code\datums\news_channels.dm" #include "code\datums\ores.dm" #include "code\datums\particles.dm" #include "code\datums\pathfinding_mover.dm" @@ -2739,7 +2740,7 @@ #include "code\modules\mod\modules\modules_service.dm" #include "code\modules\mod\modules\modules_supply.dm" #include "code\modules\mod\modules\modules_visor.dm" -#include "code\modules\newscaster\datums.dm" +#include "code\modules\newscaster\newsfeed_datums.dm" #include "code\modules\newscaster\obj\newscaster.dm" #include "code\modules\newscaster\obj\newspaper.dm" #include "code\modules\ninja\energy_katana.dm"