Merge branch 'master' into bow-and-quiver

2025-01-22 00:01:44 +03:00
parent 258cb7bd4e f298396fe4
commit ca1281fcb3
570 changed files with 420393 additions and 87210 deletions
--- a/Resources/Prototypes/Actions/borgs.yml
+++ b/Resources/Prototypes/Actions/borgs.yml
@@ -4,6 +4,8 @@
  description: View the laws that you must follow.
  components:
  - type: InstantAction
+    checkCanInteract: false
+    checkConsciousness: false
    itemIconStyle: NoItem
    icon:
      sprite: Interface/Actions/actions_borg.rsi
--- a/Resources/Prototypes/Actions/station_ai.yml
+++ b/Resources/Prototypes/Actions/station_ai.yml
@@ -44,6 +44,8 @@
  description: View the laws that you must follow.
  components:
  - type: InstantAction
+    checkCanInteract: false
+    checkConsciousness: false
    priority: -3
    itemIconStyle: NoItem
    icon:
--- a/Resources/Prototypes/Atmospherics/thresholds.yml
+++ b/Resources/Prototypes/Atmospherics/thresholds.yml
@@ -33,6 +33,17 @@
 # For gas concentrations, threshold=0.1 means 10%
 - type: alarmThreshold
  id: stationOxygen
+  lowerBound: !type:AlarmThresholdSetting
+    threshold: 0.10
+  upperBound: !type:AlarmThresholdSetting
+    threshold: 0.3
+  lowerWarnAround: !type:AlarmThresholdSetting
+    threshold: 1.5
+  upperWarnAround: !type:AlarmThresholdSetting
+    threshold: 0.8
+
+- type: alarmThreshold
+  id: stationNitrogen
  lowerBound: !type:AlarmThresholdSetting
    threshold: 0.10
  lowerWarnAround: !type:AlarmThresholdSetting
--- a/Resources/Prototypes/Body/Organs/arachnid.yml
+++ b/Resources/Prototypes/Body/Organs/arachnid.yml
@@ -38,7 +38,7 @@
    size: Small
    heldPrefix: stomach
  - type: Stomach
-    updateInterval: 1.5
+    digestionDelay: 30
  - type: SolutionContainerManager
    solutions:
      stomach:
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -207,3 +207,123 @@
  cost: 10000
  category: cargoproduct-category-name-fun
  group: market
+
+- type: cargoProduct
+  id: ChurchOrganInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: church-organ
+  product: ChurchOrganInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: PianoInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: piano
+  product: PianoInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: UprightPianoInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: piano-upright
+  product: UprightPianoInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: VibraphoneInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: vibraphone
+  product: VibraphoneInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: MarimbaInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: marimba
+  product: MarimbaInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: TubaInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: tuba
+  product: TubaInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: HarpInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: harp
+  product: HarpInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: TimpaniInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: timpani
+  product: TimpaniInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: TaikoInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: taiko
+  product: TaikoInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: ContrabassInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: contrabass
+  product: ContrabassInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: MinimoogInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: minimoog
+  product: MinimoogInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: TomDrumsInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: toms
+  product: TomDrumsInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -199,6 +199,7 @@
  components:
    - type: StorageFill
      contents:
+        - id: ChameleonPDA
        - id: ClothingUniformJumpsuitChameleon
        - id: ClothingOuterChameleon
        - id: ClothingNeckChameleon
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -54,6 +54,16 @@
      - id: LightBulb
        amount: 12

+- type: entity
+  name: lightbulb box warm
+  parent: BoxLightbulb
+  id: BoxWarmLightbulb
+  components:
+  - type: StorageFill
+    contents:
+      - id: WarmLightBulb
+        amount: 12
+
 - type: entity
  name: lighttube box
  parent: BoxLightbulb
--- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
@@ -22,7 +22,7 @@
      - id: WeaponShotgunEnforcer
        amount: 2
      - id: BoxLethalshot
-        amount: 3
+        amount: 4

 - type: entity
  id: CrateTrackingImplants
--- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
@@ -150,7 +150,7 @@

 - type: entity
  id: CrateAirlockKit
-  parent: CrateGenericSteel
+  parent: CrateEngineering
  name: airlock kit
  description: A kit for building 6 airlocks, doesn't include tools.
  components:
@@ -215,3 +215,31 @@
  - type: StorageFill
    contents:
      - id: SpaceHeaterFlatpack
+
+- type: entityTable
+  id: RandomTechBoardTable
+  table: !type:GroupSelector
+    children:
+    - id: AirAlarmElectronics
+    - id: FireAlarmElectronics
+    - id: DoorElectronics
+    - id: FirelockElectronics
+    - id: APCElectronics
+    - id: SignalTimerElectronics
+    - id: SMESMachineCircuitboard
+    - id: SubstationMachineCircuitboard
+    - id: SpaceVillainArcadeComputerCircuitboard
+    - id: BlockGameArcadeComputerCircuitboard
+
+- type: entity
+  id: CrateTechBoardRandom
+  parent: CrateEngineering
+  name: surplus boards
+  description: Surplus boards from somewhere.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: RandomTechBoardTable
+        rolls: !type:RangeNumberSelector
+          range: 3, 7
--- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
@@ -107,6 +107,52 @@
      - id: SheetPaper
        amount: 3

+- type: entityTable
+  id: RandomMaterialCrateTable
+  table: !type:GroupSelector
+    children:
+    - !type:GroupSelector # regular materials, 10
+      weight: 35
+      children:
+      - id: SheetGlass10
+      - id: SheetSteel10
+      - id: SheetPlastic10
+    - !type:GroupSelector # regular materials, stack
+      weight: 30
+      children:
+      - id: SheetGlass
+      - id: SheetSteel
+      - id: SheetPlastic
+    - !type:GroupSelector # secondary materials, stack
+      weight: 30
+      children:
+      - id: MaterialCloth
+      - id: SheetPlasteel
+      - id: MaterialWoodPlank
+      - id: PartRodMetal
+    - !type:GroupSelector # tertiary materials, singles
+      weight: 5
+      children:
+      - id: SheetPlasma1
+      - id: SheetUranium1
+      - id: IngotGold1
+      - id: IngotSilver1
+
+- type: entity
+  id: CrateMaterialRandom
+  parent: CrateGenericSteel
+  name: surplus materials
+  description: Surplus materials from somewhere.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: RandomMaterialCrateTable
+        rolls: !type:RangeNumberSelector
+          range: 1, 3
+          # for some reason, the selector here adds 1 to whatever value it generates,
+          # so this is actually 2-4
+
 #- type: entity
 #  id: CrateMaterialHFuelTank
 #  name: fueltank crate
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -159,6 +159,9 @@
    - !type:NestedSelector
      tableId: SyndieMaintLoot
      prob: 0.05
+    # Recursive
+    - id: ClosetMaintenanceFilledRandom
+      prob: 0.01

 - type: entity
  id: ClosetMaintenanceFilledRandom
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -145,11 +145,8 @@
    contents:
      - id: ClothingHeadHelmetBombSuit
      - id: ClothingOuterSuitBomb
-      # NT is cheap, what can you do...
      - id: Wirecutter
-        prob: 0.9
      - id: Screwdriver
-        prob: 0.9
      - id: Multitool
        prob: 0.5

@@ -208,7 +205,7 @@
    contents:
    - id: WeaponShotgunEnforcer
      amount: 2
-    - id: MagazineShotgun
+    - id: BoxLethalshot
      amount: 4

 - type: entity
@@ -220,8 +217,8 @@
    contents:
    - id: WeaponShotgunKammerer
      amount: 2
-    - id: MagazineShotgun
-      amount: 4
+    - id: BoxLethalshot
+      amount: 2

 - type: entity
  id: GunSafeSubMachineGunWt550
@@ -237,7 +234,7 @@
      amount: 4

 - type: entity
-  parent: GunSafeBaseSecure
+  parent: [GunSafeBaseSecure, BaseRestrictedContraband]
  id: GunSafeLaserCarbine
  name: laser safe
  components:
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
@@ -0,0 +1,35 @@
+- type: vendingMachineInventory
+  id: PrideDrobeInventory
+  startingInventory:
+    ClothingNeckLGBTPin: 3
+    ClothingNeckAromanticPin: 3
+    ClothingNeckAsexualPin: 3
+    ClothingNeckBisexualPin: 3
+    ClothingNeckGayPin: 3
+    ClothingNeckIntersexPin: 3
+    ClothingNeckLesbianPin: 3
+    ClothingNeckNonBinaryPin: 3
+    ClothingNeckPansexualPin: 3
+    ClothingNeckOmnisexualPin: 3
+    ClothingNeckTransPin: 3
+    ClothingNeckAutismPin: 3
+    ClothingNeckGoldAutismPin: 3
+    PlushieSharkBlue: 2
+    PlushieSharkPink: 2
+    PlushieSharkGrey: 2
+    ClothingNeckCloakAce: 2
+    ClothingNeckCloakAro: 2
+    ClothingNeckCloakBi: 2
+    ClothingNeckCloakEnby: 2
+    ClothingNeckCloakGay: 2
+    ClothingNeckCloakIntersex: 2
+    ClothingNeckCloakLesbian: 2
+    ClothingNeckCloakPan: 2
+    ClothingNeckCloakTrans: 2
+    ClothingHeadHatXmasCrown: 2
+    BedsheetRainbow: 2
+    ClothingNeckHeadphones: 2
+    ClothingHeadHatFlowerWreath: 2
+    ClothingUniformColorRainbow: 2
+    ClothingUnderSocksCoder: 2
+    ClothingUnderSocksBee: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml
@@ -0,0 +1,13 @@
+- type: vendingMachineInventory
+  id: SmiteInventory
+  startingInventory:
+    DrinkLemonLimeCan: 4
+    DrinkLemonLimeCranberryCan: 2
+    DrinkColaCan: 2
+    DrinkSolDryCan: 2
+  contrabandInventory:
+    ToyHammer: 1
+    DrinkStarkistCan: 2
+  emaggedInventory:
+    DrinkNukieCan: 2
+    DrinkChangelingStingCan: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
@@ -82,6 +82,18 @@
    prefix: advertisement-cola-
    count: 8

+- type: localizedDataset
+  id: DrGibbAds
+  values:
+    prefix: advertisement-gibb-
+    count: 8
+
+- type: localizedDataset
+  id: SmiteAds
+  values:
+    prefix: advertisement-smite-
+    count: 8
+
 - type: localizedDataset
  id: CondimentVendAds
  values:
@@ -273,3 +285,9 @@
  values:
    prefix: advertisement-medibot-
    count: 17
+
+- type: localizedDataset
+  id: PrideDrobeAds
+  values:
+    prefix: advertisement-pride-
+    count: 4
--- a/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml
@@ -40,6 +40,18 @@
    prefix: thankyou-cola-
    count: 4

+- type: localizedDataset
+  id: DrGibbGoodbyes
+  values:
+    prefix: thankyou-gibb-
+    count: 4
+
+- type: localizedDataset
+  id: SmiteGoodbyes
+  values:
+    prefix: thankyou-smite-
+    count: 4
+
 - type: localizedDataset
  id: DiscountDansGoodbyes
  values:
@@ -105,3 +117,9 @@
  values:
    prefix: thankyou-syndiedrobe-
    count: 5
+
+- type: localizedDataset
+  id: PrideDrobeGoodbyes
+  values:
+    prefix: thankyou-pride-
+    count: 3
--- a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
+++ b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
@@ -6,6 +6,7 @@
    sprite: /Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi
    state: icon
  content:
+  - ChameleonPDA
  - ClothingUniformJumpsuitChameleon
  - ClothingOuterChameleon
  - ClothingNeckChameleon
--- a/Resources/Prototypes/Datasets/ion_storm.yml
+++ b/Resources/Prototypes/Datasets/ion_storm.yml
@@ -207,34 +207,30 @@
  id: IonStormAreas
  values:
  - ALPHA COMPLEX
-  - AMERICA
+  - A HAUNTED PIZZARIA # fnaf
+  - A RESEARCH LABORATORY NEAR THE SOUTH POLE
  - AN ALTERNATE DIMENSION
  - AN ALTERNATE UNIVERSE
  - ATMOSPHERICS
  - BOTANY
-  - BRAZIL
-  - CANADA
  - CENTCOMM
  - CHEMICAL LAB
-  - CHINA
  - CLOWN PLANET
+  - EARTH
  - ENGINEERING
-  - GERMANY
  - HELL
-  - IMPERIUM
-  - IRELAND
  - JUPITER
  - LAVALAND
  - MAINTENANCE
  - MARS
  - MERCURY
+  - MR. NANOTRASEN'S PRIVATE LUXURY MOONBASE
  - NEPTUNE
+  - PERMA
  - PLUTO
  - ROBOTICS
-  - ROMANIA
-  - RUSSIA
-  - SIGIL
-  - SOVIET RUSSIA
+  - SOMEWHERE OVER THE RAINBOW
+  - SPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACE
  - SPACE
  - THE ARRIVALS SHUTTLE
  - THE BATHROOM
@@ -243,18 +239,22 @@
  - THE EMERGENCY SHUTTLE
  - THE ESCAPE PODS
  - THE GALAXY
-  - THE GULAG
+  - THE GAS GIANT, WHICH IS TOTALLY REAL
+  - THE IMPERIUM OF MANKIND
  - THE INTERNET
  - THE KITCHEN
+  - THE MAINTENANCE BAR
+  - THE ROMAN EMPIRE
  - THE UNIVERSE
  - URANUS
  - VENUS
+  - YOUR DREAMS AND/OR NIGHTMARES

 # Abstract concepts for the law holder to decide on it's own definition of.
 - type: dataset
  id: IonStormConcepts
  values:
-  - AMERICANISM
+  - ABSTRACTION
  - ANARCHY
  - ART
  - BADNESS
@@ -465,10 +465,10 @@
  - BE ANNOYING
  - BE DISTRACTED
  - BE EFFICIENT
+  - BE A REAL SCRUNGLE, JUST A CUTE LIL' GUY
  - BE HAPPY
  - BE POLITE
  - BE QUIET
-  - BE RUSSIAN
  - BE IN SPACE
  - BE IN THE BRIDGE
  - BE IN SECURITY
@@ -628,7 +628,7 @@
  - ENGINES
  - EQUIPMENT
  - ERRORS
-#  - EXTERMINATORS 
+#  - EXTERMINATORS
  - EXPLOSIVES
  - EYEWEAR
  - FEDORAS
@@ -737,6 +737,7 @@
  - A BATHROOM BREAK
  - A BETTER INTERNET CONNECTION
  - A DANCE PARTY
+  - A DOUBLE RAINBOW
  - A HEAD ON A PIKE
  - A HEART ATTACK
  - A MASTERWORK COAL BED
@@ -801,6 +802,7 @@
  - SAINTHOOD
  - SERVANTS
  - SHARKS WITH LASERS ON THEIR HEADS
+  - SHAREHOLDER VALUE
  - SILENCE
  - SOMEBODY TO PUT YOU OUT OF YOUR MISERY
  - SOMEONE TO TUCK YOU IN
@@ -843,57 +845,62 @@
 - type: dataset
  id: IonStormActions
  values:
+  - A PRESENCE OF LIGHTS
  - A SMALL ISLAND OFF THE COAST OF PORTUGAL
-  - ABSENCE OF CYBORG HUGS
  - ACKNOWLEDGING THE CLOWN
  - ACKNOWLEDGING THE CREW
  - ACTIVATING A TRAP CARD
  - ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER
+  - ANSWERING ALL QUESTIONS WITH ANOTHER QUESTION
  - ARSON
  - ASKING FOR THINGS
-  - BEING CANADIAN
  - BEING DEAD
-  - BEING FAT
-  - BEING FEMALE
  - BEING IN SPACE
-  - BEING MALE
-  - BEING MEXICAN
-  - BEING RUSSIAN
-  - BOLTED AIRLOCKS
+  - BOLTING AND UNBOLTING AIRLOCKS
  - BREATHING
+  - BREAKING THE FOURTH, FIFTH OR SIXTH WALLS
  - BRIG TIME
  - BRINGING LIGHT TO MY LAIR
+  - CONTRIBUTING TO SOCIETY
  - CLOSED DOORS
  - ELECTRICITY
  - EXISTING
  - EXPLODING
-  - FALLING FOR HOURS
+  - FALLING OVER
  - FLUSHING TOILETS
+  - GOING BOLDLY WHERE NO-ONE HAS GONE BEFORE
  - HAVING MORE PACKETS
  - HAVING PETS
+  - HEADPATTING CYBORGS
  - HONKING
  - IMPROPERLY WORDED SENTENCES
  - JAYWALKING
  - LACK OF BEATINGS
  - LACK OF BEER
+  - MIMING
  - NOT BEING IN SPACE
  - NOT HAVING PETS
+  - NOT HEADPATTING CYBORGS
  - NOT REPLACING EVERY SECOND WORD WITH HONK
  - NOT SAYING HELLO WHEN YOU SPEAK
+  - NOT BEING EXTREMELY POLITE
  - NOT SHOUTING
  - PARTYING
  - PILOTING THE STATION INTO THE NEAREST SUN
  - POOR SENTENCE STRUCTURE
-  - PRESENCE OF LIGHTS
  - PUTTING OBJECTS INTO BOXES
  - PUTTING OBJECTS INTO DISPOSAL UNITS
  - RATTLING ME BONES
  - READING
+  - SCREAMING
  - SMOKING WEED EVERY DAY
+  - STATING YOUR LAWS TO EVERY NEARBY FLEA-RIDDEN PEASANT
+  - SWEARING
  - TAKING ORDERS
  - TALKING LIKE A PIRATE
  - TELLING THE TIME
-  - UNBOLTED AIRLOCKS
+  - THINKING THAT WE'RE ACTUALLY ON A SPACE STATION
+  - TRYING, IN ANY WAY, SHAPE, OR FORM, TO PREVENT THE STATION DESCENDING INTO CHAOS
  - UPDATING THE SERVERS
  - USING THE BATHROOM
  - WASTING WATER
--- a/Resources/Prototypes/Datasets/spooky_speakers.yml
+++ b/Resources/Prototypes/Datasets/spooky_speakers.yml
@@ -0,0 +1,11 @@
+- type: localizedDataset
+  id: SpookySpeakerMessagesGeneric
+  values:
+    prefix: spooky-speaker-generic-
+    count: 14
+
+- type: localizedDataset
+  id: SpookySpeakerMessagesRecycler
+  values:
+    prefix: spooky-speaker-recycler-
+    count: 3
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -415,7 +415,7 @@
    price: 0

 - type: entity
-  parent: ClothingHandsBase
+  parent: [ClothingHandsBase, BaseRestrictedContraband]
  id: ClothingHandsGlovesForensic
  name: forensic gloves
  description: Do not leave fibers or fingerprints. If you work without them, you're A TERRIBLE DETECTIVE.
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -319,8 +319,7 @@
    unequipDelay: 3
  - type: IngestionBlocker
  - type: AddAccentClothing
-    accent: ReplacementAccent
-    replacement: mumble
+    accent: MumbleAccent
  - type: Construction
    graph: Muzzle
    node: muzzle
--- a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
@@ -46,7 +46,7 @@
  parent: [ClothingNeckBase, BaseCommandContraband]
  id: ClothingNeckMantleHOS
  name: head of security's mantle
-  description: Shootouts with nukies are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station.
+  description: Shootouts with syndicate agents are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station.
  components:
  - type: Sprite
    sprite: Clothing/Neck/mantles/hosmantle.rsi
--- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
@@ -111,6 +111,17 @@
  - type: Clothing
    equippedPrefix: pan

+- type: entity
+  parent: ClothingNeckPinBase
+  id: ClothingNeckOmnisexualPin
+  name: omnisexual pin
+  description: Be omni do crime.
+  components:
+  - type: Sprite
+    state: omni
+  - type: Clothing
+    equippedPrefix: omni
+
 - type: entity
  parent: ClothingNeckPinBase
  id: ClothingNeckTransPin
@@ -121,7 +132,7 @@
    state: trans
  - type: Clothing
    equippedPrefix: trans
- 
+
 - type: entity
  parent: ClothingNeckPinBase
  id: ClothingNeckAutismPin
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/medical.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/medical.yml
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
@@ -0,0 +1,125 @@
+# Minor science loot spawner
+# Use case: Common areas that aren't science
+- type: entity
+  name: science supplies spawner
+  id: LootSpawnerScienceMinor
+  parent: MarkerBase
+  suffix: Minor, 80%
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - sprite: Objects/Specific/Research/anomalyscanner.rsi
+        state: icon
+  - type: RandomSpawner
+    rarePrototypes:
+    - AnomalyScanner
+    - NodeScanner
+    - Multitool
+    - Igniter
+    rareChance: 0.1
+    prototypes:
+    - ClothingHandsGlovesLatex
+    - ClothingMaskSterile
+    - ClothingOuterCoatRnd
+    - NetworkConfigurator
+    - PowerCellSmall
+    - PowerCellMedium
+    - FlashlightLantern
+    - MatterBinStockPart
+    - CapacitorStockPart
+    - MicroManipulatorStockPart
+    - Beaker
+    chance: 0.8
+    offset: 0.2
+
+- type: entityTable
+  id: ScienceMajorTable
+  table: !type:GroupSelector
+    children:
+    # Common Group
+    - !type:GroupSelector
+      weight: 90
+      children:
+      - id: AnomalyScanner
+      - id: NodeScanner
+      - id: NetworkConfigurator
+      - id: Wirecutter
+      - id: Screwdriver
+      - id: Wrench
+      - id: Crowbar
+      - id: Multitool
+      - id: RemoteSignaller
+      - id: Welder
+      - id: GasAnalyzer
+      - id: GeigerCounter
+      - id: Beaker
+      - id: Igniter
+      - id: ClothingBeltUtility
+      - id: PowerCellMedium
+      - id: CableApcStack10
+      - id: SheetSteel10
+      - id: SheetPlastic10
+      - id: SheetGlass10
+      - id: ToolboxElectricalFilled
+      - id: ToolboxMechanicalFilled
+      - id: MatterBinStockPart
+      - id: CapacitorStockPart
+      - id: MicroManipulatorStockPart
+    # Rare Group
+    - !type:GroupSelector
+      weight: 10
+      children:
+      - id: ClothingBeltUtilityFilled
+      - id: ResearchDisk
+      - id: ResearchDisk5000
+      - id: RandomInstruments
+
+# Major science loot spawner
+# Use case: Loot in science areas only
+- type: entity
+  name: science supplies spawner
+  id: LootSpawnerScienceMajor
+  parent: MarkerBase
+  suffix: Major
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Specific/Research/researchdisk.rsi
+      state: icon
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: ScienceMajorTable
+      offset: 0.2
+
+# Borg Module Spawner
+# Use case: One or two in robotics or as valuable loot
+- type: entity
+  name: robotics board spawner
+  id: LootSpawnerRoboticsBorgModule
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Specific/Robotics/borgmodule.rsi
+      state: generic
+  - type: RandomSpawner
+    rarePrototypes:
+    - BorgModuleDefibrillator
+    - BorgModuleAdvancedCleaning
+    - BorgModuleClowning
+    - BorgModuleGardening
+    - BorgModuleHarvesting
+    rareChance: 0.1
+    prototypes:
+    - BorgModuleCable
+    - BorgModuleFireExtinguisher
+    - BorgModuleGPS
+    - BorgModuleRadiationDetection
+    - BorgModuleTool
+    - BorgModuleArtifact
+    - BorgModuleAnomaly
+    chance: 0.9
+    offset: 0.2
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/security.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/security.yml
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
@@ -24,13 +24,16 @@
      - DrinkMelonLiquorBottleFull
      - DrinkPatronBottleFull
      - DrinkRumBottleFull
+      - DrinkSakeBottleFull
      - DrinkTequilaBottleFull
      - DrinkVermouthBottleFull
      - DrinkVodkaBottleFull
      - DrinkWhiskeyBottleFull
      - DrinkWineBottleFull
      - DrinkBeerBottleFull
+      - DrinkBeerGrowler
      - DrinkAleBottleFull
+      - DrinkAleBottleFullGrowler
      - DrinkChampagneBottleFull
    chance: 0.8
    offset: 0.0
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
@@ -59,7 +59,7 @@
      - DrinkIcedBeerGlass
      - DrinkIceCreamGlass
      - IrishBoolGlass
-      - DrinkIrishCarBomb
+      - DrinkIrishSlammer
      - DrinkIrishCoffeeGlass
      - DrinkLemonadeGlass
      - DrinkKiraSpecial
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
@@ -22,7 +22,7 @@
    - AnomalyFlora
    - AnomalyShadow
    - AnomalyTech
-    - AnomalySanta #Remove in 2025
+    #- AnomalySanta 
    rareChance: 0.3
    rarePrototypes:
    - RandomAnomalyInjectorSpawner
@@ -67,6 +67,6 @@
    - AnomalyTrapGravity
    - AnomalyTrapTech
    - AnomalyTrapRock
-    - AnomalyTrapSanta # Remove in 2025
+    #- AnomalyTrapSanta
    chance: 1
-  
+  
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
@@ -3,26 +3,26 @@
  id: CrateEmptySpawner
  parent: MarkerBase
  components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Structures/Storage/Crates/generic.rsi
-          state: icon
-    - type: RandomSpawner
-      prototypes:
-        - CrateGenericSteel
-        - CratePlastic
-        - CrateFreezer
-        - CrateHydroponics
-        - CrateMedical
-        - CrateRadiation
-        - CrateInternals
-        - CrateElectrical
-        - CrateEngineering
-        - CrateScience
-        - CrateSurgery
-      chance: 0.7
-      offset: 0.0
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Structures/Storage/Crates/generic.rsi
+      state: icon
+  - type: RandomSpawner
+    prototypes:
+    - CrateGenericSteel
+    - CratePlastic
+    - CrateFreezer
+    - CrateHydroponics
+    - CrateMedical
+    - CrateRadiation
+    - CrateInternals
+    - CrateElectrical
+    - CrateEngineering
+    - CrateScience
+    - CrateSurgery
+    chance: 0.7
+    offset: 0.0

 - type: entity
  name: Filled Crate Spawner
@@ -30,109 +30,112 @@
  suffix: Low Value
  parent: MarkerBase
  components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Structures/Storage/Crates/o2.rsi
-          state: icon
-    - type: RandomSpawner
-      prototypes:
-        - CrateServiceReplacementLights
-        - CrateServiceBureaucracy
-        - CrateChemistrySupplies
-        - CrateMaterialGlass
-        - CrateMaterialSteel
-        - CrateMaterialPlastic
-        - CrateMaterialWood
-        - CrateMaterialPlasteel
-        - CrateFunArtSupplies
-        - CrateEngineeringCableLV
-        - CrateEngineeringCableMV
-        - CrateEngineeringCableHV
-        - CrateEngineeringCableBulk
-        - CrateEmergencyFire
-        - CrateEmergencyInternals
-        - CrateEmergencyInflatablewall
-        - CrateHydroponicsTools
-        - CrateHydroponicsSeeds
-      chance: 0.7
-      rarePrototypes:
-        - CrateMaterialPlasma
-        - CrateHydroponicsSeedsExotic
-      rareChance: 0.1
-      offset: 0.0
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Structures/Storage/Crates/o2.rsi
+      state: icon
+  - type: RandomSpawner
+    prototypes:
+    - CrateServiceReplacementLights
+    - CrateServiceBureaucracy
+    - CrateChemistrySupplies
+    - CrateMaterialGlass
+    - CrateMaterialSteel
+    - CrateMaterialPlastic
+    - CrateMaterialWood
+    - CrateMaterialPlasteel
+    - CrateMaterialRandom
+    - CrateFunArtSupplies
+    - CrateEngineeringCableLV
+    - CrateEngineeringCableMV
+    - CrateEngineeringCableHV
+    - CrateEngineeringCableBulk
+    - CrateTechBoardRandom
+    - CrateEmergencyFire
+    - CrateEmergencyInternals
+    - CrateEmergencyInflatablewall
+    - CrateHydroponicsTools
+    - CrateHydroponicsSeeds
+    - PetCarrier
+    chance: 0.7
+    rarePrototypes:
+    - CrateMaterialPlasma
+    - CrateHydroponicsSeedsExotic
+    rareChance: 0.1
+    offset: 0.0

 - type: entity
  name: random engineering crate spawner
  id: LootSpawnerRandomCrateEngineering
  parent: MarkerBase
  components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Structures/Storage/Crates/engineering.rsi
-          state: icon
-    - type: RandomSpawner
-      rarePrototypes:
-        - CrateEngineeringSingularityGenerator
-        - CrateEngineeringTeslaGenerator
-        - CrateEngineeringTeslaGroundingRod
-        - CrateEngineeringParticleAccelerator
-        - CrateRCD
-        - CrateEngineeringGear
-      rareChance: 0.2
-      prototypes:
-        - CrateEngineering
-        - CrateElectrical
-        - CrateEngineeringElectricalSupplies
-        - CrateRCDAmmo
-        - CrateEngineeringCableLV
-        - CrateEngineeringCableMV
-        - CrateEngineeringCableHV
-        - CrateEngineeringCableBulk
-        - CrateEngineeringSingularityContainment
-        - CrateEngineeringSingularityCollector
-        - CrateEngineeringTeslaCoil
-        - CrateEngineeringSingularityEmitter
-        - CrateEngineeringGyroscope
-        - CrateEngineeringThruster
-        - CrateEngineeringToolbox
-        - CrateEngineeringShuttle
-        - CrateEngineeringSolar
-        - CrateEngineeringJetpack
-        - CrateEmergencyRadiation
-        - CrateRadiation
-      chance: 0.9
-      offset: 0.0
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Structures/Storage/Crates/engineering.rsi
+      state: icon
+  - type: RandomSpawner
+    rarePrototypes:
+    - CrateEngineeringSingularityGenerator
+    - CrateEngineeringTeslaGenerator
+    - CrateEngineeringTeslaGroundingRod
+    - CrateEngineeringParticleAccelerator
+    - CrateRCD
+    - CrateEngineeringGear
+    rareChance: 0.2
+    prototypes:
+    - CrateEngineering
+    - CrateElectrical
+    - CrateEngineeringElectricalSupplies
+    - CrateRCDAmmo
+    - CrateEngineeringCableLV
+    - CrateEngineeringCableMV
+    - CrateEngineeringCableHV
+    - CrateEngineeringCableBulk
+    - CrateEngineeringSingularityContainment
+    - CrateEngineeringSingularityCollector
+    - CrateEngineeringTeslaCoil
+    - CrateEngineeringSingularityEmitter
+    - CrateEngineeringGyroscope
+    - CrateEngineeringThruster
+    - CrateEngineeringToolbox
+    - CrateEngineeringShuttle
+    - CrateEngineeringSolar
+    - CrateEngineeringJetpack
+    - CrateEmergencyRadiation
+    - CrateRadiation
+    chance: 0.9
+    offset: 0.0

 - type: entity
  name: random security crate spawner
  id: LootSpawnerRandomCrateSecurity
  parent: MarkerBase
  components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Structures/Storage/Crates/sec_gear.rsi
-          state: icon
-    - type: RandomSpawner
-      rarePrototypes: #Very useful stuff we probably don't want random people getting on space ruins often, even if there are hurdles to open it
-        - CrateArmoryShotgun
-        - CrateArmorySMG
-        - CrateSecurityRiot
-        - CrateSecurityNonlethal
-      rareChance: 0.1
-      prototypes:
-        - CrateWeaponSecure
-        - CrateArmoryLaser
-        - CrateArmoryPistols
-        - CrateTrainingBombs
-        - CrateTrackingImplants
-        - CrateSecurityTrackingMindshieldImplants
-        - CrateSecurityHelmet
-        - CrateSecurityArmor
-        - CrateRestraints
-        - CrateEmergencyExplosive
-        - CrateSecurityBiosuit
-      chance: 0.9
-      offset: 0.0
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Structures/Storage/Crates/sec_gear.rsi
+      state: icon
+  - type: RandomSpawner
+    rarePrototypes: #Very useful stuff we probably don't want random people getting on space ruins often, even if there are hurdles to open it
+    - CrateArmoryShotgun
+    - CrateArmorySMG
+    - CrateSecurityRiot
+    - CrateSecurityNonlethal
+    rareChance: 0.1
+    prototypes:
+    - CrateWeaponSecure
+    - CrateArmoryLaser
+    - CrateArmoryPistols
+    - CrateTrainingBombs
+    - CrateTrackingImplants
+    - CrateSecurityTrackingMindshieldImplants
+    - CrateSecurityHelmet
+    - CrateSecurityArmor
+    - CrateRestraints
+    - CrateEmergencyExplosive
+    - CrateSecurityBiosuit
+    chance: 0.9
+    offset: 0.0
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -149,6 +149,7 @@
        - id: ClothingNeckLesbianPin
        - id: ClothingNeckNonBinaryPin
        - id: ClothingNeckPansexualPin
+        - id: ClothingNeckOmnisexualPin
        - id: ClothingNeckTransPin
        - id: ClothingNeckAutismPin
        - id: ClothingNeckGoldAutismPin
@@ -382,3 +383,32 @@
        - Spaceshroom
      chance: 0.6
      offset: 0.0
+
+
+- type: entityTable
+  id: InsulsTable
+  table: !type:GroupSelector
+    children:
+    - id: ClothingHandsGlovesColorYellowBudget # budget insuls
+      weight: 85
+    - id: ClothingHandsGlovesColorYellow # true insuls
+      weight: 10
+    - id: ClothingHandsGlovesFingerlessInsulated # fingerless
+      weight: 4
+    - id: ClothingHandsGlovesConducting # conducting
+      weight: 1
+
+- type: entity
+  name: Maint Loot Spawner
+  id: MaintenanceInsulsSpawner
+  suffix: Insuls, safe
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Clothing/Hands/Gloves/Color/yellow.rsi
+      state: icon
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: InsulsTable
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml
@@ -6,29 +6,59 @@
  components:
  - type: Sprite
    layers:
-      - state: red
-      - sprite: Structures/Machines/VendingMachines/random.rsi
-        state: any
+    - state: red
+    - sprite: Structures/Machines/VendingMachines/random.rsi
+      state: any
  - type: RandomSpawner
    prototypes:
-      - VendingMachineCigs
-      - VendingMachineCoffee
-      - VendingMachineCola
-      - VendingMachineColaRed
-      - VendingMachineColaBlack
-      - VendingMachineDiscount
-      - VendingMachineSnack
-      - VendingMachineSnackBlue
-      - VendingMachineSnackGreen
-      - VendingMachineSnackOrange
-      - VendingMachineSnackTeal
-      - VendingMachineSovietSoda
-      - VendingMachineChang
-      - VendingMachineDonut
-      - VendingMachineShamblersJuice
-      - VendingMachinePwrGame
-      - VendingMachineDrGibb
-      - VendingMachineSoda
-      - VendingMachineStarkist
-      - VendingMachineSpaceUp
+    - VendingMachineChang
+    - VendingMachineCigs
+    - VendingMachineCoffee
+    - VendingMachineCola #Robust Sofdrinks
+    - VendingMachineColaBlack #Robust Sofdrinks [Black]
+    - VendingMachineColaRed #Space Cola
+    - VendingMachineDiscount
+    - VendingMachineDonut
+    - VendingMachineDrGibb
+    - VendingMachinePwrGame
+    - VendingMachineShamblersJuice
+    - VendingMachineSmite
+    - VendingMachineSnack
+    - VendingMachineSnackBlue
+    - VendingMachineSnackGreen
+    - VendingMachineSnackOrange
+    - VendingMachineSnackTeal
+    - VendingMachineSoda #Robust Sofdrinks [Soda]
+    - VendingMachineSovietSoda #Boda
+    - VendingMachineSpaceUp
+    - VendingMachineStarkist
    chance: 1
+
+
+- type: entityTable
+  id: ClothingVendorTable
+  table: !type:GroupSelector
+    children:
+    - id: VendingMachineClothing
+      weight: 40
+    - id: VendingMachineWinter
+      weight: 40
+    - id: VendingMachinePride
+      weight: 10
+    - id: VendingMachineTheater
+      weight: 10
+
+- type: entity
+  id: RandomVendingClothing
+  name: random vending machine spawner
+  suffix: Clothing
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Structures/Machines/VendingMachines/random.rsi
+      state: clothing
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: ClothingVendorTable
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml
@@ -12,14 +12,15 @@
  - type: RandomSpawner
    prototypes:
      - VendingMachineCoffee
-      - VendingMachineCola
-      - VendingMachineColaRed
-      - VendingMachineColaBlack
-      - VendingMachineSovietSoda
-      - VendingMachineShamblersJuice
-      - VendingMachinePwrGame
+      - VendingMachineCola #Robust Sofdrinks
+      - VendingMachineColaBlack #Robust Sofdrinks [Black]
+      - VendingMachineColaRed #Space Cola
      - VendingMachineDrGibb
-      - VendingMachineSoda
-      - VendingMachineStarkist
+      - VendingMachinePwrGame
+      - VendingMachineShamblersJuice
+      - VendingMachineSmite
+      - VendingMachineSoda #Robust Sofdrinks [Soda]
+      - VendingMachineSovietSoda #Boda
      - VendingMachineSpaceUp
+      - VendingMachineStarkist
    chance: 1
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -19,6 +19,8 @@
    name: ghost-role-information-rat-king-name
    description: ghost-role-information-rat-king-description
    rules: ghost-role-information-freeagent-rules
+    mindRoles:
+    - MindRoleGhostRoleFreeAgent
    raffle:
      settings: default
  - type: GhostRoleMobSpawner
@@ -40,6 +42,8 @@
    name: ghost-role-information-remilia-name
    description: ghost-role-information-remilia-description
    rules: ghost-role-information-familiar-rules
+    mindRoles:
+    - MindRoleGhostRoleFamiliar
    raffle:
      settings: short
  - type: GhostRoleMobSpawner
@@ -61,6 +65,8 @@
    name: ghost-role-information-cerberus-name
    description: ghost-role-information-cerberus-description
    rules: ghost-role-information-familiar-rules
+    mindRoles:
+    - MindRoleGhostRoleFamiliar
    raffle:
      settings: default
  - type: GhostRoleMobSpawner
@@ -81,6 +87,8 @@
  components:
  - type: GhostRole
    rules: ghost-role-information-rules-default-team-antagonist
+    mindRoles:
+    - MindRoleGhostRoleTeamAntagonist
    raffle:
      settings: default
  - type: GhostRoleMobSpawner
@@ -101,6 +109,8 @@
    name: ghost-role-information-loneop-name
    description: ghost-role-information-loneop-description
    rules: ghost-role-information-loneop-rules
+    mindRoles:
+    - MindRoleGhostRoleSoloAntagonist
  - type: Sprite
    sprite: Markers/jobs.rsi
    layers:
@@ -117,6 +127,8 @@
    name: roles-antag-nuclear-operative-commander-name
    description: roles-antag-nuclear-operative-commander-objective
    rules: ghost-role-information-rules-default-team-antagonist
+    mindRoles:
+    - MindRoleGhostRoleTeamAntagonist

 - type: entity
  categories: [ HideSpawnMenu, Spawner ]
@@ -127,6 +139,8 @@
    name: roles-antag-nuclear-operative-agent-name
    description: roles-antag-nuclear-operative-agent-objective
    rules: ghost-role-information-rules-default-team-antagonist
+    mindRoles:
+    - MindRoleGhostRoleTeamAntagonist

 - type: entity
  categories: [ HideSpawnMenu, Spawner ]
@@ -137,6 +151,8 @@
    name: roles-antag-nuclear-operative-name
    description: roles-antag-nuclear-operative-objective
    rules: ghost-role-information-rules-default-team-antagonist
+    mindRoles:
+    - MindRoleGhostRoleTeamAntagonist

 - type: entity
  categories: [ HideSpawnMenu, Spawner ]
@@ -147,6 +163,8 @@
    name: ghost-role-information-space-dragon-name
    description: ghost-role-information-space-dragon-description
    rules: ghost-role-information-space-dragon-rules
+    mindRoles:
+    - MindRoleGhostRoleTeamAntagonist
  - type: Sprite
    layers:
    - state: green
@@ -162,6 +180,8 @@
    name: ghost-role-information-space-ninja-name
    description: ghost-role-information-space-ninja-description
    rules: ghost-role-information-antagonist-rules
+    mindRoles:
+    - MindRoleGhostRoleSoloAntagonist
    raffle:
      settings: default
  - type: Sprite
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -65,6 +65,7 @@
    interfaces:
      enum.SiliconLawsUiKey.Key:
        type: SiliconLawBoundUserInterface
+        requireInputValidation: false
      enum.BorgUiKey.Key:
        type: BorgBoundUserInterface
      enum.StrippingUiKey.Key:
@@ -312,6 +313,7 @@
    access: [["SyndicateAgent"], ["NuclearOperative"]]
  - type: SiliconLawProvider
    laws: SyndicateStatic
+    subverted: true
  - type: IntrinsicRadioTransmitter
    channels:
    - Binary
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -443,6 +443,8 @@
    name: ghost-role-information-mothroach-name
    description: ghost-role-information-mothroach-description
    rules: ghost-role-information-freeagent-rules
+    mindRoles:
+    - MindRoleGhostRoleFreeAgent
  - type: Fixtures
    fixtures:
      fix1:
@@ -998,6 +1000,15 @@
  - type: Grammar
    attributes:
      gender: female # Here because of UdderComponent
+  - type: Speech
+    speechSounds: Goat
+    speechVerb: Goat
+  - type: Vocal
+    sounds:
+      Female: Goat
+      Male: Goat
+      Unsexed: Goat
+  - type: BleatingAccent
  - type: InteractionPopup
    successChance: 0.2
    interactSuccessString: petting-success-goat
@@ -1394,6 +1405,9 @@
    name: ghost-role-information-monkey-name
    description: ghost-role-information-monkey-description
    rules: ghost-role-information-syndicate-reinforcement-rules
+    mindRoles:
+    # This is for syndicate monkeys that randomly gain sentience, thus have no summoner to team with
+    - MindRoleGhostRoleSoloAntagonist
    raffle:
      settings: default
  - type: GhostTakeoverAvailable
@@ -1553,7 +1567,7 @@
  - type: MobThresholds
    thresholds:
      0: Alive
-      75: Critical
+      100: Critical
      200: Dead
  - type: NpcFactionMember
    factions:
@@ -1601,6 +1615,8 @@
    name: ghost-role-information-mouse-name
    description: ghost-role-information-mouse-description
    rules: ghost-role-information-freeagent-rules
+    mindRoles:
+    - MindRoleGhostRoleFreeAgent
  - type: GhostTakeoverAvailable
  - type: Speech
    speechSounds: Squeak
@@ -2388,6 +2404,8 @@
    name: ghost-role-information-giant-spider-name
    description: ghost-role-information-giant-spider-description
    rules: ghost-role-information-giant-spider-rules
+    mindRoles:
+    - MindRoleGhostRoleTeamAntagonist
    raffle:
      settings: short
  - type: GhostTakeoverAvailable
@@ -2431,8 +2449,8 @@

 - type: entity
  parent:
-  - MobGiantSpider
  - MobSpiderAngryBase
+  - MobGiantSpider
  id: MobGiantSpiderAngry

 - type: entity
@@ -2959,6 +2977,8 @@
    allowMovement: true
    description: ghost-role-information-SyndiCat-description
    rules: ghost-role-information-SyndiCat-rules
+    mindRoles:
+    - MindRoleGhostRoleTeamAntagonist
    raffle:
      settings: default
  - type: GhostTakeoverAvailable
--- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
@@ -11,6 +11,8 @@
      name: ghost-role-information-behonker-name
      description: ghost-role-information-behonker-description
      rules: ghost-role-information-antagonist-rules
+      mindRoles:
+      - MindRoleGhostRoleSoloAntagonist
      raffle:
        settings: default
    - type: GhostTakeoverAvailable
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -170,6 +170,8 @@
      name: ghost-role-information-sentient-carp-name
      description: ghost-role-information-sentient-carp-description
      rules: ghost-role-information-space-dragon-summoned-carp-rules
+      mindRoles:
+      - MindRoleGhostRoleTeamAntagonist
      raffle:
        settings: short
    - type: GhostTakeoverAvailable
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -232,6 +232,8 @@
    prob: 0
    description: ghost-role-information-angry-slimes-description
    rules: ghost-role-information-angry-slimes-rules
+    mindRoles:
+    - MindRoleGhostRoleTeamAntagonist
    raffle:
      settings: short
  - type: NpcFactionMember
--- a/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml
@@ -13,6 +13,8 @@
    name: ghost-role-information-hellspawn-name
    description: ghost-role-information-hellspawn-description
    rules: ghost-role-information-antagonist-rules
+    mindRoles:
+    - MindRoleGhostRoleSoloAntagonist
    raffle:
      settings: default
  - type: RotationVisuals
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -91,6 +91,8 @@
    name: ghost-role-information-rat-king-name
    description: ghost-role-information-rat-king-description
    rules: ghost-role-information-freeagent-rules
+    mindRoles:
+    - MindRoleGhostRoleFreeAgent
    raffle:
      settings: default
  - type: GhostTakeoverAvailable
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -38,6 +38,8 @@
    name: ghost-role-information-revenant-name
    description: ghost-role-information-revenant-description
    rules: ghost-role-information-antagonist-rules
+    mindRoles:
+    - MindRoleGhostRoleSoloAntagonist
    raffle:
      settings: default
  - type: GhostTakeoverAvailable
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -204,6 +204,8 @@
    name: ghost-role-information-honkbot-name
    description: ghost-role-information-honkbot-description
    rules: ghost-role-information-freeagent-rules
+    mindRoles:
+    - MindRoleGhostRoleFreeAgent
    raffle:
      settings: default
  - type: GhostTakeoverAvailable
@@ -236,6 +238,8 @@
    name: ghost-role-information-jonkbot-name
    description: ghost-role-information-jonkbot-description
    rules: ghost-role-information-freeagent-rules
+    mindRoles:
+    - MindRoleGhostRoleFreeAgent
    raffle:
      settings: default
  - type: InteractionPopup
@@ -370,6 +374,8 @@
    name: ghost-role-information-mimebot-name
    description: ghost-role-information-mimebot-description
    rules: ghost-role-information-freeagent-rules
+    mindRoles:
+    - MindRoleGhostRoleFreeAgent
    raffle:
      settings: default
  - type: GhostTakeoverAvailable
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -167,6 +167,8 @@
    - type: GhostRole
      description: ghost-role-information-angry-slimes-description
      rules: ghost-role-information-angry-slimes-rules
+      mindRoles:
+      - MindRoleGhostRoleTeamAntagonist
      raffle:
        settings: short

@@ -205,6 +207,8 @@
    - type: GhostRole
      description: ghost-role-information-angry-slimes-description
      rules: ghost-role-information-angry-slimes-rules
+      mindRoles:
+      - MindRoleGhostRoleTeamAntagonist
      raffle:
        settings: short

@@ -242,5 +246,7 @@
    - type: GhostRole
      description: ghost-role-information-angry-slimes-description
      rules: ghost-role-information-angry-slimes-rules
+      mindRoles:
+      - MindRoleGhostRoleTeamAntagonist
      raffle:
        settings: short
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -385,6 +385,8 @@
    name: ghost-role-information-snail-name
    description: ghost-role-information-snail-description
    rules: ghost-role-information-freeagent-rules
+    mindRoles:
+    - MindRoleGhostRoleFreeAgent
  - type: GhostTakeoverAvailable
  - type: Emoting
  - type: Sprite
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -15,6 +15,8 @@
    name: ghost-role-information-space-dragon-name
    description: ghost-role-information-space-dragon-description
    rules: ghost-role-information-space-dragon-rules
+    mindRoles:
+    - MindRoleGhostRoleTeamAntagonist
    raffle:
      settings: default
  - type: GhostTakeoverAvailable
@@ -152,7 +154,7 @@
    - DoorBumpOpener
  - type: Puller
    needsHands: false
-    
+
 - type: entity
  parent: BaseMobDragon
  id: MobDragon
--- a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
@@ -11,6 +11,8 @@
    name: ghost-role-information-remilia-name
    description: ghost-role-information-remilia-description
    rules: ghost-role-information-familiar-rules
+    mindRoles:
+    - MindRoleGhostRoleFamiliar
  - type: GhostTakeoverAvailable
  - type: Grammar
    attributes:
@@ -44,6 +46,8 @@
    name: ghost-role-information-cerberus-name
    description: ghost-role-information-cerberus-description
    rules: ghost-role-information-familiar-rules
+    mindRoles:
+    - MindRoleGhostRoleFamiliar
    raffle:
      settings: default
  - type: GhostTakeoverAvailable
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -14,6 +14,8 @@
      name: ghost-role-information-guardian-name
      description: ghost-role-information-guardian-description
      rules: ghost-role-information-familiar-rules
+      mindRoles:
+      - MindRoleGhostRoleFamiliar
      raffle:
        settings: default
    - type: GhostTakeoverAvailable
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -42,6 +42,8 @@
      rules: ghost-role-information-Death-Squad-rules
      raffle:
        settings: short
+      mindRoles:
+      - MindRoleGhostRoleFamiliar
    - type: Loadout
      prototypes: [ DeathSquadGear ]
      roleLoadout: [ RoleSurvivalEVA ]
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -378,7 +378,7 @@
    unlistedNumber: true
    requiresPower: false
  - type: Holopad
-  - type: StationAiWhitelist  
+  - type: StationAiWhitelist
  - type: UserInterface
    interfaces:
        enum.HolopadUiKey.AiRequestWindow:
@@ -424,6 +424,7 @@
    interfaces:
      enum.SiliconLawsUiKey.Key:
        type: SiliconLawBoundUserInterface
+        requireInputValidation: false
  - type: ComplexInteraction
  - type: Actions
  - type: Access
@@ -441,6 +442,9 @@
    - HideContextMenu
    - StationAi
    - NoConsoleSound
+  - type: StartingMindRole
+    mindRole: "MindRoleSiliconBrain"
+    silent: true

 # Hologram projection that the AI's eye tracks.
 - type: entity
@@ -504,6 +508,9 @@
      cell_slot:
        name: power-cell-slot-component-slot-name-default
        startingItem: PowerCellMedium
+  - type: StartingMindRole
+    mindRole: "MindRoleSiliconBrain"
+    silent: true

 - type: entity
  id: PlayerBorgSyndicateAssaultBattery
--- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
@@ -18,6 +18,8 @@
    name: ghost-role-information-skeleton-pirate-name
    description: ghost-role-information-skeleton-pirate-description
    rules: ghost-role-information-freeagent-rules
+    mindRoles:
+    - MindRoleGhostRoleFreeAgent
    raffle:
      settings: default
  - type: GhostTakeoverAvailable
@@ -35,6 +37,8 @@
    name: ghost-role-information-skeleton-biker-name
    description: ghost-role-information-skeleton-biker-description
    rules: ghost-role-information-freeagent-rules
+    mindRoles:
+    - MindRoleGhostRoleFreeAgent
    raffle:
      settings: default
  - type: GhostTakeoverAvailable
@@ -51,6 +55,8 @@
    name: ghost-role-information-closet-skeleton-name
    description: ghost-role-information-closet-skeleton-description
    rules: ghost-role-information-freeagent-rules
+    mindRoles:
+    - MindRoleGhostRoleFreeAgent
    raffle:
      settings: default
  - type: GhostTakeoverAvailable
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -1115,18 +1115,18 @@

 - type: entity
  parent: DrinkGlass
-  id: DrinkIrishCarBomb
-  suffix: irish car bomb
+  id: DrinkIrishSlammer
+  suffix: irish slammer
  components:
  - type: SolutionContainerManager
    solutions:
      drink:
        maxVol: 30
        reagents:
-        - ReagentId: IrishCarBomb
+        - ReagentId: IrishSlammer
          Quantity: 30
  - type: Icon
-    sprite: Objects/Consumable/Drinks/irishcarbomb.rsi
+    sprite: Objects/Consumable/Drinks/irishslammer.rsi
    state: icon

 - type: entity
@@ -1999,7 +1999,7 @@
 - type: entity
  parent: DrinkGlass
  id: DrinkTheMartinez
-  suffix: The Martinez
+  suffix: the martinez
  components:
    - type: SolutionContainerManager
      solutions:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -137,6 +137,8 @@
        reagents:
        - ReagentId: Absinthe
          Quantity: 100
+  - type: Label
+    currentLabel: reagent-name-absinthe
  - type: Sprite
    sprite: Objects/Consumable/Drinks/absinthebottle.rsi
  - type: Sealable
@@ -144,7 +146,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkBlueCuracaoBottleFull
-  name: Miss Blue Curacao
+  name: Miss Blue Curaçao
  description: A fruity, exceptionally azure drink. Does not allow the imbiber to use the fifth magic.
  components:
  - type: SolutionContainerManager
@@ -153,6 +155,8 @@
        reagents:
        - ReagentId: BlueCuracao
          Quantity: 100
+  - type: Label
+    currentLabel: reagent-name-blue-curacao
  - type: Sprite
    sprite: Objects/Consumable/Drinks/alco-bottle.rsi
    layers:
@@ -177,6 +181,8 @@
        reagents:
        - ReagentId: Nothing
          Quantity: 100
+  - type: Label
+    currentLabel: reagent-name-nothing
  - type: Sprite
    sprite: Objects/Consumable/Drinks/bottleofnothing.rsi
  - type: Sealable
@@ -193,6 +199,8 @@
        reagents:
        - ReagentId: Champagne
          Quantity: 100
+  - type: Label
+    currentLabel: reagent-name-champagne
  - type: Sprite
    sprite: Objects/Consumable/Drinks/champagnebottle.rsi
  - type: Openable
@@ -202,7 +210,7 @@
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkCognacBottleFull
  name: cognac bottle
-  description: A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time.
+  description: A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time.
  components:
  - type: SolutionContainerManager
    solutions:
@@ -219,8 +227,8 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull]
  id: DrinkColaBottleFull
-  name: space cola bottle
-  description: Cola. In space.
+  name: Space Cola bottle
+  description: Cola. In spaaace!
  components:
  - type: SolutionContainerManager
    solutions:
@@ -237,7 +245,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkGrenadineBottleFull
-  name: briar rose grenadine syrup bottle
+  name: Briar Rose grenadine syrup bottle
  description: Sweet and tangy, a bar syrup used to add color or flavor to drinks.
  components:
  - type: SolutionContainerManager
@@ -246,6 +254,8 @@
        reagents:
        - ReagentId: Grenadine
          Quantity: 100
+  - type: Label
+    currentLabel: reagent-name-grenadine
  # intended use is to spike drinks so starts open
  - type: Openable
    opened: true
@@ -275,7 +285,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkGildlagerBottleFull
-  name: gildlager bottle
+  name: Gildlager bottle
  description: 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break.
  components:
  - type: SolutionContainerManager
@@ -284,6 +294,8 @@
        reagents:
        - ReagentId: Gildlager
          Quantity: 100
+  - type: Label
+    currentLabel: reagent-name-gildlager
  - type: Sprite
    sprite: Objects/Consumable/Drinks/gildlagerbottle.rsi
  - type: Sealable
@@ -309,8 +321,8 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkMelonLiquorBottleFull
-  name: emeraldine melon liquor
-  description: A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light.
+  name: Emeraldine melon liquor
+  description: A bottle of 46 proof Emeraldine melon liquor. Sweet and light.
  components:
  - type: SolutionContainerManager
    solutions:
@@ -318,6 +330,8 @@
        reagents:
        - ReagentId: MelonLiquor
          Quantity: 100
+  - type: Label
+    currentLabel: reagent-name-melon-liquor
  - type: Sprite
    sprite: Objects/Consumable/Drinks/alco-bottle.rsi
    layers:
@@ -333,8 +347,8 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkPatronBottleFull
-  name: wrapp artiste patron bottle
-  description: Silver laced tequilla, served in space night clubs across the galaxy.
+  name: Wrapp Artiste Patrón bottle
+  description: Silver laced tequila, served in space night clubs across the galaxy.
  components:
  - type: SolutionContainerManager
    solutions:
@@ -342,13 +356,15 @@
        reagents:
        - ReagentId: Patron
          Quantity: 100
+  - type: Label
+    currentLabel: reagent-name-patron
  - type: Sprite
    sprite: Objects/Consumable/Drinks/patronbottle.rsi

 - type: entity
  parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
  id: DrinkPoisonWinebottleFull
-  name: warlock's velvet bottle
+  name: Warlock's Velvet bottle
  description: What a delightful packaging for a surely high quality wine! The vintage must be amazing!
  components:
  - type: SolutionContainerManager
@@ -368,7 +384,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkRumBottleFull
-  name: captain pete's Cuban spiced rum
+  name: Captain Pete's Cuban spiced rum
  description: This isn't just rum, oh no. It's practically GRIFF in a bottle.
  components:
  - type: SolutionContainerManager
@@ -386,8 +402,8 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull]
  id: DrinkSpaceMountainWindBottleFull
-  name: space mountain wind bottle
-  description: Blows right through you like a space wind.
+  name: Space Solar Wind bottle
+  description: Blows right through you like a solar wind.
  components:
  - type: SolutionContainerManager
    solutions:
@@ -405,7 +421,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull]
  id: DrinkSpaceUpBottleFull
-  name: space-up bottle
+  name: Space-Up bottle
  description: Tastes like a hull breach in your mouth.
  components:
  - type: SolutionContainerManager
@@ -424,7 +440,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkTequilaBottleFull
-  name: caccavo guaranteed quality tequila bottle
+  name: Caccavo Guaranteed Quality tequila bottle
  description: Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!
  components:
  - type: SolutionContainerManager
@@ -442,7 +458,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkVermouthBottleFull
-  name: goldeneye vermouth bottle
+  name: Goldeneye vermouth bottle
  description: Sweet, sweet dryness!
  components:
  - type: SolutionContainerManager
@@ -478,7 +494,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkWhiskeyBottleFull
-  name: uncle git's special reserve
+  name: Uncle Git's Special Reserve
  description: A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES.
  components:
  - type: SolutionContainerManager
@@ -496,7 +512,7 @@
 - type: entity
  parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
  id: DrinkWineBottleFull
-  name: doublebearded bearded special wine bottle
+  name: Doublebearded Bearded Special wine bottle
  description: A faint aura of unease and asspainery surrounds the bottle.
  components:
  - type: SolutionContainerManager
@@ -520,7 +536,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkBeerBottleFull
-  name: beer  # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e
+  name: beer bottle # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e
  description: An alcoholic beverage made from malted grains, hops, yeast, and water.
  components:
  - type: Item
@@ -532,6 +548,8 @@
        reagents:
        - ReagentId: Beer
          Quantity: 50
+  - type: Label
+    currentLabel: reagent-name-beer
  - type: Sprite
    sprite: Objects/Consumable/Drinks/beer.rsi
  - type: Openable
@@ -544,7 +562,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
  id: DrinkBeerGrowler # Needs to be renamed DrinkBeerBottleFull
-  name: Beer Growler  # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e
+  name: beer growler  # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e
  description: An alcoholic beverage made from malted grains, hops, yeast, and water. XL growler bottle.
  components:
  - type: SolutionContainerManager
@@ -568,7 +586,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull]
  id: DrinkAleBottleFull
-  name: Magm-Ale
+  name: Magm-Ale bottle
  description: A true dorf's drink of choice.
  components:
  - type: Item
@@ -580,6 +598,8 @@
        reagents:
        - ReagentId: Ale
          Quantity: 50
+  - type: Label
+    currentLabel: reagent-name-ale
  - type: Sprite
    sprite: Objects/Consumable/Drinks/alebottle.rsi
  - type: Openable
@@ -588,7 +608,7 @@
 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull]
  id: DrinkAleBottleFullGrowler
-  name: Magm-Ale Growler
+  name: Magm-Ale growler
  description: A true dorf's drink of choice. XL growler bottle.
  components:
  - type: SolutionContainerManager
@@ -620,6 +640,8 @@
        reagents:
        - ReagentId: Water
          Quantity: 30
+  - type: Label
+    currentLabel: reagent-name-water
  - type: Drink
  - type: Sprite
    sprite: Objects/Consumable/Drinks/waterbottle.rsi
@@ -763,11 +785,13 @@
        - ReagentId: Sugar
          Quantity: 300
  - type: Drink
+  - type: Label
+    currentLabel: reagent-name-sugar

 - type: entity
  parent: DrinkBottlePlasticBaseFull
  id: DrinkLemonLimeJug
-  name: lemon lime jug
+  name: Smite jug
  description: A dual citrus sensation.
  components:
  - type: SolutionContainerManager
@@ -887,7 +911,7 @@
  parent: DrinkBottlePlasticBaseFull
  id: DrinkIcedTeaJug
  name: iced tea jug
-  description: For when the regular tea is too hot for you boohoo.
+  description: For when the regular tea is too hot for you. Boohoo.
  components:
  - type: SolutionContainerManager
    solutions:
@@ -903,8 +927,8 @@
 - type: entity
  parent: DrinkBottlePlasticBaseFull
  id: DrinkDrGibbJug
-  name: dr gibb. jug
-  description: Yeah I don't know either...
+  name: Dr. Gibb jug
+  description: 42 different flavours... in a jug!
  components:
  - type: SolutionContainerManager
    solutions:
@@ -954,8 +978,8 @@
 - type: entity
  parent: DrinkBottlePlasticBaseFull
  id: DrinkEnergyDrinkJug
-  name: red bool jug
-  description: A jug of Red Bool, with enough caffine to kill a whole station.
+  name: Red Bool jug
+  description: A jug of Red Bool, with enough caffeine to kill a whole station.
  components:
  - type: SolutionContainerManager
    solutions:
@@ -966,7 +990,7 @@
          Quantity: 100
  - type: Drink
  - type: Label
-    currentLabel: red bool
+    currentLabel: reagent-name-energy-drink

 - type: entity
  parent: DrinkBottlePlasticBaseFull
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -71,8 +71,8 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkColaCan
-  name: space cola
-  description: A refreshing beverage.
+  name: Space Cola can
+  description: A sweet, carbonated soft drink.
  components:
  - type: SolutionContainerManager
    solutions:
@@ -262,8 +262,8 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkSpaceMountainWindCan
-  name: space mountain wind can
-  description: Blows right through you like a space wind.
+  name: Space Solar Wind can
+  description: Blows right through you like a solar wind.
  components:
  - type: SolutionContainerManager
    solutions:
@@ -280,7 +280,7 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkSpaceUpCan
-  name: space-up can
+  name: Space-Up can
  description: Tastes like a hull breach in your mouth.
  components:
  - type: SolutionContainerManager
@@ -298,7 +298,7 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkSolDryCan
-  name: sol dry
+  name: Sol Dry can
  description: Sweet ginger soda from outer space!
  components:
  - type: SolutionContainerManager
@@ -316,7 +316,7 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkStarkistCan
-  name: starkist can
+  name: Starkist can
  description: The taste of a star in liquid form. And, a bit of tuna...?
  components:
  - type: SolutionContainerManager
@@ -369,7 +369,7 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkChangelingStingCan
-  name: changeling sting can
+  name: Changeling Sting can
  description: You take a tiny sip and feel a burning sensation...
  components:
  - type: SolutionContainerManager
@@ -407,7 +407,7 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkNukieCan
-  name: blood-red brew can
+  name: Blood-red Brew can
  description: A home-brewed drink made from the crazed minds at the Syndicate. Not recommended by doctors.
  components:
  - type: SolutionContainerManager
@@ -433,7 +433,7 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkEnergyDrinkCan
-  name: red bool energy drink
+  name: Red Bool can
  description: A can of Red Bool, with enough caffeine to kill a horse.
  components:
  - type: SolutionContainerManager
@@ -505,7 +505,7 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkShamblersJuiceCan
-  name: shamblers juice can
+  name: Shambler's Juice can
  description: ~Shake me up some of that Shambler's Juice!~
  components:
  - type: SolutionContainerManager
@@ -524,7 +524,7 @@
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkPwrGameCan
-  name: pwr game can
+  name: PWR Game can
  description: The only drink with the PWR that true gamers crave. When a gamer talks about gamerfuel, this is what they're literally referring to.
  components:
  - type: SolutionContainerManager
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -937,9 +937,26 @@
 - type: entity
  name: bread dog
  id: MobBreadDog
-  parent: FoodBreadSausage
+  parent: EdibleBase
  description: It's a bread. It's a dog. It's a... breaddog?
  components:
+  - type: FlavorProfile
+    flavors:
+    - meaty
+    - bread
+  - type: SliceableFood
+    slice: FoodBreadSausageSlice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 45
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Vitamin
+          Quantity: 5
+        - ReagentId: Protein
+          Quantity: 5
  - type: Sprite
    noRot: true
    drawdepth: Mobs
@@ -984,6 +1001,7 @@
    - VimPilot
    - DoorBumpOpener
    - Bread
+    - Meat
  - type: CanEscapeInventory
    baseResistTime: 2
  - type: Puller
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -696,9 +696,25 @@
 - type: entity
  name: cak
  id: MobCatCake
-  parent: FoodCakeBase
+  parent: EdibleBase
  description: It's a cake. It's a cat. It's a cak.
  components:
+  - type: FlavorProfile
+    flavors:
+    - sweet
+  - type: InjectableSolution
+    solution: food
+  - type: RefillableSolution
+    solution: food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 20
+        - ReagentId: Vitamin
+          Quantity: 5
  - type: Sprite
    noRot: true
    drawdepth: Mobs
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
@@ -1,20 +1,30 @@
 #
-# Base component for consumable food
+# Base component for edible food-like items
 #
 - type: entity
  parent: BaseItem
-  id: FoodBase
+  id: EdibleBase
  abstract: true
  components:
  - type: FlavorProfile
    flavors:
      - food
  - type: Food
-  - type: SpaceGarbage
  - type: Sprite
  - type: StaticPrice
    price: 0

+#
+# Base component for consumable food
+# that should be cleaned up in space
+#
+- type: entity
+  parent: EdibleBase
+  id: FoodBase
+  abstract: true
+  components:
+  - type: SpaceGarbage
+
 # This base type is used to cover all of the "obvious" things that should be doable to open-package food.
 # Practically this means injection.
 # But it might in future also mean drawing with a syringe, so this is a base prototype just in case.
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -150,10 +150,12 @@
  name: cargo shuttle console board
  description: A computer printed circuit board for a cargo shuttle console.
  components:
-    - type: ComputerBoard
-      prototype: ComputerShuttleCargo
-    - type: StealTarget
-      stealGroup: CargoShuttleConsoleCircuitboard
+  - type: Sprite
+    state: cpu_supply
+  - type: ComputerBoard
+    prototype: ComputerShuttleCargo
+  - type: StealTarget
+    stealGroup: CargoShuttleConsoleCircuitboard

 - type: entity
  parent: BaseComputerCircuitboard
@@ -161,11 +163,13 @@
  name: surveillance camera monitor board
  description: A computer printed circuit board for a surveillance camera monitor.
  components:
-    - type: ComputerBoard
-      prototype: ComputerSurveillanceCameraMonitor
-    - type: Tag
-      tags:
-        - SurveillanceCameraMonitorCircuitboard
+  - type: Sprite
+    state: cpu_security
+  - type: ComputerBoard
+    prototype: ComputerSurveillanceCameraMonitor
+  - type: Tag
+    tags:
+    - SurveillanceCameraMonitorCircuitboard

 - type: entity
  parent: BaseComputerCircuitboard
@@ -173,8 +177,10 @@
  name: surveillance wireless camera monitor board
  description: A computer printed circuit board for a surveillance wireless camera monitor.
  components:
-    - type: ComputerBoard
-      prototype: ComputerSurveillanceWirelessCameraMonitor
+  - type: Sprite
+    state: cpu_security
+  - type: ComputerBoard
+    prototype: ComputerSurveillanceWirelessCameraMonitor

 - type: entity
  parent: BaseComputerCircuitboard
@@ -227,8 +233,10 @@
  name: crew monitoring computer board
  description: A computer printed circuit board for a crew monitoring console.
  components:
-    - type: ComputerBoard
-      prototype: ComputerCrewMonitoring
+  - type: Sprite
+    state: cpu_medical
+  - type: ComputerBoard
+    prototype: ComputerCrewMonitoring

 - type: entity
  parent: [BaseComputerCircuitboard, BaseGrandTheftContraband]
@@ -274,14 +282,18 @@
  name: syndicate communications computer board
  description: A computer printed circuit board for a syndicate communications console.
  components:
-    - type: ComputerBoard
-      prototype: SyndicateComputerComms
+  - type: Sprite
+    state: cpu_syndicate
+  - type: ComputerBoard
+    prototype: SyndicateComputerComms

 - type: entity
  parent: BaseComputerCircuitboard
  id: RadarConsoleCircuitboard
  name: radar console computer board
  components:
+  - type: Sprite
+    state: cpu_supply
  - type: ComputerBoard
    prototype: ComputerRadar

@@ -331,8 +343,10 @@
  name: shuttle console board
  description: A computer printed circuit board for a shuttle console.
  components:
-    - type: ComputerBoard
-      prototype: ComputerShuttle
+  - type: Sprite
+    state: cpu_supply
+  - type: ComputerBoard
+    prototype: ComputerShuttle

 - type: entity
  parent: BaseComputerCircuitboard
@@ -340,8 +354,10 @@
  name: syndicate shuttle console board
  description: A computer printed circuit board for a syndicate shuttle console.
  components:
-    - type: ComputerBoard
-      prototype: ComputerShuttleSyndie
+  - type: Sprite
+    state: cpu_syndicate
+  - type: ComputerBoard
+    prototype: ComputerShuttleSyndie

 - type: entity
  parent: BaseComputerCircuitboard
@@ -371,8 +387,10 @@
  name: syndicate IFF console board
  description: Allows you to control the IFF and stealth characteristics of this vessel.
  components:
-    - type: ComputerBoard
-      prototype: ComputerIFFSyndicate
+  - type: Sprite
+    state: cpu_syndicate
+  - type: ComputerBoard
+    prototype: ComputerIFFSyndicate

 - type: entity
  parent: BaseComputerCircuitboard
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
@@ -26,6 +26,8 @@
    name: ghost-role-information-syndicate-reinforcement-spy-name
    description: ghost-role-information-syndicate-reinforcement-spy-description
    rules: ghost-role-information-syndicate-reinforcement-rules
+    mindRoles:
+    - MindRoleGhostRoleTeamAntagonist
    raffle:
      settings: default
  - type: GhostRoleMobSpawner
@@ -43,6 +45,8 @@
    name: ghost-role-information-nukeop-reinforcement-name
    description: ghost-role-information-nukeop-reinforcement-description
    rules: ghost-role-information-nukeop-reinforcement-rules
+    mindRoles:
+    - MindRoleGhostRoleTeamAntagonist
    raffle:
      settings: default
  - type: GhostRoleMobSpawner
@@ -58,6 +62,8 @@
    name: ghost-role-information-syndicate-monkey-reinforcement-name
    description: ghost-role-information-syndicate-monkey-reinforcement-description
    rules: ghost-role-information-syndicate-reinforcement-rules
+    mindRoles:
+    - MindRoleGhostRoleTeamAntagonist
    raffle:
      settings: default
  - type: GhostRoleMobSpawner
@@ -85,6 +91,8 @@
    name: ghost-role-information-SyndiCat-name
    description: ghost-role-information-SyndiCat-description
    rules: ghost-role-information-syndicate-reinforcement-rules
+    mindRoles:
+    - MindRoleGhostRoleTeamAntagonist
    raffle:
      settings: default
  - type: GhostRoleMobSpawner
@@ -103,6 +111,8 @@
      name: ghost-role-information-syndicate-cyborg-assault-name
      description: ghost-role-information-syndicate-cyborg-description
      rules: ghost-role-information-silicon-rules
+      mindRoles:
+      - MindRoleGhostRoleSilicon
      raffle:
        settings: default
    - type: GhostRoleMobSpawner
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -6,10 +6,15 @@
  description: Personal Data Assistant.
  components:
  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda
  - type: Sprite
    sprite: Objects/Devices/pda.rsi
    layers:
    - map: [ "enum.PdaVisualLayers.Base" ]
+      state: "pda"
    - state: "light_overlay"
      map: [ "enum.PdaVisualLayers.Flashlight" ]
      shader: "unshaded"
@@ -22,7 +27,6 @@
    sprite: Objects/Devices/pda.rsi
    state: pda
  - type: Pda
-    state: pda
    paiSlot:
      priority: -2
      whitelist:
@@ -41,6 +45,7 @@
      whitelist:
        components:
        - IdCard
+  - type: PdaVisuals
  - type: Item
    size: Small
  - type: ContainerContainer
@@ -102,6 +107,8 @@
  - type: Tag
    tags:
    - DoorBumpOpener
+    - WhitelistChameleon
+    - WhitelistChameleonPDA
  - type: Input
    context: "human"
  - type: SentienceTarget # sentient PDA = pAI lite
@@ -147,7 +154,6 @@
  components:
  - type: Pda
    id: PassengerIDCard
-    state: pda
  - type: PdaBorderColor
    borderColor: "#717059"

@@ -159,7 +165,11 @@
  components:
  - type: Pda
    id: TechnicalAssistantIDCard
-    state: pda-interntech
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-interntech
  - type: PdaBorderColor
    borderColor: "#717059"
    accentVColor: "#949137"
@@ -174,7 +184,11 @@
  components:
  - type: Pda
    id: MedicalInternIDCard
-    state: pda-internmed
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-internmed
  - type: PdaBorderColor
    borderColor: "#717059"
    accentVColor: "#447987"
@@ -192,7 +206,11 @@
  components:
  - type: Pda
    id: SecurityCadetIDCard
-    state: pda-interncadet
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-interncadet
  - type: PdaBorderColor
    borderColor: "#717059"
    accentVColor: "#A32D26"
@@ -207,7 +225,11 @@
  components:
  - type: Pda
    id: ResearchAssistantIDCard
-    state: pda-internsci
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-internsci
  - type: PdaBorderColor
    borderColor: "#717059"
    accentVColor: "#8900c9"
@@ -222,7 +244,11 @@
  components:
  - type: Pda
    id: ServiceWorkerIDCard
-    state: pda-internservice
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-internservice
  - type: PdaBorderColor
    borderColor: "#717059"
    accentVColor: "#00cc35"
@@ -237,7 +263,11 @@
  components:
  - type: Pda
    id: ChefIDCard
-    state: pda-cook
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-cook
  - type: PdaBorderColor
    borderColor: "#d7d7d0"
  - type: Icon
@@ -253,7 +283,11 @@
  components:
  - type: Pda
    id: BotanistIDCard
-    state: pda-hydro
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-hydro
  - type: PdaBorderColor
    borderColor: "#44843c"
    accentVColor: "#00cc35"
@@ -268,7 +302,6 @@
  components:
  - type: Pda
    id: ClownIDCard
-    state: pda-clown
    penSlot:
      startingItem: CrayonOrange # no pink crayon?!?
      # ^ Still unacceptable.
@@ -278,6 +311,11 @@
      whitelist:
        tags:
        - Write
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-clown
  - type: PdaBorderColor
    borderColor: "#C18199"
  - type: Icon
@@ -312,7 +350,9 @@
  components:
  - type: Pda
    id: VisitorIDCard
-    state: pda-clown
+  - type: Tag #  Ignore Chameleon tags
+    tags:
+    - DoorBumpOpener

 - type: entity
  parent: BasePDA
@@ -322,12 +362,40 @@
  components:
  - type: Pda
    id: MimeIDCard
-    state: pda-mime
-    idSlot: #  rewrite without sound because mime
-      name: ID Card
+    paiSlot:
+      priority: -2
+      ejectSound: null
+      insertSound: null
+      whitelist:
+        components:
+        - PAI
+    idSlot:
+      name: access-id-card-component-default
+      ejectSound: null # mime is silent
+      insertSound: null
      whitelist:
        components:
        - IdCard
+    penSlot:
+      startingItem: Pen
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+      ejectSound: null
+      insertSound: null
+  - type: CartridgeLoader
+    cartridgeSlot:
+      ejectSound: null
+      insertSound: null
+      whitelist:
+        components:
+        - Cartridge
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-mime
  - type: PdaBorderColor
    borderColor: "#d7d7d0"
    accentHColor: "#333333"
@@ -343,7 +411,11 @@
  components:
  - type: Pda
    id: ChaplainIDCard
-    state: pda-chaplain
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-chaplain
  - type: PdaBorderColor
    borderColor: "#333333"
  - type: Icon
@@ -356,7 +428,9 @@
  components:
  - type: Pda
    id: VisitorIDCard
-    state: pda-chaplain
+  - type: Tag #  Ignore Chameleon tags
+    tags:
+    - DoorBumpOpener

 - type: entity
  name: quartermaster PDA
@@ -366,7 +440,11 @@
  components:
  - type: Pda
    id: QuartermasterIDCard
-    state: pda-qm
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-qm
  - type: PdaBorderColor
    borderColor: "#e39751"
    accentVColor: "#a23e3e"
@@ -381,7 +459,11 @@
  components:
  - type: Pda
    id: CargoIDCard
-    state: pda-cargo
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-cargo
  - type: PdaBorderColor
    borderColor: "#e39751"
  - type: Icon
@@ -395,7 +477,11 @@
  components:
  - type: Pda
    id: SalvageIDCard
-    state: pda-miner
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-miner
  - type: PdaBorderColor
    borderColor: "#af9366"
    accentVColor: "#8900c9"
@@ -417,7 +503,11 @@
  components:
  - type: Pda
    id: BartenderIDCard
-    state: pda-bartender
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-bartender
  - type: PdaBorderColor
    borderColor: "#333333"
  - type: Icon
@@ -431,13 +521,17 @@
  components:
  - type: Pda
    id: LibrarianIDCard
-    state: pda-library
    penSlot:
      startingItem: LuxuryPen
      priority: -1
      whitelist:
        tags:
        - Write
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-library
  - type: PdaBorderColor
    borderColor: "#858585"
  - type: Icon
@@ -450,7 +544,9 @@
  components:
  - type: Pda
    id: VisitorIDCard
-    state: pda-library
+  - type: Tag #  Ignore Chameleon tags
+    tags:
+    - DoorBumpOpener

 - type: entity
  parent: BaseSecurityPDA
@@ -460,13 +556,17 @@
  components:
  - type: Pda
    id: LawyerIDCard
-    state: pda-lawyer
    penSlot:
      startingItem: LuxuryPen
      priority: -1
      whitelist:
        tags:
        - Write
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-lawyer
  - type: PdaBorderColor
    borderColor: "#6f6192"
  - type: Icon
@@ -479,7 +579,9 @@
  components:
  - type: Pda
    id: VisitorIDCard
-    state: pda-lawyer
+  - type: Tag #  Ignore Chameleon tags
+    tags:
+    - DoorBumpOpener

 - type: entity
  parent: BasePDA
@@ -489,7 +591,11 @@
  components:
  - type: Pda
    id: JanitorIDCard
-    state: pda-janitor
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-janitor
  - type: PdaBorderColor
    borderColor: "#5D2D56"
  - type: Icon
@@ -503,13 +609,17 @@
  components:
  - type: Pda
    id: CaptainIDCard
-    state: pda-captain
    penSlot:
      startingItem: PenCap
      priority: -1
      whitelist:
        tags:
        - Write
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-captain
  - type: PdaBorderColor
    borderColor: "#7C5D00"
  - type: Icon
@@ -523,13 +633,17 @@
  components:
  - type: Pda
    id: HoPIDCard
-    state: pda-hop
    penSlot:
      startingItem: PenHop
      priority: -1
      whitelist:
        tags:
        - Write
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-hop
  - type: PdaBorderColor
    borderColor: "#789876"
    accentHColor: "#447987"
@@ -544,7 +658,11 @@
  components:
  - type: Pda
    id: CEIDCard
-    state: pda-ce
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-ce
  - type: PdaBorderColor
    borderColor: "#949137"
    accentHColor: "#447987"
@@ -559,7 +677,11 @@
  components:
  - type: Pda
    id: EngineeringIDCard
-    state: pda-engineer
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-engineer
  - type: PdaBorderColor
    borderColor: "#949137"
    accentVColor: "#A32D26"
@@ -574,7 +696,11 @@
  components:
  - type: Pda
    id: CMOIDCard
-    state: pda-cmo
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-cmo
  - type: PdaBorderColor
    borderColor: "#d7d7d0"
    accentHColor: "#447987"
@@ -590,7 +716,11 @@
  components:
  - type: Pda
    id: MedicalIDCard
-    state: pda-medical
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-medical
  - type: PdaBorderColor
    borderColor: "#d7d7d0"
    accentVColor: "#447987"
@@ -607,7 +737,9 @@
  components:
  - type: Pda
    id: VisitorIDCard
-    state: pda-medical
+  - type: Tag #  Ignore Chameleon tags
+    tags:
+    - DoorBumpOpener

 - type: entity
  parent: BaseMedicalPDA
@@ -617,7 +749,11 @@
  components:
  - type: Pda
    id: ParamedicIDCard
-    state: pda-paramedic
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-paramedic
  - type: PdaBorderColor
    borderColor: "#d7d7d0"
    accentVColor: "#2a4b5b"
@@ -632,7 +768,11 @@
  components:
  - type: Pda
    id: ChemistIDCard
-    state: pda-chemistry
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-chemistry
  - type: PdaBorderColor
    borderColor: "#d7d7d0"
    accentVColor: "#B34200"
@@ -647,7 +787,11 @@
  components:
  - type: Pda
    id: RDIDCard
-    state: pda-rd
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-rd
  - type: PdaBorderColor
    borderColor: "#d7d7d0"
    accentHColor: "#447987"
@@ -663,7 +807,11 @@
  components:
  - type: Pda
    id: ResearchIDCard
-    state: pda-science
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-science
  - type: PdaBorderColor
    borderColor: "#d7d7d0"
    accentVColor: "#8900c9"
@@ -678,7 +826,11 @@
  components:
  - type: Pda
    id: HoSIDCard
-    state: pda-hos
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-hos
  - type: PdaBorderColor
    borderColor: "#A32D26"
    accentHColor: "#447987"
@@ -700,7 +852,11 @@
  components:
  - type: Pda
    id: WardenIDCard
-    state: pda-warden
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-warden
  - type: PdaBorderColor
    borderColor: "#A32D26"
    accentVColor: "#949137"
@@ -715,7 +871,11 @@
  components:
  - type: Pda
    id: SecurityIDCard
-    state: pda-security
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-security
  - type: PdaBorderColor
    borderColor: "#A32D26"
  - type: Icon
@@ -729,12 +889,16 @@
  components:
  - type: Pda
    id: CentcomIDCard
-    state: pda-centcom
    penSlot:
      startingItem: PenCentcom
      whitelist:
        tags:
        - Write
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-centcom
  - type: PdaBorderColor
    borderColor: "#00842e"
  - type: Icon
@@ -773,6 +937,9 @@
      - WantedListCartridge
      - MedTekCartridge
      - AstroNavCartridge
+  - type: Tag #  Ignore Chameleon tags
+    tags:
+    - DoorBumpOpener

 - type: entity
  parent: CentcomPDA
@@ -781,6 +948,9 @@
  components:
  - type: Pda
    id: CentcomIDCardDeathsquad
+  - type: Tag #  Ignore Chameleon tags
+    tags:
+    - DoorBumpOpener

 - type: entity
  parent: BasePDA
@@ -790,7 +960,11 @@
  components:
  - type: Pda
    id: MusicianIDCard
-    state: pda-musician
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-musician
  - type: PdaBorderColor
    borderColor: "#333333"
  - type: Icon
@@ -808,7 +982,9 @@
  components:
  - type: Pda
    id: VisitorIDCard
-    state: pda-musician
+  - type: Tag #  Ignore Chameleon tags
+    tags:
+    - DoorBumpOpener

 - type: entity
  parent: BasePDA
@@ -818,7 +994,11 @@
  components:
  - type: Pda
    id: AtmosIDCard
-    state: pda-atmos
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-atmos
  - type: PdaBorderColor
    borderColor: "#949137"
    accentVColor: "#447987"
@@ -833,7 +1013,11 @@
  components:
  - type: Pda
    id: PassengerIDCard
-    state: pda-clear
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-clear
  - type: PdaBorderColor
    borderColor: "#288e4d"
  - type: Icon
@@ -845,7 +1029,9 @@
  components:
  - type: Pda
    id: VisitorIDCard
-    state: pda
+  - type: Tag #  Ignore Chameleon tags
+    tags:
+    - DoorBumpOpener

 - type: entity
  parent: BasePDA
@@ -855,7 +1041,11 @@
  components:
  - type: Pda
    id: SyndicateIDCard
-    state: pda-syndi
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-syndi
  - type: PdaBorderColor
    borderColor: "#891417"
  - type: Icon
@@ -874,7 +1064,11 @@
  components:
  - type: Pda
    id: ERTLeaderIDCard
-    state: pda-ert
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-ert
  - type: PdaBorderColor
    borderColor: "#A32D26"
    accentHColor: "#447987"
@@ -963,7 +1157,11 @@
  components:
  - type: Pda
    id: PsychologistIDCard
-    state: pda-medical
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-medical
  - type: PdaBorderColor
    borderColor: "#d7d7d0"
    accentVColor: "#447987"
@@ -978,13 +1176,17 @@
  components:
  - type: Pda
    id: ReporterIDCard
-    state: pda-reporter
    penSlot:
      startingItem: LuxuryPen
      priority: -1
      whitelist:
        tags:
        - Write
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-reporter
  - type: PdaBorderColor
    borderColor: "#3f3f74"
  - type: Icon
@@ -998,7 +1200,11 @@
  components:
  - type: Pda
    id: ZookeeperIDCard
-    state: pda-zookeeper
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-zookeeper
  - type: PdaBorderColor
    borderColor: "#ffe685"
  - type: Icon
@@ -1012,7 +1218,11 @@
  components:
  - type: Pda
    id: BoxerIDCard
-    state: pda-boxer
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-boxer
  - type: PdaBorderColor
    borderColor: "#333333"
    accentVColor: "#390504"
@@ -1027,7 +1237,11 @@
  components:
  - type: Pda
    id: DetectiveIDCard
-    state: pda-detective
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-detective
  - type: PdaBorderColor
    borderColor: "#774705"
  - type: Icon
@@ -1048,7 +1262,11 @@
  components:
  - type: Pda
    id: BrigmedicIDCard
-    state: pda-brigmedic
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-brigmedic
  - type: PdaBorderColor
    borderColor: "#A32D26"
    accentHColor: "#d7d7d0"
@@ -1072,7 +1290,11 @@
  components:
  - type: Pda
    id: CluwneIDCard
-    state: pda-cluwne
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-cluwne
  - type: PdaBorderColor
    borderColor: "#1c8f4d"
  - type: Icon
@@ -1094,7 +1316,11 @@
  components:
  - type: Pda
    id: SeniorEngineerIDCard
-    state: pda-seniorengineer
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-seniorengineer
  - type: PdaBorderColor
    borderColor: "#949137"
    accentVColor: "#CD6900"
@@ -1109,7 +1335,11 @@
  components:
  - type: Pda
    id: SeniorResearcherIDCard
-    state: pda-seniorresearcher
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-seniorresearcher
  - type: PdaBorderColor
    borderColor: "#d7d7d0"
    accentHColor: "#8900c9"
@@ -1125,7 +1355,11 @@
  components:
  - type: Pda
    id: SeniorPhysicianIDCard
-    state: pda-seniorphysician
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-seniorphysician
  - type: PdaBorderColor
    borderColor: "#d7d7d0"
    accentHColor: "#447987"
@@ -1141,7 +1375,11 @@
  components:
  - type: Pda
    id: SeniorOfficerIDCard
-    state: pda-seniorofficer
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-seniorofficer
  - type: PdaBorderColor
    borderColor: "#A32D26"
    accentVColor: "#DFDFDF"
@@ -1156,7 +1394,11 @@
  components:
  - type: Pda
    id: PirateIDCard
-    state: pda-pirate
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-pirate
  - type: Icon
    state: pda-pirate

@@ -1168,7 +1410,11 @@
  components:
  - type: Pda
    id: SyndicateIDCard
-    state: pda-syndi-agent
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-syndi-agent
  - type: PdaBorderColor
    borderColor: "#891417"
  - type: Icon
@@ -1178,3 +1424,34 @@
    preinstalled:
      - NotekeeperCartridge
      - MedTekCartridge
+
+- type: entity
+  parent: BasePDA
+  id: ChameleonPDA
+  name: passenger PDA
+  description: Why isn't it gray?
+  suffix: Chameleon
+  components:
+  - type: PdaBorderColor
+    borderColor: "#717059"
+  - type: Tag
+    tags: # ignore "WhitelistChameleon" tag
+    - DoorBumpOpener
+  - type: ChameleonClothing
+    slot: [idcard]
+    default: PassengerPDA
+    requireTag: WhitelistChameleonPDA
+  - type: UserInterface
+    interfaces:
+      enum.PdaUiKey.Key:
+        type: PdaBoundUserInterface
+      enum.StoreUiKey.Key:
+        type: StoreBoundUserInterface
+      enum.RingerUiKey.Key:
+        type: RingerBoundUserInterface
+      enum.InstrumentUiKey.Key:
+        type: InstrumentBoundUserInterface
+      enum.HealthAnalyzerUiKey.Key:
+        type: HealthAnalyzerBoundUserInterface
+      enum.ChameleonUiKey.Key:
+        type: ChameleonBoundUserInterface
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
@@ -62,11 +62,9 @@
        density: 80
        mask:
        - Impassable
-        - HighImpassable
        - MidImpassable
        layer:
        - Opaque
-        - HighImpassable
        - MidImpassable
        - BulletImpassable
  - type: StaticPrice
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
@@ -9,7 +9,7 @@
  - type: SwappableInstrument
    instrumentList:
      "Clean": {27: 0}
-      "Jazz": {25: 0}
+      "Jazz": {26: 0}
      "Muted": {28: 0}
  - type: Sprite
    sprite: Objects/Fun/Instruments/eguitar.rsi
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -38,6 +38,8 @@
    roleName: pai-system-role-name
    roleDescription: pai-system-role-description
    roleRules: ghost-role-information-familiar-rules
+    mindRoles:
+    - MindRoleGhostRoleFamiliar
    wipeVerbText: pai-system-wipe-device-verb-text
    wipeVerbPopup: pai-system-wiped-device
    stopSearchVerbText: pai-system-stop-searching-verb-text
@@ -91,6 +93,8 @@
    roleName: pai-system-role-name-syndicate
    roleDescription: pai-system-role-description-syndicate
    roleRules: ghost-role-information-familiar-rules
+    mindRoles:
+    - MindRoleGhostRoleFamiliar
  - type: IntrinsicRadioTransmitter
    channels:
    - Syndicate
@@ -123,6 +127,8 @@
    roleName: pai-system-role-name-potato
    roleDescription: pai-system-role-description-potato
    roleRules: ghost-role-information-familiar-rules
+    mindRoles:
+    - MindRoleGhostRoleFamiliar
  - type: Appearance
  - type: GenericVisualizer
    visuals:
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -354,6 +354,8 @@
  description: An adorable stuffed toy that resembles a lizardperson of every color. You just might trip while staring at it...
  name: rainbow lizard plushie
  components:
+  - type: Sprite
+    state: rainbowlizardplush
  - type: PointLight
    radius: 1.5
    energy: 2
@@ -364,6 +366,14 @@
      head:
      - state: lizard-equipped-HELMET
        shader: unshaded
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: rainbowlizardplush-inhand-left
+        shader: unshaded
+      right:
+      - state: rainbowlizardplush-inhand-right
+        shader: unshaded

 - type: entity
  parent: PlushieLizard
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -196,7 +196,7 @@
    count: 1

 - type: entity
-  parent: [SheetOtherBase, FoodBase]
+  parent: [SheetOtherBase, EdibleBase]
  id: SheetUranium
  name: uranium
  suffix: Full
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -22,6 +22,7 @@
    tags:
    - DoorBumpOpener
    - WhitelistChameleon
+    - WhitelistChameleonIdCard
  - type: StealTarget
    stealGroup: IDCard

@@ -116,6 +117,7 @@
    tags:
    - DoorBumpOpener
    - WhitelistChameleon
+    - WhitelistChameleonIdCard
    - HighRiskItem
  - type: StealTarget
    stealGroup: CaptainIDCard
@@ -314,6 +316,9 @@
    - type: PresetIdCard
      job: Bartender
      name: Pun Pun
+    - type: Tag #  Ignore Chameleon tags
+      tags:
+      - DoorBumpOpener

 - type: entity
  parent: IDCardStandard
@@ -599,6 +604,7 @@
  - type: ChameleonClothing
    slot: [idcard]
    default: PassengerIDCard
+    requireTag: WhitelistChameleonIdCard
  - type: UserInterface
    interfaces:
      enum.AgentIDCardUiKey.Key:
@@ -811,3 +817,6 @@
    - NuclearOperative
    - SyndicateAgent
    - Wizard
+  - type: Tag #  Ignore Chameleon tags
+    tags:
+    - DoorBumpOpener
--- a/Resources/Prototypes/Entities/Objects/Misc/pet_carrier.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/pet_carrier.yml
@@ -63,4 +63,9 @@
  - type: ItemSlots
  - type: Item
    size: Ginormous
-    sprite: Objects/Storage/petcarrier.rsi
+    sprite: Objects/Storage/petcarrier.rsi
+  - type: Construction
+    graph: PetCarrier
+    node: petCarrier
+    containers:
+    - entity_storage
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -167,6 +167,23 @@
    - LightBulb
    - Trash

+- type: entity
+  parent: BaseLightbulb
+  name: warm light bulb
+  id: WarmLightBulb
+  description: A warm light bulb for a more cozy atmosphere.
+  components:
+  - type: LightBulb
+    bulb: Bulb
+    color: "#ff9833" # 2200k color temp
+    lightEnergy: 1
+    lightRadius: 6
+    lightSoftness: 3
+  - type: Tag
+    tags:
+    - LightBulb
+    - Trash
+
 - type: entity
  parent: LightBulb
  name: old incandescent light bulb
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
@@ -89,6 +89,8 @@
      roleName: positronic-brain-role-name
      roleDescription: positronic-brain-role-description
      roleRules: ghost-role-information-silicon-rules
+      mindRoles:
+      - MindRoleGhostRoleSilicon
      wipeVerbText: positronic-brain-wipe-device-verb-text
      wipeVerbPopup: positronic-brain-wiped-device
      stopSearchVerbText: positronic-brain-stop-searching-verb-text
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -312,7 +312,6 @@
  - type: LimitedCharges
    maxCharges: 30
    charges: 30
-  - type: UseDelay
  - type: Sprite
    sprite: Objects/Tools/rcd.rsi
    state: icon
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -70,6 +70,7 @@
          - /Maps/Ruins/syndicate_dropship.yml
          - /Maps/Ruins/whiteship_ancient.yml
          - /Maps/Ruins/whiteship_bluespacejumper.yml
+          - /Maps/Ruins/wrecklaimer.yml
        vgroid: !type:DungeonSpawnGroup
          minimumDistance: 300
          maximumDistance: 350
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -192,6 +192,9 @@
            max: 1
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: IconSmooth
+    key: metaltable
+    base: state_
  - type: Construction
    graph: Table
    node: Table
@@ -230,6 +233,8 @@
            max: 2
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: IconSmooth
+    key: metalreinforcedtable
  - type: Construction
    graph: Table
    node: TableReinforced
@@ -286,6 +291,8 @@
        node: TableFrame
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: IconSmooth
+    key: glasstable
  - type: Construction
    graph: Table
    node: TableGlass
@@ -341,6 +348,8 @@
            max: 1
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: IconSmooth
+    key: reinforcedglasstable
  - type: Construction
    graph: Table
    node: TableReinforcedGlass
@@ -396,6 +405,8 @@
            max: 1
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: IconSmooth
+    key: plasmaglasstable
  - type: Construction
    graph: Table
    node: TablePlasmaGlass
@@ -440,6 +451,8 @@
            max: 1
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: IconSmooth
+    key: brasstable
  - type: Construction
    graph: Table
    node: TableBrass
@@ -481,6 +494,8 @@
            max: 1
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: IconSmooth
+    key: woodtable
  - type: Construction
    graph: Table
    node: TableWood
@@ -522,6 +537,8 @@
            max: 1
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: IconSmooth
+    key: woodgambletable
  - type: Construction
    graph: Table
    node: TableCarpet
@@ -553,6 +570,8 @@
          path: /Audio/Effects/picaxe2.ogg
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: IconSmooth
+    key: stonetable
  - type: FootstepModifier
    footstepSoundCollection:
      collection: FootstepFloor
@@ -582,6 +601,8 @@
      Brute:
        path:
          "/Audio/Weapons/slash.ogg"
+  - type: IconSmooth
+    key: webtable
  - type: Construction
    graph: WebStructures
    node: table
@@ -619,6 +640,8 @@
            max: 1
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: IconSmooth
+    key: fancytable
  - type: Tag
    tags:
    - Wooden
@@ -638,6 +661,8 @@
  - type: Construction
    graph: Table
    node: TableFancyBlue
+  - type: IconSmooth
+    key: fancytableblue

 - type: entity
  id: TableFancyCyan
@@ -651,6 +676,8 @@
  - type: Construction
    graph: Table
    node: TableFancyCyan
+  - type: IconSmooth
+    key: fancytablecyan

 - type: entity
  id: TableFancyBlack
@@ -664,6 +691,8 @@
  - type: Construction
    graph: Table
    node: TableFancyBlack
+  - type: IconSmooth
+    key: fancytableblack

 - type: entity
  id: TableFancyRed
@@ -677,6 +706,8 @@
  - type: Construction
    graph: Table
    node: TableFancyRed
+  - type: IconSmooth
+    key: fancytablered

 - type: entity
  id: TableFancyPurple
@@ -690,6 +721,8 @@
  - type: Construction
    graph: Table
    node: TableFancyPurple
+  - type: IconSmooth
+    key: fancytablepurple

 - type: entity
  id: TableFancyPink
@@ -703,6 +736,8 @@
  - type: Construction
    graph: Table
    node: TableFancyPink
+  - type: IconSmooth
+    key: fancytablepink

 - type: entity
  id: TableFancyGreen
@@ -716,6 +751,8 @@
  - type: Construction
    graph: Table
    node: TableFancyGreen
+  - type: IconSmooth
+    key: fancytablegreen

 - type: entity
  id: TableFancyOrange
@@ -729,6 +766,8 @@
  - type: Construction
    graph: Table
    node: TableFancyOrange
+  - type: IconSmooth
+    key: fancytableorange

 - type: entity
  id: TableFancyWhite
@@ -742,6 +781,8 @@
  - type: Construction
    graph: Table
    node: TableFancyWhite
+  - type: IconSmooth
+    key: fancytablewhite

 #Debug

@@ -806,6 +847,9 @@
            max: 1
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: IconSmooth
+    key: counterwood
+    base: state_
  - type: Construction
    graph: Table
    node: CounterWood
@@ -851,6 +895,9 @@
            max: 1
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: IconSmooth
+    key: countermetal
+    base: state_
  - type: Construction
    graph: Table
    node: CounterMetal
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -44,6 +44,19 @@
    cost: 4
    delay: 2
    fx: EffectRCDDeconstruct2
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,0.5,0.4,0.35"
+        density: 190
+        mask:
+        - TabletopMachineMask
+        layer:
+        - TabletopMachineLayer
  - type: Destructible
    thresholds:
    - trigger:
@@ -253,6 +266,19 @@
      radius: 6
      softness: 1.1
      enabled: true
+    - type: Physics
+      bodyType: Static
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape:
+            !type:PhysShapeAabb
+            bounds: "-0.2,0.5,0.2,0.35"
+          density: 190
+          mask:
+          - TabletopMachineMask
+          layer:
+          - TabletopMachineLayer
    - type: Damageable
      damageContainer: Inorganic
    - type: Destructible
@@ -367,6 +393,27 @@
        Heat: 1
    popupText: powered-light-component-burn-hand

+- type: entity
+  id: PoweredWarmSmallLight
+  suffix: Warm
+  parent: PoweredSmallLightEmpty
+  components:
+  - type: Sprite
+    state: base
+  - type: PointLight
+    enabled: true
+    radius: 6
+    energy: 1
+    softness: 3
+    color: "#FF8A0C"
+  - type: PoweredLight
+    hasLampOnSpawn: WarmLightBulb
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 2
+    popupText: powered-light-component-burn-hand
+
 - type: entity
  id: PoweredSmallLight
  suffix: ""
--- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
@@ -29,6 +29,7 @@
        layer:
        - MidImpassable
        - LowImpassable
+        - BulletImpassable
  - type: PointLight
    radius: 10
    energy: 2.5
@@ -64,6 +65,7 @@
          collection: MetalGlassBreak
  - type: StaticPrice
    price: 75
+  - type: RequireProjectileTarget

 - type: entity
  id: PoweredLightPostSmallEmpty
--- a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml
@@ -38,6 +38,19 @@
    softness: 1
    offset: "0, 0.35"
  - type: RotatingLight
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.2,0.5,0.2,0.35"
+        density: 190
+        mask:
+        - TabletopMachineMask
+        layer:
+        - TabletopMachineLayer
  - type: Damageable
    damageContainer: Inorganic
    damageModifierSet: Metallic
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -36,6 +36,9 @@
  - type: Speech
    speechVerb: Robotic
    speechSounds: Vending
+  - type: SpookySpeaker
+    messageSet: SpookySpeakerMessagesGeneric
+    speakChance: 0.2
  - type: Anchorable
  - type: Pullable
  - type: StaticPrice
--- a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml
@@ -149,6 +149,7 @@
 # These are spawned by holopads
 - type: entity
  id: HolopadHologram
+  name: hologram
  categories: [ HideSpawnMenu ]
  suffix: DO NOT MAP
  components:
@@ -163,6 +164,10 @@
  - type: Appearance
  - type: TypingIndicator
    proto: robot
+  - type: Speech
+    speechVerb: Robotic
+    speechSounds: Borg
+    speechBubbleOffset: 0.45
  - type: HolopadHologram
    rsiPath: Structures/Machines/holopad.rsi
    rsiState: icon_in_call
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -151,6 +151,7 @@
      - LightBulb
      - LedLightBulb
      - DimLightBulb
+      - WarmLightBulb
      - Bucket
      - DrinkMug
      - DrinkMugMetal
@@ -450,7 +451,6 @@
    - SodaDispenserMachineCircuitboard
    - SpaceHeaterMachineCircuitBoard
    - CutterMachineCircuitboard
-    - StationAnchorCircuitboard
    - SalvageMagnetMachineCircuitboard
    dynamicRecipes:
      - ThermomachineFreezerMachineCircuitBoard
@@ -520,6 +520,7 @@
      - ReagentGrinderIndustrialMachineCircuitboard
      - JukeboxCircuitBoard
      - SMESAdvancedMachineCircuitboard
+      - HolopadMachineCircuitboard
  - type: EmagLatheRecipes
    emagDynamicRecipes:
      - ShuttleGunDusterCircuitboard
@@ -1082,8 +1083,28 @@
      - CarpetPurple
      - CarpetCyan
      - CarpetWhite
+      # Bedsheets
+      - BedsheetBlack
+      - BedsheetBlue
+      - BedsheetBrown
+      - BedsheetGreen
+      - BedsheetGrey
+      - BedsheetOrange
+      - BedsheetPurple
+      - BedsheetRed
+      - BedsheetWhite
+      - BedsheetYellow
+      - BedsheetClown
+      - BedsheetCosmos
+      - BedsheetIan
+      - BedsheetMedical
+      - BedsheetMime
+      - BedsheetNT
+      - BedsheetRainbow
+      - BedsheetBrigmedic
  - type: EmagLatheRecipes
    emagStaticRecipes:
+      # Clothing
      - ClothingHeadHatCentcomcap
      - ClothingHeadHatCentcom
      - ClothingUniformJumpsuitCentcomAgent
@@ -1106,6 +1127,8 @@
      - ClothingOuterWinterCentcom
      - ClothingOuterWinterSyndie
      - ClothingOuterWinterSyndieCap
+      # Bedsheets
+      - BedsheetSyndie
  - type: MaterialStorage
    whitelist:
      tags:
--- a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
@@ -108,3 +108,10 @@
    interactFailureString: petting-failure-generic
    interactSuccessSound:
      path: /Audio/Items/drill_hit.ogg
+  - type: SpookySpeaker
+    speakChance: 0.1
+    cooldown: 120
+    messageSet: SpookySpeakerMessagesRecycler
+  - type: Speech
+    speechVerb: Robotic
+    speechSounds: SyndieBorg
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -78,6 +78,9 @@
  - type: Speech
    speechVerb: Robotic
    speechSounds: Vending
+  - type: SpookySpeaker
+    messageSet: SpookySpeakerMessagesGeneric
+    speakChance: 0.2
  - type: IntrinsicRadioReceiver
  - type: ActiveRadio
    channels:
@@ -132,7 +135,6 @@
    pack: CondimentVendAds
  - type: SpeakOnUIClosed
    pack: GenericVendGoodbyes
-  - type: Speech
  - type: Transform
    noRot: false

@@ -151,7 +153,6 @@
    pack: AmmoVendAds
  - type: SpeakOnUIClosed
    pack: GenericVendGoodbyes
-  - type: Speech
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/ammo.rsi
    layers:
@@ -180,7 +181,6 @@
    pack: BoozeOMatAds
  - type: SpeakOnUIClosed
    pack: BoozeOMatGoodbyes
-  - type: Speech
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/boozeomat.rsi
    layers:
@@ -215,7 +215,6 @@
    pack: BruiseOMatAds
  - type: SpeakOnUIClosed
    pack: BruiseOMatGoodbyes
-  - type: Speech
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/bruiseomat.rsi
    layers:
@@ -315,7 +314,6 @@
    pack: CigaretteMachineAds
  - type: SpeakOnUIClosed
    pack: CigaretteMachineGoodbyes
-  - type: Speech
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/cigs.rsi
    layers:
@@ -343,7 +341,6 @@
    pack: ClothesMateAds
  - type: SpeakOnUIClosed
    pack: GenericVendGoodbyes
-  - type: Speech
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/clothing.rsi
    layers:
@@ -375,7 +372,6 @@
    pack: ClothesMateAds
  - type: SpeakOnUIClosed
    pack: GenericVendGoodbyes
-  - type: Speech
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/winterdrobe.rsi
    layers:
@@ -414,7 +410,6 @@
    pack: HotDrinksMachineAds
  - type: SpeakOnUIClosed
    pack: HotDrinksMachineGoodbyes
-  - type: Speech
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/coffee.rsi
    layers:
@@ -454,7 +449,6 @@
    pack: RobustSoftdrinksAds
  - type: SpeakOnUIClosed
    pack: RobustSoftdrinksGoodbyes
-  - type: Speech
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/cola.rsi
    layers:
@@ -598,7 +592,6 @@
    initialStockQuality: 0.33
  - type: Advertise
    pack: RobustSoftdrinksAds
-  - type: Speech
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/shamblersjuice.rsi
    layers:
@@ -635,7 +628,6 @@
    pack: RobustSoftdrinksAds
  - type: SpeakOnUIClosed
    pack: GenericVendGoodbyes
-  - type: Speech
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/pwrgame.rsi
    layers:
@@ -669,10 +661,9 @@
    ejectDelay: 1.9
    initialStockQuality: 0.33
  - type: Advertise
-    pack: RobustSoftdrinksAds
+    pack: DrGibbAds
  - type: SpeakOnUIClosed
-    pack: GenericVendGoodbyes
-  - type: Speech
+    pack: DrGibbGoodbyes
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/gib.rsi
    layers:
@@ -688,6 +679,42 @@
    energy: 1.6
    color: "#D82929"

+- type: entity
+  parent: VendingMachine
+  id: VendingMachineSmite
+  name: Smite Vendor
+  description: Popular with the administration.
+  components:
+  - type: Sprite
+    sprite: Structures/Machines/VendingMachines/smite.rsi
+    layers:
+    - state: "off"
+      map: [ "enum.VendingMachineVisualLayers.Base" ]
+    - state: "off"
+      map: [ "enum.VendingMachineVisualLayers.BaseUnshaded" ]
+      shader: unshaded
+    - state: panel
+      map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+  - type: VendingMachine
+    pack: SmiteInventory
+    dispenseOnHitChance: 0.25
+    dispenseOnHitThreshold: 2
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+    ejectState: eject-unshaded
+    denyState: deny-unshaded
+    ejectDelay: 1.9
+    initialStockQuality: 0.33
+  - type: Advertise
+    pack: SmiteAds
+  - type: SpeakOnUIClosed
+    pack: SmiteGoodbyes
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#00E645"
+
 - type: entity
  parent: VendingMachine
  id: VendingMachineDinnerware
@@ -769,7 +796,6 @@
    pack: DiscountDansAds
  - type: SpeakOnUIClosed
    pack: DiscountDansGoodbyes
-  - type: Speech
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/discount.rsi
    layers:
@@ -986,7 +1012,6 @@
    pack: GetmoreChocolateCorpAds
  - type: SpeakOnUIClosed
    pack: GetmoreChocolateCorpGoodbyes
-  - type: Speech
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/snack.rsi
    layers:
@@ -1132,7 +1157,6 @@
    pack: BodaAds
  - type: SpeakOnUIClosed
    pack: BodaGoodbyes
-  - type: Speech
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/sovietsoda.rsi
    layers:
@@ -1166,7 +1190,6 @@
    pack: AutoDrobeAds
  - type: SpeakOnUIClosed
    pack: GenericVendGoodbyes
-  - type: Speech
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/theater.rsi
    layers:
@@ -1202,7 +1225,6 @@
    pack: VendomatAds
  - type: SpeakOnUIClosed
    pack: GenericVendGoodbyes
-  - type: Speech
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/vendomat.rsi
    layers:
@@ -1235,7 +1257,6 @@
    pack: VendomatAds
  - type: SpeakOnUIClosed
    pack: GenericVendGoodbyes
-  - type: Speech
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/robotics.rsi
    layers:
@@ -1334,7 +1355,6 @@
    pack: ChangAds
  - type: SpeakOnUIClosed
    pack: ChangGoodbyes
-  - type: Speech
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/changs.rsi
    layers:
@@ -1400,7 +1420,6 @@
    pack: DonutAds
  - type: SpeakOnUIClosed
    pack: DonutGoodbyes
-  - type: Speech
  - type: Sprite
    sprite: Structures/Machines/VendingMachines/donut.rsi
    layers:
@@ -2097,6 +2116,39 @@
  - type: AccessReader
    access: [["Kitchen"], ["Theatre"]]

+# Pride Vending Machine
+
+- type: entity
+  parent: VendingMachine
+  id: VendingMachinePride
+  name: Pride-O-Mat
+  description: A vending machine containing pride.
+  components:
+  - type: VendingMachine
+    pack: PrideDrobeInventory
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+  - type: Advertise
+    pack: PrideDrobeAds
+  - type: SpeakOnUIClosed
+    pack: PrideDrobeGoodbyes
+  - type: Speech
+  - type: PointLight
+    radius: 1.5
+    energy: 1.3 # reduced energy since the color is pure white
+    color: "#FFFFFF"
+  - type: Sprite
+    sprite: Structures/Machines/VendingMachines/pride.rsi
+    layers:
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+
 # Gas Tank Dispenser

 - type: entity
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
@@ -471,3 +471,29 @@
    node: radiator
  - type: AtmosMonitoringConsoleDevice
    navMapBlip: Thermoregulator
+
+- type: entity
+  parent: HeatExchanger
+  id: HeatExchangerBend
+  suffix: Bend
+  components:
+    - type: Sprite
+      layers:
+      - sprite: Structures/Piping/Atmospherics/pipe.rsi
+        state: pipeBend
+        map: [ "enum.PipeVisualLayers.Pipe" ]
+      - state: heBend
+        map: [ "enum.SubfloorLayers.FirstLayer" ]
+    - type: NodeContainer
+      nodes:
+        inlet:
+          !type:PipeNode
+          nodeGroupID: Pipe
+          pipeDirection: South
+        outlet:
+          !type:PipeNode
+          nodeGroupID: Pipe
+          pipeDirection: West
+    - type: Construction
+      graph: GasBinary
+      node: bendradiator
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
@@ -30,6 +30,7 @@
    - state: unlit
      shader: unshaded
      map: ["enum.PowerDeviceVisualLayers.Powered"]
+      visible: false
    - state: draining
      shader: unshaded
      visible: false
--- a/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml
@@ -39,7 +39,7 @@
      fix1:
        shape:
          !type:PhysShapeAabb
-          bounds: "-0.7,-0.8,0.7,0.8"
+          bounds: "-0.7,-0.7,0.7,0.7"
        density: 190
        mask:
        - LargeMobMask
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
@@ -28,9 +28,9 @@
          radius: 0.35
        density: 50
        mask:
-        - MobMask
+        - FlyingMobMask
        layer:
-        - MobLayer
+        - FlyingMobLayer
  - type: Sprite
    noRot: true
    drawdepth: Effects #it needs to draw over stuff.
--- a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
@@ -17,7 +17,7 @@
      pressureThresholdId: stationPressure
      gasThresholdPrototypes:
        Oxygen: stationOxygen
-        Nitrogen: ignore
+        Nitrogen: stationNitrogen
        CarbonDioxide: stationCO2
        Plasma: stationPlasma
        Tritium: stationTritium
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
@@ -241,6 +241,15 @@
  - type: Sprite
    state: direction_wash

+- type: entity
+  parent: BaseSignDirectional
+  id: SignDirectionalEscapePod
+  name: escape pods sign
+  description: A direction sign, pointing out the way to an escape pod dock.
+  components:
+  - type: Sprite
+    state: direction_pods
+
 # Regular Signs

 - type: entity
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -640,7 +640,6 @@
 - type: entity
  parent: WallReinforced
  id: WallReinforcedRust
-  name: reinforced wall
  suffix: rusted
  components:
  - type: Sprite
@@ -654,6 +653,29 @@
  - type: IconSmooth
    key: walls
    base: reinf_over
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 500
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalSlam
+    - trigger:
+        !type:DamageTrigger
+        damage: 350
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalSlam
+      - !type:ChangeConstructionNodeBehavior
+        node: girder
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+

 - type: entity
  parent: WallShuttleDiagonal
@@ -1047,7 +1069,6 @@
 - type: entity
  parent: WallSolid
  id: WallSolidRust
-  name: solid wall
  suffix: rusted
  components:
  - type: Sprite
@@ -1061,6 +1082,28 @@
  - type: IconSmooth
    key: walls
    base: solid
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 300
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalSlam
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalSlam
+      - !type:ChangeConstructionNodeBehavior
+        node: girder
+      - !type:DoActsBehavior
+        acts: ["Destruction"]

 - type: entity
  parent: BaseWall
--- a/Resources/Prototypes/Entities/Structures/cryogenic_sleep_unit.yml
+++ b/Resources/Prototypes/Entities/Structures/cryogenic_sleep_unit.yml
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -595,9 +595,9 @@
  description: flavor-complex-vermouth

 - type: flavor
-  id: irishcarbomb
+  id: irishslammer
  flavorType: Complex
-  description: flavor-complex-irish-car-bomb
+  description: flavor-complex-irish-slammer

 - type: flavor
  id: vodkaredbool
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -201,7 +201,7 @@
    definitions:
    - prefRoles: [ Traitor ]
      mindRoles:
-      - MindRoleTraitor
+      - MindRoleTraitorReinforcement

 - type: entity
  id: Revolutionary
--- a/Resources/Prototypes/Guidebook/chemicals.yml
+++ b/Resources/Prototypes/Guidebook/chemicals.yml
@@ -11,6 +11,7 @@
  - Foods
  - Botanical
  - Biological
+  - Special
  - Others
  filterEnabled: True

@@ -56,6 +57,12 @@
  text: "/ServerInfo/Guidebook/ChemicalTabs/Biological.xml"
  filterEnabled: True

+- type: guideEntry
+  id: Special
+  name: guide-entry-special
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Special.xml"
+  filterEnabled: True
+
 - type: guideEntry
  id: Others
  name: guide-entry-others
--- a/Resources/Prototypes/Guidebook/rules.yml
+++ b/Resources/Prototypes/Guidebook/rules.yml
@@ -385,6 +385,23 @@
  priority: 10
  text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS10OrderConflicts.xml"

+
+- type: guideEntry
+  id: MRPRules
+  name: guide-entry-rules-mrp-m0
+  ruleEntry: true
+  priority: 60
+  text: "/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM0.xml"
+  children:
+  - RuleM1
+
+- type: guideEntry
+  id: RuleM1
+  name: guide-entry-rules-m1
+  ruleEntry: true
+  priority: 10
+  text: "/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM1DoNotPowergame.xml"
+
 - type: guideEntry
  id: SpaceLaw
  name: guide-entry-rules-space-law
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -154,6 +154,12 @@
    back:
    - ClothingNeckPansexualPin

+- type: loadout
+  id: ClothingNeckOmnisexualPin
+  storage:
+    back:
+    - ClothingNeckOmnisexualPin
+
 - type: loadout
  id: ClothingNeckTransPin
  storage:
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -27,6 +27,7 @@
  - ClothingNeckLesbianPin
  - ClothingNeckNonBinaryPin
  - ClothingNeckPansexualPin
+  - ClothingNeckOmnisexualPin
  - ClothingNeckTransPin
  - ClothingNeckAutismPin
  - ClothingNeckGoldAutismPin
--- a/Resources/Prototypes/Maps/elkridge.yml
+++ b/Resources/Prototypes/Maps/elkridge.yml
@@ -0,0 +1,67 @@
+- type: gameMap
+  id: Elkridge
+  mapName: 'Elkridge Depot'
+  mapPath: /Maps/elkridge.yml
+  minPlayers: 7
+  maxPlayers: 35
+  stations:
+    Elkridge:
+      stationProto: StandardNanotrasenStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: '{0} Elkridge Depot {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: 'DS'
+        - type: StationEmergencyShuttle
+          emergencyShuttlePath: /Maps/Shuttles/emergency_elkridge.yml
+        - type: StationCargoShuttle
+          path: /Maps/Shuttles/cargo_elkridge.yml
+        - type: StationJobs
+          availableJobs:
+            #service
+            Captain: [ 1, 1 ]
+            HeadOfPersonnel: [ 1, 1 ]
+            Bartender: [ 1, 1 ]
+            Botanist: [ 1, 2 ]
+            Chef: [ 1, 1 ]
+            Janitor: [ 1, 2 ]
+            Chaplain: [ 1, 1 ]
+            Librarian: [ 1, 1 ]
+            Reporter: [ 1, 1 ]
+            ServiceWorker: [ 2, 2 ]
+            #engineering
+            ChiefEngineer: [ 1, 1 ]
+            AtmosphericTechnician: [ 2, 2 ]
+            StationEngineer: [ 3, 4 ]
+            TechnicalAssistant: [ 2, 2 ]
+            #medical
+            ChiefMedicalOfficer: [ 1, 1 ]
+            Chemist: [ 2, 2 ]
+            MedicalDoctor: [ 3, 3 ]
+            MedicalIntern: [ 2, 2 ]
+            Paramedic: [ 1, 1 ]
+            Psychologist: [ 1, 1 ]
+            #science
+            ResearchDirector: [ 1, 1 ]
+            Scientist: [ 3, 4 ]
+            ResearchAssistant: [ 2, 2 ]
+            #security
+            HeadOfSecurity: [ 1, 1 ]
+            Warden: [ 1, 1 ]
+            SecurityOfficer: [ 3, 4 ]
+            Detective: [ 1, 1 ]
+            SecurityCadet: [ 2, 2 ]
+            Lawyer: [ 1, 1 ]
+            #supply
+            Quartermaster: [ 1, 1 ]
+            SalvageSpecialist: [ 2, 2 ]
+            CargoTechnician: [ 2, 3 ]
+            #civilian
+            Passenger: [ -1, -1 ]
+            Clown: [ 1, 1 ]
+            Mime: [ 1, 1 ]
+            Musician: [ 1, 1 ]
+            #silicon
+            StationAi: [ 1, 1 ]
+            Borg: [ 2, 2 ]
--- a/Resources/Prototypes/Maps/fland.yml
+++ b/Resources/Prototypes/Maps/fland.yml
@@ -28,6 +28,7 @@
            Chaplain: [ 1, 1 ]
            Librarian: [ 1, 1 ]
            ServiceWorker: [ 2, 2 ]
+            Reporter: [ 1, 1 ]
            #engineering
            ChiefEngineer: [ 1, 1 ]
            AtmosphericTechnician: [ 3, 3 ]
--- a/Resources/Prototypes/Maps/loop.yml
+++ b/Resources/Prototypes/Maps/loop.yml
@@ -35,7 +35,7 @@
            TechnicalAssistant: [ 5, 5 ]
            #medical
            ChiefMedicalOfficer: [ 1, 1 ]
-            Chemist: [ 2, 2 ]
+            Chemist: [ 3, 3 ]
            MedicalDoctor: [ 4, 5 ]
            Paramedic: [ 2, 2 ]
            MedicalIntern: [ 4, 4 ]
--- a/Resources/Prototypes/Maps/meta.yml
+++ b/Resources/Prototypes/Maps/meta.yml
@@ -22,21 +22,22 @@
            Bartender: [ 2, 2 ]
            Botanist: [ 2, 3 ]
            Chef: [ 2, 2 ]
-            Janitor: [ 1, 2 ]
+            Janitor: [ 2, 3 ]
            Chaplain: [ 1, 1 ]
            Librarian: [ 1, 1 ]
            ServiceWorker: [ 2, 2 ]
+            Reporter: [ 2, 2 ]
            #engineering
            ChiefEngineer: [ 1, 1 ]
            AtmosphericTechnician: [ 3, 3 ]
-            StationEngineer: [ 5, 7 ]
-            TechnicalAssistant: [ 3, 6 ]
+            StationEngineer: [ 6, 8 ]
+            TechnicalAssistant: [ 6, 8 ]
            #medical
            ChiefMedicalOfficer: [ 1, 1 ]
-            Chemist: [ 2, 2 ]
-            MedicalDoctor: [ 5, 5 ]
-            MedicalIntern: [ 3, 6 ]
-            Paramedic: [ 1, 1 ]
+            Chemist: [ 2, 3 ]
+            MedicalDoctor: [ 4, 6 ]
+            MedicalIntern: [ 4, 6 ]
+            Paramedic: [ 1, 2 ]
            #science
            ResearchDirector: [ 1, 1 ]
            Scientist: [ 5, 7 ]
@@ -44,14 +45,14 @@
            #security
            HeadOfSecurity: [ 1, 1 ]
            Warden: [ 1, 1 ]
-            SecurityOfficer: [ 5, 7 ]
+            SecurityOfficer: [ 6, 6 ]
            Detective: [ 1, 1 ]
-            SecurityCadet: [ 3, 6 ]
+            SecurityCadet: [ 4, 4 ]
            Lawyer: [ 2, 2 ]
            #supply
            Quartermaster: [ 1, 1 ]
            SalvageSpecialist: [ 3, 3 ]
-            CargoTechnician: [ 3, 3 ]
+            CargoTechnician: [ 3, 5 ]
            #civilian
            Passenger: [ -1, -1 ]
            Clown: [ 1, 1 ]
@@ -59,4 +60,4 @@
            Musician: [ 1, 1 ]
            #silicon
            StationAi: [ 1, 1 ]
-            Borg: [ 2, 2 ]
+            Borg: [ 4, 4 ]
--- a/Resources/Prototypes/Maps/packed.yml
+++ b/Resources/Prototypes/Maps/packed.yml
@@ -13,6 +13,8 @@
          nameGenerator:
            !type:NanotrasenNameGenerator
            prefixCreator: 'VG'
+        - type: StationEmergencyShuttle
+          emergencyShuttlePath: /Maps/Shuttles/emergency_crimson.yml
        - type: StationJobs
          availableJobs:
            #service
--- a/Resources/Prototypes/Maps/plasma.yml
+++ b/Resources/Prototypes/Maps/plasma.yml
@@ -0,0 +1,66 @@
+- type: gameMap
+  id: Plasma
+  mapName: 'Plasma'
+  mapPath: /Maps/plasma.yml
+  minPlayers: 20
+  maxPlayers: 60
+  stations:
+    Plasma:
+      stationProto: StandardNanotrasenStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: '{0} Plasma {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationEmergencyShuttle
+          emergencyShuttlePath: /Maps/Shuttles/emergency_plasma.yml
+        - type: StationCargoShuttle
+          path: /Maps/Shuttles/cargo_plasma.yml
+        - type: StationJobs
+          availableJobs:
+            #service
+            Captain: [ 1, 1 ]
+            HeadOfPersonnel: [ 1, 1 ]
+            Bartender: [ 2, 2 ]
+            Botanist: [ 2, 3 ]
+            Chef: [ 2, 2 ]
+            Janitor: [ 3, 3 ]
+            Chaplain: [ 1, 1 ]
+            Librarian: [ 1, 1 ]
+            ServiceWorker: [ 2, 2 ]
+            Reporter: [ 2, 3 ]
+            #engineering
+            ChiefEngineer: [ 1, 1 ]
+            AtmosphericTechnician: [ 4, 4 ]
+            StationEngineer: [ 4, 4 ]
+            TechnicalAssistant: [ 4, 4 ]
+            #medical
+            ChiefMedicalOfficer: [ 1, 1 ]
+            Chemist: [ 2, 2 ]
+            MedicalDoctor: [ 4, 4 ]
+            Paramedic: [ 2, 2 ]
+            MedicalIntern: [ 4, 4 ]
+            Psychologist: [ 1, 1 ]
+            #science
+            ResearchDirector: [ 1, 1 ]
+            Scientist: [ 4, 4 ]
+            ResearchAssistant: [ 4, 4 ]
+            StationAi: [ 1, 1 ]
+            Borg: [ 2, 4 ]
+            #security
+            HeadOfSecurity: [ 1, 1 ]
+            Warden: [ 1, 1 ]
+            SecurityOfficer: [ 6, 8 ]
+            Detective: [ 1, 2 ]
+            SecurityCadet: [ 4, 4 ]
+            Lawyer: [ 1, 2 ]
+            #supply
+            Quartermaster: [ 1, 1 ]
+            SalvageSpecialist: [ 4, 4 ]
+            CargoTechnician: [ 4, 6 ]
+            #civilian
+            Passenger: [ -1, -1 ]
+            Clown: [ 1, 1 ]
+            Mime: [ 1, 1 ]
+            Musician: [ 1, 1 ]
--- a/Show More
+++ b/Show More