Skip to content
This repository has been archived by the owner on Feb 16, 2024. It is now read-only.

FIXING INTERDICTION! #22

Merged
merged 3 commits into from
Aug 22, 2023
Merged

FIXING INTERDICTION! #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa95657
I FIX
kokolo21 Aug 22, 2023
494cea2
FIX
kokolo21 Aug 22, 2023
56d1b2f
call parent
SagaStars Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/hispania/modules/shipscombat/interdiction.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions code/hispania/modules/shipscombat/interdiction_machine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions shiptest.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down