From: Huaqas Date: Sun, 26 Oct 2025 18:25:23 +0000 (+0800) Subject: Add Crazy Lube to the Toy Box. (#36292) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=eb625a5b50724755a7179d008d59e7ab3989315a;p=space-station-14.git 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 a92463a75e..d35ceaa033 100644 --- 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 a4cdfcf731..12eaf2cee6 100644 --- 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 8e02238119..3906f21a0b 100644 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 cc2039df90..23be4f59d3 100644 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 6678c2db8d..12542316ff 100644 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 1388227cbd..b8d15b2450 100644 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 55fc6227cd..c05e904864 100644 --- 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 index 0000000000..2cf3aeeefb 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 index 0000000000..2bab8b570e 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 index 0000000000..58bf76cb93 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 index 0000000000..a6843a4179 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 index 0000000000..841ae725cb --- /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 + } + ] +}