From 3950fdc7c9cfe8f12ebf8f57d088856a2245d0ca Mon Sep 17 00:00:00 2001 From: "polyxenitopalidou@gmail.com" Date: Sun, 29 Jan 2012 20:35:09 +0000 Subject: [PATCH] =?UTF-8?q?=E2=80=A2Runtime=20error=20and=20several=20typo?= =?UTF-8?q?s=20fix.=20Thanks,=20Pete.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3009 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/newscaster.dm | 39 +++++++++++++++++-------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 0d8dc9e7dc6..213df1bd52f 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -36,13 +36,14 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r // 2 = create feed channel // 3 = create feed story // 4 = feed story submited sucessfully - // 5 = feed channel created succesfully + // 5 = feed channel created successfully // 6 = ERROR: Cannot create feed story // 7 = ERROR: Cannot create feed channel // 8 = print newspaper // 9 = viewing channel feeds // 10 = censor feed story // 11 = censor feed channel + //Holy shit this is outdated, made this when I was still starting newscasters :3 var/paper_remaining = 0 var/securityCaster = 0 var/unit_no = 0 //Each newscaster has a unit_no @@ -68,7 +69,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r /obj/machinery/newscaster/New() //Right, apparently it's good to have a New() for machinery for some sort of global machine list... allCasters += src - src.paper_remaining = 20 // Will probably change this to something better + src.paper_remaining = 15 // Will probably change this to something better for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) // Let's give it an appropriate unit number src.unit_no++ src.update_icon() //for any custom ones on the map... @@ -191,10 +192,10 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r dat+="Message Body: [src.msg]
" dat+="
Submit

Cancel
" if(4) - dat+="Feed story succesfully submitted to [src.channel_name].

" + dat+="Feed story successfully submitted to [src.channel_name].

" dat+="
Return
" if(5) - dat+="Feed Channel [src.channel_name] created succesfully.

" + dat+="Feed Channel [src.channel_name] created successfully.

" dat+="
Return
" if(6) dat+="ERROR: Could not submit Feed story to Network.

" @@ -253,7 +254,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r dat+="
Back" if(10) dat+="Nanotrasen Feed Censorship Tool
" - dat+="NOTE: Due to the nature of news Feeds, total deletation of a Feed Story is not possible.
" + dat+="NOTE: Due to the nature of news Feeds, total deletion of a Feed Story is not possible.
" dat+="Keep in mind that users attempting to view a censored feed will instead see the \[REDACTED\] tag above it." dat+="
Select Feed channel to get Stories from:
" if(isemptylist(src.channel_list)) @@ -264,7 +265,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r dat+="
Cancel" if(11) dat+="Nanotrasen D-Notice Handler
" - dat+="A D-Noticed is to be bestowed upon the channel if the handling Authority deemsi it as harmful for the station's" + dat+="A D-Notice is to be bestowed upon the channel if the handling Authority deems it as harmful for the station's" dat+="morale, integrity or disciplinary behaviour. A D-Notice will render a channel unable to be updated by anyone, without deleting any feed" dat+="stories it might contain at the time. You can lift a D-Notice if you have the required access at any time.
" if(isemptylist(src.channel_list)) @@ -332,7 +333,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r dat+="•Invalid description.
" dat+="
Return
" if(17) - dat+="Wanted Issue succesfully deleted from Circulation
" + dat+="Wanted Issue successfully deleted from Circulation
" dat+="
Return
" if(18) dat+="-- STATIONWIDE WANTED ISSUE --
\[Submitted by: [src.wanted.backup_author]\]
" @@ -340,13 +341,13 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r dat+="Description: [src.wanted.body]
" dat+="
Back
" if(19) - dat+="Wanted issue for [src.channel_name] succesfully edited.

" + dat+="Wanted issue for [src.channel_name] successfully edited.

" dat+="
Return
" if(20) - dat+="Printing succesfull. Please receive your newspaper from the bottom of the machine.

" + dat+="Printing successfull. Please receive your newspaper from the bottom of the machine.

" dat+="Return" if(21) - dat+="Unable to print newspaper. Insufficient paper. Please notify maintenance personell to refill machine storage.

" + dat+="Unable to print newspaper. Insufficient paper. Please notify maintenance personnell to refill machine storage.

" dat+="Return" else dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" @@ -675,22 +676,26 @@ obj/item/weapon/newspaper/attack_self(mob/user as mob) if(ishuman(user)) var/mob/living/carbon/human/human_user = user var/dat + src.pages = 0 switch(screen) if(0) //Cover dat+="
The Griffon
" dat+="
Nanotrasen-standard newspaper, for use on Nanotrasen© Space Facilities
" if(isemptylist(src.news_content)) - dat+="Other than the title, the rest of the newspaper is unprinted..." + if(src.important_message) + dat+="Contents:
    **Important Security Announcement** \[page [src.pages+2]\]
" + else + dat+="Other than the title, the rest of the newspaper is unprinted..." else dat+="Contents:
    " for(var/datum/feed_channel/NP in src.news_content) src.pages++ if(src.important_message) - dat+="**Important Security Announcement** \[page [src.pages]\]
    " + dat+="**Important Security Announcement** \[page [src.pages+2]\]
    " var/temp_page=0 for(var/datum/feed_channel/NP in src.news_content) temp_page++ - dat+="[NP.channel_name] \[page [temp_page]\]
    " + dat+="[NP.channel_name] \[page [temp_page+2]\]
    " dat+="
" if(scribble_page==curr_page) dat+="
There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" @@ -710,7 +715,7 @@ obj/item/weapon/newspaper/attack_self(mob/user as mob) dat+= "
Previous Page
Next Page
" if(2) //Last page if(src.important_message!=null) - dat+="
Wanted Issue:


" + dat+="
Wanted Issue:


" dat+="Criminal name: [important_message.author]
" dat+="Description: [important_message.body]" else @@ -736,10 +741,10 @@ obj/item/weapon/newspaper/Topic(href, href_list) if(href_list["next_page"]) if(curr_page==src.pages+1) return //Don't need that at all, but anyway. - if(src.curr_page == src.pages) + if(src.curr_page == src.pages) //We're at the middle, get to the end src.screen = 2 else - if(curr_page == 0) + if(curr_page == 0) //We're at the start, get to the middle src.screen=1 src.curr_page++ playsound(src.loc, "pageturn", 50, 1) @@ -749,7 +754,7 @@ obj/item/weapon/newspaper/Topic(href, href_list) return if(curr_page == 1) src.screen = 0 - src.pages = 0 //so it doesn't create extra pages every time we return to the cover screen + else if(curr_page == src.pages+1) //we're at the end, let's go back to the middle. src.screen = 1