abno month E.G.O PR 2: Electric Boogaloo (#2368)

MFE stuff

new ego equipment

fixes telepole

enkephalin rush ego

hyde

community abno conversion

ER ego added

syntax fix

syntax fixes

attack verb fix

ModularTegustation/ego_weapons/melee/he.dm

@@ -2028,25 +2028,86 @@
 							FORTITUDE_ATTRIBUTE = 40
 							)
 
-/obj/item/ego_weapon/telepole//FIXME: actually make it do stuff
+/obj/item/ego_weapon/telepole
 	name = "telepole"
 	desc = "A hairy wooden longsword that's covered in barbed wire. It crackles with arcs of electricity."
-	special = "Activating the weapon in your hand allows you to dash, grazing nearby targets with BLACK damage."
+	charge_effect = "allows you to dash, grazing nearby targets with BLACK damage."
 	icon_state = "telepole"
-	lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
 	force = 25
 	damtype = BLACK_DAMAGE
-	attack_verb_continuous = list("slashes", "stabs")
-	attack_verb_simple = list("slash", "stab")
+	attack_verb_continuous = list("slashes", "stabs", "sears", "zaps")
+	attack_verb_simple = list("slash", "stab", "sear", "zap")
+	hitsound = 'sound/abnormalities/alleywaywatchdog/telepole_1.ogg'
 	attribute_requirements = list(
 							FORTITUDE_ATTRIBUTE = 40
 							)
 	charge = TRUE
+	ability_type = ABILITY_UNIQUE
+	charge_cost = 4
+	var/leap_range = 5
+	var/leap_count = 0
+	var/list/hit_turfs = list()
 
-/obj/item/ego_weapon/telepole/ChargeAttack(mob/living/target, mob/living/user)
-	..()
-	//do the thing
+/obj/item/ego_weapon/telepole/afterattack(atom/target, mob/living/user, proximity_flag, clickparams)
+	if(!CanUseEgo(user))
+		return
+	if(!currently_charging)
+		return
+	var/dir_to_target = get_dir(get_turf(user), get_turf(target))
+	if(CheckPath(user, dir_to_target))
+		to_chat(user,span_notice("You need more room to do that!"))
+		return
+	hit_turfs = list()
+	leap_count = 0
+	Leap(user, dir_to_target, leap_range)
+	playsound(src, 'sound/abnormalities/alleywaywatchdog/telepole_2.ogg', 100, 1)
+	currently_charging = FALSE
+
+/obj/item/ego_weapon/telepole/proc/Leap(mob/living/user, dir = SOUTH, leap_range)//doesn't work
+	user.forceMove(get_step(get_turf(user), dir))
+	var/end_leap = FALSE
+	leap_count += 1
+	if(leap_count >= leap_range)
+		end_leap = TRUE
+	if(CheckPath(user, dir))
+		end_leap = TRUE
+	for(var/turf/T in orange(1, user))
+		hit_turfs |= T
+	if(end_leap)
+		playsound(src, 'sound/abnormalities/alleywaywatchdog/telepole_3.ogg', 100, 1)
+		for(var/turf/T in hit_turfs) // Once again mostly jacked from harvest, but modified to work with hit_turfs instead of an on-the-spot orange
+			new /obj/effect/temp_visual/smash_effect(T)
+			for(var/mob/living/L in T.contents)
+				var/aoe = force
+				var/userjust = (get_modified_attribute_level(user, JUSTICE_ATTRIBUTE))
+				var/justicemod = 1 + userjust/100
+				aoe*=justicemod
+				aoe*=force_multiplier
+				if(L == user)
+					continue
+				if(ishuman(L))
+					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.visible_message(span_danger("[user] sears [L] with the [src]!"))
+		return
+	addtimer(CALLBACK(src, PROC_REF(Leap), user, dir, leap_range), 0.1)
+
+/obj/item/ego_weapon/telepole/proc/CheckPath(mob/living/user, dir = SOUTH)
+	var/list/immediate_path = list()
+	immediate_path |= get_step(get_turf(user), dir)
+	immediate_path |= get_step(immediate_path[1], dir)
+	var/fail_charge = FALSE
+	for(var/turf/T in immediate_path)
+		if(T.density)
+			fail_charge = TRUE
+		for(var/obj/machinery/door/D in T.contents)
+			if(D.density)
+				fail_charge = TRUE
+		for(var/obj/structure/window/W in T.contents)
+			fail_charge = TRUE
+	return fail_charge
 
 /obj/item/ego_weapon/hexnail
 	name = "hex nail"

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

@@ -327,7 +327,7 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
 
 /obj/item/clothing/suit/armor/ego_gear/he/jackrabbit
 	name = "jackrabbit"
-	desc = "A lone rabbit hops down a snowy path in a forest it's blakc antlers matching the dead tree's around it."
+	desc = "A lone rabbit hops down a snowy path in a forest it's black antlers matching the dead trees around it."
 	icon_state = "jackrabbit"
 	armor = list(RED_DAMAGE = 20, WHITE_DAMAGE = 0, BLACK_DAMAGE = 50, PALE_DAMAGE = 0) // 70
 	attribute_requirements = list(

code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/_egodatum.dm

@@ -2,6 +2,15 @@
 // Zayin //
 ///////////
 
+// The Dragon's Skull - Dragon Staff (Enkephalin Rush)
+/datum/ego_datum/weapon/dragon_staff
+	item_path = /obj/item/ego_weapon/support/dragon_staff
+	cost = 12
+
+/datum/ego_datum/armor/dragon_staff
+	item_path = /obj/item/clothing/suit/armor/ego_gear/zayin/dragon_staff
+	cost = 12
+
 //////////
 // Teth //
 //////////
@@ -28,6 +37,15 @@
 	item_path = /obj/item/clothing/suit/armor/ego_gear/he/sunspit
 	cost = 35
 
+// Creek Transportation Agency - Security (Enkephalin Rush)
+/datum/ego_datum/weapon/security_ego
+	item_path = /obj/item/ego_weapon/security_ego
+	cost = 35
+
+/datum/ego_datum/armor/security_ego
+	item_path = /obj/item/clothing/suit/armor/ego_gear/he/security_ego
+	cost = 35
+
 /////////
 // Waw //
 /////////
@@ -50,10 +68,31 @@
 	item_path = /obj/item/clothing/suit/armor/ego_gear/waw/miasma
 	cost = 50
 
+// Tools of the Forgotten Farm - Furrows (Enkephalin Rush)
+/**Enable this when the mining subtype is created.
+/datum/ego_datum/weapon/furrows
+	item_path = /obj/item/ego_weapon/furrows
+	cost = 50
+
+//Missing sprites
+/datum/ego_datum/armor/furrows
+	item_path = /obj/item/clothing/suit/armor/ego_gear/waw/furrows
+	cost = 50
+**/
+
 ///////////
 // Aleph //
 ///////////
 
+// The Crying Children - Waxen Pinion
+/datum/ego_datum/weapon/shield/waxen
+	item_path = /obj/item/ego_weapon/shield/waxen
+	cost = 100
+
+/datum/ego_datum/armor/waxen
+	item_path = /obj/item/clothing/suit/armor/ego_gear/aleph/waxen
+	cost = 100
+
 // Old Mother Hunger - Limos
 /datum/ego_datum/weapon/limos
 	item_path = /obj/item/ego_weapon/mini/limos
@@ -63,11 +102,11 @@
 	item_path = /obj/item/clothing/suit/armor/ego_gear/aleph/limos
 	cost = 100
 
-// The Crying Children - Waxen Pinion
-/datum/ego_datum/weapon/shield/waxen
-	item_path = /obj/item/ego_weapon/shield/waxen
+//The Beast of the Faraway Cabin - Lucid Nightmares (Enkephalin Rush)
+/datum/ego_datum/weapon/nightmares
+	item_path = /obj/item/ego_weapon/nightmares
 	cost = 100
 
-/datum/ego_datum/armor/waxen
-	item_path = /obj/item/clothing/suit/armor/ego_gear/aleph/waxen
-	cost = 100
+/datum/ego_datum/armor/nightmares
+	item_path = /obj/item/clothing/suit/armor/ego_gear/aleph/nightmares
+	cost = 150

code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/ego_armor.dm

@@ -1,4 +1,12 @@
 // Zayin
+/obj/item/clothing/suit/armor/ego_gear/zayin/dragon_staff
+	name = "dragon's staff"
+	desc = "A dirty set of robes studded with knotty wooden trinkets. Wearing this fills you with the majesty and pride of a dragon."
+	icon_state = "dragon_staff"
+	icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_armor.dmi'
+	worn_icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_worn.dmi'
+	flags_inv = NONE
+	armor = list(RED_DAMAGE = 0, WHITE_DAMAGE = 10, BLACK_DAMAGE = 0, PALE_DAMAGE = 0) // 10
 
 // Teth
 /obj/item/clothing/suit/armor/ego_gear/teth/desert
@@ -24,6 +32,18 @@
 							FORTITUDE_ATTRIBUTE = 40
 							)
 
+/obj/item/clothing/suit/armor/ego_gear/he/security_ego
+	name = "security"
+	desc = "An armored vest covered in metallic eyeballs. You occasionally feel them moving, as if searching for something."
+	icon_state = "security"
+	icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_armor.dmi'
+	worn_icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_worn.dmi'
+	flags_inv = NONE
+	armor = list(RED_DAMAGE = 0, WHITE_DAMAGE = 0, BLACK_DAMAGE = 30, PALE_DAMAGE = 40) // 70
+	attribute_requirements = list(
+							JUSTICE_ATTRIBUTE = 40
+							)
+
 // Waw
 /obj/item/clothing/suit/armor/ego_gear/waw/ochre
 	name = "ochre sheet"
@@ -36,6 +56,18 @@
 							JUSTICE_ATTRIBUTE = 80
 							)
 
+/obj/item/clothing/suit/armor/ego_gear/waw/furrows
+	name = "furrows"
+	desc = "The filthy overalls remind you of sharecroppers from the distant past. Someday, they'll return to that fallowed field."
+	icon_state = "furrows"
+	icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_armor.dmi'
+	worn_icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_worn.dmi'
+	armor = list(RED_DAMAGE = 70, WHITE_DAMAGE = 30, BLACK_DAMAGE = 0, PALE_DAMAGE = 40) // 140
+	attribute_requirements = list(
+							FORTITUDE_ATTRIBUTE = 60,
+							TEMPERANCE_ATTRIBUTE = 60,
+							)
+
 /obj/item/clothing/suit/armor/ego_gear/waw/miasma
 	name = "miasma skin"
 	desc = "A heavy robe made of interlinked scales."
@@ -76,3 +108,18 @@
 							TEMPERANCE_ATTRIBUTE = 100,
 							JUSTICE_ATTRIBUTE = 80
 							)
+
+/obj/item/clothing/suit/armor/ego_gear/aleph/nightmares//stat total of 260, between regular ALEPH and PL
+	name = "lucid nightmares"
+	desc = "My father once told me of a mysterious cabin deep within the creek. I had found the fabled place within the recesses of my mind, wherein a horrible beast lurked..."
+	icon_state = "nightmares"
+	icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_armor.dmi'
+	worn_icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_worn.dmi'
+	flags_inv = null
+	armor = list(RED_DAMAGE = 60, WHITE_DAMAGE = 70, BLACK_DAMAGE = 80, PALE_DAMAGE = 50)
+	attribute_requirements = list(
+							FORTITUDE_ATTRIBUTE = 100,
+							PRUDENCE_ATTRIBUTE = 100,
+							TEMPERANCE_ATTRIBUTE = 80,
+							JUSTICE_ATTRIBUTE = 80
+							)