From c6e90c2ded1c7fa27c013bff67b8fd8d80e9b5a9 Mon Sep 17 00:00:00 2001 From: carnie Date: Wed, 7 Jan 2015 18:28:55 +0000 Subject: [PATCH] Resolves #6862 - "shuttle_away" docking port was too small to fit the supply shuttle into, so it could never return to centcom. Resolves #6835 - Same issue as part of #6862. Was adding new requests to the wrong list, so when reviewing the most recent request, the computer would not find it in the pending requests list and spit out the invalid instruction message. --- _maps/map_files/generic/z2.dmm | 2 +- code/controllers/subsystem/shuttles.dm | 2 +- code/controllers/subsystem/shuttles/supply.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/generic/z2.dmm b/_maps/map_files/generic/z2.dmm index 5d0b9363beb..cb6e7a974bb 100644 --- a/_maps/map_files/generic/z2.dmm +++ b/_maps/map_files/generic/z2.dmm @@ -201,7 +201,7 @@ "dS" = (/obj/structure/table,/obj/item/weapon/paper_bin,/turf/simulated/shuttle/floor,/area/centcom/evac) "dT" = (/obj/machinery/door/airlock/shuttle{name = "Supply Shuttle Airlock"; req_access_txt = "31"},/turf/simulated/shuttle/plating,/area/space) "dU" = (/obj/machinery/door_control{dir = 2; id = "QMLoaddoor2"; name = "Loading Doors"; pixel_x = 24; pixel_y = 8},/obj/machinery/door_control{id = "QMLoaddoor"; name = "Loading Doors"; pixel_x = 24; pixel_y = -8},/turf/simulated/shuttle/floor,/area/space) -"dV" = (/obj/machinery/door/airlock/shuttle{name = "Supply Shuttle Airlock"; req_access_txt = "31"},/obj/docking_port/mobile/supply{dwidth = 5; width = 12},/obj/docking_port/stationary{dir = 8; dwidth = 4; height = 7; id = "supply_away"; name = "Centcom"; width = 11},/turf/simulated/shuttle/plating,/area/space) +"dV" = (/obj/machinery/door/airlock/shuttle{name = "Supply Shuttle Airlock"; req_access_txt = "31"},/obj/docking_port/mobile/supply{dwidth = 5; width = 12},/obj/docking_port/stationary{dir = 8; dwidth = 5; height = 7; id = "supply_away"; name = "Centcom"; width = 12},/turf/simulated/shuttle/plating,/area/space) "dW" = (/obj/machinery/conveyor{dir = 4; id = "QMLoad"},/obj/machinery/door/poddoor{id = "QMLoaddoor"; name = "supply dock loading door"},/turf/simulated/shuttle/plating,/area/space) "dX" = (/turf/simulated/shuttle/wall{icon_state = "swall7"; dir = 2},/area/space) "dY" = (/turf/simulated/shuttle/floor,/turf/simulated/shuttle/wall{icon_state = "swall_f10"; dir = 2},/area/space) diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm index 1f94610f046..76a9f4b2a78 100644 --- a/code/controllers/subsystem/shuttles.dm +++ b/code/controllers/subsystem/shuttles.dm @@ -311,7 +311,7 @@ var/datum/subsystem/shuttle/SSshuttle O.orderedbyRank = _orderedbyRank O.comment = _comment - shoppinglist += O + requestlist += O return O diff --git a/code/controllers/subsystem/shuttles/supply.dm b/code/controllers/subsystem/shuttles/supply.dm index 9986e892808..5afbc4b3508 100644 --- a/code/controllers/subsystem/shuttles/supply.dm +++ b/code/controllers/subsystem/shuttles/supply.dm @@ -263,7 +263,7 @@ return //Find the correct supply_pack datum - if(!SSshuttle.supply_packs[href_list["doorder"]]) return + if(!SSshuttle.supply_packs["[href_list["doorder"]]"]) return var/timeout = world.time + 600 var/reason = stripped_input(usr,"Reason:","Why do you require this item?","")