Merge pull request #7922 from Mandurrrh/clownbugs

Fixes #7910 and #7909 clown related bugs.
This commit is contained in:
phil235
2015-02-24 18:56:30 +01:00
3 changed files with 11 additions and 5 deletions
@@ -22,6 +22,7 @@
if(user.disabilities & CLUMSY && prob(50))
user << "<span class='warning'>Uh... how do those things work?!</span>"
apply_cuffs(user,user)
return
if(!C.handcuffed)
C.visible_message("<span class='danger'>[user] is trying to put [src.name] on [C]!</span>", \
-5
View File
@@ -287,11 +287,6 @@
if(!in_range(src, usr) && loc != user && !istype(loc, /obj/item/weapon/clipboard) && loc.loc != user && user.get_active_hand() != P)
return
if(istype(P, /obj/item/weapon/stamp/clown))
if(!clown)
user << "<span class='notice'>You are totally unable to use the stamp. HONK!</span>"
return
stamps += "<img src=large_[P.icon_state].png>"
var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
@@ -0,0 +1,10 @@
author: Mandurrrh
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
changes:
- bugfix- 'Fixes clown cuffing both mobs and two pairs of cuffs appearing.'
- bugfix- 'Fixes clown not being able to use his stamp as antag so no meta.'