cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge fix

Browse Source
This commit is contained in:
volas
2015-05-02 11:16:15 +03:00
parent aeda1db3c5
commit 93d120a24c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/paperwork/paper.dm
View File

@@ -68,7 +68,7 @@
if(!new_text) if(!new_text)
return return
free_space -= length(strip_html_properly(new_text, 0)) free_space -= length(strip_html_properly(new_text))
/obj/item/weapon/paper/examine(mob/user) /obj/item/weapon/paper/examine(mob/user)
..() ..()
@@ -95,15 +95,15 @@
usr << "<span class='warning'>You cut yourself on the paper.</span>" usr << "<span class='warning'>You cut yourself on the paper.</span>"
return return
var/n_name = sanitizeSafe(input(usr, "What would you like to label the paper?", "Paper Labelling", null) as text, MAX_NAME_LEN) var/n_name = sanitizeSafe(input(usr, "What would you like to label the paper?", "Paper Labelling", null) as text, MAX_NAME_LEN)
// We check loc one level up, so we can rename in clipboards and such. See also: /obj/item/weapon/photo/rename() // We check loc one level up, so we can rename in clipboards and such. See also: /obj/item/weapon/photo/rename()
if((loc == usr || loc.loc && loc.loc == usr) && usr.stat == 0 && n_name) if((loc == usr || loc.loc && loc.loc == usr) && usr.stat == 0 && n_name)
name = n_name name = n_name
if(n_name != "paper") if(n_name != "paper")
desc = "This is a paper titled '" + name + "'." desc = "This is a paper titled '" + name + "'."
add_fingerprint(usr) add_fingerprint(usr)
return return
/obj/item/weapon/paper/attack_self(mob/living/user as mob) /obj/item/weapon/paper/attack_self(mob/living/user as mob)
user.examinate(src) user.examinate(src)
@@ -343,7 +343,7 @@
usr << "<span class='info'>There isn't enough space left on \the [src] to write anything.</span>" usr << "<span class='info'>There isn't enough space left on \the [src] to write anything.</span>"
return return
var/t = strip_html_properly(input("Enter what you want to write:", "Write", null, null) as message) var/t = sanitize(input("Enter what you want to write:", "Write", null, null) as message, free_space, extra = 0)
if(!t) if(!t)
return return
@@ -450,7 +450,7 @@
user << "<span class='notice'>You clip the [P.name] to [(src.name == "paper") ? "the paper" : src.name].</span>" user << "<span class='notice'>You clip the [P.name] to [(src.name == "paper") ? "the paper" : src.name].</span>"
src.loc = B src.loc = B
P.loc = B P.loc = B
B.pages.Add(src) B.pages.Add(src)
B.pages.Add(P) B.pages.Add(P)
B.update_icon() B.update_icon()