From: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Date: Tue, 22 Apr 2025 19:34:39 +0000 (-0400) Subject: Ashtray Resprite and Fix (#31643) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=bd1f2af691264c5646086e68ae021753181eea6d;p=space-station-14.git Ashtray Resprite and Fix (#31643) * The meat and potatoes Yup * Stupid recycler bruh * guh guh --- diff --git a/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml b/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml index 61554d0621..9908e2a028 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml @@ -7,26 +7,69 @@ - type: Sprite sprite: Objects/Decoration/ashtray.rsi layers: - - state: icon-0 - map: ["enum.StorageFillLayers.Fill"] + - state: icon + - state: ashtray1 + map: ["ashtray1"] + visible: false + - state: ashtray2 + map: ["ashtray2"] + visible: false + - state: ashtray3 + map: ["ashtray3"] + visible: false + - state: ashtray4 + map: ["ashtray4"] + visible: false + - state: ashtray5 + map: ["ashtray5"] + visible: false + - state: ashtray6 + map: ["ashtray6"] + visible: false + - state: ashtray7 + map: ["ashtray7"] + visible: false + - state: ashtray8 + map: ["ashtray8"] + visible: false + - state: ashtray9 + map: ["ashtray9"] + visible: false + - state: ashtray10 + map: ["ashtray10"] + visible: false - type: Item size: Small - - type: StaticPrice - price: 1 + - type: PhysicalComposition + materialComposition: + Steel: 10 - type: Storage whitelist: tags: - Burnt - Cigarette - Cigar + hideStackVisualsWhenClosed: false maxItemSize: Tiny grid: - 0,0,9,0 - type: ContainerContainer containers: storagebase: !type:Container - - type: StorageFillVisualizer - fillBaseName: icon - maxFillLevels: 10 + - type: ItemCounter + count: + tags: [ Cigarette, Cigar, Burnt ] + composite: true + layerStates: + - ashtray1 + - ashtray2 + - ashtray3 + - ashtray4 + - ashtray5 + - ashtray6 + - ashtray7 + - ashtray8 + - ashtray9 + - ashtray10 - type: Appearance - type: Dumpable diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index 27316ed08a..7d4c80b795 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -245,3 +245,10 @@ materials: Cloth: 100 Steel: 50 + +- type: latheRecipe + id: Ashtray + result: Ashtray + completetime: 1 + materials: + Steel: 30 \ No newline at end of file diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray1.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray1.png new file mode 100644 index 0000000000..34d1937e2c Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray1.png differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray10.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray10.png new file mode 100644 index 0000000000..b0ff0d9d19 Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray10.png differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray2.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray2.png new file mode 100644 index 0000000000..c95889553b Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray2.png differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray3.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray3.png new file mode 100644 index 0000000000..8baf89e0cd Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray3.png differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray4.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray4.png new file mode 100644 index 0000000000..8772718e9c Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray4.png differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray5.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray5.png new file mode 100644 index 0000000000..48e3be8e48 Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray5.png differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray6.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray6.png new file mode 100644 index 0000000000..2d62f4e496 Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray6.png differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray7.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray7.png new file mode 100644 index 0000000000..6e1d607ab0 Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray7.png differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray8.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray8.png new file mode 100644 index 0000000000..0d6f17a122 Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray8.png differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray9.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray9.png new file mode 100644 index 0000000000..8e62bef89c Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray9.png differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-0.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-0.png deleted file mode 100644 index 3bc1eafb97..0000000000 Binary files a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-1.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-1.png deleted file mode 100644 index 0d4142d08d..0000000000 Binary files a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-10.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-10.png deleted file mode 100644 index 53f61b9243..0000000000 Binary files a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-10.png and /dev/null differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-2.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-2.png deleted file mode 100644 index 1800a7eea0..0000000000 Binary files a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-3.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-3.png deleted file mode 100644 index a82fd0cf8f..0000000000 Binary files a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-4.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-4.png deleted file mode 100644 index 92169bb6c5..0000000000 Binary files a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-5.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-5.png deleted file mode 100644 index cca3f51863..0000000000 Binary files a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-6.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-6.png deleted file mode 100644 index 77181b432e..0000000000 Binary files a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-6.png and /dev/null differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-7.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-7.png deleted file mode 100644 index c42784db40..0000000000 Binary files a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-7.png and /dev/null differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-8.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-8.png deleted file mode 100644 index 44c7a7e7a2..0000000000 Binary files a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-8.png and /dev/null differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-9.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-9.png deleted file mode 100644 index 250c2ef488..0000000000 Binary files a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-9.png and /dev/null differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon.png new file mode 100644 index 0000000000..c0692ee25d Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/meta.json b/Resources/Textures/Objects/Decoration/ashtray.rsi/meta.json index 9e45b4ede1..7494aa7422 100644 --- a/Resources/Textures/Objects/Decoration/ashtray.rsi/meta.json +++ b/Resources/Textures/Objects/Decoration/ashtray.rsi/meta.json @@ -1,44 +1,44 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by joshepvodka", + "copyright": "Made by Hanzdegloker", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon-0" + "name": "icon" }, { - "name": "icon-1" + "name": "ashtray1" }, { - "name": "icon-2" + "name": "ashtray2" }, { - "name": "icon-3" + "name": "ashtray3" }, { - "name": "icon-4" + "name": "ashtray4" }, { - "name": "icon-5" + "name": "ashtray5" }, { - "name": "icon-6" + "name": "ashtray6" }, { - "name": "icon-7" + "name": "ashtray7" }, { - "name": "icon-8" + "name": "ashtray8" }, { - "name": "icon-9" + "name": "ashtray9" }, { - "name": "icon-10" + "name": "ashtray10" } ] }