From 7a99c962a303dafb4190016d7841e61811dc6631 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Wed, 31 Jul 2024 14:50:16 -0400 Subject: [PATCH 001/133] Fix exploding pen clicking (#30533) --- Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml index c6c37d36424..8bae55e1f42 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml @@ -20,6 +20,8 @@ - type: DeviceLinkSink ports: - Trigger + - type: EmitSoundOnUse + handle: false # don't want the sound to stop the explosion from triggering - type: entity parent: BaseItem From 52b32fa7fad3737618473d6464d006790cef60e6 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Wed, 31 Jul 2024 17:07:12 -0400 Subject: [PATCH 002/133] Fix hypo pen clicking (#30535) --- .../Prototypes/Entities/Objects/Specific/Medical/hypospray.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index ddaf20351cd..08b86e56366 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -432,6 +432,8 @@ delay: 0.5 - type: StaticPrice # A new shitcurity meta price: 75 + - type: EmitSoundOnUse + handle: false # don't want the sound to stop the self-inject from triggering - type: entity parent: BaseItem From ba1610012a1f5e4fd6f9330aed91535176fb51ad Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Wed, 31 Jul 2024 19:29:02 -0700 Subject: [PATCH 003/133] Update RespiratorSystem.cs to not use Component.Owner (#30426) Update RespiratorSystem.cs Co-authored-by: plykiya --- Content.Server/Body/Systems/RespiratorSystem.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs index 5fbd0c48147..5190ba37d50 100644 --- a/Content.Server/Body/Systems/RespiratorSystem.cs +++ b/Content.Server/Body/Systems/RespiratorSystem.cs @@ -114,7 +114,7 @@ public void Inhale(EntityUid uid, BodyComponent? body = null) if (!Resolve(uid, ref body, logMissing: false)) return; - var organs = _bodySystem.GetBodyOrganComponents(uid, body); + var organs = _bodySystem.GetBodyOrganEntityComps((uid, body)); // Inhale gas var ev = new InhaleLocationEvent(); @@ -131,11 +131,11 @@ public void Inhale(EntityUid uid, BodyComponent? body = null) var lungRatio = 1.0f / organs.Count; var gas = organs.Count == 1 ? actualGas : actualGas.RemoveRatio(lungRatio); - foreach (var (lung, _) in organs) + foreach (var (organUid, lung, _) in organs) { // Merge doesn't remove gas from the giver. _atmosSys.Merge(lung.Air, gas); - _lungSystem.GasToReagent(lung.Owner, lung); + _lungSystem.GasToReagent(organUid, lung); } } @@ -144,7 +144,7 @@ public void Exhale(EntityUid uid, BodyComponent? body = null) if (!Resolve(uid, ref body, logMissing: false)) return; - var organs = _bodySystem.GetBodyOrganComponents(uid, body); + var organs = _bodySystem.GetBodyOrganEntityComps((uid, body)); // exhale gas @@ -161,12 +161,12 @@ public void Exhale(EntityUid uid, BodyComponent? body = null) } var outGas = new GasMixture(ev.Gas.Volume); - foreach (var (lung, _) in organs) + foreach (var (organUid, lung, _) in organs) { _atmosSys.Merge(outGas, lung.Air); lung.Air.Clear(); - if (_solutionContainerSystem.ResolveSolution(lung.Owner, lung.SolutionName, ref lung.Solution)) + if (_solutionContainerSystem.ResolveSolution(organUid, lung.SolutionName, ref lung.Solution)) _solutionContainerSystem.RemoveAllSolution(lung.Solution.Value); } @@ -201,7 +201,7 @@ public bool CanMetabolizeGas(Entity ent, GasMixture gas) if (!Resolve(ent, ref ent.Comp)) return false; - var organs = _bodySystem.GetBodyOrganComponents(ent); + var organs = _bodySystem.GetBodyOrganEntityComps((ent, null)); if (organs.Count == 0) return false; @@ -213,7 +213,7 @@ public bool CanMetabolizeGas(Entity ent, GasMixture gas) float saturation = 0; foreach (var organ in organs) { - saturation += GetSaturation(solution, organ.Comp.Owner, out var toxic); + saturation += GetSaturation(solution, organ.Owner, out var toxic); if (toxic) return false; } From 1ef4f26a441bec54380ab4c14dcce1d0fd444288 Mon Sep 17 00:00:00 2001 From: Mervill Date: Wed, 31 Jul 2024 19:30:14 -0700 Subject: [PATCH 004/133] Remove obsolete code from VomitSystem (#30544) --- Content.Server/Medical/VomitSystem.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Content.Server/Medical/VomitSystem.cs b/Content.Server/Medical/VomitSystem.cs index 8c3b15aed33..ec04a27db63 100644 --- a/Content.Server/Medical/VomitSystem.cs +++ b/Content.Server/Medical/VomitSystem.cs @@ -1,6 +1,6 @@ using Content.Server.Body.Components; using Content.Server.Body.Systems; -using Content.Server.Chemistry.Containers.EntitySystems; +using Content.Shared.Chemistry.EntitySystems; using Content.Server.Fluids.EntitySystems; using Content.Server.Forensics; using Content.Server.Popups; @@ -24,7 +24,7 @@ public sealed class VomitSystem : EntitySystem [Dependency] private readonly HungerSystem _hunger = default!; [Dependency] private readonly PopupSystem _popup = default!; [Dependency] private readonly PuddleSystem _puddle = default!; - [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!; + [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; [Dependency] private readonly StunSystem _stun = default!; [Dependency] private readonly ThirstSystem _thirst = default!; [Dependency] private readonly ForensicsSystem _forensics = default!; @@ -35,7 +35,7 @@ public sealed class VomitSystem : EntitySystem public void Vomit(EntityUid uid, float thirstAdded = -40f, float hungerAdded = -40f) { // Main requirement: You have a stomach - var stomachList = _body.GetBodyOrganComponents(uid); + var stomachList = _body.GetBodyOrganEntityComps(uid); if (stomachList.Count == 0) return; @@ -58,11 +58,11 @@ public void Vomit(EntityUid uid, float thirstAdded = -40f, float hungerAdded = - // Empty the stomach out into it foreach (var stomach in stomachList) { - if (_solutionContainer.ResolveSolution(stomach.Comp.Owner, StomachSystem.DefaultSolutionName, ref stomach.Comp.Solution, out var sol)) + if (_solutionContainer.ResolveSolution(stomach.Owner, StomachSystem.DefaultSolutionName, ref stomach.Comp1.Solution, out var sol)) { solution.AddSolution(sol, _proto); sol.RemoveAllSolution(); - _solutionContainer.UpdateChemicals(stomach.Comp.Solution.Value); + _solutionContainer.UpdateChemicals(stomach.Comp1.Solution.Value); } } // Adds a tiny amount of the chem stream from earlier along with vomit @@ -79,7 +79,7 @@ public void Vomit(EntityUid uid, float thirstAdded = -40f, float hungerAdded = - vomitChemstreamAmount.ScaleSolution(chemMultiplier); solution.AddSolution(vomitChemstreamAmount, _proto); - vomitAmount -= (float) vomitChemstreamAmount.Volume; + vomitAmount -= (float)vomitChemstreamAmount.Volume; } // Makes a vomit solution the size of 90% of the chemicals removed from the chemstream From 1d2b7131ab6c39222423f336c2ec364dea31ab10 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Wed, 31 Jul 2024 19:55:02 -0700 Subject: [PATCH 005/133] Meteors now leave behind a bit of ore (#30419) * Meteors that leave behind asteroid ore * bigger offset * Bit more generic * Better defaults * hrm? * I HATE CUSTOM SERIALIZERS * More comments * renamed a variable --------- Co-authored-by: plykiya --- .../Behaviors/WeightedSpawnEntityBehavior.cs | 89 +++++++++++++++++++ .../EntitySystems/SpawnOnDespawnSystem.cs | 6 ++ .../Entities/Markers/Spawners/temp.yml | 11 +++ .../Weapons/Guns/Projectiles/meteors.yml | 19 +++- .../Prototypes/GameRules/meteorswarms.yml | 14 +++ 5 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/temp.yml diff --git a/Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs new file mode 100644 index 00000000000..e02ed873223 --- /dev/null +++ b/Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs @@ -0,0 +1,89 @@ +using System.Numerics; +using Content.Server.Spawners.Components; +using Content.Server.Spawners.EntitySystems; +using Content.Shared.Random; +using Content.Shared.Random.Helpers; +using Robust.Server.GameObjects; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; +using Robust.Shared.Spawners; + +namespace Content.Server.Destructible.Thresholds.Behaviors; + +/// +/// Behavior that can be assigned to a trigger that that takes a +/// and spawns a number of the same entity between a given min and max +/// at a random offset from the final position of the entity. +/// +[Serializable] +[DataDefinition] +public sealed partial class WeightedSpawnEntityBehavior : IThresholdBehavior +{ + /// + /// A table of entities with assigned weights to randomly pick from + /// + [DataField(required: true)] + public ProtoId WeightedEntityTable; + + /// + /// How far away to spawn the entity from the parent position + /// + [DataField] + public float SpawnOffset = 1; + + /// + /// The mininum number of entities to spawn randomly + /// + [DataField] + public int MinSpawn = 1; + + /// + /// The max number of entities to spawn randomly + /// + [DataField] + public int MaxSpawn = 1; + + /// + /// Time in seconds to wait before spawning entities + /// + [DataField] + public float SpawnAfter; + + public void Execute(EntityUid uid, DestructibleSystem system, EntityUid? cause = null) + { + // Get the position at which to start initially spawning entities + var transform = system.EntityManager.System(); + var position = transform.GetMapCoordinates(uid); + // Helper function used to randomly get an offset to apply to the original position + Vector2 GetRandomVector() => new (system.Random.NextFloat(-SpawnOffset, SpawnOffset), system.Random.NextFloat(-SpawnOffset, SpawnOffset)); + // Randomly pick the entity to spawn and randomly pick how many to spawn + var entity = system.PrototypeManager.Index(WeightedEntityTable).Pick(system.Random); + var amountToSpawn = system.Random.NextFloat(MinSpawn, MaxSpawn); + + // Different behaviors for delayed spawning and immediate spawning + if (SpawnAfter != 0) + { + // if it fails to get the spawner, this won't ever work so just return + if (!system.PrototypeManager.TryIndex("TemporaryEntityForTimedDespawnSpawners", out var tempSpawnerProto)) + return; + + // spawn the spawner, assign it a lifetime, and assign the entity that it will spawn when despawned + for (var i = 0; i < amountToSpawn; i++) + { + var spawner = system.EntityManager.SpawnEntity(tempSpawnerProto.ID, position.Offset(GetRandomVector())); + system.EntityManager.EnsureComponent(spawner, out var timedDespawnComponent); + timedDespawnComponent.Lifetime = SpawnAfter; + system.EntityManager.EnsureComponent(spawner, out var spawnOnDespawnComponent); + system.EntityManager.System().SetPrototype((spawner, spawnOnDespawnComponent), entity); + } + } + else + { + // directly spawn the desired entities + for (var i = 0; i < amountToSpawn; i++) + { + system.EntityManager.SpawnEntity(entity, position.Offset(GetRandomVector())); + } + } + } +} diff --git a/Content.Server/Spawners/EntitySystems/SpawnOnDespawnSystem.cs b/Content.Server/Spawners/EntitySystems/SpawnOnDespawnSystem.cs index f5a34728dc8..2f850faab13 100644 --- a/Content.Server/Spawners/EntitySystems/SpawnOnDespawnSystem.cs +++ b/Content.Server/Spawners/EntitySystems/SpawnOnDespawnSystem.cs @@ -1,4 +1,5 @@ using Content.Server.Spawners.Components; +using Robust.Shared.Prototypes; using Robust.Shared.Spawners; namespace Content.Server.Spawners.EntitySystems; @@ -19,4 +20,9 @@ private void OnDespawn(EntityUid uid, SpawnOnDespawnComponent comp, ref TimedDes Spawn(comp.Prototype, xform.Coordinates); } + + public void SetPrototype(Entity entity, EntProtoId prototype) + { + entity.Comp.Prototype = prototype; + } } diff --git a/Resources/Prototypes/Entities/Markers/Spawners/temp.yml b/Resources/Prototypes/Entities/Markers/Spawners/temp.yml new file mode 100644 index 00000000000..aa76bb5ea7a --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/Spawners/temp.yml @@ -0,0 +1,11 @@ +- type: entity + id: TemporaryEntityForTimedDespawnSpawners + categories: [ HideSpawnMenu, Spawner ] + components: + - type: Transform + anchored: True + - type: Physics + bodyType: Static + canCollide: false + - type: TimedDespawn + # we can't declare the SpawnOnDespawnComponent because the entity is required on yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml index 3468cade76b..235010acc96 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml @@ -112,6 +112,11 @@ sound: collection: MetalBreak - !type:ExplodeBehavior + - !type:WeightedSpawnEntityBehavior + weightedEntityTable: "MeteorSpawnAsteroidWallTable" + minSpawn: 2 + maxSpawn: 4 + spawnAfter: 0.5 - type: entity parent: BaseMeteor @@ -147,6 +152,12 @@ sound: collection: MetalBreak - !type:ExplodeBehavior + - !type:WeightedSpawnEntityBehavior + weightedEntityTable: "MeteorSpawnAsteroidWallTable" + spawnOffset: 2 + minSpawn: 3 + maxSpawn: 6 + spawnAfter: 0.5 - type: entity parent: BaseMeteor @@ -169,6 +180,12 @@ sound: collection: MetalBreak - !type:ExplodeBehavior + - !type:WeightedSpawnEntityBehavior + weightedEntityTable: "MeteorSpawnAsteroidWallTable" + spawnOffset: 3 + minSpawn: 5 + maxSpawn: 8 + spawnAfter: 0.5 - type: entity parent: BaseMeteor @@ -203,4 +220,4 @@ volume: 10 - !type:SpillBehavior solution: blood - - !type:ExplodeBehavior + - !type:ExplodeBehavior \ No newline at end of file diff --git a/Resources/Prototypes/GameRules/meteorswarms.yml b/Resources/Prototypes/GameRules/meteorswarms.yml index b85032f0564..2f1cb4eba5e 100644 --- a/Resources/Prototypes/GameRules/meteorswarms.yml +++ b/Resources/Prototypes/GameRules/meteorswarms.yml @@ -17,6 +17,20 @@ GameRuleMeteorSwarmLarge: 5 GameRuleUristSwarm: 0.05 +- type: weightedRandomEntity + id: MeteorSpawnAsteroidWallTable + weights: + AsteroidRock: 10 + AsteroidRockCoal: 5 + AsteroidRockQuartz: 5 + AsteroidRockTin: 5 + AsteroidRockSilver: 2 + AsteroidRockGold: 2 + AsteroidRockPlasma: 2 + AsteroidRockDiamond: 2 + AsteroidRockUranium: 0.5 + AsteroidRockBananium: 0.5 + - type: entity parent: BaseGameRule id: GameRuleMeteorSwarm From 34450dc908b433952c8167d5d61a26718d62831d Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 1 Aug 2024 02:56:09 +0000 Subject: [PATCH 006/133] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index a59b3971bcf..ad4389560da 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,14 +1,4 @@ Entries: -- author: Hanzdegloker - changes: - - message: Added 6 new energy drink based mixed drinks. - type: Add - - message: Added Red Bool energy drink back to the soda dispenser and gave it a - new canned sprite. - type: Add - id: 6521 - time: '2024-05-03T06:57:37.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27597 - author: DuskyJay changes: - message: Allowed EMP implants to be used while stunned or cuffed. @@ -3781,3 +3771,10 @@ id: 7020 time: '2024-07-31T17:57:41.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30531 +- author: Plykiya + changes: + - message: Meteors now leave behind asteroid rocks on impact. + type: Add + id: 7021 + time: '2024-08-01T02:55:02.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30419 From ad0aba5108354c7bb99655801af48cdf4002b6be Mon Sep 17 00:00:00 2001 From: PixeltheAertistContrib Date: Wed, 31 Jul 2024 19:58:16 -0700 Subject: [PATCH 007/133] Change Social Anxiety ----> Stutter (#29898) * Change Social Anxiety ----> Stutter * Update traits.ftl --------- Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> --- Resources/Locale/en-US/traits/traits.ftl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl index e3aed1c8b24..d9f09cc68aa 100644 --- a/Resources/Locale/en-US/traits/traits.ftl +++ b/Resources/Locale/en-US/traits/traits.ftl @@ -5,7 +5,7 @@ trait-poor-vision-name = Short-sighted trait-poor-vision-desc = Your eyes are not what they once were, you have difficulty seeing things far away without corrective glasses. trait-narcolepsy-name = Narcolepsy -trait-narcolepsy-desc = You fall asleep randomly +trait-narcolepsy-desc = You fall asleep randomly. trait-pacifist-name = Pacifist trait-pacifist-desc = You cannot attack or hurt any living beings. @@ -13,13 +13,13 @@ trait-pacifist-desc = You cannot attack or hurt any living beings. permanent-blindness-trait-examined = [color=lightblue]{CAPITALIZE(POSS-ADJ($target))} eyes are glassy and unfocused. It doesn't seem like {SUBJECT($target)} can see you well, if at all.[/color] trait-lightweight-name = Lightweight drunk -trait-lightweight-desc = Alcohol has a stronger effect on you +trait-lightweight-desc = Alcohol has a stronger effect on you. trait-muted-name = Muted -trait-muted-desc = You can't speak +trait-muted-desc = You can't speak. trait-paracusia-name = Paracusia -trait-paracusia-desc = You hear sounds that aren't really there +trait-paracusia-desc = You hear sounds that aren't really there. trait-unrevivable-name = Unrevivable trait-unrevivable-desc = You are unable to be revived by defibrillators. @@ -31,10 +31,10 @@ trait-accentless-name = Accentless trait-accentless-desc = You don't have the accent that your species would usually have trait-frontal-lisp-name = Frontal lisp -trait-frontal-lisp-desc = You thpeak with a lithp +trait-frontal-lisp-desc = You thpeak with a lithp. -trait-socialanxiety-name = Social anxiety -trait-socialanxiety-desc = You are anxious when you speak and stutter. +trait-socialanxiety-name = Stutter +trait-socialanxiety-desc = You speak with a stutter. trait-southern-name = Southern drawl trait-southern-desc = You have a different way of speakin'. @@ -49,4 +49,4 @@ trait-cowboy-name = Cowboy accent trait-cowboy-desc = You speak with a distinct cowboy accent! trait-italian-name = Italian accent -trait-italian-desc = Mamma mia! You seem to have lived in space italy! \ No newline at end of file +trait-italian-desc = Mamma mia! You seem to have lived in space italy! From b5524bfcd1c43f63f7f463debf2fe7a108abe45b Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 1 Aug 2024 02:59:22 +0000 Subject: [PATCH 008/133] 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 ad4389560da..599ee14fcb6 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: DuskyJay - changes: - - message: Allowed EMP implants to be used while stunned or cuffed. - type: Tweak - id: 6522 - time: '2024-05-03T07:51:33.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27644 - author: Just-a-Unity-Dev changes: - message: Fixed Geras not having their speed buff. @@ -3778,3 +3771,10 @@ id: 7021 time: '2024-08-01T02:55:02.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30419 +- author: PixelTheAertist + changes: + - message: The Social Anxiety trait is now renamed to "Stutter" + type: Tweak + id: 7022 + time: '2024-08-01T02:58:16.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29898 From 1d79b924a6acdc46cf7e1d6b50b16980da020e25 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Wed, 31 Jul 2024 19:59:54 -0700 Subject: [PATCH 009/133] Adds hand labelers to the ChemDrobe, LawDrobe, and PTech (#29958) * Adds hand labelers to the chemdrobe and ptech * LawDrobe too * Update cart.yml --------- Co-authored-by: plykiya --- .../Prototypes/Catalog/VendingMachines/Inventories/cart.yml | 1 + .../Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml | 1 + .../Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml index 303b2090530..8170ba792ae 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml @@ -9,6 +9,7 @@ RubberStampDenied: 1 Paper: 10 Envelope: 10 + HandLabeler: 2 EncryptionKeyCargo: 2 EncryptionKeyEngineering: 2 EncryptionKeyMedical: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml index d028c55cabc..5dbb34afa71 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml @@ -9,6 +9,7 @@ ClothingBackpackSatchelChemistry: 2 ClothingBackpackDuffelChemistry: 2 ChemBag: 2 + HandLabeler: 3 ClothingBeltMedical: 2 ClothingHandsGlovesLatex: 2 ClothingHeadsetMedical: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml index 75760ce5196..07a650b0a38 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml @@ -17,6 +17,7 @@ BriefcaseBrown: 2 BookSpaceLaw: 3 LuxuryPen: 2 + HandLabeler: 2 contrabandInventory: ClothingOuterRobesJudge: 1 ClothingHeadHatPwig: 1 From ab05228479269cf6a86c6092a1d53cf48eebaadb Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 1 Aug 2024 03:01:00 +0000 Subject: [PATCH 010/133] Automatic changelog update --- Resources/Changelog/Changelog.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 599ee14fcb6..6f784b09404 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,17 +1,4 @@ Entries: -- author: Just-a-Unity-Dev - changes: - - message: Fixed Geras not having their speed buff. - type: Fix - - message: Geras are no longer immune to other AI mobs. - type: Fix - - message: Slimes can no longer morph into a Geras when zombified. - type: Fix - - message: Lowered the Geras death threshold. - type: Tweak - id: 6523 - time: '2024-05-03T17:26:09.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27308 - author: nikthechampiongr changes: - message: Ninjas will no longer be pointed to random wreckage in space. @@ -3778,3 +3765,10 @@ id: 7022 time: '2024-08-01T02:58:16.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29898 +- author: Plykiya + changes: + - message: Adds hand labelers to the PTech, ChemDrobe, and LawDrobe. + type: Add + id: 7023 + time: '2024-08-01T02:59:54.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29958 From 4b7325098a8eda81cb441b4e401140136a69caca Mon Sep 17 00:00:00 2001 From: Mervill Date: Wed, 31 Jul 2024 20:27:17 -0700 Subject: [PATCH 011/133] Remove obsolete code from LightningSystem (#30546) --- Content.Server/Lightning/LightningSystem.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Content.Server/Lightning/LightningSystem.cs b/Content.Server/Lightning/LightningSystem.cs index 94f3ab88023..8b0a18afb35 100644 --- a/Content.Server/Lightning/LightningSystem.cs +++ b/Content.Server/Lightning/LightningSystem.cs @@ -76,9 +76,9 @@ public void ShootRandomLightnings(EntityUid user, float range, int boltCount, st //TODO: This is still pretty bad for perf but better than before and at least it doesn't re-allocate // several hashsets every time - var targets = _lookup.GetComponentsInRange(_transform.GetMapCoordinates(user), range).ToList(); + var targets = _lookup.GetEntitiesInRange(_transform.GetMapCoordinates(user), range).ToList(); _random.Shuffle(targets); - targets.Sort((x, y) => y.Priority.CompareTo(x.Priority)); + targets.Sort((x, y) => y.Comp.Priority.CompareTo(x.Comp.Priority)); int shootedCount = 0; int count = -1; @@ -89,13 +89,13 @@ public void ShootRandomLightnings(EntityUid user, float range, int boltCount, st if (count >= targets.Count) { break; } var curTarget = targets[count]; - if (!_random.Prob(curTarget.HitProbability)) //Chance to ignore target + if (!_random.Prob(curTarget.Comp.HitProbability)) //Chance to ignore target continue; ShootLightning(user, targets[count].Owner, lightningPrototype, triggerLightningEvents); - if (arcDepth - targets[count].LightningResistance > 0) + if (arcDepth - targets[count].Comp.LightningResistance > 0) { - ShootRandomLightnings(targets[count].Owner, range, 1, lightningPrototype, arcDepth - targets[count].LightningResistance, triggerLightningEvents); + ShootRandomLightnings(targets[count].Owner, range, 1, lightningPrototype, arcDepth - targets[count].Comp.LightningResistance, triggerLightningEvents); } shootedCount++; } From 2c26be606fb4348af13628eb0624cadbbf2ac910 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Thu, 1 Aug 2024 00:15:05 -0400 Subject: [PATCH 012/133] Add support for printing reagents in lathes (#30476) * Add support for reagents in lathes * missing locale --- Content.Client/Lathe/UI/LatheMenu.xaml | 8 +- Content.Client/Lathe/UI/LatheMenu.xaml.cs | 56 +++++++----- Content.Client/Lathe/UI/RecipeControl.xaml | 4 +- Content.Client/Lathe/UI/RecipeControl.xaml.cs | 10 +-- .../Tests/MaterialArbitrageTest.cs | 6 +- Content.Server/Cargo/Systems/PricingSystem.cs | 21 +++++ Content.Server/Lathe/LatheSystem.cs | 50 +++++++++-- .../UserInterface/StatValuesCommand.cs | 7 +- .../Construction/MachinePartSystem.cs | 8 +- Content.Shared/Lathe/LatheComponent.cs | 3 + Content.Shared/Lathe/SharedLatheSystem.cs | 70 ++++++++++++++- .../Prototypes/LatheRecipePrototype.cs | 89 +++++-------------- .../Research/Systems/SharedResearchSystem.cs | 4 +- .../Systems/TechnologyDiskSystem.cs | 5 +- Resources/Locale/en-US/lathe/recipes.ftl | 8 ++ .../Locale/en-US/lathe/ui/lathe-menu.ftl | 3 + .../Prototypes/Recipes/Lathes/medical.yml | 16 ++-- 17 files changed, 234 insertions(+), 134 deletions(-) create mode 100644 Resources/Locale/en-US/lathe/recipes.ftl diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml b/Content.Client/Lathe/UI/LatheMenu.xaml index e3247fe7037..5b21f0bae66 100644 --- a/Content.Client/Lathe/UI/LatheMenu.xaml +++ b/Content.Client/Lathe/UI/LatheMenu.xaml @@ -100,11 +100,9 @@ Margin="5 0 0 0" Text="{Loc 'lathe-menu-fabricating-message'}"> - +