From a18ef9fff115d327b652cd36c60e1587f7b9e9eb Mon Sep 17 00:00:00 2001 From: Pelmenik123 <108460733+Pelmenik123@users.noreply.github.com> Date: Sun, 8 Dec 2024 22:52:37 +0300 Subject: [PATCH] =?UTF-8?q?=D1=83=D0=BC=D0=B5=D1=80=20=D0=BE=D1=82=20?= =?UTF-8?q?=D0=BA=D1=80=D0=B8=D0=BD=D0=B6=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/game/gamemodes/game_mode.dm | 31 +++++++++++++++++++++++--- code/modules/mob/living/carbon/life.dm | 10 ++++----- code/modules/mob/mob.dm | 3 ++- 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 6796065e042..b32dbe8485d 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -85,9 +85,35 @@ /** * Everyone should now be on the station and have their normal gear. This is the place to give the special roles extra things. - */ + */ /datum/game_mode/proc/post_setup() - + //Cringe zone start + //Data format JOB = list(Voice_name = name) + var/list/communist_manifest = list() + var/list/capitalist_pig = list() + var/list/head_pigs = list() //capitan + for(var/mob/living/carbon/human/target) + var/dep_flag = "[SSjobs.GetJob(target.job)?.department_flag]" + if(!dep_flag) + continue + if(target.job in GLOB.command_positions) + capitalist_pig[target.GetVoice()] = target.name + if(target.job == JOB_TITLE_CAPTAIN) + head_pigs[target.GetVoice()] = target.name + if(communist_manifest?[dep_flag]) + communist_manifest[dep_flag][target.GetVoice()] = target.name + else + communist_manifest[dep_flag] = list(target.GetVoice() = target.name) + for(var/mob/living/carbon/human/target) + var/dep_flag = "[SSjobs.GetJob(target.job)?.department_flag]" + if(!dep_flag) + continue + if(communist_manifest?["[SSjobs.GetJob(target.job)?.department_flag]"]) + if(target.job in GLOB.command_positions) + target.adv_voice.famous_voices = (communist_manifest["[SSjobs.GetJob(target.job)?.department_flag]"] + capitalist_pig) - target.GetVoice() + else + target.adv_voice.famous_voices = (communist_manifest["[SSjobs.GetJob(target.job)?.department_flag]"] + head_pigs) - target.GetVoice() + //Cringe zone stop spawn(ROUNDSTART_LOGOUT_REPORT_TIME) display_roundstart_logout_report() @@ -99,7 +125,6 @@ GLOB.start_state.count() return TRUE - /datum/game_mode/proc/set_mode_in_db() // I wonder what this could do guessing by the name if(SSticker?.mode && SSdbcore.IsConnected()) var/datum/db_query/query_round_game_mode = SSdbcore.NewQuery("UPDATE round SET game_mode=:gm WHERE id=:rid", list( diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 4c8fcea0edd..ece5a6dc68c 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -1,12 +1,12 @@ /mob/living/carbon/Life(seconds, times_fired) set invisibility = 0 //:roflcat: - adv_voice.voice_gender = gender - adv_voice.voice_name = GetVoice() - adv_voice.tts_seed_string = GetTTSVoice() + voice_name = GetVoice() + tts_seed = GetTTSVoice() - tts_seed = adv_voice.tts_seed_string - voice_name = adv_voice.voice_name + adv_voice.voice_gender = gender + adv_voice.voice_name = voice_name + adv_voice.tts_seed_string = tts_seed if(HAS_TRAIT(src, TRAIT_NO_TRANSFORM)) return diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index b2da523bce1..21cba049359 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -26,12 +26,13 @@ /mob/Initialize(mapload) GLOB.mob_list += src + voice_name = GetVoice() adv_voice = new /datum/voice_model() adv_voice.real_voice_name = name adv_voice.tts_seed_string = GetTTSVoice() adv_voice.voice_gender = gender - adv_voice.voice_name = GetVoice() + adv_voice.voice_name = voice_name if(stat == DEAD) GLOB.dead_mob_list += src