From caa536ebf5568adb65fdf649296a07936548fd8a Mon Sep 17 00:00:00 2001 From: riquewright Date: Sun, 30 Jun 2024 04:06:02 -0300 Subject: [PATCH 1/5] Plasma Cutter is back in town! --- code/modules/research/techweb/all_nodes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 06a03fb4447..d0e487e2f53 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -745,7 +745,7 @@ display_name = "Mining Technology" description = "Better than Efficiency V." prereq_ids = list("engineering") - design_ids = list("drill", "superresonator", "triggermod", "damagemod", "cooldownmod", "rangemod", "hypermod", "ore_redemption", "mining_equipment_vendor", "exploration_equipment_vendor", "cargoexpress", "furnace", "furnace_console") + design_ids = list("drill", "superresonator", "triggermod", "damagemod", "cooldownmod", "rangemod", "hypermod", "plasmacutter", "ore_redemption", "mining_equipment_vendor", "exploration_equipment_vendor", "cargoexpress", "furnace", "furnace_console") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 From b0fd7df5e0917b900c878f1cf7dd7aa9f67ed2ea Mon Sep 17 00:00:00 2001 From: riquewright Date: Sun, 30 Jun 2024 19:44:34 -0300 Subject: [PATCH 2/5] Update mining30.dmm --- .../map_files/Mining/nsv13/ruins/mining30.dmm | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/_maps/map_files/Mining/nsv13/ruins/mining30.dmm b/_maps/map_files/Mining/nsv13/ruins/mining30.dmm index a2aa0141dd6..fcf25d29ed9 100644 --- a/_maps/map_files/Mining/nsv13/ruins/mining30.dmm +++ b/_maps/map_files/Mining/nsv13/ruins/mining30.dmm @@ -50,6 +50,9 @@ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" }, /area/ruin/powered) +"B" = ( +/turf/closed/mineral/random/high_chance, +/area/ruin/powered) "C" = ( /obj/effect/landmark/dropship_entry, /turf/template_noop, @@ -858,14 +861,14 @@ L L L L -L +B L L W g G W -L +B L L b @@ -899,16 +902,16 @@ L L L L -L -L +B +B L L W c G W -L -L +B +B L b b @@ -941,8 +944,8 @@ L L L L -L -L +B +B L L Z @@ -950,7 +953,7 @@ G G c L -L +B L L b @@ -1119,7 +1122,7 @@ G c Z L -L +B L b b @@ -1153,15 +1156,15 @@ L L L L -L +B a Z G G g p -L -L +B +B L b b @@ -1194,16 +1197,16 @@ L L L L -L -L +B +B W Z G G G W -L -L +B +B L b b @@ -1236,8 +1239,8 @@ L L L L -L -L +B +B W W W From 04bbc763c732cbfac221f9680855a844a7cebfc2 Mon Sep 17 00:00:00 2001 From: riquewright Date: Sun, 30 Jun 2024 19:49:09 -0300 Subject: [PATCH 3/5] Revert "Plasma Cutter is back in town!" This reverts commit caa536ebf5568adb65fdf649296a07936548fd8a. --- code/modules/research/techweb/all_nodes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index d0e487e2f53..06a03fb4447 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -745,7 +745,7 @@ display_name = "Mining Technology" description = "Better than Efficiency V." prereq_ids = list("engineering") - design_ids = list("drill", "superresonator", "triggermod", "damagemod", "cooldownmod", "rangemod", "hypermod", "plasmacutter", "ore_redemption", "mining_equipment_vendor", "exploration_equipment_vendor", "cargoexpress", "furnace", "furnace_console") + design_ids = list("drill", "superresonator", "triggermod", "damagemod", "cooldownmod", "rangemod", "hypermod", "ore_redemption", "mining_equipment_vendor", "exploration_equipment_vendor", "cargoexpress", "furnace", "furnace_console") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 From 9f0c2d984594e18403f97df83fe6d64d98ecaedf Mon Sep 17 00:00:00 2001 From: riquewright Date: Sun, 30 Jun 2024 19:52:21 -0300 Subject: [PATCH 4/5] Revert "Update mining30.dmm" This reverts commit b0fd7df5e0917b900c878f1cf7dd7aa9f67ed2ea. --- .../map_files/Mining/nsv13/ruins/mining30.dmm | 41 +++++++++---------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/_maps/map_files/Mining/nsv13/ruins/mining30.dmm b/_maps/map_files/Mining/nsv13/ruins/mining30.dmm index fcf25d29ed9..a2aa0141dd6 100644 --- a/_maps/map_files/Mining/nsv13/ruins/mining30.dmm +++ b/_maps/map_files/Mining/nsv13/ruins/mining30.dmm @@ -50,9 +50,6 @@ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" }, /area/ruin/powered) -"B" = ( -/turf/closed/mineral/random/high_chance, -/area/ruin/powered) "C" = ( /obj/effect/landmark/dropship_entry, /turf/template_noop, @@ -861,14 +858,14 @@ L L L L -B +L L L W g G W -B +L L L b @@ -902,16 +899,16 @@ L L L L -B -B +L +L L L W c G W -B -B +L +L L b b @@ -944,8 +941,8 @@ L L L L -B -B +L +L L L Z @@ -953,7 +950,7 @@ G G c L -B +L L L b @@ -1122,7 +1119,7 @@ G c Z L -B +L L b b @@ -1156,15 +1153,15 @@ L L L L -B +L a Z G G g p -B -B +L +L L b b @@ -1197,16 +1194,16 @@ L L L L -B -B +L +L W Z G G G W -B -B +L +L L b b @@ -1239,8 +1236,8 @@ L L L L -B -B +L +L W W W From c3f938d30a2223f7c7a04c9d511014bd6c7ee42a Mon Sep 17 00:00:00 2001 From: riquewright Date: Sun, 30 Jun 2024 19:52:46 -0300 Subject: [PATCH 5/5] Reapply "Plasma Cutter is back in town!" This reverts commit 04bbc763c732cbfac221f9680855a844a7cebfc2. --- code/modules/research/techweb/all_nodes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 06a03fb4447..d0e487e2f53 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -745,7 +745,7 @@ display_name = "Mining Technology" description = "Better than Efficiency V." prereq_ids = list("engineering") - design_ids = list("drill", "superresonator", "triggermod", "damagemod", "cooldownmod", "rangemod", "hypermod", "ore_redemption", "mining_equipment_vendor", "exploration_equipment_vendor", "cargoexpress", "furnace", "furnace_console") + design_ids = list("drill", "superresonator", "triggermod", "damagemod", "cooldownmod", "rangemod", "hypermod", "plasmacutter", "ore_redemption", "mining_equipment_vendor", "exploration_equipment_vendor", "cargoexpress", "furnace", "furnace_console") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000