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
+6 -6
View File
@@ -17,9 +17,9 @@
update_icon()
/obj/item/weapon/clipboard/MouseDrop(obj/over_object as obj) //Quick clipboard fix. -Agouri
if(ishuman(usr) || ismonkey(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
if(ishuman(usr))
var/mob/M = usr
if (!(istype(over_object, /obj/screen) ))
if(!(istype(over_object, /obj/screen) ))
return ..()
if(!M.restrained() && !M.stat)
@@ -31,7 +31,7 @@
M.u_equip(src)
M.put_in_l_hand(src)
src.add_fingerprint(usr)
add_fingerprint(usr)
return
/obj/item/weapon/clipboard/update_icon()
@@ -58,7 +58,7 @@
/obj/item/weapon/clipboard/attack_self(mob/user as mob)
var/dat = "<title>Clipboard</title>"
if (haspen)
if(haspen)
dat += "<A href='?src=\ref[src];pen=1'>Remove Pen</A><BR><HR>"
else
dat += "<A href='?src=\ref[src];addpen=1'>Add Pen</A><BR><HR>"
@@ -79,10 +79,10 @@
/obj/item/weapon/clipboard/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["pen"])
if(haspen)