Merge remote-tracking branch 'citadel/master' into mobility_flags

code/modules/projectiles/projectile/special/curse.dm

@@ -12,7 +12,7 @@
 	knockdown = 20
 	speed = 2
 	range = 16
-	forcedodge = TRUE
+	movement_type = FLYING | UNSTOPPABLE
 	var/datum/beam/arm
 	var/handedness = 0
 
@@ -28,7 +28,7 @@
 
 /obj/item/projectile/curse_hand/prehit(atom/target)
 	if(target == original)
-		forcedodge = FALSE
+		DISABLE_BITFIELD(movement_type, UNSTOPPABLE)
 	else if(!isturf(target))
 		return FALSE
 	return ..()
@@ -37,7 +37,7 @@
 	if(arm)
 		arm.End()
 		arm = null
-	if(forcedodge)
+	if(CHECK_BITFIELD(movement_type, UNSTOPPABLE))
 		playsound(src, 'sound/effects/curse3.ogg', 25, 1, -1)
 	var/turf/T = get_step(src, dir)
 	new/obj/effect/temp_visual/dir_setting/curse/hand(T, dir, handedness)

code/modules/projectiles/projectile/special/ion.dm

@@ -6,15 +6,12 @@
 	nodamage = 1
 	flag = "energy"
 	impact_effect_type = /obj/effect/temp_visual/impact_effect/ion
+	var/emp_radius = 1
 
 /obj/item/projectile/ion/on_hit(atom/target, blocked = FALSE)
 	..()
-	empulse(target, 1, 1)
-	return TRUE
+	empulse(target, emp_radius, emp_radius)
+	return BULLET_ACT_HIT
 
 /obj/item/projectile/ion/weak
-
-/obj/item/projectile/ion/weak/on_hit(atom/target, blocked = FALSE)
-	..()
-	empulse(target, 0, 0)
-	return TRUE
+	emp_radius = 0

code/modules/projectiles/projectile/special/plasma.dm

@@ -29,7 +29,7 @@
 			mine_range--
 			range++
 		if(range > 0)
-			return -1
+			return BULLET_ACT_FORCE_PIERCE
 
 /obj/item/projectile/plasma/adv
 	damage = 28

code/modules/projectiles/projectile/special/rocket.dm

@@ -6,7 +6,7 @@
 /obj/item/projectile/bullet/gyro/on_hit(atom/target, blocked = FALSE)
 	..()
 	explosion(target, -1, 0, 2)
-	return TRUE
+	return BULLET_ACT_HIT
 
 /obj/item/projectile/bullet/a84mm
 	name ="\improper HEDP rocket"
@@ -28,7 +28,7 @@
 	if(issilicon(target))
 		var/mob/living/silicon/S = target
 		S.take_overall_damage(anti_armour_damage*0.75, anti_armour_damage*0.25)
-	return TRUE
+	return BULLET_ACT_HIT
 
 /obj/item/projectile/bullet/a84mm_he
 	name ="\improper HE missile"
@@ -43,4 +43,4 @@
 		explosion(target, 0, 1, 2, 4)
 	else
 		explosion(target, 0, 0, 2, 4)
-	return TRUE
+	return BULLET_ACT_HIT

code/modules/projectiles/projectile/special/wormhole.dm

@@ -25,5 +25,5 @@
 /obj/item/projectile/beam/wormhole/on_hit(atom/target)
 	if(!gun)
 		qdel(src)
-		return 
+		return BULLET_ACT_BLOCK
 	gun.create_portal(src, get_turf(src))