diff --git a/Content.Server/Traitor/Uplink/Telecrystal/TelecrystalSystem.cs b/Content.Server/Traitor/Uplink/Telecrystal/TelecrystalSystem.cs index caf3fdd8dd..fca76fc63b 100644 --- a/Content.Server/Traitor/Uplink/Telecrystal/TelecrystalSystem.cs +++ b/Content.Server/Traitor/Uplink/Telecrystal/TelecrystalSystem.cs @@ -43,12 +43,13 @@ namespace Content.Server.Traitor.Uplink.Telecrystal if (!_accounts.AddToBalance(acc, tcCount)) return; - EntityManager.DeleteEntity(uid); - var msg = Loc.GetString("telecrystal-component-sucs-inserted", - ("source", args.Used), ("target", args.Target)); + ("source", args.Used), ("target", args.Target)); + args.User.PopupMessage(args.User, msg); + EntityManager.DeleteEntity(uid); + args.Handled = true; } } diff --git a/Resources/Locale/en-US/traitor/uplink/telecrystal-component.ftl b/Resources/Locale/en-US/traitor/uplink/telecrystal-component.ftl index 2ee710d7b7..061799fcfe 100644 --- a/Resources/Locale/en-US/traitor/uplink/telecrystal-component.ftl +++ b/Resources/Locale/en-US/traitor/uplink/telecrystal-component.ftl @@ -1 +1 @@ -telecrystal-component-sucs-inserted = You slot {$source} into the {$target}. \ No newline at end of file +telecrystal-component-sucs-inserted = You slot {THE($source)} into {THE($target)}. \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index fda17a96fe..53f7da2e67 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -125,7 +125,7 @@ id: UplinkEmag category: Utility itemId: Emag - description: This sequencer, or "emag", can be used to open or hack a huge variety of items around the station. + description: The business card of the syndicate, this sequencer is able to break open airlocks and tamper with a variety of station devices. Recharges automatically. icon: /Textures/Objects/Tools/emag.rsi/icon.png price: 8 diff --git a/Resources/Prototypes/Entities/Objects/Tools/emag.yml b/Resources/Prototypes/Entities/Objects/Tools/emag.yml index 5d861eed36..bc120c4d0b 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/emag.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/emag.yml @@ -2,7 +2,7 @@ parent: BaseItem id: Emag name: cryptographic sequencer - description: The iconic card of ill omen. + description: The all-in-one hacking solution. The thinking man's lockpick. The iconic EMAG. components: - type: Emag - type: Sprite diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png b/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png index d6ee9844f0..ff1e293183 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/default.png b/Resources/Textures/Objects/Misc/id_cards.rsi/default.png index 1252002516..95b3d54c27 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/default.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/default.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_chaplain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_chaplain.png index 7dc38a4c60..624bb4864d 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_chaplain.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_chaplain.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png index b1ae7ea755..d9c8b6e261 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png index 16218ebd3a..a7c8b68355 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png index da667d4ac5..afbe56e5f0 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png index 05710e9e87..6fe2ce6698 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png index 830ea41793..6bb3134b55 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png b/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png index 06dd13ac40..bb20387315 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png index 4a98a9b57a..09527688a4 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png b/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png index 4707ff4826..3b749d582a 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png index cc0b6c4774..1d4b2f2d47 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png b/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png index 432f16af2c..a44da608ec 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_001.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_001.png index 3cfc5596d5..67dd3e8862 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_001.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_001.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_002.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_002.png index 95e07a47d7..004677ba4a 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_002.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_002.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_003.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_003.png index 590a7fb487..23c998f150 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_003.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_003.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_004.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_004.png index 7f2d2f4173..c6e31412cc 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_004.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_004.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_005.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_005.png index afede7b7b0..d1d29bb055 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_005.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_005.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_006.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_006.png index 1791dff0b4..8b2305d758 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_006.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_006.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_007.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_007.png index 877f17d40c..a5041faa88 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_007.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_007.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png b/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png index 90e6343b8e..b13153a246 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/syndie.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndie.png index 96e9f1cae2..3d5cc6e384 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/syndie.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/syndie.png differ diff --git a/Resources/Textures/Objects/Tools/emag.rsi/icon.png b/Resources/Textures/Objects/Tools/emag.rsi/icon.png index de4465dc36..61c283cfd0 100644 Binary files a/Resources/Textures/Objects/Tools/emag.rsi/icon.png and b/Resources/Textures/Objects/Tools/emag.rsi/icon.png differ