cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 11:07:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into SMC

Browse Source 
# Conflicts:
#	code/__DEFINES/flags.dm
This commit is contained in:
tigercat2000
2018-03-22 15:35:12 -07:00
parent f5940155ca 3ed55007d4
commit b14faa19c3
280 changed files with 6565 additions and 2171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/shuttle.dm
+3
View File
@@ -33,6 +33,9 @@
return QDEL_HINT_LETMELIVE
/obj/docking_port/take_damage()
return
/obj/docking_port/singularity_pull()
return