cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018

Browse Source 
# Conflicts:
#	code/modules/mob/mob.dm - Whitespace? No real conflict.
#	code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.
This commit is contained in:
Arokha Sieyes
2018-01-22 12:10:19 -05:00
parent 572aac4afb 10490fa5b4
commit 9016ca94c0
19 changed files with 246 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob_planes.dm
+1 -1
View File
@@ -37,7 +37,7 @@
/datum/plane_holder/Destroy()
my_mob = null
qdel_null_list(plane_masters) //Goodbye my children, be free //VOREStation Edit - Need to qdel these now
qdel_null_list(plane_masters) //Goodbye my children, be free
return ..()
/datum/plane_holder/proc/set_vis(var/which = null, var/state = FALSE)