banda 22

Author: Glamyrio

modular_meta/_defines/antagonists.dm

@@ -99,11 +99,8 @@
 #define COMSIG_SOL_WARNING_GIVEN "comsig_sol_warning_given"
 #define COMSIG_BLOODSUCKER_ON_LIFETICK "comsig_bloodsucker_on_lifetick"
 
-#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
+#define DANGER_LEVEL_SOL_ROSE 1
+#define DANGER_LEVEL_SOL_ENDED 2
 
 /**
  * Clan defines

modular_meta/features/antagonists/bloodsuckers/code/bloodsucker/bloodsucker_datum.dm

@@ -91,13 +91,11 @@
 	var/static/list/bloodsucker_traits = list(
 		TRAIT_NOBREATH,
 		TRAIT_SLEEPIMMUNE,
-		TRAIT_NOCRITDAMAGE,
 		TRAIT_RESISTCOLD,
 		TRAIT_RADIMMUNE,
 		TRAIT_GENELESS,
 		TRAIT_STABLEHEART,
 		TRAIT_NOSOFTCRIT,
-		TRAIT_NOHARDCRIT,
 		TRAIT_AGEUSIA,
 		TRAIT_COLDBLOODED,
 		TRAIT_VIRUSIMMUNE,
@@ -186,9 +184,6 @@
 ///The signals registered with the sol subsystem here are reregistered on mind transfer.
 /datum/antagonist/bloodsucker/on_gain()
 	RegisterSignal(SSsunlight, COMSIG_SOL_RANKUP_BLOODSUCKERS, PROC_REF(sol_rank_up))
-	RegisterSignal(SSsunlight, COMSIG_SOL_NEAR_START, PROC_REF(sol_near_start))
-	RegisterSignal(SSsunlight, COMSIG_SOL_END, PROC_REF(on_sol_end))
-	RegisterSignal(SSsunlight, COMSIG_SOL_RISE_TICK, PROC_REF(handle_sol))
 	RegisterSignal(SSsunlight, COMSIG_SOL_WARNING_GIVEN, PROC_REF(give_warning))
 
 	if(IS_FAVORITE_VASSAL(owner.current)) // Vassals shouldnt be getting the same benefits as Bloodsuckers.
@@ -211,7 +206,7 @@
 
 /// Called by the remove_antag_datum() and remove_all_antag_datums() mind procs for the antag datum to handle its own removal and deletion.
 /datum/antagonist/bloodsucker/on_removal()
-	UnregisterSignal(SSsunlight, list(COMSIG_SOL_RANKUP_BLOODSUCKERS, COMSIG_SOL_NEAR_START, COMSIG_SOL_END, COMSIG_SOL_RISE_TICK, COMSIG_SOL_WARNING_GIVEN))
+	UnregisterSignal(SSsunlight, list(COMSIG_SOL_RANKUP_BLOODSUCKERS, COMSIG_SOL_NEAR_START, COMSIG_SOL_END, COMSIG_SOL_RISE_TICK))
 	clear_powers_and_stats()
 	check_cancel_sunlight() //check if sunlight should end
 	return ..()
@@ -271,10 +266,6 @@
 	//Sol-related signals are removed when 'FinalDeath()' is called,
 	//so we'll reregister them here.
 	RegisterSignal(SSsunlight, COMSIG_SOL_RANKUP_BLOODSUCKERS, PROC_REF(sol_rank_up), TRUE)
-	RegisterSignal(SSsunlight, COMSIG_SOL_NEAR_START, PROC_REF(sol_near_start), TRUE)
-	RegisterSignal(SSsunlight, COMSIG_SOL_END, PROC_REF(on_sol_end), TRUE)
-	RegisterSignal(SSsunlight, COMSIG_SOL_RISE_TICK, PROC_REF(handle_sol), TRUE)
-	RegisterSignal(SSsunlight, COMSIG_SOL_WARNING_GIVEN, PROC_REF(give_warning), TRUE)
 
 /datum/antagonist/bloodsucker/greet()
 	. = ..()

modular_meta/features/antagonists/bloodsuckers/code/bloodsucker/bloodsucker_hud.dm

@@ -24,7 +24,7 @@
 	screen_loc = UI_VAMPRANK_DISPLAY
 
 /atom/movable/screen/bloodsucker/sunlight_counter
-	name = "Solar Flare Timer"
+	name = "Time Cycle"
 	icon_state = "sunlight"
 	screen_loc = UI_SUNLIGHT_DISPLAY
 #ifdef BLOODSUCKER_TESTING

modular_meta/features/antagonists/bloodsuckers/code/bloodsucker/bloodsucker_life.dm

@@ -277,7 +277,6 @@
 	))
 	UnregisterSignal(SSsunlight, list(
 		COMSIG_SOL_RANKUP_BLOODSUCKERS,
-		COMSIG_SOL_NEAR_START,
 		COMSIG_SOL_END,
 		COMSIG_SOL_RISE_TICK,
 		COMSIG_SOL_WARNING_GIVEN,

modular_meta/features/antagonists/bloodsuckers/code/bloodsucker/bloodsucker_moodlets.dm

@@ -28,21 +28,6 @@
 	mood_change = 15
 	timeout = 10 MINUTES
 
-/datum/mood_event/coffinsleep
-	description = span_nicegreen("I slept in a coffin during the day. I feel whole again.")
-	mood_change = 10
-	timeout = 5 MINUTES
-
-/datum/mood_event/daylight_1
-	description = span_boldwarning("I slept poorly in a makeshift coffin during the day.")
-	mood_change = -3
-	timeout = 3 MINUTES
-
-/datum/mood_event/daylight_2
-	description = span_boldwarning("I have been scorched by the unforgiving rays of the sun.")
-	mood_change = -7
-	timeout = 5 MINUTES
-
 ///Candelabrum's mood event to non Bloodsucker/Vassals
 /datum/mood_event/vampcandle
 	description = span_boldwarning("Something is making your mind feel... loose.")

modular_meta/features/antagonists/bloodsuckers/code/bloodsucker/bloodsucker_sol.dm

@@ -1,7 +1,7 @@
 /**
  *	# Assigning Sol
  *
- *	Sol is the sunlight, during this period, all Bloodsuckers must be in their coffin, else they burn.
+ *	Sol is the sunlight. After sol bloodsuckers gain ranks
  */
 
 /// Start Sol, called when someone is assigned Bloodsucker
@@ -24,90 +24,12 @@
 
 	INVOKE_ASYNC(src, PROC_REF(RankUp))
 
-///Called when Sol is near starting.
-/datum/antagonist/bloodsucker/proc/sol_near_start(atom/source)
-	SIGNAL_HANDLER
-	if(bloodsucker_lair_area && !(locate(/datum/action/cooldown/bloodsucker/gohome) in powers))
-		BuyPower(new /datum/action/cooldown/bloodsucker/gohome)
-
-///Called when Sol first ends.
-/datum/antagonist/bloodsucker/proc/on_sol_end(atom/source)
-	SIGNAL_HANDLER
-	check_end_torpor()
-	for(var/datum/action/cooldown/bloodsucker/power in powers)
-		if(istype(power, /datum/action/cooldown/bloodsucker/gohome))
-			RemovePower(power)
-
-/// Cycle through all vamp antags and check if they're inside a closet.
-/datum/antagonist/bloodsucker/proc/handle_sol()
-	SIGNAL_HANDLER
-	if(!owner || !owner.current)
-		return
-
-	if(!istype(owner.current.loc, /obj/structure))
-		if(COOLDOWN_FINISHED(src, bloodsucker_spam_sol_burn))
-			if(bloodsucker_level > 0)
-				to_chat(owner, span_userdanger("The solar flare sets your skin ablaze!"))
-			else
-				to_chat(owner, span_userdanger("The solar flare scalds your neophyte skin!"))
-			COOLDOWN_START(src, bloodsucker_spam_sol_burn, BLOODSUCKER_SPAM_SOL) //This should happen twice per Sol
-
-		if(owner.current.fire_stacks <= 0)
-			owner.current.fire_stacks = 0
-		if(bloodsucker_level > 0)
-			owner.current.adjust_fire_stacks(0.2 + bloodsucker_level / 10)
-			owner.current.ignite_mob()
-		owner.current.adjust_fire_loss(2 + (bloodsucker_level / 2))
-		owner.current.updatehealth()
-		owner.current.add_mood_event("vampsleep", /datum/mood_event/daylight_2)
-		return
-
-	if(istype(owner.current.loc, /obj/structure/closet/crate/coffin)) // Coffins offer the BEST protection
-		if(owner.current.am_staked() && COOLDOWN_FINISHED(src, bloodsucker_spam_sol_burn))
-			to_chat(owner.current, span_userdanger("You are staked! Remove the offending weapon from your heart before sleeping."))
-			COOLDOWN_START(src, bloodsucker_spam_sol_burn, BLOODSUCKER_SPAM_SOL) //This should happen twice per Sol
-		if(!HAS_TRAIT(owner.current, TRAIT_NODEATH))
-			check_begin_torpor(TRUE)
-			owner.current.add_mood_event("vampsleep", /datum/mood_event/coffinsleep)
-		dirty_area()
-		return
-
-	if(COOLDOWN_FINISHED(src, bloodsucker_spam_sol_burn)) // Closets offer SOME protection
-		to_chat(owner, span_warning("Your skin sizzles. [owner.current.loc] doesn't protect well against UV bombardment."))
-		COOLDOWN_START(src, bloodsucker_spam_sol_burn, BLOODSUCKER_SPAM_SOL) //This should happen twice per Sol
-	owner.current.adjust_fire_loss(0.5 + (bloodsucker_level / 4))
-	owner.current.updatehealth()
-	owner.current.add_mood_event("vampsleep", /datum/mood_event/daylight_1)
-
-///Makes the area the bloodsucker is currently in dirty with cobweb and dirt.
-/datum/antagonist/bloodsucker/proc/dirty_area()
-	var/list/turf/area_turfs = get_area_turfs(get_area(owner.current))
-	var/turf/turf_to_be_dirtied = pick(area_turfs)
-	if(turf_to_be_dirtied && !turf_to_be_dirtied.density)
-		var/turf/north_turf = get_step(turf_to_be_dirtied, NORTH)
-		if(istype(north_turf, /turf/closed/wall))
-			var/turf/west_turf = get_step(turf_to_be_dirtied, WEST)
-			if(istype(west_turf, /turf/closed/wall))
-				new /obj/effect/decal/cleanable/cobweb(turf_to_be_dirtied)
-			var/turf/east_turf = get_step(turf_to_be_dirtied, EAST)
-			if(istype(east_turf, /turf/closed/wall))
-				new /obj/effect/decal/cleanable/cobweb/cobweb2(turf_to_be_dirtied)
-		new /obj/effect/decal/cleanable/dirt(turf_to_be_dirtied)
-
 /datum/antagonist/bloodsucker/proc/give_warning(atom/source, danger_level, vampire_warning_message, vassal_warning_message)
 	SIGNAL_HANDLER
 	if(!owner)
 		return
 	to_chat(owner, vampire_warning_message)
 
 	switch(danger_level)
-		if(DANGER_LEVEL_FIRST_WARNING)
-			owner.current.playsound_local(null, 'modular_meta/features/antagonists/bloodsuckers/sounds/griffin_3.ogg', 50, 1)
-		if(DANGER_LEVEL_SECOND_WARNING)
-			owner.current.playsound_local(null, 'modular_meta/features/antagonists/bloodsuckers/sounds/griffin_5.ogg', 50, 1)
-		if(DANGER_LEVEL_THIRD_WARNING)
-			owner.current.playsound_local(null, 'sound/effects/alert.ogg', 75, 1)
-		if(DANGER_LEVEL_SOL_ROSE)
-			owner.current.playsound_local(null, 'sound/ambience/misc/ambimystery.ogg', 75, 1)
 		if(DANGER_LEVEL_SOL_ENDED)
-			owner.current.playsound_local(null, 'sound/music/antag/bloodcult/ghosty_wind.ogg', 90, 1)
+			owner.current.playsound_local(null, 'sound/ambience/misc/source_holehit3.ogg', 100, 1)

modular_meta/features/antagonists/bloodsuckers/code/bloodsucker/bloodsucker_torpor.dm

@@ -83,8 +83,8 @@
 		return FALSE
 	// You are in a Coffin, so instead we'll check TOTAL damage, here.
 	if(istype(user.loc, /obj/structure/closet/crate/coffin))
-		if(total_damage <= 10)
+		if(total_damage <= 20)
 			owner.current.remove_status_effect(/datum/status_effect/torpor)
 	else
-		if(total_brute <= 10)
+		if(total_brute <= 20)
 			owner.current.remove_status_effect(/datum/status_effect/torpor)

modular_meta/features/antagonists/bloodsuckers/code/bloodsucker/subsystem_sunlight.dm

@@ -2,12 +2,6 @@
 #define TIME_BLOODSUCKER_DAY 60
 ///Base time nighttime should be in for, until Sol rises.
 #define TIME_BLOODSUCKER_NIGHT 600
-///Time left to send an alert to Bloodsuckers about an incoming Sol.
-#define TIME_BLOODSUCKER_DAY_WARN 90
-///Time left to send an urgent alert to Bloodsuckers about an incoming Sol.
-#define TIME_BLOODSUCKER_DAY_FINAL_WARN 30
-///Time left to alert that Sol is rising.
-#define TIME_BLOODSUCKER_BURN_INTERVAL 5
 
 ///How much time Sol can be 'off' by, keeping the time inconsistent.
 #define TIME_BLOODSUCKER_SOL_DELAY 120
@@ -42,48 +36,24 @@ SUBSYSTEM_DEF(sunlight)
 			SEND_SIGNAL(src, COMSIG_SOL_END)
 			warn_daylight(
 				danger_level = DANGER_LEVEL_SOL_ENDED,
-				vampire_warning_message = span_announce("The solar flare has ended, and the daylight danger has passed... for now."),
-				vassal_warning_message = span_announce("The solar flare has ended, and the daylight danger has passed... for now."),
+				vampire_warning_message = span_announce("Cycle of Night and Day ended."),
+				vassal_warning_message = span_announce("Cycle of Night and Day ended."),
 			)
 		return
 
 	switch(time_til_cycle)
-		if(TIME_BLOODSUCKER_DAY_WARN)
-			SEND_SIGNAL(src, COMSIG_SOL_NEAR_START)
-			warn_daylight(
-				danger_level = DANGER_LEVEL_FIRST_WARNING,
-				vampire_warning_message = span_danger("Solar flares will bombard the station with dangerous UV radiation in [TIME_BLOODSUCKER_DAY_WARN / 60] minutes. <b>Prepare to seek cover in a coffin or closet.</b>"),
-			)
-		if(TIME_BLOODSUCKER_DAY_FINAL_WARN)
-			message_admins("BLOODSUCKER NOTICE: Daylight beginning in [TIME_BLOODSUCKER_DAY_FINAL_WARN] seconds.)")
-			warn_daylight(
-				danger_level = DANGER_LEVEL_SECOND_WARNING,
-				vampire_warning_message = span_userdanger("Solar flares are about to bombard the station! You have [TIME_BLOODSUCKER_DAY_FINAL_WARN] seconds to find cover!"),
-				vassal_warning_message = span_danger("In [TIME_BLOODSUCKER_DAY_FINAL_WARN] seconds, your master will be at risk of burning under a solar flare. Make sure they find cover!"),
-			)
-		if(TIME_BLOODSUCKER_BURN_INTERVAL)
-			warn_daylight(
-				danger_level = DANGER_LEVEL_THIRD_WARNING,
-				vampire_warning_message = span_userdanger("Seek cover, for Sol rises!"),
-			)
 		if(NONE)
 			sunlight_active = TRUE
 			//set the timer to countdown daytime now.
 			time_til_cycle = TIME_BLOODSUCKER_DAY
-			message_admins("BLOODSUCKER NOTICE: Daylight Beginning (Lasts for [TIME_BLOODSUCKER_DAY / 60] minutes.)")
 			warn_daylight(
-				danger_level = DANGER_LEVEL_SOL_ROSE,
-				vampire_warning_message = span_userdanger("Solar flares bombard the station with deadly UV light! Stay in cover for the next [TIME_BLOODSUCKER_DAY / 60] minutes or risk Final Death!"),
-				vassal_warning_message = span_userdanger("Solar flares bombard the station with UV light!"),
+				vampire_warning_message = span_userdanger("Cycle of Night and Day started, next [TIME_BLOODSUCKER_DAY / 60] minutes will be daytime"),
+				vassal_warning_message = span_userdanger("Time is Day now!"),
 			)
-
 /datum/controller/subsystem/sunlight/proc/warn_daylight(danger_level, vampire_warning_message, vassal_warning_message)
 	SEND_SIGNAL(src, COMSIG_SOL_WARNING_GIVEN, danger_level, vampire_warning_message, vassal_warning_message)
 
 #undef TIME_BLOODSUCKER_SOL_DELAY
 
-#undef TIME_BLOODSUCKER_DAY
 #undef TIME_BLOODSUCKER_NIGHT
-#undef TIME_BLOODSUCKER_DAY_WARN
-#undef TIME_BLOODSUCKER_DAY_FINAL_WARN
 #undef TIME_BLOODSUCKER_BURN_INTERVAL

modular_meta/features/antagonists/bloodsuckers/code/powers/fortitude.dm

@@ -12,8 +12,8 @@
 	check_flags = BP_CANT_USE_IN_TORPOR|BP_CANT_USE_IN_FRENZY
 	purchase_flags = BLOODSUCKER_CAN_BUY|VASSAL_CAN_BUY
 	bloodcost = 30
-	cooldown_time = 8 SECONDS
-	constant_bloodcost = 0.2
+	cooldown_time = 10 SECONDS
+	constant_bloodcost = 3
 	var/was_running
 	var/fortitude_resist // So we can raise and lower your brute resist based on what your level_current WAS.