Master to dev merge.

This commit is contained in:
Zuhayr
2014-08-27 20:24:07 +09:30
21 changed files with 3475 additions and 3518 deletions
+3 -3
View File
@@ -96,8 +96,8 @@
/obj/item/weapon/paper/attack_ai(var/mob/living/silicon/ai/user as mob)
var/dist
if(istype(user) && user.current) //is AI
dist = get_dist(src, user.current)
if(istype(user) && user.camera) //is AI
dist = get_dist(src, user.camera)
else //cyborg or AI not seeing through a camera
dist = get_dist(src, user)
if(dist < 2)
@@ -113,7 +113,7 @@
user.visible_message("<span class='notice'>You show the paper to [M]. </span>", \
"<span class='notice'> [user] holds up a paper and shows it to [M]. </span>")
M << examine()
else if(user.zone_sel.selecting == "mouth") // lipstick wiping
if(ishuman(M))
var/mob/living/carbon/human/H = M