From 842a952f9f869cbc577bb968895e4d5b50a6919d Mon Sep 17 00:00:00 2001
From: 81Denton <32391752+81Denton@users.noreply.github.com>
Date: Thu, 14 Jun 2018 23:10:48 +0200
Subject: [PATCH] Pubby: fixes boozeomat and disposals issues (#38466)

* removes duplicate poster, moves disposals bin

* boozeomat x2
---
 _maps/map_files/PubbyStation/PubbyStation.dmm | 14 +++++++-------
 code/modules/vending/boozeomat.dm             | 13 +++++++++++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index ea034784926..ec65c6ca586 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -12334,10 +12334,7 @@
 /turf/open/floor/plasteel/neutral/side,
 /area/storage/primary)
 "aGk" = (
-/obj/machinery/vending/boozeomat{
-	products = list(/obj/item/reagent_containers/food/drinks/bottle/rum = 1, /obj/item/reagent_containers/food/drinks/bottle/wine = 1, /obj/item/reagent_containers/food/drinks/ale = 1, /obj/item/reagent_containers/food/drinks/drinkingglass = 6, /obj/item/reagent_containers/food/drinks/ice = 1, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 4);
-	req_access_txt = "20"
-	},
+/obj/machinery/vending/boozeomat/pubby_captain,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
@@ -27466,6 +27463,7 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
+/obj/machinery/disposal/bin,
 /turf/open/floor/plasteel/white,
 /area/medical/chemistry)
 "bum" = (
@@ -28442,7 +28440,6 @@
 /turf/open/floor/plasteel/white,
 /area/medical/chemistry)
 "bwV" = (
-/obj/machinery/disposal/bin,
 /turf/open/floor/plasteel/whiteyellow/corner,
 /area/medical/chemistry)
 "bwW" = (
@@ -46986,7 +46983,7 @@
 /turf/open/floor/plasteel/dark,
 /area/library)
 "cBk" = (
-/obj/machinery/vending/boozeomat/maint,
+/obj/machinery/vending/boozeomat/pubby_maint,
 /turf/closed/wall,
 /area/maintenance/department/crew_quarters/dorms)
 "cBl" = (
@@ -49149,6 +49146,9 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/medical/sleeper)
+"iqc" = (
+/turf/open/floor/plasteel/stairs/right,
+/area/maintenance/department/crew_quarters/dorms)
 "itl" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -91019,7 +91019,7 @@ aaa
 aaa
 aiS
 qPB
-gNv
+iqc
 ngp
 cBr
 cBs
diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm
index 4c6edc94a5a..09a421d1d57 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -38,7 +38,7 @@
 	req_access = list(ACCESS_BAR)
 	refill_canister = /obj/item/vending_refill/boozeomat
 
-/obj/machinery/vending/boozeomat/maint
+/obj/machinery/vending/boozeomat/pubby_maint //abandoned bar on Pubbystation
 	products = list(/obj/item/reagent_containers/food/drinks/bottle/whiskey = 1,
 			/obj/item/reagent_containers/food/drinks/bottle/absinthe = 1,
 			/obj/item/reagent_containers/food/drinks/bottle/limejuice = 1,
@@ -48,7 +48,16 @@
 			/obj/item/reagent_containers/food/drinks/ice = 3,
 			/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 6,
 			/obj/item/reagent_containers/food/drinks/flask = 1)
-	req_access_txt = "0"
+	req_access = null
+
+/obj/machinery/vending/boozeomat/pubby_captain //Captain's quarters on Pubbystation
+	products = list(/obj/item/reagent_containers/food/drinks/bottle/rum = 1, 
+					/obj/item/reagent_containers/food/drinks/bottle/wine = 1, 
+					/obj/item/reagent_containers/food/drinks/ale = 1, 
+					/obj/item/reagent_containers/food/drinks/drinkingglass = 6, 
+					/obj/item/reagent_containers/food/drinks/ice = 1, 
+					/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 4);
+	req_access = list(ACCESS_CAPTAIN)
 
 /obj/item/vending_refill/boozeomat
 	machine_name = "Booze-O-Mat"