Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tastyfish
2012-02-15 20:06:49 -05:00
8 changed files with 9 additions and 1 deletions
+1
View File
@@ -174,6 +174,7 @@ THERMAL GLASSES
desc = A.desc
icon_state = A.icon_state
item_state = A.item_state
usr.update_clothing()
color = A.color
/obj/item/clothing/under/chameleon/emp_act(severity)
+1
View File
@@ -10,6 +10,7 @@
/obj/item/proc/dropped(mob/user as mob)
..()
user.update_clothing()
// So you can't drop the Offhand
if(istype(src, /obj/item/weapon/offhand))