Merge remote-tracking branch 'upstream/master' into up/drinks-yml

# Conflicts:
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml

Resources/Prototypes/Entities/Clothing/Back/backpacks.yml

@@ -46,6 +46,12 @@
   - type: Storage
     storageOpenSound:
       collection: BikeHorn
+      params:
+        variation: 0.125
+    storageInsertSound:
+      collection: FootstepClown
+      params:
+        variation: 0.125
 
 - type: entity
   parent: ClothingBackpack

Resources/Prototypes/Entities/Clothing/Back/duffel.yml

@@ -62,6 +62,12 @@
   - type: Storage
     storageOpenSound:
       collection: BikeHorn
+      params:
+        variation: 0.125
+    storageInsertSound:
+      collection: FootstepClown
+      params:
+        variation: 0.125
 
 - type: entity
   parent: [ClothingBackpackDuffel, BaseSecurityContraband]

Resources/Prototypes/Entities/Clothing/Back/satchel.yml

@@ -50,6 +50,12 @@
   - type: Storage
     storageOpenSound:
       collection: BikeHorn
+      params:
+        variation: 0.125
+    storageInsertSound:
+      collection: FootstepClown
+      params:
+        variation: 0.125
 
 - type: entity
   parent: ClothingBackpackSatchel

Resources/Prototypes/Entities/Clothing/Back/smuggler.yml

@@ -85,11 +85,11 @@
           children:
           - id: RevolverCapGun
             amount: !type:RangeNumberSelector
-              range: 4, 8
+              range: 4, 6
             weight: 95
           - id: RevolverCapGunFake
             amount: !type:RangeNumberSelector
-              range: 1, 8
+              range: 1, 6
             weight: 5
 
 - type: entity

Resources/Prototypes/Entities/Clothing/Back/specific.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingBackpack
+  parent: [ClothingBackpack, BaseChameleon]
   id: ClothingBackpackChameleon
   name: backpack
   description: You wear this on your back and put items into it.
@@ -96,6 +96,7 @@
     - WhitelistChameleon
     - CorgiWearable
     - PetOnly
+    - ScurretWearable
   - type: Construction
     graph: ClothingBagPet
     node: bagPet

Resources/Prototypes/Entities/Clothing/Ears/specific.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingHeadsetGrey
+  parent: [ClothingHeadsetGrey, BaseChameleon]
   id: ClothingHeadsetChameleon
   name: passenger headset
   description: An updated, modular intercom that fits over the head. Takes encryption keys.
@@ -14,7 +14,3 @@
     - type: ChameleonClothing
       slot: [ears]
       default: ClothingHeadsetGrey
-    - type: UserInterface
-      interfaces:
-        enum.ChameleonUiKey.Key:
-          type: ChameleonBoundUserInterface

Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

@@ -281,7 +281,7 @@
   - type: FlashImmunity
 
 - type: entity
-  parent: ClothingEyesBase
+  parent: [ClothingEyesBase, ShowSecurityIcons, BaseSecurityContraband]
   id: ClothingEyesGlassesNoir
   name: noir-tech glasses
   description: A pair of glasses that simulate what the world looked like before the invention of color.

Resources/Prototypes/Entities/Clothing/Eyes/specific.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingEyesBase
+  parent: [ClothingEyesBase, BaseChameleon]
   id: ClothingEyesChameleon # no flash immunity, sorry
   name: sun glasses
   description: Useful both for security and cargonia.
@@ -7,7 +7,7 @@
   components:
     - type: Tag
       tags: # intentionally no WhitelistChameleon tag
-      - PetWearable 
+      - PetWearable
     - type: Sprite
       sprite: Clothing/Eyes/Glasses/sunglasses.rsi
     - type: Clothing
@@ -15,8 +15,3 @@
     - type: ChameleonClothing
       slot: [eyes]
       default: ClothingEyesGlassesSunglasses
-    - type: UserInterface
-      interfaces:
-        enum.ChameleonUiKey.Key:
-          type: ChameleonBoundUserInterface
-

Resources/Prototypes/Entities/Clothing/Hands/specific.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingHandsButcherable
+  parent: [ClothingHandsButcherable, BaseChameleon]
   id: ClothingHandsChameleon # doesn't protect from electricity or heat
   name: black gloves
   description: Regular black gloves that do not keep you from frying.
@@ -17,10 +17,6 @@
     - type: Fiber
       fiberMaterial: fibers-chameleon
     - type: FingerprintMask
-    - type: UserInterface
-      interfaces:
-        enum.ChameleonUiKey.Key:
-          type: ChameleonBoundUserInterface
 
 - type: entity
   parent: ClothingHandsChameleon

Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml

@@ -141,6 +141,7 @@
     - Snout
     - HeadTop
     - HeadSide
+    - FacialHair
 
 - type: entity
   abstract: true
@@ -189,6 +190,7 @@
     - Snout
     - HeadTop
     - HeadSide
+    - FacialHair
 
 - type: entity
   abstract: true

Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml

@@ -33,6 +33,12 @@
       head-vox:
       - state: equipped-head-light-vox
         shader: unshaded
+      head-vulpkanin:
+      - state: equipped-head-light-vulpkanin
+        shader: unshaded
+      head-reptilian:
+      - state: equipped-head-light-reptilian
+        shader: unshaded
       head-dog:
       - state: equipped-head-light-dog
         shader: unshaded
@@ -46,6 +52,14 @@
       - state: equipped-head-vox
       - state: equipped-head-unshaded-vox
         shader: unshaded
+      head-vulpkanin:
+      - state: equipped-head-vulpkanin
+      - state: equipped-head-unshaded-vulpkanin
+        shader: unshaded
+      head-reptilian:
+      - state: equipped-head-reptilian
+      - state: equipped-head-unshaded-reptilian
+        shader: unshaded
       head-dog:
       - state: equipped-head-dog
       - state: equipped-head-unshaded-dog
@@ -93,6 +107,12 @@
       head-vox:
       - state: equipped-head-light-vox
         shader: unshaded
+      head-vulpkanin:
+      - state: equipped-head-light-vulpkanin
+        shader: unshaded
+      head-reptilian:
+      - state: equipped-head-light-reptilian
+        shader: unshaded
       head-dog:
       - state: equipped-head-light-dog
         shader: unshaded
@@ -106,6 +126,14 @@
       - state: equipped-head-vox
       - state: equipped-head-unshaded-vox
         shader: unshaded
+      head-vulpkanin:
+      - state: equipped-head-vulpkanin
+      - state: equipped-head-unshaded-vulpkanin
+        shader: unshaded
+      head-reptilian:
+      - state: equipped-head-reptilian
+      - state: equipped-head-unshaded-reptilian
+        shader: unshaded
       head-dog:
       - state: equipped-head-dog
       - state: equipped-head-unshaded-dog
@@ -147,6 +175,12 @@
       head-vox:
       - state: equipped-head-light-vox
         shader: unshaded
+      head-vulpkanin:
+      - state: equipped-head-light-vulpkanin
+        shader: unshaded
+      head-reptilian:
+      - state: equipped-head-light-reptilian
+        shader: unshaded
       head-dog:
       - state: equipped-head-light-dog
         shader: unshaded
@@ -160,6 +194,14 @@
       - state: equipped-head-vox
       - state: equipped-head-unshaded-vox
         shader: unshaded
+      head-vulpkanin:
+      - state: equipped-head-vulpkanin
+      - state: equipped-head-unshaded-vulpkanin
+        shader: unshaded
+      head-reptilian:
+      - state: equipped-head-reptilian
+      - state: equipped-head-unshaded-reptilian
+        shader: unshaded
       head-dog:
       - state: equipped-head-dog
       - state: equipped-head-unshaded-dog
@@ -223,6 +265,9 @@
       head-vox:
       - state: equipped-head-light-vox
         shader: unshaded
+      head-reptilian:
+      - state: equipped-head-reptilian
+        shader: unshaded
       head-dog:
       - state: equipped-head-light-dog
         shader: unshaded
@@ -236,6 +281,10 @@
       - state: equipped-head-vox
       - state: equipped-head-unshaded-vox
         shader: unshaded
+      head-reptilian:
+      - state: equipped-head-reptilian
+      - state: equipped-head-unshaded-reptilian
+        shader: unshaded
       head-dog:
       - state: equipped-head-dog
       - state: equipped-head-unshaded-dog
@@ -398,6 +447,12 @@
       head-vox:
       - state: equipped-head-light-vox
         shader: unshaded
+      head-vulpkanin:
+      - state: equipped-head-light-vulpkanin
+        shader: unshaded
+      head-reptilian:
+      - state: equipped-head-light-reptilian
+        shader: unshaded
       head-dog:
       - state: equipped-head-light-dog
         shader: unshaded
@@ -411,6 +466,14 @@
       - state: equipped-head-vox
       - state: equipped-head-unshaded-vox
         shader: unshaded
+      head-vulpkanin:
+      - state: equipped-head-vulpkanin
+      - state: equipped-head-unshaded-vulpkanin
+        shader: unshaded
+      head-reptilian:
+      - state: equipped-head-reptilian
+      - state: equipped-head-unshaded-reptilian
+        shader: unshaded
       head-dog:
       - state: equipped-head-dog
       - state: equipped-head-unshaded-dog
@@ -729,6 +792,9 @@
       head-vox:
       - state: equipped-HELMET-light-vox
         shader: unshaded
+      head-reptilian:
+      - state: equipped-HELMET-light-reptilian
+        shader: unshaded
   - type: Clothing
     sprite: Clothing/Head/Hardsuits/piratecaptainhelm.rsi
     clothingVisuals:
@@ -740,6 +806,10 @@
       - state: equipped-HELMET-vox
       - state: equipped-HELMET-unshaded-vox
         shader: unshaded
+      head-reptilian:
+      - state: equipped-HELMET-reptilian
+      - state: equipped-HELMET-unshaded-reptilian
+        shader: unshaded
   - type: PointLight # Color matches visor colors, radius/energy same as mining hardsuit for the big captain.
     color: "#f3ea9c"
     radius: 7
@@ -890,6 +960,10 @@
       - state: equipped-head-vox
       - state: equipped-head-unshaded-vox
         shader: unshaded
+      head-reptilian:
+      - state: equipped-head-reptilian
+      - state: equipped-head-unshaded-reptilian
+        shader: unshaded
   - type: PointLight
     color: orange
   - type: PressureProtection

Resources/Prototypes/Entities/Clothing/Head/helmets.yml

@@ -585,8 +585,6 @@
     modifiers:
       coefficients:
         Blunt: 0.95
-  - type: StaminaResistance
-    damageCoefficient: 0.95
   - type: Construction
     graph: cardHelmet
-    node: cardhelmet
+    node: cardhelmet

Resources/Prototypes/Entities/Clothing/Head/misc.yml

@@ -198,7 +198,7 @@
     sprite: Clothing/Head/Misc/fancycrown.rsi
   - type: TypingIndicatorClothing
     proto: regal
-  - type: MobPrice
+  - type: StaticPrice
     price: 3000
   - type: AddAccentClothing
     accent: MobsterAccent

Resources/Prototypes/Entities/Clothing/Head/specific.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingHeadBase
+  parent: [ClothingHeadBase, BaseChameleon]
   id: ClothingHeadHatChameleon
   name: beret
   description: A beret, an artists favorite headwear.
@@ -14,10 +14,6 @@
     - type: ChameleonClothing
       slot: [HEAD]
       default: ClothingHeadHatBeret
-    - type: UserInterface
-      interfaces:
-        enum.ChameleonUiKey.Key:
-          type: ChameleonBoundUserInterface
 
 - type: entity
   parent: ClothingHeadHatFedoraBrown

Resources/Prototypes/Entities/Clothing/Masks/specific.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingMaskBase
+  parent: [ClothingMaskBase, BaseChameleon]
   id: ClothingMaskGasChameleon
   name: gas mask
   description: A face-covering mask that can be connected to an air supply.
@@ -16,10 +16,6 @@
       default: ClothingMaskGas
     - type: BreathMask
     - type: IdentityBlocker # need that for default ClothingMaskGas
-    - type: UserInterface
-      interfaces:
-        enum.ChameleonUiKey.Key:
-          type: ChameleonBoundUserInterface
     - type: HideLayerClothing
       slots:
       - Snout
@@ -30,6 +26,12 @@
   suffix: Voice Mask, Chameleon
   components:
     - type: VoiceMask
+    - type: UIRequiresLock
+      userInterfaceKeys:
+        - enum.ChameleonUiKey.Key
+        - enum.VoiceMaskUIKey.Key
+      accessDeniedSound: null
+      popup: null
     - type: HideLayerClothing
       slots:
       - Snout

Resources/Prototypes/Entities/Clothing/Neck/pins.yml

@@ -14,6 +14,25 @@
 
 - type: entity
   parent: ClothingNeckPinBase
+  id: ClothingGenderPinBase
+  abstract: true
+  components:
+  - type: ChameleonClothing
+    slot: Neck
+#    default: ClothingNeckLGBTPin
+    requireTag: GenderPin
+  - type: UserInterface
+    interfaces:
+      enum.ChameleonUiKey.Key:
+        type: ChameleonBoundUserInterface
+  - type: Tag
+    tags:
+    - ClothMade #idk man its on the parent
+    - WhitelistChameleon
+    - GenderPin
+
+- type: entity
+  parent: ClothingGenderPinBase
   id: ClothingNeckLGBTPin
   name: LGBT pin
   description: Be gay do crime.
@@ -22,9 +41,11 @@
     state: lgbt
   - type: Clothing
     equippedPrefix: lgbt
+  - type: ChameleonClothing
+    default: ClothingNeckLGBTPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckAllyPin
   name: straight ally pin
   description: Be ally do crime.
@@ -33,9 +54,11 @@
     state: ally
   - type: Clothing
     equippedPrefix: ally
+  - type: ChameleonClothing
+    default: ClothingNeckAllyPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckAromanticPin
   name: aromantic pin
   description: Be aro do crime.
@@ -44,9 +67,11 @@
     state: aro
   - type: Clothing
     equippedPrefix: aro
+  - type: ChameleonClothing
+    default: ClothingNeckAromanticPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckAroacePin
   name: aroace pin
   description: Be aroace do crime.
@@ -55,9 +80,11 @@
     state: aroace
   - type: Clothing
     equippedPrefix: aroace
+  - type: ChameleonClothing
+    default: ClothingNeckAroacePin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckAsexualPin
   name: asexual pin
   description: Be ace do crime.
@@ -66,9 +93,11 @@
     state: asex
   - type: Clothing
     equippedPrefix: asex
+  - type: ChameleonClothing
+    default: ClothingNeckAsexualPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckBisexualPin
   name: bisexual pin
   description: Be bi do crime.
@@ -77,9 +106,11 @@
     state: bi
   - type: Clothing
     equippedPrefix: bi
+  - type: ChameleonClothing
+    default: ClothingNeckBisexualPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckGayPin
   name: gay pin
   description: Be gay~ do crime.
@@ -88,9 +119,11 @@
     state: gay
   - type: Clothing
     equippedPrefix: gay
+  - type: ChameleonClothing
+    default: ClothingNeckGayPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckIntersexPin
   name: intersex pin
   description: Be intersex do crime.
@@ -99,9 +132,11 @@
     state: inter
   - type: Clothing
     equippedPrefix: inter
+  - type: ChameleonClothing
+    default: ClothingNeckIntersexPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckLesbianPin
   name: lesbian pin
   description: Be lesbian do crime.
@@ -110,9 +145,11 @@
     state: les
   - type: Clothing
     equippedPrefix: les
+  - type: ChameleonClothing
+    default: ClothingNeckLesbianPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckNonBinaryPin
   name: non-binary pin
   description: "01100010 01100101 00100000 01100101 01101110 01100010 01111001 00100000 01100100 01101111 00100000 01100011 01110010 01101001 01101101 01100101"
@@ -121,9 +158,11 @@
     state: non
   - type: Clothing
     equippedPrefix: non
+  - type: ChameleonClothing
+    default: ClothingNeckNonBinaryPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckPansexualPin
   name: pansexual pin
   description: Be pan do crime.
@@ -132,9 +171,11 @@
     state: pan
   - type: Clothing
     equippedPrefix: pan
+  - type: ChameleonClothing
+    default: ClothingNeckPansexualPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckPluralPin
   name: plural pin
   description: Be plural, do crimes.
@@ -143,9 +184,11 @@
     state: plural
   - type: Clothing
     equippedPrefix: plural
+  - type: ChameleonClothing
+    default: ClothingNeckPluralPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckOmnisexualPin
   name: omnisexual pin
   description: Be omni do crime.
@@ -154,9 +197,11 @@
     state: omni
   - type: Clothing
     equippedPrefix: omni
+  - type: ChameleonClothing
+    default: ClothingNeckOmnisexualPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckGenderqueerPin
   name: genderqueer pin
   description: be crime, do gender
@@ -165,9 +210,11 @@
     state: gender
   - type: Clothing
     equippedPrefix: gender
+  - type: ChameleonClothing
+    default: ClothingNeckGenderqueerPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckGenderfluidPin
   name: genderfluid pin
   description: be gender, be fluid
@@ -176,9 +223,11 @@
     state: fluid
   - type: Clothing
     equippedPrefix: fluid
+  - type: ChameleonClothing
+    default: ClothingNeckGenderfluidPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckTransPin
   name: transgender pin
   description: Be trans do crime.
@@ -187,6 +236,8 @@
     state: trans
   - type: Clothing
     equippedPrefix: trans
+  - type: ChameleonClothing
+    default: ClothingNeckTransPin
 
 - type: entity
   parent: ClothingNeckPinBase

Resources/Prototypes/Entities/Clothing/Neck/specific.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingNeckBase
+  parent: [ClothingNeckBase, BaseChameleon]
   id: ClothingNeckChameleon
   name: striped red scarf
   description: A stylish striped red scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
@@ -14,7 +14,3 @@
     - type: ChameleonClothing
       slot: [NECK]
       default: ClothingNeckScarfStripedRed
-    - type: UserInterface
-      interfaces:
-        enum.ChameleonUiKey.Key:
-          type: ChameleonBoundUserInterface

Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

@@ -505,8 +505,6 @@
     modifiers:
       coefficients:
         Blunt: 0.9
-  - type: StaminaResistance
-    damageCoefficient: 0.90
   - type: Construction
     graph: cardArmour
-    node: cardarmour
+    node: cardarmour

Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml

@@ -145,6 +145,9 @@
       flatReductions:
         Heat: 10 # the average lightbulb only does around four damage!
     slots: OUTERCLOTHING
+  - type: HideLayerClothing
+    slots:
+    - Tail
 
 - type: entity
   abstract: true
@@ -174,6 +177,9 @@
       flatReductions:
         Heat: 10 # the average lightbulb only does around four damage!
     slots: OUTERCLOTHING
+  - type: HideLayerClothing
+    slots:
+    - Tail
 
 - type: entity
   parent: ClothingOuterBase

Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml

@@ -9,6 +9,9 @@
     sprite: Clothing/OuterClothing/Bio/general.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Bio/general.rsi
+  - type: HideLayerClothing
+    slots:
+    - Tail
   - type: Armor
     modifiers:
       coefficients:

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -974,7 +974,7 @@
     damageCoefficient: 0.2
   - type: FireProtection
     reduction: 0.8
-  - type: StaminaResistance
+  - type: StaminaResistance # do not add these to other equipment or mobs, we don't want to microbalance these everywhere
     damageCoefficient: 0.15 # Needs 21 hits with a disabler to stun :godo:
   - type: Armor
     modifiers:

Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingOuterBase
+  parent: [ClothingOuterBase, BaseChameleon]
   id: ClothingOuterChameleon
   name: vest
   description: A thick vest with a rubbery, water-resistant shell.
@@ -14,10 +14,6 @@
     - type: ChameleonClothing
       slot: [outerClothing]
       default: ClothingOuterVest
-    - type: UserInterface
-      interfaces:
-        enum.ChameleonUiKey.Key:
-          type: ChameleonBoundUserInterface
     - type: TemperatureProtection # Same as a basic winter coat.
       heatingCoefficient: 1.1
       coolingCoefficient: 0.1

Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

@@ -27,6 +27,9 @@
     - WhitelistChameleon
   - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
+  - type: HideLayerClothing
+    slots:
+      - Tail
 
 - type: entity
   parent: ClothingOuterSuitBomb
@@ -70,6 +73,9 @@
   - type: GroupExamine
   - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
+  - type: HideLayerClothing
+    slots:
+    - Tail
 
 - type: entity
   parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
@@ -106,6 +112,9 @@
     tags:
     - CorgiWearable
     - WhitelistChameleon
+  - type: HideLayerClothing
+    slots:
+    - Tail
 
 - type: entity
   parent: [ClothingOuterBaseLarge, GeigerCounterClothing, AllowSuitStorageClothing]
@@ -131,6 +140,9 @@
       toggleable-clothing: !type:ContainerSlot {}
   - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
+  - type: HideLayerClothing
+    slots:
+    - Tail
 
 - type: entity
   parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseToggleClothing, BaseMajorContraband]
@@ -195,6 +207,9 @@
         whitelist:
           tags:
             - PowerCell
+  - type: HideLayerClothing
+    slots:
+    - Tail
 
 - type: entity
   parent: ClothingOuterBase
@@ -292,6 +307,9 @@
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}
+  - type: HideLayerClothing
+    slots:
+    - Tail
 
 - type: entity
   parent: ClothingOuterSuitCarp

Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml

@@ -55,6 +55,7 @@
           tags:
           - Knife
           - Sidearm
+        priority: 4
 
 - type: entity
   abstract: true

Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml

@@ -108,8 +108,8 @@
       volume: 0.75
       temperature: 293.15
       moles:
-      - 0.153853429 # oxygen
-      - 0.153853429 # nitrogen
+        Oxygen: 0.153853429 # oxygen
+        Nitrogen: 0.153853429 # nitrogen
   - type: Item
     sprite: null
     size: Normal

Resources/Prototypes/Entities/Clothing/Shoes/misc.yml

@@ -135,6 +135,7 @@
   - type: ClothingSpeedModifier
     walkModifier: 1.5
     sprintModifier: 1.5
+    standing: true
   - type: Appearance
   - type: GenericVisualizer
     visuals:
@@ -182,7 +183,7 @@
     price: 75
   - type: Tag
     tags: [ ]
-   
+
 - type: entity
   parent: ClothingShoesBase
   id: ClothingShoesBootsJump
@@ -200,7 +201,7 @@
     jumpSound: /Audio/Effects/stealthoff.ogg
   - type: ActionGrant
     actions:
-    - ActionGravityJump 
+    - ActionGravityJump
   - type: ItemActionGrant
     actions:
     - ActionGravityJump

Resources/Prototypes/Entities/Clothing/Shoes/specific.yml

@@ -163,7 +163,7 @@
     sprite: Clothing/Shoes/Specific/wizard.rsi
 
 - type: entity
-  parent: ClothingShoesBase
+  parent: [ClothingShoesBase, BaseChameleon]
   id: ClothingShoesChameleon
   name: black shoes
   suffix: Chameleon
@@ -197,10 +197,6 @@
     - type: ChameleonClothing
       slot: [FEET]
       default: ClothingShoesColorBlack
-    - type: UserInterface
-      interfaces:
-        enum.ChameleonUiKey.Key:
-          type: ChameleonBoundUserInterface
 
 - type: entity
   parent: ClothingShoesChameleon

Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml

@@ -49,17 +49,6 @@
     sprite: Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi
 
 #Paramedic
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitParamedicNT
-  name: paramedic jumpsuit
-  description: A basic white & blue jumpsuit made for Nanotrasen paramedics stationed in combat sectors.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi
-
 - type: entity
   parent: [ ClothingUniformBase, BaseSyndicateContraband ]
   id: ClothingUniformJumpsuitParamedicSyndie
@@ -73,17 +62,6 @@
 
 #HEADS OF STAFF
 #Chief Engineer
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitChiefEngineerNT
-  name: chief engineer jumpsuit
-  description: It is often joked that the role of the combat-sector Chief Engineer is where the actual, logistically-minded engineers are promoted to. Good luck.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/ce_nt.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/ce_nt.rsi
-
 - type: entity
   parent: [ ClothingUniformBase, BaseSyndicateContraband ]
   id: ClothingUniformJumpsuitChiefEngineerSyndie

Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ClothingUniformBase, BaseChameleon]
   id: ClothingUniformJumpsuitChameleon
   name: black jumpsuit
   description: A generic black jumpsuit with no rank markings.
@@ -36,7 +36,3 @@
     - type: ChameleonClothing
       slot: [innerclothing]
       default: ClothingUniformJumpsuitColorBlack
-    - type: UserInterface
-      interfaces:
-        enum.ChameleonUiKey.Key:
-          type: ChameleonBoundUserInterface

Resources/Prototypes/Entities/Markers/Spawners/Random/folders.yml

@@ -10,15 +10,15 @@
   - type: Sprite
     sprite: Objects/Misc/folders.rsi
     layers:
-      - state: folder-base
-      - state: folder-colormap
+    - state: folder-base
+    - state: folder-colormap
   - type: RandomSpawner
     offset: 0
     prototypes:
-      - BoxFolderRed
-      - BoxFolderBlue
-      - BoxFolderYellow
-      - BoxFolderWhite
-      - BoxFolderGrey
-      - BoxFolderBlack
-      - BoxFolderGreen
+    - BoxFolderBase
+    - BoxFolderRed
+    - BoxFolderBlue
+    - BoxFolderYellow
+    - BoxFolderGrey
+    - BoxFolderBlack
+    - BoxFolderGreen

Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml

@@ -110,7 +110,7 @@
     description: ghost-role-information-loneop-description
     rules: ghost-role-information-loneop-rules
     mindRoles:
-    - MindRoleGhostRoleSoloAntagonist
+    - MindRoleLoneops
   - type: Sprite
     sprite: Markers/jobs.rsi
     layers:
@@ -211,6 +211,18 @@
     - sprite: Mobs/Aliens/paradox_clone.rsi
       state: preview
 
+- type: entity
+  categories: [ HideSpawnMenu, Spawner ]
+  parent: SpawnPointGhostDerelictCyborg
+  id: SpawnPointGhostDerelictEngineeringCyborg
+  components:
+  - type: GhostRole
+    name: ghost-role-information-derelict-engineering-cyborg-name
+    description: ghost-role-information-derelict-engineering-cyborg-description
+    rules: ghost-role-information-silicon-rules
+    raffle:
+      settings: default
+
 - type: entity
   categories: [ HideSpawnMenu, Spawner ]
   parent: BaseAntagSpawner
@@ -229,6 +241,54 @@
     - sprite: Mobs/Silicon/chassis.rsi
       state: derelict_icon
 
+- type: entity
+  categories: [ HideSpawnMenu, Spawner ]
+  parent: SpawnPointGhostDerelictCyborg
+  id: SpawnPointGhostDerelictJanitorCyborg
+  components:
+  - type: GhostRole
+    name: ghost-role-information-derelict-janitor-cyborg-name
+    description: ghost-role-information-derelict-janitor-cyborg-description
+    rules: ghost-role-information-silicon-rules
+    raffle:
+      settings: default
+
+- type: entity
+  categories: [ HideSpawnMenu, Spawner ]
+  parent: SpawnPointGhostDerelictCyborg
+  id: SpawnPointGhostDerelictMedicalCyborg
+  components:
+  - type: GhostRole
+    name: ghost-role-information-derelict-medical-cyborg-name
+    description: ghost-role-information-derelict-medical-cyborg-description
+    rules: ghost-role-information-silicon-rules
+    raffle:
+      settings: default
+
+- type: entity
+  categories: [ HideSpawnMenu, Spawner ]
+  parent: SpawnPointGhostDerelictCyborg
+  id: SpawnPointGhostDerelictMiningCyborg
+  components:
+  - type: GhostRole
+    name: ghost-role-information-derelict-mining-cyborg-name
+    description: ghost-role-information-derelict-mining-cyborg-description
+    rules: ghost-role-information-silicon-rules
+    raffle:
+      settings: default
+
+- type: entity
+  categories: [ HideSpawnMenu, Spawner ]
+  parent: SpawnPointGhostDerelictCyborg
+  id: SpawnPointGhostDerelictSyndicateAssaultCyborg
+  components:
+  - type: GhostRole
+    name: ghost-role-information-derelict-syndicate-assault-cyborg-name
+    description: ghost-role-information-derelict-syndicate-assault-cyborg-description
+    rules: ghost-role-information-silicon-rules
+    raffle:
+      settings: default
+
 - type: entity
   categories: [ HideSpawnMenu, Spawner ]
   parent: BaseAntagSpawner

Resources/Prototypes/Entities/Markers/Spawners/jobs.yml

@@ -36,6 +36,17 @@
   - type: SpawnPoint
     spawn_type: LateJoin
 
+- type: entity
+  name: any job spawn point
+  id: SpawnPointAnyJob # used for integration tests so we don't need to map every single job spawner on the test map
+  parent: SpawnPointJobBase
+  components:
+  - type: Sprite
+    state: green
+  - type: SpawnPoint
+    spawn_type: Job
+    job_id: null # any job can spawn here
+
 # Cargo
 
 - type: entity

Resources/Prototypes/Entities/Markers/Spawners/nuke_ops_spawners.yml

@@ -0,0 +1,243 @@
+# Tables
+
+- type: entityTable
+  id: NukeOpsLootTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: NukeOpsUplinkLootTable
+      weight: 6.25
+    - !type:NestedSelector
+      tableId: NukeOpsWeaponsTable
+      weight: 0.25
+    - !type:NestedSelector
+      tableId: NukeOpsGrenadeTable
+      weight: 0.75
+    - !type:NestedSelector
+      tableId: NukeOpsAmmoTable
+      weight: 0.75
+    - !type:NestedSelector
+      tableId: NukeOpsMedKitGeneral
+      weight: 0.75
+
+- type: entityTable
+  id: NukeOpsUplinkLootTable
+  table: !type:GroupSelector
+    children:
+    - id: ClothingBackpackChameleonFill
+    - id: ClothingMaskGasVoiceChameleon
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+    - id: NukeDiskFake
+      weight: 0.5
+    - id: ClothingBackpackDuffelSyndicateDecoyKitFilled
+      weight: 0.75
+    - id: BriefcaseSyndieLobbyingBundleFilled
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+    - id: ChameleonProjector
+    - id: CameraBug
+    - id: SyndicateJawsOfLife
+    - id: RadioJammer
+    - id: BorgModuleMartyr
+    - id: ScramImplant
+    - id: FakeMindShieldImplanter
+      amount: !type:RangeNumberSelector
+        range: 1, 3
+    - id: EmpImplanter
+    - id: MicroBombImplanter
+    - id: SlipocalypseClusterSoap
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+    - id: ReinforcementRadioSyndicateAncestor
+    - id: ClothingEyesHudSyndicate
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+    - id: CigPackSyndicate
+      amount: !type:RangeNumberSelector
+        range: 1, 3
+    - id: PenExplodingBox
+
+- type: entityTable
+  id: NukeOpsWeaponsTable
+  table: !type:GroupSelector
+    children:
+    - id: ThrowingKnivesKit
+    - id: ClothingHandsKnuckleDustersSyndicate
+    - id: EnergyDaggerLoud
+      weight: 0.5
+    - id: WeaponRevolverPython
+    - id: WeaponPistolCobra
+    - id: WeaponShotgunSawn
+    - id: RevolverCapGunFake
+      weight: .01
+
+- type: entityTable
+  id: NukeOpsAmmoTable
+  table: !type:GroupSelector
+    children:
+    - id: MagazinePistolSubMachineGun
+    - id: MagazineRifle
+    - id: MagazineBoxLightRifle
+      weight: 0.5
+    - id: MagazineShotgunSlug
+      weight: 0.5
+    - id: MagazineShotgun
+      weight: 0.5
+    - id: MagazinePistol
+      weight: 0.5
+    - id: MagazineBoxAntiMateriel
+      weight: 0.5
+    - id: MagazinePistolCaselessRifle
+      weight: 0.5
+    - id: SpeedLoaderMagnumAP
+      weight: 0.5
+
+- type: entityTable
+  id: NukeOpsGrenadeTable
+  table: !type:GroupSelector
+    children:
+    - id: SmokeGrenade
+      weight: 1.25
+    - id: GrenadeFlashBang
+      weight: 1.25
+    - id: GrenadeShrapnel
+      weight: 1.25
+    - id: GrenadeIncendiary
+    - id: EmpGrenade
+    - id: ExGrenade
+      weight: 0.5
+    - id: SingularityGrenade
+      weight: 0.25
+    - id: WhiteholeGrenade
+      weight: 0.25
+
+- type: entityTable
+  id: NukeOpsMedkitTableBrute
+  table: !type:GroupSelector
+    children:
+    - id: MedkitFilled
+      weight: 1.5
+    - id: MedkitBruteFilled
+      weight: 1.5
+    - id: MedkitAdvancedFilled
+    - id: MedkitCombatFilled
+      weight: 0.2
+
+- type: entityTable
+  id: NukeOpsMedKitGeneral
+  table: !type:GroupSelector
+    children:
+    - id: MedkitFilled
+    - id: MedkitBruteFilled
+    - id: MedkitToxinFilled
+    - id: MedkitRadiationFilled
+    - id: MedkitOxygenFilled
+    - id: MedkitBurnFilled
+
+# Spawners
+
+- type: entity
+  name: nuke ops loot spawner
+  id: NukeOpsLootSpawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Objects/Devices/jammer.rsi
+      state: jammer
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: NukeOpsLootTable
+  placement:
+    mode: AlignTileAny
+
+- type: entity
+  name: nuke ops weapon spawner
+  id: NukeOpsWeaponSpawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Objects/Weapons/Guns/Revolvers/python.rsi
+      state: icon
+  - type: EntityTableSpawner
+    offset: 0.15
+    table: !type:NestedSelector
+      tableId: NukeOpsWeaponsTable
+  placement:
+    mode: AlignTileAny
+
+- type: entity
+  name: nuke ops brute medkit spawner
+  id: NukeOpsMedkitBruteSpawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Objects/Specific/Medical/firstaidkits.rsi
+      state: brutekit
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: NukeOpsMedkitTableBrute
+  placement:
+    mode: AlignTileAny
+
+- type: entity
+  name: nuke ops general medkit spawner
+  id: NukeOpsMedkitSpawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Objects/Specific/Medical/firstaidkits.rsi
+      state: burnkit
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: NukeOpsMedKitGeneral
+      rolls: !type:RangeNumberSelector
+        range: 2, 4
+  placement:
+    mode: AlignTileAny
+
+- type: entity
+  name: nuke ops grenade spawner
+  id: NukeOpsGrenadeSpawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Objects/Weapons/Grenades/grenade.rsi
+      state: icon
+  - type: EntityTableSpawner
+    offset: 0.15
+    table: !type:NestedSelector
+      tableId: NukeOpsGrenadeTable
+      rolls: !type:RangeNumberSelector
+        range: 1, 2
+  placement:
+    mode: AlignTileAny
+
+- type: entity
+  name: nuke ops ammo spawner
+  id: NukeOpsAmmoSpawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi
+      state: base
+  - type: EntityTableSpawner
+    offset: 0.15
+    table: !type:NestedSelector
+      tableId: NukeOpsAmmoTable
+      rolls: !type:RangeNumberSelector
+        range: 1, 2
+  placement:
+    mode: AlignTileAny

Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_chest.yml

@@ -0,0 +1,27 @@
+# Body Markings (Chest)
+- type: marking
+  id: VulpBellyCrest
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: belly_crest
+
+- type: marking
+  id: VulpBellyFull
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: belly_full
+
+- type: marking
+  id: VulpBellyFox
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: belly_fox

Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_ears.yml

@@ -0,0 +1,115 @@
+
+# Ears Markings
+- type: marking
+  id: VulpEar
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: vulp
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: vulp-inner
+
+- type: marking
+  id: VulpEarSharp
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: vulp
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: vulp-sharp
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: vulp-inner
+
+- type: marking
+  id: VulpEarFade
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: vulp
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: vulp-fade
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: vulp-inner
+
+- type: marking
+  id: VulpEarJackal
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: jackal
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: jackal-inner
+
+- type: marking
+  id: VulpEarTerrier
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: terrier
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: terrier-inner
+
+- type: marking
+  id: VulpEarFennec
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: fennec
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: fennec-inner
+
+- type: marking
+  id: VulpEarFox
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: fox
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: fox-inner
+
+- type: marking
+  id: VulpEarOtie
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: otie
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: otie-inner
+
+- type: marking
+  id: VulpEarShock
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: shock
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: shock-inner
+
+- type: marking
+  id: VulpEarCoyote
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: coyote
+    - sprite: Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: coyote-inner

Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_hair.yml

@@ -0,0 +1,261 @@
+# Hairs
+- type: marking
+  id: VulpHairAdhara
+  bodyPart: Hair
+  speciesRestriction: [ Vulpkanin ]
+  markingCategory: Hair
+  canBeDisplaced: false
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: adhara
+
+- type: marking
+  id: VulpHairAnita
+  bodyPart: Hair
+  speciesRestriction: [ Vulpkanin ]
+  markingCategory: Hair
+  canBeDisplaced: false
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: anita
+
+- type: marking
+  id: VulpHairApollo
+  bodyPart: Hair
+  speciesRestriction: [ Vulpkanin ]
+  markingCategory: Hair
+  canBeDisplaced: false
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: apollo
+
+- type: marking
+  id: VulpHairBelle
+  bodyPart: Hair
+  speciesRestriction: [ Vulpkanin ]
+  markingCategory: Hair
+  canBeDisplaced: false
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: belle
+
+- type: marking
+  id: VulpHairBraided
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: braided
+
+- type: marking
+  id: VulpHairBun
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: bun
+
+- type: marking
+  id: VulpHairCleanCut
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: clean_cut
+
+- type: marking
+  id: VulpHairCurl
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: curl
+
+- type: marking
+  id: VulpHairHawk
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: hawk
+
+- type: marking
+  id: VulpHairJagged
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: jagged
+
+- type: marking
+  id: VulpHairJeremy
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: jeremy
+
+- type: marking
+  id: VulpHairKajam
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: kajam
+
+- type: marking
+  id: VulpHairKeid
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: keid
+
+- type: marking
+  id: VulpHairKleeia
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: kleeia
+
+- type: marking
+  id: VulpHairMizar
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: mizar
+
+- type: marking
+  id: VulpHairPunkBraided
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: punkbraided
+
+- type: marking
+  id: VulpHairRaine
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: raine
+
+- type: marking
+  id: VulpHairRough
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: rough
+
+- type: marking
+  id: VulpHairShort
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: short
+
+- type: marking
+  id: VulpHairShort2
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: short2
+
+- type: marking
+  id: VulpHairSpike
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/hair.rsi
+      state: spike
+
+# Facial Hairs
+- type: marking
+  id: VulpFacialHairRuff
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  speciesRestriction: [ Vulpkanin ]
+  canBeDisplaced: false
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/facial_hair.rsi
+      state: ruff
+
+- type: marking
+  id: VulpFacialHairElder
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  speciesRestriction: [ Vulpkanin ]
+  canBeDisplaced: false
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/facial_hair.rsi
+      state: elder
+
+- type: marking
+  id: VulpFacialHairElderChin
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  speciesRestriction: [ Vulpkanin ]
+  canBeDisplaced: false
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/facial_hair.rsi
+      state: elder_chin
+
+- type: marking
+  id: VulpFacialHairKita
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  speciesRestriction: [ Vulpkanin ]
+  canBeDisplaced: false
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/facial_hair.rsi
+      state: kita
+
+- type: marking
+  id: VulpFacialHairGoatee
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  speciesRestriction: [ Vulpkanin ]
+  canBeDisplaced: false
+  sprites:
+  - sprite: Mobs/Customization/Vulpkanin/facial_hair.rsi
+    state: goatee

Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_head.yml

@@ -0,0 +1,63 @@
+# Head Markings (Head)
+- type: marking
+  id: VulpHeadBlaze
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/head_markings.rsi
+      state: blaze
+
+- type: marking
+  id: VulpHeadMask
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/head_markings.rsi
+      state: mask
+
+- type: marking
+  id: VulpPatch
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/head_markings.rsi
+      state: patch
+
+- type: marking
+  id: VulpSlash
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/head_markings.rsi
+      state: slash
+
+- type: marking
+  id: VulpStripes1
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/head_markings.rsi
+      state: stripes_1
+
+- type: marking
+  id: VulpStripes2
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/head_markings.rsi
+      state: stripes_2
+
+- type: marking
+  id: VulpVulpine
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/head_markings.rsi
+      state: vulpine

Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_limbs.yml

@@ -0,0 +1,436 @@
+- type: marking
+  id: VulpClawsHandLeft
+  bodyPart: LHand
+  markingCategory: Arms
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: claws_l_hand
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpClawsHandRight
+  bodyPart: RHand
+  markingCategory: Arms
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: claws_r_hand
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpClawsFootLeft
+  bodyPart: LFoot
+  markingCategory: Legs
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: claws_l_foot
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpClawsFootRight
+  bodyPart: RFoot
+  markingCategory: Legs
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: claws_r_foot
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+# Crest
+
+## Left Side
+- type: marking
+  id: VulpPointsCrestLegLeft
+  markingCategory: Legs
+  bodyPart: LLeg
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: crest-leg-l
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsCrestArmLeft
+  markingCategory: Arms
+  bodyPart: LArm
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: crest-arm-l
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsCrestFootLeft
+  markingCategory: Legs
+  bodyPart: LFoot
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: crest-foot-l
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsCrestHandLeft
+  markingCategory: Arms
+  bodyPart: LHand
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: crest-hand-l
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+## Right Side
+
+- type: marking
+  id: VulpPointsCrestLegRight
+  markingCategory: Legs
+  bodyPart: RLeg
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: crest-leg-r
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsCrestArmRight
+  markingCategory: Arms
+  bodyPart: RArm
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: crest-arm-r
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsCrestFootRight
+  markingCategory: Legs
+  bodyPart: RFoot
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: crest-foot-r
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsCrestHandRight
+  markingCategory: Arms
+  bodyPart: RHand
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: crest-hand-r
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+# Fade
+
+## Left Side 
+
+- type: marking
+  id: VulpPointsFadeLegLeft
+  markingCategory: Legs
+  bodyPart: LLeg
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: points_fade-leg-l
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsFadeArmLeft
+  markingCategory: Arms
+  bodyPart: LArm
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: points_fade-arm-l
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsFadeFootLeft
+  markingCategory: Legs
+  bodyPart: LFoot
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: points_fade-foot-l
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsFadeHandLeft
+  markingCategory: Arms
+  bodyPart: LHand
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: points_fade-hand-l
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+## Right Side
+
+- type: marking
+  id: VulpPointsFadeLegRight
+  markingCategory: Legs
+  bodyPart: RLeg
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: points_fade-leg-r
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsFadeArmRight
+  markingCategory: Arms
+  bodyPart: RArm
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: points_fade-arm-r
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsFadeFootRight
+  markingCategory: Legs
+  bodyPart: RFoot
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: points_fade-foot-r
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsFadeHandRight
+  markingCategory: Arms
+  bodyPart: RHand
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: points_fade-hand-r
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+# Sharp
+
+## Left Side
+
+- type: marking
+  id: VulpPointsSharpLegLeft
+  markingCategory: Legs
+  bodyPart: LLeg
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: points_sharp-leg-l
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsSharpArmLeft
+  markingCategory: Arms
+  bodyPart: LArm
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: points_sharp-arm-l
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsSharpLongArmLeft
+  markingCategory: Arms
+  bodyPart: LArm
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: points_sharp-arm-long-l
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsSharpFootLeft
+  markingCategory: Legs
+  bodyPart: LFoot
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: points_sharp-foot-l
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsSharpHandLeft
+  markingCategory: Arms
+  bodyPart: LHand
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: points_sharp-hand-l
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+## Right Side
+
+- type: marking
+  id: VulpPointsSharpLegRight
+  markingCategory: Legs
+  bodyPart: RLeg
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: points_sharp-leg-r
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsSharpArmRight
+  markingCategory: Arms
+  bodyPart: RArm
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: points_sharp-arm-r
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsSharpLongArmRight
+  markingCategory: Arms
+  bodyPart: RArm
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: points_sharp-arm-long-r
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsSharpFootRight
+  markingCategory: Legs
+  bodyPart: RFoot
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: points_sharp-foot-r
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"
+
+- type: marking
+  id: VulpPointsSharpHandRight
+  markingCategory: Arms
+  bodyPart: RHand
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: points_sharp-hand-r
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#e5e3d1"

Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_snout.yml

@@ -0,0 +1,73 @@
+# Snout Markings
+
+- type: marking
+  id: VulpSnout
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/snout_markings.rsi
+      state: snout
+
+- type: marking
+  id: VulpSnoutNose
+  bodyPart: Snout
+  markingCategory: SnoutCover
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/snout_markings.rsi
+      state: snout-nose
+
+- type: marking
+  id: VulpSnoutVulpine
+  bodyPart: Snout
+  markingCategory: SnoutCover
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/snout_markings.rsi
+      state: vulpine
+
+- type: marking
+  id: VulpSnoutVulpineLines
+  bodyPart: Snout
+  markingCategory: SnoutCover
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/snout_markings.rsi
+      state: vulpine-lines
+
+- type: marking
+  id: VulpSnoutBlaze
+  bodyPart: Snout
+  markingCategory: SnoutCover
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/snout_markings.rsi
+      state: blaze
+
+- type: marking
+  id: VulpSnoutMask
+  bodyPart: Snout
+  markingCategory: SnoutCover
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/snout_markings.rsi
+      state: mask
+
+- type: marking
+  id: VulpSnoutTop
+  bodyPart: Snout
+  markingCategory: SnoutCover
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/snout_markings.rsi
+      state: snout-top
+
+- type: marking
+  id: VulpSnoutPatch
+  bodyPart: Snout
+  markingCategory: SnoutCover
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/snout_markings.rsi
+      state: patch

Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_tail.yml

@@ -0,0 +1,68 @@
+# Tail Markings
+- type: marking
+  id: VulpTailFennec
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
+      state: fennec
+    - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
+      state: fennec-tip
+
+- type: marking
+  id: VulpTailFluffy
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
+      state: fluffy
+    - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
+      state: fluffy-tip
+
+- type: marking
+  id: VulpTailHusky
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
+      state: husky
+    - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
+      state: husky-inner
+    - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
+      state: husky-outer
+
+- type: marking
+  id: VulpTailLong
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
+      state: long
+    - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
+      state: long-tip
+
+- type: marking
+  id: VulpTailVulp
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
+      state: vulp
+    - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
+      state: vulp-tip
+
+- type: marking
+  id: VulpTailVulpFade
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [ Vulpkanin ]
+  sprites:
+    - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
+      state: vulp
+    - sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
+      state: vulp-fade

Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml

@@ -12,6 +12,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: afro2
+- type: marking
+  id: HumanHairBaby
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: baby
 - type: marking
   id: HumanHairBigafro
   bodyPart: Hair
@@ -54,6 +61,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bedheadv3
+- type: marking
+  id: HumanHairCube
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: cube
 - type: marking
   id: HumanHairPulato
   bodyPart: Hair

Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml

@@ -113,8 +113,8 @@
 - type: marking
   id: TattooEyeRight
   bodyPart: Eyes
-  markingCategory: Head
-  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf]
+  markingCategory: [Head]
+  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Vulpkanin]
   coloring:
     default:
       type:
@@ -128,7 +128,7 @@
   id: TattooEyeLeft
   bodyPart: Eyes
   markingCategory: Head
-  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf]
+  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Vulpkanin]
   coloring:
     default:
       type:

Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml

@@ -161,4 +161,34 @@
   forcedColoring: true
   sprites:
   - sprite: Mobs/Customization/vox_parts.rsi
-    state: tail_big
+    state: tail_big
+
+- type: marking
+  id: VoxTailSpikes
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Vox]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/vox_parts.rsi
+    state: tail_spikes
+
+- type: marking
+  id: VoxTailDocked
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Vox]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/vox_parts.rsi
+    state: tail_docked
+
+- type: marking
+  id: VoxTailSplit
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Vox]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/vox_parts.rsi
+    state: tail_split

Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml

@@ -56,6 +56,7 @@
 
 - type: marking
   id: TattooVoxTailRing
+  # TODO // Looks off on some tails (i.e docked/amputated), if conditionals for markings ever get implemented this needs to be updated to account for those.
   bodyPart: Tail
   markingCategory: Overlay
   speciesRestriction: [Vox]

Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml

@@ -167,7 +167,9 @@
   - type: Lock
     locked: true
     unlockOnClick: false
-  - type: ActivatableUIRequiresLock
+  - type: UIRequiresLock
+    userInterfaceKeys:
+    - enum.BorgUiKey.Key
   - type: LockedWiresPanel
   - type: Damageable
     damageContainer: Silicon
@@ -351,6 +353,7 @@
     - Syndicate
   - type: ActiveRadio
     channels:
+    - Binary
     - Syndicate
   - type: ShowSyndicateIcons
   - type: MovementAlwaysTouching
@@ -384,6 +387,44 @@
     chance: 1
   - type: ShowJobIcons
 
+- type: entity
+  id: BaseBorgChassisSyndicateDerelict #For assault borg and maybe others in time
+  parent: BaseBorgChassis # We don't want them to see Nukies or have syndi comms, their database is out of date
+  abstract: true
+  components:
+  - type: SiliconLawProvider
+    laws: SyndicateStatic #Non-subverted version so they can still be changed
+  - type: StartIonStormed
+    ionStormAmount: 3
+  - type: IonStormTarget
+    chance: 1
+  - type: ShowJobIcons
+  - type: NpcFactionMember # They're still syndicate even if they can't listen to the radio or see icons
+    factions:
+    - Syndicate
+  - type: Access
+    tags:
+    - NuclearOperative
+    - SyndicateAgent
+  - type: AccessReader
+    access: [ [ "SyndicateAgent" ], [ "NuclearOperative" ] ]
+  - type: IntrinsicRadioTransmitter # Copy components from base SyndiBorg but without the stuff we don't want
+    channels:
+    - Binary #1984
+  - type: ActiveRadio
+    channels:
+    - Binary
+  - type: MovementAlwaysTouching
+  - type: Speech
+    speechSounds: SyndieBorg
+    allowedEmotes:
+    - Laugh
+  - type: Vocal
+    sounds:
+      Unsexed: UnisexSiliconSyndicate
+  - type: PointLight
+    color: "#dd200b"
+
 - type: entity
   parent: BaseBorgChassisNotIonStormable
   id: BaseXenoborgChassis

Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml

@@ -206,7 +206,7 @@
       map: ["light"]
       visible: false
   - type: BorgChassis
-    maxModules: 5 # the sixth one broke lol
+    maxModules: 5 # One less module slot than the regular module to reflect this being a "broken" cyborg.
     moduleWhitelist:
       tags:
       - BorgModuleGeneric
@@ -218,4 +218,165 @@
     interactSuccessString: petting-success-derelict-cyborg
     interactFailureString: petting-failure-derelict-cyborg
     interactSuccessSound:
-      path: /Audio/Ambience/Objects/periodic_beep.ogg
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
+
+- type: entity
+  parent: BaseBorgChassisDerelict
+  id: EngineeringBorgChassisDerelict
+  name: derelict engineer cyborg
+  description: A man-machine hybrid that assists the engineering department. This one seems to have chunks of strange crystals pockmarking its surface.
+  components:
+  - type: Sprite
+    layers:
+    - state: engineer_derelict
+    - state: engineer_e_r
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: engineer_derelict_crystal #This layer and the layer below are duplicated in order to create a more mellow unshaded layer. See https://github.com/space-wizards/space-station-14/pull/37869 for more info on the method.
+      shader: unshaded
+    - state: engineer_derelict_crystal
+      shader: shaded
+    - state: engineer_l
+      shader: unshaded
+      map: ["light"]
+      visible: false
+  - type: BorgChassis
+    maxModules: 5 # One less module slot than the regular module to reflect this being a "broken" cyborg.
+    moduleWhitelist:
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleEngineering
+    hasMindState: engineer_e
+    noMindState: engineer_e_r
+
+- type: entity
+  parent: BaseBorgChassisDerelict
+  id: JanitorBorgChassisDerelict
+  name: derelict janitor cyborg
+  description: A man-machine hybrid that assists the service department. It's a bigger mess than anything it can clean up.
+  components:
+  - type: Sprite
+    layers:
+    - state: janitor_derelict
+      map: ["movement"]
+    - state: janitor_e_r
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: janitor_l
+      shader: unshaded
+      map: ["light"]
+      visible: false
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: janitor_moving_derelict
+    noMovementLayers:
+      movement:
+        state: janitor_derelict
+  - type: BorgChassis
+    maxModules: 5 # One less module slot than the regular module to reflect this being a "broken" cyborg.
+    moduleWhitelist:
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleJanitor
+    hasMindState: janitor_e
+    noMindState: janitor_e_r
+
+- type: entity
+  parent: BaseBorgChassisDerelict
+  id: MedicalBorgChassisDerelict
+  name: derelict medical cyborg
+  description: A man-machine hybrid that assists the medical department. This one's needles don't look very sanitary.
+  components:
+  - type: Sprite
+    layers:
+    - state: medical_derelict
+      map: ["movement"]
+    - state: medical_e_r
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: medical_l
+      shader: unshaded
+      map: ["light"]
+      visible: false
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: medical_moving_derelict
+    noMovementLayers:
+      movement:
+        state: medical_derelict
+  - type: BorgChassis
+    maxModules: 6 # One less module slot than the regular module to reflect this being a "broken" cyborg.
+    moduleWhitelist:
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleMedical
+    hasMindState: medical_e
+    noMindState: medical_e_r
+
+- type: entity
+  parent: BaseBorgChassisDerelict
+  id: MiningBorgChassisDerelict
+  name: derelict salvage cyborg
+  description: A man-machine hybrid that assists the cargo department. This one has seen the wrong side of a gibtonite chunk.
+  components:
+  - type: Sprite
+    layers:
+    - state: miner_derelict
+      map: ["movement"]
+    - state: miner_e_r
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: miner_l
+      shader: unshaded
+      map: ["light"]
+      visible: false
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: miner_moving_derelict
+    noMovementLayers:
+      movement:
+        state: miner_derelict
+  - type: BorgChassis
+    maxModules: 6 # One less module slot than the regular module to reflect this being a "broken" cyborg.
+    moduleWhitelist:
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleCargo
+    hasMindState: miner_e
+    noMindState: miner_e_r
+
+- type: entity
+  parent: BaseBorgChassisSyndicateDerelict
+  id: SyndicateAssaultBorgChassisDerelict
+  name: derelict syndicate assault cyborg
+  description: A lean, mean killing machine with access to a variety of deadly modules. This one is more rust-orange than blood-red.
+  components:
+  - type: Sprite
+    layers:
+    - state: synd_sec_derelict
+    - state: synd_sec_e
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: synd_sec_l
+      shader: unshaded
+      map: ["light"]
+      visible: false
+  - type: BorgChassis
+    maxModules: 3
+    moduleWhitelist: # Note - the Derelict Assault Borg does not have a traversal module. This is intentional as Assault Borgs have space traversal with their c20 and free space movement, and they can navigate to the station using the pinpointer.
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleSyndicate
+      - BorgModuleSyndicateAssault
+    hasMindState: synd_sec_derelict_e
+    noMindState: synd_sec_derelict
+  - type: Construction
+    node: derelictcyborg

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -426,8 +426,6 @@
       - !type:GibBehavior
         recursive: false
   - type: NonSpreaderZombie
-  - type: SentienceTarget
-    flavorKind: station-event-random-sentience-flavor-organic
   - type: MeleeWeapon
     soundHit:
       path: /Audio/Effects/bite.ogg
@@ -1220,8 +1218,6 @@
       0: Alive
       200: Critical
       250: Dead
-  - type: StaminaResistance
-    damageCoefficient: 0.40
 
 - type: entity
   name: kangaroo
@@ -1433,6 +1429,7 @@
       methods: [ Touch ]
       effects:
       - !type:WashCreamPieReaction
+  - type: Crawler
 
 
 
@@ -2319,6 +2316,7 @@
       types:
         Heat : 0.2 #per second, scales with temperature & other constants
 
+# TODO: Make grenade penguin voice activated like the rest of the stealth items.
 - type: entity
   name: grenade penguin
   parent: [ MobPenguin, MobCombat, BaseSyndicateContraband ]
@@ -2926,8 +2924,6 @@
       amount: 2
   - type: ReplacementAccent
     accent: dog
-  - type: SentienceTarget
-    flavorKind: station-event-random-sentience-flavor-corgi
   - type: Tag
     tags:
     - VimPilot

Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml

@@ -19,7 +19,6 @@
     group: GenericNumber
   - type: StatusEffects
     allowed:
-    - Stutter
     - Electrocution
     - TemporaryBlindness
     - RadiationProtection

Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml

@@ -35,7 +35,6 @@
     bodyType: KinematicController # Same for all inheritors
   - type: StatusEffects
     allowed:
-    - Stutter
     - Electrocution
   - type: Pullable
   - type: Tag

Resources/Prototypes/Entities/Mobs/NPCs/pets.yml

@@ -662,6 +662,22 @@
     - meaty
     - sadness
 
+- type: entity
+  parent: MobHamsterHamlet
+  id: MobHamsterHamletSlippery
+  suffix: Slippery
+  components:
+  - type: Slippery
+  - type: StepTrigger
+    requiredTriggeredSpeed: 1
+  - type: TriggerOnStepTrigger
+  - type: GibOnTrigger
+  - type: EmitSoundOnTrigger
+    sound:
+      path: "/Audio/Animals/mouse_squeak.ogg"
+    positional: true
+    predicted: true
+
 - type: entity
   name: Shiva
   parent: MobGiantSpider
@@ -828,8 +844,6 @@
   - type: Item
     sprite: Mobs/Pets/Smile/smile.rsi
     size: Huge
-  - type: SentienceTarget
-    flavorKind: station-event-random-sentience-flavor-slime
   - type: MobPrice
     price: 3000 # it is a truly valuable creature
   - type: GhostRole

Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml

@@ -61,6 +61,7 @@
     proto: moth
   - type: InteractionPopup
     successChance: 0.99 # Imagine not being allowed to headpat a scurret, chat
+    interactDelay: 2.25
     interactSuccessString: petting-success-scurret
     interactFailureString: petting-failure-scurret
     interactSuccessSpawn: EffectHearts

Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml

@@ -15,7 +15,6 @@
     bodyType: KinematicController # Same for all inheritors
   - type: StatusEffects
     allowed:
-    - Stutter
     - Electrocution
   - type: Repairable
     doAfterDelay: 8

Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml

@@ -19,7 +19,6 @@
     baseSprintSpeed : 4
   - type: StatusEffects
     allowed:
-    - Stutter
     - Electrocution
     - TemporaryBlindness
     - Pacified
@@ -93,7 +92,6 @@
     baseDecayRate: 0.04
   - type: StatusEffects
     allowed:
-    - Stutter
     - Electrocution
     - TemporaryBlindness
     - Pacified

Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml

@@ -117,7 +117,7 @@
   components:
   - type: Action
     icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
-    iconOn: Structures/Machines/parts.rsi/box_2.png
+    iconOn: { sprite: Structures/Machines/parts.rsi, state: box_2 }
     keywords: [ "AI", "console", "interface" ]
     priority: -10
 
@@ -138,7 +138,7 @@
   components:
   - type: Action
     icon: { sprite: Interface/Actions/actions_ai.rsi, state: comms_console }
-    iconOn: Interface/Actions/actions_ai.rsi/comms_console.png
+    iconOn: { sprite: Interface/Actions/actions_ai.rsi, state: comms_console }
     keywords: [ "AI", "console", "interface" ]
     priority: -4
   - type: InstantAction
@@ -152,7 +152,7 @@
   components:
   - type: Action
     icon: { sprite: Interface/Actions/actions_ai.rsi, state: mass_scanner }
-    iconOn: Interface/Actions/actions_ai.rsi/mass_scanner.png
+    iconOn: { sprite: Interface/Actions/actions_ai.rsi, state: comms_console }
     keywords: [ "AI", "console", "interface" ]
     priority: -6
   - type: InstantAction
@@ -175,7 +175,7 @@
   components:
   - type: Action
     icon: { sprite: Interface/Actions/actions_ai.rsi, state: crew_monitor }
-    iconOn: Interface/Actions/actions_ai.rsi/crew_monitor.png
+    iconOn: { sprite: Interface/Actions/actions_ai.rsi, state: crew_monitor }
     keywords: [ "AI", "console", "interface" ]
     priority: -8
   - type: InstantAction
@@ -189,7 +189,7 @@
   components:
   - type: Action
     icon: { sprite: Interface/Actions/actions_ai.rsi, state: station_records }
-    iconOn: Interface/Actions/actions_ai.rsi/station_records.png
+    iconOn: { sprite: Interface/Actions/actions_ai.rsi, state: station_records }
     keywords: [ "AI", "console", "interface" ]
     priority: -7
   - type: InstantAction

Resources/Prototypes/Entities/Mobs/Player/changeling.yml

@@ -0,0 +1,12 @@
+- type: entity
+  parent: MobHuman
+  id: MobLing
+  name: Urist McLing
+  suffix: Non-Antag
+  components:
+  - type: ChangelingDevour
+  - type: ChangelingIdentity
+  - type: ChangelingTransform
+  - type: ActionGrant
+    actions:
+    - ActionRetractableItemArmBlade # Temporary addition, will inevitably be a purchasable in the bio-store

Resources/Prototypes/Entities/Mobs/Player/clone.yml

@@ -16,6 +16,8 @@
   # traits
   - BlackAndWhiteOverlay
   - Clumsy
+  - Hemophilia
+  - ImpairedMobility
   # - LegsParalyzed (you get healed)
   - LightweightDrunk
   - Muted
@@ -108,8 +110,10 @@
   # that means we only need to copy them over when switching between species.
   # So these don't need to be part of the Body settings, unless someone makes a trait that adjusts these components.
   - BodyEmotes
+  - MessyDrinker
   # - Fixtures TODO: A better way to clone fixtures or a fixture fix. Currently if you devour someone on the ground and transform, you lose collision with tables as they were knocked down when they were copied.
   - Speech
+  - TemperatureProtection
   - TypingIndicator
   - ScaleVisuals # for dwarf height
   eventComponents:
@@ -121,6 +125,7 @@
   - Rootable # diona
   - Sericulture # arachnids
   - MovementSpeedModifier # moths when weightless
+  - JumpAbility # vulp leaping
   copyEquipment: null
   copyInternalStorage: false
   copyImplants: false

Resources/Prototypes/Entities/Mobs/Player/dragon.yml

@@ -100,7 +100,6 @@
       types: {}
   - type: StatusEffects # Overwriting basesimplemob to remove flash, getting flashed as dragon just feelsbad
     allowed:
-    - Stutter
     - Electrocution
     - TemporaryBlindness
     - Pacified

Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml

@@ -77,9 +77,7 @@
         gasMixture:
           volume: 1000
           moles:
-            - 0 # oxygen
-            - 0 # nitrogen
-            - 340.5701689 # carbon dioxide
+            CarbonDioxide: 340.5701689 # carbon dioxide
           temperature: 373.15
   - type: Repairable
     doAfterDelay: 30 # you can heal the mothership core, but it takes a while
@@ -90,6 +88,17 @@
     maxIntensity: 100
     intensitySlope: 2
     totalIntensity: 200
+  - type: SurveillanceCameraSpeaker
+  - type: SurveillanceCameraMonitor
+  - type: RoboticsConsole
+    allowBorgControl: false
+    radioChannel: Xenoborg
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: Mothership
+    transmitFrequencyId: Mothership
+  - type: WirelessNetworkConnection
+    range: 10000 # mothership can see them from very far
   - type: WiresPanel
   - type: ActivatableUI
     key: enum.LatheUiKey.Key
@@ -101,6 +110,10 @@
         requireInputValidation: false
       enum.RadarConsoleUiKey.Key:
         type: RadarConsoleBoundUserInterface
+      enum.RoboticsConsoleUiKey.Key:
+        type: RoboticsConsoleBoundUserInterface
+      enum.SurveillanceCameraMonitorUiKey.Key:
+        type: SurveillanceCameraMonitorBoundUserInterface
       enum.LatheUiKey.Key:
         type: LatheBoundUserInterface
       enum.ResearchClientUiKey.Key:
@@ -184,9 +197,38 @@
     uis:
       enum.RadarConsoleUiKey.Key:
         toggleAction: ActionAGhostShowRadar
+      enum.RoboticsConsoleUiKey.Key:
+        toggleAction: ActionXenoborgControlMonitor
+      enum.SurveillanceCameraMonitorUiKey.Key:
+        toggleAction: ActionXenoborgCameraMonitor
   - type: ShowElectrocutionHUD
   - type: PowerMonitoringCableNetworks
   - type: RadarConsole
 
-# TODO: add xenoborg control interface action (part 5)
-# TODO: add xenoborg camera monitor interface action (part 5)
+- type: entity
+  parent: BaseAGhostAction
+  id: ActionXenoborgControlMonitor
+  name: Xenoborgs Control Console
+  description: View the Xenoborgs Control Console
+  components:
+  - type: Action
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: xenoborg-basic-module }
+    iconOn: { sprite: Interface/Actions/actions_borg.rsi, state: xenoborg-basic-module }
+    keywords: [ "Mothership Core", "console", "interface" ]
+    priority: -6
+  - type: InstantAction
+    event: !type:ToggleIntrinsicUIEvent { key: enum.RoboticsConsoleUiKey.Key }
+
+- type: entity
+  parent: BaseAGhostAction
+  id: ActionXenoborgCameraMonitor
+  name: Xenoborgs Camera Monitor
+  description: View the Xenoborgs Camera Monitor
+  components:
+  - type: Action
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: xenoborg-eye-module }
+    iconOn: { sprite: Interface/Actions/actions_borg.rsi, state: xenoborg-eye-module }
+    keywords: [ "Mothership Core", "console", "interface" ]
+    priority: -6
+  - type: InstantAction
+    event: !type:ToggleIntrinsicUIEvent { key: enum.SurveillanceCameraMonitorUiKey.Key }

Resources/Prototypes/Entities/Mobs/Player/silicon.yml

@@ -170,6 +170,10 @@
   - AiHolder
   suffix: Empty
   components:
+  - type: Anchorable
+    flags: 
+    - Anchorable
+  - type: Rotatable
   - type: WarpPoint
     blacklist:
       tags:
@@ -195,6 +199,7 @@
   - type: StationAiVision
   - type: InteractionOutline
   - type: Sprite
+    snapCardinals: true
     sprite: Mobs/Silicon/station_ai.rsi
     layers:
     - state: base
@@ -383,7 +388,7 @@
       borg_module:
         - BorgModuleOperative
         - BorgModuleL6C
-        - BorgModuleEsword
+        - BorgModuleDoubleEsword
   - type: ItemSlots
     slots:
       cell_slot:
@@ -453,8 +458,45 @@
     - PlayerBorgSyndicateSaboteurGhostRole
 
 - type: entity
-  id: PlayerBorgDerelict
+  parent: EngineeringBorgChassisDerelict
+  id: PlayerEngineeringBorgDerelict
+  suffix: Battery, Module
+  components:
+  - type: ContainerFill
+    containers:
+      borg_brain:
+      - PositronicBrain
+      borg_module:
+      - BorgModuleTool
+      - BorgModuleFireExtinguisher
+      - BorgModuleConstruction
+      - BorgModuleRCD
+      - BorgModuleCable
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHigh
+  - type: RandomMetadata
+    nameSegments: [NamesBorg]
+
+- type: entity
+  parent: PlayerEngineeringBorgDerelict
+  id: PlayerEngineeringBorgDerelictGhostRole
+  suffix: Ghost role
+  components:
+  - type: GhostRole
+    name: ghost-role-information-derelict-engineering-cyborg-name
+    description: ghost-role-information-derelict-engineering-cyborg-description
+    rules: ghost-role-information-silicon-rules
+    raffle:
+      settings: default
+    reregister: false
+  - type: GhostTakeoverAvailable
+
+- type: entity
   parent: BorgChassisDerelict
+  id: PlayerBorgDerelict
   suffix: Battery, Module
   components:
   - type: ContainerFill
@@ -473,8 +515,8 @@
     nameSegments: [NamesBorg]
 
 - type: entity
-  id: PlayerBorgDerelictGhostRole
   parent: PlayerBorgDerelict
+  id: PlayerBorgDerelictGhostRole
   suffix: Ghost role
   components:
     - type: GhostRole
@@ -483,4 +525,149 @@
       rules: ghost-role-information-silicon-rules
       raffle:
         settings: default
+      reregister: false
     - type: GhostTakeoverAvailable
+
+- type: entity
+  parent: JanitorBorgChassisDerelict
+  id: PlayerJanitorBorgDerelict
+  suffix: Battery, Module
+  components:
+  - type: ContainerFill
+    containers:
+      borg_brain:
+      - PositronicBrain
+      borg_module:
+      - BorgModuleTool
+      - BorgModuleFireExtinguisher
+      - BorgModuleCleaning
+      - BorgModuleCustodial
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHigh
+  - type: RandomMetadata
+    nameSegments: [NamesBorg]
+
+- type: entity
+  parent: PlayerJanitorBorgDerelict
+  id: PlayerJanitorBorgDerelictGhostRole
+  suffix: Ghost role
+  components:
+  - type: GhostRole
+    name: ghost-role-information-derelict-janitor-cyborg-name
+    description: ghost-role-information-derelict-janitor-cyborg-description
+    rules: ghost-role-information-silicon-rules
+    raffle:
+      settings: default
+    reregister: false
+  - type: GhostTakeoverAvailable
+
+- type: entity
+  parent: MedicalBorgChassisDerelict
+  id: PlayerMedicalBorgDerelict
+  suffix: Battery, Module
+  components:
+  - type: ContainerFill
+    containers:
+      borg_brain:
+      - PositronicBrain
+      borg_module:
+      - BorgModuleTool
+      - BorgModuleFireExtinguisher
+      - BorgModuleChemical
+      - BorgModuleTopicals
+      - BorgModuleRescue
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHigh
+  - type: RandomMetadata
+    nameSegments: [NamesBorg]
+
+- type: entity
+  parent: PlayerMedicalBorgDerelict
+  id: PlayerMedicalBorgDerelictGhostRole
+  suffix: Ghost role
+  components:
+  - type: GhostRole
+    name: ghost-role-information-derelict-medical-cyborg-name
+    description: ghost-role-information-derelict-medical-cyborg-description
+    rules: ghost-role-information-silicon-rules
+    raffle:
+      settings: default
+    reregister: false
+  - type: GhostTakeoverAvailable
+
+- type: entity
+  parent: MiningBorgChassisDerelict
+  id: PlayerMiningBorgDerelict
+  suffix: Battery, Module
+  components:
+  - type: ContainerFill
+    containers:
+      borg_brain:
+      - PositronicBrain
+      borg_module:
+      - BorgModuleTool #No fire extinguisher, traversal is better
+      - BorgModuleMining
+      - BorgModuleTraversal
+      - BorgModuleAppraisal
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHigh
+  - type: RandomMetadata
+    nameSegments: [NamesBorg]
+
+- type: entity
+  parent: PlayerMiningBorgDerelict
+  id: PlayerMiningBorgDerelictGhostRole
+  suffix: Ghost role
+  components:
+  - type: GhostRole
+    name: ghost-role-information-derelict-mining-cyborg-name
+    description: ghost-role-information-derelict-mining-cyborg-description
+    rules: ghost-role-information-silicon-rules
+    raffle:
+      settings: default
+    reregister: false
+  - type: GhostTakeoverAvailable
+
+- type: entity
+  parent: SyndicateAssaultBorgChassisDerelict
+  id: PlayerSyndicateAssaultBorgDerelict
+  suffix: Battery, Module
+  components:
+  - type: ContainerFill
+    containers:
+      borg_brain:
+      - PositronicBrain
+      borg_module:
+      - BorgModuleOperative
+      - BorgModuleC20r
+      - BorgModuleEsword
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHyper
+  - type: RandomMetadata
+    nameSegments: [NamesDeathCommando]
+
+- type: entity
+  parent: PlayerSyndicateAssaultBorgDerelict
+  id: PlayerBorgSyndicateDerelictGhostRole
+  suffix: Ghost role
+  components:
+  - type: GhostRole
+    name: ghost-role-information-derelict-syndicate-assault-cyborg-name
+    description: ghost-role-information-derelict-syndicate-assault-cyborg-description
+    rules: ghost-role-information-silicon-rules
+    raffle:
+      settings: default
+    reregister: false
+  - type: GhostTakeoverAvailable

Resources/Prototypes/Entities/Mobs/Player/vulpkanin.yml

@@ -0,0 +1,5 @@
+- type: entity
+  save: false
+  name: Urist McBark
+  parent: BaseMobVulpkanin
+  id: MobVulpkanin

Resources/Prototypes/Entities/Mobs/Species/arachnid.yml

@@ -95,6 +95,7 @@
       - map: [ "enum.HumanoidVisualLayers.Tail" ] # Mentioned in moth code: This needs renaming lol.
       - map: [ "back" ]
       - map: [ "neck" ]
+      - map: [ "enum.HumanoidVisualLayers.SnoutCover" ]
       - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
       - map: [ "enum.HumanoidVisualLayers.Hair" ] # Do these need to be here? (arachnid hair arachnid hair)
       - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
@@ -127,7 +128,7 @@
   - type: HumanoidAppearance
     species: Arachnid
   - type: Inventory
-    speciesId: arachnid 
+    speciesId: arachnid
 
 
 #>88w88<

Resources/Prototypes/Entities/Mobs/Species/base.yml

@@ -35,6 +35,7 @@
     - map: [ "outerClothing" ]
     - map: [ "back" ]
     - map: [ "neck" ]
+    - map: [ "enum.HumanoidVisualLayers.SnoutCover" ]
     - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
     - map: [ "enum.HumanoidVisualLayers.Hair" ]
     - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
@@ -120,10 +121,7 @@
       - !type:WashCreamPieReaction
   - type: StatusEffects
     allowed:
-    - Stutter
     - Electrocution
-    - Drunk
-    - SlurredSpeech
     - RatvarianLanguage
     - PressureImmunity
     - Muted
@@ -163,6 +161,7 @@
   - type: SleepEmitSound
   - type: SSDIndicator
   - type: StandingState
+  - type: Crawler
   - type: Dna
   - type: MindContainer
     showExamineInfo: true
@@ -324,6 +323,7 @@
     - map: [ "outerClothing" ]
     - map: [ "back" ]
     - map: [ "neck" ]
+    - map: [ "enum.HumanoidVisualLayers.SnoutCover" ]
     - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
     - map: [ "enum.HumanoidVisualLayers.Hair" ]
     - map: [ "enum.HumanoidVisualLayers.HeadSide" ]

Resources/Prototypes/Entities/Mobs/Species/moth.yml

@@ -54,7 +54,7 @@
   - type: Flammable
     damage:
       types:
-        Heat: 4.5 # moths burn more easily
+        Heat: 2.5 # moths burn more easily
   - type: Temperature # Moths hate the heat and thrive in the cold.
     heatDamageThreshold: 320
     coldDamageThreshold: 230
@@ -105,6 +105,7 @@
       - map: [ "enum.HumanoidVisualLayers.Tail" ] #in the utopian future we should probably have a wings enum inserted here so everyhting doesn't break
       - map: [ "back" ]
       - map: [ "neck" ]
+      - map: [ "enum.HumanoidVisualLayers.SnoutCover" ]
       - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
       - map: [ "enum.HumanoidVisualLayers.Hair" ]
       - map: [ "enum.HumanoidVisualLayers.HeadSide" ]

Resources/Prototypes/Entities/Mobs/Species/reptilian.yml

@@ -11,6 +11,7 @@
     - Snout
     - HeadTop
     - HeadSide
+    - Tail
     undergarmentBottom: UndergarmentBottomBoxersReptilian
   - type: Hunger
   - type: Puller
@@ -77,7 +78,27 @@
           32:
             sprite: Mobs/Species/Human/displacement.rsi
             state: jumpsuit-female
-
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: head
+      mask:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: mask
+    displacements:
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: head
+      mask:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: mask
 
 - type: entity
   parent: BaseSpeciesDummy
@@ -98,7 +119,28 @@
       jumpsuit:
         sizeMaps:
           32:
-            sprite: Mobs/Species/Human/displacement.rsi
+            sprite: Mobs/Species/Reptilian/displacement.rsi
             state: jumpsuit-female
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: head
+      mask:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: mask
+    displacements:
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: head
+      mask:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: mask
 
 #Weh

Resources/Prototypes/Entities/Mobs/Species/vox.yml

@@ -86,6 +86,7 @@
     - map: [ "back" ]
     - map: [ "neck" ]
     - map: [ "suitstorage" ] # This is not in the default order
+    - map: [ "enum.HumanoidVisualLayers.SnoutCover" ]
     - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
     - map: [ "enum.HumanoidVisualLayers.Hair" ]
     - map: [ "enum.HumanoidVisualLayers.HeadSide" ]

Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml

@@ -0,0 +1,241 @@
+- type: entity
+  abstract: true
+  save: false
+  parent: [BaseMobSpeciesOrganic]
+  id: BaseMobVulpkanin
+  name: Urist McBark
+  components:
+  - type: Hunger
+  - type: Thirst
+  - type: MessyDrinker
+    spillChance: 0.33
+  - type: Icon
+    sprite: Mobs/Species/Vulpkanin/parts.rsi
+    state: full
+  - type: Body
+    prototype: Vulpkanin
+  - type: Speech
+    speechSounds: Vulpkanin
+    speechVerb: Vulpkanin
+    allowedEmotes: [ 'Bark', 'Snarl', 'Whine', 'Howl', 'Growl' ]
+  - type: Vocal
+    sounds:
+      Male: MaleVulpkanin
+      Female: FemaleVulpkanin
+      Unsexed: MaleVulpkanin
+  - type: Damageable
+    damageModifierSet: Vulpkanin
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Weapons/pierce.ogg
+    animation: WeaponArcClaw
+    damage:
+      types:
+        Piercing: 2
+        Slash: 3
+  - type: Temperature # Same as moth temperatures until below is solved.
+    heatDamageThreshold: 320 # TODO: 315 when there is a way to make the temperature alert not blink to the side of the screen and disappear when you "sweat" at 39C.
+    coldDamageThreshold: 230 # TODO: 220 when the above is solved.
+    specificHeat: 44
+    coldDamage:
+      types:
+        Cold: 0.05 # Per second, scales with temperature & other constants
+    heatDamage:
+      types:
+        Heat: 2.5 # Per second, scales with temperature & other constants
+  # - type: Wagging TODO: Add back once we have animated tails again. Were removed due to the sprite rework, causing all of them to not fit anymore.
+  #   action: ActionToggleWaggingVulpkanin
+  - type: TemperatureProtection
+    heatingCoefficient: 1.2
+    coolingCoefficient: 0.3
+  - type: JumpAbility
+    action: ActionVulpkaninGravityJump
+    canCollide: true
+    jumpDistance: 3
+    jumpSound:
+      path: /Audio/Weapons/punchmiss.ogg
+      params:
+        pitch: 1.33
+        volume: -5
+        variation: 0.05
+  - type: InteractionPopup # Crucial detail.
+    successChance: 1
+    interactSuccessString: petting-success-soft-floofy-vulp
+    messagePerceivedByOthers: petting-success-soft-floofy-vulp-others
+    interactFailureString: petting-failure-generic
+  - type: Sprite # Drawlayers. Top to bottom in order I believe.
+    netsync: false
+    layers:
+    - map: [ "enum.HumanoidVisualLayers.Chest" ]
+    - map: [ "enum.HumanoidVisualLayers.Head" ]
+    - map: [ "enum.HumanoidVisualLayers.Snout" ]
+    - map: [ "enum.HumanoidVisualLayers.Eyes" ]
+    - map: [ "enum.HumanoidVisualLayers.RArm" ]
+    - map: [ "enum.HumanoidVisualLayers.LArm" ]
+    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
+    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    - map: [ "enum.HumanoidVisualLayers.UndergarmentBottom" ]
+    - map: [ "enum.HumanoidVisualLayers.UndergarmentTop" ]
+    - map: [ "jumpsuit" ]
+    - map: [ "enum.HumanoidVisualLayers.LHand" ]
+    - map: [ "enum.HumanoidVisualLayers.RHand" ]
+    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
+    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
+    - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
+      color: "#ffffff"
+      sprite: Objects/Misc/handcuffs.rsi
+      state: body-overlay-2
+      visible: false
+    - map: [ "id" ]
+    - map: [ "gloves" ]
+    - map: [ "shoes" ]
+    - map: [ "ears" ]
+    - map: [ "outerClothing" ]
+    - map: [ "eyes" ]
+    - map: [ "belt" ]
+    - map: [ "neck" ]
+    - map: [ "back" ]
+    - map: [ "enum.HumanoidVisualLayers.SnoutCover" ]
+    - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
+    - map: [ "enum.HumanoidVisualLayers.Hair" ]
+    - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
+    - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
+    - map: [ "enum.HumanoidVisualLayers.Tail" ]
+    - map: [ "mask" ]
+    - map: [ "head" ]
+    - map: [ "pocket1" ]
+    - map: [ "pocket2" ]
+    - map: [ "clownedon" ]
+      sprite: "Effects/creampie.rsi"
+      state: "creampie_vulpkanin"
+      visible: false
+  - type: HumanoidAppearance
+    species: Vulpkanin
+    hideLayersOnEquip:
+    - Snout
+    - SnoutCover
+    - HeadTop
+    - HeadSide
+    - FacialHair
+    markingsDisplacement:
+      Hair:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: hair
+  - type: Inventory
+    speciesId: vulpkanin
+    displacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: jumpsuit
+      back:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: back
+      outerClothing:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: outerwear
+      gloves:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: hand
+      shoes:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: shoes
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: head
+      neck:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: neck
+      eyes:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: eyes
+      belt:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: belt
+
+- type: entity
+  parent: [BaseSpeciesDummy]
+  id: MobVulpkaninDummy
+  name: Vulpkanin Dummy
+  categories: [ HideSpawnMenu ]
+  description: A dummy Vulpkanin meant to be used in character setup.
+  components:
+  - type: HumanoidAppearance
+    species: Vulpkanin
+    hideLayersOnEquip:
+    - Snout
+    - HeadTop
+    - HeadSide
+    markingsDisplacement:
+      Hair:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: hair
+  - type: Inventory
+    speciesId: vulpkanin
+    displacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: jumpsuit
+      back:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: back
+      outerClothing:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: outerwear
+      gloves:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: hand
+      shoes:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: shoes
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: head
+      neck:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: neck
+      eyes:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: eyes
+      belt:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            state: belt

Resources/Prototypes/Entities/Mobs/base.yml

@@ -9,6 +9,7 @@
     noRot: true
     drawdepth: Mobs
   - type: MobCollision
+  - type: GravityAffected
   - type: Physics
     bodyType: KinematicController
   - type: Fixtures
@@ -84,6 +85,21 @@
       - !type:PlaySoundBehavior
         sound:
           collection: MeatLaserImpact
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Radiation
+        damage: 15
+      behaviors:
+      - !type:PopupBehavior
+        popup: mouth-taste-metal
+        popupType: LargeCaution
+        targetOnly: true
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Radiation
+        damage: 40
+      behaviors:
+      - !type:VomitBehavior
   - type: RadiationReceiver
   - type: Stamina
   - type: MobState

Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml

@@ -127,6 +127,20 @@
     - state: custburg-filling
       color: red
     - state: custburg-top
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: bun-inhand-left
+      - state: alpha-patty-inhand-left
+        color: "#f70000"
+      - state: alpha-filling-inhand-left
+        color: "#f70000"
+      right:
+      - state: bun-inhand-right
+      - state: alpha-patty-inhand-right
+        color: "#f70000"
+      - state: alpha-filling-inhand-right
+        color: "#f70000"
 
 # Burger
 
@@ -156,6 +170,20 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: bun-inhand-left
+      - state: alpha-patty-inhand-left
+        color: "#382010"
+      - state: alpha-filling-inhand-left
+        color: "#bd9451"
+      right:
+      - state: bun-inhand-right
+      - state: alpha-patty-inhand-right
+        color: "#382010"
+      - state: alpha-filling-inhand-right
+        color: "#bd9451"
 # Tastes like bun, grass.
 
 - type: entity
@@ -182,6 +210,20 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: bun-inhand-left
+      - state: alpha-patty-inhand-left
+        color: "#b37659"
+      - state: alpha-filling-inhand-left
+        color: "#e8634f"
+      right:
+      - state: bun-inhand-right
+      - state: alpha-patty-inhand-right
+        color: "#b37659"
+      - state: alpha-filling-inhand-right
+        color: "#e8634f"
 # Tastes like bun, bacon.
 
 - type: entity
@@ -210,6 +252,16 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-bun-inhand-left
+        color: "#f7f7f7"
+      - state: burger-inhand-left
+      right:
+      - state: alpha-bun-inhand-right
+        color: "#f7f7f7"
+      - state: burger-inhand-right
 
 - type: entity
   name: bearger
@@ -237,6 +289,12 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: bear-inhand-left
+      right:
+      - state: bear-inhand-right
 
 - type: entity
   name: big bite burger
@@ -265,6 +323,12 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: burger-big-inhand-left
+      right:
+      - state: burger-big-inhand-right
 # Tastes like bun, silver, magic.
 
 - type: entity
@@ -293,6 +357,12 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: brain-inhand-left
+      right:
+      - state: brain-inhand-right
 # Tastes like bun, brains.
 
 - type: entity
@@ -322,6 +392,14 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: cat-inhand-left
+      - state: plain-inhand-left
+      right:
+      - state: cat-inhand-right
+      - state: plain-inhand-right
 
 - type: entity
   name: cheese burger
@@ -350,6 +428,12 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      right:
+      - state: plain-inhand-right
 # TODO: Make this work.
   # - type: Sprite
   #   state: plate
@@ -388,6 +472,20 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: bun-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#98d966"
+      - state: alpha-patty-inhand-left
+        color: "#f7b125"
+      right:
+      - state: bun-inhand-right
+      - state: alpha-filling-inhand-right
+        color: "#98d966"
+      - state: alpha-patty-inhand-right
+        color: "#f7b125"
 # Tastes like bun, chicken.
 
 - type: entity
@@ -416,6 +514,12 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: clown-inhand-left
+      right:
+      - state: clown-inhand-right
 
 - type: entity
   name: corger #not curger
@@ -441,6 +545,12 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: dog-inhand-left
+      right:
+      - state: dog-inhand-right
 
 - type: entity
   name: crab burger
@@ -468,6 +578,20 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: bun-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#7e1a07"
+      - state: alpha-patty-inhand-left
+        color: "#7e1a07"
+      right:
+      - state: bun-inhand-right
+      - state: alpha-filling-inhand-right
+        color: "#7e1a07"
+      - state: alpha-patty-inhand-right
+        color: "#7e1a07"
 
 - type: entity
   name: crazy hamburger # Burger for you euro-cucks
@@ -501,6 +625,12 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: crazy-inhand-left
+      right:
+      - state: crazy-inhand-right
 
 - type: entity
   name: duck sandwich # Burger for you sick bastards
@@ -526,6 +656,20 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: bun-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#98d966"
+      - state: alpha-patty-inhand-left
+        color: "#e8b348"
+      right:
+      - state: bun-inhand-right
+      - state: alpha-filling-inhand-right
+        color: "#98d966"
+      - state: alpha-patty-inhand-right
+        color: "#e8b348"
 # Tastes like bun, duck.
 
 - type: entity
@@ -549,6 +693,12 @@
           Quantity: 8
         - ReagentId: Licoxide
           Quantity: 5
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plasma-inhand-left
+      right:
+      - state: plasma-inhand-right
 # Tastes like bun, pure electricity.
 
 - type: entity
@@ -566,6 +716,20 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: bun-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#feffba"
+      - state: alpha-patty-inhand-left
+        color: "#f4bb53"
+      right:
+      - state: bun-inhand-right
+      - state: alpha-filling-inhand-right
+        color: "#feffba"
+      - state: alpha-patty-inhand-right
+        color: "#f4bb53"
 # Tastes like bun, fish.
 
 - type: entity
@@ -598,6 +762,12 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      right:
+      - state: plain-inhand-right
 
 # Tastes like bun, HEAT.
 
@@ -626,6 +796,22 @@
     tags:
       - ClothMade
       - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-bun-inhand-left
+        color: "#cededa"
+      - state: alpha-filling-inhand-left
+        color: "#6a6281"
+      - state: alpha-patty-inhand-left
+        color: "#95a79f"
+      right:
+      - state: alpha-bun-inhand-right
+        color: "#cededa"
+      - state: alpha-filling-inhand-right
+        color: "#6a6281"
+      - state: alpha-patty-inhand-right
+        color: "#95a79f"
 # Tastes like bun, ectoplasm.
 
 - type: entity
@@ -654,6 +840,12 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      right:
+      - state: plain-inhand-right
 
 - type: entity
   name: McGuffin
@@ -681,6 +873,20 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: bun-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#f2efce"
+      - state: alpha-patty-inhand-left
+        color: "#e3756d"
+      right:
+      - state: bun-inhand-right
+      - state: alpha-filling-inhand-right
+        color: "#f2efce"
+      - state: alpha-patty-inhand-right
+        color: "#e3756d"
 
 - type: entity
   name: BBQ Rib Sandwich
@@ -713,6 +919,20 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: bun-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#899660"
+      - state: alpha-patty-inhand-left
+        color: "#a94a31"
+      right:
+      - state: bun-inhand-right
+      - state: alpha-filling-inhand-right
+        color: "#899660"
+      - state: alpha-patty-inhand-right
+        color: "#a94a31"
 # Tastes like bun, pork patty.
 
 - type: entity
@@ -740,6 +960,12 @@
           Quantity: 4
         - ReagentId: Nothing
           Quantity: 1
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: mime-inhand-left
+      right:
+      - state: mime-inhand-right
 # Tastes like  .
 
 - type: entity
@@ -768,6 +994,12 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      right:
+      - state: plain-inhand-right
 
 - type: entity
   name: rat burger
@@ -795,6 +1027,15 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: bun-inhand-left
+      - state: rat-inhand-left
+      right:
+      - state: bun-inhand-right
+      - state: rat-inhand-right
+
 # Tastes like bun, HEAT.
 
 - type: entity
@@ -822,6 +1063,22 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-bun-inhand-left
+        color: "#7f7f7f"
+      - state: alpha-patty-inhand-left
+        color: "#c0c0c0"
+      - state: alpha-filling-inhand-left
+        color: "#141414"
+      right:
+      - state: alpha-bun-inhand-right
+        color: "#7f7f7f"
+      - state: alpha-patty-inhand-right
+        color: "#c0c0c0"
+      - state: alpha-filling-inhand-right
+        color: "#141414"
 # Tastes like bun, lettuce, sludge.
 
 - type: entity
@@ -845,6 +1102,20 @@
           Quantity: 13
         - ReagentId: Vitamin
           Quantity: 5
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: bun-inhand-left
+      - state: alpha-patty-inhand-left
+        color: "#91d90b"
+      - state: alpha-filling-inhand-left
+        color: "#91d90b"
+      right:
+      - state: bun-inhand-right
+      - state: alpha-patty-inhand-right
+        color: "#91d90b"
+      - state: alpha-filling-inhand-right
+        color: "#91d90b"
 # Tastes like bun, redditors.
 
 - type: entity
@@ -870,6 +1141,12 @@
           Quantity: 5
         - ReagentId: Vitamin
           Quantity: 10
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: spell-inhand-left
+      right:
+      - state: spell-inhand-right
 # Tastes like bun, silver.
 
 - type: entity
@@ -901,6 +1178,12 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: burger-super-inhand-left
+      right:
+      - state: burger-super-inhand-right
 # Tastes like bun, diabetes.
 
 - type: entity
@@ -924,6 +1207,20 @@
           Quantity: 8
         - ReagentId: Protein
           Quantity: 3
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: bun-inhand-left
+      - state: alpha-patty-inhand-left
+        color: "#f0d8a1"
+      - state: alpha-filling-inhand-left
+        color: "#e5ad29"
+      right:
+      - state: bun-inhand-right
+      - state: alpha-patty-inhand-right
+        color: "#f0d8a1"
+      - state: alpha-filling-inhand-right
+        color: "#e5ad29"
 # Tastes like bun, tofu.
 
 - type: entity
@@ -953,6 +1250,20 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: bun-inhand-left
+      - state: alpha-patty-inhand-left
+        color: "#00cc33"
+      - state: alpha-filling-inhand-left
+        color: "#9900cc"
+      right:
+      - state: bun-inhand-right
+      - state: alpha-patty-inhand-right
+        color: "#00cc33"
+      - state: alpha-filling-inhand-right
+        color: "#9900cc"
 # Tastes like bun, acid.
 
 # Note: I would put a bunch of colored burgers here as listed in the tg .dm but
@@ -985,4 +1296,10 @@
   - type: Tag
     tags:
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: mothroach-inhand-left
+      right:
+      - state: mothroach-inhand-right
 

Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

@@ -443,6 +443,7 @@
     - Trash
     - BananaPeel
     - Ruminant
+
     - WhitelistChameleon
     - HamsterWearable
   - type: SolutionContainerManager
@@ -459,7 +460,7 @@
     requiresSpecialDigestion: true
   - type: Clothing
     sprite: Objects/Specific/Hydroponics/banana.rsi
-    equippedState: peel-equipped-HELMET
+    equippedPrefix: peel
     slots:
     - HEAD
     quickEquip: false
@@ -471,7 +472,7 @@
   components:
   - type: Clothing
     sprite: Objects/Specific/Hydroponics/banana.rsi
-    equippedState: baked-peel-equipped-HELMET
+    equippedPrefix: baked-peel
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/banana.rsi
     state: baked-peel
@@ -502,7 +503,7 @@
     heldPrefix: peel
   - type: Clothing
     sprite: Objects/Specific/Hydroponics/mimana.rsi
-    equippedState: equipped-HELMET
+    equippedPrefix: peel
   - type: Slippery
     slipSound:
       path: /Audio/Effects/slip.ogg
@@ -523,7 +524,7 @@
   - type: Slippery
   - type: Clothing
     sprite: Objects/Materials/materials.rsi
-    equippedState: peel-equipped-HELMET
+    equippedPrefix: peel
 
 - type: entity
   name: carrot

Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml

@@ -132,7 +132,7 @@
   name: beef taco supreme
   parent: FoodTacoBase
   id: FoodTacoBeefSupreme
-  description: It's like a regular beef taco, but surpeme!
+  description: It's like a regular beef taco, but supreme!
   components:
   - type: Food
   - type: Sprite
@@ -151,7 +151,7 @@
   name: chicken taco supreme
   parent: FoodTacoBase
   id: FoodTacoChickenSupreme
-  description: It's like a regular chicken taco, but surpeme!
+  description: It's like a regular chicken taco, but supreme!
   components:
   - type: Food
   - type: Sprite

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base_machineboard.yml

@@ -18,4 +18,5 @@
         Glass: 230
       chemicalComposition:
         Silicon: 20
+    - type: Circuitboard
 

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml

@@ -1131,6 +1131,20 @@
       Cable: 2
       Glass: 1
 
+- type: entity
+  parent: BaseMachineCircuitboard
+  id: SurveillanceCameraWirelessRouterXenoborgCircuitboard
+  name: xenoborg camera wireless router
+  description: A machine printed circuit board for a xenoborg camera wireless router.
+  components:
+  - type: Sprite
+    state: generic
+  - type: MachineBoard
+    prototype: SurveillanceCameraWirelessRouterXenoborg
+    stackRequirements:
+      Cable: 2
+      Glass: 1
+
 - type: entity
   id: SurveillanceWirelessCameraMovableCircuitboard
   parent: BaseMachineCircuitboard

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/turrets.yml

@@ -31,7 +31,7 @@
   components:
   - type: Sprite
     sprite: Objects/Misc/module.rsi
-    state: command
+    state: science
   - type: MachineBoard
     prototype: WeaponEnergyTurretAI
 
@@ -45,4 +45,15 @@
     state: security
   - type: MachineBoard
     prototype: WeaponEnergyTurretSecurity
+    
+- type: entity
+  parent: WeaponEnergyTurretStationMachineCircuitboardBase
+  id: WeaponEnergyTurretCommandMachineCircuitboard
+  suffix: Command
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/module.rsi
+    state: command
+  - type: MachineBoard
+    prototype: WeaponEnergyTurretCommand
 

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml

@@ -17,6 +17,7 @@
         Glass: 230
       chemicalComposition:
         Silicon: 20
+    - type: Circuitboard
 
 - type: entity
   parent: BaseComputerCircuitboard
@@ -259,6 +260,17 @@
     state: cpu_service
   - type: ComputerBoard
     prototype: ComputerSurveillanceWirelessCameraMonitor
+  
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: XenoborgCameraMonitorCircuitboard
+  name: xenoborg camera monitor board
+  description: A computer printed circuit board for a xenoborg camera monitor.
+  components:
+  - type: Sprite
+    state: cpu_science
+  - type: ComputerBoard
+    prototype: ComputerSurveillanceWirelessXenoborgCameraMonitor
 
 - type: entity
   parent: BaseComputerCircuitboard
@@ -527,6 +539,17 @@
     - type: ComputerBoard
       prototype: ComputerRoboticsControl
 
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: ComputerXenoborgsControlCircuitboard
+  name: xenoborg control console board
+  description: A computer printed circuit board for a xenoborg control console.
+  components:
+    - type: Sprite
+      state: cpu_science
+    - type: ComputerBoard
+      prototype: ComputerXenoborgsControl
+
 - type: entity
   parent: BaseComputerCircuitboard
   id: StationAiUploadCircuitboard

Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml

@@ -17,3 +17,4 @@
       Glass: 200
     chemicalComposition:
       Silicon: 20
+  - type: Circuitboard

Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml

@@ -318,3 +318,11 @@
   components:
   - type: AccessReader
     access: [["Security"], ["Command"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsXenoborg
+  suffix: Xenoborg, Locked
+  components:
+  - type: AccessReader
+    access: [["Xenoborg"]]

Resources/Prototypes/Entities/Objects/Devices/Electronics/turret_controls.yml

@@ -0,0 +1,43 @@
+- type: entity
+  abstract: true
+  parent: BaseElectronics
+  id: WeaponEnergyTurretStationControlPanelElectronicsBase 
+  name: sentry turret control panel electronics
+  description: An electronics board used in a sentry turret control panel.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/module.rsi
+    state: security
+  - type: ElectronicsBoard
+    prototype: WeaponEnergyTurretSecurityControlPanel
+  - type: Tag
+    tags:
+    - TurretControlElectronics
+
+- type: entity
+  parent: WeaponEnergyTurretStationControlPanelElectronicsBase
+  id: WeaponEnergyTurretSecurityControlPanelElectronics
+  suffix: Security
+
+- type: entity
+  parent: WeaponEnergyTurretStationControlPanelElectronicsBase
+  id: WeaponEnergyTurretAIControlPanelElectronics
+  suffix: AI, Silicon
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/module.rsi
+    state: science
+  - type: ElectronicsBoard
+    prototype: WeaponEnergyTurretAIControlPanel
+    
+- type: entity
+  parent: WeaponEnergyTurretStationControlPanelElectronicsBase
+  id: WeaponEnergyTurretCommandControlPanelElectronics
+  suffix: Command
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/module.rsi
+    state: command
+  - type: ElectronicsBoard
+    prototype: WeaponEnergyTurretCommandControlPanel
+

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -1426,6 +1426,25 @@
   - type: Icon
     state: pda-seniorofficer
 
+- type: entity
+  parent: BasePDA
+  id: SeniorCourierPDA
+  name: senior courier PDA
+  description: Smells like postage stamps and shuttle fuel.
+  components:
+  - type: Pda
+    id: CargoIDCard
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-seniorcourier
+  - type: PdaBorderColor
+    borderColor: "#e39751"
+    accentVColor: "#DFDFDF"
+  - type: Icon
+    state: pda-seniorcourier
+
 - type: entity
   parent: [ BaseMajorContraband, SyndiPDA ]
   id: PiratePDA
@@ -1467,7 +1486,7 @@
       - MedTekCartridge
 
 - type: entity
-  parent: BasePDA
+  parent: [BasePDA, SelectableLock]
   id: ChameleonPDA
   name: passenger PDA
   description: Why isn't it gray?

Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml

@@ -158,6 +158,8 @@
     sprite: Objects/Fun/bananiumhorn.rsi
     slots: [Belt]
     quickEquip: false
+  - type: UseDelay
+    delay: 3
   - type: EmitSoundOnUse
     sound:
       collection: BananiumHorn

Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml

@@ -6,11 +6,13 @@
   - type: Clickable
   - type: InteractionOutline
   - type: MovementIgnoreGravity
+    weightless: true
   - type: Sprite
     sprite: Objects/Fun/immovable_rod.rsi
     state: icon
     noRot: false
   - type: ImmovableRod
+  - type: GravityAffected
   - type: Physics
     bodyType: Dynamic
     linearDamping: 0
@@ -78,8 +80,6 @@
     damage:
       types:
         Blunt: 190
-  - type: MovementIgnoreGravity
-    gravityState: true
   - type: InputMover
   - type: MovementSpeedModifier
     baseWeightlessAcceleration: 5

Resources/Prototypes/Entities/Objects/Fun/plushies.yml

@@ -495,7 +495,7 @@
   parent: PlushieLizard
   id: PlushieSpaceLizard #ᵂᵉʰ!
   name: space lizard plushie
-  description: An adorable stuffed toy that resembles a lizardperson in an EVA suit. Made by CentComm as a token initiative to combat speciesism in space environments. "Welcome your new colleges as you do this plush, with open arms!"
+  description: An adorable stuffed toy that resembles a lizardperson in an EVA suit. Made by CentComm as a token initiative to combat speciesism in space environments. "Welcome your new colleagues as you do this plush, with open arms!"
   components:
   - type: Sprite
     sprite: Objects/Fun/Plushies/lizard.rsi

Resources/Prototypes/Entities/Objects/Fun/toys.yml

@@ -317,6 +317,10 @@
     - state: base
       map: ["enum.GunVisualLayers.Base"]
   - type: Item
+    shape:
+    - 0,0,1,0
+    - 0,1,0,1
+    storedOffset: -2,-7
     sprite: Objects/Fun/capgun.rsi
   - type: Tag
     tags:
@@ -773,7 +777,7 @@
   parent: BaseItem
   id: CardSword
   name: cardboard sword
-  description: A cardboard tube thats been fashioned into a sword.
+  description: A cardboard tube fashioned into the shape of a sword.
   components:
   - type: Sprite
     sprite: Objects/Fun/card_sword.rsi
@@ -911,6 +915,7 @@
     delay: 0.8
   - type: Slippery
     staminaDamage: 0
+    frictionStatusTime: 0
     slipData:
       stunTime: 0
       knockdownTime: 0

Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml

@@ -15,6 +15,7 @@
   - type: Tag
     tags:
     - Sheet
+    - ConstructionMaterial
   - type: Material
   - type: Damageable
     damageContainer: Inorganic
@@ -108,15 +109,6 @@
     stackType: Glass
     count: 1
 
-- type: entity
-  parent: SheetGlass
-  id: SheetGlassLingering0
-  suffix: Lingering, 0
-  components:
-  - type: Stack
-    lingering: true
-    count: 0
-
 - type: entity
   parent: SheetGlassBase
   id: SheetRGlass
@@ -197,15 +189,6 @@
           Quantity: 0.5
         canReact: false
 
-- type: entity
-  parent: SheetRGlass
-  id: SheetRGlassLingering0
-  suffix: Lingering, 0
-  components:
-  - type: Stack
-    lingering: true
-    count: 0
-
 - type: entity
   parent: SheetGlassBase
   id: SheetPGlass
@@ -336,15 +319,6 @@
     stackType: ReinforcedPlasmaGlass
     count: 1
 
-- type: entity
-  parent: SheetRPGlass
-  id: SheetRPGlassLingering0
-  suffix: Lingering, 0
-  components:
-  - type: Stack
-    lingering: true
-    count: 0
-
 - type: entity
   parent: SheetGlassBase
   id: SheetUGlass

Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml

@@ -15,6 +15,7 @@
     tags:
     - Sheet
     - Metal
+    - ConstructionMaterial
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
@@ -94,15 +95,6 @@
     stackType: Steel
     count: 1
 
-- type: entity
-  parent: SheetSteel
-  id: SheetSteelLingering0
-  suffix: Lingering, 0
-  components:
-  - type: Stack
-    lingering: true
-    count: 0
-
 - type: entity
   parent: SheetMetalBase
   id: SheetBrass
@@ -229,12 +221,3 @@
   - type: Stack
     stackType: Plasteel
     count: 1
-
-- type: entity
-  parent: SheetPlasteel
-  id: SheetPlasteelLingering0
-  suffix: Lingering, 0
-  components:
-  - type: Stack
-    lingering: true
-    count: 0

Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml

@@ -12,6 +12,7 @@
   - type: Tag
     tags:
     - Sheet
+    - ConstructionMaterial
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
@@ -110,6 +111,7 @@
   - type: Tag
     tags:
     - Sheet
+    - ConstructionMaterial
 
 - type: entity
   parent: SheetPlasma
@@ -132,16 +134,6 @@
   - type: Stack
     count: 1
 
-- type: entity
-  parent: SheetPlasma
-  id: SheetPlasmaLingering0
-  name: plasma
-  suffix: 0, Lingering
-  components:
-  - type: Stack
-    lingering: true
-    count: 0
-
 - type: entity
   parent: SheetOtherBase
   id: SheetPlastic
@@ -152,6 +144,7 @@
     tags:
     - Plastic
     - Sheet
+    - ConstructionMaterial
   - type: Material
   - type: PhysicalComposition
     materialComposition:

Resources/Prototypes/Entities/Objects/Materials/ingots.yml

@@ -14,6 +14,7 @@
   - type: Tag
     tags:
     - Ingot
+    - ConstructionMaterial
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic

Resources/Prototypes/Entities/Objects/Materials/materials.yml

@@ -147,6 +147,7 @@
       - ClothMade
       - Gauze
       - RawMaterial
+      - ConstructionMaterial
   - type: Construction
     graph: WebObjects # not sure if I should either keep this here or just make another prototype. Will keep it here just in case.
     node: cloth
@@ -212,6 +213,7 @@
     tags:
       - ClothMade
       - RawMaterial
+      - ConstructionMaterial
   - type: Item
     heldPrefix: durathread
 
@@ -261,6 +263,7 @@
     tags:
     - Wooden
     - RawMaterial
+    - ConstructionMaterial
   - type: Extractable
     grindableSolutionName: wood
   - type: SolutionContainerManager

Resources/Prototypes/Entities/Objects/Materials/parts.yml

@@ -19,6 +19,9 @@
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: Tag
+    tags:
+    - ConstructionMaterial
 
 - type: entity
   parent: PartBase
@@ -81,6 +84,7 @@
   - type: Tag
     tags:
     - RodMetal1
+    - ConstructionMaterial
   - type: Sprite
     state: rods
   - type: Stack
@@ -95,43 +99,8 @@
   - type: Tag
     tags:
     - RodMetal1
+    - ConstructionMaterial
   - type: Sprite
     state: rods
   - type: Stack
     count: 1
-
-- type: entity
-  parent: PartRodMetal
-  id: PartRodMetalLingering0
-  suffix: Lingering, 0
-  components:
-  - type: Stack
-    lingering: true
-    count: 0
-
-- type: entity
-  parent: FloorTileItemSteel
-  id: FloorTileItemSteelLingering0
-  suffix: Lingering, 0
-  components:
-  - type: Stack
-    lingering: true
-    count: 0
-
-- type: entity
-  parent: FloorTileItemWhite
-  id: FloorTileItemWhiteLingering0
-  suffix: Lingering, 0
-  components:
-  - type: Stack
-    lingering: true
-    count: 0
-
-- type: entity
-  parent: FloorTileItemDark
-  id: FloorTileItemDarkLingering0
-  suffix: Lingering, 0
-  components:
-  - type: Stack
-    lingering: true
-    count: 0

Resources/Prototypes/Entities/Objects/Misc/folders.yml

@@ -1,6 +1,6 @@
 - type: entity
-  id: BoxFolderNuclearCodes
   parent: BaseItem
+  id: BoxFolderNuclearCodes
   name: nuclear code folder
   components:
   - type: Sprite
@@ -19,8 +19,8 @@
   - type: Appearance
 
 - type: entity
-  id: BoxFolderBase
   parent: BoxBase
+  id: BoxFolderBaseEmpty
   name: folder
   description: A folder filled with top secret paperwork.
   components:
@@ -62,22 +62,42 @@
   - type: Tag
     tags:
     - Folder
-  - type: StorageFill
-    contents:
-      - id: Paper
-        prob: 0.5
-      - id: PaperOffice
-        prob: 0.4
-      - id: Paper
-        prob: 0.3
-      - id: PaperOffice
-        prob: 0.2
-      - id: Paper
-        prob: 0.2
 
 - type: entity
-  id: BoxFolderRed
-  parent: BoxFolderBase
+  abstract: true
+  id: BoxFolderFill # Include this as a parent prototype to add 0-5 random papers to a folder's inventory when spawned.
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+    - id: Paper
+      prob: 0.5
+    - id: PaperOffice
+      prob: 0.4
+    - id: Paper
+      prob: 0.3
+    - id: PaperOffice
+      prob: 0.2
+    - id: Paper
+      prob: 0.2
+
+- type: entity
+  abstract: true
+  id: BoxFolderFillThreePapers # Like BoxFolderFill, but always has exactly three sheets of standard paper; use for roles' startingGear
+  suffix: 3 papers
+  components:
+  - type: StorageFill
+    contents:
+    - id: Paper
+      amount: 3
+
+- type: entity
+  parent: [BoxFolderBaseEmpty, BoxFolderFill]
+  id: BoxFolderBase
+
+- type: entity
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderRedEmpty
   suffix: Red
   components:
   - type: Sprite
@@ -87,8 +107,13 @@
     - state: folder-base
 
 - type: entity
-  id: BoxFolderBlue
-  parent: BoxFolderBase
+  parent: [BoxFolderRedEmpty, BoxFolderFill]
+  id: BoxFolderRed
+  suffix: Red, Filled
+
+- type: entity
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderBlueEmpty
   suffix: Blue
   components:
   - type: Sprite
@@ -98,8 +123,13 @@
     - state: folder-base
 
 - type: entity
-  id: BoxFolderYellow
-  parent: BoxFolderBase
+  parent: [BoxFolderBlueEmpty, BoxFolderFill]
+  id: BoxFolderBlue
+  suffix: Blue, Filled
+
+- type: entity
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderYellowEmpty
   suffix: Yellow
   components:
   - type: Sprite
@@ -109,18 +139,13 @@
     - state: folder-base
 
 - type: entity
-  id: BoxFolderWhite
-  parent: BoxFolderBase
-  suffix: White
-  components:
-  - type: Sprite
-    layers:
-    - state: folder-white
-    - state: folder-base
+  parent: [BoxFolderYellowEmpty, BoxFolderFill]
+  id: BoxFolderYellow
+  suffix: Yellow, Filled
 
 - type: entity
-  id: BoxFolderGrey
-  parent: BoxFolderBase
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderGreyEmpty
   suffix: Grey
   components:
   - type: Sprite
@@ -130,8 +155,13 @@
     - state: folder-base
 
 - type: entity
-  id: BoxFolderBlack
-  parent: BoxFolderBase
+  parent: [BoxFolderGreyEmpty, BoxFolderFill]
+  id: BoxFolderGrey
+  suffix: Grey, Filled
+
+- type: entity
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderBlackEmpty
   suffix: Black
   components:
   - type: Sprite
@@ -141,8 +171,13 @@
     - state: folder-base
 
 - type: entity
-  id: BoxFolderGreen
-  parent: BoxFolderBase
+  parent: [BoxFolderBlackEmpty, BoxFolderFill]
+  id: BoxFolderBlack
+  suffix: Black, Filled
+
+- type: entity
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderGreenEmpty
   suffix: Green
   components:
   - type: Sprite
@@ -152,10 +187,30 @@
     - state: folder-base
 
 - type: entity
-  id: BoxFolderCentCom
-  name: CentComm folder
-  parent: BoxFolderBase
+  parent: [BoxFolderGreenEmpty, BoxFolderFill]
+  id: BoxFolderGreen
+  suffix: Green, Filled
+
+- type: entity
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderWhiteEmpty
+  suffix: White
+  components:
+  - type: Sprite
+    layers:
+    - state: folder-white
+    - state: folder-base
+
+- type: entity
+  parent: [BoxFolderWhiteEmpty, BoxFolderFill]
+  id: BoxFolderWhite
+  suffix: White, Filled
+
+- type: entity
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderCentComEmpty
   categories: [ DoNotMap ]
+  name: CentComm folder
   description: CentComm's miserable little pile of secrets!
   components:
   - type: Sprite
@@ -164,8 +219,13 @@
     - state: folder-base
 
 - type: entity
-  id: BoxFolderClipboard
-  parent: BoxFolderBase
+  parent: [BoxFolderCentComEmpty, BoxFolderFill]
+  id: BoxFolderCentCom
+  suffix: DO NOT MAP, Filled
+
+- type: entity
+  parent: BoxFolderBaseEmpty
+  id: BoxFolderClipboardEmpty
   name: clipboard
   description: The weapon of choice for those on the front lines of bureaucracy.
   components:
@@ -223,8 +283,42 @@
         Blunt: 6
 
 - type: entity
-  id: BoxFolderCentComClipboard
-  parent: BoxFolderClipboard
+  parent: [BoxFolderClipboardEmpty, BoxFolderFill]
+  id: BoxFolderClipboard
+
+- type: entity
+  parent: [BoxFolderClipboardEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderClipboardThreePapers
+
+- type: entity
+  parent: BoxFolderClipboardEmpty
+  id: BoxFolderPlasticClipboardEmpty
+  name: plastic clipboard
+  description: A cheap clipboard made of blue plastic. For those who aren't yet ready to wield the bureaucratic might of a proper wooden clipboard.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/plastic_clipboard.rsi
+    layers:
+    - state: clipboard
+    - state: clipboard_paper
+      map: ["clipboard_paper"]
+      visible: false
+    - state: clipboard_pen
+      map: ["clipboard_pen"]
+      visible: false
+    - state: clipboard_over
+  - type: Item
+    sprite: Objects/Misc/plastic_clipboard.rsi
+  - type: Clothing
+    sprite: Objects/Misc/plastic_clipboard.rsi
+
+- type: entity
+  parent: [BoxFolderPlasticClipboardEmpty, BoxFolderFill]
+  id: BoxFolderPlasticClipboard
+
+- type: entity
+  parent: BoxFolderClipboardEmpty
+  id: BoxFolderCentComClipboardEmpty
   name: CentComm clipboard
   description: A luxurious clipboard upholstered with green velvet. Often seen carried by CentComm officials, seldom seen actually used.
   components:
@@ -245,8 +339,16 @@
     sprite: Objects/Misc/cc-clipboard.rsi
 
 - type: entity
+  parent: [BoxFolderCentComClipboardEmpty, BoxFolderFill]
+  id: BoxFolderCentComClipboard
+
+- type: entity
+  parent: [BoxFolderCentComClipboardEmpty, BoxFolderFillThreePapers]
+  id: BoxFolderCentComClipboardThreePapers
+
+- type: entity
+  parent: [BoxFolderClipboardEmpty, BaseGrandTheftContraband]
   id: BoxFolderQmClipboard
-  parent: [BoxFolderClipboard, BaseGrandTheftContraband]
   name: requisition digi-board
   description: A bulky electric clipboard, filled with shipping orders and financing details. With so many compromising documents, you ought to keep this safe.
   components:
@@ -278,8 +380,6 @@
     grid:
     - 0,0,4,3
     quickInsert: true
-  - type: StorageFill
-    contents: [] #to override base clipboard fill
   - type: ItemMapper
     mapLayers:
       qm_clipboard_paper:

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -580,7 +580,7 @@
 
 - type: entity
   name: passenger ID card
-  parent: IDCardStandard
+  parent: [IDCardStandard, BaseChameleon]
   id: AgentIDCard
   suffix: Agent
   components:
@@ -595,9 +595,11 @@
     - state: default
     - state: idpassenger
   - type: AgentIDCard
+  - type: UIRequiresLock
   - type: ActivatableUI
     key: enum.AgentIDCardUiKey.Key
     inHandsOnly: true
+    verbText: agent-id-open-ui-verb
   - type: Tag
     tags:
     - DoorBumpOpener

Resources/Prototypes/Entities/Objects/Misc/implanters.yml

@@ -6,89 +6,89 @@
   parent: BaseItem
   abstract: true
   components:
-    - type: ItemSlots
-    - type: ContainerContainer
-      containers:
-        implanter_slot: !type:ContainerSlot { }
-    - type: Implanter
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      implanter_slot: !type:ContainerSlot { }
+  - type: Implanter
+    whitelist:
+      components:
+      - MobState # no chair microbomb
+    blacklist:
+      components:
+      - Guardian # no holoparasite macrobomb wombo combo
+      tags:
+      - Unimplantable
+    currentMode: Draw
+    implanterSlot:
+      name: Implant
+      locked: True
+      priority: 0
       whitelist:
-        components:
-        - MobState # no chair microbomb
-      blacklist:
-        components:
-        - Guardian # no holoparasite macrobomb wombo combo
         tags:
-        - Unimplantable
-      currentMode: Draw
-      implanterSlot:
-        name: Implant
-        locked: True
-        priority: 0
-        whitelist:
-          tags:
-            - SubdermalImplant
-      allowDeimplantAll: false
-      deimplantWhitelist:
-      - SadTromboneImplant
-      - LightImplant
-      - BikeHornImplant
-      - TrackingImplant
-      - StorageImplant
-      - FreedomImplant
-      - UplinkImplant
-      - EmpImplant
-      - ScramImplant
-      - DnaScramblerImplant
-      - MicroBombImplant
-      - MacroBombImplant
-      - DeathAcidifierImplant
-      - DeathRattleImplant
-      - MindShieldImplant
-      - FakeMindShieldImplant
-      - RadioImplant
-      - ChameleonControllerImplant
-      deimplantFailureDamage:
-        types:
-          Cellular: 50
-          Heat: 10
-    - type: Sprite
-      sprite: Objects/Specific/Medical/implanter.rsi
-      state: implanter0
-      layers:
-        - state: implanter0
-          map: [ "implantOnly" ]
-          visible: true
-        - state: implanter1
-          map: [ "implantFull" ]
-          visible: false
-    - type: Item
-      sprite: Objects/Specific/Medical/implanter.rsi
-      heldPrefix: implanter
-      size: Small
-    - type: Appearance
-    - type: GenericVisualizer
-      visuals:
-        enum.ImplanterVisuals.Full:
-          implantFull:
-            True: {visible: true}
-            False: {visible: false}
-        enum.ImplanterImplantOnlyVisuals.ImplantOnly:
-          implantOnly:
-            True: {state: broken}
-            False: {state: implanter0}
-    - type: UserInterface
-      interfaces:
-        enum.DeimplantUiKey.Key:
-          type: DeimplantBoundUserInterface
+        - SubdermalImplant
+    allowDeimplantAll: false
+    deimplantWhitelist:
+    - SadTromboneImplant
+    - LightImplant
+    - BikeHornImplant
+    - TrackingImplant
+    - StorageImplant
+    - FreedomImplant
+    - UplinkImplant
+    - EmpImplant
+    - ScramImplant
+    - DnaScramblerImplant
+    - MicroBombImplant
+    - MacroBombImplant
+    - DeathAcidifierImplant
+    - DeathRattleImplant
+    - MindShieldImplant
+    - FakeMindShieldImplant
+    - RadioImplant
+    - ChameleonControllerImplant
+    deimplantFailureDamage:
+      types:
+        Cellular: 50
+        Heat: 10
+  - type: Sprite
+    sprite: Objects/Specific/Medical/implanter.rsi
+    state: implanter0
+    layers:
+    - state: implanter0
+      map: [ "implantOnly" ]
+      visible: true
+    - state: implanter1
+      map: [ "implantFull" ]
+      visible: false
+  - type: Item
+    sprite: Objects/Specific/Medical/implanter.rsi
+    heldPrefix: implanter
+    size: Small
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ImplanterVisuals.Full:
+        implantFull:
+          True: {visible: true}
+          False: {visible: false}
+      enum.ImplanterImplantOnlyVisuals.ImplantOnly:
+        implantOnly:
+          True: {state: broken}
+          False: {state: implanter0}
+  - type: UserInterface
+    interfaces:
+      enum.DeimplantUiKey.Key:
+        type: DeimplantBoundUserInterface
 
 - type: entity
   id: Implanter
   parent: BaseImplanter
   description: A disposable syringe exclusively designed for the injection and extraction of subdermal implants.
   components:
-    - type: Tag
-      tags:
-        - Trash
+  - type: Tag
+    tags:
+    - Trash
 
 - type: entity
   parent: Implanter
@@ -108,18 +108,18 @@
   description: A disposable syringe exclusively designed for the injection of subdermal implants.
   abstract: true
   components:
-    - type: Sprite
-      sprite: Objects/Specific/Medical/implanter.rsi
-      state: implanter0
-      layers:
-        - state: implanter1
-          map: [ "implantFull" ]
-          visible: true
-        - state: implanter0
-          map: [ "implantOnly" ]
-    - type: Implanter
-      currentMode: Inject
-      implantOnly: true
+  - type: Sprite
+    sprite: Objects/Specific/Medical/implanter.rsi
+    state: implanter0
+    layers:
+    - state: implanter1
+      map: [ "implantFull" ]
+      visible: true
+    - state: implanter0
+      map: [ "implantOnly" ]
+  - type: Implanter
+    currentMode: Inject
+    implantOnly: true
 
 - type: entity
   id: BaseImplantOnlyImplanterSyndi
@@ -128,30 +128,30 @@
   description: A compact disposable syringe exclusively designed for the injection of subdermal implants. Make sure to scrub it with soap or a rag to remove residual DNA after use!
   abstract: true
   components:
-    - type: Item
-      sprite: Objects/Specific/Medical/syndi_implanter.rsi
-      heldPrefix: implanter
-    - type: Sprite
-      sprite: Objects/Specific/Medical/syndi_implanter.rsi
-      state: implanter1
-      layers:
-        - state: implanter0
-          map: [ "implantFull" ]
-          visible: true
-        - state: implanter1
-          map: [ "implantOnly" ]
-    - type: GenericVisualizer
-      visuals:
-        enum.ImplanterVisuals.Full:
-          implantFull:
-            True: {visible: true}
-            False: {visible: false}
-        enum.ImplanterImplantOnlyVisuals.ImplantOnly:
-          implantOnly:
-            True: {state: broken}
-            False: {state: implanter1}
-    - type: Tag
-      tags: []
+  - type: Item
+    sprite: Objects/Specific/Medical/syndi_implanter.rsi
+    heldPrefix: implanter
+  - type: Sprite
+    sprite: Objects/Specific/Medical/syndi_implanter.rsi
+    state: implanter1
+    layers:
+    - state: implanter0
+      map: [ "implantFull" ]
+      visible: true
+    - state: implanter1
+      map: [ "implantOnly" ]
+  - type: GenericVisualizer
+    visuals:
+      enum.ImplanterVisuals.Full:
+        implantFull:
+          True: {visible: true}
+          False: {visible: false}
+      enum.ImplanterImplantOnlyVisuals.ImplantOnly:
+        implantOnly:
+          True: {state: broken}
+          False: {state: implanter1}
+  - type: Tag
+    tags: []
 
 #Fun implanters
 
@@ -160,24 +160,24 @@
   name: sad trombone implanter
   parent: BaseImplantOnlyImplanter
   components:
-    - type: Implanter
-      implant: SadTromboneImplant
+  - type: Implanter
+    implant: SadTromboneImplant
 
 - type: entity
   id: LightImplanter
   name: light implanter
   parent: BaseImplantOnlyImplanter
   components:
-    - type: Implanter
-      implant: LightImplant
+  - type: Implanter
+    implant: LightImplant
 
 - type: entity
   id: BikeHornImplanter
   name: bike horn implanter
   parent: BaseImplantOnlyImplanter
   components:
-    - type: Implanter
-      implant: BikeHornImplant
+  - type: Implanter
+    implant: BikeHornImplant
 
 #Security implanters
 
@@ -186,8 +186,8 @@
   name: tracking implanter
   parent: BaseImplantOnlyImplanter
   components:
-    - type: Implanter
-      implant: TrackingImplant
+  - type: Implanter
+    implant: TrackingImplant
 
 #Traitor implanters
 
@@ -196,16 +196,16 @@
   name: storage implanter
   parent: BaseImplantOnlyImplanterSyndi
   components:
-    - type: Implanter
-      implant: StorageImplant
+  - type: Implanter
+    implant: StorageImplant
 
 - type: entity
   id: FreedomImplanter
   name: freedom implanter
   parent: BaseImplantOnlyImplanterSyndi
   components:
-    - type: Implanter
-      implant: FreedomImplant
+  - type: Implanter
+    implant: FreedomImplant
 
 - type: entity
   id: RadioImplanter
@@ -228,24 +228,24 @@
   name: EMP implanter
   parent: BaseImplantOnlyImplanterSyndi
   components:
-    - type: Implanter
-      implant: EmpImplant
+  - type: Implanter
+    implant: EmpImplant
 
 - type: entity
   id: ScramImplanter
   name: scram implanter
   parent: BaseImplantOnlyImplanterSyndi
   components:
-    - type: Implanter
-      implant: ScramImplant
+  - type: Implanter
+    implant: ScramImplant
 
 - type: entity
   id: DnaScramblerImplanter
   name: DNA scrambler implanter
   parent: BaseImplantOnlyImplanterSyndi
   components:
-    - type: Implanter
-      implant: DnaScramblerImplant
+  - type: Implanter
+    implant: DnaScramblerImplant
 
 - type: entity
   id: ChameleonControllerImplanter
@@ -262,24 +262,24 @@
   name: micro-bomb implanter
   parent: BaseImplantOnlyImplanterSyndi
   components:
-    - type: Implanter
-      implant: MicroBombImplant
+  - type: Implanter
+    implant: MicroBombImplant
 
 - type: entity
   id: MacroBombImplanter
   name: macro-bomb implanter
   parent: BaseImplantOnlyImplanterSyndi
   components:
-    - type: Implanter
-      implant: MacroBombImplant
+  - type: Implanter
+    implant: MacroBombImplant
 
 - type: entity
   id: DeathRattleImplanter
   name: death rattle implanter
   parent: BaseImplantOnlyImplanterSyndi
   components:
-    - type: Implanter
-      implant: DeathRattleImplant
+  - type: Implanter
+    implant: DeathRattleImplant
 
 - type: entity
   id: DeathAcidifierImplanter
@@ -304,8 +304,8 @@
   name: mindshield implanter
   parent: BaseImplantOnlyImplanter
   components:
-    - type: Implanter
-      implant: MindShieldImplant
+  - type: Implanter
+    implant: MindShieldImplant
 
 # Centcomm implanters
 

Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml

@@ -33,7 +33,13 @@
   - type: DisassembleOnAltVerb
     prototypeToSpawn: InflatableWallStack1
     disassembleTime: 3
+  - type: InflatableSafeDisassembly
   - type: Airtight
+  - type: DeltaPressure
+    minPressure: 1000
+    minPressureDelta: 750
+    scalingType: Linear
+    scalingPower: 0.0005
   - type: Transform
     anchored: true
   placement:
@@ -81,5 +87,11 @@
   - type: DisassembleOnAltVerb
     prototypeToSpawn: InflatableDoorStack1
     disassembleTime: 3
+  - type: InflatableSafeDisassembly
   - type: Occluder
     enabled: false
+  - type: DeltaPressure
+    minPressure: 1000
+    minPressureDelta: 750
+    scalingType: Linear
+    scalingPower: 0.0005

Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml

@@ -11,6 +11,9 @@
       size: Tiny
     - type: Stack
       count: 1
+    - type: Tag
+      tags:
+      - ConstructionMaterial
 
 - type: entity
   id: MicroManipulatorStockPart

Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml

@@ -19,18 +19,18 @@
   description: This implant plays a sad tune when the user dies.
   categories: [ HideSpawnMenu ]
   components:
-    - type: SubdermalImplant
-      whitelist:
-        components:
-        - MobState # admeme implanting a chair with trombone implant needs to give the chair mobstate so it can die first
-    - type: TriggerOnMobstateChange
-      mobState:
-      - Dead
-    - type: EmitSoundOnTrigger
-      sound:
-        collection: SadTrombone
-        params:
-          variation: 0.125
+  - type: SubdermalImplant
+    whitelist:
+      components:
+      - MobState # admeme implanting a chair with trombone implant needs to give the chair mobstate so it can die first
+  - type: TriggerOnMobstateChange
+    mobState:
+    - Dead
+  - type: EmitSoundOnTrigger
+    sound:
+      collection: SadTrombone
+      params:
+        variation: 0.125
 
 - type: entity
   parent: BaseSubdermalImplant
@@ -39,20 +39,20 @@
   description: This implant emits light from the user's skin on activation.
   categories: [ HideSpawnMenu ]
   components:
-    - type: SubdermalImplant
-      implantAction: ActionToggleLight
-    - type: PointLight
-      enabled: false
-      radius: 2.5
-      softness: 5
-      mask: /Textures/Effects/LightMasks/cone.png
-      autoRot: true
-    - type: Tag
-      tags:
-        - SubdermalImplant
-        - HideContextMenu
-        - Flashlight
-    - type: UnpoweredFlashlight
+  - type: SubdermalImplant
+    implantAction: ActionToggleLight
+  - type: PointLight
+    enabled: false
+    radius: 2.5
+    softness: 5
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: Tag
+    tags:
+    - SubdermalImplant
+    - HideContextMenu
+    - Flashlight
+  - type: UnpoweredFlashlight
 
 - type: entity
   parent: BaseSubdermalImplant
@@ -108,6 +108,7 @@
   description: This implant grants hidden storage within a person's body using bluespace technology.
   categories: [ HideSpawnMenu ]
   components:
+    - type: StorageImplant
     - type: SubdermalImplant
       implantAction: ActionOpenStorageImplant
       whitelist:
@@ -280,6 +281,10 @@
   components:
     - type: SubdermalImplant
       permanent: true
+    - type: ReplacementImplant
+      whitelist:
+        tags:
+        - MicroBomb # replace microbomb implant with macrobomb
     - type: TriggerOnMobstateChange #activates the timer
       mobState:
       - Dead
@@ -306,9 +311,9 @@
       canCreateVacuum: true
     - type: Tag
       tags:
-        - SubdermalImplant
-        - HideContextMenu
-        - MacroBomb
+      - SubdermalImplant
+      - HideContextMenu
+      - MacroBomb
 
 - type: entity
   parent: BaseSubdermalImplant
@@ -362,9 +367,11 @@
   description: This implant allows the implanter to produce a fake signal that NT security huds use to identify individuals implanted with a mindshield.
   categories: [ HideSpawnMenu ]
   components:
-      - type: SubdermalImplant
-        implantAction: FakeMindShieldToggleAction
-      - type: FakeMindShieldImplant
+  - type: SubdermalImplant
+    implantAction: FakeMindShieldToggleAction
+    implantComponents:
+    - type: FakeMindShield # TODO: put the component on the implant and use implant relay events for the status icon
+  - type: FakeMindShieldImplant
 
 # Sec and Command implants
 

Resources/Prototypes/Entities/Objects/Misc/tiles.yml

@@ -1768,6 +1768,20 @@
   - type: Stack
     stackType: FloorTileXenoMaint
 
+- type: entity
+  id: FloorTileItemXenoborg
+  parent: FloorTileItemBase
+  name: xenoborg floor
+  components:
+  - type: Sprite
+    state: xenoborg-floor
+  - type: FloorTile
+    outputs:
+    - Plating
+    - FloorXenoborg
+  - type: Stack
+    stackType: FloorTileXenoborg
+
 - type: entity
   parent: FloorTileItemDark
   id: FloorTileItemDarkSquiggly

Resources/Prototypes/Entities/Objects/Shields/shields.yml

@@ -184,15 +184,12 @@
   name: cardboard shield
   parent: BaseShield
   id: CardShield
-  description: A shield that wont shield you from much.
+  description: A shield made of cardboard. Won't protect you from much.
   components:
     - type: Sprite
       state: cardshield-icon
     - type: Item
       heldPrefix: cardshield
-    - type: StaminaResistance
-      damageCoefficient: 0.95
-      worn: true
     - type: Blocking
       passiveBlockModifier:
         coefficients:

Resources/Prototypes/Entities/Objects/Specific/Cargo/mail_bag.yml

@@ -12,6 +12,7 @@
     quickEquip: false
     slots:
     - belt
+    - back
   - type: Item
     size: Ginormous
   - type: Storage
@@ -28,3 +29,7 @@
       - Document
       - Paper
   - type: Dumpable
+  - type: Tag
+    tags:
+    - ScurretWearable
+    - CorgiWearable

Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml

@@ -239,25 +239,3 @@
   - type: Residue
     residueAdjective: residue-slippery
     residueColor: residue-blue
-
-- type: entity
-  name: soap
-  id: SoapBorg # Intended for borg internals, not slippery or food, not a container for soap reagent
-  parent: BaseItem
-  description: A Nanotrasen brand bar of soap. Smells of plasma and machines.
-  components:
-  - type: Sprite
-    sprite: Objects/Specific/Janitorial/soap.rsi
-    layers:
-    - state: nt-4
-  - type: Appearance
-  - type: Item
-    sprite: Objects/Specific/Janitorial/soap.rsi
-    storedRotation: -90
-  - type: CleansForensics
-  - type: Residue
-    residueAdjective: residue-slippery
-    residueColor: residue-grey
-  - type: Tag
-    tags:
-    - Soap

Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml

@@ -75,16 +75,23 @@
   - type: ContainerContainer
     containers:
       mech-assembly-container: !type:Container
-  - type: MechAssembly
-    finishedPrototype: RipleyChassis
-    requiredParts:
-      RipleyLArm: false
-      RipleyRArm: false
-      RipleyLLeg: false
-      RipleyRLeg: false
+      battery-container: !type:Container
+  - type: MechAssemblyVisuals
+    statePrefix: ripley
   - type: Sprite
     state: ripley_harness+o
     noRot: true
+  - type: PartAssembly
+    parts:
+      Ripley:
+      - RipleyLArm
+      - RipleyRArm
+      - RipleyLLeg
+      - RipleyRLeg
+    containerId: mech-assembly-container
+  - type: Construction
+    graph: Ripley
+    node: start
 
 - type: entity
   parent: BaseRipleyPartItem
@@ -134,26 +141,6 @@
     tags:
     - RipleyRArm
 
-- type: entity
-  id: RipleyChassis
-  parent: BaseRipleyPart
-  name: ripley chassis
-  description: An in-progress construction of the Ripley APLU mech.
-  components:
-  - type: Appearance
-  - type: ContainerContainer
-    containers:
-      battery-container: !type:Container
-  - type: MechAssemblyVisuals
-    statePrefix: ripley
-  - type: Sprite
-    noRot: true
-    state: ripley0
-  - type: Construction
-    graph: Ripley
-    node: start
-    defaultTarget: ripley
-
 # H.O.N.K.
 
 - type: entity
@@ -203,16 +190,23 @@
   - type: ContainerContainer
     containers:
       mech-assembly-container: !type:Container
-  - type: MechAssembly
-    finishedPrototype: HonkerChassis
-    requiredParts:
-      HonkerLArm: false
-      HonkerRArm: false
-      HonkerLLeg: false
-      HonkerRLeg: false
+      battery-container: !type:Container
+  - type: MechAssemblyVisuals
+    statePrefix: honker
   - type: Sprite
     state: honker_harness+o
     noRot: true
+  - type: PartAssembly
+    parts:
+      Honker:
+      - HonkerLArm
+      - HonkerRArm
+      - HonkerLLeg
+      - HonkerRLeg
+    containerId: mech-assembly-container
+  - type: Construction
+    graph: Honker
+    node: start
 
 - type: entity
   parent: BaseHonkerPartItem
@@ -262,26 +256,6 @@
     tags:
     - HonkerRArm
 
-- type: entity
-  id: HonkerChassis
-  parent: BaseHonkerPart
-  name: H.O.N.K. chassis
-  description: An in-progress construction of a H.O.N.K. mech. Contains chuckle unit, bananium core and honk support systems.
-  components:
-  - type: Appearance
-  - type: ContainerContainer
-    containers:
-      battery-container: !type:Container
-  - type: MechAssemblyVisuals
-    statePrefix: honker
-  - type: Sprite
-    noRot: true
-    state: honker0
-  - type: Construction
-    graph: Honker
-    node: start
-    defaultTarget: honker
-
 # H.A.M.T.R.
 
 - type: entity
@@ -331,16 +305,23 @@
   - type: ContainerContainer
     containers:
       mech-assembly-container: !type:Container
-  - type: MechAssembly
-    finishedPrototype: HamtrChassis
-    requiredParts:
-      HamtrLArm: false
-      HamtrRArm: false
-      HamtrLLeg: false
-      HamtrRLeg: false
+      battery-container: !type:Container
+  - type: MechAssemblyVisuals
+    statePrefix: hamtr
   - type: Sprite
     state: hamtr_harness+o
     noRot: true
+  - type: PartAssembly
+    parts:
+      Hamtr:
+      - HamtrLArm
+      - HamtrRArm
+      - HamtrLLeg
+      - HamtrRLeg
+    containerId: mech-assembly-container
+  - type: Construction
+    graph: Hamtr
+    node: start
 
 - type: entity
   parent: BaseHamtrPartItem
@@ -390,26 +371,6 @@
     tags:
     - HamtrRArm
 
-- type: entity
-  id: HamtrChassis
-  parent: BaseHamtrPart
-  name: HAMTR chassis
-  description: An in-progress construction of the HAMTR mech.
-  components:
-  - type: Appearance
-  - type: ContainerContainer
-    containers:
-      battery-container: !type:Container
-  - type: MechAssemblyVisuals
-    statePrefix: hamtr
-  - type: Sprite
-    noRot: true
-    state: hamtr0
-  - type: Construction
-    graph: Hamtr
-    node: start
-    defaultTarget: hamtr
-
 # Vim!!!!!!
 
 - type: entity
@@ -455,30 +416,17 @@
   - type: ContainerContainer
     containers:
       mech-assembly-container: !type:Container
-  - type: MechAssembly
-    finishedPrototype: VimChassis
-    requiredParts:
-      HelmetEVA: false
-      BorgLeg: false
+      battery-container: !type:Container
+  - type: PartAssembly
+    parts:
+      Vim:
+      - HelmetEVA
+      - BorgLeg
+      - BorgLeg
+    containerId: mech-assembly-container
   - type: Sprite
     state: harness
     noRot: true
-
-- type: entity
-  id: VimChassis
-  parent: BaseVimPart
-  name: vim chassis
-  description: An in-progress construction of the Vim exosuit.
-  components:
-  - type: Appearance
-  - type: ContainerContainer
-    containers:
-      battery-container: !type:Container
-  - type: MechAssemblyVisuals
-    statePrefix: vim
-  - type: Sprite
-    noRot: true
-    state: vim0
   - type: Construction
     graph: Vim
     node: start

Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml

@@ -64,6 +64,7 @@
   - type: Pullable
   - type: Physics
     bodyType: KinematicController
+  - type: GravityAffected
   - type: Clickable
   - type: WiresPanel
   - type: Fixtures