diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index ad243908696..5c117f7461d 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -22,6 +22,7 @@ if(user.disabilities & CLUMSY && prob(50)) user << "Uh... how do those things work?!" apply_cuffs(user,user) + return if(!C.handcuffed) C.visible_message("[user] is trying to put [src.name] on [C]!", \ diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index cb7008ca6d9..23d9aa1c85b 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -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 << "You are totally unable to use the stamp. HONK!" - return - stamps += "" var/image/stampoverlay = image('icons/obj/bureaucracy.dmi') diff --git a/html/changelogs/Mandurrrh-Clownbugfixes.yml b/html/changelogs/Mandurrrh-Clownbugfixes.yml new file mode 100644 index 00000000000..c85677a613b --- /dev/null +++ b/html/changelogs/Mandurrrh-Clownbugfixes.yml @@ -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.'