diff --git a/modular_skyrat/modules/aesthetics/airlock/code/airlock.dm b/modular_skyrat/modules/aesthetics/airlock/code/airlock.dm index e067efa6a7b..d5164dfd517 100644 --- a/modular_skyrat/modules/aesthetics/airlock/code/airlock.dm +++ b/modular_skyrat/modules/aesthetics/airlock/code/airlock.dm @@ -86,7 +86,7 @@ else . += get_airlock_overlay("fill_[frame_state + fill_state_suffix]", icon, src, em_block = TRUE) - if(lights && hasPower() && has_environment_lights) + if(feedback && hasPower() && has_environment_lights) . += get_airlock_overlay("lights_[light_state]", overlays_file, src, em_block = FALSE) . += emissive_appearance(overlays_file, "lights_[light_state]", src, alpha = src.alpha) diff --git a/modular_skyrat/modules/bodyparts/code/_mutant_bodyparts.dm b/modular_skyrat/modules/bodyparts/code/_mutant_bodyparts.dm index 5758a5d9c09..b1b1e00212a 100644 --- a/modular_skyrat/modules/bodyparts/code/_mutant_bodyparts.dm +++ b/modular_skyrat/modules/bodyparts/code/_mutant_bodyparts.dm @@ -26,7 +26,7 @@ /obj/item/bodypart/head/mutant icon_greyscale = BODYPART_ICON_MAMMAL limb_id = SPECIES_MAMMAL - head_flags = HEAD_ALL_FEATURES + head_flags = HEAD_DEFAULT_FEATURES /obj/item/bodypart/chest/mutant icon_greyscale = BODYPART_ICON_MAMMAL diff --git a/modular_skyrat/modules/bodyparts/code/lizard_bodyparts.dm b/modular_skyrat/modules/bodyparts/code/lizard_bodyparts.dm index e6a5cbd5a08..c56265e1c21 100644 --- a/modular_skyrat/modules/bodyparts/code/lizard_bodyparts.dm +++ b/modular_skyrat/modules/bodyparts/code/lizard_bodyparts.dm @@ -1,6 +1,6 @@ /obj/item/bodypart/head/lizard icon_greyscale = BODYPART_ICON_LIZARD - head_flags = HEAD_ALL_FEATURES + head_flags = HEAD_DEFAULT_FEATURES /obj/item/bodypart/chest/lizard icon_greyscale = BODYPART_ICON_LIZARD diff --git a/modular_skyrat/modules/clock_cult/code/items/clothing.dm b/modular_skyrat/modules/clock_cult/code/items/clothing.dm index 9580234ea3f..49a38ad3cb4 100644 --- a/modular_skyrat/modules/clock_cult/code/items/clothing.dm +++ b/modular_skyrat/modules/clock_cult/code/items/clothing.dm @@ -118,7 +118,7 @@ previous_alpha = wearer.alpha animate(wearer, alpha = 90, time = 3 SECONDS) apply_wibbly_filters(wearer) - ADD_TRAIT(wearer, TRAIT_UNKNOWN, CLOTHING_TRAIT) + ADD_TRAIT(wearer, TRAIT_UNKNOWN_APPEARANCE, CLOTHING_TRAIT) /// Un-apply the effects of the cloak, returning the wearer to normal @@ -127,7 +127,7 @@ do_sparks(3, FALSE, wearer) remove_wibbly_filters(wearer) animate(wearer, alpha = previous_alpha, time = 3 SECONDS) - REMOVE_TRAIT(wearer, TRAIT_UNKNOWN, CLOTHING_TRAIT) + REMOVE_TRAIT(wearer, TRAIT_UNKNOWN_APPEARANCE, CLOTHING_TRAIT) /obj/item/clothing/glasses/clockwork diff --git a/modular_skyrat/modules/synths/code/bodyparts/limbs.dm b/modular_skyrat/modules/synths/code/bodyparts/limbs.dm index b38c5101df7..7b137624f7b 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/limbs.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/limbs.dm @@ -54,7 +54,7 @@ BURN = ROBOTIC_BURN_EXAMINE_TEXT, ) - head_flags = HEAD_ALL_FEATURES + head_flags = HEAD_DEFAULT_FEATURES bodypart_flags = BODYPART_UNHUSKABLE /datum/design/synth_head diff --git a/modular_zubbers/code/datums/components/vore/preferences.dm b/modular_zubbers/code/datums/components/vore/preferences.dm index 3841910b854..32a386d9d0e 100644 --- a/modular_zubbers/code/datums/components/vore/preferences.dm +++ b/modular_zubbers/code/datums/components/vore/preferences.dm @@ -219,7 +219,7 @@ GLOBAL_LIST_INIT(vore_preference_entries_by_key, init_vore_preference_entries_by return output /datum/vore_pref - var/abstract_type = /datum/vore_pref + abstract_type = /datum/vore_pref var/savefile_key = "" /// Checks that a given value is valid. diff --git a/modular_zubbers/code/datums/dna/dna_block.dm b/modular_zubbers/code/datums/dna/dna_block.dm index 8bdc0ee86b7..99c8cfbc613 100644 --- a/modular_zubbers/code/datums/dna/dna_block.dm +++ b/modular_zubbers/code/datums/dna/dna_block.dm @@ -1,3 +1,3 @@ /datum/dna_block /// Do not instantiate if type matches this. - var/abstract_type = /datum/dna_block + abstract_type = /datum/dna_block diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm index 4312eb0cc05..9d5d69b0262 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm @@ -104,7 +104,7 @@ SIGNAL_HANDLER identity[VISIBLE_NAME_FACE] = disguise_name - user.SetSpecialVoice(disguise_name) + user.get_message_voice(disguise_name) /datum/action/cooldown/bloodsucker/veil/DeactivatePower(deactivate_flags) . = ..() @@ -112,7 +112,7 @@ return var/mob/living/carbon/human/user = owner // Revert Identity - user.UnsetSpecialVoice() + user.get_message_voice() // Revert Appearance user.gender = prev_gender diff --git a/modular_zubbers/code/modules/client/verbs/character_directory.dm b/modular_zubbers/code/modules/client/verbs/character_directory.dm index 3522784d888..2d774c6f4c0 100644 --- a/modular_zubbers/code/modules/client/verbs/character_directory.dm +++ b/modular_zubbers/code/modules/client/verbs/character_directory.dm @@ -203,7 +203,7 @@ GLOBAL_DATUM(character_directory, /datum/character_directory) if(ishuman(mob)) var/mob/living/carbon/human/human = mob //If someone is obscured without flavor text visible, we don't want them on the Directory. - if((human.wear_mask && (human.wear_mask.flags_inv & HIDEFACE) && READ_PREFS(human, toggle/obscurity_examine)) || (human.head && (human.head.flags_inv & HIDEFACE) && READ_PREFS(human, toggle/obscurity_examine)) || (HAS_TRAIT(human, TRAIT_UNKNOWN))) + if((human.wear_mask && (human.wear_mask.flags_inv & HIDEFACE) && READ_PREFS(human, toggle/obscurity_examine)) || (human.head && (human.head.flags_inv & HIDEFACE) && READ_PREFS(human, toggle/obscurity_examine)) || (HAS_TRAIT(human, TRAIT_UNKNOWN_APPEARANCE))) continue //Display custom species, otherwise show base species instead species = (READ_PREFS(human, text/custom_species)) diff --git a/modular_zubbers/code/modules/clothing/mask/gasmask.dm b/modular_zubbers/code/modules/clothing/mask/gasmask.dm index 042423c8305..c431a822c94 100644 --- a/modular_zubbers/code/modules/clothing/mask/gasmask.dm +++ b/modular_zubbers/code/modules/clothing/mask/gasmask.dm @@ -64,19 +64,19 @@ if(HAS_TRAIT(human_user, TRAIT_SIGN_LANG)) user_tongue.temp_say_mod = "signs" - human_user.special_voice = previous_special_name + human_user.override_voice = previous_special_name previous_special_name = null return - if(human_user.special_voice != modulated_name) - previous_special_name = human_user.special_voice + if(human_user.override_voice != modulated_name) + previous_special_name = human_user.override_voice if(human_user.wear_mask == src && modulate_voice) - human_user.special_voice = modulated_name + human_user.override_voice = modulated_name user_tongue.temp_say_mod = "states" return - human_user.special_voice = previous_special_name + human_user.override_voice = previous_special_name user_tongue.temp_say_mod = initial(user_tongue.temp_say_mod) previous_special_name = null diff --git a/modular_zubbers/code/modules/customization/species/lycans/bodyparts/lycan_bodyparts.dm b/modular_zubbers/code/modules/customization/species/lycans/bodyparts/lycan_bodyparts.dm index d49b2db0d51..aa94f8c6137 100644 --- a/modular_zubbers/code/modules/customization/species/lycans/bodyparts/lycan_bodyparts.dm +++ b/modular_zubbers/code/modules/customization/species/lycans/bodyparts/lycan_bodyparts.dm @@ -2,7 +2,7 @@ icon_greyscale = BODYPART_ICON_LYCAN limb_id = SPECIES_LYCAN is_dimorphic = TRUE - head_flags = HEAD_ALL_FEATURES + head_flags = HEAD_DEFAULT_FEATURES teeth_count = 42 // Wolves have 42 teeth :) /obj/item/bodypart/chest/mutant/lycan