diff --git a/code/datums/actions/cooldown_action.dm b/code/datums/actions/cooldown_action.dm index 1c290c5f224..97400972787 100644 --- a/code/datums/actions/cooldown_action.dm +++ b/code/datums/actions/cooldown_action.dm @@ -11,8 +11,8 @@ var/panel /// The default cooldown applied when StartCooldown() is called var/cooldown_time = 0 - /// The default melee cooldown applied after the ability ends - var/melee_cooldown_time + /// The default melee cooldown applied after the ability ends. If set to null, copies cooldown_time. + var/melee_cooldown_time = 0 /// The actual next time the owner of this action can melee var/next_melee_use_time = 0 /// Whether or not you want the cooldown for the ability to display in text form diff --git a/code/modules/mob/living/basic/clown/clown.dm b/code/modules/mob/living/basic/clown/clown.dm index 3fd23284582..ebc15182c2f 100644 --- a/code/modules/mob/living/basic/clown/clown.dm +++ b/code/modules/mob/living/basic/clown/clown.dm @@ -478,7 +478,6 @@ button_icon = 'icons/mob/actions/actions_animal.dmi' button_icon_state = "regurgitate" check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_INCAPACITATED - melee_cooldown_time = 0 SECONDS click_to_activate = TRUE /datum/action/cooldown/regurgitate/set_click_ability(mob/on_who) diff --git a/code/modules/mob/living/basic/guardian/guardian_types/explosive.dm b/code/modules/mob/living/basic/guardian/guardian_types/explosive.dm index 82c69149f6e..b3c0684571d 100644 --- a/code/modules/mob/living/basic/guardian/guardian_types/explosive.dm +++ b/code/modules/mob/living/basic/guardian/guardian_types/explosive.dm @@ -35,7 +35,6 @@ button_icon = 'icons/mob/actions/actions_spells.dmi' button_icon_state = "smoke" cooldown_time = 20 SECONDS - melee_cooldown_time = 0 SECONDS background_icon = 'icons/hud/guardian.dmi' background_icon_state = "base" /// After this amount of time passses, bomb deactivates. diff --git a/code/modules/mob/living/basic/guardian/guardian_types/gaseous.dm b/code/modules/mob/living/basic/guardian/guardian_types/gaseous.dm index b43b8e64ea4..bc6415c1a53 100644 --- a/code/modules/mob/living/basic/guardian/guardian_types/gaseous.dm +++ b/code/modules/mob/living/basic/guardian/guardian_types/gaseous.dm @@ -81,7 +81,6 @@ button_icon = 'icons/mob/actions/actions_spells.dmi' button_icon_state = "smoke" cooldown_time = 0 SECONDS // We're here for the interface not the cooldown - melee_cooldown_time = 0 SECONDS click_to_activate = FALSE /// Gas being expelled. var/active_gas = null diff --git a/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon_abilities.dm b/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon_abilities.dm index af17fc0cb01..350106d707f 100644 --- a/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon_abilities.dm +++ b/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon_abilities.dm @@ -14,7 +14,6 @@ button_icon = 'icons/obj/ore.dmi' button_icon_state = "bluespace_crystal" cooldown_time = 3 SECONDS - melee_cooldown_time = 0 SECONDS ///time delay before teleport var/time_delay = 0.5 SECONDS @@ -38,7 +37,6 @@ button_icon_state = "ice_cube" cooldown_time = 2 SECONDS click_to_activate = FALSE - melee_cooldown_time = 0 SECONDS ///perimeter we will spawn the iced floors on var/radius = 1 ///intervals we will spawn the ice floors in diff --git a/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp_abilities.dm b/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp_abilities.dm index 026106516fb..d4a05bf227e 100644 --- a/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp_abilities.dm +++ b/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp_abilities.dm @@ -5,7 +5,6 @@ button_icon = 'icons/effects/magic.dmi' button_icon_state = "fireball" cooldown_time = 3 SECONDS - melee_cooldown_time = 0 SECONDS fire_range = 4 fire_damage = 10 @@ -26,7 +25,6 @@ button_icon = 'icons/effects/fire.dmi' button_icon_state = "1" cooldown_time = 4 SECONDS - melee_cooldown_time = 0 SECONDS click_to_activate = FALSE fire_range = 6 diff --git a/code/modules/mob/living/basic/jungle/leaper/leaper_abilities.dm b/code/modules/mob/living/basic/jungle/leaper/leaper_abilities.dm index d753c42c51e..153b74fbbbc 100644 --- a/code/modules/mob/living/basic/jungle/leaper/leaper_abilities.dm +++ b/code/modules/mob/living/basic/jungle/leaper/leaper_abilities.dm @@ -10,7 +10,6 @@ projectile_type = /obj/projectile/leaper projectile_sound = 'sound/effects/snap.ogg' shared_cooldown = NONE - melee_cooldown_time = 0 SECONDS // bubble ability objects and effects /obj/projectile/leaper @@ -119,7 +118,6 @@ cooldown_time = 10 SECONDS click_to_activate = FALSE shared_cooldown = NONE - melee_cooldown_time = 0 SECONDS /// how many droplets we will fire var/volley_count = 8 /// time between each droplet launched @@ -197,7 +195,6 @@ background_icon_state = "bg_revenant" overlay_icon_state = "bg_revenant_border" shared_cooldown = NONE - melee_cooldown_time = 0 SECONDS /datum/action/cooldown/mob_cooldown/belly_flop/Activate(atom/target) var/turf/target_turf = get_turf(target) diff --git a/code/modules/mob/living/basic/jungle/mega_arachnid/mega_arachnid_abilities.dm b/code/modules/mob/living/basic/jungle/mega_arachnid/mega_arachnid_abilities.dm index 2d2b69d119a..7fe69e23da0 100644 --- a/code/modules/mob/living/basic/jungle/mega_arachnid/mega_arachnid_abilities.dm +++ b/code/modules/mob/living/basic/jungle/mega_arachnid/mega_arachnid_abilities.dm @@ -43,7 +43,6 @@ button_icon_state = "default" desc = "Secrete a slippery acid!" cooldown_time = 15 SECONDS - melee_cooldown_time = 0 SECONDS click_to_activate = FALSE /datum/action/cooldown/mob_cooldown/secrete_acid/Activate(atom/target_atom) diff --git a/code/modules/mob/living/basic/jungle/seedling/seedling.dm b/code/modules/mob/living/basic/jungle/seedling/seedling.dm index 3af0675a7f8..0df19c5c27d 100644 --- a/code/modules/mob/living/basic/jungle/seedling/seedling.dm +++ b/code/modules/mob/living/basic/jungle/seedling/seedling.dm @@ -230,7 +230,6 @@ default_projectile_spread = 10 shot_count = 10 shot_delay = 0.2 SECONDS - melee_cooldown_time = 0 SECONDS shared_cooldown = NONE ///how long we must charge up before firing off var/charge_up_timer = 3 SECONDS diff --git a/code/modules/mob/living/basic/lavaland/mook/mook_abilities.dm b/code/modules/mob/living/basic/lavaland/mook/mook_abilities.dm index 90d7cb0d5b4..69aa5026a93 100644 --- a/code/modules/mob/living/basic/lavaland/mook/mook_abilities.dm +++ b/code/modules/mob/living/basic/lavaland/mook/mook_abilities.dm @@ -29,7 +29,6 @@ desc = "Leap towards the enemy!" cooldown_time = 7 SECONDS shared_cooldown = NONE - melee_cooldown_time = 0 SECONDS ///telegraph time before jumping var/wind_up_time = 2 SECONDS ///intervals between each of our attacks @@ -92,7 +91,6 @@ desc = "Soar high in the air!" cooldown_time = 14 SECONDS shared_cooldown = NONE - melee_cooldown_time = 0 SECONDS click_to_activate = FALSE /datum/action/cooldown/mob_cooldown/mook_ability/mook_jump/Activate(atom/target) diff --git a/code/modules/mob/living/basic/lavaland/watcher/watcher_gaze.dm b/code/modules/mob/living/basic/lavaland/watcher/watcher_gaze.dm index 94080329952..7d0ad8f191a 100644 --- a/code/modules/mob/living/basic/lavaland/watcher/watcher_gaze.dm +++ b/code/modules/mob/living/basic/lavaland/watcher/watcher_gaze.dm @@ -11,7 +11,6 @@ cooldown_time = 20 SECONDS click_to_activate = FALSE shared_cooldown = NONE - melee_cooldown_time = 0 SECONDS /// At what range do we check for vision? var/effect_radius = 7 /// How long does it take to play our various animation stages diff --git a/code/modules/mob/living/basic/minebots/minebot_abilities.dm b/code/modules/mob/living/basic/minebots/minebot_abilities.dm index a421c5d81f4..bc778a7bfe7 100644 --- a/code/modules/mob/living/basic/minebots/minebot_abilities.dm +++ b/code/modules/mob/living/basic/minebots/minebot_abilities.dm @@ -58,7 +58,6 @@ desc = "Launch a missile towards the target!" cooldown_time = 10 SECONDS shared_cooldown = NONE - melee_cooldown_time = 0 SECONDS ///how long before we launch said missile var/wind_up_timer = 1 SECONDS @@ -100,7 +99,6 @@ overlay_icon_state = "bg_default_border" cooldown_time = 10 SECONDS shared_cooldown = NONE - melee_cooldown_time = 0 SECONDS click_to_activate = FALSE /datum/action/cooldown/mob_cooldown/drop_landmine/IsAvailable(feedback = TRUE) diff --git a/code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat_actions.dm b/code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat_actions.dm index feb6ebb7c3b..f7997e58969 100644 --- a/code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat_actions.dm +++ b/code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat_actions.dm @@ -8,7 +8,6 @@ check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_INCAPACITATED click_to_activate = FALSE cooldown_time = 6 SECONDS - melee_cooldown_time = 0 SECONDS button_icon = 'icons/mob/actions/actions_animal.dmi' background_icon_state = "bg_clock" overlay_icon_state = "bg_clock_border" @@ -57,7 +56,6 @@ background_icon_state = "bg_clock" overlay_icon_state = "bg_clock_border" cooldown_time = 8 SECONDS - melee_cooldown_time = 0 SECONDS shared_cooldown = NONE /// How close does something need to be for us to recruit it? var/range = 5 diff --git a/code/modules/mob/living/basic/space_fauna/space_dragon/dragon_breath.dm b/code/modules/mob/living/basic/space_fauna/space_dragon/dragon_breath.dm index 5be5038b3a4..0093b76c826 100644 --- a/code/modules/mob/living/basic/space_fauna/space_dragon/dragon_breath.dm +++ b/code/modules/mob/living/basic/space_fauna/space_dragon/dragon_breath.dm @@ -6,7 +6,6 @@ fire_range = 20 fire_temperature = 700 // Even hotter than a megafauna for some reason shared_cooldown = NONE - melee_cooldown_time = 0 SECONDS /datum/action/cooldown/mob_cooldown/fire_breath/carp/on_burn_mob(mob/living/barbecued, mob/living/source) if (!source.faction_check_atom(barbecued)) diff --git a/code/modules/mob/living/basic/space_fauna/wumborian_fugu/inflation.dm b/code/modules/mob/living/basic/space_fauna/wumborian_fugu/inflation.dm index a25b3c52ad8..1281cb06f57 100644 --- a/code/modules/mob/living/basic/space_fauna/wumborian_fugu/inflation.dm +++ b/code/modules/mob/living/basic/space_fauna/wumborian_fugu/inflation.dm @@ -11,7 +11,6 @@ background_icon_state = "bg_fugu" overlay_icon_state = "bg_fugu_border" cooldown_time = 16 SECONDS - melee_cooldown_time = 0 SECONDS /datum/action/cooldown/fugu_expand/IsAvailable(feedback) . = ..() diff --git a/code/modules/mob/living/carbon/alien/adult/alien_powers.dm b/code/modules/mob/living/carbon/alien/adult/alien_powers.dm index ace63074cc2..bfdcd1a5fd2 100644 --- a/code/modules/mob/living/carbon/alien/adult/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/adult/alien_powers.dm @@ -14,7 +14,6 @@ Doesn't work on other aliens/AI.*/ button_icon = 'icons/mob/actions/actions_xeno.dmi' button_icon_state = "spell_default" check_flags = AB_CHECK_IMMOBILE | AB_CHECK_CONSCIOUS | AB_CHECK_INCAPACITATED - melee_cooldown_time = 0 SECONDS /// How much plasma this action uses. var/plasma_cost = 0 diff --git a/code/modules/mob/living/simple_animal/bot/bot_announcement.dm b/code/modules/mob/living/simple_animal/bot/bot_announcement.dm index 061e6375088..5d63fbdee2b 100644 --- a/code/modules/mob/living/simple_animal/bot/bot_announcement.dm +++ b/code/modules/mob/living/simple_animal/bot/bot_announcement.dm @@ -8,7 +8,6 @@ button_icon_state = "intercom" cooldown_time = 5 SECONDS shared_cooldown = MOB_SHARED_COOLDOWN_BOT_ANNOUNCMENT - melee_cooldown_time = 0 SECONDS /// List of strings to sound effects corresponding to automated messages we can play var/list/automated_announcements /// Maximum amount of buttons this can have @@ -173,7 +172,6 @@ /datum/action/cooldown/bot_announcement_shortcut desc = "Play a prerecorded message for the benefit of those around you." shared_cooldown = MOB_SHARED_COOLDOWN_BOT_ANNOUNCMENT - melee_cooldown_time = 0 SECONDS background_icon_state = "bg_tech_blue" overlay_icon_state = "bg_tech_blue_border" button_icon = 'icons/obj/machines/wallmounts.dmi' diff --git a/code/modules/mob/living/simple_animal/hostile/vatbeast.dm b/code/modules/mob/living/simple_animal/hostile/vatbeast.dm index d7764956243..8eab28a52e6 100644 --- a/code/modules/mob/living/simple_animal/hostile/vatbeast.dm +++ b/code/modules/mob/living/simple_animal/hostile/vatbeast.dm @@ -52,7 +52,6 @@ button_icon_state = "tentacle_slap" check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_INCAPACITATED cooldown_time = 12 SECONDS - melee_cooldown_time = 0 SECONDS click_to_activate = TRUE ranged_mousepointer = 'icons/effects/mouse_pointers/supplypod_target.dmi' diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm index b72abea937e..221ad9b79cd 100644 --- a/code/modules/spells/spell.dm +++ b/code/modules/spells/spell.dm @@ -50,7 +50,6 @@ active_overlay_icon_state = "bg_spell_border_active_red" check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_PHASED panel = "Spells" - melee_cooldown_time = 0 SECONDS /// The sound played on cast. var/sound = null