Adds Sign of Roses

new sprites

ego stuff

flor sicut rosa

work mechanics p1

linters

weapon fix

Work mechanics complete

stuff

status effect

new sprites

stuff

code/datums/abnormality/_ego_datum/waw.dm

@@ -449,3 +449,12 @@
 /datum/ego_datum/weapon/scene
 	item_path = /obj/item/ego_weapon/scene
 	cost = 50
+
+//Sign of Roses - Flore sicut rosa
+/datum/ego_datum/armor/rosa
+	item_path = /obj/item/clothing/suit/armor/ego_gear/waw/rosa
+	cost = 50
+
+/datum/ego_datum/weapon/rosa
+	item_path = /obj/item/ego_weapon/rosa
+	cost = 50

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

@@ -1114,7 +1114,7 @@
 		return
 	..()
 	if(M==user)
-		for(var/mob/living/carbon/human/L in livinginrange(10, src))
+		for(var/mob/living/carbon/human/L in livinginrange(10, user))
 			if(L==user)
 				continue
 			L.adjustBruteLoss(-15)
@@ -1673,3 +1673,38 @@
 	force_cap = 70 //double base damage
 	force_per_tile = 5 //if I can read, this means you need to cross 14 tiles for max damage
 	pierce_force_cost = 20
+
+/obj/item/ego_weapon/rosa
+	name = "flore sicut rosa"
+	desc = "See? Wish, wish for it. Knowing that it is a sin. Only then can you bloom such colorful roses."
+	special = "Hit yourself to heal the sanity of others"
+	icon_state = "rosa"
+	force = 40
+	attack_speed = 1//set this later
+	damtype = WHITE_DAMAGE
+	armortype = WHITE_DAMAGE
+	attack_verb_continuous = list("lashes", "punishes", "whips", "slaps", "lacerates")
+	attack_verb_simple = list("lash", "punish","whip", "slap", "lacerate")
+	hitsound = 'sound/weapons/whip.ogg'
+	attribute_requirements = list(
+							PRUDENCE_ATTRIBUTE = 60,
+							JUSTICE_ATTRIBUTE = 60
+							)
+
+/obj/item/ego_weapon/attack(mob/living/M, mob/living/user)
+	if(!CanUseEgo(user))
+		return
+	..()
+	if(M==user)
+		var/userjust = (get_modified_attribute_level(user, JUSTICE_ATTRIBUTE))
+		var/justicemod = 1 + userjust/100
+		var/heal_amount = (force * justicemod * 0.75)
+		var/armormod = (user.run_armor_check(null, WHITE_DAMAGE))
+		if(armormod)//skips all the math if you're not wearing armor
+			heal_amount -= (heal_amount * (armormod / 100))//wearing da capo will reduce it to 0
+			heal_amount *= 0.5
+		for(var/mob/living/carbon/human/L in livinginrange(10, user))
+			if(L==user)
+				continue
+			L.adjustSanityLoss(-heal_amount)
+			new /obj/effect/temp_visual/healing(get_turf(L))

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

@@ -458,3 +458,13 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
 	armor = list(RED_DAMAGE = 30, WHITE_DAMAGE = 50, BLACK_DAMAGE = 50, PALE_DAMAGE = 10) // 140
 	attribute_requirements = list(
 							PRUDENCE_ATTRIBUTE = 80)
+
+/obj/item/clothing/suit/armor/ego_gear/waw/rosa
+	name = "flore sicut rosa"
+	desc = "Our only wish is that our garden will bloom full of flowers."
+	icon_state = "rosa"
+	armor = list(RED_DAMAGE = 30, WHITE_DAMAGE = 50, BLACK_DAMAGE = 30, PALE_DAMAGE = 30) // 140
+	attribute_requirements = list(
+							PRUDENCE_ATTRIBUTE = 60,
+							JUSTICE_ATTRIBUTE = 60
+							)

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

@@ -1093,6 +1093,13 @@
 	justice_bonus = 4
 	slot = FACE
 
+/datum/ego_gifts/rosa
+	name = "Crown of Roses"
+	icon_state = "penitence"//TODO: make an actual sprite
+	prudence_bonus = 3
+	temperance_bonus = 3
+	slot = HAT
+
 //reduces sanity and fortitude for a 10% buff to work success. Unfortunately this translates to 200 temp
 //so right now its 10 temp
 /datum/ego_gifts/swan