From ace6bb2854014af92be5bb5720a02de427d0b358 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Sat, 5 Mar 2022 15:12:09 -0500 Subject: [PATCH 1/2] SD paper!!! One of the docking codes was the wrong subtype, resulting in bad. --- maps/stellardelight/stellar_delight2.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/stellardelight/stellar_delight2.dmm b/maps/stellardelight/stellar_delight2.dmm index a423e68b95..620aa603d6 100644 --- a/maps/stellardelight/stellar_delight2.dmm +++ b/maps/stellardelight/stellar_delight2.dmm @@ -13917,7 +13917,7 @@ pixel_x = 32; pixel_y = 0 }, -/obj/item/weapon/paper/dockingcodes, +/obj/item/weapon/paper/dockingcodes/sd, /obj/item/device/radio, /obj/item/device/radio, /turf/simulated/floor/tiled/eris/dark/monofloor, From 050de92534e639d789b19262ae182c235a0e2fbc Mon Sep 17 00:00:00 2001 From: VerySoft Date: Sat, 5 Mar 2022 15:34:17 -0500 Subject: [PATCH 2/2] This too! --- code/modules/shuttles/shuttle_console.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index 53f8c1b734..7faf07ae7a 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -161,7 +161,11 @@ GLOBAL_LIST_BOILERPLATE(papers_dockingcode, /obj/item/weapon/paper/dockingcodes) /obj/item/weapon/paper/dockingcodes/proc/populate_info() var/dockingcodes = null - var/z_to_check = codes_from_z ? codes_from_z : z + var/turf/T = get_turf(src) + var/our_z + if(T) + our_z = T.z + var/z_to_check = codes_from_z ? codes_from_z : our_z if(using_map.use_overmap) var/obj/effect/overmap/visitable/location = get_overmap_sector(z_to_check) if(location && location.docking_codes)