Merge remote-tracking branch 'origin/master' into fixes-2

code/modules/antagonists/changeling/changeling.dm

@@ -125,6 +125,8 @@
 /datum/antagonist/changeling/proc/remove_changeling_powers()
 	if(ishuman(owner.current) || ismonkey(owner.current))
 		reset_properties()
+		QDEL_NULL(cellular_emporium)
+		QDEL_NULL(emporium_action)
 		for(var/obj/effect/proc_holder/changeling/p in purchasedpowers)
 			if(p.always_keep)
 				continue
@@ -139,6 +141,7 @@
 /datum/antagonist/changeling/proc/reset_powers()
 	if(purchasedpowers)
 		remove_changeling_powers()
+	create_actions()
 	//Repurchase free powers.
 	for(var/path in all_powers)
 		var/obj/effect/proc_holder/changeling/S = new path()
@@ -225,7 +228,8 @@
 /datum/antagonist/changeling/proc/regenerate()
 	var/mob/living/carbon/the_ling = owner.current
 	if(istype(the_ling))
-		emporium_action.Grant(the_ling)
+		if(emporium_action)
+			emporium_action.Grant(the_ling)
 		if(the_ling.stat == DEAD)
 			chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), (chem_storage*0.5))
 			geneticdamage = max(LING_DEAD_GENETICDAMAGE_HEAL_CAP,geneticdamage-1)

code/modules/antagonists/changeling/powers/revive.dm

@@ -11,6 +11,14 @@
 
 //Revive from revival stasis
 /obj/effect/proc_holder/changeling/revive/sting_action(mob/living/carbon/user)
+	var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
+	if(!changeling)
+		return
+	if(changeling.hostile_absorbed)
+		to_chat(user, "<span class='notice'>We cannot muster up the strength to revive ourselves!</span>")
+		changeling.purchasedpowers -= src
+		src.action.Remove(user)
+		return
 	user.cure_fakedeath("changeling")
 	user.revive(full_heal = 1)
 	var/list/missing = user.get_missing_limbs()
@@ -27,7 +35,6 @@
 		user.regenerate_limbs(0, list(BODY_ZONE_HEAD))
 	user.regenerate_organs()
 	to_chat(user, "<span class='notice'>We have revived ourselves.</span>")
-	var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
 	changeling.purchasedpowers -= src
 	src.action.Remove(user)
 	return TRUE

code/modules/events/supermatter_surge.dm

@@ -13,11 +13,27 @@
 	var/power = 2000
 
 /datum/round_event/supermatter_surge/setup()
-	power = rand(200,4000)
+	if(prob(70))
+		power = rand(200,100000)
+	else
+		power = rand(200,200000)
 
 /datum/round_event/supermatter_surge/announce()
-	if(power > 800 || prob(round(power/8)))
-		priority_announce("Class [round(power/500) + 1] supermatter surge detected. Intervention may be required.", "Anomaly Alert")
+	var/severity = ""
+	switch(power)
+		if(-INFINITY to 100000)
+			var/low_threat_perc = 100-round(100*((power-200)/(100000-200)))
+			if(prob(low_threat_perc))
+				if(prob(low_threat_perc))
+					severity = "low; the supermatter should return to normal operation shortly."
+				else
+					severity = "medium; the supermatter should return to normal operation, but check NT CIMS to ensure this."
+			else
+				severity = "high; if the supermatter's cooling is not fortified, coolant may need to be added."
+		if(100000 to INFINITY)
+			severity = "extreme; emergency action is likely to be required even if coolant loop is fine."
+	if(power > 20000 || prob(round(power/200)))
+		priority_announce("Supermatter surge detected. Estimated severity is [severity]", "Anomaly Alert")
 
 /datum/round_event/supermatter_surge/start()
 	GLOB.main_supermatter_engine.matter_power += power

code/modules/mining/lavaland/necropolis_chests.dm

@@ -1285,8 +1285,8 @@
 			if(isliving(target) && chaser_timer <= world.time) //living and chasers off cooldown? fire one!
 				chaser_timer = world.time + chaser_cooldown
 				var/obj/effect/temp_visual/hierophant/chaser/C = new(get_turf(user), user, target, chaser_speed, friendly_fire_check)
-				C.damage = 30
-				C.monster_damage_boost = FALSE
+				C.damage = 15
+				C.monster_damage_boost = TRUE
 				log_combat(user, target, "fired a chaser at", src)
 			else
 				INVOKE_ASYNC(src, .proc/cardinal_blasts, T, user) //otherwise, just do cardinal blast
@@ -1402,10 +1402,10 @@
 		new /obj/effect/temp_visual/hierophant/telegraph/teleport(source, user)
 		for(var/t in RANGE_TURFS(1, T))
 			var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, user, TRUE) //blasts produced will not hurt allies
-			B.damage = 30
+			B.damage = 15
 		for(var/t in RANGE_TURFS(1, source))
 			var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, user, TRUE) //but absolutely will hurt enemies
-			B.damage = 30
+			B.damage = 15
 		for(var/mob/living/L in range(1, source))
 			INVOKE_ASYNC(src, .proc/teleport_mob, source, L, T, user) //regardless, take all mobs near us along
 		sleep(6) //at this point the blasts detonate
@@ -1466,8 +1466,8 @@
 		if(!J)
 			return
 		var/obj/effect/temp_visual/hierophant/blast/B = new(J, user, friendly_fire_check)
-		B.damage = 30
-		B.monster_damage_boost = FALSE
+		B.damage = 15
+		B.monster_damage_boost = TRUE
 		previousturf = J
 		J = get_step(previousturf, dir)
 
@@ -1479,7 +1479,7 @@
 	sleep(2)
 	for(var/t in RANGE_TURFS(1, T))
 		var/obj/effect/temp_visual/hierophant/blast/B = new(t, user, friendly_fire_check)
-		B.damage = 15 //keeps monster damage boost due to lower damage
+		B.damage = 15 //keeps monster damage boost due to lower damage (now added to all damage due to reduction to 15, 30dmg 50AP isn't cool)
 
 
 //Just some minor stuff

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

@@ -37,11 +37,11 @@
 			to_chat(owner, "There's something stuck to your hand, stopping you from transforming!")
 			return
 	if(IsAvailable())
-		transforming = TRUE
 		UpdateButtonIcon()
 		var/mutcolor = owner.get_ability_property(INNATE_ABILITY_SLIME_BLOBFORM, PROPERTY_BLOBFORM_COLOR) || ("#" + H.dna.features["mcolor"])
 		if(!is_puddle)
 			if(CHECK_MOBILITY(H, MOBILITY_USE)) //if we can use items, we can turn into a puddle
+				transforming = TRUE
 				is_puddle = TRUE //so we know which transformation to use when its used
 				ADD_TRAIT(H, TRAIT_HUMAN_NO_RENDER, SLIMEPUDDLE_TRAIT)
 				owner.cut_overlays() //we dont show our normal sprite, we show a puddle sprite

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

@@ -3,7 +3,7 @@
 	id = SPECIES_VAMPIRE
 	default_color = "FFFFFF"
 	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,DRINKSBLOOD,HAS_FLESH,HAS_BONE)
-	inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH)
+	inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH,TRAIT_NOMARROW)
 	inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID
 	mutant_bodyparts = list("mcolor" = "FFFFFF", "tail_human" = "None", "ears" = "None", "deco_wings" = "None")
 	exotic_bloodtype = "U"
@@ -53,10 +53,11 @@
 		C.adjustOxyLoss(-4)
 		C.adjustCloneLoss(-4)
 		return
-	C.blood_volume -= 0.75 //Will take roughly 19.5 minutes to die from standard blood volume, roughly 83 minutes to die from max blood volume.
-	if(C.blood_volume <= (BLOOD_VOLUME_SURVIVE*C.blood_ratio))
-		to_chat(C, "<span class='danger'>You ran out of blood!</span>")
-		C.dust()
+	if(C.blood_volume > 0.5)
+		C.blood_volume -= 0.5 //Will take roughly 19.5 minutes to die from standard blood volume, roughly 83 minutes to die from max blood volume.
+	else
+		C.dust(FALSE, TRUE)
+
 	var/area/A = get_area(C)
 	if(istype(A, /area/chapel) && C.mind?.assigned_role != "Chaplain")
 		to_chat(C, "<span class='danger'>You don't belong here!</span>")
@@ -125,7 +126,7 @@
 	. = ..()
 	var/obj/item/organ/heart/vampire/darkheart = getorgan(/obj/item/organ/heart/vampire)
 	if(darkheart)
-		. += "<span class='notice'>Current blood level: [blood_volume]/[BLOOD_VOLUME_MAXIMUM].</span>"
+		. += "Current blood level: [blood_volume]/[BLOOD_VOLUME_MAXIMUM]."
 
 
 /obj/item/organ/heart/vampire

code/modules/mob/living/say.dm

@@ -90,11 +90,11 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	var/static/list/one_character_prefix = list(MODE_HEADSET = TRUE, MODE_ROBOT = TRUE, MODE_WHISPER = TRUE)
 
 	var/ic_blocked = FALSE
-	/*
-	if(client && !forced && config.ic_filter_regex && findtext(message, config.ic_filter_regex))
+
+	if(client && !forced && CHAT_FILTER_CHECK(message))
 		//The filter doesn't act on the sanitized message, but the raw message.
 		ic_blocked = TRUE
-	*/
+
 	if(sanitize)
 		message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN))
 	if(!message || message == "")
@@ -103,6 +103,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	if(ic_blocked)
 		//The filter warning message shows the sanitized message though.
 		to_chat(src, "<span class='warning'>That message contained a word prohibited in IC chat! Consider reviewing the server rules.\n<span replaceRegex='show_filtered_ic_chat'>\"[message]\"</span></span>")
+		SSblackbox.record_feedback("tally", "ic_blocked_words", 1, lowertext(config.ic_filter_regex.match))
 		return
 
 	var/datum/saymode/saymode = SSradio.saymodes[talk_key]
@@ -333,7 +334,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	var/obj/item/bodypart/rightarm = get_bodypart(BODY_ZONE_R_ARM)
 	if(HAS_TRAIT(src, TRAIT_MUTE) && get_selected_language() != /datum/language/signlanguage)
 		return 0
-	
+
 	if (get_selected_language() == /datum/language/signlanguage)
 		var/left_disabled = FALSE
 		var/right_disabled = FALSE

code/modules/research/designs/mining_designs.dm

@@ -9,7 +9,7 @@
 	build_type = IMPRINTER
 	materials = list(/datum/material/glass = 1000)
 	build_path = /obj/item/circuitboard/computer/cargo/express
-	category = list("Mining Designs")
+	category = list("Computer Boards")
 	departmental_flags = DEPARTMENTAL_FLAG_CARGO
 
 /datum/design/bluespace_pod
@@ -19,7 +19,7 @@
 	build_type = PROTOLATHE
 	materials = list(/datum/material/glass = 1000)
 	build_path = /obj/item/disk/cargo/bluespace_pod
-	category = list("Mining Designs")
+	category = list("Electronics")
 	departmental_flags = DEPARTMENTAL_FLAG_CARGO
 
 /datum/design/drill