Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync

# Conflicts:
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/Traits/TraitSystem.cs
#	Content.Shared/CCVar/CCVars.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Resources/Maps/box.yml
#	Resources/Maps/core.yml

Resources/Prototypes/Actions/borgs.yml

@@ -10,3 +10,15 @@
       state: state-laws
     event: !type:ToggleLawsScreenEvent
     useDelay: 0.5
+
+- type: entity
+  id: ActionSelectBorgType
+  name: Select Cyborg Type
+  components:
+  - type: InstantAction
+    itemIconStyle: NoItem
+    icon:
+      sprite: Interface/Actions/actions_borg.rsi
+      state: select-type
+    event: !type:BorgToggleSelectTypeEvent
+    useDelay: 0.5

Resources/Prototypes/Actions/crit.yml

@@ -12,6 +12,8 @@
       sprite: Mobs/Ghosts/ghost_human.rsi
       state: icon
     event: !type:CritSuccumbEvent
+    startDelay: true
+    useDelay: 10
 
 - type: entity
   id: ActionCritFakeDeath
@@ -41,3 +43,5 @@
       sprite: Interface/Actions/actions_crit.rsi
       state: lastwords
     event: !type:CritLastWordsEvent
+    startDelay: true
+    useDelay: 10

Resources/Prototypes/Actions/polymorph.yml

@@ -40,3 +40,53 @@
     icon:
       sprite: Objects/Fun/immovable_rod.rsi
       state: icon
+
+- type: entity
+  id: ActionPolymorphJaunt
+  name: Ethereal Jaunt
+  description: Melt into the Ethereal Plane for a quick getaway!
+  components:
+  - type: Magic
+  - type: InstantAction
+    useDelay: 30
+    event: !type:PolymorphActionEvent
+      protoId: Jaunt
+    itemIconStyle: NoItem
+    icon:
+      sprite: Objects/Magic/magicactions.rsi
+      state: jaunt
+    # TODO: Effect ECS (from cardboard box)
+  - type: ActionUpgrade
+    effectedLevels:
+      2: ActionPolymorphJauntII
+      3: ActionPolymorphJauntIII
+
+- type: entity
+  id: ActionPolymorphJauntII
+  parent: ActionPolymorphJaunt
+  name: Ethereal Jaunt II
+  description: Melt into the Ethereal Plane for an even quicker getaway!
+  components:
+  - type: InstantAction
+    useDelay: 25
+    event: !type:PolymorphActionEvent
+      protoId: Jaunt
+    itemIconStyle: NoItem
+    icon:
+      sprite: Objects/Magic/magicactions.rsi
+      state: jaunt
+
+- type: entity
+  id: ActionPolymorphJauntIII
+  parent: ActionPolymorphJaunt
+  name: Ethereal Jaunt III
+  description: Are you even tangible anymore?
+  components:
+  - type: InstantAction
+    useDelay: 20
+    event: !type:PolymorphActionEvent
+      protoId: Jaunt
+    itemIconStyle: NoItem
+    icon:
+      sprite: Objects/Magic/magicactions.rsi
+      state: jaunt

Resources/Prototypes/Alerts/alerts.yml

@@ -14,6 +14,7 @@
     - alertType: Ensnared
     - category: Buckled
     - alertType: Pulling
+    - alertType: Walking
     - category: Piloting
     - alertType: Corporeal
     - alertType: Stun
@@ -127,6 +128,14 @@
   name: alerts-weightless-name
   description: alerts-weightless-desc
 
+- type: alert
+  id: Walking
+  icons:
+  - sprite: /Textures/Interface/Alerts/walking.rsi
+    state: walking
+  name: alerts-walking-name
+  description: alerts-walking-desc
+
 - type: alert
   id: Stun
   icons:

Resources/Prototypes/Body/Parts/silicon.yml

@@ -28,82 +28,105 @@
     - Robotics
 
 - type: entity
-  id: BaseBorgArmLeft
+  id: LeftArmBorg
   parent: PartSilicon
   name: cyborg left arm
-  abstract: true
   components:
   - type: BodyPart
     partType: Hand
     symmetry: Left
+  - type: Sprite
+    state: borg_l_arm
+  - type: Icon
+    state: borg_l_arm
   - type: Tag
     tags:
     - Trash
     - BorgArm
+    - BorgLArm
 
 - type: entity
-  id: BaseBorgArmRight
+  id: RightArmBorg
   parent: PartSilicon
   name: cyborg right arm
-  abstract: true
   components:
   - type: BodyPart
     partType: Hand
     symmetry: Right
+  - type: Sprite
+    state: borg_r_arm
+  - type: Icon
+    state: borg_r_arm
   - type: Tag
     tags:
     - Trash
     - BorgArm
+    - BorgRArm
 
 - type: entity
-  id: BaseBorgLegLeft
+  id: LeftLegBorg
   parent: PartSilicon
   name: cyborg left leg
-  abstract: true
   components:
   - type: BodyPart
     partType: Leg
     symmetry: Left
+  - type: Sprite
+    state: borg_l_leg
+  - type: Icon
+    state: borg_l_leg
   - type: Tag
     tags:
     - Trash
     - BorgLeg
+    - BorgLLeg
 
 - type: entity
-  id: BaseBorgLegRight
+  id: RightLegBorg
   parent: PartSilicon
   name: cyborg right leg
-  abstract: true
   components:
   - type: BodyPart
     partType: Leg
     symmetry: Right
+  - type: Sprite
+    state: borg_r_leg
+  - type: Icon
+    state: borg_r_leg
   - type: Tag
     tags:
     - Trash
     - BorgLeg
+    - BorgRLeg
 
 - type: entity
-  id: BaseBorgHead
+  id: LightHeadBorg
   parent: PartSilicon
   name: cyborg head
-  abstract: true
   components:
   - type: BodyPart
     partType: Head
+  - type: Sprite
+    state: borg_head
+  - type: Icon
+    state: borg_head
   - type: Tag
     tags:
     - Trash
     - BorgHead
 
 - type: entity
-  id: BaseBorgTorso
+  id: TorsoBorg
   parent: PartSilicon
   name: cyborg torso
-  abstract: true
   components:
   - type: BodyPart
     partType: Torso
+  - type: Sprite
+    state: borg_chest
+  - type: Icon
+    state: borg_chest
   - type: Tag
     tags:
     - Trash
+    - BorgTorso

Resources/Prototypes/Catalog/Cargo/cargo_armory.yml

@@ -18,6 +18,16 @@
   category: cargoproduct-category-name-armory
   group: market
 
+- type: cargoProduct
+  id: SecurityRiot
+  icon:
+    sprite: Clothing/OuterClothing/Armor/riot.rsi
+    state: icon
+  product: CrateSecurityRiot
+  cost: 7500
+  category: cargoproduct-category-name-armory
+  group: market
+
 - type: cargoProduct
   id: TrackingImplant
   icon:

Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml

@@ -1,9 +0,0 @@
-- type: cargoProduct
-  id: CrewMonitoringBoards
-  icon:
-    sprite: Objects/Misc/module.rsi
-    state: cpuboard
-  product: CrateCrewMonitoringBoards
-  cost: 2000
-  category: cargoproduct-category-name-circuitboards
-  group: market

Resources/Prototypes/Catalog/Cargo/cargo_engines.yml

@@ -66,7 +66,7 @@
     sprite: Objects/Devices/flatpack.rsi
     state: solar-assembly-part
   product: CrateEngineeringSolar
-  cost: 525
+  cost: 1250
   category: cargoproduct-category-name-engineering
   group: market
 

Resources/Prototypes/Catalog/Cargo/cargo_science.yml

@@ -27,3 +27,13 @@
   cost: 800
   category: cargoproduct-category-name-science
   group: market
+
+- type: cargoProduct
+  id: CrewMonitoring
+  icon:
+    sprite: Structures/Machines/server.rsi
+    state: server
+  product: CrateCrewMonitoring
+  cost: 2000
+  category: cargoproduct-category-name-science
+  group: market

Resources/Prototypes/Catalog/Cargo/cargo_security.yml

@@ -28,16 +28,6 @@
   category: cargoproduct-category-name-security
   group: market
 
-- type: cargoProduct
-  id: SecurityRiot
-  icon:
-    sprite: Clothing/OuterClothing/Armor/riot.rsi
-    state: icon
-  product: CrateSecurityRiot
-  cost: 7500
-  category: cargoproduct-category-name-security
-  group: market
-
 - type: cargoProduct
   id: SecuritySupplies
   icon:

Resources/Prototypes/Catalog/Cargo/cargo_vending.yml

@@ -33,7 +33,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 2400
+  cost: 2440
   category: cargoproduct-category-name-service
   group: market
 

Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml

@@ -159,7 +159,7 @@
   parent: ClothingBackpackDuffelSyndicateBundle
   id: ClothingBackpackDuffelSyndicatePyjamaBundle
   name: syndicate pyjama duffel bag
-  description: Contains 3 pairs of syndicate pyjamas and 3 plushies for the ultimate sleepover.
+  description: Contains 3 pairs of syndicate pyjamas and 4 plushies for the ultimate sleepover.
   components:
   - type: Storage
     grid:

Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml

@@ -84,4 +84,4 @@
         amount: 2
       - id: WeaponBaguette
       - id: SyndicateMicrowaveMachineCircuitboard
-      - id: PaperWrittenCombatBakeryKit
+      - id: PaperWrittenCombatBakeryKit

Resources/Prototypes/Catalog/Fills/Crates/armory.yml

@@ -69,3 +69,22 @@
       amount: 2
     - id: MagazinePistol
       amount: 4
+
+- type: entity
+  id: CrateSecurityRiot
+  parent: [ CrateWeaponSecure, BaseRestrictedContraband ]
+  name: swat crate
+  description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open.
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingOuterArmorRiot
+      amount: 2
+    - id: ClothingHeadHelmetRiot
+      amount: 2
+    - id: WeaponShotgunEnforcerRubber
+      amount: 2
+    - id: BoxBeanbag
+      amount: 2
+    - id: RiotShield
+      amount: 2

Resources/Prototypes/Catalog/Fills/Crates/circuitboards.yml

@@ -1,12 +0,0 @@
-- type: entity
-  id: CrateCrewMonitoringBoards
-  parent: CrateEngineeringSecure
-  name: crew monitoring boards
-  description: Has two crew monitoring console and server replacements. Requires engineering access to open.
-  components:
-    - type: StorageFill
-      contents:
-        - id: CrewMonitoringComputerCircuitboard
-          amount: 2
-        - id: CrewMonitoringServerMachineCircuitboard
-          amount: 2

Resources/Prototypes/Catalog/Fills/Crates/engines.yml

@@ -120,12 +120,14 @@
   id: CrateEngineeringSolar
   parent: CrateEngineering
   name: solar assembly crate
-  description: Parts for constructing solar panels and trackers.
+  description: A kit with solar flatpacks and glass to construct ten solar panels.
   components:
   - type: StorageFill
     contents:
       - id: SolarAssemblyFlatpack
-        amount: 6
+        amount: 10
+      - id: SheetGlass10
+        amount: 2
 
 - type: entity
   id: CrateEngineeringShuttle

Resources/Prototypes/Catalog/Fills/Crates/science.yml

@@ -12,3 +12,15 @@
         amount: 2
       - id: ClothingMaskSterile
         amount: 2
+
+- type: entity
+  id: CrateCrewMonitoring
+  parent: CrateScienceSecure
+  name: crew monitoring crate
+  description: Contains a flatpack of a crew monitoring server and a few crew monitoring computers. Requires Science access to open.
+  components:
+  - type: StorageFill
+    contents:
+    - id: CrewMonitoringServerFlatpack
+    - id: CrewMonitoringComputerFlatpack
+      amount: 3

Resources/Prototypes/Catalog/Fills/Crates/security.yml

@@ -38,26 +38,6 @@
 #      - Pepperspray
 #      - GrenadeTeargas
 
-- type: entity
-  id: CrateSecurityRiot
-  parent: CrateSecgear
-  name: swat crate
-  description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open.
-  components:
-  - type: StorageFill
-    contents:
-      - id: ClothingOuterArmorRiot
-        amount: 2
-      - id: ClothingHeadHelmetRiot
-        amount: 2
-      - id: WeaponShotgunEnforcerRubber
-        amount: 2
-      - id: BoxBeanbag
-        amount: 2
-      - id: RiotShield
-        amount: 2
-#      - SecGasmask
-
 - type: entity
   id: CrateSecuritySupplies
   parent: CrateSecgear

Resources/Prototypes/Catalog/Fills/Crates/service.yml

@@ -130,6 +130,7 @@
     - id: BoxFolderYellow
     - id: NewtonCradle
     - id: BoxEnvelope
+    - id: BrbSign
 
 - type: entity
   id: CrateServiceFaxMachine

Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml

@@ -53,6 +53,8 @@
     ClothingUniformJumpskirtCasualPurple: 2
     ClothingUniformJumpsuitCasualRed: 2
     ClothingUniformJumpskirtCasualRed: 2
+    ClothingUniformJumpsuitCasualGreen: 2
+    ClothingUniformJumpskirtCasualGreen: 2
     # DO NOT ADD MORE, USE UNIFORM DYING
     ClothingShoesColorBlack: 8
     ClothingShoesColorBrown: 4

Resources/Prototypes/Catalog/spellbook_catalog.yml

@@ -1,4 +1,4 @@
-# Offensive
+# Offensive
 - type: listing
   id: SpellbookFireball
   name: spellbook-fireball-name
@@ -77,6 +77,20 @@
   - !type:ListingLimitedStockCondition
     stock: 1
 
+- type: listing
+  id: SpellbookJaunt
+  name: spellbook-ethereal-jaunt-name
+  description: spellbook-ethereal-jaunt-description
+  productAction: ActionPolymorphJaunt
+  productUpgradeId: SpellbookJauntUpgrade
+  cost:
+    WizCoin: 2
+  categories:
+  - SpellbookUtility
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
 # Equipment
 - type: listing
   id: SpellbookWandDoor
@@ -118,6 +132,34 @@
   - !type:ListingLimitedStockCondition
     stock: 1
 
+- type: listing
+  id: SpellbookEventSummonGuns
+  name: spellbook-event-summon-guns-name
+  description: spellbook-event-summon-guns-description
+  productAction: ActionSummonGuns
+  cost:
+    WizCoin: 2
+  categories:
+  - SpellbookEvents
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+  disableRefund: true
+
+- type: listing
+  id: SpellbookEventSummonMagic
+  name: spellbook-event-summon-magic-name
+  description: spellbook-event-summon-magic-description
+  productAction: ActionSummonMagic
+  cost:
+    WizCoin: 2
+  categories:
+  - SpellbookEvents
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+  disableRefund: true
+
 # Upgrades
 - type: listing
   id: SpellbookFireballUpgrade
@@ -138,3 +180,22 @@
   # manual for now
   - !type:ListingLimitedStockCondition
     stock: 2
+
+- type: listing
+  id: SpellbookJauntUpgrade
+  productUpgradeId: SpellbookJauntUpgrade
+  name: spellbook-upgrade-jaunt-name
+  description: spellbook-upgrade-jaunt-description
+  icon:
+    sprite: Objects/Magic/magicactions.rsi
+    state: jaunt
+  cost:
+    WizCoin: 2
+  categories:
+  - SpellbookUtility
+  conditions:
+  - !type:BuyBeforeCondition
+    whitelist:
+    - SpellbookJaunt
+  - !type:ListingLimitedStockCondition
+    stock: 2

Resources/Prototypes/Datasets/Names/borer.yml

@@ -1,72 +1,5 @@
-- type: dataset
-  id: names_borer
+- type: localizedDataset
+  id: NamesBorer
   values:
-  - Alcyonium
-  - Anomia
-  - Aphrodita
-  - Arca
-  - Argonauta
-  - Ascaris
-  - Asterias
-  - Buccinum
-  - Bulla
-  - Cardium
-  - Chama
-  - Chiton
-  - Conus
-  - Corallina
-  - Cypraea
-  - Dentalium
-  - Donax
-  - Doris
-  - Echinus
-  - Eschara
-  - Fasciola
-  - Furia
-  - Gordius
-  - Gorgonia
-  - Haliotis
-  - Helix
-  - Hirudo
-  - Holothuria
-  - Hydra
-  - Isis
-  - Lepas
-  - Lernaea
-  - Limax
-  - Lumbricus
-  - Madrepora
-  - Medusa
-  - Millepora
-  - Murex
-  - Myes
-  - Mytilus
-  - Myxine
-  - Nautilus
-  - Nereis
-  - Neritha
-  - Ostrea
-  - Patella
-  - Pennatula
-  - Pholas
-  - Pinna
-  - Priapus
-  - Scyllaea
-  - Sepia
-  - Serpula
-  - Sertularia
-  - Solen
-  - Spondylus
-  - Strombus
-  - Taenia
-  - Tellina
-  - Teredo
-  - Tethys
-  - Triton
-  - Trochus
-  - Tubipora
-  - Tubularia
-  - Turbo
-  - Venus
-  - Voluta
-  - Volvox
+    prefix: names-borer-dataset-
+    count: 69

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

@@ -230,6 +230,7 @@
     stealthy: true
   - type: ToggleClothing
     action: ActionToggleNinjaGloves
+    disableOnUnequip: true
   - type: NinjaGloves
     abilities:
     - components:

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

@@ -452,6 +452,7 @@
     delay: 1.0
   - type: ToggleClothing
     action: ActionToggleJusticeHelm
+    mustEquip: false
   - type: ItemTogglePointLight
   - type: ToggleableLightVisuals
     clothingVisuals:

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

@@ -155,6 +155,7 @@
   # phase cloak
   - type: ToggleClothing
     action: ActionTogglePhaseCloak
+    disableOnUnequip: true
   - type: ComponentToggler
     parent: true
     components:

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

@@ -14,8 +14,7 @@
     sprite: Clothing/Shoes/Boots/magboots.rsi
   - type: ToggleClothing
     action: ActionToggleMagboots
-  - type: ToggleVerb
-    text: toggle-magboots-verb-get-data-text
+    mustEquip: false
   - type: ComponentToggler
     components:
     - type: NoSlip

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

@@ -222,24 +222,24 @@
     sprite: Clothing/Uniforms/Jumpskirt/color.rsi
     layers:
     - state: icon
-      color: "#79CC26"
+      color: "#007923"
     - state: trinkets-icon
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left
-        color: "#79CC26"
+        color: "#007923"
       - state: trinkets-inhand-left
       right:
       - state: inhand-right
-        color: "#79CC26"
+        color: "#007923"
       - state: trinkets-inhand-right
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/color.rsi
     clothingVisuals:
       jumpsuit:
       - state: equipped-INNERCLOTHING
-        color: "#79CC26"
+        color: "#007923"
       - state: trinkets-equipped-INNERCLOTHING
 
 # Orange Jumpskirt

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

@@ -222,24 +222,24 @@
     sprite: Clothing/Uniforms/Jumpsuit/color.rsi
     layers:
     - state: icon
-      color: "#79CC26"
+      color: "#007923"
     - state: trinkets-icon
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left
-        color: "#79CC26"
+        color: "#007923"
       - state: trinkets-inhand-left
       right:
       - state: inhand-right
-        color: "#79CC26"
+        color: "#007923"
       - state: trinkets-inhand-right
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/color.rsi
     clothingVisuals:
       jumpsuit:
       - state: equipped-INNERCLOTHING
-        color: "#79CC26"
+        color: "#007923"
       - state: trinkets-equipped-INNERCLOTHING
 
 # Orange Jumpsuit

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

@@ -822,6 +822,36 @@
       - state: equipped-INNERCLOTHING-shirt
         color: "#b30000"
 
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtCasualGreen
+  name: casual green jumpskirt
+  description: A loose worn green shirt with a grey skirt, perfect for someone looking to relax.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/casual.rsi
+    layers:
+    - state: icon-jumpskirt
+    - state: icon-shirt
+      color: "#00661D"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-jumpskirt
+      - state: inhand-left-shirt
+        color: "#00661D"
+      right:
+      - state: inhand-right-jumpskirt
+      - state: inhand-right-shirt
+        color: "#00661D"
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/casual.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING-jumpskirt
+      - state: equipped-INNERCLOTHING-shirt
+        color: "#00661D"
+
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtOldDress

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

@@ -1347,6 +1347,36 @@
       - state: equipped-INNERCLOTHING-shirt
         color: "#b30000"
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitCasualGreen
+  name: casual green jumpsuit
+  description: A loose worn green shirt with a grey pants, perfect for someone looking to relax.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/casual.rsi
+    layers:
+    - state: icon-jumpsuit
+    - state: icon-shirt
+      color: "#00661D"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-jumpsuit
+      - state: inhand-left-shirt
+        color: "#00661D"
+      right:
+      - state: inhand-right-jumpsuit
+      - state: inhand-right-shirt
+        color: "#00661D"
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/casual.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING-jumpsuit
+      - state: equipped-INNERCLOTHING-shirt
+        color: "#00661D"
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitFamilyGuy

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

@@ -69,6 +69,9 @@
         type: BorgBoundUserInterface
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
+      # Only used for NT borgs that can switch type, defined here to avoid copy-pasting the rest of this component.
+      enum.BorgSwitchableTypeUiKey.SelectBorgType:
+        type: BorgSelectTypeUserInterface
   - type: ActivatableUI
     key: enum.BorgUiKey.Key
   - type: SiliconLawBound
@@ -157,6 +160,7 @@
       collection: FootstepBorg
   - type: Construction
     graph: Cyborg
+    node: cyborg
     containers:
     - part-container
     - cell_slot
@@ -285,6 +289,9 @@
   - type: AccessReader
     access: [["Command"], ["Research"]]
   - type: ShowJobIcons
+  - type: InteractionPopup
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
 
 - type: entity
   id: BaseBorgChassisSyndicate

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

@@ -1,23 +1,22 @@
 - type: entity
-  id: BorgChassisGeneric
+  id: BorgChassisSelectable
   parent: BaseBorgChassisNT
   components:
   - type: Sprite
     layers:
     - state: robot
+      map: ["enum.BorgVisualLayers.Body", "movement"]
     - state: robot_e_r
       map: ["enum.BorgVisualLayers.Light"]
       shader: unshaded
       visible: false
     - state: robot_l
       shader: unshaded
-      map: ["light"]
+      map: ["light","enum.BorgVisualLayers.LightStatus"]
       visible: false
   - type: BorgChassis
-    maxModules: 6
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
+    # Default borg can take no modules until selected type.
+    maxModules: 0
     hasMindState: robot_e
     noMindState: robot_e_r
   - type: BorgTransponder
@@ -25,308 +24,62 @@
       sprite: Mobs/Silicon/chassis.rsi
       state: robot
     name: cyborg
-  - type: Construction
-    node: cyborg
-  - type: Speech
-    speechVerb: Robotic
   - type: InteractionPopup
     interactSuccessString: petting-success-generic-cyborg
     interactFailureString: petting-failure-generic-cyborg
-    interactSuccessSound:
-      path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: BorgSwitchableType
+    inherentRadioChannels:
+    - Common
+    - Binary
+
+- type: entity
+  id: BorgChassisGeneric
+  parent: BorgChassisSelectable
+  name: generic cyborg
+  suffix: type picked
+  components:
+  - type: BorgSwitchableType
+    selectedBorgType: generic
 
 - type: entity
   id: BorgChassisMining
-  parent: BaseBorgChassisNT
+  parent: BorgChassisSelectable
   name: salvage cyborg
   components:
-  - type: Sprite
-    layers:
-    - state: miner
-      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
-    noMovementLayers:
-      movement:
-        state: miner
-  - type: BorgChassis
-    maxModules: 4
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleCargo
-    hasMindState: miner_e
-    noMindState: miner_e_r
-  - type: BorgTransponder
-    sprite:
-      sprite: Mobs/Silicon/chassis.rsi
-      state: miner
-    name: salvage cyborg
-  - type: Construction
-    node: mining
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Supply
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Supply
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgTall
-  - type: InteractionPopup
-    interactSuccessString: petting-success-salvage-cyborg
-    interactFailureString: petting-failure-salvage-cyborg
-    interactSuccessSound:
-      path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: BorgSwitchableType
+    selectedBorgType: mining
 
 - type: entity
   id: BorgChassisEngineer
-  parent: BaseBorgChassisNT
+  parent: BorgChassisSelectable
   name: engineer cyborg
   components:
-  - type: Sprite
-    layers:
-    - state: engineer
-    - state: engineer_e_r
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: engineer_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: BorgChassis
-    maxModules: 4
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleEngineering
-    hasMindState: engineer_e
-    noMindState: engineer_e_r
-  - type: BorgTransponder
-    sprite:
-      sprite: Mobs/Silicon/chassis.rsi
-      state: engineer
-    name: engineer cyborg
-  - type: Construction
-    node: engineer
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Engineering
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Engineering
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Engineering"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgShort
-  - type: InteractionPopup
-    interactSuccessString: petting-success-engineer-cyborg
-    interactFailureString: petting-failure-engineer-cyborg
-    interactSuccessSound:
-      path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: BorgSwitchableType
+    selectedBorgType: engineering
 
 - type: entity
   id: BorgChassisJanitor
-  parent: BaseBorgChassisNT
+  parent: BorgChassisSelectable
   name: janitor cyborg
   components:
-  - type: Sprite
-    layers:
-    - state: janitor
-      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
-    noMovementLayers:
-      movement:
-        state: janitor
-  - type: BorgChassis
-    maxModules: 4
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleJanitor
-    hasMindState: janitor_e
-    noMindState: janitor_e_r
-  - type: BorgTransponder
-    sprite:
-      sprite: Mobs/Silicon/chassis.rsi
-      state: janitor
-    name: janitor cyborg
-  - type: Construction
-    node: janitor
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Service
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Service
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Service"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgShort
-  - type: InteractionPopup
-    interactSuccessString: petting-success-janitor-cyborg
-    interactFailureString: petting-failure-janitor-cyborg
-    interactSuccessSound:
-      path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: BorgSwitchableType
+    selectedBorgType: janitor
 
 - type: entity
   id: BorgChassisMedical
-  parent: [BaseBorgChassisNT, ShowMedicalIcons]
+  parent: BorgChassisSelectable
   name: medical cyborg
   components:
-  - type: Sprite
-    layers:
-    - state: medical
-      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
-    noMovementLayers:
-      movement:
-        state: medical
-  - type: BorgChassis
-    maxModules: 4
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleMedical
-    hasMindState: medical_e
-    noMindState: medical_e_r
-  - type: BorgTransponder
-    sprite:
-      sprite: Mobs/Silicon/chassis.rsi
-      state: medical
-    name: medical cyborg
-  - type: Construction
-    node: medical
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Medical
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Medical
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Medical"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgDutch
-  - type: FootstepModifier
-    footstepSoundCollection:
-      collection: FootstepHoverBorg
-  - type: SolutionScanner
-  - type: InteractionPopup
-    interactSuccessString: petting-success-medical-cyborg
-    interactFailureString: petting-failure-medical-cyborg
-    interactSuccessSound:
-      path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: BorgSwitchableType
+    selectedBorgType: medical
 
 - type: entity
   id: BorgChassisService
-  parent: BaseBorgChassisNT
+  parent: BorgChassisSelectable
   name: service cyborg
   components:
-  - type: Sprite
-    layers:
-    - state: service
-    - state: service_e_r
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: service_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: BorgChassis
-    maxModules: 4
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleService
-    hasMindState: service_e
-    noMindState: service_e_r
-  - type: BorgTransponder
-    sprite:
-      sprite: Mobs/Silicon/chassis.rsi
-      state: service
-    name: service cyborg
-  - type: Construction
-    node: service
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Service
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Service
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Service"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgTall
-  - type: InteractionPopup
-    interactSuccessString: petting-success-service-cyborg
-    interactFailureString: petting-failure-service-cyborg
-    interactSuccessSound:
-      path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: BorgSwitchableType
+    selectedBorgType: service
 
 - type: entity
   id: BorgChassisSyndicateAssault
@@ -354,8 +107,6 @@
           - BorgModuleSyndicateAssault
       hasMindState: synd_sec_e
       noMindState: synd_sec
-    - type: Construction
-      node: syndicateassault
     - type: InteractionPopup
       interactSuccessString: petting-success-syndicate-cyborg
       interactFailureString: petting-failure-syndicate-cyborg
@@ -388,8 +139,6 @@
           - BorgModuleSyndicate
       hasMindState: synd_medical_e
       noMindState: synd_medical
-    - type: Construction
-      node: syndicatemedical
     - type: ShowHealthBars
     - type: InteractionPopup
       interactSuccessString: petting-success-syndicate-cyborg
@@ -429,8 +178,6 @@
           - BorgModuleSyndicate
       hasMindState: synd_engi_e
       noMindState: synd_engi
-    - type: Construction
-      node: syndicatesaboteur
     - type: ShowHealthBars
       damageContainers:
       - Inorganic

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

@@ -1360,7 +1360,7 @@
     rules: ghost-role-information-nonantagonist-rules
   - type: GhostTakeoverAvailable
   - type: Clumsy
-    clumsyDamage:
+    gunShootFailDamage:
       types:
         Blunt: 5
         Piercing: 4
@@ -1536,7 +1536,7 @@
   description: Cousins to the sentient race of lizard people, kobolds blend in with their natural habitat and are as nasty as monkeys; ready to pull out your hair and stab you to death.
   components:
   - type: Clumsy
-    clumsyDamage:
+    gunShootFailDamage:
       types:
         Blunt: 2
         Piercing: 7

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

@@ -50,12 +50,12 @@
       Dead:
         Base: goliath_dead
   - type: MovementSpeedModifier
-    baseWalkSpeed : 2.50
-    baseSprintSpeed : 2.50
+    baseWalkSpeed : 2.00
+    baseSprintSpeed : 2.00
   - type: MobThresholds
     thresholds:
       0: Alive
-      300: Dead
+      250: Dead
   - type: MeleeWeapon
     soundHit:
       path: "/Audio/Weapons/smash.ogg"
@@ -64,7 +64,7 @@
     animation: WeaponArcPunch
     damage:
       types:
-        Slash: 15
+        Slash: 10
         Piercing: 10
   - type: NpcFactionMember
     factions:

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

@@ -231,7 +231,7 @@
     - type: Hands
     - type: ComplexInteraction
     - type: Clumsy
-      clumsyDamage:
+      gunShootFailDamage:
         types:
           Blunt: 5
           Piercing: 4

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

@@ -0,0 +1,40 @@
+- type: entity
+  name: jaunt
+  parent: [Incorporeal, BaseMob]
+  id: BaseMobJaunt
+  description: Faint traces of a humanoid figure linger here
+  suffix: Ethereal
+  components:
+  - type: ContentEye
+    maxZoom: 1.44,1.44
+  - type: Eye
+    drawFov: false
+  - type: Input
+    context: "ghost"
+  - type: InputMover
+  - type: MovementSpeedModifier
+    baseSprintSpeed: 12
+    baseWalkSpeed: 8
+  - type: Visibility
+    layer: 2
+  - type: Spectral
+
+# Should be slow, for balance
+- type: entity
+  name: jaunt
+  parent: BaseMobJaunt
+  id: EtherealJaunt
+  suffix: Wizard
+  components:
+  - type: Sprite
+    sprite: Mobs/Ghosts/ghost_human.rsi
+    color: "#60f7eb"
+    layers:
+    - state: animated
+      shader: unshaded
+    noRot: true
+    overrideContainerOcclusion: true
+    drawdepth: Ghosts
+  - type: MovementSpeedModifier
+    baseSprintSpeed: 6
+    baseWalkSpeed: 4

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

@@ -251,7 +251,7 @@
 
 - type: entity
   id: AntimovCircuitBoard
-  parent: BaseElectronics
+  parent: [BaseElectronics, BaseSyndicateContraband]
   name: law board (Antimov)
   description: An electronics board containing the Antimov lawset.
   components:
@@ -301,6 +301,7 @@
         unshaded:
           Empty: { state: empty }
           Occupied: { state: full }
+  - type: Intellicard
 
 - type: entity
   id: PlayerStationAiEmpty
@@ -428,28 +429,9 @@
       map: ["base"]
 
 # Borgs
-- type: entity
-  id: PlayerBorgGeneric
-  parent: BorgChassisGeneric
-  suffix: Battery, Tools
-  components:
-  - type: ContainerFill
-    containers:
-      borg_brain:
-        - PositronicBrain
-      borg_module:
-        - BorgModuleTool
-  - type: ItemSlots
-    slots:
-      cell_slot:
-        name: power-cell-slot-component-slot-name-default
-        startingItem: PowerCellMedium
-  - type: RandomMetadata
-    nameSegments: [names_borg]
-
 - type: entity
   id: PlayerBorgBattery
-  parent: BorgChassisGeneric
+  parent: BorgChassisSelectable
   suffix: Battery
   components:
   - type: ContainerFill

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

@@ -701,6 +701,36 @@
         - ReagentId: Water
           Quantity: 4 #It makes saline if you add salt!
 
+- type: entity
+  name: anomalous meat mass
+  parent: FoodMeatRawBase
+  id: FoodMeatAnomaly
+  description: An impossibly dense slab of meat. Just looking at it makes you uncomfortable.
+  components:
+  - type: Sprite
+    state: anomalymeat
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 90
+        - ReagentId: Fat
+          Quantity: 90
+  - type: SliceableFood
+    count: 10
+    sliceTime: 5
+    slice: FoodMeat #That's... So much meat
+  - type: InternalTemperature
+    conductivity: 0.43
+  - type: Construction
+    graph: AnomalyMeatSteak
+    node: start
+    defaultTarget: anomaly steak
+  - type: Tag
+    tags:
+    - Meat
+
 # Cooked
 
 - type: entity
@@ -1173,6 +1203,35 @@
       Burger: MeatSnail
       Taco: MeatSnail
 
+- type: entity
+  name: anomalous steak
+  parent: FoodMeatBase
+  id: FoodMeatAnomalyCooked
+  description: A gigantic mass of cooked meat. A meal for a dinner party, or someone REALLY hungry. 
+  components:
+  - type: Tag
+    tags:
+    - Cooked
+    - Meat
+  - type: Sprite
+    layers:
+    - state: anomalymeat-cooked #Kinda hard to cook this... thing evenly
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 100
+        - ReagentId: Protein
+          Quantity: 50
+  - type: SliceableFood
+    count: 10
+    sliceTime: 5
+    slice: FoodMeatCooked
+  - type: Construction
+    graph: AnomalyMeatSteak
+    node: anomaly steak
+
 # Cutlets
 
 # Raw

Resources/Prototypes/Entities/Objects/Decoration/flora.yml

@@ -475,7 +475,7 @@
 - type: entity
   parent: BaseTreeConifer
   id: FloraTreeChristmas02
-  suffix: PresentsGiver
+  suffix: Safe Presents
   name: christmas tree
   components:
   - type: Sprite
@@ -493,16 +493,33 @@
     spawnEntries:
       - id: PresentRandom
         orGroup: present
-      - id: PresentRandomCash
-        prob: 0.20
+      - id: PresentRandomCash # buy your own.
+        prob: 0.1
         orGroup: present
-      - id: PresentRandomAsh
+      - id: PresentRandomCoal # naughty
         prob: 0.05
         orGroup: present
     receivedPopup: christmas-tree-got-gift
     deniedPopup: christmas-tree-no-gift
     requiredHoliday: FestiveSeason
 
+- type: entity
+  parent: FloraTreeChristmas02
+  id: FloraTreeChristmas03
+  suffix: Insane Presents
+  name: christmas tree
+  components:
+  - type: LimitedItemGiver
+    spawnEntries:
+      - id: PresentRandom
+        orGroup: present
+      - id: PresentRandomUnsafe
+        prob: 0.5
+        orGroup: present
+      - id: PresentRandomInsane
+        prob: 0.2
+        orGroup: present
+
 - type: entity
   parent: BaseTreeConifer
   id: FloraTreeStumpConifer

Resources/Prototypes/Entities/Objects/Decoration/present.yml

@@ -374,14 +374,23 @@
       path: /Audio/Effects/unwrap.ogg
 
 - type: entity
-  id: PresentRandomAsh
+  id: PresentRandomCoal
   parent: [PresentBase, BaseItem]
-  suffix: Filled Ash
+  suffix: Filled Coal
   components:
   - type: SpawnItemsOnUse
     items:
       - id: PresentTrash
-      - id: Ash # No coal yet!
+      - id: Coal1
+        orGroup: GiftPool
+      - id: Coal5
+        prob: .4
+        orGroup: GiftPool
+      - id: Coal10
+        prob: .2
+        orGroup: GiftPool
+      - id: Coal15
+        prob: .1
         orGroup: GiftPool
     sound:
       path: /Audio/Effects/unwrap.ogg

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

@@ -215,4 +215,22 @@
     layers:
     - state: fax-machine
   - type: Flatpack
-    entity: FaxMachineBase
+    entity: FaxMachineBase
+
+- type: entity
+  parent: BaseFlatpack
+  id: CrewMonitoringServerFlatpack
+  name: crew monitoring server flatpack
+  description: A flatpack used for constructing a crew monitoring server.
+  components:
+  - type: Flatpack
+    entity: CrewMonitoringServer
+
+- type: entity
+  parent: BaseFlatpack
+  id: CrewMonitoringComputerFlatpack
+  name: crew monitoring computer flatpack
+  description: A flatpack used for constructing a crew monitoring console.
+  components:
+  - type: Flatpack
+    entity: ComputerCrewMonitoring

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

@@ -195,7 +195,7 @@
   id: HypoDartBox
   name: hypodart box
   suffix: HypoDart
-  description: A small box containing an hypodart. Packaging disintegrates when opened, leaving no evidence behind.
+  description: A small box containing a hypodart. Packaging disintegrates when opened, leaving no evidence behind.
   components:
   - type: Sprite
     sprite: Objects/Fun/Darts/dartbox.rsi

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

@@ -333,6 +333,30 @@
   - type: Stack
     count: 1
 
+- type: entity
+  parent: Coal
+  id: Coal5
+  suffix: Five
+  components:
+  - type: Stack
+    count: 5
+
+- type: entity
+  parent: Coal
+  id: Coal10
+  suffix: Ten
+  components:
+  - type: Stack
+    count: 10
+
+- type: entity
+  parent: Coal
+  id: Coal15
+  suffix: Fifteen
+  components:
+  - type: Stack
+    count: 15
+
 - type: entity
   parent: OreBase
   id: SaltOre

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

@@ -47,8 +47,8 @@
       params:
         variation: 0.125
         volume: -4
-  - type: ToggleVerb
-    text: fire-extinguisher-component-verb-text
+    verbToggleOn: fire-extinguisher-component-verb-remove
+    verbToggleOff: fire-extinguisher-component-verb-engage
   - type: SpraySafety
   - type: MeleeWeapon
     wideAnimationRotation: 180

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

@@ -597,6 +597,10 @@
     damage:
       types:
         Blunt: 10
+  - type: Tag
+    tags:
+    - Folder
+    - HighRiskItem
   - type: StealTarget
     stealGroup: BoxFolderQmClipboard
 

Resources/Prototypes/Entities/Objects/Power/lights.yml

@@ -150,6 +150,23 @@
     - LightBulb
     - Trash
 
+- type: entity
+  parent: BaseLightbulb
+  name: dim light bulb
+  id: DimLightBulb
+  description: A dim light bulb for populating the darkness of maintenance.
+  components:
+  - type: LightBulb
+    bulb: Bulb
+    color: "#ba473f"
+    lightEnergy: 0.5
+    lightRadius: 5
+    lightSoftness: 3
+  - type: Tag
+    tags:
+    - LightBulb
+    - Trash
+
 - type: entity
   parent: LightBulb
   name: old incandescent light bulb

Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml

@@ -1036,7 +1036,7 @@
   id: SyringeStimulants
   components:
   - type: Label
-    currentLabel: reagent-name-hyperzine
+    currentLabel: reagent-name-stimulants
   - type: SolutionContainerManager
     solutions:
       injector:

Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml

@@ -448,7 +448,7 @@
   name: hyperzine microinjector
   parent: [ChemicalMedipen, BaseSyndicateContraband]
   id: StimpackMini
-  description: A microinjector of hyperzine that give you about fifteen seconds of the chemical's effects.
+  description: A microinjector of hyperzine that give you about 15 seconds of the chemical's effects.
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/medipen.rsi

Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml

@@ -126,6 +126,9 @@
     state: icon
   - type: Item
     size: Large
+    storedSprite:
+      state: storage
+      sprite: Objects/Weapons/Melee/gorilla.rsi
   - type: MeleeWeapon
     attackRate: 0.5
     angle: 0
@@ -134,6 +137,8 @@
     damage:
       types:
         Blunt: 20
+    soundHit:
+      path: "/Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg"
   - type: CorePoweredThrower
   - type: MeleeThrowOnHit
     unanchorOnHit: true

Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml

@@ -568,7 +568,7 @@
 
 - type: entity
   id: BorgModuleOperative
-  parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule ]
+  parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule, BaseSyndicateContraband ]
   name: operative cyborg module
   description: A module that comes with a crowbar, an Emag and a syndicate pinpointer.
   components:
@@ -586,7 +586,7 @@
 
 - type: entity
   id: BorgModuleEsword
-  parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule ]
+  parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule, BaseSyndicateContraband ]
   name: energy sword cyborg module
   description: A module that comes with a double energy sword.
   components:
@@ -603,7 +603,7 @@
 
 - type: entity
   id: BorgModuleL6C
-  parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule ]
+  parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule, BaseSyndicateContraband ]
   name: L6C ROW cyborg module
   description: A module that comes with a L6C.
   components:

Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml

@@ -1,503 +0,0 @@
-# generic parts
-- type: entity
-  id: LeftArmBorg
-  parent: BaseBorgArmLeft
-  components:
-  - type: Sprite
-    state: borg_l_arm
-  - type: Icon
-    state: borg_l_arm
-  - type: Tag
-    tags:
-    - Trash
-    - BorgArm
-    - BorgGenericLArm
-
-- type: entity
-  id: RightArmBorg
-  parent: BaseBorgArmRight
-  components:
-  - type: Sprite
-    state: borg_r_arm
-  - type: Icon
-    state: borg_r_arm
-  - type: Tag
-    tags:
-    - Trash
-    - BorgArm
-    - BorgGenericRArm
-
-- type: entity
-  id: LeftLegBorg
-  parent: BaseBorgLegLeft
-  components:
-  - type: Sprite
-    state: borg_l_leg
-  - type: Icon
-    state: borg_l_leg
-  - type: Tag
-    tags:
-    - Trash
-    - BorgLeg
-    - BorgGenericLLeg
-
-- type: entity
-  id: RightLegBorg
-  parent: BaseBorgLegRight
-  components:
-  - type: Sprite
-    state: borg_r_leg
-  - type: Icon
-    state: borg_r_leg
-  - type: Tag
-    tags:
-    - Trash
-    - BorgLeg
-    - BorgGenericRLeg
-
-- type: entity
-  id: LightHeadBorg
-  parent: BaseBorgHead
-  components:
-  - type: Sprite
-    state: borg_head
-  - type: Icon
-    state: borg_head
-  - type: Tag
-    tags:
-    - Trash
-    - BorgHead
-    - BorgGenericHead
-
-- type: entity
-  id: TorsoBorg
-  parent: BaseBorgTorso
-  components:
-  - type: Sprite
-    state: borg_chest
-  - type: Icon
-    state: borg_chest
-  - type: Tag
-    tags:
-    - Trash
-    - BorgGenericTorso
-
-# engineer parts
-- type: entity
-  id: LeftArmBorgEngineer
-  parent: BaseBorgArmLeft
-  name: engineer cyborg left arm
-  components:
-  - type: Sprite
-    state: engineer_l_arm
-  - type: Icon
-    state: engineer_l_arm
-  - type: Tag
-    tags:
-    - Trash
-    - BorgArm
-    - BorgEngineerLArm
-
-- type: entity
-  id: RightArmBorgEngineer
-  parent: BaseBorgArmRight
-  name: engineer cyborg right arm
-  components:
-  - type: Sprite
-    state: engineer_r_arm
-  - type: Icon
-    state: engineer_r_arm
-  - type: Tag
-    tags:
-    - Trash
-    - BorgArm
-    - BorgEngineerRArm
-
-- type: entity
-  id: LeftLegBorgEngineer
-  parent: BaseBorgLegLeft
-  name: engineer cyborg left leg
-  components:
-  - type: Sprite
-    state: engineer_l_leg
-  - type: Icon
-    state: engineer_l_leg
-  - type: Tag
-    tags:
-    - Trash
-    - BorgLeg
-    - BorgEngineerLLeg
-
-- type: entity
-  id: RightLegBorgEngineer
-  parent: BaseBorgLegRight
-  name: engineer cyborg right leg
-  components:
-  - type: Sprite
-    state: engineer_r_leg
-  - type: Icon
-    state: engineer_r_leg
-  - type: Tag
-    tags:
-    - Trash
-    - BorgLeg
-    - BorgEngineerRLeg
-
-- type: entity
-  id: HeadBorgEngineer
-  parent: BaseBorgHead
-  name: engineer cyborg head
-  components:
-  - type: Sprite
-    state: engineer_head
-  - type: Icon
-    state: engineer_head
-  - type: Tag
-    tags:
-    - Trash
-    - BorgHead
-    - BorgEngineerHead
-
-- type: entity
-  id: TorsoBorgEngineer
-  parent: BaseBorgTorso
-  name: engineer cyborg torso
-  components:
-  - type: Sprite
-    state: engineer_chest
-  - type: Icon
-    state: engineer_chest
-  - type: Tag
-    tags:
-    - Trash
-    - BorgEngineerTorso
-
-# janitor parts
-- type: entity
-  id: LeftLegBorgJanitor
-  parent: BaseBorgLegLeft
-  name: janitor cyborg left leg
-  components:
-    - type: Sprite
-      state: janitor_l_leg
-    - type: Icon
-      state: janitor_l_leg
-    - type: Tag
-      tags:
-        - Trash
-        - BorgLeg
-        - BorgJanitorLLeg
-
-- type: entity
-  id: RightLegBorgJanitor
-  parent: BaseBorgLegRight
-  name: janitor cyborg right leg
-  components:
-    - type: Sprite
-      state: janitor_r_leg
-    - type: Icon
-      state: janitor_r_leg
-    - type: Tag
-      tags:
-        - Trash
-        - BorgLeg
-        - BorgJanitorRLeg
-
-- type: entity
-  id: HeadBorgJanitor
-  parent: BaseBorgHead
-  name: janitor cyborg head
-  components:
-    - type: Sprite
-      state: janitor_head
-    - type: Icon
-      state: janitor_head
-    - type: Tag
-      tags:
-        - Trash
-        - BorgHead
-        - BorgJanitorHead
-
-- type: entity
-  id: TorsoBorgJanitor
-  parent: BaseBorgTorso
-  name: janitor cyborg torso
-  components:
-    - type: Sprite
-      state: janitor_chest
-    - type: Icon
-      state: janitor_chest
-    - type: Tag
-      tags:
-        - Trash
-        - BorgJanitorTorso
-
-# medical parts
-- type: entity
-  id: LeftArmBorgMedical
-  parent: BaseBorgArmLeft
-  name: medical cyborg left arm
-  components:
-    - type: Sprite
-      state: medical_l_arm
-    - type: Icon
-      state: medical_l_arm
-    - type: Tag
-      tags:
-        - Trash
-        - BorgArm
-        - BorgMedicalLArm
-
-- type: entity
-  id: RightArmBorgMedical
-  parent: BaseBorgArmRight
-  name: medical cyborg right arm
-  components:
-    - type: Sprite
-      state: medical_r_arm
-    - type: Icon
-      state: medical_r_arm
-    - type: Tag
-      tags:
-        - Trash
-        - BorgArm
-        - BorgMedicalRArm
-
-- type: entity
-  id: LeftLegBorgMedical
-  parent: BaseBorgLegLeft
-  name: medical cyborg left leg
-  components:
-    - type: Sprite
-      state: medical_l_leg
-    - type: Icon
-      state: medical_l_leg
-    - type: Tag
-      tags:
-        - Trash
-        - BorgLeg
-        - BorgMedicalLLeg
-
-- type: entity
-  id: RightLegBorgMedical
-  parent: BaseBorgLegRight
-  name: medical cyborg right leg
-  components:
-    - type: Sprite
-      state: medical_r_leg
-    - type: Icon
-      state: medical_r_leg
-    - type: Tag
-      tags:
-        - Trash
-        - BorgLeg
-        - BorgMedicalRLeg
-
-- type: entity
-  id: HeadBorgMedical
-  parent: BaseBorgHead
-  name: medical cyborg head
-  components:
-    - type: Sprite
-      state: medical_head
-    - type: Icon
-      state: medical_head
-    - type: Tag
-      tags:
-        - Trash
-        - BorgHead
-        - BorgMedicalHead
-
-- type: entity
-  id: TorsoBorgMedical
-  parent: BaseBorgTorso
-  name: medical cyborg torso
-  components:
-    - type: Sprite
-      state: medical_chest
-    - type: Icon
-      state: medical_chest
-    - type: Tag
-      tags:
-        - Trash
-        - BorgMedicalTorso
-
-# mining parts
-- type: entity
-  id: LeftArmBorgMining
-  parent: BaseBorgArmLeft
-  name: mining cyborg left arm
-  components:
-    - type: Sprite
-      state: mining_l_arm
-    - type: Icon
-      state: mining_l_arm
-    - type: Tag
-      tags:
-        - Trash
-        - BorgArm
-        - BorgMiningLArm
-
-- type: entity
-  id: RightArmBorgMining
-  parent: BaseBorgArmRight
-  name: mining cyborg right arm
-  components:
-    - type: Sprite
-      state: mining_r_arm
-    - type: Icon
-      state: mining_r_arm
-    - type: Tag
-      tags:
-        - Trash
-        - BorgArm
-        - BorgMiningRArm
-
-- type: entity
-  id: LeftLegBorgMining
-  parent: BaseBorgLegLeft
-  name: mining cyborg left leg
-  components:
-    - type: Sprite
-      state: mining_l_leg
-    - type: Icon
-      state: mining_l_leg
-    - type: Tag
-      tags:
-        - Trash
-        - BorgLeg
-        - BorgMiningLLeg
-
-- type: entity
-  id: RightLegBorgMining
-  parent: BaseBorgLegRight
-  name: mining cyborg right leg
-  components:
-    - type: Sprite
-      state: mining_r_leg
-    - type: Icon
-      state: mining_r_leg
-    - type: Tag
-      tags:
-        - Trash
-        - BorgLeg
-        - BorgMiningRLeg
-
-- type: entity
-  id: HeadBorgMining
-  parent: BaseBorgHead
-  name: mining cyborg head
-  components:
-    - type: Sprite
-      state: mining_head
-    - type: Icon
-      state: mining_head
-    - type: Tag
-      tags:
-        - Trash
-        - BorgHead
-        - BorgMiningHead
-
-- type: entity
-  id: TorsoBorgMining
-  parent: BaseBorgTorso
-  name: mining cyborg torso
-  components:
-    - type: Sprite
-      state: mining_chest
-    - type: Icon
-      state: mining_chest
-    - type: Tag
-      tags:
-        - Trash
-        - BorgMiningTorso
-
-# service parts
-- type: entity
-  id: LeftArmBorgService
-  parent: BaseBorgArmLeft
-  name: service cyborg left arm
-  components:
-  - type: Sprite
-    state: service_l_arm
-  - type: Icon
-    state: service_l_arm
-  - type: Tag
-    tags:
-    - Trash
-    - BorgArm
-    - BorgServiceLArm
-
-- type: entity
-  id: RightArmBorgService
-  parent: BaseBorgArmRight
-  name: service cyborg right arm
-  components:
-  - type: Sprite
-    state: service_r_arm
-  - type: Icon
-    state: service_r_arm
-  - type: Tag
-    tags:
-    - Trash
-    - BorgArm
-    - BorgServiceRArm
-
-- type: entity
-  id: LeftLegBorgService
-  parent: BaseBorgLegLeft
-  name: service cyborg left leg
-  components:
-  - type: Sprite
-    state: service_l_leg
-  - type: Icon
-    state: service_l_leg
-  - type: Tag
-    tags:
-    - Trash
-    - BorgLeg
-    - BorgServiceLLeg
-
-- type: entity
-  id: RightLegBorgService
-  parent: BaseBorgLegRight
-  name: service cyborg right leg
-  components:
-  - type: Sprite
-    state: service_r_leg
-  - type: Icon
-    state: service_r_leg
-  - type: Tag
-    tags:
-    - Trash
-    - BorgLeg
-    - BorgServiceRLeg
-
-- type: entity
-  id: HeadBorgService
-  parent: BaseBorgHead
-  name: service cyborg head
-  components:
-  - type: Sprite
-    state: service_head
-  - type: Icon
-    state: service_head
-  - type: Tag
-    tags:
-    - Trash
-    - BorgHead
-    - BorgServiceHead
-
-- type: entity
-  id: TorsoBorgService
-  parent: BaseBorgTorso
-  name: service cyborg torso
-  components:
-  - type: Sprite
-    state: service_chest
-  - type: Icon
-    state: service_chest
-  - type: Tag
-    tags:
-    - Trash
-    - BorgServiceTorso

Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml

@@ -33,139 +33,27 @@
       borg_l_arm+o:
         whitelist:
           tags:
-          - BorgGenericLArm
+          - BorgLArm
       borg_r_arm+o:
         whitelist:
           tags:
-          - BorgGenericRArm
+          - BorgRArm
       borg_l_leg+o:
         whitelist:
           tags:
-          - BorgGenericLLeg
+          - BorgLLeg
       borg_r_leg+o:
         whitelist:
           tags:
-          - BorgGenericRLeg
+          - BorgRLeg
       borg_head+o:
         whitelist:
           tags:
-          - BorgGenericHead
+          - BorgHead
       borg_chest+o:
         whitelist:
           tags:
-          - BorgGenericTorso
-      service_l_arm+o:
-        whitelist:
-          tags:
-          - BorgServiceLArm
-      service_r_arm+o:
-        whitelist:
-          tags:
-          - BorgServiceRArm
-      service_l_leg+o:
-        whitelist:
-          tags:
-          - BorgServiceLLeg
-      service_r_leg+o:
-        whitelist:
-          tags:
-          - BorgServiceRLeg
-      service_head+o:
-        whitelist:
-          tags:
-          - BorgServiceHead
-      service_chest+o:
-        whitelist:
-          tags:
-          - BorgServiceTorso
-      engineer_l_arm+o:
-        whitelist:
-          tags:
-          - BorgEngineerLArm
-      engineer_r_arm+o:
-        whitelist:
-          tags:
-          - BorgEngineerRArm
-      engineer_l_leg+o:
-        whitelist:
-          tags:
-          - BorgEngineerLLeg
-      engineer_r_leg+o:
-        whitelist:
-          tags:
-          - BorgEngineerRLeg
-      engineer_head+o:
-        whitelist:
-          tags:
-          - BorgEngineerHead
-      engineer_chest+o:
-        whitelist:
-          tags:
-          - BorgEngineerTorso
-      mining_l_arm+o:
-        whitelist:
-          tags:
-            - BorgMiningLArm
-      mining_r_arm+o:
-        whitelist:
-          tags:
-            - BorgMiningRArm
-      mining_l_leg+o:
-        whitelist:
-          tags:
-            - BorgMiningLLeg
-      mining_r_leg+o:
-        whitelist:
-          tags:
-            - BorgMiningRLeg
-      mining_head+o:
-        whitelist:
-          tags:
-            - BorgMiningHead
-      mining_chest+o:
-        whitelist:
-          tags:
-            - BorgMiningTorso
-      medical_l_arm+o:
-        whitelist:
-          tags:
-            - BorgMedicalLArm
-      medical_r_arm+o:
-        whitelist:
-          tags:
-            - BorgMedicalRArm
-      medical_l_leg+o:
-        whitelist:
-          tags:
-            - BorgMedicalLLeg
-      medical_r_leg+o:
-        whitelist:
-          tags:
-            - BorgMedicalRLeg
-      medical_head+o:
-        whitelist:
-          tags:
-            - BorgMedicalHead
-      medical_chest+o:
-        whitelist:
-          tags:
-            - BorgMedicalTorso
-      janitor_l_leg+o:
-        whitelist:
-          tags:
-            - BorgJanitorLLeg
-      janitor_r_leg+o:
-        whitelist:
-          tags:
-            - BorgJanitorRLeg
-      janitor_head+o:
-        whitelist:
-          tags:
-            - BorgJanitorHead
-      janitor_chest+o:
-        whitelist:
-          tags:
-            - BorgJanitorTorso
+          - BorgTorso
   - type: ContainerContainer
     containers:
       part-container: !type:Container
@@ -173,45 +61,12 @@
   - type: PartAssembly
     parts:
       generic:
-      - BorgGenericLArm
-      - BorgGenericRArm
-      - BorgGenericLLeg
-      - BorgGenericRLeg
-      - BorgGenericHead
-      - BorgGenericTorso
-      service:
-      - BorgServiceLArm
-      - BorgServiceRArm
-      - BorgServiceLLeg
-      - BorgServiceRLeg
-      - BorgServiceHead
-      - BorgServiceTorso
-      engineer:
-      - BorgEngineerLArm
-      - BorgEngineerRArm
-      - BorgEngineerLLeg
-      - BorgEngineerRLeg
-      - BorgEngineerHead
-      - BorgEngineerTorso
-      medical:
-      - BorgMedicalLArm
-      - BorgMedicalRArm
-      - BorgMedicalLLeg
-      - BorgMedicalRLeg
-      - BorgMedicalHead
-      - BorgMedicalTorso
-      janitor:
-      - BorgJanitorLLeg
-      - BorgJanitorRLeg
-      - BorgJanitorHead
-      - BorgJanitorTorso
-      mining:
-      - BorgMiningLArm
-      - BorgMiningRArm
-      - BorgMiningLLeg
-      - BorgMiningRLeg
-      - BorgMiningHead
-      - BorgMiningTorso
+      - BorgLArm
+      - BorgRArm
+      - BorgLLeg
+      - BorgRLeg
+      - BorgHead
+      - BorgTorso
   - type: Construction
     graph: Cyborg
     node: start

Resources/Prototypes/Entities/Objects/Specific/chemistry.yml

@@ -284,6 +284,7 @@
   - type: Injector
     injectOnly: false
     ignoreMobs: true
+    ignoreClosed: false
     minTransferAmount: 1
     maxTransferAmount: 5
     transferAmount: 1

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml

@@ -16,114 +16,145 @@
   id: AmmoProviderShotgunShell
   abstract: true
   components:
+    - type: Sprite
+      sprite: Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi
     - type: BallisticAmmoProvider
       mayTransfer: true
       whitelist:
         tags:
         - ShellShotgun
       capacity: 16
+    - type: MagazineVisuals
+      magState: mag
+      steps: 5
+      zeroVisible: false
+    - type: Appearance
 
 # Shotgun Shells
 - type: entity
-  name: shotgun beanbag cartridges dispenser
   parent: AmmoProviderShotgunShell
   id: BoxBeanbag
-  description: A dispenser box full of beanbag shots, designed for riot shotguns.
+  name: shell box (beanbag)
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunBeanbag
     - type: Sprite
       layers:
-        - state: boxwide
-        - state: shellbeanbag
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-1
+        map: ["enum.GunVisualLayers.Mag"]
+      - state: beanbag
 
 - type: entity
-  name: shotgun lethal cartridges dispenser
+  name: shell box (lethal)
   parent: AmmoProviderShotgunShell
   id: BoxLethalshot
-  description: A dispenser box full of lethal pellet shots, designed for riot shotguns.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgun
     - type: Sprite
       layers:
-        - state: boxwide
-        - state: shelllethal
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-1
+        map: ["enum.GunVisualLayers.Mag"]
+      - state: lethal
 
 - type: entity
-  name: shotgun slug cartridges dispenser
+  name: shell box (slug)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunSlug
-  description: A dispenser box full of slugs, designed for riot shotguns.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunSlug
+    - type: MagazineVisuals
+      magState: mag-alt
+      steps: 5
+      zeroVisible: false
     - type: Sprite
       layers:
-        - state: boxwide
-        - state: shellslug
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-alt-1
+        map: ["enum.GunVisualLayers.Mag"]
+      - state: slug
 
 - type: entity
-  name: shotgun flare cartridges dispenser
+  name: shell box (flare)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunFlare
-  description: A dispenser box full of flare cartridges, designed for riot shotguns.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunFlare
     - type: Sprite
       layers:
-        - state: boxwide
-        - state: shellflare
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-1
+        map: ["enum.GunVisualLayers.Mag"]
+      - state: flare
 
 - type: entity
-  name: shotgun incendiary cartridges dispenser
+  name: shell box (incendiary)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunIncendiary
-  description: A dispenser box full of incendiary cartridges, designed for riot shotguns.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunIncendiary
     - type: Sprite
       layers:
-        - state: boxwide
-        - state: shellincendiary
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-1
+        map: ["enum.GunVisualLayers.Mag"]
+      - state: incendiary
 
 - type: entity
-  name: shotgun uranium cartridges dispenser
+  name: shell box (uranium)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunUranium
-  description: A dispenser box full of uranium cartridges, designed for riot shotguns.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunUranium
+    - type: MagazineVisuals
+      magState: mag-alt
+      steps: 5
+      zeroVisible: false
     - type: Sprite
       layers:
-        - state: boxwide
-        - state: shelluranium
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-alt-1
+        map: ["enum.GunVisualLayers.Mag"]
+      - state: uranium
 
 - type: entity
-  name: shotgun practice cartridges dispenser
+  name: shell box (practice)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunPractice
-  description: A dispenser box full of practice cartridges, designed for riot shotguns.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunPractice
     - type: Sprite
       layers:
-        - state: boxwide
-        - state: shellpractice
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-1
+        map: ["enum.GunVisualLayers.Mag"]
+      - state: practice
 
 - type: entity
-  name: tranquilizer cartridges dispenser
+  name: shell box (tranquilizer)
   parent: AmmoProviderShotgunShell
   id: BoxShellTranquilizer
-  description: A dispenser box full of tranquilizer cartridges, designed for riot shotguns.
   components:
     - type: BallisticAmmoProvider
       proto: ShellTranquilizer
     - type: Sprite
       layers:
-        - state: boxwide
-        - state: shelltranquilizer
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-1
+        map: ["enum.GunVisualLayers.Mag"]
+      - state: tranquilizer

Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

@@ -82,7 +82,7 @@
   - type: Appearance
 
 - type: entity
-  name: C-20r sub machine gun
+  name: C-20r submachine gun
   parent: [BaseWeaponSubMachineGun, BaseSyndicateContraband]
   id: WeaponSubMachineGunC20r
   description: A firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo.

Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml

@@ -27,7 +27,7 @@
       gun_chamber: !type:ContainerSlot
   - type: ChamberMagazineAmmoProvider
     autoCycle: false
-    boltClosed: true
+    boltClosed: false
     canRack: false
     soundBoltClosed: /Audio/Weapons/Guns/Cock/revolver_cock.ogg
     soundBoltOpened: /Audio/Weapons/Guns/Cock/revolver_cock.ogg

Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml

@@ -269,7 +269,7 @@
   name: throwing knife
   parent: [BaseKnife, BaseSyndicateContraband]
   id: ThrowingKnife
-  description: This bloodred knife is very aerodynamic and easy to throw, but good luck trying to fight someone hand-to-hand.
+  description: This blood-red knife is very aerodynamic and easy to throw, but good luck trying to fight someone hand-to-hand.
   components:
   - type: Tag
     tags:

Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml

@@ -42,9 +42,9 @@
   - type: Ensnaring
     freeTime: 2.0
     breakoutTime: 3.5 #all bola should generally be fast to remove
-    walkSpeed: 0.7 #makeshift bola shouldn't slow too much
-    sprintSpeed: 0.7
-    staminaDamage: 55 # Sudden weight increase sapping stamina
+    walkSpeed: 0.5 #makeshift bola shouldn't slow too much
+    sprintSpeed: 0.5
+    staminaDamage: 0 # anything but this is gamebreaking
     canThrowTrigger: true
     canMoveBreakout: true
   - type: LandAtCursor

Resources/Prototypes/Entities/Stations/base.yml

@@ -60,6 +60,7 @@
           maxCount: 2
           stationGrid: false
           paths:
+          - /Maps/Ruins/abandoned_outpost.yml
           - /Maps/Ruins/chunked_tcomms.yml
           - /Maps/Ruins/biodome_satellite.yml
           - /Maps/Ruins/derelict.yml
@@ -72,7 +73,7 @@
         vgroid: !type:DungeonSpawnGroup
           minimumDistance: 300
           maximumDistance: 350
-          nameDataset: names_borer
+          nameDataset: NamesBorer
           stationGrid: false
           addComponents:
           - type: Gravity

Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml

@@ -104,6 +104,28 @@
   - type: Wires
     layoutId: AirlockEngineering
 
+- type: entity
+  parent: AirlockExternal
+  id: AirlockExternalCommandLocked
+  suffix: External, Command, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCommand ]
+  - type: Wires
+    layoutId: AirlockCommand
+
+- type: entity
+  parent: AirlockExternalGlass
+  id: AirlockExternalGlassCommandLocked
+  suffix: External, Glass, Command, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCommand ]
+  - type: Wires
+    layoutId: AirlockCommand
+
 - type: entity
   parent: AirlockExternal
   id: AirlockExternalAtmosphericsLocked

Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml

@@ -20,6 +20,7 @@
     - state: closed_unlit
       shader: unshaded
       map: ["enum.DoorVisualLayers.BaseUnlit"]
+      visible: false
     - state: welded
       map: ["enum.WeldableLayers.BaseWelded"]
     - state: bolted_unlit

Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml

@@ -16,6 +16,7 @@
     - state: closed_unlit
       shader: unshaded
       map: ["enum.DoorVisualLayers.BaseUnlit"]
+      visible: false
     - state: welded
       map: ["enum.WeldableLayers.BaseWelded"]
     - state: bolted_unlit

Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml

@@ -37,6 +37,7 @@
     - state: closed_unlit
       shader: unshaded
       map: ["enum.DoorVisualLayers.BaseUnlit"]
+      visible: false
     - state: welded
       map: ["enum.WeldableLayers.BaseWelded"]
     - state: bolted_unlit

Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml

@@ -37,6 +37,7 @@
   - type: Appearance
   - type: Weldable
     time: 2
+    weldedExamineMessage: null
   - type: Airtight
   - type: Damageable
     damageContainer: StructuralInorganic

Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml

@@ -32,6 +32,7 @@
     - state: closed_unlit
       shader: unshaded
       map: ["enum.DoorVisualLayers.BaseUnlit"]
+      visible: false
     - state: welded
       map: ["enum.WeldableLayers.BaseWelded"]
     - state: bolted_unlit
@@ -164,6 +165,7 @@
     - state: closed_unlit
       shader: unshaded
       map: [ "enum.DoorVisualLayers.BaseUnlit" ]
+      visible: false
     - state: welded
       map: [ "enum.WeldableLayers.BaseWelded" ]
     - state: bolted_unlit
@@ -224,6 +226,7 @@
     - state: closed_unlit
       shader: unshaded
       map: [ "enum.DoorVisualLayers.BaseUnlit" ]
+      visible: false
     - state: welded
       map: [ "enum.WeldableLayers.BaseWelded" ]
     - state: bolted_unlit
@@ -279,6 +282,7 @@
     - state: closed_unlit
       shader: unshaded
       map: [ "enum.DoorVisualLayers.BaseUnlit" ]
+      visible: false
     - state: welded
       map: [ "enum.WeldableLayers.BaseWelded" ]
     - state: bolted_unlit
@@ -339,6 +343,7 @@
     - state: closed_unlit
       shader: unshaded
       map: [ "enum.DoorVisualLayers.BaseUnlit" ]
+      visible: false
     - state: welded
       map: [ "enum.WeldableLayers.BaseWelded" ]
     - state: bolted_unlit
@@ -394,6 +399,7 @@
     - state: closed_unlit
       shader: unshaded
       map: [ "enum.DoorVisualLayers.BaseUnlit" ]
+      visible: false
     - state: welded
       map: [ "enum.WeldableLayers.BaseWelded" ]
     - state: bolted_unlit

Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml

@@ -32,8 +32,6 @@
     bonkDamage:
       types:
         Blunt: 4
-    bonkSound: !type:SoundCollectionSpecifier
-      collection: TrayHit
   - type: Clickable
   - type: FootstepModifier
     footstepSoundCollection:

Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml

@@ -346,6 +346,27 @@
         Heat: 1
     popupText: powered-light-component-burn-hand
 
+- type: entity
+  id: PoweredDimSmallLight
+  suffix: Dim
+  parent: PoweredSmallLightEmpty
+  components:
+  - type: Sprite
+    state: base
+  - type: PointLight
+    enabled: true
+    radius: 5
+    energy: 0.5
+    softness: 3
+    color: "#ba473f"
+  - type: PoweredLight
+    hasLampOnSpawn: DimLightBulb
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 1
+    popupText: powered-light-component-burn-hand
+
 - type: entity
   id: PoweredSmallLight
   suffix: ""

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -150,6 +150,7 @@
       - ExteriorLightTube
       - LightBulb
       - LedLightBulb
+      - DimLightBulb
       - Bucket
       - DrinkMug
       - DrinkMugMetal
@@ -572,11 +573,6 @@
     - BorgModuleFireExtinguisher
     - BorgModuleRadiationDetection
     - BorgModuleTool
-    - BorgModuleAppraisal
-    - BorgModuleConstruction
-    - BorgModuleService
-    - BorgModuleTreatment
-    - BorgModuleCleaning
     - CyborgEndoskeleton
     - LeftArmBorg
     - RightArmBorg
@@ -584,50 +580,15 @@
     - RightLegBorg
     - LightHeadBorg
     - TorsoBorg
-    - LeftArmBorgEngineer
-    - RightArmBorgEngineer
-    - LeftLegBorgEngineer
-    - RightLegBorgEngineer
-    - HeadBorgEngineer
-    - TorsoBorgEngineer
-    - LeftLegBorgJanitor
-    - RightLegBorgJanitor
-    - HeadBorgJanitor
-    - TorsoBorgJanitor
-    - LeftArmBorgMedical
-    - RightArmBorgMedical
-    - LeftLegBorgMedical
-    - RightLegBorgMedical
-    - HeadBorgMedical
-    - TorsoBorgMedical
-    - LeftArmBorgMining
-    - RightArmBorgMining
-    - LeftLegBorgMining
-    - RightLegBorgMining
-    - HeadBorgMining
-    - TorsoBorgMining
-    - LeftArmBorgService
-    - RightArmBorgService
-    - LeftLegBorgService
-    - RightLegBorgService
-    - HeadBorgService
-    - TorsoBorgService
     dynamicRecipes:
     - ProximitySensor
-    - BorgModuleLightReplacer
     - BorgModuleAdvancedCleaning
-    - BorgModuleMining
-    - BorgModuleGrapplingGun
     - BorgModuleAdvancedTool
     - BorgModuleGPS
-    - BorgModuleRCD
     - BorgModuleArtifact
     - BorgModuleAnomaly
     - BorgModuleGardening
     - BorgModuleHarvesting
-    - BorgModuleMusique
-    - BorgModuleClowning
-    - BorgModuleDiagnosis
     - BorgModuleDefibrillator
     - BorgModuleAdvancedTreatment
     - RipleyHarness

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml

@@ -0,0 +1,84 @@
+- type: entity
+  parent: [AirSensorBase, GasPipeBase]
+  id: GasPipeSensor
+  name: gas pipe sensor
+  description: Reports on the status of the gas in the attached pipe network. 
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor.rsi
+    drawdepth: BelowFloor
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe.rsi
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+      state: pipeStraight
+    - map: ["base"]
+      state: base
+    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+      state: lights 
+      shader: unshaded      
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.PowerDeviceVisuals.Powered:
+        enum.PowerDeviceVisualLayers.Powered:
+          False: { state: blank }
+          True: { state: lights }
+  - type: AtmosMonitor
+    monitorsPipeNet: true
+  - type: ApcPowerReceiver
+  - type: ExtensionCableReceiver
+  - type: Construction
+    graph: GasPipeSensor
+    node: sensor 
+  - type: NodeContainer
+    nodes:
+      monitored:
+        !type:PipeNode
+        nodeGroupID: Pipe
+        pipeDirection: Longitudinal
+  - type: Tag
+    tags:
+    - AirSensor
+    - Unstackable    
+
+- type: entity
+  parent: GasPipeSensor 
+  id: GasPipeSensorDistribution 
+  suffix: Distribution
+  components:
+  - type: Label
+    currentLabel: gas-pipe-sensor-distribution-loop
+
+- type: entity
+  parent: GasPipeSensor 
+  id: GasPipeSensorWaste  
+  suffix: Waste
+  components:
+  - type: Label
+    currentLabel: gas-pipe-sensor-waste-loop
+
+- type: entity
+  parent: GasPipeSensor 
+  id: GasPipeSensorMixedAir 
+  suffix: Mixed air
+  components:
+  - type: Label
+    currentLabel: gas-pipe-sensor-mixed-air
+
+- type: entity
+  parent: GasPipeSensor 
+  id: GasPipeSensorTEGHot
+  suffix: TEG hot
+  components:
+  - type: Label
+    currentLabel: gas-pipe-sensor-teg-hot-loop
+
+- type: entity
+  parent: GasPipeSensor  
+  id: GasPipeSensorTEGCold
+  suffix: TEG cold
+  components:
+  - type: Label
+    currentLabel: gas-pipe-sensor-teg-cold-loop

Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: SingularityGenerator
   name: gravitational singularity generator
-  description: An Odd Device which produces a Gravitational Singularity when set up.
+  description: An Odd Device which produces a Gravitational Singularity when set up. Comes with a temporary shutdown containment failsafe.
   placement:
     mode: SnapgridCenter
   components:

Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml

@@ -2,12 +2,12 @@
   id: TeslaGenerator
   name: tesla generator
   parent: BaseStructureDynamic
-  description: An Odd Device which produces a powerful Tesla ball when set up.
+  description: An Odd Device which produces a powerful Tesla ball when set up. Comes with a temporary shutdown containment failsafe.
   components:
   - type: Sprite
     noRot: true
     sprite: Structures/Power/Generation/Tesla/generator.rsi
-    state: icon 
+    state: icon
   - type: SingularityGenerator # TODO: rename the generator
     spawnId: TeslaEnergyBall
   - type: InteractionOutline

Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml

@@ -79,6 +79,7 @@
 - type: entity
   parent: BaseAnomalyCore
   id: AnomalyCoreFlesh
+  description: The core of a destroyed flesh anomaly. Pulsates sickeningly, but might be a hearty meal if cooked.
   suffix: Flesh
   components:
   - type: Sprite
@@ -241,7 +242,8 @@
 
 - type: entity
   parent: BaseAnomalyInertCore
-  id: AnomalyCoreFleshInert
+  id: AnomalyCoreFleshInert # Can be microwaved to turn it into a massive piece of meat
+  description: The inert core of a destroyed flesh anomaly. Pulsates sickeningly, but might be good food in the right hands?
   suffix: Flesh, Inert
   components:
   - type: Sprite
@@ -306,7 +308,7 @@
 
 - type: entity
   parent: BaseAnomalyInertCore
-  id: AnomalyCoreFloraInert
+  id: AnomalyCoreFloraInert #Turns into a seed that grows into artifexium
   suffix: Flora, Inert
   components:
   - type: Seed

Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml

@@ -20,6 +20,11 @@
     - state: welded
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
+    - state: paper
+      visible: false
+      sprite: Structures/Storage/closet_labels.rsi
+      offset: "-0.065,0"
+      map: ["enum.PaperLabelVisuals.Layer"]
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml

@@ -19,6 +19,10 @@
     - state: welded
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
+    - state: paper
+      visible: false
+      sprite: Structures/Storage/closet_labels.rsi
+      map: ["enum.PaperLabelVisuals.Layer"]
   - type: MovedByPressure
   - type: PaperLabel
     labelSlot:
@@ -86,6 +90,21 @@
           SheetSteel1:
             min: 1
             max: 1
+  - type: GenericVisualizer
+    visuals:
+      enum.PaperLabelVisuals.HasLabel:
+        enum.PaperLabelVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false }
+      enum.StorageVisuals.Open:
+        enum.PaperLabelVisuals.Layer:
+          True: { visible: false }
+      enum.PaperLabelVisuals.LabelType:
+        enum.PaperLabelVisuals.Layer:
+          Paper: { state: paper }
+          Bounty: { state: bounty }
+          CaptainsPaper: { state: captains_paper }
+          Invoice: { state: invoice }
   - type: Appearance
   - type: EntityStorageVisuals
     stateBaseClosed: generic

Resources/Prototypes/InventoryTemplates/borg.yml

@@ -26,8 +26,7 @@
   - name: head
     slotTexture: head
     slotFlags: HEAD
-    slotGroup: MainHotbar
-    uiWindowPos: 0,0
+    uiWindowPos: 1,0
     strippingWindowPos: 0,0
     displayName: Head
     offset: 0.015625, 0

Resources/Prototypes/Magic/event_spells.yml

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: ActionSummonGhosts
   name: Summon Ghosts
   description: Makes all current ghosts permanently invisible
@@ -10,3 +10,195 @@
       sprite: Mobs/Ghosts/ghost_human.rsi
       state: icon
     event: !type:ToggleGhostVisibilityToAllEvent
+
+# TODO: Add Whitelist/Blacklist and Component support to EntitySpawnLists (to avoid making huge hardcoded lists like below).
+
+- type: entity
+  id: ActionSummonGuns
+  name: Summon Guns
+  description: AK47s for everyone! Places a random gun in front of everybody.
+  components:
+  - type: Magic
+  - type: InstantAction
+    useDelay: 300
+    itemIconStyle: BigAction
+    icon:
+      sprite: Objects/Weapons/Guns/Rifles/ak.rsi
+      state: base
+    event: !type:RandomGlobalSpawnSpellEvent
+      spawns:
+      - id: WeaponPistolViper
+        orGroup: Guns
+      - id: WeaponPistolCobra
+        orGroup: Guns
+      - id: WeaponPistolMk58
+        orGroup: Guns
+      - id: WeaponPistolN1984
+        orGroup: Guns
+      - id: WeaponRevolverDeckard
+        orGroup: Guns
+      - id: WeaponRevolverInspector
+        orGroup: Guns
+      - id: WeaponRevolverMateba
+        orGroup: Guns
+      - id: WeaponRevolverPython
+        orGroup: Guns
+      - id: WeaponRevolverPirate
+        orGroup: Guns
+      - id: WeaponRifleAk
+        orGroup: Guns
+      - id: WeaponRifleM90GrenadeLauncher
+        orGroup: Guns
+      - id: WeaponRifleLecter
+        orGroup: Guns
+      - id: WeaponShotgunBulldog
+        orGroup: Guns
+      - id: WeaponShotgunDoubleBarreled
+        orGroup: Guns
+      - id: WeaponShotgunEnforcer
+        orGroup: Guns
+      - id: WeaponShotgunKammerer
+        orGroup: Guns
+      - id: WeaponShotgunSawn
+        orGroup: Guns
+      - id: WeaponShotgunHandmade
+        orGroup: Guns
+      - id: WeaponShotgunBlunderbuss
+        orGroup: Guns
+      - id: WeaponShotgunImprovised
+        orGroup: Guns
+      - id: WeaponSubMachineGunAtreides
+        orGroup: Guns
+      - id: WeaponSubMachineGunC20r
+        orGroup: Guns
+      - id: WeaponSubMachineGunDrozd
+        orGroup: Guns
+      - id: WeaponSubMachineGunWt550
+        orGroup: Guns
+      - id: WeaponSniperMosin
+        orGroup: Guns
+      - id: WeaponSniperHristov
+        orGroup: Guns
+      - id: Musket
+        orGroup: Guns
+      - id: WeaponPistolFlintlock
+        orGroup: Guns
+      - id: WeaponLauncherChinaLake
+        orGroup: Guns
+      - id: WeaponLauncherRocket
+        orGroup: Guns
+      - id: WeaponLauncherPirateCannon
+        orGroup: Guns
+      - id: WeaponTetherGun
+        orGroup: Guns
+      - id: WeaponForceGun
+        orGroup: Guns
+      - id: WeaponGrapplingGun
+        orGroup: Guns
+      - id: WeaponLightMachineGunL6
+        orGroup: Guns
+      - id: WeaponLaserSvalinn
+        orGroup: Guns
+      - id: WeaponLaserGun
+        orGroup: Guns
+      - id: WeaponMakeshiftLaser
+        orGroup: Guns
+      - id: WeaponTeslaGun
+        orGroup: Guns
+      - id: WeaponLaserCarbinePractice
+        orGroup: Guns
+      - id: WeaponLaserCarbine
+        orGroup: Guns
+      - id: WeaponPulsePistol
+        orGroup: Guns
+      - id: WeaponPulseCarbine
+        orGroup: Guns
+      - id: WeaponPulseRifle
+        orGroup: Guns
+      - id: WeaponLaserCannon
+        orGroup: Guns
+      - id: WeaponParticleDecelerator
+        orGroup: Guns
+      - id: WeaponXrayCannon
+        orGroup: Guns
+      - id: WeaponDisablerPractice
+        orGroup: Guns
+      - id: WeaponDisabler
+        orGroup: Guns
+      - id: WeaponDisablerSMG
+        orGroup: Guns
+      - id: WeaponTaser
+        orGroup: Guns
+      - id: WeaponAntiqueLaser
+        orGroup: Guns
+      - id: WeaponAdvancedLaser
+        orGroup: Guns
+      - id: WeaponPistolCHIMP
+        orGroup: Guns
+      - id: WeaponBehonkerLaser
+        orGroup: Guns
+      - id: WeaponEnergyShotgun
+        orGroup: Guns
+      - id: WeaponMinigun
+        orGroup: Guns
+      - id: BowImprovised
+        orGroup: Guns
+      - id: WeaponFlareGun
+        orGroup: Guns
+      - id: WeaponImprovisedPneumaticCannon
+        orGroup: Guns
+      - id: WeaponWaterPistol
+        orGroup: Guns
+      - id: WeaponWaterBlaster
+        orGroup: Guns
+      - id: WeaponWaterBlasterSuper
+        orGroup: Guns
+      - id: RevolverCapGun
+        orGroup: Guns
+      - id: RevolverCapGunFake
+        orGroup: Guns
+      speech: action-speech-spell-summon-guns
+      
+- type: entity
+  id: ActionSummonMagic
+  name: Summon Magic
+  description: Places a random magical item in front of everybody. Nothing could go wrong!
+  components:
+  - type: Magic
+  - type: InstantAction
+    useDelay: 300
+    itemIconStyle: BigAction
+    icon:
+      sprite: Objects/Magic/magicactions.rsi
+      state: magicmissile
+    event: !type:RandomGlobalSpawnSpellEvent
+      spawns:
+      - id: SpawnSpellbook
+        orGroup: Magics
+      - id: ForceWallSpellbook
+        orGroup: Magics
+      - id: BlinkBook
+        orGroup: Magics
+      - id: SmiteBook
+        orGroup: Magics
+      - id: KnockSpellbook
+        orGroup: Magics
+      - id: FireballSpellbook
+        orGroup: Magics
+      - id: WeaponWandPolymorphCarp
+        orGroup: Magics
+      - id: WeaponWandPolymorphMonkey
+        orGroup: Magics
+      - id: WeaponWandFireball
+        orGroup: Magics
+      - id: WeaponWandPolymorphDoor
+        orGroup: Magics
+      - id: WeaponWandCluwne
+        orGroup: Magics
+      - id: WeaponWandPolymorphBread
+        orGroup: Magics
+      - id: WeaponStaffHealing
+        orGroup: Magics
+      - id: WeaponStaffPolymorphDoor
+        orGroup: Magics
+      speech: action-speech-spell-summon-magic

Resources/Prototypes/Polymorphs/polymorph.yml

@@ -186,3 +186,19 @@
     forced: true
     revertOnCrit: false
     revertOnDeath: false
+
+# Temporary Jaunt
+# Don't make permanent jaunts until action system can be reworked to allow do afters and cooldown pausing
+- type: polymorph
+  id: Jaunt
+  configuration:
+    entity: EtherealJaunt
+    transferName: true
+    inventory: None
+    forced: true
+    revertOnDeath: true
+    revertOnCrit: true
+    allowRepeatedMorphs: false
+    polymorphSound: /Audio/Magic/ethereal_enter.ogg
+    exitPolymorphSound: /Audio/Magic/ethereal_exit.ogg
+    duration: 3

Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml

@@ -27,17 +27,8 @@
                 sprite: Objects/Devices/communication.rsi
                 state: walkietalkie
               doAfter: 5
-            - tag: CapacitorStockPart
-              name: capacitor
-              icon:
-                sprite: Objects/Misc/stock_parts.rsi
-                state: capacitor
-              doAfter: 5
-            - tag: CapacitorStockPart
-              name: capacitor
-              icon:
-                sprite: Objects/Misc/stock_parts.rsi
-                state: capacitor
+            - material: Capacitor
+              amount: 2
               doAfter: 5
     - node: medsecHud
       entity: ClothingEyesHudMedSec

Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml

@@ -174,6 +174,22 @@
   - node: bacon
     entity: FoodMeatBaconCooked
 
+# anomaly meat steak
+- type: constructionGraph
+  id: AnomalyMeatSteak
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: anomaly steak
+      completed:
+      - !type:PlaySound
+        sound: /Audio/Effects/sizzle.ogg
+      steps:
+      - minTemperature: 335
+  - node: anomaly steak
+    entity: FoodMeatAnomalyCooked
+
 # cutlets
 
 - type: constructionGraph
@@ -294,4 +310,4 @@
       steps:
       - minTemperature: 345
   - node: xeno cutlet
-    entity: FoodMeatXenoCutletCooked
+    entity: FoodMeatXenoCutletCooked

Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml

@@ -5,18 +5,6 @@
   - node: start
     entity: CyborgEndoskeleton
     edges:
-
-    # empty the parts via prying
-    - to: start
-      conditions:
-      - !type:ContainerNotEmpty
-        container: part-container
-      steps:
-      - tool: Prying
-        doAfter: 0.5
-        completed:
-          - !type:EmptyAllContainers
-
     - to: cyborg
       steps:
       - assemblyId: generic
@@ -43,165 +31,6 @@
 
       - tool: Screwing
         doAfter: 0.5
-    
-    - to: engineer
-      steps:
-      - assemblyId: engineer
-        guideString: borg-construction-guide-string
-
-      - material: Cable
-        amount: 1
-        doAfter: 1
-        store: part-container
-
-      - component: Flash
-        name: flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - component: Flash
-        name: second flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - tool: Screwing
-        doAfter: 0.5
-
-    - to: janitor
-      steps:
-      - assemblyId: janitor
-        guideString: borg-construction-guide-string
-
-      - material: Cable
-        amount: 1
-        doAfter: 1
-        store: part-container
-
-      - component: Flash
-        name: flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - component: Flash
-        name: second flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - tool: Screwing
-        doAfter: 0.5
-
-    - to: medical
-      steps:
-      - assemblyId: medical
-        guideString: borg-construction-guide-string
-
-      - material: Cable
-        amount: 1
-        doAfter: 1
-        store: part-container
-
-      - component: Flash
-        name: flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - component: Flash
-        name: second flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - tool: Screwing
-        doAfter: 0.5
-
-    - to: mining
-      steps:
-      - assemblyId: mining
-        guideString: borg-construction-guide-string
-
-      - material: Cable
-        amount: 1
-        doAfter: 1
-        store: part-container
-
-      - component: Flash
-        name: flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - component: Flash
-        name: second flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - tool: Screwing
-        doAfter: 0.5
-
-    - to: service
-      steps:
-      - assemblyId: service
-        guideString: borg-construction-guide-string
-
-      - material: Cable
-        amount: 1
-        doAfter: 1
-        store: part-container
-
-      - component: Flash
-        name: flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - component: Flash
-        name: second flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - tool: Screwing
-        doAfter: 0.5
 
   - node: cyborg
-    entity: BorgChassisGeneric
-
-  - node: engineer
-    entity: BorgChassisEngineer
-
-  - node: janitor
-    entity: BorgChassisJanitor
-
-  - node: mining
-    entity: BorgChassisMining
-
-  - node: medical
-    entity: BorgChassisMedical
-
-  - node: service
-    entity: BorgChassisService
-
-  - node: syndicateassault
-    entity: BorgChassisSyndicateAssault
-
-  - node: syndicatemedical
-    entity: BorgChassisSyndicateMedical
-
-  - node: syndicatesaboteur
-    entity: BorgChassisSyndicateSaboteur
+    entity: BorgChassisSelectable

Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml

@@ -46,11 +46,8 @@
         doAfter: 1
     - to: memory_cell
       steps:
-      - tag: CapacitorStockPart
-        icon:
-          sprite: Objects/Misc/stock_parts.rsi
-          state: capacitor
-        name: a capacitor
+      - material: Capacitor
+        amount: 1
       - material: Cable
         amount: 2
         doAfter: 1

Resources/Prototypes/Recipes/Construction/Graphs/utilities/gas_pipe_sensor.yml

@@ -0,0 +1,29 @@
+- type: constructionGraph
+  id: GasPipeSensor
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: sensor
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
+  - node: sensor   
+    entity: GasPipeSensor
+    actions:
+    - !type:SetAnchor
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 2
+      - !type:DeleteEntity
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      steps:
+      - tool: Welding
+        doAfter: 1

Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml

@@ -28,7 +28,7 @@
         - to: icon
           steps:
             - material: Glass
-              amount: 2
+              amount: 1
               doAfter: 1
             - tag: CrystalBlue
               name: blue crystal shard
@@ -48,7 +48,7 @@
         - to: icon
           steps:
             - material: Glass
-              amount: 2
+              amount: 1
               doAfter: 1
             - tag: CrystalPink
               name: pink crystal shard
@@ -68,7 +68,7 @@
         - to: icon
           steps:
             - material: Glass
-              amount: 2
+              amount: 1
               doAfter: 1
             - tag: CrystalOrange
               name: orange crystal shard
@@ -88,7 +88,7 @@
         - to: icon
           steps:
             - material: Glass
-              amount: 2
+              amount: 1
               doAfter: 1
             - tag: CrystalRed
               name: red crystal shard
@@ -108,7 +108,7 @@
         - to: icon
           steps:
             - material: Glass
-              amount: 2
+              amount: 1
               doAfter: 1
             - tag: CrystalGreen
               name: green crystal shard

Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml

@@ -57,12 +57,8 @@
             sprite: "Objects/Power/power_cells.rsi"
             state: "medium"
           doAfter: 0.5
-        - tag: CapacitorStockPart
-          name: a capacitor
-          store: capacitor
-          icon:
-            sprite: "Objects/Misc/stock_parts.rsi"
-            state: "capacitor"
+        - material: Capacitor
+          amount: 1
           doAfter: 0.5
       - to: frame
         completed:

Resources/Prototypes/Recipes/Construction/utilities.yml

@@ -366,6 +366,21 @@
   objectType: Structure
   canRotate: true
 
+- type: construction
+  name: gas pipe sensor
+  id: GasPipeSensor
+  graph: GasPipeSensor
+  startNode: start
+  targetNode: sensor
+  category: construction-category-structures
+  description: Reports on the status of the gas within the attached pipe network. 
+  icon:
+    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor.rsi
+    state: icon
+  placementMode: SnapgridCenter
+  objectType: Structure
+  canRotate: true
+
 # ATMOS PIPES
 - type: construction
   name: gas pipe half

Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

@@ -2050,3 +2050,27 @@
     FoodCroissantRaw: 1
     FoodButterSlice: 1
     ShardGlass: 1
+
+- type: microwaveMealRecipe
+  id: RecipeInertAnomalyMeat
+  name: inert meat anomaly recipe
+  result: FoodMeatAnomaly
+  time: 5
+  solids:
+    AnomalyCoreFleshInert: 1
+
+- type: microwaveMealRecipe
+  id: RecipeAnomalyMeat
+  name: meat anomaly recipe
+  result: FoodMeatAnomaly
+  time: 5
+  solids:
+    AnomalyCoreFlesh: 1
+
+- type: microwaveMealRecipe
+  id: RecipeAnomalyMeatCooked
+  name: cooked meat anomaly recipe
+  result: FoodMeatAnomalyCooked
+  time: 5
+  solids:
+    FoodMeatAnomaly: 1

Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml

@@ -60,15 +60,7 @@
             - material: Cable
               amount: 2
               doAfter: 1
-            - tag: CapacitorStockPart
-              name: capacitor
-              icon:
-                sprite: Objects/Misc/stock_parts.rsi
-                state: capacitor
-            - tag: CapacitorStockPart
-              name: capacitor
-              icon:
-                sprite: Objects/Misc/stock_parts.rsi
-                state: capacitor
+            - material: Capacitor
+              amount: 2
     - node: potatoaichip
       entity: PotatoAIChip

Resources/Prototypes/Recipes/Lathes/misc.yml

@@ -52,6 +52,15 @@
     Steel: 50
     Glass: 50
 
+- type: latheRecipe
+  id: DimLightBulb
+  result: DimLightBulb
+  category: Lights
+  completetime: 2
+  materials:
+    Steel: 50
+    Glass: 50
+
 - type: latheRecipe
   id: GlowstickRed
   result: GlowstickRed

Resources/Prototypes/Recipes/Lathes/robotics.yml

@@ -61,8 +61,6 @@
   materials:
     Steel: 1500
 
-# Generic
-
 - type: latheRecipe
   parent: BaseBorgLimbRecipe
   id: LeftArmBorg
@@ -93,162 +91,6 @@
   id: TorsoBorg
   result: TorsoBorg
 
-# Engineer
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftArmBorgEngineer
-  result: LeftArmBorgEngineer
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightArmBorgEngineer
-  result: RightArmBorgEngineer
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftLegBorgEngineer
-  result: LeftLegBorgEngineer
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightLegBorgEngineer
-  result: RightLegBorgEngineer
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: HeadBorgEngineer
-  result: HeadBorgEngineer
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: TorsoBorgEngineer
-  result: TorsoBorgEngineer
-
-# Medical
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftArmBorgMedical
-  result: LeftArmBorgMedical
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightArmBorgMedical
-  result: RightArmBorgMedical
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftLegBorgMedical
-  result: LeftLegBorgMedical
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightLegBorgMedical
-  result: RightLegBorgMedical
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: HeadBorgMedical
-  result: HeadBorgMedical
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: TorsoBorgMedical
-  result: TorsoBorgMedical
-
-# Mining
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftArmBorgMining
-  result: LeftArmBorgMining
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightArmBorgMining
-  result: RightArmBorgMining
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftLegBorgMining
-  result: LeftLegBorgMining
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightLegBorgMining
-  result: RightLegBorgMining
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: HeadBorgMining
-  result: HeadBorgMining
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: TorsoBorgMining
-  result: TorsoBorgMining
-
-# Service
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftArmBorgService
-  result: LeftArmBorgService
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightArmBorgService
-  result: RightArmBorgService
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftLegBorgService
-  result: LeftLegBorgService
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightLegBorgService
-  result: RightLegBorgService
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: HeadBorgService
-  result: HeadBorgService
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: TorsoBorgService
-  result: TorsoBorgService
-
-# Janitor
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftLegBorgJanitor
-  result: LeftLegBorgJanitor
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightLegBorgJanitor
-  result: RightLegBorgJanitor
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: HeadBorgJanitor
-  result: HeadBorgJanitor
-  materials:
-    Steel: 500
-    Glass: 200
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: TorsoBorgJanitor
-  result: TorsoBorgJanitor
-  materials:
-    Steel: 500
-    Glass: 200
-
 # Parts
 
 - type: latheRecipe
@@ -304,23 +146,6 @@
   id: BorgModuleTool
   result: BorgModuleTool
 
-# Mining Modules
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleAppraisal
-  result: BorgModuleAppraisal
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleMining
-  result: BorgModuleMining
-
-- type: latheRecipe
-  parent: BaseGoldBorgModuleRecipe
-  id: BorgModuleGrapplingGun
-  result: BorgModuleGrapplingGun
-
 # Engineering Modules
 
 - type: latheRecipe
@@ -328,28 +153,8 @@
   id: BorgModuleAdvancedTool
   result: BorgModuleAdvancedTool
 
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleConstruction
-  result: BorgModuleConstruction
-
-- type: latheRecipe
-  parent: BaseGoldBorgModuleRecipe
-  id: BorgModuleRCD
-  result: BorgModuleRCD
-
 # Janitor Modules
 
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleLightReplacer
-  result: BorgModuleLightReplacer
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleCleaning
-  result: BorgModuleCleaning
-
 - type: latheRecipe
   parent: BaseGoldBorgModuleRecipe
   id: BorgModuleAdvancedCleaning
@@ -357,16 +162,6 @@
 
 # Medical Modules
 
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleDiagnosis
-  result: BorgModuleDiagnosis
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleTreatment
-  result: BorgModuleTreatment
-
 - type: latheRecipe
   parent: BaseGoldBorgModuleRecipe
   id: BorgModuleAdvancedTreatment
@@ -391,16 +186,6 @@
 
 # Service Modules
 
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleService
-  result: BorgModuleService
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleMusique
-  result: BorgModuleMusique
-
 - type: latheRecipe
   parent: BaseBorgModuleRecipe
   id: BorgModuleGardening
@@ -410,8 +195,3 @@
   parent: BaseBorgModuleRecipe
   id: BorgModuleHarvesting
   result: BorgModuleHarvesting
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleClowning
-  result: BorgModuleClowning

Resources/Prototypes/Recipes/Reactions/drinks.yml

@@ -953,7 +953,7 @@
     LemonLime:
       amount: 1
   products:
-    SnowWhite: 3
+    SnowWhite: 2
 
 - type: reaction
   id: SodaWater

Resources/Prototypes/Research/civilianservices.yml

@@ -66,8 +66,6 @@
   recipeUnlocks:
     - ComputerTelevisionCircuitboard
     - SynthesizerInstrument
-    - BorgModuleMusique
-    - BorgModuleClowning
     - DawInstrumentMachineCircuitboard
     - MassMediaCircuitboard
     - JukeboxCircuitBoard
@@ -82,7 +80,6 @@
   tier: 1
   cost: 5000
   recipeUnlocks:
-  - BorgModuleLightReplacer
   - BorgModuleAdvancedCleaning
 
 - type: technology

Resources/Prototypes/Research/industrial.yml

@@ -12,8 +12,6 @@
   recipeUnlocks:
   - MiningDrill
   - MineralScannerEmpty
-  - BorgModuleMining
-  - BorgModuleGrapplingGun
   - OreProcessorIndustrialMachineCircuitboard
   - ClothingMaskWeldingGas
 
@@ -168,7 +166,6 @@
     - PowerDrill
     - JawsOfLife
     - BorgModuleAdvancedTool
-    - BorgModuleRCD
 
 - type: technology
   id: MassExcavation

Resources/Prototypes/Roles/Jobs/Civilian/clown.yml

@@ -14,7 +14,7 @@
   - !type:AddComponentSpecial
     components:
     - type: Clumsy
-      clumsyDamage:
+      gunShootFailDamage:
         types: #literally just picked semi random valus. i tested this once and tweaked it.
           Blunt: 5
           Piercing: 4

Resources/Prototypes/Roles/Jobs/Science/borg.yml

@@ -27,5 +27,5 @@
   canBeAntag: false
   icon: JobIconBorg
   supervisors: job-supervisors-rd
-  jobEntity: PlayerBorgGeneric
+  jobEntity: PlayerBorgBattery
   applyTraits: false

Resources/Prototypes/Stacks/science_stacks.yml

@@ -7,6 +7,7 @@
 - type: stack
   id: Capacitor
   name: capacitor
+  icon: { sprite: /Textures/Objects/Misc/stock_parts.rsi, state: capacitor }
   spawn: CapacitorStockPart
   maxCount: 10
 

Resources/Prototypes/borg_types.yml

@@ -0,0 +1,218 @@
+# Generic borg
+- type: borgType
+  id: generic
+
+  # Description
+  dummyPrototype: BorgChassisGeneric
+
+  # Functional
+  extraModuleCount: 5
+  moduleWhitelist:
+    tags:
+    - BorgModuleGeneric
+
+  defaultModules:
+  - BorgModuleTool
+
+  radioChannels:
+  - Science
+
+  # Visual
+  inventoryTemplateId: borgShort
+  spriteBodyState: robot
+  spriteHasMindState: robot_e
+  spriteNoMindState: robot_e_r
+  spriteToggleLightState: robot_l
+
+  # Pet
+  petSuccessString: petting-success-generic-cyborg
+  petFailureString: petting-failure-generic-cyborg
+
+
+# Engineering borg
+- type: borgType
+  id: engineering
+
+  # Description
+  dummyPrototype: BorgChassisEngineer
+
+  # Functional
+  extraModuleCount: 3
+  moduleWhitelist:
+    tags:
+    - BorgModuleGeneric
+    - BorgModuleEngineering
+
+  defaultModules:
+  - BorgModuleTool
+  - BorgModuleConstruction
+  - BorgModuleRCD
+  - BorgModuleCable
+
+  radioChannels:
+  - Engineering
+  - Science
+
+  # Visual
+  inventoryTemplateId: borgShort
+  spriteBodyState: engineer
+  spriteHasMindState: engineer_e
+  spriteNoMindState: engineer_e_r
+  spriteToggleLightState: engineer_l
+
+  # Pet
+  petSuccessString: petting-success-engineer-cyborg
+  petFailureString: petting-failure-engineer-cyborg
+
+
+# Salvage borg
+- type: borgType
+  id: mining
+
+  # Description
+  dummyPrototype: BorgChassisMining
+
+  # Functional
+  extraModuleCount: 3
+  moduleWhitelist:
+    tags:
+    - BorgModuleGeneric
+    - BorgModuleCargo
+
+  defaultModules:
+  - BorgModuleGrapplingGun
+  - BorgModuleMining
+  - BorgModuleAppraisal
+
+  radioChannels:
+  - Supply
+  - Science
+
+  # Visual
+  inventoryTemplateId: borgTall
+  spriteBodyState: miner
+  spriteBodyMovementState: miner_moving
+  spriteHasMindState: miner_e
+  spriteNoMindState: miner_e_r
+  spriteToggleLightState: miner_l
+
+  # Pet
+  petSuccessString: petting-success-salvage-cyborg
+  petFailureString: petting-failure-salvage-cyborg
+
+
+# Janitor borg
+- type: borgType
+  id: janitor
+
+  # Description
+  dummyPrototype: BorgChassisJanitor
+
+  # Functional
+  extraModuleCount: 3
+  moduleWhitelist:
+    tags:
+    - BorgModuleGeneric
+    - BorgModuleJanitor
+
+  defaultModules:
+  - BorgModuleLightReplacer
+  - BorgModuleCleaning
+
+  radioChannels:
+  - Science
+  - Service
+
+  # Visual
+  inventoryTemplateId: borgShort
+  spriteBodyState: janitor
+  spriteBodyMovementState: janitor_moving
+  spriteHasMindState: janitor_e
+  spriteNoMindState: janitor_e_r
+  spriteToggleLightState: janitor_l
+
+  # Pet
+  petSuccessString: petting-success-janitor-cyborg
+  petFailureString: petting-failure-janitor-cyborg
+
+
+# Medical borg
+- type: borgType
+  id: medical
+
+  # Description
+  dummyPrototype: BorgChassisMedical
+
+  # Functional
+  extraModuleCount: 3
+  moduleWhitelist:
+    tags:
+    - BorgModuleGeneric
+    - BorgModuleMedical
+
+  defaultModules:
+  - BorgModuleTreatment
+
+  radioChannels:
+  - Science
+  - Medical
+
+  addComponents:
+  - type: SolutionScanner
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
+  - type: ShowHealthIcons
+    damageContainers:
+    - Biological
+
+  # Visual
+  inventoryTemplateId: borgDutch
+  spriteBodyState: medical
+  spriteBodyMovementState: medical_moving
+  spriteHasMindState: medical_e
+  spriteNoMindState: medical_e_r
+  spriteToggleLightState: medical_l
+
+  # Pet
+  petSuccessString: petting-success-medical-cyborg
+  petFailureString: petting-failure-medical-cyborg
+
+  # Sounds
+  footstepCollection:
+    collection: FootstepHoverBorg
+
+
+# Service borg
+- type: borgType
+  id: service
+
+  # Description
+  dummyPrototype: BorgChassisService
+
+  # Functional
+  extraModuleCount: 3
+  moduleWhitelist:
+    tags:
+    - BorgModuleGeneric
+    - BorgModuleService
+
+  defaultModules:
+  - BorgModuleMusique
+  - BorgModuleService
+  - BorgModuleClowning
+
+  radioChannels:
+  - Science
+  - Service
+
+  # Visual
+  inventoryTemplateId: borgTall
+  spriteBodyState: service
+  spriteHasMindState: service_e
+  spriteNoMindState: service_e_r
+  spriteToggleLightState: service_l
+
+  # Pet
+  petSuccessString: petting-success-service-cyborg
+  petFailureString: petting-failure-service-cyborg

Resources/Prototypes/tags.yml

@@ -75,96 +75,27 @@
 - type: Tag
   id: BorgArm
 
-- type: Tag
-  id: BorgEngineerHead
-
-- type: Tag
-  id: BorgEngineerLArm
-
-- type: Tag
-  id: BorgEngineerLLeg
-
-- type: Tag
-  id: BorgEngineerRArm
-
-- type: Tag
-  id: BorgEngineerRLeg
-
-- type: Tag
-  id: BorgEngineerTorso
-
-- type: Tag
-  id: BorgGenericHead
-
-- type: Tag
-  id: BorgGenericLArm
-
-- type: Tag
-  id: BorgGenericLLeg
-
-- type: Tag
-  id: BorgGenericRArm
-
-- type: Tag
-  id: BorgGenericRLeg
-
-- type: Tag
-  id: BorgGenericTorso
-
 - type: Tag
   id: BorgHead
 
 - type: Tag
-  id: BorgJanitorHead
+  id: BorgLArm
 
 - type: Tag
-  id: BorgJanitorLLeg
+  id: BorgLLeg
 
 - type: Tag
-  id: BorgJanitorRLeg
+  id: BorgRArm
 
 - type: Tag
-  id: BorgJanitorTorso
+  id: BorgRLeg
+
+- type: Tag
+  id: BorgTorso
 
 - type: Tag
   id: BorgLeg
 
-- type: Tag
-  id: BorgMedicalHead
-
-- type: Tag
-  id: BorgMedicalLArm
-
-- type: Tag
-  id: BorgMedicalLLeg
-
-- type: Tag
-  id: BorgMedicalRArm
-
-- type: Tag
-  id: BorgMedicalRLeg
-
-- type: Tag
-  id: BorgMedicalTorso
-
-- type: Tag
-  id: BorgMiningHead
-
-- type: Tag
-  id: BorgMiningLArm
-
-- type: Tag
-  id: BorgMiningLLeg
-
-- type: Tag
-  id: BorgMiningRArm
-
-- type: Tag
-  id: BorgMiningRLeg
-
-- type: Tag
-  id: BorgMiningTorso
-
 - type: Tag
   id: BorgModuleCargo
 
@@ -189,24 +120,6 @@
 - type: Tag
   id: BorgModuleSyndicateAssault
 
-- type: Tag
-  id: BorgServiceHead
-
-- type: Tag
-  id: BorgServiceLArm
-
-- type: Tag
-  id: BorgServiceLLeg
-
-- type: Tag
-  id: BorgServiceRArm
-
-- type: Tag
-  id: BorgServiceRLeg
-
-- type: Tag
-  id: BorgServiceTorso
-
 - type: Tag
   id: Bot