address upstream merge issues

Author: DinnerCalzone

Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml

@@ -251,9 +251,12 @@
     layers:
     - state: green
     - state: ai
-  - type: ConditionalSpawner
+  - type: RandomSpawner # imp edit - this was originally a conditional spawner with just MobPossumMortyOld.
     prototypes:
+    - MobPossumMorty
+    rarePrototypes:
     - MobPossumMortyOld
+    rareChance: 0.20
 
 - type: entity
   parent: MarkerBase

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

@@ -2917,7 +2917,7 @@
     - type: Sprite
       drawdepth: Mobs
       layers:
-      - map: ["enum.DamageStateVisualLayers.Base", "movement"] #imp
+      - map: ["enum.DamageStateVisualLayers.Base"]
         state: clown
         sprite: Mobs/Animals/clownspider.rsi
     - type: Butcherable
@@ -2955,15 +2955,6 @@
     - type: Bloodstream
       bloodMaxVolume: 150
       bloodReagent: Laughter
-  # imp edit start
-    - type: SpriteMovement
-      movementLayers:
-        movement:
-          state: clown
-      noMovementLayers:
-        movement:
-          state: clown
-    # imp edit end
 
 - type: entity
   name: wizard spider

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

@@ -503,16 +503,16 @@
   components:
   - type: Sprite
     drawdepth: Mobs
-    sprite: Mobs/Animals/possum.rsi #imp
+    sprite: Mobs/Animals/possum_old.rsi
     layers:
     - map: [ "enum.DamageStateVisualLayers.Base" ]
-      state: possum #imp
+      state: possum_old
   - type: DamageStateVisuals
     states:
       Alive:
-        Base: possum #imp
+        Base: possum_old
       Dead:
-        Base: possum_dead #imp
+        Base: possum_dead_old
 
 - type: entity
   name: Poppy # the Safety Possum

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml

@@ -1520,12 +1520,12 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 55
+        maxVol: 85 #imp
         reagents:
         - ReagentId: Nutriment
-          Quantity: 40
+          Quantity: 45 #imp
         - ReagentId: Vitamin
-          Quantity: 10
+          Quantity: 25 #imp
         - ReagentId: Milk
           Quantity: 10
   - type: SliceableFood
@@ -1561,12 +1561,12 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 12
+        maxVol: 21 #imp
         reagents:
         - ReagentId: Nutriment
-          Quantity: 8
+          Quantity: 9 #imp
         - ReagentId: Vitamin
-          Quantity: 2
+          Quantity: 5 #imp
         - ReagentId: Milk
           Quantity: 2
   - type: Tag

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml

@@ -445,7 +445,7 @@
 # Tastes like jelly-donut, fizzy tutti frutti.
 
 - type: entity
-  name: scurret jelly-donut
+  name: sirval jelly-donut #imp
   parent: FoodDonutBase
   id: FoodDonutJellyScurret
   description: The jelly in this is pitch black. Transcendental. #imp

Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

@@ -1875,6 +1875,7 @@
     FoodBerries: 5
   reagents:
     Milk: 10
+  recipeType: Assembler #imp
 
 - type: microwaveMealRecipe
   id: RecipeBreadDog

Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/grenades.yml

@@ -64,65 +64,19 @@
     keysIn:
     - timer
 
-- type: entity # Upstream got rid of it and I want both
-  name: supermatter grenade
-  description: Grenade that simulates delamination of the supermatter engine, pulling things in a heap and exploding after some time.
-  parent: [SingularityGrenade, BaseSyndicateContraband]
-  id: SupermatterGrenade
-  components:
-  - type: Explosive
-    explosionType: Default
-    totalIntensity: 200
-    intensitySlope: 30
-    maxIntensity: 120
-  - type: TwoStageTrigger
-    triggerDelay: 10.45
-    components:
-    - type: AmbientSound
-      enabled: true
-      volume: -5
-      range: 14
-      sound:
-        path: /Audio/Effects/Grenades/Supermatter/supermatter_loop.ogg
-    - type: GravityWell
-      maxRange: 8
-      baseRadialAcceleration: 145
-      baseTangentialAcceleration: 5
-      gravPulsePeriod: 0.01
-    - type: SingularityDistortion
-      intensity: 150
-      falloffPower: 1.5
-    - type: PointLight
-      enabled: true
-      color: "#ffaa44"
-      energy: 8
-      radius: 6
-      softness: 1
-      offset: "0, 0"
-    - type: EmitSoundOnTrigger
-      sound:
-        path: /Audio/Effects/Grenades/Supermatter/supermatter_end.ogg
-        params:
-          volume: 5
-      keysIn:
-      - stageTwo
-    - type: ExplodeOnTrigger
-      keysIn:
-      - stageTwo
-
 - type: entity
-  parent: [ BaseMinorContraband, SmokeGrenade ] 
+  parent: [ BaseMinorContraband, SmokeGrenade ]
   id: CleanerGrenadeBleach
   name: heavy-duty cleanade
   description: A discontinued brand of heavy-duty cleaning grenade. A warning label reads "DO NOT INHALE".
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/janitor.rsi
   - type: Tag
-    tags: 
+    tags:
     - CleanerGrenade
     - Grenade
-  - type: CartridgeAmmo 
+  - type: CartridgeAmmo
     proto: BulletGrenadeCleanerBleach
     deleteOnSpawn: true
   - type: SmokeOnTrigger

Resources/Prototypes/_Wizden/Prototypes/Object/Weapons/Throwable/grenades.yml

@@ -0,0 +1,45 @@
+- type: entity # Upstream got rid of it and I want both
+  name: supermatter grenade
+  description: Grenade that simulates delamination of the supermatter engine, pulling things in a heap and exploding after some time.
+  parent: [SingularityGrenade, BaseSyndicateContraband]
+  id: SupermatterGrenade
+  components:
+  - type: Explosive
+    explosionType: Default
+    totalIntensity: 200
+    intensitySlope: 30
+    maxIntensity: 120
+  - type: TwoStageTrigger
+    triggerDelay: 10.45
+    components:
+    - type: AmbientSound
+      enabled: true
+      volume: -5
+      range: 14
+      sound:
+        path: /Audio/Effects/Grenades/Supermatter/supermatter_loop.ogg
+    - type: GravityWell
+      maxRange: 8
+      baseRadialAcceleration: 145
+      baseTangentialAcceleration: 5
+      gravPulsePeriod: 0.01
+    - type: SingularityDistortion
+      intensity: 150
+      falloffPower: 1.5
+    - type: PointLight
+      enabled: true
+      color: "#ffaa44"
+      energy: 8
+      radius: 6
+      softness: 1
+      offset: "0, 0"
+    - type: EmitSoundOnTrigger
+      sound:
+        path: /Audio/Effects/Grenades/Supermatter/supermatter_end.ogg
+        params:
+          volume: 5
+      keysIn:
+      - stageTwo
+    - type: ExplodeOnTrigger
+      keysIn:
+      - stageTwo