Bugfixes for some of the previous commit. Added new icons that are less derpy.

This commit is contained in:
SkyMarshal
2012-01-26 23:18:57 -07:00
parent cd5e2476bd
commit e8de0a1dca
4 changed files with 31 additions and 4 deletions
+1 -1
View File
@@ -244,7 +244,7 @@
return
//What the fuck is this code
//What the fuck is this code Looks to be the parrying code. If you're grabbing someone, it might hit them instead... or something.--SkyMarshal
/mob/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (user.intent != "harm")
if (istype(src.l_hand,/obj/item/latexballon) && src.l_hand:air_contents && is_sharp(W))
+15 -1
View File
@@ -194,7 +194,7 @@
user.update_clothing()
return
/obj/item/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/item/attackby(obj/item/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/packageWrap))
if(istype(src,/obj/item/weapon/storage) && istype(src.loc, /mob)) //Put it into the bag
return
@@ -212,6 +212,20 @@
src.loc = P
O.amount -= 1
else if(istype(W,/obj/item/wardrobe))
var/obj/item/wardrobe/I = W
for (var/obj/O in locate(src.x,src.y,src.z))
if (I.contents.len < 20)
if(istype(O,/obj/item/wardrobe))
continue
if(O.anchored)
continue
I.contents += O;
else
user << "\blue The wardrobe is full."
return
user << "\blue You pick up all the items."
I.update_icon()
/obj/item/attack_self(mob/user as mob)
..()