Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

VLS unloading fix #2521

Merged
merged 2 commits into from
Sep 21, 2023
Merged

VLS unloading fix #2521

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f07d821
Update vls.dm
Ikalpo Aug 17, 2023
eff71aa
bokkie said we can't just have this
Ikalpo Aug 18, 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 nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/revision2/vls.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
return FALSE
if(loading)
return FALSE
if(oldloc == src)// stops torps from getting sent back in instantly
return FALSE
if(state >= STATE_LOADED)
return FALSE
load(torp)
Expand Down Expand Up @@ -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)
Expand Down
Loading