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

paperwork mini update, also ASS_BLAST_USA

Browse Source
This commit is contained in:
Letter N
2021-03-06 19:28:29 +08:00
parent 709aaa5006
commit 4463fd9513
24 changed files with 353 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/pen.dm
+38 -16
View File
@@ -1,9 +1,9 @@
/* Pens!
* Contains:
* Pens
* Sleepy Pens
* Parapens
* Edaggers
/* Pens!
* Contains:
* Pens
* Sleepy Pens
* Parapens
* Edaggers
*/
@@ -26,7 +26,7 @@
custom_materials = list(/datum/material/iron=10)
pressure_resistance = 2
grind_results = list(/datum/reagent/iron = 2, /datum/reagent/iodine = 1)
var/colour = "black" //what colour the ink is!
var/colour = "black" //what colour the ink is!
var/degrees = 0
var/font = PEN_FONT
embedding = list()
@@ -147,29 +147,50 @@
/obj/item/pen/afterattack(obj/O, mob/living/user, proximity)
. = ..()
//Changing Name/Description of items. Only works if they have the 'unique_rename' flag set
//Changing name/description of items. Only works if they have the UNIQUE_RENAME object 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")
var/penchoice = input(user, "What would you like to edit?", "Rename, change description or reset both?") as null|anything in list("Rename","Change description","Reset")
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/input = stripped_input(user,"What do you want to name [O]?", ,"[O.name]", MAX_NAME_LEN)
var/oldname = O.name
if(QDELETED(O) || !user.canUseTopic(O, BE_CLOSE))
return
if(oldname == input)
to_chat(user, "<span class='notice'>You changed \the [O.name] to... well... \the [O.name].</span>")
if(oldname == input || input == "")
to_chat(user, "<span class='notice'>You changed [O] to... well... [O].</span>")
else
O.name = input
to_chat(user, "<span class='notice'>\The [oldname] has been successfully been renamed to \the [input].</span>")
var/datum/component/label/label = O.GetComponent(/datum/component/label)
if(label)
label.remove_label()
label.apply_label()
to_chat(user, "<span class='notice'>You have successfully renamed \the [oldname] to [O].</span>")
O.renamedByPlayer = TRUE
if(penchoice == "Change description")
var/input = stripped_input(user,"Describe \the [O.name] here", ,"", 100)
var/input = stripped_input(user,"Describe [O] here:", ,"[O.desc]", 140)
var/olddesc = O.desc
if(QDELETED(O) || !user.canUseTopic(O, BE_CLOSE))
return
O.desc = input
to_chat(user, "<span class='notice'>You have successfully changed \the [O.name]'s description.</span>")
if(olddesc == input || input == "")
to_chat(user, "<span class='notice'>You decide against changing [O]'s description.</span>")
else
O.desc = input
to_chat(user, "<span class='notice'>You have successfully changed [O]'s description.</span>")
O.renamedByPlayer = TRUE
if(penchoice == "Reset")
if(QDELETED(O) || !user.canUseTopic(O, BE_CLOSE))
return
O.desc = initial(O.desc)
O.name = initial(O.name)
var/datum/component/label/label = O.GetComponent(/datum/component/label)
if(label)
label.remove_label()
label.apply_label()
to_chat(user, "<span class='notice'>You have successfully reset [O]'s name and description.</span>")
O.renamedByPlayer = FALSE
/*
* Sleepypens
@@ -256,6 +277,7 @@
item_state = initial(item_state)
lefthand_file = initial(lefthand_file)
righthand_file = initial(righthand_file)
return ..()
/obj/item/pen/survival
name = "survival pen"