From 46ef79af60c87aa1c94d8a29e7ce7803b13501d9 Mon Sep 17 00:00:00 2001 From: FL-OZ Date: Mon, 4 May 2020 00:16:05 -0500 Subject: [PATCH] Delete microwave.dmi, unneeded. Revert accidently changes to Shared EntryPoint.cs --- Content.Shared/EntryPoint.cs | 18 +++++++++++++++--- .../Textures/Objects/Kitchen/microwave.dmi | Bin 2180 -> 0 bytes 2 files changed, 15 insertions(+), 3 deletions(-) delete mode 100644 Resources/Textures/Objects/Kitchen/microwave.dmi diff --git a/Content.Shared/EntryPoint.cs b/Content.Shared/EntryPoint.cs index 8975f3fbb4..f2a1e7312e 100644 --- a/Content.Shared/EntryPoint.cs +++ b/Content.Shared/EntryPoint.cs @@ -1,23 +1,36 @@ using System; using System.Collections.Generic; + using System.Globalization; using Content.Shared.Maps; using Robust.Shared.ContentPack; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; + using Robust.Shared.Localization; using Robust.Shared.Prototypes; -namespace Content.Shared + namespace Content.Shared { public class EntryPoint : GameShared { + // If you want to change your codebase's language, do it here. + private const string Culture = "en-US"; + #pragma warning disable 649 [Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager; + [Dependency] private readonly ILocalizationManager _localizationManager; #pragma warning restore 649 + public override void PreInit() + { + IoCManager.InjectDependencies(this); + + // Default to en-US. + _localizationManager.LoadCulture(new CultureInfo(Culture)); + } + public override void Init() { - IoCManager.InjectDependencies(this); } public override void PostInit() @@ -55,6 +68,5 @@ namespace Content.Shared _tileDefinitionManager.Initialize(); } - } } diff --git a/Resources/Textures/Objects/Kitchen/microwave.dmi b/Resources/Textures/Objects/Kitchen/microwave.dmi deleted file mode 100644 index a3cb98f9c14d5fd5fe9bb2c191c860815381f929..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2180 zcmV-~2z&R5P)HubEQfX;Wb#zQ^upVvP9?!#0)W}WV&r00ZaNO2!e3C9^rw{4LXX@gF=;4HA zWl?c&O=i;%VPjN@fHIMZLd>8Zf`yfdjGMEpZL6eRsGwTW$4>e5r2h4~fQF~1p<|+) zN}-!dqMS{ThdG##Nn>P2WM)Nqdx)c(REB>#j)zI0prDtRmu6^vj*+6GqJyXa0M!5h zBTXZ!s zXH%P)Y?G00kBw_@Zcvkzq@A6ohlg#HlyKq8FUPeauBck&+i};>cGApt*wT00)pXm` zb=S~!*}_BP+Hcm+bj!6o(!gpdVq-nm9S@fw6VV3;YP87Y00001bW%=J z06^y0W&i*HmwHrKbVOxyV{&P5bZKvH004NLQ&w9TW`)L>QVxjGCPM{FF+f6%u7FSS1c$Y6>Ex(B0io9yAH+rPbYZ(cVEZ8M7X@yRcc(tg{V-#xhr+{4Lap1JxC zWl@J>!WVOWJ>Z#~)ZZ^<^U^CZN%?FKIKH7!U~eeIh+>}`poEz*V8YFSUKO{%fXho`p$r58W@g@XG7uOji3VL> zj>tFQo#TsDJy2D@7@Y$xGcY?h=VZVzG=mBEqoXliE^C2A1M`9TtW-p@TUX=OG86Tj)9PT10G)pXCMeLJA0W0xUy_4 zntXWXqOrXEVVrAj63S(PV~Pg`+Fyn)zp@-s5a6S$JjE;5Rt&U&GK`gL*H-rAeE1=b zBOG8OY<(kgIUXRS757FWOIO(li^I{+C*+yj^`)ij?QXRlxGY`1{4oaDFV76-nD+i< zGnjzO(kC}=6pHeGdDoKJSnzJYUw#kmSh(N{f4dbm1v46GK2;sjRMzLy3H3UZe8ezs>e2pUjG?+mOej1vs2 z;MqqL3QGe~dQ=}EoMU*5jo+(mk5Uxnd8!ZWpC_yj41B6cY}C%!36ThUnz(+@h9|5K z41Ct6K9H!s(26Io52!cY$T!^|6%yh)RCTIXDcf*u2hq>B;B5IlKHk1QFus;0pR4Nn z#x17xjg5`E)tv~@`a%mX7-(4^SVR7Ws!ra%gW&F$cW&RsN6`SU zAFw4gt=A~E>UeypM(YbLxL}|~ePC@3`Bz`7>N#}q&E&UtZgYdGN=T@FPz4=yN^ywz zfImj-3oUrk`T%A?uWoKN?ltb|_ZwS!73V-9e2#HclmZ0{C=D^-OL4AOb`RsS! zt7^5;*xcOw;m1Zp*SB=cK)8N@^Qwk(30agc!yJZXJ^sA_{5+uFRpd7nM{r@;F> zpXC&QMG)se2cEP(K%7gkA>0T^xPHLqm<|?oMi^WL9eC3E0ErtUq546m`aMy|NrhENXUi$05GAgwzK1NJUs6YXqsSJrfJ!>O`B%Z zjPeIRgN=}L?U!F4#QF!|j6pTFerFDZ284iD0$!<9y#I_A-TnXo(>Cj-X;QS&H0?Oo zY`f0FTekMFX^RHj{(#+WZ~d-KK`FYv$CwqLSHL$QU7)}MG=BpN9ayGCn`j22+-BUa zTed}QfZv4*$%NY<0K1?$>vzn6V8G=V)8iE?8UWz^0ZqX1TV|bFP0MWhr@-enXmvaR z$Zac>fuKJCw!QWHF8KWcKCfUcFQCQFcoYhW;=+-BVNxgDzyl*XW@ z{lVAo8XXNX;Bhoi!;|3fPzEUF=lCH;r_{uwQ=9}4=LX{jCFpQ|9r^(%@csb!%c}7i z!V>(qV4yu0`vb%RiQgZPq<;Wdf577>08WCyvYz}i9O1_z{P6+y4*+%h1OD9yKY;!L z+M$1-J?~nqKcLv5f1n*d00YGi{R8d!0XRte2U4Z#O8)_FNW^vJT(nLA0000