From 6c465153abfafda2f5582d1853038c5d0bc3a567 Mon Sep 17 00:00:00 2001 From: chromiumboy <50505512+chromiumboy@users.noreply.github.com> Date: Sat, 28 Dec 2024 17:33:15 -0600 Subject: [PATCH 01/23] UI improvements for holopads (#34055) * Initial commit * Minor update --- Content.Client/Holopad/HolopadWindow.xaml | 31 +++++++++++++------ Content.Client/Holopad/HolopadWindow.xaml.cs | 12 +++++-- Content.Server/Telephone/TelephoneSystem.cs | 5 +-- .../Telephone/SharedTelephoneSystem.cs | 17 ++++++++++ .../Telephone/TelephoneComponent.cs | 3 +- Resources/Locale/en-US/holopad/holopad.ftl | 2 ++ .../Locale/en-US/telephone/telephone.ftl | 4 ++- 7 files changed, 57 insertions(+), 17 deletions(-) diff --git a/Content.Client/Holopad/HolopadWindow.xaml b/Content.Client/Holopad/HolopadWindow.xaml index 9c3dfab1ea6..882f918158a 100644 --- a/Content.Client/Holopad/HolopadWindow.xaml +++ b/Content.Client/Holopad/HolopadWindow.xaml @@ -27,7 +27,11 @@ @@ -68,18 +72,25 @@ - + - + + + + - - - + - - - + + + + + + + + diff --git a/Content.Client/Holopad/HolopadWindow.xaml.cs b/Content.Client/Holopad/HolopadWindow.xaml.cs index bcab0d43df1..25982b901c2 100644 --- a/Content.Client/Holopad/HolopadWindow.xaml.cs +++ b/Content.Client/Holopad/HolopadWindow.xaml.cs @@ -171,8 +171,10 @@ public void UpdateState(Dictionary holopads) // Caller ID text var callerId = _telephoneSystem.GetFormattedCallerIdForEntity(telephone.LastCallerId.Item1, telephone.LastCallerId.Item2, Color.LightGray, "Default", 11); + var holoapdId = _telephoneSystem.GetFormattedDeviceIdForEntity(telephone.LastCallerId.Item3, Color.LightGray, "Default", 11); CallerIdText.SetMessage(FormattedMessage.FromMarkupOrThrow(callerId)); + HolopadIdText.SetMessage(FormattedMessage.FromMarkupOrThrow(holoapdId)); LockOutIdText.SetMessage(FormattedMessage.FromMarkupOrThrow(callerId)); // Sort holopads alphabetically @@ -236,10 +238,13 @@ private void UpdateAppearance() // Make / update required children foreach (var child in ContactsList.Children) { - if (child is not HolopadContactButton) + if (child is not HolopadContactButton contactButton) continue; - var contactButton = (HolopadContactButton)child; + var passesFilter = string.IsNullOrEmpty(SearchLineEdit.Text) || + contactButton.Text?.Contains(SearchLineEdit.Text, StringComparison.CurrentCultureIgnoreCase) == true; + + contactButton.Visible = passesFilter; contactButton.Disabled = (_currentState != TelephoneState.Idle || lockButtons); } @@ -290,7 +295,7 @@ private void UpdateAppearance() FetchingAvailableHolopadsContainer.Visible = (ContactsList.ChildCount == 0); ActiveCallControlsContainer.Visible = (_currentState != TelephoneState.Idle || _currentUiKey == HolopadUiKey.AiRequestWindow); CallPlacementControlsContainer.Visible = !ActiveCallControlsContainer.Visible; - CallerIdText.Visible = (_currentState == TelephoneState.Ringing); + CallerIdContainer.Visible = (_currentState == TelephoneState.Ringing); AnswerCallButton.Visible = (_currentState == TelephoneState.Ringing); } @@ -316,6 +321,7 @@ public HolopadContactButton() HorizontalExpand = true; SetHeight = 32; Margin = new Thickness(0f, 1f, 0f, 1f); + ReservesSpace = false; } public void UpdateValues(NetEntity netEntity, string label) diff --git a/Content.Server/Telephone/TelephoneSystem.cs b/Content.Server/Telephone/TelephoneSystem.cs index d4398c76d3f..cb0c72939aa 100644 --- a/Content.Server/Telephone/TelephoneSystem.cs +++ b/Content.Server/Telephone/TelephoneSystem.cs @@ -151,7 +151,7 @@ public override void Update(float frameTime) break; - // Try to hang up if their has been no recent in-call activity + // Try to hang up if there has been no recent in-call activity case TelephoneState.InCall: if (_timing.CurTime > telephone.StateStartTime + TimeSpan.FromSeconds(telephone.IdlingTimeout)) EndTelephoneCalls(entity); @@ -214,7 +214,8 @@ private bool TryCallTelephone(Entity source, Entity /// The presumed name and/or job of the last person to call this telephone + /// and the name of the device that they used to do so /// [ViewVariables, AutoNetworkedField] - public (string?, string?) LastCallerId; + public (string?, string?, string?) LastCallerId; } #region: Telephone events diff --git a/Resources/Locale/en-US/holopad/holopad.ftl b/Resources/Locale/en-US/holopad/holopad.ftl index fbb7a78531e..8a268eb1c32 100644 --- a/Resources/Locale/en-US/holopad/holopad.ftl +++ b/Resources/Locale/en-US/holopad/holopad.ftl @@ -6,6 +6,7 @@ holopad-window-options = [color=darkgray][font size=10][italic]Please select an # Call status holopad-window-no-calls-in-progress = No holo-calls in progress holopad-window-incoming-call = Incoming holo-call from: +holopad-window-relay-label = Originating at: holopad-window-outgoing-call = Attempting to establish a connection... holopad-window-call-in-progress = Holo-call in progress holopad-window-call-ending = Disconnecting... @@ -28,6 +29,7 @@ holopad-window-access-denied = Access denied holopad-window-select-contact-from-list = Select a contact to initiate a holo-call holopad-window-fetching-contacts-list = No holopads are currently contactable holopad-window-contact-label = {CAPITALIZE($label)} +holopad-window-filter-line-placeholder = Search for a contact # Flavor holopad-window-flavor-left = ⚠ Do not enter while projector is active diff --git a/Resources/Locale/en-US/telephone/telephone.ftl b/Resources/Locale/en-US/telephone/telephone.ftl index 915d54843ff..b1b27768e6e 100644 --- a/Resources/Locale/en-US/telephone/telephone.ftl +++ b/Resources/Locale/en-US/telephone/telephone.ftl @@ -5,4 +5,6 @@ chat-telephone-message-wrap-bold = [color={$color}][bold]{$name}[/bold] {$verb}, # Caller ID chat-telephone-unknown-caller = [color={$color}][font={$fontType} size={$fontSize}][bolditalic]Unknown caller[/bolditalic][/font][/color] chat-telephone-caller-id-with-job = [color={$color}][font={$fontType} size={$fontSize}][bold]{CAPITALIZE($callerName)} ({CAPITALIZE($callerJob)})[/bold][/font][/color] -chat-telephone-caller-id-without-job = [color={$color}][font={$fontType} size={$fontSize}][bold]{CAPITALIZE($callerName)}[/bold][/font][/color] \ No newline at end of file +chat-telephone-caller-id-without-job = [color={$color}][font={$fontType} size={$fontSize}][bold]{CAPITALIZE($callerName)}[/bold][/font][/color] +chat-telephone-unknown-device = [color={$color}][font={$fontType} size={$fontSize}][bolditalic]Unknown device[/bolditalic][/font][/color] +chat-telephone-device-id = [color={$color}][font={$fontType} size={$fontSize}][bold]{CAPITALIZE($deviceName)}[/bold][/font][/color] From 4155440a1ba236e7d1044cbf38b947b198100fe0 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 28 Dec 2024 23:34:22 +0000 Subject: [PATCH 02/23] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 03e3dd9bd6f..f1a17bb7d5f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Moomoobeef - changes: - - message: Added flavors to an array of previously indescribable things. - type: Add - id: 7258 - time: '2024-09-01T00:03:30.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31685 - author: Ilya246 changes: - message: Fixed tip 26 being misinformation about the tesla. It now displays truthful @@ -3935,3 +3928,12 @@ id: 7757 time: '2024-12-28T14:49:03.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/33704 +- author: chromiumboy + changes: + - message: The holoapd UI has been updated to include a text-based filter for the + contacts list, and also to specify the name of the holopad that incoming calls + originate from + type: Tweak + id: 7758 + time: '2024-12-28T23:33:16.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34055 From 3f84b04e4ce1ff35657f56a421ff91d05145149c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 29 Dec 2024 01:39:04 +0100 Subject: [PATCH 03/23] Update Credits (#34109) Co-authored-by: PJBot --- Resources/Credits/GitHub.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index 9a85185c3ec..65813dbb34b 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0tito, 0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, achookh, Acruid, actioninja, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, Agoichi, Ahion, aiden, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, AzzyIsNotHere, baa14453, BackeTako, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, bellwetherlogic, ben, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainMaru, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, CrafterKolyan, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, d4kii, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, gansulalan, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Henry, HerCoyote23, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, hubismal, Hugal31, Huxellberger, Hyenh, hyphenationc, i-justuser-i, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, KrasnoshchekovPavel, Krunklehorn, Kupie, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, Litraxx, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, moderatelyaware, modern-nm, mokiros, Moneyl, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, noelkathegod, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QueerNB, QuietlyWhisper, qwerltaz, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, Shaddap1, ShadeAware, ShadowCommander, Shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SignalWalker, siigiil, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, Slyfox333, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, spanky-spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TherapyGoth, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, Tr1bute, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, veliebm, VelonacepsCalyxEggs, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, Vexerot, VigersRay, violet754, Visne, vlados1408, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, widgetbeck, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex +0tito, 0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, achookh, Acruid, actioninja, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, Agoichi, Ahion, aiden, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alithsko, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, AzzyIsNotHere, baa14453, BackeTako, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, bellwetherlogic, ben, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainMaru, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, CrafterKolyan, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, d4kii, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, gansulalan, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Henry, HerCoyote23, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, hubismal, Hugal31, Huxellberger, Hyenh, hyphenationc, i-justuser-i, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, KrasnoshchekovPavel, Krunklehorn, Kupie, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, Litraxx, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, moderatelyaware, modern-nm, mokiros, Moneyl, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, noelkathegod, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QueerNB, QuietlyWhisper, qwerltaz, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, Shaddap1, ShadeAware, ShadowCommander, Shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SignalWalker, siigiil, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, Slyfox333, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, spanky-spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TherapyGoth, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, Tr1bute, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, veliebm, VelonacepsCalyxEggs, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, Vexerot, VigersRay, violet754, Visne, vlados1408, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, widgetbeck, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex From 5d0d37161dddcdf4f3c65d3a267e257273a82b7a Mon Sep 17 00:00:00 2001 From: zHonys <69396539+zHonys@users.noreply.github.com> Date: Sat, 28 Dec 2024 22:49:05 -0300 Subject: [PATCH 04/23] Added support so that smile can use hats (#33924) * Added support so that smile can use hats Changed Prototypes/Entities/Mobs/NPCs/pets.yml Added smile_inventory_template.yml in Resources/Prototypes/inventoryTemplates Added dir smile_displacement.rsi inside Resources/Textures/Mobs/Pets/smile.rsi Added smile_displacement.rsi/meta.json Added smile_displacement.rsi/head.png * Fixed sprite path in ProtoTypes/Entities/Mobs/NPCs/pets.yml mapping to wrong smile_displacement.rsi Fixed smile_inventory_template.yml using uiWindowPos as 1,2 instead of 0,1 Moved Resources/Textures/Mobs/Pets/smile.rsi/ to .../Pets/smile/smile.rsi/ Moved Resources/Textures/Mobs/Pets/smile.rsi/smile_displacement.rsi to .../Pets/smile/smile_displacement.rsi * Minor fixes: removing comments and change naming Renamed Resources/Textures/Mobs/Pets/smile/smile.rsi To .../Mobs/Pets/Smile/smile.rsi * Removed smile_inventory_template.yml and used head_inventory_template.yml instead --- .../Prototypes/Entities/Mobs/NPCs/pets.yml | 14 ++++++++++++-- .../{ => Smile}/smile.rsi/inhand-left.png | Bin .../{ => Smile}/smile.rsi/inhand-right.png | Bin .../Mobs/Pets/{ => Smile}/smile.rsi/meta.json | 0 .../Smile/smile_displacement.rsi/head.png | Bin 0 -> 236 bytes .../Smile/smile_displacement.rsi/meta.json | 18 ++++++++++++++++++ 6 files changed, 30 insertions(+), 2 deletions(-) rename Resources/Textures/Mobs/Pets/{ => Smile}/smile.rsi/inhand-left.png (100%) rename Resources/Textures/Mobs/Pets/{ => Smile}/smile.rsi/inhand-right.png (100%) rename Resources/Textures/Mobs/Pets/{ => Smile}/smile.rsi/meta.json (100%) create mode 100644 Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi/head.png create mode 100644 Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 5adb8914457..4cee650e0f9 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -712,7 +712,7 @@ - type: entity name: Smile id: MobSlimesPet - parent: MobAdultSlimes + parent: [MobAdultSlimes, StripableInventoryBase] description: This masterpiece has gone through thousands of experiments. But it is the sweetest creature in the world. Smile Slime! components: - type: Sprite @@ -722,6 +722,16 @@ - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] state: aslime-_3 shader: unshaded + - map: [ "head" ] + - type: Inventory + speciesId: slime + templateId: head + displacements: + head: + sizeMaps: + 32: + sprite: Mobs/Pets/Smile/smile_displacement.rsi + state: head - type: MobThresholds thresholds: 0: Alive @@ -767,7 +777,7 @@ Caustic: 1 - type: MultiHandedItem - type: Item - sprite: Mobs/Pets/smile.rsi + sprite: Mobs/Pets/Smile/smile.rsi size: Huge - type: SentienceTarget flavorKind: station-event-random-sentience-flavor-slime diff --git a/Resources/Textures/Mobs/Pets/smile.rsi/inhand-left.png b/Resources/Textures/Mobs/Pets/Smile/smile.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Mobs/Pets/smile.rsi/inhand-left.png rename to Resources/Textures/Mobs/Pets/Smile/smile.rsi/inhand-left.png diff --git a/Resources/Textures/Mobs/Pets/smile.rsi/inhand-right.png b/Resources/Textures/Mobs/Pets/Smile/smile.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Mobs/Pets/smile.rsi/inhand-right.png rename to Resources/Textures/Mobs/Pets/Smile/smile.rsi/inhand-right.png diff --git a/Resources/Textures/Mobs/Pets/smile.rsi/meta.json b/Resources/Textures/Mobs/Pets/Smile/smile.rsi/meta.json similarity index 100% rename from Resources/Textures/Mobs/Pets/smile.rsi/meta.json rename to Resources/Textures/Mobs/Pets/Smile/smile.rsi/meta.json diff --git a/Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi/head.png b/Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi/head.png new file mode 100644 index 0000000000000000000000000000000000000000..a579919824015b187ab41f3e38719b6591ea2f93 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|mU+53hE&XX zdvhaiLjcc_3oM2vvWq_-uVDSglpgtV(|hCl4q<)g&$NEGWWB&Niz$QAmvKwOGKMIJ zU#y?xE8RQ;E{fJmA~rDd;JBZ=|VE}ETh0Drs~pzlh*-V%;4$j=d#Wz Gp$Pyua!d07 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi/meta.json b/Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi/meta.json new file mode 100644 index 00000000000..1d2a84bf6d8 --- /dev/null +++ b/Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Head displacement made by zHonys", + "size": { + "x": 32, + "y": 32 + }, + "load": { + "srgb": false + }, + "states": [ + { + "name": "head", + "directions": 4 + } + ] +} From 9f9553b5261995d7f44fc29f1d3fa30c5bc35cd9 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 29 Dec 2024 01:50:11 +0000 Subject: [PATCH 05/23] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f1a17bb7d5f..d2ab10a1d74 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Ilya246 - changes: - - message: Fixed tip 26 being misinformation about the tesla. It now displays truthful - information. - type: Fix - id: 7259 - time: '2024-09-01T11:03:23.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31705 - author: yuitop changes: - message: space dragon fire breath ability now has cursor indicator @@ -3937,3 +3929,10 @@ id: 7758 time: '2024-12-28T23:33:16.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34055 +- author: zHonys + changes: + - message: Smile can now use hats + type: Add + id: 7759 + time: '2024-12-29T01:49:05.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33924 From bfb256f0bacbef19c957ff0426e8f1aa4bf2a88a Mon Sep 17 00:00:00 2001 From: SolStar <44028047+ewokswagger@users.noreply.github.com> Date: Sat, 28 Dec 2024 20:50:49 -0500 Subject: [PATCH 06/23] Add a guaranteed cotton pizza to pizza crates (#33997) * add guaranteed cotton pizza to pizza crates * saner parenting * Use clearer suffix on cotton pizza box --- Resources/Prototypes/Catalog/Fills/Crates/food.yml | 6 ++++-- .../Objects/Consumable/Food/Containers/box.yml | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml index e43d918bb9c..cbce467cf71 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml @@ -7,7 +7,8 @@ - type: StorageFill contents: - id: FoodBoxPizzaFilled - amount: 4 + amount: 3 + - id: FoodBoxPizzaCotton - id: LidSalami prob: 0.01 @@ -20,7 +21,8 @@ - type: StorageFill contents: - id: FoodBoxPizzaFilled - amount: 16 + amount: 15 + - id: FoodBoxPizzaCotton - id: LidSalami prob: 0.04 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index 69621aa9443..f613cddaafd 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -274,6 +274,17 @@ prob: 0.10 orGroup: Pizza - id: KnifePlastic + +- type: entity + name: pizza box + parent: FoodBoxPizzaFilled + id: FoodBoxPizzaCotton + suffix: Cotton Pizza + components: + - type: StorageFill + contents: + - id: FoodPizzaCotton + - id: KnifePlastic # Nugget From 4bb68c4bacd9ecf34dcf813a5f7fd116cf5ea9e2 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 29 Dec 2024 01:51:56 +0000 Subject: [PATCH 07/23] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index d2ab10a1d74..07f46efe86a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: yuitop - changes: - - message: space dragon fire breath ability now has cursor indicator - type: Tweak - id: 7260 - time: '2024-09-01T19:28:12.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31725 - author: EmoGarbage404 changes: - message: The grappling gun is now available inside the salvage vendor. Additional @@ -3936,3 +3929,10 @@ id: 7759 time: '2024-12-29T01:49:05.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/33924 +- author: ewokswagger + changes: + - message: Pizza deliveries are now guaranteed to have at least one cotton pizza. + type: Tweak + id: 7760 + time: '2024-12-29T01:50:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33997 From 2c41ed0939b6cd1ed7b04a239105b5f71db9219f Mon Sep 17 00:00:00 2001 From: Booblesnoot42 <108703193+Booblesnoot42@users.noreply.github.com> Date: Sat, 28 Dec 2024 20:56:23 -0500 Subject: [PATCH 08/23] Corrected Cotton Dough Recipe (#33988) --- Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml b/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml index 7e5e20139b0..98d892db82d 100644 --- a/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml +++ b/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml @@ -23,7 +23,8 @@ WARNING: This is not an automatically generated list, things here may become out - Uncooked Animal Protein: Grind Raw Meat Buzz! Don't forget about Moth diet! -- Cotton Dough = 5 Flour, 10 Fabric, 10 Water +- Fiber: Juice Fabric in a Reagent Grinder, 3 Fiber per Fabric +- Cotton Dough = 5 Flour, 10 Fiber, 10 Water - Cotton bread baked the same as default but with cotton dough instead - Cotton Pizza: Microwave 1 Flat Cotton Dough and 4 Cotton Bolls for 30 Seconds From e07609b3b3109604b664ec62d6712334ec2fbc97 Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Sat, 28 Dec 2024 18:02:24 -0800 Subject: [PATCH 09/23] New cotton baguette, crostini, chevre-chaud, bagel, and croissant foods for moffs (#33508) * A looooooooot of new cotton foods for the moffs * address slam's comments on the food for moffs not having any moff food in the food (the food that's intended for moffs) * alternative sprites for bagel-cottondough.png, baguette-cotton.png, and croissant-cotton.png * update requested sprites * change requested sprites * address part of sloth's review, awaiting response * address second half of review, fix magical food nutriment mitosis bug --- .../Objects/Consumable/Food/Baked/bagel.yml | 28 ++++++ .../Objects/Consumable/Food/Baked/bread.yml | 71 ++++++++++++++ .../Objects/Consumable/Food/Baked/misc.yml | 66 ++++++++++++- .../Objects/Consumable/Food/ingredients.yml | 89 +++++++++++++++++- .../Construction/Graphs/food/doughrope.yml | 16 +++- .../Recipes/Cooking/meal_recipes.yml | 37 ++++++++ .../Baked/bagel.rsi/bagel-cottondough.png | Bin 0 -> 543 bytes .../Consumable/Food/Baked/bagel.rsi/meta.json | 19 ++-- .../baguette-cotton-equipped-BELT.png | Bin 0 -> 432 bytes .../bread.rsi/baguette-cotton-inhand-left.png | Bin 0 -> 454 bytes .../baguette-cotton-inhand-right.png | Bin 0 -> 522 bytes .../Food/Baked/bread.rsi/baguette-cotton.png | Bin 0 -> 660 bytes .../Food/Baked/bread.rsi/crostini-cotton.png | Bin 0 -> 404 bytes .../Consumable/Food/Baked/bread.rsi/meta.json | 20 +++- .../Baked/misc.rsi/chevrechaud-cotton.png | Bin 0 -> 869 bytes .../Food/Baked/misc.rsi/croissant-cotton.png | Bin 0 -> 763 bytes .../Consumable/Food/Baked/misc.rsi/meta.json | 8 +- .../ingredients.rsi/cotton-dough-rope.png | Bin 0 -> 482 bytes .../ingredients.rsi/cotton-dough-slice.png | Bin 0 -> 521 bytes .../ingredients.rsi/croissant-raw-cotton.png | Bin 0 -> 307 bytes .../Consumable/Food/ingredients.rsi/meta.json | 11 ++- 21 files changed, 349 insertions(+), 16 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel-cottondough.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton-equipped-BELT.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton-inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/crostini-cotton.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/chevrechaud-cotton.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/croissant-cotton.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough-rope.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough-slice.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/croissant-raw-cotton.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml index 8f23b6c7df9..114b3e01f22 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml @@ -47,3 +47,31 @@ Quantity: 5 - ReagentId: Nutriment Quantity: 5 + +- type: entity + id: FoodBagelCotton + parent: FoodBagelBase + name: cotton bagel + description: A delicious bagel made with cotton dough. + components: + - type: FlavorProfile + flavors: + - bread + - cotton + - type: Sprite + state: bagel-cottondough + - type: Food + requiresSpecialDigestion: true + - type: Tag + tags: + - ClothMade + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 2.5 + - ReagentId: Fiber + Quantity: 2.5 + diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index 0fb3df4d278..db77d81ce84 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -702,6 +702,46 @@ Blunt: 1 # bonk # Tastes like France. +- type: entity + name: cotton baguette + parent: FoodBreadBaguette + id: FoodBreadBaguetteCotton + description: Bon azzétit! + components: + - type: Sprite + state: baguette-cotton + - type: SliceableFood + slice: FoodBreadBaguetteCottonSlice + - type: Food + requiresSpecialDigestion: true + - type: Tag + tags: + - Bread + - ClothMade + - type: Clothing + equippedPrefix: baguette-cotton + - type: Item + inhandVisuals: + left: + - state: baguette-cotton-inhand-left + right: + - state: baguette-cotton-inhand-right + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Fiber + Quantity: 3 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: TableSalt + Quantity: 1 + - ReagentId: Blackpepper + Quantity: 1 + - type: entity name: crostini parent: FoodBreadSliceBase @@ -724,6 +764,37 @@ - ReagentId: Blackpepper Quantity: 0.1 +- type: entity + name: cotton crostini + parent: FoodBreadBaguetteSlice + id: FoodBreadBaguetteCottonSlice + description: Bon az-zetite! + components: + - type: Sprite + state: crostini-cotton + - type: Food + requiresSpecialDigestion: true + - type: Tag + tags: + - Bread + - Slice + - ClothMade + - type: SolutionContainerManager + solutions: + food: + maxVol: 2 + reagents: + - ReagentId: Nutriment + Quantity: 0.25 + - ReagentId: Fiber + Quantity: 0.25 + - ReagentId: Vitamin + Quantity: 0.1 + - ReagentId: TableSalt + Quantity: 0.1 + - ReagentId: Blackpepper + Quantity: 0.1 + - type: entity name: buttered toast parent: FoodBreadSliceBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index b4be6a8dfd1..db8c186856e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -28,7 +28,7 @@ description: A delicious and spongy little cake. components: - type: Food - trash: + trash: - FoodPlateMuffinTin - type: Sprite sprite: Objects/Consumable/Food/Baked/misc.rsi @@ -609,6 +609,38 @@ - ReagentId: Vitamin Quantity: 0.5 +- type: entity + name: cotton chèvre chaud + parent: FoodBakedChevreChaud + id: FoodBakedChevreChaudCotton + description: A disk of slightly melted chèvre flopped on top of a... cotton crostini, and toasted all-round. + components: + - type: FlavorProfile + flavors: + - bread + - nutty + - creamy + - smokey + - cotton + - type: Sprite + state: chevrechaud-cotton + - type: Food + requiresSpecialDigestion: true + - type: Tag + tags: + - ClothMade + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 1 + - ReagentId: Fiber + Quantity: 1 + - ReagentId: Vitamin + Quantity: 0.5 + - type: entity name: brownies parent: FoodBakedBase @@ -771,3 +803,35 @@ damage: types: Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones + +- type: entity + name: cotton croissant + parent: FoodBakedCroissant + id: FoodBakedCroissantCotton + description: Buttery, flaky, fibery goodness. + components: + - type: FlavorProfile + flavors: + - bread + - butter + - cotton + - type: Sprite + state: croissant-cotton + - type: Food + requiresSpecialDigestion: true + - type: Tag + tags: + - ClothMade + - type: SolutionContainerManager + solutions: + food: + maxVol: 7 + reagents: + - ReagentId: Nutriment + Quantity: 1.5 + - ReagentId: Fiber + Quantity: 1.5 + - ReagentId: Butter + Quantity: 2 + - ReagentId: Vitamin + Quantity: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index af7d75b1753..30d0189492b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -315,6 +315,13 @@ - type: Construction graph: DoughRope node: start + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Nutriment + Quantity: 5 - type: entity name: dough rope @@ -330,6 +337,13 @@ - type: Construction graph: DoughRope node: rolled + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Nutriment + Quantity: 5 - type: entity name: cornmeal dough @@ -426,9 +440,9 @@ - cotton - type: Sprite state: cotton-dough - # - type: SliceableFood # TODO add it - # count: 3 - # slice: FoodDoughCottonSlice + - type: SliceableFood + count: 3 + slice: FoodDoughCottonSlice - type: Construction graph: CottonPizza node: start @@ -446,6 +460,59 @@ - ReagentId: Fiber Quantity: 10 +- type: entity + name: cotton dough slice + parent: FoodBakingBase + id: FoodDoughCottonSlice + description: A slice of cotton dough. + components: + - type: FlavorProfile + flavors: + - dough + - cotton + - type: Sprite + state: cotton-dough-slice + - type: Tag + tags: + - Slice + - type: Construction + graph: DoughRopeCotton + node: start + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Nutriment + Quantity: 1.5 + - ReagentId: Fiber + Quantity: 3.5 + +- type: entity + name: dough rope + parent: FoodBakingBase + id: FoodDoughCottonRope + description: A thin noodle of cotton dough. Can be cooked into a cotton bagel. + components: + - type: FlavorProfile + flavors: + - dough + - cotton + - type: Sprite + state: cotton-dough-rope + - type: Construction + graph: DoughRopeCotton + node: rolled + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Nutriment + Quantity: 1.5 + - ReagentId: Fiber + Quantity: 3.5 + - type: entity name: raw pastry base parent: FoodBakingBase @@ -499,6 +566,9 @@ - type: Construction graph: CottonPizza node: flat + - type: SliceableFood + count: 3 + slice: FoodCroissantRawCotton - type: entity name: pizza bread @@ -818,3 +888,16 @@ reagents: - ReagentId: Nutriment Quantity: 3 + +- type: entity + name: raw cotton croissant + parent: FoodCroissantRaw + id: FoodCroissantRawCotton + description: Buttery, flaky, fibery goodness waiting to happen. + components: + - type: FlavorProfile + flavors: + - dough + - cotton + - type: Sprite + state: croissant-raw-cotton diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/food/doughrope.yml b/Resources/Prototypes/Recipes/Construction/Graphs/food/doughrope.yml index 52a9a817cfd..1b95d46dcec 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/food/doughrope.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/food/doughrope.yml @@ -10,4 +10,18 @@ - tool: Rolling doAfter: 1 - node: rolled - entity: FoodDoughRope \ No newline at end of file + entity: FoodDoughRope + +- type: constructionGraph + id: DoughRopeCotton + start: start + graph: + - node: start + entity: FoodDoughCottonSlice + edges: + - to: rolled + steps: + - tool: Rolling + doAfter: 1 + - node: rolled + entity: FoodDoughCottonRope diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 1ec6fc7233f..abfd0fd321a 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -24,6 +24,14 @@ FoodDoughRope: 1 PoppySeeds: 1 +- type: microwaveMealRecipe + id: RecipeBagelCotton + name: cotton bagel recipe + result: FoodBagelCotton + time: 5 + solids: + FoodDoughCottonRope: 1 + #Burgers - type: microwaveMealRecipe @@ -458,6 +466,17 @@ solids: FoodDough: 1 +- type: microwaveMealRecipe + id: RecipeBaguetteCotton + name: baguette recipe + result: FoodBreadBaguetteCotton + time: 15 + reagents: + TableSalt: 5 + Blackpepper: 5 + solids: + FoodDoughCotton: 1 + - type: microwaveMealRecipe id: RecipeBaguetteSword name: baguette sword recipe @@ -1939,6 +1958,15 @@ FoodChevreSlice: 1 FoodBreadBaguetteSlice: 1 +- type: microwaveMealRecipe + id: RecipeFoodBakedChevreChaudCotton + name: cotton chevre chaud recipe + result: FoodBakedChevreChaudCotton + time: 5 + solids: + FoodChevreSlice: 1 + FoodBreadBaguetteCottonSlice: 1 + - type: microwaveMealRecipe id: RecipeCannabisButter name: cannabis butter recipe @@ -2067,6 +2095,15 @@ FoodCroissantRaw: 1 FoodButterSlice: 1 +- type: microwaveMealRecipe + id: RecipeCroissantCotton + name: cotton croissant recipe + result: FoodBakedCroissantCotton + time: 5 + solids: + FoodCroissantRawCotton: 1 + FoodButterSlice: 1 + - type: microwaveMealRecipe id: RecipeThrowingCroissant name: throwing croissant recipe diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel-cottondough.png b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel-cottondough.png new file mode 100644 index 0000000000000000000000000000000000000000..57fbe72b5cf2a8ab6c82f69d09cf3ae1cd445671 GIT binary patch literal 543 zcmV+)0^t3LP)VAm z0BWCW0K|vR<0Tw6-hZJ5W(#5sP$}j$noZ&*9D?sZPTkYWZGSY)nzc6_A*^PgQp{_v zFpQUQLL-3SFyQ!Wy=i^G=H~u1VAPbDVMg+ zjAoNux%;@Iw)HJ2l;#0Qd%wDR>vEE7BLk$|69%1gcnOEGbUy$$%P*{St!7|pc2cuT zYs8N};chMiu(4flgEN7Ou<7UQb>{mG+xWv|iZzBzotk%=p*R@`rmN7<>w7WPXV~oD-ZORxU zV~lneXCz7M_BiPY{6ppx&0VHU1}n{~0}h hj3R&tAOh$)z)zQW?ZehZYO(+T002ovPDHLkV1iqU@gx8M literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/meta.json index fcd9dc077d6..60e45949fd1 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/meta.json @@ -1,17 +1,20 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Bagel and BagelPoppy were created by DrEnzyme", + "copyright": "Bagel and BagelPoppy were created by DrEnzyme. Bagel-cottondough by JuneSzalkowska.", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "bagel" - }, - { - "name": "bagel-poppy" - } + { + "name": "bagel" + }, + { + "name": "bagel-poppy" + }, + { + "name": "bagel-cottondough" + } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton-equipped-BELT.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton-equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..b631cbea3eeec7d39b9b726bed4daed31d7c0637 GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zvpiiKLn`LH zy|r=eAp-%n2d8I0s^Z6Z~vfN7A3UM~c3+UKO0M`Tu9x^G~AhGv;2uoK@bV#<-ec+GojJ{_Xo$ z9hF|k{a86m#$l;Z-tK#A7uBnj-fBruSu%TnkYv0$_u{BtHH9hf_$y~OP1vRHvpk`M z$?0v~;+f~BTlcmaNI5K?xvf3AVE*3Me>EoxKwJnS4{X2ijqT9O))NzQ5}bG*zGXON z^EY-*%Qou|O54Ph!`97i{U~Op6(cU={e10vhRA7Vv((F<#a??D#&|;Br!?|b+20pt z6(@dmo)NLuPZ56exA(#oYyGg@$wm9_0DZYCPx$fJsC_RCt{2+C5IgFcb&y7sLS=7*I!8ID>Nl-Xd_J;&p4&S6 zAb17f{`I5idZz7ePe!ZkgW%0*#Z6Um&NHD1ZD8|s%S1#k@1L|>t%KW3ElP)tR(yS4 zP}g&IL5S8_I}7qx6Y0>Jk{UGr@OH zu-{3}DA526_XO9GY^svCyS;d7J(X(M`tH2@2zEVFm+9dO0000000000;D_(!X1152 zL%uh>p*PFNBng1gitTHW>m{fCeYUj-+}7MwC5Lui>fKTF%Gqee4>t=UBD#8fn`AA5 zSOBDI24c4>5&&-N!(MToWLkBPM>M9%^#-t&kiT#Jx8Rb`nPrTEkmBs&R8 w^F1;Cn*a>=1eawYULTN>Z!H1<007L>7irS!^R3i@&j0`b07*qoM6N<$f^4S9fB*mh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..61880dfe04063854aa2417e2d771a08e943e2f38 GIT binary patch literal 522 zcmV+l0`>igP)Px$#7RU!RCt{2+O1B*P!tF7fB8^^1c4YML4W~Gf@mLrG&q77qNqLqZ_w-w5J)f} zT7h3CkW7%EFg4Tx6%|W(fP)|x$kK&=+?Czt|C3F2bI<8%*PMF*A|fIpqRIl-mjB*E zRSR_&kjNLn+$7XWK;YVvq+MUck zyNct>p|QaOK3{1+M56IJ|nE@gqA|e3z1lN-4DS8o@1poj5 M07*qoM6N<$f}IuZO8@`> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton.png new file mode 100644 index 0000000000000000000000000000000000000000..fc00041207539a7e591298561c0fc5c49dd3efa3 GIT binary patch literal 660 zcmV;F0&D$=P)Px%PDw;TR9J=WmOp3{VHn1L*A}d)C4Yzz8i}TVB*9D;?14kFh(d-+hEQ-$=&FNm zLRW{b8N{Vna28@g5bDycgAgs6(FZ?mqZE@B2RA z%fUnw{bMPA3slIehGPx$PDw;TR9J=WlfOy>K@f*OHDGnbg%lQY1R?dMN}&%R`T{{jYYQ7oLD0uY9jm-R ziu59;x~s!pLfV9kaVsHaZOlpS{i@m7`SY7y1_FUVAQ1RtHdaZ}T3cfbaU3%o z4vC@&V+_@5_1E=&m9S`>BncvdQVJ1q_ad^gkRM6Y)GnAzCe~VOU;EGYwg2pV3p-6y z>sxozCrE2;_ls|ch@0FDx&X|I6&E)vRxpDuNs^$o_7YL>2~tYIbnI*qq43$zou|De zLB<%L(ta;+eRRlZURs(Qa7_!-9#OeQRIZ_vBFi#*&D-?}0BByFljk{6xrT@^D^?iI zOTgFEd7hJH8F3u@mi7ArfWcVk+?;XQdZKf4=KS?Wo7UwC^+ucS{RJ;?@AURc-U7VW ye5G_P;Ah48fZr9n>C_m6RnK_7inS`%3$7*HE8Jz7CA~b4`jTkQo}H1} zA-fZg6cZ$gqfufRlOlamZON>*um9IK&5C$*c{{A(iX%@!ya`cD(lsa55IrZ4$(qXj zZ=RkpI1qG?CZXZU_usl9vIF1SzW;UP``^b<_Xrnu#lIps4S$HfUD3J@AhrQ#mlaLh zh4W2le{iyH_E)Nt9X1SjJ%yGGwBA6|LXcJYoRfPOVHn3hCA1l=?BK-_-I-G$!m@`1F%rVlirz$!DCxF`PJ#!6 z@Df3PL350RK!gws1;G_uV-AJvsF#A>W-HXg?!I(bmOy$s?L=ttjs!uxpUeC5^8EO| z&kryd3sI{0gz*scSB?K)BN-qG8H z`|A=nUM$7_nkTlCj*_>j7d^UfPx%wMj%lR9J=WmOn@vVHn1L(TXvkCN_bzq770DO(At)BzUO(~ z=e;+98fy68p{aJ`c%M}Ouo(4BF0NL6&aFx}_+1VGV6-<^xRV1M!roDuY6Mjz!0&Ph z60xnL4S?`r3*PA|VqZQm)P6$vumuoBmLsIDQgT~I8#a4Cn7YB#O?*F2S67$#Qehof zSYhb#9XY0J3-G%ff_M5Gci%0E4igdaK_bGKL&v<=NzcR#;h(=5bLa?vdPdL03@=9> zmK0G^faHAc%?m<4H=VDh6e6|`k^mSC26<0>KQ3Q?eci4qLbV6vvfKNy*+s{}kI(Ui z)|mG?dDM{wAe}oW8jTX)kF%A}lFl`dN~QR%Zn>I4Km0|eZI3K5bcNxA!+J+y@y&<-8EL$s5+92D;EHrHdZRYa5!TeXg2KWf&nZ6$K!;I5|`d8TP+4;M%4t74vjEZNjFL`0rF3 zh@wb&o`)_N$m5pJzt^{+Z&GK#wM_-Euvj6EW5O^b4sQXtu}tRY=h)f%Gu;gIr2rzA z2jIzfc<#=iiylucAMgHQAWy3GV-j%`MJfmaC31O0E>GBW=yuvP9UJfZ5?%CY)N3rP zZjL2~2~J>HmMWLa6bc1i9)0ev&IVKVS^BjNfRyq>-Bc%VZBrRW1<&&^41@F2D!|xN zCNXjYu5GIRotuu$jb*aFwaeeD`b6?CZNRln)u`84ksFkMRtBk-QfgAlaovd|HqfZo zSl`;ER1|bOZGhA(pQr%uK)l507*qoM6N<$f?*rkQUCw| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough-slice.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough-slice.png new file mode 100644 index 0000000000000000000000000000000000000000..ca7e2347d7b8fa3df3d0935354624f808937453e GIT binary patch literal 521 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|?gjXSxZXXn z<>8qf_fBqoa%$7V zaR2Dqi#r!RKC|ui!IgWK^sZ^mJg{Qoqq93N?OJ^I@ah$fsk;~VY@OS-x+P=p(!SQk&S5=GT$rwX8lF=!r+S zuiU+IrYSdeZb#X%9V<63nfm_y`)ALd-Mo48{Q2`Y%0H$96?v5e`33){3@{+H=L#LR z0h-$E>Eak-(fjtoPQk+t9IOFX9h{%VEcoBXb1*9<+tllgkNs0ancJ_`ZZrR5YIA>P zdf?$||YuX8omirD29x_{4S02*) zCcC4f9hq?GfIcfq)BOR{`awc)wYbCbytk|e~4Bvn@RmC`ubq!Y@l-(JYD@< J);T3K0RYKvEw%sv literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/croissant-raw-cotton.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/croissant-raw-cotton.png new file mode 100644 index 0000000000000000000000000000000000000000..f80dc893319c30fcca50270f110b99e15685c0cb GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|v;urWT!C~) zu}w;p?VoS^zTKJd?s&rfn&7(=LjJEvSzY8aJRFR7{Q3X>T;sGZksbLS9vu5`C_b|ISFrL{ zT-kwZ6S{UkZaKW{gnJ7MSIY#yFHS23H^#Gwirr)I?+iHRePg>CM{k3diNf^SRyU`M zpZrVOSvDL_i!aWawu~bywnbIJO=YcBN#CVOjmMQ&NiAL%{#dzyv0KspK*}M0#nixi qy5Hgzb*3?zZ)E*3_uDW3_4>+LoNJYtmD7L@W$<+Mb6Mw<&;$UiZiBM` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json index 366f39f96a0..dd802fb59fd 100644 --- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice and croissant-raw taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380)", + "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice and croissant-raw taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Croissant-raw-cotton, cotton-dough-slice and cotton-dough-rope by JuneSzalkowska", "size": { "x": 32, "y": 32 @@ -46,6 +46,12 @@ { "name": "cotton-dough" }, + { + "name": "cotton-dough-slice" + }, + { + "name": "cotton-dough-rope" + }, { "name": "dough" }, @@ -123,6 +129,9 @@ }, { "name": "croissant-raw" + }, + { + "name": "croissant-raw-cotton" } ] } From a7ca552dfcf193c8b8d706f7567eb12fcc33b69c Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 29 Dec 2024 02:03:31 +0000 Subject: [PATCH 10/23] Automatic changelog update --- Resources/Changelog/Changelog.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 07f46efe86a..6517c6ddc64 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,16 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: The grappling gun is now available inside the salvage vendor. Additional - ones can be scavenged in space. - type: Add - - message: Removed the grappling gun from science research and lathes. - type: Remove - - message: Fixed issue that made the rope from the grappling gun not appear. - type: Fix - id: 7261 - time: '2024-09-02T04:33:25.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31737 - author: yuitop changes: - message: added in-hand sprite for Smile the Slime @@ -3936,3 +3924,17 @@ id: 7760 time: '2024-12-29T01:50:49.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/33997 +- author: ArtisticRoomba, JuneSzalkowska + changes: + - message: New cotton dough slices and cotton dough rolls. + type: Add + - message: New cotton baguette, cotton crostini, cotton chevre-chaud, cotton bagel, + and cotton croissant recipes. You can make them by following the recipes for + regular baguettes, bagels, etc, but use cotton dough instead. + type: Add + - message: Slicing dough into thirds now divides the nutriment value into thirds. + Previously you could slice dough to triple your nutriment. + type: Fix + id: 7761 + time: '2024-12-29T02:02:25.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33508 From b22551d985e8c38b03c2a6d88be0cf4b24078b74 Mon Sep 17 00:00:00 2001 From: SplikZerys <136282037+SplikZerys@users.noreply.github.com> Date: Sun, 29 Dec 2024 06:05:06 +0300 Subject: [PATCH 11/23] TTS voices update (#961) --- .../_sunrise/tts/tts-voices-sunrise.ftl | 10 ++- .../_Sunrise/tts_voices_sunrise.yml | 65 ++++++++++++++++--- 2 files changed, 65 insertions(+), 10 deletions(-) diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl index a74db60aa33..12ce8824cb2 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl @@ -51,9 +51,9 @@ tts-voice-name-pathologic2-alexander-saburov = [Pathologic 2] Александр tts-voice-name-pathologic2-inkvizitor = [Pathologic 2] Инквизитор tts-voice-name-pathologic2-alexander-blok = [Pathologic 2] Александр Блок tts-voice-name-pathologic2-mark-bessmertnik = [Pathologic 2] Марк Бессмертник -tts-voice-name-crysis2-ai-blackops-03-v1 = [Crysis 2] Оперативник 3 +tts-voice-name-crysis2-ai-blackops-03-v1 = [Crysis 2] Оперативник BlackOps 3 tts-voice-name-crysis2-ai-costume = [Crysis 2] ИИ Нанокостюма 2.0 -tts-voice-name-hearthstone-bellok-bright-blade = [Hearthstone] Беллок Сияющий Клинок +tts-voice-name-hearthstone-bellok-bright-blade = (NEW) [Hearthstone] Беллок Сияющий Клинок tts-voice-name-hearthstone-prince-artas = [Hearthstone] Принц Артас tts-voice-name-hearthstone-tarkus = [Hearthstone] Таркус tts-voice-name-hearthstone-uter = [Hearthstone] Утер @@ -67,3 +67,9 @@ tts-voice-name-warcraft3-muradin = [Warcraft 3] Мурадин tts-voice-name-warcraft3-artas-2 = [Warcraft 3] Артас 2.0 tts-voice-name-warcraft3-kel = (NEW) [Warcraft 3] Кел tts-voice-name-warcraft3-dreney = (NEW) [Warcraft 3] Дреней +tts-voice-name-warcraft3-witcher = (NEW) [Warcraft 3] Ведьмак +tts-voice-name-warcraft3-starik-tumba = (NEW) [Warcraft 3] Старик Тумба +tts-voice-name-starcraft-terran-adviser = (NEW) [Starcraft] Советник Терранов +tts-voice-name-crysis2-terran-adviser = (NEW) [Starcraft] Советник Терранов +tts-voice-name-warcraft3-yastreb = (NEW) [Warcraft 3] Ястреб +tts-voice-name-crysis2-ai-uscaucasian-03 = (NEW) [Crysis 2] Оперативник 3 diff --git a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml index 37471858337..daaf3fd37eb 100644 --- a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml +++ b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml @@ -1,9 +1,4 @@ -# всего 67 голосов -# 52 уникальных доступных раундстартом -# 8 недоступных раундстартом -# 7 вторых версий - -- type: ttsVoice +- type: ttsVoice id: Minkir name: tts-voice-name-minkir sex: Male @@ -53,7 +48,7 @@ name: tts-voice-name-templar-assasin sex: Female speaker: templar_assasin - roundStart: false # maybe for borgs... + roundStart: true provider: sunrise sponsorOnly: true @@ -435,7 +430,7 @@ sex: Male speaker: hearthstone_bellok_bright_blade provider: sunrise - roundStart: false # Переобучить + roundStart: true sponsorOnly: false - type: ttsVoice @@ -555,3 +550,57 @@ provider: sunrise roundStart: true sponsorOnly: false + +- type: ttsVoice + id: Warcraft3Witcher + name: tts-voice-name-warcraft3-witcher + sex: Male + speaker: warcraft3_witcher + provider: sunrise + roundStart: true + sponsorOnly: false + +- type: ttsVoice + id: Warcraft3Kel + name: tts-voice-name-warcraft3-kel + sex: Male + speaker: warcraft3_kel + provider: sunrise + roundStart: true + sponsorOnly: false + +- type: ttsVoice + id: Warcraft3StarikTumba + name: tts-voice-name-warcraft3-starik-tumba + sex: Male + speaker: warcraft3_starik_tumba + provider: sunrise + roundStart: true + sponsorOnly: false + +- type: ttsVoice + id: StarcraftTerranAdviser + name: tts-voice-name-starcraft-terran-adviser + sex: Female + speaker: starcraft_terran_adviser + provider: sunrise + roundStart: true + sponsorOnly: false + +- type: ttsVoice + id: CRYSIS2AiUscaucasian03 + name: tts-voice-name-crysis2-ai-uscaucasian-03 + sex: Male + speaker: crysis2_ai_uscaucasian_03 + provider: sunrise + roundStart: true + sponsorOnly: false + +- type: ttsVoice + id: Warcraft3Yastreb + name: tts-voice-name-warcraft3-yastreb + sex: Male + speaker: warcraft3_yastreb + provider: sunrise + roundStart: true + sponsorOnly: false From 80090b0ce06aff80743e4f29f7392b403a5b3704 Mon Sep 17 00:00:00 2001 From: GayBot Date: Sun, 29 Dec 2024 06:01:30 +0300 Subject: [PATCH 12/23] Automatic changelog update --- Resources/Changelog/ChangelogSunrise.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index 1c1e53a5510..0d00d816a8c 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -9023,3 +9023,12 @@ type: Tweak id: 631 time: '2024-12-28T19:00:44.457841+00:00' +- author: SplikZerys + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E 8 \u043D\u043E\ + \u0432\u044B\u0445 \u0422\u0422\u0421-\u0433\u043E\u043B\u043E\u0441\u043E\u0432\ + ." + type: Add + id: 632 + time: '2024-12-29T03:05:06.0000000+00:00' + url: https://github.com/space-sunrise/space-station-14/pull/961 From d6a9fe1c84ba803740b7526c210002de351520e7 Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Sat, 28 Dec 2024 21:25:39 -0600 Subject: [PATCH 13/23] Rolling joints no longer requires a filter (#34106) * Remove filters from joint crafting * err * hmmm * guhhh * yyyy * whitespace --------- Co-authored-by: Velcroboy --- Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml index 419d7bff339..fd613ae0a1f 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml @@ -7,7 +7,6 @@ - to: joint steps: - material: PaperRolling - - material: CigaretteFilter - material: GroundCannabis doAfter: 2 - node: joint @@ -22,7 +21,6 @@ - to: jointRainbow steps: - material: PaperRolling - - material: CigaretteFilter - material: GroundCannabisRainbow doAfter: 2 - node: jointRainbow From da8bb996b174ac9b781b61c73a1ed206b93a4233 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 29 Dec 2024 03:26:46 +0000 Subject: [PATCH 14/23] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 6517c6ddc64..c488dc4e61d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: yuitop - changes: - - message: added in-hand sprite for Smile the Slime - type: Add - id: 7262 - time: '2024-09-02T04:36:05.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31731 - author: EmoGarbage404 changes: - message: Space Carp and Sharkminnows are a bit weaker overall. @@ -3938,3 +3931,10 @@ id: 7761 time: '2024-12-29T02:02:25.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/33508 +- author: Velcroboy + changes: + - message: Rolling joints no longer requires a cigarette filter. + type: Tweak + id: 7762 + time: '2024-12-29T03:25:40.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34106 From 072b973f3b6f3eccaeb19a5c36bcda134f822a45 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sun, 29 Dec 2024 04:28:58 +0100 Subject: [PATCH 15/23] fix interdimensional teleporter desc (#34108) Update hand_teleporter.yml --- .../Prototypes/Entities/Objects/Devices/hand_teleporter.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml index 094e3b45798..192aca65fc6 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml @@ -20,7 +20,7 @@ suffix: Admeme parent: BaseItem name: interdimensional teleporter - description: allows you to open stable portal gates that are not limited by distance + description: Allows you to open stable portal gates that are not limited by distance. components: - type: Sprite sprite: /Textures/Objects/Devices/hand_teleporter.rsi @@ -29,4 +29,4 @@ color: green - type: HandTeleporter firstPortalPrototype: PortalGatewayBlue - secondPortalPrototype: PortalGatewayOrange \ No newline at end of file + secondPortalPrototype: PortalGatewayOrange From 580ff8f537738db0b1f25017d5143410bd6a8b81 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Sun, 29 Dec 2024 15:52:15 +0000 Subject: [PATCH 16/23] =?UTF-8?q?ERT=20Uplink:=20=D0=93=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=D0=B0=D1=82=D1=8B=20(#960)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add Explosives to Uplink * Fix NVD Icon * clean --- .../catalog/fills/boxes/nanotrasen.ftl | 16 ++ .../entities/objects/misc/implanters.ftl | 3 + .../objects/misc/subdermal_implants.ftl | 2 + .../_strings/_sunrise/store/categories.ftl | 1 + .../_sunrise/store/ntuplink-catalog.ftl | 1 + .../catalog/fills/boxes/nanotrasen.ftl | 16 ++ .../entities/objects/misc/implanters.ftl | 3 + .../objects/misc/subdermal_implants.ftl | 2 + .../_strings/_sunrise/store/categories.ftl | 1 + .../_sunrise/store/ntuplink-catalog.ftl | 1 + .../Objects/Misc/subdermal_implants.yml | 43 ++++ Resources/Prototypes/Store/presets.yml | 1 + .../Catalog/Fills/Boxes/nanotrasen.yml | 123 +++++++++ .../_Sunrise/Catalog/ert_uplink_catalog.yml | 239 ++++++++++++------ .../Entities/Objects/Misc/implanters.yml | 9 + .../Prototypes/_Sunrise/Store/categories.yml | 5 + .../Objects/Storage/boxes.rsi/incendiary.png | Bin 0 -> 177 bytes .../Objects/Storage/boxes.rsi/meta.json | 9 + .../Objects/Storage/boxes.rsi/shrapnel.png | Bin 0 -> 172 bytes .../Objects/Storage/boxes.rsi/stinger.png | Bin 0 -> 175 bytes .../Misc/nt_icons.rsi/box_ertrattle.png | Bin 0 -> 1252 bytes .../Misc/nt_icons.rsi/box_incendiary.png | Bin 0 -> 1282 bytes .../Misc/nt_icons.rsi/box_shrapnel.png | Bin 0 -> 1278 bytes .../Misc/nt_icons.rsi/box_stinger.png | Bin 0 -> 1279 bytes .../Interface/Misc/nt_icons.rsi/meta.json | 12 + 25 files changed, 411 insertions(+), 76 deletions(-) create mode 100644 Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl create mode 100644 Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml create mode 100644 Resources/Prototypes/_Sunrise/Entities/Objects/Misc/implanters.yml create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/incendiary.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/shrapnel.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/stinger.png create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_ertrattle.png create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_incendiary.png create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_shrapnel.png create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_stinger.png diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl new file mode 100644 index 00000000000..959a9b95483 --- /dev/null +++ b/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl @@ -0,0 +1,16 @@ +ent-BoxErtImplants = ERT death tracking implant box + .desc = Six death tracking implants for the whole ERT squad. +ent-BoxGrenadeIncendiary = GrenadeIncendiary box + .desc = 'WARNING: These devices are extremely dangerous.' +ent-BoxGrenadeShrapnel = GrenadeShrapnel Box + .desc = 'WARNING: These devices are extremely dangerous.' +ent-BoxGrenadeStinger = GrenadeStinger Box + .desc = 'WARNING: These devices are extremely dangerous.' +ent-BoxMetalFoamGrenade = MetalFoamGrenade Box + .desc = 'WARNING: These devices are dangerous.' +ent-BoxSmokeGrenade = SmokeGrenade Box + .desc = 'WARNING: These devices are dangerous.' +ent-BoxTearGasGrenade = TearGasGrenade box + .desc = 'WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.' +ent-BoxClusterBangFull = ClusterBang box + .desc = 'WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.' \ No newline at end of file diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/misc/implanters.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/misc/implanters.ftl index 8fc26fa3bc5..dd868f2215a 100644 --- a/Resources/Locale/en-US/_prototypes/entities/objects/misc/implanters.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/objects/misc/implanters.ftl @@ -21,6 +21,9 @@ ent-BikeHornImplanter = { ent-BaseImplantOnlyImplanter } ent-TrackingImplanter = { ent-BaseImplantOnlyImplanter } .suffix = tracking .desc = { ent-BaseImplantOnlyImplanter.desc } +ent-TrackingImplanterERT = { ent-BaseImplantOnlyImplanter } + .suffix = death rattle ERT + .desc = { ent-BaseImplantOnlyImplanter.desc } ent-StorageImplanter = { ent-BaseImplantOnlyImplanterSyndi } .suffix = storage .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/misc/subdermal_implants.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/misc/subdermal_implants.ftl index 5fd3733456e..1c0b1bd84a2 100644 --- a/Resources/Locale/en-US/_prototypes/entities/objects/misc/subdermal_implants.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/objects/misc/subdermal_implants.ftl @@ -8,6 +8,8 @@ ent-BikeHornImplant = bike horn implant .desc = This implant lets the user honk anywhere at any time. ent-TrackingImplant = tracking implant .desc = This implant has a tracking device attached to the suit sensor network, as well as a condition monitor for the Security radio channel. +ent-TrackingImplantErt = ERT death rattle implant + .desc = This implant will inform the Centcomm radio channel should the user fall into critical condition or die. ent-StorageImplant = storage implant .desc = This implant grants hidden storage within a person's body using bluespace technology. ent-FreedomImplant = freedom implant diff --git a/Resources/Locale/en-US/_strings/_sunrise/store/categories.ftl b/Resources/Locale/en-US/_strings/_sunrise/store/categories.ftl index 76e5343d8e3..8a1f889c186 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/store/categories.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/store/categories.ftl @@ -33,5 +33,6 @@ store-category-ntadditional = Additional store-category-ntsanitary = Sanitary store-category-ntengineering = Engineering store-category-ntmechs = Mechs +store-category-ntexplosive = Explosive store-category-ntammo = Ammo store-category-ntequipment = Equipment Экипировка diff --git a/Resources/Locale/en-US/_strings/_sunrise/store/ntuplink-catalog.ftl b/Resources/Locale/en-US/_strings/_sunrise/store/ntuplink-catalog.ftl index 42672152db9..7f1fb8e52bd 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/store/ntuplink-catalog.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/store/ntuplink-catalog.ftl @@ -7,6 +7,7 @@ ntuplink-mech-teleporter-eliteheavy-desc = contains crate with Seraph. for high ntuplink-mech-powercage-nanotrasen-name = NanoTrasen power cage ntuplink-mech-powercage-nanotrasen-desc = A rechargeable power cage for big devices. Increased capacity for increased power levels. Immune to EMP. +ntuplink-deathrattle-implant-desc = A box containing enough deathrattle implants for the whole squad. Relays a message containing your position to the Centcomm channel when you go into a critical state or die. ntuplink-equip-jetpackvoid-name = void jetpack ntuplink-equip-jetpackmini-name = mini jetpack ntuplink-equip-jetpack-name = jetpack diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl new file mode 100644 index 00000000000..925a233edee --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl @@ -0,0 +1,16 @@ +ent-BoxErtImplants = коробка имплантеров "Предсмертный трекер" + .desc = Шесть имплантов "Предсмертный трекер" для всего отряда ЦК. +ent-BoxGrenadeIncendiary = Коробка зажигательных гранат + .desc = ВНИМАНИЕ: Эти устройства крайне опасны. +ent-BoxGrenadeShrapnel = Коробка шрапнельных гранат + .desc = ВНИМАНИЕ: Эти устройства крайне опасны. +ent-BoxGrenadeStinger = Коробка травматических гранат + .desc = ВНИМАНИЕ: Эти устройства крайне опасны. +ent-BoxMetalFoamGrenade = Коробка металопенных гранат + .desc = ВНИМАНИЕ: Эти устройства крайне опасны и могут вызвать удушение. +ent-BoxSmokeGrenade = Коробка дымовых гранат + .desc = ВНИМАНИЕ: Эти устройства крайне опасны и могут вызвать слепоту. +ent-BoxTearGasGrenade = Коробка слезоточивых гранат + .desc = ВНИМАНИЕ: Эти устройства крайне опасны и могут вызвать слепоту при многократном использовании. +ent-BoxClusterBangFull = Коробка кластерных светошумовых гранат + .desc = ВНИМАНИЕ: Эти устройства крайне опасны и могут вызвать слепоту или глухоту при многократном использовании. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/implanters.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/implanters.ftl index 08caed8dc22..8191f72f58c 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/implanters.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/implanters.ftl @@ -21,6 +21,9 @@ ent-BikeHornImplanter = { ent-Implanter } ent-TrackingImplanter = { ent-Implanter } .desc = { ent-BaseImplantOnlyImplanter.desc } .suffix = Трекер +ent-TrackingImplanterERT = { ent-Implanter } + .desc = { ent-BaseImplantOnlyImplanter.desc } + .suffix = Предсмертный хрип ОБР ent-StorageImplanter = { ent-Implanter } .desc = { ent-BaseImplantOnlyImplanter.desc } .suffix = Хранилище diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/subdermal_implants.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/subdermal_implants.ftl index 4f17db718ae..7bf0821d7d6 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/subdermal_implants.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/subdermal_implants.ftl @@ -8,6 +8,8 @@ ent-BikeHornImplant = хонк-имплант .desc = Этот имплант позволяет пользователю хонкать когда угодно. ent-TrackingImplant = имплант Трекер .desc = Этот имплант оснащён устройством слежения, подключенным к сети датчиков комбинезонов, а также монитором состояния для радиоканала службы безопасности. +ent-TrackingImplantErt = имплант Предсмертный хрип ОБР + .desc = Этот имплант сообщит в радиоканал Центком, если пользователь окажется в критическом состоянии или умрёт. ent-StorageImplant = имплант Хранилище .desc = Этот имплант позволяет организовать скрытое хранилище внутри тела, с использованием блюспейс-технологии. ent-FreedomImplant = имплант Свобода diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/store/categories.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/store/categories.ftl index 2c2d8df85a5..c92aa4087f0 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/store/categories.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/categories.ftl @@ -34,5 +34,6 @@ store-category-ntadditional = Дополнительное store-category-ntsanitary = Санитария store-category-ntengineering = Инженерия store-category-ntmechs = Мехи +store-category-ntexplosive = Взрывчатка store-category-ntammo = Боеприпасы store-category-ntequipment = Экипировка \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/store/ntuplink-catalog.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/store/ntuplink-catalog.ftl index a30a66a22d2..05e9c775bf3 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/store/ntuplink-catalog.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/ntuplink-catalog.ftl @@ -7,6 +7,7 @@ ntuplink-mech-teleporter-eliteheavy-desc = Содержит ящик с лучш ntuplink-mech-powercage-nanotrasen-name = Энерго ячейка НаноТрейзен ntuplink-mech-powercage-nanotrasen-desc = Перезаряжаемая энергетическая ячейка для больших устройств. Увеличенная ёмкость для увеличенного уровня мощности. Имеет защиту от ЭМИ. +ntuplink-deathrattle-implant-desc = Коробка, содержащая 6 имплантов "Предсмертный хрип". Когда вы попадаете в критическое состояние Передаст сообщение с вашими координатами по радиоканалу Центком. ntuplink-equip-jetpackvoid-name = пустотный джетпак ntuplink-equip-jetpackmini-name = мини джетпак ntuplink-equip-jetpack-name = джетпак diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index 4ad3d4532ed..d26179bfd94 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml @@ -103,6 +103,49 @@ - type: Rattle radioChannel: "Security" +#ERT implants Sunrise-start +#- type: entity +# parent: [ BaseSubdermalImplant, StorePresetUplink ] +# id: UplinkImplantErt +# name: uplink implant +# description: This implant lets the user access a hidden Syndicate uplink at will. +# categories: [ HideSpawnMenu ] +# components: +# - type: SubdermalImplant +# implantAction: ActionOpenUplinkImplantErt +# whitelist: +# components: +# - Hands +# - type: Store +# balance: +# Bluecrystal: 0 +# Crystallite: 0 +# - type: UserInterface +# interfaces: +# enum.StoreUiKey.Key: +# type: StoreBoundUserInterface +# - type: Tag +# tags: +# - NTUplink + +- type: entity + parent: BaseSubdermalImplant + id: TrackingImplantErt + name: tracking ERT implant + description: This implant has a tracking device attached to the suit sensor network, as well as a condition monitor for the Centcom radio channel. + categories: [ HideSpawnMenu ] + components: + - type: SubdermalImplant + whitelist: + components: + - MobState # admeme implanting a chair with tracking implant needs to give the chair mobstate so it can die first + - type: TriggerOnMobstateChange + mobState: + - Critical + - type: Rattle + radioChannel: "CentCom" +#Sunrise-end + #Traitor implants - type: entity diff --git a/Resources/Prototypes/Store/presets.yml b/Resources/Prototypes/Store/presets.yml index ac1f0c74307..a4cffc64629 100644 --- a/Resources/Prototypes/Store/presets.yml +++ b/Resources/Prototypes/Store/presets.yml @@ -53,6 +53,7 @@ - NTAmmo - NTMedicine - NTAdditional + - NTexplosive - NTMechs - NTSanitary - NTEngineering diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml new file mode 100644 index 00000000000..4ada31d7d04 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml @@ -0,0 +1,123 @@ +- type: entity + name: ERT death tracking implant box + parent: [BoxCardboard, BaseCentcommContraband] + id: BoxErtImplants + description: Six death tracking implants for the whole centcomm squad. + components: + - type: Sprite + layers: + - state: internals + - state: syringe + - type: Storage + grid: + - 0,0,5,3 + - type: StorageFill + contents: + - id: TrackingImplanterERT + amount: 6 + +- type: entity + name: GrenadeIncendiary box + parent: BoxCardboard + id: BoxGrenadeIncendiary + description: 'WARNING: These devices are extremely dangerous.' + components: + - type: StorageFill + contents: + - id: GrenadeIncendiary + amount: 4 + - type: Sprite + layers: + - state: box_security + - state: incendiary + +- type: entity + name: GrenadeShrapnel box + parent: BoxCardboard + id: BoxGrenadeShrapnel + description: 'WARNING: These devices are extremely dangerous.' + components: + - type: StorageFill + contents: + - id: GrenadeShrapnel + amount: 4 + - type: Sprite + layers: + - state: box_security + - state: shrapnel + + +- type: entity + name: GrenadeStinger box + parent: BoxCardboard + id: BoxGrenadeStinger + description: 'WARNING: These devices are extremely dangerous.' + components: + - type: StorageFill + contents: + - id: GrenadeStinger + amount: 4 + - type: Sprite + layers: + - state: box_security + - state: stinger + +- type: entity + name: MetalFoamGrenade box + parent: BoxCardboard + id: BoxMetalFoamGrenade + description: 'WARNING: These devices are extremely dangerous.' + components: + - type: StorageFill + contents: + - id: MetalFoamGrenade + amount: 4 + - type: Sprite + layers: + - state: box_security + - state: flashbang + +- type: entity + name: TearGasGrenade box + parent: BoxCardboard + id: BoxTearGasGrenade + description: 'WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.' + components: + - type: StorageFill + contents: + - id: TearGasGrenade + amount: 4 + - type: Sprite + layers: + - state: box_security + - state: flashbang + +- type: entity + name: SmokeGrenade box + parent: BoxCardboard + id: BoxSmokeGrenade + description: 'WARNING: These devices are extremely dangerous.' + components: + - type: StorageFill + contents: + - id: SmokeGrenade + amount: 4 + - type: Sprite + layers: + - state: box_security + - state: flashbang + +- type: entity + name: ClusterBangFull box + parent: BoxCardboard + id: BoxClusterBangFull + description: 'WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.' + components: + - type: StorageFill + contents: + - id: ClusterBangFull + amount: 4 + - type: Sprite + layers: + - state: box_security + - state: flashbang \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml index 64109e08bf2..c0d902c6a1b 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml @@ -5,7 +5,7 @@ productEntity: ClothingBackpackDuffelWeaponSubMachineGunWt550Filled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: wt550 } cost: - Bluecrystal: 3 + Bluecrystal: 2 categories: - NTAutoGun conditions: @@ -31,7 +31,7 @@ productEntity: ClothingBackpackDuffelWeaponRifleLecterFilled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: lecter } cost: - Bluecrystal: 6 + Bluecrystal: 5 categories: - NTAutoGun conditions: @@ -83,7 +83,7 @@ productEntity: ClothingBackpackDuffelWeaponLightMachineGunMG42 icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mg42 } cost: - Bluecrystal: 25 + Bluecrystal: 24 categories: - NTAutoGun conditions: @@ -122,7 +122,7 @@ productEntity: ClothingBackpackDuffelWeaponShotgunZauerFilled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: zauer } cost: - Bluecrystal: 14 + Bluecrystal: 13 categories: - NTAutoGun conditions: @@ -135,7 +135,7 @@ productEntity: ClothingBackpackDuffelWeaponXM1014Filled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: xm1014 } cost: - Bluecrystal: 10 + Bluecrystal: 9 categories: - NTAutoGun conditions: @@ -148,7 +148,7 @@ productEntity: ClothingBackpackDuffelWeaponShotgun12Filled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: spas12 } cost: - Bluecrystal: 8 + Bluecrystal: 7 categories: - NTAutoGun conditions: @@ -209,7 +209,7 @@ productEntity: WeaponEnergyGunTactical icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: energygun_tac } cost: - Bluecrystal: 8 + Bluecrystal: 6 categories: - NTLasers conditions: @@ -247,7 +247,7 @@ productEntity: WeaponPulsePistol icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: pulse-p } cost: - Bluecrystal: 3 + Bluecrystal: 4 categories: - NTPistols conditions: @@ -272,7 +272,7 @@ productEntity: WeaponPistolN1984 icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: n1984 } cost: - Bluecrystal: 2 + Bluecrystal: 3 categories: - NTPistols conditions: @@ -284,7 +284,7 @@ productEntity: WeaponFlareGunSecurity icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: sec_flaregun } cost: - Bluecrystal: 2 + Bluecrystal: 1 categories: - NTPistols conditions: @@ -393,7 +393,7 @@ productEntity: SMGIncendiaryAmmoKit icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_smg_red } cost: - Crystallite: 17 + Crystallite: 15 categories: - NTAmmo conditions: @@ -405,7 +405,7 @@ productEntity: SMGUraniumAmmoKit icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_smg_uran } cost: - Crystallite: 30 + Crystallite: 25 categories: - NTAmmo conditions: @@ -429,7 +429,7 @@ productEntity: BoxMagazineShotgunIncendiary icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_shot_red } cost: - Crystallite: 18 + Crystallite: 16 categories: - NTAmmo conditions: @@ -441,7 +441,7 @@ productEntity: BoxMagazineShotgunSlug icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_shot_slug } cost: - Crystallite: 10 + Crystallite: 9 categories: - NTAmmo conditions: @@ -489,13 +489,98 @@ productEntity: PortableRecharger icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: port_recharge } cost: - Crystallite: 20 + Crystallite: 15 categories: - NTAmmo conditions: + - !type:ListingLimitedStockCondition + stock: 5 + +# NTexplosive: +- type: listing + id: NTUplinkSunriseBoxFlashbang + productEntity: BoxFlashbang + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_flashbangs } + cost: + Crystallite: 2 + categories: + - NTexplosive + conditions: + - !type:ListingLimitedStockCondition + stock: 4 + +- type: listing + id: NTUplinkSunriseBoxTearGasGrenade + productEntity: BoxTearGasGrenade + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_flashbangs } + cost: + Crystallite: 2 + categories: + - NTexplosive + conditions: + - !type:ListingLimitedStockCondition + stock: 4 + +- type: listing + id: NTUplinkSunriseBoxSmokeGrenade + productEntity: BoxSmokeGrenade + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_flashbangs } + cost: + Crystallite: 3 + categories: + - NTexplosive + conditions: - !type:ListingLimitedStockCondition stock: 4 +- type: listing + id: NTUplinkSunriseBoxClusterBangFull + productEntity: BoxClusterBangFull + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_flashbangs } + cost: + Crystallite: 4 + categories: + - NTexplosive + conditions: + - !type:ListingLimitedStockCondition + stock: 2 + +- type: listing + id: NTUplinkSunriseBoxGrenadeStinger + productEntity: BoxGrenadeStinger + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_stinger } + cost: + Crystallite: 5 + categories: + - NTexplosive + conditions: + - !type:ListingLimitedStockCondition + stock: 2 + +- type: listing + id: NTUplinkSunriseBoxGrenadeShrapnel + productEntity: BoxGrenadeShrapnel + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_shrapnel } + cost: + Crystallite: 8 + categories: + - NTexplosive + conditions: + - !type:ListingLimitedStockCondition + stock: 2 + +- type: listing + id: NTUplinkSunriseBoxGrenadeIncendiary + productEntity: BoxGrenadeIncendiary + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_incendiary } + cost: + Crystallite: 8 + categories: + - NTexplosive + conditions: + - !type:ListingLimitedStockCondition + stock: 2 + # Медицина: - type: listing id: NTUplinkSunriseMaterialBiomass @@ -598,7 +683,7 @@ productEntity: ClothingBackpackDuffelNanotrasenMedicalBundleFilled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: med_bundle } cost: - Crystallite: 35 + Crystallite: 30 categories: - NTMedicine conditions: @@ -612,7 +697,7 @@ productEntity: CrateMindShieldImplants icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: crate_med } cost: - Crystallite: 6 + Crystallite: 5 categories: - NTAdditional conditions: @@ -636,19 +721,19 @@ productEntity: PinpointerUniversal icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: universal_pinpointer } cost: - Crystallite: 3 + Crystallite: 2 categories: - NTAdditional conditions: - !type:ListingLimitedStockCondition - stock: 8 + stock: 6 - type: listing id: NTUplinkSunriseBoxMRE productEntity: BoxMRE icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_mre } cost: - Crystallite: 2 + Crystallite: 1 categories: - NTAdditional conditions: @@ -660,19 +745,7 @@ productEntity: BoxHandcuff icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_handcuffs } cost: - Crystallite: 2 - categories: - - NTAdditional - conditions: - - !type:ListingLimitedStockCondition - stock: 8 - -- type: listing - id: NTUplinkSunriseBoxFlashbang - productEntity: BoxFlashbang - icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_flashbangs } - cost: - Crystallite: 4 + Crystallite: 1 categories: - NTAdditional conditions: @@ -701,20 +774,33 @@ - NTAdditional conditions: - !type:ListingLimitedStockCondition - stock: 12 + stock: 6 - type: listing id: NTUplinkSunriseDeployableBarrier productEntity: DeployableBarrier icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: deploy_barrier } cost: - Crystallite: 6 + Crystallite: 4 categories: - NTAdditional conditions: - !type:ListingLimitedStockCondition stock: 8 +- type: listing + id: NTUplinkSunriseBoxErtImplants + description: ntuplink-deathrattle-implant-desc + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_ertrattle } + productEntity: BoxErtImplants + cost: + Crystallite: 2 + categories: + - NTAdditional + conditions: + - !type:ListingLimitedStockCondition + stock: 2 + # Санитария - type: listing @@ -777,12 +863,24 @@ - !type:ListingLimitedStockCondition stock: 3 +- type: listing + id: NTUplinkSunriseBoxCleanerGrenades + productEntity: BoxCleanerGrenades + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_flashbangs } + cost: + Crystallite: 2 + categories: + - NTSanitary + conditions: + - !type:ListingLimitedStockCondition + stock: 5 + - type: listing id: NTUplinkSunriseAdvMopItem productEntity: AdvMopItem icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: adv-mop } cost: - Crystallite: 4 + Crystallite: 3 categories: - NTSanitary conditions: @@ -802,12 +900,24 @@ - !type:ListingLimitedStockCondition stock: 4 +- type: listing + id: NTUplinkSunriseBoxMetalFoamGrenade + productEntity: BoxMetalFoamGrenade + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_flashbangs } + cost: + Crystallite: 2 + categories: + - NTEngineering + conditions: + - !type:ListingLimitedStockCondition + stock: 4 + - type: listing id: NTUplinkSunriseJawsOfLife productEntity: JawsOfLife icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: jaws } cost: - Crystallite: 5 + Crystallite: 4 categories: - NTEngineering conditions: @@ -819,7 +929,7 @@ productEntity: Omnitool icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: omnitool } cost: - Crystallite: 7 + Crystallite: 6 categories: - NTEngineering conditions: @@ -831,7 +941,7 @@ productEntity: PowerCellHigh icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: power_cell_high } cost: - Crystallite: 2 + Crystallite: 1 categories: - NTEngineering conditions: @@ -845,35 +955,12 @@ productEntity: PowerCellNanoTrasen icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: power_cell_nt } cost: - Crystallite: 5 - categories: - - NTEngineering - conditions: - - !type:ListingLimitedStockCondition - stock: 4 - -- type: listing - id: NTUplinkSunriseNetworkConfigurator - productEntity: NetworkConfigurator - icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: network_configurator } - cost: - Crystallite: 1 - categories: - - NTEngineering - conditions: - - !type:ListingLimitedStockCondition - stock: 4 -- type: listing - id: NTUplinkSunriseMultitool - productEntity: Multitool - icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: multitool } - cost: - Crystallite: 1 + Crystallite: 4 categories: - NTEngineering conditions: - !type:ListingLimitedStockCondition - stock: 4 + stock: 8 # Экипировка: - type: listing @@ -882,7 +969,7 @@ productEntity: TelescopicShield icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: telescopic_shield } cost: - Crystallite: 3 + Crystallite: 2 categories: - NTEquipment conditions: @@ -895,7 +982,7 @@ productEntity: RiotBulletShield icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: riot_bullet_shield } cost: - Crystallite: 2 + Crystallite: 1 categories: - NTEquipment conditions: @@ -908,7 +995,7 @@ productEntity: RiotLaserShield icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: riot_laser_shield } cost: - Crystallite: 2 + Crystallite: 1 categories: - NTEquipment conditions: @@ -921,7 +1008,7 @@ productEntity: RiotShield icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: riot_shield } cost: - Crystallite: 2 + Crystallite: 1 categories: - NTEquipment conditions: @@ -934,7 +1021,7 @@ productEntity: JetpackBlueFilled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: jet_blue } cost: - Crystallite: 4 + Crystallite: 3 categories: - NTEquipment conditions: @@ -947,7 +1034,7 @@ productEntity: JetpackMiniFilled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mini_jet } cost: - Crystallite: 4 + Crystallite: 2 categories: - NTEquipment conditions: @@ -970,9 +1057,9 @@ - type: listing id: NTUplinkSunriseClothingEyesNVD productEntity: ClothingEyesNVD - icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: void_jet } + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: nvd } cost: - Crystallite: 12 + Crystallite: 10 categories: - NTEquipment conditions: @@ -996,7 +1083,7 @@ productEntity: EnergyDomeGeneratorPersonalNT icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: nanotrasen_belt } cost: - Crystallite: 35 + Crystallite: 30 categories: - NTEquipment conditions: @@ -1011,7 +1098,7 @@ productEntity: PowerCageERT icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: powercage_nt } cost: - Crystallite: 10 + Crystallite: 15 categories: - NTMechs conditions: @@ -1037,12 +1124,12 @@ icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mech_ntgygax } productEntity: CrateCommandNTGygaxBundle cost: - Bluecrystal: 60 + Bluecrystal: 55 categories: - NTMechs conditions: - !type:ListingLimitedStockCondition - stock: 2 + stock: 1 - type: listing id: NTUplinkSunriseMarauder diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/implanters.yml new file mode 100644 index 00000000000..34202d4285b --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/implanters.yml @@ -0,0 +1,9 @@ +#NanoTrasen implanters + +- type: entity + id: TrackingImplanterERT + suffix: tracking + parent: BaseImplantOnlyImplanter + components: + - type: Implanter + implant: TrackingImplantErt \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Store/categories.yml b/Resources/Prototypes/_Sunrise/Store/categories.yml index ee82e7e488e..7252b76f97a 100644 --- a/Resources/Prototypes/_Sunrise/Store/categories.yml +++ b/Resources/Prototypes/_Sunrise/Store/categories.yml @@ -168,6 +168,11 @@ name: store-category-ntmechs priority: 9 +- type: storeCategory + id: NTexplosive + name: store-category-ntexplosive + priority: 10 + - type: storeCategory id: NTAmmo name: store-category-ntammo diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/incendiary.png b/Resources/Textures/Objects/Storage/boxes.rsi/incendiary.png new file mode 100644 index 0000000000000000000000000000000000000000..3bb9896bf860f761c669581ebcd310efcc82b6f5 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}*`6+rArY;~ z2@z}_X-E>CDTlh?opIzdP8{hr&PZqHVTkz}_X-E>CDTlh?opIzdP8{hr&PZqHVTk~emJRB?`GPDfJY5Hy1^WekECuoyFi0w1tZ%XMzCpt23&3jH6&OWA`FFNV*7pw Q0c~XPboFyt=akR{03>8OtpET3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/stinger.png b/Resources/Textures/Objects/Storage/boxes.rsi/stinger.png new file mode 100644 index 0000000000000000000000000000000000000000..284b33149bb59864818de60eef8a4cb19cf8a188 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}nVv3=ArY;~ z2@z}_X-E>CDTlh?opIzdP8{hr&PZqHVTk^1!I%5C; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_ertrattle.png b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_ertrattle.png new file mode 100644 index 0000000000000000000000000000000000000000..29515df8e7d819012ab9d979ff72e7039045d539 GIT binary patch literal 1252 zcmVPx(o=HSORCt{2oj*@hK@h-)19C!$1>vlSG$!~JOr)@}x1q4GqtMb1V4;bf##m@U zXF*|OZ%iz-rzWw{Sb2zv5|99=#WBa-@aA^r-Tr_3YwjNG?au7Z&c59@`*!MjyZsLe zjinV@fI?Vi@XLe6#gK9oJo9RA4*-S?AQ!$JACFvLot=#;zu357090Wl7sWaKklgj8 z`eo+#xbmnzD`yQo z*J{*U^+WfpKL+nAwVXr4jR|Wo7lU6F1kNj-N zFRf3GPX`A8aP9$cNb^1mK*Mr9rlvj%@KsO91p~l>=@^NE4UcCjgX1%jie4sff_hN{ z;ta~02fzx}x-cnNF;r2l>vxr(6xa1c5gR~=9^$gHeYjZH#!`jWfU;W$uwCgP8qp`& z8Gw}B8&*no20&fkqz!F5zu3se05+zt^}kG8&Uj3Io2Oqa7v`V5%(FlCuuVfa2VqcSwT|N$x0fg-N zwgMyQJwW&4^TGdyzYnKH>Z}9!zL^_F(_Tgcn6v>TcgR)g#Onl+uLGF$lh%(bSOdVj ze_x?VuAsfy_8orgs8<3_Tc;@KZfKCDDdY+b%XbuPC}>BbdYe1}Z5OWIO=Q0{4C(H6 zM?MSHuwmh7kc0QXE3+@v%gbZ+rCMK{>KB=q)*o+CRo1Ri)0t+IX#{|-+UYe(1qB2iwiDeZV zy40a?ngP?iT()kN zQ^NwC7~%_?Cw%1I834v?4a=3>^+Tdt2k?c>25y3}OqJ8an@yPoG@SqPEh_1=2bGHe O0000Px(yh%hsRCt{2oxe{MK@`WocZw$ji9s+nN&|t|hy^5?sIjrunD{psW306?vC+=T z7;8%#tt~Zb0tI$JfI=xuZopU!f`c`HZ-NDh*Bm$c`!msAg|o~X}A zyProbpdNCiuTLvO>OsVAv#FHsFz8;Lw5oF1 z$j^lQs`bh7ac2j>e-A)In)O)#8CKb2YUr~7TlGX7FaRo893x4v&hac{XnZC@(M#q{ zNH5WVID@k00jPp?U6?9VF`}ZnuD`7OR4KcjM3fD{MGq;nvTeB7vW?|1bPXuFbpX?q z?xGQG5}g645_`j{5}g5vuCHiAo6gTSqA`H4#|JXk9|let&Hw7wM&^3**Ot-zT@jZ# zC$tIP15nSuKiZoA&Mh4S09tFOu!ld zy+;-!Qfy#D`B!IW0RZREoB#lvyl@==F!p?dy(cd&jhWh!dlm?znq- zu1>Z7SZ)6>TjV+4FLc@~n1?{$*W`Vdk3-1-T=x7>rh_83ALcsIX)mb(6m0-m1#lG= z$~u9noSc5D^-~tC0npRGFBP50hxSUKZ0nQ=xf?OaQWkPWhGjbn))it$67`mO05-1%4%AUq>`O7?zFZ1kfa(0tZRsOQ|^nN8!W(X_wmP~U? ztxp|&s?`7hKc_Ee(k(130stl^#=Dlsr8_ikCX6AC33P?&pb#31eVJD73^CeXaa<9~4V~lxDo*eofS?|kJ`kZtGzLJVZv^QPodKv4 zd(T!SIs-^UfF8;Q;36iV%*7Bc$kHS(_6BfY3gxio0dxh^MT{~gbYt(z%1@QD>q$iW z#1PY8<#t7=F%Gi&=M0AnzqjTAY*}>ZCx+NAPig?PmaK~SJpt~1l@m7(`$9Q);)YC4 zN>479J28aHQq8Yy`E~WwB@BO^C=K?+5Rq86ZlzPh9Gw_q3zH{&#NHWzE?dK5C3gJ? s@74iqVX}d%U@WzCdU&--vw({855#IC;{%{R)&Kwi07*qoM6N<$f==R4NB{r; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_shrapnel.png b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_shrapnel.png new file mode 100644 index 0000000000000000000000000000000000000000..eeffd36140b9f84aff97f852822ed53f5ef3776d GIT binary patch literal 1278 zcmVPx(xJg7oRCt{2oxe{MK@`WohvEqVVvw_x1_GhN0uxQt&RS#eZ!pGKYhz-g|9~;p zmNr^b8I3;z1tul}0SawQ1Stps5p!A`FWwIKc4ltp$Ik408rgGp=DnFWZ+2$i?9?Xf z^}k3|mLA^%B>Zxm{{E_}W1enp0cbOTSon5ukhwnF+gqyq%El1`5EUk3QJm9{ zh+R)nzvw)G=?09&AUIe9_$pYCc+GKjU?6inx3i;_uKo9w{e1wyM7^GyF0UM}JW-#~ z!-nqb>FFvzTk`Ab$uY_pa+(EHoEohI&@6z)4(cJ7`unvqq#i`vsbagHM3fD{M-Q=C*)CkHZDZ+#t^q~24q&>{ zeKev=qB8(hVsBVgqB8)|^%ZSs)A^N+Xbj-f$)U{ko1xQ2^S`|PGjl!tYujl4zKF}5 z6WRpt0jTHS8Eegd7gtXJ0IuA>YqXp{_Z|QM&W-;D06bZ1l^ePzNFJc#upWTk0r+_6 z*=sfnm)jU=002fBBbnc?U%Q!m-^*7oGS{0Mn*f0C1!OUyk1kZ6>|KuX5KwewO1xi| zpR1LyqNvK*ZMtsjLDk@be+E!R?D>7nEP>LAo*-6~4ZzfVTJ_avDD!R8`smb?30MQ5 z_sC*IiVIvQ|Ln^G0AOlx5CCv$b`}6IKKI&qSw4-K+L3z}2&0=Ntf4dnbc$^Yom*2g z*&jZB_9KV|blNMJhrqJ0$(LO|4kZKd+4Do04vM&bm}^I;y`%jbKD za{8&(k1bdOpr`+`RCJ;{v{wRUTcEZ0%6z7RW-sJF}$i0#7FyNu|! zh7lW^8<~F}J$|Tl|I*Tuahb{p8x~F$sXE5#_FysUw&(_kvLouJ+VjQqM7Q-W!g>JO zgQmMPs4UR?`>G>b36u^2wx=;%{xT0#mU(uboOv>;%5PiG(ys){3}L;eCDY<+>r+SX zYBd1BkMkEZ>6VvQ005Jd6S?Ja>CVi*Z~bu?akPG{RqnJzZXZOs5?GcV&rx>yI7+_~ zXqpS>XLA3aJV40kv{#sBn=pnnCeRnAgFX_ zyREl<&-)vh-`8m6&JbgVD~{_zxuKIhK*b5(0}#|B(+48-h{gbj^o<}rqB8(hV(;0i zL}vhL2+%{>0DQy**jxV($z<&epJ4iCsUUbn5`F oFxkLWFqT?6J-phaSwO}42YqED7xyb54gdfE07*qoM6N<$g8k%N?f?J) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_stinger.png b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_stinger.png new file mode 100644 index 0000000000000000000000000000000000000000..f0f86191b1fcdd9bdd8e602428cc03fb6fbcf61b GIT binary patch literal 1279 zcmVPx(xk*GpRCt{2oxe{MK@`WocZw$ji9ya%8iWfK7LsV9#>QG>;vZp*t=gE_XzY!D zfTfMrmKrs|M63h^3T;dTDF^`(b6OlP-VXO}W_IVt&g^^|*>iU0y_q*}c4pt~)LMyzWn_BMe39)N~4=d%DZEZbvh=(7M<^+X&n04i7iM@OI`iN8xcEU5@e)P;_NVykC}| ztCg^#sLGi)UEX?7HMroP0aOut{vb0;pmd@qh!tf6Fg2f6eKi`&eA~1>I`w1%)&S@| zvKW!#0vF1E`TQ6F&^k5^0GPad8~`x?aoTuUK8=~$k$V;hqnjnHp)>^aifs#>$>}=) z0D8n)T=6H1X>{5vn1{f!ugRBPJ`N=V@Y(Z2nGTA$ewgbGP_zML6~I+gDC-2O za&r2q){iY%1E8n>vQ%^;AKEK{vaM4hRm?k zTf>O8^|j2u4<9|yx_@C|!MIFigbfQPi&P!sbbGKEbz5`;MA;GbQ|*L$&(g01$_!z(-jQj3x$~)` zx3wAo;K%IwOuEIzB>+IHHPyE~F5Stwcbz}>BaT)Nb;_NQ$nAqDR|3n@<2lMMA4lm| z0!?#n_H5t(Cl3%ZI_(vv*(Qu3jS2LH>7WoA)8Eg1P)cVKp8+nVi3!Y;PY7!Pregy0 zrWa8)xHJS*9P2TG;#)7Bw_qVWS(}Op%v(=Ik;Vl2+8+=?eouhAU**J&USBBZPTY{mN$JVO zawmpRS*rQjmS0y-UBd9!32U$?hKR(nbt|13=IO)`SC~BEBlgY!^w}B~E3xZGlx`is p6($?F3dT}Pr-xUYGz+LW{{U%ZBra~yJ7NF;002ovPDHLkV1it7Qzifa literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/meta.json b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/meta.json index c29da88cf50..dee78c61809 100644 --- a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/meta.json @@ -97,6 +97,9 @@ { "name": "port_recharge" }, + { + "name": "box_ertrattle" + }, { "name": "p90" }, @@ -241,6 +244,15 @@ { "name": "box_flashbangs" }, + { + "name": "box_stinger" + }, + { + "name": "box_shrapnel" + }, + { + "name": "box_incendiary" + }, { "name": "box_handcuffs" }, From ec084fb5b0eb544c4173191f9c72ab73b4dfa28d Mon Sep 17 00:00:00 2001 From: Babaev <129369024+babaevlsdd@users.noreply.github.com> Date: Sun, 29 Dec 2024 21:53:22 +0600 Subject: [PATCH 17/23] better roadmap ui (#963) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ага * вопросы? * финалочка * 2 * последний мув --- Content.Client/Stylesheets/StyleNano.cs | 15 ++- Content.Client/_Sunrise/Roadmap/Roadmap.xaml | 111 +++++++++++++++++- .../_Sunrise/Roadmap/Roadmap.xaml.cs | 30 ++--- .../_Sunrise/Roadmap/RoadmapItem.xaml | 64 +++++++--- .../_Sunrise/Roadmap/RoadmapItem.xaml.cs | 12 +- .../Roadmap/RoadmapVersionHeader.xaml | 9 +- .../_Sunrise/Roadmap/RoadmapWindow.xaml | 25 +++- .../Roadmap/RoadmapVersionsPrototype.cs | 3 + 8 files changed, 219 insertions(+), 50 deletions(-) diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs index d8042897036..3ddfd10fae0 100644 --- a/Content.Client/Stylesheets/StyleNano.cs +++ b/Content.Client/Stylesheets/StyleNano.cs @@ -163,6 +163,7 @@ public sealed class StyleNano : StyleBase public const string StyleClassCrossButtonRed = "CrossButtonRed"; public const string StyleClassButtonColorRed = "ButtonColorRed"; public const string StyleClassButtonColorGreen = "ButtonColorGreen"; + public const string StyleClassNoStyle = "NoStyle"; // Sunrise-Edit public static readonly Color ChatBackgroundColor = Color.FromHex("#25252ADD"); @@ -1722,7 +1723,19 @@ public StyleNano(IResourceCache resCache) : base(resCache) new[] { new StyleProperty(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Bwoink/un_pinned.png")) - }) + }), + // Sunrise-Edit + + Element + + + + + + + + - - - - - - + diff --git a/Content.Client/_Sunrise/Roadmap/RoadmapItem.xaml.cs b/Content.Client/_Sunrise/Roadmap/RoadmapItem.xaml.cs index 444185eb3cc..772cd335178 100644 --- a/Content.Client/_Sunrise/Roadmap/RoadmapItem.xaml.cs +++ b/Content.Client/_Sunrise/Roadmap/RoadmapItem.xaml.cs @@ -21,10 +21,10 @@ public RoadmapItemState ItemState var panel = (StyleBoxFlat) StateColor.PanelOverride!; panel.BackgroundColor = _itemState switch { - RoadmapItemState.Planned => Color.Red, - RoadmapItemState.InProgress => Color.FromHex("#20C9FF"), - RoadmapItemState.Partial => Color.Yellow, - RoadmapItemState.Complete => Color.Green, + RoadmapItemState.Planned => Color.FromHex("#e74c3c"), + RoadmapItemState.InProgress => Color.FromHex("#3498db"), + RoadmapItemState.Partial => Color.FromHex("#f1c40f"), + RoadmapItemState.Complete => Color.FromHex("#2ecc71"), _ => Color.Transparent }; @@ -42,8 +42,8 @@ public RoadmapItemState ItemState public string? HeaderText { - get => HeaderButton.Text; - set => HeaderButton.Text = value; + get => HeaderLabel.Text; + set => HeaderLabel.Text = value; } public string? Text diff --git a/Content.Client/_Sunrise/Roadmap/RoadmapVersionHeader.xaml b/Content.Client/_Sunrise/Roadmap/RoadmapVersionHeader.xaml index 4d72887eddc..2f46d2e6d88 100644 --- a/Content.Client/_Sunrise/Roadmap/RoadmapVersionHeader.xaml +++ b/Content.Client/_Sunrise/Roadmap/RoadmapVersionHeader.xaml @@ -4,7 +4,10 @@ xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls" Orientation="Horizontal" Margin="0 0 0 15"> - -