mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-29 15:08:02 +01:00
Refactors renaming things with a pen. (#14960)
* Refactors renaming things with a pen. * Farie review (thanks!!) * Derp. * Farie take 2
This commit is contained in:
@@ -42,13 +42,7 @@
|
||||
to_chat(user, "<span class='notice'>You put the [W] into \the [src].</span>")
|
||||
update_icon()
|
||||
else if(istype(W, /obj/item/pen))
|
||||
var/n_name = clean_input("What would you like to label the folder?", "Folder Labelling", null)
|
||||
if(!n_name)
|
||||
return
|
||||
n_name = sanitize(copytext(n_name, 1, MAX_NAME_LEN))
|
||||
|
||||
if((loc == usr || Adjacent(usr)) && usr.stat == 0)
|
||||
name = "folder[(n_name ? text("- '[n_name]'") : null)]"
|
||||
rename_interactive(user, W)
|
||||
else
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -103,11 +103,13 @@
|
||||
if(!usr.is_literate())
|
||||
to_chat(usr, "<span class='notice'>You don't know how to read.</span>")
|
||||
return
|
||||
var/n_name = sanitize(copytext(input(usr, "What would you like to label the paper?", "Paper Labelling", name) as text, 1, MAX_MESSAGE_LEN))
|
||||
if((loc == usr && usr.stat == 0))
|
||||
name = "[(n_name ? text("[n_name]") : initial(name))]"
|
||||
if(name != "paper")
|
||||
var/n_name = rename_interactive(usr)
|
||||
if(isnull(n_name))
|
||||
return
|
||||
if(n_name != "")
|
||||
desc = "This is a paper titled '" + name + "'."
|
||||
else
|
||||
desc = initial(desc)
|
||||
add_fingerprint(usr)
|
||||
return
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
var/pen_color_iconstate = "pencolor"
|
||||
var/pen_color_shift = 3
|
||||
|
||||
/obj/item/pen/multi/New()
|
||||
/obj/item/pen/multi/Initialize(mapload)
|
||||
..()
|
||||
update_icon()
|
||||
|
||||
@@ -104,21 +104,6 @@
|
||||
icon_state = "fountainpen"
|
||||
pen_color_shift = 0
|
||||
|
||||
/obj/item/pen/attack(mob/living/M, mob/user)
|
||||
if(!istype(M))
|
||||
return
|
||||
|
||||
if(!force)
|
||||
if(M.can_inject(user, TRUE))
|
||||
to_chat(user, "<span class='warning'>You stab [M] with the pen.</span>")
|
||||
// to_chat(M, "<span class='danger'>You feel a tiny prick!</span>")
|
||||
. = 1
|
||||
|
||||
add_attack_logs(user, M, "Stabbed with [src]")
|
||||
|
||||
else
|
||||
. = ..()
|
||||
|
||||
/*
|
||||
* Sleepypens
|
||||
*/
|
||||
@@ -128,18 +113,26 @@
|
||||
|
||||
|
||||
/obj/item/pen/sleepy/attack(mob/living/M, mob/user)
|
||||
if(!istype(M)) return
|
||||
if(!istype(M))
|
||||
return
|
||||
|
||||
if(..())
|
||||
if(reagents.total_volume)
|
||||
if(M.reagents)
|
||||
reagents.trans_to(M, 50)
|
||||
if(!..())
|
||||
return
|
||||
|
||||
if(!M.can_inject(user, TRUE))
|
||||
return
|
||||
var/transfered = 0
|
||||
if(reagents.total_volume && M.reagents)
|
||||
transfered = reagents.trans_to(M, 50)
|
||||
to_chat(user, "<span class='warning'>You sneakily stab [M] with the pen.</span>")
|
||||
add_attack_logs(user, M, "Stabbed with (sleepy) [src]. [transfered]u of reagents transfered.")
|
||||
return TRUE
|
||||
|
||||
|
||||
/obj/item/pen/sleepy/New()
|
||||
/obj/item/pen/sleepy/Initialize(mapload)
|
||||
. = ..()
|
||||
create_reagents(100)
|
||||
reagents.add_reagent("ketamine", 100)
|
||||
..()
|
||||
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user