let's play the optimization game featuring lighting (#12310)

* debug proc * kinda quirky * let's play the lighting game * let's play the macro game * let's play the refactor game * let's play the optimization game * let's play the optimization game x2 * yeehaw * e * let's play the memory game * fix * lighting fix * sanitization and checks * mh * hotkeys fix * ok
2020-05-23 13:47:42 -07:00
parent a6d7170d5b
commit e9068f05eb
12 changed files with 164 additions and 133 deletions
@@ -65,6 +65,7 @@
 	return ..()

 /obj/screen/storage/volumetric_box/Destroy()
+	makeItemInactive()
 	our_item = null
 	return ..()

@@ -87,10 +88,14 @@
 	makeItemInactive()

 /obj/screen/storage/volumetric_box/proc/makeItemInactive()
+	if(!our_item)
+		return
 	our_item.layer = VOLUMETRIC_STORAGE_ITEM_LAYER
 	our_item.plane = VOLUMETRIC_STORAGE_ITEM_PLANE

 /obj/screen/storage/volumetric_box/proc/makeItemActive()
+	if(!our_item)
+		return
 	our_item.layer = VOLUMETRIC_STORAGE_ACTIVE_ITEM_LAYER		//make sure we display infront of the others!
 	our_item.plane = VOLUMETRIC_STORAGE_ACTIVE_ITEM_PLANE