From f07d82122d4b453655225586168e6f28ea53e4bc Mon Sep 17 00:00:00 2001 From: Ikalpo Date: Thu, 17 Aug 2023 13:52:26 -0700 Subject: [PATCH 1/2] Update vls.dm --- .../ship_weapons/ballistic_weapons/revision2/vls.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/vls.dm b/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/vls.dm index 8a6c19c5974..c445fc5cb76 100644 --- a/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/vls.dm +++ b/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/vls.dm @@ -58,7 +58,9 @@ return FALSE if(loading) return FALSE - if(state >= STATE_LOADED) + if(oldloc == src)// stops torps from getting sent back in instantly + return FALSE + if(state >= STATE_FEEDING) return FALSE load(torp) @@ -133,9 +135,7 @@ hatch.toggle(HT_CLOSED) /obj/machinery/ship_weapon/vls/unload() - loading = TRUE // This prevents torps from immediately falling back into the VLS tube . = ..() - loading = FALSE if(!hatch) return hatch.toggle(HT_CLOSED) From eff71aa388fc1946185c33d057df2f6dc47e3886 Mon Sep 17 00:00:00 2001 From: Ikalpo Date: Fri, 18 Aug 2023 06:05:53 -0700 Subject: [PATCH 2/2] bokkie said we can't just have this --- .../munitions/ship_weapons/ballistic_weapons/revision2/vls.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/vls.dm b/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/vls.dm index c445fc5cb76..3cf4a5d9905 100644 --- a/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/vls.dm +++ b/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/vls.dm @@ -60,7 +60,7 @@ return FALSE if(oldloc == src)// stops torps from getting sent back in instantly return FALSE - if(state >= STATE_FEEDING) + if(state >= STATE_LOADED) return FALSE load(torp)