From aa71a5f2caf7cb4e147d99d42de0cb831aa97c23 Mon Sep 17 00:00:00 2001 From: Razharas Date: Mon, 10 Feb 2014 10:42:54 +0400 Subject: [PATCH] Monkey trouble fix It wasnt even checking is monkey had a disease. it was monkifying humans straight, assuming all cuffed monkeys should be jungle fevered --- code/_onclick/click.dm | 7 ++++--- code/_onclick/other_mobs.dm | 9 +++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 7032506d75b..9ba8c35dc34 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -71,6 +71,7 @@ return M.click_action(A,src) if(restrained()) + next_move = world.time + 10 //Doing shit in cuffs shall be vey slow RestrainedClickOn(A) return @@ -79,8 +80,8 @@ return var/obj/item/W = get_active_hand() - - + + if(W == A) next_move = world.time + 6 if(W.flags&USEDELAY) @@ -92,7 +93,7 @@ update_inv_r_hand(0) return - + // operate two levels deep here (item in backpack in src; NOT item in box in backpack in src) if(!isturf(A) && A == loc || (A in contents) || (A.loc in contents)) // faster access to objects already on you diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index e7f606789e5..0a39213ffe2 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -89,12 +89,9 @@ for(var/mob/O in viewers(ML, null)) O.show_message("\red [name] has bit [ML]!", 1) if(armor >= 2) return - if(ishuman(ML)) - ML = ML.monkeyize() - if(ismonkey(ML)) - for(var/datum/disease/D in viruses) - if(istype(D, /datum/disease/jungle_fever)) - ML.contract_disease(D,1,0) + for(var/datum/disease/D in viruses) + if(istype(D, /datum/disease/jungle_fever)) + ML.contract_disease(D,1,0) else for(var/mob/O in viewers(ML, null)) O.show_message("\red [src] has attempted to bite [ML]!", 1)