From 02c0430e9966dc3d1b29b4b344b0ed6dbf60b143 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Thu, 18 Jan 2018 14:27:23 -0500 Subject: [PATCH 1/2] POLARIS: Simplify Destroy on plane_master If we're being Destroyed, the mob probably is too. Their job to remove references to us though. --- code/modules/mob/mob_planes.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/mob/mob_planes.dm b/code/modules/mob/mob_planes.dm index 3da38e9c36e..437d70914b7 100644 --- a/code/modules/mob/mob_planes.dm +++ b/code/modules/mob/mob_planes.dm @@ -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 ..() From ade70895c0f386ac5f3e87da26a4c0c316275e87 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Thu, 18 Jan 2018 18:28:10 -0500 Subject: [PATCH 2/2] POLARIS: What if I want to wear a mouse on my head --- code/modules/mob/living/carbon/human/human_helpers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 50059f47b26..4cf0be2dc5b 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -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)