Servant of Wrath

Records and Instability

Dash speed up

Fuck you I'll space indent all I like

There was some fuckin lint in this PR

God damned there's a lot of lint in here

Faction Check

Sprite update, minor bug fixes

Floating and Gun and Acid

Minor Records

Small update

Unnerfs resists

AoE hit fix

Gun update real

more res should mean less talk

Pixel Fix

Sound... Fix?

Broke the staff's legs, fuck those guys.

lmfao audio pains

Gun Rename, Spawn nerf

NO MORE FRIENDS FROM GUN

Faction change

acid tweak

LINT!

SW Code and Balance

SoW Temp commit

Scuff-Fix

SoW bonk update

Hermit range increase and ranged damage decrease

visual fix

Ending adjustments

I forgot to carry the 4

Visual indicator

minor fixes

Instability Tweaks

Paperwork Update

Anti-Self-Burn

Ending Update

Right view

A check that should be a non-issue but i'm making sure!

Breach Update and EGO update

More goo and FEMALE

Improvement and new Icons

code/datums/abnormality/_ego_datum/waw.dm

@@ -264,6 +264,22 @@
 	item_path = /obj/item/clothing/suit/armor/ego_gear/spore
 	cost = 50
 
+// Servant of Wrath - Blind Rage
+
+/datum/ego_datum/weapon/blind_rage
+	item_path = /obj/item/ego_weapon/blind_rage
+	cost = 50
+
+/datum/ego_datum/armor/blind_rage
+	item_path = /obj/item/clothing/suit/armor/ego_gear/blind_rage
+	cost = 50
+
+/*
+/datum/ego_datum/weapon/blind_gun
+	item_path = /obj/item/gun/ego_gun/blind_rage
+	cost = 50 // Going unused. Repurpose at will.
+*/
+
 // Flesh Idol - Bleeding Heart
 /datum/ego_datum/armor/heart
 	item_path = /obj/item/clothing/suit/armor/ego_gear/heart

code/game/objects/items/ego_weapons/waw.dm

@@ -18,7 +18,9 @@
 							)
 
 /obj/item/ego_weapon/lamp/attack(mob/living/M, mob/living/user)
-	..()
+	if(!CanUseEgo(user))
+		return FALSE
+	. = ..()
 	for(var/mob/living/L in livinginrange(1, M))
 		var/aoe = 25
 		var/userjust = (get_attribute_level(user, JUSTICE_ATTRIBUTE))
@@ -910,6 +912,73 @@
 							PRUDENCE_ATTRIBUTE = 80
 							)
 
+/obj/item/ego_weapon/blind_rage
+	name = "Blind Rage"
+	desc = "Those who suffer injustice tend to lash out at all those around them."
+	icon_state = "blind_rage"
+	force = 40
+	attack_speed = 1.2
+	special = "This weapon possesses a devastating Red AND Black damage AoE. Be careful! \nUse in hand to hold back the AoE!"
+	damtype = RED_DAMAGE
+	armortype = RED_DAMAGE
+	attack_verb_continuous = list("smashes", "crushes", "flattens")
+	attack_verb_simple = list("smash", "crush", "flatten")
+	hitsound = 'sound/abnormalities/wrath_servant/big_smash1.ogg'
+	attribute_requirements = list(
+							TEMPERANCE_ATTRIBUTE = 60,
+							JUSTICE_ATTRIBUTE = 80
+							)
+
+	var/aoe_damage = 15
+	var/aoe_damage_type = BLACK_DAMAGE
+	var/aoe_range = 2
+	var/attacks = 0
+	var/toggled = FALSE
+
+/obj/item/ego_weapon/blind_rage/attack_self(mob/user)
+	toggled = !toggled
+	if(toggled)
+		to_chat(user, "<span class='warning'>You release the full power of [src].</span>")
+	else
+		to_chat(user, "<span class='notice'>You begin to hold back [src].</span>")
+
+/obj/item/ego_weapon/blind_rage/attack(mob/living/M, mob/living/user)
+	. = ..()
+	if(!.)
+		return FALSE
+
+	attacks++
+	attacks %= 3
+	switch(attacks)
+		if(0)
+			hitsound = 'sound/abnormalities/wrath_servant/big_smash1.ogg'
+		if(1)
+			hitsound = 'sound/abnormalities/wrath_servant/big_smash2.ogg'
+		if(2)
+			hitsound = 'sound/abnormalities/wrath_servant/big_smash3.ogg'
+	if(!toggled)
+		if(prob(10))
+			new /obj/effect/gibspawner/generic/silent/wrath_acid(get_turf(M))
+		return
+	for(var/turf/open/T in range(aoe_range, M))
+		var/obj/effect/temp_visual/small_smoke/halfsecond/smonk = new(T)
+		smonk.color = COLOR_GREEN
+		for(var/mob/living/L in T)
+			if(L == user)
+				continue
+			if(L.stat == DEAD)
+				continue
+			var/damage = aoe_damage
+			var/userjust = (get_attribute_level(user, JUSTICE_ATTRIBUTE))
+			var/justicemod = 1 + userjust/100
+			damage *= justicemod
+			if(attacks == 0)
+				damage *= 3
+			L.apply_damage(damage, damtype, null, L.run_armor_check(null, damtype), spread_damage = TRUE)
+			L.apply_damage(damage, aoe_damage_type, null, L.run_armor_check(null, aoe_damage_type), spread_damage = TRUE)
+		if(prob(5))
+			new /obj/effect/gibspawner/generic/silent/wrath_acid(T) // The non-damaging one
+
 /obj/item/ego_weapon/mini/heart
 	name = "bleeding heart"
 	desc = "The supplicant will suffer various ordeals in a manner like being put through a trial."

code/modules/clothing/suits/ego_gear/waw.dm

@@ -277,6 +277,17 @@
 							TEMPERANCE_ATTRIBUTE = 80
 							)
 
+/obj/item/clothing/suit/armor/ego_gear/blind_rage
+	name = "Blind Rage"
+	desc = "There is no sorrow like the betrayal of a friend. \
+			Nor is there such rage."
+	icon_state = "blind_rage"
+	armor = list(RED_DAMAGE = 50, WHITE_DAMAGE = 0, BLACK_DAMAGE = 50, PALE_DAMAGE = 40) // 140
+	attribute_requirements = list(
+							TEMPERANCE_ATTRIBUTE = 60,
+							JUSTICE_ATTRIBUTE = 80
+							)
+
 /obj/item/clothing/suit/armor/ego_gear/heart
 	name = "bleeding heart"
 	desc = "And the prayer shall inevitably end with the eternal despair of its worshiper."

code/modules/mob/living/carbon/human/ego_gifts.dm

@@ -607,6 +607,13 @@
 	temperance_bonus = 2
 	slot = FACE
 
+/datum/ego_gifts/blind_rage
+	name = "Blind Rage"
+	icon_state = "blind_rage"
+	fortitude_bonus = 2
+	justice_bonus = 4
+	slot = HAT
+
 /// All ALEPH EGO Gifts
 /datum/ego_gifts/paradise
 	name = "Paradise Lost"

code/modules/mob/living/simple_animal/abnormality/_abnormality.dm

@@ -109,7 +109,7 @@
 	GLOB.abnormality_mob_list -= src
 
 /mob/living/simple_animal/hostile/abnormality/Move()
-	if(status_flags & GODMODE) // STOP STEALING MY FREAKING ABNORMALITIES
+	if(IsContained()) // STOP STEALING MY FREAKING ABNORMALITIES
 		return FALSE
 	return ..()