Artillery 1: Interdiction HARBLUN

code/datums/mapgen/planetary/WasteGenerator.dm

@@ -397,6 +397,7 @@
 		/obj/effect/spawner/lootdrop/maintenance/three = 10,
 		/obj/effect/spawner/lootdrop/maintenance/four = 20,
 		/obj/effect/spawner/lootdrop/waste/salvageable = 40,
+		/obj/effect/spawner/lootdrop/waste/artillery = 15 // hispania
 	)
 	mob_spawn_list = list( //nor organics, more biased towards hivebots though
 		/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 80,
@@ -427,7 +428,8 @@
 		/obj/effect/spawner/lootdrop/maintenance/three = 10,
 		/obj/effect/spawner/lootdrop/maintenance/four = 20,
 		/obj/effect/spawner/lootdrop/waste/salvageable = 40,
-		/obj/structure/foamedmetal = 100
+		/obj/structure/foamedmetal = 100,
+		/obj/effect/spawner/lootdrop/waste/artillery = 20 // hispania
 	)
 	mob_spawn_list = list( //Whoops! All hivebots!
 		/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 80,

code/game/objects/effects/spawners/lootdrop.dm

@@ -1122,6 +1122,13 @@
 		/obj/structure/salvageable/server = 8
 	)
 
+// HISPANIA ARTILLERY
+/obj/effect/spawner/lootdrop/waste/artillery
+	loot = list(
+		/obj/structure/salvageable/interdiction = 70,
+		/obj/structure/salvageable/harblun = 30
+	)
+
 /obj/effect/spawner/lootdrop/waste/girder
 	loot = list(
 		/obj/structure/girder,

code/hispania/game/objects/items/circuitboards/computer_circuitboards.dm

@@ -0,0 +1,5 @@
+/obj/item/circuitboard/computer/interdiction
+	name = "interdiction control (Computer Board)"
+	icon = 'icons/hispania/obj/module.dmi'
+	icon_state = "interd"
+	build_path = /obj/machinery/computer/interdiction

code/hispania/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -0,0 +1,43 @@
+/obj/item/circuitboard/machine/interdictor
+	name = "Interdictor HARBLUN (Machine Board)"
+	icon = 'icons/hispania/obj/module.dmi'
+	icon_state = "harblun"
+	build_path = /obj/machinery/interdiction_harblun
+	req_components = list(
+		/obj/item/stack/sheet/glass = 1,
+		/obj/item/stock_parts/capacitor/adv = 2,
+		/obj/item/stack/cable_coil = 10,
+		/obj/item/stock_parts/subspace/filter = 1,
+		/obj/item/stock_parts/subspace/crystal = 1,
+		/obj/item/stock_parts/micro_laser/high = 3,
+		/obj/item/stack/ore/bluespace_crystal = 1,
+		/obj/item/stock_parts/matter_bin/adv = 2
+		)
+
+/obj/item/circuitboard/machine/interdictor/lg
+	name = "Interdictor Low-Gamma HARBLUN (Machine Board)"
+	icon_state = "harblunlg"
+	build_path = /obj/machinery/interdiction_harblun/lg
+	req_components = list(
+		/obj/item/stack/sheet/glass = 1,
+		/obj/item/stock_parts/capacitor = 2,
+		/obj/item/stack/cable_coil = 10,
+		/obj/item/stock_parts/matter_bin = 2,
+		/obj/item/stock_parts/micro_laser = 5,
+		/obj/item/stack/ore/bluespace_crystal = 1
+		)
+
+/obj/item/circuitboard/machine/interdictor/mg
+	name = "Interdictor Military-Gamma HARBLUN (Machine Board)"
+	icon_state = "harblunmg"
+	build_path = /obj/machinery/interdiction_harblun/military
+	req_components = list(
+		/obj/item/stack/sheet/glass = 1,
+		/obj/item/stock_parts/capacitor/quadratic = 4,
+		/obj/item/stack/cable_coil = 10,
+		/obj/item/stock_parts/matter_bin/bluespace = 2,
+		/obj/item/stock_parts/micro_laser/quadultra = 5,
+		/obj/item/stack/ore/bluespace_crystal = 5,
+		/obj/item/stock_parts/subspace/filter = 4,
+		/obj/item/stock_parts/subspace/crystal = 3
+		)

code/hispania/game/objects/structures/salvaging.dm

@@ -0,0 +1,43 @@
+/obj/structure/salvageable/harblun
+	name = "broken interdiction HARBLUN"
+	icon = 'icons/hispania/obj/salvage_structure.dmi'
+	icon_state = "harblun_broke"
+	salvageable_parts = list(
+		/obj/item/stack/sheet/glass/two = 80,
+		/obj/item/stack/cable_coil/cut = 80,
+		/obj/item/stack/ore/salvage/scrapuranium/five = 70,
+		/obj/item/stack/ore/salvage/scrapmetal/five = 60,
+		/obj/item/stack/ore/salvage/scrapplasma = 50,
+
+		/obj/effect/spawner/lootdrop/salvage_matter_bin = 60,
+		/obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
+
+		/obj/effect/spawner/lootdrop/salvage_laser = 80,
+		/obj/effect/spawner/lootdrop/salvage_laser = 60,
+		/obj/effect/spawner/lootdrop/salvage_laser = 40,
+
+		/obj/effect/spawner/lootdrop/salvage_capacitor = 30,
+
+		/obj/item/stack/sheet/metal/five = 15,
+		/obj/item/stack/sheet/glass/five = 15,
+		/obj/item/stack/sheet/mineral/silver/five = 15,
+
+		/obj/item/circuitboard/machine/interdictor/lg = 25,
+		/obj/item/stack/sheet/bluespace_crystal = 5
+	)
+
+/obj/structure/salvageable/interdiction
+	name = "broken interdiction analyzer"
+	icon = 'icons/hispania/obj/salvage_structure.dmi'
+	icon_state = "interdiction_broken"
+	salvageable_parts = list(
+		/obj/item/stack/sheet/glass/two = 80,
+		/obj/item/stack/cable_coil/cut = 90,
+		/obj/item/stack/ore/salvage/scrapsilver/five = 90,
+		/obj/item/stack/ore/salvage/scrapgold/five = 60,
+		/obj/item/stack/ore/salvage/scrapmetal/five = 60,
+
+		/obj/effect/spawner/lootdrop/salvage_capacitor = 60,
+
+		/obj/item/circuitboard/computer/interdiction = 25,
+	)

code/hispania/modules/overmap/ships/controlled_ship_datum.dm

@@ -0,0 +1,8 @@
+/datum/overmap/ship/controlled/proc/announce_to_helms(message)
+	for(var/obj/machinery/computer/helm/helm as anything in helms)
+		helm.say(message)
+
+/datum/overmap/ship/controlled/proc/flicker_lights()
+	for(var/area/shuttle_area as anything in shuttle_port.shuttle_areas)
+		for(var/obj/machinery/light/L in shuttle_area.contents)
+			L.flicker()

code/hispania/modules/research/designs/artillery_designs.dm

@@ -0,0 +1,37 @@
+/datum/design/board/harblun/low
+	name = "Machine Design (LOW-GAMMA Interdictor HARBLUN Board)"
+	desc = "Allows for the construction of LOW-GAMMA Interdictor HARBLUN."
+	id = "harblun_lg"
+	research_icon_state = "harblunlg_desgn"
+	build_path = /obj/item/circuitboard/machine/interdictor/lg
+	materials = list(/datum/material/glass = 500, /datum/material/bluespace = 100, /datum/material/silver = 300)
+
+/datum/design/board/harblun
+	name = "Machine Design (Interdictor HARBLUN Board)"
+	desc = "Allows for the construction of Interdictor HARBLUN."
+	id = "harblun"
+	research_icon = 'icons/hispania/obj/module.dmi'
+	research_icon_state = "harblun_desgn"
+	build_path = /obj/item/circuitboard/machine/interdictor
+	materials = list(/datum/material/glass = 1000, /datum/material/bluespace = 100, /datum/material/silver = 600)
+	category = list("Computer Boards","Shuttle Machinery")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/board/harblun/high
+	name = "Machine Design (MILITARY-GAMMA Interdictor HARBLUN Board)"
+	desc = "Allows for the construction of MILITARY-GAMMA Interdictor HARBLUN."
+	id = "harblun_mg"
+	research_icon_state = "harblunmg_desgn"
+	build_path = /obj/item/circuitboard/machine/interdictor/mg
+	materials = list(/datum/material/glass = 1000, /datum/material/bluespace = 500, /datum/material/silver = 1000, /datum/material/diamond = 500)
+
+/datum/design/board/interdictor
+	name = "Computer Design (Interdictor Console)"
+	desc = "Allows for the construction of Interdictor HARBLUN."
+	id = "interd"
+	research_icon = 'icons/hispania/obj/module.dmi'
+	research_icon_state = "interd_desgn"
+	build_path = /obj/item/circuitboard/computer/interdiction
+	materials = list(/datum/material/glass = 1000)
+	category = list("Computer Boards","Shuttle Machinery")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SECURITY