Merge pull request #16579 from FlattestGuitar/armor-defines

Adds defines for damage flags

code/modules/events/mass_hallucination.dm

@@ -9,7 +9,7 @@
 		var/turf/T = get_turf(H)
 		if(!is_station_level(T.z))
 			continue
-		var/armor = H.getarmor(type = "rad")
+		var/armor = H.getarmor(type = RAD)
 		if(HAS_TRAIT(H, TRAIT_RADIMMUNE) || armor >= 75) // Leave radiation-immune species/rad armored players completely unaffected
 			continue
 		H.AdjustHallucinate(rand(50, 100))

code/modules/events/spacevine.dm

@@ -487,7 +487,7 @@
 			damage_dealt *= 4
 			for(var/obj/structure/spacevine/B in range(1,src))
 				if(B.obj_integrity > damage_dealt)	//this only is going to occur for woodening mutation vines (increased health) or if we nerf scythe damage/multiplier
-					B.take_damage(damage_dealt, I.damtype, "melee", 1)
+					B.take_damage(damage_dealt, I.damtype, MELEE, 1)
 				else
 					B.wither()
 			return
@@ -498,7 +498,7 @@
 
 	for(var/datum/spacevine_mutation/SM in mutations)
 		damage_dealt = SM.on_hit(src, user, I, damage_dealt) //on_hit now takes override damage as arg and returns new value for other mutations to permutate further
-	take_damage(damage_dealt, I.damtype, "melee", 1)
+	take_damage(damage_dealt, I.damtype, MELEE, 1)
 
 /obj/structure/spacevine/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
 	switch(damage_type)