Added ashtrays (#22837)

added

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
index 3543db2ed16e4bba2f0d91dcf5e5ca4a9e7d0532..ab435f3645a9fb89af893e70f201b20a42750659 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -59,6 +59,11 @@
     solutions:\r
       smokable:\r
         maxVol: 20\r
+  - type: Tag\r
+    tags:\r
+      - Cigarette\r
+      - Trash\r
+      - Burnt\r
 \r
 - type: entity\r
   id: CigaretteSyndicate\r

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
index 3495ae26f9530b6a95850ade8e49e5567f8e99a7..dc8d4eaf3c4335b4d862854ac52bc0fe97b38a13 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
@@ -34,6 +34,11 @@
     solutions:
       smokable:
         maxVol: 20
+  - type: Tag
+    tags:
+      - Cigar
+      - Trash
+      - Burnt
 
 - type: entity
   id: CigarGold

diff --git a/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml b/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml
new file mode 100644 (file)
index 0000000..613b6cc
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml
@@ -0,0 +1,30 @@
+- type: entity
+  id: Ashtray
+  parent: BaseItem
+  name: ashtray
+  description: Proven by scientists to improve the smoking experience by 37%!
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/ashtray.rsi
+    layers:
+      - state: icon-0
+        map: ["enum.StorageFillLayers.Fill"]
+  - type: Item
+    size: Small
+  - type: StaticPrice
+    price: 1
+  - type: Storage
+    whitelist:
+      tags:
+      - Burnt
+    maxItemSize: Tiny
+    grid:
+    - 0,0,9,0
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+  - type: StorageFillVisualizer
+    fillBaseName: icon
+    maxFillLevels: 10
+  - type: Appearance
+  - type: Dumpable
\ No newline at end of file

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 8cb13ab8b6208372651fd9325511ce63385f8603..5be37f243db20df6b16c86016b8317fbe6777669 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -199,6 +199,9 @@
 - type: Tag
   id: BoxHug
 
+- type: Tag
+  id: Burnt
+
 - type: Tag
   id: BrassInstrument
 

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-0.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-0.png
new file mode 100644 (file)
index 0000000..3bc1eaf
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-0.png differ

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-1.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-1.png
new file mode 100644 (file)
index 0000000..0d4142d
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-1.png differ

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-10.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-10.png
new file mode 100644 (file)
index 0000000..53f61b9
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-10.png differ

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

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-3.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-3.png
new file mode 100644 (file)
index 0000000..a82fd0c
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-3.png differ

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-4.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-4.png
new file mode 100644 (file)
index 0000000..92169bb
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-4.png differ

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-5.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-5.png
new file mode 100644 (file)
index 0000000..cca3f51
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-5.png differ

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-6.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-6.png
new file mode 100644 (file)
index 0000000..77181b4
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-6.png differ

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-7.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-7.png
new file mode 100644 (file)
index 0000000..c42784d
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-7.png differ

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-8.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-8.png
new file mode 100644 (file)
index 0000000..44c7a7e
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-8.png differ

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-9.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-9.png
new file mode 100644 (file)
index 0000000..250c2ef
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-9.png differ

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/meta.json b/Resources/Textures/Objects/Decoration/ashtray.rsi/meta.json
new file mode 100644 (file)
index 0000000..9e45b4e
--- /dev/null
+++ b/Resources/Textures/Objects/Decoration/ashtray.rsi/meta.json
@@ -0,0 +1,44 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by joshepvodka",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon-0"
+    },
+    {
+      "name": "icon-1"
+    },
+    {
+      "name": "icon-2"
+    },
+    {
+      "name": "icon-3"
+    },
+    {
+      "name": "icon-4"
+    },
+    {
+      "name": "icon-5"
+    },
+    {
+      "name": "icon-6"
+    },
+    {
+      "name": "icon-7"
+    },
+    {
+      "name": "icon-8"
+    },
+    {
+      "name": "icon-9"
+    },
+    {
+      "name": "icon-10"
+    }
+  ]
+}