From 2837f0d613344f70a69a299b7eaa115317967fc7 Mon Sep 17 00:00:00 2001
From: Spookerton <918997+Spookerton@users.noreply.github.com>
Date: Thu, 30 Nov 2023 17:43:57 +0300
Subject: [PATCH] [MIRROR] no free merc ofd charges + add charges to uplink

---
 baystation12.dme                              |  1 +
 code/datums/uplink/structures_and_vehicles.dm | 34 +++++++++++++++++++
 code/datums/uplink/uplink_categories.dm       |  3 ++
 maps/antag_spawn/mercenary/mercenary_base.dmm | 12 ++-----
 4 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 code/datums/uplink/structures_and_vehicles.dm

diff --git a/baystation12.dme b/baystation12.dme
index 2fb9934fb7618..2597ce8b96543 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -513,6 +513,7 @@
 #include "code\datums\uplink\services.dm"
 #include "code\datums\uplink\stealth_and_camouflage_items.dm"
 #include "code\datums\uplink\stealthy_and_inconspicuous_weapons.dm"
+#include "code\datums\uplink\structures_and_vehicles.dm"
 #include "code\datums\uplink\telecrystals.dm"
 #include "code\datums\uplink\uplink_categories.dm"
 #include "code\datums\uplink\uplink_items.dm"
diff --git a/code/datums/uplink/structures_and_vehicles.dm b/code/datums/uplink/structures_and_vehicles.dm
new file mode 100644
index 0000000000000..d9f75274c4ab2
--- /dev/null
+++ b/code/datums/uplink/structures_and_vehicles.dm
@@ -0,0 +1,34 @@
+/datum/uplink_item/item/structures_and_vehicles
+	category = /datum/uplink_category/structures_and_vehicles
+
+
+/datum/uplink_item/item/structures_and_vehicles/ofd_charge_fire
+	name = "FR1-ENFER charge"
+	desc = "An obstruction field disperser charge that causes a localised fire."
+	antag_roles = list(MODE_MERCENARY)
+	item_cost = 80
+	path = /obj/structure/ship_munition/disperser_charge/fire
+
+
+/datum/uplink_item/item/structures_and_vehicles/ofd_charge_emp
+	name = "EM2-QUASAR charge"
+	desc = "An obstruction field disperser charge that emits an electromagnetic pulse."
+	antag_roles = list(MODE_MERCENARY)
+	item_cost = 80
+	path = /obj/structure/ship_munition/disperser_charge/emp
+
+
+/datum/uplink_item/item/structures_and_vehicles/ofd_charge_explosive
+	name = "XP4-INDARRA charge"
+	desc = "An obstruction field disperser charge that explodes."
+	antag_roles = list(MODE_MERCENARY)
+	item_cost = 80
+	path = /obj/structure/ship_munition/disperser_charge/explosive
+
+
+/datum/uplink_item/item/structures_and_vehicles/ofd_charge_mining
+	name = "MN3-BERGBAU charge"
+	desc = "An obstruction field disperser charge that extracts ore."
+	antag_roles = list(MODE_MERCENARY)
+	item_cost = 80
+	path = /obj/structure/ship_munition/disperser_charge/mining
diff --git a/code/datums/uplink/uplink_categories.dm b/code/datums/uplink/uplink_categories.dm
index 3e907ce86c5bd..4ac175ccafb98 100644
--- a/code/datums/uplink/uplink_categories.dm
+++ b/code/datums/uplink/uplink_categories.dm
@@ -48,5 +48,8 @@
 /datum/uplink_category/badassery
 	name = "Badassery"
 
+/datum/uplink_category/structures_and_vehicles
+	name = "Structures & Vehicles"
+
 /datum/uplink_category/telecrystals
 	name = "Telecrystal Materialization"
diff --git a/maps/antag_spawn/mercenary/mercenary_base.dmm b/maps/antag_spawn/mercenary/mercenary_base.dmm
index ff895c9ae7b26..69c9af3eac1c4 100644
--- a/maps/antag_spawn/mercenary/mercenary_base.dmm
+++ b/maps/antag_spawn/mercenary/mercenary_base.dmm
@@ -467,7 +467,6 @@
 /obj/machinery/disperser/back{
 	dir = 1
 	},
-/obj/structure/ship_munition/disperser_charge/emp,
 /turf/simulated/floor/plating,
 /area/map_template/merc_shuttle)
 "eR" = (
@@ -1922,11 +1921,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/map_template/merc_shuttle)
-"vZ" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/floor_decal/industrial/outline/grey,
-/turf/simulated/floor/tiled/dark/monotile,
-/area/map_template/merc_shuttle)
 "wd" = (
 /obj/machinery/sleeper{
 	dir = 4
@@ -2295,11 +2289,11 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/map_template/merc_shuttle)
 "Bj" = (
-/obj/floor_decal/industrial/outline/red,
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/structure/ship_munition/disperser_charge/explosive,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled/techfloor,
 /area/map_template/merc_shuttle)
 "Bn" = (
@@ -5646,7 +5640,7 @@ tY
 kZ
 BA
 ew
-vZ
+uq
 qA
 AF
 xc