Vampire Rework. (#16476)

* vampire rework * fixes and tweaks * cleanup + tweaks * grug stomp * TGUI * TGUI rebuild * UID fix * debugging cooldown fix * first review changes * subclass refactor * tweaks + some sprites * blackbox logging * tweaks + grammar * minor UI tweaks * ability icon sprites. * placeholder sprite warning fix * melee mod code comment warning * nullification rework * final sprites! * fixes * sabre review pt 1 Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> * sabre review pt2 * sprites readd * tgui rebuild * removes traitor vampires * fixes * readds sprites * runtime fixes * hotfix * more runtime fixes * glare tweak. less confusing when the vampire is stunned. * gargantua nerf * minor tweaks. * hemomancer nerfs * bugfixes and cleanup * I did a dumb * couple of fixes * confusion and shadow snare fixes * hemomancer nerfs part 2 electric boogaloo * TGUI rebuild * fixes and easier events * Umbrae tweaks * gargantua tweak * umbrae nerf 2 electric boogaloo. also var edit suggestion * runtime fix * buffs blood nutrition to be in line with its metabolic rate * Henk stuff Co-authored-by: Farie82 <farie82@users.noreply.github.com> * more review changes * final tweak * affected request + runtime fix * FUCK * fat fucks * darkness tweaks * UMBRAE AAAAAAAAAAAAAHH * force doors bugfix * either git or I am drunk * admin rejuv fix * I CANNOT SPELL * shitnt code * steel review * tgui rebuild * mochi review * vampire ability usage logging Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2026-08-23 20:16:55 +01:00 · 2021-11-14 15:34:56 +01:00
parent 46d3759216
commit 634f9c72f1
52 changed files with 1600 additions and 819 deletions
@@ -16,6 +16,10 @@
 	var/spreadIntoAdjacentChance = 60
 	var/obj/item/seeds/myseed = /obj/item/seeds/glowshroom

+/obj/structure/glowshroom/extinguish_light()
+	visible_message("<span class='warning'>[src] withers away!</span>")
+	qdel(src)
+
 /obj/structure/glowshroom/glowcap
 	name = "glowcap"
 	desc = "Mycena Ruthenia, a species of mushroom that, while it does glow in the dark, is not actually bioluminescent."
@@ -28,6 +32,9 @@
 	icon_state = "shadowshroom"
 	myseed = /obj/item/seeds/glowshroom/shadowshroom

+/obj/structure/glowshroom/shadowshroom/extinguish_light()
+	return
+
 /obj/structure/glowshroom/single/Spread()
 	return

@@ -33,7 +33,8 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
 	var/drop_sound
 	///Whether or not we use stealthy audio levels for this item's attack sounds
 	var/stealthy_audio = FALSE
-
+	/// Allows you to override the attack animation with an attack effect
+	var/attack_effect_override
 	var/list/attack_verb //Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]"
 	var/w_class = WEIGHT_CLASS_NORMAL
 	var/slot_flags = 0		//This is used to determine on which slots an item can fit.
@@ -36,10 +36,10 @@

 /obj/item/nullrod/attack(mob/M, mob/living/carbon/user)
 	..()
-	if(ishuman(M) && M.mind?.vampire)
+	if(ishuman(M) && M.mind?.vampire && user.mind.isholy)
 		if(!M.mind.vampire.get_ability(/datum/vampire_passive/full))
 			to_chat(M, "<span class='warning'>The nullrod's power interferes with your own!</span>")
-			M.mind.vampire.adjust_nullification(5, 2)
+			M.mind.vampire.adjust_nullification(30 + sanctify_force, 15 + sanctify_force)

 /obj/item/nullrod/pickup(mob/living/user)
 	. = ..()
@@ -452,14 +452,6 @@
 	throwforce = 0
 	var/praying = FALSE

-/obj/item/nullrod/rosary/New()
-	..()
-	START_PROCESSING(SSobj, src)
-
-/obj/item/nullrod/rosary/Destroy()
-	STOP_PROCESSING(SSobj, src)
-	return ..()
-
 /obj/item/nullrod/rosary/attack(mob/living/carbon/M, mob/living/carbon/user)
 	if(!iscarbon(M))
 		return ..()
@@ -505,16 +497,6 @@
 		to_chat(user, "<span class='notice'>Your prayer to [SSticker.Bible_deity_name] was interrupted.</span>")
 		praying = FALSE

-/obj/item/nullrod/rosary/process()
-	if(ishuman(loc))
-		var/mob/living/carbon/human/holder = loc
-		if(holder.l_hand == src || holder.r_hand == src) // Holding this in your hand will
-			for(var/mob/living/carbon/human/H in range(5, loc))
-				if(H.mind && H.mind.vampire && !H.mind.vampire.get_ability(/datum/vampire_passive/full))
-					H.mind.vampire.adjust_nullification(5, 2)
-					if(prob(10))
-						to_chat(H, "<span class='userdanger'>Being in the presence of [holder]'s [src] is interfering with your powers!</span>")
-
 /obj/item/nullrod/salt
 	name = "Holy Salt"
 	icon = 'icons/obj/food/containers.dmi'
@@ -46,10 +46,11 @@
 	if(user)
 		user.update_inv_r_hand()
 		user.update_inv_l_hand()
-	if(isrobot(user))
-		to_chat(user, "<span class='notice'>You free up your module.</span>")
-	else
-		to_chat(user, "<span class='notice'>You are now carrying [name] with one hand.</span>")
+	if(!(flags & ABSTRACT))
+		if(isrobot(user))
+			to_chat(user, "<span class='notice'>You free up your module.</span>")
+		else
+			to_chat(user, "<span class='notice'>You are now carrying [name] with one hand.</span>")
 	if(unwieldsound)
 		playsound(loc, unwieldsound, 50, 1)
 	var/obj/item/twohanded/offhand/O = user.get_inactive_hand()
@@ -80,10 +81,11 @@
 	if(user)
 		user.update_inv_r_hand()
 		user.update_inv_l_hand()
-	if(isrobot(user))
-		to_chat(user, "<span class='notice'>You dedicate your module to [src].</span>")
-	else
-		to_chat(user, "<span class='notice'>You grab [src] with both hands.</span>")
+	if(!(flags & ABSTRACT))
+		if(isrobot(user))
+			to_chat(user, "<span class='notice'>You dedicate your module to [src].</span>")
+		else
+			to_chat(user, "<span class='notice'>You grab [src] with both hands.</span>")
 	if(wieldsound)
 		playsound(loc, wieldsound, 50, 1)
 	var/obj/item/twohanded/offhand/O = new(user) ////Let's reserve his other hand~