From 7f74a925f85c24e0141f7bacfa422ed2ca1f9d75 Mon Sep 17 00:00:00 2001 From: brainfood1183 Date: Sat, 4 Nov 2023 15:29:29 +0000 Subject: [PATCH 01/14] French Accent --- .../Components/FrenchAccentComponent.cs | 8 + .../EntitySystems/FrenchAccentSystem.cs | 38 +++++ Resources/Locale/en-US/accent/french.ftl | 146 ++++++++++++++++++ Resources/Locale/en-US/traits/traits.ftl | 3 + .../Prototypes/Accents/word_replacements.yml | 52 +++++++ .../Entities/Clothing/Head/hats.yml | 2 + .../Prototypes/Roles/Jobs/Civilian/mime.yml | 1 + Resources/Prototypes/Traits/neutral.yml | 7 + 8 files changed, 257 insertions(+) create mode 100644 Content.Server/Speech/Components/FrenchAccentComponent.cs create mode 100644 Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs create mode 100644 Resources/Locale/en-US/accent/french.ftl diff --git a/Content.Server/Speech/Components/FrenchAccentComponent.cs b/Content.Server/Speech/Components/FrenchAccentComponent.cs new file mode 100644 index 00000000000000..a62ee93b927a2b --- /dev/null +++ b/Content.Server/Speech/Components/FrenchAccentComponent.cs @@ -0,0 +1,8 @@ +using Content.Server.Speech.EntitySystems; + +namespace Content.Server.Speech.Components; + +[RegisterComponent] +[Access(typeof(FrenchAccentSystem))] +public sealed partial class FrenchAccentComponent : Component +{ } diff --git a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs new file mode 100644 index 00000000000000..c4efa815776ee8 --- /dev/null +++ b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs @@ -0,0 +1,38 @@ +using Content.Server.Speech.Components; +using System.Text.RegularExpressions; + +namespace Content.Server.Speech.EntitySystems; + +public sealed class FrenchAccentSystem : EntitySystem +{ + [Dependency] private readonly ReplacementAccentSystem _replacement = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnAccentGet); + } + + // converts left word when typed into the right word. For example typing you becomes ye. + public string Accentuate(string message, FrenchAccentComponent component) + { + var msg = message; + + msg = _replacement.ApplyReplacements(msg, "french"); + + // replaces th with dz + msg = Regex.Replace(msg, @"th", "dz", RegexOptions.IgnoreCase); + + // removes the letter h from the start of words. + msg = Regex.Replace(msg, @"(? Date: Sat, 4 Nov 2023 16:43:14 +0000 Subject: [PATCH 02/14] due to standard beret used by sec senior role, added new french beret (black) can be found in theatrevending machine --- .../VendingMachines/Inventories/theater.yml | 1 + .../Entities/Clothing/Head/hats.yml | 16 ++++++++++ .../equipped-HELMET-hamster.png | Bin 0 -> 21181 bytes .../Hats/beret_french.rsi/equipped-HELMET.png | Bin 0 -> 16970 bytes .../Head/Hats/beret_french.rsi/icon.png | Bin 0 -> 15283 bytes .../Hats/beret_french.rsi/inhand-left.png | Bin 0 -> 16928 bytes .../Hats/beret_french.rsi/inhand-right.png | Bin 0 -> 16926 bytes .../Head/Hats/beret_french.rsi/meta.json | 30 ++++++++++++++++++ 8 files changed, 47 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_french.rsi/equipped-HELMET-hamster.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_french.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_french.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_french.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_french.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_french.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index d4dd657027cbb9..d6774ac5aad80e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -21,6 +21,7 @@ ClothingOuterSanta: 2 ClothingHeadHatSkub: 2 ClothingOuterSkub: 2 + ClothingHeadHatBeretFrench: 2 ClothingOuterSuitChicken: 2 ClothingHeadHatChickenhead: 2 ClothingOuterSuitMonkey: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index ce36a438e0999b..bdc1c6aa82f7be 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -19,6 +19,22 @@ sprite: Clothing/Head/Hats/beret.rsi - type: Clothing sprite: Clothing/Head/Hats/beret.rsi + - type: Tag + tags: + - ClothMade + - HamsterWearable + - WhitelistChameleon + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretFrench + name: french beret + description: A french beret, viva la france. + components: + - type: Sprite + sprite: Clothing/Head/Hats/beret_french.rsi + - type: Clothing + sprite: Clothing/Head/Hats/beret_french.rsi - type: AddAccentClothing accent: FrenchAccent - type: Tag diff --git a/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..e7088999c3c82eed7ead15fa796be77bd1fd161e GIT binary patch literal 21181 zcmeI4eT-aH6~G^$d=yZkG15|X9AW~Nw{t(KP#E?coo)3g)UtsUD0pJ&H^#~uyuH;0!z4Ijr< z)^4e3+VSs?|BldZ*mJU`ZTN9GvAMo^{8Ju}rUsaZd^s>ZRRL*D8$4^e!uU2>&-rpP zEDz;hyyw1rE)+xg3(avfUKy2J!?ioB^1PkvC-}~7+!gt=ipvJ4JuomO>nt}tRVvrK z>7jhnt_S7#av`5gwr$vF!7B-O!xL;0=sdc`Xg8jZ$4gAPR1$pUs=w}4225FI4+ z+Dy65ruA~|)RvL9oiSPC)v!_zqjD~`%lv42eJG!gE1G>J{hF%GR#dJf?0{lnnpFyT z02O*E2|lY+*_q&+oj6EhWA*d%Mw_9~aFcR*K8?bZ8QeUt2XXA!1Ayr-dh7%X5XzOx_% zIUO#b7T;;9HOExT)q?=d8?8!KkE#<xQ;3a-*Zo;h8(_!muo&M(y;$Lbpn1 z;B>6XF;8kM3dv`7}|V4>IL zo?2rO-yYA3;WC#sa6wIR4LGPd??>3=+^g*yrLc(CI3pvjNmm=xbw)<&cvID>_FhJ#?I_QdbW^;Xyt5f6peX*J@UNkSk}Sq?Z5OQHJ+-nb*~_tLCdtmO;hKFD;*LDix9t0(*`2~1x)I$L1bb&phOR_&jdk+M9ApVwCVWR zu?W(oZ5T`2YFki2eayf#Hxt$p_;A~?86g3qnDp6dS8yqjMS!)mm$uce6g2R`sxMtX zF)d-1`nG_+5b6eIzi#B%FipqeuuRef2qTuEgLj3bmP;j-eF71bGoK2sJ1pR>Rx^V$ z-7zU41akzP>DRPHT!v);tVJ?qmTFuJ2J^zTUERgfNk)hd|H3S!J|U*%+PKeFODv^h zu_lnj^ilzlE@y^-A?+F_N=C>M%|^+jFF1@4VBI#oL@`7PLlEW!@d#OJAd(X78^Ag+ zlM%w0O>|~TgE_(pFzz>A%RpMDYcQSKED5Tv>mc2Am}^47btDsgj*x(0LLC?(h6TWz zO94Xx@ClGKDdoiW`!;P7f+&P1XkaqY-+HSjLr7p+>sPY~p@%ulvUF-%fo}MQrMt+X zx`TyeoJhxT(iZ{9a0Uddh`x_}E&{BxK)SjxjX-x@AGlgR;$TQR*i7ZxHWrvzxCXLx z;yX+?87w5Q;5oWQEG`gtxb3=&H^v;utvJ>#P=n^h!^$?W9#BLAjtCHdJfzp+-?}98?Rc0F*N~D>Vl}h2 zx$2#?Br)Bt9ZdI5O$;Lt6oC(rM9o1Xb>={(0wV_olZz;I!N09`D#qqjbZ#|-4Ie8h zGHplM9Gt;Tp$B$g>Vg`k?nAXYcOdn_)PR1mb`?F$%&Tf`7^ikKb91m}YImNzWbV~Y zYS-MFRamtqR7bF*A`|g(g8|zq9+6Cb>(Bb65)Xl(vZL5K8 z9rjO_}+G3w-_-V>VtgK*jkJaaec?T!EZO?~?Wqm`kpiSx?%`~?DA${rr}X7CWuQ!0 z%R-9EjYP3EZIrJWG#%5r3SVM??@ttFzd)h*ObL}sUF`H|sVyt^vPu*f>BS6JIwM6Q z!==DTFJ`#X87UGOE(JzfstO!aHTU+Br;qIjPzoL zE1i)dk>OHcq!%+>>5LSK43`2Uy_n%jXQW7ExD*)a#SB+EBSj*^rNBrpX1LNBDH0hj z1x9)?!qy(zL%` ztZCkEP5WT%fUvTi32k*M=&W)2Fc}#oE#SfL9_?8Uc^V3Jk2}gbCpAWkeN1b-{xu^gA zz%75<_pUE|`@xG|tNi4}*G_zH+1U+w_i}#6@a`G=oNI3V`3e78vHzx#ZTfP4@HXeh ztG~ME)s;^?dC$A)BhIcr?z!%E^U8-`Zrp$7G4zwyY&`$6S4IUb^+d-`%|WjqCn&?{8K-a@_T=&+NVIYxf2(J#_NHr&s0ohBy4#DgXBI-L>^U zc>Fs*{OcB`BY$-KzhC&=%Lghm z=bU=QufF$>+c!Rc#oFc1pMGs))xG=PcYm>WGoHQiXZy7i@JpW_yI{=&vB&L!7 Ia`6}c17H+BdH?_b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..8175d93dc5e3261f1254488fa19963e52f8f97be GIT binary patch literal 16970 zcmeHPd2kcg9bQuo#|%vfv{0@J(KMzY@9MU;vW&3+3oI;b6KoesR=ZE~#*%iUT_M>a z)G>wOG!5Z~3E@g93piwz-mT}St)KbM z%9-=Hg1$qhU06El$+^cl=N`X!gTMHTU$aYA8w(E2>^N#o#mtQH_9gt@WrK5$d^2Le z!ZEWqjKA6LmTzOvmlr=vvtgb-(Y2J9qu@=VfQVxYo0e`4Y8s zaZmDF%hu(e<+>j{e417@*1x*u)-kv)mQ{3V8DC~E#7V}RMNo_rWQDveTtx&i=Z08< ztOC5k3EZ?VM|pF{Zl!{za+G8AcFfM^gG#!f#t%wrMwXH_Riueh=2|k$Ashzq0-jKW zydEEihjNtRxH$YRG^0vI7{XWODD#AbiZZ)Hk zYCVc+Q7xv@XmK5e>okh!OKHh~zs!Ehg%?|gM$^H+a+H-k&*CT=3qC|N+wrY%>uL-a7@5Yf*})tkMEZ%)G(Xf5sxHH z*G+rb@Py$aq)bkcaXcIFd%{?XM1co*VG<6GTb+^zxJXAbP5Cu(6Ft93bL$VZGwr zEe7CeSHf0JrZ4ogNCP3d1)9(kp@mHx@s=6R!EVQ`3>gp>!)CPz%ZXDANmF?ECz%cO zCbb5ZiJr(-=?D|1G69!Sr8PRKY)or30kz32NYOM*!oJZIHXp|mJ`%tb5S&HB_&VTp znMfm{A}}gjrODO-mD8v!hP9!i0I6~s2)HbIOb=X6jX|T;#1e?;E$84E7at`2AkPggW*G(z zrqE=mF-7JW+D9=#u750AQ((&hgO$K%(O?>_3WKA>N-?-i>v63<7AM@FOgE##_UfVk z@2e!zOj;#GTp*$+PcdPighFby3e%OU4Y*c^>x>nxN|fL?U5Us=GjW!JM=9YV`M)n< z%$MJ3)YOX>X>D3@u_|s}p=RNdh37eJ7EKmrM&o}a)Qcb-9)fo#>O zTWBxg1}N)uo6$sLQ=~BXX2@ux2nkJx=lcNxH?mTO@mRjc>LycCMFUoX2a&2wcutFB zYUsH*KLSdk+Zl>>Ri~myEi2GPpkz8c;!y-od{+Q5OcX+NAixV5k`VUYusm=hO~8cG z5cZG3gc}t#o5kmeR_NwbSxPFIpidM`QjTPDlMH!&KFIj1iu^^+*8s^&&CxQwNtR-G zNauKewN0{6DVb*BaE03hpO*w!)1rvqf4YY9UPmAIE(EX{R8V<3~$8pYbq$SU11|ccfI!344oJ@J87YxlgtTyOP2g zpgp{b_9?jHVS~kSL_kp>;dF|_qZGW0)VBzz>OoJ5ki zvRtxUk`#~xmfa=GB}oBEVA)-=T#^)!1eV<;%OyzxNnqJsvRslBkOY?9CCepA0ZCxl zU9wz~6p#d#-6hKHEc442kMYo@xKe*o7xj6kr z;=!iw#h-x_bNLa^(pEIgUp%p4GS>NU;qqPw&Y>B7Kd?Z@BL)?=jo!zGuyS+}5cuAM|brTzs@@)#gj5+iWB6Ec(}#BU?N>wN|Wl z-MUF<-+Qm2eoN&B{p^cho-^9Je9&PvUGpKkrfcU>TXTN&{GCnX$KUG1el+&soVwrk nXxz5{f~l2pgu6a|W8(A3?SeL!4qiYW3N5xFBdr?;zgqWS#yIcZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..608a155cfdc842548333de8732dd527a1dc06ec2 GIT binary patch literal 15283 zcmeI3du$X%9LEQZP^&~xt4Po+2O4~A_jP;MTdxPD2W<`4mOiwgMz_0j*9~{O$L_Yh z7XFY&A_O&xiI3Vu{!ol05~DF{w2BW*jE{dvtkE>!Bc^HE>J!2G7hXdC)wym!T1^yv%^oP#w)dIJz%nMteKCg?KVFkzUrzT-<74T1*kd#f+OU1FxkDS=q=j_f%1C86qo4pO=&DR6l{6hCQ|rsdRnTv*ne#E( zF7BpUU!9kb>58>7^_C48xjMjVd?3gKL)C&D4Elq&Fd{F=94~Pa&x(@b=M}%mO z68#F>dR%FXuFa=IR;{ncb<+yR_4oHz_e<55o#2E}D8%t1CyFfU!8!w`t7cf!S(Xbj z6(^Gc-)iA*QY4pHPXYMK+Od9IvD*9w|+ubs>e zP1iV>gehpc4$=u_b?F|r-Bh!+=US|rai>)2t&m__D!at5FX@EKQR(QatNvYp(rzUobWMp{c1m?4MoLXU zE^Q{lT(PmFXJIcX^;Xid(THF~3UlR}OH|qYr8Jq2tC|{YibhaFwPEOrEck=nFc4=Y zwMJ&88o$7*vL>?rZY>b+_N!uCgxR^rVx{sKp`(`8>(vMfojXo+OGDv{!_oqBjT(we zY_MC5vw{F28xkaq4M7>g8Y#dBG&GIeI7@=fNYr8*=(JOlC4IcP=qQ;a`XxOs_|Y`f z5bM|cLAFNfhHOv`KrJ2!Ng=r~moi~yq-r!Av_}U@_Ac7N+4HO&Zl2ycK+^aR7Q#{c{@pU1TUGs|Wted; z{eLS^+`w9oY9^o_;imTPRKvL~T5c()7uD2RFtZ55-oKH83K(rBHCs4Bn48g7%$)1r zq?vWNE1zmlle zk@;X=iVFimHYqMLAIwW}VL-?x#YN_Wc_}Uo2-&2#$b2v_#f1SOn-mwB59Xz~Fd$@; z;v)0Gyc8D(gltk=WImXe;=+KCO^S=m2lG-~7!a~aagq68UWy9?LN+NbG9S!KabZBn zCdEbOgLx?~3<%kzxX64kFU5rcA)6EznGfcrxG*4Olj0)t!Mqd~283)J zkWGq<%m?#QTo@3tNyJrId}b4x=t0eX^hD+}iS*unqw=ux z+R@{$jhV|HNo?-CcH6qXLtCCcJcs$9LfYY&`f2{s*E_0&wd+1TWWVlTxNX;=(7e5G z@9eC4{G*HZ9QL(X@m<2#TO%zWtr|M{$D8-7i=O>+aO47T>aBSnCePf`uA91O!T6rz`|1`|4xn`aO>3H?2Up*_{V&;C!F2!t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..84d21a6738cdc91042032e3fe12be58f727de5c7 GIT binary patch literal 16928 zcmeI4Yj6|S701^BYGdjG11XP|A_PoB%4#2aS&J;NEkD#CaBKtS6d!#5|^@#U?-kghxt=Asr}WCIP2FVG=r+0u9Y%+VC*YyOJzj$ub*v zGSe@s8Ka}S=YP(vPWhk2$JI}b(VwgDav2gx4^$U`9+t(SAVf| zwuB%9hA4j-$c9bB5hPvU9_iS;=2A0{rpikgwpn=?c|tklU8&V{mImPZ+XkK>*2j?2W>9e@!G!H-SoPZx%Miq|m9MOltK3s5M(`VGR`76!uwMkT zh#>aKVUcF)I9cc6s`)^k{`R5w^g5o+)6X)yakp5=)$pZDf?UOtX_d^9I>yH8Cp)t3 zVG0EBb26<9`+Wh43g_t~aVcOc&6r*nagpot^!Z9cU6s2`S11HIo!MYP8QfykS#1Ww zY_*!K6Llm`m@(Xl8F7>}QYM@-k-FGN@5lz0J;-{ga%XWY9r%@}uaRYu!mv;%WC$4z zLa-VmY&IK)lNd>&zyp;U0x}&&1Jc-NkghmRPGW+*DDy%rVCZ# za+k#;DZ{Pi{bFRmU=q?MXPLOaSReF7d|3wLe4HO7kwCwRv^o$kE==3yblr1_GGhYD zqHtoofG!isD#T zrRZwtS;BXp7J{@H2?EDaj}1(Qi7;}ghcPoK;q@}+T(8+;RHh}`B}m?L4oUFJAv(zA zSA!CBlz;-$kp=?SJvECDutG?h&=oD&vFCuH8ZO`8-^2=Nf(tz8s_^(8PL_NxUwCojven+e0#LAC5?35aP=BgTBTh%Tv0Bi&MWFg(Z_SaG#v-4K6wHjtAb+2O1^g?yNjX`3k9(OoH}ac z>7hU`y4j;F8g(kqZ~;m9`om5mu*Z*GB;)I$LpP_;E& zs)%3*4Hry9)z)ySB7z+>Trdq)Tf?P_2zJnL!8BBD4VNk+*g?Yu(@?cFT&jp*2MrfY zL)F%BsUm_MG+ZzZRr|5HvJ-Efa{=(Wc?i5$-cP=>1-z54V@k{22(n~6f;Tv|Qu@FJ1^$0RdShJw582pz53tZ0p%J79-7mlr3h7axc;a4xdsPm2zpM3PF z_0p>4Qc_DD;&Y>jFYjC! zZfx08Iiv0Df6V^T1zX;28Fv4ZcXuCe+?ADsoLIl@)se0H{r88ye|YKYS2jsaSwhCb z)vkukLyQ%xzqr^jza7<2&73T}w_MDfGW#{xgd(E2cEhy*a{2xYv{k>$r4$P<+u3yr8Dy0kEA|@?`)d9{+ekn^QF|sxnS<~i- F_%E>;#d81v literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..aee4b59f97a0cd033d24f6255e6c88fb3ff99e28 GIT binary patch literal 16926 zcmeI4Yj6|S6~~tj6l0(`layC@2oajVu-es1mb8m3YD<0yBkWiP41vIUcO|baX&3Dp z$+#hu$4m$$q);*`=}_KnXoHgm3Y1_5&)7P;d;aI#`@84fz58Lkv3g$l$o%p72!f1sSGa1x=eL#Lysv}52l*8rfRABf z#UcqohTpIJ4nlVPa4doh+RQth)zuAxEJzK4sB=4=Ix#Hx_yC6>(aYO^JFCGv=z+8U z_`}IZ8~5*jYMhH&f>VnMCU-o#XYAnN)1GTkDAL*xkW7tD^_u1b)7r7X*bypp`vU%Gl?cRr8e*EDdoiFRCA$Qzr z?EIPYBDrAWiN9|@a(;;SRy@{WGbz2i<)_OChq@6IEI>?@CSKmE<0>gPW((o@Iz^_Ss(FmG^DZs$;z2d@r`{^pLc`sPMzxb?v8Czfx$GTUEvyBFy|!f!tPlX2@1#IcvJt&{6Kb16m$8faFi=M2%H z2xbvM?6adH%`|bcuAcMrp(1_HiBozV&lc$y7J6`x=;RvsidA9GyJ}u7v#N<9S^aEB zzCB8T06|WsbtZf)Q<1({NvNyyRO_5Vn9~&+EGUCptU4=c zFcw;^X6sBHfg1}k+=Q8MlrT|doH7%-#E;&Q4=j6_^-(phvP3%Ytw`S>%OZtgkx0Z4 zF&TugA2X69iQxoB5Ge3KrIwIPN70ZpH6A1x$HhrZm=|SU2%&33`Ad7NteZXuz>x5X+^MeECxAX1diKKoInXOX9vVUvjq2`S>lwYSf~K&!;}Fl&~x=eOl~}I zfOxel^Od^XZvdJ1rOPT~_{x=jWn7f+N2Xkf%VI?wuPr+mgU3U;1g2S;47banOee(( z49`+AlkwFPoDHW@+{&`3nFOV5D^!?SSSx9wZ7f;nvnwbv!=%eMk-{C4WIDufAO&zX z@F2d0CT!+<&Wc)$W*Q|;W*nvK>q!)6aFRBe!8-J@$<1<0CnRZ|MSwdsGK#*(Zd9jzn1|TvN^2 z{12$2vJY(P1(#Tglj!*WCjH&unJ>Ki#m9%zpK;GQZdW}@T=7P7A>9?>a?E#TDAAXh~~ z1L$VIvUt?FJi~<~;mZ#@hrpgXT2f9SAcVoX;T$G=`osw}r^_2sfd}R4_;a#D*(!DQ z&3r&c`H)VkDKCNJK#ou#<#bAcqZGK+$Ci=lYHPSu5y1``E|`X@t>IEd1UqQBU>d5n zhD#L@?4aR-X{g#7E>%RZgN6&Hp=xWmR1v`r8ZMZIs;%KtMFcx&xL_KpwuVa;5$vGh zf@!GQ8ZK2tu!DvRrlD$UxKt6r4jL|)hN`XMQbhziXt-b+sXwsJNJKK>n_0GZ7bB0WD{c`!zu06U>ds}tHqCZXRn!ubs}qevO3!5Yc*$% z2;$XE56@`Z`Nz)Ay7nj zSM8GE=~Kw+Z6n46JBIvPkZu-yEfINF=gmn->65Rmtem;1U1@Wd&T}0qS-$qagS@{g literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/meta.json new file mode 100644 index 00000000000000..ade65863af2dc4 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 9392e66d202e4f1ade8e2f7e8a518346433deaea Mon Sep 17 00:00:00 2001 From: brainfood1183 Date: Sat, 4 Nov 2023 17:26:42 +0000 Subject: [PATCH 03/14] bread is now baguette --- Resources/Locale/en-US/accent/french.ftl | 15 +++++++++------ .../Prototypes/Accents/word_replacements.yml | 2 ++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Resources/Locale/en-US/accent/french.ftl b/Resources/Locale/en-US/accent/french.ftl index 1996b097be8d5a..203c65579aaac2 100644 --- a/Resources/Locale/en-US/accent/french.ftl +++ b/Resources/Locale/en-US/accent/french.ftl @@ -136,11 +136,14 @@ accent-french-replacement-45 = je accent-french-replaced-46 = yo accent-french-replacement-46 = salut -accent-french-replaced-46 = very -accent-french-replacement-46 = très +accent-french-replaced-47 = very +accent-french-replacement-47 = très -accent-french-replaced-47 = france -accent-french-replacement-47 = la france +accent-french-replaced-48 = france +accent-french-replacement-48 = la france -accent-french-replaced-48 = greetings -accent-french-replacement-48 = bonjour +accent-french-replaced-49 = greetings +accent-french-replacement-49 = bonjour + +accent-french-replaced-50 = bread +accent-french-replacement-50 = baguette diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml index 1743f645d42ca5..c34a6d9773afed 100644 --- a/Resources/Prototypes/Accents/word_replacements.yml +++ b/Resources/Prototypes/Accents/word_replacements.yml @@ -588,3 +588,5 @@ accent-french-replaced-46: accent-french-replacement-46 accent-french-replaced-47: accent-french-replacement-47 accent-french-replaced-48: accent-french-replacement-48 + accent-french-replaced-49: accent-french-replacement-49 + accent-french-replaced-50: accent-french-replacement-50 From 09b96594a0ecfafb7a1ab5afcabf2314efacd19f Mon Sep 17 00:00:00 2001 From: brainfood1183 Date: Sat, 4 Nov 2023 19:54:39 +0000 Subject: [PATCH 04/14] removed some words and added spacing for punctuation --- .../EntitySystems/FrenchAccentSystem.cs | 8 +++- Resources/Locale/en-US/accent/french.ftl | 44 ++++++------------- .../Prototypes/Accents/word_replacements.yml | 6 --- 3 files changed, 19 insertions(+), 39 deletions(-) diff --git a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs index c4efa815776ee8..57580a8ed6f301 100644 --- a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs @@ -22,11 +22,15 @@ public string Accentuate(string message, FrenchAccentComponent component) msg = _replacement.ApplyReplacements(msg, "french"); // replaces th with dz - msg = Regex.Replace(msg, @"th", "dz", RegexOptions.IgnoreCase); + msg = Regex.Replace(msg, @"th", "'z", RegexOptions.IgnoreCase); // removes the letter h from the start of words. - msg = Regex.Replace(msg, @"(? Date: Sat, 4 Nov 2023 20:02:47 +0000 Subject: [PATCH 05/14] changed to ! ? : ; --- Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs index 57580a8ed6f301..2380c3088d2528 100644 --- a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs @@ -27,10 +27,11 @@ public string Accentuate(string message, FrenchAccentComponent component) // removes the letter h from the start of words. msg = Regex.Replace(msg, @"(? Date: Sun, 26 Nov 2023 18:31:34 +0000 Subject: [PATCH 06/14] removed many of the replacement words. --- Resources/Locale/en-US/accent/french.ftl | 76 +++++-------------- .../Prototypes/Accents/word_replacements.yml | 13 ---- .../Entities/Clothing/Head/hats.yml | 2 +- 3 files changed, 20 insertions(+), 71 deletions(-) diff --git a/Resources/Locale/en-US/accent/french.ftl b/Resources/Locale/en-US/accent/french.ftl index 1a593d2cdb162a..404607fa9607df 100644 --- a/Resources/Locale/en-US/accent/french.ftl +++ b/Resources/Locale/en-US/accent/french.ftl @@ -2,22 +2,22 @@ accent-french-replaced-1 = yes accent-french-replacement-1 = oui accent-french-replaced-2 = hi -accent-french-replacement-2 = salut +accent-french-replacement-2 = bonjour accent-french-replaced-3 = hello accent-french-replacement-3 = allo accent-french-replaced-4 = bye -accent-french-replacement-4 = au revoir +accent-french-replacement-4 = salut accent-french-replaced-5 = goodbye accent-french-replacement-5 = au revoir -accent-french-replaced-6 = the -accent-french-replacement-6 = la +accent-french-replaced-6 = dead +accent-french-replacement-6 = morte -accent-french-replaced-7 = is -accent-french-replacement-7 = est +accent-french-replaced-7 = traitor +accent-french-replacement-7 = traitre accent-french-replaced-8 = bread accent-french-replacement-8 = baguette @@ -25,14 +25,14 @@ accent-french-replacement-8 = baguette accent-french-replaced-9 = very accent-french-replacement-9 = très -accent-french-replaced-10 = good -accent-french-replacement-10 = bien +accent-french-replaced-10 = murdered +accent-french-replacement-10 = assassiné -accent-french-replaced-11 = great -accent-french-replacement-11 = super +accent-french-replaced-11 = botany +accent-french-replacement-11 = botanique -accent-french-replaced-12 = beautiful -accent-french-replacement-12 = beau +accent-french-replaced-12 = murder +accent-french-replacement-12 = meurtre accent-french-replaced-13 = music accent-french-replacement-13 = musique @@ -41,7 +41,7 @@ accent-french-replaced-14 = greetings accent-french-replacement-14 = bonjour accent-french-replaced-15 = france -accent-french-replacement-15 = la france +accent-french-replacement-15 = la France accent-french-replaced-16 = captain accent-french-replacement-16 = capitaine @@ -58,8 +58,8 @@ accent-french-replacement-19 = magie accent-french-replaced-20 = magic wand accent-french-replacement-20 = baguette magique -accent-french-replaced-21 = we -accent-french-replacement-21 = nous +accent-french-replaced-21 = banana +accent-french-replacement-21 = banane accent-french-replaced-22 = small accent-french-replacement-22 = petite @@ -85,47 +85,9 @@ accent-french-replacement-28 = cuisine accent-french-replaced-29 = quick accent-french-replacement-29 = rapide -accent-french-replaced-30 = library -accent-french-replacement-30 = bibliothèque +accent-french-replaced-30 = french +accent-french-replacement-30 = Français -accent-french-replaced-31 = shit -accent-french-replacement-31 = merde +accent-french-replaced-31 = please +accent-french-replacement-31 = s'il vous plaît -accent-french-replaced-32 = if -accent-french-replacement-32 = si - -accent-french-replaced-33 = traitor -accent-french-replacement-33 = traitre - -accent-french-replaced-34 = murdered -accent-french-replacement-34 = assassiné - -accent-french-replaced-35 = botany -accent-french-replacement-35 = botanique - -accent-french-replaced-36 = murder -accent-french-replacement-36 = meurtre - -accent-french-replaced-37 = banana -accent-french-replacement-37 = banane - -accent-french-replaced-38 = what -accent-french-replacement-38 = quoi - -accent-french-replaced-39 = please -accent-french-replacement-39 = s'il vous plaît - -accent-french-replaced-40 = will you -accent-french-replacement-40 = veux-tu - -accent-french-replaced-41 = french -accent-french-replacement-41 = français - -accent-french-replaced-42 = librarian -accent-french-replacement-42 = bibliothécaire - -accent-french-replaced-43 = yo -accent-french-replacement-43 = salut - -accent-french-replaced-44 = dead -accent-french-replacement-44 = morte diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml index 7b9501c6b6f5e3..4a58968606b39a 100644 --- a/Resources/Prototypes/Accents/word_replacements.yml +++ b/Resources/Prototypes/Accents/word_replacements.yml @@ -571,16 +571,3 @@ accent-french-replaced-29: accent-french-replacement-29 accent-french-replaced-30: accent-french-replacement-30 accent-french-replaced-31: accent-french-replacement-31 - accent-french-replaced-32: accent-french-replacement-32 - accent-french-replaced-33: accent-french-replacement-33 - accent-french-replaced-34: accent-french-replacement-34 - accent-french-replaced-35: accent-french-replacement-35 - accent-french-replaced-36: accent-french-replacement-36 - accent-french-replaced-37: accent-french-replacement-37 - accent-french-replaced-38: accent-french-replacement-38 - accent-french-replaced-39: accent-french-replacement-39 - accent-french-replaced-40: accent-french-replacement-40 - accent-french-replaced-41: accent-french-replacement-41 - accent-french-replaced-42: accent-french-replacement-42 - accent-french-replaced-43: accent-french-replacement-43 - accent-french-replaced-44: accent-french-replacement-44 diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 1b04ec8b3f18f2..caa3741b6f3877 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -29,7 +29,7 @@ parent: ClothingHeadBase id: ClothingHeadHatBeretFrench name: french beret - description: A french beret, viva la france. + description: A french beret, viva la France. components: - type: Sprite sprite: Clothing/Head/Hats/beret_french.rsi From 13a440bc31530169ecbe835e9fa41a55ccdfac1c Mon Sep 17 00:00:00 2001 From: brainfood1183 Date: Sat, 2 Dec 2023 17:29:46 +0000 Subject: [PATCH 07/14] removed more words, removed french accent from traits. --- Resources/Locale/en-US/accent/french.ftl | 45 +++++-------------- .../Prototypes/Accents/word_replacements.yml | 7 --- Resources/Prototypes/Traits/neutral.yml | 7 --- 3 files changed, 12 insertions(+), 47 deletions(-) diff --git a/Resources/Locale/en-US/accent/french.ftl b/Resources/Locale/en-US/accent/french.ftl index 404607fa9607df..ac9f4ee7dfd298 100644 --- a/Resources/Locale/en-US/accent/french.ftl +++ b/Resources/Locale/en-US/accent/french.ftl @@ -22,8 +22,8 @@ accent-french-replacement-7 = traitre accent-french-replaced-8 = bread accent-french-replacement-8 = baguette -accent-french-replaced-9 = very -accent-french-replacement-9 = très +accent-french-replaced-9 = very much +accent-french-replacement-9 = beaucoup accent-french-replaced-10 = murdered accent-french-replacement-10 = assassiné @@ -40,14 +40,14 @@ accent-french-replacement-13 = musique accent-french-replaced-14 = greetings accent-french-replacement-14 = bonjour -accent-french-replaced-15 = france -accent-french-replacement-15 = la France +accent-french-replaced-15 = please +accent-french-replacement-15 = s'il vous plaît -accent-french-replaced-16 = captain -accent-french-replacement-16 = capitaine +accent-french-replaced-16 = thank you +accent-french-replacement-16 = merci -accent-french-replaced-17 = fries -accent-french-replacement-17 = frites +accent-french-replaced-17 = french +accent-french-replacement-17 = Français accent-french-replaced-18 = wand accent-french-replacement-18 = baguette @@ -58,8 +58,8 @@ accent-french-replacement-19 = magie accent-french-replaced-20 = magic wand accent-french-replacement-20 = baguette magique -accent-french-replaced-21 = banana -accent-french-replacement-21 = banane +accent-french-replaced-21 = security +accent-french-replacement-21 = sécurité accent-french-replaced-22 = small accent-french-replacement-22 = petite @@ -67,27 +67,6 @@ accent-french-replacement-22 = petite accent-french-replaced-23 = thanks accent-french-replacement-23 = merci -accent-french-replaced-24 = thankyou -accent-french-replacement-24 = merci - -accent-french-replaced-25 = thank you -accent-french-replacement-25 = merci - -accent-french-replaced-26 = very much -accent-french-replacement-26 = beaucoup - -accent-french-replaced-27 = security -accent-french-replacement-27 = sécurité - -accent-french-replaced-28 = kitchen -accent-french-replacement-28 = cuisine - -accent-french-replaced-29 = quick -accent-french-replacement-29 = rapide - -accent-french-replaced-30 = french -accent-french-replacement-30 = Français - -accent-french-replaced-31 = please -accent-french-replacement-31 = s'il vous plaît +accent-french-replaced-24 = quick +accent-french-replacement-24 = rapide diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml index 4a58968606b39a..5d2a831d9bc727 100644 --- a/Resources/Prototypes/Accents/word_replacements.yml +++ b/Resources/Prototypes/Accents/word_replacements.yml @@ -564,10 +564,3 @@ accent-french-replaced-22: accent-french-replacement-22 accent-french-replaced-23: accent-french-replacement-23 accent-french-replaced-24: accent-french-replacement-24 - accent-french-replaced-25: accent-french-replacement-25 - accent-french-replaced-26: accent-french-replacement-26 - accent-french-replaced-27: accent-french-replacement-27 - accent-french-replaced-28: accent-french-replacement-28 - accent-french-replaced-29: accent-french-replacement-29 - accent-french-replaced-30: accent-french-replacement-30 - accent-french-replaced-31: accent-french-replacement-31 diff --git a/Resources/Prototypes/Traits/neutral.yml b/Resources/Prototypes/Traits/neutral.yml index 67853356bfae77..8fa2ede30b2c29 100644 --- a/Resources/Prototypes/Traits/neutral.yml +++ b/Resources/Prototypes/Traits/neutral.yml @@ -23,10 +23,3 @@ - type: MothAccent - type: ReplacementAccent accent: dwarf - -- type: trait - id: FrenchAccent - name: trait-french-accent-name - description: trait-french-accent-desc - components: - - type: FrenchAccent From fdb5277335960a7e78c56f1c996c35b766005005 Mon Sep 17 00:00:00 2001 From: brainfood1183 Date: Fri, 5 Jan 2024 22:26:10 +0000 Subject: [PATCH 08/14] removed more words. --- Resources/Locale/en-US/accent/french.ftl | 45 +++++-------------- .../Prototypes/Accents/word_replacements.yml | 9 +--- 2 files changed, 11 insertions(+), 43 deletions(-) diff --git a/Resources/Locale/en-US/accent/french.ftl b/Resources/Locale/en-US/accent/french.ftl index ac9f4ee7dfd298..daf9e83c1cda55 100644 --- a/Resources/Locale/en-US/accent/french.ftl +++ b/Resources/Locale/en-US/accent/french.ftl @@ -19,23 +19,23 @@ accent-french-replacement-6 = morte accent-french-replaced-7 = traitor accent-french-replacement-7 = traitre -accent-french-replaced-8 = bread -accent-french-replacement-8 = baguette +accent-french-replaced-8 = french +accent-french-replacement-8 = Français accent-french-replaced-9 = very much accent-french-replacement-9 = beaucoup -accent-french-replaced-10 = murdered -accent-french-replacement-10 = assassiné +accent-french-replaced-10 = quick +accent-french-replacement-10 = rapide -accent-french-replaced-11 = botany -accent-french-replacement-11 = botanique +accent-french-replaced-11 = thanks +accent-french-replacement-11 = merci -accent-french-replaced-12 = murder -accent-french-replacement-12 = meurtre +accent-french-replaced-12 = small +accent-french-replacement-12 = petite -accent-french-replaced-13 = music -accent-french-replacement-13 = musique +accent-french-replaced-13 = security +accent-french-replacement-13 = sécurité accent-french-replaced-14 = greetings accent-french-replacement-14 = bonjour @@ -45,28 +45,3 @@ accent-french-replacement-15 = s'il vous plaît accent-french-replaced-16 = thank you accent-french-replacement-16 = merci - -accent-french-replaced-17 = french -accent-french-replacement-17 = Français - -accent-french-replaced-18 = wand -accent-french-replacement-18 = baguette - -accent-french-replaced-19 = magic -accent-french-replacement-19 = magie - -accent-french-replaced-20 = magic wand -accent-french-replacement-20 = baguette magique - -accent-french-replaced-21 = security -accent-french-replacement-21 = sécurité - -accent-french-replaced-22 = small -accent-french-replacement-22 = petite - -accent-french-replaced-23 = thanks -accent-french-replacement-23 = merci - -accent-french-replaced-24 = quick -accent-french-replacement-24 = rapide - diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml index 5d2a831d9bc727..7c47c66bc48d35 100644 --- a/Resources/Prototypes/Accents/word_replacements.yml +++ b/Resources/Prototypes/Accents/word_replacements.yml @@ -556,11 +556,4 @@ accent-french-replaced-14: accent-french-replacement-14 accent-french-replaced-15: accent-french-replacement-15 accent-french-replaced-16: accent-french-replacement-16 - accent-french-replaced-17: accent-french-replacement-17 - accent-french-replaced-18: accent-french-replacement-18 - accent-french-replaced-19: accent-french-replacement-19 - accent-french-replaced-20: accent-french-replacement-20 - accent-french-replaced-21: accent-french-replacement-21 - accent-french-replaced-22: accent-french-replacement-22 - accent-french-replaced-23: accent-french-replacement-23 - accent-french-replaced-24: accent-french-replacement-24 + From 60848efa507acec2c8c0b48904346e1b9cbbb096 Mon Sep 17 00:00:00 2001 From: brainfood1183 Date: Sat, 20 Jan 2024 13:49:04 +0000 Subject: [PATCH 09/14] removed word replacements. --- Resources/Locale/en-US/accent/french.ftl | 47 ------------------- .../Prototypes/Accents/word_replacements.yml | 20 -------- 2 files changed, 67 deletions(-) delete mode 100644 Resources/Locale/en-US/accent/french.ftl diff --git a/Resources/Locale/en-US/accent/french.ftl b/Resources/Locale/en-US/accent/french.ftl deleted file mode 100644 index daf9e83c1cda55..00000000000000 --- a/Resources/Locale/en-US/accent/french.ftl +++ /dev/null @@ -1,47 +0,0 @@ -accent-french-replaced-1 = yes -accent-french-replacement-1 = oui - -accent-french-replaced-2 = hi -accent-french-replacement-2 = bonjour - -accent-french-replaced-3 = hello -accent-french-replacement-3 = allo - -accent-french-replaced-4 = bye -accent-french-replacement-4 = salut - -accent-french-replaced-5 = goodbye -accent-french-replacement-5 = au revoir - -accent-french-replaced-6 = dead -accent-french-replacement-6 = morte - -accent-french-replaced-7 = traitor -accent-french-replacement-7 = traitre - -accent-french-replaced-8 = french -accent-french-replacement-8 = Français - -accent-french-replaced-9 = very much -accent-french-replacement-9 = beaucoup - -accent-french-replaced-10 = quick -accent-french-replacement-10 = rapide - -accent-french-replaced-11 = thanks -accent-french-replacement-11 = merci - -accent-french-replaced-12 = small -accent-french-replacement-12 = petite - -accent-french-replaced-13 = security -accent-french-replacement-13 = sécurité - -accent-french-replaced-14 = greetings -accent-french-replacement-14 = bonjour - -accent-french-replaced-15 = please -accent-french-replacement-15 = s'il vous plaît - -accent-french-replaced-16 = thank you -accent-french-replacement-16 = merci diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml index 7e797340e25454..e02f25323d0634 100644 --- a/Resources/Prototypes/Accents/word_replacements.yml +++ b/Resources/Prototypes/Accents/word_replacements.yml @@ -311,23 +311,3 @@ chatsan-word-41: chatsan-replacement-41 chatsan-word-42: chatsan-replacement-42 -- type: accent - id: french - wordReplacements: - accent-french-replaced-1: accent-french-replacement-1 - accent-french-replaced-2: accent-french-replacement-2 - accent-french-replaced-3: accent-french-replacement-3 - accent-french-replaced-4: accent-french-replacement-4 - accent-french-replaced-5: accent-french-replacement-5 - accent-french-replaced-6: accent-french-replacement-6 - accent-french-replaced-7: accent-french-replacement-7 - accent-french-replaced-8: accent-french-replacement-8 - accent-french-replaced-9: accent-french-replacement-9 - accent-french-replaced-10: accent-french-replacement-10 - accent-french-replaced-11: accent-french-replacement-11 - accent-french-replaced-12: accent-french-replacement-12 - accent-french-replaced-13: accent-french-replacement-13 - accent-french-replaced-14: accent-french-replacement-14 - accent-french-replaced-15: accent-french-replacement-15 - accent-french-replaced-16: accent-french-replacement-16 - From 2323f8063b22e0bac7ee6239a84c0eb38d43a194 Mon Sep 17 00:00:00 2001 From: brainfood1183 Date: Sat, 20 Jan 2024 18:19:49 +0000 Subject: [PATCH 10/14] fix restock crate price error. --- Resources/Prototypes/Catalog/Cargo/cargo_vending.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 89e457598c9e4e..9777407ae43e0f 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -33,7 +33,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockClothesFilled - cost: 4800 + cost: 4900 category: Service group: market From 1586d8fedb59d47375386d7216f8dcda79507c32 Mon Sep 17 00:00:00 2001 From: brainfood1183 Date: Wed, 14 Feb 2024 00:58:42 +0000 Subject: [PATCH 11/14] fixes --- Content.Server/Speech/Components/FrenchAccentComponent.cs | 3 +++ Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs | 5 +++-- Resources/Locale/en-US/traits/traits.ftl | 3 --- Resources/Prototypes/Entities/Clothing/Head/hats.yml | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Content.Server/Speech/Components/FrenchAccentComponent.cs b/Content.Server/Speech/Components/FrenchAccentComponent.cs index a62ee93b927a2b..f696c35ea03f45 100644 --- a/Content.Server/Speech/Components/FrenchAccentComponent.cs +++ b/Content.Server/Speech/Components/FrenchAccentComponent.cs @@ -2,6 +2,9 @@ namespace Content.Server.Speech.Components; +/// +/// French accent replaces spoken letters. "th" becomes "z" and "H" at the start of a word becomes "'". +/// [RegisterComponent] [Access(typeof(FrenchAccentSystem))] public sealed partial class FrenchAccentComponent : Component diff --git a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs index 2380c3088d2528..053ab22b318c48 100644 --- a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs @@ -2,7 +2,9 @@ using System.Text.RegularExpressions; namespace Content.Server.Speech.EntitySystems; - +/// +/// Entity gains a french accent which modifies their speech by replacing th with z and h with '. +/// public sealed class FrenchAccentSystem : EntitySystem { [Dependency] private readonly ReplacementAccentSystem _replacement = default!; @@ -14,7 +16,6 @@ public override void Initialize() SubscribeLocalEvent(OnAccentGet); } - // converts left word when typed into the right word. For example typing you becomes ye. public string Accentuate(string message, FrenchAccentComponent component) { var msg = message; diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl index 236e2d51f0d348..89f0e04f5a55c5 100644 --- a/Resources/Locale/en-US/traits/traits.ftl +++ b/Resources/Locale/en-US/traits/traits.ftl @@ -24,9 +24,6 @@ trait-unrevivable-desc = You are unable to be revived by defibrillators. trait-pirate-accent-name = Pirate Accent trait-pirate-accent-desc = You can't stop speaking like a pirate! -trait-french-accent-name = French Accent -trait-french-accent-desc = You like to throw random french words into your english out of protest. - trait-accentless-name = Accentless trait-accentless-desc = You don't have the accent that your species would usually have diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index e7e2b80e10cc46..296970df89243a 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -28,8 +28,8 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretFrench - name: french beret - description: A french beret, viva la France. + name: French beret + description: A French beret, "vive la France". components: - type: Sprite sprite: Clothing/Head/Hats/beret_french.rsi From ae1d71f76103c284439732fc5585fdb634914da6 Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Tue, 13 Feb 2024 17:22:37 -0800 Subject: [PATCH 12/14] Don't add a blank space --- Resources/Prototypes/Accents/word_replacements.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml index e4a74bac934a55..02e8d4a0b109ad 100644 --- a/Resources/Prototypes/Accents/word_replacements.yml +++ b/Resources/Prototypes/Accents/word_replacements.yml @@ -414,4 +414,3 @@ chatsan-word-40: chatsan-replacement-etcetera chatsan-word-41: chatsan-replacement-41 chatsan-word-42: chatsan-replacement-42 - From fedae4dbaece1f7e25888335dde7f828815ebcd9 Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Tue, 13 Feb 2024 17:23:32 -0800 Subject: [PATCH 13/14] Update FrenchAccentSystem.cs --- Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs index 053ab22b318c48..563728873252f9 100644 --- a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs @@ -2,8 +2,9 @@ using System.Text.RegularExpressions; namespace Content.Server.Speech.EntitySystems; + /// -/// Entity gains a french accent which modifies their speech by replacing th with z and h with '. +/// System that gives the speaker a faux-French accent. /// public sealed class FrenchAccentSystem : EntitySystem { From c585f35783afd6a398138f68b55040cd6c174175 Mon Sep 17 00:00:00 2001 From: brainfood1183 Date: Wed, 14 Feb 2024 14:43:38 +0000 Subject: [PATCH 14/14] remove hamster wearable sprite. --- .../Prototypes/Entities/Clothing/Head/hats.yml | 1 - .../equipped-HELMET-hamster.png | Bin 21181 -> 0 bytes .../Head/Hats/beret_french.rsi/meta.json | 4 ---- 3 files changed, 5 deletions(-) delete mode 100644 Resources/Textures/Clothing/Head/Hats/beret_french.rsi/equipped-HELMET-hamster.png diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 296970df89243a..467a2070d220ec 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -40,7 +40,6 @@ - type: Tag tags: - ClothMade - - HamsterWearable - WhitelistChameleon - type: entity diff --git a/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/equipped-HELMET-hamster.png deleted file mode 100644 index e7088999c3c82eed7ead15fa796be77bd1fd161e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21181 zcmeI4eT-aH6~G^$d=yZkG15|X9AW~Nw{t(KP#E?coo)3g)UtsUD0pJ&H^#~uyuH;0!z4Ijr< z)^4e3+VSs?|BldZ*mJU`ZTN9GvAMo^{8Ju}rUsaZd^s>ZRRL*D8$4^e!uU2>&-rpP zEDz;hyyw1rE)+xg3(avfUKy2J!?ioB^1PkvC-}~7+!gt=ipvJ4JuomO>nt}tRVvrK z>7jhnt_S7#av`5gwr$vF!7B-O!xL;0=sdc`Xg8jZ$4gAPR1$pUs=w}4225FI4+ z+Dy65ruA~|)RvL9oiSPC)v!_zqjD~`%lv42eJG!gE1G>J{hF%GR#dJf?0{lnnpFyT z02O*E2|lY+*_q&+oj6EhWA*d%Mw_9~aFcR*K8?bZ8QeUt2XXA!1Ayr-dh7%X5XzOx_% zIUO#b7T;;9HOExT)q?=d8?8!KkE#<xQ;3a-*Zo;h8(_!muo&M(y;$Lbpn1 z;B>6XF;8kM3dv`7}|V4>IL zo?2rO-yYA3;WC#sa6wIR4LGPd??>3=+^g*yrLc(CI3pvjNmm=xbw)<&cvID>_FhJ#?I_QdbW^;Xyt5f6peX*J@UNkSk}Sq?Z5OQHJ+-nb*~_tLCdtmO;hKFD;*LDix9t0(*`2~1x)I$L1bb&phOR_&jdk+M9ApVwCVWR zu?W(oZ5T`2YFki2eayf#Hxt$p_;A~?86g3qnDp6dS8yqjMS!)mm$uce6g2R`sxMtX zF)d-1`nG_+5b6eIzi#B%FipqeuuRef2qTuEgLj3bmP;j-eF71bGoK2sJ1pR>Rx^V$ z-7zU41akzP>DRPHT!v);tVJ?qmTFuJ2J^zTUERgfNk)hd|H3S!J|U*%+PKeFODv^h zu_lnj^ilzlE@y^-A?+F_N=C>M%|^+jFF1@4VBI#oL@`7PLlEW!@d#OJAd(X78^Ag+ zlM%w0O>|~TgE_(pFzz>A%RpMDYcQSKED5Tv>mc2Am}^47btDsgj*x(0LLC?(h6TWz zO94Xx@ClGKDdoiW`!;P7f+&P1XkaqY-+HSjLr7p+>sPY~p@%ulvUF-%fo}MQrMt+X zx`TyeoJhxT(iZ{9a0Uddh`x_}E&{BxK)SjxjX-x@AGlgR;$TQR*i7ZxHWrvzxCXLx z;yX+?87w5Q;5oWQEG`gtxb3=&H^v;utvJ>#P=n^h!^$?W9#BLAjtCHdJfzp+-?}98?Rc0F*N~D>Vl}h2 zx$2#?Br)Bt9ZdI5O$;Lt6oC(rM9o1Xb>={(0wV_olZz;I!N09`D#qqjbZ#|-4Ie8h zGHplM9Gt;Tp$B$g>Vg`k?nAXYcOdn_)PR1mb`?F$%&Tf`7^ikKb91m}YImNzWbV~Y zYS-MFRamtqR7bF*A`|g(g8|zq9+6Cb>(Bb65)Xl(vZL5K8 z9rjO_}+G3w-_-V>VtgK*jkJaaec?T!EZO?~?Wqm`kpiSx?%`~?DA${rr}X7CWuQ!0 z%R-9EjYP3EZIrJWG#%5r3SVM??@ttFzd)h*ObL}sUF`H|sVyt^vPu*f>BS6JIwM6Q z!==DTFJ`#X87UGOE(JzfstO!aHTU+Br;qIjPzoL zE1i)dk>OHcq!%+>>5LSK43`2Uy_n%jXQW7ExD*)a#SB+EBSj*^rNBrpX1LNBDH0hj z1x9)?!qy(zL%` ztZCkEP5WT%fUvTi32k*M=&W)2Fc}#oE#SfL9_?8Uc^V3Jk2}gbCpAWkeN1b-{xu^gA zz%75<_pUE|`@xG|tNi4}*G_zH+1U+w_i}#6@a`G=oNI3V`3e78vHzx#ZTfP4@HXeh ztG~ME)s;^?dC$A)BhIcr?z!%E^U8-`Zrp$7G4zwyY&`$6S4IUb^+d-`%|WjqCn&?{8K-a@_T=&+NVIYxf2(J#_NHr&s0ohBy4#DgXBI-L>^U zc>Fs*{OcB`BY$-KzhC&=%Lghm z=bU=QufF$>+c!Rc#oFc1pMGs))xG=PcYm>WGoHQiXZy7i@JpW_yI{=&vB&L!7 Ia`6}c17H+BdH?_b diff --git a/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/meta.json index ade65863af2dc4..a470e0094432b5 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/meta.json @@ -14,10 +14,6 @@ "name": "equipped-HELMET", "directions": 4 }, - { - "name": "equipped-HELMET-hamster", - "directions": 4 - }, { "name": "inhand-left", "directions": 4