Ports Damage Refractors

ModularTegustation/!extra_abnos/joke_abnormalities/!equipment/guns.dm

@@ -95,5 +95,5 @@
 	..()
 	for(var/mob/living/L in view(1, target))
 		new /obj/effect/temp_visual/fire/fast(get_turf(L))
-		L.apply_damage(20, RED_DAMAGE, null, L.run_armor_check(null, RED_DAMAGE), spread_damage = TRUE)
+		L.deal_damage(20, RED_DAMAGE, firer, attack_type = (ATTACK_TYPE_RANGED))
 	return BULLET_ACT_HIT

ModularTegustation/!extra_abnos/joke_abnormalities/!equipment/weapons.dm

@@ -119,7 +119,7 @@
 		return
 	if((ishuman(hit_atom)))
 		var/mob/living/carbon/M = hit_atom
-		M.apply_damage(10, STAMINA)
+		M.deal_damage(10, STAMINA, source = throwingdatum.thrower, attack_type = (ATTACK_TYPE_THROWING))
 		if(prob(75))
 			M.Paralyze(60)
 			visible_message(span_danger("[M] barely manages to contain the power of the [src]!"))
@@ -130,7 +130,7 @@
 		playsound(src, 'sound/abnormalities/crying_children/sorrow_shot.ogg', 45, FALSE, 5)
 		for(var/mob/living/L in view(1, src))
 			var/aoe = 50
-			L.apply_damage(aoe, RED_DAMAGE, null, L.run_armor_check(null, RED_DAMAGE), spread_damage = TRUE)
+			L.deal_damage(aoe, RED_DAMAGE, throwingdatum.thrower, attack_type = (ATTACK_TYPE_THROWING))
 			new /obj/effect/temp_visual/small_smoke/halfsecond(get_turf(L))
 	activated = FALSE
 
@@ -234,7 +234,7 @@
 		aoe_damage *= force_multiplier
 		if(L == user) //This WILL friendly fire there is no escape
 			continue
-		L.apply_damage(aoe_damage, RED_DAMAGE, null, L.run_armor_check(null, RED_DAMAGE), spread_damage = TRUE)
+		L.deal_damage(aoe_damage, RED_DAMAGE, user, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_SPECIAL))
 		to_chat(L, span_userdanger("You are crushed by a monolith!"))
 		if(L.health < 0)
 			L.gib()

ModularTegustation/!extra_abnos/joke_abnormalities/aleph/buffdolta.dm

@@ -163,7 +163,7 @@
 		onrush_hit |= target
 	var/turf/thrownat = get_ranged_target_turf_direct(src, target, 15, rand(-30, 30))
 	target.throw_at(thrownat, 8, 2, src, TRUE, force = MOVE_FORCE_OVERPOWERING, gentle = FALSE)
-	target.deal_damage(onrush_damage, RED_DAMAGE)
+	target.deal_damage(onrush_damage, RED_DAMAGE, src, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_SPECIAL))
 	new /obj/effect/temp_visual/smash_effect(get_turf(target))
 	shake_camera(target, 2, 5)
 
@@ -221,7 +221,7 @@
 		if(TF.density)
 			continue
 		new /obj/effect/temp_visual/small_smoke/halfsecond(TF)
-		been_hit = HurtInTurf(TF, been_hit, slam_damage, RED_DAMAGE, null, TRUE, FALSE, TRUE, TRUE)
+		been_hit = HurtInTurf(TF, been_hit, slam_damage, RED_DAMAGE, null, TRUE, FALSE, TRUE, TRUE, src, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_SPECIAL))
 	for(var/mob/living/L in been_hit)
 		if(L.health < 0)
 			L.gib()

ModularTegustation/ego_weapons/melee/aleph.dm

@@ -46,7 +46,7 @@
 			var/userjust = (get_modified_attribute_level(user, JUSTICE_ATTRIBUTE))
 			var/justicemod = 1 + userjust / 100
 			var/damage_dealt = aoe_damage * justicemod * force_multiplier
-			user.HurtInTurf(T, list(), damage_dealt, PALE_DAMAGE)
+			user.HurtInTurf(T, list(), damage_dealt, PALE_DAMAGE, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_SPECIAL))
 		else
 			hitsound = 'sound/weapons/ego/justitia1.ogg'
 			user.changeNext_move(CLICK_CD_MELEE * 0.4)
@@ -188,7 +188,7 @@
 			aoe*=force_multiplier
 			if(L == user || ishuman(L))
 				continue
-			been_hit = user.HurtInTurf(T, been_hit, aoe, RED_DAMAGE, hurt_mechs = TRUE, hurt_structure = TRUE)
+			been_hit = user.HurtInTurf(T, been_hit, aoe, RED_DAMAGE, hurt_mechs = TRUE, hurt_structure = TRUE, attack_type = (ATTACK_TYPE_MELEE))
 
 /obj/item/ego_weapon/mimicry/get_clamped_volume()
 	return 40
@@ -432,7 +432,7 @@
 		for(var/mob/living/L in range(aoe_range, user)) //knocks enemies away from you
 			if(L == user || ishuman(L))
 				continue
-			L.apply_damage(aoe, damtype, null, L.run_armor_check(null, damtype), spread_damage = TRUE)
+			L.deal_damage(aoe, damtype, user, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_SPECIAL))
 			if(firsthit)
 				aoe = (aoe / 2)
 				firsthit = FALSE
@@ -569,7 +569,7 @@
 						continue
 				else
 					continue
-			L.apply_damage(modified_damage, BLACK_DAMAGE, null, L.run_armor_check(null, BLACK_DAMAGE), spread_damage = TRUE)
+			L.deal_damage(modified_damage, BLACK_DAMAGE, user, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_SPECIAL))
 			new /obj/effect/temp_visual/dir_setting/bloodsplatter(get_turf(L), pick(GLOB.alldirs))
 
 /obj/item/ego_weapon/censored/get_clamped_volume()
@@ -741,7 +741,7 @@
 	var/userjust = (get_modified_attribute_level(user, JUSTICE_ATTRIBUTE))
 	var/justicemod = 1 + userjust/100
 	var/damage = force * justicemod * force_multiplier
-	target.apply_damage(damage, BLACK_DAMAGE, null, target.run_armor_check(null, BLACK_DAMAGE), spread_damage = TRUE)
+	target.deal_damage(damage, BLACK_DAMAGE, user, attack_type = (ATTACK_TYPE_MELEE))
 
 	if(!canaoe)
 		return
@@ -764,8 +764,8 @@
 	for(var/mob/living/L in range(2, start))
 		if(L == user || ishuman(L))
 			continue
-		L.apply_damage(aoe, BLACK_DAMAGE, null, L.run_armor_check(null, BLACK_DAMAGE), spread_damage = TRUE)
-		L.apply_damage(aoe, WHITE_DAMAGE, null, L.run_armor_check(null, WHITE_DAMAGE), spread_damage = TRUE)
+		L.deal_damage(aoe, BLACK_DAMAGE, user, attack_type = (ATTACK_TYPE_SPECIAL))
+		L.deal_damage(aoe, WHITE_DAMAGE, user, attack_type = (ATTACK_TYPE_SPECIAL))
 
 /obj/item/ego_weapon/space/EgoAttackInfo(mob/user)
 	if(force_multiplier != 1)
@@ -1019,7 +1019,7 @@
 		for(var/turf/open/T in range(target_turf, 1))
 			new /obj/effect/temp_visual/spicebloom(T)
 			for(var/mob/living/L in T.contents)
-				L.apply_damage(modified_damage, WHITE_DAMAGE, null, L.run_armor_check(null, WHITE_DAMAGE), spread_damage = TRUE)
+				L.deal_damage(modified_damage, WHITE_DAMAGE, user, attack_type = (ATTACK_TYPE_SPECIAL))
 				if((L.stat < DEAD) && !(L.status_flags & GODMODE))
 					damage_dealt += modified_damage
 
@@ -1133,7 +1133,7 @@
 		aoe*=justicemod
 		if(user.faction_check_mob(L) || L == target)
 			continue
-		L.apply_damage(aoe, BLACK_DAMAGE, null, L.run_armor_check(null, BLACK_DAMAGE), spread_damage = TRUE)
+		L.deal_damage(aoe, BLACK_DAMAGE, user, attack_type = (ATTACK_TYPE_MELEE))
 		new /obj/effect/temp_visual/small_smoke/halfsecond(get_turf(L))
 
 /obj/item/ego_weapon/mockery/get_clamped_volume()
@@ -1257,7 +1257,7 @@
 		aoe*=force_multiplier
 		if(L == user || ishuman(L))
 			continue
-		L.apply_damage(aoe, PALE_DAMAGE, null, L.run_armor_check(null, PALE_DAMAGE), spread_damage = TRUE)
+		L.deal_damage(aoe, PALE_DAMAGE, user, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_SPECIAL))
 		new /obj/effect/temp_visual/small_smoke/halfsecond(get_turf(L))
 
 /obj/item/ego_weapon/shield/gasharpoon/afterattack(atom/target, mob/living/user, proximity_flag, clickparams)
@@ -1320,7 +1320,7 @@
 	for(var/mob/living/L in view(1, user))
 		if(L == user || ishuman(L))
 			continue
-		L.apply_damage(aoe, PALE_DAMAGE, null, L.run_armor_check(null, PALE_DAMAGE), spread_damage = TRUE)
+		L.deal_damage(aoe, PALE_DAMAGE, user, attack_type = (ATTACK_TYPE_COUNTER | ATTACK_TYPE_SPECIAL))
 		var/datum/status_effect/stacking/pallid_noise/P = L.has_status_effect(/datum/status_effect/stacking/pallid_noise)
 		if(!P)
 			L.apply_status_effect(STATUS_EFFECT_PALLIDNOISE)

ModularTegustation/ego_weapons/melee/he.dm

@@ -23,7 +23,7 @@
 	var/justicemod = 1 + userjust / 100
 	var/damage_dealt = force * justicemod * force_multiplier
 	var/list/been_hit = QDELETED(target) ? list() : list(target)
-	user.HurtInTurf(T, been_hit, damage_dealt, RED_DAMAGE, hurt_mechs = TRUE, hurt_structure = TRUE)
+	user.HurtInTurf(T, been_hit, damage_dealt, RED_DAMAGE, hurt_mechs = TRUE, hurt_structure = TRUE, attack_type = (ATTACK_TYPE_MELEE))
 
 /obj/item/ego_weapon/grinder/get_clamped_volume()
 	return 40
@@ -76,7 +76,7 @@
 			aoe*=justicemod
 			if(L == user || ishuman(L))
 				continue
-			L.apply_damage(aoe, BLACK_DAMAGE, null, L.run_armor_check(null, BLACK_DAMAGE), spread_damage = TRUE)
+			L.deal_damage(aoe, BLACK_DAMAGE, user, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_SPECIAL))
 
 
 /obj/item/ego_weapon/fury
@@ -369,7 +369,7 @@
 			new /obj/effect/temp_visual/smash_effect(T)
 			var/smash_damage = (i > 2 ? 22 : 6)*(1+(get_modified_attribute_level(user, JUSTICE_ATTRIBUTE)/100))
 			smash_damage*=force_multiplier
-			been_hit = user.HurtInTurf(T, been_hit, smash_damage, RED_DAMAGE)
+			been_hit = user.HurtInTurf(T, been_hit, smash_damage, RED_DAMAGE, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_SPECIAL))
 		if (i > 2)
 			playsound(get_turf(src), 'sound/abnormalities/woodsman/woodsman_strong.ogg', 75, 0, 5) // BAM
 		else
@@ -863,7 +863,7 @@
 			aoe*=force_multiplier
 			if(L == user || ishuman(L))
 				continue
-			L.apply_damage(aoe, BLACK_DAMAGE, null, L.run_armor_check(null, BLACK_DAMAGE), spread_damage = TRUE)
+			L.deal_damage(aoe, BLACK_DAMAGE, user, attack_type = (ATTACK_TYPE_MELEE))
 			new /obj/effect/temp_visual/small_smoke/halfsecond(get_turf(L))
 		icon_state = "impending_day_extended"
 		sacrifice = TRUE
@@ -953,7 +953,7 @@
 		aoe*=force_multiplier
 		if(L == user || ishuman(L))
 			continue
-		L.apply_damage(aoe, BLACK_DAMAGE, null, L.run_armor_check(null, BLACK_DAMAGE), spread_damage = TRUE)
+		L.deal_damage(aoe, BLACK_DAMAGE, user, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_SPECIAL))
 		var/obj/effect/temp_visual/small_smoke/halfsecond/FX =  new(get_turf(L))
 		FX.color = "#b52e19"
 
@@ -1239,7 +1239,7 @@
 			continue
 		playsound(T, 'sound/weapons/fixer/generic/blade3.ogg', 30, TRUE, 3)
 		new /obj/effect/temp_visual/smash_effect(T)
-		been_hit = user.HurtInTurf(T, been_hit, punishment_damage, PALE_DAMAGE, check_faction = TRUE)
+		been_hit = user.HurtInTurf(T, been_hit, punishment_damage, PALE_DAMAGE, check_faction = TRUE, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_SPECIAL))
 
 /obj/item/ego_weapon/destiny
 	name = "destiny"
@@ -1398,7 +1398,7 @@
 /obj/item/ego_weapon/aedd/proc/power_attack(mob/living/target, mob/living/user)
 	var/userjust = (get_modified_attribute_level(user, JUSTICE_ATTRIBUTE))
 	var/justicemod = 1 + userjust/100
-	target.apply_damage((force * justicemod), BLACK_DAMAGE, null, target.run_armor_check(null, BLACK_DAMAGE), spread_damage = TRUE)
+	target.deal_damage((force * justicemod), BLACK_DAMAGE, user, attack_type = (ATTACK_TYPE_MELEE))
 	playsound(src, 'sound/abnormalities/thunderbird/tbird_charge.ogg', 50, TRUE)
 	var/turf/T = get_turf(target)
 	new /obj/effect/temp_visual/justitia_effect(T)
@@ -1469,7 +1469,7 @@
 	for(var/turf/T in view(1, target))
 		var/obj/effect/temp_visual/small_smoke/halfsecond/FX =  new(T)
 		FX.color = "#622F22"
-		user.HurtInTurf(T, list(), 16, BLACK_DAMAGE, check_faction = TRUE)
+		user.HurtInTurf(T, list(), 16, BLACK_DAMAGE, check_faction = TRUE, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_SPECIAL))
 	return
 
 
@@ -1668,7 +1668,7 @@
 		qdel(src)
 		return
 
-	owner.apply_damage(damage_amount, RED_DAMAGE, null, owner.run_armor_check(null, RED_DAMAGE), spread_damage = TRUE)
+	owner.deal_damage(damage_amount, RED_DAMAGE, attack_type = (ATTACK_TYPE_STATUS))
 	playsound(owner, 'sound/abnormalities/mountain/bite.ogg', 40, TRUE) //yes im reusing a sound bite me
 	new /obj/effect/temp_visual/beakbite(get_turf(owner))
 
@@ -1973,7 +1973,7 @@
 				aoe*=force_multiplier
 				if(L == user || ishuman(L))
 					continue
-				been_hit = user.HurtInTurf(T2, been_hit, aoe, RED_DAMAGE, hurt_mechs = TRUE, hurt_structure = TRUE)
+				been_hit = user.HurtInTurf(T2, been_hit, aoe, RED_DAMAGE, hurt_mechs = TRUE, hurt_structure = TRUE, attack_type = (ATTACK_TYPE_MELEE))
 				var/atom/throw_target = get_edge_target_turf(L, get_dir(L, get_step_towards(L, get_turf(user))))
 				if(!L.anchored)
 					L.throw_at(throw_target, 1, get_dist(user, L) - 1, user)
@@ -2118,7 +2118,7 @@
 					var/mob/living/carbon/human/H = L
 					if(!H.sanity_lost)
 						continue
-				L.apply_damage(aoe, BLACK_DAMAGE, null, L.run_armor_check(null, BLACK_DAMAGE), spread_damage = TRUE)
+				L.deal_damage(aoe, BLACK_DAMAGE, user, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_SPECIAL))
 				L.visible_message(span_danger("[user] sears [L] with the [src]!"))
 		return
 	addtimer(CALLBACK(src, PROC_REF(Leap), user, dir, leap_range), 0.1)

ModularTegustation/ego_weapons/melee/non_abnormality/black_silence.dm

@@ -262,7 +262,7 @@
 	var/mob/living/L = target
 	var/turf/F = get_turf(L)
 	new /obj/effect/temp_visual/smash_effect(F)
-	L.apply_damage(40, BLACK_DAMAGE, null, L.run_armor_check(null, BLACK_DAMAGE))
+	L.deal_damage(40, BLACK_DAMAGE, user, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_SPECIAL))
 	exchange_cooldown -= 20
 	switch(dash_count)
 		if(0)
@@ -456,7 +456,7 @@
 		playsound(T, 'sound/weapons/black_silence/longsword_atk.ogg', 50, 1)
 		for (var/i = 0; i < 3; i++)
 			new /obj/effect/temp_visual/smash_effect(T)
-			for(var/mob/living/L in user.HurtInTurf(T, list(), 25, BLACK_DAMAGE, check_faction = TRUE, hurt_mechs = TRUE))
+			for(var/mob/living/L in user.HurtInTurf(T, list(), 25, BLACK_DAMAGE, check_faction = TRUE, hurt_mechs = TRUE, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_SPECIAL)))
 				exchange_cooldown -= 10
 			sleep(0.25 SECONDS)
 
@@ -745,12 +745,12 @@
 	dash(user, target_turf)
 	playsound(user, 'sound/weapons/black_silence/duelsword.ogg', 50, 1)
 	if(dash_count < 1)
-		L.apply_damage(30, BLACK_DAMAGE, null, L.run_armor_check(null, BLACK_DAMAGE))
+		L.deal_damage(30, BLACK_DAMAGE, user, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_SPECIAL))
 		addtimer(CALLBACK(src, PROC_REF(dash_attack), user, target), 5)
 		new /obj/effect/temp_visual/smash_effect(F)
 		dash_count += 1
 	else
-		L.apply_damage(50, BLACK_DAMAGE, null, L.run_armor_check(null, BLACK_DAMAGE))
+		L.deal_damage(50, BLACK_DAMAGE, user, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_SPECIAL))
 		new /obj/effect/temp_visual/smash_effect(F)
 		exchange_cooldown -= 30
 		dash_count = 0
@@ -878,7 +878,7 @@
 		var/list/been_hit = list()
 		for(var/turf/T in area_of_effect)
 			new /obj/effect/temp_visual/smash_effect(T)
-			var/list/new_hits = user.HurtInTurf(T, been_hit, 150, BLACK_DAMAGE, check_faction = TRUE, hurt_mechs = TRUE) - been_hit
+			var/list/new_hits = user.HurtInTurf(T, been_hit, 150, BLACK_DAMAGE, check_faction = TRUE, hurt_mechs = TRUE, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_SPECIAL)) - been_hit
 			been_hit += new_hits
 			for(var/mob/living/L in new_hits)
 				var/atom/throw_target = get_edge_target_turf(target, get_dir(user, L))
@@ -1029,7 +1029,7 @@
 	new /obj/effect/temp_visual/smash_effect(T)
 	if(!target.anchored)
 		target.Move(target_turf)
-	L.apply_damage(750, BLACK_DAMAGE, null, L.run_armor_check(null, BLACK_DAMAGE)) //this went on for 5 sec, so 150 DPS as the final attack
+	L.deal_damage(750, BLACK_DAMAGE, user, attack_type = (ATTACK_TYPE_MELEE | ATTACK_TYPE_RANGED | ATTACK_TYPE_SPECIAL)) //this went on for 5 sec, so 150 DPS as the final attack
 	sleep(10)
 
 	furioso_end(user, target)

ModularTegustation/ego_weapons/melee/non_abnormality/blue_sicko.dm

@@ -219,7 +219,7 @@
 				damage *= 1.5
 		if(isanimal(L))
 			damage *= 1.5
-		L.apply_damage(damage, PALE_DAMAGE, null, L.run_armor_check(null, PALE_DAMAGE))
+		L.deal_damage(damage, PALE_DAMAGE, user, attack_type = (ATTACK_TYPE_SPECIAL))
 		to_chat(L, span_userdanger("[user] eviscerates you!"), MESSAGE_TYPE_COMBAT)
 		to_chat(user, span_warning("You eviscerate [L]!"), MESSAGE_TYPE_COMBAT)
 	active = FALSE

ModularTegustation/ego_weapons/melee/non_abnormality/cane.dm

@@ -127,5 +127,5 @@
 			var/mob/living/carbon/human/H = L
 			if(!H.sanity_lost)
 				continue
-		L.apply_damage(10, WHITE_DAMAGE, null, L.run_armor_check(null, WHITE_DAMAGE), spread_damage = TRUE)
+		L.deal_damage(10, WHITE_DAMAGE, user, attack_type = (ATTACK_TYPE_SPECIAL))
 

ModularTegustation/ego_weapons/melee/non_abnormality/dawn.dm

@@ -34,7 +34,7 @@
 		for(var/turf/T in view(aoe_range, target))
 			if(prob(30))
 				new /obj/effect/temp_visual/fire/fast(T)
-			user.HurtInTurf(T, list(), force*0.2, damtype, hurt_mechs = TRUE)
+			user.HurtInTurf(T, list(), force*0.2, damtype, hurt_mechs = TRUE, attack_type = (ATTACK_TYPE_SPECIAL))
 	aoe_target = target
 
 //Philip's Sword

ModularTegustation/ego_weapons/melee/non_abnormality/devyat.dm

@@ -91,7 +91,7 @@
 			var/mob/living/carbon/human/theif = user
 			say("You are touching a devyat trunk without the correct access, please step away.")
 			playsound(get_turf(src), 'sound/weapons/ego/devyat_overclock.ogg', 25, 0, 4)
-			theif.apply_damage(theif_damage, BLACK_DAMAGE)
+			theif.deal_damage(theif_damage, BLACK_DAMAGE, flags = (DAMAGE_FORCED))
 		return FALSE
 	. = ..()
 
@@ -151,7 +151,7 @@
 			var/mob/living/carbon/human/theif = who
 			say("You are touching a devyat trunk without the correct access, please step away.")
 			playsound(get_turf(src), 'sound/weapons/ego/devyat_overclock.ogg', 25, 0, 4)
-			theif.apply_damage(theif_damage, BLACK_DAMAGE)
+			theif.deal_damage(theif_damage, BLACK_DAMAGE, flags = (DAMAGE_FORCED))
 		return FALSE
 	return ..()
 
@@ -243,7 +243,7 @@
 
 /obj/item/ego_weapon/city/devyat_trunk/proc/gain_courier_trunk(amount, mob/living/user)
 	if(overclock)
-		user.apply_damage(courier_trunk * overclock_mult, BLACK_DAMAGE)
+		user.deal_damage(courier_trunk * overclock_mult, BLACK_DAMAGE, flags = (DAMAGE_FORCED))
 		if(user.stat == DEAD)
 			playsound(get_turf(user), 'sound/weapons/ego/devyat_overclock_death.ogg', 50, 0, 4)
 			end_combat()