-Fixed Issue 849

-Fixed some other occurrences of this happening. If you find any, please post it here: http://nanotrasen.com/phpBB3/viewtopic.php?f=7&t=9955 
or let me know in #coderbus.

-Split up the Core() verb a bit.
-When sending messages to Centcom or the Syndicate, with the communications console, it would never reset itself since it resets the wrong variable. I've given it the correct variable and I made the cooldown 10 minutes instead of a minute.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4629 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-09-05 23:42:04 +00:00
parent 0c620b02ae
commit 6117b5d02f
15 changed files with 39 additions and 33 deletions
+2 -1
View File
@@ -793,10 +793,11 @@ var/global/BSACooldown = 0
if ((src.rank in list( "Trial Admin", "Badmin", "Game Admin", "Game Master" )))
var/mob/M = locate(href_list["forcespeech"])
if (ismob(M))
var/speech = copytext(sanitize(input("What will [key_name(M)] say?.", "Force speech", "")),1,MAX_MESSAGE_LEN)
var/speech = input("What will [key_name(M)] say?.", "Force speech", "")// Don't need to sanitize, since it does that in say(), we also trust our admins.
if(!speech)
return
M.say(speech)
speech = sanitize(speech) // Nah, we don't trust them
log_admin("[key_name(usr)] forced [key_name(M)] to say: [speech]")
message_admins("\blue [key_name_admin(usr)] forced [key_name_admin(M)] to say: [speech]")
else
+4 -4
View File
@@ -261,7 +261,7 @@
if (prob(30))
switch(pick(1,2))
if(1)
core()
view_core()
if(2)
ai_call_shuttle()
..()
@@ -445,7 +445,7 @@
return 0
if(!src.eyeobj)
core()
view_core()
return
// ok, we're alive, camera is good and in our network...
eyeobj.setLoc(get_turf(C))
@@ -512,7 +512,7 @@
set name = "Cancel Camera View"
//src.cameraFollow = null
src.core()
src.view_core()
//Replaces /mob/living/silicon/ai/verb/change_network() in ai.dm & camera.dm
@@ -547,7 +547,7 @@
network = input(U, "Which network would you like to view?") as null|anything in cameralist
if(!U.eyeobj)
U.core()
U.view_core()
return
if(isnull(network))
@@ -103,11 +103,17 @@
/mob/living/silicon/ai/verb/core()
set category = "AI Commands"
set name = "AI Core"
view_core()
/mob/living/silicon/ai/proc/view_core()
current = null
cameraFollow = null
machine = null
if(src.eyeobj)
if(src.eyeobj && src.loc)
src.eyeobj.loc = src.loc
else
src << "ERROR: Eyeobj not found. Please report this to Giacom. Creating new eye..."
+1 -1
View File
@@ -22,5 +22,5 @@
if(O)
O.mode = 1
O.emotion = "Neutral"
src.core()
src.view_core()
return
+1 -1
View File
@@ -6,5 +6,5 @@
if (client)
client.eye = loc
client.perspective = EYE_PERSPECTIVE
src.core()
src.view_core()
return