make terminator immune to rev and zombie (#24239)

Co-authored-by: deltanedas <@deltanedas:kde.org>

diff --git a/Resources/Prototypes/Entities/Mobs/Player/terminator.yml b/Resources/Prototypes/Entities/Mobs/Player/terminator.yml
index 873b0ee12df6695e74582c0b0cb0c1994fd95e1b..663838e01acadfb476c529b39351788e31e8914f 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Player/terminator.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/terminator.yml
@@ -1,5 +1,13 @@
+# stuff common to flesh and endoskeleton
 - type: entity
-  parent: MobHuman
+  abstract: true
+  id: MobTerminatorBase
+  components:
+  - type: ZombieImmune # yeah no
+  - type: FlashImmunity # no brain to brainwash, eyes are robotic
+
+- type: entity
+  parent: [MobHuman, MobTerminatorBase]
   id: MobHumanTerminator
   # uses random name generator dont worry
   name: exterminator
@@ -92,6 +100,12 @@
         Blunt: 10
         Structural: 10
   - type: RandomHumanoidAppearance
+  - type: Tag
+    tags:
+    - CanPilot
+    - FootstepSound
+    - DoorBumpOpener
+    - Unimplantable # no brain to mindshield, no organic body to implant into
 
 - type: entity
   parent:
@@ -99,6 +113,7 @@
   - MobCombat
   - MobDamageable
   - MobSiliconBase
+  - MobTerminatorBase
   id: MobTerminatorEndoskeleton
   # you are now valid
   name: nt-800 "exterminator" endoskeleton
@@ -184,3 +199,5 @@
     - ShoesRequiredStepTriggerImmune
     # let mind transfer on gib work
     - MindTransferTarget
+    # its just metal so no implants
+    - Unimplantable

diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
index 400bfc5c0f8478043294fc88cebfb7a838d4fda1..64989ccc5b3b8c809dfc413691164228554bcb42 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
@@ -18,6 +18,8 @@
       blacklist:
         components:
         - Guardian # no holoparasite macrobomb wombo combo
+        tags:
+        - Unimplantable
       currentMode: Draw
       implanterSlot:
         name: Implant

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 8fb58db7c1ea68ff3cb438e0bf41730486bc7586..61e2c56c4a9afe1ffcf692ec5668a62dffe621c9 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1139,6 +1139,9 @@
 - type: Tag
   id: TrashBag
 
+- type: Tag
+  id: Unimplantable
+
 - type: Tag
   id: Unstackable # To prevent things like atmos devices (filters etc) being stacked on one tile. See NoUnstackableInTile