New pen stuff.

Removed some doubled lattice near the escape arm.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2977 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-01-19 21:06:45 +00:00
parent 7bd9eda440
commit fa01234c5f
6 changed files with 5940 additions and 6026 deletions

View File

@@ -837,12 +837,17 @@
throw_speed = 7
throw_range = 15
m_amt = 10
var/text_size = 2
var/text_color = "#000000"
var/text_bold = 0
var/text_italic = 0
var/text_underline = 0
var/text_break = 0
var/colour = "black" //what colour the ink is!
/obj/item/weapon/pen/blue
desc = "It's a normal blue ink pen."
icon_state = "pen_blue"
colour = "blue"
/obj/item/weapon/pen/red
desc = "It's a normal red ink pen."
icon_state = "pen_red"
colour = "red"
/obj/item/weapon/banhammer
desc = "A banhammer"

View File

@@ -249,7 +249,10 @@ var/global/datum/controller/occupations/job_master
C.name = "[C.registered]'s ID Card ([C.assignment])"
C.access = get_access(C.assignment)
H.equip_if_possible(C, H.slot_wear_id)
H.equip_if_possible(new /obj/item/weapon/pen(H), H.slot_r_store)
if(prob(50))
H.equip_if_possible(new /obj/item/weapon/pen(H), H.slot_r_store)
else
H.equip_if_possible(new /obj/item/weapon/pen/blue(H), H.slot_r_store)
H.equip_if_possible(new /obj/item/device/pda(H), H.slot_belt)
if(istype(H.belt, /obj/item/device/pda))//I bet this could just use locate
var/obj/item/device/pda/pda = H.belt

View File

@@ -40,148 +40,6 @@ CLIPBOARDS
onclose(usr, "[src.name]")
return
/obj/item/weapon/pen/proc/formatText(var/s)
if (text_size < 2 || text_size > 7)
text_size = 3
if (!(text_color))
text_color = "#000000"
var/textToAddHeader = ""
var/textToAddFooter = ""
if (text_color && text_size)
textToAddHeader = "<font size=[text_size] color=[text_color]>"
textToAddFooter = "</font>"
if (text_bold == 1)
textToAddHeader = "[textToAddHeader]<b>"
textToAddFooter = "</b>[textToAddFooter]"
if (text_underline == 1)
textToAddHeader = "[textToAddHeader]<u>"
textToAddFooter = "</u>[textToAddFooter]"
if (text_italic == 1)
textToAddHeader = "[textToAddHeader]<i>"
textToAddFooter = "</i>[textToAddFooter]"
if (text_break == 1)
textToAddFooter = "[textToAddFooter]<br>"
var/r = "[textToAddHeader][s][textToAddFooter]"
return r
/obj/item/weapon/pen/attack_self(mob/user as mob)
var/dat
dat = text("How would you like to write?<br>")
dat = text("[formatText("example")]<br>")
dat += text("<b>size:</b><br>")
dat += text("<A href='?src=\ref[src];size=2'><font size=2>2</font></A> ")
dat += text("<A href='?src=\ref[src];size=3'><font size=3>3</font></A> ")
dat += text("<A href='?src=\ref[src];size=4'><font size=4>4</font></A> ")
dat += text("<A href='?src=\ref[src];size=5'><font size=5>5</font></A> ")
dat += text("<A href='?src=\ref[src];size=6'><font size=6>6</font></A> ")
dat += text("<A href='?src=\ref[src];size=7'><font size=7>7<font></A><br><br>")
dat += text("<b>Color:</b><br>")
dat += text("<A href='?src=\ref[src];color=["000000"]'><font color=black>black:</font></A> ")
dat += text("<A href='?src=\ref[src];color=["222222"]'><font color=#222222>1</font></A> ")
dat += text("<A href='?src=\ref[src];color=["444444"]'><font color=#444444>2</font></A> ")
dat += text("<A href='?src=\ref[src];color=["666666"]'><font color=#666666>3</font></A> ")
dat += text("<A href='?src=\ref[src];color=["888888"]'><font color=#888888>4</font></A> ")
dat += text("<A href='?src=\ref[src];color=["AAAAAA"]'><font color=#AAAAAA>5</font></A> ")
dat += text("<A href='?src=\ref[src];color=["CCCCCC"]'><font color=#CCCCCC>6</font></A><br>")
dat += text("<A href='?src=\ref[src];color=["FF0000"]'><font color=#FF0000>Red:</font></A> ")
dat += text("<A href='?src=\ref[src];color=["440000"]'><font color=#440000>1</font></A> ")
dat += text("<A href='?src=\ref[src];color=["880000"]'><font color=#880000>2</font></A> ")
dat += text("<A href='?src=\ref[src];color=["CC0000"]'><font color=#CC0000>3</font></A> ")
dat += text("<A href='?src=\ref[src];color=["FF2222"]'><font color=#FF2222>4</font></A> ")
dat += text("<A href='?src=\ref[src];color=["FF6666"]'><font color=#FF6666>5</font></A> ")
dat += text("<A href='?src=\ref[src];color=["FFBBBB"]'><font color=#FFBBBB>6</font></A><br>")
dat += text("<A href='?src=\ref[src];color=["FFFF00"]'><font color=#FFFF00>Yellow:</font></A> ")
dat += text("<A href='?src=\ref[src];color=["444400"]'><font color=#444400>1</font></A> ")
dat += text("<A href='?src=\ref[src];color=["888800"]'><font color=#888800>2</font></A> ")
dat += text("<A href='?src=\ref[src];color=["CCCC00"]'><font color=#CCCC00>3</font></A> ")
dat += text("<A href='?src=\ref[src];color=["FFFF22"]'><font color=#FFFF22>4</font></A> ")
dat += text("<A href='?src=\ref[src];color=["FFFF66"]'><font color=#FFFF66>5</font></A> ")
dat += text("<A href='?src=\ref[src];color=["FFFFBB"]'><font color=#FFFFBB>6</font></A><br>")
dat += text("<A href='?src=\ref[src];color=["00FF00"]'><font color=#00FF00>Green:</font></A> ")
dat += text("<A href='?src=\ref[src];color=["004400"]'><font color=#004400>1</font></A> ")
dat += text("<A href='?src=\ref[src];color=["008800"]'><font color=#008800>2</font></A> ")
dat += text("<A href='?src=\ref[src];color=["00CC00"]'><font color=#00CC00>3</font></A> ")
dat += text("<A href='?src=\ref[src];color=["22FF22"]'><font color=#22FF22>4</font></A> ")
dat += text("<A href='?src=\ref[src];color=["66FF66"]'><font color=#66FF66>5</font></A> ")
dat += text("<A href='?src=\ref[src];color=["BBFFBB"]'><font color=#BBFFBB>6</font></A><br>")
dat += text("<A href='?src=\ref[src];color=["00FFFF"]'><font color=#00FFFF>Cyan:</font></A> ")
dat += text("<A href='?src=\ref[src];color=["004444"]'><font color=#004444>1</font></A> ")
dat += text("<A href='?src=\ref[src];color=["008888"]'><font color=#008888>2</font></A> ")
dat += text("<A href='?src=\ref[src];color=["00CCCC"]'><font color=#00CCCC>3</font></A> ")
dat += text("<A href='?src=\ref[src];color=["22FFFF"]'><font color=#22FFFF>4</font></A> ")
dat += text("<A href='?src=\ref[src];color=["66FFFF"]'><font color=#66FFFF>5</font></A> ")
dat += text("<A href='?src=\ref[src];color=["BBFFFF"]'><font color=#BBFFFF>6</font></A><br>")
dat += text("<A href='?src=\ref[src];color=["0000FF"]'><font color=#0000FF>Blue:</font></A> ")
dat += text("<A href='?src=\ref[src];color=["000044"]'><font color=#000044>1</font></A> ")
dat += text("<A href='?src=\ref[src];color=["000088"]'><font color=#000088>2</font></A> ")
dat += text("<A href='?src=\ref[src];color=["0000CC"]'><font color=#0000CC>3</font></A> ")
dat += text("<A href='?src=\ref[src];color=["2222FF"]'><font color=#2222FF>4</font></A> ")
dat += text("<A href='?src=\ref[src];color=["6666FF"]'><font color=#6666FF>5</font></A> ")
dat += text("<A href='?src=\ref[src];color=["BBBBFF"]'><font color=#BBBBFF>6</font></A><br>")
dat += text("<A href='?src=\ref[src];color=["000000"]'><font color=#FF00FF>Purple:</font></A> ")
dat += text("<A href='?src=\ref[src];color=["440044"]'><font color=#440044>1</font></A> ")
dat += text("<A href='?src=\ref[src];color=["880088"]'><font color=#880088>2</font></A> ")
dat += text("<A href='?src=\ref[src];color=["CC00CC"]'><font color=#CC00CC>3</font></A> ")
dat += text("<A href='?src=\ref[src];color=["FF22FF"]'><font color=#FF22FF>4</font></A> ")
dat += text("<A href='?src=\ref[src];color=["FF66FF"]'><font color=#FF66FF>5</font></A> ")
dat += text("<A href='?src=\ref[src];color=["FFBBFF"]'><font color=#FFBBFF>6</font></A><br><br>")
if (text_bold)
dat += text("<b>Bold:</b> yes / <A href='?src=\ref[src];bold=[0]'>no</A><br>")
else
dat += text("<b>Bold: <A href='?src=\ref[src];bold=[1]'>yes</A> / no<br>")
if (text_italic)
dat += text("<b>Italic:</b> yes / <A href='?src=\ref[src];italic=[0]'>no</A><br>")
else
dat += text("<b>Italic: <A href='?src=\ref[src];italic=[1]'>yes</A> / no<br>")
if (text_underline)
dat += text("<b>Underline:</b> yes / <A href='?src=\ref[src];underline=[0]'>no</A><br>")
else
dat += text("<b>Underline:</b> <A href='?src=\ref[src];underline=[1]'>yes</A> / no<br>")
if (text_break)
dat += text("<b>Jump into a new line at the end?</b> yes / <A href='?src=\ref[src];break=[0]'>no</A><br>")
else
dat += text("<b>Jump into a new line at the end?</b> <A href='?src=\ref[src];break=[1]'>yes</A> / no<br>")
user << browse("[dat]", "window=pen")
/obj/item/weapon/pen/Topic(href, href_list)
usr.machine = src
if(href_list["color"])
src.text_color = "#"
src.text_color += href_list["color"]
if(href_list["size"])
src.text_size = text2num(href_list["size"])
if(href_list["bold"])
src.text_bold = text2num(href_list["bold"])
if(href_list["underline"])
src.text_underline = text2num(href_list["underline"])
if(href_list["italic"])
src.text_italic = text2num(href_list["italic"])
if(href_list["break"])
src.text_break = text2num(href_list["break"])
attack_self(usr)
return
/obj/item/weapon/paper/verb/rename()
set name = "Rename paper"
set category = "Object"
@@ -222,29 +80,67 @@ CLIPBOARDS
clown = 1
if (istype(P, /obj/item/weapon/pen))
var/obj/item/weapon/pen/PEN = P
var/t = strip_html(input(user, "What text do you wish to add?", text("[]", src.name), null),8192) as message
t = text("[PEN.formatText(t)]")
var/t = strip_html_simple(input(user, "What text do you wish to add?", text("[]", src.name), null),8192) as message
if ((!in_range(src, usr) && src.loc != user && !( istype(src.loc, /obj/item/weapon/clipboard) ) && src.loc.loc != user && user.equipped() != P))
return
/*
t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
t = dd_replacetext(t, "\n", "<BR>")
t = dd_replacetext(t, "\[center\]", "<center>")
t = dd_replacetext(t, "\[/center\]", "</center>")
t = dd_replacetext(t, "\[list\]", "<ul>")
t = dd_replacetext(t, "\[/list\]", "</ul>")
t = dd_replacetext(t, "\[*\]", "<li>")
t = dd_replacetext(t, "\[*\]", "<li>")
t = dd_replacetext(t, "\[br\]", "<BR>")
t = dd_replacetext(t, "\[hr\]", "<HR>")
t = dd_replacetext(t, "\[b\]", "<B>")
t = dd_replacetext(t, "\[/b\]", "</B>")
t = dd_replacetext(t, "\[i\]", "<I>")
t = dd_replacetext(t, "\[/i\]", "</I>")
t = dd_replacetext(t, "\[u\]", "<U>")
t = dd_replacetext(t, "\[/u\]", "</U>")
t = dd_replacetext(t, "\[sign\]", text("<font face=vivaldi>[]</font>", user.real_name))
*/
t = text("<font face=calligrapher>[]</font>", t)
t = dd_replacetext(t, "\[small\]", "<font size = \"1\">")
t = dd_replacetext(t, "\[/small\]", "</font>")
t = dd_replacetext(t, "\[large\]", "<font size = \"4\">")
t = dd_replacetext(t, "\[/large\]", "</font>")
t = dd_replacetext(t, "\[sign\]", text("<font face=vivaldi>[user.real_name]</font>"))
var/obj/item/weapon/pen/i = P
t = text("<font face=calligrapher color=[i.colour]>[t]</font>")
if(!overlays.Find("paper_words"))
src.overlays += "paper_words"
src.info += t
return
if(istype(P, /obj/item/toy/crayon))
var/t = strip_html_simple(input(user, "What text do you wish to add?", text("[]", src.name), null),8192) as message
if ((!in_range(src, usr) && src.loc != user && !( istype(src.loc, /obj/item/weapon/clipboard) ) && src.loc.loc != user && user.equipped() != P))
return
t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
t = dd_replacetext(t, "\[center\]", "<center>")
t = dd_replacetext(t, "\[/center\]", "</center>")
t = dd_replacetext(t, "\[br\]", "<BR>")
t = dd_replacetext(t, "\[b\]", "")
t = dd_replacetext(t, "\[/b\]", "")
t = dd_replacetext(t, "\[i\]", "<I>")
t = dd_replacetext(t, "\[/i\]", "</I>")
t = dd_replacetext(t, "\[u\]", "<U>")
t = dd_replacetext(t, "\[/u\]", "</U>")
t = dd_replacetext(t, "\[large\]", "<font size = \"4\">")
t = dd_replacetext(t, "\[/large\]", "</font>")
t = dd_replacetext(t, "\[sign\]", text("<I>[user.real_name]</I>"))
var/obj/item/toy/crayon/i = P
t = text("<font face=\"Comic Sans MS\" color=[i.colour]><B>[t]</B></font>")
if(!overlays.Find("paper_words"))
src.overlays += "paper_words"
src.info += t
return
else
if(istype(P, /obj/item/weapon/stamp))