shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Makes action buttons call the correct procs (#2902)

Browse Source 
* Makes action buttons call the correct procs (#30921)

* Makes action buttons call the correct procs

* Changed to mob/living proc

* CB

* Makes action buttons call the correct procs
This commit is contained in:
CitadelStationBot
2017-09-22 19:00:34 -05:00
committed by Poojawa
parent 0925853992
commit 944753dccd
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+4 -1
View File
@@ -544,11 +544,14 @@
if(!force_moving)
..(pressure_difference, direction, pressure_resistance_prob_delta)
/mob/living/proc/can_resist()
return !((next_move > world.time) || incapacitated(ignore_restraints = TRUE))
/mob/living/verb/resist()
set name = "Resist"
set category = "IC"
if(!isliving(src) || next_move > world.time || incapacitated(ignore_restraints = 1))
if(!can_resist())
return
changeNext_move(CLICK_CD_RESIST)