Merge remote-tracking branch 'space-station-14/master' into 29-04-2024-upstream

# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml

Resources/Prototypes/Body/Parts/terminator.yml

@@ -1,158 +0,0 @@
-- type: entity
-  abstract: true
-  parent: BaseItem
-  id: PartTerminator
-  name: nt-800 body part
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Terminator/parts.rsi
-  - type: Icon
-    sprite: Mobs/Species/Terminator/parts.rsi
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Cybernetic
-  - type: BodyPart
-  - type: ContainerContainer
-    containers:
-      bodypart: !type:Container
-        ents: []
-  - type: Gibbable
-  - type: StaticPrice
-    price: 200
-
-- type: entity
-  parent: PartTerminator
-  id: TorsoTerminator
-  name: nt-800 torso
-  components:
-  - type: Sprite
-    state: torso_m
-  - type: Icon
-    state: torso_m
-  - type: BodyPart
-    partType: Torso
-
-- type: entity
-  parent: PartTerminator
-  id: HeadTerminator
-  name: nt-800 skull
-  description: Its red eyes have powered down... for now.
-  components:
-  - type: Sprite
-    state: skull_icon
-  - type: Icon
-    state: skull_icon
-  - type: BodyPart
-    partType: Head
-  # killing a terminators worth big bucks
-  - type: StaticPrice
-    price: 2000
-  - type: Tag
-    tags:
-    - Head
-
-- type: entity
-  parent: PartTerminator
-  id: LeftArmTerminator
-  name: left nt-800 arm
-  components:
-  - type: Sprite
-    state: l_arm
-  - type: Icon
-    state: l_arm
-  - type: BodyPart
-    partType: Arm
-    symmetry: Left
-
-- type: entity
-  parent: PartTerminator
-  id: RightArmTerminator
-  name: right nt-800 arm
-  components:
-  - type: Sprite
-    state: r_arm
-  - type: Icon
-    state: r_arm
-  - type: BodyPart
-    partType: Arm
-    symmetry: Right
-
-- type: entity
-  parent: PartTerminator
-  id: LeftHandTerminator
-  name: left nt-800 hand
-  components:
-  - type: Sprite
-    state: l_hand
-  - type: Icon
-    state: l_hand
-  - type: BodyPart
-    partType: Hand
-    symmetry: Left
-
-- type: entity
-  parent: PartTerminator
-  id: RightHandTerminator
-  name: right nt-800 hand
-  components:
-  - type: Sprite
-    state: r_hand
-  - type: Icon
-    state: r_hand
-  - type: BodyPart
-    partType: Hand
-    symmetry: Right
-
-- type: entity
-  parent: PartTerminator
-  id: LeftLegTerminator
-  name: left nt-800 leg
-  components:
-  - type: Sprite
-    state: l_leg
-  - type: Icon
-    state: l_leg
-  - type: BodyPart
-    partType: Leg
-    symmetry: Left
-  - type: MovementBodyPart
-
-- type: entity
-  parent: PartTerminator
-  id: RightLegTerminator
-  name: right nt-800 leg
-  components:
-  - type: Sprite
-    state: r_leg
-  - type: Icon
-    state: r_leg
-  - type: BodyPart
-    partType: Leg
-    symmetry: Right
-  - type: MovementBodyPart
-
-- type: entity
-  parent: PartTerminator
-  id: LeftFootTerminator
-  name: left nt-800 foot
-  components:
-  - type: Sprite
-    state: l_foot
-  - type: Icon
-    state: l_foot
-  - type: BodyPart
-    partType: Foot
-    symmetry: Left
-
-- type: entity
-  parent: PartTerminator
-  id: RightFootTerminator
-  name: right nt-800 foot
-  components:
-  - type: Sprite
-    state: r_foot
-  - type: Icon
-    state: r_foot
-  - type: BodyPart
-    partType: Foot
-    symmetry: Right

Resources/Prototypes/Body/Prototypes/terminator.yml

@@ -1,85 +0,0 @@
-# not quite human...
-- type: body
-  id: TerminatorFlesh
-  name: exterminator
-  root: torso
-  slots:
-    head:
-      part: HeadHuman
-      connections:
-      - torso
-      organs:
-        brain: MobTerminatorEndoskeleton
-    torso:
-      part: TorsoHuman
-      connections:
-      - left arm
-      - right arm
-      - left leg
-      - right leg
-    right arm:
-      part: RightArmHuman
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmHuman
-      connections:
-      - left hand
-    right hand:
-      part: RightHandHuman
-    left hand:
-      part: LeftHandHuman
-    right leg:
-      part: RightLegHuman
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegHuman
-      connections:
-      - left foot
-    right foot:
-      part: RightFootHuman
-    left foot:
-      part: LeftFootHuman
-
-# TODO: terminator body parts
-- type: body
-  id: TerminatorEndoskeleton
-  name: terminatorEndoskeleton
-  root: torso
-  slots:
-    head:
-      part: HeadTerminator
-      connections:
-      - torso
-    torso:
-      part: TorsoTerminator
-      connections:
-      - left arm
-      - right arm
-      - left leg
-      - right leg
-    right arm:
-      part: RightArmTerminator
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmTerminator
-      connections:
-      - left hand
-    right hand:
-      part: RightHandTerminator
-    left hand:
-      part: LeftHandTerminator
-    right leg:
-      part: RightLegTerminator
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegTerminator
-      connections:
-      - left foot
-    right foot:
-      part: RightFootTerminator
-    left foot:
-      part: LeftFootTerminator