mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 21:18:37 +01:00
Fix Build Your Own Shuttle crashing the server (#39886)
This commit is contained in:
committed by
vuonojenmustaturska
parent
b8d61a5e1f
commit
ac2d857da0
@@ -31,7 +31,7 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/shuttle/escape)
|
||||
"g" = (
|
||||
/obj/docking_port/mobile/emergency{
|
||||
/obj/docking_port/mobile/emergency/shuttle_build{
|
||||
dwidth = 11;
|
||||
height = 18;
|
||||
name = "Shuttle Under Construction";
|
||||
@@ -41,10 +41,6 @@
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/shuttle/escape)
|
||||
"h" = (
|
||||
/obj/effect/shuttle_build,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/shuttle/escape)
|
||||
|
||||
(1,1,1) = {"
|
||||
a
|
||||
@@ -341,7 +337,7 @@ f
|
||||
f
|
||||
f
|
||||
f
|
||||
h
|
||||
f
|
||||
f
|
||||
f
|
||||
f
|
||||
|
||||
@@ -102,19 +102,6 @@
|
||||
qdel(src)
|
||||
|
||||
|
||||
//Shuttle Build
|
||||
|
||||
/obj/effect/shuttle_build
|
||||
name = "shuttle_build"
|
||||
desc = "Some assembly required."
|
||||
icon = 'icons/obj/items_and_weapons.dmi'
|
||||
icon_state = "syndballoon"
|
||||
anchored = TRUE
|
||||
|
||||
/obj/effect/shuttle_build/New()
|
||||
SSshuttle.emergency.initiate_docking(SSshuttle.getDock("emergency_home"))
|
||||
qdel(src)
|
||||
|
||||
//Arena
|
||||
|
||||
/obj/effect/forcefield/arena_shuttle
|
||||
|
||||
@@ -571,6 +571,10 @@
|
||||
SSshuttle.emergency = current_emergency
|
||||
SSshuttle.backup_shuttle = src
|
||||
|
||||
/obj/docking_port/mobile/emergency/shuttle_build/register()
|
||||
. = ..()
|
||||
initiate_docking(SSshuttle.getDock("emergency_home"))
|
||||
|
||||
#undef TIME_LEFT
|
||||
#undef ENGINES_START_TIME
|
||||
#undef ENGINES_STARTED
|
||||
|
||||
Reference in New Issue
Block a user