Merge pull request #21647 from KorPhaeron/buildyourownshuttle

Allows captains to organize a shuttle build event
This commit is contained in:
oranges
2016-11-25 10:13:53 +13:00
committed by GitHub
4 changed files with 52 additions and 382 deletions
+13
View File
@@ -138,3 +138,16 @@
else
mover << "You don't have enough money to enter the main shuttle. You'll have to fly coach."
return 0
//Shuttle Build
/obj/effect/shuttle_build
name = "shuttle_build"
desc = "Some assembly required"
icon = 'icons/obj/weapons.dmi'
icon_state = "syndballoon"
anchored = TRUE
/obj/effect/shuttle_build/New()
SSshuttle.emergency.dock(SSshuttle.getDock("emergency_home"))
qdel(src)
+3
View File
@@ -422,6 +422,9 @@
//this is the main proc. It instantly moves our mobile port to stationary port S1
//it handles all the generic behaviour, such as sanity checks, closing doors on the shuttle, stunning mobs, etc
/obj/docking_port/mobile/proc/dock(obj/docking_port/stationary/S1, force=FALSE)
if(S1.get_docked() == src)
remove_ripples()
return
// Crashing this ship with NO SURVIVORS
if(!force)
if(!check_dock(S1))