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

-Fixed Issue 849

Browse Source 
-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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/bots/cleanbot.dm
+1 -3
View File
@@ -353,11 +353,9 @@ text("<A href='?src=\ref[src];operation=oddbutton'>[src.oddbutton ? "Yes" : "No"
del(src)
else if (istype(W, /obj/item/weapon/pen))
var/t = input(user, "Enter new robot name", src.name, src.created_name) as text
t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN)
var/t = stripped_input(user, "Enter new robot name", src.name, src.created_name)
if (!t)
return
if (!in_range(src, usr) && src.loc != usr)
return
src.created_name = t
code/game/machinery/bots/ed209bot.dm
+1 -2
View File
@@ -891,8 +891,7 @@ Auto Patrol: []"},
..()
if(istype(W, /obj/item/weapon/pen))
var/t = input(user, "Enter new robot name", src.name, src.created_name) as text
t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN)
var/t = stripped_input(user, "Enter new robot name", src.name, src.created_name)
if(!t) return
if(!in_range(src, usr) && src.loc != usr) return
created_name = t
code/game/machinery/bots/floorbot.dm
+3 -4
View File
@@ -425,8 +425,7 @@
del(src)
else if (istype(W, /obj/item/weapon/pen))
var/t = input(user, "Enter new robot name", src.name, src.created_name) as text
t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN)
var/t = stripped_input(user, "Enter new robot name", src.name, src.created_name)
if (!t)
return
if (!in_range(src, usr) && src.loc != usr)
@@ -445,8 +444,8 @@
user.drop_from_inventory(src)
del(src)
else if (istype(W, /obj/item/weapon/pen))
var/t = input(user, "Enter new robot name", src.name, src.created_name) as text
t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN)
var/t = stripped_input(user, "Enter new robot name", src.name, src.created_name)
if (!t)
return
if (!in_range(src, usr) && src.loc != usr)
code/game/machinery/bots/medbot.dm
+1 -3
View File
@@ -559,13 +559,11 @@
/obj/item/weapon/firstaid_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
if(istype(W, /obj/item/weapon/pen))
var/t = input(user, "Enter new robot name", src.name, src.created_name) as text
t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN)
var/t = stripped_input(user, "Enter new robot name", src.name, src.created_name)
if (!t)
return
if (!in_range(src, usr) && src.loc != usr)
return
src.created_name = t
else
switch(build_step)
code/game/machinery/bots/secbot.dm
+1 -3
View File
@@ -754,11 +754,9 @@ Auto Patrol: []"},
del(src)
else if(istype(W, /obj/item/weapon/pen))
var/t = input(user, "Enter new robot name", src.name, src.created_name) as text
t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN)
var/t = stripped_input(user, "Enter new robot name", src.name, src.created_name)
if(!t)
return
if(!in_range(src, usr) && src.loc != usr)
return
src.created_name = t
code/game/machinery/camera/tracking.dm
+1 -1
View File
@@ -112,7 +112,7 @@
if(U.eyeobj)
U.eyeobj.setLoc(get_turf(target))
else
core()
view_core()
return
sleep(10)
code/game/machinery/computer/communications.dm
+7 -7
View File
@@ -98,7 +98,7 @@
if("announce")
if(src.authenticated==2)
if(message_cooldown) return
var/input = copytext(strip_html_simple(input(usr, "Please choose a message to announce to the station crew.", "What?", "")),1,MAX_MESSAGE_LEN)
var/input = stripped_input(usr, "Please choose a message to announce to the station crew.", "What?")
if(!input || !(usr in view(1,src)))
return
captain_announce(input)//This should really tell who is, IE HoP, CE, HoS, RD, Captain
@@ -177,15 +177,15 @@
if(centcomm_message_cooldown)
usr << "Arrays recycling. Please stand by."
return
var/input = copytext(sanitize(input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "")),1,MAX_MESSAGE_LEN)
var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "")
if(!input || !(usr in view(1,src)))
return
Centcomm_announce(input, usr)
usr << "Message transmitted."
log_say("[key_name(usr)] has made a Centcomm announcement: [input]")
centcomm_message_cooldown = 1
spawn(600)//One minute cooldown
message_cooldown = 0
spawn(6000)//10 minute cooldown
centcomm_message_cooldown = 0
// OMG SYNDICATE ...LETTERHEAD
@@ -194,15 +194,15 @@
if(centcomm_message_cooldown)
usr << "Arrays recycling. Please stand by."
return
var/input = copytext(sanitize(input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "")),1,MAX_MESSAGE_LEN)
var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "")
if(!input || !(usr in view(1,src)))
return
Syndicate_announce(input, usr)
usr << "Message transmitted."
log_say("[key_name(usr)] has made a Syndicate announcement: [input]")
centcomm_message_cooldown = 1
spawn(600)//One minute cooldown
message_cooldown = 0
spawn(6000)//10 minute cooldown
centcomm_message_cooldown = 0
if("RestoreBackup")
usr << "Backup routing data restored!"
code/game/objects/items/robot/robot_parts.dm
+1 -2
View File
@@ -216,8 +216,7 @@
user << "\blue The MMI must go in after everything else!"
if (istype(W, /obj/item/weapon/pen))
var/t = input(user, "Enter new robot name", src.name, src.created_name) as text
t = copytext(sanitize(t), 1, MAX_NAME_LEN)
var/t = stripped_input(user, "Enter new robot name", src.name, src.created_name, MAX_NAME_LEN)
if (!t)
return
if (!in_range(src, usr) && src.loc != usr)