Линтер и рантаймы

ss220club · Nov 6, 2024 · d4c8367 · d4c8367
1 parent f2fdb2c
commit d4c8367
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/modular_ss220/species/serpentids/code/mob/serpentids.dm b/modular_ss220/species/serpentids/code/mob/serpentids.dm
@@ -143,7 +143,7 @@
 			var/limb_armor = limb.brute_dam + limb.burn_dam
 			armor_count += limb_armor
 
-		if (gene_degradation)
+		if(gene_degradation)
 			H.adjustCloneLoss(gene_degradation)
 
 		gene_lastcall = 0

diff --git a/modular_ss220/text_to_speech/code/tts_atom.dm b/modular_ss220/text_to_speech/code/tts_atom.dm
@@ -29,18 +29,3 @@
 
 /atom/proc/tts_trait_remove(trait)
 	SEND_SIGNAL(src, COMSIG_ATOM_TTS_TRAIT_REMOVE, trait)
-
-/mob/add_language(language, force)
-	. = ..()
-	RegisterSignal(src, COMSIG_ATOM_PRE_TTS_CAST, PROC_REF(atom_pre_tts_cast_mob))
-
-/mob/remove_language(rem_language, force)
-	. = ..()
-	UnregisterSignal(src, COMSIG_ATOM_PRE_TTS_CAST)
-
-/mob/proc/atom_pre_tts_cast_mob(atom, listener, message, location, is_local, effect, traits, preSFX, postSFX)
-	SIGNAL_HANDLER
-	for(var/datum/multilingual_say_piece/phrase in message)
-		if(phrase.speaking.no_tts)
-			return COMPONENT_TTS_INTERRUPT
-	return FALSE
diff --git a/modular_ss220/text_to_speech/code/tts_component.dm b/modular_ss220/text_to_speech/code/tts_component.dm
@@ -7,12 +7,14 @@
 	RegisterSignal(parent, COMSIG_ATOM_TTS_CAST, PROC_REF(cast_tts))
 	RegisterSignal(parent, COMSIG_ATOM_TTS_TRAIT_ADD, PROC_REF(tts_trait_add))
 	RegisterSignal(parent, COMSIG_ATOM_TTS_TRAIT_REMOVE, PROC_REF(tts_trait_remove))
+	RegisterSignal(parent, COMSIG_ATOM_PRE_TTS_CAST, PROC_REF(atom_pre_tts_cast_mob))
 
 /datum/component/tts_component/UnregisterFromParent()
 	UnregisterSignal(parent, COMSIG_ATOM_TTS_SEED_CHANGE)
 	UnregisterSignal(parent, COMSIG_ATOM_TTS_CAST)
 	UnregisterSignal(parent, COMSIG_ATOM_TTS_TRAIT_ADD)
 	UnregisterSignal(parent, COMSIG_ATOM_TTS_TRAIT_REMOVE)
+	UnregisterSignal(parent, COMSIG_ATOM_TTS_TRAIT_REMOVE)
 
 /datum/component/tts_component/Initialize(datum/tts_seed/new_tts_seed, ...)
 	if(!isatom(parent))
@@ -198,6 +200,13 @@
 	if(!isnull(trait) && (trait in traits))
 		traits -= trait
 
+/datum/component/tts_component/proc/atom_pre_tts_cast_mob(atom, listener, message, location, is_local, effect, traits, preSFX, postSFX)
+	SIGNAL_HANDLER
+	for(var/datum/multilingual_say_piece/phrase in message)
+		if(phrase.speaking?.no_tts)
+			return COMPONENT_TTS_INTERRUPT
+	return FALSE
+
 // Component usage
 
 /client/create_response_team_part_1(new_gender, new_species, role, turf/spawn_location)