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

Merge pull request #35542 from ShizCalev/free-spam-removal

Browse Source 
Cleans up some duplicate canusetopic warnings
This commit is contained in:
oranges
2018-02-16 15:34:37 +13:00
committed by CitadelStationBot
parent 86f27dd5e8
commit 5dc3549801
14 changed files with 43 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/pen.dm
+21 -32
View File
@@ -124,39 +124,28 @@
. = ..()
/obj/item/pen/afterattack(obj/O, mob/living/user, proximity)
//Changing Name/Description of items. Only works if they have the 'unique_rename' var set
if(isobj(O) && proximity)
if(O.obj_flags & UNIQUE_RENAME)
var/penchoice = input(user, "What would you like to edit?", "Rename or change description?") as null|anything in list("Rename","Change description")
if(!QDELETED(O) && user.canUseTopic(O, BE_CLOSE))
if(penchoice == "Rename")
var/input = stripped_input(user,"What do you want to name \the [O.name]?", ,"", MAX_NAME_LEN)
var/oldname = O.name
if(!QDELETED(O) && user.canUseTopic(O, BE_CLOSE))
if(oldname == input)
to_chat(user, "You changed \the [O.name] to... well... \the [O.name].")
return
else
O.name = input
to_chat(user, "\The [oldname] has been successfully been renamed to \the [input].")
return
else
to_chat(user, "You are too far away!")
if(penchoice == "Change description")
var/input = stripped_input(user,"Describe \the [O.name] here", ,"", 100)
if(!QDELETED(O) && user.canUseTopic(O, BE_CLOSE))
O.desc = input
to_chat(user, "You have successfully changed \the [O.name]'s description.")
return
else
to_chat(user, "You are too far away!")
else
to_chat(user, "You are too far away!")
//Changing Name/Description of items. Only works if they have the 'unique_rename' flag set
if(isobj(O) && proximity && (O.obj_flags & UNIQUE_RENAME))
var/penchoice = input(user, "What would you like to edit?", "Rename or change description?") as null|anything in list("Rename","Change description")
if(QDELETED(O) || !user.canUseTopic(O, BE_CLOSE))
return
if(penchoice == "Rename")
var/input = stripped_input(user,"What do you want to name \the [O.name]?", ,"", MAX_NAME_LEN)
var/oldname = O.name
if(QDELETED(O) || !user.canUseTopic(O, BE_CLOSE))
return
else
return
if(oldname == input)
to_chat(user, "You changed \the [O.name] to... well... \the [O.name].")
else
O.name = input
to_chat(user, "\The [oldname] has been successfully been renamed to \the [input].")
if(penchoice == "Change description")
var/input = stripped_input(user,"Describe \the [O.name] here", ,"", 100)
if(QDELETED(O) || !user.canUseTopic(O, BE_CLOSE))
return
O.desc = input
to_chat(user, "You have successfully changed \the [O.name]'s description.")
/*
* Sleepypens