cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4916 from Ar3nn/newscasterfuckoff

Browse Source 
Adds silence button to newscasters
This commit is contained in:
Fox McCloud
2016-07-11 02:38:24 -04:00
committed by GitHub
parent c06cc2118f 45d15dd360
commit c75de17aef
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/newscaster.dm
+19 -4
View File
@@ -98,6 +98,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
var/c_locked=0; //Will our new channel be locked to public submissions?
var/hitstaken = 0 //Death at 3 hits from an item with force>=15
var/datum/feed_channel/viewing_channel = null
var/silence = 0
light_range = 0
anchored = 1
@@ -199,8 +200,12 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
dat+= {"<HR><BR><A href='?src=\ref[src];create_channel=1'>Create Feed Channel</A>
<BR><A href='?src=\ref[src];view=1'>View Feed Channels</A>
<BR><A href='?src=\ref[src];create_feed_story=1'>Submit new Feed story</A>
<BR><A href='?src=\ref[src];menu_paper=1'>Print newspaper</A>
<BR><A href='?src=\ref[src];refresh=1'>Re-scan User</A>
<BR><A href='?src=\ref[src];menu_paper=1'>Print newspaper</A>"}
if(!silence)
dat+= "<BR><A href='?src=\ref[src];silence_unit=1'>Silence unit</A>"
else
dat+= "<BR><A href='?src=\ref[src];unsilence_unit=1'>Unsilence unit</A>"
dat+= {"<BR><A href='?src=\ref[src];refresh=1'>Re-scan User</A>
<BR><BR><A href='?src=\ref[human_or_robot_user];mach_close=newscaster_main'>Exit</A>"}
if(src.securityCaster)
var/wanted_already = 0
@@ -441,7 +446,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
/obj/machinery/newscaster/Topic(href, href_list)
if(..())
return 1
usr.set_machine(src)
if(href_list["set_channel_name"])
src.channel_name = sanitizeSQL(strip_html_simple(input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "")))
@@ -546,6 +551,14 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
src.screen = 20
src.updateUsrDialog()
else if(href_list["silence_unit"])
silence=1
updateUsrDialog()
else if(href_list["unsilence_unit"])
silence=0
updateUsrDialog()
else if(href_list["menu_censor_story"])
src.screen=10
src.updateUsrDialog()
@@ -958,6 +971,7 @@ obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob, pa
/obj/machinery/newscaster/proc/newsAlert(var/news_call) //This isn't Agouri's work, for it is ugly and vile.
var/turf/T = get_turf(src) //Who the fuck uses spawn(600) anyway, jesus christ
if(news_call)
for(var/mob/O in hearers(world.view-1, T))
O.show_message("<span class='newscaster'><EM>[src.name]</EM> beeps, \"[news_call]\"</span>",2)
src.alert = 1
@@ -965,7 +979,8 @@ obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob, pa
spawn(300)
src.alert = 0
src.update_icon()
playsound(src.loc, 'sound/machines/twobeep.ogg', 75, 1)
if(!silence)
playsound(src.loc, 'sound/machines/twobeep.ogg', 75, 1)
else
for(var/mob/O in hearers(world.view-1, T))
O.show_message("<span class='newscaster'><EM>[src.name]</EM> beeps, \"Attention! Wanted issue distributed!\"</span>",2)