From d8adb23a121ff7e33b6dca6053731ff1bbb5b13a Mon Sep 17 00:00:00 2001
From: FirinMaLazors <68245376+FirinMaLazors@users.noreply.github.com>
Date: Tue, 8 Sep 2020 08:02:31 -0400
Subject: [PATCH] Adds ashtrays to the bar and diner. (#9886)

---
 html/changelogs/FirinMaLazors-serviceashtrays.yml |  4 ++++
 maps/aurora/aurora-4_mainlevel.dmm                | 12 +++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 html/changelogs/FirinMaLazors-serviceashtrays.yml

diff --git a/html/changelogs/FirinMaLazors-serviceashtrays.yml b/html/changelogs/FirinMaLazors-serviceashtrays.yml
new file mode 100644
index 00000000000..30e71d16431
--- /dev/null
+++ b/html/changelogs/FirinMaLazors-serviceashtrays.yml
@@ -0,0 +1,4 @@
+author: FirinMaLazors
+delete-after: True
+changes: 
+  - rscadd: "Added ashtrays to the bar."
\ No newline at end of file
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 50df7cea8ec..f14fa16ade0 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -51676,6 +51676,7 @@
 /obj/machinery/door/firedoor,
 /obj/structure/table/reinforced,
 /obj/item/storage/box/fancy/candle_box,
+/obj/item/material/ashtray/bronze,
 /turf/simulated/floor/lino/grey,
 /area/crew_quarters/bar)
 "bSR" = (
@@ -67780,6 +67781,11 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/medbay)
+"wcO" = (
+/obj/structure/table/wood,
+/obj/item/material/ashtray/bronze,
+/turf/simulated/floor/carpet,
+/area/crew_quarters/bar)
 "wee" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -98548,7 +98554,7 @@ rsk
 bZT
 bWa
 bYZ
-bZt
+wcO
 bYy
 bSM
 caM
@@ -99833,7 +99839,7 @@ bWa
 bZU
 bZU
 bYZ
-bZt
+wcO
 bYy
 bSM
 caQ
@@ -101118,7 +101124,7 @@ bVc
 izh
 bWa
 bYZ
-bZt
+wcO
 bYy
 bSM
 caT