Vampire Expansion Pack 2 (#1212)

* neckbitenstuff

* fix gamemode 4 real

Author: Kapu1178

code/__DEFINES/maps.dm

@@ -67,9 +67,6 @@ require only minor tweaks.
 #define ZTRAIT_ICE_RUINS_UNDERGROUND "Ice Ruins Underground"
 #define ZTRAIT_ISOLATED_RUINS "Isolated Ruins" //Placing ruins on z levels with this trait will use turf reservation instead of usual placement.
 
-// boolean - Is this Z-level used to house shuttles during transport
-#define ZTRAIT_TRANSIT "Transit"
-
 // boolean - weather types that occur on the level
 #define ZTRAIT_SNOWSTORM "Weather_Snowstorm"
 #define ZTRAIT_VOIDSTORM "Weather_Voidstorm"
@@ -117,9 +114,6 @@ require only minor tweaks.
 ///Z level traits for Secret Away Missions
 #define ZTRAITS_AWAY_SECRET list(ZTRAIT_AWAY = TRUE, ZTRAIT_SECRET = TRUE, ZTRAIT_NOPHASE = TRUE)
 
-///Z level traits for the transit z level
-#define ZTRAITS_TRANSIT list(ZTRAIT_RESERVED = TRUE, ZTRAIT_TRANSIT = TRUE)
-
 #define DL_NAME "name"
 #define DL_TRAITS "traits"
 #define DECLARE_LEVEL(NAME, TRAITS) list(DL_NAME = NAME, DL_TRAITS = TRAITS)

code/game/gamemodes/blood_plague_outbreak.dm

@@ -11,15 +11,17 @@
 	if(.)
 		return
 
-	var/list/transit_levels = SSmapping.levels_by_trait(ZTRAIT_TRANSIT)
+	if(EMERGENCY_AT_LEAST_DOCKED || SSshuttle.emergency?.mode == SHUTTLE_CALL)
+		return TRUE
+
 	// If there's no non-vampires left alive, end the round.
 	// If this becomes too common, something is wrong, this is NOT a conversion antagonist.
 	for(var/mob/living/carbon/human in GLOB.human_list)
 		if(!human.ckey)
 			continue
 
 		var/turf/pos = get_turf(human)
-		if(isnull(pos) || !(is_station_level(pos.z) || (pos.z in transit_levels)))
+		if(isnull(pos) || !(is_station_level(pos.z) || isshuttleturf(pos)))
 			continue
 
 		if(IS_VAMPIRE(human))

code/modules/antagonists/vampire/vampire.dm

@@ -16,8 +16,8 @@
 	var/list/current_states = list()
 	var/list/state_datums
 
-	/// Weakref to the last mob drained of blood.
-	var/datum/weakref/last_victim_ref
+	/// Weakrefs to mobs drained of blood.
+	var/list/datum/weakref/past_victim_refs = list()
 
 	var/list/innate_actions = list(
 		/datum/action/cooldown/blood_sense,

code/modules/antagonists/vampire/vampire_actions/blood_track.dm

@@ -19,7 +19,7 @@
 		return
 
 	var/datum/antagonist/vampire/vamp_datum = owner.mind.has_antag_datum(/datum/antagonist/vampire)
-	return !!vamp_datum.last_victim_ref
+	return !!length(vamp_datum.past_victim_refs)
 
 /datum/action/cooldown/blood_track/Activate(atom/target)
 	var/mob/living/carbon/human/human_owner = owner
@@ -32,10 +32,28 @@
 		to_chat(owner, span_notice("You are unable to catch a scent here."))
 		return
 
+	var/datum/antagonist/vampire/vamp_datum = owner.mind.has_antag_datum(/datum/antagonist/vampire)
+
+	var/list/options = list()
+	for(var/datum/weakref/weakref as anything in vamp_datum.past_victim_refs)
+		var/mob/living/carbon/human/H = weakref.resolve()
+		if(!ishuman(H))
+			vamp_datum.past_victim_refs -= weakref
+			continue
+
+		options[H.real_name] = weakref
+
+	var/victim_name = tgui_input_list(owner, "Select a target", "Blood hunt", options, options[1], 1 MINUTE)
+	if(isnull(victim_name) || isnull(owner))
+		return
+
+	var/datum/weakref/victim_ref = options[victim_name]
+	var/mob/living/carbon/human/victim = victim_ref.resolve()
+	if(!ishuman(victim))
+		return
+
 	. = ..()
 
-	var/datum/antagonist/vampire/vamp_datum = owner.mind.has_antag_datum(/datum/antagonist/vampire)
-	var/mob/living/carbon/human/victim = vamp_datum.last_victim_ref.resolve()
 	var/turf/victim_turf = get_turf(victim)
 	var/turf/owner_turf = get_turf(owner)
 

code/modules/antagonists/vampire/vampire_actions/neck_bite.dm

@@ -38,31 +38,39 @@
 	var/mob/living/carbon/human/user = target
 	var/mob/living/carbon/human/victim = select_target()
 
-	user.visible_message(span_danger("[user] bites down on [victim]'s neck!"), vision_distance = COMBAT_MESSAGE_RANGE)
-
+	var/datum/antagonist/vampire/vamp_datum = user.mind.has_antag_datum(/datum/antagonist/vampire)
 	var/datum/callback/checks_callback = CALLBACK(src, PROC_REF(can_bite), user, victim)
-	if(!do_after(user, victim, 3 SECONDS, DO_IGNORE_HELD_ITEM|DO_IGNORE_SLOWDOWNS|DO_PUBLIC, extra_checks = checks_callback, display = image('goon/icons/actions.dmi', "bite")))
-		return FALSE
+
+	if(vamp_datum.thirst_stage != THIRST_STAGE_BLOODLUST)
+		if(!do_after(user, victim, 3 SECONDS, DO_IGNORE_HELD_ITEM|DO_IGNORE_SLOWDOWNS|DO_PUBLIC, extra_checks = checks_callback, display = image('goon/icons/actions.dmi', "bite")))
+			return FALSE
 
 	. = ..()
 
 	spawn(-1)
+		user.visible_message(span_danger("<b>[user]</b> bites down on <b>[victim]</b>'s neck."), vision_distance = COMBAT_MESSAGE_RANGE)
+
 		ADD_TRAIT(user, TRAIT_MUTE, ref(src))
+		ADD_TRAIT(victim, TRAIT_MUTE, ref(src))
+		var/obj/item/bodypart/head/head = victim.get_bodypart(BODY_ZONE_HEAD)
+		head.create_wound_easy(/datum/wound/neck_bite, 10)
+
 		var/image/succ_image = image('goon/icons/actions.dmi', "blood")
 		while(TRUE)
 			if(!can_bite(user, victim))
 				break
 
 			if(!do_after(user, victim, 1 SECOND, DO_IGNORE_HELD_ITEM|DO_IGNORE_SLOWDOWNS|DO_PUBLIC, extra_checks = checks_callback, display = succ_image))
-				user.visible_message(span_notice("[user] removes [p_their()] teeth from [victim]'s neck."))
+				user.visible_message(span_notice("<b>[user]</b> removes [p_their()] teeth from </b>[victim]</b>'s neck."))
 				break
 
 			siphon_blood(user, victim)
 
+		REMOVE_TRAIT(victim, TRAIT_MUTE, ref(src))
 		REMOVE_TRAIT(user, TRAIT_MUTE, ref(src))
 
 /datum/action/cooldown/neck_bite/proc/siphon_blood(mob/living/carbon/human/user, mob/living/carbon/human/victim)
-	user.visible_message(span_danger("[user] siphons blood from [victim]'s neck!"), vision_distance = COMBAT_MESSAGE_RANGE, ignored_mobs = victim)
+	user.visible_message(span_danger("<b>[user]</b> siphons blood from <b>[victim]</b>'s neck."), vision_distance = COMBAT_MESSAGE_RANGE, ignored_mobs = victim)
 	if(victim.stat == CONSCIOUS)
 		to_chat(victim, span_danger("You can feel blood draining from your neck."))
 
@@ -74,13 +82,18 @@
 	victim.adjustBloodVolume(-VAMPIRE_BLOOD_DRAIN_RATE)
 	user.adjustBloodVolumeUpTo(VAMPIRE_BLOOD_DRAIN_RATE, BLOOD_VOLUME_NORMAL + 100)
 
+	if(user.nutrition < NUTRITION_LEVEL_FULL)
+		user.set_nutrition(min(user.nutrition + 10, NUTRITION_LEVEL_FULL))
+		user.satiety = min(user.satiety + 20, MAX_SATIETY)
+
+	user.heal_overall_damage(2.5, 2.5, BODYTYPE_ORGANIC)
+
 	var/datum/antagonist/vampire/vamp_datum = user.mind.has_antag_datum(/datum/antagonist/vampire)
 	vamp_datum.thirst_level.remove_points(VAMPIRE_BLOOD_DRAIN_RATE * VAMPIRE_BLOOD_THIRST_EXCHANGE_COEFF)
 	vamp_datum.update_thirst_stage()
 
-	var/had_victim = vamp_datum.last_victim_ref
-	vamp_datum.last_victim_ref = WEAKREF(victim)
-	if(!had_victim)
+	if(!(WEAKREF(victim) in vamp_datum.past_victim_refs))
+		vamp_datum.past_victim_refs += WEAKREF(victim)
 		var/datum/action/cooldown/blood_track/track = locate() in owner.actions
 		if(track)
 			track.build_all_button_icons(UPDATE_BUTTON_STATUS)
@@ -140,14 +153,18 @@
 			*error_string_ptr = "You aren't holding anyone."
 		return null
 
+	var/datum/antagonist/vampire/vamp_datum = user.mind.has_antag_datum(/datum/antagonist/vampire)
+
+	var/needed_grab = vamp_datum.thirst_stage == THIRST_STAGE_BLOODLUST ? GRAB_AGGRESSIVE : GRAB_NECK
+
 	for(var/obj/item/hand_item/grab/grab in user.active_grabs)
 		var/mob/living/carbon/human/potential_victim = grab.affecting
 		if(!ishuman(potential_victim) || ismonkey(potential_victim))
 			if(ismob(potential_victim) && error_string_ptr)
 				*error_string_ptr = "You cannot feast on [potential_victim]."
 			continue
 
-		if((grab.current_grab.damage_stage < GRAB_NECK))
+		if((grab.current_grab.damage_stage < needed_grab))
 			if(error_string_ptr)
 				*error_string_ptr = "You need a stronger grip on [potential_victim]."
 			continue

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

@@ -1224,8 +1224,8 @@
 		)
 	else
 		visible_message(
-			span_warning("The [W.desc] on [src]'s [W.parent.plaintext_zone] widens with a nasty ripping noise."),
-			span_warning("The [W.desc] on your [W.parent.plaintext_zone] widens with a nasty ripping noise."),
+			span_warning("The [W.desc] on [src]'s [W.wound_location()] widens with a nasty ripping noise."),
+			span_warning("The [W.desc] on your [W.wound_location()] widens with a nasty ripping noise."),
 			span_hear("You hear a nasty ripping noise, as if flesh is being torn apart."),
 			COMBAT_MESSAGE_RANGE,
 		)

code/modules/shuttle/emergency.dm

@@ -502,7 +502,7 @@
 				for(var/obj/docking_port/mobile/M in SSshuttle.mobile_docking_ports)
 					M.post_emergency_launch()
 				if(prob(10))
-					SSuniverse.SetUniversalState(/datum/universal_state/resonance_jump, list(ZTRAIT_TRANSIT))
+					SSuniverse.SetUniversalState(/datum/universal_state/resonance_jump, list(ZTRAIT_RESERVED))
 				setTimer(SSshuttle.emergency_escape_time * engine_coeff)
 				priority_announce("The Icarus has entered the resonance gate and is enroute to it's destination. Estimate [timeLeft(600)] minutes until the shuttle docks at Sector Control.", "LRSV Icarus Announcement")
 				INVOKE_ASYNC(SSticker, TYPE_PROC_REF(/datum/controller/subsystem/ticker, poll_hearts))

code/modules/surgery/bodyparts/wounds/_wounds.dm

@@ -279,6 +279,9 @@
 
 	return this_wound_desc
 
+/// Returns the location of the wound for descriptions.
+/datum/wound/proc/wound_location()
+	return parent.plaintext_zone
 
 /datum/wound/proc/item_gone(datum/source)
 	SIGNAL_HANDLER

code/modules/surgery/bodyparts/wounds/neck_bite.dm

@@ -0,0 +1,21 @@
+/// Used by the Neck Bite ability.
+/datum/wound/neck_bite
+	pain_factor = 0
+	bleed_threshold = 0
+	wound_type = WOUND_PIERCE
+
+	autoheal_cutoff = 10
+	max_bleeding_stage = 1
+	stages = list(
+		"afflicted bite" = 5,
+		"fading bite mark" = 0,
+	)
+
+/datum/wound/neck_bite/can_worsen(damage_type, damage)
+	return FALSE
+
+/datum/wound/neck_bite/can_merge(datum/wound/other)
+	return FALSE
+
+/datum/wound/neck_bite/wound_location()
+	return "neck"

daedalus.dme

@@ -4466,6 +4466,7 @@
 #include "code\modules\surgery\bodyparts\wounds\create_wound.dm"
 #include "code\modules\surgery\bodyparts\wounds\cuts.dm"
 #include "code\modules\surgery\bodyparts\wounds\lost_limb.dm"
+#include "code\modules\surgery\bodyparts\wounds\neck_bite.dm"
 #include "code\modules\surgery\bodyparts\wounds\punctures.dm"
 #include "code\modules\surgery\machines\bodyscanner.dm"
 #include "code\modules\surgery\machines\bodyscanner_display.dm"