Port Dogtags from CD and fix some minor issues with it. ( DeltaV #2301)…

… (#2628) * Port Dogtags from CD and fix some minor issues with it. (#2301) * Port Dogtags from CD and fix some minor issues with it. * Addressing reviews * more engraveable items, system "fixes" * PDA next to cartridges, cadet/deputy badges * Reorder dogtags * Comment success localization change * "let's fix the badges" biggest mistake of my life * fix detective PDA order * bailiff neck fallbacks * fix sheriff fallbacks --------- Co-authored-by: Kr8art <[email protected]> Co-authored-by: Whatstone <[email protected]>
new-frontiers-14 · Dec 28, 2024 · f3108cb · f3108cb
1 parent ec47b70
commit f3108cb
Show file tree

Hide file tree

Showing 31 changed files with 261 additions and 60 deletions.
diff --git a/Content.Server/_CD/Engraving/EngraveableComponent.cs b/Content.Server/_CD/Engraving/EngraveableComponent.cs
@@ -0,0 +1,32 @@
+namespace Content.Server._CD.Engraving;
+
+/// <summary>
+///     Allows an items' description to be modified with an engraving
+/// </summary>
+[RegisterComponent, Access(typeof(EngraveableSystem))]
+public sealed partial class EngraveableComponent : Component
+{
+    /// <summary>
+    ///     Message given to user to notify them a message was sent
+    /// </summary>
+    [DataField]
+    public string EngravedMessage = string.Empty;
+
+    /// <summary>
+    ///     The inspect text to use when there is no engraving
+    /// </summary>
+    [DataField]
+    public LocId NoEngravingText = "engraving-generic-no-message"; // Frontier: "dogtags"<"generic"
+
+    /// <summary>
+    ///     The message to use when successfully engraving the item
+    /// </summary>
+    [DataField]
+    public LocId EngraveSuccessMessage = "engraving-generic-succeed"; // Frontier: "dogtags"<"generic"
+
+    /// <summary>
+    ///     The inspect text to use when there is an engraving. The message will be shown seperately afterwards.
+    /// </summary>
+    [DataField]
+    public LocId HasEngravingText = "engraving-generic-has-message"; // Frontier: "dogtags"<"generic"
+}
diff --git a/Content.Server/_CD/Engraving/EngraveableSystem.cs b/Content.Server/_CD/Engraving/EngraveableSystem.cs
@@ -0,0 +1,83 @@
+using Content.Server.Administration;
+using Content.Server.Administration.Logs;
+using Content.Server.Popups;
+using Content.Shared.Database;
+using Content.Shared.Popups;
+using Content.Shared.Examine;
+using Content.Shared.Verbs;
+using Robust.Shared.Player;
+using Robust.Shared.Utility;
+
+namespace Content.Server._CD.Engraving;
+
+public sealed class EngraveableSystem : EntitySystem
+{
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly QuickDialogSystem _dialog = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EngraveableComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<EngraveableComponent, GetVerbsEvent<ActivationVerb>>(AddEngraveVerb);
+    }
+
+    private void OnExamined(Entity<EngraveableComponent> ent, ref ExaminedEvent args)
+    {
+        var msg = new FormattedMessage();
+        // Frontier: don't localize the message, use args in fluent entries
+        if (ent.Comp.EngravedMessage == string.Empty)
+            msg.AddMarkupOrThrow(Loc.GetString(ent.Comp.NoEngravingText, ("object", ent)));
+        else
+            msg.AddMarkupOrThrow(Loc.GetString(ent.Comp.HasEngravingText, ("object", ent), ("message", ent.Comp.EngravedMessage)));
+        // End Frontier
+
+        args.PushMessage(msg, 1);
+    }
+
+    private void AddEngraveVerb(Entity<EngraveableComponent> ent, ref GetVerbsEvent<ActivationVerb> args)
+    {
+        // First check if it's already been engraved. If it has, don't let them do it again.
+        if (ent.Comp.EngravedMessage != string.Empty)
+            return;
+
+        // We need an actor to give the verb.
+        if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
+            return;
+
+        // Make sure ghosts can't engrave stuff.
+        if (!args.CanInteract)
+            return;
+
+        var engraveVerb = new ActivationVerb
+        {
+            Text = Loc.GetString("engraving-verb-engrave"),
+            Act = () =>
+            {
+                _dialog.OpenDialog(actor.PlayerSession,
+                    Loc.GetString("engraving-verb-engrave"),
+                    Loc.GetString("engraving-popup-ui-message"),
+                    (string message) =>
+                    {
+                        // If either the actor or comp have magically vanished
+                        if (actor.PlayerSession.AttachedEntity == null || !HasComp<EngraveableComponent>(ent))
+                            return;
+
+                        ent.Comp.EngravedMessage = message;
+                        _popup.PopupEntity(Loc.GetString(ent.Comp.EngraveSuccessMessage, ("object", ent)), // Frontier: add object argument
+                            actor.PlayerSession.AttachedEntity.Value,
+                            actor.PlayerSession,
+                            PopupType.Medium);
+                        _adminLogger.Add(LogType.Action,
+                            LogImpact.Low,
+                            $"{ToPrettyString(actor.PlayerSession.AttachedEntity):player} engraved an item with message: {message}");
+                    });
+            },
+            Impact = LogImpact.Low,
+        };
+        engraveVerb.Impact = LogImpact.Low;
+        args.Verbs.Add(engraveVerb);
+    }
+}
diff --git a/Resources/Locale/en-US/_CD/engraving/engraving.ftl b/Resources/Locale/en-US/_CD/engraving/engraving.ftl
@@ -0,0 +1,7 @@
+engraving-verb-engrave = Engrave
+engraving-popup-ui-message = Description
+
+# Frontier: generic engraving messages
+engraving-generic-no-message = There isn't anything engraved on {THE($object)}.
+engraving-generic-has-message = There's a message engraved on {THE($object)}. It reads: {$message}
+engraving-generic-succeed = You successfully engrave {THE($object)} with your message.
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
@@ -74,6 +74,7 @@
         Gold: 200 # 2 bars
     - type: StaticPrice
       price: 300
+    - type: Engraveable # Frontier - base rings may not be metallic
 
 - type: entity
   abstract: true
@@ -86,3 +87,4 @@
         Silver: 200 # 2 bars
     - type: StaticPrice
       price: 275
+    - type: Engraveable # Frontier - base rings may not be metallic
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
@@ -18,6 +18,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shinyflask.rsi
+  - type: Engraveable # Frontier
 
 - type: entity
   parent: FlaskBase
@@ -46,6 +47,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/detflask.rsi
+  - type: Engraveable # Frontier
 
 - type: entity
   parent: FlaskBase
@@ -55,6 +57,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/hosflask.rsi
+  - type: Engraveable # Frontier
 
 - type: entity
   parent: FlaskBase
@@ -64,6 +67,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/flask.rsi
+  - type: Engraveable # Frontier
 
 - type: entity
   parent: FlaskBase
@@ -73,6 +77,7 @@
   components:
     - type: Sprite
       sprite: Objects/Consumable/Drinks/barflask.rsi
+    - type: Engraveable # Frontier
 
 - type: entity
   parent: FlaskBase
@@ -82,6 +87,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/flask_old.rsi
+  - type: Engraveable # Frontier
 
 - type: entity
   parent: FlaskBase
@@ -91,6 +97,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lithiumflask.rsi
+  - type: Engraveable # Frontier
 
 - type: entity
   parent: FlaskBase

diff --git a/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml b/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml
@@ -57,3 +57,4 @@
     sprite: Objects/Devices/goldwatch.rsi
   - type: StaticPrice
     price: 500 #if you ever increase the price of kidneys, increase this too.
+  - type: Engraveable # Frontier
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -212,6 +212,7 @@
   - type: UseDelay
   - type: IgnitionSource
     ignited: false
+  - type: Engraveable # Frontier
 
 - type: entity
   name: flippo engraved lighter

diff --git a/Resources/Prototypes/_CD/Entities/Objects/Misc/dogtags.yml b/Resources/Prototypes/_CD/Entities/Objects/Misc/dogtags.yml
@@ -0,0 +1,14 @@
+- type: entity
+  id: CDDogtags
+  parent: ClothingNeckBase 
+  name: dogtags
+  description: A set of dogtags, hanging from a small piece of cord for wearing and carrying.
+  components:
+  - type: Sprite
+    sprite: _CD/Objects/Misc/dogtags.rsi
+    layers:
+    - state: dogtag
+  - type: Clothing
+    sprite: _CD/Objects/Misc/dogtags.rsi
+  - type: Appearance
+  - type: Engraveable
diff --git a/Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml
@@ -0,0 +1,5 @@
+- type: loadout
+  id: CDDogtags
+  storage:
+    back:
+    - CDDogtags
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml
@@ -55,6 +55,7 @@
     ClothingOuterCoatNfsdLongCoat: 3
     ClothingNeckCloakSheriff: 3
     ClothingNeckMantleSheriff: 3
+    ClothingNeckPublicAffairsLiaisonBadge: 10
     ClothingNeckNfsdBadgeSecurityCadet: 10
     ClothingNeckNfsdBadgeSecurityBrigmedic: 10
     ClothingNeckNfsdBadgeDetective: 10

diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/neck.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/neck.yml
@@ -1,4 +1,4 @@
 - type: loadout
-  id: BrigmedicClothingNeckMantleBrigmedic
+  id: BrigmedicClothingNeckNfsdBadgeSecurityBrigmedic
   equipment:
     neck: ClothingNeckNfsdBadgeSecurityBrigmedic
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/neck.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/neck.yml
@@ -99,22 +99,22 @@
     neck: ClothingNeckBellCollar
 
 - type: loadout
-  id: ContractorClothingNeckStethoscope
+  id: ContractorCDDogtags
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
   equipment:
-    neck: ClothingNeckStethoscope
+    neck: CDDogtags
 
 - type: loadout
-  id: ContractorClothingOuterPonchoClassic
+  id: ContractorClothingNeckStethoscope
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
   equipment:
-    neck: ClothingOuterPonchoClassic
+    neck: ClothingNeckStethoscope
 
 - type: loadout
   id: ContractorClothingOuterPoncho
@@ -124,6 +124,16 @@
   price: 500
   equipment:
     neck: ClothingOuterPoncho
+
+- type: loadout
+  id: ContractorClothingOuterPonchoClassic
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    neck: ClothingOuterPonchoClassic
+
 #T2
 - type: loadout
   id: ContractorClothingNeckCloakCap

diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/neck.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/neck.yml
@@ -1,5 +1,5 @@
 #T0
 - type: loadout
-  id: NFDetectiveClothingNeckBadgeNFDetective
+  id: NFDetectiveClothingNeckNfsdBadgeDetective
   equipment:
-    neck: ClothingNeckNfsdBadgeSecurity
+    neck: ClothingNeckNfsdBadgeDetective
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pal/neck.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Pal/neck.yml
@@ -0,0 +1,5 @@
+#T0
+- type: loadout
+  id: PalClothingNeckPublicAffairsLiaisonBadge
+  equipment:
+    neck: ClothingNeckPublicAffairsLiaisonBadge
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/neck.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/neck.yml
@@ -3,3 +3,13 @@
   id: SheriffClothingNeckMantleSheriff
   equipment:
     neck: ClothingNeckMantleSheriff
+
+- type: loadout
+  id: SheriffClothingNeckCloakSheriff
+  equipment:
+    neck: ClothingNeckCloakSheriff
+
+- type: loadout
+  id: SheriffClothingNeckNfsdBadgeSheriff
+  equipment:
+    neck: ClothingNeckNfsdBadgeSheriff
diff --git a/Resources/Prototypes/_NF/Loadouts/bailiff_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/bailiff_loadout_groups.yml
@@ -28,9 +28,11 @@
 - type: loadoutGroup
   id: BailiffNeck
   name: loadout-group-contractor-neck
-  minLimit: 0
+  hidden: true
   loadouts:
   - BailiffClothingNeckBadgeBailiff
+  fallbacks:
+  - BailiffClothingNeckBadgeBailiff
 
 - type: loadoutGroup
   id: BailiffPDA

diff --git a/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml
@@ -37,9 +37,11 @@
 - type: loadoutGroup
   id: BrigmedicNeck
   name: loadout-group-contractor-neck
-  minLimit: 0
+  hidden: true
   loadouts:
-  - BrigmedicClothingNeckMantleBrigmedic
+  - BrigmedicClothingNeckNfsdBadgeSecurityBrigmedic
+  fallbacks:
+  - BrigmedicClothingNeckNfsdBadgeSecurityBrigmedic
 
 - type: loadoutGroup
   id: BrigmedicPDA

diff --git a/Resources/Prototypes/_NF/Loadouts/cadet_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/cadet_loadout_groups.yml
@@ -28,9 +28,11 @@
 - type: loadoutGroup
   id: CadetNeck
   name: loadout-group-contractor-neck
-  minLimit: 0
+  hidden: true
   loadouts:
   - CadetClothingNeckBadgeCadet
+  fallbacks:
+  - CadetClothingNeckBadgeCadet
 
 - type: loadoutGroup
   id: CadetPDA

diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
@@ -588,6 +588,7 @@
   - ContractorClothingNeckHeadphones
   - ContractorClothingNeckCrucifix
   - ContractorClothingNeckBellCollar
+  - ContractorCDDogtags
   - ContractorClothingNeckStethoscope
   - ContractorClothingOuterPoncho
   - ContractorClothingOuterPonchoClassic

diff --git a/Resources/Prototypes/_NF/Loadouts/deputy_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/deputy_loadout_groups.yml
@@ -28,9 +28,11 @@
 - type: loadoutGroup
   id: DeputyNeck
   name: loadout-group-contractor-neck
-  minLimit: 0
+  hidden: true # No point in showing this, it gets auto-selected.
   loadouts:
   - DeputyClothingNeckBadgeDeputy
+  fallbacks:
+  - DeputyClothingNeckBadgeDeputy
 
 - type: loadoutGroup
   id: DeputyPDA