From 40573ca2e40c9ae25587e9ea9cc2664238043aeb Mon Sep 17 00:00:00 2001 From: Dmitry <57028746+DIMMoon1@users.noreply.github.com> Date: Sun, 19 Jul 2026 14:17:14 +0700 Subject: [PATCH] fix --- .../Preferences/HumanoidCharacterProfile.cs | 14 ++++++++++---- .../Corvax/Entities/Objects/Devices/pda.yml | 18 ++++++++++-------- .../Machines/fax_machine.rsi/printing.png | Bin 482 -> 2056 bytes 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index c9d10ecddf..54f5002380 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -308,12 +308,19 @@ namespace Content.Shared.Preferences return sex; } - // Corvax-TTS-Start + // Corvax-TTS-Start + public static String RandomTTS(Sex sex) + { + var prototypeManager = IoCManager.Resolve(); + var random = IoCManager.Resolve(); + var voiceId = random.Pick(prototypeManager .EnumeratePrototypes() .Where(o => CanHaveVoice(o, sex)).ToArray() ).ID; - // Corvax-TTS-End + return voiceId; + } + // Corvax-TTS-End /// /// Picks a random gender using species sex; @@ -380,11 +387,10 @@ namespace Content.Shared.Preferences profile.Gender = (randomizeCfg & RandomizeCfg.Gender) != 0 ? RandomGender(profile.Sex) : baseProfile.Gender; profile.Name = (randomizeCfg & RandomizeCfg.Name) != 0 ? RandomName(speciesProto, profile.Gender) : baseProfile.Name; profile.Age = (randomizeCfg & RandomizeCfg.Age) != 0 ? RandomAge(speciesProto) : baseProfile.Age; - + profile.TTSVoice = (randomizeCfg & RandomizeCfg.Age) != 0 ? RandomTTS(profile.Sex) : baseProfile.TTSVoice; // Corvax-TTS profile.Appearance = HumanoidCharacterAppearance.Random(randomizeCfg, baseProfile.Appearance, speciesProto, profile.Sex); return profile; - TTSVoice = voiceId, // Corvax-TTS } /// diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml index e116f452aa..4e9a4a0e43 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml @@ -36,14 +36,16 @@ accentVColor: "#DFDFDF" - type: Icon state: pda-seniorofficer - - type: CartridgeLoader - preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NanoTaskCartridge - - NewsReaderCartridge - - WantedListCartridge - - AstroNavCartridge + - type: EntityTableContainerFill + containers: + preinstalled-program-container: !type:AllSelector + children: + - id: CrewManifestCartridge + - id: NotekeeperCartridge + - id: NanoTaskCartridge + - id: NewsReaderCartridge + - id: WantedListCartridge + - id: AstroNavCartridge - type: entity parent: BaseSecurityPDA diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png index 516ebc1e21285dd7f134451a567d1bdde0b21f0a..7297e7d3222acd1b4f44819443384d88eb051b2e 100644 GIT binary patch literal 2056 zcma)7X;f257JdN~K@@FBbUgNpgtVk^42@}>&YND8SGQJu zQPX+3w-?J#cemi$mbqKp?l~95i@9$V+kr~GWAcy+lafjusiZqAboDKORY3o6&He62 zu#rLM*xP+EZoPf`gDHaTSSr-7+-PPPlCND@WZGTiqt8?uO(LIb8OgBDMT6VH3Pgx! zWN0gw_wx|B>q_csl!JX`X)8O zg_AHzmb`rYxu}j8eY%n~k5*Uh75Wis9&;hi->$`66gW2+g9I3}IDN^Khd6QM&aJg8%!c&^6?kVL*0+J&uF6$5Kh& zAe@@++rET+d2?F_U$mMupMeHT6;D`XKE=JTT5S|{mp){SI>eDhpd@YDs%sY6QxOzu zNf!&Q%t2v}O?)rJUev%SWesN))=+Z$esQ_?RtPWV;a(+xmKTU0y}>!oQU;^m9e;|k zqquE!p%SYy_82B_Dr6?VG90HN9jOo<5_uFRrnLMm&@wWP;A+P1KyBN$)wcy-7sB&& zcel+S2|L`qP*JfHz@n*?4A{yB5&@PJTEWr=J}bJiRhHLrUfHVCa!xpZ@hLq*3!3vOBV6TX9w;2EcN{hxXrk~ zTPky(5!MZiOWyS-l*N1Q$J`c`iJ$-KVjlJRK1o?-f5oKNmm*&XP!~;gu3-7A*k&~M z+Ve-DUElO^nhZ$M!K89_!PEd;2Kgv)|9WBpa8iKNK0ds}z$;E*MXJY&NZiU4bSJ4Q zV>#kOi70i)Pz}l%mgvk%nlD~p1x8&b4kiZVQyH0+o|t{;mj`tIySY<3Nm!X!UnbD3 z@+4HSz7E7Z8l*U}ba_H4&{U1*YV>mYAuBd~>S#ttx-3#DoXq_mNEbVs0(S7~14Up& zs#HB|n39Yscj=sLMBRd{sqFTnXgPv6bZShuEX>1%L8S?49 zEOoxuNM-#|Y=7gopSY}_!dn$lEIH!pC)~zH*vd{m3Zm`oJ~3AtX6)p`Cuv~P4h7jk zQkmI4vFF?6BvXKQ#;_cPMC663p+gTdUfy1*)s2ayCs=!v9Ylxe*eSCUsP28A5^R{hWed^ z9f7PAalw)sR~eHoW?8Hq3Pb zsS2`~w_p4U-@rgc)r!P7>(>bxDfZcFM?Ch8xf zEMlV(5~&W<)9Gpekx0DNM=Z|%D=!FE1pyo~jYjK>I1^F%a2c=SUR>ED6WUD)RGBlx zJG6PbokkGt+tB!U16~|6>GTDHdGKPj43YMJN#$pzNA6b&1ogdP0rW;|8$?Er;hd(J z`M7NsmnU)F0|bDBTG&&BIJFJA*6(zUyfH=B;U4vpgllwYR->F|ZHLHsWvINVGolEo z^L`L%FG=Wq^X8X)65o;?spe8MbX&yU?GA|o2ZUa>d;JFMi>=oL+{c&x8gyI+t?q1r zPuL@Br3i^0IgB9D*ph)NLKsPE%K&dVS*C?;X06q+Y?^SQ++!>?6m?MbwF9os9!_+} Hp!7ch_G31R literal 482 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>u?g@AarO1} zZD?p%v0_DfdU{-3oUN_x!aE!9EIiKO%fRrTp|Y~_`Lk#L|Np;n9WeO&KNkerY2xYP7*a9k?Tv$6hYSQgs+j>+`?TuB1N8<7D#w|-zzDN69ya2@Zn$by!Y2HuPpmKYyI`Ad)xm<2s1q3 zjfh)a^S-EVU6!2O>UqZnf_rA~NoP`XIJ-ZA=PchIb4> zS@wTtRy=m+1$!53lj(+hCbk2*2NpC<{B~LJqM+<6R~ERggmU{0@0Q3j81Vggn=^gM zH1v!v?l*z6Tg~uu6m&T&lBD0>eelwLLJs&d;ku8;&zEET}M8c}M%{ zZ^od*ich#0RzA#l&c*Pt=KdK|hM>b2f#f~m2~vG!>lg~=H(V*$Qq0=$n`KGc;<@kH iJ$T!X?!NIixr8~OZvJG>*`c{0vprq?T-G@yGywp(k<1$a