From 5bf335dfef9cfea3042b049026740caa2f5b9e35 Mon Sep 17 00:00:00 2001
From: TheGoret <thegorettmtc@gmail.com>
Date: Fri, 17 Jan 2020 07:55:23 +0100
Subject: [PATCH] Music for the bar (#8009)

---
 html/changelogs/goret-music-for-the-bar.yml | 42 +++++++++++++++++++++
 maps/aurora/aurora-4_mainlevel.dmm          | 32 ++++++++--------
 2 files changed, 59 insertions(+), 15 deletions(-)
 create mode 100644 html/changelogs/goret-music-for-the-bar.yml

diff --git a/html/changelogs/goret-music-for-the-bar.yml b/html/changelogs/goret-music-for-the-bar.yml
new file mode 100644
index 00000000000..ff8a862b7d1
--- /dev/null
+++ b/html/changelogs/goret-music-for-the-bar.yml
@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Goret
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - maptweak: "A phonograph and a cigar case have been added to the bar counter. The cake hat has been moved to the kitchen."
+  
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 18329c5d278..12906a5e998 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -50108,6 +50108,7 @@
 	},
 /obj/machinery/door/firedoor,
 /obj/structure/table/reinforced,
+/obj/item/storage/fancy/cigar,
 /turf/simulated/floor/lino,
 /area/crew_quarters/bar)
 "bIv" = (
@@ -54320,6 +54321,7 @@
 	pixel_x = 0;
 	pixel_y = -27
 	},
+/obj/item/clothing/head/cakehat,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/kitchen)
 "bSq" = (
@@ -54582,7 +54584,7 @@
 	},
 /obj/machinery/door/firedoor,
 /obj/structure/table/reinforced,
-/obj/item/clothing/head/cakehat,
+/obj/item/storage/fancy/candle_box,
 /turf/simulated/floor/lino,
 /area/crew_quarters/bar)
 "bSR" = (
@@ -54596,18 +54598,6 @@
 /obj/structure/table/reinforced,
 /turf/simulated/floor/lino,
 /area/crew_quarters/bar)
-"bSS" = (
-/obj/machinery/door/blast/shutters{
-	dir = 2;
-	id = "barshutters01";
-	name = "Bar Shutters"
-	},
-/obj/machinery/door/firedoor,
-/obj/structure/table/reinforced,
-/obj/item/storage/box/matches,
-/obj/item/storage/fancy/candle_box,
-/turf/simulated/floor/lino,
-/area/crew_quarters/bar)
 "bST" = (
 /obj/machinery/door/blast/shutters{
 	dir = 2;
@@ -54804,6 +54794,7 @@
 /obj/item/reagent_containers/toothpaste,
 /obj/item/reagent_containers/toothpaste,
 /obj/item/device/nanoquikpay,
+/obj/item/storage/box/matches,
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
 "bTq" = (
@@ -64503,6 +64494,17 @@
 	},
 /turf/simulated/floor/wood,
 /area/maintenance/vault)
+"hbG" = (
+/obj/machinery/door/blast/shutters{
+	dir = 2;
+	id = "barshutters01";
+	name = "Bar Shutters"
+	},
+/obj/machinery/door/firedoor,
+/obj/structure/table/reinforced,
+/obj/machinery/media/jukebox/phonograph,
+/turf/simulated/floor/lino,
+/area/crew_quarters/bar)
 "hcd" = (
 /obj/effect/floor_decal/spline/plain{
 	icon_state = "spline_plain";
@@ -101207,7 +101209,7 @@ bSN
 bTq
 bTZ
 bUF
-uRY
+hbG
 bVz
 bWa
 bWo
@@ -103006,7 +103008,7 @@ bOt
 bTv
 bTZ
 bTu
-bSS
+uRY
 bVz
 bWa
 bWo