cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Most actions cannot be used while incapacitated [MDB IGNORE] (#19469)

Browse Source 
Most actions cannot be used while incapacitated

Co-authored-by: Jacquerel <hnevard@gmail.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-03-10 05:30:59 +00:00
committed by GitHub
co-authored by Jacquerel Gandalf
parent d666b49125
commit 93fc6f2a81
26 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/basic/space_fauna/giant_spider/spider_abilities/lay_eggs.dm
+1 -1
View File
@@ -5,7 +5,7 @@
button_icon_state = "lay_eggs"
background_icon_state = "bg_alien"
overlay_icon_state = "bg_alien_border"
check_flags = AB_CHECK_CONSCIOUS
check_flags = AB_CHECK_CONSCIOUS | AB_CHECK_INCAPACITATED
///How long it takes for a broodmother to lay eggs.
var/egg_lay_time = 12 SECONDS
///The type of egg we create
code/modules/mob/living/basic/space_fauna/giant_spider/spider_abilities/web.dm
+1 -1
View File
@@ -6,7 +6,7 @@
button_icon_state = "lay_web"
background_icon_state = "bg_alien"
overlay_icon_state = "bg_alien_border"
check_flags = AB_CHECK_CONSCIOUS
check_flags = AB_CHECK_CONSCIOUS | AB_CHECK_INCAPACITATED
cooldown_time = 0 SECONDS
/// How long it takes to lay a web
var/webbing_time = 4 SECONDS
code/modules/mob/living/basic/space_fauna/giant_spider/spider_abilities/wrap.dm
+1 -1
View File
@@ -8,7 +8,7 @@
overlay_icon_state = "bg_alien_border"
button_icon = 'icons/mob/actions/actions_animal.dmi'
button_icon_state = "wrap_0"
check_flags = AB_CHECK_CONSCIOUS
check_flags = AB_CHECK_CONSCIOUS | AB_CHECK_INCAPACITATED
click_to_activate = TRUE
ranged_mousepointer = 'icons/effects/mouse_pointers/wrap_target.dmi'
/// The time it takes to wrap something.
code/modules/mob/living/carbon/alien/adult/alien_powers.dm
+1 -1
View File
@@ -13,7 +13,7 @@ Doesn't work on other aliens/AI.*/
overlay_icon_state = "bg_alien_border"
button_icon = 'icons/mob/actions/actions_xeno.dmi'
button_icon_state = "spell_default"
check_flags = AB_CHECK_IMMOBILE|AB_CHECK_CONSCIOUS
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
code/modules/mob/living/simple_animal/hostile/goose.dm
+1 -1
View File
@@ -246,7 +246,7 @@
/datum/action/cooldown/vomit
name = "Vomit"
check_flags = AB_CHECK_CONSCIOUS
check_flags = AB_CHECK_CONSCIOUS | AB_CHECK_INCAPACITATED
button_icon_state = "vomit"
button_icon = 'icons/mob/simple/animal.dmi'
cooldown_time = 250
code/modules/mob/living/simple_animal/hostile/ooze.dm
+3 -3
View File
@@ -195,7 +195,7 @@
overlay_icon_state = "bg_hive_border"
button_icon = 'icons/mob/actions/actions_slime.dmi'
button_icon_state = "consume"
check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_IMMOBILE
check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_IMMOBILE|AB_CHECK_INCAPACITATED
///The mob thats being consumed by this creature
var/mob/living/vored_mob
@@ -305,7 +305,7 @@
overlay_icon_state = "bg_hive_border"
button_icon = 'icons/mob/actions/actions_slime.dmi'
button_icon_state = "globules"
check_flags = AB_CHECK_CONSCIOUS
check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_INCAPACITATED
cooldown_time = 5 SECONDS
click_to_activate = TRUE
@@ -421,7 +421,7 @@
overlay_icon_state = "bg_hive_border"
button_icon = 'icons/mob/actions/actions_slime.dmi'
button_icon_state = "gel_cocoon"
check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_IMMOBILE
check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_IMMOBILE|AB_CHECK_INCAPACITATED
cooldown_time = 10 SECONDS
/datum/action/cooldown/gel_cocoon/Activate(atom/target)
code/modules/mob/living/simple_animal/hostile/regalrat.dm
+2 -2
View File
@@ -212,7 +212,7 @@
/datum/action/cooldown/domain
name = "Rat King's Domain"
desc = "Corrupts this area to be more suitable for your rat army."
check_flags = AB_CHECK_CONSCIOUS
check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_INCAPACITATED
cooldown_time = 6 SECONDS
melee_cooldown_time = 0 SECONDS
button_icon = 'icons/mob/actions/actions_animal.dmi'
@@ -246,7 +246,7 @@
/datum/action/cooldown/riot
name = "Raise Army"
desc = "Raise an army out of the hordes of mice and pests crawling around the maintenance shafts."
check_flags = AB_CHECK_CONSCIOUS
check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_INCAPACITATED
button_icon = 'icons/mob/actions/actions_animal.dmi'
button_icon_state = "riot"
background_icon_state = "bg_clock"
code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+1 -1
View File
@@ -480,7 +480,7 @@
overlay_icon_state = "bg_changeling_border"
button_icon = 'icons/mob/actions/actions_animal.dmi'
button_icon_state = "regurgitate"
check_flags = AB_CHECK_CONSCIOUS
check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_INCAPACITATED
melee_cooldown_time = 0 SECONDS
click_to_activate = TRUE
code/modules/mob/living/simple_animal/hostile/vatbeast.dm
+1 -1
View File
@@ -51,7 +51,7 @@
overlay_icon_state = "bg_revenant_border"
button_icon = 'icons/mob/actions/actions_animal.dmi'
button_icon_state = "tentacle_slap"
check_flags = AB_CHECK_CONSCIOUS
check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_INCAPACITATED
cooldown_time = 12 SECONDS
melee_cooldown_time = 0 SECONDS
click_to_activate = TRUE