From d1812c11fde58ffa23967c50524472c6324334a2 Mon Sep 17 00:00:00 2001 From: goet <6637097+goet@users.noreply.github.com> Date: Wed, 25 Sep 2024 07:21:24 +0200 Subject: [PATCH 01/12] Fix contraband never getting added to vend inventory (#32431) * fix contraband never getting added to vend inventory * Revert "fix contraband never getting added to vend inventory" This reverts commit e7fb3a60c3cb6fcbf41d7f015f13dbc7b1c1901d. * readd setter method to system * fix again without reparenting --- .../VendingMachineContrabandWireAction.cs | 11 ++++++++++- .../VendingMachines/VendingMachineSystem.cs | 12 ++++++++++++ .../VendingMachines/VendingMachineComponent.cs | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Content.Server/VendingMachines/VendingMachineContrabandWireAction.cs b/Content.Server/VendingMachines/VendingMachineContrabandWireAction.cs index 22a0341fcbeac1..39231fbe8349a3 100644 --- a/Content.Server/VendingMachines/VendingMachineContrabandWireAction.cs +++ b/Content.Server/VendingMachines/VendingMachineContrabandWireAction.cs @@ -7,11 +7,20 @@ namespace Content.Server.VendingMachines; [DataDefinition] public sealed partial class VendingMachineContrabandWireAction : BaseToggleWireAction { + private VendingMachineSystem _vendingMachineSystem = default!; + public override Color Color { get; set; } = Color.Green; public override string Name { get; set; } = "wire-name-vending-contraband"; public override object? StatusKey { get; } = ContrabandWireKey.StatusKey; public override object? TimeoutKey { get; } = ContrabandWireKey.TimeoutKey; + public override void Initialize() + { + base.Initialize(); + + _vendingMachineSystem = EntityManager.System(); + } + public override StatusLightState? GetLightState(Wire wire) { if (EntityManager.TryGetComponent(wire.Owner, out VendingMachineComponent? vending)) @@ -28,7 +37,7 @@ public override void ToggleValue(EntityUid owner, bool setting) { if (EntityManager.TryGetComponent(owner, out VendingMachineComponent? vending)) { - vending.Contraband = !setting; + _vendingMachineSystem.SetContraband(owner, !vending.Contraband, vending); } } diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 38407a98c72943..90fe4cb7d8ae7b 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -192,6 +192,18 @@ public void SetShooting(EntityUid uid, bool canShoot, VendingMachineComponent? c component.CanShoot = canShoot; } + /// + /// Sets the property of the vending machine. + /// + public void SetContraband(EntityUid uid, bool contraband, VendingMachineComponent? component = null) + { + if (!Resolve(uid, ref component)) + return; + + component.Contraband = contraband; + Dirty(uid, component); + } + public void Deny(EntityUid uid, VendingMachineComponent? vendComponent = null) { if (!Resolve(uid, ref vendComponent)) diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs index a3c7949600a189..50023a023ab1dd 100644 --- a/Content.Shared/VendingMachines/VendingMachineComponent.cs +++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs @@ -41,6 +41,7 @@ public sealed partial class VendingMachineComponent : Component [DataField, AutoNetworkedField] public Dictionary ContrabandInventory = new(); + [DataField, AutoNetworkedField] public bool Contraband; public bool Ejecting; From 31c45d6169c0ef336b54c7257b454d1db546b3f5 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 25 Sep 2024 05:22:30 +0000 Subject: [PATCH 02/12] 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 a31711b81609f0..3905edbc13a4bf 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deepdarkdepths - changes: - - message: Removed the description about geras in the Slime guidebook section. - type: Remove - id: 6935 - time: '2024-07-19T09:04:43.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30140 - author: Blackern5000 changes: - message: Nuclear operatives are now able to purchase durable armor which is NOT @@ -3928,3 +3921,10 @@ id: 7434 time: '2024-09-24T21:58:46.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32343 +- author: goet + changes: + - message: Vending machines can be hacked again. + type: Fix + id: 7435 + time: '2024-09-25T05:21:24.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32431 From 0dedc9d91aa17848d9a829a2708765375cf18242 Mon Sep 17 00:00:00 2001 From: Zylofan <80375291+Zylofan@users.noreply.github.com> Date: Wed, 25 Sep 2024 06:50:15 -0400 Subject: [PATCH 03/12] Skull Helm Hand Sprite now turns (#32442) Fixed a typo for the bone helmet that made it not rotate when held in the right hand. --- .../Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json index bbb0aac6648283..a470e0094432b5 100644 --- a/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json @@ -20,7 +20,7 @@ }, { "name": "inhand-right", - "direction": 4 + "directions": 4 } ] } From 7168959929b87dd392c5cbc3d29bdb9bd315c060 Mon Sep 17 00:00:00 2001 From: keronshb <54602815+keronshb@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:27:28 -0400 Subject: [PATCH 04/12] Adds real-time charge & disabled action information to Actions (#31821) --- Content.Client/Actions/ActionsSystem.cs | 27 ++++++++ Content.Shared/Actions/BaseActionComponent.cs | 14 ++++ Content.Shared/Actions/SharedActionsSystem.cs | 64 +++++++++++++++++-- 3 files changed, 99 insertions(+), 6 deletions(-) diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs index 26a22fa8b8df37..7b13233bab5cd5 100644 --- a/Content.Client/Actions/ActionsSystem.cs +++ b/Content.Client/Actions/ActionsSystem.cs @@ -51,6 +51,29 @@ public override void Initialize() SubscribeLocalEvent(OnEntityWorldTargetHandleState); } + public override void FrameUpdate(float frameTime) + { + base.FrameUpdate(frameTime); + + var worldActionQuery = EntityQueryEnumerator(); + while (worldActionQuery.MoveNext(out var uid, out var action)) + { + UpdateAction(uid, action); + } + + var instantActionQuery = EntityQueryEnumerator(); + while (instantActionQuery.MoveNext(out var uid, out var action)) + { + UpdateAction(uid, action); + } + + var entityActionQuery = EntityQueryEnumerator(); + while (entityActionQuery.MoveNext(out var uid, out var action)) + { + UpdateAction(uid, action); + } + } + private void OnInstantHandleState(EntityUid uid, InstantActionComponent component, ref ComponentHandleState args) { if (args.Current is not InstantActionComponentState state) @@ -95,6 +118,8 @@ private void BaseHandleState(EntityUid uid, BaseActionComponent component, Ba component.Icon = state.Icon; component.IconOn = state.IconOn; component.IconColor = state.IconColor; + component.OriginalIconColor = state.OriginalIconColor; + component.DisabledIconColor = state.DisabledIconColor; component.Keywords.Clear(); component.Keywords.UnionWith(state.Keywords); component.Enabled = state.Enabled; @@ -125,6 +150,8 @@ public override void UpdateAction(EntityUid? actionId, BaseActionComponent? acti if (!ResolveActionData(actionId, ref action)) return; + action.IconColor = action.Charges < 1 ? action.DisabledIconColor : action.OriginalIconColor; + base.UpdateAction(actionId, action); if (_playerManager.LocalEntity != action.AttachedEntity) return; diff --git a/Content.Shared/Actions/BaseActionComponent.cs b/Content.Shared/Actions/BaseActionComponent.cs index 9156f747f5c90a..01452bdc72e0f4 100644 --- a/Content.Shared/Actions/BaseActionComponent.cs +++ b/Content.Shared/Actions/BaseActionComponent.cs @@ -40,6 +40,16 @@ public abstract partial class BaseActionComponent : Component /// [DataField("iconColor")] public Color IconColor = Color.White; + /// + /// The original this action was. + /// + [DataField] public Color OriginalIconColor; + + /// + /// The color the action should turn to when disabled + /// + [DataField] public Color DisabledIconColor = Color.DimGray; + /// /// Keywords that can be used to search for this action in the action menu. /// @@ -179,6 +189,8 @@ public abstract class BaseActionComponentState : ComponentState public SpriteSpecifier? Icon; public SpriteSpecifier? IconOn; public Color IconColor; + public Color OriginalIconColor; + public Color DisabledIconColor; public HashSet Keywords; public bool Enabled; public bool Toggled; @@ -209,6 +221,8 @@ protected BaseActionComponentState(BaseActionComponent component, IEntityManager Icon = component.Icon; IconOn = component.IconOn; IconColor = component.IconColor; + OriginalIconColor = component.OriginalIconColor; + DisabledIconColor = component.DisabledIconColor; Keywords = component.Keywords; Enabled = component.Enabled; Toggled = component.Toggled; diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs index 275634542825d1..76b8a1b081b49c 100644 --- a/Content.Shared/Actions/SharedActionsSystem.cs +++ b/Content.Shared/Actions/SharedActionsSystem.cs @@ -69,8 +69,42 @@ public override void Initialize() SubscribeAllEvent(OnActionRequest); } + public override void Update(float frameTime) + { + base.Update(frameTime); + + var worldActionQuery = EntityQueryEnumerator(); + while (worldActionQuery.MoveNext(out var uid, out var action)) + { + if (IsCooldownActive(action) || !ShouldResetCharges(action)) + continue; + + ResetCharges(uid, dirty: true); + } + + var instantActionQuery = EntityQueryEnumerator(); + while (instantActionQuery.MoveNext(out var uid, out var action)) + { + if (IsCooldownActive(action) || !ShouldResetCharges(action)) + continue; + + ResetCharges(uid, dirty: true); + } + + var entityActionQuery = EntityQueryEnumerator(); + while (entityActionQuery.MoveNext(out var uid, out var action)) + { + if (IsCooldownActive(action) || !ShouldResetCharges(action)) + continue; + + ResetCharges(uid, dirty: true); + } + } + private void OnActionMapInit(EntityUid uid, BaseActionComponent component, MapInitEvent args) { + component.OriginalIconColor = component.IconColor; + if (component.Charges == null) return; @@ -326,14 +360,18 @@ public void RemoveCharges(EntityUid? actionId, int? removeCharges) Dirty(actionId.Value, action); } - public void ResetCharges(EntityUid? actionId) + public void ResetCharges(EntityUid? actionId, bool update = false, bool dirty = false) { if (!TryGetActionData(actionId, out var action)) return; action.Charges = action.MaxCharges; - UpdateAction(actionId, action); - Dirty(actionId.Value, action); + + if (update) + UpdateAction(actionId, action); + + if (dirty) + Dirty(actionId.Value, action); } private void OnActionsGetState(EntityUid uid, ActionsComponent component, ref ComponentGetState args) @@ -386,13 +424,12 @@ private void OnActionRequest(RequestPerformActionEvent ev, EntitySessionEventArg return; var curTime = GameTiming.CurTime; - // TODO: Check for charge recovery timer - if (action.Cooldown.HasValue && action.Cooldown.Value.End > curTime) + if (IsCooldownActive(action, curTime)) return; // TODO: Replace with individual charge recovery when we have the visuals to aid it if (action is { Charges: < 1, RenewCharges: true }) - ResetCharges(actionEnt); + ResetCharges(actionEnt, true, true); BaseActionEvent? performEvent = null; @@ -1072,4 +1109,19 @@ public void SetEntityIcon(EntityUid uid, EntityUid? icon, BaseActionComponent? a action.EntityIcon = icon; Dirty(uid, action); } + + /// + /// Checks if the action has a cooldown and if it's still active + /// + protected bool IsCooldownActive(BaseActionComponent action, TimeSpan? curTime = null) + { + curTime ??= GameTiming.CurTime; + // TODO: Check for charge recovery timer + return action.Cooldown.HasValue && action.Cooldown.Value.End > curTime; + } + + protected bool ShouldResetCharges(BaseActionComponent action) + { + return action is { Charges: < 1, RenewCharges: true }; + } } From e0a3d3d91a5c2e07bef8f9fbfc214d3c4a2816e1 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:41:34 -0400 Subject: [PATCH 05/12] Fix agent ID card unlimited range (#32445) * Fix agent ID card unlimited range * update order to be more optimized --- Content.Server/Access/Systems/AgentIDCardSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Access/Systems/AgentIDCardSystem.cs b/Content.Server/Access/Systems/AgentIDCardSystem.cs index 8f1d0d4f820a2c..4de908bc3019a2 100644 --- a/Content.Server/Access/Systems/AgentIDCardSystem.cs +++ b/Content.Server/Access/Systems/AgentIDCardSystem.cs @@ -32,7 +32,7 @@ public override void Initialize() private void OnAfterInteract(EntityUid uid, AgentIDCardComponent component, AfterInteractEvent args) { - if (!TryComp(args.Target, out var targetAccess) || !HasComp(args.Target) || args.Target == null) + if (args.Target == null || !args.CanReach || !TryComp(args.Target, out var targetAccess) || !HasComp(args.Target)) return; if (!TryComp(uid, out var access) || !HasComp(uid)) From d2ed93ed629c18de589e2a881db9294db47328cd Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 25 Sep 2024 15:42:42 +0000 Subject: [PATCH 06/12] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 3905edbc13a4bf..6aec9cc60ddaff 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Blackern5000 - changes: - - message: Nuclear operatives are now able to purchase durable armor which is NOT - space-proof. - type: Add - id: 6936 - time: '2024-07-19T09:38:26.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29845 - author: Plykiya, slarticodefast changes: - message: Explosive pens now correctly embed into their target. @@ -3928,3 +3920,10 @@ id: 7435 time: '2024-09-25T05:21:24.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32431 +- author: themias + changes: + - message: Agent ID card can now only copy access within interaction range. + type: Fix + id: 7436 + time: '2024-09-25T15:41:34.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32445 From 6459f7156b30859e06d49640b9c6ed32214e42e4 Mon Sep 17 00:00:00 2001 From: Vasilis Date: Wed, 25 Sep 2024 18:49:43 +0200 Subject: [PATCH 07/12] Remove binary channel access to silicons without laws. (#32385) Mostly feature proofing but these should not have binary access. ESPECIALLY pais Say we had malf ai and it was talking with other borgs about its plans. The owner of the pai (or any of these silicons) can just listen into this. Someone can just wake up a pai and ask it to monitor the binary channel. There's a reason the binary radio chip is a syndicate item. Some of these also have no reason to be able to talk on binary, are you gonna ask the ai to bother someone to refill your vend stock? Are you gonna clown with the AI and other borgs as a clown borg and annoy them? --- Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml | 5 ----- Resources/Prototypes/Entities/Objects/Fun/pai.yml | 4 ---- .../Entities/Structures/Machines/vending_machines.yml | 4 ---- 3 files changed, 13 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 857115e10f197f..d5b4366e2baea9 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -32,12 +32,8 @@ factions: - SimpleNeutral - type: IntrinsicRadioReceiver - - type: IntrinsicRadioTransmitter - channels: - - Binary - type: ActiveRadio channels: - - Binary - Common - type: HealthExaminable examinableTypes: @@ -396,6 +392,5 @@ - Bot - type: ActiveRadio channels: - - Binary - Common - Supply diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml index 4695f1c125d258..ff662c2186aacf 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml @@ -44,12 +44,8 @@ stopSearchVerbPopup: pai-system-stopped-searching - type: Examiner - type: IntrinsicRadioReceiver - - type: IntrinsicRadioTransmitter - channels: - - Binary - type: ActiveRadio channels: - - Binary - Common - type: DoAfter - type: Actions diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 99879cfbc9450b..e047614ac246f5 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -79,12 +79,8 @@ speechVerb: Robotic speechSounds: Vending - type: IntrinsicRadioReceiver - - type: IntrinsicRadioTransmitter - channels: - - Binary - type: ActiveRadio channels: - - Binary - Common - type: DoAfter - type: Electrified From 92c5c873d4b62e34adb564649067b6b6d7bee6c3 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 25 Sep 2024 16:50:51 +0000 Subject: [PATCH 08/12] 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 6aec9cc60ddaff..f93e445a366ab6 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Plykiya, slarticodefast - changes: - - message: Explosive pens now correctly embed into their target. - type: Fix - id: 6937 - time: '2024-07-19T09:42:58.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30112 - author: ThatOneEnby1337 changes: - message: News Reporters are now able to use markup tags in their reports without @@ -3927,3 +3920,10 @@ id: 7436 time: '2024-09-25T15:41:34.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32445 +- author: Myra + changes: + - message: Silicon with no laws will not have binary channel access. + type: Remove + id: 7437 + time: '2024-09-25T16:49:43.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32385 From b2dad9ff90d515bf04e823e8991e0ef66cf5c967 Mon Sep 17 00:00:00 2001 From: august-sun <45527070+august-sun@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:27:30 -0600 Subject: [PATCH 09/12] Makes the rolling pin craftable (#32285) * Makes the rolling pin craftable * Update Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rolling_pin.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../Prototypes/Entities/Objects/Tools/tools.yml | 3 +++ .../Crafting/Graphs/improvised/rolling_pin.yml | 15 +++++++++++++++ .../Prototypes/Recipes/Crafting/improvised.yml | 15 ++++++++++++++- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rolling_pin.yml diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index d985560ac2dad4..41d167352f2954 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -514,3 +514,6 @@ - type: Tag tags: - RollingPin + - type: Construction + graph: WoodenRollingPin + node: rollingpin diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rolling_pin.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rolling_pin.yml new file mode 100644 index 00000000000000..caa9ebbea91a6a --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rolling_pin.yml @@ -0,0 +1,15 @@ +- type: constructionGraph + id: WoodenRollingPin + start: start + graph: + - node: start + edges: + - to: rollingpin + steps: + - material: WoodPlank + amount: 2 + - material: MetalRod + amount: 1 + doAfter: 2 + - node: rollingpin + entity: RollingPin diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index 38d254c1416d94..c87f4eb3d20c8e 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -145,7 +145,7 @@ targetNode: shell category: construction-category-weapons objectType: Item - description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a Barn + description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a barn. icon: sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi state: improvised @@ -214,3 +214,16 @@ icon: sprite: Objects/Weapons/Bombs/pipebomb.rsi state: icon + +- type: construction + name: rolling pin + id: rollingpin + graph: WoodenRollingPin + startNode: start + targetNode: rollingpin + category: construction-category-tools + objectType: Item + description: A rolling pin, used for cooking and defending the kitchen. + icon: + sprite: Objects/Tools/rolling_pin.rsi + state: icon From 5a585f70e5a6ae80702c2b90f7613829dd946ba6 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 25 Sep 2024 17:28:36 +0000 Subject: [PATCH 10/12] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f93e445a366ab6..50812ba2b62e8f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: ThatOneEnby1337 - changes: - - message: News Reporters are now able to use markup tags in their reports without - bricking the PDAs of readers - type: Fix - id: 6938 - time: '2024-07-19T14:18:39.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30169 - author: themias changes: - message: Mailing units are functional again @@ -3927,3 +3919,10 @@ id: 7437 time: '2024-09-25T16:49:43.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32385 +- author: august-sun + changes: + - message: Rolling pins are now craftable. + type: Tweak + id: 7438 + time: '2024-09-25T17:27:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32285 From 548973bc1fcdd78655918dda99ee0385d9da5556 Mon Sep 17 00:00:00 2001 From: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com> Date: Wed, 25 Sep 2024 19:39:49 +0200 Subject: [PATCH 11/12] Fix Doctors Delight metabolism Rate (#32297) * Fix Doctors Delight metabolism Rate * Combine Drink and Medicine instead of halving their motabolism rate. * Removed unintentional newline. Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Remove metabolismRate since it is setting it to the default. Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 1aa03bf4c93661..602d6296b3d361 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -875,8 +875,6 @@ - !type:AdjustReagent reagent: Ethanol amount: 0.05 - Medicine: - effects: - !type:HealthChange damage: groups: From 9c2fe85d4765e03c5c4b931b76e8dbbb8fb2955b Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 25 Sep 2024 17:40:55 +0000 Subject: [PATCH 12/12] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 50812ba2b62e8f..f010f4808bab6a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: themias - changes: - - message: Mailing units are functional again - type: Fix - id: 6939 - time: '2024-07-20T02:31:26.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30174 - author: Ghagliiarghii changes: - message: Nuclear Operatives' Reinforcements now have a PDA! @@ -3926,3 +3919,11 @@ id: 7438 time: '2024-09-25T17:27:30.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32285 +- author: BramvanZijp + changes: + - message: Fixed an issue that caused Doctors Delight to metabolize twice the normal + speed, which also halved its effectiveness. + type: Fix + id: 7439 + time: '2024-09-25T17:39:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32297