Manual merge of head.dmi.

This commit is contained in:
Zuhayr
2014-11-14 23:02:16 +10:30
189 changed files with 1621 additions and 2595 deletions

View File

@@ -59,9 +59,6 @@
/obj/machinery/computer/aifixer/attack_ai(var/mob/user as mob)
return attack_hand(user)
/obj/machinery/computer/aifixer/attack_paw(var/mob/user as mob)
return attack_hand(user)
/obj/machinery/computer/aifixer/attack_hand(var/mob/user as mob)
if(..())
return