Merge branch 'master' into Projectile_Rework

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

@@ -4,7 +4,7 @@
 	damage = 0
 	damage_type = TRUE
 	nodamage = 1
-	flag = "energy"
+	flag = ENERGY
 
 /obj/item/projectile/energy/floramut/on_hit(atom/target, blocked = FALSE)
 	. = ..()
@@ -22,7 +22,7 @@
 	damage = 0
 	damage_type = TOX
 	nodamage = TRUE
-	flag = "energy"
+	flag = ENERGY
 
 /obj/item/projectile/energy/florarevolution
 	name = "gamma somatorary"
@@ -30,4 +30,4 @@
 	damage = 0
 	damage_type = TOX
 	nodamage = TRUE
-	flag = "energy"
+	flag = ENERGY

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

@@ -4,7 +4,7 @@
 	damage = 0
 	damage_type = BURN
 	nodamage = TRUE
-	flag = "energy"
+	flag = ENERGY
 	impact_effect_type = /obj/effect/temp_visual/impact_effect/ion
 	var/emp_radius = 1
 

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

@@ -5,7 +5,7 @@
 	damage = 0
 	damage_type = BRUTE
 	nodamage = 1
-	flag = "bullet"
+	flag = BULLET
 
 /obj/item/projectile/meteor/Bump(atom/A)
 	if(A == firer)

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

@@ -23,7 +23,7 @@
 	explosion(target, -1, 1, 3, 1, 0, flame_range = 4)
 
 	if(ismecha(target))
-		var/obj/mecha/M = target
+		var/obj/vehicle/sealed/mecha/M = target
 		M.take_damage(anti_armour_damage)
 	if(issilicon(target))
 		var/mob/living/silicon/S = target
@@ -53,7 +53,7 @@
 	ricochets_max = 0 //it's a MISSILE
 	var/sturdy = list(
 	/turf/closed,
-	/obj/mecha,
+	/obj/vehicle/sealed/mecha,
 	/obj/machinery/door/,
 	/obj/machinery/door/poddoor/shutters
 	)

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

@@ -12,7 +12,7 @@
 	ricochet_chance = 80
 	is_reflectable = TRUE
 	light_color = LIGHT_COLOR_BLUE
-	flag = "energy"
+	flag = ENERGY
 	var/temperature = 100
 
 /obj/item/projectile/temp/on_hit(atom/target, blocked = 0)