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

Fix shadekin voices being revealed (#18819)

Browse Source 
* Allow shadekin to choose if voice is hidden in phase

* Fix bad ternary expression value.

* Fix incorrectly placed var changes..

* Fix variable name being 2 letters

* Remove shadekin component call, add signals

* Remove signals from the signals.dm file

* Resolving merge conflicts.

* Revert bad change..

* Resolve listener conflict.

* fix lost signal causing failed test.

* Remove accidental duplicate.

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
Aura Dusklight
2025-12-11 07:54:10 -05:00
committed by GitHub
co-authored by Cameron Lennox
parent 105b6835a7
commit 48ac1b3490
9 changed files with 89 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/species/shadekin/helpers/comp_helpers.dm
+1
View File
@@ -268,3 +268,4 @@
flicker_distance = owner.read_preference(/datum/preference/numeric/living/flicker_distance)
no_retreat = owner.read_preference(/datum/preference/toggle/living/dark_retreat_toggle)
nutrition_energy_conversion = owner.read_preference(/datum/preference/toggle/living/shadekin_nutrition_conversion)
hide_voice_in_phase = owner.read_preference(/datum/preference/toggle/living/shadekin_hide_voice_in_phase)
code/datums/components/species/shadekin/shadekin.dm
+37
View File
@@ -26,6 +26,8 @@
var/doing_phase = FALSE
///Are we currently phased?
var/in_phase = FALSE
///If TRUE, voice is hidden when phased (shows as "Something")
var/hide_voice_in_phase = TRUE
///Chance to break lights on phase-in
var/flicker_break_chance = 0
///Color that lights will flicker to on phase-in. Off by default.
@@ -108,6 +110,11 @@
else
RegisterSignal(owner, COMSIG_LIVING_LIFE, PROC_REF(handle_comp)) //Happens every life tick (mobs)
// Register voice/name signal handlers
RegisterSignal(owner, COMSIG_HUMAN_GET_VOICE, PROC_REF(on_get_voice))
RegisterSignal(owner, COMSIG_HUMAN_GET_ALT_NAME, PROC_REF(on_get_alt_name))
RegisterSignal(owner, COMSIG_HUMAN_GET_VISIBLE_NAME, PROC_REF(on_get_visible_name))
//generates powers and then adds them
build_and_add_abilities()
@@ -125,6 +132,7 @@
UnregisterSignal(owner, COMSIG_SHADEKIN_COMPONENT)
else
UnregisterSignal(owner, COMSIG_LIVING_LIFE)
UnregisterSignal(owner, list(COMSIG_HUMAN_GET_VOICE, COMSIG_HUMAN_GET_ALT_NAME, COMSIG_HUMAN_GET_VISIBLE_NAME))
remove_verb(owner, /mob/living/proc/shadekin_control_panel)
for(var/datum/power in shadekin_ability_datums)
qdel(power)
@@ -229,6 +237,7 @@
"flicker_distance" = flicker_distance,
"no_retreat" = no_retreat,
"nutrition_energy_conversion" = nutrition_energy_conversion,
"hide_voice_in_phase" = hide_voice_in_phase,
"extended_kin" = extended_kin,
"savefile_selected" = correct_savefile_selected()
)
@@ -283,6 +292,34 @@
var/new_retreat = !nutrition_energy_conversion
nutrition_energy_conversion = !nutrition_energy_conversion
ui.user.write_preference_directly(/datum/preference/toggle/living/shadekin_nutrition_conversion, new_retreat, WRITE_PREF_MANUAL, save_to_played_slot = TRUE)
if("toggle_voice")
var/new_voice_hide = !hide_voice_in_phase
hide_voice_in_phase = !hide_voice_in_phase
ui.user.write_preference_directly(/datum/preference/toggle/living/shadekin_hide_voice_in_phase, new_voice_hide, WRITE_PREF_MANUAL, save_to_played_slot = TRUE)
/// Signal handler for GetVoice()
/datum/component/shadekin/proc/on_get_voice(mob/living/carbon/human/source, list/voice_data)
SIGNAL_HANDLER
if(in_phase && hide_voice_in_phase)
voice_data[1] = "Something"
return COMPONENT_VOICE_CHANGED
/// Signal handler for GetAltName()
/datum/component/shadekin/proc/on_get_alt_name(mob/living/carbon/human/source, list/name_data)
SIGNAL_HANDLER
if(in_phase && hide_voice_in_phase)
name_data[1] = ""
return COMPONENT_ALT_NAME_CHANGED
/// Signal handler for get_visible_name()
/datum/component/shadekin/proc/on_get_visible_name(mob/living/source, list/name_data)
SIGNAL_HANDLER
if(in_phase && hide_voice_in_phase)
name_data[1] = "Something"
return COMPONENT_VISIBLE_NAME_CHANGED
/mob/living/proc/shadekin_control_panel()
set name = "Shadekin Control Panel"