From afa99a027800fb16df53a78a4bdd164c96b8f5dc Mon Sep 17 00:00:00 2001 From: Mykhailo Bykhovtsev Date: Fri, 29 Jun 2018 13:01:06 -0700 Subject: [PATCH] Bugfixes (#4943) Removes duplicated items from the map due to mapconflict tool. Fixes #4939. Fixes #4920 Adds holopad to Journalist office. Fixes #4922 --- maps/aurora/aurora-4_mainlevel.dmm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index eedd514bd98..14d72f849e9 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -29027,7 +29027,6 @@ dir = 1 }, /obj/structure/window/reinforced, -/obj/machinery/door/firedoor, /obj/structure/window/reinforced{ icon_state = "rwindow"; dir = 4 @@ -63232,12 +63231,6 @@ /area/security/security_office) "ctr" = ( /obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 1 - }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/door/window/southleft{ dir = 4; @@ -63245,23 +63238,30 @@ name = "Atmospheric Hardsuits"; req_access = list(24) }, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 1 + }, /obj/item/clothing/suit/space/void/atmos, /obj/item/clothing/head/helmet/space/void/atmos, /turf/simulated/floor/tiled, /area/engineering/atmos/storage) "cts" = ( /obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, +/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/door/window/southleft{ dir = 4; icon_state = "left"; name = "Atmospheric Hardsuits"; req_access = list(24) }, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/void/atmos, /obj/item/clothing/head/helmet/space/void/atmos, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/engineering/atmos/storage) "ctt" = ( @@ -63437,6 +63437,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/wood, /area/journalistoffice) "ctT" = (