merge fix

This commit is contained in:
volas
2015-05-02 11:16:15 +03:00
parent aeda1db3c5
commit 93d120a24c

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)
..() ..()
@@ -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