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

Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into navconsoles2

Browse Source 
# Conflicts:
#	code/modules/shuttle/shuttle.dm
This commit is contained in:
datlo
2019-02-11 13:31:37 +00:00
parent b27584d6e3 ed3fadb6c9
commit c57ec440e1
112 changed files with 2304 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/shuttle.dm
+3
View File
@@ -837,7 +837,10 @@
req_access = list(access_cent_general)
shuttleId = "specops"
possible_destinations = "specops_home;specops_away"
<<<<<<< HEAD
resistance_flags = INDESTRUCTIBLE
=======
>>>>>>> refs/remotes/ParadiseSS13/master
/obj/machinery/computer/shuttle/white_ship
name = "White Ship Console"