From 3d7e12113788893065e331cec2779979f4b426ac Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Sat, 2 Nov 2024 17:49:44 +0100 Subject: [PATCH 01/95] Hotfix add debug info to traitor activation (#33119) * Add debug messages to traitor activation * more debug --- Content.Server/Antag/AntagSelectionSystem.cs | 4 +++ .../GameTicking/Rules/TraitorRuleSystem.cs | 31 +++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs index 224629ff2e5..610c0ad182a 100644 --- a/Content.Server/Antag/AntagSelectionSystem.cs +++ b/Content.Server/Antag/AntagSelectionSystem.cs @@ -55,6 +55,8 @@ public override void Initialize() { base.Initialize(); + Log.Level = LogLevel.Debug; + SubscribeLocalEvent(OnTakeGhostRole); SubscribeLocalEvent(OnObjectivesTextGetInfo); @@ -360,6 +362,8 @@ public void MakeAntag(Entity ent, ICommonSession? sessi _role.MindAddRoles(curMind.Value, def.MindRoles, null, true); ent.Comp.SelectedMinds.Add((curMind.Value, Name(player))); SendBriefing(session, def.Briefing); + + Log.Debug($"Selected {ToPrettyString(curMind)} as antagonist: {ToPrettyString(ent)}"); } var afterEv = new AfterAntagEntitySelectedEvent(session, player, ent, def); diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs index 1987613763b..bc6a8e9395f 100644 --- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs @@ -41,6 +41,8 @@ public override void Initialize() { base.Initialize(); + Log.Level = LogLevel.Debug; + SubscribeLocalEvent(AfterEntitySelected); SubscribeLocalEvent(OnObjectivesTextPrepend); } @@ -53,6 +55,7 @@ protected override void Added(EntityUid uid, TraitorRuleComponent component, Gam private void AfterEntitySelected(Entity ent, ref AfterAntagEntitySelectedEvent args) { + Log.Debug($"AfterAntagEntitySelected {ToPrettyString(ent)}"); MakeTraitor(args.EntityUid, ent); } @@ -78,14 +81,22 @@ public string[] GenerateTraitorCodewords(TraitorRuleComponent component) public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component) { + Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - start"); + //Grab the mind if it wasn't provided if (!_mindSystem.TryGetMind(traitor, out var mindId, out var mind)) + { + Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - failed, no Mind found"); return false; + } var briefing = ""; if (component.GiveCodewords) + { + Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - added codewords flufftext to briefing"); briefing = Loc.GetString("traitor-role-codewords-short", ("codewords", string.Join(", ", component.Codewords))); + } var issuer = _random.Pick(_prototypeManager.Index(component.ObjectiveIssuers).Values); @@ -94,6 +105,7 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component) if (component.GiveUplink) { + Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink start"); // Calculate the amount of currency on the uplink. var startingBalance = component.StartingBalance; if (_jobs.MindTryGetJob(mindId, out var prototype)) @@ -105,18 +117,27 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component) } // Choose and generate an Uplink, and return the uplink code if applicable + Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink request start"); var uplinkParams = RequestUplink(traitor, startingBalance, briefing); code = uplinkParams.Item1; briefing = uplinkParams.Item2; + Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink request completed"); } string[]? codewords = null; if (component.GiveCodewords) + { + Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - set codewords from component"); codewords = component.Codewords; + } if (component.GiveBriefing) + { _antag.SendBriefing(traitor, GenerateBriefing(codewords, code, issuer), null, component.GreetSoundNotification); + Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Sent the Briefing"); + } + Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Adding TraitorMind"); component.TraitorMinds.Add(mindId); // Assign briefing @@ -126,9 +147,14 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component) _roleSystem.MindHasRole(mindId, out var traitorRole); if (traitorRole is not null) { + Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Add traitor briefing components"); AddComp(traitorRole.Value.Owner); Comp(traitorRole.Value.Owner).Briefing = briefing; } + else + { + Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - did not get traitor briefing"); + } // Send codewords to only the traitor client var color = TraitorCodewordColor; // Fall back to a dark red Syndicate color if a prototype is not found @@ -137,9 +163,11 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component) _roleCodewordSystem.SetRoleCodewords(codewordComp, "traitor", component.Codewords.ToList(), color); // Change the faction + Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Change faction"); _npcFaction.RemoveFaction(traitor, component.NanoTrasenFaction, false); _npcFaction.AddFaction(traitor, component.SyndicateFaction); + Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Finished"); return true; } @@ -148,10 +176,12 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component) var pda = _uplink.FindUplinkTarget(traitor); Note[]? code = null; + Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink add"); var uplinked = _uplink.AddUplink(traitor, startingBalance, pda, true); if (pda is not null && uplinked) { + Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink is PDA"); // Codes are only generated if the uplink is a PDA code = EnsureComp(pda.Value).Code; @@ -163,6 +193,7 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component) } else if (pda is null && uplinked) { + Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink is implant"); briefing += "\n" + Loc.GetString("traitor-role-uplink-implant-short"); } From 07ae96ed2c54fbbd93bc19ca1bb4d85d45b9689c Mon Sep 17 00:00:00 2001 From: Milon Date: Sat, 2 Nov 2024 17:59:38 +0100 Subject: [PATCH 02/95] change ShowHealthBars and ShowHealthIcons to use protoId (#32355) use protoId --- Content.Client/Commands/ShowHealthBarsCommand.cs | 4 +++- Content.Shared/Overlays/ShowHealthBarsComponent.cs | 8 +++++--- Content.Shared/Overlays/ShowHealthIconsComponent.cs | 9 ++++++--- Resources/Prototypes/Entities/Clothing/Eyes/hud.yml | 6 ------ .../Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml | 2 -- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Content.Client/Commands/ShowHealthBarsCommand.cs b/Content.Client/Commands/ShowHealthBarsCommand.cs index 0811f966637..6ea9d06c8c3 100644 --- a/Content.Client/Commands/ShowHealthBarsCommand.cs +++ b/Content.Client/Commands/ShowHealthBarsCommand.cs @@ -1,6 +1,8 @@ +using Content.Shared.Damage.Prototypes; using Content.Shared.Overlays; using Robust.Client.Player; using Robust.Shared.Console; +using Robust.Shared.Prototypes; using System.Linq; namespace Content.Client.Commands; @@ -34,7 +36,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) { var showHealthBarsComponent = new ShowHealthBarsComponent { - DamageContainers = args.ToList(), + DamageContainers = args.Select(arg => new ProtoId(arg)).ToList(), HealthStatusIcon = null, NetSyncEnabled = false }; diff --git a/Content.Shared/Overlays/ShowHealthBarsComponent.cs b/Content.Shared/Overlays/ShowHealthBarsComponent.cs index 4642c5936a7..cb4f0fe7dd4 100644 --- a/Content.Shared/Overlays/ShowHealthBarsComponent.cs +++ b/Content.Shared/Overlays/ShowHealthBarsComponent.cs @@ -2,7 +2,6 @@ using Content.Shared.StatusIcon; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; namespace Content.Shared.Overlays; @@ -15,8 +14,11 @@ public sealed partial class ShowHealthBarsComponent : Component /// /// Displays health bars of the damage containers. /// - [DataField("damageContainers", customTypeSerializer: typeof(PrototypeIdListSerializer))] - public List DamageContainers = new(); + [DataField] + public List> DamageContainers = new() + { + "Biological" + }; [DataField] public ProtoId? HealthStatusIcon = "HealthIconFine"; diff --git a/Content.Shared/Overlays/ShowHealthIconsComponent.cs b/Content.Shared/Overlays/ShowHealthIconsComponent.cs index c2526c2f401..aa12c9887a8 100644 --- a/Content.Shared/Overlays/ShowHealthIconsComponent.cs +++ b/Content.Shared/Overlays/ShowHealthIconsComponent.cs @@ -1,6 +1,6 @@ using Content.Shared.Damage.Prototypes; using Robust.Shared.GameStates; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; +using Robust.Shared.Prototypes; namespace Content.Shared.Overlays; @@ -13,6 +13,9 @@ public sealed partial class ShowHealthIconsComponent : Component /// /// Displays health status icons of the damage containers. /// - [DataField("damageContainers", customTypeSerializer: typeof(PrototypeIdListSerializer))] - public List DamageContainers = new(); + [DataField] + public List> DamageContainers = new() + { + "Biological" + }; } diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index f79817bfab7..24f438113b9 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -13,11 +13,7 @@ categories: [ HideSpawnMenu ] components: - type: ShowHealthBars - damageContainers: - - Biological - type: ShowHealthIcons - damageContainers: - - Biological - type: entity parent: ClothingEyesBase @@ -226,8 +222,6 @@ sprite: Clothing/Eyes/Hud/syndagent.rsi - type: ShowSyndicateIcons - type: ShowHealthBars - damageContainers: - - Biological - type: entity parent: [ClothingEyesGlassesSunglasses, ShowSecurityIcons] diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml index 58478ca180b..0cc7cc027c9 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -398,8 +398,6 @@ - type: Construction node: syndicatemedical - type: ShowHealthBars - damageContainers: - - Biological - type: InteractionPopup interactSuccessString: petting-success-syndicate-cyborg interactFailureString: petting-failure-syndicate-cyborg From 0b19652d65a7ce0c5bff860e32d1b0440c102930 Mon Sep 17 00:00:00 2001 From: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Date: Sat, 2 Nov 2024 15:55:15 -0400 Subject: [PATCH 03/95] Combat and survival knife storage/inhand sprites (#33111) * Adds storage sprites for combat knife and survival knife. Replaces inhand sprites. * Fixes meta.json copyright --- .../Entities/Objects/Weapons/Melee/knife.yml | 6 +++ .../Melee/combat_knife.rsi/inhand-left.png | Bin 291 -> 352 bytes .../Melee/combat_knife.rsi/inhand-right.png | Bin 275 -> 349 bytes .../Weapons/Melee/combat_knife.rsi/meta.json | 5 +- .../Melee/combat_knife.rsi/storage.png | Bin 0 -> 335 bytes .../Melee/survival_knife.rsi/inhand-left.png | Bin 308 -> 273 bytes .../Melee/survival_knife.rsi/inhand-right.png | Bin 306 -> 272 bytes .../Melee/survival_knife.rsi/meta.json | 49 ++++++++++-------- .../Melee/survival_knife.rsi/storage.png | Bin 0 -> 307 bytes 9 files changed, 36 insertions(+), 24 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/storage.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/storage.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index ae5b22f8e02..711b8c49feb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -103,6 +103,9 @@ Slash: 10 - type: Item sprite: Objects/Weapons/Melee/combat_knife.rsi + storedSprite: + state: storage + sprite: Objects/Weapons/Melee/combat_knife.rsi - type: DisarmMalus malus: 0.225 @@ -117,6 +120,9 @@ state: icon - type: Item sprite: Objects/Weapons/Melee/survival_knife.rsi + storedSprite: + state: storage + sprite: Objects/Weapons/Melee/survival_knife.rsi - type: entity name: kukri knife diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png index a7ea753940826be08aaafd478d1f94b930ed18e6..e014cf5110fd9502d664134f7008fff5ed1ed201 100644 GIT binary patch delta 326 zcmV-M0lEI80^kCWBYy!WNkl82kTV2Q2DiycW{bs;a@?7B;==z|J713<&7)EP00000K+4Dan~Ql}EKeyGS?0-^ zs`0wkRE=8ZDOm{O0W9<6$|B!2rY!PgAv{Y?J`TMri(HwiQGd0yna`No+U&BfPN{Fn zt^E>v0>+_tTI*eh-_+J-zOT$-b=}$B?qoP)OwtcykiVPlx^vLRxAAS;x`z$ni1Pse z00000001B)b=$j_XgRv474{W7P_Y2+X@z~nuFpjRxTh7~BW8UbJ%Er_*vHl!mqo6| zp$`rrdH|naKR@c_^eS@r%@%^zT55?fp{=m5%euN$YaPBG1 diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png index 368c73da32797153fc605523aebb86ef07599351..20efe6dd87654762cd77570c3805cb3f8d0748d3 100644 GIT binary patch delta 323 zcmV-J0lfZ`0^I_TBYy!TNklPw?-vp3b8);TZnt#M{JnUB=LYl;)Ss}T# zQQvv*3%G<}j9GmMkCq>F>N;0dyVV7ts(xnvyS%qc15;I3mZcNSU;)h%KW0001t_X}=D VUchc<8SMZ7002ovPDHLkV1hV0mMQ=M delta 248 zcmcc1G?{6Fay9tphzg^gV%pqMg%5x0jCK|R6Grjx!;a> zn|sumqs#E!y>#wbkx|z}C%sqPGd+Hq>g~rH=6qMI3Ep?2@XRF(AHDyaj}26ft*773 z{^@)5Ph8tWRdtZ5Aka|1^&R)RUBNf*vj17VrTzca&~mO&yO>nbxrIl&{(W(eo_fEe uetAGDfBc2NbDdrn#7^6<9WwneNT;)YBU7SwXM}?g$RJNwKbLh*2~7aZy=cS$ diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json index 08894a12a7b..56602b6ea13 100644 --- a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/pull/378/commits/9e081bd2a0d7614be5a9dabbca34886ce204105d", + "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/pull/378/commits/9e081bd2a0d7614be5a9dabbca34886ce204105d, storage & inhand sprites by RiceMar1244", "size": { "x": 32, "y": 32 @@ -10,6 +10,9 @@ { "name": "icon" }, + { + "name": "storage" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/storage.png new file mode 100644 index 0000000000000000000000000000000000000000..6b88c9a3aa2885541458d1a5461aba93888ca350 GIT binary patch literal 335 zcmV-V0kHmwP)bY*_4N)F#w<}x910#FIURDfiMjH0nC>xRoAsYfZo8LGH~fq zTFj;l{9HzMS2zQxwuK~_9DVt+Y}0CHYXf(;H`vqR*ZSkrGqP->l4QbdA)KPM<~WYo z7{kUG22R`Q93V|o)>`}fl2uiOAPDen;OqcV6oH74=ehHq_XavKAUTL4fTn3Abs2!Q hRuK`1NDT46^94PVfvFJX;jRDx002ovPDHLkV1mvVjzs_f literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png index b2f253c30b7a7bb447137fd5ce3b2a96983cd340..c352ccfab67d1bc0c97ebe9e383a1557cbb96dee 100644 GIT binary patch delta 257 zcmdnOG?8h7L_G%^0|UdV%))y>>V~I_V@SoEw>LNPwixiVK76sw!l7fDkRgL|3PY6F z5rz;S2k)aCJgr6@>mRweH?Xk2{GZi+Lu}=|AfRR-kelMFdU;QW?^_f7AhD^TYq{m` zi!bri^S!N^9JabDIqd3|xn7h1Y*ek7thUqVv(jIKc~Vu&B)uB>pRZBS3B&! z?T5_?)gN+o!f%9Pjy-bUvhHaf)7zuLzO0ruK%F1>?8T2|eJFA;%?Fv|>FVdQ&MBb@ E0N6NcqW}N^ delta 293 zcmbQpw1sJcL_HHT0|Uc#_L;swiYLG)#1%-_)zvLovc$;9=zQMwZ$Lg{NswPKgTu2M zX+Ta^RY*jMOKNd)QD#9&W_}(6L&conu!5q}?_YuoK7M_o<*loA?#%h%4WR}XjUPPH zIq#!+lA)-lcZY>>knv?>FNHaeCLNg+q7bZUt#7PbAKKY%th#xH#1bIAR>RO-^oZG$ zps<3k#f;M24Ca1P(pz#&0)f^hc)B=-So9_*NU-wo=ex;R0hkwL&%iMv6FeKB(rzZV~mkB4X5Rz?>kRY_xm nm3_DQ99o8wcvoJ7JPGYxSx^dMVpk)l6u6{1-oD!M>bj?kV@SoEw>S54Hakch`=}iKqwz*m7qdkZGl+_? zY+O54`A$Gl^PZI~o=yhshUL%xYqLJAou@6o6sVnn;lTabX}Yd)r`Er>2%0$E={i;>d z6u9-7=Ho-0002j2boO(000b7OjJex|Nnk|e&65UGBPqz(&=mf0004W zQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ> zRWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DLXGSEq_&si!&v&s2HS)i!-e# zF*g;&Hsn%PaP@Nm8w&t8P8u7uY&1~-003S|L_t(IjbmUK;lKfz!ve$s$O0ljJOx=G z0*F2iag7W}EfVTmwH9QFB0jvr}!QcfB43MM&1B@U6RwMz|1|Y%dfDjM^5ll!) p=?0jbgWC>R0vtI&o)ZTO001>G2t9uSyI%kR002ovPDHLkV1hA4Xqf;2 diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json index 455734e0447..56602b6ea13 100644 --- a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json @@ -1,26 +1,29 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/6cdc0503d32e249125151e369edf951e93bccd1a", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/pull/378/commits/9e081bd2a0d7614be5a9dabbca34886ce204105d, storage & inhand sprites by RiceMar1244", + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BELT", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "storage" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/storage.png new file mode 100644 index 0000000000000000000000000000000000000000..173f66035b357a4e97dd17ea50420238b05ec7c2 GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJU!E?GArY-_r`dBiIY=CnSIy;i zeluLWaY5~0qr-%00qxlx(-clsvvR(R?En6;{QU2# z@&*yd%|DxhZ9}{^=JuZyP-#$8;d#&#voB8fq~@P|rnSr&v9dpP)tO6NxK}Sysh3gM zrqFZFE1MxIoITm@r@|!N2|y^owxUZYG%#uZ?MZq|ZV4JaD?b0(ZXNr>MxY6nE&rdmEcB32MhK%BVS>L3CB7EY=1gV zN}cJ`FvUSR-)XgdE_;KoM8mXyO$JulS Date: Sat, 2 Nov 2024 17:23:40 -0500 Subject: [PATCH 04/95] Delete conveyor_old.rsi (#33102) --- .../conveyor_old.rsi/conveyor_loose.png | Bin 286 -> 0 bytes .../conveyor_old.rsi/conveyor_started_ccw.png | Bin 4389 -> 0 bytes .../conveyor_started_ccw_r.png | Bin 4440 -> 0 bytes .../conveyor_old.rsi/conveyor_started_cw.png | Bin 4434 -> 0 bytes .../conveyor_started_cw_r.png | Bin 4464 -> 0 bytes .../conveyor_old.rsi/conveyor_stopped_ccw.png | Bin 1687 -> 0 bytes .../conveyor_old.rsi/conveyor_stopped_cw.png | Bin 1689 -> 0 bytes .../Structures/conveyor_old.rsi/meta.json | 238 ------------------ 8 files changed, 238 deletions(-) delete mode 100644 Resources/Textures/Structures/conveyor_old.rsi/conveyor_loose.png delete mode 100644 Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw.png delete mode 100644 Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw_r.png delete mode 100644 Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_cw.png delete mode 100644 Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_cw_r.png delete mode 100644 Resources/Textures/Structures/conveyor_old.rsi/conveyor_stopped_ccw.png delete mode 100644 Resources/Textures/Structures/conveyor_old.rsi/conveyor_stopped_cw.png delete mode 100644 Resources/Textures/Structures/conveyor_old.rsi/meta.json diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_loose.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_loose.png deleted file mode 100644 index 97b955cc6e000436a475b44e3c3da2374f5a1f3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmV+(0pb3MP)V#pRVNX9Kd%6Q$LnTv6#%sDVbBB0s>XJ|b0)f+&g^?%oYv5KU3V-L4b~2Qd?VzG z*OOQTWr~0?ux^^kM5&fBaPRxc3{Wk01#CqY0?kRa6f-uN2@b1)&`KX;n-IGTVvDy#8)62U=5^h$CTWT*&|u%cI-WprDmRoQYlOk k{!;a!-H^tMUrxpO0MJTUObOT2v;Y7A07*qoM6N<$f_a&A`~Uy| diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw.png deleted file mode 100644 index 7ad5f8fc70dac364e96c4a47c75cdb6ef9c99d30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4389 zcmV+=5!&vFP) zJ&RUJ7ROIFH<-x4by=FlM-8N-4Ge?^afV5j#Yiw&Fx$^y=tuA~mlk z7#J8e8?l_@kvyWlCSd znEYo_^Y1FY@eh`k%71YG`1QjFwFHE;a`bQ9x>?i&bLmsT=u6h9t>^#v=)G7MbgZ>@ zfSuI}-o9bgjIy&@ZM@)IecuUk3yVXa0!Clb0OpW?$qK;NAJUh$&64`nK2l?lIrY;e zD*&IM14uVPb0?OUr8=ZGniW8_1z3{7azh=1v`$YIVAKJ6DS%QaV~{zpwD%Pw=m6FS z#j!-gcl1&LHaQ6HsR=GYdJNK21=yqm04&R3xmo%c1PezOv{?tR79h>i#~@Sq?~~GF zAngT`!uI0eSn6J^DLD5c6}13Mp9i-wNZW9}n<5A3p$}>XJIxZhV8vsArT0Ot1xUly z2d|BN4-mk{AZeELJwUUwKq+htQua(PmQv0DGj#wPgDe}(3SgEF0AOQ~T;}FbTIrpw z0{|@3@B#YTiV(xT2WXh3k3ni<-vczx(#Ie@Re<(AKp{&XgDmZR#jx)I2rSX?9lcb5 zO%8&4YJy9!?*aH|(g6ULWw6{VeGGzy^?QJp0wV#)Ho>h2hQdG@gDfHcl)Xs4R+FI- zrT5~r6q=8sU%D4-?)j(gMIwhrr1n8uuYoi}^QHbK#oYC&?a8V038ddEl0!6T7_btXA;rhY#X|L8me9^O}Ag z{br{@F>p)+zJ2rZ_up{owQMOI{_i}8%=G?;F zQ+k^00?jEnEyc08XVN&GyqEL@9iXQ^cuOz3rL=H8tM&9)U@W6+y8j-4bDKg7&*6M; zJ)|et1)5VIyf&14`S?n?W#^+Ix}A_+_8L`K;J8X6pd97s=pYmJVQhkqj=H zT?k9D)bWI&k9`kdbd7xvV04Xr50Jp+sWflY`!&*1D{rxMXs4(9?*Uv`lqt?mPe?k{ z`#GOAzQ1PPLicK>r^!LE<^dUZ?%oH0egi}GuHS56EXgjF1;#RcN0a9R0K`L|l>WrD zTwtsxKi*#d?bXvit^Y6d!+pJ<4*%NJ^Ej^`r_a9!lOO8!ewkqN!*zX=Er4`vQeVsU z7oWfT3QvB#4G-`A2KxtB0N_)yFUfuVKmPI^JiK@DlJ*ZSr!9oU_0CB4559wEFQ)s_ zoY(IkT!B|lFMdCN_jNKqT-Qg#qf7O{TMUo>$3Ofz7$N%emyf~l>Die^LQ^r4b7GHme-CQGHdri$+G4gZnlPDk81)+jXn=@Pv{T#!Oorw_L3|Avw zd#xDpt;ERJ(&L79DGllcpy30vYX7+8Rl2aVbfYIe?J`$FWb68y$0>Z4O|d z;4pmd+Mhbk1TY6MCg42ikLwxKH2L?K0~kTL4WB!%Cs#Mh9KhIsGBuonqwB<-rtPsn zE;YUd){a`dbiFa9)0r{N(r?H$rdS6v{=W6Nn9>XxFUDagMvqx&WC@F+^^Bz(;}VU( zG(FTBAKU88GBl#m4j2R1TA6pG(lmZ{u>;hY64TaPx*nA&<8Q4s3bD-<;#-TQ8|9pw zU@G{)R9Ylggs}|NgqRb|Ur&OPK{1t*XWAIR5TmveVlW3V*qKwDSaSeFgw|^Rm{Xbq z7_5PNOKN{k{S+amGzTyM0N|IOe}V^(9>dw`3AqbXQu}l2=MZ&(8u8j|#fWbuM!uF_ z?0%{dQVq9;6IfW3&IyGleDLTo{POcpUFdK9^>2Sa2k192RPXx#{?|X(k=e#Z*n_^c z0G%@qD64G`we`1a$7gRPK7C8^`8Cfc7&A7=srO91W=el5pVVsxHw9HIKD$rN`1G~o z^VdF~z~}RqkL#WR=Dl%U6Vk_|n{rL{`0S=%Uq1%sKCWwO=|>O9kfOEt@FGISY>0jo zud!8CBR+g;J~^eYb#8*`*VSJ;fFGS#YOAU+3Cr~0o6JBlmilC`VLq4k_#~@M>l<4{a_0qMQ(ifoNqg+`T&;; zU+dfi)32+q8W<}SrXth?N(Mq2AFSZ?LxrEKT@p}=s!t7K#hL#c#+942ek?=^+ip}jWozv%yC6FATHRG2E(p1VEV&Y&}x)X?nMr_UaHPf@CR=_=bsZLNl z3zRDG7LC6KHM)ONn$8JY>CSS&{!MUe#_!O6aZ76j-1Fz&5{%Q&>Hs0*mn<-BjQR0a z2u)hlq@EoxS0@l(2Z+@`QUx{@o3iv^1}<7`1vv6QkCfKw<|kKziqEsb+Qy&}yIGha-Ldiww00Q!`K!Y4T}t z{2@I>Dlwg%$lGlS^7n<6AjO;&H!?0rd7;3amAt%73 zfx|Fz^U7_E*cleB4Rn}6awuH@qb|@mKD)MImBfdyy)T7(j35bD+Hz)LH1`gbv<3sf zR~47R~(rGDlhYhK;Rp-EXRXss);A4SfBx z)01yqppX$t5Qq=oggzH3NAL^Z1?CFrhh7@T`UU`?^s(gVj*Xw9A8J)%-7miv6Vku5 z5H>bKDPr-5YU*k|3;8`GfUh`m#B@Tu2K z=}(;lK)uExbuvq8q0H|Jl&Z`wQ1Kt?8%0^g%I{>T?m( zmzezvIbRF;9{`Ht^PeLOU?aS>8-%z%n2QTpqCa&(j(+Gm?!7%NPmdlRzTR>n5?z^u zLRNAy9{7&+CAG);LrEO=(90~XHMHWu=jcoBmc;05uD|qh4nRzQa0Ts$3-@0X=hjol z&T6$Wf{*EQY3ArlgVD!sulAoo(N{R8HFy|FZT-P7_;Fy;++}_&{(vW??$VQu{Z^TH)tgivi?dhhr-lxJZ!a&eT!luoEM;B?H~O^3Pn zxcjbNyB;*cSnI}_$CQ572QgY3zc`*7TO5jA8~b}KE#oeTG$k9oB-2rHk2Au(AHG+e z{7C6vasX`MN;-n(?o$jQCx~@HC}8e)E;^ z+&Z~s9~&D;Q`?9o*ysY4csh5BfZgArNl67EiDqk{nQ!efzT^N@qvCdisr!3(0suWn zSZYfX90YUJ;8aJz7J@m!1yY0L7W2x<#%4Io3&!@pIa&kkz8uXLg_$Ddq@=uK*Oait zzP}?n4O+6ml)4_ftY50b{gTFe=|h|Uv})Uu@=iSutJ_NLKlLss1RbE(Ahe|yfh_~B zv|(Dg+~;A&2Ca>=FmR@6yS2gz)wH$Hb^?r6={>n=OjSlwwJ`>6dx&;{S{sDcYL1uU z1Qh4tPEQQU3ODxb?UKIv80oz!wVUB3I6)3MI|8_w+7p$_R4bL-3shr@F-6TmnU)i@ z(xu=WlTf=#C3ZO8oe+BlYBQYXX0Ou!Zv~1I)XJl;%h}>fY>~;;oYI{M#`!W!1Eg{}qgF88m=n|v<~!CeDO2tmzee{8?EqB6J3hLI$>T?!rjYB5 z-1<4Vvcu|2v>F)woWX7GJyfJLiw?;vxrfvEatmNeUt>Q#Hvdwq>m22uJHx_(wB}F} z52vL09v8j~i${salar2^z8@=IlHB}rrw6MaGBC*+Kc=tM$_y?}x^!ToP~ii7i_>oU zb@kuAdAW8vO(P8HV>LO}7%oL&)?geE)%5G?yXXivZhec*>chR)$B)f=c=&oNq@Oz& z#-=l*zwI*YLWcvyWBiw1;|N6q4#n?x&q&4i&$$MpFL@3^ZvMH?K}hL`x>~NUEmiCL ztz1c0FEnP$8OQnhgG<2v!4-J*^y2sPcVB~vE4>CF9tzvt|NPxoc=F?IczEwO*gv=e z0G~FVU3v{hU-BFTj6Q(eIS48J8c@#ypgN|nzXcF)hQ~4XIj#v|`gQdS!qWplejhy4 z1)=EY64N(~ZrQ3GpS`xe(KqYhxV^@QH~L0x8uY=V$ME_;|J|sGYwH_*vvEFv6s^XG zH~MA(kX>qaGX**E;d7piT>y#c8+|kRQ9K1_piYA`K77u?hlIYd46=8FVj0)Ynh^x3 z*BbpG;sDZLLCx(eE2CZ59YDkQ4TB3-2hggSt@by#U~>QsqT6K86& z5=0}zg(AU8*Tx~uv0lh2tc5U2K_8Hzy~u^tGvhZXpbyBHeb#%~K=Mhz~V4}c9z z$7!gT`1BNPG0jLZq~gPCz@?AbMQYAqj2WC!+_`(7bXrReestav{g@$R9fum7*jNt3 z+3AT|a4N^nYPB}vl)lur0lvP`H^GH4sZ$CaQ#G*k(LB}y7>?odmycUluU+2=5~Wo` fhV*SV$k5{d>jmJsd_0u=00000NkvXXu0mjfCn$U2 diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw_r.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw_r.png deleted file mode 100644 index 8bd276e82e4218a07a4be1d234c43800ccd5ffa2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4440 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 ejOiOj5B?A7jtB_(7S8kl0000 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�D9*pynpwaHwUOqb}_W##%oj3=Paw0C=EG8MLMbJ2P6F9r~m$W$j003 zby8{C`v1SSoOgek;t4T5%(Bc!<;9DqmqLiX5UWxuWMGbT;+yJgYUlJzU>sB`%_#k1 z4`9&(TEvI1FNwJfFN11tBy+=eBoTFhn(Tl^tAkz2I=uNmU8D7#ZF276r$(qjCO&-839a>=?Q!AZ z$3|#D+5(T(cecfaWzf_h;^0xG*zcS)E&VvIdkAk`i~Zi4#@RO6?a*<2_V2#947YED zxay~WPnRvF(&Y4i{N)4OyZJfXzVQbk diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_cw_r.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_cw_r.png deleted file mode 100644 index d2e18ca0caa0896cbe64be7665dd7a650c64b7a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4464 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 diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_stopped_cw.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_stopped_cw.png deleted file mode 100644 index 116b3aed504581c21d31a005133b94bc23a5e74c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1689 zcmV;K24?w*P)+T-Chru7kP~C_IkIR*v3AWc-KCawcG3A^Yt}$dp%a!O&}Yeude|(1ke{b;ImcA z{^iBlf1kMVsR`G{T1J4R{q3E-JVpax^#T6})HP>rB}r-aV)Ab_Wt4(Onc5(yrS>^7 z`GXNq(qXA1nx-->B1k}K2UvBOG`s|8jPLgc{Z>vbT>)~z+Xs|}Rt2yKlLXu)YzQcf z4FL>r`W4EXG!Y9Kw%X2Wf-_{Ejwfjm;4@gl`P1=)J-U$?9dXJ?Zh~BgmvX-E|8)ba z57-~{i#xyWyBJ7ZKc|efT#U2S*Kn?7f6(8If;iwhAJ_~-i(^ATVQlsT3S+Y$P#By2 zfWp}92SnsajmVh%Cg%Y;D*(w-ny{G9SoTBtO%jk3kDojRun}h6Sz*>{7^=;@3!kl0 z_DPua^2MXockf^Qvii;UCz(De0=WADmLh=K<~JXI;N^=)`0dy4c>CcVfG@S}zEt|8 zKET(Zm0T6&*#7$MQ|H0`hs(u$hS%?a*Y5z}%j!2@9?A5@_3;)^@_aQ+7JNfPWDnGi%Y~> z5Rh|oCdC$qh_xU9$g|YJwUI)Ec>+poO-l4Pu|$|B0LZ)0r`cKiu+^qO?gd#XH^xqr z?Y8^d!E?e^olj`0ks8on!RXl`tfEp-m1>Z5ryLHKwE2BEzIGi+i(@ zOX1vRwh5*PkQ`EKXiGJsz!U+1oy{K?no(ee0FHVY$kSm;MgfVq%n$&i%|LUl6LF(} zHslWuk8pZ&y!t*k5p%WesRlXuLuI;qvR2M0$K>%j9{{>B`gkpEybnI7YS#GJ^8qeW z{84p2$r!t(_3?zui?h{@Y3Xu&$aVid=K}_WS*{q0w3#lXCwWz2RPOt)3V63l>*Ial zOzpc?txq{0z)3^!si(W8_3ZKured%<486KK z2cY-|*kV4r(d^LUgMptUoSqyf zH%*dFnl@CnBmqAW*dgjUsQ*Xo4FFZ$I3_`&a*dzWMkAz-{8B(v(25J|AeW jgbV5OLnx`+&xL;ggbzO0e^hp<00000NkvXXu0mjfD^Ns3 diff --git a/Resources/Textures/Structures/conveyor_old.rsi/meta.json b/Resources/Textures/Structures/conveyor_old.rsi/meta.json deleted file mode 100644 index 71aefcdba1d..00000000000 --- a/Resources/Textures/Structures/conveyor_old.rsi/meta.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/blob/a846799c53f8ee9dcec4b075d7645f591f3ec19d/icons/obj/machines/conveyor.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "conveyor_loose" - }, - { - "name": "conveyor_started_ccw", - "directions": 8, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "conveyor_started_ccw_r", - "directions": 8, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "conveyor_started_cw", - "directions": 8, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "conveyor_started_cw_r", - "directions": 8, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "conveyor_stopped_ccw", - "directions": 8 - }, - { - "name": "conveyor_stopped_cw", - "directions": 8 - } - ] -} From 2b87c9641071567b0053dc820addc30f09f7197e Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Sat, 2 Nov 2024 18:16:18 -0500 Subject: [PATCH 05/95] Fix broken computer white shadows (#33103) fix broken computer white shadows --- .../Machines/computers.rsi/broken.png | Bin 3576 -> 3542 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Structures/Machines/computers.rsi/broken.png b/Resources/Textures/Structures/Machines/computers.rsi/broken.png index 38d2fd88a37fe5f960b2e68434c01099e83fafd3..5adb4f73f2eb804a8e96da7845c7b321399e64e8 100644 GIT binary patch delta 3541 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 P00000NkvXXu0mjf;wYdQ delta 3575 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 From bb2e3daba62d1e9dfe845d6fed00f5462d11ac25 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Sun, 3 Nov 2024 03:25:30 -0800 Subject: [PATCH 06/95] Bugfix: Wielding now uses identity system. (#33134) Make wielding system use identity --- Content.Shared/Wieldable/WieldableSystem.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs index d76876c0cff..0a193576bfd 100644 --- a/Content.Shared/Wieldable/WieldableSystem.cs +++ b/Content.Shared/Wieldable/WieldableSystem.cs @@ -3,6 +3,7 @@ using Content.Shared.Hands; using Content.Shared.Hands.Components; using Content.Shared.Hands.EntitySystems; +using Content.Shared.IdentityManagement; using Content.Shared.Interaction.Events; using Content.Shared.Inventory.VirtualItem; using Content.Shared.Item; @@ -125,7 +126,7 @@ private void OnExamineRequires(Entity entity, ref Exa private void OnExamine(EntityUid uid, GunWieldBonusComponent component, ref ExaminedEvent args) { - if (HasComp(uid)) + if (HasComp(uid)) return; if (component.WieldBonusExamineMessage != null) @@ -253,7 +254,7 @@ public bool TryWield(EntityUid used, WieldableComponent component, EntityUid use return false; var selfMessage = Loc.GetString("wieldable-component-successful-wield", ("item", used)); - var othersMessage = Loc.GetString("wieldable-component-successful-wield-other", ("user", user), ("item", used)); + var othersMessage = Loc.GetString("wieldable-component-successful-wield-other", ("user", Identity.Entity(user, EntityManager)), ("item", used)); _popupSystem.PopupPredicted(selfMessage, othersMessage, user, user); var targEv = new ItemWieldedEvent(); @@ -298,7 +299,7 @@ private void OnItemUnwielded(EntityUid uid, WieldableComponent component, ItemUn _audioSystem.PlayPredicted(component.UnwieldSound, uid, args.User); var selfMessage = Loc.GetString("wieldable-component-failed-wield", ("item", uid)); - var othersMessage = Loc.GetString("wieldable-component-failed-wield-other", ("user", args.User.Value), ("item", uid)); + var othersMessage = Loc.GetString("wieldable-component-failed-wield-other", ("user", Identity.Entity(args.User.Value, EntityManager)), ("item", uid)); _popupSystem.PopupPredicted(selfMessage, othersMessage, args.User.Value, args.User.Value); } From 87abe91faad77846c3754b1a01efbad59310d902 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 3 Nov 2024 11:26:38 +0000 Subject: [PATCH 07/95] 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 155dbacf061..6d9e05276b0 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Flareguy - changes: - - message: Added vox sprites for most of the remaining common mask items. - type: Add - id: 7085 - time: '2024-08-10T21:06:50.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30838 - author: Scribbles0, Plykiya, nikthechampiongr changes: - message: You can now execute incapacitated/cuffed entities or yourself with certain @@ -3921,3 +3914,11 @@ id: 7584 time: '2024-11-02T15:12:26.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/33067 +- author: Plykiya + changes: + - message: Wielding weapons no longer displays your character's real identity when + your identity is hidden. + type: Fix + id: 7585 + time: '2024-11-03T11:25:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33134 From c0c9a8c2e4b83f6634d86be1962cf63e78d9c56b Mon Sep 17 00:00:00 2001 From: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Date: Mon, 4 Nov 2024 03:49:42 +0300 Subject: [PATCH 08/95] Collapsible ghost roles menu (#32717) * Make ghost roles collapsible * Save `BodyVisible` state of each `Collapsible` box * Make ghost role collapsible only when group has more than 1 role * Make it a little prettier * Make only ghost role buttons collapsible * Apply requested changes * Typo * Small cleanup * Store in list, instead of iterating * Make unique ids more unique * Move it out of the cycle * Make _collapsibleBoxes into dictionary and use key instead of Collapsible boxes names Added TODO. So after the problem will be fixed in `GhostRolesEui`, it should be mirrored and fixed here too. * Put TODO in GhostRolesEui. I guess Issue must be made for this * Use HashSet instead of Dictionary as suggested. Invert the HashSet, so being present means it uncollapsed I decided to invert HashSet to _uncollapsedStates, because players surely will have more collapsed buttons than opened, so we optimise memory usage a little bit. * Remove extra space from ghost roles window * Add buttons stretching. Size 3:1 --- .../Controls/Roles/GhostRoleButtonsBox.xaml | 9 +++ ...ry.xaml.cs => GhostRoleButtonsBox.xaml.cs} | 7 +- .../Controls/Roles/GhostRoleEntryButtons.xaml | 10 +-- .../Controls/Roles/GhostRoleInfoBox.xaml | 8 ++ .../Controls/Roles/GhostRoleInfoBox.xaml.cs | 18 +++++ .../Ghost/Controls/Roles/GhostRolesEntry.xaml | 16 ---- .../Ghost/Controls/Roles/GhostRolesEui.cs | 30 +++++--- .../Controls/Roles/GhostRolesWindow.xaml.cs | 77 ++++++++++++++++++- Resources/Locale/en-US/ghost/ghost-gui.ftl | 1 + 9 files changed, 136 insertions(+), 40 deletions(-) create mode 100644 Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml rename Content.Client/UserInterface/Systems/Ghost/Controls/Roles/{GhostRolesEntry.xaml.cs => GhostRoleButtonsBox.xaml.cs} (86%) create mode 100644 Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml create mode 100644 Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml.cs delete mode 100644 Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml new file mode 100644 index 00000000000..32d611e7717 --- /dev/null +++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml @@ -0,0 +1,9 @@ + + + + + diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml.cs similarity index 86% rename from Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml.cs rename to Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml.cs index fc53cc72ae6..7df02434160 100644 --- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml.cs +++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml.cs @@ -10,20 +10,17 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles { [GenerateTypedNameReferences] - public sealed partial class GhostRolesEntry : BoxContainer + public sealed partial class GhostRoleButtonsBox : BoxContainer { private SpriteSystem _spriteSystem; public event Action? OnRoleSelected; public event Action? OnRoleFollow; - public GhostRolesEntry(string name, string description, bool hasAccess, FormattedMessage? reason, IEnumerable roles, SpriteSystem spriteSystem) + public GhostRoleButtonsBox(bool hasAccess, FormattedMessage? reason, IEnumerable roles, SpriteSystem spriteSystem) { RobustXamlLoader.Load(this); _spriteSystem = spriteSystem; - Title.Text = name; - Description.SetMessage(description); - foreach (var role in roles) { var button = new GhostRoleEntryButtons(role); diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml index ffde5d69f76..05c52deef16 100644 --- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml +++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml @@ -1,15 +1,15 @@  + Orientation="Horizontal" + HorizontalAlignment="Stretch">