cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 10:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

dun dun duuunnnn

Browse Source
This commit is contained in:
iero-srv
2023-04-17 17:57:27 -04:00
parent a994ec21f2
commit f18f4c1719
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modular_zubbers/code/modules/status_indicators/status_indicator.dm
View File

@@ -1,10 +1,10 @@
GLOBAL_LIST_INIT(potential_indicators, list(
STUNNED = image(icon = 'modular_skyrat/master_files/icons/mob/status_indicators.dmi', icon_state = STUNNED),
WEAKEN = image(icon = 'modular_skyrat/master_files/icons/mob/status_indicators.dmi', icon_state = WEAKEN),
PARALYSIS = image(icon = 'modular_skyrat/master_files/icons/mob/status_indicators.dmi', icon_state = PARALYSIS),
SLEEPING = image(icon = 'modular_skyrat/master_files/icons/mob/status_indicators.dmi', icon_state = SLEEPING),
CONFUSED = image(icon = 'modular_skyrat/master_files/icons/mob/status_indicators.dmi', icon_state = CONFUSED),
STUNNED = image(icon = 'modular_zubbers/icons/mob/status_indicators.dmi', icon_state = STUNNED),
WEAKEN = image(icon = 'modular_zubbers/icons/mob/status_indicators.dmi', icon_state = WEAKEN),
PARALYSIS = image(icon = 'modular_zubbers/icons/mob/status_indicators.dmi', icon_state = PARALYSIS),
SLEEPING = image(icon = 'modular_zubbers/icons/mob/status_indicators.dmi', icon_state = SLEEPING),
CONFUSED = image(icon = 'modular_zubbers/icons/mob/status_indicators.dmi', icon_state = CONFUSED),
))
/datum/component/status_indicator
@@ -56,8 +56,7 @@ GLOBAL_LIST_INIT(potential_indicators, list(
attached_mob = parent
// The Basics
RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(cut_indicators_overlays))
RegisterSignal(parent, COMSIG_CARBON_HEALTH_UPDATE, PROC_REF(status_indicator_evaluate))
RegisterSignal(parent, COMSIG_LIVING_LIFE, PROC_REF(check_indicators))
RegisterSignal(parent, COMSIG_LIVING_LIFE, PROC_REF(status_indicator_evaluate))
// When things actually happen
RegisterSignal(parent, COMSIG_LIVING_STATUS_STUN, PROC_REF(status_indicator_evaluate))
RegisterSignal(parent, COMSIG_LIVING_STATUS_KNOCKDOWN, PROC_REF(status_indicator_evaluate))
@@ -75,7 +74,6 @@ GLOBAL_LIST_INIT(potential_indicators, list(
/datum/component/status_indicator/UnregisterFromParent()
QDEL_NULL(status_indicators)
UnregisterSignal(attached_mob, COMSIG_LIVING_DEATH)
UnregisterSignal(attached_mob, COMSIG_CARBON_HEALTH_UPDATE)
UnregisterSignal(attached_mob, COMSIG_LIVING_LIFE)
UnregisterSignal(attached_mob, COMSIG_LIVING_STATUS_STUN)
UnregisterSignal(attached_mob, COMSIG_LIVING_STATUS_KNOCKDOWN)

7
tgstation.dme
View File

@@ -374,7 +374,6 @@
#include "code\__DEFINES\~skyrat_defines\sound.dm"
#include "code\__DEFINES\~skyrat_defines\span.dm"
#include "code\__DEFINES\~skyrat_defines\species_clothing_paths.dm"
#include "code\__DEFINES\~skyrat_defines\status_indicator_defines.dm"
#include "code\__DEFINES\~skyrat_defines\strippable.dm"
#include "code\__DEFINES\~skyrat_defines\synth_defines.dm"
#include "code\__DEFINES\~skyrat_defines\teshari_clothing_paths.dm"
@@ -391,6 +390,7 @@
#include "code\__DEFINES\~~bubber_defines\access.dm"
#include "code\__DEFINES\~~bubber_defines\quirk_whitelist.dm"
#include "code\__DEFINES\~~bubber_defines\species.dm"
#include "code\__DEFINES\~~bubber_defines\status_indicator_defines.dm"
#include "code\__DEFINES\~~bubber_defines\traits.dm"
#include "code\__HELPERS\_auxtools_api.dm"
#include "code\__HELPERS\_lists.dm"
@@ -5314,7 +5314,6 @@
#include "modular_skyrat\master_files\code\modules\mob\living\blood.dm"
#include "modular_skyrat\master_files\code\modules\mob\living\emote_popup.dm"
#include "modular_skyrat\master_files\code\modules\mob\living\examine_tgui.dm"
#include "modular_skyrat\master_files\code\modules\mob\living\living.dm"
#include "modular_skyrat\master_files\code\modules\mob\living\living_defines.dm"
#include "modular_skyrat\master_files\code\modules\mob\living\carbon\human.dm"
#include "modular_skyrat\master_files\code\modules\mob\living\carbon\human_helpers.dm"
@@ -6589,8 +6588,6 @@
#include "modular_skyrat\modules\stasisrework\code\machine_circuitboards.dm"
#include "modular_skyrat\modules\stasisrework\code\medical_designs.dm"
#include "modular_skyrat\modules\stasisrework\code\stasissleeper.dm"
#include "modular_skyrat\modules\status_indicators\status_indicator.dm"
#include "modular_skyrat\modules\status_indicators\status_indicator_pref.dm"
#include "modular_skyrat\modules\stone\code\ore_veins.dm"
#include "modular_skyrat\modules\stone\code\stone.dm"
#include "modular_skyrat\modules\stormtrooper\code\stormtrooper_clothes.dm"
@@ -6728,6 +6725,8 @@
#include "modular_zubbers\code\modules\mod\mod_theme.dm"
#include "modular_zubbers\code\modules\mod\mod_types.dm"
#include "modular_zubbers\code\modules\projectiles\guns\energy\pulse.dm"
#include "modular_zubbers\code\modules\status_indicators\status_indicator.dm"
#include "modular_zubbers\code\modules\status_indicators\status_indicator_pref.dm"
#include "modular_zubbers\code\modules\surgery\bodyparts\species_parts\misc_bodyparts.dm"
#include "modular_zubbers\code\modules\vending\wardrobe.dm"
// END_INCLUDE