shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4884 from Citadel-Station-13/upstream-merge-34468

Browse Source 
[MIRROR] Cleans up some redundant stripped_input usage
This commit is contained in:
LetterJay
2018-01-17 09:45:04 -06:00
committed by GitHub
parent f4bb94f04e 6bcf918111
commit 59e5a71e78
7 changed files with 465 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/AI_modules.dm
+3 -3
View File
@@ -238,7 +238,7 @@ AI MODULES
return
newpos = 15
lawpos = min(newpos, 50)
var/targName = stripped_input(user, "Please enter a new law for the AI.", "Freeform Law Entry", laws[1], MAX_MESSAGE_LEN)
var/targName = stripped_input(user, "Please enter a new law for the AI.", "Freeform Law Entry", laws[1])
if(!targName)
return
laws[1] = targName
@@ -357,7 +357,7 @@ AI MODULES
var/subject = "human being"
/obj/item/aiModule/core/full/asimov/attack_self(var/mob/user as mob)
var/targName = stripped_input(user, "Please enter a new subject that asimov is concerned with.", "Asimov to whom?", subject, MAX_MESSAGE_LEN)
var/targName = stripped_input(user, "Please enter a new subject that asimov is concerned with.", "Asimov to whom?", subject)
if(!targName)
return
subject = targName
@@ -459,7 +459,7 @@ AI MODULES
laws = list("")
/obj/item/aiModule/syndicate/attack_self(mob/user)
var/targName = stripped_input(user, "Please enter a new law for the AI.", "Freeform Law Entry", laws[1],MAX_MESSAGE_LEN)
var/targName = stripped_input(user, "Please enter a new law for the AI.", "Freeform Law Entry", laws[1])
if(!targName)
return
laws[1] = targName
code/game/objects/items/blueprints.dm
+1 -1
View File
@@ -177,7 +177,7 @@
/obj/item/areaeditor/proc/edit_area()
var/area/A = get_area()
var/prevname = "[A.name]"
var/str = trim(stripped_input(usr,"New area name:", "Area Creation", "", MAX_NAME_LEN))
var/str = stripped_input(usr,"New area name:", "Area Creation", "", MAX_NAME_LEN)
if(!str || !length(str) || str==prevname) //cancel
return
if(length(str) > 50)
code/game/objects/items/devices/PDA/PDA.dm
+1 -1
View File
@@ -584,7 +584,7 @@ GLOBAL_LIST_EMPTY(PDAs)
update_icon()
/obj/item/device/pda/proc/msg_input(mob/living/U = usr)
var/t = stripped_input(U, "Please enter message", name, null, MAX_MESSAGE_LEN)
var/t = stripped_input(U, "Please enter message", name)
if (!t || toff)
return
if (!in_range(src, U) && loc != U)