From d3b132f1303cbd3e719da817273196df556eb654 Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Mon, 11 Nov 2024 21:31:02 +0300 Subject: [PATCH] me avoid merge conflict --- _maps/map_files/generic/centcomm.dmm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index bf9b5f79b5b2..7f85c69cd991 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -6353,6 +6353,12 @@ /obj/item/dice/d20, /turf/simulated/floor/wood, /area/trader_station/sol) +"vC" = ( +/obj/machinery/photocopier/faxmachine/longrange{ + department = "Central Command" + }, +/turf/simulated/floor/plasteel, +/area/admin) "vD" = ( /obj/structure/railing, /obj/effect/landmark/spawner/trader, @@ -6899,6 +6905,12 @@ icon_state = "white" }, /area/centcom/control) +"xx" = ( +/obj/machinery/photocopier/faxmachine/longrange/syndie{ + department = "Syndicate" + }, +/turf/simulated/floor/plasteel, +/area/admin) "xy" = ( /obj/structure/bookcase/random, /obj/machinery/light/small, @@ -8987,7 +8999,7 @@ /obj/structure/table/wood, /obj/machinery/photocopier{ icon_state = "fax"; - name = "fax machine" + name = "fake fax machine" }, /obj/item/photo{ name = "butts" @@ -69399,7 +69411,7 @@ vH lZ wR wk -lZ +vC lZ lZ lZ @@ -69656,7 +69668,7 @@ lZ lZ lZ wk -lZ +xx lZ lZ lZ