From 0ad08b13cc47018f351946ab5a18fc5017a93c08 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Tue, 4 Jun 2013 13:14:51 +0400 Subject: [PATCH] Fixes #2954 Winners do no use Space Drugs to escape from cuffs. --- code/modules/reagents/Chemistry-Reagents.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index cd49cfde524..55c255d42dd 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -512,7 +512,7 @@ datum if(!M) M = holder.my_atom M.druggy = max(M.druggy, 15) if(isturf(M.loc) && !istype(M.loc, /turf/space)) - if(M.canmove) + if(M.canmove && !M.restrained()) if(prob(10)) step(M, pick(cardinal)) if(prob(7)) M.emote(pick("twitch","drool","moan","giggle")) holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM) @@ -642,7 +642,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - if(M.canmove && istype(M.loc, /turf/space)) + if(M.canmove && !M.restrained() && istype(M.loc, /turf/space)) step(M, pick(cardinal)) if(prob(5)) M.emote(pick("twitch","drool","moan")) ..() @@ -728,7 +728,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - if(M.canmove && istype(M.loc, /turf/space)) + if(M.canmove && !M.restrained() && istype(M.loc, /turf/space)) step(M, pick(cardinal)) if(prob(5)) M.emote(pick("twitch","drool","moan")) ..()