From 5edf9ac0c3e9dd2f03cee2a50de8b29e0505706f Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Wed, 24 Jan 2024 03:43:14 +0200
Subject: [PATCH 1/3] smoke

---
 .../_NF/Entities/Objects/Misc/ashtray.yml     |  47 ++++++++++++++++++
 .../_NF/Objects/Misc/ashtray.rsi/icon-0.png   | Bin 0 -> 509 bytes
 .../_NF/Objects/Misc/ashtray.rsi/icon-1.png   | Bin 0 -> 584 bytes
 .../_NF/Objects/Misc/ashtray.rsi/icon-2.png   | Bin 0 -> 629 bytes
 .../_NF/Objects/Misc/ashtray.rsi/icon-3.png   | Bin 0 -> 693 bytes
 .../_NF/Objects/Misc/ashtray.rsi/meta.json    |  23 +++++++++
 6 files changed, 70 insertions(+)
 create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml
 create mode 100644 Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-0.png
 create mode 100644 Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-1.png
 create mode 100644 Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-2.png
 create mode 100644 Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-3.png
 create mode 100644 Resources/Textures/_NF/Objects/Misc/ashtray.rsi/meta.json

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml
new file mode 100644
index 00000000000..6c6bcda2e38
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml
@@ -0,0 +1,47 @@
+- type: entity
+  name: ashtray
+  id: Ashtray
+  parent: BaseStorageItem
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Misc/ashtray.rsi
+    layers:
+      - state: icon-0
+        map: ["enum.StorageFillLayers.Fill"]
+  - type: Storage
+    capacity: 12
+    quickInsert: true
+    areaInsert: true
+    storageInsertSound:
+      collection: trashBagRustle
+    whitelist:
+      tags:
+        - Cigar
+        - Cigarette
+  - type: Appearance
+  - type: StorageFillVisualizer
+    maxFillLevels: 4
+    fillBaseName: icon
+  - type: Dumpable
+    sprite: _NF/Objects/Misc/ashtray.rsi
+  - type: Item
+    size: 12
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 1
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1
+#        triggersOnce: false
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:EmptyAllContainersBehaviour
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
diff --git a/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-0.png b/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..b912aa3bacdfe3e2334fa480ea0af4e833e155ab
GIT binary patch
literal 509
zcmV<Z0RsMsP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$ok>JNR9J=Wl)Y}-Fce0QNKp!5drIOZKvyH9ktsvp{}GBjKvTdeU=*q#i<dtg
zA_rD1$u-cSgU&)xSG?bMuSmko%*@OcJZ-n>X}e7TU!R}P#$)UnvZ>(XX46Zkl>$I%
zjq09{#2ASo5Mu1T|Mv1SsiDRKkDE>MZHsq~?1IyHBARt`?;LVCoE7nz!MtA{9ug^0
z7(=EMbyZE}7-X?pkz%BEjt~N`yWOBxK9$6Y;GF{?#7GF?qOjH)-I*?}z4-m00q;HH
z97gL8@gv7}e~c-iviIWhyq~UZ8c+%mxy}GUVGM3$q5ss0Qxh>I;z_(vquXrS0Kjs&
z#B^1eqM&ISs;WZgImQ^uvIL-QTSSD_YK65H>3*Adk84|8H~(t`B0`a$hpe?&YbkGT
zFj|vqjSm3{f%b5itaOaQ{-kvEeKN^Z2L=uN-0!pBb^TAo6VQl^UL&J>;8$H|-Fg6u
zqF}vVUliQ!cD?!Aem{8=PHw`^#5;A({q0@){^OO!V$nNt-g`uZ``f#Vf-^HSGc*4k
ze*hM3!c)3UZ_WS!01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjf#>wJi

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-1.png b/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ae71a7e693970d5b2c31b1dd6db6966fb1cb17e
GIT binary patch
literal 584
zcmV-O0=NB%P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$=t)FDR9J=Wlud5aKp2J}|BTa7l2zMOYNT$XZYr#ZMHid`iQIt`a0tXbT8Sg%
z3@lMstO$~!3ax7;o*xg3gve<ehoA_t@Ut0@KhO8R{^py3hK7c};QiZ|?ohe>LnZnr
z4CB}h<JgVIWB2O%+5wcuVI1#WnXoQ+IT)-Z%;)pfbDCwmxVmz`$A>hfuy$k3=es+v
zPGjp9Tn+}#<T*wuJfJR1Q536ZZ#g$gq381rL(i$Kz(v3BvNR<U0?+gKd4InazrDF3
znM~^P((ZNvczS%~yw`J+B&qy|%9j`YzQZky8>IlSMS-=pQtb6;#GBEGPaod_@Zt6g
z04*so#$c^wF9YXiXHF}H2!fS3fVFm2?$ziVzPCsdh9N-^5cs8?^?kI~e4kD$wYD~4
zBm_$9%9wdpiL!~pIf_y|^6O7}?J4MVI*4%biHIU*vl(fc5`-Z_2wJTc0C}FHwWizc
zBBewxw@n*^%5&6m{>KKi)<ofENJ@#6lGf1?A_xeB0AnrM+O;FP50&+C?qD}9Ky3vo
z4g8o+y{9ZYh`0l0T5r8Zw)Vh7mU+wd07Owluh-itm?X*Cd|UVLG*B|JAj>#CK5<{a
zO=!2<gry!a#-O$4^!Q|_U_(PgL&JZ^FA~|`))Tf-!T<mO4rN$LW=%~1DgXcg2mk;8
W00000(o>TF0000<MNUMnLSTZSoe6dT

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-2.png b/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fc488a866e2a0ed0fbf37184d4ac1e81adbf799
GIT binary patch
literal 629
zcmV-*0*d{KP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%6-h)vR9J=Wl+SM3KoEyN2iwE~B%~xn3R0w=5K<LtK@O4HL%HNNdhWCIMbbCO
zf!=eelv9)kD3#nIoH)jRc9-n|if}N{RH*8~-(@}Co%zkq&Mp)b6#NCBKA!7c#oF6d
zpnpQwb#>Qu^<Xg2?=CJh!1CC2-4|EJ+%(y4wK4&dI9_}QVaS`aGyQvf2m+=`t@zyC
z-y54W)*eB-)zUIakZFnmY>G0SP67DvzKSuoWtt-5cqO6d<W}Ic+0<bWU|SZ3Vc?HO
znfcFGS9rr=j_0ez+Dfekz|-R+Cyj<4dS31xa(|vSn;Jb!T&5`iZ~J|G-{<SiO=fNX
z@)F<o0jSsOj7B5wZf^l7I}TDxlv1oqAomEQltfXq5N~%nc%H{(GU2uB(&_b(Qqt-5
z@H~$=j)~)#FW1*7r4~L(6rq$t2$3hVz5*x5$J)@E^qHfcPG{#k7s>3zFfdIMV=ucW
z+p<W7;Kz8JtF`eKRI61ibGF2?ZK5b52m(r`iDg-o%VhwPBtZy4tyaTv9K^hGLQ2vk
zA)VWQoPZDl+gzP;90$j7DDUrMl}ebU5>hFIQkg6I5^{S$>z%!{02?cio50WU*mw%V
zorr575@PK$vbF~v!qAxe17O=WjYeaupyzoRdtLKwO<*aB8DYrL!J+>4eMqHJ!CdMQ
zDJ4P(jt&mD3KkR;6cqe-`~umB{v)bv&W->801jnXNoGw=04e|g00;m8000000Mb*F
P00000NkvXXu0mjfEIk^J

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-3.png b/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bb6940209f8548a6f41ea5fe90fd130484218f1
GIT binary patch
literal 693
zcmV;m0!safP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%RY^oaR9J=Wl+R8RQ51*2>HKLYErA9oO)C(Cw31@e(wM+Pm+pN5AHZiZK7tS6
zBbao@0v4LEae|sif?`sv(^4j-bMMS`QD|sri<ri^m~V6E-gECczq#j}3lR|!f5EGl
zkJYq%#ir%xpHQn-Rjpc8^?F@B+1XJ5*T-75dgq%lCK)%1#UY2ii;KZ`$MdL^%j#-u
zcRGYYaN~?~c&JT^G1j<IEGpUSfu><v767qWKVzkGnc3M{+U+)njzbuR0K9l=^QL}A
z5Qc<OqQVd}k(elAWDTt3^UCXVP^$kkk17@Jt*-Lx^pxE4GOp`#baceG<6|<}EZJO+
zY%T{ttJ$QowKec{es)GKlNp<uk;+!`dBtV$hnt%KJbU2s?n{~v`}+VCOC>J4UDnpu
zX|-Aa%+1ZwY&Ow#9e~e{gOrjW2smjpM#dVsm|I#>!uK(Co%@9XVHgrmB#=^K7zVno
z^L}rS+V(a<5DZfA@!){9LIJ}xd0r8`e)|<-F@zADy6)WsXiDJ=F|@A2kYcF>Kr)pg
zolfJrE_=JX#54`VFwkPdS+z_Pe}aICU64wpFpd5e)3WGxyL@t-{@gT)$K!*2LI`GN
zX0UA=;rjpxDe-$f{LA?t3lKtJ88=O~ZDZRu@k9bs*D-V*83c$R7;4eGFtQ7-s()Hc
zx`B}be!8x9?s-!Qu7Iu(W8Z<XHPH4v?eaVTmSvI2WNr=EXf%fA<BIQA0oO$I@jMpi
z7u5G3CnS?ejB7O_r9=q9;{3v`0V5(JA|n1feglht{QUtUW3K=J01jnXNoGw=04e|g
b00;m8000000Mb*F00000NkvXXu0mjfwGuja

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/meta.json b/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/meta.json
new file mode 100644
index 00000000000..6229a0222d1
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-4.0",
+  "copyright": "Made for Frontier by gentlebutter",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon-0"
+    },
+    {
+      "name": "icon-1"
+    },
+    {
+      "name": "icon-2"
+    },
+    {
+      "name": "icon-3"
+    }
+  ]
+}

From fcd64829a5dad94cb9dd1e1829abeef48d1252ba Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Wed, 24 Jan 2024 13:50:55 +0200
Subject: [PATCH 2/3] The scale is real, half size the ashtray

---
 Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml
index 6c6bcda2e38..615f0d5b42f 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml
@@ -4,6 +4,7 @@
   parent: BaseStorageItem
   components:
   - type: Sprite
+    scale: 0.5, 0.5
     sprite: _NF/Objects/Misc/ashtray.rsi
     layers:
       - state: icon-0
@@ -23,7 +24,6 @@
     maxFillLevels: 4
     fillBaseName: icon
   - type: Dumpable
-    sprite: _NF/Objects/Misc/ashtray.rsi
   - type: Item
     size: 12
   - type: Damageable

From e85836eceedb8b0d87042b2ce27dbc6772f8c8a8 Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Wed, 24 Jan 2024 14:22:44 +0200
Subject: [PATCH 3/3] Added to vender

---
 .../Prototypes/Catalog/VendingMachines/Inventories/cigs.yml      | 1 +
 Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
index 7f72dfd9966..33a7aca74e0 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
@@ -13,5 +13,6 @@
     PackPaperRollingFilters: 8
     CheapLighter: 6
     Lighter: 4
+    Ashtray: 4
   emaggedInventory:
     CigPackSyndicate: 6
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml
index 615f0d5b42f..24d0b77e94a 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml
@@ -19,6 +19,7 @@
       tags:
         - Cigar
         - Cigarette
+        - Ash
   - type: Appearance
   - type: StorageFillVisualizer
     maxFillLevels: 4