Add puddles / reagent spills (#743)

Resources/Prototypes/Entities/Fluids/puddle.yml

@@ -0,0 +1,119 @@
+# TODO: Add the other mess types
+- type: entity
+  id: PuddleBase
+  abstract: true
+  components:
+  - type: SnapGrid
+    offset: Center
+  - type: Sprite
+    drawdepth: FloorObjects
+  - type: Solution
+    caps: 1
+  - type: Puddle
+    spill_sound: /Audio/effects/Fluids/splat.ogg
+    recolor: true
+  - type: Sound
+  - type: InteractionOutline
+  - type: Clickable
+  - type: Collidable
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5,-0.5,0.5,0.5"
+    hard: false
+
+- type: entity
+  name: Puddle
+  id: PuddleGeneric
+  parent: PuddleSmear
+
+- type: entity
+  name: Gibblets
+  id: PuddleGibblet
+  parent: PuddleBase
+  description: Holds spilt milk
+  components:
+  - type: Sprite
+    sprite: Fluids/gibblet.rsi # Placeholder
+    state: gibblet-0
+  - type: Icon
+    icon: Fluids/gibblet.rsi
+    state: gibblet-0
+  - type: Puddle
+    variants: 5
+
+- type: entity
+  name: Smear
+  id: PuddleSmear
+  parent: PuddleBase
+  description: Holds spilt milk
+  components:
+  - type: Sprite
+    sprite: Fluids/smear.rsi # Placeholder
+    state: smear-0
+  - type: Icon
+    icon: Fluids/smear.rsi
+    state: smear-0
+  - type: Puddle
+    variants: 7
+
+- type: entity
+  name: Splatter
+  id: PuddleSplatter
+  parent: PuddleBase
+  description: Holds spilt milk
+  components:
+  - type: Sprite
+    sprite: Fluids/splatter.rsi # Placeholder
+    state: splatter-0
+  - type: Icon
+    icon: Fluids/splatter.rsi
+    state: splatter-0
+  - type: Puddle
+    variants: 6
+
+- type: entity
+  name: Vomit
+  id: PuddleVomit
+  parent: PuddleBase
+  description: 
+  components:
+  - type: Sprite
+    sprite: Fluids/vomit.rsi
+    state: vomit-0
+  - type: Icon
+    icon: Fluids/vomit.rsi
+    state: vomit-0
+  - type: Puddle
+    variants: 4
+    recolor: false
+
+- type: entity
+  name: Toxins vomit
+  id: PuddleVomitToxin
+  parent: PuddleBase
+  description: You probably don't want to get too close to this
+  components:
+  - type: Sprite
+    sprite: Fluids/vomit_toxin.rsi
+    state: vomit_toxin-0
+  - type: Icon
+    icon: Fluids/vomit_toxin.rsi
+    state: vomit_toxin-0
+  - type: Puddle
+    variants: 4
+    recolor: false
+
+- type: entity
+  name: Writing
+  id: PuddleWriting
+  parent: PuddleBase
+  description: Holds spilt milk
+  components:
+  - type: Sprite
+    sprite: Fluids/writing.rsi # Placeholder
+    state: writing-0
+  - type: Icon
+    icon: Fluids/writing.rsi
+    state: writing-0
+  - type: Puddle
+    variants: 5

Resources/Prototypes/Entities/Janitor.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ReagentItem
+  parent: BaseItem
   name: "Extra-Grip™ Mop"
   id: MopItem
   description: A mop that can't be stopped, viscera cleanup detail awaits.
@@ -10,36 +10,68 @@
     texture: Objects/Janitorial/mop.png
   - type: Item
     Size: 10
+  - type: Mop
   - type: Solution
     maxVol: 10
     caps: 1
+  - type: Sound
 
 - type: entity
-  parent: ReagentItem
+  parent: BaseItem
   name: Mop Bucket
   id: MopBucket
   description: Holds water and the tears of the janitor.
   components:
+  - type: Clickable
   - type: Sprite
     texture: Objects/Janitorial/mopbucket.png
+    drawdepth: Objects
   - type: Icon
     texture: Objects/Janitorial/mopbucket.png
   - type: Clickable
   - type: InteractionOutline
+  - type: Bucket
+  - type: Sound
   - type: Solution
     maxVol: 500
     caps: 3
+  - type: Collidable
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.25,-0.25,0.25,0.25"
+      mask: 3
+      layer: 1
+    IsScrapingFloor: true
+  - type: Physics
+    mass: 5
+    Anchored: false
+  - type: Sound
 
 - type: entity
-  parent: ReagentItem
+  parent: BaseItem
   name: Bucket
   id: Bucket
   description: "It's a bucket."
   components:
+  - type: Clickable
   - type: Sprite
     texture: Objects/Janitorial/bucket.png
+    drawdepth: Objects
   - type: Icon
     texture: Objects/Janitorial/bucket.png
+  - type: Bucket
+  - type: Sound
   - type: Solution
     maxVol: 500
     caps: 3
+  - type: Collidable
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.25,-0.25,0.25,0.25"
+      mask: 3
+      layer: 1
+    IsScrapingFloor: true
+  - type: Physics
+    mass: 5
+    Anchored: false
+  - type: Sound

Resources/Prototypes/Reagents/chemicals.yml

@@ -1,7 +1,7 @@
 - type: reagent
   id: chem.Nutriment
   name: Nutriment
-  desc: Generic nutrition
+  desc: All the vitamins, minerals, and carbohydrates the body needs in pure form.
   color: "#664330"
   metabolism:
     - !type:DefaultFood
@@ -17,7 +17,7 @@
   id: chem.H2O
   name: Water
   desc: A tasty colorless liquid.
-  color: "#808080"
+  color: "#DEF7F5"
   metabolism:
     - !type:DefaultDrink
       rate: 1

Resources/Textures/Fluids/gibblet.rsi/meta.json

@@ -0,0 +1,31 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aff0d780742ca3902d8b05f854c212c8cda32c4f/icons/effects/blood.dmi",
+    "states": [
+        {
+            "name": "gibblet-0",
+            "directions": 1
+        },
+        {
+            "name": "gibblet-1",
+            "directions": 1
+        },
+        {
+            "name": "gibblet-2",
+            "directions": 1
+        },
+        {
+            "name": "gibblet-3",
+            "directions": 1
+        },
+        {
+            "name": "gibblet-4",
+            "directions": 1
+        }
+    ]
+}

Resources/Textures/Fluids/smear.rsi/meta.json

@@ -0,0 +1,39 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aff0d780742ca3902d8b05f854c212c8cda32c4f/icons/effects/blood.dmi",
+    "states": [
+        {
+            "name": "smear-0",
+            "directions": 1
+        },
+        {
+            "name": "smear-1",
+            "directions": 1
+        },
+        {
+            "name": "smear-2",
+            "directions": 1
+        },
+        {
+            "name": "smear-3",
+            "directions": 1
+        },
+        {
+            "name": "smear-4",
+            "directions": 1
+        },
+        {
+            "name": "smear-5",
+            "directions": 1
+        },
+        {
+            "name": "smear-6",
+            "directions": 1
+        }
+    ]
+}

Resources/Textures/Fluids/splatter.rsi/meta.json

@@ -0,0 +1,35 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aff0d780742ca3902d8b05f854c212c8cda32c4f/icons/effects/blood.dmi",
+    "states": [
+        {
+            "name": "splatter-0",
+            "directions": 1
+        },
+        {
+            "name": "splatter-1",
+            "directions": 1
+        },
+        {
+            "name": "splatter-2",
+            "directions": 1
+        },
+        {
+            "name": "splatter-3",
+            "directions": 1
+        },
+        {
+            "name": "splatter-4",
+            "directions": 1
+        },
+        {
+            "name": "splatter-5",
+            "directions": 1
+        }
+    ]
+}

Resources/Textures/Fluids/vomit.rsi/meta.json

@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aff0d780742ca3902d8b05f854c212c8cda32c4f/icons/effects/blood.dmi",
+    "states": [
+        {
+            "name": "vomit-0",
+            "directions": 1
+        },
+        {
+            "name": "vomit-1",
+            "directions": 1
+        },
+        {
+            "name": "vomit-2",
+            "directions": 1
+        },
+        {
+            "name": "vomit-3",
+            "directions": 1
+        }
+    ]
+}

Resources/Textures/Fluids/vomit_toxin.rsi/meta.json

@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aff0d780742ca3902d8b05f854c212c8cda32c4f/icons/effects/blood.dmi",
+    "states": [
+        {
+            "name": "vomit_toxin-0",
+            "directions": 1
+        },
+        {
+            "name": "vomit_toxin-1",
+            "directions": 1
+        },
+        {
+            "name": "vomit_toxin-2",
+            "directions": 1
+        },
+        {
+            "name": "vomit_toxin-3",
+            "directions": 1
+        }
+    ]
+}

Resources/Textures/Fluids/writing.rsi/meta.json

@@ -0,0 +1,31 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aff0d780742ca3902d8b05f854c212c8cda32c4f/icons/effects/blood.dmi",
+    "states": [
+        {
+            "name": "writing-0",
+            "directions": 1
+        },
+        {
+            "name": "writing-1",
+            "directions": 1
+        },
+        {
+            "name": "writing-2",
+            "directions": 1
+        },
+        {
+            "name": "writing-3",
+            "directions": 1
+        },
+        {
+            "name": "writing-4",
+            "directions": 1
+        }
+    ]
+}