Fix AI tracking, atmospherics construction, blob talk fix, ERT radio fix

This commit is contained in:
Markolie
2015-02-21 20:56:55 +01:00
parent 63ceaad3ec
commit d2dcb7a041
8 changed files with 74 additions and 37 deletions
+1 -1
View File
@@ -313,7 +313,7 @@
src.connected_to = c
node2 = target
break
if(!node1 && !node2)
del(src)
return
+3 -3
View File
@@ -70,8 +70,8 @@
if (!message)
return
var/message_a = say_quote(message)
var/rendered = "<font color=\"#EE4000\"><i><span class='game say'>Blob Telepathy, <span class='name'>[name]</span> <span class='message'>[message_a]</span></span></i></font>"
var/verb = "states,"
var/rendered = "<font color=\"#EE4000\"><i><span class='game say'>Blob Telepathy, <span class='name'>[name]</span> <span class='message'>[verb] \"[message]\"</span></span></i></font>"
for (var/mob/camera/blob/S in world)
if(istype(S))
@@ -79,7 +79,7 @@
for (var/mob/M in dead_mob_list)
if(!istype(M,/mob/new_player) && !istype(M,/mob/living/carbon/brain)) //No meta-evesdropping
rendered = "<font color=\"#EE4000\"><i><span class='game say'>Blob Telepathy, <span class='name'>[name]</span> <a href='byond://?src=\ref[M];follow2=\ref[M];follow=\ref[src]'>(Follow)</a> <span class='message'>[message_a]</span></span></i></font>"
rendered = "<font color=\"#EE4000\"><i><span class='game say'>Blob Telepathy, <span class='name'>[name]</span> <a href='byond://?src=\ref[M];follow2=\ref[M];follow=\ref[src]'>(Follow)</a> <span class='message'>[verb] \"[message]\"</span></span></i></font>"
M.show_message(rendered, 2)
/mob/camera/blob/emote(var/act,var/m_type=1,var/message = null)
+1 -1
View File
@@ -171,7 +171,7 @@ proc/issyndicate(mob/living/M as mob)
var/hair_c = pick("#8B4513","#000000","#FF4500","#FFD700") // Brown, black, red, blonde
var/eye_c = pick("#000000","#8B4513","1E90FF") // Black, brown, blue
var/skin_tone = pick(35, 60, 75, 90, 105, 120, 135, 150) // Caucasian - black
var/skin_tone = pick(35, 60, 75, 90, 105, 120) // Caucasian - black
var/hair_style = "Bald"
var/facial_hair_style = "Shaved"
if(M.gender == MALE)
+2
View File
@@ -142,6 +142,8 @@
pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0
update_icon()
if(ticker && ticker.current_state == GAME_STATE_PLAYING)
initialize()
return
first_run()
+32 -1
View File
@@ -42,6 +42,12 @@
autolinkers = list("hub", "relay", "c_relay", "s_relay", "m_relay", "r_relay", "science", "medical",
"supply", "service", "common", "command", "engineering", "security",
"receiverA", "receiverB", "broadcasterA", "broadcasterB")
/obj/machinery/telecomms/hub/preset_cent
id = "CentComm Hub"
network = "tcommsat"
autolinkers = list("hub_cent", "c_relay", "s_relay", "m_relay", "r_relay",
"centcomm", "receiverCent", "broadcasterCent")
//Receivers
@@ -67,7 +73,12 @@
for(var/i = 1441, i < 1489, i += 2)
freq_listening |= i
..()
/obj/machinery/telecomms/receiver/preset_cent
id = "CentComm Receiver"
network = "tcommsat"
autolinkers = list("receiverCent")
freq_listening = list(ERT_FREQ, DTH_FREQ)
//Buses
@@ -99,6 +110,12 @@
for(var/i = 1441, i < 1489, i += 2)
freq_listening |= i
..()
/obj/machinery/telecomms/bus/preset_cent
id = "CentComm Bus"
network = "tcommsat"
freq_listening = list(ERT_FREQ, DTH_FREQ)
autolinkers = list("processorCent", "centcomm")
//Processors
@@ -121,6 +138,11 @@
id = "Processor 4"
network = "tcommsat"
autolinkers = list("processor4")
/obj/machinery/telecomms/processor/preset_cent
id = "CentComm Processor"
network = "tcommsat"
autolinkers = list("processorCent")
//Servers
@@ -175,6 +197,10 @@
freq_listening = list(1359)
autolinkers = list("security")
/obj/machinery/telecomms/server/presets/centcomm
id = "CentComm Server"
freq_listening = list(ERT_FREQ, DTH_FREQ)
autolinkers = list("centcomm")
//Broadcasters
@@ -191,3 +217,8 @@
id = "Broadcaster B"
network = "tcommsat"
autolinkers = list("broadcasterB")
/obj/machinery/telecomms/broadcaster/preset_cent
id = "CentComm Broadcaster"
network = "tcommsat"
autolinkers = list("broadcasterCent")
-5
View File
@@ -21,11 +21,6 @@
// Reagent ID => friendly name
var/list/reagents_to_log=list()
/obj/New()
..()
if(ticker && ticker.current_state == GAME_STATE_PLAYING)
initialize()
/obj/Topic(href, href_list, var/nowindow = 0, var/checkrange = 1)
// Calling Topic without a corresponding window open causes runtime errors
if(!nowindow && ..())
+5 -3
View File
@@ -498,9 +498,11 @@ var/list/ai_list = list()
if (href_list["track"])
var/mob/target = locate(href_list["track"]) in mob_list
var/mob/living/silicon/ai/A = locate(href_list["track2"]) in mob_list
if(A && target)
A.ai_actual_track(target)
if(target && (!istype(target, /mob/living/carbon/human) || html_decode(href_list["trackname"]) == target:get_face_name()))
ai_actual_track(target)
else
src << "\red System error. Cannot locate [html_decode(href_list["trackname"])]."
return
if (href_list["trackbot"])