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

Locking lifeboats open the docks #5133

Merged
merged 7 commits into from
Dec 9, 2023
Merged

Locking lifeboats open the docks #5133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5530a7b
dock
ihatethisengine Dec 5, 2023
34d6391
d
ihatethisengine Dec 5, 2023
a7f5ed9
Update computer.dm
ihatethisengine Dec 6, 2023
5491794
Update computer.dm
ihatethisengine Dec 6, 2023
4fbc5a3
d
ihatethisengine Dec 6, 2023
266e122
d
ihatethisengine Dec 6, 2023
7796794
d
ihatethisengine Dec 6, 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
19 changes: 14 additions & 5 deletions code/modules/shuttle/computer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,14 +321,23 @@
if(lifeboat.status == LIFEBOAT_LOCKED)
to_chat(xeno, SPAN_WARNING("We already wrested away control of this metal bird."))
return XENO_NO_DELAY_ACTION
if(lifeboat.mode == SHUTTLE_CALL)
to_chat(xeno, SPAN_WARNING("Too late, you cannot stop the metal bird mid-flight."))
return XENO_NO_DELAY_ACTION

xeno_attack_delay(xeno)
if(do_after(usr, 5 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE))
if(lifeboat.status != LIFEBOAT_LOCKED)
lifeboat.status = LIFEBOAT_LOCKED
lifeboat.available = FALSE
lifeboat.set_mode(SHUTTLE_IDLE)
xeno_message(SPAN_XENOANNOUNCE("We have wrested away control of one of the metal birds! They shall not escape!"), 3, xeno.hivenumber)
if(lifeboat.status == LIFEBOAT_LOCKED)
return XENO_NO_DELAY_ACTION
if(lifeboat.mode == SHUTTLE_CALL)
to_chat(xeno, SPAN_WARNING("Too late, you cannot stop the metal bird mid-flight."))
return XENO_NO_DELAY_ACTION
lifeboat.status = LIFEBOAT_LOCKED
lifeboat.available = FALSE
lifeboat.set_mode(SHUTTLE_IDLE)
var/obj/docking_port/stationary/lifeboat_dock/lifeboat_dock = lifeboat.get_docked()
lifeboat_dock.open_dock()
xeno_message(SPAN_XENOANNOUNCE("We have wrested away control of one of the metal birds! They shall not escape!"), 3, xeno.hivenumber)
return XENO_NO_DELAY_ACTION
else
return ..()
2 changes: 2 additions & 0 deletions code/modules/shuttle/shuttles/crashable/lifeboats.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@

/obj/docking_port/stationary/lifeboat_dock/proc/close_dock()
var/obj/docking_port/mobile/crashable/lifeboat/docked_shuttle = get_docked()
if(docked_shuttle.status == LIFEBOAT_LOCKED)
return
if(docked_shuttle)
for(var/obj/structure/machinery/door/airlock/multi_tile/door in docked_shuttle.doors)
INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat, close_and_lock))
Expand Down