From 1d6f40cd267adc7d7cc02da89073aae18c0124d7 Mon Sep 17 00:00:00 2001 From: ilyadobr <155672646+i1yadobr@users.noreply.github.com> Date: Tue, 29 Oct 2024 17:47:50 +0200 Subject: [PATCH] fix(genesis): the right merchant shuttle console and license #12931 --- maps/genesis/genesis-3.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maps/genesis/genesis-3.dmm b/maps/genesis/genesis-3.dmm index 1fef24affc5..71a7c3f7731 100644 --- a/maps/genesis/genesis-3.dmm +++ b/maps/genesis/genesis-3.dmm @@ -2229,7 +2229,7 @@ "aVf" = (/mob/living/carbon/human/monkey{name = "Murphey"},/turf/unsimulated/floor{icon_state = "freezerfloor"},/area/wizard_station) "aVg" = (/obj/structure/bed/chair/comfy/black,/turf/simulated/floor/trim/carpet/blue,/area/shuttle/merchant/home) "aVh" = (/obj/machinery/button/remote/blast_door{name = "Merchant Window Shutters"; pixel_x = 28; id = "merchantshuttle"; req_access = list(201)},/obj/structure/bed/chair/comfy/black,/turf/simulated/floor/trim/carpet/blue,/area/shuttle/merchant/home) -"aVi" = (/obj/structure/table/reinforced,/turf/simulated/floor/trim/carpet/blue,/area/shuttle/merchant/home) +"aVi" = (/obj/structure/table/reinforced,/obj/item/paper/trade_lic,/turf/simulated/floor/trim/carpet/blue,/area/shuttle/merchant/home) "aVj" = (/obj/structure/disposalpipe/segment{icon_state = "pipe-c"; dir = 4},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/turf/simulated/floor/tiled,/area/merchant_station) "aVk" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/merchant_station) "aVl" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/merchant_station) @@ -2244,7 +2244,7 @@ "aVu" = (/obj/item/material/knife/ritual,/turf/unsimulated/floor{icon_state = "freezerfloor"},/area/wizard_station) "aVv" = (/turf/space,/turf/simulated/shuttle/wall/corner/smoothwhite/ne,/area/shuttle/merchant/home) "aVw" = (/obj/structure/computerframe,/turf/simulated/floor/trim/carpet/blue,/area/shuttle/merchant/home) -"aVx" = (/obj/machinery/computer/shuttle_control/merchant,/turf/simulated/floor/trim/carpet/blue,/area/shuttle/merchant/home) +"aVx" = (/obj/machinery/computer/shuttle_control/multi/merchant,/turf/simulated/floor/trim/carpet/blue,/area/shuttle/merchant/home) "aVy" = (/obj/structure/table/reinforced,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/pen,/turf/simulated/floor/trim/carpet/blue,/area/shuttle/merchant/home) "aVz" = (/turf/space,/turf/simulated/shuttle/wall/corner/smoothwhite/nw,/area/shuttle/merchant/home) "aVA" = (/obj/structure/sign/bluecross_2,/turf/simulated/wall,/area/merchant_station)