Merge pull request #6865 from PsiOmegaDelta/PDA

PDA newscast reception
This commit is contained in:
Chinsky
2014-10-29 06:30:54 +03:00
17 changed files with 350 additions and 173 deletions
@@ -35,10 +35,7 @@
var/life_status = "[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"]"
var/damage_report = "(<font color='blue'>[dam1]</font>/<font color='green'>[dam2]</font>/<font color='orange'>[dam3]</font>/<font color='red'>[dam4]</font>)"
if(H.wear_id)
log += "<tr><td width='40%'>[H.wear_id.name]</td>"
else
log += "<tr><td width='40%'>Unknown</td>"
log += "<tr><td width='40%'>[H.get_id_name()]</td>"
switch(C.sensor_mode)
if(1)
+1 -4
View File
@@ -149,7 +149,4 @@ proc/announce_newscaster_news(datum/news_announcement/news)
newMsg.body = news.message
newMsg.message_type = news.message_type
sendto.messages += newMsg
for(var/obj/machinery/newscaster/NEWSCASTER in allCasters)
NEWSCASTER.newsAlert(news.channel_name)
news_network.insert_message_in_channel(sendto, newMsg)