Fix cooldown abilities never running
This commit is contained in:
@@ -167,10 +167,7 @@ GLOBAL_LIST_EMPTY(plague_rats)
|
||||
button_icon_state = "coffer"
|
||||
cooldown_time = 50
|
||||
|
||||
/datum/action/cooldown/scavenge/Trigger()
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
/datum/action/cooldown/scavenge/Activate()
|
||||
var/turf/T = get_turf(owner)
|
||||
var/loot = rand(1,100)
|
||||
switch(loot)
|
||||
|
||||
@@ -87,11 +87,9 @@
|
||||
background_icon_state = "bg_clock"
|
||||
button_icon_state = "coffer"
|
||||
cooldown_time = 50
|
||||
check_flags = AB_CHECK_CONSCIOUS
|
||||
|
||||
/datum/action/cooldown/coffer/Trigger()
|
||||
. = ..()
|
||||
if(!. || owner.stat != CONSCIOUS)
|
||||
return
|
||||
/datum/action/cooldown/coffer/Activate()
|
||||
var/turf/T = get_turf(owner)
|
||||
var/loot = rand(1,100)
|
||||
switch(loot)
|
||||
@@ -131,12 +129,10 @@
|
||||
button_icon_state = "riot"
|
||||
background_icon_state = "bg_clock"
|
||||
cooldown_time = 80
|
||||
check_flags = AB_CHECK_CONSCIOUS
|
||||
///Checks to see if there are any nearby mice. Does not count Rats.
|
||||
|
||||
/datum/action/cooldown/riot/Trigger()
|
||||
. = ..()
|
||||
if(!. || owner.stat != CONSCIOUS)
|
||||
return
|
||||
/datum/action/cooldown/riot/Activate()
|
||||
var/cap = CONFIG_GET(number/ratcap)
|
||||
var/something_from_nothing = FALSE
|
||||
for(var/mob/living/simple_animal/mouse/M in oview(owner, 5))
|
||||
|
||||
Reference in New Issue
Block a user