Merge pull request #4763 from Citadel-Station-13/upstream-merge-34101

[MIRROR] Removes omnizine (traitor) cigarettes from captain's office on Meta
This commit is contained in:
deathride58
2018-01-11 21:32:59 +00:00
committed by GitHub
+3 -10
View File
@@ -36108,10 +36108,7 @@
}, },
/area/bridge) /area/bridge)
"bwA" = ( "bwA" = (
/obj/machinery/vending/cigarette{ /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)
},
/turf/open/floor/wood, /turf/open/floor/wood,
/area/crew_quarters/heads/captain/private) /area/crew_quarters/heads/captain/private)
"bwB" = ( "bwB" = (
@@ -37817,9 +37814,7 @@
dir = 8; dir = 8;
pixel_x = 24 pixel_x = 24
}, },
/obj/machinery/vending/cigarette{ /obj/machinery/vending/cigarette,
pixel_x = 2
},
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/bridge) /area/bridge)
"bAa" = ( "bAa" = (
@@ -42595,9 +42590,7 @@
/turf/open/floor/carpet, /turf/open/floor/carpet,
/area/crew_quarters/bar) /area/crew_quarters/bar)
"bKo" = ( "bKo" = (
/obj/machinery/vending/cigarette{ /obj/machinery/vending/cigarette,
pixel_y = 1
},
/turf/open/floor/carpet, /turf/open/floor/carpet,
/area/crew_quarters/bar) /area/crew_quarters/bar)
"bKp" = ( "bKp" = (