diff --git a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs index aeceae13275..e191e821c22 100644 --- a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs +++ b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs @@ -23,6 +23,7 @@ public sealed partial class WarDeclaratorWindow : FancyWindow public WarDeclaratorWindow() { RobustXamlLoader.Load(this); + IoCManager.InjectDependencies(this); WarButton.OnPressed += (_) => OnActivated?.Invoke(Rope.Collapse(MessageEdit.TextRope)); diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyWeldableOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyWeldableOperator.cs index 020a3d73ecd..e417a03fb6e 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyWeldableOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyWeldableOperator.cs @@ -58,13 +58,24 @@ public override void Initialize(IEntitySystemManager sysManager) if (!damageQuery.TryGetComponent(target, out var damage)) continue; - var tagPrototype = _prototypeManager.Index(WeldbotWeldOperator.SiliconTag); + var tagSiliconMobPrototype = _prototypeManager.Index(WeldbotWeldOperator.SiliconTag); + var tagWeldFixableStructurePrototype = _prototypeManager.Index(WeldbotWeldOperator.WeldotFixableStructureTag); - if (!_entManager.TryGetComponent(target, out var tagComponent) || !_tagSystem.HasTag(tagComponent, tagPrototype) || !emagged && damage.DamagePerGroup["Brute"].Value == 0) + if (!_entManager.TryGetComponent(target, out var tagComponent)) continue; - //Needed to make sure it doesn't sometimes stop right outside it's interaction range - var pathRange = SharedInteractionSystem.InteractionRange - 1f; + var canWeldSiliconMob = _tagSystem.HasTag(tagComponent, tagSiliconMobPrototype) && (emagged || damage.DamagePerGroup["Brute"].Value > 0); + var canWeldStructure = _tagSystem.HasTag(tagComponent, tagWeldFixableStructurePrototype) && damage.TotalDamage.Value > 0; + + if(!canWeldSiliconMob && !canWeldStructure) + continue; + + var pathRange = SharedInteractionSystem.InteractionRange; + + //Needed to make sure it doesn't sometimes stop right outside its interaction range, in case of a mob. + if (canWeldSiliconMob) + pathRange--; + var path = await _pathfinding.GetPath(owner, target, pathRange, cancelToken); if (path.Result == PathResult.NoPath) diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/WeldbotWeldOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/WeldbotWeldOperator.cs index be5b983fb30..96e22274b5c 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/WeldbotWeldOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/WeldbotWeldOperator.cs @@ -25,6 +25,11 @@ public sealed partial class WeldbotWeldOperator : HTNOperator private TagSystem _tagSystem = default!; public const string SiliconTag = "SiliconMob"; + public const string WeldotFixableStructureTag = "WeldbotFixableStructure"; + + public const float EmaggedBurnDamage = 10; + public const float SiliconRepairAmount = 30; + public const float StructureRepairAmount = 5; /// /// Target entity to inject. @@ -57,33 +62,58 @@ public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTi if (!blackboard.TryGetValue(TargetKey, out var target, _entMan) || _entMan.Deleted(target)) return HTNOperatorStatus.Failed; - var tagPrototype = _prototypeManager.Index(SiliconTag); + var tagSiliconMobPrototype = _prototypeManager.Index(SiliconTag); + var tagWeldFixableStructurePrototype = _prototypeManager.Index(WeldotFixableStructureTag); + + if(!_entMan.TryGetComponent(target, out var tagComponent)) + return HTNOperatorStatus.Failed; + + var weldableIsSilicon = _tagSystem.HasTag(tagComponent, tagSiliconMobPrototype); + var weldableIsStructure = _tagSystem.HasTag(tagComponent, tagWeldFixableStructurePrototype); - if (!_entMan.TryGetComponent(target, out var tagComponent) || !_tagSystem.HasTag(tagComponent, tagPrototype) + if ((!weldableIsSilicon && !weldableIsStructure) || !_entMan.TryGetComponent(owner, out var botComp) || !_entMan.TryGetComponent(target, out var damage) - || !_interaction.InRangeUnobstructed(owner, target) - || (damage.DamagePerGroup["Brute"].Value == 0 && !_entMan.HasComponent(owner))) + || !_interaction.InRangeUnobstructed(owner, target)) + return HTNOperatorStatus.Failed; + + var canWeldSilicon = damage.DamagePerGroup["Brute"].Value > 0 || _entMan.HasComponent(owner); + var canWeldStructure = damage.TotalDamage.Value > 0; + + if ((!canWeldSilicon && weldableIsSilicon) || (!canWeldStructure && weldableIsStructure)) return HTNOperatorStatus.Failed; if (botComp.IsEmagged) { - if (!_prototypeManager.TryIndex("Burn", out var prototype)) + if (!_prototypeManager.TryIndex("Burn", out var prototype) || weldableIsStructure) return HTNOperatorStatus.Failed; - _damageableSystem.TryChangeDamage(target, new DamageSpecifier(prototype, 10), true, false, damage); + _damageableSystem.TryChangeDamage(target, new DamageSpecifier(prototype, EmaggedBurnDamage), true, false, damage); } else { - if (!_prototypeManager.TryIndex("Brute", out var prototype)) + if (weldableIsSilicon) + { + if (!_prototypeManager.TryIndex("Brute", out var prototype)) + return HTNOperatorStatus.Failed; + + _damageableSystem.TryChangeDamage(target, new DamageSpecifier(prototype, -SiliconRepairAmount), true, false, damage); + } + else if (weldableIsStructure) + { + //If a structure explicitly has a tag to allow a Weldbot to fix it, trust that we can just do so no matter what the damage actually is. + _damageableSystem.ChangeAllDamage(target, damage, -StructureRepairAmount); + } + else + { return HTNOperatorStatus.Failed; - - _damageableSystem.TryChangeDamage(target, new DamageSpecifier(prototype, -50), true, false, damage); + } } _audio.PlayPvs(botComp.WeldSound, target); - if(damage.DamagePerGroup["Brute"].Value == 0) //only say "all done if we're actually done!" + if((weldableIsSilicon && damage.DamagePerGroup["Brute"].Value == 0) + || (weldableIsStructure && damage.TotalDamage.Value == 0)) //only say "all done if we're actually done!" _chat.TrySendInGameICMessage(owner, Loc.GetString("weldbot-finish-weld"), InGameICChatType.Speak, hideChat: true, hideLog: true); return HTNOperatorStatus.Finished; diff --git a/Content.Shared/Damage/Systems/DamageableSystem.cs b/Content.Shared/Damage/Systems/DamageableSystem.cs index e162d6f159a..ab1fe8035f8 100644 --- a/Content.Shared/Damage/Systems/DamageableSystem.cs +++ b/Content.Shared/Damage/Systems/DamageableSystem.cs @@ -256,6 +256,39 @@ public void SetAllDamage(EntityUid uid, DamageableComponent component, FixedPoin // Shitmed Change End } + /// + /// Changes all damage types supported by a by the specified value. + /// + /// + /// Will not lower damage to a negative value. + /// + public void ChangeAllDamage(EntityUid uid, DamageableComponent component, FixedPoint2 addedValue) + { + foreach (var type in component.Damage.DamageDict.Keys) + { + component.Damage.DamageDict[type] += addedValue; + if (component.Damage.DamageDict[type] < 0) + component.Damage.DamageDict[type] = 0; + } + + // Changing damage does not count as 'dealing' damage, even if it is set to a larger value, so we pass an + // empty damage delta. + DamageChanged(uid, component, new DamageSpecifier()); + + // Shitmed Change Start + if (!HasComp(uid)) + return; + + foreach (var (part, _) in _body.GetBodyChildren(uid)) + { + if (!TryComp(part, out DamageableComponent? damageComp)) + continue; + + ChangeAllDamage(part, damageComp, addedValue); + } + // Shitmed Change End + } + public void SetDamageModifierSetId(EntityUid uid, string damageModifierSetId, DamageableComponent? comp = null) { if (!_damageableQuery.Resolve(uid, ref comp)) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index deda4ab8827..6c0cd960cae 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -12014,3 +12014,64 @@ Entries: id: 6878 time: '2025-02-21T16:46:25.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1831 +- author: EctoplasmIsGood + changes: + - type: Tweak + message: Advanced Industrial welder from 250 capacity to 500 + - type: Tweak + message: Advanced Industrial welder from 1.3x speed to 1.5x speed + - type: Tweak + message: Experimental welder from 1000 capacity to 200 + - type: Tweak + message: Experimental welder from 1u of welder fuel generated to 0.5u + - type: Tweak + message: Experimental welder from 1x speed to 2x speed + id: 6879 + time: '2025-02-22T03:46:30.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1832 +- author: Timfa2112 + changes: + - type: Tweak + message: >- + Weldbots can now fix specific structures, like windows and grounding + rods. + id: 6880 + time: '2025-02-22T18:08:01.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1838 +- author: Timfa2112 + changes: + - type: Tweak + message: >- + Tweaked Tricordrazine to heal MINOR amounts of radiation damage. This + includes Medibots. If it's more than a teeny tiny amount, go to medical! + This also alleviates the issue where the medibot keeps pestering you + about the 0.1 rad damage because it thinks it can heal it, while the + medicine it'll inject (before this change) didn't actually do anything. + id: 6881 + time: '2025-02-24T00:21:05.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1840 +- author: Timfa2112 + changes: + - type: Add + message: Added cloth wraps to hands loadouts + id: 6882 + time: '2025-02-25T02:16:52.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1841 +- author: EctoplasmIsGood + changes: + - type: Tweak + message: Holoparasite melee damage from 20 blunt to 10 blunt + - type: Tweak + message: Holoparasite melee speed from 1.8 to 0.3 + id: 6883 + time: '2025-02-25T05:22:08.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1843 +- author: Diggy + changes: + - type: Tweak + message: Tweaked the nano bot trait value from 0,9 to 0,6. + - type: Fix + message: Bionic legs DO work now, yay. + id: 6884 + time: '2025-02-25T14:39:19.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1833 diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index d6ef2be39c4..a7c47028776 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0x6273, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Aerocrux, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, Aidenkrz, Aikakakah, aitorlogedo, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, aspiringlich, astriloqua, avalon, avghdev, AzzyIsNotHere, BananaFlambe, BasedPugilist, BasedUser, beck-thompson, benev0, BGare, bhespiritu, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, BlueHNT, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, boogiebogus, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, byondfuckery, c0rigin, c4llv07e, CaasGit, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, CatTheSystem, Centronias, CerberusWolfie, chairbender, Charlese2, chavonadelal, Cheackraze, cheesePizza2, Chief-Engineer, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, CilliePaint, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, Cohnway, cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, CormosLemming, CrafterKolyan, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, degradka, Delete69, deltanedas, DeltaV-Bot, DerbyX, derek, dersheppard, dexlerxd, dffdff2423, dge21, diggy0, digitalic, DinoWattz, DisposableCrewmember42, DJB1gYAPPA, DjfjdfofdjfjD, DocNITE, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, DoubleRiceEddiedd, DoutorWhite, drakewill-CRL, Drayff, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, Dutch-VanDerLinde, dvir001, dylanstrategie, Dynexust, Easypoller, eclips_e, EctoplasmIsGood, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, Erisfiregamer1, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, eugene, Evgencheg, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, Fansana, Feluk6174, fenndragon, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, fl-oz, Flareguy, FluffiestFloof, FluffMe, FluidRock, flybik, flyingkarii, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, FoxxoTrystan, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FryOfDestiny, FungiFellow, GalacticChimp, gamer3107, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, ghost581x, Git-Nivrak, gituhabu, GlassEclipse, gluesniffler, GNF54, GNUtopia, Golinth, GoodWheatley, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, h3half, Haltell, Hanzdegloker, Hardly3D, harikattar, Hebi, Henry, HerCoyote23, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, i-justuser-i, iacore, IamVelcroboy, icekot8, icesickleone, Ichaie, iczero, iglov, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, ItsMeThom, Itzbenz, Jackal298, Jackrost, jacksonzck, Jackw2As, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, JoeHammad1844, JohnGinnane, johnku1, joshepvodka, Jrpl, jukereise, juliangiebel, juniwoofs, justart1m, JustCone14, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, komunre, KonstantinAngelov, koteq, Kr8art, Krunklehorn, Kukutis96513, Kupie, kxvvv, Kyoth25f, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, lizelive, lleftTheDragon, localcc, Lomcastar, lonoferars, LordCarve, LordEclipse, LovelyLophi, luckyshotpictures, LudwigVonChesterfield, Lukasz825700516, Lumminal, lunarcomets, luringens, lvvova1, Lyndomen, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, MehimoNemo, MeltedPixel, MemeProof, MendaxxDev, Menshin, Mephisto72, Mervill, metalgearsloth, mhamsterr, michaelcu, micheel665, Mike32oz, MilenVolf, milon, MilonPL, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, MLGTASTICa, Mnemotechnician, moderatelyaware, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, namespace-Memory, Nannek, NeLepus, neuPanda, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, nok-ko, NonchalantNoob, NoobyLegion, not-gavnaed, notafet, notquitehadouken, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, och-och, OCOtheOmega, OctoRocket, OldDanceJacket, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Phantom-Lily, PHCodes, Phill101, phunnyguy, pigeonpeas, PilgrimViis, Pill-U, Piras314, Pireax, pissdemon, PixelTheKermit, PJB3005, Plasmaguy, PlasmaRaptor, plinyvic, Plykiya, pofitlo, pointer-to-null, poklj, PolterTzi, PoorMansDreams, potato1234x, PotentiallyTom, ProfanedBane, PROG-MohamedDwidar, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, RadsammyT, Rainbeon, Rainfey, Raitononai, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, RedFoxIV, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, Rinkashikachi, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Rosycup, router, RumiTiger, S1ss3l, Saakra, saga3152, Salex08, sam, Samsterious, SaphireLattice, SapphicOverload, sapphirescript, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, ShadowCommander, shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, SixplyDev, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, SleepyScarecrow, sleepyyapril, Slyfox333, snebl, sniperchance, Snowni, snowsignal, SonicHDC, Sornarok, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, SpaceManiac, SpaceRox1244, SpaceyLady, spartak, SpartanKadence, Spatison, SpeltIncorrectyl, spess-empyrean, SphiraI, SplinterGP, spoogemonster, sporekto, Squishy77, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, suraru, SweptWasTaken, SX-7, Sybil, SYNCHRONIC, Szunti, TadJohnson00, takemysoult, TaralGit, Taran, Tayrtahn, tday93, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TherapyGoth, TheShuEd, thevinter, ThunderBear2006, Timemaster99, Timfa2112, timothyteakettle, TimrodDX, tin-man-tim, Tirochora, Titian3, tk-a369, tkdrg, Tmanzxd, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, Tornado-Technology, tosatur, TotallyLemon, trashalice, truepaintgit, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, twoducksonnaplane, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, v0idRift, Vaaankas, valentfingerov, Varen, VasilisThePikachu, veliebm, VelonacepsCalyxEggs, veprolet, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, vlados1408, VMSolidus, volotomite, volundr-, Voomra, Vordenburg, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, waylon531, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xkreksx, xqzpop7, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, zelezniciar1, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, Zymem, zzylex +0x6273, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Aerocrux, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, Aidenkrz, Aikakakah, aitorlogedo, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, as334, AsikKEsel, asperger-sind, aspiringlich, aspiringLich, astriloqua, avalon, avghdev, AzzyIsNotHere, BananaFlambe, BasedPugilist, BasedUser, beck-thompson, benev0, BGare, bhespiritu, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, BlueHNT, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, boogiebogus, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, byondfuckery, c0rigin, c4llv07e, CaasGit, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, CatTheSystem, Centronias, CerberusWolfie, chairbender, Charlese2, chavonadelal, Cheackraze, cheesePizza2, Chief-Engineer, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, CilliePaint, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, Cohnway, cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, CormosLemming, CrafterKolyan, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, degradka, Delete69, deltanedas, DeltaV-Bot, DerbyX, derek, dersheppard, dexlerxd, dffdff2423, dge21, diggy0, digitalic, DinoWattz, DisposableCrewmember42, DJB1gYAPPA, DjfjdfofdjfjD, DocNITE, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, DoubleRiceEddiedd, DoutorWhite, drakewill-CRL, Drayff, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, Dutch-VanDerLinde, dvir001, dylanstrategie, Dynexust, Easypoller, eclips_e, EctoplasmIsGood, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, Erisfiregamer1, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, eugene, Evgencheg, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, Fansana, Feluk6174, fenndragon, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, fl-oz, Flareguy, FluffiestFloof, FluffMe, FluidRock, flybik, flyingkarii, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, FoxxoTrystan, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FryOfDestiny, FungiFellow, GalacticChimp, gamer3107, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, ghost581x, Git-Nivrak, gituhabu, GlassEclipse, gluesniffler, GNF54, GNUtopia, Golinth, GoodWheatley, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, h3half, Haltell, Hanzdegloker, Hardly3D, harikattar, Hebi, Henry, HerCoyote23, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, i-justuser-i, iacore, IamVelcroboy, icekot8, icesickleone, Ichaie, iczero, iglov, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, ItsMeThom, Itzbenz, Jackal298, Jackrost, jacksonzck, Jackw2As, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, JohnGinnane, johnku1, joshepvodka, Jrpl, jukereise, juliangiebel, juniwoofs, justart1m, JustCone14, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, komunre, KonstantinAngelov, koteq, Kr8art, Krunklehorn, Kukutis96513, Kupie, kxvvv, Kyoth25f, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, lizelive, lleftTheDragon, localcc, Lomcastar, lonoferars, LordCarve, LordEclipse, LovelyLophi, luckyshotpictures, LudwigVonChesterfield, Lukasz825700516, Lumminal, lunarcomets, luringens, lvvova1, Lyndomen, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, MehimoNemo, MeltedPixel, MemeProof, MendaxxDev, Menshin, Mephisto72, Mervill, metalgearsloth, mhamsterr, michaelcu, micheel665, Mike32oz, MilenVolf, milon, MilonPL, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, MLGTASTICa, Mnemotechnician, moderatelyaware, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, namespace-Memory, Nannek, NeLepus, neuPanda, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, nok-ko, NonchalantNoob, NoobyLegion, not-gavnaed, notafet, notquitehadouken, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, och-och, OCOtheOmega, OctoRocket, OldDanceJacket, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Phantom-Lily, PHCodes, Phill101, phunnyguy, pigeonpeas, PilgrimViis, Pill-U, Piras314, Pireax, pissdemon, PixelTheKermit, PJB3005, Plasmaguy, PlasmaRaptor, plinyvic, Plykiya, plyushsune, pofitlo, pointer-to-null, poklj, PolterTzi, PoorMansDreams, potato1234x, PotentiallyTom, ProfanedBane, PROG-MohamedDwidar, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, RadsammyT, Rainbeon, Rainfey, Raitononai, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, RedFoxIV, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, Rinkashikachi, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Rosycup, router, RumiTiger, S1ss3l, Saakra, saga3152, Salex08, sam, Samsterious, SaphireLattice, SapphicOverload, sapphirescript, sarahon, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, ShadowCommander, shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, SixplyDev, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, SleepyScarecrow, sleepyyapril, Slyfox333, snebl, sniperchance, Snowni, snowsignal, SonicHDC, Sornarok, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, sowelipililimute, SpaceManiac, SpaceRox1244, SpaceyLady, spartak, SpartanKadence, Spatison, SpeltIncorrectyl, spess-empyrean, SphiraI, SplinterGP, spoogemonster, sporekto, Squishy77, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, suraru, SweptWasTaken, SX-7, Sybil, SYNCHRONIC, Szunti, TadJohnson00, takemysoult, TaralGit, Taran, Tayrtahn, tday93, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TherapyGoth, TheShuEd, thevinter, ThunderBear2006, Timemaster99, Timfa2112, timothyteakettle, TimrodDX, tin-man-tim, Tirochora, Titian3, tk-a369, tkdrg, Tmanzxd, tmtmtl30, toasterpm87, Toby222, TokenStyle, Tollhouse, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, Tornado-Technology, tosatur, TotallyLemon, trashalice, truepaintgit, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, twoducksonnaplane, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, v0idRift, Vaaankas, valentfingerov, Varen, VasilisThePikachu, veliebm, VelonacepsCalyxEggs, veprolet, VerinSenpai, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, vlados1408, VMSolidus, volotomite, volundr-, Voomra, Vordenburg, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, waylon531, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xkreksx, xqzpop7, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, zelezniciar1, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, Zymem, zzylex diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml index 802590accd2..737e5da8d79 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml @@ -19,3 +19,5 @@ id: LoadoutHandsGlovesEnviroglovesColor - type: loadout id: LoadoutHandsGlovesEnviroglovesEvening + - type: loadout + id: LoadoutHandsClothWrap diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Windows/tinted_windows.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Windows/tinted_windows.yml index fdaa60b4d78..77eb472dce3 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Windows/tinted_windows.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Windows/tinted_windows.yml @@ -14,6 +14,7 @@ - type: Tag tags: - ForceNoFixRotations + - WeldbotFixableStructure - type: Icon sprite: Structures/Windows/directional.rsi state: tinted_window diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml index 2a06306a911..7fcda82621b 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml @@ -134,6 +134,18 @@ map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] color: "#40a7d7" shader: unshaded + - type: MeleeWeapon + hidden: false + altDisarm: false + animation: WeaponArcFist + attackRate: 0.3 + autoAttack: true + soundHit: + collection: Punch + damage: + types: + Blunt: 10 + Structural: 10 - type: HTN rootTask: task: SimpleHumanoidHostileCompound diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index a04812e1eb1..b8a003e3b55 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml @@ -157,7 +157,7 @@ name: advanced industrial welding tool parent: WelderIndustrial id: WelderIndustrialAdvanced - description: "An advanced industrial welder with over double the fuel capacity and hotter flame." + description: "An advanced industrial welder with over five times the fuel capacity and a hotter flame." components: - type: Sprite sprite: Objects/Tools/welder_industrialadv.rsi @@ -168,16 +168,16 @@ Welder: reagents: - ReagentId: WeldingFuel - Quantity: 250 - maxVol: 250 + Quantity: 500 + maxVol: 500 - type: Tool - speedModifier: 1.3 + speedModifier: 1.5 - type: entity name: experimental welding tool parent: Welder id: WelderExperimental - description: "An experimental welder capable of self-fuel generation and less harmful to the eyes." + description: "An experimental welder that is less harmful to the eyes while having a hotter flame and slowly regenerating fuel." components: - type: Sprite sprite: Objects/Tools/welder_experimental.rsi @@ -188,8 +188,8 @@ Welder: reagents: - ReagentId: WeldingFuel - Quantity: 1000 - maxVol: 1000 + Quantity: 200 + maxVol: 200 - type: PointLight enabled: false radius: 1.5 @@ -199,7 +199,9 @@ generated: reagents: - ReagentId: WeldingFuel - Quantity: 1 + Quantity: 0.5 + - type: Tool + speedModifier: 2 - type: entity name: emergency welding tool diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml index 7c8439fd6e2..bdce1de9f65 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml @@ -43,6 +43,9 @@ - state: panel_open map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: AnimationPlayer + - type: Tag + tags: + - WeldbotFixableStructure - type: ApcPowerReceiver - type: ExtensionCableReceiver - type: DoorSignalControl diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml index 55a22a59a58..2df9cf6a1de 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml @@ -77,6 +77,9 @@ - type: InteractionOutline - type: Damageable damageContainer: StructuralInorganic + - type: Tag + tags: + - WeldbotFixableStructure - type: ExaminableDamage messages: WindowMessages - type: Repairable @@ -164,6 +167,9 @@ - type: Repairable - type: Damageable damageContainer: StructuralInorganic + - type: Tag + tags: + - WeldbotFixableStructure - type: DamageVisuals thresholds: [8, 16, 25] damageDivisor: 3.333 diff --git a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml index b1850d6e8fc..de79a32b872 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml @@ -39,6 +39,9 @@ - type: IconSmooth base: swindow - type: Appearance + - type: Tag + tags: + - WeldbotFixableStructure - type: DamageVisuals thresholds: [4, 8, 12] damageDivisor: 28 diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml index c8cc53106be..68a0f1a9f0f 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/window.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml @@ -18,6 +18,7 @@ tags: - ForceFixRotations - Window + - WeldbotFixableStructure - type: Sprite drawdepth: WallTops sprite: Structures/Windows/window.rsi @@ -115,6 +116,7 @@ tags: - Window - Directional #Delta V - Summary: Allows the tilewindow mapping command to work. + - WeldbotFixableStructure - type: MeleeSound soundGroups: Brute: diff --git a/Resources/Prototypes/Loadouts/Generic/hands.yml b/Resources/Prototypes/Loadouts/Generic/hands.yml index ec2aec9070a..202c5a65d0f 100644 --- a/Resources/Prototypes/Loadouts/Generic/hands.yml +++ b/Resources/Prototypes/Loadouts/Generic/hands.yml @@ -95,3 +95,15 @@ inverted: true species: - Plasmaman + +- type: loadout + id: LoadoutHandsClothWrap + category: Hands + cost: 0 + exclusive: false + customColorTint: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutGloves + items: + - ClothingClothWrap diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 0e83a6dd212..358dc3b6a9f 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -781,6 +781,7 @@ Brute: -1 types: Poison: -0.5 ##Should be about what it was when it healed the toxin group + Radiation: -0.15 ##Should really only heal minor accidental exposures Heat: -0.5 Shock: -0.5 Cold: -0.5 # Was .33, Buffed due to limb damage changes diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml index 3b20f3ce480..382ca70dd2a 100644 --- a/Resources/Prototypes/Traits/physical.yml +++ b/Resources/Prototypes/Traits/physical.yml @@ -888,8 +888,8 @@ damageCap: 200 damage: groups: - Brute: -0.9 - Burn: -0.9 + Brute: -0.6 + Burn: -0.6 - type: trait id: BionicLeg @@ -903,11 +903,11 @@ - !type:CharacterItemGroupRequirement group: TraitsMind functions: - - !type:TraitAddComponent + - !type:TraitReplaceComponent components: - - type: MovementBodyPart - walkSpeed: 3.125 - sprintSpeed: 5.625 + - type: TraitSpeedModifier + sprintModifier: 1.300 + walkModifier: 1.125 - !type:TraitPushDescription descriptionExtensions: - description: examine-bionic-leg-message @@ -1099,4 +1099,5 @@ descriptionExtensions: - description: examine-thermal-vision-message fontSize: 12 - requireDetailRange: true \ No newline at end of file + requireDetailRange: true + diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Windows/windows.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Windows/windows.yml index 979a70c3a03..9ee2ed1f014 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Windows/windows.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Windows/windows.yml @@ -19,6 +19,7 @@ tags: - ForceFixRotations - Window + - WeldbotFixableStructure - type: Physics bodyType: Static - type: Fixtures diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 0a39a04f2c4..b4c9888746b 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1094,6 +1094,9 @@ - type: Tag id: SiliconMob +- type: Tag + id: WeldbotFixableStructure + - type: Tag id: PlushieSharkBlue