Witch's Shapeshift -> Witch's Wildshape (Also now gives Necran's their Fog Ward spell back again)

code/__DEFINES/cleric.dm

@@ -16,5 +16,5 @@
 #define CLERIC_REGEN_WEAK 0.1 //Would be better to just do away with devotion entirely, but oh well.
 #define CLERIC_REGEN_MINOR 0.5
 #define CLERIC_REGEN_MAJOR 0.8
-#define CLERIC_REGEN_WITCH 0.3
+#define CLERIC_REGEN_WITCH 1.7 //CC edit. Faster witch regen. W/ Devotee it equals 2 devotion/tick. They cannot manually pray.
 #define CLERIC_REGEN_ABSOLVER 5

code/controllers/subsystem/rogue/fog_event/fog_ward_effect.dm

@@ -16,7 +16,7 @@
 /datum/status_effect/buff/fog_ward/on_apply()
 	ADD_TRAIT(owner, TRAIT_FOG_WARDED, TRAIT_MIRACLE)
 	SEND_SIGNAL(owner, COMSIG_WARDED_TRAIT_CHANGE)
-	owner.add_filter(FOG_WARD_OUTLINE, 1, list("type" = "outline", "color" = "#ffffffb3", "size" = 1))
+	owner.add_filter(FOG_WARD_OUTLINE, 1, list("type" = "outline", "color" = "#ffffffb3", "size" = 0.4)) //CC Edit, tweaked size
 	return TRUE
 
 /datum/status_effect/buff/fog_ward/process()
@@ -68,7 +68,7 @@
 /datum/status_effect/buff/fog_ward_caster/on_apply()
 	ADD_TRAIT(owner, TRAIT_FOG_WARDED, TRAIT_MIRACLE)
 	SEND_SIGNAL(owner, COMSIG_WARDED_TRAIT_CHANGE)
-	owner.add_filter(FOG_WARD_OUTLINE, 1, list("type" = "outline", "color" = "#ffffff", "size" = 2))
+	owner.add_filter(FOG_WARD_OUTLINE, 1, list("type" = "outline", "color" = "#ffffff", "size" = 0.85))  //CC Edit, tweaked size
 	return TRUE
 
 /datum/status_effect/buff/fog_ward_caster/on_remove()
@@ -108,7 +108,7 @@
 /obj/effect/proc_holder/spell/invoked/fog_ward
 	name = "Ward of the Undermaiden"
 	desc = "Call upon Necra to manifest a holy mist that dispels fog phantoms and prevents ambushes. Allies must stay close to you to maintain protection."
-	invocations = list("Necra, clear the path!", "Be gone, shades of the mist!")
+	invocations = list("Necra, clear the path!") //CC Edit, tweaked the invocation string
 	devotion_cost = 150
 	recharge_time = 3 MINUTES
 	chargetime = 2 SECONDS
@@ -138,9 +138,12 @@
 
 	return TRUE
 
-/obj/effect/proc_holder/spell/invoked/fog_ward/on_gain(mob/living/user)
+//CC Edit Begin
+// Allow Necrans to have this normally. There is no reason why they should not have this, as this actually creates runtimes due to not actually "existing" on characters.
+/* /obj/effect/proc_holder/spell/invoked/fog_ward/on_gain(mob/living/user)
 	// Check the subsystem variable to see if fog is even a possibility this round
 	if(!SSevent_scheduler.fog_scheduled)
 		qdel(src)
 		return FALSE
-	return ..()
+	return ..() */
+//CC Edit End

code/controllers/subsystem/rogue/miscprocs.dm

@@ -173,6 +173,12 @@
 
 	if(!devotion)
 		return FALSE
+	//CC Edit Begin
+	//Witch's all have a god complex. Their patron still loves them however.
+	if(HAS_TRAIT(src, TRAIT_WITCH))
+		to_chat(src, span_warning("My patron has blessed me enough as is, I can do things on my own."))
+		return FALSE
+	//CC Edit End
 
 	var/prayersesh = 0
 	visible_message("[src] kneels their head in prayer to the Gods.", "I kneel my head in prayer to [devotion.patron.name].")

code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/witch.dm

@@ -1,3 +1,4 @@
+//CC Edit: Old Witch Class. New Witch Class can be found in modular_causticove, within is new and improved witch shapeshifting.
 /datum/advclass/witch
 	name = "Witch"
 	tutorial = "You are a witch, seen as wisefolk to some and a demon to many. Ostracized and sequestered for wrongthinks or outright heresy, your potions are what the commonfolk turn to when all else fails, and for this they tolerate you — at an arm's length. Take care not to end 'pon a pyre, for the church condemns your left handed arts."

code/modules/mob/living/carbon/human/species_types/wildshape/wildshape_transformation.dm

@@ -24,8 +24,8 @@
 	W.regenerate_icons()
 	W.stored_mob = src
 	W.cmode_music = 'sound/music/cmode/garrison/combat_warden.ogg'
-	playsound(W.loc, pick('sound/combat/gib (1).ogg','sound/combat/gib (2).ogg'), 200, FALSE, 3)
-	//W.spawn_gibs(FALSE) //Caustic Edit - Turned off the gibs on Wildshaping
+	playsound(W.loc, 'sound/body/shapeshift-start.ogg', 75, FALSE, 3) //CC Edit, changed gib sounds to the appropriate shapeshift sounds for less strain on hearing.
+	//W.spawn_gibs(FALSE) //Caustic Edit - Turned off the gibs on Wildshaping, do not uncomment unless you want gibs to spawn.
 	src.forceMove(W)
 
 	W.after_creation()
@@ -178,6 +178,10 @@
 
 	W.regenerate_icons()
 	to_chat(W, span_userdanger("I return to my old form."))
+	//CC Edit Begin makes wildshapers stand up immediately after reforming to make transformation more seamless and snappy.
+	if(W.resting)
+		W.set_resting(FALSE, TRUE)
+	//CC Edit End
 
 	qdel(src)
 

code/modules/spells/spell_types/wildshape.dm

@@ -56,7 +56,16 @@
 
 		choices[shape.name] = icon_img
 
-	var/new_wildshape_type = show_radial_menu(user, user, choices)
+	//CC Edit Begin
+	//Grab all of the possible choices and show a radial menu. If there is none, default to picking the first one.
+	//This should never runtime unless possible_shapes is empty.
+	var/new_wildshape_type
+	if(length(choices) > 1)
+		new_wildshape_type = show_radial_menu(user, user, choices)
+
+	if(!new_wildshape_type)
+		new_wildshape_type = choices[1]
+	//CC Edit End
 
 	if(!new_wildshape_type)
 		revert_cast()

modular_causticcove/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/witch.dm

@@ -0,0 +1,219 @@
+//Copied from witch.dm on 3/23/26, update accordingly for any changes.
+
+/datum/advclass/witch
+	name = "Witch"
+	tutorial = "You are a witch, seen as wisefolk to some and a demon to many. Ostracized and sequestered for wrongthinks or outright heresy, your potions are what the commonfolk turn to when all else fails, and for this they tolerate you — at an arm's length. Take care not to end 'pon a pyre, for the church condemns your left handed arts."
+	allowed_sexes = list(MALE, FEMALE)
+	allowed_races = RACES_ALL_KINDS
+	outfit = /datum/outfit/job/roguetown/adventurer/witch
+	category_tags = list(CTAG_PILGRIM, CTAG_TOWNER)
+	traits_applied = list(TRAIT_DEATHSIGHT, TRAIT_WITCH, TRAIT_ALCHEMY_EXPERT)
+	subclass_stats = list(
+		STATKEY_INT = 3,
+		STATKEY_SPD = 2,
+		STATKEY_LCK = 1
+	)
+	age_mod = /datum/class_age_mod/witch
+
+	subclass_skills = list(
+		/datum/skill/misc/reading = SKILL_LEVEL_EXPERT,
+		/datum/skill/craft/alchemy = SKILL_LEVEL_EXPERT,
+		/datum/skill/misc/medicine = SKILL_LEVEL_APPRENTICE,
+		/datum/skill/labor/farming = SKILL_LEVEL_NOVICE,
+		/datum/skill/craft/cooking = SKILL_LEVEL_NOVICE,
+		/datum/skill/craft/sewing = SKILL_LEVEL_NOVICE,
+		/datum/skill/craft/crafting = SKILL_LEVEL_APPRENTICE,
+		/datum/skill/craft/carpentry = SKILL_LEVEL_APPRENTICE,
+	)
+	maximum_possible_slots = 20 // Should not fill, just a hack to make it shows what types of towners are in round
+
+/datum/outfit/job/roguetown/adventurer/witch/pre_equip(mob/living/carbon/human/H)
+	..()
+	head = /obj/item/clothing/head/roguetown/witchhat
+	mask = /obj/item/clothing/head/roguetown/roguehood/black
+	armor = /obj/item/clothing/suit/roguetown/shirt/robe/phys
+	shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/priest
+	gloves = /obj/item/clothing/gloves/roguetown/leather/black
+	belt = /obj/item/storage/belt/rogue/leather/black
+	beltr = /obj/item/storage/belt/rogue/pouch/coins/poor
+	pants = /obj/item/clothing/under/roguetown/trou
+	shoes = /obj/item/clothing/shoes/roguetown/shortboots
+	backl = /obj/item/storage/backpack/rogue/satchel
+	backpack_contents = list(
+						/obj/item/reagent_containers/glass/mortar = 1,
+						/obj/item/pestle = 1,
+						/obj/item/candle/yellow = 2,
+						/obj/item/recipe_book/alchemy = 1,
+						/obj/item/recipe_book/survival = 1,
+						/obj/item/recipe_book/magic = 1,
+						/obj/item/chalk = 1
+						)
+	var/classes = list("Old Magick", "Godsblood", "Mystagogue")
+	var/classchoice = input("How do your powers manifest?", "THE OLD WAYS") as anything in classes
+
+	//Shapeshifting choices are handled in the shapeshift spell itself further down the file.
+
+	switch (classchoice)
+		if("Old Magick")
+			// the original witch: arcyne t2 with 9 spellpoints
+			ADD_TRAIT(H, TRAIT_ARCYNE_T2, TRAIT_GENERIC)
+			H.adjust_skillrank(/datum/skill/magic/arcane, SKILL_LEVEL_APPRENTICE, TRUE)
+			H.mind?.adjust_spellpoints(9) // twelve if you pick arcyne potential
+			beltl = /obj/item/storage/magebag/starter
+			if (H.age == AGE_OLD)
+				H.adjust_skillrank(/datum/skill/magic/arcane, SKILL_LEVEL_APPRENTICE, TRUE)
+				H.mind?.adjust_spellpoints(3)
+		if("Godsblood")
+			//miracle witch: capped at t2 miracles. cannot pray to regain devo, but has high innate regen because of it (1.7 instead of 0.8 from major).
+			//Cannot use miracles or gain devotion when shapeshifted.
+			var/datum/devotion/D = new /datum/devotion/(H, H.patron)
+			H.adjust_skillrank(/datum/skill/magic/holy, SKILL_LEVEL_APPRENTICE, TRUE)
+			D.grant_miracles(H, cleric_tier = CLERIC_T2, passive_gain = CLERIC_REGEN_WITCH, devotion_limit = CLERIC_REQ_2)
+			D.max_devotion *= 0.5
+			neck = /obj/item/clothing/neck/roguetown/psicross/wood
+			if (H.age == AGE_OLD)
+				H.adjust_skillrank(/datum/skill/magic/holy, SKILL_LEVEL_NOVICE, TRUE)
+		if("Mystagogue")
+			// hybrid arcane/holy witch with t1 arcane and t1 miracles, but less spellpoints, lower max devotion and less regen (0.5). Still can't pray.
+			//Also cannot use miracles or gain devotion when shapeshifted.
+			var/datum/devotion/D = new /datum/devotion/(H, H.patron)
+			H.adjust_skillrank(/datum/skill/magic/holy, SKILL_LEVEL_NOVICE, TRUE)
+			D.grant_miracles(H, cleric_tier = CLERIC_T1, passive_gain = CLERIC_REGEN_MINOR, devotion_limit = CLERIC_REQ_1)
+			D.max_devotion *= 0.5
+			ADD_TRAIT(H, TRAIT_ARCYNE_T1, TRAIT_GENERIC)
+			H.adjust_skillrank(/datum/skill/magic/arcane, SKILL_LEVEL_NOVICE, TRUE)
+			H.mind?.adjust_spellpoints(6) // nine if you pick arcyne potential
+			beltl = /obj/item/storage/magebag/starter
+			neck = /obj/item/clothing/neck/roguetown/psicross/wood
+			if (H.age == AGE_OLD)
+				H.adjust_skillrank(/datum/skill/magic/arcane, SKILL_LEVEL_NOVICE, TRUE)
+				H.adjust_skillrank(/datum/skill/magic/holy, SKILL_LEVEL_NOVICE, TRUE)
+	if(H.mind)
+		H.mind.AddSpell(new /obj/effect/proc_holder/spell/self/wildshape/witch)
+
+		switch (classchoice)
+			if("Old Magick")
+				H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/guidance)
+				H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/fortitude)
+				H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/projectile/arcynebolt)
+
+	if(H.gender == FEMALE)
+		armor = /obj/item/clothing/suit/roguetown/armor/corset
+		shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/lowcut
+		pants = /obj/item/clothing/under/roguetown/skirt/red
+
+	switch(H.patron?.type)
+		if(/datum/patron/inhumen/zizo)
+			H.cmode_music = 'sound/music/combat_heretic.ogg'
+			ADD_TRAIT(H, TRAIT_HERESIARCH, TRAIT_GENERIC)
+		if(/datum/patron/inhumen/matthios)
+			H.cmode_music = 'sound/music/combat_matthios.ogg'
+			ADD_TRAIT(H, TRAIT_HERESIARCH, TRAIT_GENERIC)
+		if(/datum/patron/inhumen/graggar)
+			H.cmode_music = 'sound/music/combat_graggar.ogg'
+			ADD_TRAIT(H, TRAIT_HERESIARCH, TRAIT_GENERIC)
+		if(/datum/patron/inhumen/baotha)
+			H.cmode_music = 'sound/music/combat_baotha.ogg'
+			ADD_TRAIT(H, TRAIT_HERESIARCH, TRAIT_GENERIC)
+	if(H.mind)
+		SStreasury.give_money_account(ECONOMIC_LOWER_MIDDLE_CLASS, H, "Savings.")
+
+//Unique wildshape spell designed specifically for witches.
+/obj/effect/proc_holder/spell/self/wildshape/witch
+	name = "Shapechange"
+	desc = "Take on the form of another creature. Cast to select your shape."
+	overlay_state = null
+	clothes_req = FALSE
+	human_req = FALSE
+	chargedrain = 0
+	chargetime = 0
+	recharge_time = 5 SECONDS
+	cooldown_min = 50
+	//"Dyreform.", Norse for "Form of animal."
+	invocations = list("Dyreform.")
+	invocation_type = "none"
+	action_icon_state = "shapeshift"
+	devotion_cost = 0
+	miracle = FALSE
+
+	//Internal var. Empty on purpose. Fills with new mobs on first cast.
+	possible_shapes = list()
+
+	var/list/cached_items = list()
+	var/picked_form = FALSE
+
+/obj/effect/proc_holder/spell/self/wildshape/witch/cast(list/targets, mob/living/carbon/human/user)
+	//Cast once to pick a form.
+	if(!picked_form)
+		pick_form(user)
+		return
+	. = ..()
+
+/obj/effect/proc_holder/spell/self/wildshape/witch/proc/pick_form(mob/living/carbon/human/user)
+	var/shapeshifts = list("Zad", "Bat", "Cabbit", "Volf", "Venard", "Cat", "Rat", "Refund My Choice")
+	var/shapeshiftchoice = input(user, "What form does your second skin take?", "THE OLD WAYS") as anything in shapeshifts
+	switch (shapeshiftchoice)
+		if("Cabbit")
+			possible_shapes += list(/mob/living/carbon/human/species/wildshape/witch/cabbit)
+			action_icon_state = "familiar" //Default icon for animals without unique or similar icons.
+			desc = "Take on the form of a Cabbit."
+		if("Zad")
+			possible_shapes += list(/mob/living/carbon/human/species/wildshape/witch/zad)
+			action_icon_state = "zad"
+			desc = "Take on the form of a Zad."
+		if("Cat") //If someone can figure out how to get skins to work and make 2 possible_shapes for a normal and black cat without a new species entirely plz do so ty ily
+			possible_shapes += list(/mob/living/carbon/human/species/wildshape/witch/cat)
+			action_icon_state = "cat_transform"
+			desc = "Take on the form of a Cat."
+		if("Bat")
+			possible_shapes += list(/mob/living/carbon/human/species/wildshape/witch/bat)
+			action_icon_state = "bat_transform"
+			desc = "Take on the form of a Bat."
+		if("Volf")
+			possible_shapes += list(/mob/living/carbon/human/species/wildshape/witch/volf)
+			action_icon_state = "volf_transform"
+			desc = "Take on the form of a Wolf."
+		if("Venard")
+			possible_shapes += list(/mob/living/carbon/human/species/wildshape/witch/venard)
+			action_icon_state = "volf_transform"
+			desc = "Take on the form of a Venard."
+		if("Rat")
+			possible_shapes += list(/mob/living/carbon/human/species/wildshape/witch/small_rous)
+			action_icon_state = "familiar"
+			desc = "Take on the form of a Rat."
+		if("Refund My Choice") //Simply refunds the choice.
+			desc = "You: 'Hey! Dendor! Get me an animal form with nothing!' Camera pans to the right: 'Nothiiiiinnnn!?'"
+			return
+	if(length(possible_shapes))
+		picked_form = TRUE
+
+/mob/living/carbon/human/species/wildshape/witch
+	var/hand_examine = "paws"
+
+/mob/living/carbon/human/species/wildshape/witch/Initialize()
+	. = ..()
+	//Place it in any inactive hand slot on transform.
+	var/obj/item/unusable_hand/H = new(src)
+	put_in_inactive_hand(H)
+	H.name = hand_examine
+
+/mob/living/carbon/human/species/wildshape/witch/gain_inherent_skills()
+	ADD_TRAIT(src, TRAIT_DEATHSIGHT, ADVENTURER_TRAIT)
+	ADD_TRAIT(src, TRAIT_ALCHEMY_EXPERT, ADVENTURER_TRAIT)
+	return //Do not let this call into wildshape inherent skill gain, or else they'll get miracles and devotions
+
+//Unique witch blocker.
+/obj/item/unusable_hand
+	name = "other hand"
+	desc = "This is your other hand, however you cannot use it whilst shapeshifted. You CAN use your beak, claws, paws, maws, and back to carry other items however. (You can only use 1 hand when shapeshifted.)"
+	icon = 'icons/mob/roguehudgrabs.dmi'
+	icon_state = "grabbing_greyscale"
+	w_class = WEIGHT_CLASS_BULKY
+	item_flags = ABSTRACT
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+	no_effect = TRUE
+	experimental_inhand = FALSE
+
+/obj/item/unusable_hand/New(loc, ...)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_NODROP, TRAIT_GENERIC)