diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index 45d3b2e6d60..cf3851b3cc5 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -50,7 +50,7 @@ var/A - A = input(user, "Area to jump to", "BOOYEA", A) in teleportlocs|null + A = input(user, "Area to jump to", "BOOYEA", A) as null|anything in teleportlocs if(!A) return var/area/thearea = teleportlocs[A] diff --git a/code/modules/admin/sql_notes.dm b/code/modules/admin/sql_notes.dm index 88652cc7b09..661744a75b7 100644 --- a/code/modules/admin/sql_notes.dm +++ b/code/modules/admin/sql_notes.dm @@ -18,7 +18,7 @@ target_ckey = new_ckey var/target_sql_ckey = sanitizeSQL(target_ckey) if(!notetext) - notetext = input(usr,"Write your Note","Add Note") as message + notetext = input(usr,"Write your Note","Add Note") as null|message if(!notetext) return notetext = sanitizeSQL(notetext) @@ -97,7 +97,7 @@ target_ckey = query_find_note_edit.item[1] var/old_note = query_find_note_edit.item[2] var/adminckey = query_find_note_edit.item[3] - var/new_note = input("Input new note", "New Note", "[old_note]") as message + var/new_note = input("Input new note", "New Note", "[old_note]") as null|message if(!new_note) return new_note = sanitizeSQL(new_note) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index a5157a25298..214b938b918 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -476,13 +476,13 @@ return minutes = CMinutes + mins duration = GetExp(minutes) - reason = input(usr,"Please State Reason.","Reason",reason2) as message + reason = input(usr,"Please State Reason.","Reason",reason2) as null|message if(!reason) return if("No") temp = 0 duration = "Perma" - reason = input(usr,"Please State Reason.","Reason",reason2) as message + reason = input(usr,"Please State Reason.","Reason",reason2) as null|message if(!reason) return diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 718bc116192..165c9c8102c 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -31,8 +31,7 @@ targets["[T.mob.real_name](as [T.mob.name]) - [T]"] = T else targets["(No Mob) - [T]"] = T - var/list/sorted = sortList(targets) - var/target = input(src,"To whom shall we send a message?","Admin PM",null) in sorted|null + var/target = input(src,"To whom shall we send a message?","Admin PM",null) as null|anything in sortList(targets) cmd_admin_pm(targets[target],null) feedback_add_details("admin_verb","APM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!