From a0dfe5d603b6765f525428d18fb236153d77725b Mon Sep 17 00:00:00 2001 From: Ediblebomb <95509996+Ediblebomb@users.noreply.github.com> Date: Wed, 11 Sep 2024 23:22:17 -0500 Subject: [PATCH 1/4] Update golden_arrow.dmm --- maps/map_files/golden_arrow/golden_arrow.dmm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index ea8d1a9e4a..03ee557764 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -1959,6 +1959,10 @@ pixel_y = 3 }, /obj/structure/surface/table/reinforced/almayer_B, +/obj/item/storage/pouch/flamertank{ + pixel_x = -11; + pixel_y = 2 + }, /turf/open/floor/almayer{ icon_state = "mono" }, @@ -17942,6 +17946,9 @@ pixel_y = 10 }, /obj/structure/surface/table/reinforced/almayer_B, +/obj/item/storage/pouch/flamertank{ + pixel_x = -7 + }, /turf/open/floor/almayer{ icon_state = "mono" }, From 3a4c29669704e657dc5d905960a9210fd8858828 Mon Sep 17 00:00:00 2001 From: Ediblebomb <95509996+Ediblebomb@users.noreply.github.com> Date: Thu, 12 Sep 2024 16:14:16 -0500 Subject: [PATCH 2/4] Revert "Update golden_arrow.dmm" This reverts commit a0dfe5d603b6765f525428d18fb236153d77725b. --- maps/map_files/golden_arrow/golden_arrow.dmm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index 03ee557764..ea8d1a9e4a 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -1959,10 +1959,6 @@ pixel_y = 3 }, /obj/structure/surface/table/reinforced/almayer_B, -/obj/item/storage/pouch/flamertank{ - pixel_x = -11; - pixel_y = 2 - }, /turf/open/floor/almayer{ icon_state = "mono" }, @@ -17946,9 +17942,6 @@ pixel_y = 10 }, /obj/structure/surface/table/reinforced/almayer_B, -/obj/item/storage/pouch/flamertank{ - pixel_x = -7 - }, /turf/open/floor/almayer{ icon_state = "mono" }, From 939590186a462e11f14bab1b7ce196aeb042ada8 Mon Sep 17 00:00:00 2001 From: Ediblebomb <95509996+Ediblebomb@users.noreply.github.com> Date: Thu, 12 Sep 2024 16:35:45 -0500 Subject: [PATCH 3/4] Update squad_prep.dm --- .../game/machinery/vending/vendor_types/squad_prep/squad_prep.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index 8ec93ab581..a07a86d5b0 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -127,6 +127,7 @@ list("Large Pistol Magazine Pouch", round(scale * 2), /obj/item/storage/pouch/magazine/pistol/large, VENDOR_ITEM_REGULAR), list("Tools Pouch", round(scale * 1.25), /obj/item/storage/pouch/tools, VENDOR_ITEM_REGULAR), list("Sling Pouch", round(scale * 1.25), /obj/item/storage/pouch/sling, VENDOR_ITEM_REGULAR), + list("Incinerator Fuel Tank Pouch", round(scale * 1.25), /obj/item/storage/pouch/flamertank, VENDOR_ITEM_REGULAR), list("MASK", -1, null, null, null), list("M5 Standalone Gas Mask", round(scale * 15), /obj/item/clothing/mask/gas/m5, VENDOR_ITEM_REGULAR), From 8b353c97253b12ce4b867b8b0d5e42378680d40e Mon Sep 17 00:00:00 2001 From: Ediblebomb <95509996+Ediblebomb@users.noreply.github.com> Date: Fri, 13 Sep 2024 17:15:45 -0500 Subject: [PATCH 4/4] oops --- .../machinery/vending/vendor_types/squad_prep/squad_prep.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index d6253e737a..6e572e7e8b 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -159,7 +159,7 @@ list("Large Pistol Magazine Pouch", floor(scale * 2), /obj/item/storage/pouch/magazine/pistol/large, VENDOR_ITEM_REGULAR), list("Tools Pouch", 1.25, /obj/item/storage/pouch/tools, VENDOR_ITEM_REGULAR), list("Sling Pouch", 1.25, /obj/item/storage/pouch/sling, VENDOR_ITEM_REGULAR), - list("Incinerator Fuel Tank Pouch", 1.25, /obj/item/storage/pouch/flamertank, VENDOR_ITEM_REGULAR), + list("Incinerator Fuel Tank Pouch", 1.25, /obj/item/storage/pouch/flamertank, VENDOR_ITEM_REGULAR), list("MASK", -1, null, null, null), list("M5 Standalone Gas Mask", floor(scale * 15), /obj/item/clothing/mask/gas/m5, VENDOR_ITEM_REGULAR),