Merge pull request #446 from Schrodinger71/fix_cyborg

Убираю киборгу Сб спешилл
AdventureTimeSS14 · Mar 2, 2024 · 5248aae · 5248aae
2 parents f740f66 + 53093cf
commit 5248aae
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 13 deletions.
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml
@@ -137,6 +137,9 @@
       noRot: true
       drawdepth: Mobs
       layers:
+        - map: ["enum.DamageStateVisualLayers.Base"]
+          sprite: ADT/Mobs/Silicon/Cyborg/parts.rsi
+          state: full
         - map: ["enum.HumanoidVisualLayers.Chest"]
         - map: ["enum.HumanoidVisualLayers.Head"]
         - map: ["enum.HumanoidVisualLayers.Snout"]
@@ -311,8 +314,14 @@
         proper: true
     - type: StandingState
     - type: CanEscapeInventory
-    - type: HumanoidAppearance
-      species: ADTCyborgSpecies
+    # - type: HumanoidAppearance
+    #   species: ADTCyborgSpecies
+    # - type: Sprite
+    #   drawdepth: Mobs
+    #   layers:
+    #     - map: ["enum.DamageStateVisualLayers.Base"]
+    #       state: crawling
+    #       sprite: Corvax/Mobs/Pets/largo.rsi
     - type: Body
       prototype: ADTBodyCyborgSec
       requiredLegs: 2

diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sec_cyborg.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sec_cyborg.yml
@@ -158,5 +158,5 @@
   components:
   - type: HumanoidAppearance
     species: ADTCyborgSpecies
-  - type: Inventory
-    templateId: ADTCyborgSecInventory
+  # - type: Inventory
+  #   templateId: ADTCyborgSecInventory
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/species.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/species.yml
@@ -1,24 +1,39 @@
 - type: species
   id: ADTCyborgSpecies
   name: species-name-cyb-security
-  roundStart: false #
-  prototype: ADTMobCyborSecurity
+  roundStart: false #true # остаил для набегеров с софтом
+  prototype: ADTMobMouseCyborgSpecies #prototype: ADTMobCyborSecurity
   sprites: ADTMobCyborgSecSprites
   markingLimits: MobIPCMarkingLimits
-  dollPrototype: ADTMobCyborgSecDummy
+  dollPrototype: ADTMobMouseCyborgSpecies #ADTMobCyborgSecDummy
   skinColoration: TintedHues
   minAge: 1
   maxAge: 240
   oldAge: 50
   youngAge: 50
-  maleFirstNames: IpcFirst
-  femaleFirstNames: IpcFirst
-  maleLastNames: IpcLast # Corvax-LastnameGender
-  femaleLastNames: IpcLast # Corvax-LastnameGender
-  naming: FirstDashLast
+  # maleFirstNames: IpcFirst
+  # femaleFirstNames: IpcFirst
+  # maleLastNames: IpcLast # Corvax-LastnameGender
+  # femaleLastNames: IpcLast # Corvax-LastnameGender
+  # naming: FirstDashLast
   sexes:
   - Unsexed
 
+- type: entity
+  parent: MobMouse2
+  id: ADTMobMouseCyborgSpecies
+  name: "Крыска"
+  components:
+  - type: HumanoidAppearance
+    species: ADTCyborgSpecies
+  - type: RandomMetadata
+    nameSegments: [names_mouse_cyb]
+
+- type: dataset
+  id: names_mouse_cyb
+  values:
+  - Крыска
+
 - type: speciesBaseSprites
   id: ADTMobCyborgSecSprites
   sprites:

diff --git a/Resources/Textures/ADT/Mobs/Silicon/Cyborg/parts.rsi/meta.json b/Resources/Textures/ADT/Mobs/Silicon/Cyborg/parts.rsi/meta.json
@@ -8,7 +8,8 @@
   },
   "states": [
     {
-      "name": "full"
+      "name": "full",
+      "directions": 4
     },
     {
       "name": "head_m",