From 4bb15a1cee6bce33c2edcc94907f3a4ac843a772 Mon Sep 17 00:00:00 2001 From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com> Date: Fri, 21 Feb 2025 21:46:29 -0600 Subject: [PATCH 01/14] Experimental Welder Rework (#1832) # Description Changes the experimental welder a decent amount. Rather than being practically a normal welder with nigh unlimited fuel, it is now a super fast welder with slower self-fueling, and a much lower fuel capacity. Changes advanced industrial welder to make it still a worthwhile item. # Changelog :cl: - tweak: Advanced Industrial welder from 250 capacity to 500 - tweak: Advanced Industrial welder from 1.3x speed to 1.5x speed - tweak: Experimental welder from 1000 capacity to 200 - tweak: Experimental welder from 1u of welder fuel generated to 0.5u - tweak: Experimental welder from 1x speed to 2x speed --------- Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com> Signed-off-by: Remuchi <72476615+Remuchi@users.noreply.github.com> Co-authored-by: Timfa Co-authored-by: Remuchi <72476615+Remuchi@users.noreply.github.com> --- .../Entities/Objects/Tools/welders.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) 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 From b104fe55423bd03c4246539d6ed36f0ba6a426b1 Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Sat, 22 Feb 2025 03:46:56 +0000 Subject: [PATCH 02/14] Automatic Changelog Update (#1832) --- Resources/Changelog/Changelog.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index deda4ab8827..f8b434cab9d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -12014,3 +12014,18 @@ 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 From a7760a6ee17766b4724382e0f4ed1698eaf19444 Mon Sep 17 00:00:00 2001 From: Timfa Date: Sat, 22 Feb 2025 19:08:01 +0100 Subject: [PATCH 03/14] Allow Weldbot to Fix Specific Structures (#1838) # Description As requested in Goobstation MRP; This update allows the weldbot to, _very slowly_, fix specific structures. To allow a structure to be repaired by a weldbot, apply the "WeldbotFixableStructure" tag to it. So far, this has been applied to: - Windows - Directional Windows - Grounding Rods - Tesla Coils The robot will repair 5 damage per step to structures. In addition, repair speeds of silicon mobs, borgs and IPC's has been lowered a bit. --- # Changelog :cl: - tweak: Weldbots can now fix specific structures, like windows and grounding rods. --------- Signed-off-by: Timfa --- .../Specific/PickNearbyWeldableOperator.cs | 19 +++++-- .../Operators/Specific/WeldbotWeldOperator.cs | 50 +++++++++++++++---- .../Damage/Systems/DamageableSystem.cs | 33 ++++++++++++ .../Structures/Windows/tinted_windows.yml | 1 + .../Doors/Windoors/base_structurewindoors.yml | 3 ++ .../Power/Generation/Tesla/coil.yml | 6 +++ .../Entities/Structures/Windows/shuttle.yml | 3 ++ .../Entities/Structures/Windows/window.yml | 2 + .../Entities/Structures/Windows/windows.yml | 1 + Resources/Prototypes/tags.yml | 3 ++ 10 files changed, 107 insertions(+), 14 deletions(-) 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/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/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/_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 From 321243e22ec95ef0a966793c548022f2823f4bd7 Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Sat, 22 Feb 2025 18:08:34 +0000 Subject: [PATCH 04/14] Automatic Changelog Update (#1838) --- Resources/Changelog/Changelog.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f8b434cab9d..362452a2fde 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -12029,3 +12029,12 @@ Entries: 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 From 482d4ace3c6f6391fcb911f8f1fa9668ca62df5e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 22 Feb 2025 18:36:34 -0800 Subject: [PATCH 05/14] Update Credits (#1839) Co-authored-by: SimpleStation Changelogs --- 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 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 From 23e332e0e7b0e8ca20eec2d20ca63f1f1354faec Mon Sep 17 00:00:00 2001 From: Timfa Date: Mon, 24 Feb 2025 01:21:05 +0100 Subject: [PATCH 06/14] Allow Tricordrazine to Heal Minor Accidental Exposures (#1840) # Description As requested in Goob: https://discord.com/channels/1323488536501944350/1323488538750353442/1343047906114011167 this allows Tricordrazine to heal _very minor_ amounts of radiation poisoning. The use case: I walked past a Borg with a micro-RTG and the medibot won't stop bugging me because it doesn't know it can't help. With this change it _can_ help, but it's really only viable for small amounts. Ordinarily, in these small amounts of damage (10-12 tops), it was a hassle to make appropriate radiation medicine for; a lot of effort for only a tiny problem. This apparently caused annoyance, and this change will both make Tricordrazine a tiny bit more useful and lessen the aforementioned problem. --- # Changelog :cl: - tweak: 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. --- Resources/Prototypes/Reagents/medicine.yml | 1 + 1 file changed, 1 insertion(+) 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 From 8f5f69902afacf6ff285cb53635fd38be9f67113 Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Mon, 24 Feb 2025 00:21:39 +0000 Subject: [PATCH 07/14] Automatic Changelog Update (#1840) --- Resources/Changelog/Changelog.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 362452a2fde..dd3c1d2dcee 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -12038,3 +12038,15 @@ Entries: 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 From 4fb870d7b52f4b9111d72e10babe6487bfea554d Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 24 Feb 2025 00:26:57 -0500 Subject: [PATCH 08/14] Fix War Declarator (#1842) # Description Basically just https://github.com/space-wizards/space-station-14/pull/30221 --- Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs | 1 + 1 file changed, 1 insertion(+) 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)); From ecf8e356593bcf9be82fcb6bd89065b8fe353558 Mon Sep 17 00:00:00 2001 From: Timfa Date: Tue, 25 Feb 2025 03:16:52 +0100 Subject: [PATCH 09/14] Add Clothwraps to Hands Loadouts (#1841) # Description Adds the Cloth Wraps to the hands loadout --- # TODO - [x] Test --- # Changelog :cl: - add: Added cloth wraps to hands loadouts --- .../CharacterItemGroups/Generic/gloveGroup.yml | 2 ++ Resources/Prototypes/Loadouts/Generic/hands.yml | 12 ++++++++++++ 2 files changed, 14 insertions(+) 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/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 From e3edfe815e25dbe0b08288839b61d02553e4829c Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Tue, 25 Feb 2025 02:17:20 +0000 Subject: [PATCH 10/14] Automatic Changelog Update (#1841) --- Resources/Changelog/Changelog.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index dd3c1d2dcee..854e26eda50 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -12050,3 +12050,10 @@ Entries: 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 From 7cb0456eb1c9317a4ab9edfa450b99e0684b35dc Mon Sep 17 00:00:00 2001 From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com> Date: Mon, 24 Feb 2025 23:22:08 -0600 Subject: [PATCH 11/14] Holoparasite Buff (#1843) # Description Buffs holoparasite and brings it more in line with its inspiration. Currently, holoparasite attacks very slowly but does high damage per hit, regardless they're very weak and tend to die before they can actually take anybody down. With my buff, it makes them do less damage per hit, but WAY faster, dramatically decreasing their TTK. This buff brings them more in line with the fast-hitting barrages of stands (their inspiration), and also makes them actually viable, and worth their price again. Also for reference, they cost 10tc more then a damn singularity beacon, and currently kill someone slower then a random guy with a crowbar would.

Media

This is a holoparasite CURRENTLY https://github.com/user-attachments/assets/64f724e8-7d02-4047-bd8b-78d056259b57 This is a holoparasite with my buffs https://github.com/user-attachments/assets/654de634-2909-4771-96ea-4b06a0135c6f
--- # Changelog :cl: - tweak: Holoparasite melee damage from 20 blunt to 10 blunt - tweak: Holoparasite melee speed from 1.8 to 0.3 --------- Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com> --- .../Prototypes/Entities/Mobs/Player/guardian.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 From 3e073ae490922b41bce30810cb8d35503375dee5 Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Tue, 25 Feb 2025 05:22:35 +0000 Subject: [PATCH 12/14] Automatic Changelog Update (#1843) --- Resources/Changelog/Changelog.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 854e26eda50..099b0420a74 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -12057,3 +12057,12 @@ Entries: 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 From c03b719d931b67ba4b01eea1dfd2d77b840047bd Mon Sep 17 00:00:00 2001 From: BloodfiendishOperator <141253729+Diggy0@users.noreply.github.com> Date: Tue, 25 Feb 2025 15:39:19 +0100 Subject: [PATCH 13/14] Minor Fixes to My Two Traits PR. (#1833) Fixed the nano bot trait having a bit too much healing and actually got the bionic leg trait to work. # Nano bot trait nerf and Bionic Leg fix. Could be defined as incompetence and also a "this is the first time I do this" kind of error, regardless, platelet factories for IPC now only heals 0,6 instead of 0,9 and Bionic Legs ACTUALLY do work this time around.. --- # TODO - [ ] Task - [x] Completed Task ---

Media

![Example Media Embed](https://example.com/thisimageisntreal.png)

--- # Changelog :cl: Diggy - tweak: Tweaked the nano bot trait value from 0,9 to 0,6. - fix: Bionic legs DO work now, yay. --- Resources/Prototypes/Traits/physical.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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 + From 330fa0c97e1814e4c34d6765d3d340ff20cc80b1 Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Tue, 25 Feb 2025 14:39:51 +0000 Subject: [PATCH 14/14] Automatic Changelog Update (#1833) --- Resources/Changelog/Changelog.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 099b0420a74..6c0cd960cae 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -12066,3 +12066,12 @@ Entries: 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