Stable merge (#37050)

Resources/Prototypes/Magic/animate_spell.yml

@@ -3,14 +3,12 @@
   name: Animate
   description: Bring an inanimate object to life!
   components:
-  - type: LimitedCharges
-    maxCharges: 5
   - type: EntityTargetAction
     useDelay: 0
     itemIconStyle: BigAction
     whitelist:
       components:
-      - Animateable # Currently on: SeatBase, TableBase, ClosetBase, BaseMachine, ConstructibleMachine, BaseComputer, BaseItem, CrateGeneric, StorageTank, GasCanister, BaseTarget
+      - Animateable # Currently on: SeatBase, TableBase, ClosetBase, BaseMachine, ConstructibleMachine, BaseComputer, BaseItem, CrateGeneric, StorageTank, GasCanister
     blacklist:
       components:
       - MindContainer
@@ -19,7 +17,7 @@
       - AnomalyGenerator
       - TegGenerator
       - TegCirculator
-      - Artifact
+      - XenoArtifact
     canTargetSelf: false
     interactOnMiss: false
     sound: !type:SoundPathSpecifier
@@ -70,9 +68,11 @@
               collection: MetalBreak
       - type: Hands
       - type: CanEscapeInventory
+      - type: MobCollision
       toRemove:
       - RequireProjectileTarget
       - BlockMovement
       - Item
+      - MeleeRequiresWield
       speech: action-speech-spell-animate
       doSpeech: false

Resources/Prototypes/Magic/staves.yml

@@ -7,6 +7,10 @@
   name: RGB staff
   description: Helps fix the underabundance of RGB gear on the station.
   components:
+  - type: LimitedCharges
+    maxCharges: 25
+  - type: AutoRecharge
+    rechargeDuration: 30
   - type: Sprite
     sprite: Objects/Weapons/Guns/Basic/staves.rsi
     layers:
@@ -14,6 +18,7 @@
     - state: nothing-unshaded
       shader: unshaded
   - type: ActionOnInteract
+    requiresCharge: true
     actions:
     - ActionRgbLight
   - type: Item
@@ -38,11 +43,16 @@
   name: staff of animation
   description: Brings inanimate objects to life!
   components:
+  - type: LimitedCharges
+    maxCharges: 5
+  - type: AutoRecharge
+    rechargeDuration: 30
   - type: Sprite
     sprite: Objects/Weapons/Guns/Basic/staves.rsi
     layers:
     - state: animation
   - type: ActionOnInteract
+    requiresCharge: true
     actions:
     - ActionAnimateSpell
   - type: Item
@@ -59,8 +69,6 @@
 - type: entity
   id: ActionRgbLight
   components:
-  - type: LimitedCharges
-    maxCharges: 25
   - type: EntityTargetAction
     whitelist: { components: [ PointLight ] }
     sound: /Audio/Magic/blink.ogg

Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml

@@ -19,6 +19,7 @@
     amount: 1
   tileReactions:
   - !type:ExtinguishTileReaction { }
+  - !type:SpillIfPuddlePresentTileReaction { }
 
 - type: reagent
   id: BaseSoda

Resources/Prototypes/Reagents/Consumable/Food/condiments.yml

@@ -175,6 +175,8 @@
   recognizable: true
   physicalDesc: reagent-physical-desc-sticky
   viscosity: 0.55 #Start using syrup to attach your remote recievers to your microwaves!
+  tileReactions:
+    - !type:SpillTileReaction
   metabolisms:
     Food:
       # 12 diona blood for 1 unit of syrup, this stuff better be worthwhile.

Resources/Prototypes/Reagents/biological.yml

@@ -66,6 +66,8 @@
   recognizable: true
   physicalDesc: reagent-physical-desc-viscous
   viscosity: 0.25
+  tileReactions:
+    - !type:SpillTileReaction
   metabolisms:
     Food:
       # Delicious!
@@ -87,6 +89,8 @@
   recognizable: true
   physicalDesc: reagent-physical-desc-sticky
   viscosity: 0.10
+  tileReactions:
+    - !type:SpillTileReaction
   metabolisms:
     Food:
       # Sweet!

Resources/Prototypes/Reagents/cleaning.yml

@@ -77,6 +77,8 @@
   recognizable: true
   boilingPoint: 290.0 # Glycerin
   meltingPoint: 18.2
+  tileReactions:
+  - !type:SpillTileReaction
   friction: 0.0
 
 - type: reagent
@@ -88,6 +90,8 @@
   color: "#ffffff"
   boilingPoint: 250.0
   meltingPoint: 380.0
+  tileReactions:
+  - !type:SpillTileReaction
   viscosity: 0.5
   reactiveEffects:
     Acidic: