fix effect application

ss220club · Gaxeer · Jan 19, 2025 · Jan 17, 2025 · Jan 17, 2025 · Jan 17, 2025
commit 67cdc1c63c11e2b43d6e00f7c04dc22ddd40c9e8
diff --git a/modular_bandastation/tts/code/shell.dm b/modular_bandastation/tts/code/shell.dm
@@ -34,10 +34,10 @@
 		log_runtime("Error: apply_sound_effects([effect_types], [filename_input], [filename_output]) - See debug logs.")
 		logger.Log(LOG_CATEGORY_DEBUG, "apply_sound_effects([effect_types], [filename_input], [filename_output]) STDOUT: [stdout]")
 		logger.Log(LOG_CATEGORY_DEBUG, "apply_sound_effects([effect_types], [filename_input], [filename_output]) STDERR: [stderr]")
+		return FALSE
 	else
 		message_admins("ffmpeg output: [stdout]")
 		log_admin("ffmpeg output: [stdout]")
-		return FALSE
 	return TRUE
 
 /datum/singleton/sound_effect

diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm
 		var/mutant_override = FALSE

 		var/obj/item/bodypart/head/bodypart_head = src.get_bodypart(BODY_ZONE_HEAD)
 		if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_head.species_bodytype])
 			icon_file = worn_item.worn_icon_species[bodypart_head.species_bodytype]
 			mutant_override = TRUE
 		else if(bodypart_head.species_bodytype in icon_files_species)
 			icon_file = icon_files_species[bodypart_head.species_bodytype]
 		var/mutant_override = FALSE

 		var/obj/item/bodypart/chest/bodypart_chest = src.get_bodypart(BODY_ZONE_CHEST)
 		if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_chest.species_bodytype])
 			icon_file = worn_item.worn_icon_species[bodypart_chest.species_bodytype]
 			mutant_override = TRUE
 		else if(bodypart_chest.species_bodytype in icon_files_species)
 			icon_file = icon_files_species[bodypart_chest.species_bodytype]
 		var/mutant_override = FALSE

 		var/obj/item/bodypart/head/bodypart_head = src.get_bodypart(BODY_ZONE_HEAD)
 		if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_head.species_bodytype])
 			icon_file = worn_item.worn_icon_species[bodypart_head.species_bodytype]
 			mutant_override = TRUE
 		else if(bodypart_head.species_bodytype in icon_files_species)
 			icon_file = icon_files_species[bodypart_head.species_bodytype]
diff --git a/modular_bandastation/objects/code/items/clothing/spacesuits/hev_suit.dm b/modular_bandastation/objects/code/items/clothing/spacesuits/hev_suit.dm
 		"Вы пытаетесь что-то сказать, но костюм сдавливает вам гортань..."
 	)

 	speech_args[SPEECH_MESSAGE] = "..."
 	to_chat(source, span_warning(pick(cancel_messages)))

 //Fire
diff --git a/modular_bandastation/species/code/clothing/mod.dm b/modular_bandastation/species/code/clothing/mod.dm
 	var/mob/living/carbon/user = usr
 	if(istype(user))
 		var/obj/item/bodypart/head/bodypart_head = user.get_bodypart(BODY_ZONE_HEAD)
 		if(bodypart_head && worn_icon_species && worn_icon_species[bodypart_head.species_bodytype])
 			module_icon = mutable_appearance(worn_icon_species[bodypart_head.species_bodytype], used_overlay, layer = standing.layer + 0.1)
 	if(!use_mod_colors)
 		module_icon.appearance_flags |= RESET_COLOR
 	. += module_icon
	var/mutant_override = FALSE

	var/obj/item/bodypart/head/bodypart_head = src.get_bodypart(BODY_ZONE_HEAD)
	if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_head.species_bodytype])
Check warning on line 402 in code/modules/mob/living/carbon/human/human_update_icons.dm GitHub Actions / Run Linters `OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641`
	icon_file = worn_item.worn_icon_species[bodypart_head.species_bodytype]
Check warning on line 403 in code/modules/mob/living/carbon/human/human_update_icons.dm GitHub Actions / Run Linters `OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641`
	mutant_override = TRUE
	else if(bodypart_head.species_bodytype in icon_files_species)
	icon_file = icon_files_species[bodypart_head.species_bodytype]
	var/mutant_override = FALSE

	var/obj/item/bodypart/chest/bodypart_chest = src.get_bodypart(BODY_ZONE_CHEST)
	if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_chest.species_bodytype])
Check warning on line 471 in code/modules/mob/living/carbon/human/human_update_icons.dm GitHub Actions / Run Linters `OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641`
	icon_file = worn_item.worn_icon_species[bodypart_chest.species_bodytype]
Check warning on line 472 in code/modules/mob/living/carbon/human/human_update_icons.dm GitHub Actions / Run Linters `OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641`
	mutant_override = TRUE
	else if(bodypart_chest.species_bodytype in icon_files_species)
	icon_file = icon_files_species[bodypart_chest.species_bodytype]
	var/mutant_override = FALSE

	var/obj/item/bodypart/head/bodypart_head = src.get_bodypart(BODY_ZONE_HEAD)
	if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_head.species_bodytype])
Check warning on line 541 in code/modules/mob/living/carbon/human/human_update_icons.dm GitHub Actions / Run Linters `OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641`
	icon_file = worn_item.worn_icon_species[bodypart_head.species_bodytype]
Check warning on line 542 in code/modules/mob/living/carbon/human/human_update_icons.dm GitHub Actions / Run Linters `OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641`
	mutant_override = TRUE
	else if(bodypart_head.species_bodytype in icon_files_species)
	icon_file = icon_files_species[bodypart_head.species_bodytype]
	"Вы пытаетесь что-то сказать, но костюм сдавливает вам гортань..."
	)

	speech_args[SPEECH_MESSAGE] = "..."
Check warning on line 117 in modular_bandastation/objects/code/items/clothing/spacesuits/hev_suit.dm GitHub Actions / Run Linters `OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641`
	to_chat(source, span_warning(pick(cancel_messages)))

	//Fire
	var/mob/living/carbon/user = usr
	if(istype(user))
	var/obj/item/bodypart/head/bodypart_head = user.get_bodypart(BODY_ZONE_HEAD)
	if(bodypart_head && worn_icon_species && worn_icon_species[bodypart_head.species_bodytype])
Check warning on line 18 in modular_bandastation/species/code/clothing/mod.dm GitHub Actions / Run Linters `OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641`
	module_icon = mutable_appearance(worn_icon_species[bodypart_head.species_bodytype], used_overlay, layer = standing.layer + 0.1)
Check warning on line 19 in modular_bandastation/species/code/clothing/mod.dm GitHub Actions / Run Linters `OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641`
	if(!use_mod_colors)
	module_icon.appearance_flags \|= RESET_COLOR
	. += module_icon