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.

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

Fix shuttle_catastrophe canSpawnEvent #1212

Merged
Merged
Changes from all commits
Commits
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
Fix shuttle_catastrophe canSpawnEvent
CSDSP committed Oct 27, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 7b038c2486f1a6a89cfb27583bc09340a4642fd7
2 changes: 1 addition & 1 deletion code/modules/events/shuttle_catastrophe.dm
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
description = "Replaces the emergency shuttle with a random one."

/datum/round_event_control/shuttle_catastrophe/canSpawnEvent(players, gamemode)
if(SSshuttle.emergency.name == "Build your own shuttle kit")
if(istype(SSshuttle.emergency, /obj/docking_port/mobile/emergency/shuttle_build))
return FALSE //don't undo manual player engineering, it also would unload people and ghost them, there's just a lot of problems
if(SSshuttle.emergency.in_flight())
return FALSE //ditto, problems