From 17a4bcd35ec5f4248dc588fe75ce1dc0bc3a2543 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Wed, 13 Mar 2024 18:09:30 +0800 Subject: [PATCH 1/2] BoxCommit --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 26 +++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 0d15799978a9..9b33de35fbfa 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -24105,6 +24105,10 @@ pixel_x = 4; pixel_y = -2 }, +/obj/item/stack/sheet/cardboard/small_stack{ + pixel_x = -6; + pixel_y = 9 + }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) "dXI" = ( @@ -26160,7 +26164,14 @@ pixel_x = -1; pixel_y = 10 }, -/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil{ + pixel_y = 1; + pixel_x = 8 + }, +/obj/item/stack/sheet/cardboard/small_stack{ + pixel_y = -3; + pixel_x = -8 + }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) "eGq" = ( @@ -67445,7 +67456,11 @@ "teu" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/weapon/gun/shotgun/pump{ - starting_attachment_types = list(/obj/item/attachable/stock/shotgun) + starting_attachment_types = list(/obj/item/attachable/stock/shotgun); + pixel_y = 9 + }, +/obj/item/stack/sheet/cardboard/small_stack{ + pixel_y = -6 }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) @@ -72048,7 +72063,12 @@ desc = "A large handheld tool used to override various machine functions. Primarily used to pulse Airlock and APC wires on a shortwave frequency. It contains a small data buffer as well. This one is comically oversized. Made in Texas."; icon_state = "multitool_big"; name = "\improper Oversized Security Access Tuner"; - pixel_y = 8 + pixel_y = 16; + pixel_x = 10 + }, +/obj/item/stack/sheet/cardboard/medium_stack{ + pixel_y = -6; + pixel_x = -7 }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) From 0ff27be28b9ec8c3d767f20acffbb56c57a2b35a Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Tue, 19 Mar 2024 18:10:56 +0800 Subject: [PATCH 2/2] Fix --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 9b33de35fbfa..a31d6a8ace67 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -24103,11 +24103,13 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/device/camera_film{ pixel_x = 4; - pixel_y = -2 + pixel_y = 1; + layer = 3.03 }, /obj/item/stack/sheet/cardboard/small_stack{ - pixel_x = -6; - pixel_y = 9 + pixel_x = -5; + pixel_y = 3; + layer = 3.02 }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) @@ -26169,8 +26171,9 @@ pixel_x = 8 }, /obj/item/stack/sheet/cardboard/small_stack{ - pixel_y = -3; - pixel_x = -8 + pixel_y = 2; + pixel_x = -3; + layer = 3.01 }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) @@ -67460,7 +67463,7 @@ pixel_y = 9 }, /obj/item/stack/sheet/cardboard/small_stack{ - pixel_y = -6 + layer = 3.01 }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) @@ -72063,12 +72066,13 @@ desc = "A large handheld tool used to override various machine functions. Primarily used to pulse Airlock and APC wires on a shortwave frequency. It contains a small data buffer as well. This one is comically oversized. Made in Texas."; icon_state = "multitool_big"; name = "\improper Oversized Security Access Tuner"; - pixel_y = 16; - pixel_x = 10 + pixel_y = 11; + pixel_x = 4 }, /obj/item/stack/sheet/cardboard/medium_stack{ pixel_y = -6; - pixel_x = -7 + pixel_x = -7; + layer = 3.01 }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared)