cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting

Browse Source 
# Conflicts:
#	code/__DEFINES/misc.dm
This commit is contained in:
Mark van Alphen
2019-05-04 03:07:36 +02:00
parent bbeb07abd2 3c4f56ecdb
commit f3fb39b339
39 changed files with 704 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/shuttle.dm
+2
View File
@@ -717,6 +717,8 @@
possible_destinations = C.possible_destinations
shuttleId = C.shuttleId
/obj/machinery/computer/shuttle/Initialize(mapload)
. = ..()
connect()
/obj/machinery/computer/shuttle/proc/connect()