Merge pull request #2789 from VOREStation/aro-thirdruntime

Fixes a runtime and potential future runtime
This commit is contained in:
Leshana
2018-01-18 18:48:41 -05:00
committed by GitHub
2 changed files with 2 additions and 4 deletions
@@ -135,7 +135,7 @@
for(var/slot in slots)
var/obj/item/clothing/O = get_equipped_item(slot) //Change this type if you move the vision stuff to item or something.
if(O && O.enables_planes && (slot in O.plane_slots))
if(istype(O) && O.enables_planes && (slot in O.plane_slots))
compiled_vis |= O.enables_planes
//Check to see if we have a rig (ugh, blame rigs, desnowflake this)
+1 -3
View File
@@ -36,9 +36,7 @@
..()
/datum/plane_holder/Destroy()
if(my_mob)
my_mob.plane_holder = null
my_mob = null
my_mob = null
plane_masters.Cut() //Goodbye my children, be free
return ..()