From 1e7add4ac786bc580a229faa8240be5e9848ea2c Mon Sep 17 00:00:00 2001
From: AnderFan <AnderFann@gmail.com>
Date: Tue, 19 Mar 2024 19:52:30 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D0=BE=D1=82=D1=88=D0=B5=D0=BB=D1=8C=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=B8.=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=BF=D1=80=D0=BE=D0=B7=D1=80=D0=B0=D1=87=D0=BD=D1=8B?=
 =?UTF-8?q?=D0=B9=20=D0=BA=D0=BF=D0=BA=20=D0=B1=D0=B5=D0=B7=20=D0=B0=D0=B9?=
 =?UTF-8?q?=D0=B4=D0=B8=20=D0=BA=D0=B0=D1=80=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Locale/ru-RU/ADT/Lavaland/hermit.ftl      |   7 +++
 .../entities/objects/devices/pda.ftl          |   2 +
 .../ADT/Lavaland/NPCs/Hermit/Hermit.yml       |  41 ++++++++++++++++++
 .../Lavaland/NPCs/Hermit/HermitEquipment.yml  |   9 ++++
 .../Entities/Objects/Devices/pda.yml          |  13 ++++++
 .../ADT/Mobs/Lavaland/hermit.rsi/fulls.png    | Bin 0 -> 2243 bytes
 .../ADT/Mobs/Lavaland/hermit.rsi/meta.json    |  14 ++++++
 7 files changed, 86 insertions(+)
 create mode 100644 Resources/Locale/ru-RU/ADT/Lavaland/hermit.ftl
 create mode 100644 Resources/Prototypes/ADT/Lavaland/NPCs/Hermit/Hermit.yml
 create mode 100644 Resources/Prototypes/ADT/Lavaland/NPCs/Hermit/HermitEquipment.yml
 create mode 100644 Resources/Textures/ADT/Mobs/Lavaland/hermit.rsi/fulls.png
 create mode 100644 Resources/Textures/ADT/Mobs/Lavaland/hermit.rsi/meta.json

diff --git a/Resources/Locale/ru-RU/ADT/Lavaland/hermit.ftl b/Resources/Locale/ru-RU/ADT/Lavaland/hermit.ftl
new file mode 100644
index 00000000000..6917faa817f
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/Lavaland/hermit.ftl
@@ -0,0 +1,7 @@
+ghost-role-information-hermit-name = Отшельник
+ghost-role-information-hermit-description = Вы застряли в этой безбожной тюрьме планеты дольше, чем вы можете себе представить. Каждый день вы с трудом выживаете, и среди ужасных условий вашего импровизированного убежища, все, чего вы можете пожелать, - это ощущение мягкой травы между пальцами ног и свежий воздух Земли. Эти мысли рассеивает очередное воспоминание о том, как ты сюда попал...
+
+ent-MobHermitSpawner = Спавнер отшельника
+
+ent-MobHermit = Отшельник
+    .desc = Выглядит потрёпанно.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl
index e7027bbeb46..84ca4a9b010 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl
@@ -76,6 +76,8 @@ ent-AtmosPDA = КПК атмос-техника
     .desc = Все ещё пахнет плазмой.
 ent-ClearPDA = прозрачный КПК
     .desc = На 99,44% из прозрачного пластика.
+ent-NocardClearPDA = { ent-ClearPDA }
+    .desc = { ent-ClearPDA.desc }
 ent-SyndiPDA = КПК синдиката
     .desc = Окей, пора стать продуктивным членом... о, круто, я плохой парень, пора убивать людей!
 ent-ERTLeaderPDA = КПК ОБР
diff --git a/Resources/Prototypes/ADT/Lavaland/NPCs/Hermit/Hermit.yml b/Resources/Prototypes/ADT/Lavaland/NPCs/Hermit/Hermit.yml
new file mode 100644
index 00000000000..263c701782e
--- /dev/null
+++ b/Resources/Prototypes/ADT/Lavaland/NPCs/Hermit/Hermit.yml
@@ -0,0 +1,41 @@
+- type: entity
+  noSpawn: true
+  name: Hermit
+  description: He looks shabby.
+  parent: MobHuman
+  id: MobHermit
+  components:
+    - type: GhostRole
+      name: ghost-role-information-hermit-name
+      description: ghost-role-information-hermit-description
+    - type: GhostTakeoverAvailable
+    - type: RandomHumanoidAppearance
+    - type: Loadout
+      prototypes: [ ADTHemritEquipment ]
+    - type: Icon
+      sprite: ADT/Mobs/Lavaland/hermit.rsi
+      state: fulls
+
+- type: entity
+  name: Hermit spawner
+  id: MobHermitSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - sprite: ADT/Markers/job.rsi
+          state: green
+        - sprite: ADT/Mobs/Lavaland/hermit.rsi
+          state: fulls
+    - type: ConditionalSpawner
+      prototypes:
+        - MobHermit
+
+- type: entity
+  parent: BaseSpeciesDummy
+  id: MobHermitDummy
+  noSpawn: true
+  description: A dummy hermit.
+  components:
+  - type: HumanoidAppearance
+    species: Human
diff --git a/Resources/Prototypes/ADT/Lavaland/NPCs/Hermit/HermitEquipment.yml b/Resources/Prototypes/ADT/Lavaland/NPCs/Hermit/HermitEquipment.yml
new file mode 100644
index 00000000000..3c252497557
--- /dev/null
+++ b/Resources/Prototypes/ADT/Lavaland/NPCs/Hermit/HermitEquipment.yml
@@ -0,0 +1,9 @@
+- type: startingGear
+  id: ADTHemritEquipment
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitTacticool #
+    back: ClothingBackpack #
+    shoes: ClothingShoesBootsCombat #
+    id: NocardClearPDA #
+    gloves: ADTClothingHandsFingerlessCombat #
+    pocket2: RadioHandheld
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index f04371d8f7d..05c1dbde273 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -745,6 +745,19 @@
   - type: Icon
     state: pda-clear
 
+- type: entity
+  parent: BasePDA
+  id: NocardClearPDA
+  name: clear PDA
+  description: 99 and 44/100ths percent pure plastic.
+  components:
+  - type: Pda
+    state: pda-clear
+  - type: PdaBorderColor
+    borderColor: "#288e4d"
+  - type: Icon
+    state: pda-clear
+
 - type: entity
   parent: BasePDA
   id: SyndiPDA
diff --git a/Resources/Textures/ADT/Mobs/Lavaland/hermit.rsi/fulls.png b/Resources/Textures/ADT/Mobs/Lavaland/hermit.rsi/fulls.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f0a4635885cc18ce38734b3abd3a5e00fa93aab
GIT binary patch
literal 2243
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/ADT/Mobs/Lavaland/hermit.rsi/meta.json b/Resources/Textures/ADT/Mobs/Lavaland/hermit.rsi/meta.json
new file mode 100644
index 00000000000..cf830d37d12
--- /dev/null
+++ b/Resources/Textures/ADT/Mobs/Lavaland/hermit.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://wiki.ss220.space/index.php/%D0%A4%D0%B0%D0%B9%D0%BB:Lavaland_hermit.png",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "fulls"
+        }
+    ]
+}