Vampire: The Touchening - try 2

code/__DEFINES/~~oculis_defines/antagonists.dm

@@ -0,0 +1,4 @@
+/// Checks if the given mob is a vampire
+#define IS_VAMPIRE(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/vampire))
+/// Checks if the given mob is a vassal
+#define IS_VASSAL(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/vassal))

code/__DEFINES/~~oculis_defines/crafting.dm

@@ -0,0 +1 @@
+#define CAT_VAMPIRE "Vampire"

code/__DEFINES/~~oculis_defines/dcs/signals/signals_mob/signals_mob_living.dm

@@ -0,0 +1,6 @@
+/// From base of /mob/living/simple_animal/attack_hand() and /mob/living/basic/attack_hand() when petting (non-combat): (mob/living/pet)
+#define COMSIG_LIVING_PET_ANIMAL "living_pet_animal"
+/// From base of carbon_defense.dm when hugging: (mob/living/carbon/hugged)
+#define COMSIG_LIVING_HUG_CARBON "living_hug_carbon"
+/// From base of /datum/element/art when appraising art: (atom/art_piece)
+#define COMSIG_LIVING_APPRAISE_ART "living_appraise_art"

code/__DEFINES/~~oculis_defines/do_afters.dm

@@ -0,0 +1,2 @@
+#define DOAFTER_SOURCE_ARCHIVE_OF_THE_KINDRED "doafter_archive_of_the_kindred"
+#define DOAFTER_SOURCE_PERSUASION_RACK "doafter_persuasion_rack"

code/__DEFINES/~~oculis_defines/factions.dm

@@ -0,0 +1 @@
+#define FACTION_VAMPIRE "Vampire"

code/__DEFINES/~~oculis_defines/hud.dm

@@ -0,0 +1,5 @@
+#define HUD_VAMPIRE_BLOOD "vampire_blood"
+#define HUD_VAMPIRE_RANK "vampire_rank"
+#define HUD_VAMPIRE_HUMANITY "vampire_humanity"
+#define HUD_VAMPIRE_SUNLIGHT "vampire_sunlight"
+#define HUD_VASSAL_TRACKER "vassal_tracker"

code/__DEFINES/~~oculis_defines/language.dm

@@ -0,0 +1,2 @@
+#define LANGUAGE_VAMPIRE "vampire"
+#define LANGUAGE_VASSAL "vassal"

code/__DEFINES/~~oculis_defines/role_preferences.dm

@@ -1,2 +1,8 @@
 #define ROLE_HERETIC_SMUGGLER "Heretic Smuggler"
 #define ROLE_FORBIDDENCALLING "Forbidden Calling"
+
+#define ROLE_VAMPIRE "Vampire"
+#define ROLE_VAMPIRIC_ACCIDENT "Vampiric Accident"
+#define ROLE_VAMPIRE_BREAKOUT "Vampire Breakout"
+
+#define ROLE_VASSAL "Vassal"

code/__DEFINES/~~oculis_defines/span.dm

@@ -0,0 +1,2 @@
+#define span_awe(str) ("<span class='awe'>" + str + "</span>")
+#define span_vampire_master(str) ("<span class='vampire_master'>" + str + "</span>")

code/__DEFINES/~~oculis_defines/traits/declarations.dm

@@ -11,4 +11,14 @@
 #define TRAIT_AMNESTICS "trait_amnestics"
 #define TRAIT_MNESTICS "trait_mnestics"
 
+/// Hides TRAIT_GENELESS.
+#define TRAIT_FAKEGENES "fakegenes"
+
+/// The user is "vampire aligned" - i.e a vampire or vassal.
+/// Basically just check for `HAS_MIND_TRAIT(user, TRAIT_VAMPIRE_ALIGNED)` instead of `IS_VAMPIRE(user) || IS_VASSAL(user)`
+#define TRAIT_VAMPIRE_ALIGNED "vampire_aligned"
+
+/// Slimepeople with this trait will not lose limbs from low blood/nutrition.
+#define TRAIT_SLIME_NO_CANNIBALIZE "slime_no_cannibalize"
+
 // END TRAIT DEFINES

code/__DEFINES/~~oculis_defines/vampires.dm

@@ -0,0 +1,208 @@
+/// Uncomment this to enable testing of Vampire features (such as vassalizing people with a mind instead of a client).
+//#define VAMPIRE_TESTING
+#if defined(VAMPIRE_TESTING) && defined(CIBUILDING)
+	#error VAMPIRE_TESTING is enabled, disable this!
+#endif
+#ifdef TESTING
+	#define VAMPIRE_TESTING
+#endif
+
+// Blood-level defines
+/// Determines Vampire regeneration rate
+#define BS_BLOOD_VOLUME_MAX_REGEN 700
+/// Cost to vassalize someone halfway, in blood. Called twice for full cost.
+#define VASSALIZATION_BLOOD_HALF_COST 8
+/// Cost to convert someone after successful vassalization, in blood.
+#define VASSALIZATION_CONVERSION_COST 50
+/// Once blood is this low, will enter a Frenzy
+#define FRENZY_THRESHOLD_ENTER 25
+/// Once blood is this high, will exit the Frenzy. Intentionally high, we want to kill the person we feed off of
+#define FRENZY_THRESHOLD_EXIT 500
+/// How much blood drained from the vampire each lifetick
+#define VAMPIRE_PASSIVE_BLOOD_DRAIN 0.1
+/// The number that incoming levels are divided by when comitting the Amaranth. Example: 2 would divide the victims level by 2, and give that to the diablerist
+#define DIABLERIE_DIVISOR 1.5
+/// Amount of vitae drunk from another player required to level up.
+#define VITAE_GOAL_STANDARD 250
+
+/// Default amount of damage the vampire's punch/kick damage increases with each level.
+#define VAMPIRE_UNARMED_DMG_INCREASE_ON_RANKUP 0.5
+
+/// How many starting levels do we want each one to have?
+#define VAMPIRE_STARTING_LEVELS 3
+/// How many free levels the vampire gets gradually.
+#define VAMPIRE_FREE_LEVELS 3
+/// Vampire's default stamina resist.
+#define VAMPIRE_INHERENT_STAMINA_RESIST 0.75
+
+/// When do we warn them about their low blood?
+#define VAMPIRE_LOW_BLOOD_WARNING 300
+
+/// How much blood drained from the vampire each tick during sol
+#define VAMPIRE_SOL_BURN 15
+/// We don't go below this threshold when in a shielded area during sol
+#define VAMPIRE_SOL_SHIELD_THRESHOLD 500
+
+/// Minimum blood required for vampire slimes to auto-revive.
+#define SLIME_MIN_REVIVE_BLOOD_THRESHOLD (FRENZY_THRESHOLD_ENTER * 5)
+/// How long it takes for a vampire slime to auto-revive, when left alone.
+#define SLIME_VAMPIRE_REVIVE_TIME (1.5 MINUTES)
+/// How many times faster a slime vampire will revive if their core is being held by a non-vampire/non-ally.
+#define SLIME_VAMPIRE_REVIVE_HELD_MULTIPLIER 0.5
+/// How many times faster a slime vampire will revive if their core is being held by an ally.
+#define SLIME_VAMPIRE_REVIVE_ALLY_MULTIPLIER 1.2
+/// How many times faster a slime vampire will revive if their core is in a coffin.
+#define SLIME_VAMPIRE_REVIVE_COFFIN_MULTIPLIER 2.5
+
+// vassal defines
+/// If someone passes all checks and can be vassalized
+#define VASSALIZATION_ALLOWED 0
+/// If someone has to accept vassalization
+#define VASSALIZATION_DISLOYAL 1
+/// If someone is not allowed under any circimstances to become a vassal
+#define VASSALIZATION_BANNED 2
+
+/// How long Sol lasts
+#define TIME_VAMPIRE_DAY 180 // 3 minutes
+/// The grace period inbetween Sol
+#define TIME_VAMPIRE_NIGHT 2700 // 45 minutes
+/// First audio warning that Sol is coming
+#define TIME_VAMPIRE_DAY_WARN_1 90
+/// Second audio warning that Sol is coming
+#define TIME_VAMPIRE_DAY_WARN_2 30
+/// Final audio warning that Sol is coming
+#define TIME_VAMPIRE_DAY_WARN_3 15
+
+///How much time Sol can be 'off' by, keeping the time inconsistent.
+#define TIME_VAMPIRE_SOL_DELAY 120
+
+// Humanity gains (The actual tracking lists and such are in the datum duh)
+// These are supposed to be somewhat nontrivial, to the point of sometimes not being viable.
+/// Hugging of separate people
+#define HUMANITY_HUGGING_TYPE "hug"
+
+/// Petting of separate animals
+#define HUMANITY_PETTING_TYPE "pet"
+
+/// Watching of art
+#define HUMANITY_ART_TYPE "art"
+
+#define HUMANITY_GAIN_TYPES list(HUMANITY_HUGGING_TYPE, HUMANITY_PETTING_TYPE, HUMANITY_ART_TYPE)
+
+/// Default Humanity
+#define VAMPIRE_DEFAULT_HUMANITY 7
+
+// List of areas that are shielded from sol.
+#define VAMPIRE_SOL_SHIELDED list(/area/station/maintenance, /area/station/medical/morgue, /area/station/security/prison, /area/shuttle, /area/centcom)
+
+// Cooldown defines
+// Used to prevent spamming vampires
+/// Spam prevention for healing messages.
+#define VAMPIRE_SPAM_HEALING 15 SECONDS
+/// Spam prevention for Sol Masquerade messages.
+#define VAMPIRE_SPAM_MASQUERADE 60 SECONDS
+
+/// Spam prevention for Sol messages.
+#define VAMPIRE_SPAM_SOL 30 SECONDS
+
+// Clan defines
+#define CLAN_BRUJAH "Brujah Clan"
+#define CLAN_TOREADOR "Toreador Clan"
+#define CLAN_NOSFERATU "Nosferatu Clan"
+#define CLAN_TREMERE "Tremere Clan"
+#define CLAN_GANGREL "Gangrel Clan"
+#define CLAN_VENTRUE "Ventrue Clan"
+#define CLAN_MALKAVIAN "Malkavian Clan"
+#define CLAN_TZIMISCE "Tzimisce Clan"
+#define CLAN_HECATA "Hecata Clan"
+#define CLAN_LASOMBRA "Lasombra Clan"
+
+// Power defines
+/// This Power can't be used in Torpor
+#define BP_CANT_USE_IN_TORPOR (1<<0)
+/// This Power can't be used in Frenzy.
+#define BP_CANT_USE_IN_FRENZY (1<<1)
+/// This Power can't be used with a stake in you
+#define BP_CANT_USE_WHILE_STAKED (1<<2)
+/// This Power can't be used while incapacitated
+#define BP_CANT_USE_WHILE_INCAPACITATED (1<<3)
+/// This Power can't be used while unconscious
+#define BP_CANT_USE_WHILE_UNCONSCIOUS (1<<4)
+/// This Power CAN be used while silver cuffed
+#define BP_ALLOW_WHILE_SILVER_CUFFED (1<<5)
+
+/// This is a Default Power that all Vampires get.
+#define VAMPIRE_DEFAULT_POWER (1<<1)
+
+/// This Power is a Toggled Power
+#define BP_AM_TOGGLE (1<<0)
+/// This Power is a Single-Use Power
+#define BP_AM_SINGLEUSE (1<<1)
+/// This Power has a Static cooldown
+#define BP_AM_STATIC_COOLDOWN (1<<2)
+/// This Power doesn't cost bloot to run while unconscious
+#define BP_AM_COSTLESS_UNCONSCIOUS (1<<3)
+/// This Power has a cooldown that is more dynamic than a typical power
+#define BP_AM_VERY_DYNAMIC_COOLDOWN (1<<4)
+
+///Called when a Vampire reaches Final Death.
+#define COMSIG_VAMPIRE_FINAL_DEATH "vampire_final_death"
+	///Whether the vampire should not be dusted when arriving Final Death
+	#define DONT_DUST (1<<0)
+
+// Vampire Signals
+/// Called when a Vampire breaks the Masquerade
+#define COMSIG_VAMPIRE_BROKE_MASQUERADE "comsig_vampire_broke_masquerade"
+
+// Signals & Defines
+/// Sent every Sol tick.
+#define COMSIG_SOL_TICK "comsig_sol_tick"
+/// Sent every Sol tick while the sun is up.
+#define COMSIG_SOL_RISE_TICK "comsig_sol_rise_tick"
+/// Sent 90 seconds before Sol begins
+#define COMSIG_SOL_NEAR_START "comsig_sol_near_start"
+/// Sent at the end of Sol
+#define COMSIG_SOL_END "comsig_sol_end"
+/// Sent 15 seconds before Sol ends
+#define COMSIG_SOL_NEAR_END "comsig_sol_near_end"
+/// Sent when a warning for Sol is meant to go out: (danger_level, vampire_warning_message, vassal_warning_message)
+#define COMSIG_SOL_WARNING_GIVEN "comsig_sol_warning_given"
+/// Sent when tracking humanity gain progress: (type, subject)
+#define COMSIG_VAMPIRE_TRACK_HUMANITY_GAIN "comsig_vampire_track_humanity_gain"
+
+#define DANGER_LEVEL_FIRST_WARNING 1
+#define DANGER_LEVEL_SECOND_WARNING 2
+#define DANGER_LEVEL_THIRD_WARNING 3
+#define DANGER_LEVEL_SOL_ROSE 4
+#define DANGER_LEVEL_SOL_ENDED 5
+
+/// Called on the mind when a Vampire chooses a clan: (datum/antagonist/vampire, datum/vampire_clan)
+#define COMSIG_VAMPIRE_CLAN_CHOSEN "vampire_clan_chosen"
+
+// Clan defines
+/// Drinks blood the normal Vampire way.
+#define VAMPIRE_DRINK_NORMAL "vampire_drink_normal"
+/// Drinks blood but is snobby, refusing to drink from mindless
+#define VAMPIRE_DRINK_SNOBBY "vampire_drink_snobby"
+// Masquerade ability given at this point or above
+#define VAMPIRE_HUMANITY_MASQUERADE_POWER 7
+
+// Traits
+/// Falsifies Health analyzer blood levels
+#define TRAIT_FEIGN_LIFE "feign_life"
+/// For people in the middle of being staked
+#define TRAIT_BEINGSTAKED "beingstaked"
+/// This vampire is currently in a frenzy,
+#define TRAIT_FRENZY "frenzy"
+/// This vampire is currently in torpor.
+#define TRAIT_TORPOR "torpor"
+/// This vampire can tell if another vampire has committed diablere on examine.
+#define TRAIT_SEE_DIABLERIE "see_diablerie"
+
+// Trait sources
+/// Source trait for all vampire traits
+#define TRAIT_VAMPIRE "trait_vampire"
+
+// Macros
+#define IS_CURATOR(mob) istype(mob?.mind?.assigned_role, /datum/job/curator)
+// #define IS_CURATOR(mob) (IS_CURATOR(mob) || IS_MONSTERHUNTER(mob))

code/__HELPERS/~~oculis_helpers/view.dm

@@ -0,0 +1,15 @@
+//Returns an in proportion scaled out view, with zoom_amt extra tiles on the y axis.
+/proc/get_zoomed_view(view, zoom_amt)
+	var/view_x
+	var/view_y
+	if(IS_FINITE(view))
+		return view + zoom_amt
+	else
+		var/list/viewrangelist = splittext(view, "x")
+		view_x = text2num(viewrangelist[1])
+		view_y = text2num(viewrangelist[2])
+		var/proportion = view_x / view_x
+		view_x += zoom_amt * proportion
+		view_y += zoom_amt
+	//God, I hate that we have to round this.
+	return "[round(view_x, 1)]x[round(view_y, 1)]"

code/game/objects/items/devices/scanners/sequence_scanner.dm

@@ -48,7 +48,7 @@
 	add_fingerprint(user)
 
 	//no scanning if its a husk or DNA-less Species
-	if (!HAS_TRAIT(interacting_with, TRAIT_GENELESS) && !HAS_TRAIT(interacting_with, TRAIT_BADDNA))
+	if ((!HAS_TRAIT(interacting_with, TRAIT_GENELESS) || HAS_TRAIT(interacting_with, TRAIT_FAKEGENES)) && !HAS_TRAIT(interacting_with, TRAIT_BADDNA)) // OCULIS EDIT CHANGE - VAMPIRES - ORIGINAL: if (!HAS_TRAIT(interacting_with, TRAIT_GENELESS) && !HAS_TRAIT(interacting_with, TRAIT_BADDNA))
 		user.visible_message(span_notice("[user] analyzes [interacting_with]'s genetic sequence."))
 		balloon_alert(user, "sequence analyzed")
 		playsound(user, 'sound/items/healthanalyzer.ogg', 50) // close enough

code/modules/admin/sql_ban_system.dm

@@ -407,6 +407,11 @@
 				ROLE_BORER,
 				ROLE_ASSAULT_OPERATIVE,
 				// NOVA EDIT ADDITION END
+				// OCULIS EDIT ADDITION START - VAMPIRES
+				ROLE_VAMPIRE,
+				ROLE_VAMPIRIC_ACCIDENT,
+				ROLE_VAMPIRE_BREAKOUT,
+				// OCULIS EDIT ADDITION END
 			),
 			// NOVA EDIT ADDITION START - EXTRA_BANS
 			"Nova Ban Options" = list(

code/modules/antagonists/_common/antag_datum.dm

@@ -615,6 +615,10 @@ GLOBAL_LIST_EMPTY(antagonists)
 			/datum/objective/survive,
 			///datum/objective/martyr, // NOVA EDIT REMOVAL
 			/datum/objective/exile,
+			// OCULIS EDIT ADDITION START - VAMPIRES
+			/datum/objective/vampire/scourge,
+			/datum/objective/vampire/prince,
+			// OCULIS EDIT ADDITION END
 		)
 		for (var/datum/objective/check_objective in objectives)
 			if (is_type_in_list(check_objective, escape_objectives))

code/modules/antagonists/brainwashing/brainwashing.dm

@@ -1,4 +1,5 @@
-/proc/brainwash(mob/living/brainwash_victim, directives)
+/proc/brainwash(mob/living/brainwash_victim, directives, source) // OCULIS EDIT - original: /proc/brainwash(mob/living/brainwash_victim, directives, source)
+	. = list() // OCULIS EDIT ADDITION - brainwashing refactor
 	if(!brainwash_victim.mind)
 		return
 	if(!islist(directives))
@@ -8,16 +9,27 @@
 	if(brainwashed_datum)
 		for(var/O in directives)
 			var/datum/objective/brainwashing/objective = new(O)
+			// OCULIS EDIT ADDITION START
+			if(source)
+				objective.source = source
+			. += WEAKREF(objective)
+			// OCULIS EDIT ADDITION END
 			brainwashed_datum.objectives += objective
 		brainwashed_datum.greet()
 	else
 		brainwashed_datum = new()
 		for(var/O in directives)
 			var/datum/objective/brainwashing/objective = new(O)
+			// OCULIS EDIT ADDITION START
+			if(source)
+				objective.source = source
+			. += WEAKREF(objective)
+			// OCULIS EDIT ADDITION END
 			brainwashed_datum.objectives += objective
 		brainwash_mind.add_antag_datum(brainwashed_datum)
 
-	var/begin_message = " has been brainwashed with the following objectives: "
+	var/source_message = source ? " by [source]" : "" // OCULIS EDIT ADDITION
+	var/begin_message = " has been brainwashed with the following objective[length(directives) > 1 ? "s" : ""][source_message]: " // OCULIS EDIT CHANGE - ORIGINAL: var/begin_message = " has been brainwashed with the following objectives: "
 	var/obj_message = english_list(directives)
 	var/rendered = begin_message + obj_message
 	if(!(rendered[length(rendered)] in list(",",":",";",".","?","!","\'","-")))
@@ -26,6 +38,43 @@
 	if(check_holidays(APRIL_FOOLS))
 		// Note: most of the time you're getting brainwashed you're unconscious
 		brainwash_victim.say("You son of a bitch! I'm in.", forced = "That son of a bitch! They're in. (April Fools)")
+	brainwashed_datum.update_static_data_for_all_viewers() // OCULIS EDIT ADDITION - ensure that objectives show up properly
+
+// OCULIS EDIT ADDITION START - add unbrainwash proc. kept in here so that it's right next to /proc/brainwash
+/// Removes objectives from someone's brainwash.
+/proc/unbrainwash(mob/living/victim, list/directives)
+	var/datum/antagonist/brainwashed/brainwash = victim?.mind?.has_antag_datum(/datum/antagonist/brainwashed)
+	if(!brainwash)
+		return FALSE
+	if(directives)
+		if(!isnull(directives) && !islist(directives))
+			directives = list(directives)
+		var/list/removed_objectives = list()
+		var/list/objective_texts = list()
+		for(var/datum/objective/directive as anything in directives)
+			if(istype(directive, /datum/weakref))
+				var/datum/weakref/directive_weakref = directive
+				directive = directive_weakref.resolve()
+			if(!istype(directive))
+				continue
+			brainwash.objectives -= directive
+			removed_objectives += directive
+			objective_texts += "\"[directive.explanation_text]\""
+		log_admin("[key_name(victim)] had the following brainwashing objective[length(removed_objectives) > 1 ? "s" : ""] removed: [english_list(objective_texts)].")
+		if(LAZYLEN(brainwash.objectives))
+			to_chat(victim, span_userdanger("[length(removed_objectives) > 1 ? "Some" : "One"] of your Directives fade away! You only have to obey the remaining Directives now.</b></span></big>"))
+			victim.mind.announce_objectives()
+		else
+			victim.mind.remove_antag_datum(/datum/antagonist/brainwashed)
+		QDEL_LIST(removed_objectives)
+	else
+		var/list/objective_texts = list()
+		for(var/datum/objective/directive as anything in brainwash.objectives)
+			objective_texts += "\"[directive.explanation_text]\""
+		log_admin("[key_name(victim)] had all of their brainwashing objectives removed: [english_list(objective_texts)].")
+		QDEL_LIST(brainwash.objectives)
+		victim.mind.remove_antag_datum(/datum/antagonist/brainwashed)
+// OCULIS EDIT ADDITION END
 
 /datum/antagonist/brainwashed
 	name = "\improper Brainwashed Victim"
@@ -84,3 +133,4 @@
 
 /datum/objective/brainwashing
 	completed = TRUE
+	var/source // OCULIS EDIT ADDITION