tm heresy

.github/CODEOWNERS

@@ -4,5 +4,5 @@
 # In the event that people are to be informed of changes
 # to the same file or dir, add them to the end of under Multiple Owners
 
-
 # SHOULD BE CLEAN, OK? JUST BECAUSE!
+

code/__DEFINES/antagonists.dm

@@ -105,15 +105,49 @@
 #define HKT_NEXT "next"
 #define HKT_BAN "ban"
 #define HKT_DEPTH "depth"
+#define HKT_PURCHASED_DEPTH "purchased_depth"
 #define HKT_ROUTE "route"
 #define HKT_UI_BGR "ui_bgr"
+#define HKT_COST "cost"
+/// Only present for already researched knowledge.
+#define HKT_INSTANCE "instance"
+#define HKT_CATEGORY "category"
+/// unique identifier most commonly used for identifying what knowledge is researchable
+#define HKT_ID "id"
 
+#define BGR_SIDE "node_side"
 
 /// 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
 
+#define HERETIC_DRAFT_TIER_MAX 5
+
+/// The default drain speed for heretic rift's, anything below this will be considered a fast drain, and be very noticeable and cause a overlay
+#define HERETIC_RIFT_DEFAULT_DRAIN_SPEED 10 SECONDS
+
+/// Sources of knowledge purchased for heretics, used for positioning in the UI
+#define HERETIC_KNOWLEDGE_TREE "tree"
+#define HERETIC_KNOWLEDGE_SHOP "shop"
+#define HERETIC_KNOWLEDGE_DRAFT "draft"
+#define HERETIC_KNOWLEDGE_START "start"
+
+/// defines for the depths of the heretic knowledge tree nodes
+#define HKT_DEPTH_START 2
+#define HKT_DEPTH_TIER_1 3
+#define HKT_DEPTH_DRAFT_1 4
+#define HKT_DEPTH_TIER_2 5
+#define HKT_DEPTH_DRAFT_2 6
+#define HKT_DEPTH_ROBES 7
+#define HKT_DEPTH_TIER_3 8
+#define HKT_DEPTH_DRAFT_3 9
+#define HKT_DEPTH_ARMOR 10
+#define HKT_DEPTH_TIER_4 11
+#define HKT_DEPTH_DRAFT_4 12
+#define HKT_DEPTH_ASCENSION 13
+
+
 /// A define used in ritual priority for heretics.
 #define MAX_KNOWLEDGE_PRIORITY 100
 

code/__DEFINES/dcs/declarations.dm

@@ -68,6 +68,7 @@
 #define CALTROP_SILENT (1 << 2)
 #define CALTROP_NOSTUN (1 << 3)
 #define CALTROP_NOCRAWL (1 << 4)
+#define CALTROP_ANTS (1 << 5)
 
 //Ingredient type in datum/component/ingredients_holder
 #define CUSTOM_INGREDIENT_TYPE_EDIBLE 1

code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm

@@ -70,3 +70,8 @@
 
 /// Called on the atom being hit, from /datum/component/anti_magic/on_attack() : (obj/item/weapon, mob/user, antimagic_flags)
 #define COMSIG_ATOM_HOLYATTACK "atom_holyattacked"
+
+/// Called from [/mob/living/proc/send_item_attack_message()]: (&signal_message, &signal_self, &signal_blind)
+#define COMSIG_SEND_ITEM_ATTACK_MESSAGE "send_item_attack_message"
+	/// Return value if the hitby messages are changed.
+	#define SIGNAL_MESSAGE_MODIFIED (1<<0)

code/__DEFINES/dcs/signals/signals_food.dm

@@ -2,6 +2,8 @@
 //Food
 
 // Eating stuff
+/// From datum/component/edible/proc/TakeBite: (atom/owner)
+#define COMSIG_FOOD_BIT "food_bit"
 /// From datum/component/edible/proc/TakeBite: (mob/living/eater, mob/feeder, bitecount, bitesize)
 #define COMSIG_FOOD_EATEN "food_eaten"
 	#define DESTROY_FOOD (1<<0)

code/__DEFINES/dcs/signals/signals_heretic.dm

@@ -16,3 +16,11 @@
 
 /// For [/datum/status_effect/protective_blades] to signal when it is triggered
 #define COMSIG_BLADE_BARRIER_TRIGGERED "blade_barrier_triggered"
+
+/// at the end of determine_drafted_knowledge
+#define COMSIG_HERETIC_SHOP_SETUP "heretic_shop_finished"
+
+/// called on the antagonist datum, upgrades the passive to level 2
+#define COMSIG_HERETIC_PASSIVE_UPGRADE_FIRST "heretic_passive_upgrade_first"
+/// called on the antagonist datum, upgrades the passive to level 3
+#define COMSIG_HERETIC_PASSIVE_UPGRADE_FINAL "heretic_passive_upgrade_final"

code/__DEFINES/dcs/signals/signals_object.dm

@@ -145,6 +145,8 @@
 #define COMSIG_ITEM_DRIED "item_dried"
 ///from base of obj/item/dropped(): (mob/user)
 #define COMSIG_ITEM_DROPPED "item_drop"
+///a mob has just dropped an item
+#define COMSIG_MOB_DROPPED_ITEM "mob_dropped_item"
 ///from base of obj/item/pickup(): (/mob/taker)
 #define COMSIG_ITEM_PICKUP "item_pickup"
 ///from base of obj/item/on_outfit_equip(): (mob/equipper, visuals_only, slot)

code/__DEFINES/dcs/signals/signals_status_effect.dm

@@ -0,0 +1,2 @@
+/// From /datum/status_effect/fire_handler/fire_stacks/tick()
+#define COMSIG_FIRE_STACKS_UPDATED "fire_stacks_updated"

code/__DEFINES/is_helpers.dm

@@ -175,6 +175,8 @@ GLOBAL_LIST_INIT(turfs_pass_meteor, typecacheof(list(
 
 #define is_simian(A) (isgorilla(A) || ismonkey(A))
 
+#define isstargazer(A) (istype(A, /mob/living/basic/heretic_summon/star_gazer))
+
 /// returns whether or not the atom is either a basic mob OR simple animal
 #define isanimal_or_basicmob(A) (istype(A, /mob/living/simple_animal) || istype(A, /mob/living/basic))
 

code/__DEFINES/obj_flags.dm

@@ -51,6 +51,8 @@
 #define NO_BLOOD_ON_ITEM (1 << 19)
 /// Whether this item should skip the /datum/component/fantasy applied on spawn on the RPG event. Used on things like stacks
 #define SKIP_FANTASY_ON_SPAWN (1<<20)
+/// If the item can attack people despite the attacker being a pacifist
+#define BYPASSES_PACIFISM (1<<21)
 
 // Flags for the clothing_flags var on /obj/item/clothing
 

code/__DEFINES/traits/declarations.dm

@@ -96,6 +96,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_EMOTEMUTE "emotemute"
 #define TRAIT_DEAF "deaf"
 #define TRAIT_FAT "fat"
+/// If you are fat, you no longer get the slowdown from it
+#define TRAIT_FAT_IGNORE_SLOWDOWN "fat_ignore_slowdown"
 /// Always hungry. They can eat as much as they want without eating slowdown.
 #define TRAIT_GLUTTON "glutton"
 #define TRAIT_HUSK "husk"
@@ -180,6 +182,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_NUKEIMMUNE "nuke_immunity"
 /// Can't be given viruses
 #define TRAIT_VIRUSIMMUNE "virus_immunity"
+/// Stepping on ants wont cause damage
+#define TRAIT_SPACE_ANT_IMMUNITY "space_ant_immunity"
 /// Won't become a husk under any circumstances
 #define TRAIT_UNHUSKABLE "trait_unhuskable"
 /// Reduces the chance viruses will spread to this mob, and if the mob has a virus, slows its advancement
@@ -456,6 +460,14 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_HALLUCINATION_IMMUNE "hallucination_immune"
 /// Increases chance of getting special traumas, makes them harder to cure
 #define TRAIT_SPECIAL_TRAUMA_BOOST "special_trauma_boost"
+
+//---- Brain trauma resists
+/// Unable to gain any brain trauma whatsoever
+#define TRAIT_BRAIN_TRAUMA_IMMUNITY "brain_trauma_immunity"
+
+/// Prevents death from having too much brain damage
+#define TRAIT_BRAIN_DAMAGE_NODEATH "brain_damage_nodeath"
+
 #define TRAIT_SPACEWALK "spacewalk"
 /// Mobs with this trait still breathe gas in and out but aren't harmed by lacking any particular gas mix. (You can still be hurt by TOO MUCH of a specific gas).
 #define TRAIT_NO_BREATHLESS_DAMAGE "spacebreathing"
@@ -634,6 +646,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_NO_GUN_AKIMBO "no_gun_akimbo"
 /// Mobs with this trait cannot be hit by projectiles, meaning the projectiles will just go through.
 #define TRAIT_UNHITTABLE_BY_PROJECTILES "unhittable_by_projectiles"
+/// Mobs with this trait can never be hit by laser projectiles, meaning the projectiles will just go through.
+#define TRAIT_UNHITTABLE_BY_LASERS "unhittable_by_lasers"
 
 /// Mobs with this trait do care about a few grisly things, such as digging up graves. They also really do not like bringing people back to life or tending wounds, but love autopsies and amputations.
 #define TRAIT_MORBID "morbid"
@@ -871,8 +885,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_ROD_ATTRACT_SHINY_LOVERS "rod_attract_shiny_lovers"
 /// This rod can be used to fish on lava
 #define TRAIT_ROD_LAVA_USABLE "rod_lava_usable"
-/// This rod was infused by a heretic, making it awesome and improving influence gain
-#define TRAIT_ROD_MANSUS_INFUSED "rod_infused"
 /// Stuff that can go inside fish cases and aquariums
 #define TRAIT_AQUARIUM_CONTENT "aquarium_content"
 /// If the item can be used as a bit.
@@ -921,10 +933,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_NO_STRIP "no_strip"
 /// Disallows this item from being pricetagged with a barcode
 #define TRAIT_NO_BARCODES "no_barcode"
-/// 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 the same person from being chosen multiple times for kidnapping objective
 #define TRAIT_HAS_BEEN_KIDNAPPED "has_been_kidnapped"
 /// An item still plays its hitsound even if it has 0 force, instead of the tap
@@ -942,6 +950,22 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// Items with this trait will not appear when examined.
 #define TRAIT_EXAMINE_SKIP "examine_skip"
 
+//---- Heretic Traits
+/// Hides the heretic overlay that outs them as the heretic
+#define TRAIT_HERETIC_AURA_HIDDEN "heretic_aura_hidden"
+/// This rod was infused by a heretic, making it awesome and improving influence gain
+#define TRAIT_ROD_MANSUS_INFUSED "rod_infused"
+/// 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"
+/// Trait given to all participants in a heretic arena
+#define TRAIT_ELDRITCH_ARENA_PARTICIPANT "eldritch_arena_participant"
+/// Trait given to heretic summons, making them immune to heretic spells
+#define TRAIT_HERETIC_SUMMON "heretic_summon"
+/// Lock heretic grasp no longer goes on cooldown when opening things
+#define TRAIT_LOCK_GRASP_UPGRADED "lock_grasp_upgraded"
+
 //quirk traits
 #define TRAIT_ALCOHOL_TOLERANCE "alcohol_tolerance"
 #define TRAIT_ANOSMIA "anosmia"
@@ -1375,9 +1399,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// Trait given to anything linked to, not necessarily allied to, the mansus
 #define TRAIT_MANSUS_TOUCHED "mansus_touched"
 
-/// Trait given to all participants in a heretic arena
-#define TRAIT_ELDRITCH_ARENA_PARTICIPANT "eldritch_arena_participant"
-
 // These traits are used in IS_X() as an OR, and is utilized for pseudoantags (such as deathmatch or domains) so they don't need to actually get antag status.
 // To specifically and only get the antag datum, GET_X() exists now.
 #define TRAIT_ACT_AS_CULTIST "act_as_cultist"
@@ -1504,9 +1525,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 ///A trait given to users as a mutex to prevent repeated unresolved attempts to christen a shuttle
 #define TRAIT_ATTEMPTING_CHRISTENING "attempting_christening"
 
-///Trait given to heretic summons, making them immune to heretic spells
-#define TRAIT_HERETIC_SUMMON "heretic_summon"
-
 ///trait given to mobs that are difficult to tame through mounting
 #define TRAIT_MOB_DIFFICULT_TO_MOUNT "difficult_to_mount"
 

code/__DEFINES/traits/sources.dm

@@ -57,8 +57,6 @@
 #define SHOES_TRAIT "shoes"
 /// Trait inherited by implants
 #define IMPLANT_TRAIT "implant"
-/// Traits given by the heretic arena spell
-#define HERETIC_ARENA_TRAIT "heretic_arena"
 #define GLASSES_TRAIT "glasses"
 /// inherited from riding vehicles
 #define VEHICLE_TRAIT "vehicle"
@@ -102,6 +100,14 @@
 /// Trait given by being recruited as a nuclear operative
 #define NUKE_OP_MINION_TRAIT "nuke-op-minion"
 
+//---- Heretic Traits Sources
+/// Traits given by the heretic arena spell
+#define HERETIC_ARENA_TRAIT "heretic_arena"
+/// Trait given by researching any final knowledge before ascension
+#define FINAL_KNOWLEDGE_TRAIT "final_knowledge"
+/// Trait given by getting too many knowledge points
+#define HELLA_KNOWLEDGE_TRAIT "hella_knowledge"
+
 /// Trait given to you by shapeshifting
 #define SHAPESHIFT_TRAIT "shapeshift_trait"
 

code/__DEFINES/turfs.dm

@@ -89,6 +89,7 @@
 #define RUST_RESISTANCE_REINFORCED 2
 #define RUST_RESISTANCE_TITANIUM 3
 #define RUST_RESISTANCE_ORGANIC 4
+/// Should not be rustable. EVER. Includes thing like space, lava, chasms, admin walls
 #define RUST_RESISTANCE_ABSOLUTE 5
 
 /// Turf will be passable if density is 0

code/_globalvars/traits/_traits.dm

@@ -34,6 +34,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_SPINNING" = TRAIT_SPINNING,
 		"TRAIT_STICKERED" = TRAIT_STICKERED,
 		"TRAIT_UNHITTABLE_BY_PROJECTILES" = TRAIT_UNHITTABLE_BY_PROJECTILES,
+		"TRAIT_UNHITTABLE_BY_LASERS" = TRAIT_UNHITTABLE_BY_LASERS,
 		"TRAIT_UNLINKABLE_FISHING_SPOT" = TRAIT_UNLINKABLE_FISHING_SPOT,
 		"TRAIT_TETHER_ATTACHED" = TRAIT_TETHER_ATTACHED,
 	),
@@ -143,6 +144,9 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 	/datum/wound = list(
 		"TRAIT_WOUND_SCANNED" = TRAIT_WOUND_SCANNED,
 	),
+	/datum/antagonist/heretic = list(
+		"TRAIT_LOCK_GRASP_UPGRADED" = TRAIT_LOCK_GRASP_UPGRADED,
+	),
 	/obj = list(
 		"TRAIT_CONTRABAND" = TRAIT_CONTRABAND,
 		"TRAIT_SPEED_POTIONED" = TRAIT_SPEED_POTIONED,
@@ -637,6 +641,9 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_PREVENT_BLINK_LOOPS" = TRAIT_PREVENT_BLINK_LOOPS,
 		"TRAIT_NO_EYELIDS" = TRAIT_NO_EYELIDS,
 		"TRAIT_CARPOTOXIN_IMMUNE" = TRAIT_CARPOTOXIN_IMMUNE,
+		"TRAIT_FAT_IGNORE_SLOWDOWN" = TRAIT_FAT_IGNORE_SLOWDOWN,
+		"TRAIT_SPACE_ANT_IMMUNITY" = TRAIT_SPACE_ANT_IMMUNITY,
+		"TRAIT_BRAIN_TRAUMA_IMMUNITY" = TRAIT_BRAIN_TRAUMA_IMMUNITY,
 	),
 	/mob/dead/observer = list(
 		"TRAIT_NO_OBSERVE" = TRAIT_NO_OBSERVE,
@@ -682,6 +689,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_UNCOMPOSTABLE" = TRAIT_UNCOMPOSTABLE,
 		"TRAIT_UNIQUE_AQUARIUM_CONTENT" = TRAIT_UNIQUE_AQUARIUM_CONTENT,
 		"TRAIT_WIELDED" = TRAIT_WIELDED,
+		"TRAIT_HERETIC_AURA_HIDDEN" = TRAIT_HERETIC_AURA_HIDDEN,
 	),
 	/obj/item/ammo_casing = list(
 		"TRAIT_DART_HAS_INSERT" = TRAIT_DART_HAS_INSERT,
@@ -755,6 +763,9 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_LIVING_HEART" = TRAIT_LIVING_HEART,
 		"TRAIT_USED_ORGAN" = TRAIT_USED_ORGAN,
 	),
+	/obj/item/organ/brain = list(
+		"TRAIT_BRAIN_DAMAGE_NODEATH" = TRAIT_BRAIN_DAMAGE_NODEATH,
+	),
 	/obj/item/organ/liver = list(
 		"TRAIT_BALLMER_SCIENTIST" = TRAIT_BALLMER_SCIENTIST,
 		"TRAIT_COMEDY_METABOLISM" = TRAIT_COMEDY_METABOLISM,

code/_globalvars/traits/admin_tooling.dm

@@ -7,6 +7,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_CATCH_AND_RELEASE" = TRAIT_CATCH_AND_RELEASE,
 		"TRAIT_KEEP_TOGETHER" = TRAIT_KEEP_TOGETHER,
 		"TRAIT_UNHITTABLE_BY_PROJECTILES" = TRAIT_UNHITTABLE_BY_PROJECTILES,
+		"TRAIT_UNHITTABLE_BY_LASERS" = TRAIT_UNHITTABLE_BY_LASERS,
 	),
 	/atom/movable = list(
 		"TRAIT_ASHSTORM_IMMUNE" = TRAIT_ASHSTORM_IMMUNE,

code/_onclick/item_attack.dm

@@ -228,7 +228,7 @@
 		return FALSE
 
 	var/final_force = CALCULATE_FORCE(src, attack_modifiers)
-	if(damtype != STAMINA && final_force && HAS_TRAIT(user, TRAIT_PACIFISM))
+	if(damtype != STAMINA && final_force && HAS_TRAIT(user, TRAIT_PACIFISM) && !(item_flags & BYPASSES_PACIFISM))
 		to_chat(user, span_warning("You don't want to harm other living beings!"))
 		return FALSE
 
@@ -475,6 +475,9 @@
 			return clamp(w_class * 6, 10, 100) // Multiply the item's weight class by 6, then clamp the value between 10 and 100
 
 /mob/living/proc/send_item_attack_message(obj/item/weapon, mob/living/user, hit_area, def_zone)
+	if(SEND_SIGNAL(user, COMSIG_SEND_ITEM_ATTACK_MESSAGE) & SIGNAL_MESSAGE_MODIFIED)
+		return TRUE
+
 	if(!weapon.force && !length(weapon.attack_verb_simple) && !length(weapon.attack_verb_continuous))
 		return
 

code/controllers/subsystem/throwing.dm

@@ -127,7 +127,7 @@ SUBSYSTEM_DEF(throwing)
 
 	qdel(src)
 
-/// Returns the mob thrower, or null
+/// Returns the thrower, or null
 /datum/thrownthing/proc/get_thrower()
 	. = thrower?.resolve()
 	if(isnull(.))
@@ -144,11 +144,11 @@ SUBSYSTEM_DEF(throwing)
 		return
 
 	var/atom/movable/actual_target = initial_target?.resolve()
-	var/mob/mob_thrower = get_thrower()
+	var/atom/thrower = get_thrower()
 
 	if(dist_travelled) //to catch sneaky things moving on our tile while we slept
 		for(var/atom/movable/obstacle as anything in get_turf(thrownthing))
-			if (obstacle == thrownthing || (obstacle == mob_thrower && !ismob(thrownthing)))
+			if(obstacle == thrownthing || (obstacle == thrower && !ismob(thrownthing)))
 				continue
 			if(ismob(obstacle) && thrownthing.pass_flags & PASSMOB && (obstacle != actual_target))
 				continue

code/datums/brain_damage/brain_trauma.dm

@@ -6,14 +6,22 @@
 /datum/brain_trauma
 	var/name = "Brain Trauma"
 	var/desc = "A trauma caused by brain damage, which causes issues to the patient."
-	var/scan_desc = "generic brain trauma" //description when detected by a health scanner
-	var/mob/living/carbon/owner //the poor bastard
-	var/obj/item/organ/brain/brain //the poor bastard's brain
+	/// Description when detected by a health scanner
+	var/scan_desc = "generic brain trauma"
+	/// The poor bastard
+	var/mob/living/carbon/owner
+	/// The poor bastard's brain
+	var/obj/item/organ/brain/brain
+	/// Message sent in chat when trauma is gained
 	var/gain_text = span_notice("You feel traumatized.")
+	/// Message sent in chat when trauma is lost
 	var/lose_text = span_notice("You no longer feel traumatized.")
+	/// If the trauma can be gained, checked in can_gain_trauma
 	var/can_gain = TRUE
-	var/random_gain = TRUE //can this be gained through random traumas?
-	var/resilience = TRAUMA_RESILIENCE_BASIC //how hard is this to cure?
+	/// If this trauma can be gained randomly
+	var/random_gain = TRUE
+	/// How hard is this to cure?
+	var/resilience = TRAUMA_RESILIENCE_BASIC
 
 	/// Tracks abstract types of brain traumas, useful for determining traumas that should not exist
 	var/abstract_type = /datum/brain_trauma