Merge branch 'master' into hardlight-spear

WWhiteDreamProject · Oct 11, 2024 · 0db64f4 · 0db64f4
2 parents 5ec0722 + 6d5d0d9
commit 0db64f4
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 3 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -6525,3 +6525,10 @@ Entries:
   id: 6363
   time: '2024-10-11T04:07:40.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/79
+- author: Spatison
+  changes:
+    - type: Add
+      message: Added syndicate implanter / Добавлен имплантер синдиката
+  id: 6364
+  time: '2024-10-11T04:26:13.0000000+00:00'
+  url: https://github.com/WWhiteDreamProject/wwdpublic/pull/78
diff --git a/Resources/Locale/en-US/_white/store/uplink-catalog.ftl b/Resources/Locale/en-US/_white/store/uplink-catalog.ftl
@@ -13,5 +13,8 @@ uplink-ebow-desc = A fairly quiet weapon that automatically reloads and stuns. I
 uplink-hardlight-spear-implant-name = Hardlight spear implanter
 uplink-hardlight-spear-implant-desc = An implant injected into the body, and later activated at the user's will. It will summon a spear made out of hardlight that the user can use to wreak havoc.
 
+uplink-implanter-name = Implanter
+uplink-implanter-desc = An advanced implant that allows you to quickly insert and remove implants.
+
 uplink-smoke-implant-name = Smoke implant
 uplink-smoke-implant-desc = Releases a cloud of smoke when activated.
diff --git a/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl b/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl
@@ -2,5 +2,8 @@ ent-HardlightSpearImplanter = { ent-BaseImplanter }
     .desc = { ent-BaseImplanter.desc }
     .suffix = световое копьё
 
+ent-ImplanterSyndi = { ent-BaseImplanter }
+    .desc = Компактный одноразовый шприц, предназначенный исключительно для введения и извлечения подкожных имплантатов.
+
 ent-SmokeImplanter = { ent-BaseImplanter }
     .desc = { ent-BaseImplanter.desc }
diff --git a/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl
@@ -1,4 +1,4 @@
-uplink-emp-flashlight-name = Электромагнитный фонарик
+uplink-emp-flashlight-name = Электромагнитный фонарик
 uplink-emp-flashlight-desc = Замаскированное под фонарик устройство. При ударе выпускает ЭМИ, поражающий электрические устройства.
 
 uplink-betrayal-knife-name = Предательский кинжал
@@ -13,5 +13,8 @@ uplink-ebow-desc = Довольно тихое оружие, которое ав
 uplink-hardlight-spear-implant-name = Имплант светового копья
 uplink-hardlight-spear-implant-desc = Имплант, вводимый в тело и активируемый по желанию пользователя. Он вызывает копье из твердого света, с помощью которого пользователь может сеять хаос.
 
+uplink-implanter-name = Имплантер
+uplink-implanter-desc = Продвинутый имплантер, позволяющий быстро вкалывать и вытаскивать импланты.
+
 uplink-smoke-implant-name = Имплант дыма
 uplink-smoke-implant-desc = Выпускает облако дыма при активации.
diff --git a/Resources/Locale/ru-RU/prototypes/entities/objects/misc/implanters.ftl b/Resources/Locale/ru-RU/prototypes/entities/objects/misc/implanters.ftl
@@ -52,5 +52,3 @@ ent-DeathAcidifierImplanter = { ent-BaseImplanter }
 ent-ImplanterAdmeme = { ent-BaseImplanter }
     .desc = {""}
     .suffix = адмемы
-ent-ImplanterSyndi = { ent-BaseImplanter }
-    .desc = { ent-BaseImplanter.desc }
diff --git a/Resources/Prototypes/_White/Catalog/uplink_catalog.yml b/Resources/Prototypes/_White/Catalog/uplink_catalog.yml
@@ -69,6 +69,16 @@
       - NukeOpsUplink
   saleLimit: 1
 
+- type: listing
+  id: UplinkImplanterSyndi
+  name: uplink-implanter-name
+  description: uplink-implanter-desc
+  productEntity: ImplanterSyndi
+  cost:
+    Telecrystal: 1
+  categories: 
+  - UplinkImplants
+
 - type: listing
   id: UplinkSmokeImplanter
   name: uplink-smoke-implant-name

diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml
@@ -1,3 +1,16 @@
+- type: entity
+  parent: Implanter
+  id: ImplanterSyndi
+  description: A compact disposable syringe exclusively designed for the quick injection and extraction of subdermal implants.
+  components:
+    - type: Item
+      sprite: Objects/Specific/Medical/syndi_implanter.rsi
+    - type: Sprite
+      sprite: Objects/Specific/Medical/syndi_implanter.rsi
+    - type: Implanter
+      drawTime: 2
+      implantTime: 2
+
 - type: entity
   parent: BaseImplantOnlyImplanterSyndi
   id: HardlightSpearImplanter