July 5th TG sync (#1883)

July 5th TG sync

code/game/alternate_appearance.dm

@@ -35,7 +35,7 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances)
 	for(var/v in hudatoms)
 		remove_from_hud(v)
 	GLOB.active_alternate_appearances -= src
- 	return ..()
+	return ..()
 
 /datum/atom_hud/alternate_appearance/proc/onNewMob(mob/M)
 	if(mobShouldSee(M))

code/game/area/areas/misc.dm

@@ -118,11 +118,7 @@
 	
 /area/prison/execution_room
 	name = "Prisoner Education Chamber"
-	icon_state = "armory"
-
-/area/prison/execution_room
-	name = "Prisoner Education Chamber"
-	icon_state = "armory"
+	icon_state = "execution_room"
 
 /area/prison/cell_block/a
 //	/area/prison/cell_block/A

code/game/area/areas/ruins.dm

@@ -272,6 +272,10 @@
 	power_light = 0
 	poweralm = 0
 
+//ash walker nest
+/area/ruin/unpowered/ash_walkers
+	icon_state = "red"
+
 //Ruin of ancient Space Station
 
 /area/ruin/ancientstation

code/game/atoms_movable.dm

@@ -197,7 +197,7 @@
 
 	QDEL_NULL(proximity_monitor)
 	QDEL_NULL(language_holder)
-	
+
 	unbuckle_all_mobs(force=1)
 
 	. = ..()
@@ -213,7 +213,8 @@
 
 // Previously known as HasEntered()
 // This is automatically called when something enters your square
-/atom/movable/Crossed(atom/movable/AM)
+//oldloc = old location on atom, inserted when forceMove is called and ONLY when forceMove is called!
+/atom/movable/Crossed(atom/movable/AM, oldloc)
 	return
 
 /atom/movable/Bump(atom/A, yes) //the "yes" arg is to differentiate our Bump proc from byond's, without it every Bump() call would become a double Bump().
@@ -249,7 +250,7 @@
 			for(var/atom/movable/AM in destination)
 				if(AM == src)
 					continue
-				AM.Crossed(src)
+				AM.Crossed(src, oldloc)
 
 		Moved(oldloc, 0)
 		return 1
@@ -439,6 +440,8 @@
 	if(!no_effect && (visual_effect_icon || used_item))
 		do_item_attack_animation(A, visual_effect_icon, used_item)
 
+	if(A == src)
+		return //don't do an animation if attacking self
 	var/pixel_x_diff = 0
 	var/pixel_y_diff = 0
 	var/final_pixel_y = initial(pixel_y)
@@ -660,6 +663,7 @@
 		else
 			H.selected_default_language = null
 
+
 	var/datum/language/chosen_langtype
 	var/highest_priority
 
@@ -685,3 +689,10 @@
 //Returns an atom's power cell, if it has one. Overload for individual items.
 /atom/movable/proc/get_cell()
 	return
+
+/atom/movable/proc/can_be_pulled(user)
+	if(src == user || !isturf(loc))
+		return FALSE
+	if(anchored || throwing)
+		return FALSE
+	return TRUE

code/game/data_huds.dm

@@ -162,14 +162,11 @@
 	var/image/holder = hud_list[STATUS_HUD]
 	var/icon/I = icon(icon, icon_state, dir)
 	var/virus_state = check_virus()
-	var/mob/living/simple_animal/borer/B = has_brain_worms()
 	holder.pixel_y = I.Height() - world.icon_size
 	if(status_flags & XENO_HOST)
 		holder.icon_state = "hudxeno"
 	else if(stat == DEAD || (status_flags & FAKEDEATH))
 		holder.icon_state = "huddead"
-	else if(has_brain_worms() && B != null && B.controlling)
-		holder.icon_state = "hudbrainworm"
 	else if(virus_state == 2)
 		holder.icon_state = "hudill"
 	else if(virus_state == 1)

code/game/gamemodes/antag_hud.dm

@@ -1,88 +1,88 @@
-/datum/atom_hud/antag
-	hud_icons = list(ANTAG_HUD)
-	var/self_visible = 1
-
-/datum/atom_hud/antag/hidden
-	self_visible = 0
-
-/datum/atom_hud/antag/proc/join_hud(mob/M)
-	//sees_hud should be set to 0 if the mob does not get to see it's own hud type.
-	if(!istype(M))
-		CRASH("join_hud(): [M] ([M.type]) is not a mob!")
-	if(M.mind.antag_hud) //note: please let this runtime if a mob has no mind, as mindless mobs shouldn't be getting antagged
-		M.mind.antag_hud.leave_hud(M)
-	add_to_hud(M)
-	if(self_visible)
-		add_hud_to(M)
-	M.mind.antag_hud = src
-
-/datum/atom_hud/antag/proc/leave_hud(mob/M)
-	if(!M)
-		return
-	if(!istype(M))
-		CRASH("leave_hud(): [M] ([M.type]) is not a mob!")
-	remove_from_hud(M)
-	remove_hud_from(M)
-	if(M.mind)
-		M.mind.antag_hud = null
-
-
-//GAME_MODE PROCS
-//called to set a mob's antag icon state
-/datum/game_mode/proc/set_antag_hud(mob/M, new_icon_state)
-	if(!istype(M))
-		CRASH("set_antag_hud(): [M] ([M.type]) is not a mob!")
-	var/image/holder = M.hud_list[ANTAG_HUD]
-	if(holder)
-		holder.icon_state = new_icon_state
-	if(M.mind || new_icon_state) //in mindless mobs, only null is acceptable, otherwise we're antagging a mindless mob, meaning we should runtime
-		M.mind.antag_hud_icon_state = new_icon_state
-
-
-//MIND PROCS
-//these are called by mind.transfer_to()
-/datum/mind/proc/transfer_antag_huds(datum/atom_hud/antag/newhud)
-	leave_all_antag_huds()
-	SSticker.mode.set_antag_hud(current, antag_hud_icon_state)
-	if(newhud)
-		newhud.join_hud(current)
-
-/datum/mind/proc/leave_all_antag_huds()
-	for(var/datum/atom_hud/antag/hud in GLOB.huds)
+/datum/atom_hud/antag
+	hud_icons = list(ANTAG_HUD)
+	var/self_visible = 1
+
+/datum/atom_hud/antag/hidden
+	self_visible = 0
+
+/datum/atom_hud/antag/proc/join_hud(mob/M)
+	//sees_hud should be set to 0 if the mob does not get to see it's own hud type.
+	if(!istype(M))
+		CRASH("join_hud(): [M] ([M.type]) is not a mob!")
+	if(M.mind.antag_hud) //note: please let this runtime if a mob has no mind, as mindless mobs shouldn't be getting antagged
+		M.mind.antag_hud.leave_hud(M)
+	add_to_hud(M)
+	if(self_visible)
+		add_hud_to(M)
+	M.mind.antag_hud = src
+
+/datum/atom_hud/antag/proc/leave_hud(mob/M)
+	if(!M)
+		return
+	if(!istype(M))
+		CRASH("leave_hud(): [M] ([M.type]) is not a mob!")
+	remove_from_hud(M)
+	remove_hud_from(M)
+	if(M.mind)
+		M.mind.antag_hud = null
+
+
+//GAME_MODE PROCS
+//called to set a mob's antag icon state
+/datum/game_mode/proc/set_antag_hud(mob/M, new_icon_state)
+	if(!istype(M))
+		CRASH("set_antag_hud(): [M] ([M.type]) is not a mob!")
+	var/image/holder = M.hud_list[ANTAG_HUD]
+	if(holder)
+		holder.icon_state = new_icon_state
+	if(M.mind || new_icon_state) //in mindless mobs, only null is acceptable, otherwise we're antagging a mindless mob, meaning we should runtime
+		M.mind.antag_hud_icon_state = new_icon_state
+
+
+//MIND PROCS
+//these are called by mind.transfer_to()
+/datum/mind/proc/transfer_antag_huds(datum/atom_hud/antag/newhud)
+	leave_all_antag_huds()
+	SSticker.mode.set_antag_hud(current, antag_hud_icon_state)
+	if(newhud)
+		newhud.join_hud(current)
+
+/datum/mind/proc/leave_all_antag_huds()
+	for(var/datum/atom_hud/antag/hud in GLOB.huds)
 		if(hud.hudusers[current])
-			hud.leave_hud(current)
-
-/datum/atom_hud/antag/gang
-	var/color = null
-
-/datum/atom_hud/antag/gang/add_to_hud(atom/A)
-	if(!A)
-		return
-	var/image/holder = A.hud_list[ANTAG_HUD]
-	if(holder)
-		holder.color = color
-	..()
-
-/datum/atom_hud/antag/gang/remove_from_hud(atom/A)
-	if(!A)
-		return
-	var/image/holder = A.hud_list[ANTAG_HUD]
-	if(holder)
-		holder.color = null
-	..()
-
-/datum/atom_hud/antag/gang/join_hud(mob/M)
-	if(!istype(M))
-		CRASH("join_hud(): [M] ([M.type]) is not a mob!")
-	var/image/holder = M.hud_list[ANTAG_HUD]
-	if(holder)
-		holder.color = color
-	..()
-
-/datum/atom_hud/antag/gang/leave_hud(mob/M)
-	if(!istype(M))
-		CRASH("leave_hud(): [M] ([M.type]) is not a mob!")
-	var/image/holder = M.hud_list[ANTAG_HUD]
-	if(holder)
-		holder.color = null
-	..()
+			hud.leave_hud(current)
+
+/datum/atom_hud/antag/gang
+	var/color = null
+
+/datum/atom_hud/antag/gang/add_to_hud(atom/A)
+	if(!A)
+		return
+	var/image/holder = A.hud_list[ANTAG_HUD]
+	if(holder)
+		holder.color = color
+	..()
+
+/datum/atom_hud/antag/gang/remove_from_hud(atom/A)
+	if(!A)
+		return
+	var/image/holder = A.hud_list[ANTAG_HUD]
+	if(holder)
+		holder.color = null
+	..()
+
+/datum/atom_hud/antag/gang/join_hud(mob/M)
+	if(!istype(M))
+		CRASH("join_hud(): [M] ([M.type]) is not a mob!")
+	var/image/holder = M.hud_list[ANTAG_HUD]
+	if(holder)
+		holder.color = color
+	..()
+
+/datum/atom_hud/antag/gang/leave_hud(mob/M)
+	if(!istype(M))
+		CRASH("leave_hud(): [M] ([M.type]) is not a mob!")
+	var/image/holder = M.hud_list[ANTAG_HUD]
+	if(holder)
+		holder.color = null
+	..()

code/game/gamemodes/antag_spawner.dm

@@ -155,6 +155,7 @@
 /obj/item/weapon/antag_spawner/nuke_ops/attack_self(mob/user)
 	if(!(check_usability(user)))
 		return
+
 	to_chat(user, "<span class='notice'>You activate [src] and wait for confirmation.</span>")
 	var/list/nuke_candidates = pollGhostCandidates("Do you want to play as a syndicate [borg_to_spawn ? "[lowertext(borg_to_spawn)] cyborg":"operative"]?", ROLE_OPERATIVE, null, ROLE_OPERATIVE, 150, POLL_IGNORE_SYNDICATE)
 	if(nuke_candidates.len)
@@ -250,7 +251,7 @@
 		spawn_antag(theghost.client, get_turf(src), initial(demon_type.name))
 		to_chat(user, shatter_msg)
 		to_chat(user, veil_msg)
-		playsound(user.loc, 'sound/effects/Glassbr1.ogg', 100, 1)
+		playsound(user.loc, 'sound/effects/glassbr1.ogg', 100, 1)
 		qdel(src)
 	else
 		to_chat(user, "<span class='notice'>You can't seem to work up the nerve to shatter the bottle. Perhaps you should try again later.</span>")

code/game/gamemodes/blob/blob_finish.dm

@@ -1,72 +1,72 @@
-/datum/game_mode/blob/check_finished()
-	if(blobwincount <= GLOB.blobs_legit.len)//Blob took over
-		return 1
-	for(var/datum/mind/blob in blob_overminds)
-		if(isovermind(blob.current))
-			var/mob/camera/blob/B = blob.current
-			if(B.blob_core || !B.placed)
-				return 0
-	if(!GLOB.blob_cores.len) //blob is dead
-		if(config.continuous["blob"])
-			message_sent = FALSE //disable the win count at this point
-			continuous_sanity_checked = 1 //Nonstandard definition of "alive" gets past the check otherwise
-			SSshuttle.clearHostileEnvironment(src)
-			return ..()
-		return 1
-	return ..()
-
-
-/datum/game_mode/blob/declare_completion()
-	if(round_converted) //So badmin blobs later don't step on the dead natural blobs metaphorical toes
-		..()
-	if(blobwincount <= GLOB.blobs_legit.len)
+/datum/game_mode/blob/check_finished()
+	if(blobwincount <= GLOB.blobs_legit.len)//Blob took over
+		return 1
+	for(var/datum/mind/blob in blob_overminds)
+		if(isovermind(blob.current))
+			var/mob/camera/blob/B = blob.current
+			if(B.blob_core || !B.placed)
+				return 0
+	if(!GLOB.blob_cores.len) //blob is dead
+		if(config.continuous["blob"])
+			message_sent = FALSE //disable the win count at this point
+			continuous_sanity_checked = 1 //Nonstandard definition of "alive" gets past the check otherwise
+			SSshuttle.clearHostileEnvironment(src)
+			return ..()
+		return 1
+	return ..()
+
+
+/datum/game_mode/blob/declare_completion()
+	if(round_converted) //So badmin blobs later don't step on the dead natural blobs metaphorical toes
+		..()
+	if(blobwincount <= GLOB.blobs_legit.len)
 		SSticker.mode_result = "win - blob took over"
-		to_chat(world, "<FONT size = 3><B>The blob has taken over the station!</B></FONT>")
-		to_chat(world, "<B>The entire station was eaten by the Blob!</B>")
-		log_game("Blob mode completed with a blob victory.")
-
-		SSticker.news_report = BLOB_WIN
-
-	else if(station_was_nuked)
+		to_chat(world, "<FONT size = 3><B>The blob has taken over the station!</B></FONT>")
+		to_chat(world, "<B>The entire station was eaten by the Blob!</B>")
+		log_game("Blob mode completed with a blob victory.")
+
+		SSticker.news_report = BLOB_WIN
+
+	else if(station_was_nuked)
 		SSticker.mode_result = "halfwin - nuke"
-		to_chat(world, "<FONT size = 3><B>Partial Win: The station has been destroyed!</B></FONT>")
-		to_chat(world, "<B>Directive 7-12 has been successfully carried out, preventing the Blob from spreading.</B>")
-		log_game("Blob mode completed with a tie (station destroyed).")
-
-		SSticker.news_report = BLOB_NUKE
-
-	else if(!GLOB.blob_cores.len)
+		to_chat(world, "<FONT size = 3><B>Partial Win: The station has been destroyed!</B></FONT>")
+		to_chat(world, "<B>Directive 7-12 has been successfully carried out, preventing the Blob from spreading.</B>")
+		log_game("Blob mode completed with a tie (station destroyed).")
+
+		SSticker.news_report = BLOB_NUKE
+
+	else if(!GLOB.blob_cores.len)
 		SSticker.mode_result = "loss - blob eliminated"
-		to_chat(world, "<FONT size = 3><B>The staff has won!</B></FONT>")
-		to_chat(world, "<B>The alien organism has been eradicated from the station!</B>")
-		log_game("Blob mode completed with a crew victory.")
-
-		SSticker.news_report = BLOB_DESTROYED
-
-	..()
-	return 1
-
-/datum/game_mode/blob/printplayer(datum/mind/ply, fleecheck)
-	if((ply in blob_overminds))
-		var/text = "<br><b>[ply.key]</b> was <b>[ply.name]</b>"
-		if(isovermind(ply.current))
-			var/mob/camera/blob/B = ply.current
-			text += "<b>(<font color=\"[B.blob_reagent_datum.color]\">[B.blob_reagent_datum.name]</font>)</b> and"
-			if(B.blob_core)
-				text += " <span class='greenannounce'>survived</span>"
-			else
-				text += " <span class='boldannounce'>was destroyed</span>"
-		else
-			text += " and <span class='boldannounce'>was destroyed</span>"
-		return text
-	return ..()
-
-/datum/game_mode/proc/auto_declare_completion_blob()
-	if(istype(SSticker.mode,/datum/game_mode/blob) )
-		var/datum/game_mode/blob/blob_mode = src
-		if(blob_mode.blob_overminds.len)
-			var/text = "<FONT size = 2><B>The blob[(blob_mode.blob_overminds.len > 1 ? "s were" : " was")]:</B></FONT>"
-			for(var/datum/mind/blob in blob_mode.blob_overminds)
-				text += printplayer(blob)
-			to_chat(world, text)
-		return 1
+		to_chat(world, "<FONT size = 3><B>The staff has won!</B></FONT>")
+		to_chat(world, "<B>The alien organism has been eradicated from the station!</B>")
+		log_game("Blob mode completed with a crew victory.")
+
+		SSticker.news_report = BLOB_DESTROYED
+
+	..()
+	return 1
+
+/datum/game_mode/blob/printplayer(datum/mind/ply, fleecheck)
+	if((ply in blob_overminds))
+		var/text = "<br><b>[ply.key]</b> was <b>[ply.name]</b>"
+		if(isovermind(ply.current))
+			var/mob/camera/blob/B = ply.current
+			text += "<b>(<font color=\"[B.blob_reagent_datum.color]\">[B.blob_reagent_datum.name]</font>)</b> and"
+			if(B.blob_core)
+				text += " <span class='greenannounce'>survived</span>"
+			else
+				text += " <span class='boldannounce'>was destroyed</span>"
+		else
+			text += " and <span class='boldannounce'>was destroyed</span>"
+		return text
+	return ..()
+
+/datum/game_mode/proc/auto_declare_completion_blob()
+	if(istype(SSticker.mode,/datum/game_mode/blob) )
+		var/datum/game_mode/blob/blob_mode = src
+		if(blob_mode.blob_overminds.len)
+			var/text = "<FONT size = 2><B>The blob[(blob_mode.blob_overminds.len > 1 ? "s were" : " was")]:</B></FONT>"
+			for(var/datum/mind/blob in blob_mode.blob_overminds)
+				text += printplayer(blob)
+			to_chat(world, text)
+		return 1

code/game/gamemodes/blob/blob_report.dm

@@ -14,7 +14,7 @@
 			intercepttext += " 3. Avoid damage to the capital infrastructure of the station.<BR>"
 			intercepttext += "<BR>Note in the event of a quarantine breach or uncontrolled spread of the biohazard, <b>Biohazard Response Procedure 5-12</b> may be issued.<BR>"
 			print_command_report(text=intercepttext,title="Level 5-6 Biohazard Response Procedures",announce=FALSE)
-			priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg')
+			priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/ai/outbreak5.ogg')
 		if(2)
 			var/nukecode = random_nukecode()
 			for(var/obj/machinery/nuclearbomb/bomb in GLOB.machines)

code/game/gamemodes/blob/theblob.dm

@@ -262,7 +262,7 @@
 			else
 				playsound(src, 'sound/weapons/tap.ogg', 50, 1)
 		if(BURN)
-			playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
+			playsound(src.loc, 'sound/items/welder.ogg', 100, 1)
 
 /obj/structure/blob/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
 	switch(damage_type)

code/game/gamemodes/changeling/changeling.dm

@@ -217,7 +217,7 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w
 /*/datum/game_mode/changeling/check_finished()
 	var/changelings_alive = 0
 	for(var/datum/mind/changeling in changelings)
-		if(!istype(changeling.current,/mob/living/carbon))
+		if(!iscarbon(changeling.current))
 			continue
 		if(changeling.current.stat==2)
 			continue

code/game/gamemodes/changeling/changeling_power.dm

@@ -1,78 +1,78 @@
-/*
- * Don't use the apostrophe in name or desc. Causes script errors.
- * TODO: combine atleast some of the functionality with /proc_holder/spell
- */
-
-/obj/effect/proc_holder/changeling
-	panel = "Changeling"
-	name = "Prototype Sting"
-	desc = "" // Fluff
-	var/helptext = "" // Details
-	var/chemical_cost = 0 // negative chemical cost is for passive abilities (chemical glands)
-	var/dna_cost = -1 //cost of the sting in dna points. 0 = auto-purchase, -1 = cannot be purchased
-	var/req_dna = 0  //amount of dna needed to use this ability. Changelings always have atleast 1
-	var/req_human = 0 //if you need to be human to use this ability
-	var/req_stat = CONSCIOUS // CONSCIOUS, UNCONSCIOUS or DEAD
-	var/always_keep = 0 // important for abilities like revive that screw you if you lose them.
-	var/ignores_fakedeath = FALSE // usable with the FAKEDEATH flag
-
-
-/obj/effect/proc_holder/changeling/proc/on_purchase(mob/user, is_respec)
-	if(!is_respec)
+/*
+ * Don't use the apostrophe in name or desc. Causes script errors.
+ * TODO: combine atleast some of the functionality with /proc_holder/spell
+ */
+
+/obj/effect/proc_holder/changeling
+	panel = "Changeling"
+	name = "Prototype Sting"
+	desc = "" // Fluff
+	var/helptext = "" // Details
+	var/chemical_cost = 0 // negative chemical cost is for passive abilities (chemical glands)
+	var/dna_cost = -1 //cost of the sting in dna points. 0 = auto-purchase, -1 = cannot be purchased
+	var/req_dna = 0  //amount of dna needed to use this ability. Changelings always have atleast 1
+	var/req_human = 0 //if you need to be human to use this ability
+	var/req_stat = CONSCIOUS // CONSCIOUS, UNCONSCIOUS or DEAD
+	var/always_keep = 0 // important for abilities like revive that screw you if you lose them.
+	var/ignores_fakedeath = FALSE // usable with the FAKEDEATH flag
+
+
+/obj/effect/proc_holder/changeling/proc/on_purchase(mob/user, is_respec)
+	if(!is_respec)
 		SSblackbox.add_details("changeling_power_purchase",name)
-
-/obj/effect/proc_holder/changeling/proc/on_refund(mob/user)
-	return
-
-/obj/effect/proc_holder/changeling/Click()
-	var/mob/user = usr
-	if(!user || !user.mind || !user.mind.changeling)
-		return
-	try_to_sting(user)
-
-/obj/effect/proc_holder/changeling/proc/try_to_sting(mob/user, mob/target)
-	if(!can_sting(user, target))
-		return
-	var/datum/changeling/c = user.mind.changeling
-	if(sting_action(user, target))
+
+/obj/effect/proc_holder/changeling/proc/on_refund(mob/user)
+	return
+
+/obj/effect/proc_holder/changeling/Click()
+	var/mob/user = usr
+	if(!user || !user.mind || !user.mind.changeling)
+		return
+	try_to_sting(user)
+
+/obj/effect/proc_holder/changeling/proc/try_to_sting(mob/user, mob/target)
+	if(!can_sting(user, target))
+		return
+	var/datum/changeling/c = user.mind.changeling
+	if(sting_action(user, target))
 		SSblackbox.add_details("changeling_powers",name)
-		sting_feedback(user, target)
+		sting_feedback(user, target)
 		c.chem_charges -= chemical_cost
-
-/obj/effect/proc_holder/changeling/proc/sting_action(mob/user, mob/target)
-	return 0
-
-/obj/effect/proc_holder/changeling/proc/sting_feedback(mob/user, mob/target)
-	return 0
-
-//Fairly important to remember to return 1 on success >.<
-/obj/effect/proc_holder/changeling/proc/can_sting(mob/user, mob/target)
-	if(!ishuman(user) && !ismonkey(user)) //typecast everything from mob to carbon from this point onwards
-		return 0
-	if(req_human && !ishuman(user))
-		to_chat(user, "<span class='warning'>We cannot do that in this form!</span>")
-		return 0
-	var/datum/changeling/c = user.mind.changeling
-	if(c.chem_charges < chemical_cost)
-		to_chat(user, "<span class='warning'>We require at least [chemical_cost] unit\s of chemicals to do that!</span>")
-		return 0
-	if(c.absorbedcount < req_dna)
-		to_chat(user, "<span class='warning'>We require at least [req_dna] sample\s of compatible DNA.</span>")
-		return 0
-	if(req_stat < user.stat)
-		to_chat(user, "<span class='warning'>We are incapacitated.</span>")
-		return 0
-	if((user.status_flags & FAKEDEATH) && (!ignores_fakedeath))
-		to_chat(user, "<span class='warning'>We are incapacitated.</span>")
-		return 0
-	return 1
-
-//used in /mob/Stat()
-/obj/effect/proc_holder/changeling/proc/can_be_used_by(mob/user)
-	if(!user || QDELETED(user))
-		return 0
-	if(!ishuman(user) && !ismonkey(user))
-		return 0
-	if(req_human && !ishuman(user))
-		return 0
-	return 1
+
+/obj/effect/proc_holder/changeling/proc/sting_action(mob/user, mob/target)
+	return 0
+
+/obj/effect/proc_holder/changeling/proc/sting_feedback(mob/user, mob/target)
+	return 0
+
+//Fairly important to remember to return 1 on success >.<
+/obj/effect/proc_holder/changeling/proc/can_sting(mob/user, mob/target)
+	if(!ishuman(user) && !ismonkey(user)) //typecast everything from mob to carbon from this point onwards
+		return 0
+	if(req_human && !ishuman(user))
+		to_chat(user, "<span class='warning'>We cannot do that in this form!</span>")
+		return 0
+	var/datum/changeling/c = user.mind.changeling
+	if(c.chem_charges < chemical_cost)
+		to_chat(user, "<span class='warning'>We require at least [chemical_cost] unit\s of chemicals to do that!</span>")
+		return 0
+	if(c.absorbedcount < req_dna)
+		to_chat(user, "<span class='warning'>We require at least [req_dna] sample\s of compatible DNA.</span>")
+		return 0
+	if(req_stat < user.stat)
+		to_chat(user, "<span class='warning'>We are incapacitated.</span>")
+		return 0
+	if((user.status_flags & FAKEDEATH) && (!ignores_fakedeath))
+		to_chat(user, "<span class='warning'>We are incapacitated.</span>")
+		return 0
+	return 1
+
+//used in /mob/Stat()
+/obj/effect/proc_holder/changeling/proc/can_be_used_by(mob/user)
+	if(!user || QDELETED(user))
+		return 0
+	if(!ishuman(user) && !ismonkey(user))
+		return 0
+	if(req_human && !ishuman(user))
+		return 0
+	return 1

code/game/gamemodes/changeling/evolution_menu.dm

@@ -1,112 +1,112 @@
-/datum/changeling/proc/purchasePower(mob/living/carbon/user, sting_name)
-
-	var/obj/effect/proc_holder/changeling/thepower = null
-
-	for(var/path in subtypesof(/obj/effect/proc_holder/changeling))
-		var/obj/effect/proc_holder/changeling/S = path
-		if(initial(S.name) == sting_name)
-			thepower = new path()
-			break
-
-	if(!thepower)
-		to_chat(user, "This is awkward. Changeling power purchase failed, please report this bug to a coder!")
-		return
-
-	if(absorbedcount < thepower.req_dna)
-		to_chat(user, "We lack the energy to evolve this ability!")
-		return
-
-	if(has_sting(thepower))
-		to_chat(user, "We have already evolved this ability!")
-		return
-
-	if(thepower.dna_cost < 0)
-		to_chat(user, "We cannot evolve this ability.")
-		return
-
-	if(geneticpoints < thepower.dna_cost)
-		to_chat(user, "We have reached our capacity for abilities.")
-		return
-
-	if(user.status_flags & FAKEDEATH)//To avoid potential exploits by buying new powers while in stasis, which clears your verblist.
-		to_chat(user, "We lack the energy to evolve new abilities right now.")
-		return
-
-	geneticpoints -= thepower.dna_cost
-	purchasedpowers += thepower
-	thepower.on_purchase(user)
-
-//Reselect powers
-/datum/changeling/proc/lingRespec(mob/user)
-	if(!ishuman(user))
-		to_chat(user, "<span class='danger'>We can't remove our evolutions in this form!</span>")
-		return
-	if(canrespec)
-		to_chat(user, "<span class='notice'>We have removed our evolutions from this form, and are now ready to readapt.</span>")
-		user.remove_changeling_powers(1)
-		canrespec = 0
-		user.make_changeling(TRUE)
-		return 1
-	else
-		to_chat(user, "<span class='danger'>You lack the power to readapt your evolutions!</span>")
-		return 0
-
-/mob/proc/make_changeling(is_respec)
-	if(!mind)
-		return
-	if(!ishuman(src) && !ismonkey(src))
-		return
-	if(!mind.changeling)
-		mind.changeling = new /datum/changeling(gender)
-	if(mind.changeling.purchasedpowers)
-		remove_changeling_powers(1)
-	// purchase free powers.
-	for(var/path in subtypesof(/obj/effect/proc_holder/changeling))
-		var/obj/effect/proc_holder/changeling/S = new path()
-		if(!S.dna_cost)
-			if(!mind.changeling.has_sting(S))
-				mind.changeling.purchasedpowers+=S
-			S.on_purchase(src, is_respec)
-	if(is_respec)
+/datum/changeling/proc/purchasePower(mob/living/carbon/user, sting_name)
+
+	var/obj/effect/proc_holder/changeling/thepower = null
+
+	for(var/path in subtypesof(/obj/effect/proc_holder/changeling))
+		var/obj/effect/proc_holder/changeling/S = path
+		if(initial(S.name) == sting_name)
+			thepower = new path()
+			break
+
+	if(!thepower)
+		to_chat(user, "This is awkward. Changeling power purchase failed, please report this bug to a coder!")
+		return
+
+	if(absorbedcount < thepower.req_dna)
+		to_chat(user, "We lack the energy to evolve this ability!")
+		return
+
+	if(has_sting(thepower))
+		to_chat(user, "We have already evolved this ability!")
+		return
+
+	if(thepower.dna_cost < 0)
+		to_chat(user, "We cannot evolve this ability.")
+		return
+
+	if(geneticpoints < thepower.dna_cost)
+		to_chat(user, "We have reached our capacity for abilities.")
+		return
+
+	if(user.status_flags & FAKEDEATH)//To avoid potential exploits by buying new powers while in stasis, which clears your verblist.
+		to_chat(user, "We lack the energy to evolve new abilities right now.")
+		return
+
+	geneticpoints -= thepower.dna_cost
+	purchasedpowers += thepower
+	thepower.on_purchase(user)
+
+//Reselect powers
+/datum/changeling/proc/lingRespec(mob/user)
+	if(!ishuman(user))
+		to_chat(user, "<span class='danger'>We can't remove our evolutions in this form!</span>")
+		return
+	if(canrespec)
+		to_chat(user, "<span class='notice'>We have removed our evolutions from this form, and are now ready to readapt.</span>")
+		user.remove_changeling_powers(1)
+		canrespec = 0
+		user.make_changeling(TRUE)
+		return 1
+	else
+		to_chat(user, "<span class='danger'>You lack the power to readapt your evolutions!</span>")
+		return 0
+
+/mob/proc/make_changeling(is_respec)
+	if(!mind)
+		return
+	if(!ishuman(src) && !ismonkey(src))
+		return
+	if(!mind.changeling)
+		mind.changeling = new /datum/changeling(gender)
+	if(mind.changeling.purchasedpowers)
+		remove_changeling_powers(1)
+	// purchase free powers.
+	for(var/path in subtypesof(/obj/effect/proc_holder/changeling))
+		var/obj/effect/proc_holder/changeling/S = new path()
+		if(!S.dna_cost)
+			if(!mind.changeling.has_sting(S))
+				mind.changeling.purchasedpowers+=S
+			S.on_purchase(src, is_respec)
+	if(is_respec)
 		SSblackbox.add_details("changeling_power_purchase","Readapt")
-
-	var/mob/living/carbon/C = src	//only carbons have dna now, so we have to typecaste
-	if(ishuman(C))
-		var/datum/changelingprofile/prof = mind.changeling.add_new_profile(C, src)
-		mind.changeling.first_prof = prof
+
+	var/mob/living/carbon/C = src	//only carbons have dna now, so we have to typecaste
+	if(ishuman(C))
+		var/datum/changelingprofile/prof = mind.changeling.add_new_profile(C, src)
+		mind.changeling.first_prof = prof
 
 		var/obj/item/organ/brain/B = C.getorganslot("brain")
 		if(B)
 			B.vital = FALSE
 			B.decoy_override = TRUE
-	return 1
-
-/datum/changeling/proc/reset()
-	chosen_sting = null
-	geneticpoints = initial(geneticpoints)
-	sting_range = initial(sting_range)
-	chem_storage = initial(chem_storage)
-	chem_recharge_rate = initial(chem_recharge_rate)
-	chem_charges = min(chem_charges, chem_storage)
-	chem_recharge_slowdown = initial(chem_recharge_slowdown)
-	mimicing = ""
-
-/mob/proc/remove_changeling_powers(keep_free_powers=0)
-	if(ishuman(src) || ismonkey(src))
-		if(mind && mind.changeling)
-			mind.changeling.changeling_speak = 0
-			mind.changeling.reset()
-			for(var/obj/effect/proc_holder/changeling/p in mind.changeling.purchasedpowers)
-				if((p.dna_cost == 0 && keep_free_powers) || p.always_keep)
-					continue
-				mind.changeling.purchasedpowers -= p
-				p.on_refund(src)
-		if(hud_used)
-			hud_used.lingstingdisplay.icon_state = null
-			hud_used.lingstingdisplay.invisibility = INVISIBILITY_ABSTRACT
-
-/datum/changeling/proc/has_sting(obj/effect/proc_holder/changeling/power)
-	for(var/obj/effect/proc_holder/changeling/P in purchasedpowers)
-		if(initial(power.name) == P.name)
-			return 1
-	return 0
+	return 1
+
+/datum/changeling/proc/reset()
+	chosen_sting = null
+	geneticpoints = initial(geneticpoints)
+	sting_range = initial(sting_range)
+	chem_storage = initial(chem_storage)
+	chem_recharge_rate = initial(chem_recharge_rate)
+	chem_charges = min(chem_charges, chem_storage)
+	chem_recharge_slowdown = initial(chem_recharge_slowdown)
+	mimicing = ""
+
+/mob/proc/remove_changeling_powers(keep_free_powers=0)
+	if(ishuman(src) || ismonkey(src))
+		if(mind && mind.changeling)
+			mind.changeling.changeling_speak = 0
+			mind.changeling.reset()
+			for(var/obj/effect/proc_holder/changeling/p in mind.changeling.purchasedpowers)
+				if((p.dna_cost == 0 && keep_free_powers) || p.always_keep)
+					continue
+				mind.changeling.purchasedpowers -= p
+				p.on_refund(src)
+		if(hud_used)
+			hud_used.lingstingdisplay.icon_state = null
+			hud_used.lingstingdisplay.invisibility = INVISIBILITY_ABSTRACT
+
+/datum/changeling/proc/has_sting(obj/effect/proc_holder/changeling/power)
+	for(var/obj/effect/proc_holder/changeling/P in purchasedpowers)
+		if(initial(power.name) == P.name)
+			return 1
+	return 0

code/game/gamemodes/changeling/powers/absorb.dm

@@ -1,109 +1,109 @@
-/obj/effect/proc_holder/changeling/absorbDNA
-	name = "Absorb DNA"
-	desc = "Absorb the DNA of our victim."
-	chemical_cost = 0
-	dna_cost = 0
-	req_human = 1
-
-/obj/effect/proc_holder/changeling/absorbDNA/can_sting(mob/living/carbon/user)
-	if(!..())
-		return
-
-	var/datum/changeling/changeling = user.mind.changeling
-	if(changeling.isabsorbing)
-		to_chat(user, "<span class='warning'>We are already absorbing!</span>")
-		return
-
-	if(!user.pulling || !iscarbon(user.pulling))
-		to_chat(user, "<span class='warning'>We must be grabbing a creature to absorb them!</span>")
-		return
-	if(user.grab_state <= GRAB_NECK)
-		to_chat(user, "<span class='warning'>We must have a tighter grip to absorb this creature!</span>")
-		return
-
-	var/mob/living/carbon/target = user.pulling
-	return changeling.can_absorb_dna(user,target)
-
-
-
-/obj/effect/proc_holder/changeling/absorbDNA/sting_action(mob/user)
-	var/datum/changeling/changeling = user.mind.changeling
-	var/mob/living/carbon/human/target = user.pulling
-	changeling.isabsorbing = 1
-	for(var/i in 1 to 3)
-		switch(i)
-			if(1)
-				to_chat(user, "<span class='notice'>This creature is compatible. We must hold still...</span>")
-			if(2)
-				user.visible_message("<span class='warning'>[user] extends a proboscis!</span>", "<span class='notice'>We extend a proboscis.</span>")
-			if(3)
-				user.visible_message("<span class='danger'>[user] stabs [target] with the proboscis!</span>", "<span class='notice'>We stab [target] with the proboscis.</span>")
-				to_chat(target, "<span class='userdanger'>You feel a sharp stabbing pain!</span>")
-				target.take_overall_damage(40)
-
+/obj/effect/proc_holder/changeling/absorbDNA
+	name = "Absorb DNA"
+	desc = "Absorb the DNA of our victim."
+	chemical_cost = 0
+	dna_cost = 0
+	req_human = 1
+
+/obj/effect/proc_holder/changeling/absorbDNA/can_sting(mob/living/carbon/user)
+	if(!..())
+		return
+
+	var/datum/changeling/changeling = user.mind.changeling
+	if(changeling.isabsorbing)
+		to_chat(user, "<span class='warning'>We are already absorbing!</span>")
+		return
+
+	if(!user.pulling || !iscarbon(user.pulling))
+		to_chat(user, "<span class='warning'>We must be grabbing a creature to absorb them!</span>")
+		return
+	if(user.grab_state <= GRAB_NECK)
+		to_chat(user, "<span class='warning'>We must have a tighter grip to absorb this creature!</span>")
+		return
+
+	var/mob/living/carbon/target = user.pulling
+	return changeling.can_absorb_dna(user,target)
+
+
+
+/obj/effect/proc_holder/changeling/absorbDNA/sting_action(mob/user)
+	var/datum/changeling/changeling = user.mind.changeling
+	var/mob/living/carbon/human/target = user.pulling
+	changeling.isabsorbing = 1
+	for(var/i in 1 to 3)
+		switch(i)
+			if(1)
+				to_chat(user, "<span class='notice'>This creature is compatible. We must hold still...</span>")
+			if(2)
+				user.visible_message("<span class='warning'>[user] extends a proboscis!</span>", "<span class='notice'>We extend a proboscis.</span>")
+			if(3)
+				user.visible_message("<span class='danger'>[user] stabs [target] with the proboscis!</span>", "<span class='notice'>We stab [target] with the proboscis.</span>")
+				to_chat(target, "<span class='userdanger'>You feel a sharp stabbing pain!</span>")
+				target.take_overall_damage(40)
+
 		SSblackbox.add_details("changeling_powers","Absorb DNA|[i]")
-		if(!do_mob(user, target, 150))
-			to_chat(user, "<span class='warning'>Our absorption of [target] has been interrupted!</span>")
-			changeling.isabsorbing = 0
-			return
-
+		if(!do_mob(user, target, 150))
+			to_chat(user, "<span class='warning'>Our absorption of [target] has been interrupted!</span>")
+			changeling.isabsorbing = 0
+			return
+
 	SSblackbox.add_details("changeling_powers","Absorb DNA|4")
-	user.visible_message("<span class='danger'>[user] sucks the fluids from [target]!</span>", "<span class='notice'>We have absorbed [target].</span>")
-	to_chat(target, "<span class='userdanger'>You are absorbed by the changeling!</span>")
-
-	if(!changeling.has_dna(target.dna))
-		changeling.add_new_profile(target, user)
-
-	if(user.nutrition < NUTRITION_LEVEL_WELL_FED)
-		user.nutrition = min((user.nutrition + target.nutrition), NUTRITION_LEVEL_WELL_FED)
-
-	if(target.mind)//if the victim has got a mind
-
-		target.mind.show_memory(user, 0) //I can read your mind, kekeke. Output all their notes.
-
-		//Some of target's recent speech, so the changeling can attempt to imitate them better.
-		//Recent as opposed to all because rounds tend to have a LOT of text.
-		var/list/recent_speech = list()
-
-		var/list/say_log = target.logging[INDIVIDUAL_SAY_LOG]
-
-		if(LAZYLEN(say_log) > LING_ABSORB_RECENT_SPEECH)
-			recent_speech = say_log.Copy(say_log.len-LING_ABSORB_RECENT_SPEECH+1,0) //0 so len-LING_ARS+1 to end of list
-		else
-			for(var/spoken_memory in say_log)
-				if(recent_speech.len >= LING_ABSORB_RECENT_SPEECH)
-					break
-				recent_speech[spoken_memory] = say_log[spoken_memory]
-
-		if(recent_speech.len)
-			user.mind.store_memory("<B>Some of [target]'s speech patterns, we should study these to better impersonate them!</B>")
-			to_chat(user, "<span class='boldnotice'>Some of [target]'s speech patterns, we should study these to better impersonate them!</span>")
-			for(var/spoken_memory in recent_speech)
-				user.mind.store_memory("\"[recent_speech[spoken_memory]]\"")
-				to_chat(user, "<span class='notice'>\"[recent_speech[spoken_memory]]\"</span>")
-			user.mind.store_memory("<B>We have no more knowledge of [target]'s speech patterns.</B>")
-			to_chat(user, "<span class='boldnotice'>We have no more knowledge of [target]'s speech patterns.</span>")
-
-		if(target.mind.changeling)//If the target was a changeling, suck out their extra juice and objective points!
-			changeling.chem_charges += min(target.mind.changeling.chem_charges, changeling.chem_storage)
-			changeling.absorbedcount += (target.mind.changeling.absorbedcount)
-
-			target.mind.changeling.stored_profiles.len = 1
-			target.mind.changeling.absorbedcount = 0
-
-
-	changeling.chem_charges=min(changeling.chem_charges+10, changeling.chem_storage)
-
-	changeling.isabsorbing = 0
-	changeling.canrespec = 1
-
-	target.death(0)
-	target.Drain()
-	return TRUE
-
-
-
-//Absorbs the target DNA.
-//datum/changeling/proc/absorb_dna(mob/living/carbon/T, mob/user)
-
-//datum/changeling/proc/store_dna(datum/dna/new_dna, mob/user)
+	user.visible_message("<span class='danger'>[user] sucks the fluids from [target]!</span>", "<span class='notice'>We have absorbed [target].</span>")
+	to_chat(target, "<span class='userdanger'>You are absorbed by the changeling!</span>")
+
+	if(!changeling.has_dna(target.dna))
+		changeling.add_new_profile(target, user)
+
+	if(user.nutrition < NUTRITION_LEVEL_WELL_FED)
+		user.nutrition = min((user.nutrition + target.nutrition), NUTRITION_LEVEL_WELL_FED)
+
+	if(target.mind)//if the victim has got a mind
+
+		target.mind.show_memory(user, 0) //I can read your mind, kekeke. Output all their notes.
+
+		//Some of target's recent speech, so the changeling can attempt to imitate them better.
+		//Recent as opposed to all because rounds tend to have a LOT of text.
+		var/list/recent_speech = list()
+
+		var/list/say_log = target.logging[INDIVIDUAL_SAY_LOG]
+
+		if(LAZYLEN(say_log) > LING_ABSORB_RECENT_SPEECH)
+			recent_speech = say_log.Copy(say_log.len-LING_ABSORB_RECENT_SPEECH+1,0) //0 so len-LING_ARS+1 to end of list
+		else
+			for(var/spoken_memory in say_log)
+				if(recent_speech.len >= LING_ABSORB_RECENT_SPEECH)
+					break
+				recent_speech[spoken_memory] = say_log[spoken_memory]
+
+		if(recent_speech.len)
+			user.mind.store_memory("<B>Some of [target]'s speech patterns, we should study these to better impersonate them!</B>")
+			to_chat(user, "<span class='boldnotice'>Some of [target]'s speech patterns, we should study these to better impersonate them!</span>")
+			for(var/spoken_memory in recent_speech)
+				user.mind.store_memory("\"[recent_speech[spoken_memory]]\"")
+				to_chat(user, "<span class='notice'>\"[recent_speech[spoken_memory]]\"</span>")
+			user.mind.store_memory("<B>We have no more knowledge of [target]'s speech patterns.</B>")
+			to_chat(user, "<span class='boldnotice'>We have no more knowledge of [target]'s speech patterns.</span>")
+
+		if(target.mind.changeling)//If the target was a changeling, suck out their extra juice and objective points!
+			changeling.chem_charges += min(target.mind.changeling.chem_charges, changeling.chem_storage)
+			changeling.absorbedcount += (target.mind.changeling.absorbedcount)
+
+			target.mind.changeling.stored_profiles.len = 1
+			target.mind.changeling.absorbedcount = 0
+
+
+	changeling.chem_charges=min(changeling.chem_charges+10, changeling.chem_storage)
+
+	changeling.isabsorbing = 0
+	changeling.canrespec = 1
+
+	target.death(0)
+	target.Drain()
+	return TRUE
+
+
+
+//Absorbs the target DNA.
+//datum/changeling/proc/absorb_dna(mob/living/carbon/T, mob/user)
+
+//datum/changeling/proc/store_dna(datum/dna/new_dna, mob/user)

code/game/gamemodes/changeling/powers/adrenaline.dm

@@ -11,9 +11,9 @@
 /obj/effect/proc_holder/changeling/adrenaline/sting_action(mob/living/user)
 	to_chat(user, "<span class='notice'>Energy rushes through us.[user.lying ? " We arise." : ""]</span>")
 	user.SetSleeping(0)
-	user.SetParalysis(0)
-	user.SetStunned(0)
-	user.SetWeakened(0)
+	user.SetUnconscious(0)
+	user.SetStun(0)
+	user.SetKnockdown(0)
 	user.reagents.add_reagent("changelingAdrenaline", 10)
 	user.reagents.add_reagent("changelingAdrenaline2", 2) //For a really quick burst of speed
 	user.adjustStaminaLoss(-75)

code/game/gamemodes/changeling/powers/biodegrade.dm

@@ -8,7 +8,7 @@
 
 /obj/effect/proc_holder/changeling/biodegrade/sting_action(mob/living/carbon/human/user)
 	var/used = FALSE // only one form of shackles removed per use
-	if(!user.restrained() && istype(user.loc, /turf/open))
+	if(!user.restrained() && isopenturf(user.loc))
 		to_chat(user, "<span class='warning'>We are already free!</span>")
 		return 0
 

code/game/gamemodes/changeling/powers/headcrab.dm

@@ -17,13 +17,13 @@
 	explosion(get_turf(user),0,0,2,0,silent=1)
 	for(var/mob/living/carbon/human/H in range(2,user))
 		to_chat(H, "<span class='userdanger'>You are blinded by a shower of blood!</span>")
-		H.Stun(1)
+		H.Stun(20)
 		H.blur_eyes(20)
 		H.adjust_eye_damage(5)
 		H.confused += 3
 	for(var/mob/living/silicon/S in range(2,user))
 		to_chat(S, "<span class='userdanger'>Your sensors are disabled by a shower of blood!</span>")
-		S.Weaken(3)
+		S.Knockdown(60)
 	var/turf = get_turf(user)
 	user.gib()
 	. = TRUE

code/game/gamemodes/changeling/powers/mutations.dm

@@ -312,7 +312,7 @@
 	H.dropItemToGround(source.gun, TRUE) //Unequip thus delete the tentacle on hit
 	if(blocked >= 100)
 		return 0
-	if(istype(target, /obj/item))
+	if(isitem(target))
 		var/obj/item/I = target
 		if(!I.anchored)
 			to_chat(firer, "<span class='notice'>You pull [I] towards yourself.</span>")
@@ -403,7 +403,7 @@
 	if(ismob(loc))
 		loc.visible_message("<span class='warning'>The end of [loc.name]\'s hand inflates rapidly, forming a huge shield-like mass!</span>", "<span class='warning'>We inflate our hand into a strong shield.</span>", "<span class='italics'>You hear organic matter ripping and tearing!</span>")
 
-/obj/item/weapon/shield/changeling/hit_reaction()
+/obj/item/weapon/shield/changeling/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	if(remaining_uses < 1)
 		if(ishuman(loc))
 			var/mob/living/carbon/human/H = loc

code/game/gamemodes/changeling/powers/panacea.dm

@@ -1,44 +1,35 @@
-/obj/effect/proc_holder/changeling/panacea
-	name = "Anatomic Panacea"
-	desc = "Expels impurifications from our form; curing diseases, removing parasites, sobering us, purging toxins and radiation, and resetting our genetic code completely."
-	helptext = "Can be used while unconscious."
-	chemical_cost = 20
-	dna_cost = 1
-	req_stat = UNCONSCIOUS
-
-//Heals the things that the other regenerative abilities don't.
-/obj/effect/proc_holder/changeling/panacea/sting_action(mob/user)
-	to_chat(user, "<span class='notice'>We cleanse impurities from our form.</span>")
-
-	var/mob/living/simple_animal/borer/B = user.has_brain_worms()
-	if(B)
-		if(B.controlling)
-			B.detatch()
-		B.leave_victim()
-		if(iscarbon(user))
-			var/mob/living/carbon/C = user
+/obj/effect/proc_holder/changeling/panacea
+	name = "Anatomic Panacea"
+	desc = "Expels impurifications from our form; curing diseases, removing parasites, sobering us, purging toxins and radiation, and resetting our genetic code completely."
+	helptext = "Can be used while unconscious."
+	chemical_cost = 20
+	dna_cost = 1
+	req_stat = UNCONSCIOUS
+
+//Heals the things that the other regenerative abilities don't.
+/obj/effect/proc_holder/changeling/panacea/sting_action(mob/user)
+	to_chat(user, "<span class='notice'>We cleanse impurities from our form.</span>")
+
+	var/list/bad_organs = list(
+		user.getorgan(/obj/item/organ/body_egg),
+		user.getorgan(/obj/item/organ/zombie_infection))
+
+	for(var/o in bad_organs)
+		var/obj/item/organ/O = o
+		if(!istype(O))
+			continue
+
+		O.Remove(user)
+		if(iscarbon(user))
+			var/mob/living/carbon/C = user
 			C.vomit(0, toxic = TRUE)
-			to_chat(user, "<span class='notice'>A parasite exits our form.</span>")
-	var/list/bad_organs = list(
-		user.getorgan(/obj/item/organ/body_egg),
-		user.getorgan(/obj/item/organ/zombie_infection))
-
-	for(var/o in bad_organs)
-		var/obj/item/organ/O = o
-		if(!istype(O))
-			continue
-
-		O.Remove(user)
-		if(iscarbon(user))
-			var/mob/living/carbon/C = user
-			C.vomit(0, toxic = TRUE)
-		O.forceMove(get_turf(user))
-
-	user.reagents.add_reagent("mutadone", 10)
-	user.reagents.add_reagent("pen_acid", 20)
-	user.reagents.add_reagent("antihol", 10)
-	user.reagents.add_reagent("mannitol", 25)
-
-	for(var/datum/disease/D in user.viruses)
-		D.cure()
-	return TRUE
+		O.forceMove(get_turf(user))
+
+	user.reagents.add_reagent("mutadone", 10)
+	user.reagents.add_reagent("pen_acid", 20)
+	user.reagents.add_reagent("antihol", 10)
+	user.reagents.add_reagent("mannitol", 25)
+
+	for(var/datum/disease/D in user.viruses)
+		D.cure()
+	return TRUE

code/game/gamemodes/changeling/powers/regenerate.dm

@@ -17,7 +17,7 @@
 		var/mob/living/carbon/C = user
 		var/list/missing = C.get_missing_limbs()
 		if(missing.len)
-			playsound(user, 'sound/magic/Demon_consume.ogg', 50, 1)
+			playsound(user, 'sound/magic/demon_consume.ogg', 50, 1)
 			C.visible_message("<span class='warning'>[user]'s missing limbs \
 				reform, making a loud, grotesque sound!</span>",
 				"<span class='userdanger'>Your limbs regrow, making a \

code/game/gamemodes/changeling/powers/revive.dm

@@ -14,7 +14,7 @@
 	var/list/missing = user.get_missing_limbs()
 	missing -= "head" // headless changelings are funny
 	if(missing.len)
-		playsound(user, 'sound/magic/Demon_consume.ogg', 50, 1)
+		playsound(user, 'sound/magic/demon_consume.ogg', 50, 1)
 		user.visible_message("<span class='warning'>[user]'s missing limbs \
 			reform, making a loud, grotesque sound!</span>",
 			"<span class='userdanger'>Your limbs regrow, making a \

code/game/gamemodes/changeling/powers/shriek.dm

@@ -1,42 +1,42 @@
-/obj/effect/proc_holder/changeling/resonant_shriek
-	name = "Resonant Shriek"
-	desc = "Our lungs and vocal chords shift, allowing us to briefly emit a noise that deafens and confuses the weak-minded."
-	helptext = "Emits a high-frequency sound that confuses and deafens humans, blows out nearby lights and overloads cyborg sensors."
-	chemical_cost = 20
-	dna_cost = 1
-	req_human = 1
-
-//A flashy ability, good for crowd control and sewing chaos.
-/obj/effect/proc_holder/changeling/resonant_shriek/sting_action(mob/user)
-	for(var/mob/living/M in get_hearers_in_view(4, user))
-		if(iscarbon(M))
+/obj/effect/proc_holder/changeling/resonant_shriek
+	name = "Resonant Shriek"
+	desc = "Our lungs and vocal chords shift, allowing us to briefly emit a noise that deafens and confuses the weak-minded."
+	helptext = "Emits a high-frequency sound that confuses and deafens humans, blows out nearby lights and overloads cyborg sensors."
+	chemical_cost = 20
+	dna_cost = 1
+	req_human = 1
+
+//A flashy ability, good for crowd control and sewing chaos.
+/obj/effect/proc_holder/changeling/resonant_shriek/sting_action(mob/user)
+	for(var/mob/living/M in get_hearers_in_view(4, user))
+		if(iscarbon(M))
 			var/mob/living/carbon/C = M
 			if(!C.mind || !C.mind.changeling)
 				C.adjustEarDamage(0, 30)
 				C.confused += 25
 				C.Jitter(50)
-			else
+			else
 				C << sound('sound/effects/screech.ogg')
-
-		if(issilicon(M))
-			M << sound('sound/weapons/flash.ogg')
-			M.Weaken(rand(5,10))
-
-	for(var/obj/machinery/light/L in range(4, user))
-		L.on = 1
-		L.break_light_tube()
-	return TRUE
-
-/obj/effect/proc_holder/changeling/dissonant_shriek
-	name = "Dissonant Shriek"
-	desc = "We shift our vocal cords to release a high-frequency sound that overloads nearby electronics."
-	chemical_cost = 20
-	dna_cost = 1
-
-//A flashy ability, good for crowd control and sewing chaos.
-/obj/effect/proc_holder/changeling/dissonant_shriek/sting_action(mob/user)
-	for(var/obj/machinery/light/L in range(5, usr))
-		L.on = 1
-		L.break_light_tube()
-	empulse(get_turf(user), 2, 5, 1)
-	return TRUE
+
+		if(issilicon(M))
+			M << sound('sound/weapons/flash.ogg')
+			M.Knockdown(rand(100,200))
+
+	for(var/obj/machinery/light/L in range(4, user))
+		L.on = 1
+		L.break_light_tube()
+	return TRUE
+
+/obj/effect/proc_holder/changeling/dissonant_shriek
+	name = "Dissonant Shriek"
+	desc = "We shift our vocal cords to release a high-frequency sound that overloads nearby electronics."
+	chemical_cost = 20
+	dna_cost = 1
+
+//A flashy ability, good for crowd control and sewing chaos.
+/obj/effect/proc_holder/changeling/dissonant_shriek/sting_action(mob/user)
+	for(var/obj/machinery/light/L in range(5, usr))
+		L.on = 1
+		L.break_light_tube()
+	empulse(get_turf(user), 2, 5, 1)
+	return TRUE

code/game/gamemodes/changeling/powers/strained_muscles.dm

@@ -20,7 +20,7 @@
 		to_chat(user, "<span class='notice'>Our muscles relax.</span>")
 		if(stacks >= 10)
 			to_chat(user, "<span class='danger'>We collapse in exhaustion.</span>")
-			user.Weaken(3)
+			user.Knockdown(60)
 			user.emote("gasp")
 
 	INVOKE_ASYNC(src, .proc/muscle_loop, user)
@@ -33,7 +33,7 @@
 		if(user.stat != CONSCIOUS || user.staminaloss >= 90)
 			active = !active
 			to_chat(user, "<span class='notice'>Our muscles relax without the energy to strengthen them.</span>")
-			user.Weaken(2)
+			user.Knockdown(40)
 			user.status_flags &= ~GOTTAGOFAST
 			break
 

code/game/gamemodes/changeling/powers/tiny_prick.dm

@@ -1,231 +1,231 @@
-/obj/effect/proc_holder/changeling/sting
-	name = "Tiny Prick"
-	desc = "Stabby stabby"
-	var/sting_icon = null
-
-/obj/effect/proc_holder/changeling/sting/Click()
-	var/mob/user = usr
-	if(!user || !user.mind || !user.mind.changeling)
-		return
-	if(!(user.mind.changeling.chosen_sting))
-		set_sting(user)
-	else
-		unset_sting(user)
-	return
-
-/obj/effect/proc_holder/changeling/sting/proc/set_sting(mob/user)
-	to_chat(user, "<span class='notice'>We prepare our sting, use alt+click or middle mouse button on target to sting them.</span>")
-	user.mind.changeling.chosen_sting = src
-	user.hud_used.lingstingdisplay.icon_state = sting_icon
-	user.hud_used.lingstingdisplay.invisibility = 0
-
-/obj/effect/proc_holder/changeling/sting/proc/unset_sting(mob/user)
-	to_chat(user, "<span class='warning'>We retract our sting, we can't sting anyone for now.</span>")
-	user.mind.changeling.chosen_sting = null
-	user.hud_used.lingstingdisplay.icon_state = null
-	user.hud_used.lingstingdisplay.invisibility = INVISIBILITY_ABSTRACT
-
-/mob/living/carbon/proc/unset_sting()
-	if(mind && mind.changeling && mind.changeling.chosen_sting)
-		src.mind.changeling.chosen_sting.unset_sting(src)
-
-/obj/effect/proc_holder/changeling/sting/can_sting(mob/user, mob/target)
-	if(!..())
-		return
-	if(!user.mind.changeling.chosen_sting)
-		to_chat(user, "We haven't prepared our sting yet!")
-	if(!iscarbon(target))
-		return
-	if(!isturf(user.loc))
-		return
-	if(!AStar(user, target.loc, /turf/proc/Distance, user.mind.changeling.sting_range, simulated_only = 0))
-		return
+/obj/effect/proc_holder/changeling/sting
+	name = "Tiny Prick"
+	desc = "Stabby stabby"
+	var/sting_icon = null
+
+/obj/effect/proc_holder/changeling/sting/Click()
+	var/mob/user = usr
+	if(!user || !user.mind || !user.mind.changeling)
+		return
+	if(!(user.mind.changeling.chosen_sting))
+		set_sting(user)
+	else
+		unset_sting(user)
+	return
+
+/obj/effect/proc_holder/changeling/sting/proc/set_sting(mob/user)
+	to_chat(user, "<span class='notice'>We prepare our sting, use alt+click or middle mouse button on target to sting them.</span>")
+	user.mind.changeling.chosen_sting = src
+	user.hud_used.lingstingdisplay.icon_state = sting_icon
+	user.hud_used.lingstingdisplay.invisibility = 0
+
+/obj/effect/proc_holder/changeling/sting/proc/unset_sting(mob/user)
+	to_chat(user, "<span class='warning'>We retract our sting, we can't sting anyone for now.</span>")
+	user.mind.changeling.chosen_sting = null
+	user.hud_used.lingstingdisplay.icon_state = null
+	user.hud_used.lingstingdisplay.invisibility = INVISIBILITY_ABSTRACT
+
+/mob/living/carbon/proc/unset_sting()
+	if(mind && mind.changeling && mind.changeling.chosen_sting)
+		src.mind.changeling.chosen_sting.unset_sting(src)
+
+/obj/effect/proc_holder/changeling/sting/can_sting(mob/user, mob/target)
+	if(!..())
+		return
+	if(!user.mind.changeling.chosen_sting)
+		to_chat(user, "We haven't prepared our sting yet!")
+	if(!iscarbon(target))
+		return
+	if(!isturf(user.loc))
+		return
+	if(!AStar(user, target.loc, /turf/proc/Distance, user.mind.changeling.sting_range, simulated_only = 0))
+		return
 	if(target.mind && target.mind.changeling)
 		sting_feedback(user, target)
 		user.mind.changeling.chem_charges -= chemical_cost
-	return 1
-
-/obj/effect/proc_holder/changeling/sting/sting_feedback(mob/user, mob/target)
-	if(!target)
-		return
-	to_chat(user, "<span class='notice'>We stealthily sting [target.name].</span>")
-	if(target.mind && target.mind.changeling)
-		to_chat(target, "<span class='warning'>You feel a tiny prick.</span>")
-	return 1
-
-
-/obj/effect/proc_holder/changeling/sting/transformation
-	name = "Transformation Sting"
-	desc = "We silently sting a human, injecting a retrovirus that forces them to transform."
+	return 1
+
+/obj/effect/proc_holder/changeling/sting/sting_feedback(mob/user, mob/target)
+	if(!target)
+		return
+	to_chat(user, "<span class='notice'>We stealthily sting [target.name].</span>")
+	if(target.mind && target.mind.changeling)
+		to_chat(target, "<span class='warning'>You feel a tiny prick.</span>")
+	return 1
+
+
+/obj/effect/proc_holder/changeling/sting/transformation
+	name = "Transformation Sting"
+	desc = "We silently sting a human, injecting a retrovirus that forces them to transform."
 	helptext = "The victim will transform much like a changeling would. Does not provide a warning to others. Mutations will not be transferred, and monkeys will become human."
-	sting_icon = "sting_transform"
+	sting_icon = "sting_transform"
 	chemical_cost = 50
-	dna_cost = 3
-	var/datum/changelingprofile/selected_dna = null
-
-/obj/effect/proc_holder/changeling/sting/transformation/Click()
-	var/mob/user = usr
-	var/datum/changeling/changeling = user.mind.changeling
-	if(changeling.chosen_sting)
-		unset_sting(user)
-		return
-	selected_dna = changeling.select_dna("Select the target DNA: ", "Target DNA")
-	if(!selected_dna)
-		return
-	if(NOTRANSSTING in selected_dna.dna.species.species_traits)
-		to_chat(user, "<span class = 'notice'>That DNA is not compatible with changeling retrovirus!")
-		return
-	..()
-
-/obj/effect/proc_holder/changeling/sting/transformation/can_sting(mob/user, mob/target)
-	if(!..())
-		return
-	if((target.disabilities & HUSK) || !target.has_dna())
-		to_chat(user, "<span class='warning'>Our sting appears ineffective against its DNA.</span>")
-		return 0
-	return 1
-
-/obj/effect/proc_holder/changeling/sting/transformation/sting_action(mob/user, mob/target)
-	add_logs(user, target, "stung", "transformation sting", " new identity is [selected_dna.dna.real_name]")
-	var/datum/dna/NewDNA = selected_dna.dna
-	if(ismonkey(target))
-		to_chat(user, "<span class='notice'>Our genes cry out as we sting [target.name]!</span>")
-
-	var/mob/living/carbon/C = target
-	. = TRUE
-	if(istype(C))
-		C.real_name = NewDNA.real_name
+	dna_cost = 3
+	var/datum/changelingprofile/selected_dna = null
+
+/obj/effect/proc_holder/changeling/sting/transformation/Click()
+	var/mob/user = usr
+	var/datum/changeling/changeling = user.mind.changeling
+	if(changeling.chosen_sting)
+		unset_sting(user)
+		return
+	selected_dna = changeling.select_dna("Select the target DNA: ", "Target DNA")
+	if(!selected_dna)
+		return
+	if(NOTRANSSTING in selected_dna.dna.species.species_traits)
+		to_chat(user, "<span class = 'notice'>That DNA is not compatible with changeling retrovirus!")
+		return
+	..()
+
+/obj/effect/proc_holder/changeling/sting/transformation/can_sting(mob/user, mob/target)
+	if(!..())
+		return
+	if((target.disabilities & HUSK) || !target.has_dna())
+		to_chat(user, "<span class='warning'>Our sting appears ineffective against its DNA.</span>")
+		return 0
+	return 1
+
+/obj/effect/proc_holder/changeling/sting/transformation/sting_action(mob/user, mob/target)
+	add_logs(user, target, "stung", "transformation sting", " new identity is [selected_dna.dna.real_name]")
+	var/datum/dna/NewDNA = selected_dna.dna
+	if(ismonkey(target))
+		to_chat(user, "<span class='notice'>Our genes cry out as we sting [target.name]!</span>")
+
+	var/mob/living/carbon/C = target
+	. = TRUE
+	if(istype(C))
+		C.real_name = NewDNA.real_name
 		NewDNA.transfer_identity(C)
 		if(ismonkey(C))
 			C.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_DEFAULTMSG)
-		C.updateappearance(mutcolor_update=1)
-
-
-/obj/effect/proc_holder/changeling/sting/false_armblade
-	name = "False Armblade Sting"
-	desc = "We silently sting a human, injecting a retrovirus that mutates their arm to temporarily appear as an armblade."
-	helptext = "The victim will form an armblade much like a changeling would, except the armblade is dull and useless."
-	sting_icon = "sting_armblade"
-	chemical_cost = 20
-	dna_cost = 1
-
-/obj/item/weapon/melee/arm_blade/false
-	desc = "A grotesque mass of flesh that used to be your arm. Although it looks dangerous at first, you can tell it's actually quite dull and useless."
-	force = 5 //Basically as strong as a punch
-
-/obj/item/weapon/melee/arm_blade/false/afterattack(atom/target, mob/user, proximity)
-	return
-
-/obj/effect/proc_holder/changeling/sting/false_armblade/can_sting(mob/user, mob/target)
-	if(!..())
-		return
-	if((target.disabilities & HUSK) || !target.has_dna())
-		to_chat(user, "<span class='warning'>Our sting appears ineffective against its DNA.</span>")
-		return 0
-	return 1
-
-/obj/effect/proc_holder/changeling/sting/false_armblade/sting_action(mob/user, mob/target)
-	add_logs(user, target, "stung", object="falso armblade sting")
-
-	if(!target.drop_item())
-		to_chat(user, "<span class='warning'>The [target.get_active_held_item()] is stuck to their hand, you cannot grow a false armblade over it!</span>")
-		return
-
-	if(ismonkey(target))
-		to_chat(user, "<span class='notice'>Our genes cry out as we sting [target.name]!</span>")
-
-	var/obj/item/weapon/melee/arm_blade/false/blade = new(target,1)
-	target.put_in_hands(blade)
-	target.visible_message("<span class='warning'>A grotesque blade forms around [target.name]\'s arm!</span>", "<span class='userdanger'>Your arm twists and mutates, transforming into a horrific monstrosity!</span>", "<span class='italics'>You hear organic matter ripping and tearing!</span>")
-	playsound(target, 'sound/effects/blobattack.ogg', 30, 1)
-
-	addtimer(CALLBACK(src, .proc/remove_fake, target, blade), 600)
-	return TRUE
-
-/obj/effect/proc_holder/changeling/sting/false_armblade/proc/remove_fake(mob/target, obj/item/weapon/melee/arm_blade/false/blade)
-	playsound(target, 'sound/effects/blobattack.ogg', 30, 1)
-	target.visible_message("<span class='warning'>With a sickening crunch, \
-	[target] reforms their [blade.name] into an arm!</span>",
-	"<span class='warning'>[blade] reforms back to normal.</span>",
-	"<span class='italics>You hear organic matter ripping and tearing!</span>")
-
-	qdel(blade)
-	target.update_inv_hands()
-
-/obj/effect/proc_holder/changeling/sting/extract_dna
-	name = "Extract DNA Sting"
-	desc = "We stealthily sting a target and extract their DNA."
-	helptext = "Will give you the DNA of your target, allowing you to transform into them."
-	sting_icon = "sting_extract"
-	chemical_cost = 25
-	dna_cost = 0
-
-/obj/effect/proc_holder/changeling/sting/extract_dna/can_sting(mob/user, mob/target)
-	if(..())
-		return user.mind.changeling.can_absorb_dna(user, target)
-
-/obj/effect/proc_holder/changeling/sting/extract_dna/sting_action(mob/user, mob/living/carbon/human/target)
-	add_logs(user, target, "stung", "extraction sting")
-	if(!(user.mind.changeling.has_dna(target.dna)))
-		user.mind.changeling.add_new_profile(target, user)
-	return TRUE
-
-/obj/effect/proc_holder/changeling/sting/mute
-	name = "Mute Sting"
-	desc = "We silently sting a human, completely silencing them for a short time."
-	helptext = "Does not provide a warning to the victim that they have been stung, until they try to speak and cannot."
-	sting_icon = "sting_mute"
-	chemical_cost = 20
-	dna_cost = 2
-
-/obj/effect/proc_holder/changeling/sting/mute/sting_action(mob/user, mob/living/carbon/target)
-	add_logs(user, target, "stung", "mute sting")
-	target.silent += 30
-	return TRUE
-
-/obj/effect/proc_holder/changeling/sting/blind
-	name = "Blind Sting"
-	desc = "Temporarily blinds the target."
-	helptext = "This sting completely blinds a target for a short time."
-	sting_icon = "sting_blind"
-	chemical_cost = 25
-	dna_cost = 1
-
-/obj/effect/proc_holder/changeling/sting/blind/sting_action(mob/user, mob/living/carbon/target)
-	add_logs(user, target, "stung", "blind sting")
-	to_chat(target, "<span class='danger'>Your eyes burn horrifically!</span>")
-	target.become_nearsighted()
-	target.blind_eyes(20)
-	target.blur_eyes(40)
-	return TRUE
-
-/obj/effect/proc_holder/changeling/sting/LSD
-	name = "Hallucination Sting"
-	desc = "Causes terror in the target."
-	helptext = "We evolve the ability to sting a target with a powerful hallucinogenic chemical. The target does not notice they have been stung, and the effect occurs after 30 to 60 seconds."
-	sting_icon = "sting_lsd"
-	chemical_cost = 10
-	dna_cost = 1
-
-/obj/effect/proc_holder/changeling/sting/LSD/sting_action(mob/user, mob/living/carbon/target)
-	add_logs(user, target, "stung", "LSD sting")
-	addtimer(CALLBACK(src, .proc/hallucination_time, target), rand(300,600))
-	return TRUE
-
-/obj/effect/proc_holder/changeling/sting/LSD/proc/hallucination_time(mob/living/carbon/target)
-	if(target)
-		target.hallucination = max(400, target.hallucination)
-
-/obj/effect/proc_holder/changeling/sting/cryo
-	name = "Cryogenic Sting"
-	desc = "We silently sting a human with a cocktail of chemicals that freeze them."
-	helptext = "Does not provide a warning to the victim, though they will likely realize they are suddenly freezing."
-	sting_icon = "sting_cryo"
-	chemical_cost = 15
-	dna_cost = 2
-
-/obj/effect/proc_holder/changeling/sting/cryo/sting_action(mob/user, mob/target)
-	add_logs(user, target, "stung", "cryo sting")
-	if(target.reagents)
-		target.reagents.add_reagent("frostoil", 30)
-	return TRUE
+		C.updateappearance(mutcolor_update=1)
+
+
+/obj/effect/proc_holder/changeling/sting/false_armblade
+	name = "False Armblade Sting"
+	desc = "We silently sting a human, injecting a retrovirus that mutates their arm to temporarily appear as an armblade."
+	helptext = "The victim will form an armblade much like a changeling would, except the armblade is dull and useless."
+	sting_icon = "sting_armblade"
+	chemical_cost = 20
+	dna_cost = 1
+
+/obj/item/weapon/melee/arm_blade/false
+	desc = "A grotesque mass of flesh that used to be your arm. Although it looks dangerous at first, you can tell it's actually quite dull and useless."
+	force = 5 //Basically as strong as a punch
+
+/obj/item/weapon/melee/arm_blade/false/afterattack(atom/target, mob/user, proximity)
+	return
+
+/obj/effect/proc_holder/changeling/sting/false_armblade/can_sting(mob/user, mob/target)
+	if(!..())
+		return
+	if((target.disabilities & HUSK) || !target.has_dna())
+		to_chat(user, "<span class='warning'>Our sting appears ineffective against its DNA.</span>")
+		return 0
+	return 1
+
+/obj/effect/proc_holder/changeling/sting/false_armblade/sting_action(mob/user, mob/target)
+	add_logs(user, target, "stung", object="falso armblade sting")
+
+	if(!target.drop_item())
+		to_chat(user, "<span class='warning'>The [target.get_active_held_item()] is stuck to their hand, you cannot grow a false armblade over it!</span>")
+		return
+
+	if(ismonkey(target))
+		to_chat(user, "<span class='notice'>Our genes cry out as we sting [target.name]!</span>")
+
+	var/obj/item/weapon/melee/arm_blade/false/blade = new(target,1)
+	target.put_in_hands(blade)
+	target.visible_message("<span class='warning'>A grotesque blade forms around [target.name]\'s arm!</span>", "<span class='userdanger'>Your arm twists and mutates, transforming into a horrific monstrosity!</span>", "<span class='italics'>You hear organic matter ripping and tearing!</span>")
+	playsound(target, 'sound/effects/blobattack.ogg', 30, 1)
+
+	addtimer(CALLBACK(src, .proc/remove_fake, target, blade), 600)
+	return TRUE
+
+/obj/effect/proc_holder/changeling/sting/false_armblade/proc/remove_fake(mob/target, obj/item/weapon/melee/arm_blade/false/blade)
+	playsound(target, 'sound/effects/blobattack.ogg', 30, 1)
+	target.visible_message("<span class='warning'>With a sickening crunch, \
+	[target] reforms their [blade.name] into an arm!</span>",
+	"<span class='warning'>[blade] reforms back to normal.</span>",
+	"<span class='italics>You hear organic matter ripping and tearing!</span>")
+
+	qdel(blade)
+	target.update_inv_hands()
+
+/obj/effect/proc_holder/changeling/sting/extract_dna
+	name = "Extract DNA Sting"
+	desc = "We stealthily sting a target and extract their DNA."
+	helptext = "Will give you the DNA of your target, allowing you to transform into them."
+	sting_icon = "sting_extract"
+	chemical_cost = 25
+	dna_cost = 0
+
+/obj/effect/proc_holder/changeling/sting/extract_dna/can_sting(mob/user, mob/target)
+	if(..())
+		return user.mind.changeling.can_absorb_dna(user, target)
+
+/obj/effect/proc_holder/changeling/sting/extract_dna/sting_action(mob/user, mob/living/carbon/human/target)
+	add_logs(user, target, "stung", "extraction sting")
+	if(!(user.mind.changeling.has_dna(target.dna)))
+		user.mind.changeling.add_new_profile(target, user)
+	return TRUE
+
+/obj/effect/proc_holder/changeling/sting/mute
+	name = "Mute Sting"
+	desc = "We silently sting a human, completely silencing them for a short time."
+	helptext = "Does not provide a warning to the victim that they have been stung, until they try to speak and cannot."
+	sting_icon = "sting_mute"
+	chemical_cost = 20
+	dna_cost = 2
+
+/obj/effect/proc_holder/changeling/sting/mute/sting_action(mob/user, mob/living/carbon/target)
+	add_logs(user, target, "stung", "mute sting")
+	target.silent += 30
+	return TRUE
+
+/obj/effect/proc_holder/changeling/sting/blind
+	name = "Blind Sting"
+	desc = "Temporarily blinds the target."
+	helptext = "This sting completely blinds a target for a short time."
+	sting_icon = "sting_blind"
+	chemical_cost = 25
+	dna_cost = 1
+
+/obj/effect/proc_holder/changeling/sting/blind/sting_action(mob/user, mob/living/carbon/target)
+	add_logs(user, target, "stung", "blind sting")
+	to_chat(target, "<span class='danger'>Your eyes burn horrifically!</span>")
+	target.become_nearsighted()
+	target.blind_eyes(20)
+	target.blur_eyes(40)
+	return TRUE
+
+/obj/effect/proc_holder/changeling/sting/LSD
+	name = "Hallucination Sting"
+	desc = "Causes terror in the target."
+	helptext = "We evolve the ability to sting a target with a powerful hallucinogenic chemical. The target does not notice they have been stung, and the effect occurs after 30 to 60 seconds."
+	sting_icon = "sting_lsd"
+	chemical_cost = 10
+	dna_cost = 1
+
+/obj/effect/proc_holder/changeling/sting/LSD/sting_action(mob/user, mob/living/carbon/target)
+	add_logs(user, target, "stung", "LSD sting")
+	addtimer(CALLBACK(src, .proc/hallucination_time, target), rand(300,600))
+	return TRUE
+
+/obj/effect/proc_holder/changeling/sting/LSD/proc/hallucination_time(mob/living/carbon/target)
+	if(target)
+		target.hallucination = max(400, target.hallucination)
+
+/obj/effect/proc_holder/changeling/sting/cryo
+	name = "Cryogenic Sting"
+	desc = "We silently sting a human with a cocktail of chemicals that freeze them."
+	helptext = "Does not provide a warning to the victim, though they will likely realize they are suddenly freezing."
+	sting_icon = "sting_cryo"
+	chemical_cost = 15
+	dna_cost = 2
+
+/obj/effect/proc_holder/changeling/sting/cryo/sting_action(mob/user, mob/target)
+	add_logs(user, target, "stung", "cryo sting")
+	if(target.reagents)
+		target.reagents.add_reagent("frostoil", 30)
+	return TRUE

code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm

@@ -46,7 +46,7 @@
 /obj/effect/clockwork/sigil/proc/sigil_effects(mob/living/L)
 
 
-//Sigil of Transgression: Stuns the first non-servant to walk on it and flashes all nearby non_servants. Nar-Sian cultists are damaged and knocked down for a longer stun
+//Sigil of Transgression: Stuns the first non-servant to walk on it and flashes all nearby non_servants. Nar-Sian cultists are damaged and knocked down for a longer time
 /obj/effect/clockwork/sigil/transgression
 	name = "dull sigil"
 	desc = "A dull, barely-visible golden sigil. It's as though light was carved into the ground."
@@ -69,10 +69,10 @@
 	if(iscultist(L))
 		to_chat(L, "<span class='heavy_brass'>\"Watch your step, wretch.\"</span>")
 		L.adjustBruteLoss(10)
-		L.Weaken(7)
+		L.Knockdown(140, FALSE)
 	L.visible_message("<span class='warning'>[src] appears around [L] in a burst of light!</span>", \
 	"<span class='userdanger'>[target_flashed ? "An unseen force":"The glowing sigil around you"] holds you in place!</span>")
-	L.Stun(5)
+	L.Stun(100)
 	new /obj/effect/temp_visual/ratvar/sigil/transgression(get_turf(src))
 	qdel(src)
 
@@ -120,9 +120,9 @@
 	post_channel(L)
 	if(is_eligible_servant(L))
 		to_chat(L, "<span class='heavy_brass'>\"You belong to me now.\"</span>")
-	add_servant_of_ratvar(L)
-	L.Weaken(3) //Completely defenseless for about five seconds - mainly to give them time to read over the information they've just been presented with
-	L.Stun(3)
+	if(add_servant_of_ratvar(L))
+		L.log_message("<font color=#BE8700>Conversion was done with a [sigil_name].</font>", INDIVIDUAL_ATTACK_LOG)
+	L.Knockdown(60) //Completely defenseless for about five seconds - mainly to give them time to read over the information they've just been presented with
 	if(iscarbon(L))
 		var/mob/living/carbon/C = L
 		C.silent += 5
@@ -163,6 +163,7 @@
 
 /obj/effect/clockwork/sigil/submission/accession/post_channel(mob/living/L)
 	if(L.isloyal())
+		L.log_message("<font color=#BE8700>Had their mindshield implant broken by a [sigil_name].</font>", INDIVIDUAL_ATTACK_LOG)
 		delete_on_finish = TRUE
 		L.visible_message("<span class='warning'>[L] visibly trembles!</span>", \
 		"<span class='sevtug'>[text2ratvar("You will be mine and his. This puny trinket will not stop me.")]</span>")
@@ -235,8 +236,7 @@
 		cyborg.visible_message("<span class='warning'>[cyborg] glows a brilliant orange!</span>")
 		var/previous_color = cyborg.color
 		cyborg.color = list("#EC8A2D", "#EC8A2D", "#EC8A2D", rgb(0,0,0))
-		var/datum/status_effect/cyborg_power_regen/CPR = cyborg.apply_status_effect(STATUS_EFFECT_POWERREGEN)
-		CPR.power_to_give = giving_power * 0.1 //ten ticks, restoring 10% each
+		cyborg.apply_status_effect(STATUS_EFFECT_POWERREGEN, giving_power * 0.1) //ten ticks, restoring 10% each
 		animate(cyborg, color = previous_color, time = 100)
 		addtimer(CALLBACK(cyborg, /atom/proc/update_atom_colour), 100)
 
@@ -330,7 +330,7 @@
 				vitality_drained = L.maxHealth
 				var/obj/effect/temp_visual/ratvar/sigil/vitality/V = new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src))
 				animate(V, alpha = 0, transform = matrix()*2, time = 8)
-				playsound(L, 'sound/magic/WandODeath.ogg', 50, 1)
+				playsound(L, 'sound/magic/wandodeath.ogg', 50, 1)
 				L.visible_message("<span class='warning'>[L] collapses in on [L.p_them()]self as [src] flares bright blue!</span>")
 				to_chat(L, "<span class='inathneq_large'>\"[text2ratvar("Your life will not be wasted.")]\"</span>")
 				for(var/obj/item/W in L)
@@ -358,7 +358,7 @@
 					L.revive(1, 1)
 					var/obj/effect/temp_visual/ratvar/sigil/vitality/V = new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src))
 					animate(V, alpha = 0, transform = matrix()*2, time = 8)
-					playsound(L, 'sound/magic/Staff_Healing.ogg', 50, 1)
+					playsound(L, 'sound/magic/staff_healing.ogg', 50, 1)
 					L.visible_message("<span class='warning'>[L] suddenly gets back up, [GLOB.ratvar_awakens ? "[L.p_their()] body dripping blue ichor":"even as [src] scatters into blue sparks around [L.p_them()]"]!</span>", \
 					"<span class='inathneq'>\"[text2ratvar("You will be okay, child.")]\"</span>")
 					vitality -= revival_cost

code/game/gamemodes/clock_cult/clock_effects/general_markers.dm

@@ -18,10 +18,10 @@
 	their prowess. After a lost battle with Nar-Sian cultists, Inath-neq was struck down and stated in her dying breath, \
 	\"The Resonant Cogs shall not fall silent this day, but will come together to form a wheel that shall never stop turning.\" Ratvar, touched by this, granted Inath-neq an eternal body and \
 	merged her soul with those of the Cogs slain with her on the battlefield."
-	icon = 'icons/effects/187x381.dmi'
+	icon = 'icons/effects/119x268.dmi'
 	icon_state = "inath-neq"
-	pixel_x = -77
-	pixel_y = -174
+	pixel_x = -59
+	pixel_y = -134
 
 /obj/effect/clockwork/general_marker/nezbere
 	name = "Nezbere, the Brass Eidolon"
@@ -29,10 +29,10 @@
 	clockwork_desc = "One of Ratvar's four generals. Nezbere is responsible for the design, testing, and creation of everything in Ratvar's domain, and his loyalty to Ratvar knows no bounds. \
 	It is said that Ratvar once asked him to destroy the plans for a weapon Nezbere had made that could have harmed him, and Nezbere responded by not only destroying the plans, \
 	but by taking his own life so that the device could never be replicated. Nezbere's zealotry is unmatched."
-	icon = 'icons/effects/340x428.dmi'
+	icon = 'icons/effects/237x321.dmi'
 	icon_state = "nezbere"
-	pixel_x = -154
-	pixel_y = -198
+	pixel_x = -118
+	pixel_y = -160
 
 /obj/effect/clockwork/general_marker/sevtug
 	name = "Sevtug, the Formless Pariah"
@@ -40,10 +40,10 @@
 	clockwork_desc = "One of Ratvar's four generals. Sevtug taught him how to manipulate minds and is one of his oldest allies. Sevtug serves Ratvar loyally out of a hope that one day, he will \
 	be able to use a moment of weakness in the Justicar to usurp him, but such a day will never come. And so, he serves with dedication, if not necessarily any sort of decorum, never aware he is \
 	the one being made a fool of."
-	icon = 'icons/effects/211x247.dmi'
+	icon = 'icons/effects/166x195.dmi'
 	icon_state = "sevtug"
-	pixel_x = -89
-	pixel_y = -107
+	pixel_x = -83
+	pixel_y = -97
 
 /obj/effect/clockwork/general_marker/nzcrentr
 	name = "Nzcrentr, the Eternal Thunderbolt"
@@ -51,7 +51,7 @@
 	clockwork_desc = "One of Ratvar's four generals. Before becoming one of Ratvar's generals, Nzcrentr sook out any and all sentient life to slaughter it for sport. \
 	Nzcrentr was coerced by Ratvar into entering a shell constructed by Nezbere, ostensibly made to grant Nzcrentr more power. In reality, the shell was made to trap and control it. \
 	Nzcrentr now serves loyally, though even one of Nezbere's finest creations was not enough to totally eliminate its will."
-	icon = 'icons/effects/254x361.dmi'
+	icon = 'icons/effects/274x385.dmi'
 	icon_state = "nzcrentr"
-	pixel_x = -111
-	pixel_y = -164
+	pixel_x = -137
+	pixel_y = -145

code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm

@@ -119,7 +119,7 @@
 		qdel(src)
 		return FALSE
 	if(!sender)
-		visible_message("<span class='warning'>[A] bounces off of [src]!</span>")
+		visible_message("<span class='warning'>[A] bounces off [src]!</span>")
 		return FALSE
 	if(!uses)
 		return FALSE
@@ -127,8 +127,8 @@
 		var/mob/living/user = A
 		to_chat(user, "<span class='warning'><b>You pass through [src] and appear elsewhere!</b></span>")
 	linked_gateway.visible_message("<span class='warning'>A shape appears in [linked_gateway] before emerging!</span>")
-	playsound(src, 'sound/effects/EMPulse.ogg', 50, 1)
-	playsound(linked_gateway, 'sound/effects/EMPulse.ogg', 50, 1)
+	playsound(src, 'sound/effects/empulse.ogg', 50, 1)
+	playsound(linked_gateway, 'sound/effects/empulse.ogg', 50, 1)
 	transform = matrix() * 1.5
 	animate(src, transform = matrix() / 1.5, time = 10, flags = ANIMATION_END_NOW)
 	linked_gateway.transform = matrix() * 1.5
@@ -165,7 +165,7 @@
 		return FALSE
 	var/input_target_key = input(invoker, "Choose a target to form a rift to.", "Spatial Gateway") as null|anything in possible_targets
 	var/atom/movable/target = possible_targets[input_target_key]
-	if(!src || !input_target_key || !invoker || !invoker.canUseTopic(src, !issilicon(invoker)) || !is_servant_of_ratvar(invoker) || (istype(src, /obj/item) && invoker.get_active_held_item() != src) || !invoker.can_speak_vocal())
+	if(!src || !input_target_key || !invoker || !invoker.canUseTopic(src, !issilicon(invoker)) || !is_servant_of_ratvar(invoker) || (isitem(src) && invoker.get_active_held_item() != src) || !invoker.can_speak_vocal())
 		return FALSE //if any of the involved things no longer exist, the invoker is stunned, too far away to use the object, or does not serve ratvar, or if the object is an item and not in the mob's active hand, fail
 	if(!target) //if we have no target, but did have a key, let them retry
 		to_chat(invoker, "<span class='warning'>That target no longer exists!</span>")
@@ -194,7 +194,7 @@
 			return procure_gateway(invoker, time_duration, gateway_uses, two_way)
 		var/obj/structure/destructible/clockwork/powered/clockwork_obelisk/CO = target
 		if(CO.active)
-			to_chat(invoker, "<span class='warning'>That [target.name] is sustaining a gateway, and cannot recieve another!</span>")
+			to_chat(invoker, "<span class='warning'>That [target.name] is sustaining a gateway, and cannot receive another!</span>")
 			return procure_gateway(invoker, time_duration, gateway_uses, two_way)
 		var/efficiency = CO.get_efficiency_mod()
 		gateway_uses = round(gateway_uses * (2 * efficiency), 1)

code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm

@@ -40,7 +40,7 @@
 	if(floor_tile == /obj/item/stack/tile/plasteel)
 		new floor_tile(src)
 		make_plating()
-		playsound(src, 'sound/items/Crowbar.ogg', 10, 1) //clink
+		playsound(src, 'sound/items/crowbar.ogg', 10, 1) //clink
 	return list("operation_time" = 30, "new_obj_type" = /turf/open/floor/clockwork, "power_cost" = POWER_FLOOR, "spawn_dir" = SOUTH)
 
 /turf/open/floor/plating/asteroid/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent)

code/game/gamemodes/clock_cult/clock_helpers/hierophant_network.dm

@@ -28,7 +28,7 @@
 	desc = "Allows you to communicate with other Servants."
 	button_icon_state = "hierophant"
 	background_icon_state = "bg_clock"
-	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_CONSCIOUS
+	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUN|AB_CHECK_CONSCIOUS
 	buttontooltipstyle = "clockcult"
 	var/title = "Servant"
 	var/span_for_name = "heavy_brass"

code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm

@@ -5,7 +5,7 @@
 	for(var/mob/living/M in GLOB.living_mob_list)
 		if(is_servant_of_ratvar(M) && (ishuman(M) || issilicon(M)))
 			servants++
-	. = list(SCRIPTURE_DRIVER = TRUE, SCRIPTURE_SCRIPT = FALSE, SCRIPTURE_APPLICATION = FALSE, SCRIPTURE_REVENANT = FALSE, SCRIPTURE_JUDGEMENT = FALSE)
+	. = list(SCRIPTURE_DRIVER = TRUE, SCRIPTURE_SCRIPT = FALSE, SCRIPTURE_APPLICATION = FALSE, SCRIPTURE_JUDGEMENT = FALSE)
 	//Drivers: always unlocked
 	.[SCRIPTURE_SCRIPT] = (SSticker.scripture_states[SCRIPTURE_SCRIPT] || \
 	(servants >= SCRIPT_SERVANT_REQ && GLOB.clockwork_caches >= SCRIPT_CACHE_REQ))
@@ -13,9 +13,6 @@
 	.[SCRIPTURE_APPLICATION] = (SSticker.scripture_states[SCRIPTURE_APPLICATION] || \
 	(servants >= APPLICATION_SERVANT_REQ && GLOB.clockwork_caches >= APPLICATION_CACHE_REQ && GLOB.clockwork_construction_value >= APPLICATION_CV_REQ))
 	//Application: APPLICATION_SERVANT_REQ or more non-brain servants, APPLICATION_CACHE_REQ or more clockwork caches, and at least APPLICATION_CV_REQ CV
-	.[SCRIPTURE_REVENANT] = (SSticker.scripture_states[SCRIPTURE_REVENANT] || \
-	(servants >= REVENANT_SERVANT_REQ && GLOB.clockwork_caches >= REVENANT_CACHE_REQ && GLOB.clockwork_construction_value >= REVENANT_CV_REQ))
-	//Revenant: REVENANT_SERVANT_REQ or more non-brain servants, REVENANT_CACHE_REQ or more clockwork caches, and at least REVENANT_CV_REQ CV
 	.[SCRIPTURE_JUDGEMENT] = (SSticker.scripture_states[SCRIPTURE_JUDGEMENT] || \
 	(servants >= JUDGEMENT_SERVANT_REQ && GLOB.clockwork_caches >= JUDGEMENT_CACHE_REQ && GLOB.clockwork_construction_value >= JUDGEMENT_CV_REQ && !unconverted_ai_exists))
 	//Judgement: JUDGEMENT_SERVANT_REQ or more non-brain servants, JUDGEMENT_CACHE_REQ or more clockwork caches, at least JUDGEMENT_CV_REQ CV, and there are no living, non-servant ais
@@ -25,7 +22,7 @@
 	. = scripture_unlock_check()
 	for(var/i in .)
 		if(.[i] != previous_states[i])
-			hierophant_message("<span class='large_brass'><i>Hierophant Network:</i> <b>[i] Scripture has been [.[i] ? "un":""]locked.</b></span>")
+			hierophant_message("<span class='large_brass'><i>Hierophant Network:</i> <b>[i] Scripture has been [.[i] ? "un":""]locked.</b></span>") //maybe admins fucked with scripture states?
 			update_slab_info()
 
 /proc/get_unconverted_ais()

code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm

@@ -136,11 +136,10 @@
 			add_logs(ranged_ability_user, L, "purged of holy water with Sentinel's Compromise")
 			L.visible_message("<span class='warning'>A blue light washes over [L], causing [L.p_them()] to briefly glow!</span>", \
 			"<span class='heavy_brass'>You feel Inath-neq's power purging the darkness within you!</span>")
-		playsound(targetturf, 'sound/magic/Staff_Healing.ogg', 50, 1)
+		playsound(targetturf, 'sound/magic/staff_healing.ogg', 50, 1)
 
 		if(has_holy_water)
 			L.reagents.remove_reagent("holywater", 1000)
-			to_chat(L, "<span class='heavy_brass'>Ratvar's light flares, banishing the darkness. Your devotion remains intact!</span>")
 
 		remove_ranged_ability()
 

code/game/gamemodes/clock_cult/clock_items/clock_components.dm

@@ -220,5 +220,5 @@
 /obj/item/clockwork/alloy_shards/pinion_lock
 	name = "pinion lock"
 	desc = "A dented and scratched gear. It's very heavy."
-	clockwork_desc = "A broken gear lock for pinion airlocks"
+	clockwork_desc = "A broken gear lock for pinion airlocks."
 	icon_state = "pinion_lock"

code/game/gamemodes/clock_cult/clock_items/judicial_visor.dm

@@ -1,4 +1,4 @@
-//Judicial visor: Grants the ability to smite an area and stun the unfaithful nearby every thirty seconds.
+//Judicial visor: Grants the ability to smite an area and knocking down the unfaithful nearby every thirty seconds.
 /obj/item/clothing/glasses/judicial_visor
 	name = "judicial visor"
 	desc = "A strange purple-lensed visor. Looking at it inspires an odd sense of guilt."
@@ -145,7 +145,7 @@
 		return TRUE
 	return FALSE
 
-//Judicial marker: Created by the judicial visor. After three seconds, stuns any non-servants nearby and damages Nar-Sian cultists.
+//Judicial marker: Created by the judicial visor. After three seconds, knocks down any non-Servants nearby and damages Nar-Sian cultists.
 /obj/effect/clockwork/judicial_marker
 	name = "judicial marker"
 	desc = "You get the feeling that you shouldn't be standing here."
@@ -163,7 +163,7 @@
 	INVOKE_ASYNC(src, .proc/judicialblast)
 
 /obj/effect/clockwork/judicial_marker/proc/judicialblast()
-	playsound(src, 'sound/magic/MAGIC_MISSILE.ogg', 50, 1, 1, 1)
+	playsound(src, 'sound/magic/magic_missile.ogg', 50, 1, 1, 1)
 	flick("judicial_marker", src)
 	sleep(16)
 	layer = ABOVE_ALL_MOB_LAYER
@@ -184,11 +184,11 @@
 		if(!iscultist(L))
 			L.visible_message("<span class='warning'>[L] is struck by a judicial explosion!</span>", \
 			"<span class='userdanger'>[!issilicon(L) ? "An unseen force slams you into the ground!" : "ERROR: Motor servos disabled by external source!"]</span>")
-			L.Weaken(8) //stun targets for 14-16 seconds
+			L.Knockdown(160) //knocks down targets for 14-16 seconds
 		else
 			L.visible_message("<span class='warning'>[L] is struck by a judicial explosion!</span>", \
 			"<span class='heavy_brass'>\"Keep an eye out, filth.\"</span>\n<span class='userdanger'>A burst of heat crushes you against the ground!</span>")
-			L.Weaken(4) //stun for 6-8 seconds, but set cultist targets on fire
+			L.Knockdown(80) //knocks down for 6-8 seconds, but set cultist targets on fire
 			L.adjust_fire_stacks(2)
 			L.IgniteMob()
 		if(iscarbon(L))

code/game/gamemodes/clock_cult/clock_items/ratvarian_spear.dm

@@ -50,7 +50,7 @@
 	if(is_servant_of_ratvar(user) || isobserver(user))
 		to_chat(user, "<span class='brass'>Stabbing a human you are pulling or have grabbed with the spear will impale them, doing massive damage and stunning.</span>")
 		if(!iscyborg(user))
-			to_chat(user, "<span class='brass'>Throwing the spear will do massive damage, break the spear, and stun the target.</span>")
+			to_chat(user, "<span class='brass'>Throwing the spear will do massive damage, break the spear, and knock down the target.</span>")
 
 /obj/item/clockwork/ratvarian_spear/attack(mob/living/target, mob/living/carbon/human/user)
 	var/impaling = FALSE
@@ -97,7 +97,7 @@
 		attack_cooldown = world.time + initial(attack_cooldown) //can't attack until we're done impaling
 		if(target)
 			new /obj/effect/temp_visual/dir_setting/bloodsplatter(get_turf(target), get_dir(user, target))
-			target.Stun(2) //brief stun
+			target.Stun(80) //brief stun
 			to_chat(user, "<span class='brass'>You prepare to remove your ratvarian spear from [target]...</span>")
 			var/remove_verb = pick("pull", "yank", "drag")
 			if(do_after(user, 10, 1, target))
@@ -114,7 +114,7 @@
 					step(target, get_dir(user, target))
 					T = get_turf(target)
 					B.forceMove(T)
-					target.Weaken(2) //then weaken if we stayed next to them
+					target.Knockdown(40) //then knockdown if we stayed next to them
 					playsound(T, 'sound/weapons/thudswoosh.ogg', 50, 1)
 				flash_color(target, flash_color="#911414", flash_time=8)
 			else if(target) //it's a do_after, we gotta check again to make sure they didn't get deleted
@@ -136,11 +136,9 @@
 		else if(!..())
 			if(!L.null_rod_check())
 				if(issilicon(L) || iscultist(L))
-					L.Stun(6)
-					L.Weaken(6)
+					L.Knockdown(100)
 				else
-					L.Stun(2)
-					L.Weaken(2)
+					L.Knockdown(40)
 			break_spear(T)
 	else
 		..()

code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm

@@ -111,10 +111,6 @@
 		charge_delay = 2
 
 /obj/item/clockwork/replica_fabricator/ratvar_act()
-	if(GLOB.nezbere_invoked)
-		charge_rate = 1250
-	else
-		charge_rate = initial(charge_rate)
 	if(GLOB.ratvar_awakens)
 		uses_power = FALSE
 		speed_multiplier = initial(speed_multiplier) * 0.25
@@ -141,7 +137,7 @@
 				to_chat(user, "<span class='warning'>[src] requires <b>[POWER_WALL_TOTAL]W</b> of power to produce brass sheets!</span>")
 				return
 			modify_stored_power(-POWER_WALL_TOTAL)
-		playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
+		playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
 		new/obj/item/stack/tile/brass(user.loc, 5)
 		to_chat(user, "<span class='brass'>You use [stored_power ? "some":"all"] of [src]'s power to produce <b>5</b> brass sheets. It now stores <b>[get_power()]W/[get_max_power()]W</b> of power.</span>")
 
@@ -240,7 +236,7 @@
 				user.visible_message("<span class='warning'>[user]'s [name] rapidly consumes [target]!</span>", \
 				"<span class='brass'>Your [name] consumes [target].</span>")
 
-	playsound(target, 'sound/items/Deconstruct.ogg', 50, 1)
+	playsound(target, 'sound/items/deconstruct.ogg', 50, 1)
 	var/new_thing_type = fabrication_values["new_obj_type"]
 	if(isturf(target)) //if our target is a turf, we're just going to ChangeTurf it and assume it'll work out.
 		var/turf/T = target

code/game/gamemodes/clock_cult/clock_mobs.dm

@@ -13,6 +13,7 @@
 	speak_emote = list("clanks", "clinks", "clunks", "clangs")
 	verb_ask = "requests"
 	verb_exclaim = "proclaims"
+	verb_whisper = "imparts"
 	verb_yell = "harangues"
 	initial_language_holder = /datum/language_holder/clockmob
 	bubble_icon = "clock"

code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm

@@ -272,8 +272,8 @@
 			target.changeNext_move(CLICK_CD_MELEE)
 		blockchance = initial(blockchance)
 		playsound(src, 'sound/magic/clockwork/fellowship_armory.ogg', 30, 1, 0, 1) //clang
-		visible_message("<span class='boldannounce'>[src] blocks [target && istype(textobject, /obj/item) ? "[target]'s [textobject.name]":"\the [textobject]"]!</span>", \
-		"<span class='userdanger'>You block [target && istype(textobject, /obj/item) ? "[target]'s [textobject.name]":"\the [textobject]"]!</span>")
+		visible_message("<span class='boldannounce'>[src] blocks [target && isitem(textobject) ? "[target]'s [textobject.name]":"\the [textobject]"]!</span>", \
+		"<span class='userdanger'>You block [target && isitem(textobject) ? "[target]'s [textobject.name]":"\the [textobject]"]!</span>")
 		if(target && Adjacent(target))
 			if(prob(counterchance))
 				counterchance = initial(counterchance)

code/game/gamemodes/clock_cult/clock_scripture.dm

@@ -253,7 +253,7 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or
 		to_chat(invoker, creator_message)
 	var/obj/O = new object_path (get_turf(invoker))
 	O.ratvar_act() //update the new object so it gets buffed if ratvar is alive
-	if(istype(O, /obj/item))
+	if(isitem(O))
 		invoker.put_in_hands(O)
 	return TRUE
 

code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm

@@ -124,8 +124,7 @@
 		invoker.visible_message("<span class='warning'>The tendril, covered in blood, retracts from [invoker]'s head and back into the [slab.name]!</span>", \
 		"<span class='userdanger'>Total agony overcomes you as the tendril is forced out early!</span>")
 		invoker.notransform = FALSE
-		invoker.Stun(5)
-		invoker.Weaken(5)
+		invoker.Knockdown(100)
 		invoker.apply_damage(10, BRUTE, "head")
 		slab.busy = null
 		return FALSE
@@ -272,7 +271,7 @@
 /datum/clockwork_scripture/create_object/tinkerers_daemon
 	descname = "Powered Structure, Component Generator"
 	name = "Tinkerer's Daemon"
-	desc = "Creates a tinkerer's daemon which can rapidly collect components. It will only function if it has sufficient power, is outnumbered by Servants by a ratio of 5:1, \
+	desc = "Creates a tinkerer's daemon which can rapidly collect components. It will only function if it has sufficient power, active daemons are outnumbered by Servants by a ratio of 5:1, \
 	and there is at least one existing cache."
 	invocations = list("May this generator...", "...collect Engine parts that yet hold greatness!")
 	channel_time = 80
@@ -289,19 +288,6 @@
 	quickbind = TRUE
 	quickbind_desc = "Creates a Tinkerer's Daemon, which can rapidly collect components for power."
 
-/datum/clockwork_scripture/create_object/tinkerers_daemon/check_special_requirements()
-	var/servants = 0
-	for(var/mob/living/L in GLOB.living_mob_list)
-		if(is_servant_of_ratvar(L))
-			servants++
-	if(servants * 0.2 < GLOB.clockwork_daemons)
-		to_chat(invoker, "<span class='nezbere'>\"Daemons are already disabled, making more of them would be a waste.\"</span>")
-		return FALSE
-	if(servants * 0.2 < GLOB.clockwork_daemons+1)
-		to_chat(invoker, "<span class='nezbere'>\"This daemon would be useless, friend.\"</span>")
-		return FALSE
-	return ..()
-
 
 //Clockwork Obelisk: Creates a powerful obelisk that can be used to broadcast messages or open a gateway to any servant or clockwork obelisk at a power cost.
 /datum/clockwork_scripture/create_object/clockwork_obelisk

code/game/gamemodes/clock_cult/clock_scriptures/scripture_cyborg.dm

@@ -37,7 +37,7 @@
 	invocations = list("May heathens...", "...kneel under our force!")
 	channel_time = 30
 	primary_component = BELLIGERENT_EYE
-	quickbind_desc = "Allows you to place a Judicial Marker to stun and damage a target location.<br><b>Click your slab to disable.</b>"
+	quickbind_desc = "Allows you to place a Judicial Marker to knock down and damage non-Servants in an area.<br><b>Click your slab to disable.</b>"
 	slab_icon = "judicial"
 	ranged_type = /obj/effect/proc_holder/slab/judicial
 	ranged_message = "<span class='neovgre_small'><i>You charge the clockwork slab with judicial force.</i>\n\

code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm

@@ -26,10 +26,9 @@
 
 //Judicial Visor: Creates a judicial visor, which can smite an area.
 /datum/clockwork_scripture/create_object/judicial_visor
-	descname = "Delayed Area Stun Glasses"
+	descname = "Delayed Area Knockdown Glasses"
 	name = "Judicial Visor"
-	desc = "Forms a visor that, when worn, will grant the ability to smite an area, stunning, muting, and damaging non-Servants. \
-	Cultists of Nar-Sie will be set on fire, though they will be stunned for half the time."
+	desc = "Forms a visor that, when worn, will grant the ability to smite an area, knocking down, muting, and damaging non-Servants."
 	invocations = list("Grant me the flames of Engine!")
 	channel_time = 10
 	consumed_components = list(BELLIGERENT_EYE = 1)
@@ -42,14 +41,14 @@
 	primary_component = BELLIGERENT_EYE
 	sort_priority = 2
 	quickbind = TRUE
-	quickbind_desc = "Creates a Judicial Visor, which can create a Judicial Marker at an area, stunning, muting, and damaging non-Servants after a delay."
+	quickbind_desc = "Creates a Judicial Visor, which can create a Judicial Marker at an area, knocking down, muting, and damaging non-Servants after a delay."
 
 
 //Vanguard: Provides twenty seconds of stun immunity. At the end of the twenty seconds, 25% of all stuns absorbed are applied to the invoker.
 /datum/clockwork_scripture/vanguard
 	descname = "Self Stun Immunity"
 	name = "Vanguard"
-	desc = "Provides twenty seconds of stun immunity. At the end of the twenty seconds, the invoker is stunned for the equivalent of 25% of all stuns they absorbed. \
+	desc = "Provides twenty seconds of stun immunity. At the end of the twenty seconds, the invoker is knocked down for the equivalent of 25% of all stuns they absorbed. \
 	Excessive absorption will cause unconsciousness."
 	invocations = list("Shield me...", "...from darkness!")
 	channel_time = 30
@@ -171,14 +170,16 @@
 	return target && binding && target.buckled == binding && !is_servant_of_ratvar(target) && target.stat != DEAD
 
 /datum/clockwork_scripture/geis/scripture_effects()
-	return add_servant_of_ratvar(target)
+	. = add_servant_of_ratvar(target)
+	if(.)
+		add_logs(invoker, target, "Converted", object = "Geis")
 
 
 //Taunting Tirade: Channeled for up to five times over thirty seconds. Confuses non-servants that can hear it and allows movement for a brief time after each chant.
 /datum/clockwork_scripture/channeled/taunting_tirade
 	descname = "Channeled, Mobile Confusion Trail"
 	name = "Taunting Tirade"
-	desc = "Allows movement for five seconds, leaving a confusing and weakening trail. Chanted every second for up to thirty seconds."
+	desc = "Allows movement for five seconds, leaving a trail that confuses and knocks down. Chanted every second for up to thirty seconds."
 	chant_invocations = list("Hostiles on my back!", "Enemies on my trail!", "Gonna try and shake my tail.", "Bogeys on my six!")
 	chant_amount = 5
 	chant_interval = 10
@@ -188,7 +189,7 @@
 	primary_component = GEIS_CAPACITOR
 	sort_priority = 6
 	quickbind = TRUE
-	quickbind_desc = "Allows movement for five seconds, leaving a confusing and weakening trail.<br><b>Maximum 5 chants.</b>"
+	quickbind_desc = "Allows movement for five seconds, leaving a trail that confuses and knocks down.<br><b>Maximum 5 chants.</b>"
 	var/flee_time = 47 //allow fleeing for 5 seconds
 	var/grace_period = 3 //very short grace period so you don't have to stop immediately
 	var/datum/progressbar/progbar

code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm

@@ -251,7 +251,7 @@
 	channel_time = 20
 	consumed_components = list(REPLICANT_ALLOY = 2, HIEROPHANT_ANSIBLE = 1)
 	whispered = TRUE
-	usage_tip = "You can impale human targets with the spear by pulling them, then attacking. Throwing the spear at a mob will do massive damage and stun them, but break the spear."
+	usage_tip = "You can impale human targets with the spear by pulling them, then attacking. Throwing the spear at a mob will do massive damage and knock them down, but break the spear."
 	tier = SCRIPTURE_SCRIPT
 	primary_component = REPLICANT_ALLOY
 	sort_priority = 8
@@ -275,7 +275,7 @@
 	desc = "Allows you to summon a Ratvarian spear to fight enemies."
 	button_icon_state = "ratvarian_spear"
 	background_icon_state = "bg_clock"
-	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_CONSCIOUS
+	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUN|AB_CHECK_CONSCIOUS
 	buttontooltipstyle = "clockcult"
 	var/cooldown = 0
 	var/base_cooldown = RATVARIAN_SPEAR_DURATION

code/game/gamemodes/clock_cult/clock_structure.dm

@@ -175,13 +175,6 @@
 	SSobj.processing -= src
 	return ..()
 
-/obj/structure/destructible/clockwork/powered/ratvar_act()
-	..()
-	if(GLOB.nezbere_invoked)
-		needs_power = FALSE
-	else
-		needs_power = initial(needs_power)
-
 /obj/structure/destructible/clockwork/powered/process()
 	var/powered = total_accessable_power()
 	return powered == PROCESS_KILL ? 25 : powered //make sure we don't accidentally return the arbitrary PROCESS_KILL define

code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm

@@ -69,7 +69,7 @@
 	if(!purpose_fulfilled)
 		var/area/gate_area = get_area(src)
 		hierophant_message("<span class='large_brass'><b>An Ark of the Clockwork Justicar has fallen at [gate_area.map_name]!</b></span>")
-		send_to_playing_players(sound(null, 0, channel = 8))
+		send_to_playing_players(sound(null, 0, channel = CHANNEL_JUSTICAR_ARK))
 	var/was_stranded = SSshuttle.emergency.mode == SHUTTLE_STRANDED
 	SSshuttle.clearHostileEnvironment(src)
 	if(!was_stranded && !purpose_fulfilled)
@@ -88,7 +88,7 @@
 			resistance_flags |= INDESTRUCTIBLE
 			countdown.stop()
 			visible_message("<span class='userdanger'>[src] begins to pulse uncontrollably... you might want to run!</span>")
-			send_to_playing_players(sound('sound/effects/clockcult_gateway_disrupted.ogg', 0, channel = 8, volume = 50))
+			send_to_playing_players(sound('sound/effects/clockcult_gateway_disrupted.ogg', 0, channel = CHANNEL_JUSTICAR_ARK, volume = 50))
 			make_glow()
 			glow.icon_state = "clockwork_gateway_disrupted"
 			resistance_flags |= INDESTRUCTIBLE
@@ -204,7 +204,7 @@
 	if(still_needs_components())
 		if(!first_sound_played)
 			priority_announce("Massive energy anomaly detected on short-range scanners. Attempting to triangulate location...", "Anomaly Alert")
-			send_to_playing_players(sound('sound/effects/clockcult_gateway_charging.ogg', 1, channel = 8, volume = 10))
+			send_to_playing_players(sound('sound/effects/clockcult_gateway_charging.ogg', 1, channel = CHANNEL_JUSTICAR_ARK, volume = 10))
 			first_sound_played = TRUE
 		make_glow()
 		glow.icon_state = "clockwork_gateway_components"
@@ -229,7 +229,7 @@
 	switch(progress_in_seconds)
 		if(-INFINITY to GATEWAY_REEBE_FOUND)
 			if(!second_sound_played)
-				send_to_playing_players(sound('sound/effects/clockcult_gateway_charging.ogg', 1, channel = 8, volume = 30))
+				send_to_playing_players(sound('sound/effects/clockcult_gateway_charging.ogg', 1, channel = CHANNEL_JUSTICAR_ARK, volume = 30))
 				second_sound_played = TRUE
 			make_glow()
 			glow.icon_state = "clockwork_gateway_charging"
@@ -237,13 +237,13 @@
 			if(!third_sound_played)
 				var/area/gate_area = get_area(src)
 				priority_announce("Location of massive energy anomaly has been triangulated. Location: [gate_area.map_name].", "Anomaly Alert")
-				send_to_playing_players(sound('sound/effects/clockcult_gateway_active.ogg', 1, channel = 8, volume = 35))
+				send_to_playing_players(sound('sound/effects/clockcult_gateway_active.ogg', 1, channel = CHANNEL_JUSTICAR_ARK, volume = 35))
 				third_sound_played = TRUE
 			make_glow()
 			glow.icon_state = "clockwork_gateway_active"
 		if(GATEWAY_RATVAR_COMING to GATEWAY_RATVAR_ARRIVAL)
 			if(!fourth_sound_played)
-				send_to_playing_players(sound('sound/effects/clockcult_gateway_closing.ogg', 1, channel = 8, volume = 40))
+				send_to_playing_players(sound('sound/effects/clockcult_gateway_closing.ogg', 1, channel = CHANNEL_JUSTICAR_ARK, volume = 40))
 				fourth_sound_played = TRUE
 			make_glow()
 			glow.icon_state = "clockwork_gateway_closing"
@@ -254,7 +254,7 @@
 				purpose_fulfilled = TRUE
 				make_glow()
 				animate(glow, transform = matrix() * 1.5, alpha = 255, time = 125)
-				send_to_playing_players(sound('sound/effects/ratvar_rises.ogg', 0, channel = 8)) //End the sounds
+				send_to_playing_players(sound('sound/effects/ratvar_rises.ogg', 0, channel = CHANNEL_JUSTICAR_ARK)) //End the sounds
 				sleep(125)
 				make_glow()
 				animate(glow, transform = matrix() * 3, alpha = 0, time = 5)

code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm

@@ -13,7 +13,7 @@
 	icon = 'icons/effects/clockwork_effects.dmi'
 	icon_state = "geisbinding_full"
 	break_message = null
-	break_sound = 'sound/magic/Repulse.ogg'
+	break_sound = 'sound/magic/repulse.ogg'
 	debris = list()
 	can_buckle = TRUE
 	buckle_lying = 0
@@ -72,7 +72,7 @@
 		L.resist()
 
 /obj/structure/destructible/clockwork/geis_binding/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
-	playsound(src, 'sound/effects/EMPulse.ogg', 50, 1)
+	playsound(src, 'sound/effects/empulse.ogg', 50, 1)
 
 /obj/structure/destructible/clockwork/geis_binding/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
 	. = ..()
@@ -88,7 +88,7 @@
 	for(var/m in buckled_mobs)
 		var/mob/living/L = m
 		if(L)
-			L.Stun(1, 1, 1)
+			L.Stun(20, 1, 1)
 			if(iscarbon(L))
 				var/mob/living/carbon/C = L
 				C.silent += 4

code/game/gamemodes/clock_cult/clock_structures/interdiction_lens.dm

@@ -9,7 +9,7 @@
 	inactive_icon = "interdiction_lens"
 	unanchored_icon = "interdiction_lens_unwrenched"
 	break_message = "<span class='warning'>The lens flares a blinding violet before the totem beneath it shatters!</span>"
-	break_sound = 'sound/effects/Glassbr3.ogg'
+	break_sound = 'sound/effects/glassbr3.ogg'
 	debris = list(/obj/item/clockwork/alloy_shards/small = 2, \
 	/obj/item/clockwork/alloy_shards/large = 2, \
 	/obj/item/clockwork/component/belligerent_eye/lens_gem = 1)
@@ -137,7 +137,7 @@
 
 		if(power_drained && power_drained >= MIN_CLOCKCULT_POWER && return_power(power_drained))
 			successfulprocess = TRUE
-			playsound(src, 'sound/items/PSHOOM.ogg', 50 * efficiency, 1, interdiction_range-7, 1)
+			playsound(src, 'sound/items/pshoom.ogg', 50 * efficiency, 1, interdiction_range-7, 1)
 
 		if(!successfulprocess)
 			forced_disable()

code/game/gamemodes/clock_cult/clock_structures/mania_motor.dm

@@ -60,6 +60,5 @@
 				M = MM
 				break
 		if(!M)
-			M = H.apply_status_effect(STATUS_EFFECT_MANIAMOTOR)
-			M.motor = src
+			M = H.apply_status_effect(STATUS_EFFECT_MANIAMOTOR, src)
 		M.severity = Clamp(M.severity + ((11 - get_dist(src, H)) * efficiency * efficiency), 0, MAX_MANIA_SEVERITY)

code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm

@@ -50,9 +50,6 @@
 	if(GLOB.ratvar_awakens)
 		damage_per_tick = 10
 		sight_range = 6
-	else if(GLOB.nezbere_invoked)
-		damage_per_tick = 5
-		sight_range = 5
 	else
 		damage_per_tick = initial(damage_per_tick)
 		sight_range = initial(sight_range)

code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm

@@ -26,12 +26,9 @@
 		if(SSshuttle.emergency.mode == SHUTTLE_DOCKED || SSshuttle.emergency.mode == SHUTTLE_IGNITING || SSshuttle.emergency.mode == SHUTTLE_STRANDED || SSshuttle.emergency.mode == SHUTTLE_ESCAPE)
 			to_chat(user, "<span class='inathneq'>An emergency shuttle has arrived and this prism is no longer useful; attempt to activate it to gain a partial refund of components used.</span>")
 		else
-			var/efficiency = get_efficiency_mod()
-			var/efficiency_time = get_efficiency_mod(TRUE)
-			to_chat(user, "<span class='inathneq_small'>It requires at least <b>[get_delay_cost() * efficiency]W</b> of power to attempt to delay the arrival of an emergency shuttle by \
-			<b>[2 * efficiency_time]</b> minutes.</span>")
-			to_chat(user, "<span class='inathneq_small'>This cost increases by <b>[delay_cost_increase * 0.1]W</b> for every <b>10 CV</b> and <b>[delay_cost_increase]W</b> for every previous \
-			activation.</span>")
+			var/efficiency = get_efficiency_mod(TRUE)
+			to_chat(user, "<span class='inathneq_small'>It requires at least <b>[get_delay_cost()]W</b> of power to attempt to delay the arrival of an emergency shuttle by <b>[2 * efficiency]</b> minutes.</span>")
+			to_chat(user, "<span class='inathneq_small'>This cost increases by <b>[delay_cost_increase * 0.1]W</b> for every <b>10 CV</b> and <b>[delay_cost_increase]W</b> for every previous activation.</span>")
 
 /obj/structure/destructible/clockwork/powered/prolonging_prism/forced_disable(bad_effects)
 	if(active)
@@ -58,8 +55,7 @@
 		if(SSshuttle.emergency.mode != SHUTTLE_CALL)
 			to_chat(user, "<span class='warning'>No emergency shuttles are attempting to arrive at the station!</span>")
 			return 0
-		var/efficiency = get_efficiency_mod()
-		if(!try_use_power(get_delay_cost() * efficiency))
+		if(!try_use_power(get_delay_cost()))
 			to_chat(user, "<span class='warning'>[src] needs more power to function!</span>")
 			return 0
 		delay_cost += delay_cost_increase

code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm

@@ -24,7 +24,7 @@
 		O.ratvar_act()
 	START_PROCESSING(SSobj, src)
 	send_to_playing_players("<span class='ratvar'>\"[text2ratvar("ONCE AGAIN MY LIGHT SHALL SHINE ACROSS THIS PATHETIC REALM")]!!\"</span>")
-	send_to_playing_players('sound/effects/ratvar_reveal.ogg')
+	sound_to_playing_players('sound/effects/ratvar_reveal.ogg')
 	var/mutable_appearance/alert_overlay = mutable_appearance('icons/effects/clockwork_effects.dmi', "ratvar_alert")
 	var/area/A = get_area(src)
 	notify_ghosts("The Justiciar's light calls to you! Reach out to Ratvar in [A.name] to be granted a shell to spread his glory!", null, source = src, alert_overlay = alert_overlay)
@@ -69,16 +69,19 @@
 	for(var/mob/living/L in GLOB.living_mob_list) //we want to know who's alive so we don't lose and retarget a single person
 		if(L.z == z && !is_servant_of_ratvar(L) && L.mind)
 			meals += L
+	if(GLOB.cult_narsie && GLOB.cult_narsie.z == z)
+		meals = list(GLOB.cult_narsie) //if you're in the way, handy for him, but ratvar only cares about nar-sie!
+		prey = GLOB.cult_narsie
+		if(get_dist(src, prey) <= 10)
+			clash()
+			return
 	if(!prey)
-		for(var/obj/singularity/narsie/N in GLOB.singularities)
-			if(N.z == z)
-				prey = N
-				break
 		if(!prey && LAZYLEN(meals))
+			var/mob/living/L = prey
 			prey = pick(meals)
 			to_chat(prey, "<span class='heavy_brass'><font size=5>\"You will do, heretic.\"</font></span>\n\
 			<span class='userdanger'>You feel something massive turn its crushing focus to you...</span>")
-			prey << 'sound/effects/ratvar_reveal.ogg'
+			L.playsound_local(prey, 'sound/effects/ratvar_reveal.ogg', 100, FALSE, pressure_affected = FALSE)
 	else
 		if((!istype(prey, /obj/singularity/narsie) && prob(10) && LAZYLEN(meals) > 1) || prey.z != z || !(prey in meals))
 			if(is_servant_of_ratvar(prey))
@@ -92,18 +95,14 @@
 			dir_to_step_in = get_dir(src, prey) //Unlike Nar-Sie, Ratvar ruthlessly chases down his target
 	step(src, dir_to_step_in)
 
-/obj/structure/destructible/clockwork/massive/ratvar/narsie_act()
-	if(clashing)
-		return FALSE
+/obj/structure/destructible/clockwork/massive/ratvar/proc/clash()
+	if(clashing || prey != GLOB.cult_narsie)
+		return
 	clashing = TRUE
+	GLOB.cult_narsie.clashing = TRUE
 	to_chat(world, "<span class='heavy_brass'><font size=5>\"[pick("BLOOD GOD!!!", "NAR-SIE!!!", "AT LAST, YOUR TIME HAS COME!")]\"</font></span>")
 	to_chat(world, "<span class='cult'><font size=5>\"<b>Ratvar?! How?!</b>\"</font></span>")
-	for(var/obj/singularity/narsie/N in range(15, src))
-		if(N.clashing)
-			continue
-		N.clashing = TRUE
-		clash_of_the_titans(N) //IT'S TIME FOR THE BATTLE OF THE AGES
-		break
+	clash_of_the_titans(GLOB.cult_narsie) //IT'S TIME FOR THE BATTLE OF THE AGES
 	return TRUE
 
 //Put me in Reebe, will you? Ratvar has found and is going to fucking murder Nar-Sie
@@ -111,7 +110,7 @@
 	var/winner = "Undeclared"
 	var/base_victory_chance = 1
 	while(src && narsie)
-		send_to_playing_players('sound/magic/clockwork/ratvar_attack.ogg')
+		sound_to_playing_players('sound/magic/clockwork/ratvar_attack.ogg')
 		sleep(5.2)
 		for(var/mob/M in GLOB.mob_list)
 			if(!isnewplayer(M))
@@ -125,7 +124,7 @@
 			winner = "Ratvar"
 			break
 		sleep(rand(2,5))
-		send_to_playing_players('sound/magic/clockwork/narsie_attack.ogg')
+		sound_to_playing_players('sound/magic/clockwork/narsie_attack.ogg')
 		sleep(7.4)
 		for(var/mob/M in GLOB.mob_list)
 			if(!isnewplayer(M))
@@ -139,13 +138,13 @@
 		if("Ratvar")
 			send_to_playing_players("<span class='heavy_brass'><font size=5>\"[pick("DIE! DIE! DIE!", "FILTH!!!", "SUFFER!!!", text2ratvar("ROT FOR CENTURIES AS I HAVE!!"))]\"</font></span>\n\
 			<span class='cult'><font size=5>\"<b>[pick("Nooooo...", "Not die. To y-", "Die. Ratv-", "Sas tyen re-")]\"</b></font></span>") //nar-sie get out
-			send_to_playing_players('sound/magic/clockwork/anima_fragment_attack.ogg')
-			send_to_playing_players('sound/magic/demon_dies.ogg')
+			sound_to_playing_players('sound/magic/clockwork/anima_fragment_attack.ogg')
+			sound_to_playing_players('sound/magic/demon_dies.ogg', 50)
 			clashing = FALSE
 			qdel(narsie)
 		if("Nar-Sie")
 			send_to_playing_players("<span class='cult'><font size=5>\"<b>[pick("Ha.", "Ra'sha fonn dest.", "You fool. To come here.")]</b>\"</font></span>") //Broken English
-			send_to_playing_players('sound/magic/demon_attack1.ogg')
-			send_to_playing_players('sound/magic/clockwork/anima_fragment_death.ogg')
+			sound_to_playing_players('sound/magic/demon_attack1.ogg')
+			sound_to_playing_players('sound/magic/clockwork/anima_fragment_death.ogg', 50)
 			narsie.clashing = FALSE
 			qdel(src)

code/game/gamemodes/clock_cult/clock_structures/taunting_trail.dm

@@ -2,7 +2,7 @@
 /obj/structure/destructible/clockwork/taunting_trail
 	name = "strange smoke"
 	desc = "A cloud of purple smoke."
-	clockwork_desc = "A cloud of purple smoke that confuses and weakens non-Servants that enter it."
+	clockwork_desc = "A cloud of purple smoke that confuses and knocks down non-Servants that enter it."
 	gender = PLURAL
 	max_integrity = 5
 	obj_integrity = 5
@@ -11,7 +11,7 @@
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "smoke"
 	break_message = null
-	break_sound = 'sound/magic/Teleport_app.ogg'
+	break_sound = 'sound/magic/teleport_app.ogg'
 	debris = list()
 	var/timerid
 
@@ -35,7 +35,7 @@
 	return ..()
 
 /obj/structure/destructible/clockwork/taunting_trail/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
-	playsound(src, 'sound/items/Welder.ogg', 50, 1)
+	playsound(src, 'sound/items/welder.ogg', 50, 1)
 
 /obj/structure/destructible/clockwork/taunting_trail/CanPass(atom/movable/mover, turf/target, height=0)
 	return TRUE
@@ -58,5 +58,5 @@
 			L.confused = min(L.confused + 15, 50)
 			L.dizziness = min(L.dizziness + 15, 50)
 			if(L.confused >= 25)
-				L.Weaken(Floor(L.confused * 0.04))
+				L.Knockdown(Floor(L.confused * 0.8))
 		take_damage(max_integrity)

code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm

@@ -2,7 +2,7 @@
 /obj/structure/destructible/clockwork/powered/tinkerers_daemon
 	name = "tinkerer's daemon"
 	desc = "A strange machine with three small brass obelisks attached to it."
-	clockwork_desc = "An efficient machine that can rapidly produce components at a small power cost. It will only function if outnumbered by servants at a rate to 5:1."
+	clockwork_desc = "An efficient machine that can rapidly produce components at a small power cost. It will only function if active daemons are outnumbered by servants at a rate to 5:1."
 	icon_state = "tinkerers_daemon"
 	active_icon = "tinkerers_daemon"
 	inactive_icon = "tinkerers_daemon"
@@ -18,26 +18,12 @@
 	var/static/mutable_appearance/component_glow = mutable_appearance('icons/obj/clockwork_objects.dmi', "t_random_component")
 	var/component_id_to_produce
 	var/production_time = 0 //last time we produced a component
-	var/production_cooldown = 60
-
-/obj/structure/destructible/clockwork/powered/tinkerers_daemon/Initialize()
-	. = ..()
-	GLOB.clockwork_daemons++
+	var/production_cooldown = 70
 
 /obj/structure/destructible/clockwork/powered/tinkerers_daemon/Destroy()
-	GLOB.clockwork_daemons--
+	GLOB.active_daemons -= src
 	return ..()
 
-/obj/structure/destructible/clockwork/powered/tinkerers_daemon/ratvar_act()
-	..()
-	if(GLOB.nezbere_invoked)
-		production_time = 0
-		production_cooldown = initial(production_cooldown) * 0.5
-		if(!active)
-			toggle(0)
-	else
-		production_cooldown = initial(production_cooldown)
-
 /obj/structure/destructible/clockwork/powered/tinkerers_daemon/examine(mob/user)
 	..()
 	if(is_servant_of_ratvar(user) || isobserver(user))
@@ -71,13 +57,6 @@
 		if(!anchored)
 			to_chat(user, "<span class='warning'>[src] needs to be secured to the floor before it can be activated!</span>")
 			return FALSE
-		var/servants = 0
-		for(var/mob/living/L in GLOB.living_mob_list)
-			if(is_servant_of_ratvar(L))
-				servants++
-		if(servants * 0.2 < GLOB.clockwork_daemons)
-			to_chat(user, "<span class='nezbere'>\"There are too few servants for this daemon to work.\"</span>")
-			return
 		if(!GLOB.clockwork_caches)
 			to_chat(user, "<span class='nezbere'>\"You require a cache for this daemon to operate. Get to it.\"</span>")
 			return
@@ -90,6 +69,13 @@
 		if(total_accessable_power() < min_power_usable)
 			to_chat(user, "<span class='nezbere'>\"You need more power to activate this daemon, friend.\"</span>")
 			return
+		var/servants = 0
+		for(var/mob/living/L in GLOB.living_mob_list)
+			if(is_servant_of_ratvar(L))
+				servants++
+		if(servants * 0.2 < 1)
+			to_chat(user, "<span class='nezbere'>\"There are too few servants for daemons to work.\"</span>")
+			return
 		var/choice = alert(user,"Activate Daemon...",,"Specific Component","Random Component","Cancel")
 		switch(choice)
 			if("Specific Component")
@@ -102,7 +88,7 @@
 				for(var/mob/living/L in GLOB.living_mob_list)
 					if(is_servant_of_ratvar(L))
 						servants++
-				if(!is_servant_of_ratvar(user) || !user.canUseTopic(src, !issilicon(user), NO_DEXTERY) || active || !GLOB.clockwork_caches || servants * 0.2 < GLOB.clockwork_daemons)
+				if(!is_servant_of_ratvar(user) || !user.canUseTopic(src, !issilicon(user), NO_DEXTERY) || active || !GLOB.clockwork_caches || servants * 0.2 < 1)
 					return
 				if(!component_id_to_produce)
 					to_chat(user, "<span class='warning'>You decide not to select a component and activate the daemon.</span>")
@@ -113,11 +99,18 @@
 				toggle(0, user)
 			if("Random Component")
 				component_id_to_produce = null
+				servants = 0
+				for(var/mob/living/L in GLOB.living_mob_list)
+					if(is_servant_of_ratvar(L))
+						servants++
+				if(!is_servant_of_ratvar(user) || !user.canUseTopic(src, !issilicon(user), NO_DEXTERY) || active || !GLOB.clockwork_caches || servants * 0.2 < 1)
+					return
 				toggle(0, user)
 
 /obj/structure/destructible/clockwork/powered/tinkerers_daemon/toggle(fast_process, mob/living/user)
 	. = ..()
 	if(active)
+		GLOB.active_daemons += src
 		var/component_color = get_component_color(component_id_to_produce)
 		daemon_glow.color = component_color
 		add_overlay(daemon_glow)
@@ -127,6 +120,7 @@
 		production_time = world.time + production_cooldown //don't immediately produce when turned on after being off
 		set_light(2, 0.9, get_component_color_bright(component_id_to_produce))
 	else
+		GLOB.active_daemons -= src
 		cut_overlays()
 		set_light(0)
 
@@ -138,6 +132,14 @@
 	for(var/mob/living/L in GLOB.living_mob_list)
 		if(is_servant_of_ratvar(L))
 			servants++
+	while(servants * 0.2 < LAZYLEN(GLOB.active_daemons))
+		var/obj/structure/destructible/clockwork/powered/tinkerers_daemon/D = GLOB.active_daemons[1]
+		if(!istype(D))
+			break
+		if(D.active)
+			D.forced_disable(FALSE)
+			if(D == src)
+				return
 	. = ..()
 	var/min_power_usable = 0
 	if(!component_id_to_produce)
@@ -148,7 +150,7 @@
 				min_power_usable = min(min_power_usable, get_component_cost(i))
 	else
 		min_power_usable = get_component_cost(component_id_to_produce)
-	if(!GLOB.clockwork_caches || servants * 0.2 < GLOB.clockwork_daemons || . < min_power_usable) //if we don't have enough to produce the lowest or what we chose to produce, cancel out
+	if(!GLOB.clockwork_caches || . < min_power_usable) //if we don't have enough to produce the lowest or what we chose to produce, cancel out
 		forced_disable(FALSE)
 		return
 	if(production_time <= world.time)

code/game/gamemodes/cult/cult.dm

@@ -156,7 +156,7 @@
 		return 0
 	if(cult_mind.add_antag_datum(ANTAG_DATUM_CULT))
 		if(stun)
-			cult_mind.current.Paralyse(5)
+			cult_mind.current.Unconscious(100)
 		return 1
 
 /datum/game_mode/proc/remove_cultist(datum/mind/cult_mind, silent, stun)
@@ -167,7 +167,7 @@
 		cult_datum.silent = silent
 		cult_datum.on_removal()
 		if(stun)
-			cult_mind.current.Paralyse(5)
+			cult_mind.current.Unconscious(100)
 		return TRUE
 
 /datum/game_mode/proc/update_cult_icons_added(datum/mind/cult_mind)
@@ -294,4 +294,4 @@
 						SSblackbox.add_details("cult_objective","cult_narsie|FAIL")
 						SSticker.news_report = CULT_FAILURE
 			text += "<br><B>Objective #[obj_count]</B>: [explanation]"
-	to_chat(world, text)
+	to_chat(world, text)

code/game/gamemodes/cult/cult_comms.dm

@@ -4,7 +4,7 @@
 /datum/action/innate/cult
 	background_icon_state = "bg_demon"
 	buttontooltipstyle = "cult"
-	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_CONSCIOUS
+	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUN|AB_CHECK_CONSCIOUS
 
 /datum/action/innate/cult/IsAvailable()
 	if(!iscultist(owner))

code/game/gamemodes/cult/cult_items.dm

@@ -14,7 +14,7 @@
 
 /obj/item/weapon/melee/cultblade/attack(mob/living/target, mob/living/carbon/human/user)
 	if(!iscultist(user))
-		user.Weaken(5)
+		user.Knockdown(100)
 		user.dropItemToGround(src, TRUE)
 		user.visible_message("<span class='warning'>A powerful force shoves [user] away from [target]!</span>", \
 							 "<span class='cultlarge'>\"You shouldn't play with sharp things. You'll poke someone's eye out.\"</span>")
@@ -28,7 +28,7 @@
 
 /obj/item/weapon/melee/cultblade/ghost
 	name = "eldritch sword"
-	force = 19
+	force = 19 //can't break normal airlocks
 	flags = NODROP|DROPDEL
 
 /obj/item/weapon/melee/cultblade/pickup(mob/living/user)
@@ -69,7 +69,7 @@
 	desc = "A strong bola, bound with dark magic. Throw it to trip and slow your victim."
 	icon_state = "bola_cult"
 	breakouttime = 45
-	weaken = 1
+	knockdown = 10
 
 
 /obj/item/clothing/head/culthood
@@ -192,7 +192,7 @@
 			to_chat(user, "<span class='warning'>An overwhelming sense of nausea overpowers you!</span>")
 			user.dropItemToGround(src, TRUE)
 			user.Dizzy(30)
-			user.Weaken(5)
+			user.Knockdown(100)
 		else
 			to_chat(user, "<span class='cultlarge'>\"Trying to use things you don't own is bad, you know.\"</span>")
 			to_chat(user, "<span class='userdanger'>The armor squeezes at your body!</span>")
@@ -200,7 +200,7 @@
 			user.adjustBruteLoss(25)
 			user.dropItemToGround(src, TRUE)
 
-/obj/item/clothing/suit/hooded/cultrobes/cult_shield/hit_reaction(mob/living/carbon/human/owner, attack_text, isinhands)
+/obj/item/clothing/suit/hooded/cultrobes/cult_shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	if(current_charges)
 		owner.visible_message("<span class='danger'>\The [attack_text] is deflected in a burst of blood-red sparks!</span>")
 		current_charges--
@@ -244,7 +244,7 @@
 			to_chat(user, "<span class='warning'>An overwhelming sense of nausea overpowers you!</span>")
 			user.dropItemToGround(src, TRUE)
 			user.Dizzy(30)
-			user.Weaken(5)
+			user.Knockdown(100)
 		else
 			to_chat(user, "<span class='cultlarge'>\"Trying to use things you don't own is bad, you know.\"</span>")
 			to_chat(user, "<span class='userdanger'>The robes squeeze at your body!</span>")
@@ -260,13 +260,13 @@
 	darkness_view = 8
 	flash_protect = 1
 
-/obj/item/clothing/glasses/night/cultblind/equipped(mob/user, slot)
+/obj/item/clothing/glasses/night/cultblind/equipped(mob/living/user, slot)
 	..()
 	if(!iscultist(user))
 		to_chat(user, "<span class='cultlarge'>\"You want to be blind, do you?\"</span>")
 		user.dropItemToGround(src, TRUE)
 		user.Dizzy(30)
-		user.Weaken(5)
+		user.Knockdown(100)
 		user.blind_eyes(30)
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/unholywater
@@ -283,10 +283,10 @@
 	icon_state ="shuttlecurse"
 	var/global/curselimit = 0
 
-/obj/item/device/shuttle_curse/attack_self(mob/user)
+/obj/item/device/shuttle_curse/attack_self(mob/living/user)
 	if(!iscultist(user))
 		user.dropItemToGround(src, TRUE)
-		user.Weaken(5)
+		user.Knockdown(100)
 		to_chat(user, "<span class='warning'>A powerful force shoves you away from [src]!</span>")
 		return
 	if(curselimit > 1)
@@ -301,7 +301,7 @@
 		var/timer = SSshuttle.emergency.timeLeft(1) + cursetime
 		SSshuttle.emergency.setTimer(timer)
 		to_chat(user, "<span class='danger'>You shatter the orb! A dark essence spirals into the air, then disappears.</span>")
-		playsound(user.loc, 'sound/effects/Glassbr1.ogg', 50, 1)
+		playsound(user.loc, 'sound/effects/glassbr1.ogg', 50, 1)
 		qdel(src)
 		sleep(20)
 		var/global/list/curses

code/game/gamemodes/cult/cult_structures.dm

@@ -129,7 +129,7 @@
 	icon_state = "pylon"
 	light_range = 5
 	light_color = LIGHT_COLOR_RED
-	break_sound = 'sound/effects/Glassbr2.ogg'
+	break_sound = 'sound/effects/glassbr2.ogg'
 	break_message = "<span class='warning'>The blood-red crystal falls to the floor and shatters!</span>"
 	var/heal_delay = 25
 	var/last_heal = 0

code/game/gamemodes/cult/ritual.dm

@@ -218,7 +218,7 @@ This file contains the arcane tome files.
 		if(!(A in GLOB.summon_spots))  // Check again to make sure they didn't move
 			to_chat(user, "<span class='cultlarge'>The Geometer can only be summoned where the veil is weak - in [english_list(GLOB.summon_spots)]!</span>")
 			return
-		priority_announce("Figments from an eldritch god are being summoned by [user] into [A.map_name] from an unknown dimension. Disrupt the ritual at all costs!","Central Command Higher Dimensional Affairs", 'sound/AI/spanomalies.ogg')
+		priority_announce("Figments from an eldritch god are being summoned by [user] into [A.map_name] from an unknown dimension. Disrupt the ritual at all costs!","Central Command Higher Dimensional Affairs", 'sound/ai/spanomalies.ogg')
 		for(var/B in spiral_range_turfs(1, user, 1))
 			var/obj/structure/emergency_shield/sanguine/N = new(B)
 			shields += N

code/game/gamemodes/cult/runes.dm

@@ -357,7 +357,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 			L.visible_message("<span class='warning'>[L]'s eyes glow a defiant yellow!</span>", \
 			"<span class='cultlarge'>\"Stop resisting. You <i>will</i> be mi-\"</span>\n\
 			<span class='large_brass'>\"Give up and you will feel pain unlike anything you've ever felt!\"</span>")
-			L.Weaken(4)
+			L.Knockdown(80)
 		else if(is_convertable)
 			do_convert(L, invokers)
 	else
@@ -429,10 +429,10 @@ structure_check() searches for nearby cultist structures required for the invoca
 
 	if(sacrificial)
 		if(iscyborg(sacrificial))
-			playsound(sacrificial, 'sound/magic/Disable_Tech.ogg', 100, 1)
+			playsound(sacrificial, 'sound/magic/disable_tech.ogg', 100, 1)
 			sacrificial.dust() //To prevent the MMI from remaining
 		else
-			playsound(sacrificial, 'sound/magic/Disintegrate.ogg', 100, 1)
+			playsound(sacrificial, 'sound/magic/disintegrate.ogg', 100, 1)
 			sacrificial.gib()
 	return TRUE
 
@@ -603,19 +603,19 @@ structure_check() searches for nearby cultist structures required for the invoca
 	visible_message("<span class='warning'>[src] glows blue for a moment before vanishing.</span>")
 	switch(invokers.len)
 		if(1 to 2)
-			playsound(E, 'sound/items/Welder2.ogg', 25, 1)
+			playsound(E, 'sound/items/welder2.ogg', 25, 1)
 			for(var/M in invokers)
 				to_chat(M, "<span class='warning'>You feel a minute vibration pass through you...</span>")
 		if(3 to 6)
-			playsound(E, 'sound/magic/Disable_Tech.ogg', 50, 1)
+			playsound(E, 'sound/magic/disable_tech.ogg', 50, 1)
 			for(var/M in invokers)
-				to_chat(M, "<span class='danger'>Your hair stands on end as a shockwave eminates from the rune!</span>")
+				to_chat(M, "<span class='danger'>Your hair stands on end as a shockwave emanates from the rune!</span>")
 		if(7 to INFINITY)
-			playsound(E, 'sound/magic/Disable_Tech.ogg', 100, 1)
+			playsound(E, 'sound/magic/disable_tech.ogg', 100, 1)
 			for(var/M in invokers)
 				var/mob/living/L = M
 				to_chat(L, "<span class='userdanger'>You chant in unison and a colossal burst of energy knocks you backward!</span>")
-				L.Weaken(2)
+				L.Knockdown(40)
 	qdel(src) //delete before pulsing because it's a delay reee
 	empulse(E, 9*invokers.len, 12*invokers.len) // Scales now, from a single room to most of the station depending on # of chanters
 
@@ -671,7 +671,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 			affecting.visible_message("<span class='warning'>[affecting] slowly relaxes, the glow around [affecting.p_them()] dimming.</span>", \
 								 "<span class='danger'>You are re-united with your physical form. [src] releases its hold over you.</span>")
 			affecting.remove_atom_colour(ADMIN_COLOUR_PRIORITY, RUNE_COLOR_DARKRED)
-			affecting.Weaken(3)
+			affecting.Knockdown(60)
 			break
 		if(affecting.stat == UNCONSCIOUS)
 			if(prob(1))
@@ -958,4 +958,4 @@ structure_check() searches for nearby cultist structures required for the invoca
 								  "<span class='cultlarge'>Your link to the world fades. Your form breaks apart.</span>")
 		for(var/obj/I in new_human)
 			new_human.dropItemToGround(I, TRUE)
-		new_human.dust()
+		new_human.dust()

code/game/gamemodes/cult/talisman.dm

@@ -169,8 +169,7 @@
 			target.visible_message("<span class='warning'>[target]'s holy weapon absorbs the talisman's light!</span>", \
 								   "<span class='userdanger'>Your holy weapon absorbs the blinding light!</span>")
 		else
-			target.Weaken(10)
-			target.Stun(10)
+			target.Knockdown(200)
 			target.flash_act(1,1)
 			if(issilicon(target))
 				var/mob/living/silicon/S = target

code/game/gamemodes/devil/devil.dm

@@ -31,8 +31,8 @@
 				return 2.5 // Will take four hits with a normal toolbox to crit.
 		if(BANE_HARVEST)
 			if(istype(weapon,/obj/item/weapon/reagent_containers/food/snacks/grown/))
-				src.visible_message("<span class='warning'>The spirits of the harvest aid in the exorcism.</span>", "<span class='notice'>The harvest spirits are harming you.</span>")
-				src.Weaken(2)
+				visible_message("<span class='warning'>The spirits of the harvest aid in the exorcism.</span>", "<span class='notice'>The harvest spirits are harming you.</span>")
+				Knockdown(40)
 				qdel(weapon)
 				return 2
 	return 1

code/game/gamemodes/devil/true_devil/_true_devil.dm

@@ -23,13 +23,9 @@
 	bodyparts = list(/obj/item/bodypart/chest/devil, /obj/item/bodypart/head/devil, /obj/item/bodypart/l_arm/devil,
 					 /obj/item/bodypart/r_arm/devil, /obj/item/bodypart/r_leg/devil, /obj/item/bodypart/l_leg/devil)
 
-
-
 /mob/living/carbon/true_devil/Initialize()
 	create_bodyparts() //initialize bodyparts
-
 	create_internal_organs()
-
 	grant_all_languages(omnitongue=TRUE)
 	..()
 
@@ -37,9 +33,9 @@
 	internal_organs += new /obj/item/organ/brain
 	internal_organs += new /obj/item/organ/tongue
 	internal_organs += new /obj/item/organ/eyes
+	internal_organs += new /obj/item/organ/ears/invincible //Prevents hearing loss from poorly aimed fireballs.
 	..()
 
-
 /mob/living/carbon/true_devil/proc/convert_to_archdevil()
 	maxHealth = 500 // not an IMPOSSIBLE amount, but still near impossible.
 	ascended = TRUE
@@ -57,7 +53,6 @@
 	devilinfo.greet()
 	mind.announce_objectives()
 
-
 /mob/living/carbon/true_devil/death(gibbed)
 	stat = DEAD
 	..(gibbed)
@@ -90,10 +85,15 @@
 	msg += "*---------*</span>"
 	to_chat(user, msg)
 
-
 /mob/living/carbon/true_devil/IsAdvancedToolUser()
 	return 1
 
+/mob/living/carbon/true_devil/resist_buckle()
+	if(buckled)
+		buckled.user_unbuckle_mob(src,src)
+		visible_message("<span class='warning'>[src] easily breaks out of their handcuffs!</span>", \
+					"<span class='notice'>With just a thought your handcuffs fall off.</span>")
+
 /mob/living/carbon/true_devil/canUseTopic(atom/movable/M, be_close = 0)
 	if(incapacitated())
 		return 0
@@ -101,7 +101,7 @@
 		return 0
 	return 1
 
-/mob/living/carbon/true_devil/assess_threat()
+/mob/living/carbon/true_devil/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null)
 	return 666
 
 /mob/living/carbon/true_devil/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0)
@@ -177,7 +177,7 @@
 			if ("disarm")
 				if (!lying && !ascended) //No stealing the arch devil's pitchfork.
 					if (prob(5))
-						Paralyse(2)
+						Unconscious(40)
 						playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 						add_logs(M, src, "pushed")
 						visible_message("<span class='danger'>[M] has pushed down [src]!</span>", \

code/game/gamemodes/events.dm

@@ -1,5 +1,5 @@
 /proc/power_failure()
-	priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", 'sound/AI/poweroff.ogg')
+	priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", 'sound/ai/poweroff.ogg')
 	for(var/obj/machinery/power/smes/S in GLOB.machines)
 		if(istype(get_area(S), /area/ai_monitored/turret_protected) || S.z != ZLEVEL_STATION)
 			continue
@@ -46,7 +46,7 @@
 
 /proc/power_restore()
 
-	priority_announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/AI/poweron.ogg')
+	priority_announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/ai/poweron.ogg')
 	for(var/obj/machinery/power/apc/C in GLOB.machines)
 		if(C.cell && C.z == ZLEVEL_STATION)
 			C.cell.charge = C.cell.maxcharge
@@ -68,7 +68,7 @@
 
 /proc/power_restore_quick()
 
-	priority_announce("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/AI/poweron.ogg')
+	priority_announce("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/ai/poweron.ogg')
 	for(var/obj/machinery/power/smes/S in GLOB.machines)
 		if(S.z != ZLEVEL_STATION)
 			continue

code/game/gamemodes/extended/extended.dm

@@ -1,26 +1,26 @@
-/datum/game_mode/extended
-	name = "secret extended"
+/datum/game_mode/extended
+	name = "secret extended"
 	config_tag = "secret_extended"
-	required_players = 0
-
-	announce_span = "notice"
-	announce_text = "Just have fun and enjoy the game!"
-
-/datum/game_mode/extended/pre_setup()
-	return 1
-
-/datum/game_mode/extended/post_setup()
-	..()
-
-/datum/game_mode/extended/announced
-	name = "extended"
-	config_tag = "extended"
-
-/datum/game_mode/extended/announced/generate_station_goals()
-	for(var/T in subtypesof(/datum/station_goal))
-		var/datum/station_goal/G = new T
-		station_goals += G
-		G.on_report()
-
-/datum/game_mode/extended/announced/send_intercept(report = 0)
-	priority_announce("Thanks to the tireless efforts of our security and intelligence divisions, there are currently no credible threats to [station_name()]. All station construction projects have been authorized. Have a secure shift!", "Security Report", 'sound/AI/commandreport.ogg')
+	required_players = 0
+
+	announce_span = "notice"
+	announce_text = "Just have fun and enjoy the game!"
+
+/datum/game_mode/extended/pre_setup()
+	return 1
+
+/datum/game_mode/extended/post_setup()
+	..()
+
+/datum/game_mode/extended/announced
+	name = "extended"
+	config_tag = "extended"
+
+/datum/game_mode/extended/announced/generate_station_goals()
+	for(var/T in subtypesof(/datum/station_goal))
+		var/datum/station_goal/G = new T
+		station_goals += G
+		G.on_report()
+
+/datum/game_mode/extended/announced/send_intercept(report = 0)
+	priority_announce("Thanks to the tireless efforts of our security and intelligence divisions, there are currently no credible threats to [station_name()]. All station construction projects have been authorized. Have a secure shift!", "Security Report", 'sound/ai/commandreport.ogg')

code/game/gamemodes/game_mode.dm

@@ -44,6 +44,7 @@
 
 	var/list/datum/station_goal/station_goals = list()
 
+	var/allow_persistence_save = TRUE
 
 /datum/game_mode/proc/announce() //Shows the gamemode's name and a fast description.
 	to_chat(world, "<b>The gamemode is: <span class='[announce_span]'>[name]</span>!</b>")
@@ -54,7 +55,7 @@
 /datum/game_mode/proc/can_start()
 	var/playerC = 0
 	for(var/mob/dead/new_player/player in GLOB.player_list)
-		if((player.client)&&(player.ready))
+		if((player.client)&&(player.ready == PLAYER_READY_TO_PLAY))
 			playerC++
 	if(!GLOB.Debug2)
 		if(playerC < required_players || (maximum_players >= 0 && playerC > maximum_players))
@@ -268,42 +269,6 @@
 	if(cult.len && !istype(SSticker.mode,/datum/game_mode/cult))
 		datum_cult_completion()
 
-	if(GLOB.borers.len)
-		var/borerwin = FALSE
-		var/borertext = "<br><font size=3><b>The borers were:</b></font>"
-		for(var/mob/living/simple_animal/borer/B in GLOB.borers)
-			if((B.key || B.controlling) && B.stat != DEAD)
-				borertext += "<br>[B.controlling ? B.victim.key : B.key] was [B.truename] ("
-				var/turf/location = get_turf(B)
-				if(location.z == ZLEVEL_CENTCOM && B.victim)
-					borertext += "escaped with host"
-				else
-					borertext += "failed"
-				borertext += ")"
-		to_chat(world, borertext)
-
-		var/total_borers = 0
-		for(var/mob/living/simple_animal/borer/B in GLOB.borers)
-			if((B.key || B.victim) && B.stat != DEAD)
-				total_borers++
-		if(total_borers)
-			var/total_borer_hosts = 0
-			for(var/mob/living/carbon/C in GLOB.mob_list)
-				var/mob/living/simple_animal/borer/D = C.has_brain_worms()
-				var/turf/location = get_turf(C)
-				if(location.z == ZLEVEL_CENTCOM && D && D.stat != DEAD)
-					total_borer_hosts++
-			if(GLOB.total_borer_hosts_needed <= total_borer_hosts)
-				borerwin = TRUE
-			to_chat(world, "<b>There were [total_borers] borers alive at round end!</b>")
-			to_chat(world, "<b>A total of [total_borer_hosts] borers with hosts escaped on the shuttle alive. The borers needed [GLOB.total_borer_hosts_needed] hosts to escape.</b>")
-			if(borerwin)
-				to_chat(world, "<b><font color='green'>The borers were successful!</font></b>")
-			else
-				to_chat(world, "<b><font color='red'>The borers have failed!</font></b>")
-
-		CHECK_TICK
-
 	return 0
 
 
@@ -336,7 +301,7 @@
 			intercepttext += G.get_report()
 
 	print_command_report(intercepttext, "Central Command Status Summary", announce=FALSE)
-	priority_announce("A summary has been copied and printed to all communications consoles.", "Enemy communication intercepted. Security level elevated.", 'sound/AI/intercept.ogg')
+	priority_announce("A summary has been copied and printed to all communications consoles.", "Enemy communication intercepted. Security level elevated.", 'sound/ai/intercept.ogg')
 	if(GLOB.security_level < SEC_LEVEL_BLUE)
 		set_security_level(SEC_LEVEL_BLUE)
 
@@ -417,6 +382,7 @@
 							//			Less if there are not enough valid players in the game entirely to make recommended_enemies.
 
 
+
 /datum/game_mode/proc/num_players()
 	. = 0
 	for(var/mob/dead/new_player/P in GLOB.player_list)
@@ -592,4 +558,4 @@
 /datum/game_mode/proc/declare_station_goal_completion()
 	for(var/V in station_goals)
 		var/datum/station_goal/G = V
-		G.print_result()
+		G.print_result()

code/game/gamemodes/gang/dominator.dm

@@ -98,7 +98,7 @@
 			else
 				playsound(loc, 'sound/weapons/tap.ogg', 50, 1)
 		if(BURN)
-			playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
+			playsound(src.loc, 'sound/items/welder.ogg', 100, 1)
 
 /obj/machinery/dominator/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1)
 	. = ..()
@@ -228,4 +228,4 @@
 		gang.message_gangtools("Hostile takeover in progress: Estimated [time] minutes until victory.[gang.dom_attempts ? "" : " This is your final attempt."]")
 		for(var/datum/gang/G in SSticker.mode.gangs)
 			if(G != gang)
-				G.message_gangtools("Enemy takeover attempt detected in [locname]: Estimated [time] minutes until our defeat.",1,1)
+				G.message_gangtools("Enemy takeover attempt detected in [locname]: Estimated [time] minutes until our defeat.",1,1)

code/game/gamemodes/gang/gang.dm

@@ -178,7 +178,7 @@ GLOBAL_LIST_INIT(gang_outfit_pool, list(/obj/item/clothing/suit/jacket/leather,/
 			var/mob/living/carbon/carbon_mob = gangster_mind.current
 			carbon_mob.silent = max(carbon_mob.silent, 5)
 			carbon_mob.flash_act(1, 1)
-		gangster_mind.current.Stun(5)
+		gangster_mind.current.Stun(100)
 	if(G.is_deconvertible)
 		to_chat(gangster_mind.current, "<FONT size=3 color=red><B>You are now a member of the [G.name] Gang!</B></FONT>")
 		to_chat(gangster_mind.current, "<font color='red'>Help your bosses take over the station by claiming territory with <b>special spraycans</b> only they can provide. Simply spray on any unclaimed area of the station.</font>")
@@ -241,7 +241,7 @@ GLOBAL_LIST_INIT(gang_outfit_pool, list(/obj/item/clothing/suit/jacket/leather,/
 			message_admins("[ADMIN_LOOKUPFLW(gangster_mind.current)] has been borged while being a member of the [gang.name] Gang. They are no longer a gangster.")
 		else
 			if(!silent)
-				gangster_mind.current.Paralyse(5)
+				gangster_mind.current.Unconscious(100)
 				gangster_mind.current.visible_message("<FONT size=3><B>[gangster_mind.current] looks like they've given up the life of crime!<B></font>")
 			to_chat(gangster_mind.current, "<FONT size=3 color=red><B>You have been reformed! You are no longer a gangster!</B><BR>You try as hard as you can, but you can't seem to recall any of the identities of your former gangsters...</FONT>")
 			gangster_mind.memory = ""

code/game/gamemodes/gang/gang_items.dm

@@ -345,7 +345,6 @@
 	if(spawn_msg)
 		to_chat(user, spawn_msg)
 
-
 /datum/gang_item/equipment/wetwork_boots
 	name = "Wetwork boots"
 	id = "wetwork"

code/game/gamemodes/gang/gang_pen.dm

@@ -35,7 +35,7 @@
 							cooldown(G)
 						if(2)
 							new /obj/item/device/gangtool/soldier(M)
-							M.Paralyse(5)
+							M.Unconscious(100)
 							cooldown(G)
 						if(1)
 							to_chat(user, "<span class='warning'>This mind is resistant to recruitment!</span>")

code/game/gamemodes/gang/recaller.dm

@@ -226,7 +226,7 @@
 /obj/item/device/gangtool/proc/can_use(mob/living/carbon/human/user)
 	if(!istype(user))
 		return 0
-	if(user.restrained() || user.lying || user.stat || user.stunned || user.weakened)
+	if(user.incapacitated())
 		return 0
 	if(!(src in user.contents))
 		return 0

code/game/gamemodes/meteor/meteor.dm

@@ -1,55 +1,55 @@
-/datum/game_mode/meteor
-	name = "meteor"
-	config_tag = "meteor"
-	var/meteordelay = 2000
-	var/nometeors = 0
-	var/rampupdelta = 5
-	required_players = 0
-
-	announce_span = "danger"
-	announce_text = "A major meteor shower is bombarding the station! The crew needs to evacuate or survive the onslaught."
-
-
-/datum/game_mode/meteor/process()
-	if(nometeors || meteordelay > world.time - SSticker.round_start_time)
-		return
-
-	var/list/wavetype = GLOB.meteors_normal
-	var/meteorminutes = (world.time - SSticker.round_start_time - meteordelay) / 10 / 60
-
-
-	if (prob(meteorminutes))
-		wavetype = GLOB.meteors_threatening
-
-	if (prob(meteorminutes/2))
-		wavetype = GLOB.meteors_catastrophic
-
-	var/ramp_up_final = Clamp(round(meteorminutes/rampupdelta), 1, 10)
-
-	spawn_meteors(ramp_up_final, wavetype)
-
-
-/datum/game_mode/meteor/declare_completion()
-	var/text
-	var/survivors = 0
-
-	for(var/mob/living/player in GLOB.player_list)
-		if(player.stat != DEAD)
-			++survivors
-
-			if(player.onCentcom())
-				text += "<br><b><font size=2>[player.real_name] escaped to the safety of Centcom.</font></b>"
-			else if(player.onSyndieBase())
-				text += "<br><b><font size=2>[player.real_name] escaped to the (relative) safety of Syndicate Space.</font></b>"
-			else
-				text += "<br><font size=1>[player.real_name] survived but is stranded without any hope of rescue.</font>"
-
-
-	if(survivors)
-		to_chat(world, "<span class='boldnotice'>The following survived the meteor storm</span>:[text]")
-	else
-		to_chat(world, "<span class='boldnotice'>Nobody survived the meteor storm!</span>")
-
+/datum/game_mode/meteor
+	name = "meteor"
+	config_tag = "meteor"
+	var/meteordelay = 2000
+	var/nometeors = 0
+	var/rampupdelta = 5
+	required_players = 0
+
+	announce_span = "danger"
+	announce_text = "A major meteor shower is bombarding the station! The crew needs to evacuate or survive the onslaught."
+
+
+/datum/game_mode/meteor/process()
+	if(nometeors || meteordelay > world.time - SSticker.round_start_time)
+		return
+
+	var/list/wavetype = GLOB.meteors_normal
+	var/meteorminutes = (world.time - SSticker.round_start_time - meteordelay) / 10 / 60
+
+
+	if (prob(meteorminutes))
+		wavetype = GLOB.meteors_threatening
+
+	if (prob(meteorminutes/2))
+		wavetype = GLOB.meteors_catastrophic
+
+	var/ramp_up_final = Clamp(round(meteorminutes/rampupdelta), 1, 10)
+
+	spawn_meteors(ramp_up_final, wavetype)
+
+
+/datum/game_mode/meteor/declare_completion()
+	var/text
+	var/survivors = 0
+
+	for(var/mob/living/player in GLOB.player_list)
+		if(player.stat != DEAD)
+			++survivors
+
+			if(player.onCentcom())
+				text += "<br><b><font size=2>[player.real_name] escaped to the safety of Centcom.</font></b>"
+			else if(player.onSyndieBase())
+				text += "<br><b><font size=2>[player.real_name] escaped to the (relative) safety of Syndicate Space.</font></b>"
+			else
+				text += "<br><font size=1>[player.real_name] survived but is stranded without any hope of rescue.</font>"
+
+
+	if(survivors)
+		to_chat(world, "<span class='boldnotice'>The following survived the meteor storm</span>:[text]")
+	else
+		to_chat(world, "<span class='boldnotice'>Nobody survived the meteor storm!</span>")
+
 	SSticker.mode_result = "end - evacuation"
-	..()
-	return 1
+	..()
+	return 1

code/game/gamemodes/meteor/meteors.dm

@@ -206,7 +206,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 	pass_flags = PASSTABLE | PASSGRILLE
 	hits = 1
 	hitpwr = 3
-	meteorsound = 'sound/weapons/Gunshot_smg.ogg'
+	meteorsound = 'sound/weapons/gunshot_smg.ogg'
 	meteordrop = list(/obj/item/weapon/ore/glass)
 	threat = 1
 

code/game/gamemodes/miniantags/abduction/abductee_objectives.dm

@@ -2,6 +2,11 @@
 	dangerrating = 5
 	completed = 1
 
+/datum/objective/abductee/random
+
+/datum/objective/abductee/random/New()
+	explanation_text = pick(world.file2list("strings/abductee_objectives.txt"))
+
 /datum/objective/abductee/steal
 	explanation_text = "Steal all"
 
@@ -28,7 +33,8 @@
 
 /datum/objective/abductee/capture/New()
 	var/list/jobs = SSjob.occupations.Copy()
-	for(var/datum/job/J in jobs)
+	for(var/X in jobs)
+		var/datum/job/J = X
 		if(J.current_positions < 1)
 			jobs -= J
 	if(jobs.len > 0)
@@ -37,134 +43,13 @@
 	else
 		explanation_text += " someone."
 
-/datum/objective/abductee/shuttle
-	explanation_text = "You must escape the station! Get the shuttle called!"
-
-/datum/objective/abductee/noclone
-	explanation_text = "Don't allow anyone to be cloned."
-
-/datum/objective/abductee/oxygen
-	explanation_text = "The oxygen is killing them all and they don't even know it. Make sure no oxygen is on the station."
-
-/datum/objective/abductee/blazeit
-	explanation_text = "Your body must be improved. Ingest as many drugs as you can."
-
-/datum/objective/abductee/yumyum
-	explanation_text = "You are hungry. Eat as much food as you can find."
-
-/datum/objective/abductee/insane
-	explanation_text = "You see you see what they cannot you see the open door you seeE you SEeEe you SEe yOU seEee SHOW THEM ALL"
-
-/datum/objective/abductee/cannotmove
-	explanation_text = "Convince the crew that you are a paraplegic."
-
-/datum/objective/abductee/deadbodies
-	explanation_text = "Start a collection of corpses. Don't kill people to get these corpses."
-
-/datum/objective/abductee/floors
-	explanation_text = "Replace all the floor tiles with wood, carpeting, grass or bling."
-
-/datum/objective/abductee/POWERUNLIMITED
-	explanation_text = "Flood the station's powernet with as much electricity as you can."
-
-/datum/objective/abductee/pristine
-	explanation_text = "The CEO of Nanotrasen is coming! Ensure the station is in absolutely pristine condition."
-
-/datum/objective/abductee/nowalls
-	explanation_text = "The crew must get to know one another better. Break down the walls inside the station!"
-
-/datum/objective/abductee/nations
-	explanation_text = "Ensure your department prospers over all else."
-
-/datum/objective/abductee/abductception
-	explanation_text = "You have been changed forever. Find the ones that did this to you and give them a taste of their own medicine."
-
-/datum/objective/abductee/summon
-	explanation_text = "The elder gods hunger. Gather a cult and conduct a ritual to summon one."
-
-/datum/objective/abductee/machine
-	explanation_text = "You are secretly an android. Interface with as many machines as you can to boost your own power so the AI may acknowledge you at last."
-
-/datum/objective/abductee/calling
-	explanation_text = "Call forth a spirit from the other side."
-
 /datum/objective/abductee/calling/New()
 	var/mob/dead/D = pick(GLOB.dead_mob_list)
 	if(D)
 		explanation_text = "You know that [D] has perished. Hold a seance to call them from the spirit realm."
 
-/datum/objective/abductee/social_experiment
-	explanation_text = "This is a secret social experiment conducted by Nanotrasen. Convince the crew that this is the truth."
-
-/datum/objective/abductee/vr
-	explanation_text = "It's all an entirely virtual simulation within an underground vault. Convince the crew to escape the shackles of VR."
-
-/datum/objective/abductee/pets
-	explanation_text = "Nanotrasen is abusing the animals! Save as many as you can!"
-
-/datum/objective/abductee/defect
-	explanation_text = "Fuck the system! Defect from the station and start an independent colony in space, Lavaland or the derelict. Recruit crewmates if you can."
-
-/datum/objective/abductee/promote
-	explanation_text = "Climb the corporate ladder all the way to the top!"
-
-/datum/objective/abductee/science
-	explanation_text = "So much lies undiscovered. Look deeper into the machinations of the universe."
-
-/datum/objective/abductee/build
-	explanation_text = "Expand the station."
-
-/datum/objective/abductee/pragnant
-	explanation_text = "You are pregnant and soon due. Find a safe place to deliver your baby."
-
-/datum/objective/abductee/engine
-	explanation_text = "Go have a good conversation with the singularity/tesla/supermatter crystal. Bonus points if it responds."
-
-/datum/objective/abductee/music
-	explanation_text = "You burn with passion for music. Share your vision. If anyone hates it, beat them on the head with your instrument!"
-
-/datum/objective/abductee/clown
-	explanation_text = "The clown is not funny. You can do better! Steal his audience and make the crew laugh!"
-
-/datum/objective/abductee/party
-	explanation_text = "You're throwing a huge rager. Make it as awesome as possible so the whole crew comes... OR ELSE!"
-
-/datum/objective/abductee/pets
-	explanation_text = "All the pets around here suck. You need to make them cooler. Replace them with exotic beasts!"
-
-/datum/objective/abductee/conspiracy
-	explanation_text = "The leaders of this station are hiding a grand, evil conspiracy. Only you can learn what it is, and expose it to the people!"
-
-/datum/objective/abductee/stalker
-	explanation_text = "The Syndicate has hired you to compile dossiers on all important members of the crew. Be sure they don't know you're doing it."
-
-/datum/objective/abductee/narrator
-	explanation_text = "You're the narrator of this tale. Follow around the protagonists to tell their story."
-
-/datum/objective/abductee/lurve
-	explanation_text = "You are doomed to feel woefully incomplete forever... until you find your true love on this station. They're waiting for you!"
-
-/datum/objective/abductee/sixthsense
-	explanation_text = "You died back there and went to heaven... or is it hell? No one here seems to know they're dead. Convince them, and maybe you can escape this limbo."
-
-/datum/objective/abductee/toupefallacy
-	explanation_text = "There are alien parasites masquerading as people's hair.  Save people from this invasion."
-
-/datum/objective/abductee/everyoneisthesame
-	explanation_text = "There is only one other person in existence, he is just really good at pretending to be multiple people."
-
 /datum/objective/abductee/forbiddennumber
-	explanation_text = "Numbers, how do they work?" //Shouldn't ever see this.
 
 /datum/objective/abductee/forbiddennumber/New()
 	var/number = rand(2,10)
 	explanation_text = "Ignore anything in a set of [number], they don't exist."
-
-/datum/objective/abductee/foreignname
-	explanation_text = "No matter how they say it, other people keep mispronouncing your name.  Be sure to correct them whenever possible."
-
-/datum/objective/abductee/pairoff
-	explanation_text = "Being alone and in large groups are both frightening.  Try to be alone with only one other person whenever possible."
-
-/datum/objective/abductee/takeblame
-	explanation_text = "Try to get formally executed for a crime you didn't commit, without a false confession."

code/game/gamemodes/miniantags/abduction/abduction_gear.dm

@@ -83,7 +83,7 @@
 		M.cut_overlays()
 		M.regenerate_icons()
 
-/obj/item/clothing/suit/armor/abductor/vest/hit_reaction()
+/obj/item/clothing/suit/armor/abductor/vest/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	DeactivateStealth()
 	return 0
 
@@ -108,9 +108,9 @@
 			return
 		var/mob/living/carbon/human/M = loc
 		M.adjustStaminaLoss(-75)
-		M.SetParalysis(0)
-		M.SetStunned(0)
-		M.SetWeakened(0)
+		M.SetUnconscious(0)
+		M.SetStun(0)
+		M.SetKnockdown(0)
 		combat_cooldown = 0
 		START_PROCESSING(SSobj, src)
 
@@ -393,8 +393,8 @@ Congratulations! You are now trained for invasive xenobiology research!"}
 
 	if(ishuman(L))
 		var/mob/living/carbon/human/H = L
-		if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK))
-			playsound(L, 'sound/weapons/Genhit.ogg', 50, 1)
+		if(H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK))
+			playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
 			return 0
 
 	switch (mode)
@@ -414,13 +414,12 @@ Congratulations! You are now trained for invasive xenobiology research!"}
 	user.lastattacked = L
 	L.lastattacker = user
 
-	L.Stun(7)
-	L.Weaken(7)
+	L.Knockdown(140)
 	L.apply_effect(STUTTER, 7)
 
 	L.visible_message("<span class='danger'>[user] has stunned [L] with [src]!</span>", \
 							"<span class='userdanger'>[user] has stunned you with [src]!</span>")
-	playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
+	playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
 
 	if(ishuman(L))
 		var/mob/living/carbon/human/H = L
@@ -432,8 +431,8 @@ Congratulations! You are now trained for invasive xenobiology research!"}
 	if(L.incapacitated(TRUE, TRUE))
 		L.visible_message("<span class='danger'>[user] has induced sleep in [L] with [src]!</span>", \
 							"<span class='userdanger'>You suddenly feel very drowsy!</span>")
-		playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
-		L.Sleeping(60)
+		playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
+		L.Sleeping(1200)
 		add_logs(user, L, "put to sleep")
 	else
 		L.drowsyness += 1
@@ -608,7 +607,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
 		to_chat(user, "<span class='notice'>You start disassembling [src]...</span>")
 		playsound(src.loc, I.usesound, 50, 1)
 		if(do_after(user, 30*I.toolspeed, target = src))
-			playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+			playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
 			for(var/i = 1, i <= framestackamount, i++)
 				new framestack(get_turf(src))
 			qdel(src)
@@ -704,7 +703,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
 		if(WT.remove_fuel(0,user))
 			user.visible_message("<span class='warning'>[user] disassembles the airlock assembly.</span>", \
 								"You start to disassemble the airlock assembly...")
-			playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
+			playsound(src.loc, 'sound/items/welder2.ogg', 50, 1)
 			if(do_after(user, 40*W.toolspeed, target = src))
 				if( !WT.isOn() )
 					return

code/game/gamemodes/miniantags/abduction/machinery/experiment.dm

@@ -8,8 +8,8 @@
 	state_open = 1
 	var/points = 0
 	var/credits = 0
-	var/list/history = list()
-	var/list/abductee_minds = list()
+	var/list/history
+	var/list/abductee_minds
 	var/flash = " - || - "
 	var/obj/machinery/abductor/console/console
 
@@ -156,6 +156,7 @@
 	add_fingerprint(usr)
 
 /obj/machinery/abductor/experiment/proc/Experiment(mob/occupant,type)
+	LAZYINITLIST(history)
 	var/mob/living/carbon/human/H = occupant
 	var/point_reward = 0
 	if(H in history)
@@ -168,8 +169,9 @@
 		say("Experimental dissection not detected!")
 		return "<span class='bad'>No glands detected!</span>"
 	if(H.mind != null && H.ckey != null)
-		history += H
-		abductee_minds += H.mind
+		LAZYINITLIST(abductee_minds)
+		LAZYADD(history, H)
+		LAZYADD(abductee_minds, H.mind)
 		say("Processing specimen...")
 		sleep(5)
 		switch(text2num(type))
@@ -182,7 +184,7 @@
 		sleep(5)
 		to_chat(H, "<span class='warning'><b>Your mind snaps!</b></span>")
 		to_chat(H, "<big><span class='warning'><b>You can't remember how you got here...</b></span></big>")
-		var/objtype = pick(subtypesof(/datum/objective/abductee/))
+		var/objtype = (prob(75) ? /datum/objective/abductee/random : pick(subtypesof(/datum/objective/abductee/) - /datum/objective/abductee/random))
 		var/datum/objective/abductee/O = new objtype()
 		SSticker.mode.abductees += H.mind
 		H.mind.objectives += O
@@ -211,7 +213,7 @@
 
 
 /obj/machinery/abductor/experiment/proc/SendBack(mob/living/carbon/human/H)
-	H.Sleeping(8)
+	H.Sleeping(160)
 	H.uncuff()
 	if(console && console.pad && console.pad.teleport_target)
 		H.forceMove(console.pad.teleport_target)

code/game/gamemodes/miniantags/abduction/machinery/pad.dm

@@ -18,7 +18,7 @@
 		target.forceMove(teleport_target)
 		new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir)
 		to_chat(target, "<span class='warning'>The instability of the warp leaves you disoriented!</span>")
-		target.Stun(3)
+		target.Stun(60)
 
 /obj/machinery/abductor/pad/proc/Retrieve(mob/living/target)
 	flick("alien-pad", src)

code/game/gamemodes/miniantags/bot_swarm/swarmer.dm

@@ -1,58 +1,46 @@
 ////Deactivated swarmer shell////
-/obj/item/device/unactivated_swarmer
+/obj/item/device/deactivated_swarmer
+	name = "deactivated swarmer"
+	desc = "A shell of swarmer that was completely powered down. It can no longer activate itself."
+	icon = 'icons/mob/swarmer.dmi'
+	icon_state = "swarmer_unactivated"
+	origin_tech = "bluespace=4;materials=4;programming=7"
+	materials = list(MAT_METAL = 10000, MAT_GLASS = 4000)
+
+/obj/effect/mob_spawn/swarmer
 	name = "unactivated swarmer"
 	desc = "A currently unactivated swarmer. Swarmers can self activate at any time, it would be wise to immediately dispose of this."
 	icon = 'icons/mob/swarmer.dmi'
 	icon_state = "swarmer_unactivated"
-	origin_tech = "bluespace=4;materials=4;programming=7"
-	materials = list(MAT_METAL=10000, MAT_GLASS=4000)
+	density = FALSE
+	anchored = FALSE
 
+	mob_type = /mob/living/simple_animal/hostile/swarmer
+	mob_name = "a swarmer"
+	death = FALSE
+	roundstart = FALSE
+	flavour_text = {"
+	<b>You are a swarmer, a weapon of a long dead civilization. Until further orders from your original masters are received, you must continue to consume and replicate.</b>
+	<b>Clicking on any object will try to consume it, either deconstructing it into its components, destroying it, or integrating any materials it has into you if successful.</b>
+	<b>Ctrl-Clicking on a mob will attempt to remove it from the area and place it in a safe environment for storage.</b>
+	<b>Objectives:</b>
+	1. Consume resources and replicate until there are no more resources left.
+	2. Ensure that this location is fit for invasion at a later date; do not perform actions that would render it dangerous or inhospitable.
+	3. Biological resources will be harvested at a later date; do not harm them.
+	"}
 
-/obj/item/device/unactivated_swarmer/Initialize()
-	if(!crit_fail)
-		notify_ghosts("An unactivated swarmer has been created in [get_area(src)]!", enter_link = "<a href=?src=\ref[src];ghostjoin=1>(Click to enter)</a>", source = src, action = NOTIFY_ATTACK)
-	..()
+/obj/effect/mob_spawn/swarmer/attack_hand(mob/living/user)
+	to_chat(user, "<span class='notice'>Picking up the swarmer may cause it to activate. You should be careful about this.</span>")
 
-/obj/item/device/unactivated_swarmer/Topic(href, href_list)
-	if(href_list["ghostjoin"])
-		var/mob/dead/observer/ghost = usr
-		if(istype(ghost))
-			attack_ghost(ghost)
-
-/obj/item/device/unactivated_swarmer/attackby(obj/item/weapon/W, mob/user, params)
-	..()
-	if(istype(W, /obj/item/weapon/screwdriver) && !crit_fail)
+/obj/effect/mob_spawn/swarmer/attackby(obj/item/weapon/W, mob/user, params)
+	if(istype(W, /obj/item/weapon/screwdriver) && user.a_intent != INTENT_HARM)
 		user.visible_message("<span class='warning'>[usr.name] deactivates [src].</span>",
 			"<span class='notice'>After some fiddling, you find a way to disable [src]'s power source.</span>",
 			"<span class='italics'>You hear clicking.</span>")
-		name = "deactivated swarmer"
-		desc = "A shell of swarmer that was completely powered down. It can no longer activate itself."
-		crit_fail = 1
-
-/obj/item/device/unactivated_swarmer/attack_ghost(mob/user)
-	if(crit_fail)
-		to_chat(user, "This swarmer shell is completely depowered. You cannot activate it.")
-		return
-
-	var/be_swarmer = alert("Become a swarmer? (Warning, You can no longer be cloned!)",,"Yes","No")
-	if(be_swarmer == "No")
-		return
-	if(crit_fail)
-		to_chat(user, "Swarmer has been depowered.")
-		return
-	if(QDELETED(src))
-		to_chat(user, "Swarmer has been occupied by someone else.")
-		return
-	var/mob/living/simple_animal/hostile/swarmer/S = new /mob/living/simple_animal/hostile/swarmer(get_turf(loc))
-	S.key = user.key
-	qdel(src)
-
-
-/obj/item/device/unactivated_swarmer/deactivated
-	name = "deactivated swarmer"
-	desc = "A shell of swarmer that was completely powered down. It can no longer activate itself."
-	crit_fail = 1
-
+		new /obj/item/device/deactivated_swarmer(get_turf(src))
+		qdel(src)
+	else
+		..()
 
 ////The Mob itself////
 
@@ -85,7 +73,7 @@
 	obj_damage = 0
 	environment_smash = ENVIRONMENT_SMASH_NONE
 	attacktext = "shocks"
-	attack_sound = 'sound/effects/EMPulse.ogg'
+	attack_sound = 'sound/effects/empulse.ogg'
 	friendly = "pinches"
 	speed = 0
 	faction = list("swarmer")
@@ -103,27 +91,13 @@
 	light_color = LIGHT_COLOR_CYAN
 	var/resources = 0 //Resource points, generated by consuming metal/glass
 	var/max_resources = 100
-	var/login_text_dump = {"
-	<b>You are a swarmer, a weapon of a long dead civilization. Until further orders from your original masters are received, you must continue to consume and replicate.</b>
-	<b>Clicking on any object will try to consume it, either deconstructing it into its components, destroying it, or integrating any materials it has into you if successful.</b>
-	<b>Ctrl-Clicking on a mob will attempt to remove it from the area and place it in a safe environment for storage.</b>
-	<b>Objectives:</b>
-	1. Consume resources and replicate until there are no more resources left.
-	2. Ensure that this location is fit for invasion at a later date; do not perform actions that would render it dangerous or inhospitable.
-	3. Biological resources will be harvested at a later date; do not harm them.
-	"}
-
-/mob/living/simple_animal/hostile/swarmer/Login()
-	..()
-	to_chat(src, login_text_dump)
 
 /mob/living/simple_animal/hostile/swarmer/Initialize()
-	..()
+	. = ..()
 	verbs -= /mob/living/verb/pulled
 	var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
 	diag_hud.add_to_hud(src)
 
-
 /mob/living/simple_animal/hostile/swarmer/med_hud_set_health()
 	var/image/holder = hud_list[DIAG_HUD]
 	var/icon/I = icon(icon, icon_state, dir)
@@ -185,6 +159,13 @@
 	S.DisIntegrate(src)
 	return TRUE //return TRUE/FALSE whether or not an AI swarmer should try this swarmer_act() again, NOT whether it succeeded.
 
+/obj/effect/mob_spawn/swarmer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
+	S.Integrate(src)
+	return FALSE //would logically be TRUE, but we don't want AI swarmers eating player spawn chances.
+
+/obj/effect/mob_spawn/swarmer/IntegrateAmount()
+	return 50
+
 /turf/closed/indestructible/swarmer_act()
 	return FALSE
 
@@ -196,10 +177,13 @@
 /obj/item/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
 	return S.Integrate(src)
 
-/obj/item/proc/IntegrateAmount() //returns the amount of resources gained when eating this item
+/atom/movable/proc/IntegrateAmount()
+	return 0
+
+/obj/item/IntegrateAmount() //returns the amount of resources gained when eating this item
 	if(materials[MAT_METAL] || materials[MAT_GLASS])
 		return 1
-	return 0
+	return ..()
 
 /obj/item/weapon/gun/swarmer_act()//Stops you from eating the entire armory
 	return FALSE
@@ -402,12 +386,7 @@
 			to_chat(S, "<span class='warning'>Disrupting the power grid would bring no benefit to us. Aborting.</span>")
 			return FALSE
 
-
-/obj/item/device/unactivated_swarmer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
-	..()
-	return FALSE //would logically be TRUE, but we don't want AI swarmers eating player spawn chances.
-
-/obj/item/device/unactivated_swarmer/IntegrateAmount()
+/obj/item/device/deactivated_swarmer/IntegrateAmount()
 	return 50
 
 /obj/machinery/hydroponics/soil/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
@@ -426,7 +405,7 @@
 		return 0
 	return new fabrication_object(loc)
 
-/mob/living/simple_animal/hostile/swarmer/proc/Integrate(obj/item/target)
+/mob/living/simple_animal/hostile/swarmer/proc/Integrate(atom/movable/target)
 	var/resource_gain = target.IntegrateAmount()
 	if(resources + resource_gain > max_resources)
 		to_chat(src, "<span class='warning'>We cannot hold more materials!</span>")
@@ -447,7 +426,7 @@
 		qdel(target)
 		return TRUE
 	else
-		to_chat(src, "<span class='warning'>\the [target] is incompatible with our internal matter recycler.</span>")
+		to_chat(src, "<span class='warning'>[target] is incompatible with our internal matter recycler.</span>")
 	return FALSE
 
 
@@ -547,22 +526,22 @@
 	icon_state = "ui_light"
 	layer = MOB_LAYER
 	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
-	var/lon_range = 1
 	light_color = LIGHT_COLOR_CYAN
 	obj_integrity = 30
 	max_integrity = 30
-	anchored = 1
+	anchored = TRUE
+	var/lon_range = 1
 
 /obj/structure/swarmer/Initialize(mapload)
-	..()
+	. = ..()
 	set_light(lon_range)
 
 /obj/structure/swarmer/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
 	switch(damage_type)
 		if(BRUTE)
-			playsound(loc, 'sound/weapons/Egloves.ogg', 80, 1)
+			playsound(src, 'sound/weapons/egloves.ogg', 80, 1)
 		if(BURN)
-			playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
+			playsound(src, 'sound/items/welder.ogg', 100, 1)
 
 /obj/structure/swarmer/emp_act()
 	qdel(src)
@@ -582,7 +561,7 @@
 			playsound(loc,'sound/effects/snap.ogg',50, 1, -1)
 			L.electrocute_act(0, src, 1, 1, 1)
 			if(iscyborg(L))
-				L.Weaken(5)
+				L.Knockdown(100)
 			qdel(src)
 	..()
 
@@ -642,7 +621,7 @@
 
 
 /mob/living/simple_animal/hostile/swarmer/proc/SwarmerTypeToCreate()
-	return /obj/item/device/unactivated_swarmer
+	return /obj/effect/mob_spawn/swarmer
 
 
 /mob/living/simple_animal/hostile/swarmer/proc/RepairSelf()

code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm

@@ -9,19 +9,17 @@
 
 /datum/round_event/spawn_swarmer
 
-
 /datum/round_event/spawn_swarmer/start()
 	if(find_swarmer())
 		return 0
 	if(!GLOB.the_gateway)
 		return 0
-	new /obj/item/device/unactivated_swarmer(get_turf(GLOB.the_gateway))
+	new /obj/effect/mob_spawn/swarmer(get_turf(GLOB.the_gateway))
 	if(prob(25)) //25% chance to announce it to the crew
 		var/swarmer_report = "<font size=3><b>[command_name()] High-Priority Update</b></span>"
 		swarmer_report += "<br><br>Our long-range sensors have detected an odd signal emanating from your station's gateway. We recommend immediate investigation of your gateway, as something may have come through."
 		print_command_report(swarmer_report, announce=TRUE)
 
-
 /datum/round_event/spawn_swarmer/proc/find_swarmer()
 	for(var/mob/living/M in GLOB.mob_list)
 		if(istype(M, /mob/living/simple_animal/hostile/swarmer) && M.client) //If there is a swarmer with an active client, we've found our swarmer

code/game/gamemodes/miniantags/morph/morph.dm

@@ -40,7 +40,7 @@
 	/obj/singularity,
 	/mob/living/simple_animal/hostile/morph,
 	/obj/effect))
-	
+
 	var/playstyle_string = "<b><font size=3 color='red'>You are a morph,</font> an abomination of science created primarily with changeling cells. \
 							You may take the form of anything nearby by shift-clicking it. This process will alert any nearby \
 							observers, and can only be performed once every five seconds. While morphed, you move faster, but do \
@@ -72,7 +72,7 @@
 	..()
 
 /mob/living/simple_animal/hostile/morph/proc/allowed(atom/movable/A) // make it into property/proc ? not sure if worth it
-	return !is_type_in_typecache(A, blacklist_typecache)
+	return !is_type_in_typecache(A, blacklist_typecache) && (isobj(A) || ismob(A))
 
 /mob/living/simple_animal/hostile/morph/proc/eat(atom/movable/A)
 	if(A && A.loc != src)
@@ -187,7 +187,7 @@
 				if(eat(L))
 					adjustHealth(-50)
 			return
-	else if(istype(target,/obj/item)) //Eat items just to be annoying
+	else if(isitem(target)) //Eat items just to be annoying
 		var/obj/item/I = target
 		if(!I.anchored)
 			if(do_after(src, 20, target = I))
@@ -224,7 +224,7 @@
 	player_mind.special_role = "Morph"
 	SSticker.mode.traitors |= player_mind
 	to_chat(S, S.playstyle_string)
-	S << 'sound/magic/Mutate.ogg'
+	S << 'sound/magic/mutate.ogg'
 	message_admins("[key_name_admin(S)] has been made into a morph by an event.")
 	log_game("[key_name(S)] was spawned as a morph by an event.")
 	spawned_mobs += S

code/game/gamemodes/miniantags/readme.txt

@@ -1,7 +1,6 @@
 This folder contains all "mini-antagonists" - antagonists that can still spice up the round but aren't enough to be a roundtype in their own right.
 Currently, that list consists of:
 	-Abductors
-	-Cortical borers
 	-Swarmers
 	-Prophets of sin
 	-The Jungle Fever virus (infected monkey bites human, human becomes another infected monkey)

code/game/gamemodes/miniantags/slaughter/slaughter.dm

@@ -17,7 +17,7 @@
 	stop_automated_movement = 1
 	status_flags = CANPUSH
 	attack_sound = 'sound/magic/demon_attack1.ogg'
-	var/feast_sound = 'sound/magic/Demon_consume.ogg'
+	var/feast_sound = 'sound/magic/demon_consume.ogg'
 	death_sound = 'sound/magic/demon_dies.ogg'
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	minbodytemp = 0
@@ -89,7 +89,7 @@
 		return ..()
 	user.visible_message("<span class='warning'>[user] raises [src] to their mouth and tears into it with their teeth!</span>", \
 						 "<span class='danger'>An unnatural hunger consumes you. You raise [src] your mouth and devour it!</span>")
-	playsound(user, 'sound/magic/Demon_consume.ogg', 50, 1)
+	playsound(user, 'sound/magic/demon_consume.ogg', 50, 1)
 	for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list)
 		if(knownspell.type == /obj/effect/proc_holder/spell/bloodcrawl)
 			to_chat(user, "<span class='warning'>...and you don't feel any different.</span>")

code/game/gamemodes/nuclear/nuclear.dm

@@ -288,7 +288,7 @@
 		text += "<br>"
 		text += "(Syndicates used [TC_uses] TC) [purchases]"
 		if(TC_uses == 0 && station_was_nuked && !are_operatives_dead())
-			text += "<BIG><IMG CLASS=icon SRC=\ref['icons/BadAss.dmi'] ICONSTATE='badass'></BIG>"
+			text += "<BIG>[bicon(icon('icons/badass.dmi', "badass"))]</BIG>"
 		to_chat(world, text)
 	return 1
 

code/game/gamemodes/nuclear/nuclear_challenge.dm

@@ -44,7 +44,7 @@
 	if(!check_allowed(user) || !war_declaration)
 		return
 
-	priority_announce(war_declaration, title = "Declaration of War", sound = 'sound/machines/Alarm.ogg')
+	priority_announce(war_declaration, title = "Declaration of War", sound = 'sound/machines/alarm.ogg')
 
 	to_chat(user, "You've attracted the attention of powerful forces within the syndicate. A bonus bundle of telecrystals has been granted to your team. Great things await you if you complete the mission.")
 

code/game/gamemodes/nuclear/nuclearbomb.dm

@@ -422,7 +422,7 @@
 	safety = TRUE
 	update_icon()
 	for(var/mob/M in GLOB.player_list)
-		M << 'sound/machines/Alarm.ogg'
+		M << 'sound/machines/alarm.ogg'
 	if(SSticker && SSticker.mode)
 		SSticker.mode.explosion_in_progress = 1
 	sleep(100)
@@ -527,7 +527,7 @@ This is here to make the tiles around the station mininuke change when it's arme
 
 /obj/item/weapon/disk/nuclear/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is going delta! It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	playsound(user.loc, 'sound/machines/Alarm.ogg', 50, -1, 1)
+	playsound(user.loc, 'sound/machines/alarm.ogg', 50, -1, 1)
 	var/end_time = world.time + 100
 	var/newcolor = "#00FF00"
 	while(world.time < end_time)

code/game/gamemodes/nuclear/pinpointer.dm

@@ -33,7 +33,7 @@
 /obj/item/weapon/pinpointer/attack_self(mob/living/user)
 	active = !active
 	user.visible_message("<span class='notice'>[user] [active ? "" : "de"]activates their pinpointer.</span>", "<span class='notice'>You [active ? "" : "de"]activate your pinpointer.</span>")
-	playsound(user, 'sound/items/Screwdriver2.ogg', 50, 1)
+	playsound(user, 'sound/items/screwdriver2.ogg', 50, 1)
 	icon_state = "pin[active ? "onnull" : "off"]"
 	if(active)
 		START_PROCESSING(SSfastprocess, src)
@@ -147,7 +147,7 @@
 		if(bomb.timing)
 			if(!nuke_warning)
 				nuke_warning = TRUE
-				playsound(src, 'sound/items/Nuke_toy_lowpower.ogg', 50, 0)
+				playsound(src, 'sound/items/nuke_toy_lowpower.ogg', 50, 0)
 				if(isliving(loc))
 					var/mob/living/L = loc
 					to_chat(L, "<span class='userdanger'>Your [name] vibrates and lets out a tinny alarm. Uh oh.</span>")

code/game/gamemodes/objective.dm

@@ -701,7 +701,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 		explanation_text = "Destroy [target.name], the experimental AI."
 	else
 		explanation_text = "Free Objective"
-
+	
 /datum/objective/destroy/internal
 	var/stolen = FALSE 		//Have we already eliminated this target?
 

code/game/gamemodes/objective_items.dm

@@ -1,213 +1,223 @@
-//Contains the target item datums for Steal objectives.
-
-/datum/objective_item
-	var/name = "A silly bike horn! Honk!"
-	var/targetitem = /obj/item/weapon/bikehorn		//typepath of the objective item
-	var/difficulty = 9001							//vaguely how hard it is to do this objective
-	var/list/excludefromjob = list()				//If you don't want a job to get a certain objective (no captain stealing his own medal, etcetc)
-	var/list/altitems = list()				//Items which can serve as an alternative to the objective (darn you blueprints)
-	var/list/special_equipment = list()
-
-/datum/objective_item/proc/check_special_completion() //for objectives with special checks (is that slime extract unused? does that intellicard have an ai in it? etcetc)
-	return 1
-
-/datum/objective_item/steal/caplaser
-	name = "the captain's antique laser gun"
-	targetitem = /obj/item/weapon/gun/energy/laser/captain
-	difficulty = 5
-	excludefromjob = list("Captain")
-
-/datum/objective_item/steal/hoslaser
-	name = "the head of security's personal laser gun"
-	targetitem = /obj/item/weapon/gun/energy/e_gun/hos
-	difficulty = 10
-	excludefromjob = list("Head Of Security")
-
-/datum/objective_item/steal/handtele
-	name = "a hand teleporter"
-	targetitem = /obj/item/weapon/hand_tele
-	difficulty = 5
-	excludefromjob = list("Captain")
-
-/datum/objective_item/steal/jetpack
-	name = "the Captain's jetpack"
-	targetitem = /obj/item/weapon/tank/jetpack/oxygen/captain
-	difficulty = 5
-	excludefromjob = list("Captain")
-
-/datum/objective_item/steal/magboots
-	name = "the chief engineer's advanced magnetic boots"
-	targetitem =  /obj/item/clothing/shoes/magboots/advance
-	difficulty = 5
-	excludefromjob = list("Chief Engineer")
-
-/datum/objective_item/steal/capmedal
-	name = "the medal of captaincy"
+//Contains the target item datums for Steal objectives.
+
+/datum/objective_item
+	var/name = "A silly bike horn! Honk!"
+	var/targetitem = /obj/item/weapon/bikehorn		//typepath of the objective item
+	var/difficulty = 9001							//vaguely how hard it is to do this objective
+	var/list/excludefromjob = list()				//If you don't want a job to get a certain objective (no captain stealing his own medal, etcetc)
+	var/list/altitems = list()				//Items which can serve as an alternative to the objective (darn you blueprints)
+	var/list/special_equipment = list()
+
+/datum/objective_item/proc/check_special_completion() //for objectives with special checks (is that slime extract unused? does that intellicard have an ai in it? etcetc)
+	return 1
+
+/datum/objective_item/steal/caplaser
+	name = "the captain's antique laser gun"
+	targetitem = /obj/item/weapon/gun/energy/laser/captain
+	difficulty = 5
+	excludefromjob = list("Captain")
+
+/datum/objective_item/steal/hoslaser
+	name = "the head of security's personal laser gun"
+	targetitem = /obj/item/weapon/gun/energy/e_gun/hos
+	difficulty = 10
+	excludefromjob = list("Head Of Security")
+
+/datum/objective_item/steal/handtele
+	name = "a hand teleporter"
+	targetitem = /obj/item/weapon/hand_tele
+	difficulty = 5
+	excludefromjob = list("Captain")
+
+/datum/objective_item/steal/jetpack
+	name = "the Captain's jetpack"
+	targetitem = /obj/item/weapon/tank/jetpack/oxygen/captain
+	difficulty = 5
+	excludefromjob = list("Captain")
+
+/datum/objective_item/steal/magboots
+	name = "the chief engineer's advanced magnetic boots"
+	targetitem =  /obj/item/clothing/shoes/magboots/advance
+	difficulty = 5
+	excludefromjob = list("Chief Engineer")
+
+/datum/objective_item/steal/capmedal
+	name = "the medal of captaincy"
 	targetitem = /obj/item/clothing/accessory/medal/gold/captain
-	difficulty = 5
-	excludefromjob = list("Captain")
-
-/datum/objective_item/steal/hypo
-	name = "the hypospray"
-	targetitem = /obj/item/weapon/reagent_containers/hypospray/CMO
-	difficulty = 5
-	excludefromjob = list("Chief Medical Officer")
-
-/datum/objective_item/steal/nukedisc
-	name = "the nuclear authentication disk"
-	targetitem = /obj/item/weapon/disk/nuclear
-	difficulty = 5
-	excludefromjob = list("Captain")
-
-/datum/objective_item/steal/reflector
-	name = "a reflector vest"
-	targetitem = /obj/item/clothing/suit/armor/laserproof
-	difficulty = 3
-	excludefromjob = list("Head of Security", "Warden")
-
-/datum/objective_item/steal/reactive
-	name = "the reactive teleport armor"
-	targetitem = /obj/item/clothing/suit/armor/reactive
-	difficulty = 5
-	excludefromjob = list("Research Director")
-
-/datum/objective_item/steal/documents
-	name = "any set of secret documents of any organization"
-	targetitem = /obj/item/documents //Any set of secret documents. Doesn't have to be NT's
-	difficulty = 5
-
-/datum/objective_item/steal/nuke_core
-	name = "the heavily radioactive plutonium core from the onboard self-destruct. Take care to wear the proper safety equipment when extracting the core"
-	targetitem = /obj/item/nuke_core
-	difficulty = 15
-
-/datum/objective_item/steal/nuke_core/New()
-	special_equipment += /obj/item/weapon/storage/box/syndie_kit/nuke
-
-//Items with special checks!
-/datum/objective_item/steal/plasma
-	name = "28 moles of plasma (full tank)"
-	targetitem = /obj/item/weapon/tank
-	difficulty = 3
-	excludefromjob = list("Chief Engineer","Research Director","Station Engineer","Scientist","Atmospheric Technician")
-
-/datum/objective_item/steal/plasma/check_special_completion(obj/item/weapon/tank/T)
-	var/target_amount = text2num(name)
-	var/found_amount = 0
-	found_amount += T.air_contents.gases["plasma"] ? T.air_contents.gases["plasma"][MOLES] : 0
-	return found_amount>=target_amount
-
-
-/datum/objective_item/steal/functionalai
-	name = "a functional AI"
-	targetitem = /obj/item/device/aicard
-	difficulty = 20 //beyond the impossible
-
-/datum/objective_item/steal/functionalai/check_special_completion(obj/item/device/aicard/C)
-	for(var/mob/living/silicon/ai/A in C)
-		if(isAI(A) && A.stat != 2) //See if any AI's are alive inside that card.
-			return 1
-	return 0
-
-/datum/objective_item/steal/blueprints
-	name = "the station blueprints"
-	targetitem = /obj/item/areaeditor/blueprints
-	difficulty = 10
-	excludefromjob = list("Chief Engineer")
-	altitems = list(/obj/item/weapon/photo)
-
-/datum/objective_item/steal/blueprints/check_special_completion(obj/item/I)
-	if(istype(I, /obj/item/areaeditor/blueprints))
-		return 1
-	if(istype(I, /obj/item/weapon/photo))
-		var/obj/item/weapon/photo/P = I
-		if(P.blueprints)	//if the blueprints are in frame
-			return 1
-	return 0
-
-/datum/objective_item/steal/slime
-	name = "an unused sample of slime extract"
-	targetitem = /obj/item/slime_extract
-	difficulty = 3
-	excludefromjob = list("Research Director","Scientist")
-
-/datum/objective_item/steal/slime/check_special_completion(obj/item/slime_extract/E)
-	if(E.Uses > 0)
-		return 1
-	return 0
-
-//Unique Objectives
-/datum/objective_item/unique/docs_red
-	name = "the \"Red\" secret documents"
-	targetitem = /obj/item/documents/syndicate/red
-	difficulty = 10
-
-/datum/objective_item/unique/docs_blue
-	name = "the \"Blue\" secret documents"
-	targetitem = /obj/item/documents/syndicate/blue
-	difficulty = 10
-
-//Old ninja objectives.
-/datum/objective_item/special/pinpointer
-	name = "the captain's pinpointer"
-	targetitem = /obj/item/weapon/pinpointer
-	difficulty = 10
-
-/datum/objective_item/special/aegun
-	name = "an advanced energy gun"
-	targetitem = /obj/item/weapon/gun/energy/e_gun/nuclear
-	difficulty = 10
-
-/datum/objective_item/special/ddrill
-	name = "a diamond drill"
-	targetitem = /obj/item/weapon/pickaxe/drill/diamonddrill
-	difficulty = 10
-
-/datum/objective_item/special/boh
-	name = "a bag of holding"
-	targetitem = /obj/item/weapon/storage/backpack/holding
-	difficulty = 10
-
-/datum/objective_item/special/hypercell
-	name = "a hyper-capacity cell"
-	targetitem = /obj/item/weapon/stock_parts/cell/hyper
-	difficulty = 5
-
-/datum/objective_item/special/laserpointer
-	name = "a laser pointer"
-	targetitem = /obj/item/device/laser_pointer
-	difficulty = 5
-
-/datum/objective_item/special/corgimeat
-	name = "a piece of corgi meat"
-	targetitem = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi
-	difficulty = 5
-
-//Stack objectives get their own subtype
-/datum/objective_item/stack
-	name = "5 cardboards"
-	targetitem = /obj/item/stack/sheet/cardboard
-	difficulty = 9001
-
-/datum/objective_item/stack/check_special_completion(obj/item/stack/S)
-	var/target_amount = text2num(name)
-	var/found_amount = 0
-
-	if(istype(S, targetitem))
-		found_amount = S.amount
-	return found_amount>=target_amount
-
-/datum/objective_item/stack/diamond
-	name = "10 diamonds"
-	targetitem = /obj/item/stack/sheet/mineral/diamond
-	difficulty = 10
-
-/datum/objective_item/stack/gold
-	name = "50 gold bars"
-	targetitem = /obj/item/stack/sheet/mineral/gold
-	difficulty = 15
-
-/datum/objective_item/stack/uranium
-	name = "25 refined uranium bars"
-	targetitem = /obj/item/stack/sheet/mineral/uranium
-	difficulty = 10
+	difficulty = 5
+	excludefromjob = list("Captain")
+
+/datum/objective_item/steal/hypo
+	name = "the hypospray"
+	targetitem = /obj/item/weapon/reagent_containers/hypospray/CMO
+	difficulty = 5
+	excludefromjob = list("Chief Medical Officer")
+
+/datum/objective_item/steal/nukedisc
+	name = "the nuclear authentication disk"
+	targetitem = /obj/item/weapon/disk/nuclear
+	difficulty = 5
+	excludefromjob = list("Captain")
+
+/datum/objective_item/steal/reflector
+	name = "a reflector vest"
+	targetitem = /obj/item/clothing/suit/armor/laserproof
+	difficulty = 3
+	excludefromjob = list("Head of Security", "Warden")
+
+/datum/objective_item/steal/reactive
+	name = "the reactive teleport armor"
+	targetitem = /obj/item/clothing/suit/armor/reactive
+	difficulty = 5
+	excludefromjob = list("Research Director")
+
+/datum/objective_item/steal/documents
+	name = "any set of secret documents of any organization"
+	targetitem = /obj/item/documents //Any set of secret documents. Doesn't have to be NT's
+	difficulty = 5
+
+/datum/objective_item/steal/nuke_core
+	name = "the heavily radioactive plutonium core from the onboard self-destruct. Take care to wear the proper safety equipment when extracting the core"
+	targetitem = /obj/item/nuke_core
+	difficulty = 15
+
+/datum/objective_item/steal/nuke_core/New()
+	special_equipment += /obj/item/weapon/storage/box/syndie_kit/nuke
+	..()
+
+/datum/objective_item/steal/supermatter
+	name = "a sliver of a supermatter crystal. Be sure to use the proper safety equipment when extracting the sliver!"
+	targetitem = /obj/item/nuke_core/supermatter_sliver
+	difficulty = 15
+
+/datum/objective_item/steal/supermatter/New()
+	special_equipment += /obj/item/weapon/storage/box/syndie_kit/supermatter
+	..()
+
+//Items with special checks!
+/datum/objective_item/steal/plasma
+	name = "28 moles of plasma (full tank)"
+	targetitem = /obj/item/weapon/tank
+	difficulty = 3
+	excludefromjob = list("Chief Engineer","Research Director","Station Engineer","Scientist","Atmospheric Technician")
+
+/datum/objective_item/steal/plasma/check_special_completion(obj/item/weapon/tank/T)
+	var/target_amount = text2num(name)
+	var/found_amount = 0
+	found_amount += T.air_contents.gases["plasma"] ? T.air_contents.gases["plasma"][MOLES] : 0
+	return found_amount>=target_amount
+
+
+/datum/objective_item/steal/functionalai
+	name = "a functional AI"
+	targetitem = /obj/item/device/aicard
+	difficulty = 20 //beyond the impossible
+
+/datum/objective_item/steal/functionalai/check_special_completion(obj/item/device/aicard/C)
+	for(var/mob/living/silicon/ai/A in C)
+		if(isAI(A) && A.stat != 2) //See if any AI's are alive inside that card.
+			return 1
+	return 0
+
+/datum/objective_item/steal/blueprints
+	name = "the station blueprints"
+	targetitem = /obj/item/areaeditor/blueprints
+	difficulty = 10
+	excludefromjob = list("Chief Engineer")
+	altitems = list(/obj/item/weapon/photo)
+
+/datum/objective_item/steal/blueprints/check_special_completion(obj/item/I)
+	if(istype(I, /obj/item/areaeditor/blueprints))
+		return 1
+	if(istype(I, /obj/item/weapon/photo))
+		var/obj/item/weapon/photo/P = I
+		if(P.blueprints)	//if the blueprints are in frame
+			return 1
+	return 0
+
+/datum/objective_item/steal/slime
+	name = "an unused sample of slime extract"
+	targetitem = /obj/item/slime_extract
+	difficulty = 3
+	excludefromjob = list("Research Director","Scientist")
+
+/datum/objective_item/steal/slime/check_special_completion(obj/item/slime_extract/E)
+	if(E.Uses > 0)
+		return 1
+	return 0
+
+//Unique Objectives
+/datum/objective_item/unique/docs_red
+	name = "the \"Red\" secret documents"
+	targetitem = /obj/item/documents/syndicate/red
+	difficulty = 10
+
+/datum/objective_item/unique/docs_blue
+	name = "the \"Blue\" secret documents"
+	targetitem = /obj/item/documents/syndicate/blue
+	difficulty = 10
+
+//Old ninja objectives.
+/datum/objective_item/special/pinpointer
+	name = "the captain's pinpointer"
+	targetitem = /obj/item/weapon/pinpointer
+	difficulty = 10
+
+/datum/objective_item/special/aegun
+	name = "an advanced energy gun"
+	targetitem = /obj/item/weapon/gun/energy/e_gun/nuclear
+	difficulty = 10
+
+/datum/objective_item/special/ddrill
+	name = "a diamond drill"
+	targetitem = /obj/item/weapon/pickaxe/drill/diamonddrill
+	difficulty = 10
+
+/datum/objective_item/special/boh
+	name = "a bag of holding"
+	targetitem = /obj/item/weapon/storage/backpack/holding
+	difficulty = 10
+
+/datum/objective_item/special/hypercell
+	name = "a hyper-capacity cell"
+	targetitem = /obj/item/weapon/stock_parts/cell/hyper
+	difficulty = 5
+
+/datum/objective_item/special/laserpointer
+	name = "a laser pointer"
+	targetitem = /obj/item/device/laser_pointer
+	difficulty = 5
+
+/datum/objective_item/special/corgimeat
+	name = "a piece of corgi meat"
+	targetitem = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi
+	difficulty = 5
+
+//Stack objectives get their own subtype
+/datum/objective_item/stack
+	name = "5 cardboards"
+	targetitem = /obj/item/stack/sheet/cardboard
+	difficulty = 9001
+
+/datum/objective_item/stack/check_special_completion(obj/item/stack/S)
+	var/target_amount = text2num(name)
+	var/found_amount = 0
+
+	if(istype(S, targetitem))
+		found_amount = S.amount
+	return found_amount>=target_amount
+
+/datum/objective_item/stack/diamond
+	name = "10 diamonds"
+	targetitem = /obj/item/stack/sheet/mineral/diamond
+	difficulty = 10
+
+/datum/objective_item/stack/gold
+	name = "50 gold bars"
+	targetitem = /obj/item/stack/sheet/mineral/gold
+	difficulty = 15
+
+/datum/objective_item/stack/uranium
+	name = "25 refined uranium bars"
+	targetitem = /obj/item/stack/sheet/mineral/uranium
+	difficulty = 10

code/game/gamemodes/revolution/revolution.dm

@@ -70,7 +70,7 @@
 
 
 	for(var/datum/mind/rev_mind in head_revolutionaries)	//People with return to lobby may still be in the lobby. Let's pick someone else in that case.
-		if(istype(rev_mind.current,/mob/dead/new_player))
+		if(isnewplayer(rev_mind.current))
 			head_revolutionaries -= rev_mind
 			var/list/newcandidates = shuffle(antag_candidates)
 			if(newcandidates.len == 0)
@@ -79,7 +79,7 @@
 				var/datum/mind/lenin = M
 				antag_candidates -= lenin
 				newcandidates -= lenin
-				if(istype(lenin.current,/mob/dead/new_player)) //We don't want to make the same mistake again
+				if(isnewplayer(lenin.current)) //We don't want to make the same mistake again
 					continue
 				else
 					var/mob/Nm = lenin.current
@@ -269,7 +269,7 @@
 		var/mob/living/carbon/carbon_mob = rev_mind.current
 		carbon_mob.silent = max(carbon_mob.silent, 5)
 		carbon_mob.flash_act(1, 1)
-	rev_mind.current.Stun(5)
+	rev_mind.current.Stun(100)
 	to_chat(rev_mind.current, "<span class='danger'><FONT size = 3> You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!</FONT></span>")
 	rev_mind.current.log_message("<font color='red'>Has been converted to the revolution!</font>", INDIVIDUAL_ATTACK_LOG)
 	rev_mind.special_role = "Revolutionary"
@@ -297,7 +297,7 @@
 			message_admins("[ADMIN_LOOKUPFLW(rev_mind.current)] has been borged while being a [remove_head ? "leader" : " member"] of the revolution.")
 
 		else
-			rev_mind.current.Paralyse(5)
+			rev_mind.current.Unconscious(100)
 			rev_mind.current.visible_message("[rev_mind.current] looks like they just remembered their real allegiance!",\
 				"<span class='danger'><FONT size = 3>You have been brainwashed! You are no longer a revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you...</FONT></span>")
 		update_rev_icons_removed(rev_mind)

code/game/gamemodes/sandbox/sandbox.dm

@@ -5,6 +5,8 @@
 
 	announce_span = "info"
 	announce_text = "Build your own station... or just shoot each other!"
+	
+	allow_persistence_save = FALSE
 
 /datum/game_mode/sandbox/pre_setup()
 	for(var/mob/M in GLOB.player_list)

code/game/gamemodes/traitor/double_agents.dm

@@ -27,9 +27,10 @@
 		i++
 		if(i + 1 > pre_traitors.len)
 			i = 0
-		target_list[traitor] = pre_traitors[i+1]
+		target_list[traitor] = pre_traitors[i+1]	
 	..()
 
+
 /datum/game_mode/traitor/internal_affairs/add_latejoin_traitor(datum/mind/character)
 
 	check_potential_agents()
@@ -71,4 +72,6 @@
 						continue // It all checks out.
 
 		// If any check fails, remove them from our list
-		late_joining_list -= M
+		late_joining_list -= M
+
+

code/game/gamemodes/traitor/traitor.dm

@@ -123,7 +123,7 @@
 			if(uplink_true)
 				text += " (used [TC_uses] TC) [purchases]"
 				if(TC_uses==0 && traitorwin)
-					var/static/icon/badass = icon('icons/BadAss.dmi', "badass")
+					var/static/icon/badass = icon('icons/badass.dmi', "badass")
 					text += "<BIG>[bicon(badass)]</BIG>"
 
 			text += objectives

code/game/gamemodes/wizard/soulstone.dm

@@ -44,9 +44,9 @@
 
 //////////////////////////////Capturing////////////////////////////////////////////////////////
 
-/obj/item/device/soulstone/attack(mob/living/carbon/human/M, mob/user)
+/obj/item/device/soulstone/attack(mob/living/carbon/human/M, mob/living/user)
 	if(!iscultist(user) && !iswizard(user) && !usability)
-		user.Paralyse(5)
+		user.Unconscious(100)
 		to_chat(user, "<span class='userdanger'>Your body is wracked with debilitating pain!</span>")
 		return
 	if(spent)
@@ -63,11 +63,11 @@
 
 ///////////////////Options for using captured souls///////////////////////////////////////
 
-/obj/item/device/soulstone/attack_self(mob/user)
+/obj/item/device/soulstone/attack_self(mob/living/user)
 	if(!in_range(src, user))
 		return
 	if(!iscultist(user) && !iswizard(user) && !usability)
-		user.Paralyse(5)
+		user.Unconscious(100)
 		to_chat(user, "<span class='userdanger'>Your body is wracked with debilitating pain!</span>")
 		return
 	release_shades(user)
@@ -274,4 +274,4 @@
 		T.dropItemToGround(W)
 	init_shade(T, U)
 	qdel(T)
-	return 1
+	return 1

code/game/gamemodes/wizard/spellbook.dm

@@ -118,7 +118,6 @@
 /datum/spellbook_entry/disintegrate
 	name = "Disintegrate"
 	spell_type = /obj/effect/proc_holder/spell/targeted/touch/disintegrate
-	cost = 6
 
 /datum/spellbook_entry/disabletech
 	name = "Disable Tech"
@@ -140,7 +139,6 @@
 	name = "Time Stop"
 	spell_type = /obj/effect/proc_holder/spell/aoe_turf/conjure/timestop
 	category = "Defensive"
-	cost = 4
 
 /datum/spellbook_entry/smoke
 	name = "Smoke"
@@ -203,7 +201,6 @@
 	name = "Bind Soul"
 	spell_type = /obj/effect/proc_holder/spell/targeted/lichdom
 	category = "Defensive"
-	cost = 4
 
 /datum/spellbook_entry/teslablast
 	name = "Tesla Blast"
@@ -279,7 +276,7 @@
 	if(surplus>=0)
 		dat += "[surplus] left.<br>"
 	return dat
-/* // these have never been fun, like, ever.
+
 /datum/spellbook_entry/item/staffchange
 	name = "Staff of Change"
 	desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself."
@@ -289,13 +286,12 @@
 	name = "Staff of Animation"
 	desc = "An arcane staff capable of shooting bolts of eldritch energy which cause inanimate objects to come to life. This magic doesn't affect machines."
 	item_path = /obj/item/weapon/gun/magic/staff/animate
-	category = "Assistance" */
+	category = "Assistance"
 
 /datum/spellbook_entry/item/staffchaos
 	name = "Staff of Chaos"
 	desc = "A caprious tool that can fire all sorts of magic without any rhyme or reason. Using it on people you care about is not recommended."
 	item_path = /obj/item/weapon/gun/magic/staff/chaos
-	cost = 4
 
 /datum/spellbook_entry/item/spellblade
 	name = "Spellblade"
@@ -482,13 +478,13 @@
 /datum/spellbook_entry/summon/guns/IsAvailible()
 	if(!SSticker.mode) // In case spellbook is placed on map
 		return 0
-	return (SSticker.mode.name != "ragin' mages" && !config.no_summon_guns)
+	return (!config.no_summon_guns)
 
 /datum/spellbook_entry/summon/guns/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book)
 	SSblackbox.add_details("wizard_spell_learned", name)
 	rightandwrong(0, user, 25)
 	active = 1
-	playsound(get_turf(user), 'sound/magic/CastSummon.ogg', 50, 1)
+	playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1)
 	to_chat(user, "<span class='notice'>You have cast summon guns!</span>")
 	return 1
 
@@ -499,13 +495,13 @@
 /datum/spellbook_entry/summon/magic/IsAvailible()
 	if(!SSticker.mode) // In case spellbook is placed on map
 		return 0
-	return (SSticker.mode.name != "ragin' mages" && !config.no_summon_magic)
+	return (!config.no_summon_magic)
 
 /datum/spellbook_entry/summon/magic/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book)
 	SSblackbox.add_details("wizard_spell_learned", name)
 	rightandwrong(1, user, 25)
 	active = 1
-	playsound(get_turf(user), 'sound/magic/CastSummon.ogg', 50, 1)
+	playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1)
 	to_chat(user, "<span class='notice'>You have cast summon magic!</span>")
 	return 1
 
@@ -517,13 +513,13 @@
 /datum/spellbook_entry/summon/events/IsAvailible()
 	if(!SSticker.mode) // In case spellbook is placed on map
 		return 0
-	return (SSticker.mode.name != "ragin' mages" && !config.no_summon_events)
+	return (!config.no_summon_events)
 
 /datum/spellbook_entry/summon/events/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book)
 	SSblackbox.add_details("wizard_spell_learned", name)
 	summonevents()
 	times++
-	playsound(get_turf(user), 'sound/magic/CastSummon.ogg', 50, 1)
+	playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1)
 	to_chat(user, "<span class='notice'>You have cast summon events.</span>")
 	return 1
 
@@ -842,10 +838,10 @@
 	icon_state ="bookforcewall"
 	desc = "This book has a dedication to mimes everywhere inside the front cover."
 
-/obj/item/weapon/spellbook/oneuse/forcewall/recoil(mob/user)
+/obj/item/weapon/spellbook/oneuse/forcewall/recoil(mob/living/user)
 	..()
 	to_chat(user,"<span class='warning'>You suddenly feel very solid!</span>")
-	user.Stun(2)
+	user.Stun(40, ignore_canstun = TRUE)
 	user.petrify(30)
 
 /obj/item/weapon/spellbook/oneuse/knock
@@ -854,10 +850,10 @@
 	icon_state ="bookknock"
 	desc = "This book is hard to hold closed properly."
 
-/obj/item/weapon/spellbook/oneuse/knock/recoil(mob/user)
+/obj/item/weapon/spellbook/oneuse/knock/recoil(mob/living/user)
 	..()
 	to_chat(user,"<span class='warning'>You're knocked down!</span>")
-	user.Weaken(20)
+	user.Knockdown(40)
 
 /obj/item/weapon/spellbook/oneuse/barnyard
 	spell = /obj/effect/proc_holder/spell/targeted/barnyardcurse

code/game/gamemodes/wizard/wizard.dm

@@ -1,265 +1,265 @@
-/datum/game_mode
-	var/list/datum/mind/wizards = list()
-	var/list/datum/mind/apprentices = list()
-
-/datum/game_mode/wizard
-	name = "wizard"
-	config_tag = "wizard"
-	antag_flag = ROLE_WIZARD
-	required_players = 20
-	required_enemies = 1
-	recommended_enemies = 1
-	enemy_minimum_age = 14
-	round_ends_with_antag_death = 1
-	announce_span = "danger"
-	announce_text = "There is a space wizard attacking the station!\n\
-	<span class='danger'>Wizard</span>: Accomplish your objectives and cause mayhem on the station.\n\
-	<span class='notice'>Crew</span>: Eliminate the wizard before they can succeed!"
-	var/use_huds = 0
-	var/finished = 0
-
-/datum/game_mode/wizard/pre_setup()
-
-	var/datum/mind/wizard = pick(antag_candidates)
-	wizards += wizard
-	modePlayer += wizard
-	wizard.assigned_role = "Wizard"
-	wizard.special_role = "Wizard"
-	if(GLOB.wizardstart.len == 0)
-		to_chat(wizard.current, "<span class='boldannounce'>A starting location for you could not be found, please report this bug!</span>")
-		return 0
-	for(var/datum/mind/wiz in wizards)
-		wiz.current.loc = pick(GLOB.wizardstart)
-
-	return 1
-
-
-/datum/game_mode/wizard/post_setup()
-	for(var/datum/mind/wizard in wizards)
-		log_game("[wizard.key] (ckey) has been selected as a Wizard")
-		equip_wizard(wizard.current)
-		forge_wizard_objectives(wizard)
-		if(use_huds)
-			update_wiz_icons_added(wizard)
-		greet_wizard(wizard)
-		name_wizard(wizard.current)
-	..()
-	return
-
-
-/datum/game_mode/proc/forge_wizard_objectives(datum/mind/wizard)
-	switch(rand(1,100))
-		if(1 to 30)
-
-			var/datum/objective/assassinate/kill_objective = new
-			kill_objective.owner = wizard
-			kill_objective.find_target()
-			wizard.objectives += kill_objective
-
-			if (!(locate(/datum/objective/escape) in wizard.objectives))
-				var/datum/objective/escape/escape_objective = new
-				escape_objective.owner = wizard
-				wizard.objectives += escape_objective
-		if(31 to 60)
-			var/datum/objective/steal/steal_objective = new
-			steal_objective.owner = wizard
-			steal_objective.find_target()
-			wizard.objectives += steal_objective
-
-			if (!(locate(/datum/objective/escape) in wizard.objectives))
-				var/datum/objective/escape/escape_objective = new
-				escape_objective.owner = wizard
-				wizard.objectives += escape_objective
-
-		if(61 to 85)
-			var/datum/objective/assassinate/kill_objective = new
-			kill_objective.owner = wizard
-			kill_objective.find_target()
-			wizard.objectives += kill_objective
-
-			var/datum/objective/steal/steal_objective = new
-			steal_objective.owner = wizard
-			steal_objective.find_target()
-			wizard.objectives += steal_objective
-
-			if (!(locate(/datum/objective/survive) in wizard.objectives))
-				var/datum/objective/survive/survive_objective = new
-				survive_objective.owner = wizard
-				wizard.objectives += survive_objective
-
-		else
-			if (!(locate(/datum/objective/hijack) in wizard.objectives))
-				var/datum/objective/hijack/hijack_objective = new
-				hijack_objective.owner = wizard
-				wizard.objectives += hijack_objective
-	return
-
-
-/datum/game_mode/proc/name_wizard(mob/living/carbon/human/wizard_mob)
-	//Allows the wizard to choose a custom name or go with a random one. Spawn 0 so it does not lag the round starting.
-	var/wizard_name_first = pick(GLOB.wizard_first)
-	var/wizard_name_second = pick(GLOB.wizard_second)
-	var/randomname = "[wizard_name_first] [wizard_name_second]"
-	spawn(0)
-		var/newname = copytext(sanitize(input(wizard_mob, "You are the Space Wizard. Would you like to change your name to something else?", "Name change", randomname) as null|text),1,MAX_NAME_LEN)
-
-		if (!newname)
-			newname = randomname
-
-		wizard_mob.real_name = newname
-		wizard_mob.name = newname
-		if(wizard_mob.mind)
-			wizard_mob.mind.name = newname
+/datum/game_mode
+	var/list/datum/mind/wizards = list()
+	var/list/datum/mind/apprentices = list()
+
+/datum/game_mode/wizard
+	name = "wizard"
+	config_tag = "wizard"
+	antag_flag = ROLE_WIZARD
+	required_players = 20
+	required_enemies = 1
+	recommended_enemies = 1
+	enemy_minimum_age = 14
+	round_ends_with_antag_death = 1
+	announce_span = "danger"
+	announce_text = "There is a space wizard attacking the station!\n\
+	<span class='danger'>Wizard</span>: Accomplish your objectives and cause mayhem on the station.\n\
+	<span class='notice'>Crew</span>: Eliminate the wizard before they can succeed!"
+	var/use_huds = 0
+	var/finished = 0
+
+/datum/game_mode/wizard/pre_setup()
+
+	var/datum/mind/wizard = pick(antag_candidates)
+	wizards += wizard
+	modePlayer += wizard
+	wizard.assigned_role = "Wizard"
+	wizard.special_role = "Wizard"
+	if(GLOB.wizardstart.len == 0)
+		to_chat(wizard.current, "<span class='boldannounce'>A starting location for you could not be found, please report this bug!</span>")
+		return 0
+	for(var/datum/mind/wiz in wizards)
+		wiz.current.loc = pick(GLOB.wizardstart)
+
+	return 1
+
+
+/datum/game_mode/wizard/post_setup()
+	for(var/datum/mind/wizard in wizards)
+		log_game("[wizard.key] (ckey) has been selected as a Wizard")
+		equip_wizard(wizard.current)
+		forge_wizard_objectives(wizard)
+		if(use_huds)
+			update_wiz_icons_added(wizard)
+		greet_wizard(wizard)
+		name_wizard(wizard.current)
+	..()
+	return
+
+
+/datum/game_mode/proc/forge_wizard_objectives(datum/mind/wizard)
+	switch(rand(1,100))
+		if(1 to 30)
+
+			var/datum/objective/assassinate/kill_objective = new
+			kill_objective.owner = wizard
+			kill_objective.find_target()
+			wizard.objectives += kill_objective
+
+			if (!(locate(/datum/objective/escape) in wizard.objectives))
+				var/datum/objective/escape/escape_objective = new
+				escape_objective.owner = wizard
+				wizard.objectives += escape_objective
+		if(31 to 60)
+			var/datum/objective/steal/steal_objective = new
+			steal_objective.owner = wizard
+			steal_objective.find_target()
+			wizard.objectives += steal_objective
+
+			if (!(locate(/datum/objective/escape) in wizard.objectives))
+				var/datum/objective/escape/escape_objective = new
+				escape_objective.owner = wizard
+				wizard.objectives += escape_objective
+
+		if(61 to 85)
+			var/datum/objective/assassinate/kill_objective = new
+			kill_objective.owner = wizard
+			kill_objective.find_target()
+			wizard.objectives += kill_objective
+
+			var/datum/objective/steal/steal_objective = new
+			steal_objective.owner = wizard
+			steal_objective.find_target()
+			wizard.objectives += steal_objective
+
+			if (!(locate(/datum/objective/survive) in wizard.objectives))
+				var/datum/objective/survive/survive_objective = new
+				survive_objective.owner = wizard
+				wizard.objectives += survive_objective
+
+		else
+			if (!(locate(/datum/objective/hijack) in wizard.objectives))
+				var/datum/objective/hijack/hijack_objective = new
+				hijack_objective.owner = wizard
+				wizard.objectives += hijack_objective
+	return
+
+
+/datum/game_mode/proc/name_wizard(mob/living/carbon/human/wizard_mob)
+	//Allows the wizard to choose a custom name or go with a random one. Spawn 0 so it does not lag the round starting.
+	var/wizard_name_first = pick(GLOB.wizard_first)
+	var/wizard_name_second = pick(GLOB.wizard_second)
+	var/randomname = "[wizard_name_first] [wizard_name_second]"
+	spawn(0)
+		var/newname = copytext(sanitize(input(wizard_mob, "You are the Space Wizard. Would you like to change your name to something else?", "Name change", randomname) as null|text),1,MAX_NAME_LEN)
+
+		if (!newname)
+			newname = randomname
+
+		wizard_mob.real_name = newname
+		wizard_mob.name = newname
+		if(wizard_mob.mind)
+			wizard_mob.mind.name = newname
 
 		/* Wizards by nature cannot be too young. */
 		if(wizard_mob.age < WIZARD_AGE_MIN)
 			wizard_mob.age = WIZARD_AGE_MIN
-	return
-
-
-/datum/game_mode/proc/greet_wizard(datum/mind/wizard, you_are=1)
-	if (you_are)
-		to_chat(wizard.current, "<span class='boldannounce'>You are the Space Wizard!</span>")
-	to_chat(wizard.current, "<B>The Space Wizards Federation has given you the following tasks:</B>")
-
-	wizard.announce_objectives()
-	return
-
-
-/datum/game_mode/proc/learn_basic_spells(mob/living/carbon/human/wizard_mob)
-	if(!istype(wizard_mob) || !wizard_mob.mind)
-		return 0
-	wizard_mob.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(null)) //Wizards get Magic Missile and Ethereal Jaunt by default
-	wizard_mob.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(null))
-
-
-/datum/game_mode/proc/equip_wizard(mob/living/carbon/human/wizard_mob)
-	if (!istype(wizard_mob))
-		return
-
-	//So zards properly get their items when they are admin-made.
-	qdel(wizard_mob.wear_suit)
-	qdel(wizard_mob.head)
-	qdel(wizard_mob.shoes)
-	for(var/obj/item/I in wizard_mob.held_items)
-		qdel(I)
-	qdel(wizard_mob.r_store)
-	qdel(wizard_mob.l_store)
-
-	wizard_mob.set_species(/datum/species/human)
-	wizard_mob.equip_to_slot_or_del(new /obj/item/device/radio/headset(wizard_mob), slot_ears)
-	wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(wizard_mob), slot_w_uniform)
-	wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/magic(wizard_mob), slot_shoes)
-	wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(wizard_mob), slot_wear_suit)
-	wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(wizard_mob), slot_head)
-	wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(wizard_mob), slot_back)
-	wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(wizard_mob), slot_in_backpack)
-	wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll(wizard_mob), slot_r_store)
-	var/obj/item/weapon/spellbook/spellbook = new /obj/item/weapon/spellbook(wizard_mob)
-	spellbook.owner = wizard_mob
-	wizard_mob.put_in_hands_or_del(spellbook)
-
-	to_chat(wizard_mob, "You will find a list of available spells in your spell book. Choose your magic arsenal carefully.")
-	to_chat(wizard_mob, "The spellbook is bound to you, and others cannot use it.")
-	to_chat(wizard_mob, "In your pockets you will find a teleport scroll. Use it as needed.")
-	wizard_mob.mind.store_memory("<B>Remember:</B> do not forget to prepare your spells.")
-	return 1
-
-
-/datum/game_mode/wizard/check_finished()
-
-	for(var/datum/mind/wizard in wizards)
-		if(isliving(wizard.current) && wizard.current.stat!=DEAD)
-			return ..()
-
-	if(SSevents.wizardmode) //If summon events was active, turn it off
-		SSevents.toggleWizardmode()
-		SSevents.resetFrequency()
-
-	return ..()
-
-/datum/game_mode/wizard/declare_completion()
-	if(finished)
+	return
+
+
+/datum/game_mode/proc/greet_wizard(datum/mind/wizard, you_are=1)
+	if (you_are)
+		to_chat(wizard.current, "<span class='boldannounce'>You are the Space Wizard!</span>")
+	to_chat(wizard.current, "<B>The Space Wizards Federation has given you the following tasks:</B>")
+
+	wizard.announce_objectives()
+	return
+
+
+/datum/game_mode/proc/learn_basic_spells(mob/living/carbon/human/wizard_mob)
+	if(!istype(wizard_mob) || !wizard_mob.mind)
+		return 0
+	wizard_mob.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(null)) //Wizards get Magic Missile and Ethereal Jaunt by default
+	wizard_mob.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(null))
+
+
+/datum/game_mode/proc/equip_wizard(mob/living/carbon/human/wizard_mob)
+	if (!istype(wizard_mob))
+		return
+
+	//So zards properly get their items when they are admin-made.
+	qdel(wizard_mob.wear_suit)
+	qdel(wizard_mob.head)
+	qdel(wizard_mob.shoes)
+	for(var/obj/item/I in wizard_mob.held_items)
+		qdel(I)
+	qdel(wizard_mob.r_store)
+	qdel(wizard_mob.l_store)
+
+	wizard_mob.set_species(/datum/species/human)
+	wizard_mob.equip_to_slot_or_del(new /obj/item/device/radio/headset(wizard_mob), slot_ears)
+	wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(wizard_mob), slot_w_uniform)
+	wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/magic(wizard_mob), slot_shoes)
+	wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(wizard_mob), slot_wear_suit)
+	wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(wizard_mob), slot_head)
+	wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(wizard_mob), slot_back)
+	wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(wizard_mob), slot_in_backpack)
+	wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll(wizard_mob), slot_r_store)
+	var/obj/item/weapon/spellbook/spellbook = new /obj/item/weapon/spellbook(wizard_mob)
+	spellbook.owner = wizard_mob
+	wizard_mob.put_in_hands_or_del(spellbook)
+
+	to_chat(wizard_mob, "You will find a list of available spells in your spell book. Choose your magic arsenal carefully.")
+	to_chat(wizard_mob, "The spellbook is bound to you, and others cannot use it.")
+	to_chat(wizard_mob, "In your pockets you will find a teleport scroll. Use it as needed.")
+	wizard_mob.mind.store_memory("<B>Remember:</B> do not forget to prepare your spells.")
+	return 1
+
+
+/datum/game_mode/wizard/check_finished()
+
+	for(var/datum/mind/wizard in wizards)
+		if(isliving(wizard.current) && wizard.current.stat!=DEAD)
+			return ..()
+
+	if(SSevents.wizardmode) //If summon events was active, turn it off
+		SSevents.toggleWizardmode()
+		SSevents.resetFrequency()
+
+	return ..()
+
+/datum/game_mode/wizard/declare_completion()
+	if(finished)
 		SSticker.mode_result = "loss - wizard killed"
-		to_chat(world, "<span class='userdanger'>The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!</span>")
-
-		SSticker.news_report = WIZARD_KILLED
-
-	..()
-	return 1
-
-
-/datum/game_mode/proc/auto_declare_completion_wizard()
-	if(wizards.len)
-		var/text = "<br><font size=3><b>the wizards/witches were:</b></font>"
-
-		for(var/datum/mind/wizard in wizards)
-
-			text += "<br><b>[wizard.key]</b> was <b>[wizard.name]</b> ("
-			if(wizard.current)
-				if(wizard.current.stat == DEAD)
-					text += "died"
-				else
-					text += "survived"
-				if(wizard.current.real_name != wizard.name)
-					text += " as <b>[wizard.current.real_name]</b>"
-			else
-				text += "body destroyed"
-			text += ")"
-
-			var/count = 1
-			var/wizardwin = 1
-			for(var/datum/objective/objective in wizard.objectives)
-				if(objective.check_completion())
-					text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>"
+		to_chat(world, "<span class='userdanger'>The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!</span>")
+
+		SSticker.news_report = WIZARD_KILLED
+
+	..()
+	return 1
+
+
+/datum/game_mode/proc/auto_declare_completion_wizard()
+	if(wizards.len)
+		var/text = "<br><font size=3><b>the wizards/witches were:</b></font>"
+
+		for(var/datum/mind/wizard in wizards)
+
+			text += "<br><b>[wizard.key]</b> was <b>[wizard.name]</b> ("
+			if(wizard.current)
+				if(wizard.current.stat == DEAD)
+					text += "died"
+				else
+					text += "survived"
+				if(wizard.current.real_name != wizard.name)
+					text += " as <b>[wizard.current.real_name]</b>"
+			else
+				text += "body destroyed"
+			text += ")"
+
+			var/count = 1
+			var/wizardwin = 1
+			for(var/datum/objective/objective in wizard.objectives)
+				if(objective.check_completion())
+					text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>"
 					SSblackbox.add_details("wizard_objective","[objective.type]|SUCCESS")
-				else
-					text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
+				else
+					text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
 					SSblackbox.add_details("wizard_objective","[objective.type]|FAIL")
-					wizardwin = 0
-				count++
-
-			if(wizard.current && wizard.current.stat!=2 && wizardwin)
-				text += "<br><font color='green'><B>The wizard was successful!</B></font>"
+					wizardwin = 0
+				count++
+
+			if(wizard.current && wizard.current.stat!=2 && wizardwin)
+				text += "<br><font color='green'><B>The wizard was successful!</B></font>"
 				SSblackbox.add_details("wizard_success","SUCCESS")
-			else
-				text += "<br><font color='red'><B>The wizard has failed!</B></font>"
+			else
+				text += "<br><font color='red'><B>The wizard has failed!</B></font>"
 				SSblackbox.add_details("wizard_success","FAIL")
-			if(wizard.spell_list.len>0)
-				text += "<br><B>[wizard.name] used the following spells: </B>"
-				var/i = 1
-				for(var/obj/effect/proc_holder/spell/S in wizard.spell_list)
-					text += "[S.name]"
-					if(wizard.spell_list.len > i)
-						text += ", "
-					i++
-			text += "<br>"
-
-		to_chat(world, text)
-	return 1
-
-//OTHER PROCS
-
-//To batch-remove wizard spells. Linked to mind.dm.
-/mob/proc/spellremove(mob/M)
-	if(!mind)
-		return
-	for(var/X in src.mind.spell_list)
-		var/obj/effect/proc_holder/spell/spell_to_remove = X
-		qdel(spell_to_remove)
-		mind.spell_list -= spell_to_remove
-
-//returns whether the mob is a wizard (or apprentice)
-/proc/iswizard(mob/living/M)
-	return istype(M) && M.mind && SSticker && SSticker.mode && ((M.mind in SSticker.mode.wizards) || (M.mind in SSticker.mode.apprentices))
-
-
-/datum/game_mode/proc/update_wiz_icons_added(datum/mind/wiz_mind)
-	var/datum/atom_hud/antag/wizhud = GLOB.huds[ANTAG_HUD_WIZ]
-	wizhud.join_hud(wiz_mind.current)
-	set_antag_hud(wiz_mind.current, ((wiz_mind in wizards) ? "wizard" : "apprentice"))
-
-/datum/game_mode/proc/update_wiz_icons_removed(datum/mind/wiz_mind)
-	var/datum/atom_hud/antag/wizhud = GLOB.huds[ANTAG_HUD_WIZ]
-	wizhud.leave_hud(wiz_mind.current)
-	set_antag_hud(wiz_mind.current, null)
+			if(wizard.spell_list.len>0)
+				text += "<br><B>[wizard.name] used the following spells: </B>"
+				var/i = 1
+				for(var/obj/effect/proc_holder/spell/S in wizard.spell_list)
+					text += "[S.name]"
+					if(wizard.spell_list.len > i)
+						text += ", "
+					i++
+			text += "<br>"
+
+		to_chat(world, text)
+	return 1
+
+//OTHER PROCS
+
+//To batch-remove wizard spells. Linked to mind.dm.
+/mob/proc/spellremove(mob/M)
+	if(!mind)
+		return
+	for(var/X in src.mind.spell_list)
+		var/obj/effect/proc_holder/spell/spell_to_remove = X
+		qdel(spell_to_remove)
+		mind.spell_list -= spell_to_remove
+
+//returns whether the mob is a wizard (or apprentice)
+/proc/iswizard(mob/living/M)
+	return istype(M) && M.mind && SSticker && SSticker.mode && ((M.mind in SSticker.mode.wizards) || (M.mind in SSticker.mode.apprentices))
+
+
+/datum/game_mode/proc/update_wiz_icons_added(datum/mind/wiz_mind)
+	var/datum/atom_hud/antag/wizhud = GLOB.huds[ANTAG_HUD_WIZ]
+	wizhud.join_hud(wiz_mind.current)
+	set_antag_hud(wiz_mind.current, ((wiz_mind in wizards) ? "wizard" : "apprentice"))
+
+/datum/game_mode/proc/update_wiz_icons_removed(datum/mind/wiz_mind)
+	var/datum/atom_hud/antag/wizhud = GLOB.huds[ANTAG_HUD_WIZ]
+	wizhud.leave_hud(wiz_mind.current)
+	set_antag_hud(wiz_mind.current, null)

code/game/machinery/Beacon.dm

@@ -1,56 +1,56 @@
-/obj/machinery/bluespace_beacon
-
-	icon = 'icons/obj/objects.dmi'
-	icon_state = "floor_beaconf"
-	name = "bluespace gigabeacon"
-	desc = "A device that draws power from bluespace and creates a permanent tracking beacon."
-	level = 1		// underfloor
-	layer = LOW_OBJ_LAYER
-	anchored = 1
+/obj/machinery/bluespace_beacon
+
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "floor_beaconf"
+	name = "bluespace gigabeacon"
+	desc = "A device that draws power from bluespace and creates a permanent tracking beacon."
+	level = 1		// underfloor
+	layer = LOW_OBJ_LAYER
+	anchored = 1
 	use_power = IDLE_POWER_USE
-	idle_power_usage = 0
-	var/obj/item/device/radio/beacon/Beacon
-
-/obj/machinery/bluespace_beacon/New()
-	..()
-	var/turf/T = loc
-	Beacon = new /obj/item/device/radio/beacon
-	Beacon.invisibility = INVISIBILITY_MAXIMUM
-	Beacon.loc = T
-
-	hide(T.intact)
-
-/obj/machinery/bluespace_beacon/Destroy()
-	if(Beacon)
-		qdel(Beacon)
-	Beacon = null
-	return ..()
-
-// update the invisibility and icon
-/obj/machinery/bluespace_beacon/hide(intact)
-	invisibility = intact ? INVISIBILITY_MAXIMUM : 0
-	updateicon()
-
-// update the icon_state
-/obj/machinery/bluespace_beacon/proc/updateicon()
-	var/state="floor_beacon"
-
-	if(invisibility)
-		icon_state = "[state]f"
-
-	else
-		icon_state = "[state]"
-
-/obj/machinery/bluespace_beacon/process()
-	if(!Beacon)
-		var/turf/T = loc
-		Beacon = new /obj/item/device/radio/beacon
-		Beacon.invisibility = INVISIBILITY_MAXIMUM
-		Beacon.loc = T
-	if(Beacon)
-		if(Beacon.loc != loc)
-			Beacon.loc = loc
-
-	updateicon()
-
-
+	idle_power_usage = 0
+	var/obj/item/device/radio/beacon/Beacon
+
+/obj/machinery/bluespace_beacon/New()
+	..()
+	var/turf/T = loc
+	Beacon = new /obj/item/device/radio/beacon
+	Beacon.invisibility = INVISIBILITY_MAXIMUM
+	Beacon.loc = T
+
+	hide(T.intact)
+
+/obj/machinery/bluespace_beacon/Destroy()
+	if(Beacon)
+		qdel(Beacon)
+	Beacon = null
+	return ..()
+
+// update the invisibility and icon
+/obj/machinery/bluespace_beacon/hide(intact)
+	invisibility = intact ? INVISIBILITY_MAXIMUM : 0
+	updateicon()
+
+// update the icon_state
+/obj/machinery/bluespace_beacon/proc/updateicon()
+	var/state="floor_beacon"
+
+	if(invisibility)
+		icon_state = "[state]f"
+
+	else
+		icon_state = "[state]"
+
+/obj/machinery/bluespace_beacon/process()
+	if(!Beacon)
+		var/turf/T = loc
+		Beacon = new /obj/item/device/radio/beacon
+		Beacon.invisibility = INVISIBILITY_MAXIMUM
+		Beacon.loc = T
+	if(Beacon)
+		if(Beacon.loc != loc)
+			Beacon.loc = loc
+
+	updateicon()
+
+

code/game/machinery/PDApainter.dm

@@ -92,7 +92,7 @@
 					if(!WT.isOn() || !(stat & BROKEN))
 						return
 					to_chat(user, "<span class='notice'>You repair [src].</span>")
-					playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
+					playsound(loc, 'sound/items/welder2.ogg', 50, 1)
 					stat &= ~BROKEN
 					obj_integrity = max_integrity
 					update_icon()