cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing conflicts

Browse Source
This commit is contained in:
Cadyn
2020-10-05 18:10:53 -07:00
parent 7b44df4701 2a79ecfdad
commit 07775449d7
2080 changed files with 1768339 additions and 30848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/modules/modular_computers/file_system/news_article.dm
View File

@@ -21,4 +21,26 @@
/datum/computer_file/data/news_article/space/vol_one
filename = "SPACE Magazine vol. 1"
server_file_path = 'news_articles/space_magazine_1.html'
*/
*/
/* CHOMPedit: commenting out YW articles because they don't make sense here and adding our own.
//YAWN ADDS - All from discord
/datum/computer_file/data/news_article/archives/vol_gwa_one
filename = "Galaxy Wide Archives"
server_file_path = 'news_articles/galaxy_wide_archived_1.html'
archived = 1
/datum/computer_file/data/news_article/archives/vol_tss_one
filename = "The Sleepy Sergal Archives vol. 1"
server_file_path = 'news_articles/the_sleepy_sergal_archived_1.html'
archived = 1
/datum/computer_file/data/news_article/tss/vol_two
filename = "The Sleepy Sergal vol. 2"
server_file_path = 'news_articles/the_sleepy_sergal_2.html'
*/
/datum/computer_file/data/news_article/starfire/year_2564
filename = "Starfire Report: Year 2564"
server_file_path = 'news_articles/starfire_report_2564.html'
//End CHOMPedit