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

Merge pull request #1230 from Erthilo/TGUpdates

Browse Source 
Records/Flavor text fixes, TG merge fixes, MAX_NAME_LEN changes
This commit is contained in:
SkyMarshal
2012-06-02 15:37:00 -07:00
parent 74360f7679 30e3132762
commit 813d43e1d5
16 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/global.dm
+1 -1
View File
@@ -189,7 +189,7 @@ var/const/MAX_MESSAGE_LEN = 1024
var/const/MAX_PAPER_MESSAGE_LEN = 3072
var/const/MAX_BOOK_MESSAGE_LEN = 9216
var/const/MAX_NAME_LEN = 40
var/const/MAX_NAME_LEN = 32
var/list/paper_blacklist = list("script","frame","iframe","input","button","a","embed","object")
code/game/machinery/bots/cleanbot.dm
+1 -1
View File
@@ -371,7 +371,7 @@ text("<A href='?src=\ref[src];operation=oddbutton'>[src.oddbutton ? "Yes" : "No"
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)
t = copytext(sanitize(t), 1, MAX_NAME_LEN)
if (!t)
return
if (!in_range(src, usr) && src.loc != usr)
code/game/machinery/bots/ed209bot.dm
+1 -1
View File
@@ -869,7 +869,7 @@ Auto Patrol: []"},
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)
t = copytext(sanitize(t), 1, MAX_NAME_LEN)
if (!t)
return
if (!in_range(src, usr) && src.loc != usr)
code/game/machinery/bots/floorbot.dm
+2 -2
View File
@@ -400,7 +400,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)
t = copytext(sanitize(t), 1, MAX_NAME_LEN)
if (!t)
return
if (!in_range(src, usr) && src.loc != usr)
@@ -422,7 +422,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)
t = copytext(sanitize(t), 1, MAX_NAME_LEN)
if (!t)
return
if (!in_range(src, usr) && src.loc != usr)
code/game/machinery/bots/medbot.dm
+1 -1
View File
@@ -575,7 +575,7 @@
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)
t = copytext(sanitize(t), 1, MAX_NAME_LEN)
if (!t)
return
if (!in_range(src, usr) && src.loc != usr)
code/game/machinery/bots/secbot.dm
+1 -1
View File
@@ -761,7 +761,7 @@ Auto Patrol: []"},
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)
t = copytext(sanitize(t), 1, MAX_NAME_LEN)
if(!t)
return
if(!in_range(src, usr) && src.loc != usr)
code/game/machinery/cell_charger.dm
+1 -1
View File
@@ -50,7 +50,7 @@
if(!isarea(a))
return
if(a.power_equip == 0) // There's no APC in this area, don't try to cheat power!
user << "\red The [src] blinks red as you try to insert the cell!"
user << "\red \The [src] blinks red as you try to insert the cell!"
return
user.drop_item()
code/game/machinery/computer/card.dm
+1 -1
View File
@@ -246,7 +246,7 @@
if (authenticated)
var/t1 = href_list["assign_target"]
if(t1 == "Custom")
var/temp_t = copytext(sanitize(input("Enter a custom job assignment.","Assignment")),1,MAX_MESSAGE_LEN)
var/temp_t = copytext(sanitize(input("Enter a custom job assignment.","Assignment")),1,MAX_NAME_LEN)
if(temp_t)
t1 = temp_t
else
code/game/machinery/computer/medical.dm
+3 -1
View File
@@ -360,9 +360,11 @@
src.active2.fields["cdi_d"] = t1
if("notes")
if (istype(src.active2, /datum/data/record))
var/t1 = copytext(sanitize(input("Please summarize notes:", "Med. records", src.active2.fields["notes"], null) as message),1,MAX_MESSAGE_LEN)
var/t1 = input("Please summarize notes:", "Med. records", src.active2.fields["notes"], null) as message
if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
return
t1 = copytext(t1, 1, MAX_PAPER_MESSAGE_LEN)
t1 = html_encode(t1)
src.active2.fields["notes"] = t1
if("p_stat")
if (istype(src.active1, /datum/data/record))
code/game/machinery/computer/security.dm
+3 -1
View File
@@ -464,9 +464,11 @@ What a mess.*/
active2.fields["ma_crim_d"] = t1
if("notes")
if (istype(active2, /datum/data/record))
var/t1 = copytext(sanitize(input("Please summarize notes:", "Secure. records", active2.fields["notes"], null) as message),1,MAX_MESSAGE_LEN)
var/t1 = input("Please summarize notes:", "Secure. records", active2.fields["notes"], null) as message
if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2))
return
t1 = copytext(t1, 1, MAX_PAPER_MESSAGE_LEN)
t1 = html_encode(t1)
active2.fields["notes"] = t1
if("criminal")
if (istype(active2, /datum/data/record))
code/game/machinery/portable_turret.dm
+1 -1
View File
@@ -732,7 +732,7 @@ Neutralize All Unidentified Life Signs: []<BR>"},
if (istype(W, /obj/item/weapon/pen)) // you can rename turrets like bots!
var/t = input(user, "Enter new turret name", src.name, src.finish_name) as text
t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN)
t = copytext(sanitize(t), 1, MAX_NAME_LEN)
if (!t)
return
if (!in_range(src, usr) && src.loc != usr)
code/game/machinery/recharger.dm
+1 -1
View File
@@ -29,7 +29,7 @@ obj/machinery/recharger
if(!isarea(a))
return
if(a.power_equip == 0) // There's no APC in this area, don't try to cheat power!
user << "\red The [name] blinks red as you try to insert the item!"
user << "\red \The [src] blinks red as you try to insert the item!"
return
user.drop_item()
G.loc = src
code/game/magic/library.dm
+1 -1
View File
@@ -126,7 +126,7 @@
O.loc = src
update_icon()
else if(istype(O, /obj/item/weapon/pen))
var/newname = copytext(sanitize(input("What would you like to title this bookshelf?") as text|null),1,MAX_MESSAGE_LEN)
var/newname = copytext(sanitize(input("What would you like to title this bookshelf?") as text|null),1,MAX_NAME_LEN)
if(!newname)
return
else
code/game/objects/bodybag.dm
+1 -1
View File
@@ -48,7 +48,7 @@
return
if (!in_range(src, user) && src.loc != user)
return
t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
t = copytext(sanitize(t),1,MAX_NAME_LEN)
if (t)
src.name = "body bag - "
src.name += t
code/modules/mob/new_player/preferences.dm
+7 -4
View File
@@ -707,7 +707,7 @@ datum/preferences
if(link_tags["OOC"])
var/tempnote = ""
tempnote = copytext(sanitize(input(user, "Please enter your OOC Notes!:", "OOC notes" , metadata) as text),1,1000)
tempnote = copytext(sanitize(input(user, "Please enter your OOC Notes!:", "OOC notes" , metadata) as text),1,MAX_MESSAGE_LEN)
if(tempnote)
metadata = tempnote
return
@@ -924,9 +924,10 @@ datum/preferences
be_random_name = !be_random_name
if(link_tags["flavor_text"])
var/msg = copytext(sanitize(input(usr,"Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!","Flavor Text",html_decode(flavor_text)) as message),1,1000)
var/msg = input(usr,"Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!","Flavor Text",html_decode(flavor_text)) as message
if(msg != null)
msg = copytext(msg, 1, MAX_MESSAGE_LEN)
msg = html_encode(msg)
flavor_text = msg
@@ -1035,18 +1036,20 @@ datum/preferences
user << browse(null, "window=records")
if(link_tags["med_record"])
var/medmsg = copytext(sanitize(input(usr,"Set your medical notes here.","Medical Records",html_decode(med_record)) as message),1,2000)
var/medmsg = input(usr,"Set your medical notes here.","Medical Records",html_decode(med_record)) as message
if(medmsg != null)
medmsg = copytext(medmsg, 1, MAX_PAPER_MESSAGE_LEN)
medmsg = html_encode(medmsg)
med_record = medmsg
SetRecords(user)
if(link_tags["sec_record"])
var/secmsg = copytext(sanitize(input(usr,"Set your security notes here.","Security Records",html_decode(sec_record)) as message),1,2000)
var/secmsg = input(usr,"Set your security notes here.","Security Records",html_decode(sec_record)) as message
if(secmsg != null)
secmsg = copytext(secmsg, 1, MAX_PAPER_MESSAGE_LEN)
secmsg = html_encode(secmsg)
sec_record = secmsg
code/modules/recycling/sortingmachinery.dm
+2 -2
View File
@@ -62,7 +62,7 @@
name = "[name] ([str])"
update_icon()
if("Description")
var/str = copytext(sanitize(input(usr,"Label text?","Set label","")),1,MAX_NAME_LEN)
var/str = copytext(sanitize(input(usr,"Label text?","Set label","")),1,MAX_MESSAGE_LEN)
if(!str || !length(str))
usr << "\red Invalid text."
return
@@ -150,7 +150,7 @@
name = "[name] ([str])"
update_icon()
if("Description")
var/str = copytext(sanitize(input(usr,"Label text?","Set label","")),1,MAX_NAME_LEN)
var/str = copytext(sanitize(input(usr,"Label text?","Set label","")),1,MAX_MESSAGE_LEN)
if(!str || !length(str))
usr << "\red Invalid text."
return