From ad233066f2e58af499203dcf7fad1430b7b9a21f Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Wed, 17 Jan 2024 15:52:26 -0800 Subject: [PATCH 001/105] Fix comp.Owner (#24206) --- .../Chemistry/EntitySystems/ReagentDispenserSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs index a0d6a66bb34..109d5f351ac 100644 --- a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs @@ -88,11 +88,11 @@ private void UpdateUiState(Entity reagentDispenser) return null; } - private List>> GetInventory(ReagentDispenserComponent reagentDispenser) + private List>> GetInventory(Entity reagentDispenser) { var inventory = new List>>(); - for (var i = 0; i < reagentDispenser.NumSlots; i++) + for (var i = 0; i < reagentDispenser.Comp.NumSlots; i++) { var storageSlotId = ReagentDispenserComponent.BaseStorageSlotId + i; var storedContainer = _itemSlotsSystem.GetItemOrNull(reagentDispenser.Owner, storageSlotId); From 2c0e1fcfb97ba401029a122fbdeef0eae5ae979e Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Thu, 18 Jan 2024 02:57:40 +0300 Subject: [PATCH 002/105] Repairable shuttles (#24193) * fixable shuttle * nukie not repairable * fix --- .../Structures/Shuttles/thrusters.yml | 42 ++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml index 61218cf41c5..fb053d46a47 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml @@ -39,6 +39,9 @@ behaviors: - !type:DoActsBehavior acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/metalbreak.ogg - type: StaticPrice price: 300 placement: @@ -49,9 +52,27 @@ name: thruster parent: [ BaseThruster, ConstructibleMachine ] components: - - type: Thruster - type: Machine board: ThrusterMachineCircuitboard + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/metalbreak.ogg + - !type:ChangeConstructionNodeBehavior + node: machineFrame - type: Sprite sprite: Structures/Shuttles/thruster.rsi layers: @@ -142,6 +163,25 @@ color: "#4246b3" - type: Machine board: GyroscopeMachineCircuitboard + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/metalbreak.ogg + - !type:ChangeConstructionNodeBehavior + node: machineFrame - type: UpgradePowerDraw powerDrawMultiplier: 0.75 scaling: Exponential From 4536bad9481c61bafa1f79deee8bc7f62a788216 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 17 Jan 2024 23:58:46 +0000 Subject: [PATCH 003/105] Automatic changelog update --- Resources/Changelog/Changelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 9b2d52233a9..c7ca8b3d9bc 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,10 +1,4 @@ Entries: -- author: Ubaser - changes: - - message: The senior physician beret now matches their outfit more. - type: Tweak - id: 5233 - time: '2023-12-01T08:34:08.0000000+00:00' - author: enumerate0 changes: - message: Recognizable solutions now appear sorted by volume first, then by name @@ -3775,3 +3769,10 @@ id: 5733 time: '2024-01-17T21:43:48.0000000+00:00' url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23907 +- author: TheShuEd + changes: + - message: Added the ability to repair thrusters and gyroscopes on the shuttle. + type: Add + id: 5734 + time: '2024-01-17T23:57:40.0000000+00:00' + url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24193 From 1e9eab0a0b7524e2fcdc3b342cc15fe777b7a7bd Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Wed, 17 Jan 2024 16:16:58 -0800 Subject: [PATCH 004/105] Do not log missing components in OpenableSystem (#24208) Do not log missing components --- Content.Server/Nutrition/EntitySystems/OpenableSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Nutrition/EntitySystems/OpenableSystem.cs b/Content.Server/Nutrition/EntitySystems/OpenableSystem.cs index fbe617eff49..d7b7da25b88 100644 --- a/Content.Server/Nutrition/EntitySystems/OpenableSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/OpenableSystem.cs @@ -118,7 +118,7 @@ public void UpdateAppearance(EntityUid uid, OpenableComponent? comp = null, Appe /// public void SetOpen(EntityUid uid, bool opened = true, OpenableComponent? comp = null) { - if (!Resolve(uid, ref comp) || opened == comp.Opened) + if (!Resolve(uid, ref comp, false) || opened == comp.Opened) return; comp.Opened = opened; @@ -132,7 +132,7 @@ public void SetOpen(EntityUid uid, bool opened = true, OpenableComponent? comp = /// Whether it got opened public bool TryOpen(EntityUid uid, OpenableComponent? comp = null) { - if (!Resolve(uid, ref comp) || comp.Opened) + if (!Resolve(uid, ref comp, false) || comp.Opened) return false; SetOpen(uid, true, comp); From a61e24a254a2ba0ed6b804a7e481393518604f8b Mon Sep 17 00:00:00 2001 From: Volodius <43648983+Volotomite@users.noreply.github.com> Date: Thu, 18 Jan 2024 03:28:31 +0300 Subject: [PATCH 005/105] fix flippo not igniting plasma (#24207) Add welder component to FlippoLighter --- Resources/Prototypes/Entities/Objects/Tools/lighters.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml index 9eb3a2da92a..dff367dc99f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml @@ -177,6 +177,10 @@ - ReagentId: WeldingFuel Quantity: 12 maxVol: 12 #uses less fuel than a welder, so this isnt as bad as it looks + - type: Welder + fuelConsumption: 0.01 + fuelLitCost: 0.1 + tankSafe: true - type: ToggleableLightVisuals spriteLayer: lighter_flame inhandVisuals: From a32f0da49b817ef1c71e357aaef71eb6a3bcb396 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 18 Jan 2024 00:29:37 +0000 Subject: [PATCH 006/105] Automatic changelog update --- Resources/Changelog/Changelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c7ca8b3d9bc..e2a1ee0cdbf 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,10 +1,4 @@ Entries: -- author: enumerate0 - changes: - - message: Recognizable solutions now appear sorted by volume first, then by name - type: Tweak - id: 5234 - time: '2023-12-01T08:35:51.0000000+00:00' - author: Whisper changes: - message: Added the Death Acidifier, an implant that destroys your body and equipment @@ -3776,3 +3770,10 @@ id: 5734 time: '2024-01-17T23:57:40.0000000+00:00' url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24193 +- author: Volotomite + changes: + - message: Flippo can burn plasma now! + type: Fix + id: 5735 + time: '2024-01-18T00:28:32.0000000+00:00' + url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24207 From 7a7d0017b504dec4b1d390b941af9791d9677287 Mon Sep 17 00:00:00 2001 From: 0x6273 <0x40@keemail.me> Date: Thu, 18 Jan 2024 02:30:30 +0100 Subject: [PATCH 007/105] Use old reagent dispenser beaker slot ID (#24209) Change the slot ID back to what it was to keep old map saves with an item in the slot loading correctly. This also fixes the "You can't put this in the dispenser!" message not appearing when inserting an item without FitsInDispenserComponent because the whitelisted slot name wasn't changed. --- Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs | 2 +- .../Chemistry/Components/ReagentDispenserComponent.cs | 5 ----- .../Chemistry/EntitySystems/ReagentDispenserSystem.cs | 2 +- Content.Shared/Chemistry/SharedReagentDispenser.cs | 2 +- .../Structures/Dispensers/base_structuredispensers.yml | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs b/Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs index 98bb7da6b77..a5449308be4 100644 --- a/Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs +++ b/Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs @@ -25,7 +25,7 @@ public async Task InsertEjectBuiTest() await Interact(); // Eject beaker via BUI. - var ev = new ItemSlotButtonPressedEvent(ReagentDispenserComponent.BeakerSlotId); + var ev = new ItemSlotButtonPressedEvent(SharedReagentDispenser.OutputSlotName); await SendBui(ReagentDispenserUiKey.Key, ev); // Beaker is back in the player's hands diff --git a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs index 4cf0d2e29e0..eb1839ef2ec 100644 --- a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs +++ b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs @@ -39,11 +39,6 @@ public sealed partial class ReagentDispenserComponent : Component [DataField] public EntityWhitelist? StorageWhitelist; - /// - /// Slot for container to dispense into. - /// - public static string BeakerSlotId = "ReagentDispenser-beakerSlot"; - [DataField] public ItemSlot BeakerSlot = new(); diff --git a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs index 109d5f351ac..d5ec310f87e 100644 --- a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs @@ -202,7 +202,7 @@ private void OnMapInit(EntityUid uid, ReagentDispenserComponent component, MapIn _itemSlotsSystem.AddItemSlot(uid, component.StorageSlotIds[i], component.StorageSlots[i]); } - _itemSlotsSystem.AddItemSlot(uid, ReagentDispenserComponent.BeakerSlotId, component.BeakerSlot); + _itemSlotsSystem.AddItemSlot(uid, SharedReagentDispenser.OutputSlotName, component.BeakerSlot); } } } diff --git a/Content.Shared/Chemistry/SharedReagentDispenser.cs b/Content.Shared/Chemistry/SharedReagentDispenser.cs index be71bf8a776..22cb87dcdb9 100644 --- a/Content.Shared/Chemistry/SharedReagentDispenser.cs +++ b/Content.Shared/Chemistry/SharedReagentDispenser.cs @@ -8,7 +8,7 @@ namespace Content.Shared.Chemistry /// public sealed class SharedReagentDispenser { - public const string OutputSlotName = "ReagentDispenser-beakerSlot"; + public const string OutputSlotName = "beakerSlot"; } [Serializable, NetSerializable] diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml index 4ce88c15827..c54e9f548be 100644 --- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml +++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml @@ -68,7 +68,7 @@ containers: machine_board: !type:Container machine_parts: !type:Container - ReagentDispenser-beakerSlot: !type:ContainerSlot + beakerSlot: !type:ContainerSlot - type: StaticPrice price: 1000 - type: Wires From eefec0029d367d1d5640ceedc58d3a193400703f Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Wed, 17 Jan 2024 21:12:44 -0700 Subject: [PATCH 008/105] reach update (#24211) --- Resources/Maps/reach.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Resources/Maps/reach.yml b/Resources/Maps/reach.yml index fe1de973d88..a4d369582ba 100644 --- a/Resources/Maps/reach.yml +++ b/Resources/Maps/reach.yml @@ -9956,6 +9956,11 @@ entities: - type: Transform pos: 26.518682,2.5202096 parent: 407 + - uid: 2277 + components: + - type: Transform + pos: -16.322409,-2.5030437 + parent: 407 - proto: NitrogenCanister entities: - uid: 1533 @@ -11239,6 +11244,9 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,-0.5 parent: 407 + - type: DeviceLinkSink + links: + - 1255 - uid: 1253 components: - type: MetaData @@ -11247,6 +11255,9 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,0.5 parent: 407 + - type: DeviceLinkSink + links: + - 1255 - uid: 1254 components: - type: MetaData @@ -11255,6 +11266,9 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,1.5 parent: 407 + - type: DeviceLinkSink + links: + - 1255 - proto: ShuttersWindowOpen entities: - uid: 1650 @@ -11694,6 +11708,14 @@ entities: - type: Transform pos: -19.5,2.5 parent: 407 + - type: DeviceLinkSource + linkedPorts: + 1254: + - Pressed: Toggle + 1253: + - Pressed: Toggle + 1252: + - Pressed: Toggle - proto: SignalButtonDirectional entities: - uid: 1759 From 9ad1ae5d963cf294d2f68d06ce07506dedbefe64 Mon Sep 17 00:00:00 2001 From: DrSmugleaf Date: Thu, 18 Jan 2024 00:01:58 -0800 Subject: [PATCH 009/105] Fix error when starting a DoAfter while handling one on the same entity (#24218) * Fix error when starting a DoAfter while handling one on the same entity * Reuse array --- Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs index 32f46e5791b..abd8888f583 100644 --- a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs +++ b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs @@ -9,6 +9,8 @@ public abstract partial class SharedDoAfterSystem : EntitySystem [Dependency] private readonly IDynamicTypeFactory _factory = default!; [Dependency] private readonly SharedGravitySystem _gravity = default!; + private DoAfter[] _doAfters = Array.Empty(); + public override void Update(float frameTime) { base.Update(frameTime); @@ -34,8 +36,15 @@ protected void Update( { var dirty = false; - foreach (var doAfter in comp.DoAfters.Values) + var values = comp.DoAfters.Values; + var count = values.Count; + if (_doAfters.Length < count) + _doAfters = new DoAfter[count]; + + values.CopyTo(_doAfters, 0); + for (var i = 0; i < count; i++) { + var doAfter = _doAfters[i]; if (doAfter.CancelledTime != null) { if (time - doAfter.CancelledTime.Value > ExcessTime) From 9968cc178be97c21bae7b8f779ca17145aa26fbc Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Fri, 19 Jan 2024 02:26:28 +1100 Subject: [PATCH 010/105] Golden honker glow (#24230) add --- .../Entities/Objects/Fun/bike_horn.yml | 5 +++++ .../Objects/Fun/goldbikehorn.rsi/icon.png | Bin 15553 -> 2114 bytes .../Fun/goldbikehorn.rsi/inhand-left.png | Bin 16110 -> 1469 bytes .../Fun/goldbikehorn.rsi/inhand-right.png | Bin 16807 -> 1437 bytes 4 files changed, 5 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml index e3fe9d8949b..1a79011d1b2 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml @@ -106,6 +106,11 @@ - type: Prayable - type: StaticPrice price: 1000 + - type: PointLight + radius: 1.2 + energy: 1 + castShadows: false + color: "#eef066" - type: entity parent: BikeHorn diff --git a/Resources/Textures/Objects/Fun/goldbikehorn.rsi/icon.png b/Resources/Textures/Objects/Fun/goldbikehorn.rsi/icon.png index ada07a87202540f5300115c3635ea9f54d785c7d..9be524c789fb018c63467cd3c4d9dbf66f687945 100644 GIT binary patch delta 1564 zcmZ`(c~FuG6o*et(nKu}N=*c|tke(9JP;kcP*d}W47|$W5+fk|P^uMNZ?pAcGuB8g zJG7$1YBSTcYoSc&ur%}PR?AAeHrsNo-DaGf-8b`Q-u#Yv@AuEUu=%2C86FQ$iwX9J z9o5>5z+f;Gix$d`h=47fo{`i2wQjAJm)lzbddza7b$PKPiWU)t2@r@_7*7@ru6{e9;D(em@N-DPhk^Vh>*h{Vu9 zKPqkZSZv2i8$WYZdN1ELsIW8;hiDW&YI);{&T3xs7 zo#RtutJOI+(A-6dvIErJFlnxIuBZMz8zFvQH|2F_-kh_@etDRWIz&qG z9;&bH$~)He@p#OqVT<+*EqBx18nb~BgIKRl%42py?+;J#Q!;(htWi^PquIHahUM#k z<%KP4`}N z5^X&%_Ze#F0XdPgmAly6)RSES%{?I{7ox2U_`)&M(j$Ronh?LdnkT&RTk77p0Z7Gv5FN1YtDryo3CgIGxe-|(H zl0mQAl2rX0d^GB_|NaSaTkNt_lW1xd+HaoDJOqA9aMPn*Wo{-qHvD9=;CHS(+eNQq z82e(A9%?}^egDMBhZj6$Z^534M@?l2xNQMia7ikglL9}Ye^)cVmZm)WbII+ejpRF| z`$Rp3NyW-19rnhhrFzElyo@zvmx3P#M>Fe6%NvkrxTo4X=SvUGWH^A(5%#Y90?{!EV9VmJxTj&Z1?m1SU^9e?rC>Lr+KYxb9&oZ zAl$Mk>xxDotuKyjSXO4m%k#i7XXygSxPcytixW0>ZA~d-%6>hniPK%x;jl}3ZMXrB zS~No6FL7qVPb`$QPUL$d*s!FSTa@JM^Xl4iE2-5Hqy6u%RrvyaZdYETblZk9YIYid z^M9L7>JH__8|%VM+cosye3_Eke>2Tby~feG(Ps?~mlEkm-ODh`;(RP%Zi{MgeX;Q3 z|(I;(A=nFHpGREDVA2f$DJ3JqKrXSY~J%@Sg46g!r*J8o8^?{w9&}a-BG- tx3en#PgW&@e#WNb{GiVu3j^xO;2cV4Q>{4d$=6pO8ni0#s6Vhi`!AH2m>>WE literal 15553 zcmeI3dsGuw9>)g|A0V_xX;FNf7^~tVnLJ4{o5WH;L=Cza5Udm@lL^d{WI|>jfwfrb z`^6r#D)^{pwd?6_#Yb(a&s8h!sXZ0zs;%0pMeTa5U2%1b*!8h9Ng&}8?r!(=&zW8O&=C`{H8UZ@w87 zi+o+!QiC{^PbkVa%@U>2Zc?O{rbq}`ibkZ-N#$ydMx~h~Qpn_LRHj6gGKoTosbrW+ zAqre#V+{98@3z{oob)Mybev@nm$0l0Ls5^%BlReyw7VFU>vTF)ra%=63D-lyR61GQ zD{(TT{Xsh8q>~Kcrd%vVJ4Jk4+(MVL2C&_%}Su8opg{+mf>{rusT->&C*N>-Al?Ycdv=LnwU&oxxNtN`mzcMkCX4mNY743Z+CQm&ny- znF3R4F}Y%Hh~D1`keg^LWvdJ$S7|U=NZD0qMTpHsZN4qIQmRTRk+&tcIqp5 zarf3vhn+HVRghXKE2dJ~Qb?7Cl;F4=msnC%3W-i_vq^MTxmBSdQZx!&r$_ny$%%p^ z;UoE4yXOd<0BnSOrA;O*%gL}fH-W5l-*_l)JcJBa*+`jILMYT4iCm{5BoGGZw+*p2S*kN-I+ZQnxE<~2^}Ku5qhSZ;?8K?9@3|i<}XPRCQOf1Qz^c- zl>m6Y8nel=?ybSv`c6|9?q*2-tT2c>4~wqjm+RVf>3wGoh7QLc5->dTg|=ZSZUU2+ru&j0(gOk^n&9rhp612k;8G z03dKvzy;?6cm-Sl5V$Geg7X2q0xkdu+!S!Z`2b!47XSoq3b^2W0Iz@x00K7!TyQ>s zSHJ}Tftvy@I3K_(-~xcaO#v6258xGW0YKoUfD6tC@Cvv9AaGN_1?K~J1zZ3SxGCU* z^8vg9E&vGJ6mY@$0A2wX00eFdxZr#MuYd~x0yhO*a6W)nzy$z-n*uI4AHXZ%0)W6x z0T-MP;1zHIK;Wi;3(g1d3b+6ua8tkq=L2{JTmTTbDd2+h0lWe(00`WK;))5ruShz% zmlQqR+lZ5Y&TZ!2WE2rob4&aX#8O3kzFbGU%2|w+PVmbfjKR)F4%4OaPyvLu~7{> z4n(u$bge*%VNvUdulc-o~rM?@a1!OTjF=| zUw%FBxdU-OCYwjB$rFG3r-9x!N&CSa&zkZt4#3+Q+82zTso8qAEN!lIi*{q=@)c|2 znwQ33i*&A;^6xW0KQUDu9dEJzy_woRsj$K<&E5Y_$?Ky&o-|&Sw;DVCX~_rAm}8S4 z-tky>{bO-nsq~PlaIg5vCe{4N{nrO)?s&2h$vFGRWNi2d$Dog|j;^FzFKu|ODPcog z;#vPy zNti(FY&tBO-WGG~_1pK4oUbpK*Kg4kP3?-d;T=uG3evJ3owS2Bee05mwn@`Jv7g#9fZDyNg?wy|zSX}YR?GKG$XNCf-6kJ7 zQ^$3kcc(FD6Y}2J-z=WT#(n;Ps2LJ9Zch;%aj*4c^UII_;>xY9yJ)W6 zKju}NBsE=*XyuTLJb>^Ob0bzR%FW7{6bE^dFTwx+5OIa^65RR3*A)WT`sFH4Gc zX@?stOGG2}9qoU8-?ClSvbISgoqjT*KDW7PW!?7`nbc+X1azHUx9-JhU%y*_9JQa? zwE<09x&F$-bMIKDB&Iy5s#`32ZReO(r#_vBC;wD^H!1O2eO}f^>)S<##?5&3Zo~A( z3iq6g(RsSDKQ!04a*^`1lR1Yb%sIHKpXaB%tigl!#E4GEC+VjjeJ`&(bq!Ttt!NyO w+&JuZ=I2YcmL0hJhjXh-pBDb+jfH&?nqa+0s&3BaUoy_h$WGt=%KSI~1Gf8XQvd(} diff --git a/Resources/Textures/Objects/Fun/goldbikehorn.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/goldbikehorn.rsi/inhand-left.png index dc3c7ec737d8c34339c0454706014bf78e7fd2f1..c2920bd89d9740f78c88049d54e8e6ab4ca6eee4 100644 GIT binary patch delta 913 zcmaD?yO(={iV9GZx^prw85kJ&QX@Rme0>?TfNTyR27yb#lP4;QGclJ;w343K zt-}}L8=&BvUzDm~re~mMF!5{MCwmr@B%4&^7PwZF*eYd|loVL$>t_PR z^zw_+^@~eV^pOTq*>NerfK5uWRY_(^PAZZZP|l_(CC$n)r)2V4 z7Kt#0irgHloW#6zTcrx!l+?7u(wq_{yUe_d#Jm*UqRjM+5*vMx`kYKOL%^ayQ;>vh z^kEiGUdbWPVWVG?nU-c1Ie9*Z^yGRDzRA-$l+6P&@=Nk_Q%j06lRfiFQi}?TQcDs` zGV}B7jG*eVs+jzM!_6Ma%T|s>CFS`=*&$%>p*k0rvdQ~6&Faf;8=PlgU_9aJ;uuoF z_;%)5ze5fJ$I}gGMd+(6c*twxVWSX!|E%~!+X{}nq%Tb7K9lQOm?!;ce4OX$>6w*# z_paLQf8QNWZ~A?I=KVKYmO8hvF)1+MKnuJRtoA;>`DR{e>6MzLi@*3}Jgv_x`D9i4 zOKoy?+*&h{wrJUzhwo_AEDm3}yo7%)n|}{;gpOHf<>QaWhLfjV-0gpG@kQ>53Q>CB zcd^xO*EXGBZpmZ&PrqgTcRu!itoF8LTNVC2U7C`;UX!Ewp!+6=_1pb96+>)3-~R5G zCnYA*KJS*T2+Q)4;@$sBYxa3K4GIjOWj^e=asTAc{a7wPIkRQgzujcMHxp17Ka0&OrI&py@AOA?Zweom zH*}ubczL^o@YLjVMvGWWyK`4w-S-LWn_Ia#Yjx2ZAFdm#WUQGTRJ(dlZ471z;#eUQ zzCSO??KOwVKf@gwi$dp=zf+2MVo}H3_==^DpFVdQ&MBb@0Pcug AfdBvi literal 16110 zcmeI3d0bOh7RN6M0gB6@;MA=(1Y5KvdqPMWFi5bVAdH{}Ymtz=Kt5zM2@p^;qP5Ug zp|vQAN<^@36&FN`MX*zaA_Eph3#}DVY^jX6AWNw@FJTK$cr%?(|9ts;LUQi8zjN;W zo_i1PpQMK_eRq=MOh*8~q`&~-GWb(qemmH~e~-%7{tSP-q6vu50WiVY{I&sm_D%=D zt5F^<(u;zFcoMaeB9^M7A&Nn%foB82UtrLPC2^3R7!Ae9RoTl* zA4m8bUn`aImI)UPrh_eSQmkID;ZdoHiHVd%CPl4{q0+frE|tchG8kld23eP+(u)mb zmCkJ-$WR<1q?2gn8ogYtBAVlhqt)?xZxYFzX!td_FQsNUkxDnn4yH&oh&5C?g+?7q zB$W(nH1S%6Woc3g6;eP-NTt`oI{KJ8O{`k4*2SvFNjdBuH!)n3;NaohW3E@J95b~} z@1Fo87(_azQWu`2fvC$MojP7Cf&3HTt+hkO_` z29r#qlj-bm8iU95;?Wtatn>qu5b|KPR4z*zL(XFH*qlMR)g+`GzBN*@Ui{wzSWmMG zA(ilCYOPYN_mL~bF%VUwis4g72CZfeA0wWhTA|j$D}sEOeCk-kW2%H|NxbG_6 z4yLcOstQ~i%S~M0)xUCyPPmvSl(dS4x*M zI1*0|L(Jt<&G!=)jjY5R$uc@RhxG=~R%otta4;`WrPGVy4Fn1;>yg9j;jn0MW*Uu5 zi)M4+HpKEIM@O?EvVE|)2>oPp8uk(CXG9?Cu#+Pu|26WU7tQs@w^9PZI# zh1HxPntvw67-3#Y6(Bd)HVFaVT#Ybj?dZ{w+FH7)My%CA=3e1V8fq59?H8Up{Nh`B z4o@sG_hBE2`6@$FK6TXS$g+?!`TtwMf%sPP@pB}`LaK3E!9Wztgz@z{wM?HV)XG((5=IwW|GOAyZDH_}4dmm=W;5A*DsmX9 z2$dTkg-9reTbs^&AU#=w8l+=PVZ?YsE61R4pnz7-AeP%SFbY56zz$HFFzw@M5?SK+sJL7djt=7sG`Bf^K5C z(D@*|7%l`5bQ8mc&IjSea3O%8n;0&1J_s*{3jqY(#BibWL3lA-2q5Sth6|k!!i(WT z06{k~TkLg$0}M&`k^%Iv<1=!-W8XZeqC5`5?R)E(8#C6T^kh z2jRtVA%LKp7%p@^2rq^U0R-K|aG~=-crjcEAm}EB3!M+bi{U~5K{qj6=zI`f3>N|j zx{2XJ=Y#NKxDY_lO$--0AA}dfg#dzXqT+HK`Mn~ff`6o#2>%+f5`V=3{v{((60j^7 zfaEs-Fm48*_XYgf20%OwfZw73;AI2ws`|4vmlgp)$Oshrh8vpNbL!Ny{9P)`)v}xE zw=O?mWz7ty1ov+)-s@zauN8y}QvE`fXL>Df+1Wqs>=xUpQ}etvi}pIUR2*o%(N7>Y z36I8p8XH}?)cJ*|qxNnl=gz5;ylrLa!3hQ5_gB?E{JO4>uI}P~TjN!mbCG`A5fF?x zfsF}-f_cCNID*Rf3EPvwzn?w$C*@kE&b@CVIWn(c)`#}ZT>OUp5I5=FC%Eo+zzW+= z(8KLZF9yr{oCI%m+;LqcB~;JTL^#Z?6UW!?up?Fh2kF&rH~`gq8pg&S@I=oAU6LhBm&bc(pwUd+)@V`qJg8;Saq_p8k60#`D|219%ZkjznDOr|TA1 z-z&Qxg3HFAPvdUOzLs>qs7v#pzp2bVaf5y6ik+v`HfLLT&fnj0U-;$O{$o}71_4*Wt81`EQ44#!%AGXx)S_et_~?RHPwTV|dwY5L)(OLIaJ9^Jb2 zV}^^@vCF;(ODYcUHgzWzHaux+nhcs-F0FAQH*5@V%60Z#Qopcaqg}hq#^*aqdPU&3 zC)Rvio6>u&_h~uK_IP23k=xK58}Lo%lMR2IUh_eERoJ=e&XBas$h!@dw{mV%D3?W| zUrl8fN^#9IjDI(hffD=(O2N{Oi)+~lo6~NYep~%QsBFtAJXc(8D4o)hRiCv)x_DBi z(z)@qboWyk1bCBkIv;dx0%>g#1*1 z(TUshbh*!Kf?`!GDkdrvTfCevZ2X|6{SaL|!NrpaK5No?6O4ZNtC8iZ<(=nn&0Dfd zy1S1SJzCp+|CiSnUcJ!eY1}Hh$UJ3C0#kIW2<{DYOP}GhA9dC_#iU+&+oZ_}ItkST z;a&J{r_a}`iOfy2F5xCKCgh)OE#1Fv-=5oH?34TVlsXj^rX2pv_3$T4?{E`tIAAyeYY!SD)bDlOc?Izqe1&+Jy(+d8P^3 z@8_A6@69Q{1kx5y$~)w9&h@ z`~smbrK_$TH_dL z63UOhZFADC^0jHivbuK)dPNr>Up%pk-uvA6qd|XV+Z96WPvw7`4v87{d;U1=Ve0XS z9K86JJ`lC)TzakTdvVA7*3j?$QIT~wYVmQ_x$4I(P<2*2J7`mv?#tOBc;o7~D|bvL zc2_^n$5)kU6^B4YK-OJ($QEtk?40>&HeapS?(S{ZF8|!=n*vv_eb2J)$_}P}G0WA* z@cds(Iu{-JbjoV`>iM~LjS+S^v27oBq_mbadUUMZK4W6)nHND*x~3j3%WK zF|p$8%>^l6GhP}_K23>2H=I-hdJ3E*irJ@`f&NQ{Cl*Gf{s)djlqCQF diff --git a/Resources/Textures/Objects/Fun/goldbikehorn.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/goldbikehorn.rsi/inhand-right.png index e015e092215ffd5fffb96df19bff02a29f89a0d9..456b4c1adc22f466b0ed4bcdcd907a4a6e5aaf38 100644 GIT binary patch delta 853 zcmZ49%s7{Of{F@bage(c!@6@aFBupZ_);T0(|mmyw18|5AO?X;!ILK{iZd~nOtg}o z*sa4C;TxdfoL`ixV5VoFXE5<=-Q*RF7L%7TnJ0S|lq8!}FZ|# z#q{!v()Ei=QuL7&=o=XrSm+uU=^9z;E7@@=z<^CkvQvgec5e;^9&4(D?D8sLn;{G z-aPAf$U%Vp!_8k4BlJ}kJmj_Uuu%w?pZfiQ;*QRX+;&1s*{*76k@I4hIG%fd&Q?<_2v8x%(?FzKD8zZfD(@pGEi7D%naM zJ8S9}9sfD0?J)OZ*4Nj5zx_PtdCYU|r>9sidMJvRqP$K8TvdFr_w4cCQHwPlSMo&mKl;(3w_dDu zhRvp;y1b6etTA1k;VS}PmMiH2N^p}Y){Hn-tVq|E>yj@wPVraHMdkaUlxC? zS;TNaIQ_YH?vm~M9~?>lBR98i-RhJY#s?B^A3hz`*PO6?Ro8ls<0fFwRVXf~Uo*9C zYvn|nNiC@U1%<)^|HkgTe~DWM4f<%d#( literal 16807 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 S%2E9*1=krKj(PS=WB(1_Y^AmU From 08c2cac96d95acb513b7e7a14ee8a7e91adb5a0a Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Fri, 19 Jan 2024 02:26:59 +1100 Subject: [PATCH 011/105] Paramedic void suit is now a soft suit. (#24229) add --- Resources/Prototypes/Catalog/Fills/Lockers/medical.yml | 1 - .../Prototypes/Entities/Clothing/Head/eva-helmets.yml | 1 - .../Entities/Clothing/OuterClothing/softsuits.yml | 9 +++++++-- Resources/migration.yml | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml index a26bfaec1a5..0461538b033 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml @@ -131,7 +131,6 @@ components: - type: StorageFill contents: - - id: ClothingHeadHelmetVoidParamed - id: ClothingOuterHardsuitVoidParamed - id: ClothingOuterCoatParamedicWB - id: ClothingHeadHatParamedicsoft diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml index d9dbdb4e402..963bcdedd78 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml @@ -71,7 +71,6 @@ - type: Armor modifiers: coefficients: - Slash: 0.95 Heat: 0.90 Radiation: 0.75 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index 6ab97981312..45f170dcb7c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -87,7 +87,7 @@ - type: HeldSpeedModifier #Paramedic Voidsuit -#Despite having resistances and looking like one, this is two-piece and parents off the EVA suit so it goes here. +#Despite having resistances and looking like a hardsuit, this parents off the EVA suit so it goes here. - type: entity parent: ClothingOuterEVASuitBase id: ClothingOuterHardsuitVoidParamed @@ -110,10 +110,15 @@ - type: Armor modifiers: coefficients: - Slash: 0.95 Heat: 0.90 Radiation: 0.75 Caustic: 0.5 - type: GroupExamine - type: StealTarget stealGroup: ClothingOuterHardsuitVoidParamed + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetVoidParamed + slot: head + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} diff --git a/Resources/migration.yml b/Resources/migration.yml index 1584ec0b403..5d31d34d5f0 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -159,3 +159,6 @@ ClothingHeadHatHoodRad: null # 2024-01-12 SpaceMedipen: null + +# 2024-01-18 +ClothingHeadHelmetVoidParamed: null From 882e27795567623a3b942ab354b16bf5e71a2aa2 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Fri, 19 Jan 2024 02:28:01 +1100 Subject: [PATCH 012/105] Carrots now properly contain Oculine (#24228) * carrot * add * quantity --- .../Prototypes/Entities/Objects/Consumable/Food/produce.yml | 6 +++++- Resources/Prototypes/Reagents/Consumable/Drink/juice.yml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index ce96ff8a3d0..769e3a74cd0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -378,12 +378,14 @@ - type: SolutionContainerManager solutions: food: - maxVol: 9 + maxVol: 12 reagents: - ReagentId: JuiceCarrot Quantity: 5 - ReagentId: Vitamin Quantity: 4 + - ReagentId: Oculine + Quantity: 3 - type: Sprite sprite: Objects/Specific/Hydroponics/carrot.rsi - type: Produce @@ -393,6 +395,8 @@ reagents: - ReagentId: JuiceCarrot Quantity: 10 + - ReagentId: Oculine + Quantity: 2 - type: entity name: cabbage diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml index 206d7dcd2bb..9b6e235eecd 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml @@ -41,7 +41,7 @@ factor: 2 - !type:AdjustReagent reagent: Oculine - amount: 0.15 + amount: 0.5 - !type:AdjustReagent reagent: Nutriment amount: 0.5 From e3bcdcc667b58103682ad8321408e6140643f7fb Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 18 Jan 2024 15:28:05 +0000 Subject: [PATCH 013/105] Automatic changelog update --- Resources/Changelog/Changelog.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e2a1ee0cdbf..2ed9a560959 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,15 +1,4 @@ Entries: -- author: Whisper - changes: - - message: Added the Death Acidifier, an implant that destroys your body and equipment - without harming allies. - type: Add - - message: Added the microbomb implanter back to nukie uplinks. - type: Add - - message: Nukies have exchanged microbomb implants for Death Acidifiers. - type: Tweak - id: 5235 - time: '2023-12-01T20:14:45.0000000+00:00' - author: Vasilis changes: - message: Tacos can be eaten by Lizards now. It's fricken Taco Tuesday! @@ -3777,3 +3766,10 @@ id: 5735 time: '2024-01-18T00:28:32.0000000+00:00' url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24207 +- author: Ubaser + changes: + - message: The paramedic's void suit now has a helmet toggle. + type: Tweak + id: 5736 + time: '2024-01-18T15:26:59.0000000+00:00' + url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24229 From 98828278a9bf8a30f9d19a7649be5df9524cab22 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 18 Jan 2024 15:29:10 +0000 Subject: [PATCH 014/105] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2ed9a560959..87949e88acc 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,10 +1,4 @@ Entries: -- author: Vasilis - changes: - - message: Tacos can be eaten by Lizards now. It's fricken Taco Tuesday! - type: Fix - id: 5236 - time: '2023-12-01T22:27:09.0000000+00:00' - author: Rainbeon changes: - message: Cyborgs can now speak while in a Critical state. @@ -3773,3 +3767,11 @@ id: 5736 time: '2024-01-18T15:26:59.0000000+00:00' url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24229 +- author: Ubaser + changes: + - message: Carrots now properly contain Oculine, and you can Juice them to obtain + the raw chemical. + type: Fix + id: 5737 + time: '2024-01-18T15:28:01.0000000+00:00' + url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24228 From da7ed4b27bf596015e2d37bfea102771911ce9c5 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Fri, 19 Jan 2024 02:50:00 +1100 Subject: [PATCH 015/105] Add pacifism description and clean up traits a little (#24216) add --- Resources/Locale/en-US/traits/traits.ftl | 6 ++---- Resources/Prototypes/Traits/disabilities.yml | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl index a875b8c9915..3a8b1f3b59d 100644 --- a/Resources/Locale/en-US/traits/traits.ftl +++ b/Resources/Locale/en-US/traits/traits.ftl @@ -2,9 +2,10 @@ trait-blindness-name = Blindness trait-blindness-desc = You are legally blind, and can't see clearly past a few meters in front of you. trait-narcolepsy-name = Narcolepsy -trait-narcolepsy-decs = 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. 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] @@ -17,9 +18,6 @@ trait-muted-desc = You can't speak trait-paracusia-name = Paracusia trait-paracusia-desc = You hear sounds that aren't really there -trait-uncloneable-name = Uncloneable -trait-uncloneable-desc = Cannot be cloned - trait-pirate-accent-name = Pirate Accent trait-pirate-accent-desc = You can't stop speaking like a pirate! diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml index 2e3bf91171c..73476e101d7 100644 --- a/Resources/Prototypes/Traits/disabilities.yml +++ b/Resources/Prototypes/Traits/disabilities.yml @@ -12,7 +12,7 @@ - type: trait id: Narcolepsy name: trait-narcolepsy-name - description: trait-narcolepsy-decs + description: trait-narcolepsy-desc components: - type: Narcolepsy timeBetweenIncidents: 300, 600 @@ -21,6 +21,7 @@ - type: trait id: Pacifist name: trait-pacifist-name + description: trait-pacifist-desc components: - type: Pacified From 4315531a3ff2bdf681da8acbc9d19e8bcafaddbf Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 18 Jan 2024 21:35:34 +0000 Subject: [PATCH 016/105] make terminator immune to rev and zombie (#24239) Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Entities/Mobs/Player/terminator.yml | 19 ++++++++++++++++++- .../Entities/Objects/Misc/implanters.yml | 2 ++ Resources/Prototypes/tags.yml | 3 +++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/Player/terminator.yml b/Resources/Prototypes/Entities/Mobs/Player/terminator.yml index 873b0ee12df..663838e01ac 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/terminator.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/terminator.yml @@ -1,5 +1,13 @@ +# stuff common to flesh and endoskeleton - type: entity - parent: MobHuman + abstract: true + id: MobTerminatorBase + components: + - type: ZombieImmune # yeah no + - type: FlashImmunity # no brain to brainwash, eyes are robotic + +- type: entity + parent: [MobHuman, MobTerminatorBase] id: MobHumanTerminator # uses random name generator dont worry name: exterminator @@ -92,6 +100,12 @@ Blunt: 10 Structural: 10 - type: RandomHumanoidAppearance + - type: Tag + tags: + - CanPilot + - FootstepSound + - DoorBumpOpener + - Unimplantable # no brain to mindshield, no organic body to implant into - type: entity parent: @@ -99,6 +113,7 @@ - MobCombat - MobDamageable - MobSiliconBase + - MobTerminatorBase id: MobTerminatorEndoskeleton # you are now valid name: nt-800 "exterminator" endoskeleton @@ -184,3 +199,5 @@ - ShoesRequiredStepTriggerImmune # let mind transfer on gib work - MindTransferTarget + # its just metal so no implants + - Unimplantable diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml index 400bfc5c0f8..64989ccc5b3 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml @@ -18,6 +18,8 @@ blacklist: components: - Guardian # no holoparasite macrobomb wombo combo + tags: + - Unimplantable currentMode: Draw implanterSlot: name: Implant diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 8fb58db7c1e..61e2c56c4a9 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1139,6 +1139,9 @@ - type: Tag id: TrashBag +- type: Tag + id: Unimplantable + - type: Tag id: Unstackable # To prevent things like atmos devices (filters etc) being stacked on one tile. See NoUnstackableInTile From 20dadf45ec92aecd244ae9e77d87c4531c6d1493 Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Thu, 18 Jan 2024 16:39:13 -0500 Subject: [PATCH 017/105] Fix solution corruption when grinding a stack of items (#24242) Fix corruption when grinding a stack of items --- .../Kitchen/EntitySystems/ReagentGrinderSystem.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs index acb6116e9ae..e309c3bd374 100644 --- a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs @@ -103,7 +103,12 @@ public override void Update(float frameTime) if (fitsCount <= 0) continue; - solution.ScaleSolution(fitsCount); + // Make a copy of the solution to scale + // Otherwise we'll actually change the volume of the remaining stack too + var scaledSolution = new Solution(solution); + scaledSolution.ScaleSolution(fitsCount); + solution = scaledSolution; + _stackSystem.SetCount(item, stack.Count - fitsCount); // Setting to 0 will QueueDel } else From 6931848f1d875b22a1529e0868bff72f5dde663d Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Thu, 18 Jan 2024 16:55:05 -0500 Subject: [PATCH 018/105] Add fill visuals and inhand sprites to water bottle (#24240) * Add fill visuals and inhand sprites to water bottle * adjust sprite --- .../Consumable/Drinks/drinks_bottles.yml | 23 +++++----- .../Drinks/waterbottle.rsi/icon-1.png | Bin 0 -> 170 bytes .../Drinks/waterbottle.rsi/icon-2.png | Bin 0 -> 215 bytes .../Drinks/waterbottle.rsi/icon-3.png | Bin 0 -> 246 bytes .../Drinks/waterbottle.rsi/icon-4.png | Bin 0 -> 280 bytes .../Drinks/waterbottle.rsi/icon-5.png | Bin 0 -> 318 bytes .../Drinks/waterbottle.rsi/icon.png | Bin 406 -> 382 bytes .../Drinks/waterbottle.rsi/inhand-left.png | Bin 0 -> 387 bytes .../Drinks/waterbottle.rsi/inhand-right.png | Bin 0 -> 425 bytes .../Drinks/waterbottle.rsi/meta.json | 40 +++++++++++++++++- 10 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-4.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-5.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 7837ae4e761..6c0c719c7ac 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -497,9 +497,18 @@ - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/waterbottle.rsi - -- type: entity - parent: DrinkBottlePlasticBaseFull + layers: + - state: icon + - state: icon-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: icon- + +- type: entity + parent: DrinkWaterBottleFull id: DrinkSodaWaterBottleFull name: soda water bottle description: Like water, but angry! @@ -511,12 +520,9 @@ reagents: - ReagentId: SodaWater Quantity: 150 - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/waterbottle.rsi - type: entity - parent: DrinkBottlePlasticBaseFull + parent: DrinkWaterBottleFull id: DrinkTonicWaterBottleFull name: tonic water bottle description: Like soda water, but angrier maybe? Often sweeter. @@ -528,9 +534,6 @@ reagents: - ReagentId: TonicWater Quantity: 150 - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/waterbottle.rsi # Cartons, TODO: this needs to be moved elsewhere eventually, since cartons shouldnt smash into glass shards diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-1.png new file mode 100644 index 0000000000000000000000000000000000000000..520e2ef51786c916bbdd202685d1e914f22d7981 GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}DV{ElArY-_ z&nfaX7>F=ma1ziExzku&+@Pu<`h*q-t5kt1F1b?z@F``!`}5Cnpsi&WR_@o+PC zGmcZ4zTwj5tCe0m#g=?NcHtXCL&?1pTPv2;usZ^ThU2H2b@qRVKu{@Q|U%o$z Qf%Y+Yy85}Sb4q9e00jR$%K!iX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-2.png new file mode 100644 index 0000000000000000000000000000000000000000..11e9421b770bc34cf16933accf2546c772538cbc GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6FprVLn2y} z6C_v{Cy4Yk1sZU<9n_FuW#*AMd2vg|-DCfy%C2c7ne)k}c5r`EziA^@B%`3Ic1%H2 zp+V_epihs?Vu=|iE`IrQRhum?Ev@ajyq$r~{|}6Z>b`dAuul+Wy8rKQQpLxA+RXC8 z?94!Lxchs&1H(3JWy{qShhl(^WAJqKb6Mw< G&;$S@>`Gh! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-3.png new file mode 100644 index 0000000000000000000000000000000000000000..475c272afcab30528c5c39d6dbf46bca827f23d1 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}8$4YcLn2z= zUNGc322(EtZJ$Gi3_$8i s?Bn$gR&!a8AKv%>OayO>K>d40mSctt|5x?a0^QEw>FVdQ&MBb@07sTyHUIzs literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-4.png new file mode 100644 index 0000000000000000000000000000000000000000..d14515fe61b4e5eb1dc3b4a123790036b81c5b62 GIT binary patch literal 280 zcmV+z0q6dSP)Px#(n&-?R9J=W)WHgZKoADt-|Wz(5Gegb+e7xPCyVG^Mafd?{$3rXSg1yTfX^Fgh7v>NuF$Hm>(O0AOgEC>)2=iZ?)%BsgZ- z`wp;Q0eb^e%lgQ;8({wfL(@d06e6Xb=Pox;wKd{gW7Hb}0ODMuYU}O>n2#rhw^`G7 e#+pC~@%J986P)Px#_(?=TR9J=WltF63Koo|*n3Qy55!8SOsCWTEaFZJpdH}EKt_%gCv==B{c9Rga ziG~q1j^m=xqB|dwjq|N$ewd$+2XDaPa5!!qPx449MHPg0I35A;F?-`~zxCoczPPI) z5vYRD_6LuY#!wo=a6F<4LM!PK30xDAK$2wu=+y?j+K}e@FLTs_QtE15f#lKm&(gln z=O@|c>x{|s)5U8o66i${{dSwu7yz2S&oYW6RWgAj%lKL>{_h~(0`UZTt=35%*=-fkCJ1sh6oe&qM|ehvVis0=!dM3R-U7 QLjV8(07*qoM6N<$f=9oKS^xk5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon.png index 43f809403377102d1d703f173e31e3666dc1125b..cf51fc855297f081ece4e3dca93f07acb1ce7727 100644 GIT binary patch delta 356 zcmV-q0h|7o1O5V#BYyw^b5ch_0Itp)=>Px$I7vi7R9J=Wlrc-gP!Pv|6^ATp2h$={ zT>1e7Da9?_ic5!l1aWY4)6p@b6dbaNyU^g0%}jO>w1`t2T+*SpyZD2UKG?N>X}2EuBzHC-f-U0joMA z8Ru-X0YEa&v8uE31f1Agm5bp(zUKxi2?m4Vzw-gOEOjYAt1wIe0000%ropJ}2N^Z(~5bndfym!fY zp2uIVxj)@K17v^vRrc{O0 z05{U&gZdf{;D9n>_CCUa9|BMd1hqim2jV+76~J!v#_G}~3(tM_j0^I2SGfD<(ty-m z&~D%G^m4++`Ypp@lS-veueU7?$jST>ndVsxJ4tkn=N;yz2I#(i#+z1sBKP1t(kbVq z5UG!#YUpg~C3T!6wg6%1$PT2`fPo*Pg(Hede4pf6<@|I2RYT`PFa65NRzPYFSU@ox zQ4B{|pfm?kS3oO_@dLpMivak6Kr4&^xg(Hj!_)A6V)h^D%hGKqbsej0_;bzPWt0K_ a9pDSX*l#14^k={T0000Px$JxN4CRCt{2+M!B=Q5eSY=M%#g94iI|!-7}f4VLpjNAJCHuJHz3*ISx38Mh$? zNo(ebiTU>fFkRIUf-c^sQIbwKw=(BkB{Km400000002OG7P|vwGtBz|KW*L}ILONV z@g)5&`*{C_EuY!wJBMq-Kfd^{GZ}@KGhN9{Q*i$} zL(-t|9b@TCNrQ)+)@wT|W^*&ldHbfyYo(8~AP@vH+A+qiELFRa!*UTA O_6(k`elF{r5}E)2*|N3( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json index db0ac608ed0..7ad5fd0c1d7 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json @@ -1 +1,39 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{ + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "license": "CC-BY-SA-3.0", + "size": + { + "x": 32, + "y": 32 + }, + "states": + [ + { + "name": "icon" + }, + { + "name": "icon-1" + }, + { + "name": "icon-2" + }, + { + "name": "icon-3" + }, + { + "name": "icon-4" + }, + { + "name": "icon-5" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ], + "version": 1 +} \ No newline at end of file From 9b97c7f2f215ec9862d8146e7db07ba03005a71f Mon Sep 17 00:00:00 2001 From: Kot <1192090+koteq@users.noreply.github.com> Date: Fri, 19 Jan 2024 02:18:53 +0400 Subject: [PATCH 019/105] Fix entity menu grouping and sorting (#24243) * Group entity menu by the displayed name instead of by the prototype * Sort entity menu by the displayed name (with label) in current culture --- .../ContextMenu/UI/EntityMenuPresenterGrouping.cs | 2 +- Content.Client/ContextMenu/UI/EntityMenuUIController.cs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs b/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs index d8804a1218e..3345c114998 100644 --- a/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs +++ b/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs @@ -18,7 +18,7 @@ private List> GroupEntities(IEnumerable entities, int { if (GroupingContextMenuType == 0) { - var newEntities = entities.GroupBy(e => Identity.Name(e, _entityManager) + (_entityManager.GetComponent(e).EntityPrototype?.ID ?? string.Empty)).ToList(); + var newEntities = entities.GroupBy(e => Identity.Name(e, _entityManager)).ToList(); return newEntities.Select(grp => grp.ToList()).ToList(); } else diff --git a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs index 03d5a9486b4..039c03601ad 100644 --- a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs +++ b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs @@ -7,6 +7,7 @@ using Content.Client.Verbs.UI; using Content.Shared.CCVar; using Content.Shared.Examine; +using Content.Shared.IdentityManagement; using Content.Shared.Input; using Robust.Client.GameObjects; using Robust.Client.Graphics; @@ -91,7 +92,10 @@ public void OpenRootMenu(List entities) var entitySpriteStates = GroupEntities(entities); var orderedStates = entitySpriteStates.ToList(); - orderedStates.Sort((x, y) => string.CompareOrdinal(_entityManager.GetComponent(x.First()).EntityPrototype?.Name, _entityManager.GetComponent(y.First()).EntityPrototype?.Name)); + orderedStates.Sort((x, y) => string.Compare( + Identity.Name(x.First(), _entityManager), + Identity.Name(y.First(), _entityManager), + StringComparison.CurrentCulture)); Elements.Clear(); AddToUI(orderedStates); From d47052820ca969973a168adb439f5b2108c6b541 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 18 Jan 2024 22:19:59 +0000 Subject: [PATCH 020/105] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 87949e88acc..8d9fb24caaa 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,10 +1,4 @@ Entries: -- author: Rainbeon - changes: - - message: Cyborgs can now speak while in a Critical state. - type: Tweak - id: 5237 - time: '2023-12-02T00:25:20.0000000+00:00' - author: metalgearsloth changes: - message: Potentially fix audio filters. @@ -3775,3 +3769,11 @@ id: 5737 time: '2024-01-18T15:28:01.0000000+00:00' url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24228 +- author: koteq + changes: + - message: Jugs with the same labels are now correctly grouped and sorted in the + context menu. + type: Tweak + id: 5738 + time: '2024-01-18T22:18:53.0000000+00:00' + url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24243 From 0d53dad58ac5efc8d6cbd76a5e43eae7450ea25d Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Thu, 18 Jan 2024 14:25:40 -0800 Subject: [PATCH 021/105] Wrap objective briefing text (#24244) --- .../UserInterface/Systems/Character/CharacterUIController.cs | 5 ++++- .../Objectives/Controls/ObjectiveBriefingControl.xaml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs b/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs index 5c085b19664..88edb6a4f12 100644 --- a/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs +++ b/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs @@ -149,7 +149,10 @@ private void CharacterUpdated(CharacterData data) if (briefing != null) { var briefingControl = new ObjectiveBriefingControl(); - briefingControl.Label.Text = briefing; + var text = new FormattedMessage(); + text.PushColor(Color.Yellow); + text.AddText(briefing); + briefingControl.Label.SetMessage(text); _window.Objectives.AddChild(briefingControl); } diff --git a/Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveBriefingControl.xaml b/Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveBriefingControl.xaml index 5b49c0e3a7f..450f4e782cf 100644 --- a/Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveBriefingControl.xaml +++ b/Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveBriefingControl.xaml @@ -2,5 +2,5 @@ xmlns="https://spacestation14.io" xmlns:controls="clr-namespace:Content.Client.UserInterface.Systems.Objectives.Controls" Orientation="Horizontal"> -