Skip to content

Commit

Permalink
Merge pull request #2712 from Razharas/LeMonkeyFace
Browse files Browse the repository at this point in the history
Monkey trouble fix
  • Loading branch information
Cheridan committed Feb 10, 2014
2 parents c07d8c2 + aa71a5f commit 59ebf87
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
7 changes: 4 additions & 3 deletions code/_onclick/click.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -79,8 +80,8 @@
return

var/obj/item/W = get_active_hand()


if(W == A)
next_move = world.time + 6
if(W.flags&USEDELAY)
Expand All @@ -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
Expand Down
9 changes: 3 additions & 6 deletions code/_onclick/other_mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 59ebf87

Please sign in to comment.