Drifting Fox 2; Revenge Of The Brellas. #1678

Moribox · 2023-12-02T04:58:34Z

Base Code; Includes: Base Fox stats / planned features; Sunder is done already, need to get the AOE to work, and make sure umbrellas function correctly, once that's done, fox will be functional.

About The Pull Request

Second Fox PR due to me scuffing the first.

Completed stuff:

Umbrellas ( Cox is apparently going to handle this as it is out of any reasonable level of skill i'm obtaining any time soon. )
Black sunder ( works on the umbrellas, but also phased out as a consequence of the umbrellas being phased out. )
Fox petting mechanic
Aoe attack ( ALSO on the umbrellas so not pertinent. )

Why It's Good For The Game

I doubt it is, but more abnormalities is always fun.

Changelog

🆑
add: Drifting Fox Abnormality
/:cl:

code/modules/mob/living/simple_animal/abnormality/he/drifting_fox.dm

code/datums/abnormality/_ego_datum/he.dm

Coxswain-Navigator · 2023-12-04T20:47:18Z

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

+	icon_state = "sunshower"
+	armor = list(RED_DAMAGE = 30, WHITE_DAMAGE = 20, BLACK_DAMAGE = 40, PALE_DAMAGE = -20) // 70
+	attribute_requirements = list(
+							ATTACHMENT_ATTRIBUTE = 40


Attachment is not an attribute

This still has not been resolved.

code/modules/mob/living/simple_animal/abnormality/he/drifting_fox.dm

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

code/modules/mob/living/simple_animal/abnormality/he/drifting_fox.dm

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

code/modules/paperwork/records/info/he.dm

code/modules/mob/living/simple_animal/abnormality/he/drifting_fox.dm

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

what it says it is.

This reverts commit 8bc8a10.

This reverts commit 89344ec.

Base Code; Includes: Base Fox stats / planned features; Sunder is done already, need to get the AOE to work, and make sure umbrellas function correctly, once that's done, fox will be functional.

… to issues beyond my skill level to solve.

…fox.dm Co-authored-by: Gboster-0 <[email protected]>

…and gives poise to the EGO wep.

Moribox · 2023-12-18T05:46:05Z

alright so, writing this now, I fucked the merge and then unfucked it via manually going in an editing everything, so like, every pr ive ever made is in this at once but they also arent? I dont know how to explain it, point being I think I undid it, and were good and its fine so yeah yipee woo. If I fucked this horribly please do tell me how to undo it.

Coxswain-Navigator · 2023-12-18T06:53:11Z

Why is the jackrabbit icon in icons/obj/clothing/ego_gear/abnormality/he.dmi getting deleted?

Coxswain-Navigator · 2023-12-18T07:13:34Z

Some E.G.O. gifts are being duplicated in this PR.

Coxswain-Navigator · 2023-12-18T07:15:22Z

code/modules/mob/living/simple_animal/abnormality/he/drifting_fox.dm

+	//	var/turf/T = get_turf(X)
+	//	new /mob/living/simple_animal/hostile/umbrella(T)
+
+/mob/living/simple_animal/hostile/umbrella


Try to keep code contained with like code. Don't define the umbrella mob then make the status effect and tack the umbrella mob procs under that status effect.

code/modules/paperwork/records/info/he.dm

Moribox · 2023-12-18T20:48:45Z

OK so for the second time I have to close this because I was rebasing entirely incorrectly so uh yeah were doing this AGAIN; This is being closed and im just reopening a new branch after I fix my entire copy of the git because I messed bad with the merge; Sorry for any inconvience.

Gboster-0 reviewed Dec 3, 2023

View reviewed changes