Merge remote-tracking branch 'citadel/master' into combat_v7

code/modules/antagonists/bloodsucker/bloodsucker_sunlight.dm

@@ -7,98 +7,79 @@
 // Over Time, tick down toward a "Solar Flare" of UV buffeting the station. This period is harmful to vamps.
 /obj/effect/sunlight
 	//var/amDay = FALSE
-	var/cancel_me = FALSE
 	var/amDay = FALSE
 	var/time_til_cycle = 0
-	var/nightime_duration = 900 //15 Minutes
+	var/nighttime_duration = 900 //15 Minutes
+	var/issued_XP = FALSE
 
 /obj/effect/sunlight/Initialize()
 	. = ..()
-	INVOKE_ASYNC(src, .proc/countdown)
-	INVOKE_ASYNC(src, .proc/hud_tick)
 
-/obj/effect/sunlight/proc/countdown()
-	set waitfor = FALSE
+/obj/effect/sunlight/proc/start_countdown()
+	START_PROCESSING(SSweather, src) //it counts as weather right
+	time_til_cycle = nighttime_duration
 
-	while(!cancel_me)
-
-		time_til_cycle = nightime_duration
-
-		// Part 1: Night (all is well)
-		while(time_til_cycle > TIME_BLOODSUCKER_DAY_WARN)
-			sleep(10)
-			if(cancel_me)
-				return
-		//sleep(TIME_BLOODSUCKER_NIGHT - TIME_BLOODSUCKER_DAY_WARN)
-		warn_daylight(1,"<span class = 'danger'>Solar Flares will bombard the station with dangerous UV in [TIME_BLOODSUCKER_DAY_WARN / 60] minutes. <b>Prepare to seek cover in a coffin or closet.</b></span>")  // time2text <-- use Help On
-		give_home_power() // Give VANISHING ACT power to all vamps with a lair!
-
-		// Part 2: Night Ending
-		while(time_til_cycle > TIME_BLOODSUCKER_DAY_FINAL_WARN)
-			sleep(10)
-			if(cancel_me)
-				return
-		//sleep(TIME_BLOODSUCKER_DAY_WARN - TIME_BLOODSUCKER_DAY_FINAL_WARN)
-		message_admins("BLOODSUCKER NOTICE: Daylight beginning in [TIME_BLOODSUCKER_DAY_FINAL_WARN] seconds.)")
-		warn_daylight(2,"<span class = 'userdanger'>Solar Flares are about to bombard the station! You have [TIME_BLOODSUCKER_DAY_FINAL_WARN] seconds to find cover!</span>",\
-					  "<span class = 'danger'>In [TIME_BLOODSUCKER_DAY_FINAL_WARN / 10], your master will be at risk of a Solar Flare. Make sure they find cover!</span>")
-
-		// (FINAL LIL WARNING)
-		while(time_til_cycle > 5)
-			sleep(10)
-			if(cancel_me)
-				return
-		//sleep(TIME_BLOODSUCKER_DAY_FINAL_WARN - 50)
-		warn_daylight(3,"<span class = 'userdanger'>Seek cover, for Sol rises!</span>")
-
-		// Part 3: Night Ending
-		while(time_til_cycle > 0)
-			sleep(10)
-			if(cancel_me)
-				return
-		//sleep(50)
-		warn_daylight(4,"<span class = 'userdanger'>Solar flares bombard the station with deadly UV light!</span><br><span class = ''>Stay in cover for the next [TIME_BLOODSUCKER_DAY / 60] minutes or risk Final Death!</span>",\
-				  	  "<span class = 'danger'>Solar flares bombard the station with UV light!</span>")
-
-		// Part 4: Day
-		amDay = TRUE
-		message_admins("BLOODSUCKER NOTICE: Daylight Beginning (Lasts for [TIME_BLOODSUCKER_DAY / 60] minutes.)")
-		time_til_cycle = TIME_BLOODSUCKER_DAY
-		sleep(10) // One second grace period.
-		//var/daylight_time = TIME_BLOODSUCKER_DAY
-		var/issued_XP = FALSE
-		while(time_til_cycle > 0)
+/obj/effect/sunlight/process()
+	// Update all Bloodsucker sunlight huds
+	for(var/datum/mind/M in SSticker.mode.bloodsuckers)
+		if(!istype(M) || !istype(M.current))
+			continue
+		var/datum/antagonist/bloodsucker/bloodsuckerdatum = M.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
+		if(istype(bloodsuckerdatum))
+			bloodsuckerdatum.update_sunlight(max(0, time_til_cycle), amDay) // This pings all HUDs
+	time_til_cycle--
+	if(amDay)
+		if(time_til_cycle > 0 && time_til_cycle % 4 == 0)
 			punish_vamps()
-			sleep(TIME_BLOODSUCKER_BURN_INTERVAL)
-			if(cancel_me)
-				return
-			//daylight_time -= TIME_BLOODSUCKER_BURN_INTERVAL
-			// Issue Level Up!
 			if(!issued_XP && time_til_cycle <= 5)
 				issued_XP = TRUE
-				vamps_rank_up()
+				// Cycle through all vamp antags and check if they're inside a closet.
+				for(var/datum/mind/M in SSticker.mode.bloodsuckers)
+					if(!istype(M) || !istype(M.current))
+						continue
+					var/datum/antagonist/bloodsucker/bloodsuckerdatum = M.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
+					if(istype(bloodsuckerdatum))
+						bloodsuckerdatum.RankUp()	// Rank up! Must still be in a coffin to level!
 
 		warn_daylight(5,"<span class = 'announce'>The solar flare has ended, and the daylight danger has passed...for now.</span>",\
 				  	  "<span class = 'announce'>The solar flare has ended, and the daylight danger has passed...for now.</span>")
 		amDay = FALSE
-		day_end()   // Remove VANISHING ACT power from all vamps who have it! Clear Warnings (sunlight, locker protection)
-		nightime_duration += 100 //Each day makes the night a minute longer.
-		message_admins("BLOODSUCKER NOTICE: Daylight Ended. Resetting to Night (Lasts for [nightime_duration / 60] minutes.)")
-
-
-
-/obj/effect/sunlight/proc/hud_tick()
-	set waitfor = FALSE
-	while(!cancel_me)
-		// Update all Bloodsucker sunlight huds
+		issued_XP = FALSE
 		for(var/datum/mind/M in SSticker.mode.bloodsuckers)
 			if(!istype(M) || !istype(M.current))
 				continue
 			var/datum/antagonist/bloodsucker/bloodsuckerdatum = M.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
-			if(istype(bloodsuckerdatum))
-				bloodsuckerdatum.update_sunlight(max(0, time_til_cycle), amDay) // This pings all HUDs
-		sleep(10)
-		time_til_cycle --
+			if(!istype(bloodsuckerdatum))
+				continue
+			// Reset Warnings
+			bloodsuckerdatum.warn_sun_locker = FALSE
+			bloodsuckerdatum.warn_sun_burn = FALSE
+			// Remove Dawn Powers
+			for(var/datum/action/bloodsucker/P in bloodsuckerdatum.powers)
+				if(istype(P, /datum/action/bloodsucker/gohome))
+					bloodsuckerdatum.powers -= P
+					P.Remove(M.current)
+		nighttime_duration += 100 //Each day makes the night a minute longer.
+		time_til_cycle = nighttime_duration
+		message_admins("BLOODSUCKER NOTICE: Daylight Ended. Resetting to Night (Lasts for [nighttime_duration / 60] minutes.)")
+	else
+		switch(time_til_cycle)
+			if(TIME_BLOODSUCKER_DAY_WARN)
+				//sleep(TIME_BLOODSUCKER_NIGHT - TIME_BLOODSUCKER_DAY_WARN)
+				warn_daylight(1,"<span class = 'danger'>Solar Flares will bombard the station with dangerous UV in [TIME_BLOODSUCKER_DAY_WARN / 60] minutes. <b>Prepare to seek cover in a coffin or closet.</b></span>")  // time2text <-- use Help On
+				give_home_power() // Give VANISHING ACT power to all vamps with a lair!
+			if(TIME_BLOODSUCKER_DAY_FINAL_WARN)
+				message_admins("BLOODSUCKER NOTICE: Daylight beginning in [TIME_BLOODSUCKER_DAY_FINAL_WARN] seconds.)")
+				warn_daylight(2,"<span class = 'userdanger'>Solar Flares are about to bombard the station! You have [TIME_BLOODSUCKER_DAY_FINAL_WARN] seconds to find cover!</span>",\
+							"<span class = 'danger'>In [TIME_BLOODSUCKER_DAY_FINAL_WARN / 10], your master will be at risk of a Solar Flare. Make sure they find cover!</span>")
+			if(5)
+				warn_daylight(3,"<span class = 'userdanger'>Seek cover, for Sol rises!</span>")
+			if(0)
+				warn_daylight(4,"<span class = 'userdanger'>Solar flares bombard the station with deadly UV light!</span><br><span class = ''>Stay in cover for the next [TIME_BLOODSUCKER_DAY / 60] minutes or risk Final Death!</span>",\
+				"<span class = 'danger'>Solar flares bombard the station with UV light!</span>")
+				amDay = TRUE
+				message_admins("BLOODSUCKER NOTICE: Daylight Beginning (Lasts for [TIME_BLOODSUCKER_DAY / 60] minutes.)")
+				time_til_cycle = TIME_BLOODSUCKER_DAY
 
 /obj/effect/sunlight/proc/warn_daylight(danger_level =0, vampwarn = "", vassalwarn = "")
 	for(var/datum/mind/M in SSticker.mode.bloodsuckers)
@@ -162,32 +143,6 @@
 			M.current.updatehealth()
 			SEND_SIGNAL(M.current, COMSIG_ADD_MOOD_EVENT, "vampsleep", /datum/mood_event/daylight_2)
 
-/obj/effect/sunlight/proc/day_end()
-	for(var/datum/mind/M in SSticker.mode.bloodsuckers)
-		if(!istype(M) || !istype(M.current))
-			continue
-		var/datum/antagonist/bloodsucker/bloodsuckerdatum = M.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
-		if(!istype(bloodsuckerdatum))
-			continue
-		// Reset Warnings
-		bloodsuckerdatum.warn_sun_locker = FALSE
-		bloodsuckerdatum.warn_sun_burn = FALSE
-		// Remove Dawn Powers
-		for(var/datum/action/bloodsucker/P in bloodsuckerdatum.powers)
-			if(istype(P, /datum/action/bloodsucker/gohome))
-				bloodsuckerdatum.powers -= P
-				P.Remove(M.current)
-
-/obj/effect/sunlight/proc/vamps_rank_up()
-	set waitfor = FALSE
-	// Cycle through all vamp antags and check if they're inside a closet.
-	for(var/datum/mind/M in SSticker.mode.bloodsuckers)
-		if(!istype(M) || !istype(M.current))
-			continue
-		var/datum/antagonist/bloodsucker/bloodsuckerdatum = M.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
-		if(istype(bloodsuckerdatum))
-			bloodsuckerdatum.RankUp()	// Rank up! Must still be in a coffin to level!
-
 /obj/effect/sunlight/proc/give_home_power()
 	// It's late...! Give the "Vanishing Act" gohome power to bloodsuckers.
 	for(var/datum/mind/M in SSticker.mode.bloodsuckers)

code/modules/antagonists/clockcult/clock_helpers/scripture_checks.dm

@@ -19,7 +19,7 @@
 			update_slab_info()
 			for(var/mob/M in GLOB.player_list)
 				if(is_servant_of_ratvar(M) || isobserver(M))
-					M.playsound_local(M, 'sound/magic/clockwork/scripture_tier_up.ogg', 50, FALSE, pressure_affected = FALSE)
+					M.playsound_local(M, 'sound/magic/clockwork/scripture_tier_up.ogg', 20, FALSE, pressure_affected = FALSE)
 
 /proc/update_slab_info(obj/item/clockwork/slab/set_slab)
 	generate_all_scripture()

code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm

@@ -21,8 +21,10 @@
 	var/recollecting = TRUE //if we're looking at fancy recollection. tutorial enabled by default
 	var/recollection_category = "Default"
 
-	var/list/quickbound = list(/datum/clockwork_scripture/spatial_gateway, \
-	/datum/clockwork_scripture/ranged_ability/kindle, /datum/clockwork_scripture/ranged_ability/hateful_manacles) //quickbound scripture, accessed by index
+	var/list/quickbound = list(
+		/datum/clockwork_scripture/spatial_gateway,
+		/datum/clockwork_scripture/ranged_ability/kindle,
+		/datum/clockwork_scripture/ranged_ability/hateful_manacles) //quickbound scripture, accessed by index
 	var/maximum_quickbound = 5 //how many quickbound scriptures we can have
 
 	var/obj/structure/destructible/clockwork/trap/linking //If we're linking traps together, which ones we're doing
@@ -326,6 +328,7 @@
 		"requirement" = "Unlock powerful equipment and structures by converting five servants or if [DisplayPower(JUDGEMENT_UNLOCK_THRESHOLD)] of power is reached..",
 		"ready" = SSticker.scripture_states[SCRIPTURE_JUDGEMENT]
 	)
+	// no need to learn shit, ratvar is free
 	.["recollection_categories"] = list()
 	if(GLOB.ratvar_awakens)
 		return
@@ -340,19 +343,25 @@
 	)
 	.["rec_section"] = get_recollection(recollection_category)
 	generate_all_scripture()
-	//needs a new place to live, preferably when clockcult unlocks/downgrades a tier. Smart enough to earlyreturn.
+	//needs a new place to live, preferably when clockcult unlocks/downgrades a tier.
+	//comsig maybe?
 
 /obj/item/clockwork/slab/ui_act(action, params)
+	. = ..()
+	if(.)
+		return
 	switch(action)
 		if("toggle")
 			recollecting = !recollecting
+			. = TRUE
 		if("recite")
 			INVOKE_ASYNC(src, .proc/recite_scripture, text2path(params["script"]), usr, FALSE)
+			. = TRUE
 		if("bind")
 			var/datum/clockwork_scripture/path = text2path(params["script"]) //we need a path and not a string
 			if(!ispath(path, /datum/clockwork_scripture) || !initial(path.quickbind) || initial(path.tier) == SCRIPTURE_PERIPHERAL) //fuck you href bus
 				to_chat(usr, "<span class='warning'>Nice try using href exploits</span>")
-				return
+				return FALSE
 			var/found_index = quickbound.Find(path)
 			if(found_index) //hey, we already HAVE this bound
 				if(LAZYLEN(quickbound) == found_index) //if it's the last scripture, remove it instead of leaving a null
@@ -361,6 +370,7 @@
 					quickbound[found_index] = null //otherwise, leave it as a null so the scripture maintains position
 				update_quickbind()
 			else
+				// todo: async this due to ((input)) but its fine for now
 				var/target_index = input("Position of [initial(path.name)], 1 to [maximum_quickbound]?", "Input")  as num|null
 				if(isnum(target_index) && target_index > 0 && target_index <= maximum_quickbound && !..())
 					var/datum/clockwork_scripture/S
@@ -368,10 +378,11 @@
 						S = quickbound[target_index]
 					if(S != path)
 						quickbind_to_slot(path, target_index)
+			. = TRUE
 		if("rec_category")
 			recollection_category = params["category"]
 			update_static_data()
-	return TRUE
+			. = TRUE
 
 /obj/item/clockwork/slab/proc/quickbind_to_slot(datum/clockwork_scripture/scripture, index) //takes a typepath(typecast for initial()) and binds it to a slot
 	if(!ispath(scripture) || !scripture || (scripture in quickbound))

code/modules/antagonists/devil/true_devil/inventory.dm

@@ -1,4 +1,4 @@
-/mob/living/carbon/true_devil/doUnEquip(obj/item/I, force)
+/mob/living/carbon/true_devil/doUnEquip(obj/item/I, force, silent = FALSE)
 	if(..())
 		update_inv_hands()
 		return 1

code/modules/antagonists/eldritch_cult/knowledge/ash_lore.dm

@@ -193,7 +193,7 @@
 	var/list/trait_list = list(TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE)
 
 /datum/eldritch_knowledge/final/ash_final/on_finished_recipe(mob/living/user, list/atoms, loc)
-	priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Fear the blaze, for Ashbringer [user.real_name] has come! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/announcer/classic/spanomalies.ogg')
+	priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Fear the blaze, for the Ashlord, [user.real_name] has ascended! The flames shall consume all! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/announcer/classic/spanomalies.ogg')
 	user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/fire_cascade/big)
 	user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/fire_sworn)
 	var/mob/living/carbon/human/H = user
@@ -201,6 +201,7 @@
 	H.physiology.burn_mod *= 0.5
 	var/datum/antagonist/heretic/ascension = H.mind.has_antag_datum(/datum/antagonist/heretic)
 	ascension.ascended = TRUE
+	H.client?.give_award(/datum/award/achievement/misc/ash_ascension, H)
 	for(var/X in trait_list)
 		ADD_TRAIT(user,X,MAGIC_TRAIT)
 	return ..()

code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm

@@ -232,7 +232,7 @@
 			log_game("[key_name_admin(ghost_candidate)] has taken control of ([key_name_admin(summoned)]).")
 			summoned.ghostize(FALSE)
 			summoned.key = ghost_candidate.key
-			summoned.mind.add_antag_datum(/datum/antagonist/heretic_monster)
+			summoned.mind.add_antag_datum(/datum/antagonist/heretic_monster) //no you will NOT get the achivement you ghost.
 			var/datum/antagonist/heretic_monster/monster = summoned.mind.has_antag_datum(/datum/antagonist/heretic_monster)
 			var/datum/antagonist/heretic/master = user.mind.has_antag_datum(/datum/antagonist/heretic)
 			monster.set_owner(master)
@@ -243,11 +243,14 @@
 			user.SetImmobilized(0)
 			priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Fear the dark, for king of arms has ascended! Lord of the night has come! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/announcer/classic/spanomalies.ogg')
 			log_game("[user.real_name] ascended as [summoned.real_name]")
-			var/mob/living/carbon/carbon_user = user
-			var/datum/antagonist/heretic/ascension = carbon_user.mind.has_antag_datum(/datum/antagonist/heretic)
+			if(!ishuman(user))
+				return
+			var/mob/living/carbon/human/H = user
+			H.client?.give_award(/datum/award/achievement/misc/flesh_ascension, H)
+			var/datum/antagonist/heretic/ascension = user.mind.has_antag_datum(/datum/antagonist/heretic)
 			ascension.ascended = TRUE
-			carbon_user.mind.transfer_to(summoned, TRUE)
-			carbon_user.gib()
+			user.mind.transfer_to(summoned, TRUE)
+			user.gib()
 
 	return ..()
 

code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm

@@ -169,7 +169,8 @@
 	var/mob/living/carbon/human/H = user
 	H.physiology.brute_mod *= 0.5
 	H.physiology.burn_mod *= 0.5
-	priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Fear the decay, for Rustbringer [user.real_name] has come! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/announcer/classic/spanomalies.ogg')
+	H.client?.give_award(/datum/award/achievement/misc/rust_ascension, H)
+	priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Fear the decay, for the Rustbringer, [user.real_name] has ascended! None shall escape the corrosion! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/announcer/classic/spanomalies.ogg')
 	new /datum/rust_spread(loc)
 	var/datum/antagonist/heretic/ascension = H.mind.has_antag_datum(/datum/antagonist/heretic)
 	ascension.ascended = TRUE