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
This commit is contained in:
Razharas
2014-02-10 10:42:54 +04:00
parent c07d8c23dc
commit aa71a5f2ca
2 changed files with 7 additions and 9 deletions
+4 -3
View File
@@ -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
+3 -6
View File
@@ -89,12 +89,9 @@
for(var/mob/O in viewers(ML, null))
O.show_message("\red <B>[name] has bit [ML]!</B>", 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 <B>[src] has attempted to bite [ML]!</B>", 1)