Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

code/modules/projectiles/projectile/special.dm

@@ -137,20 +137,6 @@
 			var/mob/living/carbon/human/M = target
 			M.adjustBrainLoss(20)
 			M.hallucination += 20
-
-/obj/item/projectile/icarus/pointdefense/process()
-	Icarus_FireLaser(get_turf(original))
-	spawn
-		qdel(src)
-
-	return
-
-/obj/item/projectile/icarus/guns/process()
-	Icarus_FireCannon(get_turf(original))
-	spawn
-		qdel(src)
-	return
-
 /obj/item/projectile/chameleon
 	name = "bullet"
 	icon_state = "bullet"
@@ -159,3 +145,4 @@
 	nodamage = 1
 	damage_type = HALLOSS
 	muzzle_type = /obj/effect/projectile/bullet/muzzle
+