fixed various inputs to be cancel-able

This commit is contained in:
Tastyfish
2015-11-29 18:30:30 -05:00
parent 8b5a4d60f9
commit 340068a25a
4 changed files with 17 additions and 7 deletions
+4 -1
View File
@@ -240,7 +240,10 @@ Obviously, requires DNA2.
/obj/effect/proc_holder/spell/targeted/remotetalk/cast(list/targets)
if(!ishuman(usr)) return
var/say = strip_html(input("What do you wish to say"))
var/say = input("What do you wish to say") as text|null
if(say == null || length(say) == 0)
return
say = strip_html(say)
for(var/mob/living/target in targets)
log_say("Project Mind: [key_name(usr)]->[key_name(target)]: [say]")
@@ -62,7 +62,9 @@
..()
/obj/item/weapon/c4/attack_self(mob/user as mob)
var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num
var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num|null
if(newtime == null)
return
if(newtime < 10)
newtime = 10
if(newtime > 60000)
+3 -2
View File
@@ -18,10 +18,11 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
var/list/type = list("Question","Player Complaint")
var/selected_type = input("Pick a category.", "Admin Help", null, null) as null|anything in type
if(selected_type)
msg = input("Please enter your message.", "Admin Help", null, null) as text
msg = input("Please enter your message.", "Admin Help", null, null) as text|null
//clean the input msg
if(!msg) return
if(msg == null || length(msg) == 0)
return
if(src.handle_spam_prevention(msg,MUTE_ADMINHELP))
return
+7 -3
View File
@@ -133,8 +133,10 @@
if("change_id")
var/attempt_code = text2num(input("Re-enter the current EFTPOS access code", "Confirm EFTPOS code"))
if(attempt_code == access_code)
eftpos_name = input("Enter a new terminal ID for this device", "Enter new EFTPOS ID") + " EFTPOS scanner"
print_reference()
var name = input("Enter a new terminal ID for this device", "Enter new EFTPOS ID") as text|null
if(name && length(name) > 0)
eftpos_name = name + " EFTPOS scanner"
print_reference()
else
usr << "\icon[src]<span class='warning'>Incorrect code entered.</span>"
if("link_account")
@@ -147,7 +149,9 @@
else
usr << "\icon[src]<span class='warning'>Unable to connect to accounts database.</span>"
if("trans_purpose")
transaction_purpose = input("Enter reason for EFTPOS transaction", "Transaction purpose")
var/purpose = input("Enter reason for EFTPOS transaction", "Transaction purpose") as text|null
if(purpose && length(purpose) > 0)
transaction_purpose = purpose
if("trans_value")
var/try_num = input("Enter amount for EFTPOS transaction", "Transaction amount") as num
if(try_num < 0)