Merge branch 'master' into upstream-merge-11110

code/game/gamemodes/technomancer/core_obj.dm

@@ -7,7 +7,7 @@
 	item_state = "technomancer_core"
 	w_class = ITEMSIZE_HUGE
 	slot_flags = SLOT_BACK
-	unacidable = 1
+	unacidable = TRUE
 	origin_tech = list(
 		TECH_MATERIAL = 8, TECH_ENGINEERING = 8, TECH_POWER = 8, TECH_BLUESPACE = 10,
 		TECH_COMBAT = 7, TECH_MAGNET = 9, TECH_DATA = 5

code/game/gamemodes/technomancer/spells/energy_siphon.dm

@@ -181,7 +181,7 @@
 	if(A == firer) // For this, you CAN shoot yourself.
 		on_impact(A)
 
-		density = 0
+		density = FALSE
 		invisibility = 101
 
 		qdel(src)