From aa95657ec40db6aa988445d57d7e2e754237eccb Mon Sep 17 00:00:00 2001 From: kokolo21 <94068050+kokolo21@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:57:12 -0300 Subject: [PATCH 1/3] I FIX --- code/hispania/modules/shipscombat/interdiction.dm | 4 ++-- shiptest.dme | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/code/hispania/modules/shipscombat/interdiction.dm b/code/hispania/modules/shipscombat/interdiction.dm index a3e381f4399a..d6647380ac31 100644 --- 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/shiptest.dme b/shiptest.dme index 709b88ed4976..2cb2eaa77ca4 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1453,16 +1453,11 @@ #include "code\game\turfs\open\space\space.dm" #include "code\game\turfs\open\space\transit.dm" #include "code\hispania\game\area\ship_areas.dm" -#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\research\designs\artillery_designs.dm" +#include "code\hispania\modules\recycling\disposal\bin.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" From 494cea27f280f8f34c36fc87b30d95b6ea0eb039 Mon Sep 17 00:00:00 2001 From: kokolo21 <94068050+kokolo21@users.noreply.github.com> Date: Tue, 22 Aug 2023 14:00:08 -0300 Subject: [PATCH 2/3] FIX --- shiptest.dme | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/shiptest.dme b/shiptest.dme index 2cb2eaa77ca4..bcbbce960aff 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1453,9 +1453,14 @@ #include "code\game\turfs\open\space\space.dm" #include "code\game\turfs\open\space\transit.dm" #include "code\hispania\game\area\ship_areas.dm" +#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\modules\admin\admin.dm" From 56d1b2f8834549f3d6a231fc4e22bfc2c92c0a4c Mon Sep 17 00:00:00 2001 From: Saga <55407528+SagaStars@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:08:57 -0400 Subject: [PATCH 3/3] call parent aaaaaaaaaaa Signed-off-by: Saga <55407528+SagaStars@users.noreply.github.com> --- code/hispania/modules/shipscombat/interdiction_machine.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/hispania/modules/shipscombat/interdiction_machine.dm b/code/hispania/modules/shipscombat/interdiction_machine.dm index 65bcd27b599d..facab96489f3 100644 --- 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)