From 8b4788a8845c60a8f13141c12a8d00186906ab1f Mon Sep 17 00:00:00 2001 From: oranges Date: Fri, 12 Jan 2018 09:04:12 +1300 Subject: [PATCH 1/2] Merge pull request #34101 from ShizCalev/got-a-light- Removes omnizine (traitor) cigarettes from captain's office on Meta --- _maps/map_files/MetaStation/MetaStation.dmm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index c81ed8e449..064938ff62 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -36108,10 +36108,7 @@ }, /area/bridge) "bwA" = ( -/obj/machinery/vending/cigarette{ - pixel_y = 2; - products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 7, /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3, /obj/item/storage/fancy/cigarettes/cigpack_robust = 2, /obj/item/storage/fancy/cigarettes/cigpack_carp = 3, /obj/item/storage/fancy/cigarettes/cigpack_midori = 1, /obj/item/storage/box/matches = 10, /obj/item/lighter/greyscale = 4, /obj/item/storage/fancy/rollingpapers = 5) - }, +/obj/machinery/vending/cigarette, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "bwB" = ( @@ -37817,9 +37814,7 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/vending/cigarette{ - pixel_x = 2 - }, +/obj/machinery/vending/cigarette, /turf/open/floor/plasteel/dark, /area/bridge) "bAa" = ( @@ -42595,9 +42590,7 @@ /turf/open/floor/carpet, /area/crew_quarters/bar) "bKo" = ( -/obj/machinery/vending/cigarette{ - pixel_y = 1 - }, +/obj/machinery/vending/cigarette, /turf/open/floor/carpet, /area/crew_quarters/bar) "bKp" = (