Add Crazy Lube to the Toy Box. (#36292)

* Add crazy lube to the toy box.

* Decrease volume from 100u to 60u.

* Bring it back to 100u now lube evaporates.

* 4 space indent

Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
---------

Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index a92463a75ef1ea5f6d2d2409d8df1e915d147508..d35ceaa033e0293370308029a3c7a7b1c2fadf40 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -428,7 +428,7 @@
     contents:
       - id: SnapPopBox
       - id: CrazyGlue
-        amount: 2
+      - id: CrazyLube
       - id: PlasticBanana
       - id: WhoopieCushion
       - id: ToyHammer

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index a4cdfcf7317a2d2a5d63f88b149a18a72f0c8506..12eaf2cee6c1cea21561577a4829cdeb6e07cc57 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1087,6 +1087,38 @@
     tags:
     - DrinkSpaceGlue
 
+- type: entity
+  parent: DrinkBase
+  id: CrazyLube
+  name: crazy lube
+  description: A bottle of super slipery crazy lube manufactured by Honk! Co.
+  components:
+  - type: Openable
+    sound:
+      collection: packetOpenSounds
+  - type: Sprite
+    sprite: Objects/Fun/lube.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+  - type: Appearance
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 100
+        reagents:
+        - ReagentId: SpaceLube
+          Quantity: 100
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "icon_open"}
+          False: {state: "icon"}
+  - type: Lube
+  - type: TrashOnSolutionEmpty
+    solution: drink
+
 - type: entity
   parent: BaseItem
   id: NewtonCradle

diff --git a/Resources/Textures/Objects/Fun/glue.rsi/icon.png b/Resources/Textures/Objects/Fun/glue.rsi/icon.png
index 8e0223811980f9f77832c185a9f936ac646375e8..3906f21a0b060ed665eb81a49f7687152280c890 100644 (file)
Binary files a/Resources/Textures/Objects/Fun/glue.rsi/icon.png and b/Resources/Textures/Objects/Fun/glue.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Fun/glue.rsi/icon_open.png b/Resources/Textures/Objects/Fun/glue.rsi/icon_open.png
index cc2039df905dbc1377f6b1fbc5a8e7355f4ab6cd..23be4f59d3ec8932a2d7fb1461aebd74d70b7409 100644 (file)
Binary files a/Resources/Textures/Objects/Fun/glue.rsi/icon_open.png and b/Resources/Textures/Objects/Fun/glue.rsi/icon_open.png differ

diff --git a/Resources/Textures/Objects/Fun/glue.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/glue.rsi/inhand-left.png
index 6678c2db8dc57daa6d3c7aa9d817a9a04c7c1b57..12542316ffc49267d714df67e1fcb49fbfaf1748 100644 (file)
Binary files a/Resources/Textures/Objects/Fun/glue.rsi/inhand-left.png and b/Resources/Textures/Objects/Fun/glue.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Fun/glue.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/glue.rsi/inhand-right.png
index 1388227cbd3da61ae08ca2d6358c04927af64c86..b8d15b2450e0442a91bb26e743cf53af45af0fbf 100644 (file)
Binary files a/Resources/Textures/Objects/Fun/glue.rsi/inhand-right.png and b/Resources/Textures/Objects/Fun/glue.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Fun/glue.rsi/meta.json b/Resources/Textures/Objects/Fun/glue.rsi/meta.json
index 55fc6227cd490c4ffffb9ae20f7edccc2232fe08..c05e90486469ea2c527c7201a9b610737873d3a7 100644 (file)
--- a/Resources/Textures/Objects/Fun/glue.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/glue.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by brainfood1183 (github) for ss14",
+  "copyright": "Made by brainfood1183 (github) for ss14.  Edited by huaqas (github).",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Objects/Fun/lube.rsi/icon.png b/Resources/Textures/Objects/Fun/lube.rsi/icon.png
new file mode 100644 (file)
index 0000000..2cf3aee
Binary files /dev/null and b/Resources/Textures/Objects/Fun/lube.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Fun/lube.rsi/icon_open.png b/Resources/Textures/Objects/Fun/lube.rsi/icon_open.png
new file mode 100644 (file)
index 0000000..2bab8b5
Binary files /dev/null and b/Resources/Textures/Objects/Fun/lube.rsi/icon_open.png differ

diff --git a/Resources/Textures/Objects/Fun/lube.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/lube.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..58bf76c
Binary files /dev/null and b/Resources/Textures/Objects/Fun/lube.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Fun/lube.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/lube.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..a6843a4
Binary files /dev/null and b/Resources/Textures/Objects/Fun/lube.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Fun/lube.rsi/meta.json b/Resources/Textures/Objects/Fun/lube.rsi/meta.json
new file mode 100644 (file)
index 0000000..841ae72
--- /dev/null
+++ b/Resources/Textures/Objects/Fun/lube.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by brainfood1183 (github) for ss14. Edited by huaqas (github).",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}