Moved para and sleepy pen defines out of weapon.dm.

Updated flashlight code a little.
Added inhand sprites for desk lamps.
Standardised modules/paperwork.
Decapitalised a bunch of mining items.
Slightly reverted update_icons.dm, so we're not looping through mutations more than we need to. Also, skeletons can now wear lipstick!

A few other things which aren't worth listing individually.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4855 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-10-13 14:37:28 +00:00
parent 92650f1464
commit c4f9b43020
19 changed files with 222 additions and 276 deletions
+3 -3
View File
@@ -36,7 +36,7 @@
update_icon()
else if(istype(W, /obj/item/weapon/pen))
var/n_name = copytext(sanitize(input(usr, "What would you like to label the folder?", "Folder Labelling", null) as text),1,MAX_NAME_LEN)
if ((loc == usr && usr.stat == 0))
if((loc == usr && usr.stat == 0))
name = "folder[(n_name ? text("- '[n_name]'") : null)]"
return
@@ -54,10 +54,10 @@
/obj/item/weapon/folder/Topic(href, href_list)
..()
if ((usr.stat || usr.restrained()))
if((usr.stat || usr.restrained()))
return
if (usr.contents.Find(src))
if(usr.contents.Find(src))
if(href_list["remove"])
var/obj/item/P = locate(href_list["remove"])