Skip to content

Commit

Permalink
Merge pull request #1212 from TheSyndication/no_byos_catastrophe
Browse files Browse the repository at this point in the history
Fix shuttle_catastrophe canSpawnEvent
  • Loading branch information
MosleyTheMalO authored Nov 9, 2024
2 parents 4da2079 + 7b038c2 commit 7e1a7cd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/events/shuttle_catastrophe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7e1a7cd

Please sign in to comment.