Merge pull request #22 from Helixis/interdicfix

FIXING INTERDICTION!
Helixis · Aug 22, 2023 · c3ae62d · c3ae62d
2 parents e2569b2 + 56d1b2f
commit c3ae62d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/code/hispania/modules/shipscombat/interdiction.dm b/code/hispania/modules/shipscombat/interdiction.dm
@@ -295,10 +295,10 @@
 
 		if(our_strength * our_speedunit > 0 && their_strength * their_speedunit > 0)
 			current_ship.announce_to_helms("Interdiction locking roughly by a [our_strength] coefficient.")
-			throw_ship_contents(current_ship, current_ship.get_heading(), our_strength)
+		//	throw_ship_contents(current_ship, current_ship.get_heading(), our_strength)
 		if(their_strength * their_speedunit > 0)
 			interdicting.announce_to_helms("Interdiction locking roughly by a [their_strength] coefficient.")
-			throw_ship_contents(interdicting, interdicting.get_heading(), their_strength)
+		//	throw_ship_contents(interdicting, interdicting.get_heading(), their_strength)
 
 	if(tether)
 		QDEL_NULL(tether)

diff --git a/code/hispania/modules/shipscombat/interdiction_machine.dm b/code/hispania/modules/shipscombat/interdiction_machine.dm
@@ -71,6 +71,7 @@
 	update_icon()
 
 /obj/machinery/interdiction_harblun/update_icon_state()
+	. = ..()
 	if(machine_stat & BROKEN)
 		icon_state = "[initial(icon_state)]_broke"
 	else if(machine_stat & NOPOWER)

diff --git a/shiptest.dme b/shiptest.dme
@@ -1456,13 +1456,13 @@
 #include "code\hispania\game\objects\items\circuitboards\computer_circuitboards.dm"
 #include "code\hispania\game\objects\items\circuitboards\machine_circuitboards.dm"
 #include "code\hispania\game\objects\structures\salvaging.dm"
+#include "code\hispania\modules\jobs\job_types\hammer.dm"
 #include "code\hispania\modules\jobs\job_types\mantarraya.dm"
 #include "code\hispania\modules\overmap\ships\controlled_ship_datum.dm"
+#include "code\hispania\modules\recycling\disposal\bin.dm"
 #include "code\hispania\modules\research\designs\artillery_designs.dm"
 #include "code\hispania\modules\shipscombat\interdiction.dm"
 #include "code\hispania\modules\shipscombat\interdiction_machine.dm"
-#include "code\hispania\modules\jobs\job_types\hammer.dm"
-#include "code\hispania\modules\recycling\disposal\bin.dm"
 #include "code\modules\admin\admin.dm"
 #include "code\modules\admin\admin_follow.dm"
 #include "code\modules\admin\admin_investigate.dm"