diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 6bf9930e..566613b1 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -180,7 +180,7 @@ GLOBAL_LIST_EMPTY(allCasters) /obj/machinery/newscaster name = "newscaster" - desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. All the news you absolutely have no use for, in one place!" + desc = "A standard Kinaris-licensed newsfeed handler for use in commercial space stations. All the news you absolutely have no use for, in one place!" icon = 'icons/obj/terminals.dmi' icon_state = "newscaster_normal" verb_say = "beeps" @@ -271,7 +271,7 @@ GLOBAL_LIST_EMPTY(allCasters) switch(screen) if(0) dat += "Welcome to Newscasting Unit #[unit_no].
Interface & News networks Operational." - dat += "
Property of Nanotrasen Inc" + dat += "
Property of Kinaris Corp" if(GLOB.news_network.wanted_issue.active) dat+= "
Read Wanted Issue" dat+= "

Create Feed Channel" @@ -616,14 +616,14 @@ GLOBAL_LIST_EMPTY(allCasters) screen = 15 else if(GLOB.news_network.wanted_issue.isAdminMsg) - alert("The wanted issue has been distributed by a Nanotrasen higherup. You cannot edit it.","Ok") + alert("The wanted issue has been distributed by a Kinaris higherup. You cannot edit it.","Ok") return GLOB.news_network.submitWanted(channel_name, msg, scanned_user, picture) screen = 19 updateUsrDialog() else if(href_list["cancel_wanted"]) if(GLOB.news_network.wanted_issue.isAdminMsg) - alert("The wanted issue has been distributed by a Nanotrasen higherup. You cannot take it down.","Ok") + alert("The wanted issue has been distributed by a Kinaris higherup. You cannot take it down.","Ok") return var/choice = alert("Please confirm Wanted Issue removal","Network Security Handler","Confirm","Cancel") if(choice=="Confirm") @@ -636,21 +636,21 @@ GLOBAL_LIST_EMPTY(allCasters) else if(href_list["censor_channel_author"]) var/datum/newscaster/feed_channel/FC = locate(href_list["censor_channel_author"]) if(FC.is_admin_channel) - alert("This channel was created by a Nanotrasen Officer. You cannot censor it.","Ok") + alert("This channel was created by a Kinaris Officer. You cannot censor it.","Ok") return FC.toggleCensorAuthor() updateUsrDialog() else if(href_list["censor_channel_story_author"]) var/datum/newscaster/feed_message/MSG = locate(href_list["censor_channel_story_author"]) if(MSG.is_admin_message) - alert("This message was created by a Nanotrasen Officer. You cannot censor its author.","Ok") + alert("This message was created by a Kinaris Officer. You cannot censor its author.","Ok") return MSG.toggleCensorAuthor() updateUsrDialog() else if(href_list["censor_channel_story_body"]) var/datum/newscaster/feed_message/MSG = locate(href_list["censor_channel_story_body"]) if(MSG.is_admin_message) - alert("This channel was created by a Nanotrasen Officer. You cannot censor it.","Ok") + alert("This channel was created by a Kinaris Officer. You cannot censor it.","Ok") return MSG.toggleCensorBody() updateUsrDialog() @@ -662,7 +662,7 @@ GLOBAL_LIST_EMPTY(allCasters) else if(href_list["toggle_d_notice"]) var/datum/newscaster/feed_channel/FC = locate(href_list["toggle_d_notice"]) if(FC.is_admin_channel) - alert("This channel was created by a Nanotrasen Officer. You cannot place a D-Notice upon it.","Ok") + alert("This channel was created by a Kinaris Officer. You cannot place a D-Notice upon it.","Ok") return FC.toggleCensorDclass() updateUsrDialog() @@ -864,7 +864,7 @@ GLOBAL_LIST_EMPTY(allCasters) /obj/item/newspaper name = "newspaper" - desc = "An issue of The Griffon, the newspaper circulating aboard Nanotrasen Space Stations." + desc = "An issue of The Griffon, the newspaper circulating aboard Kin.Co Space Stations." icon = 'icons/obj/bureaucracy.dmi' icon_state = "newspaper" lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi' diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index 0fa31032..8706870b 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -273,7 +273,7 @@ /obj/item/book/manual/wiki/chemistry name = "Guide to chems" icon_state ="chemistrybook" - author = "Nanotrasen" + author = "Kin-Chems" title = "Guide to chems" page_link = "Guide_to_chemistry" @@ -300,9 +300,9 @@ /obj/item/book/manual/wiki/security_space_law name = "Space Law" - desc = "A set of Nanotrasen guidelines for keeping law and order on their space stations." + desc = "A set of Kin-Station guidelines for keeping law and order on their space stations." icon_state = "bookSpaceLaw" - author = "Nanotrasen" + author = "Kin.Co PMC" title = "Space Law" page_link = "Space_Law" @@ -334,7 +334,7 @@ /obj/item/book/manual/wiki/detective name = "The Film Noir: Proper Procedures for Investigations" icon_state ="bookDetective" - author = "Nanotrasen" + author = "The Stranger" title = "The Film Noir: Proper Procedures for Investigations" page_link = "Detective" diff --git a/code/modules/events/high_priority_bounty.dm b/code/modules/events/high_priority_bounty.dm index ffdcd884..d629a0b8 100644 --- a/code/modules/events/high_priority_bounty.dm +++ b/code/modules/events/high_priority_bounty.dm @@ -6,7 +6,7 @@ earliest_start = 10 /datum/round_event/high_priority_bounty/announce(fake) - priority_announce("Central Command has issued a high-priority cargo bounty. Details have been sent to all bounty consoles.", "Nanotrasen Bounty Program") + priority_announce("C.C has issued a high-priority bounty. Details have been uploaded to all bounty consoles.", "Kinaris Corp Bounty Program") /datum/round_event/high_priority_bounty/start() var/datum/bounty/B diff --git a/sound/music/sacredgeometry.ogg b/sound/music/sacredgeometry.ogg new file mode 100644 index 00000000..635db4da Binary files /dev/null and b/sound/music/sacredgeometry.ogg differ diff --git a/strings/round_start_sounds.txt b/strings/round_start_sounds.txt index a8409188..03ff64cc 100644 --- a/strings/round_start_sounds.txt +++ b/strings/round_start_sounds.txt @@ -4,6 +4,7 @@ sound/ambience/title3.ogg sound/ambience/title4.ogg sound/misc/i_did_not_grief_them.ogg sound/ambience/clown.ogg +sound/music/sacredgeometry.ogg sound/music/1.ogg sound/music/carmenmirandasghost.ogg sound/music/century21march.ogg