From a069966658a0a5b4a56dea7467a623ac658088d1 Mon Sep 17 00:00:00 2001
From: Zack <winklj000@gmail.com>
Date: Sun, 31 Dec 2023 06:51:44 -0600
Subject: [PATCH] Qol improvements for the ghost bar (#23421)

* Added some garbage bins, added a vender for the ghost bar kitchen

* Fixed the floor under a table

* Moved the shadycig vender a bit more to the wall and removed a beaker that I placed on accident

* Removed a wall behind a vender

* fuck you merge masters

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
---
 _maps/map_files/generic/centcomm.dmm | 54 +++++++++++++++++-----------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
index bc5aa5d5d3da..8295f9818031 100644
--- a/_maps/map_files/generic/centcomm.dmm
+++ b/_maps/map_files/generic/centcomm.dmm
@@ -1823,6 +1823,7 @@
 	dir = 4;
 	pixel_y = 8
 	},
+/obj/machinery/economy/vending/cigarette,
 /turf/simulated/floor/wood,
 /area/ghost_bar)
 "gT" = (
@@ -3686,7 +3687,7 @@
 /area/admin)
 "mz" = (
 /obj/machinery/economy/vending/boozeomat,
-/turf/simulated/wall/indestructible/riveted,
+/turf/simulated/floor/wood,
 /area/ghost_bar)
 "mA" = (
 /obj/structure/sign/poster/official/fruit_bowl,
@@ -5137,6 +5138,12 @@
 /obj/item/stack/sheet/metal/fifty,
 /turf/simulated/floor/plasteel/dark,
 /area/centcom/specops)
+"rq" = (
+/obj/structure/closet/crate/can,
+/turf/simulated/floor/plasteel{
+	icon_state = "cafeteria"
+	},
+/area/ghost_bar)
 "rr" = (
 /obj/structure/table,
 /obj/item/storage/box/beakers,
@@ -5679,10 +5686,10 @@
 /turf/simulated/floor/plasteel/dark,
 /area/centcom/specops)
 "tr" = (
-/turf/simulated/floor/wood{
-	broken = 1;
-	icon_state = "wood-broken"
+/obj/machinery/light/small{
+	dir = 1
 	},
+/turf/simulated/floor/wood,
 /area/ghost_bar)
 "ts" = (
 /obj/machinery/atmospherics/portable/canister/oxygen,
@@ -6703,6 +6710,7 @@
 	desc = "Used to grind things up into raw materials and liquids.";
 	pixel_y = 5
 	},
+/obj/item/reagent_containers/glass/beaker/large,
 /turf/simulated/floor/plasteel{
 	icon_state = "cafeteria"
 	},
@@ -6987,7 +6995,6 @@
 "xU" = (
 /obj/structure/table/reinforced,
 /obj/machinery/kitchen_machine/microwave/upgraded,
-/obj/machinery/light/small,
 /turf/simulated/floor/plasteel{
 	icon_state = "cafeteria"
 	},
@@ -6997,10 +7004,7 @@
 /turf/simulated/floor/plasteel/dark,
 /area/ghost_bar)
 "xY" = (
-/obj/machinery/economy/vending/cigarette,
-/obj/machinery/light/small{
-	dir = 1
-	},
+/obj/structure/closet/crate/can,
 /turf/simulated/floor/wood,
 /area/ghost_bar)
 "xZ" = (
@@ -7288,6 +7292,13 @@
 /obj/machinery/computer/cryopod/robot,
 /turf/simulated/wall/indestructible/riveted,
 /area/centcom/specops)
+"zP" = (
+/obj/machinery/light/small,
+/obj/machinery/economy/vending/dinnerware,
+/turf/simulated/floor/plasteel{
+	icon_state = "cafeteria"
+	},
+/area/ghost_bar)
 "zQ" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/plasteel/freezer,
@@ -13851,6 +13862,7 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
+/obj/structure/closet/crate/can,
 /turf/simulated/floor/wood,
 /area/ghost_bar)
 "Xb" = (
@@ -72235,7 +72247,7 @@ Jy
 vd
 vd
 vd
-Jy
+rf
 Me
 EX
 Jy
@@ -72492,7 +72504,7 @@ Jy
 vd
 cX
 vd
-rf
+xY
 Me
 wh
 rd
@@ -73785,8 +73797,8 @@ Me
 Me
 Me
 Me
-xY
-Jy
+Me
+tr
 Jy
 qH
 Nm
@@ -74041,8 +74053,8 @@ es
 Oj
 zj
 fF
-Me
-Jy
+rq
+aT
 Jy
 ip
 Jy
@@ -74298,9 +74310,9 @@ es
 es
 es
 es
+es
 Uk
 Jy
-Jy
 ol
 ol
 Hz
@@ -74555,8 +74567,8 @@ wN
 Dk
 zY
 xU
+zP
 Me
-tr
 Jy
 rG
 hU
@@ -74812,8 +74824,8 @@ Me
 Me
 Me
 Me
-aT
-Jy
+Me
+Me
 Jy
 RX
 RX
@@ -75070,9 +75082,9 @@ ps
 ps
 ps
 Me
-Jy
+Me
 gS
-Jy
+xY
 Me
 Me
 Me