Merge branch 'master' into races

Resources/Prototypes/Accents/word_replacements.yml

@@ -367,6 +367,15 @@
     accent-cowboy-words-98: accent-cowboy-replacement-98
     accent-cowboy-words-99: accent-cowboy-replacement-99
 
+- type: accent
+  id: southern
+  wordReplacements:
+    accent-southern-words-1: accent-southern-words-replace-1
+    accent-southern-words-2: accent-southern-words-replace-2
+    accent-southern-words-3: accent-southern-words-replace-3
+    accent-southern-words-4: accent-southern-words-replace-4
+    accent-southern-words-5: accent-southern-words-replace-5
+    accent-southern-words-6: accent-southern-words-replace-6
 
 # For the chat sanitization system
 - type: accent

Resources/Prototypes/Anomaly/behaviours.yml

@@ -0,0 +1,208 @@
+- type: weightedRandom
+  id: AnomalyBehaviorList
+  weights:
+  #safe
+    Slow: 0.5
+    Light: 0.5
+    FullSafe: 0.1
+  #balanced
+    Balanced: 3
+    DelayedForce: 1
+    Rapid: 1
+    BalancedSecret: 1
+    Reflect: 1
+    NonSensivity: 1
+    Sensivity: 1
+  #Hard
+    Fast: 0.5
+    Strenght: 0.5
+    Inconstancy: 0.5
+    InconstancyParticle: 0.5
+    FullUnknown: 0.5
+    Jumping: 0.3
+    Moving: 0.1
+  #Complex
+    FastUnknown: 0.2
+    JumpingUnknown: 0.1
+    InconstancyParticleUnknown: 0.1
+
+
+# Easy x0.5 point production
+
+- type: anomalyBehavior
+  id: FullSafe
+  pulseFrequencyModifier: 3
+  pulsePowerModifier: 0.5
+  earnPointModifier: 0.05
+  description: anomaly-behavior-safe
+
+- type: anomalyBehavior
+  id: Slow
+  pulseFrequencyModifier: 2
+  earnPointModifier: 0.5
+  description: anomaly-behavior-slow
+
+- type: anomalyBehavior
+  id: Light
+  pulsePowerModifier: 0.5
+  earnPointModifier: 0.5
+  description: anomaly-behavior-light
+
+# Balanced x1 point production
+
+- type: anomalyBehavior
+  id: Balanced
+  earnPointModifier: 1
+  description: anomaly-behavior-balanced
+
+- type: anomalyBehavior
+  id: DelayedForce
+  earnPointModifier: 1.15
+  description: anomaly-behavior-delayed-force
+  pulseFrequencyModifier: 0.5
+  pulsePowerModifier: 2
+  
+- type: anomalyBehavior
+  id: Rapid
+  earnPointModifier: 1.15
+  description: anomaly-behavior-rapid
+  pulseFrequencyModifier: 2
+  pulsePowerModifier: 0.5
+
+- type: anomalyBehavior
+  id: BalancedSecret
+  earnPointModifier: 1.2
+  description: anomaly-behavior-secret
+  components:
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 2
+    randomStartSecretMax: 3
+
+- type: anomalyBehavior
+  id: Reflect
+  earnPointModifier: 1.1
+  particleSensivity: 0.5
+  description: anomaly-behavior-reflect
+  components:
+  - type: Reflect
+    reflectProb: 0.5
+    reflects:
+      - Energy
+
+- type: anomalyBehavior
+  id: NonSensivity
+  earnPointModifier: 0.8
+  particleSensivity: 0.5
+  description: anomaly-behavior-nonsensivity
+  
+- type: anomalyBehavior
+  id: Sensivity
+  earnPointModifier: 1.2
+  particleSensivity: 1.5
+  description: anomaly-behavior-sensivity
+
+# Hard x2 point production
+
+- type: anomalyBehavior
+  id: Fast
+  earnPointModifier: 1.9
+  pulseFrequencyModifier: 0.5
+  description: anomaly-behavior-fast
+
+- type: anomalyBehavior
+  id: Strenght
+  pulsePowerModifier: 1.5
+  earnPointModifier: 1.4
+  description: anomaly-behavior-strenght
+
+- type: anomalyBehavior
+  id: Inconstancy
+  earnPointModifier: 1.7
+  description: anomaly-behavior-inconstancy
+  components:
+  - type: ShuffleParticlesAnomaly
+    shuffleOnPulse: true
+    prob: 1
+
+- type: anomalyBehavior
+  id: InconstancyParticle
+  earnPointModifier: 1.8
+  description: anomaly-behavior-inconstancy
+  components:
+  - type: ShuffleParticlesAnomaly
+    shuffleOnParticleHit: true
+    prob: 0.8
+
+- type: anomalyBehavior
+  id: Moving
+  earnPointModifier: 2.2
+  description: anomaly-behavior-moving
+  components:
+  - type: RandomWalk
+    minSpeed: 0
+    maxSpeed: 0.3
+  - type: CanMoveInAir
+  - type: Physics
+    bodyType: Dynamic
+    bodyStatus: InAir
+
+- type: anomalyBehavior
+  id: Jumping
+  earnPointModifier: 1.8
+  description: anomaly-behavior-moving
+  components:
+  - type: ChaoticJump
+    jumpMinInterval: 15
+    jumpMaxInterval: 25
+    rangeMin: 1
+    rangeMax: 4
+    effect: PuddleSparkle
+
+- type: anomalyBehavior
+  id: FullUnknown
+  earnPointModifier: 1.9
+  description: anomaly-behavior-secret
+  components:
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 4
+    randomStartSecretMax: 6
+
+# Complex Effects
+
+- type: anomalyBehavior
+  id: JumpingUnknown
+  earnPointModifier: 1.9
+  description: anomaly-behavior-moving
+  components:
+  - type: ChaoticJump
+    jumpMinInterval: 15
+    jumpMaxInterval: 25
+    rangeMin: 1
+    rangeMax: 1
+    effect: PuddleSparkle
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 3
+    randomStartSecretMax: 5
+
+
+- type: anomalyBehavior
+  id: FastUnknown
+  earnPointModifier: 1.9
+  pulseFrequencyModifier: 0.5
+  description: anomaly-behavior-fast
+  components:
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 3
+    randomStartSecretMax: 5
+
+- type: anomalyBehavior
+  id: InconstancyParticleUnknown
+  earnPointModifier: 1.95
+  description: anomaly-behavior-inconstancy
+  components:
+  - type: ShuffleParticlesAnomaly
+    shuffleOnParticleHit: true
+    prob: 0.5
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 3
+    randomStartSecretMax: 5

Resources/Prototypes/Body/Parts/human.yml

@@ -15,6 +15,7 @@
         Quantity: 10
 
 - type: entity
+  noSpawn: true
   id: TorsoHuman
   name: "human torso"
   parent: [PartHuman, BaseTorso]
@@ -31,6 +32,7 @@
         Quantity: 20
 
 - type: entity
+  noSpawn: true
   id: HeadHuman
   name: "human head"
   parent: [PartHuman, BaseHead]
@@ -47,6 +49,7 @@
         Quantity: 10
 
 - type: entity
+  noSpawn: true
   id: LeftArmHuman
   name: "left human arm"
   parent: [PartHuman, BaseLeftArm]
@@ -56,6 +59,7 @@
     state: "l_arm"
 
 - type: entity
+  noSpawn: true
   id: RightArmHuman
   name: "right human arm"
   parent: [PartHuman, BaseRightArm]
@@ -65,6 +69,7 @@
     state: "r_arm"
 
 - type: entity
+  noSpawn: true
   id: LeftHandHuman
   name: "left human hand"
   parent: [PartHuman, BaseLeftHand]
@@ -74,6 +79,7 @@
     state: "l_hand"
 
 - type: entity
+  noSpawn: true
   id: RightHandHuman
   name: "right human hand"
   parent: [PartHuman, BaseRightHand]
@@ -83,6 +89,7 @@
     state: "r_hand"
 
 - type: entity
+  noSpawn: true
   id: LeftLegHuman
   name: "left human leg"
   parent: [PartHuman, BaseLeftLeg]
@@ -92,6 +99,7 @@
     state: "l_leg"
 
 - type: entity
+  noSpawn: true
   id: RightLegHuman
   name: "right human leg"
   parent: [PartHuman, BaseRightLeg]
@@ -101,6 +109,7 @@
     state: "r_leg"
 
 - type: entity
+  noSpawn: true
   id: LeftFootHuman
   name: "left human foot"
   parent: [PartHuman, BaseLeftFoot]
@@ -110,6 +119,7 @@
     state: "l_foot"
 
 - type: entity
+  noSpawn: true
   id: RightFootHuman
   name: "right human foot"
   parent: [PartHuman, BaseRightFoot]

Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

@@ -68,16 +68,6 @@
   category: cargoproduct-category-name-fun
   group: market
 
-- type: cargoProduct
-  id: FunSprayPaints
-  icon:
-    sprite: Objects/Fun/spraycans.rsi
-    state: death2_cap
-  product: CrateFunSprayPaints
-  cost: 2000
-  category: Fun
-  group: market
-
 - type: cargoProduct
   id: FunParty
   icon:

Resources/Prototypes/Catalog/Cargo/cargo_service.yml

@@ -82,7 +82,7 @@
   id: ServiceBooks
   icon:
     sprite: Objects/Misc/books.rsi
-    state: book0
+    state: book_icon
   product: CrateServiceBooks
   cost: 1000
   category: cargoproduct-category-name-service
@@ -92,7 +92,7 @@
   id: ServiceGuidebooks
   icon:
     sprite: Objects/Misc/books.rsi
-    state: book_engineering2
+    state: book_icon
   product: CrateServiceGuidebooks
   cost: 1300
   category: cargoproduct-category-name-service

Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml

@@ -328,6 +328,27 @@
         - id: CrowbarRed
         - id: AdvMopItem
 
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackERTChaplain
+  id: ClothingBackpackERTChaplainFilled
+  components:
+    - type: StorageFill
+      contents:
+        - id: BoxSurvivalEngineering
+        - id: BoxCandle
+        - id: BoxBodyBag
+        - id: DrinkWaterMelonJuiceJug
+        - id: Lantern
+        - id: Lantern
+        - id: Bible
+        - id: CrowbarRed
+        - id: FoodBakedBunHotX
+        - id: FoodBakedBunHotX
+        - id: FoodBakedBunHotX
+        - id: FoodBakedBunHotX
+        - id: Lighter
+
 # Death Squad
 
 - type: entity

Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml

@@ -5,70 +5,10 @@
   components:
   - type: StorageFill
     contents:
-      - id: BookRandom
-        prob: 0.4
-        amount: 1
-        maxAmount: 4
-      - id: BookNarsieLegend
-        prob: 0.1
-      - id: BookTruth
-        prob: 0.1
-      - id: BookWorld
-        prob: 0.1
-      - id: BookIanAntarctica
-        prob: 0.1
-      - id: BookSlothClownSSS
-        prob: 0.1
-      - id: BookSlothClownPranks
-        prob: 0.1
-      - id: BookSlothClownMMD
-        prob: 0.1
-      - id: BookStruck
-        prob: 0.1
-      - id: BookSun
-        prob: 0.1
-      - id: BookPossum
-        prob: 0.1
-      - id: BookCafe
-        prob: 0.1
-      - id: BookFeather
-        prob: 0.1
-      - id: BookIanLostWolfPup
-        prob: 0.1
-      - id: BookIanRanch
-        prob: 0.1
-      - id: BookIanOcean
-        prob: 0.1
-      - id: BookIanMountain
-        prob: 0.1
-      - id: BookIanCity
-        prob: 0.1
-      - id: BookIanArctic
-        prob: 0.1
-      - id: BookIanDesert
-        prob: 0.1
-      - id: BookNames
-        prob: 0.1
-      - id: BookEarth
-        prob: 0.1
-      - id: BookAurora
-        prob: 0.1
-      - id: BookTemple
-        prob: 0.1
-      - id: BookWatched
-        prob: 0.1
-      - id: BookMedicalOfficer
-        prob: 0.1
-      - id: BookMorgue
-        prob: 0.1
-      - id: BookRufus
-        prob: 0.1
-      - id: BookMap
-        prob: 0.1
-      - id: BookJourney
-        prob: 0.1
-      - id: BookInspiration
-        prob: 0.1
+      - id: BookRandomStory
+        prob: 0.6
+        amount: 2
+        maxAmount: 6
       - id: BookSpaceEncyclopedia
         orGroup: BookPool
       - id: BookTheBookOfControl
@@ -95,3 +35,93 @@
         orGroup: BookPool
       - id: BookChemicalCompendium
         orGroup: BookPool
+      - id: BookNarsieLegend
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookTruth
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookWorld
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanAntarctica
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookSlothClownSSS
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookSlothClownPranks
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookSlothClownMMD
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookStruck
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookSun
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookPossum
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookCafe
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookFeather
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanLostWolfPup
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanRanch
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanOcean
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanMountain
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanCity
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanArctic
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanDesert
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookNames
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookEarth
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookAurora
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookTemple
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookWatched
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookMedicalOfficer
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookMorgue
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookRufus
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookMap
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookJourney
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookInspiration
+        prob: 0.1
+        orGroup: BookAuthor

Resources/Prototypes/Catalog/Fills/Books/lore.yml

@@ -1,122 +0,0 @@
-# ---- Library Salvage Fills ----
-
-- type: entity
-  name: demonomicon
-  parent: BookBase
-  id: BookDemonomicon
-  noSpawn: true
-  description: 'Who knows what dark spells may be contained in these horrid pages?'
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_demonomicon
-
-- type: entity
-  name: demonomicon
-  parent: BookDemonomicon
-  id: BookDemonomiconRandom
-  suffix: random
-  components:
-  - type: RandomSpawner
-    prototypes:
-    - BookDemonomicon1
-    - BookDemonomicon2
-    - BookDemonomicon3
-    offset: 0.1
-
-- type: entity
-  parent: BookDemonomicon
-  id: BookDemonomicon1
-  suffix: 1
-  components:
-  - type: Paper
-    content: book-text-demonomicon1
-
-- type: entity
-  parent: BookDemonomicon
-  id: BookDemonomicon2
-  suffix: 2
-  components:
-  - type: Paper
-    content: book-text-demonomicon2
-
-- type: entity
-  parent: BookDemonomicon
-  id: BookDemonomicon3
-  suffix: 3
-  components:
-  - type: Paper
-    content: book-text-demonomicon3
-
-- type: entity
-  name: pharmaceutical manuscript
-  parent: BookBase
-  id: BookChemistryInsane
-  suffix: library salvage
-  description: 'You can tell whoever wrote this was off the desoxy HARD.'
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_chemistry
-  - type: Paper
-    content: book-text-chemistry-insane
-
-- type: entity
-  name: botanical textbook
-  parent: BookBase
-  id: BookBotanicalTextbook
-  suffix: library salvage
-  description: 'Only a couple pages are left.'
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_hydroponics_pod_people
-  - type: Paper
-    content: book-text-botanics
-
-- type: entity
-  parent: BookBase
-  id: BookGnominomicon
-  name: gnominomicon
-  suffix: library salvage
-  description: You don't like the look of this. Looks
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book5
-  - type: Paper
-    content: book-text-gnome
-
-- type: entity
-  parent: BookBase
-  id: BookFishing
-  name: Tales from the Fishbowl
-  suffix: library salvage
-  description: This book sucks.
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_fish
-  - type: Paper
-    content: book-text-fishing
-
-- type: entity
-  parent: BookBase
-  id: BookDetective
-  name: Strokgraeth Holmes, Dwarf Detective
-  suffix: library salvage
-  description: Exciting! Invigorating! This author died after his book career failed.
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_detective
-  - type: Paper
-    content: book-text-detective
-
-# ---- End Library Salvage Fills ----

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

@@ -166,8 +166,8 @@
 - type: entity
   id: CrateRCDAmmo
   parent: CrateEngineering
-  name: RCD ammo crate
-  description: 3 RCD ammo, each restoring 5 charges.
+  name: compressed matter crate
+  description: Contains three compressed matter cartridges.
   components:
   - type: StorageFill
     contents:
@@ -178,7 +178,7 @@
   id: CrateRCD
   parent: CrateEngineeringSecure
   name: RCD crate
-  description: A crate containing a single Rapid Construction Device.
+  description: A crate containing a single rapid construction device.
   components:
   - type: StorageFill
     contents:

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

@@ -290,21 +290,14 @@
     contents:
       - id: SnapPopBox
       - id: CrazyGlue
+        amount: 2
       - id: PlasticBanana
-      - id: FunnyPaint
-        orGroup: Paint
-        prob: 0.5
-      - id: FunnyPaintYellow
-        orGroup: Paint
-        prob: 0.5
       - id: WhoopieCushion
       - id: ToyHammer
       - id: MrChips
-        prob: 0.5
-        orGroup: Dummy
+        orGroup: GiftPool
       - id: MrDips
-        prob: 0.5
-        orGroup: Dummy
+        orGroup: Giftpool
       - id: RevolverCapGun
       - id: BalloonNT
       - id: ClothingShoesClownLarge
@@ -337,41 +330,6 @@
         amount: 15
         prob: 0.05
 
-- type: entity
-  id: CrateFunSprayPaints
-  name: spray paint crate
-  description: a crate filled with spray paint.
-  parent: CratePlastic
-  suffix: Spray Paint
-  components:
-  - type: StorageFill
-    contents:
-      - id: SprayPaintBlue
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintRed
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintOrange
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintBlack
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintGreen
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintPurple
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintWhite
-        amount: 2
-        prob: 0.33
-      - id: DeathPaint
-        amount: 2
-      - id: DeathPaintTwo
-        amount: 2
-
 - type: entity
   name: dartboard box set
   description: A box with everything you need for a fun game of darts.

Resources/Prototypes/Catalog/Fills/Items/briefcases.yml

@@ -1,6 +1,5 @@
 - type: entity
   id: BriefcaseBrownFilled
-  name: brown briefcase
   parent: BriefcaseBrown
   suffix: Filled, Paper
   components:
@@ -11,9 +10,8 @@
 
 - type: entity
   id: BriefcaseSyndieSniperBundleFilled
-  name: brown briefcase
   parent: BriefcaseSyndie
-  suffix: SniperBundle
+  suffix: Syndicate, Sniper Bundle
   components:
   - type: Item
     size: Ginormous
@@ -32,7 +30,6 @@
 
 - type: entity
   id: BriefcaseSyndieLobbyingBundleFilled
-  name: brown briefcase
   parent: BriefcaseSyndie
   suffix: Syndicate, Spesos
   components:
@@ -52,7 +49,6 @@
 
 - type: entity
   id: BriefcaseThiefBribingBundleFilled
-  name: brown briefcase
   parent: BriefcaseSyndie
   suffix: Thief, Spesos
   components:

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -255,7 +255,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingEyesHudSecurity
       - id: WeaponDisabler
       - id: ClothingOuterCoatHoSTrench
       - id: ClothingMaskNeckGaiter
@@ -263,7 +262,7 @@
       - id: ClothingMaskGasSwat
       - id: ClothingBeltSecurityFilled
       - id: ClothingHeadsetAltSecurity
-      - id: ClothingEyesGlassesSunglasses
+      - id: ClothingEyesGlassesSecurity
       - id: ClothingShoesBootsJack
       - id: CigarGoldCase
         prob: 0.50
@@ -282,13 +281,12 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingEyesHudSecurity
       - id: WeaponDisabler
       - id: ClothingOuterCoatHoSTrench
       - id: ClothingMaskNeckGaiter
       - id: ClothingBeltSecurityFilled
       - id: ClothingHeadsetAltSecurity
-      - id: ClothingEyesGlassesSunglasses
+      - id: ClothingEyesGlassesSecurity
       - id: ClothingShoesBootsJack
       - id: CigarGoldCase
         prob: 0.50

Resources/Prototypes/Catalog/Fills/Lockers/misc.yml

@@ -145,10 +145,6 @@
           prob: 0.25
         - id: StrangePill
           prob: 0.20
-        - id: DeathPaint
-          prob: 0.05
-        - id: DeathPaintTwo
-          prob: 0.05
         - id: DrinkMopwataBottleRandom
           prob: 0.20
         - id: ModularReceiver
@@ -159,6 +155,8 @@
           prob: 0.20
         - id: BarberScissors
           prob: 0.05
+        - id: BookRandomStory
+          prob: 0.1
         # Syndicate loot
         - id: null
           prob: 0.95

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

@@ -9,7 +9,7 @@
       - id: WeaponDisabler
       - id: ClothingBeltSecurityFilled
       - id: Flash
-      - id: ClothingEyesGlassesSunglasses
+      - id: ClothingEyesGlassesSecurity
       - id: ClothingHeadsetAltSecurity
       - id: ClothingHandsGlovesCombat
       - id: ClothingShoesBootsJack
@@ -19,7 +19,6 @@
       - id: DoorRemoteArmory
       - id: ClothingOuterHardsuitWarden
       - id: HoloprojectorSecurity
-      - id: ClothingEyesHudSecurity
 
 - type: entity
   id: LockerWardenFilled
@@ -32,7 +31,7 @@
       - id: WeaponDisabler
       - id: ClothingBeltSecurityFilled
       - id: Flash
-      - id: ClothingEyesGlassesSunglasses
+      - id: ClothingEyesGlassesSecurity
       - id: ClothingHeadsetAltSecurity
       - id: ClothingHandsGlovesCombat
       - id: ClothingShoesBootsJack
@@ -41,7 +40,6 @@
       - id: RubberStampWarden
       - id: DoorRemoteArmory
       - id: HoloprojectorSecurity
-      - id: ClothingEyesHudSecurity
 
 - type: entity
   id: LockerSecurityFilled
@@ -60,13 +58,12 @@
       - id: ClothingBeltSecurityFilled
       - id: Flash
         prob: 0.5
-      - id: ClothingEyesGlassesSunglasses
+      - id: ClothingEyesGlassesSecurity
       - id: ClothingHeadsetSecurity
       - id: ClothingHandsGlovesColorBlack
       - id: ClothingShoesBootsJack
       - id: WeaponMeleeNeedle
         prob: 0.1
-      - id: ClothingEyesHudSecurity
       - id: HoloprojectorSecurity
         prob: 0.6
 
@@ -77,7 +74,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingEyesHudSecurity
+      - id: ClothingEyesGlassesSecurity
       - id: WeaponDisabler
       - id: TrackingImplanter
         amount: 2
@@ -112,7 +109,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingEyesHudSecurity
+      - id: ClothingEyesGlassesSecurity
         prob: 0.3
       - id: ClothingHeadHatFedoraBrown
       - id: ClothingNeckTieDet

Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml

@@ -1,11 +1,11 @@
 - type: reagentDispenserInventory
   id: SodaDispenserInventory
   inventory:
+  - DrinkCoconutWaterJug
   - DrinkCoffeeJug
   - DrinkColaBottleFull
   - DrinkCreamCartonXL
   - DrinkDrGibbJug
-  - DrinkEnergyDrinkJug
   - DrinkGreenTeaJug
   - DrinkIceJug
   - DrinkJuiceLimeCartonXL

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

@@ -13,7 +13,9 @@
     DrinkBeerBottleFull: 5
     DrinkBlueCuracaoBottleFull: 2
     DrinkCognacBottleFull: 4
+    DrinkCoconutWaterCarton: 3
     DrinkColaBottleFull: 4
+    DrinkMilkCarton: 2
     DrinkCreamCarton: 5
     DrinkGinBottleFull: 3
     DrinkGildlagerBottleFull: 2 #if champagne gets less because its premium, then gildlager should match this and have two
@@ -26,6 +28,7 @@
     DrinkPatronBottleFull: 2
     DrinkRumBottleFull: 4
     DrinkSodaWaterCan: 8
+    DrinkSolDryCan: 8
     DrinkSpaceMountainWindBottleFull: 3
     DrinkSpaceUpBottleFull: 3
     DrinkTequilaBottleFull: 3

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

@@ -5,6 +5,7 @@
     DrinkGrapeCan: 2
     DrinkRootBeerCan: 2
     DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:

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

@@ -2,6 +2,7 @@
   id: CuraDrobeInventory
   startingInventory:
     BooksBag: 2
+    BriefcaseBrown: 2
     HandLabeler: 2
     ClothingEyesGlasses: 2
     ClothingEyesGlassesJamjar: 2
@@ -12,4 +13,4 @@
     ClothingUniformJumpskirtLibrarian: 3
     ClothingShoesBootsLaceup: 2
     ClothingHeadsetService: 2
-    
+

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

@@ -5,6 +5,7 @@
     DrinkGrapeCan: 2
     DrinkRootBeerCan: 2
     DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:

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

@@ -14,6 +14,7 @@
     ClothingShoesBootsLaceup: 2
     ClothingHeadsetService: 2
     ClothingNeckLawyerbadge: 2
+    BriefcaseBrown: 2
     LuxuryPen: 2
   contrabandInventory:
     ClothingOuterRobesJudge: 1

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

@@ -6,6 +6,7 @@
     DrinkGrapeCan: 2
     DrinkRootBeerCan: 2
     DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:

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

@@ -5,6 +5,7 @@
     DrinkGrapeCan: 2
     DrinkRootBeerCan: 2
     DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:

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

@@ -5,6 +5,7 @@
     DrinkGrapeCan: 3
     DrinkRootBeerCan: 3
     DrinkIcedTeaCan: 3
+    DrinkSolDryCan: 3
     DrinkLemonLimeCan: 3
     DrinkFourteenLokoCan: 3
   emaggedInventory:

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

@@ -6,6 +6,7 @@
     DrinkGrapeCan: 2
     DrinkRootBeerCan: 2
     DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:

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

@@ -5,6 +5,7 @@
     DrinkGrapeCan: 2
     DrinkRootBeerCan: 2
     DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:

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

@@ -43,7 +43,7 @@
     ClothingMaskScaredMime: 1
     ClothingUniformJumpsuitKimono: 1
     ClothingHeadHatCasa: 1
-    ClothingHeadHatHairflower: 1
+    FoodPoppy: 1
     ClothingHeadHatGladiator: 1
     ClothingUniformJumpsuitGladiator: 1
     ClothingHeadHatCowboyBrown: 1

Resources/Prototypes/Datasets/story_generation.yml

@@ -0,0 +1,266 @@
+- type: dataset
+  id: book_type
+  values:
+  - story-gen-book-type1 
+  - story-gen-book-type2 
+  - story-gen-book-type3 
+  - story-gen-book-type4 
+  - story-gen-book-type5 
+  - story-gen-book-type6 
+  - story-gen-book-type7 
+  - story-gen-book-type8 
+  - story-gen-book-type9 
+  - story-gen-book-type10
+  - story-gen-book-type11
+  - story-gen-book-type12
+
+- type: dataset
+  id: book_genre
+  values:
+  - story-gen-book-genre1 
+  - story-gen-book-genre2 
+  - story-gen-book-genre3 
+  - story-gen-book-genre4 
+  - story-gen-book-genre5 
+  - story-gen-book-genre6 
+  - story-gen-book-genre7 
+  - story-gen-book-genre8 
+  - story-gen-book-genre9 
+  - story-gen-book-genre10
+  - story-gen-book-genre11
+  - story-gen-book-genre12
+  - story-gen-book-genre13
+  - story-gen-book-genre14
+
+- type: dataset
+  id: book_hint_appearance
+  values:
+  - story-gen-book-appearance1 
+  - story-gen-book-appearance2 
+  - story-gen-book-appearance3 
+  - story-gen-book-appearance4 
+  - story-gen-book-appearance5 
+  - story-gen-book-appearance6 
+  - story-gen-book-appearance7 
+  - story-gen-book-appearance8 
+  - story-gen-book-appearance9 
+  - story-gen-book-appearance10
+  - story-gen-book-appearance11
+  - story-gen-book-appearance12
+  - story-gen-book-appearance13
+  - story-gen-book-appearance14
+  - story-gen-book-appearance15
+  - story-gen-book-appearance16
+  - story-gen-book-appearance17
+  - story-gen-book-appearance18
+  - story-gen-book-appearance19
+  - story-gen-book-appearance20
+  - story-gen-book-appearance21
+  - story-gen-book-appearance22
+  - story-gen-book-appearance23
+  - story-gen-book-appearance24
+  - story-gen-book-appearance25
+  - story-gen-book-appearance26
+  - story-gen-book-appearance27
+
+- type: dataset
+  id: book_character
+  values:
+  - story-gen-book-character1 
+  - story-gen-book-character2 
+  - story-gen-book-character3 
+  - story-gen-book-character4 
+  - story-gen-book-character5 
+  - story-gen-book-character6 
+  - story-gen-book-character7 
+  - story-gen-book-character8 
+  - story-gen-book-character9 
+  - story-gen-book-character10
+  - story-gen-book-character11
+  - story-gen-book-character12
+  - story-gen-book-character13
+  - story-gen-book-character14
+  - story-gen-book-character15
+  - story-gen-book-character16
+  - story-gen-book-character17
+  - story-gen-book-character18
+  - story-gen-book-character19
+  - story-gen-book-character20
+  - story-gen-book-character21
+  - story-gen-book-character22
+  - story-gen-book-character23
+  - story-gen-book-character24
+  - story-gen-book-character25
+  - story-gen-book-character26
+  - story-gen-book-character27
+  - story-gen-book-character28
+  - story-gen-book-character29
+  - story-gen-book-character30
+  - story-gen-book-character31
+  - story-gen-book-character32
+  - story-gen-book-character33
+  - story-gen-book-character34
+  - story-gen-book-character35
+  - story-gen-book-character36
+  - story-gen-book-character37
+  - story-gen-book-character38
+  - story-gen-book-character39
+  - story-gen-book-character40
+
+- type: dataset
+  id: book_character_trait
+  values:
+  - story-gen-book-character-trait1 
+  - story-gen-book-character-trait2 
+  - story-gen-book-character-trait3 
+  - story-gen-book-character-trait4 
+  - story-gen-book-character-trait5 
+  - story-gen-book-character-trait6 
+  - story-gen-book-character-trait7 
+  - story-gen-book-character-trait8 
+  - story-gen-book-character-trait9 
+  - story-gen-book-character-trait10
+  - story-gen-book-character-trait11
+  - story-gen-book-character-trait12
+  - story-gen-book-character-trait13
+  - story-gen-book-character-trait14
+  - story-gen-book-character-trait15
+  - story-gen-book-character-trait16
+  - story-gen-book-character-trait17
+  - story-gen-book-character-trait18
+  - story-gen-book-character-trait19
+  - story-gen-book-character-trait20
+  - story-gen-book-character-trait21
+  - story-gen-book-character-trait22
+  - story-gen-book-character-trait23
+  - story-gen-book-character-trait24
+
+
+- type: dataset
+  id: book_event
+  values:
+  - story-gen-book-event1 
+  - story-gen-book-event2 
+  - story-gen-book-event3 
+  - story-gen-book-event4 
+  - story-gen-book-event5 
+  - story-gen-book-event6 
+  - story-gen-book-event7 
+  - story-gen-book-event8 
+  - story-gen-book-event9 
+  - story-gen-book-event10
+  - story-gen-book-event11
+  - story-gen-book-event12
+  - story-gen-book-event13
+  - story-gen-book-event14
+  - story-gen-book-event15
+  - story-gen-book-event16
+  - story-gen-book-event17
+  - story-gen-book-event18
+  - story-gen-book-event19
+  - story-gen-book-event20
+  - story-gen-book-event21
+  - story-gen-book-event22
+  - story-gen-book-event23
+  - story-gen-book-event24
+
+- type: dataset
+  id: book_action
+  values:
+  - story-gen-book-action1 
+  - story-gen-book-action2 
+  - story-gen-book-action3 
+  - story-gen-book-action4 
+  - story-gen-book-action5 
+  - story-gen-book-action6 
+  - story-gen-book-action7 
+  - story-gen-book-action8 
+  - story-gen-book-action9 
+  - story-gen-book-action10
+  - story-gen-book-action11
+  - story-gen-book-action12
+
+- type: dataset
+  id: book_action_trait
+  values:
+  - story-gen-book-action-trait1 
+  - story-gen-book-action-trait2 
+  - story-gen-book-action-trait3 
+  - story-gen-book-action-trait4 
+  - story-gen-book-action-trait5 
+  - story-gen-book-action-trait6 
+  - story-gen-book-action-trait7 
+  - story-gen-book-action-trait8 
+  - story-gen-book-action-trait9 
+  - story-gen-book-action-trait10
+  - story-gen-book-action-trait11
+  - story-gen-book-action-trait12
+  - story-gen-book-action-trait13
+
+- type: dataset
+  id: book_location
+  values:
+  - story-gen-book-location1 
+  - story-gen-book-location2 
+  - story-gen-book-location3 
+  - story-gen-book-location4 
+  - story-gen-book-location5 
+  - story-gen-book-location6 
+  - story-gen-book-location7 
+  - story-gen-book-location8 
+  - story-gen-book-location9 
+  - story-gen-book-location10
+  - story-gen-book-location11
+  - story-gen-book-location12
+  - story-gen-book-location13
+  - story-gen-book-location14
+  - story-gen-book-location15
+  - story-gen-book-location16
+  - story-gen-book-location17
+  - story-gen-book-location18
+  - story-gen-book-location19
+  - story-gen-book-location20
+  - story-gen-book-location21
+  - story-gen-book-location22
+  - story-gen-book-location23
+  - story-gen-book-location24
+  - story-gen-book-location25
+  - story-gen-book-location26
+  - story-gen-book-location27
+  - story-gen-book-location28
+  - story-gen-book-location29
+  - story-gen-book-location30
+  - story-gen-book-location31
+  - story-gen-book-location32
+  - story-gen-book-location33
+  - story-gen-book-location34
+
+- type: dataset
+  id: book_story_element
+  values:
+  - story-gen-book-element1
+  - story-gen-book-element2
+  - story-gen-book-element3
+  - story-gen-book-element4
+  - story-gen-book-element5
+  - story-gen-book-element6
+  - story-gen-book-element7
+  - story-gen-book-element8
+  - story-gen-book-element9
+
+- type: dataset
+  id: book_story_element_trait
+  values:
+  - story-gen-book-element-trait1 
+  - story-gen-book-element-trait2 
+  - story-gen-book-element-trait3 
+  - story-gen-book-element-trait4 
+  - story-gen-book-element-trait5 
+  - story-gen-book-element-trait6 
+  - story-gen-book-element-trait7 
+  - story-gen-book-element-trait8 
+  - story-gen-book-element-trait9 
+  - story-gen-book-element-trait10
+  - story-gen-book-element-trait11
+  - story-gen-book-element-trait12
+  - story-gen-book-element-trait13

Resources/Prototypes/DeviceLinking/sink_ports.yml

@@ -107,3 +107,8 @@
   id: SetParticleZeta
   name: signal-port-name-set-particle-zeta
   description: signal-port-description-set-particle-zeta
+
+- type: sinkPort
+  id: SetParticleSigma
+  name: signal-port-name-set-particle-sigma
+  description: signal-port-description-set-particle-sigma

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

@@ -248,6 +248,15 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/ertclown.rsi
 
+- type: entity
+  parent: ClothingBackpackERTLeader
+  id: ClothingBackpackERTChaplain
+  name: ERT chaplain backpack
+  description: A spacious backpack with lots of pockets, worn by Chaplains of an Emergency Response Team.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Backpacks/ertchaplain.rsi
+
 #Syndicate
 - type: entity
   parent: ClothingBackpack

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

@@ -167,6 +167,9 @@
     sprite: Clothing/Back/Duffels/syndicate.rsi
   - type: ExplosionResistance
     damageCoefficient: 0.1
+  - type: Storage
+    grid:
+    - 0,0,8,4
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicate

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

@@ -149,6 +149,11 @@
   - type: FlashImmunity
   - type: EyeProtection
     protectionTime: 5
+  - type: Tag
+    tags:
+    - Sunglasses
+    - HamsterWearable
+    - WhitelistChameleon
 
 - type: entity
   parent: ClothingEyesBase
@@ -163,6 +168,9 @@
   - type: FlashImmunity
   - type: EyeProtection
     protectionTime: 5
+  - type: Construction
+    graph: GlassesSecHUD
+    node: glassesSec
   - type: Tag
     tags:
     - HamsterWearable

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

@@ -571,6 +571,21 @@
         Piercing: 0.9
         Heat: 0.9
 
+#ERT Chaplain Hardsuit
+- type: entity
+  parent: ClothingHeadHelmetHardsuitSyndie
+  id: ClothingHeadHelmetHardsuitERTChaplain
+  name: ERT chaplain hardsuit helmet
+  description: A special hardsuit helmet worn by members of an emergency response team.
+  components:
+  - type: BreathMask
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi
+  - type: PointLight
+    color: "#ffffff"
+
 #ERT Engineer Hardsuit
 - type: entity
   parent: ClothingHeadHelmetHardsuitSyndie

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

@@ -147,29 +147,6 @@
         Piercing: 0.9
         Heat: 0.9
 
-#SCAF Helmet
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHelmetScaf
-  name: scaf helmet
-  description: A robust, strong helmet.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Helmets/scaf.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Helmets/scaf.rsi
-  - type: IngestionBlocker
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.8
-  - type: Tag
-    tags:
-    - HidesHair
-    - WhitelistChameleon
-
 #Space Ninja Helmet
 - type: entity
   parent: ClothingHeadEVAHelmetBase

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

@@ -35,31 +35,20 @@
 
 - type: entity
   parent: ClothingHeadBase
-  id: ClothingHeadHatFlowerCrown
-  name: flower crown
-  description: A coronet of fresh and fragrant flowers.
+  id: ClothingHeadHatFlowerWreath
+  name: flower wreath
+  description: A wreath of colourful flowers. Can be worn both on head and neck.
   components:
   - type: Sprite
-    sprite: Clothing/Head/Misc/flower-crown.rsi
+    sprite: Clothing/Head/Misc/flower-wreath.rsi
   - type: Clothing
-    sprite: Clothing/Head/Misc/flower-crown.rsi
+    sprite: Clothing/Head/Misc/flower-wreath.rsi
+    slots:
+    - HEAD
+    - neck
   - type: Construction
-    graph: flowercrown
-    node: flowercrown
-
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatHairflower
-  name: hairflower
-  description: A red flower for beautiful ladies.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Misc/hairflower.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Misc/hairflower.rsi
-  - type: Construction
-    graph: hairflower
-    node: hairflower
+    graph: flowerwreath
+    node: flowerwreath
 
 - type: entity
   parent: ClothingHeadLightBase

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

@@ -79,17 +79,3 @@
     event: !type:StethoscopeActionEvent
     checkCanInteract: false
     priority: -1
-
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckFlowerWreath
-  name: flower wreath
-  description: A wreath of colourful flowers.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Misc/flower-wreath.rsi
-  - type: Clothing
-    sprite: Clothing/Neck/Misc/flower-wreath.rsi
-  - type: Construction
-    graph: flowerwreath
-    node: flowerwreath

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

@@ -183,32 +183,6 @@
   - type: Clothing
     sprite: Clothing/OuterClothing/Armor/magusred.rsi
 
-- type: entity
-  parent: ClothingOuterBaseLarge
-  id: ClothingOuterArmorScaf
-  name: scaf suit
-  description: A green and brown tactical suit for combat situations.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Armor/scaf.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Armor/scaf.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.7
-        Slash: 0.7
-        Piercing: 0.4
-        Heat: 0.9
-        Caustic: 0.9
-  - type: ExplosionResistance
-    damageCoefficient: 0.8
-  - type: GroupExamine
-  - type: Tag
-    tags:
-    - Hardsuit
-    - WhitelistChameleon
-
 - type: entity
   parent: ClothingOuterBaseLarge
   id: ClothingOuterArmorCaptainCarapace

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

@@ -767,6 +767,20 @@
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitERTLeader
 
+#ERT Chaplain Hardsuit
+- type: entity
+  parent: ClothingOuterHardsuitJuggernaut
+  id: ClothingOuterHardsuitERTChaplain
+  name: ERT chaplain's hardsuit
+  description: A protective hardsuit worn by the chaplains of an Emergency Response Team.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi #if you change this, please update the humanoid.yml with a better markers sprite.
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitERTChaplain
+
 #ERT Engineer Hardsuit
 - type: entity
   parent: ClothingOuterHardsuitCBURN

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

@@ -1093,6 +1093,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/musician.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitERTChaplain
+  name: ERT chaplain uniform
+  description: A special suit made for Central Command's elite chaplain corps.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitERTEngineer

Resources/Prototypes/Entities/Effects/chemistry_effects.yml

@@ -9,6 +9,7 @@
   - type: SmokeVisuals
   - type: Transform
     anchored: true
+  - type: Clickable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -76,6 +77,8 @@
     animationState: foam-dissolve
   - type: Slippery
   - type: StepTrigger
+  - type: ScoopableSolution
+    solution: solutionArea
 
 - type: entity
   id: MetalFoam
@@ -128,9 +131,10 @@
     snap:
     - Wall
   components:
-  - type: Tag
-    tags:
-    - RCDDeconstructWhitelist
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2  
   - type: Clickable
   - type: InteractionOutline
   - type: Sprite

Resources/Prototypes/Entities/Effects/rcd.yml

@@ -1,16 +1,115 @@
 - type: entity
-  id: EffectRCDConstruction
+  id: EffectRCDBase
+  abstract: true
   noSpawn: true
   components:
   - type: Transform
     anchored: True
   - type: Sprite
+    snapCardinals: true
+    noRot: true
     drawdepth: Effects
     sprite: /Textures/Effects/rcd.rsi
-    state: construct
-  - type: TimedDespawn
-    lifetime: 3.2
+    state: construct0
   - type: Tag
     tags:
     - HideContextMenu
   - type: AnimationPlayer
+  
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstructPreview
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstructPreview
+  
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct0
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct0
+  - type: TimedDespawn
+    lifetime: 1.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct1
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct1
+  - type: TimedDespawn
+    lifetime: 2.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct2
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct2
+  - type: TimedDespawn
+    lifetime: 3.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct3
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct3
+  - type: TimedDespawn
+    lifetime: 4.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct4
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct4
+  - type: TimedDespawn
+    lifetime: 5.2
+
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstruct2
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstruct2
+  - type: TimedDespawn
+    lifetime: 3.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstruct4
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstruct4
+  - type: TimedDespawn
+    lifetime: 5.2
+
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstruct6
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstruct6
+  - type: TimedDespawn
+    lifetime: 7.2
+
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstruct8
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstruct8
+  - type: TimedDespawn
+    lifetime: 9.2

Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml

@@ -19,6 +19,7 @@
       - DrinkAloe
       - DrinkAndalusia
       - DrinkAntifreeze
+      - DrinkArnoldPalmer
       - DrinkB52Glass
       - DrinkBahamaMama
       - DrinkBananaHonkGlass
@@ -27,12 +28,15 @@
       - DrinkBerryJuice
       - DrinkBlackRussianGlass
       - DrinkBlueCuracaoGlass
+      - DrinkBlueHawaiianGlass
       - DrinkBloodyMaryGlass
       - DrinkBooger
       - DrinkBraveBullGlass
       - DrinkCarrotJuice
+      - DrinkCoconutRum
       - DrinkChocolateGlass
       - DrinkCognacGlass
+      - DrinkCosmopolitan
       - DrinkCubaLibreGlass
       - DrinkDeadRumGlass
       - DrinkDevilsKiss
@@ -66,15 +70,19 @@
       - DrinkMilkshake
       - DrinkMojito
       - DrinkNTCahors
+      - DrinkPainkillerGlass
       - DrinkPatronGlass
+      - DrinkPinaColadaGlass
       - DrinkPoscaGlass
       - DrinkRedMeadGlass
       - DrinkRewriter
+      - DrinkRoyRogersGlass
       - DrinkRootBeerFloatGlass
       - DrinkRumGlass
       - DrinkSakeGlass
       - DrinkSbitenGlass
       - DrinkScrewdriverCocktailGlass
+      - DrinkShirleyTempleGlass
       - DrinkSuiDreamGlass
       - DrinkSingulo
       - DrinkSoyLatte

Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml

@@ -31,6 +31,7 @@
       - DrinkDrGibbCan
       - DrinkEnergyDrinkCan
       - DrinkShamblersJuiceCan
+      - DrinkSolDryCan
       - DrinkPwrGameCan
       - DrinkHotCoco
       - DrinkHotCoffee

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

@@ -44,7 +44,6 @@
         - CrateMaterialPlastic
         - CrateMaterialWood
         - CrateMaterialPlasteel
-        - CrateFunSprayPaints
         - CrateFunArtSupplies
         - CrateEngineeringCableLV
         - CrateEngineeringCableMV

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

@@ -77,7 +77,7 @@
         - ClothingHeadHatCone
         - ClothingNeckBling
         - ClothingHeadHelmetCosmonaut
-        - ClothingHeadHelmetScaf
+        - ClothingHeadHelmetBasic
         - ClothingShoeSlippersDuck
         - ClothingUnderSocksBee
         - ClothingUnderSocksCoder
@@ -173,12 +173,7 @@
         - MaterialCloth10
         - MaterialWoodPlank10
         - ResearchDisk
-        - DeathPaint
         - Plunger
-        - SprayPaintBlue
-        - SprayPaintRed
-        - SprayPaintGreen
-        - SprayPaintOrange
         - TechnologyDisk
         - PowerCellMedium
         - PowerCellSmall

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

@@ -510,6 +510,18 @@
       - state: green
       - state: ertleader
 
+- type: entity
+  id: SpawnPointERTChaplain
+  parent: SpawnPointJobBase
+  name: ERTchaplain
+  components:
+  - type: SpawnPoint
+    job_id: ERTChaplain
+  - type: Sprite
+    layers:
+      - state: green
+      - state: chaplain
+
 - type: entity
   id: SpawnPointERTEngineer
   parent: SpawnPointJobBase

Resources/Prototypes/Entities/Markers/construction_ghost.yml

@@ -7,4 +7,4 @@
     color: '#3F38'
   - type: ConstructionGhost
   - type: Clickable
-  - type: InteractionOutline
+  - type: InteractionOutline

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

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseMob
   id: BaseBorgChassis
   name: cyborg
@@ -83,6 +83,7 @@
     templateId: borg
   - type: Hands
     showInHands: false
+    disableExplosionRecursion: true
   - type: IntrinsicRadioReceiver
   - type: IntrinsicRadioTransmitter
     channels:
@@ -101,8 +102,6 @@
   - type: BorgChassis
   - type: WiresPanel
   - type: ActivatableUIRequiresPanel
-  - type: Wires
-    layoutId: Borg
   - type: NameIdentifier
     group: Silicon
   - type: ContainerContainer
@@ -131,6 +130,9 @@
   - type: Speech
     speechVerb: Robotic
     speechSounds: Pai
+  - type: Vocal
+    sounds:
+      Unsexed: UnisexSilicon
   - type: UnblockableSpeech
   - type: Construction
     graph: Cyborg
@@ -140,6 +142,7 @@
   - type: Lock
     locked: true
   - type: ActivatableUIRequiresLock
+  - type: LockedWiresPanel
   - type: Flashable
   - type: Damageable
     damageContainer: Silicon

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

@@ -70,7 +70,6 @@
       tags:
         - Carp
         - DoorBumpOpener
-        - NoPaint
     - type: ReplacementAccent
       accent: genericAggressive
     - type: Speech

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

@@ -93,6 +93,3 @@
     - RevenantTheme
   - type: Speech
     speechVerb: Ghost
-  - type: Tag
-    tags:
-      - NoPaint

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

@@ -104,7 +104,6 @@
     - type: Tag
       tags:
         - CannotSuicide
-        - NoPaint
 
 # From the uplink injector
 - type: entity
@@ -213,7 +212,6 @@
       tags:
         - CannotSuicide
         - FootstepSound
-        - NoPaint
     - type: Inventory
       templateId: holoclown
     - type: Hands

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

@@ -1,11 +1,13 @@
 - type: entity
   save: false
+  noSpawn: true
   name: Urist McHands
   parent: BaseMobHuman
   id: MobHuman
 
 #Syndie
 - type: entity
+  noSpawn: true
   parent: MobHuman
   id: MobHumanSyndicateAgentBase
   name: syndicate agent
@@ -20,6 +22,7 @@
       - Syndicate
 
 - type: entity
+  noSpawn: true
   parent: MobHumanSyndicateAgentBase
   id: MobHumanSyndicateAgent
   name: syndicate agent
@@ -31,6 +34,7 @@
       giveObjectives: false
 
 - type: entity
+  noSpawn: true
   parent: MobHumanSyndicateAgentBase
   id: MobHumanSyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink
   suffix: Human, NukeOps

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

@@ -119,6 +119,66 @@
       prototypes: [ ERTLeaderGearEVALecter ]
     - type: InitialInfectedExempt
 
+## ERT Chaplain
+
+- type: entity
+  id: RandomHumanoidSpawnerERTChaplain
+  parent: RandomHumanoidSpawnerERTLeader
+  name: ERT chaplain
+  suffix: ERTRole, Basic
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: chaplain #needs an ERT variant once a good suit it made.
+    - type: RandomMetadata
+      nameSegments:
+      - NamesFirstMilitary
+      - NamesLastMilitary
+    - type: RandomHumanoidSpawner
+      settings: ERTChaplain
+
+- type: randomHumanoidSettings
+  id: ERTChaplain
+  parent: ERTLeader
+  components:
+    - type: MindShield
+    - type: GhostRole
+      name: ghost-role-information-ert-chaplain-name
+      description: ghost-role-information-ert-chaplain-description
+    - type: GhostTakeoverAvailable
+    - type: RandomMetadata
+      nameSegments:
+      - NamesFirstMilitary
+      - NamesLastMilitary
+    - type: Loadout
+      prototypes: [ ERTChaplainGear ]
+    - type: InitialInfectedExempt
+
+- type: entity
+  id: RandomHumanoidSpawnerERTChaplainEVA
+  parent: RandomHumanoidSpawnerERTChaplain
+  name: ERT chaplain
+  suffix: ERTRole, Enviro EVA
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: chaplain #needs an ERT variant once a good suit it made.
+    - type: RandomHumanoidSpawner
+      settings: ERTChaplainEVA
+
+- type: randomHumanoidSettings
+  id: ERTChaplainEVA
+  parent: ERTChaplain
+  components:
+    - type: MindShield
+    - type: GhostRole
+      name: ghost-role-information-ert-chaplain-name
+      description: ghost-role-information-ert-chaplain-description
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      prototypes: [ ERTChaplainGearEVA ]
+    - type: InitialInfectedExempt
+
 ## ERT Janitor
 
 - type: entity

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml

@@ -112,6 +112,24 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/tomatojuice.rsi
 
+- type: entity
+  parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
+  id: DrinkCoconutWaterCarton
+  name: coconut water
+  description: It's the inside of the coconut that counts.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: CoconutWater
+          Quantity: 50
+  - type: Drink
+  - type: Label
+    currentLabel: coconut water
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/coconutwater.rsi
+
 - type: entity
   parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
   id: DrinkCreamCarton

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml

@@ -258,6 +258,22 @@
         - ReagentId: Antifreeze
           Quantity: 30
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkArnoldPalmer
+  suffix: arnold palmer
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: ArnoldPalmer
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/arnoldpalmer.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkAtomicBombGlass
@@ -437,6 +453,22 @@
     sprite: Objects/Consumable/Drinks/bloodymaryglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkBlueHawaiianGlass
+  suffix: blue hawaiian
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: BlueHawaiian
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/bluehawaiian.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkBooger
@@ -501,6 +533,35 @@
     sprite: Objects/Consumable/Drinks/chocolateglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkCoconutRum
+  suffix: coconut rum
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: CoconutRum
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/coconutrum.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkCoconutWaterGlass
+  suffix: coconut water
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: CoconutWater
+          Quantity: 30
+
 - type: entity
   parent: DrinkGlass
   id: DrinkCoffee
@@ -533,6 +594,22 @@
     sprite: Objects/Consumable/Drinks/cognacglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkCosmopolitan
+  suffix: cosmopolitan
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Cosmopolitan
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/cosmopolitan.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkCream
@@ -1340,6 +1417,22 @@
     sprite: Objects/Consumable/Drinks/orangejuice.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkPainkillerGlass
+  suffix: painkiller
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Painkiller
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/painkiller.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkPatronGlass
@@ -1356,6 +1449,22 @@
     sprite: Objects/Consumable/Drinks/patronglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkPinaColadaGlass
+  suffix: piña colada
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: PinaColada
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/pinacolada.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkPoisonBerryJuice
@@ -1484,6 +1593,22 @@
     sprite: Objects/Consumable/Drinks/rumglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkRoyRogersGlass
+  suffix: roy rogers
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: RoyRogers
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/royrogers.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkSakeGlass
@@ -1609,6 +1734,22 @@
     sprite: Objects/Consumable/Drinks/glass_white.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkShirleyTempleGlass
+  suffix: shirley temple
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: ShirleyTemple
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/shirleytemple.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkSilencerGlass
@@ -1641,6 +1782,22 @@
     sprite: Objects/Consumable/Drinks/singulo.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkSolDryGlass
+  suffix: sol dry
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: SolDry
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/sol_dry_glass.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkSnowWhite

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml

@@ -789,6 +789,23 @@
   - type: Label
     currentLabel: ice
 
+- type: entity
+  parent: DrinkBottlePlasticBaseFull
+  id: DrinkCoconutWaterJug
+  name: coconut water jug
+  description: It's on the inside of the coconut that counts.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 300
+        reagents:
+        - ReagentId: CoconutWater
+          Quantity: 300
+  - type: Drink
+  - type: Label
+    currentLabel: coconut water
+
 - type: entity
   parent: DrinkBottlePlasticBaseFull
   id: DrinkCoffeeJug

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml

@@ -239,6 +239,24 @@
   - type: Item
     sprite: Objects/Consumable/Drinks/space-up.rsi
 
+- type: entity
+  parent: DrinkCanBaseFull
+  id: DrinkSolDryCan
+  name: sol dry
+  description: Sweet ginger soda from outer space!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: SolDry
+          Quantity: 30
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/sol_dry.rsi
+  - type: Item
+    sprite: Objects/Consumable/Drinks/sol_dry.rsi
+
 - type: entity
   parent: DrinkCanBaseFull
   id: DrinkStarkistCan

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

@@ -1220,6 +1220,10 @@
   id: FoodPoppy
   description: A flower with extracts often used in the production of medicine
   components:
+  - type: Clothing
+    slots:
+    - HEAD
+    quickEquip: false
   - type: FlavorProfile
     flavors:
       - medicine

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

@@ -292,9 +292,9 @@
         orGroup: GiftPool
       - id: ClothingHeadHatBunny
         orGroup: GiftPool
-      - id: ClothingHeadHatFlowerCrown
+      - id: ClothingHeadHatFlowerWreath
         orGroup: GiftPool
-      - id: ClothingHeadHatHairflower
+      - id: FoodPoppy
         orGroup: GiftPool
       - id: ClothingMaskClown
         orGroup: GiftPool

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

@@ -7,9 +7,19 @@
     - type: Sprite
       sprite: Objects/Misc/module.rsi
       state: door_electronics
-    - type: AccessReader
     - type: Tag
       tags:
         - DoorElectronics
+    - type: DoorElectronics
     - type: StaticPrice
       price: 55
+    - type: AccessReader
+    - type: ActivatableUI
+      key: enum.DoorElectronicsConfigurationUiKey.Key
+      allowedItems:
+        tags:
+        - Multitool
+    - type: UserInterface
+      interfaces:
+      - key: enum.DoorElectronicsConfigurationUiKey.Key
+        type: DoorElectronicsBoundUserInterface

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

@@ -0,0 +1,264 @@
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsService
+  suffix: Service, Locked
+  components:
+  - type: AccessReader
+    access: [["Service"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsTheatre
+  suffix: Theatre, Locked
+  components:
+  - type: AccessReader
+    access: [["Theatre"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsChapel
+  suffix: Chapel, Locked
+  components:
+  - type: AccessReader
+    access: [["Chapel"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsJanitor
+  suffix: Janitor, Locked
+  components:
+  - type: AccessReader
+    access: [["Janitor"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsKitchen
+  suffix: Kitchen, Locked
+  components:
+  - type: AccessReader
+    access: [["Kitchen"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsBar
+  suffix: Bar, Locked
+  components:
+  - type: AccessReader
+    access: [["Bar"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsHydroponics
+  suffix: Hydroponics, Locked
+  components:
+  - type: AccessReader
+    access: [["Hydroponics"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsCaptain
+  suffix: Captain, Locked
+  components:
+  - type: AccessReader
+    access: [["Captain"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsExternal
+  suffix: External, Locked
+  components:
+  - type: AccessReader
+    access: [["External"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsCargo
+  suffix: Cargo, Locked
+  components:
+  - type: AccessReader
+    access: [["Cargo"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsEngineering
+  suffix: Engineering, Locked
+  components:
+  - type: AccessReader
+    access: [["Engineering"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsAtmospherics
+  suffix: Atmospherics, Locked
+  components:
+  - type: AccessReader
+    access: [["Atmospherics"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsFreezer
+  suffix: Freezer, Locked
+  components:
+  - type: AccessReader
+    access: [["Kitchen"], ["Hydroponics"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsSalvage
+  suffix: Salvage, Locked
+  components:
+  - type: AccessReader
+    access: [["Salvage"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsMedical
+  suffix: Medical, Locked
+  components:
+  - type: AccessReader
+    access: [["Medical"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsChemistry
+  suffix: Chemistry, Locked
+  components:
+  - type: AccessReader
+    access: [["Chemistry"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsResearch
+  suffix: Research, Locked
+  components:
+  - type: AccessReader
+    access: [["Research"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsScience
+  suffix: Science, Locked
+  components:
+  - type: AccessReader
+    access: [["Research"], ["Medical"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsCommand
+  suffix: Command, Locked
+  components:
+  - type: AccessReader
+    access: [["Command"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsChiefMedicalOfficer
+  suffix: ChiefMedicalOfficer, Locked
+  components:
+  - type: AccessReader
+    access: [["ChiefMedicalOfficer"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsChiefEngineer
+  suffix: ChiefEngineer, Locked
+  components:
+  - type: AccessReader
+    access: [["ChiefEngineer"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsHeadOfSecurity
+  suffix: HeadOfSecurity, Locked
+  components:
+  - type: AccessReader
+    access: [["HeadOfSecurity"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsResearchDirector
+  suffix: ResearchDirector, Locked
+  components:
+  - type: AccessReader
+    access: [["ResearchDirector"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsHeadOfPersonnel
+  suffix: HeadOfPersonnel, Locked
+  components:
+  - type: AccessReader
+    access: [["HeadOfPersonnel"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsQuartermaster
+  suffix: Quartermaster, Locked
+  components:
+  - type: AccessReader
+    access: [["Quartermaster"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsSecurity
+  suffix: Security, Locked
+  components:
+  - type: AccessReader
+    access: [["Security"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsDetective
+  suffix: Detective, Locked
+  components:
+  - type: AccessReader
+    access: [["Detective"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsBrig
+  suffix: Brig, Locked
+  components:
+  - type: AccessReader
+    access: [["Brig"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsArmory
+  suffix: Armory, Locked
+  components:
+  - type: AccessReader
+    access: [["Armory"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsVault
+  suffix: Vault, Locked
+  components:
+  - type: AccessReader
+    access: [["Security", "Command"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsMaintenance
+  suffix: Maintenance, Locked
+  components:
+  - type: AccessReader
+    access: [["Maintenance"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsSyndicateAgent
+  suffix: SyndicateAgent, Locked
+  components:
+  - type: AccessReader
+    access: [["SyndicateAgent"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsRnDMed
+  suffix: Medical/Science, Locked
+  components:
+  - type: AccessReader
+    access: [["Research"], ["Medical"]]

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

@@ -13,7 +13,7 @@
     programName: notekeeper-program-name
     icon:
       sprite:  Objects/Misc/books.rsi
-      state: book6
+      state: book_icon
   - type: NotekeeperCartridge
 
 - type: entity

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

@@ -108,6 +108,7 @@
 - type: entity
   parent: BasePDA
   id: BaseMedicalPDA
+  abstract: true
   components:
   - type: HealthAnalyzer
     scanDelay: 1

Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml

@@ -163,9 +163,6 @@
   - type: Appearance
   - type: WiresVisuals
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-dawinstrument
-    layoutId: DawInstrument
   - type: Machine
     board: DawInstrumentMachineCircuitboard
   - type: Instrument

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

@@ -53,10 +53,10 @@
     solution: melee
   - type: InjectableSolution
     solution: melee
-  - type: SolutionInjectOnCollide
+  - type: SolutionInjectOnEmbed
     transferAmount: 2
+    solution: melee
     blockSlots: OUTERCLOTHING
-    fixtureId: "throw-fixture"
   - type: SolutionTransfer
     maxTransferAmount: 2
   - type: Damageable
@@ -124,10 +124,9 @@
     solutions:
       melee:
         maxVol: 7
-  - type: SolutionInjectOnCollide
+  - type: SolutionInjectOnEmbed
     transferAmount: 7
-    blockSlots: NONE
-    fixtureId: "throw-fixture"
+    solution: melee
   - type: SolutionTransfer
     maxTransferAmount: 7
 

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

@@ -1,292 +0,0 @@
-# Base Paints
-- type: entity
-  parent: BaseItem
-  id: PaintBase
-  name: spray paint
-  description: A tin of spray paint.
-  noSpawn: true
-  components:
-  - type: Appearance
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    state: clown_cap
-    layers:
-      - state: clown_cap
-        map: ["enum.OpenableVisuals.Layer"]
-  - type: Paint
-    consumptionUnit: 10
-    blacklist:
-      tags:
-        - NoPaint
-  - type: Item
-    sprite: Objects/Fun/spraycans.rsi
-    heldPrefix: spray
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 50
-        reagents:
-        - ReagentId: SpaceGlue
-          Quantity: 50
-  - type: TrashOnSolutionEmpty
-    solution: drink
-  - type: Sealable
-  - type: Openable
-    sound:
-      path: /Audio/Effects/pop_high.ogg
-    closeable: true
-    closeSound:
-      path: /Audio/Effects/pop_high.ogg
-
-# Paints
-
-# funnypaint
-- type: entity
-  parent: PaintBase
-  id: FunnyPaint
-  name: funny paint
-  description:  A tin of funny paint, manufactured by Honk! Co.
-  components:
-  - type: Paint
-    color: "#fa74df"
-  - type: Item
-    sprite: Objects/Fun/spraycans.rsi
-    heldPrefix: clown
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "clown"}
-          False: {state: "clown_cap"}
-
-- type: entity
-  parent: PaintBase
-  id: FunnyPaintYellow
-  name: funny paint
-  description:  A tin of funny paint, manufactured by Honk! Co.
-  components:
-  - type: Paint
-    color: "#d5e028"
-  - type: Item
-    sprite: Objects/Fun/spraycans.rsi
-    heldPrefix: clown
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    state: clown2_cap
-    layers:
-      - state: clown2_cap
-        map: ["enum.OpenableVisuals.Layer"]
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "clown2"}
-          False: {state: "clown2_cap"}
-
-#death paint
-- type: entity
-  parent: PaintBase
-  id: DeathPaint
-  components:
-  - type: Paint
-    color: "#ff20c8"
-  - type: Item
-    sprite: Objects/Fun/spraycans.rsi
-    heldPrefix: spray
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    state: death_cap
-    layers:
-      - state: death_cap
-        map: ["enum.OpenableVisuals.Layer"]
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "death"}
-          False: {state: "death_cap"}
-
-- type: entity
-  parent: PaintBase
-  id: DeathPaintTwo
-  components:
-  - type: Paint
-    color: "#ff2020"
-  - type: Item
-    sprite: Objects/Fun/spraycans.rsi
-    heldPrefix: spray
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    state: death2_cap
-    layers:
-      - state: death2_cap
-        map: ["enum.OpenableVisuals.Layer"]
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "death2"}
-          False: {state: "death2_cap"}
-
-#Sprays
-
-#Blue
-- type: entity
-  parent: PaintBase
-  id: SprayPaintBlue
-  suffix: Blue
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#5890f7"
-  - type: Paint
-    color: "#5890f7"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#5890f7"}
-          False: {state: "spray_cap_colors" , color: "#5890f7"}
-
-#Red
-- type: entity
-  parent: PaintBase
-  id: SprayPaintRed
-  suffix: Red
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#ff3b3b"
-  - type: Paint
-    color: "#ff3b3b"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#ff3b3b"}
-          False: {state: "spray_cap_colors" , color: "#ff3b3b"}
-
-#Green
-- type: entity
-  parent: PaintBase
-  id: SprayPaintGreen
-  suffix: Green
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#73f170"
-  - type: Paint
-    color: "#73f170"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#73f170"}
-          False: {state: "spray_cap_colors" , color: "#73f170"}
-
-#Black
-- type: entity
-  parent: PaintBase
-  id: SprayPaintBlack
-  suffix: Black
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#3a3a3a"
-  - type: Paint
-    color: "#3a3a3a"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#3a3a3a"}
-          False: {state: "spray_cap_colors" , color: "#3a3a3a"}
-
-#Orange
-- type: entity
-  parent: PaintBase
-  id: SprayPaintOrange
-  suffix: Orange
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#f6a44b"
-  - type: Paint
-    color: "#f6a44b"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#f6a44b"}
-          False: {state: "spray_cap_colors" , color: "#f6a44b"}
-
-#Purple
-- type: entity
-  parent: PaintBase
-  id: SprayPaintPurple
-  suffix: Purple
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#c063f5"
-  - type: Paint
-    color: "#c063f5"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#c063f5"}
-          False: {state: "spray_cap_colors" , color: "#c063f5"}
-
-#White
-- type: entity
-  parent: PaintBase
-  id: SprayPaintWhite
-  suffix: White
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#f2f2f2"
-  - type: Paint
-    color: "#f2f2f2"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#f2f2f2"}
-          False: {state: "spray_cap_colors" , color: "#f2f2f2"}

Resources/Prototypes/Entities/Objects/Magic/books.yml

@@ -7,7 +7,13 @@
     - type: Sprite
       sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_demonomicon
+      - state: paper_blood
+      - state: cover_strong
+        color: "#645a5a" 
+      - state: decor_wingette_flat
+        color: "#4d0303"
+      - state: icon_pentagramm
+        color: "#f7e19f"
     - type: Spellbook
     - type: Tag
       tags:
@@ -28,9 +34,19 @@
   parent: BaseSpellbook
   components:
     - type: Sprite
-      sprite: Objects/Magic/spellbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: bookforcewall
+      - state: paper
+      - state: cover_strong
+        color: "#366ed6"
+      - state: decor_vertical_middle
+        color: "#95ffff"
+      - state: decor_wingette_circle
+        color: "#95ffff"
+      - state: icon_magic_forcewall
+        shader: unshaded
+      - state: detail_rivets
+        color: gold
     - type: Spellbook
       spells:
         ActionForceWall: -1
@@ -41,9 +57,17 @@
   parent: BaseSpellbook
   components:
     - type: Sprite
-      sprite: Objects/Magic/spellbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: spellbook
+      - state: paper
+      - state: cover_old
+        color: "#657e9c"
+      - state: icon_text3
+      - state: decor_wingette_circle
+        color: gold
+      - state: icon_magic
+      - state: detail_rivets
+        color: gold
     - type: Spellbook
       spells:
         ActionBlink: -1
@@ -53,13 +77,23 @@
   name: smite spellbook
   parent: BaseSpellbook
   components:
-  - type: Sprite
-    sprite: Objects/Magic/spellbooks.rsi
-    layers:
-    - state: spellbook
-  - type: Spellbook
-    spells:
-      ActionSmite: -1
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_old
+        color: "#c42b40"
+      - state: decor_wingette_circle
+        color: gold
+      - state: icon_magic
+      - state: detail_rivets
+        color: gold
+      - state: detail_bookmark
+        color: red
+      - state: overlay_blood
+    - type: Spellbook
+      spells:
+        ActionSmite: -1
 
 - type: entity
   id: KnockSpellbook
@@ -67,9 +101,18 @@
   parent: BaseSpellbook
   components:
     - type: Sprite
-      sprite: Objects/Magic/spellbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: bookknock
+      - state: paper
+      - state: cover_strong
+        color: "#117045"
+      - state: decor_wingette_circle
+        color: gold
+      - state: icon_magic_knock
+      - state: detail_rivets
+        color: gold
+      - state: detail_bookmark
+        color: "#98c495"
     - type: Spellbook
       spells:
         ActionKnock: -1
@@ -79,13 +122,24 @@
   name: fireball spellbook
   parent: BaseSpellbook
   components:
-  - type: Sprite
-    sprite: Objects/Magic/spellbooks.rsi
-    layers:
-    - state: bookfireball
-  - type: Spellbook
-    spells:
-      ActionFireball: -1
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_old
+        color: "#ba5a14"
+      - state: decor_wingette_circle
+        color: gold
+      - state: detail_rivets
+        color: gold
+      - state: detail_bookmark
+        color: "#e89b3c"
+      - state: overlay_blood
+      - state: icon_magic_fireball
+        shader: unshaded
+    - type: Spellbook
+      spells:
+        ActionFireball: -1
 
 - type: entity
   id: ScrollRunes

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

@@ -15,7 +15,6 @@
   - type: Tag
     tags:
     - Sheet
-    - NoPaint
   - type: Material
   - type: Damageable
     damageContainer: Inorganic

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

@@ -15,7 +15,6 @@
     tags:
     - Sheet
     - Metal
-    - NoPaint
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic

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

@@ -12,7 +12,6 @@
   - type: Tag
     tags:
     - Sheet
-    - NoPaint
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
@@ -111,7 +110,6 @@
   - type: Tag
     tags:
     - Sheet
-    - NoPaint
 
 - type: entity
   parent: SheetPlasma
@@ -134,7 +132,6 @@
     tags:
     - Plastic
     - Sheet
-    - NoPaint
   - type: Material
   - type: PhysicalComposition
     materialComposition:

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

@@ -12,7 +12,6 @@
   - type: Tag
     tags:
       - RawMaterial
-      - NoPaint
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible

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

@@ -7,8 +7,17 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book0
-      map: [ "enum.DamageStateVisualLayers.Base" ]
+    - state: paper
+    - state: cover_base
+      color: "#332d27"
+      map: [ "cover" ]
+    - state: decor_wingette
+      color: "#453f3a"
+      map: [ "decor" ]
+    - state: icon_text
+      map: [ "icon" ]
+    - state: overlay_null
+      map: [ "overlay" ]
   - type: Paper
     contentSize: 12000
   - type: ActivatableUI
@@ -35,7 +44,15 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book0 # placeholder(?). if only we have a better sprite that fits this.
+    - state: paper
+    - state: cover_base
+      color: "#0a2a6b"
+    - state: decor_wingette
+      color: "#082561"
+    - state: icon_text 
+      color: gold
+    - state: icon_planet
+      color: "#42b6f5"
   - type: Tag
     tags:
     - Book
@@ -53,7 +70,15 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book7
+    - state: paper
+    - state: cover_base
+      color: black
+    - state: decor_wingette
+      color: "#bbbbbb"
+    - state: icon_glow
+      color: red
+    - state: icon_corner
+      color: red
   - type: Tag
     tags:
     - Book
@@ -71,7 +96,12 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_bar
+    - state: paper
+    - state: cover_base
+      color: "#004848"
+    - state: decor_wingette
+      color: "#006666"
+    - state: icon_bar
   - type: Tag
     tags:
     - Book
@@ -89,7 +119,11 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_cooking
+    - state: paper
+    - state: cover_base
+      color: "#e22541"
+    - state: decor_wingette
+    - state: icon_apple
   - type: Tag
     tags:
     - Book
@@ -107,7 +141,14 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_hydroponics_pod_people
+    - state: paper
+    - state: cover_base
+      color: "#0e5a24"
+    - state: decor_wingette
+      color: "#2fa151"
+    - state: icon_cabbage
+    - state: icon_corner
+      color: gold
   - type: Tag
     tags:
     - Book
@@ -125,7 +166,14 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_engineering
+    - state: paper
+    - state: cover_base
+      color: "#6c4718"
+    - state: decor_wingette
+      color: "#b5913c"
+    - state: icon_wrench
+    - state: icon_corner
+      color: gold
   - type: Tag
     tags:
     - Book
@@ -143,7 +191,12 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_science
+    - state: paper
+    - state: cover_base
+      color: "#542485"
+    - state: decor_wingette_circle
+      color: "#be69f0"
+    - state: icon_dna
   - type: Tag
     tags:
     - Book
@@ -161,7 +214,12 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_security
+    - state: paper
+    - state: cover_base
+      color: "#ab1515"
+    - state: decor_wingette
+      color: "#e05334"
+    - state: icon_stunbaton
   - type: Tag
     tags:
     - Book
@@ -184,7 +242,11 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book0 # no janitorial book sprite so this is a placeholder
+    - state: paper
+    - state: cover_base
+      color: "#550c82"
+    - state: decor_wingette
+    - state: icon_bucket
   - type: Tag
     tags:
     - Book
@@ -202,7 +264,15 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book0 # no salvage book sprite so this is a placeholder
+    - state: paper
+    - state: cover_base
+      color: "#52320b"
+    - state: decor_wingette
+      color: "#e69a3e"
+    - state: icon_glow
+    - state: icon_diamond
+    - state: icon_text
+      color: "#fcdf74"
   - type: Tag
     tags:
     - Book
@@ -220,7 +290,13 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_medical
+    - state: paper
+    - state: cover_base
+      color: "#cccccc"
+    - state: decor_wingette
+      color: "#f7f7f7"
+    - state: icon_medical
+      color: "#58abcc"
   - type: Tag
     tags:
     - Book
@@ -238,7 +314,15 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_engineering
+    - state: paper
+    - state: cover_old
+      color: "#6c4718"
+    - state: decor_wingette
+      color: "#b5913c"
+    - state: icon_glow
+      color: red
+    - state: icon_wrench
+    - state: overlay_blood
   - type: Tag
     tags:
     - Book
@@ -256,7 +340,12 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_chemistry
+    - state: paper
+    - state: cover_base
+      color: "#2a7b74"
+    - state: decor_wingette
+      color: "#2a7b74"
+    - state: icon_chemical
   - type: Tag
     tags:
     - Book
@@ -268,69 +357,120 @@
 - type: entity
   parent: BookBase
   id: BookRandom
-  suffix: random
+  suffix: random visual
+  description: Each book is unique! What is hidden in this one?
   components:
+  - type: RandomMetadata
+    nameSegments: 
+    - book_hint_appearance
+    - book_type
   - type: RandomSprite
     available:
-      - enum.DamageStateVisualLayers.Base:
-          book0: ""
-          book1: ""
-          book2: ""
-          book3: ""
-          book4: ""
-          book5: ""
-          book6: ""
-          book7: ""
-          book8: ""
+      - cover:
+          cover_base: Sixteen
+          cover_old: Sixteen
+          cover_strong: Sixteen
+        decor:
+          decor_wingette: Sixteen
+          decor_wingette_circle: Sixteen
+          decor_bottom: Sixteen
+          decor_middle: Sixteen
+          decor_spine: Sixteen
+          decor_diagonal: Sixteen
+          decor_vertical_middle: Sixteen
+          icon_corner: Sixteen
+          icon_mount: ""
+        icon:
+          icon_biohazard: Sixteen
+          icon_borg: ""
+          icon_banana: ""
+          icon_glow: Sixteen
+          icon_hacking: ""
+          icon_law: Sixteen
+          icon_magnifier: ""
+          icon_nuclear: ""
+          icon_time: Sixteen
+          icon_aurora: Sixteen
+          icon_briefcase: ""
+          icon_eye: ""
+          icon_letter_N: ""
+          icon_letter_P: ""
+          icon_lightning: ""
+          icon_planet: ""
+          icon_possum: ""
+          icon_question: Sixteen
+          icon_scmmd: ""
+          icon_stars: Sixteen
+          icon_stars2: Sixteen
+          icon_temple: Sixteen
+          icon_tree: ""
+          icon_pentagramm: Sixteen
+          icon_fish: ""
+          icon_origami: ""
+          icon_skull: ""
+          icon_text: ""
+          icon_text2: ""
+          icon_text3: "" 
+        overlay:
+          overlay_blood: ""
+          overlay_dirt: Sixteen
+          detail_bookmark: Sixteen
+          detail_rivets: Sixteen
+          overlay_null: ""
 
 - type: entity
-  parent: BookBase
-  id: BookEscalation
-  name: Robert's Rules of Escalation
-  description: The book is stained with blood. It seems to have been used more as a weapon than reading material.
+  parent: BookRandom
+  id: BookRandomStory
+  suffix: random visual, random story
   components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book2
-    - type: MeleeWeapon
-      wideAnimationRotation: 180
-      damage:
-        types:
-          Blunt: 6
-    - type: Paper
-      content: book-text-escalation
-
-- type: entity
-  parent: BookBase
-  id: BookEscalationSecurity
-  name: "Robert's Rules of Escalation: Security Edition"
-  description: The book is stained with blood. It seems to have been used more as a weapon than reading material.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book2
-    - type: MeleeWeapon
-      wideAnimationRotation: 180
-      damage:
-        types:
-          Blunt: 6
-    - type: Paper
-      content: book-text-escalation-security
-
+  - type: PaperRandomStory
+    storySegments:
+    - "This is a "
+    - book_genre
+    - " about a "
+    - book_character_trait
+    - " "
+    - book_character
+    - " and "
+    - book_character_trait
+    - " "
+    - book_character
+    - ". Due to "
+    - book_event
+    - ", they "
+    - book_action_trait
+    - " "
+    - book_action
+    - " "
+    - book_character
+    - " "
+    - book_location
+    - ". \n\n"
+    - book_story_element
+    - " is "
+    - book_story_element_trait
+    - "."
+    storySeparator: ""
+    
 - type: entity
   parent: BookBase
   id: BookAtmosDistro
   name: "Newton's Guide to Atmos: The Distro"
   description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks.
   components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book5
-    - type: Paper
-      content: book-text-atmos-distro
+  - type: Sprite
+    sprite: Objects/Misc/books.rsi
+    layers:
+    - state: paper
+    - state: cover_base
+      color: "#366ed6"
+    - state: decor_wingette
+      color: "#2739b0"
+    - state: icon_atmos
+    - state: icon_corner
+      color: gold
+  - type: Paper
+    content: book-text-atmos-distro
 
 - type: entity
   parent: BookBase
@@ -338,12 +478,19 @@
   name: "Newton's Guide to Atmos: Waste"
   description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks.
   components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book5
-    - type: Paper
-      content: book-text-atmos-waste
+  - type: Sprite
+    sprite: Objects/Misc/books.rsi
+    layers:
+    - state: paper
+    - state: cover_base
+      color: "#db233f"
+    - state: decor_wingette
+      color: "#ab0730"
+    - state: icon_atmos
+    - state: icon_corner
+      color: gold
+  - type: Paper
+    content: book-text-atmos-waste
 
 - type: entity
   parent: BookBase
@@ -351,12 +498,19 @@
   name: "Newton's Guide to Atmos: Air Alarms"
   description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks.
   components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book5
-    - type: Paper
-      content: book-text-atmos-alarms
+  - type: Sprite
+    sprite: Objects/Misc/books.rsi
+    layers:
+    - state: paper
+    - state: cover_base
+      color: "#bfb328"
+    - state: decor_wingette
+      color: "#9c7c14"
+    - state: icon_atmos
+    - state: icon_corner
+      color: gold
+  - type: Paper
+    content: book-text-atmos-alarms
 
 - type: entity
   parent: BookBase
@@ -364,9 +518,16 @@
   name: "Newton's Guide to Atmos: Vents and More"
   description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks.
   components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book5
-    - type: Paper
-      content: book-text-atmos-vents
+  - type: Sprite
+    sprite: Objects/Misc/books.rsi
+    layers:
+    - state: paper
+    - state: cover_base
+      color: "#3ec78e"
+    - state: decor_wingette
+      color: "#28a15a"
+    - state: icon_atmos
+    - state: icon_corner
+      color: gold
+  - type: Paper
+    content: book-text-atmos-vents

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

@@ -5,9 +5,19 @@
   description: The book is an old, leather-bound tome with intricate engravings on the cover. The pages are yellowed and fragile with age, with the ink of the text faded in some places. It appears to have been well-read and well-loved, with dog-eared pages and marginalia scrawled in the margins. Despite its aged appearance, the book still exudes a sense of mystical power and wonder, hinting at the secrets and knowledge contained within its pages.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_narsie_legend
+      - state: paper
+      - state: cover_old
+        color: "#a6161d"
+      - state: decor_bottom
+        color: "#6e1022"
+      - state: decor_wingette
+        color: "#4a101b"
+      - state: icon_pentagramm
+        color: "#911129"
+      - state: detail_bookmark
+        color: red 
     - type: Paper
       content: book-text-narsielegend
 
@@ -18,9 +28,18 @@
   description: A book exploring the different philosophical perspectives on truth and lying has a worn cover, with creases and marks indicating frequent use and thoughtful contemplation. The spine shows signs of wear from being pulled off the shelf again and again. The pages themselves are filled with underlines, notes in the margins, and highlighted passages as readers grapple with the nuances and complexities of the topic.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_truth
+      - state: paper
+      - state: cover_strong
+        color: "#c9752a"
+      - state: decor_diagonal
+        color: "#cf792d"
+      - state: decor_wingette_circle
+        color: gold
+      - state: icon_question
+      - state: detail_bookmark
+        color: "#cf792d"
     - type: Paper
       content: book-text-truth
 
@@ -31,9 +50,15 @@
   description: The book is a well-preserved hardcover with a simple, elegant design on the cover, depicting the image of a world in motion. The pages are crisp and clean, with no signs of wear or tear, suggesting that it has been well-cared for and valued by its previous owner. The text is printed in a clear, legible font, and the chapters are organized in a logical and easy-to-follow manner, making it accessible to readers of all levels of expertise.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_world
+      - state: paper
+      - state: cover_base
+        color: "#215e9e"
+      - state: icon_planet
+      - state: icon_text
+      - state: detail_bookmark
+        color: "#2dab24"
     - type: Paper
       content: book-text-world
 
@@ -44,9 +69,16 @@
   description: The book is a small paperback in good condition, with an illustration of Ian the corgi and the colony of penguins on the cover. The title, "Ian and Robert's Antarctic Adventure", is written in bold white letters against a blue background. The back cover features a brief summary of the story, highlighting the themes of humility, resilience, and the beauty of nature.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_ian_antarctica
+      - state: paper
+      - state: cover_base
+        color: "#5779c9"
+      - state: icon_stars2
+      - state: decor_bottom
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
     - type: Paper
       content: book-text-ian-antarctica
 
@@ -57,9 +89,18 @@
   description: The book looks new, with a glossy cover featuring Chuckles the clown and Snuggles the sloth floating in space with a backdrop of stars and planets. Chuckles is dressed in his banana costume and Snuggles is sleeping on a hammock made of space ropes. The title "The Sloth and the Clown - Space Station Shenanigans" is written in bold and colorful letters.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_scsss
+      - state: paper
+      - state: cover_base
+        color: "#e838b9"
+      - state: decor_wingette
+        color: "#ab22ba"
+      - state: decor_spine
+        color: "#f7cc2f"
+      - state: icon_banana
+      - state: detail_bookmark
+        color: "#f7cc2f"
     - type: Paper
       content: book-text-sloth-clown-sss
 
@@ -70,9 +111,18 @@
   description: The book is in excellent condition, with crisp pages and a bright cover. The cover of the book features Chuckles and Snuggles, surrounded by the different species they encountered during their adventures in space. In the background, the Zorgs can be seen peeking out from behind a spaceship.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_scpz
+      - state: paper
+      - state: cover_base
+        color: "#f7cc2f"
+      - state: decor_wingette
+        color: "#ab22ba"
+      - state: decor_spine
+        color: "#e838b9"
+      - state: icon_banana
+      - state: detail_bookmark
+        color: "#ab22ba"
     - type: Paper
       content: book-text-sloth-clown-pz
 
@@ -83,9 +133,18 @@
   description: The book looks new and vibrant, with an image of Chuckles and Snuggles standing in front of the changing maze on the cover. The title "The Sloth and the Clown - Maze Maze Danger" is written in bold, colorful letters that pop against a background of space and stars.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_scmmd
+      - state: paper
+      - state: cover_base
+        color: "#e838b9"
+      - state: decor_wingette
+        color: "#ab22ba"
+      - state: decor_spine
+        color: "#f7cc2f"
+      - state: icon_scmmd
+      - state: detail_bookmark
+        color: "#ab22ba"
     - type: Paper
       content: book-text-sloth-clown-mmd
 
@@ -96,9 +155,21 @@
   description: The cover of the book is an electrifying image of lightning striking the ground, with a silhouette of a person standing in the midst of it. The title is written in bold letters in white against a black background, conveying the power and intensity of the experience. The subtitle is written in smaller letters below the title, providing a hint of the philosophical and spiritual themes explored within.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_struck
+      - state: paper
+      - state: cover_strong
+        color: "#2c384d"
+      - state: decor_wingette
+        color: "#3a4a66"
+      - state: decor_wingette_circle
+        color: "#6d7c9c"
+      - state: icon_glow
+        color: "#f7bb2f"
+      - state: icon_lightning
+        color: "#f7bb2f"
+      - state: detail_bookmark
+        color: "#f7bb2f"
     - type: Paper
       content: book-text-struck
 
@@ -109,9 +180,20 @@
   description: The book is new, with a bright and vibrant cover featuring a plant stretching its leaves towards the sun. The title, "Reaching for the Sun - A Plant's Quest for Life," is written in bold, green letters, with an image of the sun rising behind the plant. The cover evokes a sense of growth, energy, and the beauty of nature.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_sun
+      - state: paper
+      - state: cover_base
+        color: "#255c8a"
+      - state: decor_bottom
+        color: "#2d2e12"
+      - state: icon_glow
+        color: "#f7bb2f"
+      - state: icon_cabbage
+      - state: detail_bookmark
+        color: "#f7bb2f"
+      - state: detail_rivets
+        color: "#f7bb2f"
     - type: Paper
       content: book-text-sun
 
@@ -122,9 +204,15 @@
   description: The book is in good condition, with a hardcover and a dark green forest background. In the center of the cover, there is a sad looking possum sitting on a branch, with a distant and lonely expression on its face. The title, "Fallen Ambitions - The Tragic Tale of Morty the Possum," is written in bold, gold letters above the possum.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_possum
+      - state: paper
+      - state: cover_old
+        color: "#a3bfae"
+      - state: icon_possum
+      - state: detail_bookmark
+        color: "#2b593d"
+      - state: overlay_blood
     - type: Paper
       content: book-text-possum
 
@@ -135,9 +223,14 @@
   description: The book is in new condition, with a vibrant and whimsical cover that features a charming illustration of a tiny possum peeking out from behind a coffee cup, with a colorful and bustling cafe scene in the background. The title "The Cafe Possum" is written in bold, playful lettering, and the author's name is printed in a smaller font below it.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_cafe
+      - state: paper
+      - state: cover_strong
+        color: "#e8ab6d"
+      - state: icon_possum
+      - state: detail_bookmark
+        color: "#2b593d"
     - type: Paper
       content: book-text-cafe
 
@@ -150,7 +243,15 @@
     - type: Sprite
       sprite: Objects/Misc/books.rsi
       layers:
-        - state: book4
+      - state: paper
+      - state: cover_strong
+        color: "#abebed"
+      - state: decor_wingette
+        color: "#a081cc"
+      - state: icon_atmos
+      - state: icon_magic
+      - state: detail_bookmark
+        color: "#7396f5"
     - type: Paper
       content: book-text-feather
 
@@ -161,9 +262,16 @@
   description: The book is a new condition with a colorful cover, depicting Ian the corgi and Renault the fox on a journey through the forest, with the lost wolf pup to their feet. The title "The Adventures of Ian and Renault - Finding the Lost Wolf Pup" is prominently displayed at the top, with the author's name below. The cover has a whimsical and adventurous feel to it, attracting readers of all ages.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_ian_wolfpup
+      - state: paper
+      - state: cover_base
+        color: "#3a9e57"
+      - state: decor_bottom
+        color: "#1c6330"
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
     - type: Paper
       content: book-text-ian-wolfpup
 
@@ -174,9 +282,16 @@
   description: The book appears to be new, with crisp pages and an unblemished cover. The cover features a colorful illustration of Ian and Renault, surrounded by various animals they encountered on the ranch, including horses, cows, and chickens. The title, "The Adventures of Ian and Renault - Ranch Expedition," is written in bold letters above the image, with the subtitle, "Helping Animals in Need," written below.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_ian_ranch
+      - state: paper
+      - state: cover_base
+        color: "#ccab64"
+      - state: decor_bottom
+        color: "#946e38"
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
     - type: Paper
       content: book-text-ian-ranch
 
@@ -187,9 +302,16 @@
   description: The book is new and in excellent condition. The cover shows Ian and Renault running and playing on the beach, with the blue ocean and golden sand in the background. The title is written in bold, playful letters, and the subtitle reads "An Ocean Adventure."
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_ian_ocean
+      - state: paper
+      - state: cover_base
+        color: "#567cd6"
+      - state: decor_bottom
+        color: "#272782"
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
     - type: Paper
       content: book-text-ian-ocean
 
@@ -200,9 +322,15 @@
   description: The book is in new condition. The cover is a stunning mountain landscape with Ian and Renault in the foreground, looking out over the vista of the surrounding peaks and valleys. The title is written in bold, block letters at the top, with the subtitle, "A Mountain Expedition," written underneath.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_ian_mountain
+      - state: paper
+      - state: cover_base
+        color: "#86b4d9"
+      - state: icon_mount
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
     - type: Paper
       content: book-text-ian-mountain
 
@@ -213,9 +341,16 @@
   description: The book is in new condition, with crisp pages and a glossy cover. The cover features a colorful illustration of Ian and Renault exploring the city, with tall buildings and bustling streets in the background. Ian is leading the way, with his tail wagging excitedly, while Renault follows close behind, her ears perked up and her eyes wide with wonder. The title, "The Adventures of Ian and Renault," is written in bold, playful letters, with the subtitle, "Exploring the City," written below in smaller font.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_ian_city
+      - state: paper
+      - state: cover_base
+        color: "#9a9b9c"
+      - state: decor_bottom
+        color: "#5f6061"
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
     - type: Paper
       content: book-text-ian-city
 
@@ -226,9 +361,16 @@
   description: The book looks new and adventurous, with a picture of Ian and Renault standing in front of an icy landscape with snowflakes falling all around them. The title, "The Adventures of Ian and Renault," is written in bold letters at the top, with a subtitle that reads, "An Arctic Journey of Courage and Friendship."
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_ian_arctic
+      - state: paper
+      - state: cover_base
+        color: "#5779c9"
+      - state: icon_stars2
+      - state: decor_bottom
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
     - type: Paper
       content: book-text-ian-arctic
 
@@ -239,9 +381,16 @@
   description: The book is in new condition and would have a colorful cover depicting Ian and Renault against a desert backdrop. The cover would feature images of various animals and plants that the two encountered on their adventure, such as a rattlesnake, coyotes, sand dunes, and an oasis. The title, "The Adventures of Ian and Renault" is prominently displayed on the cover in bold letters, while the subtitle "Exploring the Mysterious Desert" is written in smaller letters underneath.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_ian_desert
+      - state: paper
+      - state: cover_base
+        color: "#507bad"
+      - state: decor_bottom
+        color: "#bd9a55"
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
     - type: Paper
       content: book-text-ian-desert
 
@@ -252,9 +401,15 @@
   description: The book is a gently used philosophy text, with a cover that features a close-up of a person's mouth, with the word "names" written on their lips. The title is "The Power of Names - A Philosophical Exploration," and the author's name is prominently displayed underneath. The overall design is simple and elegant, with the focus on the text rather than any flashy graphics or images.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_names
+      - state: paper
+      - state: cover_base
+        color: "#8c8c8c"
+      - state: decor_wingette_circle
+      - state: icon_letter_N
+      - state: detail_bookmark
+      - state: overlay_dirt
     - type: Paper
       content: book-text-names
 
@@ -265,9 +420,19 @@
   description: The book is in good condition, with a slightly faded cover due to exposure to sunlight.  The cover of the book depicts a panoramic view of the Earth from space, with a bright blue ocean and green landmasses. In the foreground, a lone astronaut is seen sitting in front of a window, gazing wistfully at the Earth. The title of the book, "Earthly Longing," is written in bold white letters against a black background at the top of the cover.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_earth
+      - state: paper
+      - state: cover_strong
+        color: "#0f204f"
+      - state: decor_wingette_circle
+        color: "#2c5491"
+      - state: decor_vertical_middle
+        color: "#3c6ab0"
+      - state: icon_planet
+      - state: icon_text3
+      - state: detail_bookmark
+        color: "#2c5491"
     - type: Paper
       content: book-text-earth
 
@@ -278,9 +443,21 @@
   description: The book is in excellent condition, with a shiny cover depicting a spaceship hovering above a planet, perhaps with the Earth in the background. The title "Journey Beyond - The Starship Aurora Mission" is written in bold, silver letters. The cover also features a quote from a review, "A breathtaking tale of human achievement and exploration" to entice potential readers.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_aurora
+      - state: paper
+      - state: cover_base
+        color: "#0f204f"
+      - state: decor_vertical_middle
+        color: "#3c6ab0" 
+      - state: decor_spine
+        color: "#3c6ab0" 
+      - state: icon_stars2
+      - state: icon_aurora
+      - state: detail_bookmark
+        color: "#2c5491"
+      - state: detail_rivets
+        color: "#799dd4"
     - type: Paper
       content: book-text-aurora
 
@@ -291,9 +468,18 @@
   description: The book appears new with crisp pages and an uncreased spine. The cover features an image of a temple with a glowing, multicolored aura around it, symbolizing the various gods discussed in the book. The title is displayed prominently in gold lettering, with the author's name and a brief summary of the book written in smaller text below.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_temple
+      - state: paper
+      - state: cover_base
+        color: "#542e80"
+      - state: decor_vertical_middle
+        color: "#39205e"
+      - state: decor_wingette_circle
+        color: "#914fb8"
+      - state: icon_temple
+      - state: detail_bookmark
+        color: "#bfbfbf"
     - type: Paper
       content: book-text-temple
 
@@ -304,9 +490,18 @@
   description: The book is in good condition, with a slightly worn cover that features a dark and ominous space station looming in the background. The title "Watched" is written in bold letters that seem to be staring back at the reader, conveying the feeling of being constantly observed. The blurb on the back cover hints at a thrilling and suspenseful tale of paranoia and danger in a confined setting.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_watched
+      - state: paper
+      - state: cover_base
+        color: "#611e10"
+      - state: overlay_dirt
+        color: "#4f1206"
+      - state: decor_wingette_circle
+        color: "#241e1d"
+      - state: icon_eye
+      - state: detail_bookmark
+        color: "#bfbfbf"
     - type: Paper
       content: book-text-watched
 
@@ -317,9 +512,17 @@
   description: The cover features Smith, the medical officer, in his uniform, looking determined and ready to face any challenge. The backdrop shows the SS Horizon under attack, with explosions and smoke filling the space station. In the foreground, a wizard with a staff can be seen, adding an element of mystery and intrigue to the scene. The title is prominently displayed in bold letters, with the author's name and a tagline indicating the book's action-packed and suspenseful nature.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_medical
+      - state: paper
+      - state: cover_base
+        color: "#d7dadb"
+      - state: decor_wingette_circle
+        color: "#55b0d4"
+      - state: icon_medical_cross
+        color: "#55b0d4"
+      - state: detail_bookmark
+        color: "#55b0d4"
     - type: Paper
       content: book-text-medical-officer
 
@@ -330,9 +533,16 @@
   description: The book looks old and worn, with faded lettering on the cover. The cover depicts a dark and eerie morgue, with a full moon casting an ominous glow over the scene. In the foreground are Morty the possum and Morticia the raccoon, with mischievous expressions on their faces, peeking out from behind a metal shelf. The title is written in bold, spooky letters, with the subtitle "A Tale of Animal Spirits" written in smaller font below.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_morgue
+      - state: paper
+      - state: cover_old
+        color: "#d7dadb"
+      - state: icon_text2
+        color: "#61363d"
+      - state: overlay_dirt
+      - state: detail_bookmark
+        color: "#61363d"
     - type: Paper
       content: book-text-morgue
 
@@ -343,9 +553,21 @@
   description: The book is in new condition, with vibrant colors and illustrations on the cover. The cover shows Rufus on his bicycle, with Blossom flying beside him in a playful manner. The title is written in bold, whimsical font, with the characters' names highlighted in a contrasting color. The overall aesthetic is charming and inviting, appealing to children and adults alike.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_rufus
+      - state: paper
+      - state: cover_base
+        color: "#6597c9"
+      - state: decor_bottom
+        color: "#113a63"
+      - state: decor_diagonal
+        color: "#113a63"
+      - state: icon_text3
+        color: "#ffde7d"
+      - state: detail_bookmark
+        color: "#61363d"
+      - state: detail_rivets
+        color: "#ffde7d"
     - type: Paper
       content: book-text-rufus
 
@@ -356,9 +578,19 @@
   description: The book is in a good condition, with a glossy cover depicting a jungle scene with vibrant colors and intricate details. The title "The Map of Adventure," is written in bold, gold lettering. The cover also features an image of a mysterious suitcase with the map spilling out of it.
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_map
+      - state: paper
+      - state: cover_base
+        color: "#56c463"
+      - state: icon_briefcase
+      - state: decor_wingette
+        color: "#298033"
+      - state: icon_briefcase
+      - state: detail_bookmark
+        color: "#61363d"
+      - state: detail_rivets
+        color: "#ffde7d"
     - type: Paper
       content: book-text-map
 
@@ -369,9 +601,17 @@
   description: The book is in excellent condition, with crisp pages and a glossy cover. The cover features a striking image of a mountain range, with a silhouette of a climber with a guitar on their back in the foreground. The title is bold and eye-catching, with the subtitle "A Journey of Music, Mountains, and Self-Discovery."
   components:
     - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_journ_mount
+      - state: paper
+      - state: cover_base
+        color: "#9bc1c9"
+      - state: icon_briefcase
+      - state: icon_mount
+      - state: detail_bookmark
+        color: "#61363d"
+      - state: detail_rivets
+        color: "#ffde7d"
     - type: Paper
       content: book-text-journ-mount
 
@@ -384,7 +624,16 @@
     - type: Sprite
       sprite: Objects/Misc/books.rsi
       layers:
-        - state: book6
+      - state: paper
+      - state: cover_base
+        color: "#1d662c"
+      - state: decor_spine
+        color: "#2a8c58"
+      - state: icon_glow
+        color: "#b9edc4"
+      - state: icon_tree
+      - state: detail_bookmark
+        color: "#61363d"
     - type: Paper
       content: book-text-inspiration
 
@@ -397,7 +646,14 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book0 
+    - state: paper
+    - state: cover_old
+      color: "#c526de"
+    - state: decor_wingette
+    - state: icon_bucket
+    - state: detail_bookmark
+      color: "#61363d"
+    - state: overlay_dirt
   - type: Paper
     content: book-text-janitor
 

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

@@ -1,8 +1,8 @@
 - type: entity
   parent: BaseStorageItem
-  abstract: true
   id: BriefcaseBase
   description: Useful for carrying items in your hands.
+  abstract: true
   components:
   - type: Item
     size: Ginormous
@@ -14,10 +14,9 @@
     - Briefcase
 
 - type: entity
-  name: brown briefcase
   parent: BriefcaseBase
   id: BriefcaseBrown
-  description: A handy briefcase.
+  name: brown briefcase
   components:
   - type: Sprite
     sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
@@ -26,23 +25,9 @@
     sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
 
 - type: entity
-  parent: BriefcaseBase
-  abstract: true
-  id: BriefcaseSyndieBase
+  parent: BriefcaseBrown
+  id: BriefcaseSyndie
   suffix: Syndicate, Empty
-  description: Useful for carrying items in your hands.
   components:
   - type: Item
     size: Huge
-
-- type: entity
-  name: brown briefcase
-  parent: BriefcaseSyndieBase
-  id: BriefcaseSyndie
-  description: A handy briefcase.
-  components:
-  - type: Sprite
-    sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
-    state: icon
-  - type: Item
-    sprite: Objects/Storage/Briefcases/briefcase_brown.rsi

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

@@ -0,0 +1,19 @@
+- type: entity
+  name: coordinates disk
+  parent: BaseItem
+  id: CoordinatesDisk
+  description: A disk containing the coordinates to a location in space. Necessary for any FTL-traversing vessel to reach their destination. Fits inside shuttle consoles.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/cd.rsi
+    state: icon
+  - type: StaticPrice
+    price: 100
+  - type: Tag
+    tags:
+    - CoordinatesDisk
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Slash: 1
+  - type: ShuttleDestinationCoordinates

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

@@ -0,0 +1,21 @@
+- type: entity
+  name: diskcase
+  parent: BaseStorageItem
+  id: DiskCase
+  description: Case for storing a coordinates disk.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/diskcases.rsi
+    state: icon_base
+  - type: Storage
+    grid:
+    - 0,0,0,1
+    maxItemSize: Normal
+    whitelist:
+      tags:
+        - Document
+        - CoordinatesDisk
+    storageOpenSound: /Audio/Machines/screwdriveropen.ogg
+    storageCloseSound: /Audio/Machines/screwdriverclose.ogg
+    storageInsertSound: /Audio/Items/crowbar.ogg
+    storageRemoveSound: /Audio/Items/crowbar.ogg

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

@@ -15,9 +15,6 @@
         Blunt: 5
   - type: Stack
     count: 1
-  - type: Tag
-    tags:
-      - NoPaint
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible

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

@@ -87,123 +87,6 @@
         - Mop
         - MopAdv
 
-- type: entity
-  name: mop bucket
-  id: MopBucket
-  description: Holds water and the tears of the janitor.
-  components:
-  - type: Clickable
-  - type: Sprite
-    sprite: Objects/Specific/Janitorial/janitorial.rsi
-    noRot: true
-    layers:
-    - state: mopbucket
-    - state: mopbucket_water-1
-      map: ["enum.SolutionContainerLayers.Fill"]
-      visible: false
-    drawdepth: Objects
-  - type: InteractionOutline
-  - type: SolutionContainerManager
-    solutions:
-      bucket:
-        maxVol: 600
-  - type: Spillable
-    solution: bucket
-    spillDelay: 3.0
-  - type: DrainableSolution
-    solution: bucket
-  - type: RefillableSolution
-    solution: bucket
-  - type: ExaminableSolution
-    solution: bucket
-  - type: Tag
-    tags:
-      - Wringer
-  - type: ItemMapper
-    mapLayers:
-      mopbucket_shark_blue:
-        whitelist:
-          tags:
-            - PlushieSharkBlue
-      mopbucket_shark_pink:
-        whitelist:
-          tags:
-            - PlushieSharkPink
-      mopbucket_shark_grey:
-        whitelist:
-          tags:
-            - PlushieSharkGrey
-    sprite: Objects/Fun/sharkplush.rsi
-  - type: Physics
-    bodyType: Dynamic
-  - type: Transform
-    noRot: true
-  - type: ItemSlots
-    slots:
-      shark_slot:
-        name: mop-bucket-slot-component-slot-name-shark
-        whitelist:
-          tags:
-            - PlushieSharkBlue
-            - PlushieSharkPink
-            - PlushieSharkGrey
-        priority: 3 # Higher than drinking priority
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.25,-0.40,0.25,0.25"
-        density: 60
-        mask:
-        - MobMask
-        layer:
-        - MobLayer
-  - type: Pullable
-  - type: Drink
-    solution: bucket
-  - type: Appearance
-  - type: SolutionContainerVisuals
-    maxFillLevels: 3
-    fillBaseName: mopbucket_water-
-  - type: ContainerContainer
-    containers:
-      storagebase: !type:Container
-        ents: []
-      shark_slot: !type:ContainerSlot {}
-  - type: GuideHelp
-    guides:
-    - Janitorial
-  - type: Damageable
-    damageContainer: Inorganic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 70
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-
-- type: entity
-  name: mop bucket
-  id: MopBucketFull
-  parent: MopBucket
-  suffix: full
-  components:
-    - type: Sprite
-      layers:
-        - state: mopbucket
-        - state: mopbucket_water-3
-          map: [ "enum.SolutionContainerLayers.Fill" ]
-    - type: SolutionContainerManager
-      solutions:
-        bucket:
-          maxVol: 600
-          reagents:
-            - ReagentId: Water
-              Quantity: 600
-
 - type: entity
   name: wet floor sign
   id: WetFloorSign
@@ -279,291 +162,6 @@
     tags: # ignore "WhitelistChameleon" tag
       - WetFloorSign
 
-- type: entity
-  name: janitorial trolley
-  id: JanitorialTrolley
-  parent: BaseStructureDynamic
-  description: This is the alpha and omega of sanitation.
-  components:
-    - type: Sprite
-      noRot: true
-      sprite: Objects/Specific/Janitorial/janitorial_cart.rsi
-      layers:
-        - state: cart
-        - state: cart_water-1
-          map: ["enum.SolutionContainerLayers.Fill"]
-          visible: false
-    - type: Rotatable
-    - type: InteractionOutline
-    # Removing storage until OnInteractUsing logic resolved
-    #- type: Storage
-    #  popup: false
-    #  capacity: 80
-    #  blacklist: # there is exclusive item slots for that
-    #    tags:
-    #      - Mop
-    #      - TrashBag
-    #      - Bucket
-    - type: ItemSlots
-      slots:
-        mop_slot:
-          name: janitorial-trolley-slot-component-slot-name-mop
-          whitelist:
-            tags:
-              - Mop
-          insertOnInteract: false # or it conflicts with bucket logic
-          priority: 9 # Higher than bucket slot
-        plunger_slot:
-          name: janitorial-trolley-slot-component-slot-name-plunger
-          whitelist:
-            tags:
-              - Plunger
-          priority: 8
-        wetfloorsign_slot4:
-          name: janitorial-trolley-slot-component-slot-name-sign
-          whitelist:
-            tags:
-              - WetFloorSign
-          priority: 7
-        wetfloorsign_slot3:
-          name: janitorial-trolley-slot-component-slot-name-sign
-          whitelist:
-            tags:
-              - WetFloorSign
-          priority: 7
-        wetfloorsign_slot2:
-          name: janitorial-trolley-slot-component-slot-name-sign
-          whitelist:
-            tags:
-              - WetFloorSign
-          priority: 7
-        wetfloorsign_slot1:
-          name: janitorial-trolley-slot-component-slot-name-sign
-          whitelist:
-            tags:
-              - WetFloorSign
-          priority: 7
-        lightreplacer_slot:
-          name: janitorial-trolley-slot-component-slot-name-lightreplacer
-          whitelist:
-            components:
-              - LightReplacer
-          priority: 6
-        spraybottle_slot:
-          name: janitorial-trolley-slot-component-slot-name-spray
-          whitelist:
-            tags:
-              - Spray
-          insertOnInteract: false # or it conflicts with bucket logic
-          priority: 5 # Higher than bucket slot
-        bucket_slot:
-          name: janitorial-trolley-slot-component-slot-name-bucket
-          whitelist:
-            tags:
-              - Bucket
-          insertOnInteract: false # or it also conflicts with bucket logic
-          priority: 4 # Higher than trash bag slot
-        trashbag_slot:
-          name: janitorial-trolley-slot-component-slot-name-trashbag
-          whitelist:
-            tags:
-              - TrashBag
-          priority: 3 # Higher than drinking priority
-    - type: Fixtures
-      fixtures:
-        fix1:
-          shape:
-            !type:PhysShapeCircle
-            radius: 0.3
-          density: 250
-          layer:
-          - MobLayer
-          mask:
-          - MobMask
-    - type: Spillable
-      solution: bucket
-      spillDelay: 3.0
-    - type: SolutionContainerManager
-      solutions:
-        bucket:
-          maxVol: 800
-          reagents:
-            - ReagentId: Water
-              Quantity: 600 # 3 quarters full at roundstart to make it more appealing
-    - type: DrainableSolution
-      solution: bucket
-    - type: RefillableSolution
-      solution: bucket
-    - type: ExaminableSolution
-      solution: bucket
-    - type: Tag
-      tags:
-        - Wringer
-    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
-    - type: Destructible
-      thresholds:
-        - trigger:
-            !type:DamageTrigger
-            damage: 400
-          behaviors:
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-        - trigger:
-            !type:DamageTrigger
-            damage: 200
-          behaviors:
-            - !type:EmptyAllContainersBehaviour
-            - !type:DoActsBehavior
-              acts: ["Destruction"]
-            - !type:PlaySoundBehavior
-              sound:
-                collection: MetalBreak
-    - type: ItemMapper
-      mapLayers:
-        cart_plunger:
-          whitelist:
-            tags:
-              - Plunger
-        cart_mop:
-          whitelist:
-            tags:
-              - MopBasic
-        cart_advmop:
-          whitelist:
-            tags:
-              - MopAdv
-        cart_garbage:
-          whitelist:
-            tags:
-              - TrashBag
-        cart_replacer:
-          whitelist:
-            components:
-              - LightReplacer
-        cart_spray:
-          whitelist:
-            tags:
-              - Spray
-        cart_sign1: # this is like stack of floor signs
-          minCount: 1
-          whitelist:
-            tags:
-              - WetFloorSign
-        cart_sign2:
-          minCount: 2
-          whitelist:
-            tags:
-              - WetFloorSign
-        cart_sign3:
-          minCount: 3
-          whitelist:
-            tags:
-              - WetFloorSign
-        cart_sign4:
-          minCount: 4
-          whitelist:
-            tags:
-              - WetFloorSign
-        cart_bucket:
-          whitelist:
-            tags:
-              - Bucket
-      sprite: Objects/Specific/Janitorial/janitorial_cart.rsi
-    - type: Appearance
-    - type: SolutionContainerVisuals
-      maxFillLevels: 3
-      fillBaseName: cart_water-
-    - type: UserInterface
-      interfaces:
-      - key: enum.StorageUiKey.Key
-        type: StorageBoundUserInterface
-    - type: Drink
-      solution: bucket
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          ents: []
-        mop_slot: !type:ContainerSlot {}
-        trashbag_slot: !type:ContainerSlot {}
-        bucket_slot: !type:ContainerSlot {}
-        plunger_slot: !type:ContainerSlot {}
-        wetfloorsign_slot4: !type:ContainerSlot {}
-        wetfloorsign_slot3: !type:ContainerSlot {}
-        wetfloorsign_slot2: !type:ContainerSlot {}
-        wetfloorsign_slot1: !type:ContainerSlot {}
-        lightreplacer_slot: !type:ContainerSlot {}
-        spraybottle_slot:  !type:ContainerSlot {}
-    - type: GuideHelp
-      guides:
-      - Janitorial
-    - type: TileFrictionModifier
-      modifier: 0.4 # makes it slide
-
-- type: entity
-  id: FloorDrain
-  name: drain
-  description: Drains puddles around it. Useful for dumping mop buckets or keeping certain rooms clean.
-  placement:
-    mode: SnapgridCenter
-  components:
-    - type: Sprite
-      drawdepth: FloorObjects
-      sprite: Objects/Specific/Janitorial/drain.rsi
-      layers:
-      - state: icon
-      - map: [ "enum.SolutionContainerLayers.Fill" ]
-        state: fill-1
-        visible: false
-    - type: InteractionOutline
-    - type: Clickable
-    - type: Transform
-      anchored: true
-    - type: Physics
-      bodyType: Static
-      canCollide: false
-    - type: AmbientSound
-      enabled: false
-      volume: -8
-      range: 8
-      sound:
-        path: /Audio/Ambience/Objects/drain.ogg
-    - type: Drain
-    - type: DumpableSolution
-      solution: drainBuffer
-    - type: Appearance
-    - type: SolutionContainerVisuals
-      maxFillLevels: 1
-      fillBaseName: fill-
-      solutionName: drainBuffer
-    - type: SolutionContainerManager
-      solutions:
-        drainBuffer:
-          maxVol: 1000
-    - type: DrainableSolution
-      solution: drainBuffer
-    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
-    - type: Destructible
-      thresholds:
-        - trigger:
-            !type:DamageTrigger
-            damage: 200
-          behaviors:
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-        - trigger:
-            !type:DamageTrigger
-            damage: 100
-          behaviors:
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-            - !type:PlaySoundBehavior
-              sound:
-                collection: MetalBreak
-
 - type: entity
   name: plunger
   id: Plunger
@@ -622,6 +220,15 @@
     damage:
       types:
         Blunt: 3
+  - type: Plunger
+
+- type: weightedRandomEntity
+  id: PlungerLoot
+  weights:
+    RandomSpawner100: 56
+    SpacemenFigureSpawner: 28
+    SpawnMobCockroach: 5
+    MaintenanceToolSpawner: 5
 
 - type: entity
   parent: BaseItem

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

@@ -62,7 +62,6 @@
     solution: soap
   - type: DeleteOnSolutionEmpty
     solution: soap
-  - type: PaintRemover
   - type: FlavorProfile
     flavors:
       - clean

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

@@ -66,9 +66,6 @@
     bodyType: KinematicController
   - type: Clickable
   - type: WiresPanel
-  - type: Wires #we just want the panel
-    boardName: wires-board-name-mech
-    layoutId: Mech
   - type: Fixtures
     fixtures:
       fix1:

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

@@ -710,6 +710,10 @@
   parent: Pill
   id: PillAmbuzolPlus
   components:
+    - type: Pill
+      pillType: 2
+    - type: Sprite
+      state: pill3
     - type: SolutionContainerManager
       solutions:
         food:

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

@@ -115,6 +115,7 @@
     solutionName: pen
     transferAmount: 15
     onlyAffectsMobs: false
+    injectOnly: true
   - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 1
@@ -205,6 +206,7 @@
     solutionName: pen
     transferAmount: 20
     onlyAffectsMobs: false
+    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -236,6 +238,7 @@
     solutionName: pen
     transferAmount: 20
     onlyAffectsMobs: false
+    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -267,6 +270,8 @@
     solutionName: pen
     transferAmount: 20
     onlyAffectsMobs: false
+    injectOnly: true
+
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -299,6 +304,7 @@
     solutionName: pen
     transferAmount: 30
     onlyAffectsMobs: false
+    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -337,6 +343,7 @@
     solutionName: pen
     transferAmount: 30
     onlyAffectsMobs: false
+    injectOnly: true
   - type: StaticPrice
     price: 500
   - type: Tag
@@ -397,6 +404,7 @@
     solutionName: pen
     transferAmount: 30
     onlyAffectsMobs: false
+    injectOnly: true
   - type: StaticPrice
     price: 500
   - type: Tag
@@ -417,6 +425,7 @@
     solution: hypospray
   - type: ExaminableSolution
     solution: hypospray
+    heldOnly: true # Allow examination only when held in hand.
   - type: Hypospray
     onlyAffectsMobs: false
   - type: UseDelay

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

@@ -120,6 +120,8 @@
   - type: SolutionSpiker
     sourceSolution: food
     ignoreEmpty: true
+  - type: ScoopableSolution
+    solution: food
   - type: Extractable
     grindableSolutionName: food
 

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

@@ -517,13 +517,13 @@
   components:
     - type: Sprite
       layers:
-        - state: syndicate
-        - state: icon-tools
+      - state: syndicate
+      - state: icon-syndicate
     - type: ItemBorgModule
       items:
-        - Crowbar
-        - Emag
-        - PinpointerSyndicateNuclear
+      - Crowbar
+      - Emag
+      - PinpointerSyndicateNuclear
 
 - type: entity
   id: BorgModuleEsword
@@ -533,12 +533,12 @@
   components:
     - type: Sprite
       layers:
-        - state: syndicate
-        - state: icon-tools
+      - state: syndicate
+      - state: icon-syndicate
     - type: ItemBorgModule
       items:
-        - EnergySwordDouble
-        - PinpointerSyndicateNuclear
+      - EnergySwordDouble
+      - PinpointerSyndicateNuclear
 
 - type: entity
   id: BorgModuleL6C
@@ -548,9 +548,9 @@
   components:
     - type: Sprite
       layers:
-        - state: syndicate
-        - state: icon-tools
+      - state: syndicate
+      - state: icon-syndicate
     - type: ItemBorgModule
       items:
-        - WeaponLightMachineGunL6C
-        - PinpointerSyndicateNuclear
+      - WeaponLightMachineGunL6C
+      - PinpointerSyndicateNuclear

Resources/Prototypes/Entities/Objects/Tools/tools.yml

@@ -337,15 +337,35 @@
       path: "/Audio/Items/drill_hit.ogg"
 
 - type: entity
-  name: RCD
-  parent: BaseItem
   id: RCD
-  description: An advanced construction device which can place/remove walls, floors, and airlocks quickly.
+  parent: BaseItem
+  name: RCD
+  description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function.
   components:
   - type: RCD
+    availablePrototypes:   
+    - WallSolid
+    - FloorSteel
+    - Plating
+    - Catwalk
+    - Grille
+    - Window    
+    - WindowDirectional
+    - WindowReinforcedDirectional
+    - ReinforcedWindow
+    - Airlock
+    - AirlockGlass
+    - Firelock
+    - TubeLight
+    - BulbLight
+    - LVCable
+    - MVCable
+    - HVCable
+    - CableTerminal
+    - Deconstruct
   - type: LimitedCharges
-    maxCharges: 5
-    charges: 5
+    maxCharges: 30
+    charges: 30
   - type: UseDelay
   - type: Sprite
     sprite: Objects/Tools/rcd.rsi
@@ -363,6 +383,12 @@
       Plastic: 100
   - type: StaticPrice
     price: 100
+  - type: UserInterface
+    interfaces:
+    - key: enum.RcdUiKey.Key
+      type: RCDMenuBoundUserInterface
+  - type: ActivatableUI
+    key: enum.RcdUiKey.Key
 
 - type: entity
   id: RCDEmpty
@@ -370,37 +396,50 @@
   suffix: Empty
   components:
   - type: LimitedCharges
-    maxCharges: 5
     charges: 0
+  - type: RCD
+    availablePrototypes:   
+    - WallSolid
+    - FloorSteel
+    - Plating
+    - Catwalk
+    - Grille
+    - Window
+    - WindowDirectional
+    - WindowReinforcedDirectional
+    - ReinforcedWindow
+    - Airlock
+    - AirlockGlass
+    - Firelock
 
 - type: entity
   id: RCDRecharging
   parent: RCD
-  name: experimental rcd
-  description: A bluespace-enhanced RCD that regenerates charges passively.
+  name: experimental RCD
+  description: A bluespace-enhanced rapid construction device that passively generates its own compressed matter.
   suffix: AutoRecharge
   components:
   - type: LimitedCharges
-    maxCharges: 3
-    charges: 3
+    maxCharges: 20
+    charges: 20
   - type: AutoRecharge
-    rechargeDuration: 30
+    rechargeDuration: 10
 
 - type: entity
   id: RCDExperimental
   parent: RCD
   suffix: Admeme
-  name: experimental rcd
-  description: A bluespace-enhanced RCD that regenerates charges passively.
+  name: experimental RCD
+  description: A bluespace-enhanced rapid construction device that passively generates its own compressed matter.
   components:
   - type: AutoRecharge
-    rechargeDuration: 5
+    rechargeDuration: 1
 
 - type: entity
-  name: RCD Ammo
+  name: compressed matter
   parent: BaseItem
   id: RCDAmmo
-  description: Ammo cartridge for an RCD.
+  description: A cartridge of raw matter compacted by bluespace technology. Used in rapid construction devices.
   components:
   - type: RCDAmmo
   - type: Sprite

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

@@ -86,8 +86,8 @@
     damage:
       types:
         Piercing: 3
-        Slash: 3 
-        
+        Slash: 3
+
 
 - type: entity
   id: PelletShotgunTranquilizer
@@ -110,9 +110,9 @@
     solution: ammo
   - type: DrainableSolution
     solution: ammo
-  - type: SolutionInjectOnCollide
+  - type: SolutionInjectOnProjectileHit
     transferAmount: 15
-    blockSlots: NONE #tranquillizer darts shouldn't be blocked by a mask
+    solution: ammo
   - type: InjectableSolution
     solution: ammo
 

Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -643,6 +643,7 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/Revolvers/chimp.rsi
   - type: Gun
+    projectileSpeed: 4
     fireRate: 1.5
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
@@ -657,6 +658,8 @@
       fireCost: 100
     - proto: AnomalousParticleZetaStrong
       fireCost: 100
+    - proto: AnomalousParticleSigmaStrong
+      fireCost: 100
   - type: Construction
     graph: UpgradeWeaponPistolCHIMP
     node: start
@@ -679,6 +682,8 @@
       fireCost: 100
     - proto: AnomalousParticleZetaStrong
       fireCost: 100
+    - proto: AnomalousParticleSigmaStrong
+      fireCost: 100
 
 - type: entity
   name: eye of a behonker

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml

@@ -50,9 +50,9 @@
     solution: ammo
   - type: InjectableSolution
     solution: ammo
-  - type: SolutionInjectOnCollide
+  - type: SolutionInjectOnEmbed
     transferAmount: 2
-    blockSlots: NONE
+    solution: ammo
   - type: SolutionTransfer
     maxTransferAmount: 2
   - type: Appearance

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -487,6 +487,11 @@
   name: delta particles
   noSpawn: true
   components:
+  - type: PointLight
+    enabled: true
+    color: "#c2385d"
+    radius: 2.0
+    energy: 7.0
   - type: AnomalousParticle
     particleType: Delta
   - type: Sprite
@@ -513,6 +518,9 @@
         Heat: 5
   - type: TimedDespawn
     lifetime: 3
+  - type: Reflective
+    reflective:
+    - Energy
 
 
 - type: entity
@@ -533,6 +541,11 @@
   name: epsilon particles
   noSpawn: true
   components:
+  - type: PointLight
+    enabled: true
+    color: "#38c296"
+    radius: 2.0
+    energy: 7.0
   - type: Sprite
     layers:
       - state: magicm_cyan
@@ -558,6 +571,11 @@
   name: zeta particles
   noSpawn: true
   components:
+  - type: PointLight
+    enabled: true
+    color: "#b9c238"
+    radius: 2.0
+    energy: 7.0
   - type: Sprite
     layers:
       - state: magicm_yellow
@@ -583,6 +601,11 @@
   name: omega particles
   noSpawn: true
   components:
+  - type: PointLight
+    enabled: true
+    color: "#38c24f"
+    radius: 2.0
+    energy: 7.0
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
     layers:
@@ -601,6 +624,33 @@
       types:
         Heat: 20
 
+- type: entity
+  parent: AnomalousParticleDelta
+  id: AnomalousParticleSigma
+  name: sigma particles
+  noSpawn: true
+  components:
+  - type: PointLight
+    enabled: true
+    color: "#8d38c2"
+    radius: 2.0
+    energy: 7.0
+  - type: Sprite
+    layers:
+      - state: magicm
+        shader: unshaded
+  - type: AnomalousParticle
+    particleType: Sigma
+    
+- type: entity
+  parent: AnomalousParticleSigma
+  id: AnomalousParticleSigmaStrong
+  name: sigma particles
+  noSpawn: true
+  components:
+  - type: AnomalousParticle
+    particleType: Sigma
+    
 # Launcher projectiles (grenade / rocket)
 - type: entity
   id: BulletRocket

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

@@ -78,9 +78,6 @@
     malus: 0
   - type: Reflect
     enabled: false
-  - type: Tag
-    tags:
-      - NoPaint
   - type: IgnitionSource
     temperature: 700
 
@@ -159,7 +156,6 @@
   - type: Tag
     tags:
     - Write
-    - NoPaint
   - type: DisarmMalus
     malus: 0
 

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

@@ -263,6 +263,7 @@
     tags:
     - CombatKnife
     - Knife
+    - CannonRestrict
   - type: Sprite
     sprite: Objects/Weapons/Melee/throwing_knife.rsi
     state: icon
@@ -275,6 +276,7 @@
   - type: EmbeddableProjectile
     sound: /Audio/Weapons/star_hit.ogg
   - type: DamageOtherOnHit
+    ignoreResistances: true
     damage:
       types:
         Slash: 10

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

@@ -65,10 +65,9 @@
     solution: melee
   - type: InjectableSolution
     solution: melee
-  - type: SolutionInjectOnCollide
+  - type: SolutionInjectOnEmbed
     transferAmount: 2
-    fixtureId: "throw-fixture"
-    blockSlots: NONE
+    solution: melee
   - type: SolutionTransfer
     maxTransferAmount: 2
   - type: Wieldable

Resources/Prototypes/Entities/Stations/base.yml

@@ -120,4 +120,4 @@
   id: BaseStationAllEventsEligible
   abstract: true
   components:
-    - type: StationEventEligible # For when someone makes this more granular in the future.
+    - type: StationEventEligible # For when someone makes this more granular in the future.

Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml

@@ -1,5 +1,6 @@
 - type: entity
   id: Bonfire
+  noSpawn: true
   parent: BaseStructure
   name: bonfire
   description: What can be better then late evening under the sky with guitar and friends.
@@ -31,12 +32,10 @@
     sound:
       path: /Audio/Ambience/Objects/fireplace.ogg
   - type: AlwaysHot
-  - type: Tag
-    tags:
-      - NoPaint
 
 - type: entity
   id: LegionnaireBonfire
+  noSpawn: true
   parent: Bonfire
   name: legionnaire bonfire
   description: There, in the land of lava and ash, place to to cook marshmallow and potato.

Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml

@@ -71,5 +71,4 @@
       beakerSlot: !type:ContainerSlot
   - type: StaticPrice
     price: 1000
-  - type: Wires
   - type: WiresPanel

Resources/Prototypes/Entities/Structures/Dispensers/booze.yml

@@ -19,9 +19,6 @@
     noRot: false
   - type: Machine
     board: BoozeDispenserMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-booze
-    layoutId: BoozeDispenser
   - type: GuideHelp
     guides:
     - Bartender

Resources/Prototypes/Entities/Structures/Dispensers/chem.yml

@@ -31,9 +31,6 @@
         acts: ["Destruction"]
   - type: Machine
     board: ChemDispenserMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-chemdispenser
-    layoutId: ChemDispenser
   - type: GuideHelp
     guides:
     - Chemicals

Resources/Prototypes/Entities/Structures/Dispensers/soda.yml

@@ -19,9 +19,6 @@
     noRot: false
   - type: Machine
     board: SodaDispenserMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-soda
-    layoutId: SodaDispenser
   - type: GuideHelp
     guides:
     - Bartender

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

@@ -138,48 +138,6 @@
     sprite: Structures/Doors/Airlocks/Standard/hatch_maint.rsi
 
 # Glass
-
-- type: entity
-  id: AirlockGlass
-  parent: Airlock
-  name: glass airlock
-  components:
-  - type: MeleeSound
-    soundGroups:
-      Brute:
-        collection: GlassSmack
-  - type: Door
-    occludes: false
-  - type: Occluder
-    enabled: false
-  - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/glass.rsi
-  - type: AnimationPlayer
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
-        density: 100
-        mask:
-        - FullTileMask
-        layer:     #removed opaque from the layer, allowing lasers to pass through glass airlocks
-        - GlassAirlockLayer
-  - type: LayerChangeOnWeld
-    unWeldedLayer: GlassAirlockLayer
-    weldedLayer: GlassLayer
-  - type: Construction
-    graph: Airlock
-    node: glassAirlock
-  - type: PaintableAirlock
-    group: Glass
-  - type: RadiationBlocker
-    resistance: 2
-  - type: Tag
-    tags:
-      - GlassAirlock
-      # This tag is used to nagivate the Airlock construction graph. It's needed because the construction graph is shared between Airlock, AirlockGlass, and HighSecDoor
 - type: entity
   parent: AirlockGlass
   id: AirlockEngineeringGlass
@@ -295,4 +253,4 @@
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/centcomm.rsi
   - type: WiresPanelSecurity
-    securityLevel: medSecurity
+    securityLevel: medSecurity

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

@@ -30,6 +30,10 @@
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger: