cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-23 20:56:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #561 from jack-fractal/bugfix_clickcode

Browse Source 
Bugfix: #548 - Adding delay to throw_item and UnarmedAttack
This commit is contained in:
skull132
2015-05-31 16:37:52 +03:00
parent 38f3f001db a6ce30df10
commit 99e8e59df0
11 changed files with 89 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+6 -6
View File
@@ -442,9 +442,9 @@
set name = "Resist"
set category = "IC"
if(!isliving(usr) || usr.next_move > world.time)
if(!isliving(usr) || !usr.AllowedToMoveAgain())
return
usr.next_move = world.time + 20
usr.AllowedToClickAgainAfter(CLICK_CD_RESIST)
var/mob/living/L = usr
@@ -527,7 +527,7 @@
if(iscarbon(L))
var/mob/living/carbon/C = L
if( C.handcuffed )
C.next_move = world.time + 100
C.AllowedToClickAgainAfter(CLICK_CD_BREAKOUT)
C.last_special = world.time + 100
C << "\red You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stand still)"
for(var/mob/O in viewers(L))
@@ -561,7 +561,7 @@
// breakout_time++ //Harder to get out of welded lockers than locked lockers
//okay, so the closet is either welded or locked... resist!!!
usr.next_move = world.time + 100
usr.AllowedToClickAgainAfter(CLICK_CD_BREAKOUT)
L.last_special = world.time + 100
L << "\red You lean on the back of \the [C] and start pushing the door open. (this will take about [breakout_time] minutes)"
for(var/mob/O in viewers(usr.loc))
@@ -626,7 +626,7 @@
ExtinguishMob()
return
if(CM.handcuffed && CM.canmove && (CM.last_special <= world.time))
CM.next_move = world.time + 100
CM.AllowedToClickAgainAfter(CLICK_CD_BREAKOUT)
CM.last_special = world.time + 100
var/can_break_cuffs
@@ -672,7 +672,7 @@
CM.drop_from_inventory(CM.handcuffed)
else if(CM.legcuffed && CM.canmove && (CM.last_special <= world.time))
CM.next_move = world.time + 100
CM.AllowedToClickAgainAfter(CLICK_CD_BREAKOUT)
CM.last_special = world.time + 100
var/can_break_cuffs
code/modules/mob/mob.dm
+5 -4
View File
@@ -259,8 +259,9 @@ var/list/slot_equipment_priority = list( \
if (W)
W.attack_self(src)
update_inv_r_hand()
if(next_move < world.time)
next_move = world.time + 2
AllowedToClickAgainAfter(CLICK_CD_ACTIVATE_OBJECT) // this is probably imperceptible
return
/*
@@ -970,9 +971,9 @@ mob/proc/yank_out_object()
set desc = "Remove an embedded item at the cost of bleeding and pain."
set src in view(1)
if(!isliving(usr) || usr.next_move > world.time)
if(!isliving(usr) || !usr.AllowedToMoveAgain())
return
usr.next_move = world.time + 20
usr.AllowedToClickAgainAfter(CLICK_CD_RESIST)
if(usr.stat == 1)
usr << "You are unconcious and cannot do that!"
code/modules/mob/mob_grab.dm
+2 -2
View File
@@ -108,7 +108,7 @@
return
if(state == GRAB_UPGRADING)
return
if(assailant.next_move > world.time)
if(!assailant.AllowedToMoveAgain())
return
if(world.time < (last_upgrade + UPGRADE_COOLDOWN))
return
@@ -160,7 +160,7 @@
assailant.attack_log += "\[[time_stamp()]\] <font color='red'>Strangled (kill intent) [affecting.name] ([affecting.ckey])</font>"
msg_admin_attack("[key_name_admin(assailant)] strangled (kill intent) [key_name_admin(affecting)] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[affecting.x];Y=[affecting.y];Z=[affecting.z]'>JMP</a>")
assailant.next_move = world.time + 10
assailant.AllowedToClickAgainAfter(CLICK_CD_STRANGLE)
affecting.losebreath += 1
else
assailant.visible_message("<span class='warning'>[assailant] was unable to tighten \his grip on [affecting]'s neck!</span>")