Re-opening of [PORT] Full Heretic Overhaul

beestation.dme

@@ -836,6 +836,7 @@
 #include "code\datums\weather\weather_types\floor_is_lava.dm"
 #include "code\datums\weather\weather_types\radiation_storm.dm"
 #include "code\datums\weather\weather_types\snow_storm.dm"
+#include "code\datums\weather\weather_types\void_storm.dm"
 #include "code\datums\wires\_wires.dm"
 #include "code\datums\wires\airalarm.dm"
 #include "code\datums\wires\airlock.dm"
@@ -1791,16 +1792,6 @@
 #include "code\modules\antagonists\devil\sintouched\sintouched.dm"
 #include "code\modules\antagonists\devil\true_devil\_true_devil.dm"
 #include "code\modules\antagonists\devil\true_devil\inventory.dm"
-#include "code\modules\antagonists\eldritch_cult\eldritch_antag.dm"
-#include "code\modules\antagonists\eldritch_cult\eldritch_book.dm"
-#include "code\modules\antagonists\eldritch_cult\eldritch_effects.dm"
-#include "code\modules\antagonists\eldritch_cult\eldritch_items.dm"
-#include "code\modules\antagonists\eldritch_cult\eldritch_knowledge.dm"
-#include "code\modules\antagonists\eldritch_cult\eldritch_magic.dm"
-#include "code\modules\antagonists\eldritch_cult\eldritch_monster_antag.dm"
-#include "code\modules\antagonists\eldritch_cult\knowledge\ash_lore.dm"
-#include "code\modules\antagonists\eldritch_cult\knowledge\flesh_lore.dm"
-#include "code\modules\antagonists\eldritch_cult\knowledge\rust_lore.dm"
 #include "code\modules\antagonists\ert\ert.dm"
 #include "code\modules\antagonists\fugitive\fugitive.dm"
 #include "code\modules\antagonists\fugitive\fugitive_outfits.dm"
@@ -1814,6 +1805,54 @@
 #include "code\modules\antagonists\gang\gang_hud.dm"
 #include "code\modules\antagonists\greentext\greentext.dm"
 #include "code\modules\antagonists\guardian\guardian.dm"
+#include "code\modules\antagonists\heretic\heretic_antag.dm"
+#include "code\modules\antagonists\heretic\heretic_focus.dm"
+#include "code\modules\antagonists\heretic\heretic_knowledge.dm"
+#include "code\modules\antagonists\heretic\heretic_living_heart.dm"
+#include "code\modules\antagonists\heretic\heretic_monsters.dm"
+#include "code\modules\antagonists\heretic\influences.dm"
+#include "code\modules\antagonists\heretic\rust_effect.dm"
+#include "code\modules\antagonists\heretic\transmutation_rune.dm"
+#include "code\modules\antagonists\heretic\items\crucifix.dm"
+#include "code\modules\antagonists\heretic\items\eldritch_flask.dm"
+#include "code\modules\antagonists\heretic\items\forbidden_book.dm"
+#include "code\modules\antagonists\heretic\items\heretic_armor.dm"
+#include "code\modules\antagonists\heretic\items\heretic_blades.dm"
+#include "code\modules\antagonists\heretic\items\heretic_necks.dm"
+#include "code\modules\antagonists\heretic\items\madness_mask.dm"
+#include "code\modules\antagonists\heretic\knowledge\ash_lore.dm"
+#include "code\modules\antagonists\heretic\knowledge\flesh_lore.dm"
+#include "code\modules\antagonists\heretic\knowledge\general_side.dm"
+#include "code\modules\antagonists\heretic\knowledge\rust_lore.dm"
+#include "code\modules\antagonists\heretic\knowledge\side_ash_flesh.dm"
+#include "code\modules\antagonists\heretic\knowledge\side_flesh_void.dm"
+#include "code\modules\antagonists\heretic\knowledge\side_rust_ash.dm"
+#include "code\modules\antagonists\heretic\knowledge\side_void_rust.dm"
+#include "code\modules\antagonists\heretic\knowledge\starting_lore.dm"
+#include "code\modules\antagonists\heretic\knowledge\void_lore.dm"
+#include "code\modules\antagonists\heretic\knowledge\sacrifice_knowledge\sacrifice_buff.dm"
+#include "code\modules\antagonists\heretic\knowledge\sacrifice_knowledge\sacrifice_knowledge.dm"
+#include "code\modules\antagonists\heretic\knowledge\sacrifice_knowledge\sacrifice_map.dm"
+#include "code\modules\antagonists\heretic\knowledge\sacrifice_knowledge\sacrifice_moodlets.dm"
+#include "code\modules\antagonists\heretic\magic\aggressive_spread.dm"
+#include "code\modules\antagonists\heretic\magic\ash_ascension.dm"
+#include "code\modules\antagonists\heretic\magic\ash_jaunt.dm"
+#include "code\modules\antagonists\heretic\magic\blood_cleave.dm"
+#include "code\modules\antagonists\heretic\magic\blood_siphon.dm"
+#include "code\modules\antagonists\heretic\magic\eldritch_blind.dm"
+#include "code\modules\antagonists\heretic\magic\eldritch_emplosion.dm"
+#include "code\modules\antagonists\heretic\magic\eldritch_shapeshift.dm"
+#include "code\modules\antagonists\heretic\magic\eldritch_telepathy.dm"
+#include "code\modules\antagonists\heretic\magic\flesh_ascension.dm"
+#include "code\modules\antagonists\heretic\magic\madness_touch.dm"
+#include "code\modules\antagonists\heretic\magic\manse_link.dm"
+#include "code\modules\antagonists\heretic\magic\mansus_grasp.dm"
+#include "code\modules\antagonists\heretic\magic\nightwatcher_rebirth.dm"
+#include "code\modules\antagonists\heretic\magic\rust_wave.dm"
+#include "code\modules\antagonists\heretic\magic\void_phase.dm"
+#include "code\modules\antagonists\heretic\magic\void_pull.dm"
+#include "code\modules\antagonists\heretic\structures\carving_knife.dm"
+#include "code\modules\antagonists\heretic\structures\mawed_crucible.dm"
 #include "code\modules\antagonists\highlander\highlander.dm"
 #include "code\modules\antagonists\hivemind\hivemind.dm"
 #include "code\modules\antagonists\hivemind\hivemind_overlays.dm"
@@ -2781,7 +2820,7 @@
 #include "code\modules\mob\living\simple_animal\constructs.dm"
 #include "code\modules\mob\living\simple_animal\corpse.dm"
 #include "code\modules\mob\living\simple_animal\damage_procs.dm"
-#include "code\modules\mob\living\simple_animal\eldritch_demons.dm"
+#include "code\modules\mob\living\simple_animal\heretic_monsters.dm"
 #include "code\modules\mob\living\simple_animal\kalo.dm"
 #include "code\modules\mob\living\simple_animal\parrot.dm"
 #include "code\modules\mob\living\simple_animal\shade.dm"
@@ -3499,6 +3538,7 @@
 #include "code\modules\spells\spell_types\blind.dm"
 #include "code\modules\spells\spell_types\bloodcrawl.dm"
 #include "code\modules\spells\spell_types\charge.dm"
+#include "code\modules\spells\spell_types\cluwnecurse.dm"
 #include "code\modules\spells\spell_types\cone_spells.dm"
 #include "code\modules\spells\spell_types\conjure.dm"
 #include "code\modules\spells\spell_types\construct_spells.dm"

code/__DEFINES/antagonists.dm

@@ -75,12 +75,28 @@
 ///It is faster as a macro than a proc
 #define IS_HERETIC(mob) (mob.mind?.has_antag_datum(/datum/antagonist/heretic))
 #define IS_HERETIC_MONSTER(mob) (mob.mind?.has_antag_datum(/datum/antagonist/heretic_monster))
+/// Checks if the given mob is either a heretic or a heretic monster.
+#define IS_HERETIC_OR_MONSTER(mob) (IS_HERETIC(mob) || IS_HERETIC_MONSTER(mob))
 
-#define PATH_SIDE "Side"
+/// Define for the heretic faction applied to heretics and heretic mobs.
+#define FACTION_HERETIC "heretics"
+
+// Heretic path defines.
+#define HERETIC_PATH_START "Heretic Start Path"
+#define HERETIC_PATH_SIDE "Heretic Side Path"
+#define HERETIC_PATH_ASH "Heretic Ash Path"
+#define HERETIC_PATH_RUST "Heretic Rust Path"
+#define HERETIC_PATH_FLESH "Heretic Flesh Path"
+#define HERETIC_PATH_VOID "Heretic Void Path"
+
+/// Defines are used in /proc/has_living_heart() to report if the heretic has no heart period, no living heart, or has a living heart.
+#define HERETIC_NO_HEART_ORGAN -1
+#define HERETIC_NO_LIVING_HEART 0
+#define HERETIC_HAS_LIVING_HEART 1
+
+/// A define used in ritual priority for heretics.
+#define MAX_KNOWLEDGE_PRIORITY 100
 
-#define PATH_ASH "Ash"
-#define PATH_RUST "Rust"
-#define PATH_FLESH "Flesh"
 
 /// How much does it cost to reroll strains?
 #define BLOB_REROLL_COST 40

code/__DEFINES/colors.dm

@@ -29,6 +29,7 @@
 #define COLOR_HALF_TRANSPARENT_BLACK    "#0000007A"
 #define COLOR_RED              "#FF0000"
 #define COLOR_RED_LIGHT        "#FF3333"
+#define COLOR_DARK_RED		   "#A50824"
 #define COLOR_MAROON           "#800000"
 #define COLOR_YELLOW           "#FFFF00"
 #define COLOR_OLIVE            "#808000"

code/__DEFINES/configuration.dm

@@ -47,6 +47,7 @@
 #define TARGET_GIMMICK_OBJ_FILE "[STRING_DIRECTORY]/target_gimmick_objectives.txt"
 #define SPLASH_DESC_FILE "splash.json"
 #define MEDIEVAL_SPEECH_FILE "medieval_speech.json"
+#define HERETIC_INFLUENCE_FILE "heretic_influences.json"
 
 /// Force the log directory to be something specific in the data/logs folder
 #define OVERRIDE_LOG_DIRECTORY_PARAMETER "log-directory"

code/__DEFINES/dcs/signals/signals_mob/signals_human.dm

@@ -9,4 +9,17 @@
 #define COMSIG_HUMAN_ATTACKED "carbon_attacked"					//hit by something that checks shields.
 
 //Heretics stuff
-#define COMSIG_HUMAN_VOID_MASK_ACT "void_mask_act"
+#define COMSIG_HERETIC_MASK_ACT "void_mask_act"
+/// From /obj/item/melee/touch_attack/mansus_fist/on_mob_hit : (mob/living/source, mob/living/target)
+#define COMSIG_HERETIC_MANSUS_GRASP_ATTACK "mansus_grasp_attack"
+	/// Default behavior is to use a charge, so return this to blocks the mansus fist from being consumed after use.
+	#define COMPONENT_BLOCK_CHARGE_USE (1<<0)
+
+/// From /obj/item/melee/sickly_blade/afterattack (with proximity) : (mob/living/source, mob/living/target)
+#define COMSIG_HERETIC_BLADE_ATTACK "blade_attack"
+/// From /obj/item/melee/sickly_blade/afterattack (without proximity) : (mob/living/source, mob/living/target)
+#define COMSIG_HERETIC_RANGED_BLADE_ATTACK "ranged_blade_attack"
+///called from /obj/effect/proc_holder/spell/cast_check (src)
+#define COMSIG_MOB_PRE_CAST_SPELL "mob_cast_spell"
+	/// Return to cancel the cast from beginning.
+	#define COMPONENT_CANCEL_SPELL (1<<0)

code/__DEFINES/is_helpers.dm

@@ -230,6 +230,8 @@ GLOBAL_LIST_INIT(heavyfootmob, typecacheof(list(
 
 #define isitem(A) (istype(A, /obj/item))
 
+#define isstack(A) (istype(A, /obj/item/stack))
+
 #define isgrenade(A) (istype(A, /obj/item/grenade))
 
 #define islandmine(A) (istype(A, /obj/effect/mine))

code/__DEFINES/maps.dm

@@ -60,7 +60,7 @@ require only minor tweaks.
 // boolean - weather types that occur on the level
 #define ZTRAIT_ASHSTORM "Weather_Ashstorm"
 #define ZTRAIT_ACIDRAIN "Weather_Acidrain"
-
+#define ZTRAIT_VOIDSTORM "Weather_Voidstorm"
 /// number - bombcap is multiplied by this before being applied to bombs
 #define ZTRAIT_BOMBCAP_MULTIPLIER "Bombcap Multiplier"
 
@@ -89,9 +89,9 @@ require only minor tweaks.
 #define ZTRAITS_SPACE list(ZTRAIT_LINKAGE = SELFLOOPING, ZTRAIT_DYNAMIC_LEVEL = TRUE)
 #define ZTRAITS_LAVALAND list(\
     ZTRAIT_MINING = TRUE, \
-	ZTRAIT_ASHSTORM = TRUE, \
     ZTRAIT_LAVA_RUINS = TRUE, \
     ZTRAIT_BOMBCAP_MULTIPLIER = 2, \
+	ZTRAIT_ASHSTORM = TRUE, \
     ZTRAIT_BASETURF = /turf/open/lava/smooth/lava_land_surface)
 #define ZTRAITS_REEBE list(ZTRAIT_REEBE = TRUE, ZTRAIT_BOMBCAP_MULTIPLIER = 0.5)
 #define DL_NAME "name"

code/__DEFINES/obj_flags.dm

@@ -34,6 +34,7 @@
 #define NO_PIXEL_RANDOM_DROP 	(1<<13) //if dropped, it wont have a randomized pixel_x/pixel_y
 #define WAS_THROWN				(1<<14) //if the item was thrown and shouldn't have the drop_item animation applied
 #define ISWEAPON				(1<<15) //! If this item should hit living mobs when used on harm intent
+#define EXAMINE_SKIP			(1<<16) //! Examine will not read out this item
 
 // Flags for the clothing_flags var on /obj/item/clothing
 
@@ -61,6 +62,7 @@
 #define ORGAN_EXTERNAL			(1<<3)	//Was this organ implanted/inserted/etc, if true will not be removed during species change.
 #define ORGAN_VITAL				(1<<4)	//Currently only the brain
 #define ORGAN_EDIBLE			(1<<5)	//is a snack? :D
+#define ORGAN_UNREMOVABLE 		(1<<6)	//Can't be removed using surgery
 
 /// Flags for the pod_flags var on /obj/structure/closet/supplypod
 

code/__DEFINES/traits.dm

@@ -267,6 +267,13 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 
 #define TRAIT_AI_BAGATTACK "bagattack" // This atom can ignore the "is on a turf" check for simple AI datum attacks, allowing them to attack from bags or lockers as long as any other conditions are met
 
+/// Allows heretics to cast their spells.
+#define TRAIT_ALLOW_HERETIC_CASTING "allow_heretic_casting"
+/// Designates a heart as a living heart for a heretic.
+#define TRAIT_LIVING_HEART "living_heart"
+/// Prevents stripping this equipment
+#define TRAIT_NO_STRIP "no_strip"
+
 //quirk traits
 #define TRAIT_ALCOHOL_TOLERANCE	"alcohol_tolerance"
 #define TRAIT_AGEUSIA			"ageusia"

code/__HELPERS/cmp.dm

@@ -136,3 +136,6 @@ GLOBAL_VAR_INIT(cmp_field, "name")
 
 /proc/cmp_mob_realname_dsc(mob/A,mob/B)
 	return sorttext(A.real_name,B.real_name)
+
+/proc/cmp_heretic_knowledge(datum/heretic_knowledge/knowledge_a, datum/heretic_knowledge/knowledge_b)
+	return initial(knowledge_b.priority) - initial(knowledge_a.priority)

code/_onclick/item_attack.dm

@@ -147,7 +147,7 @@
 // Click parameters is the params string from byond Click() code, see that documentation.
 /obj/item/proc/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
 	SEND_SIGNAL(src, COMSIG_ITEM_AFTERATTACK, target, user, proximity_flag, click_parameters)
-	SEND_SIGNAL(user, COMSIG_MOB_ITEM_AFTERATTACK, target, user, proximity_flag, click_parameters)
+	SEND_SIGNAL(user, COMSIG_MOB_ITEM_AFTERATTACK, target, src, proximity_flag, click_parameters)
 
 
 /obj/item/proc/get_clamped_volume()

code/datums/components/mood.dm

@@ -25,7 +25,7 @@
 	RegisterSignal(parent, COMSIG_MOVABLE_ENTERED_AREA, PROC_REF(check_area_mood))
 
 	RegisterSignal(parent, COMSIG_MOB_HUD_CREATED, PROC_REF(modify_hud))
-	RegisterSignal(parent, COMSIG_HUMAN_VOID_MASK_ACT, PROC_REF(direct_sanity_drain))
+	RegisterSignal(parent, COMSIG_HERETIC_MASK_ACT, PROC_REF(direct_sanity_drain))
 	var/mob/living/owner = parent
 	if(owner.hud_used)
 		modify_hud()

code/datums/components/storage/concrete/pockets.dm

@@ -108,3 +108,12 @@
 					  /obj/item/reagent_containers/food/drinks/bottle/molotov,
 					  /obj/item/reagent_containers/food/drinks/drinkingglass,
 					  /obj/item/ammo_box/a762))
+
+/datum/component/storage/concrete/pockets/void_cloak
+	quickdraw = TRUE
+	max_items = 3
+
+/datum/component/storage/concrete/pockets/void_cloak/Initialize()
+	. = ..()
+	var/static/list/exception_cache = typecacheof(list(/obj/item/clothing/neck/heretic_focus,/obj/item/codex_cicatrix))
+	exception_hold = exception_cache

code/datums/elements/strippable.dm

@@ -163,6 +163,9 @@
 	if(isnull(item))
 		return FALSE
 
+	if(HAS_TRAIT(item, TRAIT_NO_STRIP))
+		return FALSE
+
 	source.visible_message(
 		"<span class='warning'>[user] tries to remove [source]'s [item.name].</span>",
 		"<span class='userdanger'>[user] tries to remove your [item.name].</span>",
@@ -380,7 +383,7 @@
 			continue
 
 		var/obj/item/item = item_data.get_item(owner)
-		if(isnull(item))
+		if(isnull(item) || (HAS_TRAIT(item, TRAIT_NO_STRIP)))
 			items[strippable_key] = result
 			continue
 

code/datums/looping_sounds/weather.dm

@@ -45,3 +45,9 @@
 	start_length = 130
 	end_sound = 'sound/weather/ashstorm/inside/weak_end.ogg'
 	volume = 30
+
+/datum/looping_sound/void_loop
+	mid_sounds = list('sound/ambience/VoidsEmbrace.ogg'=1)
+	mid_length = 1669 // exact length of the music in ticks
+	volume = 100
+	extra_range = 30

code/datums/mutations/touch.dm

@@ -35,15 +35,19 @@
 			C.dropItemToGround(C.get_inactive_held_item())
 			C.confused += 15
 			C.visible_message("<span class='danger'>[user] electrocutes [target]!</span>","<span class='userdanger'>[user] electrocutes you!</span>")
+			use_charge(user)
 			return ..()
 		else
 			user.visible_message("<span class='warning'>[user] fails to electrocute [target]!</span>")
+			use_charge(user)
 			return ..()
 	else if(isliving(target))
 		var/mob/living/L = target
 		L.electrocute_act(15, user, 1, FALSE, FALSE, FALSE, FALSE)
 		L.visible_message("<span class='danger'>[user] electrocutes [target]!</span>","<span class='userdanger'>[user] electrocutes you!</span>")
+		use_charge(user)
 		return ..()
 	else
 		to_chat(user,"<span class='warning'>The electricity doesn't seem to affect [target]...</span>")
+		use_charge(user)
 		return ..()

code/datums/soullink.dm

@@ -19,8 +19,6 @@
 	sharedSoullinks = null
 	return ..()
 
-
-
 //Keeps track of a Mob->Mob (potentially Player->Player) connection
 //Can be used to trigger actions on one party when events happen to another
 //Eg: shared deaths

code/datums/status_effects/buffs.dm

@@ -605,3 +605,50 @@
 /datum/status_effect/antimagic/on_remove()
 	REMOVE_TRAIT(owner, TRAIT_ANTIMAGIC, MAGIC_TRAIT)
 	owner.visible_message("<span class='warning'>[owner]'s dull aura fades away...</span>")
+
+/datum/status_effect/crucible_soul
+	id = "Blessing of Crucible Soul"
+	status_type = STATUS_EFFECT_REFRESH
+	duration = 15 SECONDS
+	examine_text = "<span class='notice'>They don't seem to be all here.</span>"
+	alert_type = /atom/movable/screen/alert/status_effect/crucible_soul
+	var/turf/location
+
+/datum/status_effect/crucible_soul/on_apply()
+	to_chat(owner,"<span class='notice'>You phase through reality, nothing is out of bounds!</span>")
+	owner.alpha = 180
+	owner.pass_flags |= PASSCLOSEDTURF | PASSTRANSPARENT | PASSGRILLE | PASSMACHINE | PASSSTRUCTURE | PASSTABLE | PASSMOB
+	location = get_turf(owner)
+	return TRUE
+
+/datum/status_effect/crucible_soul/on_remove()
+	to_chat(owner,"<span class='notice'>You regain your physicality, returning you to your original location...</span>")
+	owner.alpha = initial(owner.alpha)
+	owner.pass_flags &= ~(PASSCLOSEDTURF | PASSTRANSPARENT | PASSGRILLE | PASSMACHINE | PASSSTRUCTURE | PASSTABLE | PASSMOB)
+	owner.forceMove(location)
+	location = null
+
+/datum/status_effect/duskndawn
+	id = "Blessing of Dusk and Dawn"
+	status_type = STATUS_EFFECT_REFRESH
+	duration = 60 SECONDS
+	alert_type =/atom/movable/screen/alert/status_effect/duskndawn
+
+/datum/status_effect/duskndawn/on_apply()
+	ADD_TRAIT(owner,TRAIT_XRAY_VISION,type)
+	owner.update_sight()
+	return TRUE
+
+/datum/status_effect/duskndawn/on_remove()
+	REMOVE_TRAIT(owner,TRAIT_XRAY_VISION,type)
+	owner.update_sight()
+
+/atom/movable/screen/alert/status_effect/crucible_soul
+	name = "Blessing of Crucible Soul"
+	desc = "You phased through reality. You are halfway to your final destination..."
+	icon_state = "crucible"
+
+/atom/movable/screen/alert/status_effect/duskndawn
+	name = "Blessing of Dusk and Dawn"
+	desc = "Many things hide beyond the horizon. With Owl's help I managed to slip past Sun's guard and Moon's watch."
+	icon_state = "duskndawn"