Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm

code/game/atoms.dm

@@ -43,7 +43,7 @@
 		if(SSatoms.InitAtom(src, args))
 			//we were deleted
 			return
-	
+
 	var/list/created = SSatoms.created_atoms
 	if(created)
 		created += src

code/game/atoms_movable.dm

@@ -1,3 +1,4 @@
+
 #ifndef PIXEL_SCALE
 #define PIXEL_SCALE 0
 #if DM_VERSION >= 512
@@ -13,9 +14,8 @@
 	var/throw_speed = 2 //How many tiles to move per ds when being thrown. Float values are fully supported
 	var/throw_range = 7
 	var/mob/pulledby = null
-	var/list/languages
-	var/list/initial_languages = list(/datum/language/common)
-	var/only_speaks_language = null
+	var/initial_language_holder = /datum/language_holder
+	var/datum/language_holder/language_holder
 	var/verb_say = "says"
 	var/verb_ask = "asks"
 	var/verb_exclaim = "exclaims"
@@ -42,13 +42,32 @@
 		return FALSE	//PLEASE no.
 	if((var_name in careful_edits) && (var_value % world.icon_size) != 0)
 		return FALSE
+	switch(var_name)
+		if("x")
+			var/turf/T = locate(var_value, y, z)
+			if(T)
+				forceMove(T)
+				return TRUE
+			return FALSE
+		if("y")
+			var/turf/T = locate(x, var_value, z)
+			if(T)
+				forceMove(T)
+				return TRUE
+			return FALSE
+		if("z")
+			var/turf/T = locate(x, y, var_value)
+			if(T)
+				forceMove(T)
+				return TRUE
+			return FALSE
+		if("loc")
+			if(var_value == null || istype(var_value, /atom))
+				forceMove(var_value)
+				return TRUE
+			return FALSE
 	return ..()
 
-/atom/movable/Initialize(mapload)
-	. = ..()
-	for(var/L in initial_languages)
-		grant_language(L)
-
 /atom/movable/Move(atom/newloc, direct = 0)
 	if(!loc || !newloc) return 0
 	var/atom/oldloc = loc
@@ -177,6 +196,7 @@
 		STOP_PROCESSING(SSinbounds, src)
 
 	QDEL_NULL(proximity_monitor)
+	QDEL_NULL(language_holder)
 
 	. = ..()
 	if(loc)
@@ -435,8 +455,7 @@
 		pixel_x_diff = -8
 
 	animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, time = 2)
-	//animate(pixel_x = initial(pixel_x), pixel_y = final_pixel_y, time = 2)
-	animate(pixel_x = pixel_x - pixel_x_diff, pixel_y = final_pixel_y, time = 2) //Putting back my non offset breaking method
+	animate(pixel_x = initial(pixel_x), pixel_y = final_pixel_y, time = 2)
 
 /atom/movable/proc/do_item_attack_animation(atom/A, visual_effect_icon, obj/item/used_item)
 	var/image/I
@@ -576,44 +595,73 @@
 
 
 /* Language procs */
+/atom/movable/proc/get_language_holder(shadow=TRUE)
+	if(language_holder)
+		return language_holder
+	else
+		language_holder = new initial_language_holder(src)
+		return language_holder
+
 /atom/movable/proc/grant_language(datum/language/dt)
-	LAZYINITLIST(languages)
-	languages[dt] = TRUE
+	var/datum/language_holder/H = get_language_holder()
+	H.grant_language(dt)
 
 /atom/movable/proc/grant_all_languages(omnitongue=FALSE)
-	for(var/la in subtypesof(/datum/language))
-		grant_language(la)
-
-	if(omnitongue)
-		SET_SECONDARY_FLAG(src, OMNITONGUE)
+	var/datum/language_holder/H = get_language_holder()
+	H.grant_all_languages(omnitongue)
 
 /atom/movable/proc/get_random_understood_language()
-	var/list/possible = list()
-	for(var/dt in languages)
-		possible += dt
-	. = safepick(possible)
+	var/datum/language_holder/H = get_language_holder()
+	. = H.get_random_understood_language()
 
 /atom/movable/proc/remove_language(datum/language/dt)
-	LAZYREMOVE(languages, dt)
+	var/datum/language_holder/H = get_language_holder()
+	H.remove_language(dt)
 
 /atom/movable/proc/remove_all_languages()
-	LAZYCLEARLIST(languages)
+	var/datum/language_holder/H = get_language_holder()
+	H.remove_all_languages()
 
 /atom/movable/proc/has_language(datum/language/dt)
-	. = is_type_in_typecache(dt, languages)
+	var/datum/language_holder/H = get_language_holder()
+	. = H.has_language(dt)
+
+/atom/movable/proc/copy_known_languages_from(thing, replace=FALSE)
+	var/datum/language_holder/H = get_language_holder()
+	. = H.copy_known_languages_from(thing, replace)
+
+// Whether an AM can speak in a language or not, independent of whether
+// it KNOWS the language
+/atom/movable/proc/could_speak_in_language(datum/language/dt)
+	. = TRUE
 
 /atom/movable/proc/can_speak_in_language(datum/language/dt)
-	. = has_language(dt)
-	if(only_speaks_language && !HAS_SECONDARY_FLAG(src, OMNITONGUE))
-		. = . && ispath(only_speaks_language, dt)
+	var/datum/language_holder/H = get_language_holder()
+
+	if(!H.has_language(dt))
+		return FALSE
+	else if(H.omnitongue)
+		return TRUE
+	else if(could_speak_in_language(dt) && (!H.only_speaks_language || H.only_speaks_language == dt))
+		return TRUE
+	else
+		return FALSE
 
 /atom/movable/proc/get_default_language()
 	// if no language is specified, and we want to say() something, which
 	// language do we use?
+	var/datum/language_holder/H = get_language_holder()
+
+	if(H.selected_default_language)
+		if(can_speak_in_language(H.selected_default_language))
+			return H.selected_default_language
+		else
+			H.selected_default_language = null
+
 	var/datum/language/chosen_langtype
 	var/highest_priority
 
-	for(var/lt in languages)
+	for(var/lt in H.languages)
 		var/datum/language/langtype = lt
 		if(!can_speak_in_language(langtype))
 			continue
@@ -623,7 +671,10 @@
 			chosen_langtype = langtype
 			highest_priority = pri
 
+	H.selected_default_language = .
 	. = chosen_langtype
+
+/* End language procs */
 /atom/movable/proc/ConveyorMove(movedir)
 	set waitfor = FALSE
 	if(!anchored && has_gravity())

code/game/gamemodes/antag_spawner.dm

@@ -1,295 +1,295 @@
-/obj/item/weapon/antag_spawner
-	throw_speed = 1
-	throw_range = 5
-	w_class = WEIGHT_CLASS_TINY
-	var/used = 0
-
-/obj/item/weapon/antag_spawner/proc/spawn_antag(client/C, turf/T, type = "")
-	return
-
-/obj/item/weapon/antag_spawner/proc/equip_antag(mob/target)
-	return
-
-
-///////////WIZARD
-
-/obj/item/weapon/antag_spawner/contract
-	name = "contract"
-	desc = "A magic contract previously signed by an apprentice. In exchange for instruction in the magical arts, they are bound to answer your call for aid."
-	icon = 'icons/obj/wizard.dmi'
-	icon_state ="scroll2"
-
-/obj/item/weapon/antag_spawner/contract/attack_self(mob/user)
-	user.set_machine(src)
-	var/dat
-	if(used)
-		dat = "<B>You have already summoned your apprentice.</B><BR>"
-	else
-		dat = "<B>Contract of Apprenticeship:</B><BR>"
-		dat += "<I>Using this contract, you may summon an apprentice to aid you on your mission.</I><BR>"
-		dat += "<I>If you are unable to establish contact with your apprentice, you can feed the contract back to the spellbook to refund your points.</I><BR>"
-		dat += "<B>Which school of magic is your apprentice studying?:</B><BR>"
-		dat += "<A href='byond://?src=\ref[src];school=destruction'>Destruction</A><BR>"
-		dat += "<I>Your apprentice is skilled in offensive magic. They know Magic Missile and Fireball.</I><BR>"
-		dat += "<A href='byond://?src=\ref[src];school=bluespace'>Bluespace Manipulation</A><BR>"
-		dat += "<I>Your apprentice is able to defy physics, melting through solid objects and travelling great distances in the blink of an eye. They know Teleport and Ethereal Jaunt.</I><BR>"
-		dat += "<A href='byond://?src=\ref[src];school=healing'>Healing</A><BR>"
-		dat += "<I>Your apprentice is training to cast spells that will aid your survival. They know Forcewall and Charge and come with a Staff of Healing.</I><BR>"
-		dat += "<A href='byond://?src=\ref[src];school=robeless'>Robeless</A><BR>"
-		dat += "<I>Your apprentice is training to cast spells without their robes. They know Knock and Mindswap.</I><BR>"
-	user << browse(dat, "window=radio")
-	onclose(user, "radio")
-	return
-
-/obj/item/weapon/antag_spawner/contract/Topic(href, href_list)
-	..()
-	var/mob/living/carbon/human/H = usr
-
-	if(H.stat || H.restrained())
-		return
-	if(!ishuman(H))
-		return 1
-
-	if(loc == H || (in_range(src, H) && isturf(loc)))
-		H.set_machine(src)
-		if(href_list["school"])
-			if(used)
-				to_chat(H, "You already used this contract!")
-				return
-			var/list/candidates = pollCandidatesForMob("Do you want to play as a wizard's [href_list["school"]] apprentice?", ROLE_WIZARD, null, ROLE_WIZARD, 150, src)
-			if(candidates.len)
-				if(used)
-					to_chat(H, "You already used this contract!")
-					return
-				used = 1
-				var/mob/dead/observer/theghost = pick(candidates)
-				spawn_antag(theghost.client, get_turf(src), href_list["school"])
-				if(H && H.mind)
-					SSticker.mode.update_wiz_icons_added(H.mind)
-			else
-				to_chat(H, "Unable to reach your apprentice! You can either attack the spellbook with the contract to refund your points, or wait and try again later.")
-
-/obj/item/weapon/antag_spawner/contract/spawn_antag(client/C, turf/T, type = "")
-	new /obj/effect/particle_effect/smoke(T)
-	var/mob/living/carbon/human/M = new/mob/living/carbon/human(T)
-	C.prefs.copy_to(M)
-	M.key = C.key
-	var/wizard_name = "the wizard"
-	if(usr)
-		wizard_name = usr.real_name
-	to_chat(M, "<B>You are [wizard_name]'s apprentice! You are bound by magic contract to follow their orders and help them in accomplishing their goals.")
-	switch(type)
-		if("destruction")
-			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(null))
-			M.mind.AddSpell(new /obj/effect/proc_holder/spell/aimed/fireball(null))
-			to_chat(M, "<B>Your service has not gone unrewarded, however. Studying under [wizard_name], you have learned powerful, destructive spells. You are able to cast magic missile and fireball.")
-		if("bluespace")
-			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(null))
-			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(null))
-			to_chat(M, "<B>Your service has not gone unrewarded, however. Studying under [wizard_name], you have learned reality bending mobility spells. You are able to cast teleport and ethereal jaunt.")
-		if("healing")
-			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/charge(null))
-			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/forcewall(null))
-			M.put_in_hands_or_del(new /obj/item/weapon/gun/magic/staff/healing(M))
-			to_chat(M, "<B>Your service has not gone unrewarded, however. Studying under [wizard_name], you have learned livesaving survival spells. You are able to cast charge and forcewall.")
-		if("robeless")
-			M.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(null))
-			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mind_transfer(null))
-			to_chat(M, "<B>Your service has not gone unrewarded, however. Studying under [wizard_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap.")
-
-	equip_antag(M)
-	var/wizard_name_first = pick(GLOB.wizard_first)
-	var/wizard_name_second = pick(GLOB.wizard_second)
-	var/randomname = "[wizard_name_first] [wizard_name_second]"
-	if(usr)
-		var/datum/objective/protect/new_objective = new /datum/objective/protect
-		new_objective.owner = M.mind
-		new_objective.target = usr.mind
-		new_objective.explanation_text = "Protect [usr.real_name], the wizard."
-		M.mind.objectives += new_objective
-	SSticker.mode.apprentices += M.mind
-	M.mind.special_role = "apprentice"
-	SSticker.mode.update_wiz_icons_added(M.mind)
-	M << sound('sound/effects/magic.ogg')
-	var/newname = copytext(sanitize(input(M, "You are [wizard_name]'s apprentice. Would you like to change your name to something else?", "Name change", randomname) as null|text),1,MAX_NAME_LEN)
-	if (!newname)
-		newname = randomname
-	M.mind.name = newname
-	M.real_name = newname
-	M.name = newname
-	M.dna.update_dna_identity()
-
-/obj/item/weapon/antag_spawner/contract/equip_antag(mob/target)
-	target.equip_to_slot_or_del(new /obj/item/device/radio/headset(target), slot_ears)
-	target.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(target), slot_w_uniform)
-	target.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/magic(target), slot_shoes)
-	target.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(target), slot_wear_suit)
-	target.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(target), slot_head)
-	target.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(target), slot_back)
-	target.equip_to_slot_or_del(new /obj/item/weapon/storage/box(target), slot_in_backpack)
-	target.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll/apprentice(target), slot_r_store)
-///////////BORGS AND OPERATIVES
-
-
-/obj/item/weapon/antag_spawner/nuke_ops
-	name = "syndicate operative teleporter"
-	desc = "A single-use teleporter designed to quickly reinforce operatives in the field."
-	icon = 'icons/obj/device.dmi'
-	icon_state = "locator"
-	var/borg_to_spawn
-
-/obj/item/weapon/antag_spawner/nuke_ops/proc/check_usability(mob/user)
-	if(used)
-		to_chat(user, "<span class='warning'>[src] is out of power!</span>")
-		return 0
-	if(!(user.mind in SSticker.mode.syndicates))
-		to_chat(user, "<span class='danger'>AUTHENTICATION FAILURE. ACCESS DENIED.</span>")
-		return 0
-	if(user.z != ZLEVEL_CENTCOM)
-		to_chat(user, "<span class='warning'>[src] is out of range! It can only be used at your base!</span>")
-		return 0
-	return 1
-
-
-/obj/item/weapon/antag_spawner/nuke_ops/attack_self(mob/user)
-	if(!(check_usability(user)))
-		return
-
+/obj/item/weapon/antag_spawner
+	throw_speed = 1
+	throw_range = 5
+	w_class = WEIGHT_CLASS_TINY
+	var/used = 0
+
+/obj/item/weapon/antag_spawner/proc/spawn_antag(client/C, turf/T, type = "")
+	return
+
+/obj/item/weapon/antag_spawner/proc/equip_antag(mob/target)
+	return
+
+
+///////////WIZARD
+
+/obj/item/weapon/antag_spawner/contract
+	name = "contract"
+	desc = "A magic contract previously signed by an apprentice. In exchange for instruction in the magical arts, they are bound to answer your call for aid."
+	icon = 'icons/obj/wizard.dmi'
+	icon_state ="scroll2"
+
+/obj/item/weapon/antag_spawner/contract/attack_self(mob/user)
+	user.set_machine(src)
+	var/dat
+	if(used)
+		dat = "<B>You have already summoned your apprentice.</B><BR>"
+	else
+		dat = "<B>Contract of Apprenticeship:</B><BR>"
+		dat += "<I>Using this contract, you may summon an apprentice to aid you on your mission.</I><BR>"
+		dat += "<I>If you are unable to establish contact with your apprentice, you can feed the contract back to the spellbook to refund your points.</I><BR>"
+		dat += "<B>Which school of magic is your apprentice studying?:</B><BR>"
+		dat += "<A href='byond://?src=\ref[src];school=destruction'>Destruction</A><BR>"
+		dat += "<I>Your apprentice is skilled in offensive magic. They know Magic Missile and Fireball.</I><BR>"
+		dat += "<A href='byond://?src=\ref[src];school=bluespace'>Bluespace Manipulation</A><BR>"
+		dat += "<I>Your apprentice is able to defy physics, melting through solid objects and travelling great distances in the blink of an eye. They know Teleport and Ethereal Jaunt.</I><BR>"
+		dat += "<A href='byond://?src=\ref[src];school=healing'>Healing</A><BR>"
+		dat += "<I>Your apprentice is training to cast spells that will aid your survival. They know Forcewall and Charge and come with a Staff of Healing.</I><BR>"
+		dat += "<A href='byond://?src=\ref[src];school=robeless'>Robeless</A><BR>"
+		dat += "<I>Your apprentice is training to cast spells without their robes. They know Knock and Mindswap.</I><BR>"
+	user << browse(dat, "window=radio")
+	onclose(user, "radio")
+	return
+
+/obj/item/weapon/antag_spawner/contract/Topic(href, href_list)
+	..()
+	var/mob/living/carbon/human/H = usr
+
+	if(H.stat || H.restrained())
+		return
+	if(!ishuman(H))
+		return 1
+
+	if(loc == H || (in_range(src, H) && isturf(loc)))
+		H.set_machine(src)
+		if(href_list["school"])
+			if(used)
+				to_chat(H, "You already used this contract!")
+				return
+			var/list/candidates = pollCandidatesForMob("Do you want to play as a wizard's [href_list["school"]] apprentice?", ROLE_WIZARD, null, ROLE_WIZARD, 150, src)
+			if(candidates.len)
+				if(used)
+					to_chat(H, "You already used this contract!")
+					return
+				used = 1
+				var/mob/dead/observer/theghost = pick(candidates)
+				spawn_antag(theghost.client, get_turf(src), href_list["school"])
+				if(H && H.mind)
+					SSticker.mode.update_wiz_icons_added(H.mind)
+			else
+				to_chat(H, "Unable to reach your apprentice! You can either attack the spellbook with the contract to refund your points, or wait and try again later.")
+
+/obj/item/weapon/antag_spawner/contract/spawn_antag(client/C, turf/T, type = "")
+	new /obj/effect/particle_effect/smoke(T)
+	var/mob/living/carbon/human/M = new/mob/living/carbon/human(T)
+	C.prefs.copy_to(M)
+	M.key = C.key
+	var/wizard_name = "the wizard"
+	if(usr)
+		wizard_name = usr.real_name
+	to_chat(M, "<B>You are [wizard_name]'s apprentice! You are bound by magic contract to follow their orders and help them in accomplishing their goals.")
+	switch(type)
+		if("destruction")
+			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(null))
+			M.mind.AddSpell(new /obj/effect/proc_holder/spell/aimed/fireball(null))
+			to_chat(M, "<B>Your service has not gone unrewarded, however. Studying under [wizard_name], you have learned powerful, destructive spells. You are able to cast magic missile and fireball.")
+		if("bluespace")
+			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(null))
+			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(null))
+			to_chat(M, "<B>Your service has not gone unrewarded, however. Studying under [wizard_name], you have learned reality bending mobility spells. You are able to cast teleport and ethereal jaunt.")
+		if("healing")
+			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/charge(null))
+			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/forcewall(null))
+			M.put_in_hands_or_del(new /obj/item/weapon/gun/magic/staff/healing(M))
+			to_chat(M, "<B>Your service has not gone unrewarded, however. Studying under [wizard_name], you have learned livesaving survival spells. You are able to cast charge and forcewall.")
+		if("robeless")
+			M.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(null))
+			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mind_transfer(null))
+			to_chat(M, "<B>Your service has not gone unrewarded, however. Studying under [wizard_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap.")
+
+	equip_antag(M)
+	var/wizard_name_first = pick(GLOB.wizard_first)
+	var/wizard_name_second = pick(GLOB.wizard_second)
+	var/randomname = "[wizard_name_first] [wizard_name_second]"
+	if(usr)
+		var/datum/objective/protect/new_objective = new /datum/objective/protect
+		new_objective.owner = M.mind
+		new_objective.target = usr.mind
+		new_objective.explanation_text = "Protect [usr.real_name], the wizard."
+		M.mind.objectives += new_objective
+	SSticker.mode.apprentices += M.mind
+	M.mind.special_role = "apprentice"
+	SSticker.mode.update_wiz_icons_added(M.mind)
+	M << sound('sound/effects/magic.ogg')
+	var/newname = copytext(sanitize(input(M, "You are [wizard_name]'s apprentice. Would you like to change your name to something else?", "Name change", randomname) as null|text),1,MAX_NAME_LEN)
+	if (!newname)
+		newname = randomname
+	M.mind.name = newname
+	M.real_name = newname
+	M.name = newname
+	M.age = rand(AGE_MIN, WIZARD_AGE_MIN - 1)
+	M.dna.update_dna_identity()
+
+/obj/item/weapon/antag_spawner/contract/equip_antag(mob/target)
+	target.equip_to_slot_or_del(new /obj/item/device/radio/headset(target), slot_ears)
+	target.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(target), slot_w_uniform)
+	target.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/magic(target), slot_shoes)
+	target.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(target), slot_wear_suit)
+	target.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(target), slot_head)
+	target.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(target), slot_back)
+	target.equip_to_slot_or_del(new /obj/item/weapon/storage/box(target), slot_in_backpack)
+	target.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll/apprentice(target), slot_r_store)
+///////////BORGS AND OPERATIVES
+
+
+/obj/item/weapon/antag_spawner/nuke_ops
+	name = "syndicate operative teleporter"
+	desc = "A single-use teleporter designed to quickly reinforce operatives in the field."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "locator"
+	var/borg_to_spawn
+
+/obj/item/weapon/antag_spawner/nuke_ops/proc/check_usability(mob/user)
+	if(used)
+		to_chat(user, "<span class='warning'>[src] is out of power!</span>")
+		return 0
+	if(!(user.mind in SSticker.mode.syndicates))
+		to_chat(user, "<span class='danger'>AUTHENTICATION FAILURE. ACCESS DENIED.</span>")
+		return 0
+	if(user.z != ZLEVEL_CENTCOM)
+		to_chat(user, "<span class='warning'>[src] is out of range! It can only be used at your base!</span>")
+		return 0
+	return 1
+
+
+/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 = pollCandidatesForMob("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, src)
-	if(nuke_candidates.len)
-		if(!(check_usability(user)))
-			return
-		used = 1
-		var/mob/dead/observer/theghost = pick(nuke_candidates)
-		spawn_antag(theghost.client, get_turf(src), "syndieborg")
-		do_sparks(4, TRUE, src)
-		qdel(src)
-	else
-		to_chat(user, "<span class='warning'>Unable to connect to Syndicate command. Please wait and try again later or use the teleporter on your uplink to get your points refunded.</span>")
-
-/obj/item/weapon/antag_spawner/nuke_ops/spawn_antag(client/C, turf/T)
-	var/mob/living/carbon/human/M = new/mob/living/carbon/human(T)
-	C.prefs.copy_to(M)
-	M.key = C.key
-	var/code = "BOMB-NOT-FOUND"
-	var/obj/machinery/nuclearbomb/nuke = locate("syndienuke") in GLOB.nuke_list
-	if(nuke)
-		code = nuke.r_code
-	M.mind.make_Nuke(null, code, 0, FALSE)
-	var/newname = M.dna.species.random_name(M.gender,0,SSticker.mode.nukeops_lastname)
-	M.mind.name = newname
-	M.real_name = newname
-	M.name = newname
-
-//////SYNDICATE BORG
-/obj/item/weapon/antag_spawner/nuke_ops/borg_tele
-	name = "syndicate cyborg teleporter"
-	desc = "A single-use teleporter designed to quickly reinforce operatives in the field.."
-	icon = 'icons/obj/device.dmi'
-	icon_state = "locator"
-
-/obj/item/weapon/antag_spawner/nuke_ops/borg_tele/assault
-	name = "syndicate assault cyborg teleporter"
-	borg_to_spawn = "Assault"
-
-/obj/item/weapon/antag_spawner/nuke_ops/borg_tele/medical
-	name = "syndicate medical teleporter"
-	borg_to_spawn = "Medical"
-
-/obj/item/weapon/antag_spawner/nuke_ops/borg_tele/spawn_antag(client/C, turf/T)
-	var/mob/living/silicon/robot/R
-	switch(borg_to_spawn)
-		if("Medical")
-			R = new /mob/living/silicon/robot/syndicate/medical(T)
-		else
-			R = new /mob/living/silicon/robot/syndicate(T) //Assault borg by default
-
-	var/brainfirstname = pick(GLOB.first_names_male)
-	if(prob(50))
-		brainfirstname = pick(GLOB.first_names_female)
-	var/brainopslastname = pick(GLOB.last_names)
-	if(SSticker.mode.nukeops_lastname)  //the brain inside the syndiborg has the same last name as the other ops.
-		brainopslastname = SSticker.mode.nukeops_lastname
-	var/brainopsname = "[brainfirstname] [brainopslastname]"
-
-	R.mmi.name = "Man-Machine Interface: [brainopsname]"
-	R.mmi.brain.name = "[brainopsname]'s brain"
-	R.mmi.brainmob.real_name = brainopsname
-	R.mmi.brainmob.name = brainopsname
-
-	R.key = C.key
-	R.mind.make_Nuke(null, nuke_code = null,leader=0, telecrystals = TRUE)
-
-///////////SLAUGHTER DEMON
-
-/obj/item/weapon/antag_spawner/slaughter_demon //Warning edgiest item in the game
-	name = "vial of blood"
-	desc = "A magically infused bottle of blood, distilled from countless murder victims. Used in unholy rituals to attract horrifying creatures."
-	icon = 'icons/obj/wizard.dmi'
-	icon_state = "vial"
-
-	var/shatter_msg = "<span class='notice'>You shatter the bottle, no turning back now!</span>"
-	var/veil_msg = "<span class='warning'>You sense a dark presence lurking just beyond the veil...</span>"
-	var/objective_verb = "Kill"
-	var/mob/living/demon_type = /mob/living/simple_animal/slaughter
-
-
-/obj/item/weapon/antag_spawner/slaughter_demon/attack_self(mob/user)
-	if(user.z != 1)
-		to_chat(user, "<span class='notice'>You should probably wait until you reach the station.</span>")
-		return
-	if(used)
-		return
-	var/list/demon_candidates = pollCandidatesForMob("Do you want to play as a [initial(demon_type.name)]?", null, null, ROLE_ALIEN, 50, src)
-	if(demon_candidates.len)
-		if(used)
-			return
-		used = 1
-		var/mob/dead/observer/theghost = pick(demon_candidates)
-		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)
-		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>")
-
-
-/obj/item/weapon/antag_spawner/slaughter_demon/spawn_antag(client/C, turf/T, type = "")
-
-	var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(T)
-	var/mob/living/simple_animal/slaughter/S = new demon_type(holder)
-	S.holder = holder
-	S.key = C.key
-	S.mind.assigned_role = S.name
-	S.mind.special_role = S.name
-	SSticker.mode.traitors += S.mind
-	var/datum/objective/assassinate/new_objective
-	if(usr)
-		new_objective = new /datum/objective/assassinate
-		new_objective.owner = S.mind
-		new_objective.target = usr.mind
-		new_objective.explanation_text = "[objective_verb] [usr.real_name], the one who summoned you."
-		S.mind.objectives += new_objective
-	var/datum/objective/new_objective2 = new /datum/objective
-	new_objective2.owner = S.mind
-	new_objective2.explanation_text = "[objective_verb] everyone[usr ? " else while you're at it":""]."
-	S.mind.objectives += new_objective2
-	to_chat(S, S.playstyle_string)
-	to_chat(S, "<B>You are currently not currently in the same plane of existence as the station. \
-	Ctrl+Click a blood pool to manifest.</B>")
-	if(new_objective)
-		to_chat(S, "<B>Objective #[1]</B>: [new_objective.explanation_text]")
-	to_chat(S, "<B>Objective #[new_objective ? "[2]":"[1]"]</B>: [new_objective2.explanation_text]")
-
-/obj/item/weapon/antag_spawner/slaughter_demon/laughter
-	name = "vial of tickles"
-	desc = "A magically infused bottle of clown love, distilled from countless hugging attacks. Used in funny rituals to attract adorable creatures."
-	icon = 'icons/obj/wizard.dmi'
-	icon_state = "vial"
-	color = "#FF69B4" // HOT PINK
-
-	veil_msg = "<span class='warning'>You sense an adorable presence lurking just beyond the veil...</span>"
-	objective_verb = "Hug and Tickle"
-	demon_type = /mob/living/simple_animal/slaughter/laughter
+	if(nuke_candidates.len)
+		if(!(check_usability(user)))
+			return
+		used = 1
+		var/mob/dead/observer/theghost = pick(nuke_candidates)
+		spawn_antag(theghost.client, get_turf(src), "syndieborg")
+		do_sparks(4, TRUE, src)
+		qdel(src)
+	else
+		to_chat(user, "<span class='warning'>Unable to connect to Syndicate command. Please wait and try again later or use the teleporter on your uplink to get your points refunded.</span>")
+
+/obj/item/weapon/antag_spawner/nuke_ops/spawn_antag(client/C, turf/T)
+	var/mob/living/carbon/human/M = new/mob/living/carbon/human(T)
+	C.prefs.copy_to(M)
+	M.key = C.key
+	var/code = "BOMB-NOT-FOUND"
+	var/obj/machinery/nuclearbomb/nuke = locate("syndienuke") in GLOB.nuke_list
+	if(nuke)
+		code = nuke.r_code
+	M.mind.make_Nuke(null, code, 0, FALSE)
+	var/newname = M.dna.species.random_name(M.gender,0,SSticker.mode.nukeops_lastname)
+	M.mind.name = newname
+	M.real_name = newname
+	M.name = newname
+
+//////SYNDICATE BORG
+/obj/item/weapon/antag_spawner/nuke_ops/borg_tele
+	name = "syndicate cyborg teleporter"
+	desc = "A single-use teleporter designed to quickly reinforce operatives in the field.."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "locator"
+
+/obj/item/weapon/antag_spawner/nuke_ops/borg_tele/assault
+	name = "syndicate assault cyborg teleporter"
+	borg_to_spawn = "Assault"
+
+/obj/item/weapon/antag_spawner/nuke_ops/borg_tele/medical
+	name = "syndicate medical teleporter"
+	borg_to_spawn = "Medical"
+
+/obj/item/weapon/antag_spawner/nuke_ops/borg_tele/spawn_antag(client/C, turf/T)
+	var/mob/living/silicon/robot/R
+	switch(borg_to_spawn)
+		if("Medical")
+			R = new /mob/living/silicon/robot/syndicate/medical(T)
+		else
+			R = new /mob/living/silicon/robot/syndicate(T) //Assault borg by default
+
+	var/brainfirstname = pick(GLOB.first_names_male)
+	if(prob(50))
+		brainfirstname = pick(GLOB.first_names_female)
+	var/brainopslastname = pick(GLOB.last_names)
+	if(SSticker.mode.nukeops_lastname)  //the brain inside the syndiborg has the same last name as the other ops.
+		brainopslastname = SSticker.mode.nukeops_lastname
+	var/brainopsname = "[brainfirstname] [brainopslastname]"
+
+	R.mmi.name = "Man-Machine Interface: [brainopsname]"
+	R.mmi.brain.name = "[brainopsname]'s brain"
+	R.mmi.brainmob.real_name = brainopsname
+	R.mmi.brainmob.name = brainopsname
+
+	R.key = C.key
+	R.mind.make_Nuke(null, nuke_code = null,leader=0, telecrystals = TRUE)
+
+///////////SLAUGHTER DEMON
+
+/obj/item/weapon/antag_spawner/slaughter_demon //Warning edgiest item in the game
+	name = "vial of blood"
+	desc = "A magically infused bottle of blood, distilled from countless murder victims. Used in unholy rituals to attract horrifying creatures."
+	icon = 'icons/obj/wizard.dmi'
+	icon_state = "vial"
+
+	var/shatter_msg = "<span class='notice'>You shatter the bottle, no turning back now!</span>"
+	var/veil_msg = "<span class='warning'>You sense a dark presence lurking just beyond the veil...</span>"
+	var/objective_verb = "Kill"
+	var/mob/living/demon_type = /mob/living/simple_animal/slaughter
+
+
+/obj/item/weapon/antag_spawner/slaughter_demon/attack_self(mob/user)
+	if(user.z != 1)
+		to_chat(user, "<span class='notice'>You should probably wait until you reach the station.</span>")
+		return
+	if(used)
+		return
+	var/list/demon_candidates = pollCandidatesForMob("Do you want to play as a [initial(demon_type.name)]?", null, null, ROLE_ALIEN, 50, src)
+	if(demon_candidates.len)
+		if(used)
+			return
+		used = 1
+		var/mob/dead/observer/theghost = pick(demon_candidates)
+		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)
+		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>")
+
+
+/obj/item/weapon/antag_spawner/slaughter_demon/spawn_antag(client/C, turf/T, type = "")
+
+	var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(T)
+	var/mob/living/simple_animal/slaughter/S = new demon_type(holder)
+	S.holder = holder
+	S.key = C.key
+	S.mind.assigned_role = S.name
+	S.mind.special_role = S.name
+	SSticker.mode.traitors += S.mind
+	var/datum/objective/assassinate/new_objective
+	if(usr)
+		new_objective = new /datum/objective/assassinate
+		new_objective.owner = S.mind
+		new_objective.target = usr.mind
+		new_objective.explanation_text = "[objective_verb] [usr.real_name], the one who summoned you."
+		S.mind.objectives += new_objective
+	var/datum/objective/new_objective2 = new /datum/objective
+	new_objective2.owner = S.mind
+	new_objective2.explanation_text = "[objective_verb] everyone[usr ? " else while you're at it":""]."
+	S.mind.objectives += new_objective2
+	to_chat(S, S.playstyle_string)
+	to_chat(S, "<B>You are currently not currently in the same plane of existence as the station. \
+	Ctrl+Click a blood pool to manifest.</B>")
+	if(new_objective)
+		to_chat(S, "<B>Objective #[1]</B>: [new_objective.explanation_text]")
+	to_chat(S, "<B>Objective #[new_objective ? "[2]":"[1]"]</B>: [new_objective2.explanation_text]")
+
+/obj/item/weapon/antag_spawner/slaughter_demon/laughter
+	name = "vial of tickles"
+	desc = "A magically infused bottle of clown love, distilled from countless hugging attacks. Used in funny rituals to attract adorable creatures."
+	icon = 'icons/obj/wizard.dmi'
+	icon_state = "vial"
+	color = "#FF69B4" // HOT PINK
+
+	veil_msg = "<span class='warning'>You sense an adorable presence lurking just beyond the veil...</span>"
+	objective_verb = "Hug and Tickle"
+	demon_type = /mob/living/simple_animal/slaughter/laughter

code/game/gamemodes/changeling/changeling.dm

@@ -200,6 +200,7 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w
 		to_chat(changeling.current, "<span class='boldannounce'>You are [changeling.changeling.changelingID], a changeling! You have absorbed and taken the form of a human.</span>")
 	to_chat(changeling.current, "<span class='boldannounce'>Use say \":g message\" to communicate with your fellow changelings.</span>")
 	to_chat(changeling.current, "<b>You must complete the following tasks:</b>")
+	changeling.current.playsound_local('sound/ambience/antag/ling_aler.ogg',100,0)
 
 	if (changeling.current.mind)
 		var/mob/living/carbon/human/H = changeling.current

code/game/gamemodes/clock_cult/clock_cult.dm

@@ -75,7 +75,7 @@ Credit where due:
 /proc/remove_servant_of_ratvar(mob/living/L, silent = FALSE)
 	if(!L || !L.mind)
 		return
-	var/datum/antagonist/clockcult/clock_datum = L.mind.has_antag_datum(/datum/antagonist/clockcult)
+	var/datum/antagonist/clockcult/clock_datum = L.mind.has_antag_datum(ANTAG_DATUM_CLOCKCULT)
 	if(!clock_datum)
 		return FALSE
 	clock_datum.silent = silent
@@ -146,6 +146,7 @@ Credit where due:
 	Rusting eternally in the Celestial Derelict, Ratvar has formed a covenant of mortals, with you as one of its members. As one of the Justiciar's servants, you are to work to the best of your \
 	ability to assist in completion of His agenda. You may not know the specifics of how to do so, but luckily you have a vessel to help you learn.</b>"
 	to_chat(M, greeting_text)
+	M.playsound_local('sound/ambience/antag/ClockCultAlr.ogg',100,0)
 	return 1
 
 /datum/game_mode/proc/equip_servant(mob/living/L) //Grants a clockwork slab to the mob, with one of each component

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

@@ -5,60 +5,60 @@
 //otherwise, return literally any non-list thing but preferably FALSE
 //returning TRUE won't produce the "cannot be proselytized" message and will still prevent proselytizing
 
-/atom/proc/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/atom/proc/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	return FALSE
 
 //Turf conversion
-/turf/closed/wall/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) //four sheets of metal
+/turf/closed/wall/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) //four sheets of metal
 	return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 4), "spawn_dir" = SOUTH)
 
-/turf/closed/wall/mineral/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) //two sheets of metal
+/turf/closed/wall/mineral/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) //two sheets of metal
 	return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 2), "spawn_dir" = SOUTH)
 
-/turf/closed/wall/mineral/iron/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) //two sheets of metal, five rods
+/turf/closed/wall/mineral/iron/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) //two sheets of metal, five rods
 	return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 2) - (POWER_ROD * 5), "spawn_dir" = SOUTH)
 
-/turf/closed/wall/mineral/cult/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) //no metal
+/turf/closed/wall/mineral/cult/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) //no metal
 	return list("operation_time" = 80, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL, "spawn_dir" = SOUTH)
 
-/turf/closed/wall/shuttle/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) //two sheets of metal
+/turf/closed/wall/shuttle/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) //two sheets of metal
 	return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 2), "spawn_dir" = SOUTH)
 
-/turf/closed/wall/r_wall/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/turf/closed/wall/r_wall/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	return FALSE
 
-/turf/closed/wall/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/turf/closed/wall/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	return list("operation_time" = 50, "new_obj_type" = /turf/open/floor/clockwork, "power_cost" = -POWER_WALL_MINUS_FLOOR, "spawn_dir" = SOUTH)
 
-/turf/open/floor/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/turf/open/floor/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	if(floor_tile == /obj/item/stack/tile/plasteel)
 		new floor_tile(src)
 		make_plating()
 		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/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/turf/open/floor/plating/asteroid/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	return FALSE
 
-/turf/open/floor/plating/ashplanet/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/turf/open/floor/plating/ashplanet/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	return FALSE
 
-/turf/open/floor/plating/lava/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/turf/open/floor/plating/lava/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	return FALSE
 
-/turf/open/floor/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/turf/open/floor/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	if(locate(/obj/structure/table) in src)
 		return FALSE
 	if(is_blocked_turf(src, TRUE))
 		to_chat(user, "<span class='warning'>Something is in the way, preventing you from proselytizing [src] into a clockwork wall.</span>")
 		return TRUE
 	var/operation_time = 100
-	if(proselytizer.speed_multiplier > 0)
+	if(!GLOB.ratvar_awakens && proselytizer.speed_multiplier > 0) //if ratvar isn't awake, this always takes 10 seconds
 		operation_time /= proselytizer.speed_multiplier
 	return list("operation_time" = operation_time, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_MINUS_FLOOR, "spawn_dir" = SOUTH)
 
 //False wall conversion
-/obj/structure/falsewall/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/structure/falsewall/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	var/cost = POWER_WALL_MINUS_FLOOR
 	if(ispath(mineral, /obj/item/stack/sheet/metal))
 		cost -= (POWER_METAL * (2 + mineral_amount)) //four sheets of metal, plus an assumption that the girder is also two
@@ -66,17 +66,17 @@
 		cost -= (POWER_METAL * 2) //anything that doesn't use metal just has the girder
 	return list("operation_time" = 50, "new_obj_type" = /obj/structure/falsewall/brass, "power_cost" = cost, "spawn_dir" = SOUTH)
 
-/obj/structure/falsewall/iron/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) //two sheets of metal, two rods; special assumption
+/obj/structure/falsewall/iron/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) //two sheets of metal, two rods; special assumption
 	return list("operation_time" = 50, "new_obj_type" = /obj/structure/falsewall/brass, "power_cost" = POWER_WALL_MINUS_FLOOR - (POWER_METAL * 2) - (POWER_ROD * 2), "spawn_dir" = SOUTH)
 
-/obj/structure/falsewall/reinforced/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/structure/falsewall/reinforced/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	return FALSE
 
-/obj/structure/falsewall/brass/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/structure/falsewall/brass/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	return FALSE
 
 //Metal conversion
-/obj/item/stack/tile/plasteel/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/item/stack/tile/plasteel/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	if(source)
 		return FALSE
 	var/amount_temp = get_amount()
@@ -104,7 +104,7 @@
 		to_chat(user, "<span class='warning'>You need at least <b>20</b> floor tiles to convert into brass.</span>")
 	return TRUE
 
-/obj/item/stack/rods/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/item/stack/rods/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	if(source)
 		return FALSE
 	if(proselytizer.metal_to_power)
@@ -122,7 +122,7 @@
 		to_chat(user, "<span class='warning'>You need at least <b>10</b> rods to convert into brass.</span>")
 	return TRUE
 
-/obj/item/stack/sheet/metal/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/item/stack/sheet/metal/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	if(source)
 		return FALSE
 	if(proselytizer.metal_to_power)
@@ -140,7 +140,7 @@
 		to_chat(user, "<span class='warning'>You need at least <b>5</b> sheets of metal to convert into brass.</span>")
 	return TRUE
 
-/obj/item/stack/sheet/plasteel/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/item/stack/sheet/plasteel/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	if(source)
 		return FALSE
 	if(proselytizer.metal_to_power)
@@ -159,23 +159,23 @@
 	return TRUE
 
 //Brass directly to power
-/obj/item/stack/tile/brass/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/item/stack/tile/brass/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	if(source)
 		return FALSE
 	return list("operation_time" = 0, "new_obj_type" = /obj/effect/overlay/temp/ratvar/beam/itemconsume, "power_cost" = -(amount*POWER_FLOOR), "spawn_dir" = SOUTH)
 
 //Airlock conversion
-/obj/machinery/door/airlock/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/machinery/door/airlock/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	var/doortype = /obj/machinery/door/airlock/clockwork
 	if(glass)
 		doortype = /obj/machinery/door/airlock/clockwork/brass
 	return list("operation_time" = 60, "new_obj_type" = doortype, "power_cost" = POWER_WALL_TOTAL, "spawn_dir" = dir)
 
-/obj/machinery/door/airlock/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/machinery/door/airlock/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	return FALSE
 
 //Table conversion
-/obj/structure/table/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/structure/table/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	var/prosel_cost = POWER_STANDARD
 	if(framestack == /obj/item/stack/rods)
 		prosel_cost -= POWER_ROD*framestackamount
@@ -187,10 +187,10 @@
 		prosel_cost -= POWER_PLASTEEL*buildstackamount
 	return list("operation_time" = 20, "new_obj_type" = /obj/structure/table/reinforced/brass, "power_cost" = prosel_cost, "spawn_dir" = SOUTH)
 
-/obj/structure/table/reinforced/brass/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/structure/table/reinforced/brass/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	return FALSE
 
-/obj/structure/table_frame/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/structure/table_frame/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	var/prosel_cost = POWER_FLOOR
 	if(framestack == /obj/item/stack/rods)
 		prosel_cost -= POWER_ROD*framestackamount
@@ -198,11 +198,11 @@
 		prosel_cost -= POWER_FLOOR*framestackamount
 	return list("operation_time" = 10, "new_obj_type" = /obj/structure/table_frame/brass, "power_cost" = prosel_cost, "spawn_dir" = SOUTH)
 
-/obj/structure/table_frame/brass/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/structure/table_frame/brass/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	return FALSE
 
 //Window conversion
-/obj/structure/window/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/structure/window/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	var/windowtype = /obj/structure/window/reinforced/clockwork
 	var/new_dir = TRUE
 	var/prosel_time = 15
@@ -220,18 +220,18 @@
 		INVOKE_ASYNC(proselytizer, /obj/item/clockwork/clockwork_proselytizer.proc/proselytize, G, user)
 	return list("operation_time" = prosel_time, "new_obj_type" = windowtype, "power_cost" = prosel_cost, "spawn_dir" = dir, "dir_in_new" = new_dir)
 
-/obj/structure/window/reinforced/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/structure/window/reinforced/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	return FALSE
 
 //Windoor conversion
-/obj/machinery/door/window/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/machinery/door/window/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	return list("operation_time" = 30, "new_obj_type" = /obj/machinery/door/window/clockwork, "power_cost" = POWER_STANDARD, "spawn_dir" = dir, "dir_in_new" = TRUE)
 
-/obj/machinery/door/window/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/machinery/door/window/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	return FALSE
 
 //Grille conversion
-/obj/structure/grille/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/structure/grille/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	var/grilletype = /obj/structure/grille/ratvar
 	var/prosel_time = 15
 	if(broken)
@@ -239,32 +239,32 @@
 		prosel_time = 5
 	return list("operation_time" = prosel_time, "new_obj_type" = grilletype, "power_cost" = 0, "spawn_dir" = dir)
 
-/obj/structure/grille/ratvar/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/structure/grille/ratvar/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	return FALSE
 
 //Lattice conversion
-/obj/structure/lattice/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/structure/lattice/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	return list("operation_time" = 0, "new_obj_type" = /obj/structure/lattice/clockwork, "power_cost" = 0, "spawn_dir" = SOUTH, "no_target_deletion" = TRUE)
 
-/obj/structure/lattice/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/structure/lattice/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	ratvar_act() //just in case we're the wrong type for some reason??
 	return FALSE
 
-/obj/structure/lattice/catwalk/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/structure/lattice/catwalk/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	return list("operation_time" = 0, "new_obj_type" = /obj/structure/lattice/catwalk/clockwork, "power_cost" = 0, "spawn_dir" = SOUTH, "no_target_deletion" = TRUE)
 
-/obj/structure/lattice/catwalk/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/structure/lattice/catwalk/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	return FALSE
 
 //Girder conversion
-/obj/structure/girder/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/structure/girder/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	var/prosel_cost = POWER_GEAR - (POWER_METAL * 2)
 	if(state == GIRDER_REINF_STRUTS || state == GIRDER_REINF)
 		prosel_cost -= POWER_PLASTEEL
 	return list("operation_time" = 20, "new_obj_type" = /obj/structure/destructible/clockwork/wall_gear, "power_cost" = prosel_cost, "spawn_dir" = SOUTH)
 
 //Hitting a clockwork structure will try to repair it.
-/obj/structure/destructible/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/structure/destructible/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	. = TRUE
 	var/list/repair_values = list()
 	if(!proselytizer.proselytizer_repair_checks(repair_values, src, user))
@@ -287,7 +287,7 @@
 			"<span class='alloy'>You finish repairing [src]. It is now at <b>[obj_integrity]/[max_integrity]</b> integrity.</span>")
 
 //Hitting a sigil of transmission will try to charge from it.
-/obj/effect/clockwork/sigil/transmission/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/obj/effect/clockwork/sigil/transmission/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	. = TRUE
 	var/list/charge_values = list()
 	if(!proselytizer.sigil_charge_checks(charge_values, src, user))
@@ -337,7 +337,7 @@
 	adjustHealth(-amount)
 
 //Hitting a ratvar'd silicon will also try to repair it.
-/mob/living/silicon/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/mob/living/silicon/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	. = TRUE
 	if(health == maxHealth) //if we're at maximum health, prosel the turf under us
 		return FALSE
@@ -346,7 +346,7 @@
 		"<span class='alloy'>You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_they(TRUE)] [p_are()]"] now at <b>[abs(HEALTH_THRESHOLD_DEAD - health)]/[abs(HEALTH_THRESHOLD_DEAD - maxHealth)]</b> health.</span>")
 
 //Same with clockwork mobs.
-/mob/living/simple_animal/hostile/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/mob/living/simple_animal/hostile/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	. = TRUE
 	if(health == maxHealth) //if we're at maximum health, prosel the turf under us
 		return FALSE
@@ -355,7 +355,7 @@
 		"<span class='alloy'>You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_they(TRUE)] [p_are()]"] now at <b>[health]/[maxHealth]</b> health.</span>")
 
 //Cogscarabs get special interaction because they're drones and have innate self-heals/revives.
-/mob/living/simple_animal/drone/cogscarab/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
+/mob/living/simple_animal/drone/cogscarab/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent)
 	. = TRUE
 	if(stat == DEAD)
 		try_reactivate(user) //if we're at maximum health, prosel the turf under us
@@ -374,17 +374,36 @@
 			proselytizer.repairing = null
 
 //Convert shards and gear bits directly to power
-/obj/item/clockwork/alloy_shards/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
-	return list("operation_time" = 0, "new_obj_type" = /obj/effect/overlay/temp/ratvar/beam/itemconsume, "power_cost" = -POWER_STANDARD, "spawn_dir" = SOUTH)
+/obj/item/clockwork/alloy_shards/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent, power_amount)
+	if(!power_amount)
+		power_amount = -POWER_STANDARD
+	if(proselytizer.can_use_power(power_amount))
+		var/obj/effect/overlay/temp/ratvar/beam/itemconsume/B = new /obj/effect/overlay/temp/ratvar/beam/itemconsume(get_turf(src))
+		B.pixel_x = pixel_x
+		B.pixel_y = pixel_y
+	if(!silent) //looper no looping
+		for(var/obj/item/clockwork/alloy_shards/S in get_turf(src)) //convert all other shards in the turf if we can
+			if(S == src)
+				continue //we want the shards to be proselytized after the main shard, thus this delay
+			addtimer(CALLBACK(proselytizer, /obj/item/clockwork/clockwork_proselytizer.proc/proselytize, S, user, TRUE), 0)
+	return list("operation_time" = 0, "new_obj_type" = null, "power_cost" = power_amount, "spawn_dir" = SOUTH)
 
-/obj/item/clockwork/alloy_shards/medium/gear_bit/large/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
-	return list("operation_time" = 0, "new_obj_type" = /obj/effect/overlay/temp/ratvar/beam/itemconsume, "power_cost" = -(CLOCKCULT_POWER_UNIT*0.08), "spawn_dir" = SOUTH)
+/obj/item/clockwork/alloy_shards/medium/gear_bit/large/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent, power_amount)
+	if(!power_amount)
+		power_amount = -(CLOCKCULT_POWER_UNIT*0.08)
+	return ..()
 
-/obj/item/clockwork/alloy_shards/large/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
-	return list("operation_time" = 0, "new_obj_type" = /obj/effect/overlay/temp/ratvar/beam/itemconsume, "power_cost" = -(CLOCKCULT_POWER_UNIT*0.06), "spawn_dir" = SOUTH)
+/obj/item/clockwork/alloy_shards/large/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent, power_amount)
+	if(!power_amount)
+		power_amount = -(CLOCKCULT_POWER_UNIT*0.06)
+	return ..()
 
-/obj/item/clockwork/alloy_shards/medium/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
-	return list("operation_time" = 0, "new_obj_type" = /obj/effect/overlay/temp/ratvar/beam/itemconsume, "power_cost" = -(CLOCKCULT_POWER_UNIT*0.04), "spawn_dir" = SOUTH)
+/obj/item/clockwork/alloy_shards/medium/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent, power_amount)
+	if(!power_amount)
+		power_amount = -(CLOCKCULT_POWER_UNIT*0.04)
+	return ..()
 
-/obj/item/clockwork/alloy_shards/small/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
-	return list("operation_time" = 0, "new_obj_type" = /obj/effect/overlay/temp/ratvar/beam/itemconsume, "power_cost" = -(CLOCKCULT_POWER_UNIT*0.02), "spawn_dir" = SOUTH)
+/obj/item/clockwork/alloy_shards/small/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent, power_amount)
+	if(!power_amount)
+		power_amount = -(CLOCKCULT_POWER_UNIT*0.02)
+	return ..()

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

@@ -26,7 +26,7 @@
 	ranged_mousepointer = 'icons/effects/geis_target.dmi'
 
 /obj/effect/proc_holder/slab/geis/InterceptClickOn(mob/living/caller, params, atom/target)
-	if(target == slab || ..())
+	if(..())
 		return TRUE
 
 	var/turf/T = ranged_ability_user.loc
@@ -148,7 +148,7 @@
 	ranged_mousepointer = 'icons/effects/volt_target.dmi'
 
 /obj/effect/proc_holder/slab/volt/InterceptClickOn(mob/living/caller, params, atom/target)
-	if(..())
+	if(target == slab || ..()) //we can't cancel
 		return TRUE
 
 	var/turf/T = ranged_ability_user.loc

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

@@ -162,14 +162,15 @@
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	var/randomsinglesprite = FALSE
 	var/randomspritemax = 2
+	var/sprite_shift = 9
 
 /obj/item/clockwork/alloy_shards/Initialize()
 	. = ..()
 	if(randomsinglesprite)
 		replace_name_desc()
 		icon_state = "[icon_state][rand(1, randomspritemax)]"
-		pixel_x = rand(-9, 9)
-		pixel_y = rand(-9, 9)
+		pixel_x = rand(-sprite_shift, sprite_shift)
+		pixel_y = rand(-sprite_shift, sprite_shift)
 
 /obj/item/clockwork/alloy_shards/proc/replace_name_desc()
 	name = "replicant alloy shard"
@@ -177,16 +178,21 @@
 	clockwork_desc = "A broken shard of replicant alloy. Can be proselytized for additional power."
 
 /obj/item/clockwork/alloy_shards/large
+	w_class = WEIGHT_CLASS_TINY
 	randomsinglesprite = TRUE
 	icon_state = "shard_large"
+	sprite_shift = 9
 
 /obj/item/clockwork/alloy_shards/medium
+	w_class = WEIGHT_CLASS_TINY
 	randomsinglesprite = TRUE
 	icon_state = "shard_medium"
+	sprite_shift = 10
 
 /obj/item/clockwork/alloy_shards/medium/gear_bit
 	randomspritemax = 4
 	icon_state = "gear_bit"
+	sprite_shift = 12
 
 /obj/item/clockwork/alloy_shards/medium/gear_bit/replace_name_desc()
 	name = "gear bit"
@@ -200,9 +206,11 @@
 	name = "complex gear bit"
 
 /obj/item/clockwork/alloy_shards/small
+	w_class = WEIGHT_CLASS_TINY
 	randomsinglesprite = TRUE
 	randomspritemax = 3
 	icon_state = "shard_small"
+	sprite_shift = 12
 
 /obj/item/clockwork/alloy_shards/pinion_lock
 	name = "pinion lock"

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

@@ -178,21 +178,24 @@
 	return TRUE
 
 //A note here; return values are for if we CAN BE PUT ON A TABLE, not IF WE ARE SUCCESSFUL, unless no_table_check is TRUE
-/obj/item/clockwork/clockwork_proselytizer/proc/proselytize(atom/target, mob/living/user, no_table_check)
+/obj/item/clockwork/clockwork_proselytizer/proc/proselytize(atom/target, mob/living/user, silent, no_table_check)
 	if(!target || !user)
 		return FALSE
 	if(repairing)
-		to_chat(user, "<span class='warning'>You are currently repairing [repairing] with [src]!</span>")
+		if(!silent)
+			to_chat(user, "<span class='warning'>You are currently repairing [repairing] with [src]!</span>")
 		return FALSE
 	if(recharging)
-		to_chat(user, "<span class='warning'>You are currently recharging [src] from the [recharging.sigil_name]!</span>")
+		if(!silent)
+			to_chat(user, "<span class='warning'>You are currently recharging [src] from the [recharging.sigil_name]!</span>")
 		return FALSE
-	var/list/proselytize_values = target.proselytize_vals(user, src) //relevant values for proselytizing stuff, given as an associated list
+	var/list/proselytize_values = target.proselytize_vals(user, src, silent) //relevant values for proselytizing stuff, given as an associated list
 	if(!islist(proselytize_values))
 		if(proselytize_values != TRUE) //if we get true, fail, but don't send a message for whatever reason
 			if(!isturf(target)) //otherwise, if we didn't get TRUE and the original target wasn't a turf, try to proselytize the turf
 				return proselytize(get_turf(target), user, no_table_check)
-			to_chat(user, "<span class='warning'>[target] cannot be proselytized!</span>")
+			if(!silent)
+				to_chat(user, "<span class='warning'>[target] cannot be proselytized!</span>")
 			if(!no_table_check)
 				return TRUE
 		return FALSE
@@ -207,19 +210,22 @@
 
 	var/target_type = target.type
 
-	if(!proselytize_checks(proselytize_values, target, target_type, user))
+	if(!proselytize_checks(proselytize_values, target, target_type, user, silent))
 		return FALSE
 
 	proselytize_values["operation_time"] *= speed_multiplier
 
 	playsound(target, 'sound/machines/click.ogg', 50, 1)
 	if(proselytize_values["operation_time"])
-		user.visible_message("<span class='warning'>[user]'s [name] begins tearing apart [target]!</span>", "<span class='brass'>You begin proselytizing [target]...</span>")
+		if(!silent)
+			user.visible_message("<span class='warning'>[user]'s [name] begins tearing apart [target]!</span>", "<span class='brass'>You begin proselytizing [target]...</span>")
 		if(!do_after(user, proselytize_values["operation_time"], target = target, extra_checks = CALLBACK(src, .proc/proselytize_checks, proselytize_values, target, target_type, user, TRUE)))
 			return FALSE
-		user.visible_message("<span class='warning'>[user]'s [name] covers [target] in golden energy!</span>", "<span class='brass'>You proselytize [target].</span>")
+		if(!silent)
+			user.visible_message("<span class='warning'>[user]'s [name] covers [target] in golden energy!</span>", "<span class='brass'>You proselytize [target].</span>")
 	else
-		user.visible_message("<span class='warning'>[user]'s [name] tears apart [target], covering it in golden energy!</span>", "<span class='brass'>You proselytize [target].</span>")
+		if(!silent)
+			user.visible_message("<span class='warning'>[user]'s [name] tears apart [target], covering it in golden energy!</span>", "<span class='brass'>You proselytize [target].</span>")
 
 	playsound(target, 'sound/items/Deconstruct.ogg', 50, 1)
 	var/new_thing_type = proselytize_values["new_obj_type"]
@@ -227,11 +233,12 @@
 		var/turf/T = target
 		T.ChangeTurf(new_thing_type)
 	else
-		if(proselytize_values["dir_in_new"])
-			new new_thing_type(get_turf(target), proselytize_values["spawn_dir"]) //please verify that your new object actually wants to get a dir in New()
-		else
-			var/atom/A = new new_thing_type(get_turf(target))
-			A.setDir(proselytize_values["spawn_dir"])
+		if(new_thing_type)
+			if(proselytize_values["dir_in_new"])
+				new new_thing_type(get_turf(target), proselytize_values["spawn_dir"]) //please verify that your new object actually wants to get a dir in New()
+			else
+				var/atom/A = new new_thing_type(get_turf(target))
+				A.setDir(proselytize_values["spawn_dir"])
 		if(!proselytize_values["no_target_deletion"]) //for some cases where proselytize_vals() modifies the object but doesn't want it deleted
 			qdel(target)
 	modify_stored_power(-proselytize_values["power_cost"])
@@ -239,8 +246,13 @@
 		return TRUE
 	return FALSE
 
+//The following three procs are heavy wizardry.
+//What these procs do is they take an existing list of values, which they then modify.
+//This(modifying an existing object, in this case the list) is the only way to get information OUT of a do_after callback, which this is used as.
+
+//The proselytize check proc.
 /obj/item/clockwork/clockwork_proselytizer/proc/proselytize_checks(list/proselytize_values, atom/target, expected_type, mob/user, silent) //checked constantly while proselytizing
-	if(!islist(proselytize_values) || !target || QDELETED(target) || !user)
+	if(!islist(proselytize_values) || QDELETED(target) || QDELETED(user))
 		return FALSE
 	if(repairing || recharging)
 		return FALSE
@@ -259,11 +271,8 @@
 	return TRUE
 
 //The repair check proc.
-//Is dark magic. Can probably kill you.
-//What this proc does is it takes an existing list of values, which it modifies.
-//This(modifying an existing object) is the only way to get information OUT of a do_after callback, which this is used as.
 /obj/item/clockwork/clockwork_proselytizer/proc/proselytizer_repair_checks(list/repair_values, atom/target, mob/user, silent) //Exists entirely to avoid an otherwise unreadable series of checks.
-	if(!islist(repair_values) || !target || QDELETED(target) || !user)
+	if(!islist(repair_values) || QDELETED(target) || QDELETED(user))
 		return FALSE
 	if(isliving(target)) //standard checks for if we can affect the target
 		var/mob/living/L = target
@@ -302,9 +311,9 @@
 		return FALSE
 	return TRUE
 
-//checked constantly while charging from a sigil
+//The sigil charge check proc.
 /obj/item/clockwork/clockwork_proselytizer/proc/sigil_charge_checks(list/charge_values, obj/effect/clockwork/sigil/transmission/sigil, mob/user, silent)
-	if(!islist(charge_values) || !sigil || QDELETED(sigil) || !user)
+	if(!islist(charge_values) || QDELETED(sigil) || QDELETED(user))
 		return FALSE
 	if(can_use_power(RATVAR_POWER_CHECK))
 		return FALSE

code/game/gamemodes/clock_cult/clock_mobs.dm

@@ -14,8 +14,7 @@
 	verb_ask = "requests"
 	verb_exclaim = "proclaims"
 	verb_yell = "harangues"
-	initial_languages = list(/datum/language/common, /datum/language/ratvar)
-	only_speaks_language = /datum/language/ratvar
+	initial_language_holder = /datum/language_holder/clockmob
 	bubble_icon = "clock"
 	light_color = "#E42742"
 	death_sound = 'sound/magic/clockwork/anima_fragment_death.ogg'

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

@@ -135,7 +135,7 @@
 	if(!check_special_requirements())
 		return FALSE
 	to_chat(invoker, "<span class='warning'>The tendril shivers slightly as it selects a marauder...</span>")
-	var/list/marauder_candidates = pollCandidates("Do you want to play as the clockwork marauder of [invoker.real_name]?", ROLE_SERVANT_OF_RATVAR, null, FALSE, 50, POLL_IGNORE_CLOCKWORK_MARAUDER)
+	var/list/marauder_candidates = pollGhostCandidates("Do you want to play as the clockwork marauder of [invoker.real_name]?", ROLE_SERVANT_OF_RATVAR, null, FALSE, 50, POLL_IGNORE_CLOCKWORK_MARAUDER)
 	if(!check_special_requirements())
 		return FALSE
 	if(!marauder_candidates.len)

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

@@ -93,7 +93,7 @@
 /obj/structure/destructible/clockwork/powered/clockwork_obelisk/process()
 	if(!anchored)
 		return
-	var/obj/effect/clockwork/spatial_gateway/SG = locate(/obj/effect/clockwork/spatial_gateway)
+	var/obj/effect/clockwork/spatial_gateway/SG = locate(/obj/effect/clockwork/spatial_gateway) in loc
 	if(SG && SG.timerid) //it's a valid gateway, we're active
 		icon_state = active_icon
 		density = 0

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

@@ -28,7 +28,7 @@
 	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)
-	INVOKE_ASYNC(SSshuttle.emergency, /obj/docking_port/mobile/emergency..proc/request, null, 0, 0)
+	INVOKE_ASYNC(SSshuttle.emergency, /obj/docking_port/mobile/emergency.proc/request, null, 0, null, FALSE, 0)
 
 /obj/structure/destructible/clockwork/massive/ratvar/Destroy()
 	GLOB.ratvar_awakens--
@@ -117,12 +117,10 @@
 			if(!isnewplayer(M))
 				flash_color(M, flash_color="#966400", flash_time=1)
 				shake_camera(M, 4, 3)
-		var/ratvar_chance = min(SSticker.mode.servants_of_ratvar.len, 50)
-		var/narsie_chance = SSticker.mode.cult.len
-		for(var/mob/living/simple_animal/hostile/construct/harvester/C in GLOB.player_list)
-			narsie_chance++
+		var/ratvar_chance = min(LAZYLEN(SSticker.mode.servants_of_ratvar), 50)
+		var/narsie_chance = min(LAZYLEN(SSticker.mode.cult), 50)
 		ratvar_chance = rand(base_victory_chance, ratvar_chance)
-		narsie_chance = rand(base_victory_chance, min(narsie_chance, 50))
+		narsie_chance = rand(base_victory_chance, narsie_chance)
 		if(ratvar_chance > narsie_chance)
 			winner = "Ratvar"
 			break

code/game/gamemodes/cult/cult.dm

@@ -1,34 +1,31 @@
-
-
 /datum/game_mode
 	var/list/datum/mind/cult = list()
 	var/list/cult_objectives = list()
+	var/eldergod = 1 //for the summon god objective
 
 /proc/iscultist(mob/living/M)
 	return istype(M) && M.mind && M.mind.has_antag_datum(ANTAG_DATUM_CULT)
 
 /proc/is_sacrifice_target(datum/mind/mind)
-	if(SSticker.mode.name == "cult")
-		var/datum/game_mode/cult/cult_mode = SSticker.mode
-		if(mind == cult_mode.sacrifice_target)
-			return 1
-	return 0
+	if(mind == GLOB.sac_mind)
+		return TRUE
+	return FALSE
 
 /proc/is_convertable_to_cult(mob/living/M)
 	if(!istype(M))
-		return 0
+		return FALSE
 	if(M.mind)
 		if(ishuman(M) && (M.mind.assigned_role in list("Captain", "Chaplain")))
-			return 0
+			return FALSE
 		if(is_sacrifice_target(M.mind))
-			return 0
+			return FALSE
 		if(M.mind.enslaved_to && !iscultist(M.mind.enslaved_to))
-			return 0
+			return FALSE
 	else
-		return 0
+		return FALSE
 	if(M.isloyal() || issilicon(M) || isbot(M) || isdrone(M) || is_servant_of_ratvar(M))
-		return 0 //can't convert machines, shielded, or ratvar's dogs
-	return 1
+		return FALSE //can't convert machines, shielded, or ratvar's dogs
+	return TRUE
 
 /datum/game_mode/cult
 	name = "cult"
@@ -47,14 +44,13 @@
 	<span class='notice'>Crew</span>: Prevent the cult from expanding and drive it out."
 
 	var/finished = 0
-	var/eldergod = 1 //for the summon god objective
 
 	var/acolytes_needed = 10 //for the survive objective
 	var/acolytes_survived = 0
 
-	var/datum/mind/sacrifice_target = null//The target to be sacrificed
 	var/list/cultists_to_cult = list() //the cultists we'll convert
 
+
 /datum/game_mode/cult/pre_setup()
 	cult_objectives += "sacrifice"
 	cult_objectives += "eldergod"
@@ -82,22 +78,6 @@
 	return (cultists_to_cult.len>=required_enemies)
 
 
-/datum/game_mode/cult/proc/memorize_cult_objectives(datum/mind/cult_mind)
-	for(var/obj_count = 1,obj_count <= cult_objectives.len,obj_count++)
-		var/explanation
-		switch(cult_objectives[obj_count])
-			if("survive")
-				explanation = "Our knowledge must live on. Make sure at least [acolytes_needed] acolytes escape on the shuttle to spread their work on an another station."
-			if("sacrifice")
-				if(sacrifice_target)
-					explanation = "Sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role] via invoking a Sacrifice rune with them on it and three acolytes around it."
-				else
-					explanation = "Free objective."
-			if("eldergod")
-				explanation = "Summon Nar-Sie by invoking the rune 'Summon Nar-Sie' with nine acolytes on it. You must do this after sacrificing your target."
-		to_chat(cult_mind.current, "<B>Objective #[obj_count]</B>: [explanation]")
-		cult_mind.memory += "<B>Objective #[obj_count]</B>: [explanation]<BR>"
-
 /datum/game_mode/cult/post_setup()
 	modePlayer += cultists_to_cult
 	if("sacrifice" in cult_objectives)
@@ -108,15 +88,25 @@
 				if(player.mind && !(player.mind in cultists_to_cult))
 					possible_targets += player.mind
 		if(possible_targets.len > 0)
-			sacrifice_target = pick(possible_targets)
-			if(!sacrifice_target)
+			GLOB.sac_mind = pick(possible_targets)
+			if(!GLOB.sac_mind)
 				message_admins("Cult Sacrifice: ERROR -  Null target chosen!")
+			else
+				var/datum/job/sacjob = SSjob.GetJob(GLOB.sac_mind.assigned_role)
+				var/datum/preferences/sacface = GLOB.sac_mind.current.client.prefs
+				var/icon/reshape = get_flat_human_icon(null, sacjob, sacface)
+				reshape.Shift(SOUTH, 4)
+				reshape.Shift(EAST, 1)
+				reshape.Crop(7,4,26,31)
+				reshape.Crop(-5,-3,26,30)
+				GLOB.sac_image = reshape
 		else
 			message_admins("Cult Sacrifice: Could not find unconvertable or convertable target. WELP!")
 	for(var/datum/mind/cult_mind in cultists_to_cult)
 		equip_cultist(cult_mind.current)
 		update_cult_icons_added(cult_mind)
 		to_chat(cult_mind.current, "<span class='userdanger'>You are a member of the cult!</span>")
+		cult_mind.current.playsound_local('sound/ambience/antag/bloodcult.ogg',100,0)//subject to change
 		add_cultist(cult_mind, 0)
 	..()
 
@@ -163,12 +153,12 @@
 			cult_mind.current.Paralyse(5)
 		return 1
 
-/datum/game_mode/proc/remove_cultist(datum/mind/cult_mind, show_message = 1, stun)
+/datum/game_mode/proc/remove_cultist(datum/mind/cult_mind, silent, stun)
 	if(cult_mind.current)
 		var/datum/antagonist/cult/cult_datum = cult_mind.has_antag_datum(ANTAG_DATUM_CULT)
 		if(!cult_datum)
 			return FALSE
-		cult_datum.silent = show_message
+		cult_datum.silent = silent
 		cult_datum.on_removal()
 		if(stun)
 			cult_mind.current.Paralyse(5)
@@ -198,7 +188,7 @@
 	if(cult_objectives.Find("eldergod"))
 		cult_fail += eldergod //1 by default, 0 if the elder god has been summoned at least once
 	if(cult_objectives.Find("sacrifice"))
-		if(sacrifice_target && !GLOB.sacrificed.Find(sacrifice_target)) //if the target has been GLOB.sacrificed, ignore this step. otherwise, add 1 to cult_fail
+		if(GLOB.sac_mind && !GLOB.sac_complete) //if the target has been GLOB.sacrificed, ignore this step. otherwise, add 1 to cult_fail
 			cult_fail++
 	return cult_fail //if any objectives aren't met, failure
 
@@ -243,16 +233,12 @@
 						SSblackbox.add_details("cult_objective","cult_survive|FAIL|[acolytes_needed]")
 						SSticker.news_report = CULT_FAILURE
 				if("sacrifice")
-					if(sacrifice_target)
-						if(sacrifice_target in GLOB.sacrificed)
-							explanation = "Sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role]. <span class='greenannounce'>Success!</span>"
-							SSblackbox.add_details("cult_objective","cult_sacrifice|SUCCESS")
-						else if(sacrifice_target && sacrifice_target.current)
-							explanation = "Sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role]. <span class='boldannounce'>Fail.</span>"
-							SSblackbox.add_details("cult_objective","cult_sacrifice|FAIL")
-						else
-							explanation = "Sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role]. <span class='boldannounce'>Fail (Gibbed).</span>"
-							SSblackbox.add_details("cult_objective","cult_sacrifice|FAIL|GIBBED")
+					if(GLOB.sac_complete)
+						explanation = "Sacrifice [GLOB.sac_mind], the [GLOB.sac_mind.assigned_role]. <span class='greenannounce'>Success!</span>"
+						SSblackbox.add_details("cult_objective","cult_sacrifice|SUCCESS")
+					else
+						explanation = "Sacrifice [GLOB.sac_mind], the [GLOB.sac_mind.assigned_role]. <span class='boldannounce'>Fail.</span>"
+						SSblackbox.add_details("cult_objective","cult_sacrifice|FAIL")
 				if("eldergod")
 					if(!eldergod)
 						explanation = "Summon Nar-Sie. <span class='greenannounce'>Success!</span>"
@@ -269,12 +255,46 @@
 	return 1
 
 
-/datum/game_mode/proc/auto_declare_completion_cult()
-	if( cult.len || (SSticker && istype(SSticker.mode,/datum/game_mode/cult)) )
-		var/text = "<br><font size=3><b>The cultists were:</b></font>"
-		for(var/datum/mind/cultist in cult)
-			text += printplayer(cultist)
-
-		text += "<br>"
-
-		to_chat(world, text)
+/datum/game_mode/proc/datum_cult_completion()
+	var/text = ""
+	var/acolytes_survived = 0
+	for(var/datum/mind/cult_mind in cult)
+		if (cult_mind.current && cult_mind.current.stat != DEAD)
+			if(cult_mind.current.onCentcom() || cult_mind.current.onSyndieBase())
+				acolytes_survived++
+	var/cult_fail = 0
+	cult_fail += eldergod
+	if(!GLOB.sac_complete)
+		cult_fail++
+	if(!cult_fail)
+		SSblackbox.set_details("round_end_result","win - cult win")
+		SSblackbox.set_val("round_end_result",acolytes_survived)
+		to_chat(world, "<span class='greentext'>The cult has succeeded! Nar-sie has snuffed out another torch in the void!</span>")
+	else
+		SSblackbox.set_details("round_end_result","loss - staff stopped the cult")
+		SSblackbox.set_val("round_end_result",acolytes_survived)
+		to_chat(world, "<span class='redtext'>The staff managed to stop the cult! Dark words and heresy are no match for Nanotrasen's finest!</span>")
+	if(cult_objectives.len)
+		text += "<br><b>The cultists' objectives were:</b>"
+		for(var/obj_count in 1 to 2)
+			var/explanation
+			switch(cult_objectives[obj_count])
+				if("sacrifice")
+					if(GLOB.sac_mind)
+						if(GLOB.sac_complete)
+							explanation = "Sacrifice [GLOB.sac_mind], the [GLOB.sac_mind.assigned_role]. <span class='greenannounce'>Success!</span>"
+							SSblackbox.add_details("cult_objective","cult_sacrifice|SUCCESS")
+						else
+							explanation = "Sacrifice [GLOB.sac_mind], the [GLOB.sac_mind.assigned_role]. <span class='boldannounce'>Fail.</span>"
+							SSblackbox.add_details("cult_objective","cult_sacrifice|FAIL")
+				if("eldergod")
+					if(!eldergod)
+						explanation = "Summon Nar-Sie. <span class='greenannounce'>Success!</span>"
+						SSblackbox.add_details("cult_objective","cult_narsie|SUCCESS")
+						SSticker.news_report = CULT_SUMMON
+					else
+						explanation = "Summon Nar-Sie. <span class='boldannounce'>Fail.</span>"
+						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)

code/game/gamemodes/cult/cult_comms.dm

@@ -1,17 +1,21 @@
+// Contains cult communion, guide, and cult master abilities
+#define MARK_COOLDOWN
 
-/datum/action/innate/cultcomm
-	name = "Communion"
-	button_icon_state = "cult_comms"
+/datum/action/innate/cult
 	background_icon_state = "bg_demon"
 	buttontooltipstyle = "cult"
 	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_CONSCIOUS
 
-/datum/action/innate/cultcomm/IsAvailable()
+/datum/action/innate/cult/IsAvailable()
 	if(!iscultist(owner))
-		return 0
+		return FALSE
 	return ..()
 
-/datum/action/innate/cultcomm/Activate()
+/datum/action/innate/cult/comm
+	name = "Communion"
+	button_icon_state = "cult_comms"
+
+/datum/action/innate/cult/comm/Activate()
 	var/input = stripped_input(usr, "Please choose a message to tell to the other acolytes.", "Voice of Blood", "")
 	if(!input || !IsAvailable())
 		return
@@ -19,11 +23,22 @@
 	cultist_commune(usr, input)
 
 /proc/cultist_commune(mob/living/user, message)
+	var/my_message
 	if(!message)
 		return
-	user.whisper("O bidai nabora se[pick("'","`")]sma!")
+	user.whisper("O bidai nabora se[pick("'","`")]sma!", language = /datum/language/common)
 	user.whisper(html_decode(message))
-	var/my_message = "<span class='cultitalic'><b>[(ishuman(user) ? "Acolyte" : "Construct")] [findtextEx(user.name, user.real_name) ? user.name : "[user.real_name] (as [user.name])"]:</b> [message]</span>"
+	var/title = "Acolyte"
+	var/span = "cultitalic"
+	if(user.mind && user.mind.has_antag_datum(ANTAG_DATUM_CULT_MASTER))
+		span = "cultlarge"
+		if(ishuman(user))
+			title = "Master"
+		else
+			title = "Lord"
+	else if(!ishuman(user))
+		title = "Construct"
+	my_message = "<span class='[span]'><b>[title] [findtextEx(user.name, user.real_name) ? user.name : "[user.real_name] (as [user.name])"]:</b> [message]</span>"
 	for(var/mob/M in GLOB.mob_list)
 		if(iscultist(M))
 			to_chat(M, my_message)
@@ -65,3 +80,223 @@
 	popup.set_content(text)
 	popup.open()
 	return 1
+
+/mob/living/proc/cult_master()
+	set category = "Cultist"
+	set name = "Assert Leadership"
+	pollCultists(src)  // This proc handles the distribution of cult master actions
+
+/datum/action/innate/cult/mastervote
+	name = "Assert Leadership"
+	button_icon_state = "cultvote"
+
+/datum/action/innate/cult/mastervote/IsAvailable()
+	if(GLOB.cult_vote_called)
+		return FALSE
+	return ..()
+
+/datum/action/innate/cult/mastervote/Activate()
+	pollCultists(owner)
+
+/proc/pollCultists(var/mob/living/Nominee) //Cult Master Poll
+	if(world.time < CULT_POLL_WAIT)
+		to_chat(Nominee, "It would be premature to select a leader while everyone is still settling in, try again in [round((CULT_POLL_WAIT-world.time)/10)] seconds.")
+		return
+	GLOB.cult_vote_called = TRUE //somebody's trying to be a master, make sure we don't let anyone else try
+	for(var/datum/mind/B in SSticker.mode.cult)
+		if(B.current)
+			B.current.update_action_buttons_icon()
+			if(!B.current.incapacitated())
+				B.current << 'sound/hallucinations/im_here1.ogg'
+				to_chat(B.current, "<span class='cultlarge'>Acolyte [Nominee] has asserted that they are worthy of leading the cult. A vote will be called shortly.</span>")
+	sleep(100)
+	var/list/asked_cultists = list()
+	for(var/datum/mind/B in SSticker.mode.cult)
+		if(B.current && B.current != Nominee && !B.current.incapacitated())
+			B.current << 'sound/magic/exit_blood.ogg'
+			asked_cultists += B.current
+	var/list/yes_voters = pollCandidates("[Nominee] seeks to lead your cult, do you support [Nominee.p_them()]?", poll_time = 300, group = asked_cultists)
+	if(QDELETED(Nominee) || Nominee.incapacitated())
+		GLOB.cult_vote_called = FALSE
+		for(var/datum/mind/B in SSticker.mode.cult)
+			if(B.current)
+				B.current.update_action_buttons_icon()
+				if(!B.current.incapacitated())
+					to_chat(B.current,"<span class='cultlarge'>[Nominee] has died in the process of attempting to win the cult's support!")
+		return FALSE
+	if(!Nominee.mind)
+		GLOB.cult_vote_called = FALSE
+		for(var/datum/mind/B in SSticker.mode.cult)
+			if(B.current)
+				B.current.update_action_buttons_icon()
+				if(!B.current.incapacitated())
+					to_chat(B.current,"<span class='cultlarge'>[Nominee] has gone catatonic in the process of attempting to win the cult's support!")
+		return FALSE
+	if(LAZYLEN(yes_voters) <= LAZYLEN(asked_cultists) * 0.5)
+		GLOB.cult_vote_called = FALSE
+		for(var/datum/mind/B in SSticker.mode.cult)
+			if(B.current)
+				B.current.update_action_buttons_icon()
+				if(!B.current.incapacitated())
+					to_chat(B.current, "<span class='cultlarge'>[Nominee] could not win the cult's support and shall continue to serve as an acolyte.")
+		return FALSE
+	GLOB.cult_mastered = TRUE
+	SSticker.mode.remove_cultist(Nominee.mind, TRUE)
+	Nominee.mind.add_antag_datum(ANTAG_DATUM_CULT_MASTER)
+	for(var/datum/mind/B in SSticker.mode.cult)
+		if(B.current)
+			for(var/datum/action/innate/cult/mastervote/vote in B.current.actions)
+				vote.Remove(B.current)
+			if(!B.current.incapacitated())
+				to_chat(B.current,"<span class='cultlarge'>[Nominee] has won the cult's support and is now their master. Follow [Nominee.p_their()] orders to the best of your ability!")
+	return TRUE
+
+/datum/action/innate/cult/master/IsAvailable()
+	if(!owner.mind || !owner.mind.has_antag_datum(ANTAG_DATUM_CULT_MASTER) || GLOB.cult_narsie)
+		return 0
+	return ..()
+
+/datum/action/innate/cult/master/finalreck
+	name = "Final Reckoning"
+	desc = "A single-use spell that brings the entire cult to the master's location."
+	button_icon_state = "sintouch"
+
+/datum/action/innate/cult/master/finalreck/Activate()
+	for(var/i in 1 to 4)
+		chant(i)
+		var/list/destinations = list()
+		for(var/turf/T in orange(1, owner))
+			if(!is_blocked_turf(T, TRUE))
+				destinations += T
+		if(!LAZYLEN(destinations))
+			to_chat(owner, "<span class='warning'>You need more space to summon the cult!</span>")
+			return
+		if(do_after(owner, 30, target = owner))
+			for(var/datum/mind/B in SSticker.mode.cult)
+				if(B.current && B.current.stat != DEAD)
+					var/turf/mobloc = get_turf(B.current)
+					switch(i)
+						if(1)
+							new /obj/effect/overlay/temp/cult/sparks(mobloc, B.current.dir)
+							playsound(mobloc, "sparks", 50, 1)
+						if(2)
+							new /obj/effect/overlay/temp/dir_setting/cult/phase/out(mobloc, B.current.dir)
+							playsound(mobloc, "sparks", 75, 1)
+						if(3)
+							new /obj/effect/overlay/temp/dir_setting/cult/phase(mobloc, B.current.dir)
+							playsound(mobloc, "sparks", 100, 1)
+						if(4)
+							playsound(mobloc, 'sound/magic/exit_blood.ogg', 100, 1)
+							if(B.current != owner)
+								var/turf/final = pick(destinations)
+								if(istype(B.current.loc, /obj/item/device/soulstone))
+									var/obj/item/device/soulstone/S = B.current.loc
+									S.release_shades(owner)
+								B.current.setDir(SOUTH)
+								new /obj/effect/overlay/temp/cult/blood(final)
+								addtimer(CALLBACK(B.current, /mob/.proc/reckon, final), 10)
+		else
+			return
+	GLOB.reckoning_complete = TRUE
+	Remove(owner)
+
+/mob/proc/reckon(turf/final)
+	new /obj/effect/overlay/temp/cult/blood/out(get_turf(src))
+	forceMove(final)
+
+/datum/action/innate/cult/master/finalreck/proc/chant(chant_number)
+	switch(chant_number)
+		if(1)
+			owner.say("C'arta forbici!", language = /datum/language/common)
+		if(2)
+			owner.say("Pleggh e'ntrath!", language = /datum/language/common)
+			playsound(get_turf(owner),'sound/magic/clockwork/narsie_attack.ogg', 50, 1)
+		if(3)
+			owner.say("Barhah hra zar'garis!", language = /datum/language/common)
+			playsound(get_turf(owner),'sound/magic/clockwork/narsie_attack.ogg', 75, 1)
+		if(4)
+			owner.say("N'ath reth sh'yro eth d'rekkathnor!!!", language = /datum/language/common)
+			playsound(get_turf(owner),'sound/magic/clockwork/narsie_attack.ogg', 100, 1)
+
+/datum/action/innate/cult/master/cultmark
+	name = "Mark Target"
+	desc = "Marks a target for the cult."
+	button_icon_state = "cult_mark"
+	var/obj/effect/proc_holder/cultmark/CM
+	var/cooldown = 0
+	var/base_cooldown = 1200
+
+/datum/action/innate/cult/master/cultmark/New()
+	CM = new()
+	CM.attached_action = src
+	..()
+
+/datum/action/innate/cult/master/cultmark/IsAvailable()
+	if(!owner.mind || !owner.mind.has_antag_datum(ANTAG_DATUM_CULT_MASTER))
+		return FALSE
+	if(cooldown > world.time)
+		if(!CM.active)
+			owner << "<span class='cultlarge'><b>You need to wait [round((cooldown - world.time) * 0.1)] seconds before you can mark another target!</b></span>"
+		return FALSE
+	return ..()
+
+/datum/action/innate/cult/master/cultmark/Destroy()
+	QDEL_NULL(CM)
+	return ..()
+
+/datum/action/innate/cult/master/cultmark/Activate()
+	CM.toggle(owner) //the important bit
+	return TRUE
+
+/obj/effect/proc_holder/cultmark
+	active = FALSE
+	ranged_mousepointer = 'icons/effects/cult_target.dmi'
+	var/datum/action/innate/cult/master/cultmark/attached_action
+
+/obj/effect/proc_holder/cultmark/Destroy()
+	attached_action = null
+	return ..()
+
+/obj/effect/proc_holder/cultmark/proc/toggle(mob/user)
+	if(active)
+		remove_ranged_ability("<span class='cult'>You cease the marking ritual.</span>")
+	else
+		add_ranged_ability(user, "<span class='cult'>You prepare to mark a target for your cult...</span>")
+
+/obj/effect/proc_holder/cultmark/InterceptClickOn(mob/living/caller, params, atom/target)
+	if(..())
+		return
+	if(ranged_ability_user.incapacitated())
+		remove_ranged_ability()
+		return
+	var/turf/T = get_turf(ranged_ability_user)
+	if(!isturf(T))
+		return FALSE
+	if(target in view(7, get_turf(ranged_ability_user)))
+		GLOB.blood_target = target
+		var/area/A = get_area(target)
+		attached_action.cooldown = world.time + attached_action.base_cooldown
+		addtimer(CALLBACK(attached_action.owner, /mob.proc/update_action_buttons_icon), attached_action.base_cooldown)
+		GLOB.blood_target_image = image('icons/effects/cult_target.dmi', target, "glow", ABOVE_MOB_LAYER)
+		GLOB.blood_target_image.appearance_flags = RESET_COLOR
+		GLOB.blood_target_image.pixel_x = -target.pixel_x
+		GLOB.blood_target_image.pixel_y = -target.pixel_y
+		for(var/datum/mind/B in SSticker.mode.cult)
+			if(B.current && B.current.stat != DEAD && B.current.client)
+				to_chat(B.current, "<span class='cultlarge'><b>Master [ranged_ability_user] has marked [GLOB.blood_target] in the [A.name] as the cult's top priority, get there immediately!</b></span>")
+				B.current << pick(sound('sound/hallucinations/over_here2.ogg',0,1,75), sound('sound/hallucinations/over_here3.ogg',0,1,75))
+				B.current.client.images += GLOB.blood_target_image
+		attached_action.owner.update_action_buttons_icon()
+		remove_ranged_ability("<span class='cult'>The marking rite is complete! It will last for 90 seconds.</span>")
+		GLOB.blood_target_reset_timer = addtimer(CALLBACK(GLOBAL_PROC, .proc/reset_blood_target), 900, TIMER_STOPPABLE)
+		return TRUE
+	return FALSE
+
+/proc/reset_blood_target()
+	for(var/datum/mind/B in SSticker.mode.cult)
+		if(B.current && B.current.stat != DEAD && B.current.client)
+			if(GLOB.blood_target)
+				to_chat(B.current,"<span class='cultlarge'><b>The blood mark has expired!</b></span>")
+			B.current.client.images -= GLOB.blood_target_image
+	QDEL_NULL(GLOB.blood_target_image)
+	GLOB.blood_target = null

code/game/gamemodes/cult/cult_items.dm

@@ -26,6 +26,11 @@
 		return
 	..()
 
+/obj/item/weapon/melee/cultblade/ghost
+	name = "eldritch sword"
+	force = 19
+	flags = NODROP|DROPDEL
+
 /obj/item/weapon/melee/cultblade/pickup(mob/living/user)
 	..()
 	if(!iscultist(user))
@@ -100,12 +105,18 @@
 	icon_state = "cult_hoodalt"
 	item_state = "cult_hoodalt"
 
+/obj/item/clothing/head/culthood/alt/ghost
+	flags = NODROP|DROPDEL
+
 /obj/item/clothing/suit/cultrobes/alt
 	name = "cultist robes"
 	desc = "An armored set of robes worn by the followers of Nar-Sie."
 	icon_state = "cultrobesalt"
 	item_state = "cultrobesalt"
 
+/obj/item/clothing/suit/cultrobes/alt/ghost
+	flags = NODROP|DROPDEL
+
 
 /obj/item/clothing/head/magus
 	name = "magus helm"
@@ -203,7 +214,7 @@
 /obj/item/clothing/suit/hooded/cultrobes/cult_shield/worn_overlays(isinhands)
 	. = list()
 	if(!isinhands && current_charges)
-		. += mutable_appearance('icons/effects/effects.dmi', "shield-cult", MOB_LAYER + 0.01)
+		. += mutable_appearance('icons/effects/cult_effects.dmi', "shield-cult", MOB_LAYER + 0.01)
 
 /obj/item/clothing/suit/hooded/cultrobes/berserker
 	name = "flagellant's robes"
@@ -213,7 +224,7 @@
 	flags_inv = HIDEJUMPSUIT
 	allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade)
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	armor = list(melee = -50, bullet = -50, laser = -100,energy = -50, bomb = -50, bio = -50, rad = -50, fire = 0, acid = 0)
+	armor = list(melee = -50, bullet = -50, laser = -50,energy = -50, bomb = -50, bio = -50, rad = -50, fire = 0, acid = 0)
 	slowdown = -1
 	hoodtype = /obj/item/clothing/head/hooded/berserkerhood
 

code/game/gamemodes/cult/ritual.dm

@@ -197,35 +197,30 @@ This file contains the arcane tome files.
 	if(!src || QDELETED(src) || !Adjacent(user) || user.incapacitated() || !check_rune_turf(Turf, user))
 		return
 	if(ispath(rune_to_scribe, /obj/effect/rune/narsie))
-		if(SSticker.mode.name == "cult")
-			var/datum/game_mode/cult/cult_mode = SSticker.mode
-			if(!("eldergod" in cult_mode.cult_objectives))
-				to_chat(user, "<span class='warning'>Nar-Sie does not wish to be summoned!</span>")
-				return
-			if(cult_mode.sacrifice_target && !(cult_mode.sacrifice_target in GLOB.sacrificed))
-				to_chat(user, "<span class='warning'>The sacrifice is not complete. The portal would lack the power to open if you tried!</span>")
-				return
-			if(!cult_mode.eldergod)
-				to_chat(user, "<span class='cultlarge'>\"I am already here. There is no need to try to summon me now.\"</span>")
-				return
-			if((loc.z && loc.z != ZLEVEL_STATION) || !A.blob_allowed)
-				to_chat(user, "<span class='warning'>The Geometer is not interested in lesser locations; the station is the prize!</span>")
-				return
-			var/confirm_final = alert(user, "This is the FINAL step to summon Nar-Sie, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for Nar-Sie!", "No")
-			if(confirm_final == "No")
-				to_chat(user, "<span class='cult'>You decide to prepare further before scribing the rune.</span>")
-				return
-			Turf = get_turf(user)
-			A = get_area(src)
-			if(!check_rune_turf(Turf, user) || (loc.z && loc.z != ZLEVEL_STATION)|| !A.blob_allowed)
-				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 Dimensionsal 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
-		else
+		if(!("eldergod" in SSticker.mode.cult_objectives))
 			to_chat(user, "<span class='warning'>Nar-Sie does not wish to be summoned!</span>")
 			return
+		if(!GLOB.sac_complete)
+			to_chat(user, "<span class='warning'>The sacrifice is not complete. The portal would lack the power to open if you tried!</span>")
+			return
+		if(!SSticker.mode.eldergod)
+			to_chat(user, "<span class='cultlarge'>\"I am already here. There is no need to try to summon me now.\"</span>")
+			return
+		if((loc.z && loc.z != ZLEVEL_STATION) || !A.blob_allowed)
+			to_chat(user, "<span class='warning'>The Geometer is not interested in lesser locations; the station is the prize!</span>")
+			return
+		var/confirm_final = alert(user, "This is the FINAL step to summon Nar-Sie; it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for Nar-Sie!", "No")
+		if(confirm_final == "No")
+			to_chat(user, "<span class='cult'>You decide to prepare further before scribing the rune.</span>")
+			return
+		Turf = get_turf(user)
+		A = get_area(src)
+		if(!check_rune_turf(Turf, user) || (loc.z && loc.z != ZLEVEL_STATION)|| !A.blob_allowed)
+			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')
+		for(var/B in spiral_range_turfs(1, user, 1))
+			var/obj/structure/emergency_shield/sanguine/N = new(B)
+			shields += N
 	user.visible_message("<span class='warning'>[user] [user.blood_volume ? "cuts open their arm and begins writing in their own blood":"begins sketching out a strange design"]!</span>", \
 						 "<span class='cult'>You [user.blood_volume ? "slice open your arm and ":""]begin drawing a sigil of the Geometer.</span>")
 	if(user.blood_volume)

code/game/gamemodes/cult/rune_spawn_action.dm

@@ -0,0 +1,70 @@
+//after a delay, creates a rune below you. for constructs creating runes.
+/datum/action/innate/cult/create_rune
+	background_icon_state = "bg_cult"
+	var/obj/effect/rune/rune_type
+	var/cooldown = 0
+	var/base_cooldown = 900
+	var/scribe_time = 100
+	var/damage_interrupt = TRUE
+	var/action_interrupt = TRUE
+	var/obj/effect/overlay/temp/cult/rune_spawn/rune_word_type
+	var/obj/effect/overlay/temp/cult/rune_spawn/rune_innerring_type
+	var/obj/effect/overlay/temp/cult/rune_spawn/rune_center_type
+	var/rune_color
+
+/datum/action/innate/cult/create_rune/IsAvailable()
+	if(!rune_type || cooldown > world.time)
+		return FALSE
+	return ..()
+
+/datum/action/innate/cult/create_rune/Activate()
+	var/chosen_keyword
+	if(!isturf(owner.loc))
+		to_chat(owner, "<span class='warning>You need more space to scribe a rune!</span>")
+		return
+	if(initial(rune_type.req_keyword))
+		chosen_keyword = stripped_input(owner, "Enter a keyword for the new rune.", "Words of Power")
+		if(!chosen_keyword)
+			return
+//the outer ring is always the same across all runes
+	var/obj/effect/overlay/temp/cult/rune_spawn/R1 = new(owner.loc, scribe_time, rune_color)
+//the rest are not always the same, so we need types for em
+	var/obj/effect/overlay/temp/cult/rune_spawn/R2
+	if(rune_word_type)
+		R2 = new rune_word_type(owner.loc, scribe_time, rune_color)
+	var/obj/effect/overlay/temp/cult/rune_spawn/R3
+	if(rune_innerring_type)
+		R3 = new rune_innerring_type(owner.loc, scribe_time, rune_color)
+	var/obj/effect/overlay/temp/cult/rune_spawn/R4
+	if(rune_center_type)
+		R4 = new rune_center_type(owner.loc, scribe_time, rune_color)
+
+	cooldown = base_cooldown + world.time
+	owner.update_action_buttons_icon()
+	addtimer(CALLBACK(owner, /mob.proc/update_action_buttons_icon), base_cooldown)
+	var/list/health
+	if(damage_interrupt && isliving(owner))
+		var/mob/living/L = owner
+		health = list("health" = L.health)
+	if(do_after(owner, scribe_time, target = owner, extra_checks = CALLBACK(owner, /mob.proc/break_do_after_checks, health, action_interrupt)))
+		var/obj/effect/rune/new_rune = new rune_type(owner.loc)
+		new_rune.keyword = chosen_keyword
+	else
+		qdel(R1)
+		if(R2)
+			qdel(R2)
+		if(R3)
+			qdel(R3)
+		if(R4)
+			qdel(R4)
+		cooldown = 0
+		owner.update_action_buttons_icon()
+
+//teleport rune
+/datum/action/innate/cult/create_rune/tele
+	button_icon_state = "telerune"
+	rune_type = /obj/effect/rune/teleport
+	rune_word_type = /obj/effect/overlay/temp/cult/rune_spawn/rune2
+	rune_innerring_type = /obj/effect/overlay/temp/cult/rune_spawn/rune2/inner
+	rune_center_type = /obj/effect/overlay/temp/cult/rune_spawn/rune2/center
+	rune_color = RUNE_COLOR_TELEPORT

code/game/gamemodes/cult/runes.dm

@@ -24,18 +24,18 @@ To draw a rune, use an arcane tome.
 	icon_state = "1"
 	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	layer = LOW_OBJ_LAYER
-	color = "#FF0000"
+	color = RUNE_COLOR_RED
 
 	var/invocation = "Aiy ele-mayo!" //This is said by cultists when the rune is invoked.
 	var/req_cultists = 1 //The amount of cultists required around the rune to invoke it. If only 1, any cultist can invoke it.
 	var/req_cultists_text //if we have a description override for required cultists to invoke
-	var/rune_in_use = 0 // Used for some runes, this is for when you want a rune to not be usable when in use.
+	var/rune_in_use = FALSE // Used for some runes, this is for when you want a rune to not be usable when in use.
 
 	var/scribe_delay = 50 //how long the rune takes to create
 	var/scribe_damage = 0.1 //how much damage you take doing it
 
-	var/allow_excess_invokers = 0 //if we allow excess invokers when being invoked
-	var/construct_invoke = 1 //if constructs can invoke it
+	var/allow_excess_invokers = FALSE //if we allow excess invokers when being invoked
+	var/construct_invoke = TRUE //if constructs can invoke it
 
 	var/req_keyword = 0 //If the rune requires a keyword - go figure amirite
 	var/keyword //The actual keyword for the rune
@@ -136,7 +136,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 	if(invocation)
 		for(var/M in invokers)
 			var/mob/living/L = M
-			L.say(invocation)
+			L.say(invocation, language = /datum/language/common)
 	do_invoke_glow()
 
 /obj/effect/rune/proc/do_invoke_glow()
@@ -191,7 +191,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 	cultist_desc = "transforms paper into powerful magic talismans."
 	invocation = "H'drak v'loso, mir'kanas verbot!"
 	icon_state = "3"
-	color = "#0000FF"
+	color = RUNE_COLOR_TALISMAN
 
 /obj/effect/rune/imbue/invoke(var/list/invokers)
 	var/mob/living/user = invokers[1] //the first invoker is always the user
@@ -228,14 +228,12 @@ structure_check() searches for nearby cultist structures required for the invoca
 	var/obj/item/weapon/paper/paper_to_imbue = papers_on_rune[1]
 	..()
 	visible_message("<span class='warning'>Dark power begins to channel into the paper!</span>")
-	rune_in_use = 1
-	if(!do_after(user, initial(talisman_type.creation_time), target = paper_to_imbue))
-		rune_in_use = 0
-		return
-	new talisman_type(get_turf(src))
-	visible_message("<span class='warning'>[src] glows with power, and bloody images form themselves on [paper_to_imbue].</span>")
-	qdel(paper_to_imbue)
-	rune_in_use = 0
+	rune_in_use = TRUE
+	if(do_after(user, initial(talisman_type.creation_time), target = paper_to_imbue))
+		new talisman_type(get_turf(src))
+		visible_message("<span class='warning'>[src] glows with power, and bloody images form themselves on [paper_to_imbue].</span>")
+		qdel(paper_to_imbue)
+	rune_in_use = FALSE
 
 /obj/effect/rune/imbue/proc/checkpapers()
 	. = list()
@@ -248,8 +246,8 @@ structure_check() searches for nearby cultist structures required for the invoca
 	cultist_desc = "warps everything above it to another chosen teleport rune."
 	invocation = "Sas'so c'arta forbici!"
 	icon_state = "2"
-	color = "#551A8B"
-	req_keyword = 1
+	color = RUNE_COLOR_TELEPORT
+	req_keyword = TRUE
 	var/listkey
 
 /obj/effect/rune/teleport/Initialize(mapload, set_keyword)
@@ -296,15 +294,15 @@ structure_check() searches for nearby cultist structures required for the invoca
 		to_chat(user, "<span class='warning'>The target rune is blocked. Attempting to teleport to it would be massively unwise.</span>")
 		fail_invoke()
 		return
-	var/movedsomething = 0
-	var/moveuserlater = 0
+	var/movedsomething = FALSE
+	var/moveuserlater = FALSE
 	for(var/atom/movable/A in T)
 		if(A == user)
-			moveuserlater = 1
-			movedsomething = 1
+			moveuserlater = TRUE
+			movedsomething = TRUE
 			continue
 		if(!A.anchored)
-			movedsomething = 1
+			movedsomething = TRUE
 			A.forceMove(target)
 	if(movedsomething)
 		..()
@@ -324,9 +322,9 @@ structure_check() searches for nearby cultist structures required for the invoca
 	req_cultists_text = "2 for conversion, 3 for living sacrifices and sacrifice targets."
 	invocation = "Mah'weyh pleggh at e'ntrath!"
 	icon_state = "3"
-	color = "#FFFFFF"
+	color = RUNE_COLOR_OFFER
 	req_cultists = 1
-	allow_excess_invokers = 1
+	allow_excess_invokers = TRUE
 	rune_in_use = FALSE
 
 /obj/effect/rune/convert/do_invoke_glow()
@@ -347,7 +345,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 	rune_in_use = TRUE
 	visible_message("<span class='warning'>[src] pulses blood red!</span>")
 	var/oldcolor = color
-	color = "#7D1717"
+	color = RUNE_COLOR_DARKRED
 	var/mob/living/L = pick(myriad_targets)
 	var/is_clock = is_servant_of_ratvar(L)
 	var/is_convertable = is_convertable_to_cult(L)
@@ -398,23 +396,23 @@ structure_check() searches for nearby cultist structures required for the invoca
 	return 1
 
 /obj/effect/rune/convert/proc/do_sacrifice(mob/living/sacrificial, list/invokers)
+	var/big_sac = FALSE
 	if((((ishuman(sacrificial) || iscyborg(sacrificial)) && sacrificial.stat != DEAD) || is_sacrifice_target(sacrificial.mind)) && invokers.len < 3)
 		for(var/M in invokers)
 			to_chat(M, "<span class='cultitalic'>[sacrificial] is too greatly linked to the world! You need three acolytes!</span>")
 		log_game("Offer rune failed - not enough acolytes and target is living or sac target")
 		return FALSE
-	var/sacrifice_fulfilled = FALSE
-
 	if(sacrificial.mind)
 		GLOB.sacrificed += sacrificial.mind
 		if(is_sacrifice_target(sacrificial.mind))
-			sacrifice_fulfilled = TRUE
+			GLOB.sac_complete = TRUE
+			big_sac = TRUE
 	else
 		GLOB.sacrificed += sacrificial
 
 	new /obj/effect/overlay/temp/cult/sac(get_turf(src))
 	for(var/M in invokers)
-		if(sacrifice_fulfilled)
+		if(big_sac)
 			to_chat(M, "<span class='cultlarge'>\"Yes! This is the one I desire! You have done well.\"</span>")
 		else
 			if(ishuman(sacrificial) || iscyborg(sacrificial))
@@ -444,14 +442,13 @@ structure_check() searches for nearby cultist structures required for the invoca
 	invocation = "TOK-LYR RQA-NAP G'OLT-ULOFT!!"
 	req_cultists = 9
 	icon = 'icons/effects/96x96.dmi'
-	color = "#7D1717"
+	color = RUNE_COLOR_DARKRED
 	icon_state = "rune_large"
 	pixel_x = -32 //So the big ol' 96x96 sprite shows up right
 	pixel_y = -32
 	scribe_delay = 450 //how long the rune takes to create
 	scribe_damage = 40.1 //how much damage you take doing it
-	var/used
-	var/ignore_gamemode = FALSE
+	var/used = FALSE
 
 /obj/effect/rune/narsie/Initialize(mapload, set_keyword)
 	. = ..()
@@ -470,34 +467,21 @@ structure_check() searches for nearby cultist structures required for the invoca
 	if(z != ZLEVEL_STATION)
 		return
 
-	var/datum/game_mode/cult/cult_mode
-
-	if(SSticker.mode.name == "cult")
-		cult_mode = SSticker.mode
-
-	if(!cult_mode && !ignore_gamemode)
-		for(var/M in invokers)
-			to_chat(M, "<span class='warning'>Nar-Sie does not respond!</span>")
-		fail_invoke()
-		log_game("Summon Nar-Sie rune failed - gametype is not cult")
-		return
-
 	if(locate(/obj/singularity/narsie) in GLOB.poi_list)
 		for(var/M in invokers)
 			to_chat(M, "<span class='warning'>Nar-Sie is already on this plane!</span>")
 		log_game("Summon Nar-Sie rune failed - already summoned")
 		return
 	//BEGIN THE SUMMONING
-	used = 1
+	used = TRUE
 	..()
-	send_to_playing_players('sound/effects/dimensional_rend.ogg') //There used to be a message for this but every time it was changed it got edgier so I removed it
+	send_to_playing_players('sound/effects/dimensional_rend.ogg')
 	var/turf/T = get_turf(src)
 	sleep(40)
 	if(src)
-		color = "#FF0000"
-	if(cult_mode)
-		cult_mode.eldergod = 0
-	new /obj/singularity/narsie/large(T) //Causes Nar-Sie to spawn even if the rune has been removed
+		color = RUNE_COLOR_RED
+	SSticker.mode.eldergod = FALSE
+	new /obj/singularity/narsie/large/cult(T) //Causes Nar-Sie to spawn even if the rune has been removed
 
 /obj/effect/rune/narsie/attackby(obj/I, mob/user, params)	//Since the narsie rune takes a long time to make, add logging to removal.
 	if((istype(I, /obj/item/weapon/tome) && iscultist(user)))
@@ -514,11 +498,11 @@ structure_check() searches for nearby cultist structures required for the invoca
 
 //Rite of Resurrection: Requires the corpse of a cultist and that there have been less revives than the number of people GLOB.sacrificed
 /obj/effect/rune/raise_dead
-	cultist_name = "Raise Dead"
+	cultist_name = "Resurrect Cultist"
 	cultist_desc = "requires the corpse of a cultist placed upon the rune. Provided there have been sufficient sacrifices, they will be revived."
-	invocation = null //Depends on the name of the user - see below
+	invocation = "Pasnar val'keriam usinar. Savrae ines amutan. Yam'toth remium il'tarat!" //Depends on the name of the user - see below
 	icon_state = "1"
-	color = "#C80000"
+	color = RUNE_COLOR_MEDIUMRED
 	var/static/revives_used = 0
 
 /obj/effect/rune/raise_dead/examine(mob/user)
@@ -556,9 +540,9 @@ structure_check() searches for nearby cultist structures required for the invoca
 		return
 	rune_in_use = 1
 	if(user.name == "Herbert West")
-		user.say("To life, to life, I bring them!")
+		invocation = "To life, to life, I bring them!"
 	else
-		user.say("Pasnar val'keriam usinar. Savrae ines amutan. Yam'toth remium il'tarat!")
+		invocation = initial(invocation)
 	..()
 	revives_used++
 	mob_to_revive.revive(1, 1) //This does remove disabilities and such, but the rune might actually see some use because of it!
@@ -609,7 +593,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 	invocation = "Ta'gh fara'qha fel d'amar det!"
 	icon_state = "5"
 	allow_excess_invokers = 1
-	color = "#4D94FF"
+	color = RUNE_COLOR_EMP
 
 /obj/effect/rune/emp/invoke(var/list/invokers)
 	var/turf/E = get_turf(src)
@@ -639,7 +623,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 	cultist_desc = "severs the link between one's spirit and body. This effect is taxing and one's physical body will take damage while this is active."
 	invocation = "Fwe'sh mah erl nyag r'ya!"
 	icon_state = "7"
-	color = "#7D1717"
+	color = RUNE_COLOR_DARKRED
 	rune_in_use = 0 //One at a time, please!
 	construct_invoke = 0
 	var/mob/living/affecting = null
@@ -665,9 +649,9 @@ structure_check() searches for nearby cultist structures required for the invoca
 	var/mob/living/user = invokers[1]
 	..()
 	var/turf/T = get_turf(src)
-	rune_in_use = 1
+	rune_in_use = TRUE
 	affecting = user
-	user.color = "#7D1717"
+	user.add_atom_colour(RUNE_COLOR_DARKRED, ADMIN_COLOUR_PRIORITY)
 	user.visible_message("<span class='warning'>[user] freezes statue-still, glowing an unearthly red.</span>", \
 						 "<span class='cult'>You see what lies beyond. All is revealed. While this is a wondrous experience, your physical form will waste away in this state. Hurry...</span>")
 	user.ghostize(1)
@@ -675,7 +659,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 		if(!affecting)
 			visible_message("<span class='warning'>[src] pulses gently before falling dark.</span>")
 			affecting = null //In case it's assigned to a number or something
-			rune_in_use = 0
+			rune_in_use = FALSE
 			return
 		affecting.apply_damage(0.1, BRUTE)
 		if(!(user in T))
@@ -685,9 +669,9 @@ structure_check() searches for nearby cultist structures required for the invoca
 		if(user.key)
 			user.visible_message("<span class='warning'>[user] slowly relaxes, the glow around [user.p_them()] dimming.</span>", \
 								 "<span class='danger'>You are re-united with your physical form. [src] releases its hold over you.</span>")
-			user.color = initial(user.color)
+			user.remove_atom_colour(ADMIN_COLOUR_PRIORITY, RUNE_COLOR_DARKRED)
 			user.Weaken(3)
-			rune_in_use = 0
+			rune_in_use = FALSE
 			affecting = null
 			return
 		if(user.stat == UNCONSCIOUS)
@@ -695,14 +679,14 @@ structure_check() searches for nearby cultist structures required for the invoca
 				var/mob/dead/observer/G = user.get_ghost()
 				to_chat(G, "<span class='cultitalic'>You feel the link between you and your body weakening... you must hurry!</span>")
 		if(user.stat == DEAD)
-			user.color = initial(user.color)
-			rune_in_use = 0
+			user.remove_atom_colour(ADMIN_COLOUR_PRIORITY, RUNE_COLOR_DARKRED)
+			rune_in_use = FALSE
 			affecting = null
 			var/mob/dead/observer/G = user.get_ghost()
 			to_chat(G, "<span class='cultitalic'><b>You suddenly feel your physical form pass on. [src]'s exertion has killed you!</b></span>")
 			return
 		sleep(1)
-	rune_in_use = 0
+	rune_in_use = FALSE
 
 //Rite of the Corporeal Shield: When invoked, becomes solid and cannot be passed. Invoke again to undo.
 /obj/effect/rune/wall
@@ -710,7 +694,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 	cultist_desc = "when invoked, makes a temporary invisible wall to block passage. Can be invoked again to reverse this."
 	invocation = "Khari'd! Eske'te tannin!"
 	icon_state = "1"
-	color = "#C80000"
+	color = RUNE_COLOR_MEDIUMRED
 	CanAtmosPass = ATMOS_PASS_DENSITY
 	var/density_timer
 	var/recharging = FALSE
@@ -769,7 +753,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 
 /obj/effect/rune/wall/proc/recharge()
 	recharging = FALSE
-	add_atom_colour("#C80000", FIXED_COLOUR_PRIORITY)
+	add_atom_colour(RUNE_COLOR_MEDIUMRED, FIXED_COLOUR_PRIORITY)
 
 /obj/effect/rune/wall/proc/update_state()
 	deltimer(density_timer)
@@ -780,10 +764,10 @@ structure_check() searches for nearby cultist structures required for the invoca
 		shimmer.alpha = 60
 		shimmer.color = "#701414"
 		add_overlay(shimmer)
-		add_atom_colour("#FF0000", FIXED_COLOUR_PRIORITY)
+		add_atom_colour(RUNE_COLOR_RED, FIXED_COLOUR_PRIORITY)
 	else
 		cut_overlays()
-		add_atom_colour("#C80000", FIXED_COLOUR_PRIORITY)
+		add_atom_colour(RUNE_COLOR_MEDIUMRED, FIXED_COLOUR_PRIORITY)
 
 //Rite of Joined Souls: Summons a single cultist.
 /obj/effect/rune/summon
@@ -793,7 +777,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 	req_cultists = 2
 	allow_excess_invokers = 1
 	icon_state = "5"
-	color = "#00FF00"
+	color = RUNE_COLOR_SUMMON
 
 /obj/effect/rune/summon/invoke(var/list/invokers)
 	var/mob/living/user = invokers[1]
@@ -838,7 +822,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 	cultist_desc = "boils the blood of non-believers who can see the rune, rapidly dealing extreme amounts of damage. Requires 3 invokers."
 	invocation = "Dedo ol'btoh!"
 	icon_state = "4"
-	color = "#C80000"
+	color = RUNE_COLOR_MEDIUMRED
 	light_color = LIGHT_COLOR_LAVA
 	req_cultists = 3
 	construct_invoke = 0
@@ -905,10 +889,12 @@ structure_check() searches for nearby cultist structures required for the invoca
 	invocation = "Gal'h'rfikk harfrandid mud'gib!" //how the fuck do you pronounce this
 	icon_state = "6"
 	construct_invoke = 0
-	color = "#C80000"
+	color = RUNE_COLOR_MEDIUMRED
+	var/ghost_limit = 5
+	var/ghosts = 0
 
-/obj/effect/rune/manifest/New(loc)
-	..()
+/obj/effect/rune/manifest/Initialize()
+	. = ..()
 	notify_ghosts("Manifest rune created in [get_area(src)].", 'sound/effects/ghost2.ogg', source = src)
 
 /obj/effect/rune/manifest/can_invoke(mob/living/user)
@@ -917,6 +903,16 @@ structure_check() searches for nearby cultist structures required for the invoca
 		fail_invoke()
 		log_game("Manifest rune failed - user not standing on rune")
 		return list()
+	if(user.has_status_effect(STATUS_EFFECT_SUMMONEDGHOST))
+		to_chat(user, "<span class='cultitalic'>Ghosts can't summon more ghosts!</span>")
+		fail_invoke()
+		log_game("Manifest rune failed - user is a ghost")
+		return list()
+	if(ghosts >= ghost_limit)
+		to_chat(user, "<span class='cultitalic'>You are sustaining too many ghosts to summon more!</span>")
+		fail_invoke()
+		log_game("Manifest rune failed - too many summoned ghosts")
+		return list()
 	var/list/ghosts_on_rune = list()
 	for(var/mob/dead/observer/O in get_turf(src))
 		if(O.client && !jobban_isbanned(O, ROLE_CULTIST))
@@ -938,8 +934,13 @@ structure_check() searches for nearby cultist structures required for the invoca
 	var/mob/living/carbon/human/new_human = new(get_turf(src))
 	new_human.real_name = ghost_to_spawn.real_name
 	new_human.alpha = 150 //Makes them translucent
+	new_human.equipOutfit(/datum/outfit/ghost_cultist) //give them armor
+	new_human.apply_status_effect(STATUS_EFFECT_SUMMONEDGHOST) //ghosts can't summon more ghosts
 	..()
-	visible_message("<span class='warning'>A cloud of red mist forms above [src], and from within steps... a man.</span>")
+	ghosts++
+	playsound(src, 'sound/magic/exit_blood.ogg', 50, 1)
+	user.apply_damage(10, BRUTE)
+	visible_message("<span class='warning'>A cloud of red mist forms above [src], and from within steps... a [new_human.gender == FEMALE ? "wo":""]man.</span>")
 	to_chat(user, "<span class='cultitalic'>Your blood begins flowing into [src]. You must remain in place and conscious to maintain the forms of those summoned. This will hurt you slowly but surely...</span>")
 	var/turf/T = get_turf(src)
 	var/obj/structure/emergency_shield/invoker/N = new(T)
@@ -948,16 +949,17 @@ structure_check() searches for nearby cultist structures required for the invoca
 	SSticker.mode.add_cultist(new_human.mind, 0)
 	to_chat(new_human, "<span class='cultitalic'><b>You are a servant of the Geometer. You have been made semi-corporeal by the cult of Nar-Sie, and you are to serve them at all costs.</b></span>")
 
-	while(user in T)
-		if(user.stat)
+	while(!QDELETED(src) && !QDELETED(user) && !QDELETED(new_human) && (user in T))
+		if(user.stat || new_human.InCritical())
 			break
 		user.apply_damage(0.1, BRUTE)
-		sleep(3)
+		sleep(1)
 
 	qdel(N)
+	ghosts--
 	if(new_human)
 		new_human.visible_message("<span class='warning'>[new_human] suddenly dissolves into bones and ashes.</span>", \
 								  "<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)
-		new_human.dust()
+			new_human.dropItemToGround(I, TRUE)
+		new_human.dust()

code/game/gamemodes/cult/supply.dm

@@ -0,0 +1,124 @@
+//Supply Talisman: Has a few unique effects. Granted only to starter cultists.
+/obj/item/weapon/paper/talisman/supply
+	cultist_name = "Supply Talisman"
+	cultist_desc = "A multi-use talisman that can create various objects. Intended to increase the cult's strength early on."
+	invocation = null
+	uses = 3
+	var/list/possible_summons = list(
+		/datum/cult_supply/tome,
+		/datum/cult_supply/metal,
+		/datum/cult_supply/talisman/teleport,
+		/datum/cult_supply/talisman/emp,
+		/datum/cult_supply/talisman/stun,
+		/datum/cult_supply/talisman/veil,
+		/datum/cult_supply/soulstone,
+		/datum/cult_supply/construct_shell
+	)
+
+/obj/item/weapon/paper/talisman/supply/invoke(mob/living/user, successfuluse = 1)
+	var/list/dat = list()
+	dat += "<B>There are [uses] bloody runes on the parchment.</B><BR>"
+	dat += "Please choose the chant to be imbued into the fabric of reality.<BR>"
+	dat += "<HR>"
+	for(var/s in possible_summons)
+		var/datum/cult_supply/S = s
+		dat += "<a href='?src=\ref[src];id=[initial(S.id)]'>[initial(S.invocation)]</a> - [initial(S.desc)]<br>"
+	var/datum/browser/popup = new(user, "talisman", "", 400, 400)
+	popup.set_content(dat.Join(""))
+	popup.open()
+	return 0
+
+/obj/item/weapon/paper/talisman/supply/Topic(href, href_list)
+	world.log << "[usr], [href], [href_list]"
+	if(QDELETED(src) || usr.incapacitated() || !in_range(src, usr))
+		return
+
+	var/id = href_list["id"]
+	var/datum/cult_supply/match
+
+	for(var/s in possible_summons)
+		var/datum/cult_supply/S = s
+		if(initial(S.id) == id)
+			match = S
+			break
+
+	if(!match)
+		to_chat(usr, "<span class='userdanger'>The fabric of reality quivers in agony.</span>")
+		return
+
+	var/turf/T = get_turf(src)
+	var/summon_type = initial(match.summon_type)
+
+
+	var/atom/movable/AM = new summon_type(T)
+	if(istype(AM, /obj/item))
+		usr.put_in_hands(AM)
+
+	uses--
+	if(uses <= 0)
+		to_chat(usr, "<span class='warning'>[src] crumbles to dust.</span>")
+		burn()
+
+/obj/item/weapon/paper/talisman/supply/weak
+	cultist_name = "Lesser Supply Talisman"
+	uses = 2
+
+/obj/item/weapon/paper/talisman/supply/weak/Initialize(mapload)
+	. = ..()
+	// no runed metal from lesser talismans.
+	possible_summons -= /datum/cult_supply/metal
+
+/datum/cult_supply
+	var/id = "used_popcorn"
+	var/invocation = "Pla'ceho'lder."
+	var/desc = "Summons a generic supply item, to aid the cult."
+	var/summon_type = /obj/item/trash/popcorn // wait this isn't useful
+
+/datum/cult_supply/tome
+	id = "arcane_tome"
+	invocation = "N'ath reth sh'yro eth d'raggathnor!"
+	desc = "Summons an arcane tome, used to scribe runes."
+	summon_type = /obj/item/weapon/tome
+
+/datum/cult_supply/metal
+	id = "runed_metal"
+	invocation = "Bar'tea eas!"
+	desc = "Provides 5 runed metal, which can build a variety of cult structures."
+	summon_type = /obj/item/stack/sheet/runed_metal/five
+
+/datum/cult_supply/talisman/teleport
+	id = "teleport_talisman"
+	invocation = "Sas'so c'arta forbici!"
+	desc = "Allows you to move to a selected teleportation rune."
+	summon_type = /obj/item/weapon/paper/talisman/teleport
+
+/datum/cult_supply/talisman/emp
+	id = "emp_talisman"
+	invocation = "Ta'gh fara'qha fel d'amar det!"
+	desc = "Allows you to destroy technology in a short range."
+	summon_type = /obj/item/weapon/paper/talisman/emp
+
+/datum/cult_supply/talisman/stun
+	id = "stun_talisman"
+	invocation = "Fuu ma'jin!"
+	desc = "Allows you to stun a person by attacking them with the talisman. Does not work on people holding a holy weapon!"
+	summon_type = /obj/item/weapon/paper/talisman/stun
+
+/datum/cult_supply/talisman/veil
+	id = "veil_talisman"
+	invocation = "Kla'atu barada nikt'o!"
+	desc = "Two use talisman, first use makes all nearby runes invisible, secnd use reveals nearby hidden runes."
+	summon_type = /obj/item/weapon/paper/talisman/true_sight
+
+/datum/cult_supply/soulstone
+	id = "soulstone"
+	invocation = "Kal'om neth!"
+	desc = "Summons a soul stone, used to capture the spirits of dead or dying humans."
+	summon_type = /obj/item/device/soulstone
+
+/datum/cult_supply/construct_shell
+	id = "construct_shell"
+	invocation = "Daa'ig osk!"
+	desc = "Summons a construct shell for use with soulstone-captured souls. It is too large to carry on your person."
+	summon_type = /obj/structure/constructshell
+

code/game/gamemodes/cult/talisman.dm

@@ -28,7 +28,7 @@
 	. = successfuluse
 	if(successfuluse) //if the calling whatever says we succeed, do the fancy stuff
 		if(invocation)
-			user.whisper(invocation)
+			user.whisper(invocation, language = /datum/language/common)
 		if(health_cost && iscarbon(user))
 			var/mob/living/carbon/C = user
 			C.apply_damage(health_cost, BRUTE, pick("l_arm", "r_arm"))
@@ -45,79 +45,11 @@
 		var/mob/living/carbon/C = user
 		C.apply_damage(10, BRUTE, "head")
 
-//Supply Talisman: Has a few unique effects. Granted only to starter cultists.
-/obj/item/weapon/paper/talisman/supply
-	cultist_name = "Supply Talisman"
-	cultist_desc = "A multi-use talisman that can create various objects. Intended to increase the cult's strength early on."
-	invocation = null
-	uses = 3
-
-/obj/item/weapon/paper/talisman/supply/invoke(mob/living/user, successfuluse = 1)
-	var/dat = "<B>There are [uses] bloody runes on the parchment.</B><BR>"
-	dat += "Please choose the chant to be imbued into the fabric of reality.<BR>"
-	dat += "<HR>"
-	dat += "<A href='?src=\ref[src];rune=newtome'>N'ath reth sh'yro eth d'raggathnor!</A> - Summons an arcane tome, used to scribe runes and communicate with other cultists.<BR>"
-	dat += "<A href='?src=\ref[src];rune=metal'>Bar'tea eas!</A> - Provides 5 runed metal.<BR>"
-	dat += "<A href='?src=\ref[src];rune=teleport'>Sas'so c'arta forbici!</A> - Allows you to move to a selected teleportation rune.<BR>"
-	dat += "<A href='?src=\ref[src];rune=emp'>Ta'gh fara'qha fel d'amar det!</A> - Allows you to destroy technology in a short range.<BR>"
-	dat += "<A href='?src=\ref[src];rune=runestun'>Fuu ma'jin!</A> - Allows you to stun a person by attacking them with the talisman.<BR>"
-	dat += "<A href='?src=\ref[src];rune=veiling'>Kla'atu barada nikt'o!</A> - Two use talisman, first use makes all nearby runes invisible, second use reveals nearby hidden runes.<BR>"
-	dat += "<A href='?src=\ref[src];rune=soulstone'>Kal'om neth!</A> - Summons a soul stone, used to capure the spirits of dead or dying humans.<BR>"
-	dat += "<A href='?src=\ref[src];rune=construct'>Daa'ig osk!</A> - Summons a construct shell for use with soulstone-captured souls. It is too large to carry on your person.<BR>"
-	var/datum/browser/popup = new(user, "talisman", "", 400, 400)
-	popup.set_content(dat)
-	popup.open()
-	return 0
-
-/obj/item/weapon/paper/talisman/supply/Topic(href, href_list)
-	if(src)
-		if(usr.stat || usr.restrained() || !in_range(src, usr))
-			return
-		if(href_list["rune"])
-			switch(href_list["rune"])
-				if("newtome")
-					var/obj/item/weapon/tome/T = new(usr)
-					usr.put_in_hands(T)
-				if("metal")
-					if(istype(src, /obj/item/weapon/paper/talisman/supply/weak))
-						usr.visible_message("<span class='cultitalic'>Lesser supply talismans lack the strength to materialize runed metal!</span>")
-						return
-					var/obj/item/stack/sheet/runed_metal/R = new(usr,5)
-					usr.put_in_hands(R)
-				if("teleport")
-					var/obj/item/weapon/paper/talisman/teleport/T = new(usr)
-					usr.put_in_hands(T)
-				if("emp")
-					var/obj/item/weapon/paper/talisman/emp/T = new(usr)
-					usr.put_in_hands(T)
-				if("runestun")
-					var/obj/item/weapon/paper/talisman/stun/T = new(usr)
-					usr.put_in_hands(T)
-				if("soulstone")
-					var/obj/item/device/soulstone/T = new(usr)
-					usr.put_in_hands(T)
-				if("construct")
-					new /obj/structure/constructshell(get_turf(usr))
-				if("veiling")
-					var/obj/item/weapon/paper/talisman/true_sight/T = new(usr)
-					usr.put_in_hands(T)
-			src.uses--
-			if(src.uses <= 0)
-				if(iscarbon(usr))
-					var/mob/living/carbon/C = usr
-					C.drop_item()
-					visible_message("<span class='warning'>[src] crumbles to dust.</span>")
-				qdel(src)
-
-/obj/item/weapon/paper/talisman/supply/weak
-	cultist_name = "Lesser Supply Talisman"
-	uses = 2
-
 //Rite of Translocation: Same as rune
 /obj/item/weapon/paper/talisman/teleport
 	cultist_name = "Talisman of Teleportation"
 	cultist_desc = "A single-use talisman that will teleport a user to a random rune of the same keyword."
-	color = "#551A8B" // purple
+	color = RUNE_COLOR_TELEPORT
 	invocation = "Sas'so c'arta forbici!"
 	health_cost = 5
 	creation_time = 80

code/game/gamemodes/devil/devil.dm

@@ -1,5 +1,6 @@
 /mob/living/proc/check_devil_bane_multiplier(obj/item/weapon, mob/living/attacker)
-	switch(mind.devilinfo.bane)
+	var/datum/antagonist/devil/devilInfo = mind.has_antag_datum(ANTAG_DATUM_DEVIL)
+	switch(devilInfo.bane)
 		if(BANE_WHITECLOTHES)
 			if(ishuman(attacker))
 				var/mob/living/carbon/human/H = attacker
@@ -21,13 +22,13 @@
 						/obj/item/clothing/under/suit_jacket/white = 0.5,
 						/obj/item/clothing/under/burial = 1
 					)
-					if(whiteness[U.type])
+					if(U && whiteness[U.type])
 						src.visible_message("<span class='warning'>[src] seems to have been harmed by the purity of [attacker]'s clothes.</span>", "<span class='notice'>Unsullied white clothing is disrupting your form.</span>")
 						return whiteness[U.type] + 1
 		if(BANE_TOOLBOX)
 			if(istype(weapon,/obj/item/weapon/storage/toolbox))
 				src.visible_message("<span class='warning'>The [weapon] seems unusually robust this time.</span>", "<span class='notice'>The [weapon] is your unmaking!</span>")
-				return 2.5 // Will take four hits with a normal toolbox.
+				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>")

code/game/gamemodes/devil/devil_game_mode.dm

@@ -19,7 +19,6 @@
 		+	<span class='notice'>Crew</span>: Resist the lure of sin and remain pure!"
 
 /datum/game_mode/devil/pre_setup()
-
 	if(config.protect_roles_from_antagonist)
 		restricted_jobs += protected_jobs
 	if(config.protect_assistant_from_antagonist)
@@ -56,10 +55,22 @@
 	return 1
 
 /datum/game_mode/devil/proc/post_setup_finalize(datum/mind/devil)
-	set waitfor = FALSE
-	sleep(rand(10,100))
-	finalize_devil(devil, TRUE)
-	sleep(100)
-	add_devil_objectives(devil, objective_count) //This has to be in a separate loop, as we need devil names to be generated before we give objectives in devil agent.
-	devil.announceDevilLaws()
-	devil.announce_objectives()
+	add_devil(devil.current, ascendable = TRUE) //Devil gamemode devils are ascendable.
+	add_devil_objectives(devil,2)
+
+/proc/is_devil(mob/living/M)
+	return M && M.mind && M.mind.has_antag_datum(ANTAG_DATUM_DEVIL)
+
+/proc/add_devil(mob/living/L, ascendable = FALSE)
+	if(!L || !L.mind)
+		return FALSE
+	var/datum/antagonist/devil/devil_datum = L.mind.add_antag_datum(ANTAG_DATUM_DEVIL)
+	devil_datum.ascendable = ascendable
+	return devil_datum
+
+/proc/remove_devil(mob/living/L)
+	if(!L || !L.mind)
+		return FALSE
+	var/datum/antagonist/devil_datum = L.mind.has_antag_datum(ANTAG_DATUM_DEVIL)
+	devil_datum.on_removal()
+	return TRUE

code/game/gamemodes/devil/devilinfo.dm

@@ -78,8 +78,15 @@ GLOBAL_LIST_INIT(lawlorify, list (
 			BANISH_FUNERAL_GARB = "If your corpse is clad in funeral garments, you will be unable to resurrect."
 		)
 	))
-/datum/devilinfo
-	var/datum/mind/owner = null
+
+//These are also used in the codex gigas, so let's declare them globally.
+GLOBAL_LIST_INIT(devil_pre_title, list("Dark ", "Hellish ", "Fallen ", "Fiery ", "Sinful ", "Blood ", "Fluffy "))
+GLOBAL_LIST_INIT(devil_title, list("Lord ", "Prelate ", "Count ", "Viscount ", "Vizier ", "Elder ", "Adept "))
+GLOBAL_LIST_INIT(devil_syllable, list("hal", "ve", "odr", "neit", "ci", "quon", "mya", "folth", "wren", "geyr", "hil", "niet", "twou", "phi", "coa"))
+GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", ", the Lord of all things", ", Jr."))
+/datum/antagonist/devil
+	//Don't delete upon mind destruction, otherwise soul re-selling will break.
+	delete_on_death = FALSE
 	var/obligation
 	var/ban
 	var/bane
@@ -89,55 +96,63 @@ GLOBAL_LIST_INIT(lawlorify, list (
 	var/reviveNumber = 0
 	var/form = BASIC_DEVIL
 	var/exists = 0
-	var/static/list/dont_remove_spells = list(
-	/obj/effect/proc_holder/spell/targeted/summon_contract,
-	/obj/effect/proc_holder/spell/targeted/conjure_item/violin,
-	/obj/effect/proc_holder/spell/targeted/summon_dancefloor)
+	var/static/list/removable_devil_spells = list(
+		/obj/effect/proc_holder/spell/aimed/fireball/hellish,
+		/obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork,
+		/obj/effect/proc_holder/spell/aimed/fireball/hellish,
+		/obj/effect/proc_holder/spell/targeted/infernal_jaunt,
+		/obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork/greater,
+		/obj/effect/proc_holder/spell/targeted/sintouch,
+		/obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork/ascended,
+		/obj/effect/proc_holder/spell/targeted/sintouch/ascended)
+	var/static/list/devil_spells = list(
+		/obj/effect/proc_holder/spell/aimed/fireball/hellish,
+		/obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork,
+		/obj/effect/proc_holder/spell/aimed/fireball/hellish,
+		/obj/effect/proc_holder/spell/targeted/infernal_jaunt,
+		/obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork/greater,
+		/obj/effect/proc_holder/spell/targeted/sintouch,
+		/obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork/ascended,
+		/obj/effect/proc_holder/spell/targeted/sintouch/ascended,
+		/obj/effect/proc_holder/spell/targeted/summon_contract,
+		/obj/effect/proc_holder/spell/targeted/conjure_item/violin,
+		/obj/effect/proc_holder/spell/targeted/summon_dancefloor)
 	var/ascendable = FALSE
 
 
-/datum/devilinfo/New()
+/datum/antagonist/devil/New()
 	..()
-	dont_remove_spells = typecacheof(dont_remove_spells)
+	devil_spells = typecacheof(devil_spells)
+	truename = randomDevilName()
+	ban = randomdevilban()
+	bane = randomdevilbane()
+	obligation = randomdevilobligation()
+	banish = randomdevilbanish()
+	GLOB.allDevils[lowertext(truename)] = src
 
 
-/proc/randomDevilInfo(name = randomDevilName())
-	var/datum/devilinfo/devil = new
-	devil.truename = name
-	devil.bane = randomdevilbane()
-	devil.obligation = randomdevilobligation()
-	devil.ban = randomdevilban()
-	devil.banish = randomdevilbanish()
-	return devil
-
-/proc/devilInfo(name, saveDetails = 0)
+/proc/devilInfo(name)
 	if(GLOB.allDevils[lowertext(name)])
 		return GLOB.allDevils[lowertext(name)]
 	else
-		var/datum/devilinfo/devil = randomDevilInfo(name)
+		var/datum/fakeDevil/devil = new /datum/fakeDevil(name)
 		GLOB.allDevils[lowertext(name)] = devil
-		devil.exists = saveDetails
 		return devil
 
-
-
 /proc/randomDevilName()
-	var/preTitle = ""
-	var/title = ""
-	var/mainName = ""
-	var/suffix = ""
+	var/name = ""
 	if(prob(65))
 		if(prob(35))
-			preTitle = pick("Dark ", "Hellish ", "Fiery ", "Sinful ", "Blood ")
-		title = pick("Lord ", "Fallen Prelate ", "Count ", "Viscount ", "Vizier ", "Elder ", "Adept ")
+			name = pick(GLOB.devil_pre_title)
+		name += pick(GLOB.devil_title)
 	var/probability = 100
-	mainName = pick("Hal", "Ve", "Odr", "Neit", "Ci", "Quon", "Mya", "Folth", "Wren", "Gyer", "Geyr", "Hil", "Niet", "Twou", "Hu", "Don")
+	name += pick(GLOB.devil_syllable)
 	while(prob(probability))
-		mainName += pick("hal", "ve", "odr", "neit", "ca", "quon", "mya", "folth", "wren", "gyer", "geyr", "hil", "niet", "twoe", "phi", "coa")
+		name += pick(GLOB.devil_syllable)
 		probability -= 20
 	if(prob(40))
-		suffix = pick(" the Red", " the Soulless", " the Master", ", the Lord of all things", ", Jr.")
-	return preTitle + title + mainName + suffix
+		name += pick(GLOB.devil_suffix)
+	return name
 
 /proc/randomdevilobligation()
 	return pick(OBLIGATION_FOOD, OBLIGATION_FIDDLE, OBLIGATION_DANCEOFF, OBLIGATION_GREET, OBLIGATION_PRESENCEKNOWN, OBLIGATION_SAYNAME, OBLIGATION_ANNOUNCEKILL, OBLIGATION_ANSWERTONAME)
@@ -151,7 +166,7 @@ GLOBAL_LIST_INIT(lawlorify, list (
 /proc/randomdevilbanish()
 	return pick(BANISH_WATER, BANISH_COFFIN, BANISH_FORMALDYHIDE, BANISH_RUNES, BANISH_CANDLES, BANISH_DESTRUCTION, BANISH_FUNERAL_GARB)
 
-/datum/devilinfo/proc/add_soul(datum/mind/soul)
+/datum/antagonist/devil/proc/add_soul(datum/mind/soul)
 	if(soulsOwned.Find(soul))
 		return
 	soulsOwned += soul
@@ -169,13 +184,13 @@ GLOBAL_LIST_INIT(lawlorify, list (
 		if(ARCH_THRESHOLD)
 			increase_arch_devil()
 
-/datum/devilinfo/proc/remove_soul(datum/mind/soul)
+/datum/antagonist/devil/proc/remove_soul(datum/mind/soul)
 	if(soulsOwned.Remove(soul))
 		check_regression()
 		to_chat(owner.current, "<span class='warning'>You feel as though a soul has slipped from your grasp.</span>")
 		update_hud()
 
-/datum/devilinfo/proc/check_regression()
+/datum/antagonist/devil/proc/check_regression()
 	if(form == ARCH_DEVIL)
 		return //arch devil can't regress
 	//Yes, fallthrough behavior is intended, so I can't use a switch statement.
@@ -187,7 +202,7 @@ GLOBAL_LIST_INIT(lawlorify, list (
 		remove_spells()
 		to_chat(owner.current, "<span class='warning'>As punishment for your failures, all of your powers except contract creation have been revoked.")
 
-/datum/devilinfo/proc/regress_humanoid()
+/datum/antagonist/devil/proc/regress_humanoid()
 	to_chat(owner.current, "<span class='warning'>Your powers weaken, have more contracts be signed to regain power.")
 	if(ishuman(owner.current))
 		var/mob/living/carbon/human/H = owner.current
@@ -198,7 +213,7 @@ GLOBAL_LIST_INIT(lawlorify, list (
 		owner.current.forceMove(get_turf(owner.current))//Fixes dying while jaunted leaving you permajaunted.
 	form = BASIC_DEVIL
 
-/datum/devilinfo/proc/regress_blood_lizard()
+/datum/antagonist/devil/proc/regress_blood_lizard()
 	var/mob/living/carbon/true_devil/D = owner.current
 	to_chat(D, "<span class='warning'>Your powers weaken, have more contracts be signed to regain power.")
 	D.oldform.loc = D.loc
@@ -209,7 +224,7 @@ GLOBAL_LIST_INIT(lawlorify, list (
 	update_hud()
 
 
-/datum/devilinfo/proc/increase_blood_lizard()
+/datum/antagonist/devil/proc/increase_blood_lizard()
 	to_chat(owner.current, "<span class='warning'>You feel as though your humanoid form is about to shed.  You will soon turn into a blood lizard.")
 	sleep(50)
 	if(ishuman(owner.current))
@@ -227,7 +242,7 @@ GLOBAL_LIST_INIT(lawlorify, list (
 
 
 
-/datum/devilinfo/proc/increase_true_devil()
+/datum/antagonist/devil/proc/increase_true_devil()
 	to_chat(owner.current, "<span class='warning'>You feel as though your current form is about to shed.  You will soon turn into a true devil.")
 	sleep(50)
 	var/mob/living/carbon/true_devil/A = new /mob/living/carbon/true_devil(owner.current.loc)
@@ -241,7 +256,7 @@ GLOBAL_LIST_INIT(lawlorify, list (
 	update_hud()
 
 
-/datum/devilinfo/proc/increase_arch_devil()
+/datum/antagonist/devil/proc/increase_arch_devil()
 	if(!ascendable)
 		return
 	var/mob/living/carbon/true_devil/D = owner.current
@@ -291,17 +306,17 @@ GLOBAL_LIST_INIT(lawlorify, list (
 	SSticker.mode.devil_ascended++
 	form = ARCH_DEVIL
 
-/datum/devilinfo/proc/remove_spells()
+/datum/antagonist/devil/proc/remove_spells()
 	for(var/X in owner.spell_list)
 		var/obj/effect/proc_holder/spell/S = X
-		if(!is_type_in_typecache(S, dont_remove_spells))
+		if(is_type_in_typecache(S, removable_devil_spells))
 			owner.RemoveSpell(S)
 
-/datum/devilinfo/proc/give_summon_contract()
+/datum/antagonist/devil/proc/give_summon_contract()
 	owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/summon_contract(null))
 
 
-/datum/devilinfo/proc/give_base_spells(give_summon_contract = 0)
+/datum/antagonist/devil/proc/give_base_spells(give_summon_contract = 0)
 	remove_spells()
 	owner.AddSpell(new /obj/effect/proc_holder/spell/aimed/fireball/hellish(null))
 	owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork(null))
@@ -312,25 +327,25 @@ GLOBAL_LIST_INIT(lawlorify, list (
 		if(obligation == OBLIGATION_DANCEOFF)
 			owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/summon_dancefloor(null))
 
-/datum/devilinfo/proc/give_lizard_spells()
+/datum/antagonist/devil/proc/give_lizard_spells()
 	remove_spells()
 	owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork(null))
 	owner.AddSpell(new /obj/effect/proc_holder/spell/aimed/fireball/hellish(null))
 	owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/infernal_jaunt(null))
 
-/datum/devilinfo/proc/give_true_spells()
+/datum/antagonist/devil/proc/give_true_spells()
 	remove_spells()
 	owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork/greater(null))
 	owner.AddSpell(new /obj/effect/proc_holder/spell/aimed/fireball/hellish(null))
 	owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/infernal_jaunt(null))
 	owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/sintouch(null))
 
-/datum/devilinfo/proc/give_arch_spells()
+/datum/antagonist/devil/proc/give_arch_spells()
 	remove_spells()
 	owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork/ascended(null))
 	owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/sintouch/ascended(null))
 
-/datum/devilinfo/proc/beginResurrectionCheck(mob/living/body)
+/datum/antagonist/devil/proc/beginResurrectionCheck(mob/living/body)
 	if(SOULVALUE>0)
 		to_chat(owner.current, "<span class='userdanger'>Your body has been damaged to the point that you may no longer use it.  At the cost of some of your power, you will return to life soon.  Remain in your body.</span>")
 		sleep(DEVILRESURRECTTIME)
@@ -350,7 +365,7 @@ GLOBAL_LIST_INIT(lawlorify, list (
 	else
 		to_chat(owner.current, "<span class='userdanger'>Your hellish powers are too weak to resurrect yourself.</span>")
 
-/datum/devilinfo/proc/check_banishment(mob/living/body)
+/datum/antagonist/devil/proc/check_banishment(mob/living/body)
 	switch(banish)
 		if(BANISH_WATER)
 			if(istype(body, /mob/living/carbon))
@@ -394,7 +409,7 @@ GLOBAL_LIST_INIT(lawlorify, list (
 						return 1
 				return 0
 
-/datum/devilinfo/proc/hellish_resurrection(mob/living/body)
+/datum/antagonist/devil/proc/hellish_resurrection(mob/living/body)
 	message_admins("[owner.name] (true name is: [truename]) is resurrecting using hellish energy.</a>")
 	if(SOULVALUE < ARCH_THRESHOLD && ascendable) // once ascended, arch devils do not go down in power by any means.
 		reviveNumber += LOSS_PER_DEATH
@@ -413,7 +428,7 @@ GLOBAL_LIST_INIT(lawlorify, list (
 		create_new_body()
 	check_regression()
 
-/datum/devilinfo/proc/create_new_body()
+/datum/antagonist/devil/proc/create_new_body()
 	if(GLOB.blobstart.len > 0)
 		var/turf/targetturf = get_turf(pick(GLOB.blobstart))
 		var/mob/currentMob = owner.current
@@ -451,8 +466,65 @@ GLOBAL_LIST_INIT(lawlorify, list (
 		throw EXCEPTION("Unable to find a blobstart landmark for hellish resurrection")
 
 
-/datum/devilinfo/proc/update_hud()
+/datum/antagonist/devil/proc/update_hud()
 	if(istype(owner.current, /mob/living/carbon))
 		var/mob/living/C = owner.current
 		if(C.hud_used && C.hud_used.devilsouldisplay)
 			C.hud_used.devilsouldisplay.update_counter(SOULVALUE)
+
+/datum/antagonist/devil/greet()
+	to_chat(owner.current, "<span class='warning'><b>You remember your link to the infernal.  You are [truename], an agent of hell, a devil.  And you were sent to the plane of creation for a reason.  A greater purpose.  Convince the crew to sin, and embroiden Hell's grasp.</b></span>")
+	to_chat(owner.current, "<span class='warning'><b>However, your infernal form is not without weaknesses.</b></span>")
+	to_chat(owner.current, "You may not use violence to coerce someone into selling their soul.")
+	to_chat(owner.current, "You may not directly and knowingly physically harm a devil, other than yourself.")
+	to_chat(owner.current, GLOB.lawlorify[LAW][bane])
+	to_chat(owner.current, GLOB.lawlorify[LAW][ban])
+	to_chat(owner.current, GLOB.lawlorify[LAW][obligation])
+	to_chat(owner.current, GLOB.lawlorify[LAW][banish])
+	to_chat(owner.current, "<span class='warning'>Remember, the crew can research your weaknesses if they find out your devil name.</span><br>")
+	.=..()
+
+/datum/antagonist/devil/on_gain()
+	owner.store_memory("Your devilic true name is [truename]<br>[GLOB.lawlorify[LAW][ban]]<br>You may not use violence to coerce someone into selling their soul.<br>You may not directly and knowingly physically harm a devil, other than yourself.<br>[GLOB.lawlorify[LAW][bane]]<br>[GLOB.lawlorify[LAW][obligation]]<br>[GLOB.lawlorify[LAW][banish]]<br>")
+	if(issilicon(owner.current))
+		var/mob/living/silicon/robot_devil = owner.current
+		var/laws = list("You may not use violence to coerce someone into selling their soul.", "You may not directly and knowingly physically harm a devil, other than yourself.", GLOB.lawlorify[LAW][ban], GLOB.lawlorify[LAW][obligation], "Accomplish your objectives at all costs.")
+		robot_devil.set_law_sixsixsix(laws)
+	sleep(10)
+	if(owner.assigned_role == "Clown" && ishuman(owner.current))
+		var/mob/living/carbon/human/S = owner.current
+		to_chat(S, "<span class='notice'>Your infernal nature has allowed you to overcome your clownishness.</span>")
+		S.dna.remove_mutation(CLOWNMUT)
+	.=..()
+
+/datum/antagonist/devil/on_removal()
+	to_chat(owner.current, "<span class='userdanger'>Your infernal link has been severed! You are no longer a devil!</span>")
+	.=..()
+
+/datum/antagonist/devil/apply_innate_effects(mob/living/mob_override)
+	give_base_spells(1)
+	owner.current.grant_all_languages(TRUE)
+	update_hud()
+	.=..()
+
+/datum/antagonist/devil/remove_innate_effects(mob/living/mob_override)
+	for(var/X in owner.spell_list)
+		var/obj/effect/proc_holder/spell/S = X
+		if(is_type_in_typecache(S, devil_spells))
+			owner.RemoveSpell(S)
+	.=..()
+
+//A simple super light weight datum for the codex gigas.
+/datum/fakeDevil
+	var/truename
+	var/bane
+	var/obligation
+	var/ban
+	var/banish
+
+/datum/fakeDevil/New(name = randomDevilName())
+	truename = name
+	bane = randomdevilbane()
+	obligation = randomdevilobligation()
+	ban = randomdevilban()
+	banish = randomdevilbanish()

code/game/gamemodes/devil/game_mode.dm

@@ -29,25 +29,6 @@
 		text += "<br>"
 	to_chat(world, text)
 
-
-/datum/game_mode/proc/finalize_devil(datum/mind/devil_mind, ascendable = FALSE)
-	set waitfor = FALSE
-	var/trueName= randomDevilName()
-
-	devil_mind.devilinfo = devilInfo(trueName, 1)
-	devil_mind.devilinfo.ascendable = ascendable
-	devil_mind.store_memory("Your devilic true name is [devil_mind.devilinfo.truename]<br>[GLOB.lawlorify[LAW][devil_mind.devilinfo.ban]]<br>You may not use violence to coerce someone into selling their soul.<br>You may not directly and knowingly physically harm a devil, other than yourself.<br>[GLOB.lawlorify[LAW][devil_mind.devilinfo.bane]]<br>[GLOB.lawlorify[LAW][devil_mind.devilinfo.obligation]]<br>[GLOB.lawlorify[LAW][devil_mind.devilinfo.banish]]<br>")
-	devil_mind.devilinfo.owner = devil_mind
-	devil_mind.devilinfo.give_base_spells(1)
-	if(issilicon(devil_mind.current))
-		add_law_sixsixsix(devil_mind.current)
-	sleep(10)
-	devil_mind.devilinfo.update_hud()
-	if(devil_mind.assigned_role == "Clown" && ishuman(devil_mind.current))
-		var/mob/living/carbon/human/S = devil_mind.current
-		to_chat(S, "<span class='notice'>Your infernal nature has allowed you to overcome your clownishness.</span>")
-		S.dna.remove_mutation(CLOWNMUT)
-
 /datum/game_mode/proc/add_devil_objectives(datum/mind/devil_mind, quantity)
 	var/list/validtypes = list(/datum/objective/devil/soulquantity, /datum/objective/devil/soulquality, /datum/objective/devil/sintouch, /datum/objective/devil/buy_target)
 	for(var/i = 1 to quantity)
@@ -60,28 +41,16 @@
 		else
 			objective.find_target()
 
-/datum/mind/proc/announceDevilLaws()
+/datum/game_mode/proc/printdevilinfo(mob/living/ply)
+	var/datum/antagonist/devil/devilinfo = is_devil(ply)
 	if(!devilinfo)
-		return
-	to_chat(current, "<span class='warning'><b>You remember your link to the infernal.  You are [src.devilinfo.truename], an agent of hell, a devil.  And you were sent to the plane of creation for a reason.  A greater purpose.  Convince the crew to sin, and embroiden Hell's grasp.</b></span>")
-	to_chat(current, "<span class='warning'><b>However, your infernal form is not without weaknesses.</b></span>")
-	to_chat(current, "You may not use violence to coerce someone into selling their soul.")
-	to_chat(current, "You may not directly and knowingly physically harm a devil, other than yourself.")
-	to_chat(current, GLOB.lawlorify[LAW][src.devilinfo.bane])
-	to_chat(current, GLOB.lawlorify[LAW][src.devilinfo.ban])
-	to_chat(current, GLOB.lawlorify[LAW][src.devilinfo.obligation])
-	to_chat(current, GLOB.lawlorify[LAW][src.devilinfo.banish])
-	to_chat(current, "<br/><br/><span class='warning'>Remember, the crew can research your weaknesses if they find out your devil name.</span><br>")
-
-/datum/game_mode/proc/printdevilinfo(datum/mind/ply)
-	if(!ply.devilinfo)
 		return "Target is not a devil."
-	var/text = "</br>The devil's true name is: [ply.devilinfo.truename]</br>"
+	var/text = "</br>The devil's true name is: [devilinfo.truename]</br>"
 	text += "The devil's bans were:</br>"
-	text += "	[GLOB.lawlorify[LORE][ply.devilinfo.ban]]</br>"
-	text += "	[GLOB.lawlorify[LORE][ply.devilinfo.bane]]</br>"
-	text += "	[GLOB.lawlorify[LORE][ply.devilinfo.obligation]]</br>"
-	text += "	[GLOB.lawlorify[LORE][ply.devilinfo.banish]]</br></br>"
+	text += "	[GLOB.lawlorify[LORE][devilinfo.ban]]</br>"
+	text += "	[GLOB.lawlorify[LORE][devilinfo.bane]]</br>"
+	text += "	[GLOB.lawlorify[LORE][devilinfo.obligation]]</br>"
+	text += "	[GLOB.lawlorify[LORE][devilinfo.banish]]</br></br>"
 	return text
 
 /datum/game_mode/proc/update_devil_icons_added(datum/mind/devil_mind)

code/game/gamemodes/devil/objectives.dm

@@ -14,7 +14,9 @@
 
 /datum/objective/devil/soulquantity/check_completion()
 	var/count = 0
-	for(var/S in owner.devilinfo.soulsOwned)
+	var/datum/antagonist/devil/devilDatum = owner.has_antag_datum(ANTAG_DATUM_DEVIL)
+	var/list/souls = devilDatum.soulsOwned
+	for(var/S in souls) //Just a sanity check.
 		var/datum/mind/L = S
 		if(L.soulOwner == owner)
 			count++
@@ -52,9 +54,11 @@
 
 /datum/objective/devil/soulquality/check_completion()
 	var/count = 0
-	for(var/S in owner.devilinfo.soulsOwned)
+	var/datum/antagonist/devil/devilDatum = owner.has_antag_datum(ANTAG_DATUM_DEVIL)
+	var/list/souls = devilDatum.soulsOwned
+	for(var/S in souls)
 		var/datum/mind/L = S
-		if(L.soulOwner != L && L.damnation_type == contractType)
+		if(!L.owns_soul() && L.damnation_type == contractType)
 			count++
 	return count>=target_amount
 
@@ -91,16 +95,21 @@
 /datum/objective/devil/outsell/New()
 
 /datum/objective/devil/outsell/update_explanation_text()
-	explanation_text = "Purchase and retain control over more souls than [target.devilinfo.truename], known to mortals as [target.name], the [target.assigned_role]."
+	var/datum/antagonist/devil/opponent = target.has_antag_datum(ANTAG_DATUM_DEVIL)
+	explanation_text = "Purchase and retain control over more souls than [opponent.truename], known to mortals as [target.name], the [target.assigned_role]."
 
 /datum/objective/devil/outsell/check_completion()
 	var/selfcount = 0
-	for(var/S in owner.devilinfo.soulsOwned)
+	var/datum/antagonist/devil/devilDatum = owner.has_antag_datum(ANTAG_DATUM_DEVIL)
+	var/list/souls = devilDatum.soulsOwned
+	for(var/S in souls)
 		var/datum/mind/L = S
 		if(L.soulOwner == owner)
 			selfcount++
 	var/targetcount = 0
-	for(var/S in target.devilinfo.soulsOwned)
+	devilDatum = target.has_antag_datum(ANTAG_DATUM_DEVIL)
+	souls = devilDatum.soulsOwned
+	for(var/S in souls)
 		var/datum/mind/L = S
 		if(L.soulOwner == target)
 			targetcount++

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

@@ -41,18 +41,20 @@
 
 
 /mob/living/carbon/true_devil/proc/convert_to_archdevil()
-	maxHealth = 5000 // not an IMPOSSIBLE amount, but still near impossible.
+	maxHealth = 500 // not an IMPOSSIBLE amount, but still near impossible.
 	ascended = TRUE
 	health = maxHealth
 	icon_state = "arch_devil"
 
 /mob/living/carbon/true_devil/proc/set_name()
-	name = mind.devilinfo.truename
+	var/datum/antagonist/devil/devilinfo = mind.has_antag_datum(ANTAG_DATUM_DEVIL)
+	name = devilinfo.truename
 	real_name = name
 
 /mob/living/carbon/true_devil/Login()
 	..()
-	mind.announceDevilLaws()
+	var/datum/antagonist/devil/devilinfo = mind.has_antag_datum(ANTAG_DATUM_DEVIL)
+	devilinfo.greet()
 	mind.announce_objectives()
 
 
@@ -60,7 +62,7 @@
 	stat = DEAD
 	..(gibbed)
 	drop_all_held_items()
-	INVOKE_ASYNC(mind.devilinfo, /datum/devilinfo/proc/beginResurrectionCheck, src)
+	INVOKE_ASYNC(mind.has_antag_datum(ANTAG_DATUM_DEVIL), /datum/antagonist/devil/proc/beginResurrectionCheck, src)
 
 
 /mob/living/carbon/true_devil/examine(mob/user)

code/game/gamemodes/game_mode.dm

@@ -257,6 +257,8 @@
 	if(escaped_total > 0)
 		SSblackbox.set_val("escaped_total",escaped_total)
 	send2irc("Server", "Round just ended.")
+	if(cult.len && !istype(SSticker.mode,/datum/game_mode/cult))
+		datum_cult_completion()
 	return 0
 
 

code/game/gamemodes/gang/dominator.dm

@@ -1,4 +1,5 @@
 #define DOM_BLOCKED_SPAM_CAP 6
+#define DOM_REQUIRED_TURFS 30
 
 /obj/machinery/dominator
 	name = "dominator"
@@ -21,12 +22,12 @@
 
 /proc/dominator_excessive_walls(atom/A)
 	var/open = 0
-	for(var/turf/T in circleviewturfs(center=A,radius=3))
-		if(!istype(T, /turf/closed))
+	for(var/turf/T in view(3, A))
+		if(!isclosedturf(T))
 			open++
-	if(open < 40)
+	if(open < DOM_REQUIRED_TURFS)
 		return TRUE
-	else 
+	else
 		return FALSE
 
 /obj/machinery/dominator/tesla_act()
@@ -62,7 +63,7 @@
 		var/time_remaining = gang.domination_time_remaining()
 		if(time_remaining > 0)
 			if(dominator_excessive_walls(src))
-				gang.domination_timer += 2
+				gang.domination_timer += 20
 				playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0)
 				if(spam_prevention < DOM_BLOCKED_SPAM_CAP)
 					spam_prevention++
@@ -70,7 +71,7 @@
 					gang.message_gangtools("Warning: There are too many walls around your gang's dominator, its signal is being blocked!")
 					say("Error: Takeover signal is currently blocked! There are too many walls within 3 standard units of this device.")
 					spam_prevention = 0
-					return
+				return
 			. = TRUE
 			playsound(loc, 'sound/items/timer.ogg', 10, 0)
 			if(!warned && (time_remaining < 180))
@@ -208,4 +209,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

@@ -58,13 +58,19 @@ GLOBAL_LIST_INIT(gang_colors_pool, list("red","orange","yellow","green","blue","
 		gangs += G
 
 		//Now assign a boss for the gang
-		var/datum/mind/boss = pick(antag_candidates)
-		antag_candidates -= boss
-		G.bosses += boss
-		boss.gang_datum = G
-		boss.special_role = "[G.name] Gang Boss"
-		boss.restricted_roles = restricted_jobs
-		log_game("[boss.key] has been selected as the Boss for the [G.name] Gang")
+		for(var/n in 1 to 3)
+			var/datum/mind/boss = pick(antag_candidates)
+			antag_candidates -= boss
+			G.bosses += boss
+			boss.gang_datum = G
+			var/title
+			if(n == 1)
+				title = "Boss"
+			else
+				title = "Lieutenant"
+			boss.special_role = "[G.name] Gang [title]"
+			boss.restricted_roles = restricted_jobs
+			log_game("[boss.key] has been selected as the [title] for the [G.name] Gang")
 
 	if(gangs.len < 2) //Need at least two gangs
 		return 0
@@ -251,6 +257,7 @@ GLOBAL_LIST_INIT(gang_colors_pool, list("red","orange","yellow","green","blue","
 /proc/determine_domination_time(var/datum/gang/G)
 	return max(180,480 - (round((G.territory.len/GLOB.start_state.num_territories)*100, 1) * 9))
 
+
 //////////////////////////////////////////////////////////////////////
 //Announces the end of the game with all relavent information stated//
 //////////////////////////////////////////////////////////////////////

code/game/gamemodes/gang/gang_datum.dm

@@ -263,4 +263,4 @@
 	ganghud = new()
 
 /datum/gang/multiverse/income()
-	return
+	return

code/game/gamemodes/gang/gang_items.dm

@@ -131,7 +131,7 @@
 	id = "pistol_ammo"
 	cost = 10
 	item_path = /obj/item/ammo_box/magazine/m10mm
-	
+
 /datum/gang_item/weapon/sniper
 	name = ".50cal Sniper Rifle"
 	id = "sniper"
@@ -156,8 +156,8 @@
 	id = "uzi_ammo"
 	cost = 40
 	item_path = /obj/item/ammo_box/magazine/uzim9mm
-	
-	
+
+
 ///////////////////
 //EQUIPMENT
 ///////////////////
@@ -171,7 +171,7 @@
 	id = "spraycan"
 	cost = 5
 	item_path = /obj/item/toy/crayon/spraycan/gang
-	
+
 /datum/gang_item/equipment/sharpener
 	name = "Sharpener"
 	id = "whetstone"
@@ -305,15 +305,15 @@
 		if(obj.density)
 			to_chat(user, "<span class='warning'>There's not enough room here!</span>")
 			return FALSE
-	
+
 	if(dominator_excessive_walls(user))
-		to_chat(user, "span class='warning'>The <b>dominator</b> will not function here! The <b>dominator</b> requires an open space within three standard units so that walls do not interfere with the signal.</span>")
+		to_chat(user, "span class='warning'>The <b>dominator</b> will not function here! The <b>dominator</b> requires a sizable open space within three standard units so that walls do not interfere with the signal.</span>")
 		return FALSE
-		
+
 	if(!(usrarea.type in gang.territory|gang.territory_new))
 		to_chat(user, "<span class='warning'>The <b>dominator</b> can be spawned only on territory controlled by your gang!</span>")
 		return FALSE
 	return ..()
 
 /datum/gang_item/equipment/dominator/spawn_item(mob/living/carbon/user, datum/gang/gang, obj/item/device/gangtool/gangtool)
-	new item_path(user.loc)
+	new item_path(user.loc)

code/game/gamemodes/gang/gang_pen.dm

@@ -57,4 +57,4 @@
 	cooldown = 0
 	icon_state = "pen"
 	var/mob/M = get(src, /mob)
-	to_chat(M, "<span class='notice'>\icon[src] [src][(src.loc == M)?(""):(" in your [src.loc]")] vibrates softly. It is ready to be used again.</span>")
+	to_chat(M, "<span class='notice'>\icon[src] [src][(src.loc == M)?(""):(" in your [src.loc]")] vibrates softly. It is ready to be used again.</span>")

code/game/gamemodes/gang/recaller.dm

@@ -241,4 +241,4 @@
 	outfits = 1
 
 /obj/item/device/gangtool/spare/lt
-	promotable = 1
+	promotable = 1

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

@@ -62,7 +62,7 @@
 	icon = 'icons/mob/swarmer.dmi'
 	desc = "A robot of unknown design, they seek only to consume materials and replicate themselves indefinitely."
 	speak_emote = list("tones")
-	initial_languages = list(/datum/language/swarmer)
+	initial_language_holder = /datum/language_holder/swarmer
 	bubble_icon = "swarmer"
 	health = 40
 	maxHealth = 40

code/game/gamemodes/miniantags/revenant/revenant.dm

@@ -14,7 +14,7 @@
 	var/icon_reveal = "revenant_revealed"
 	var/icon_stun = "revenant_stun"
 	var/icon_drain = "revenant_draining"
-	var/stasis = 0
+	var/stasis = FALSE
 	incorporeal_move = 3
 	invisibility = INVISIBILITY_REVENANT
 	health = INFINITY //Revenants don't use health, they use essence instead
@@ -205,6 +205,7 @@
 /mob/living/simple_animal/revenant/death()
 	if(!revealed || stasis) //Revenants cannot die if they aren't revealed //or are already dead
 		return 0
+	stasis = TRUE
 	to_chat(src, "<span class='revendanger'>NO! No... it's too late, you can feel your essence [pick("breaking apart", "drifting away")]...</span>")
 	notransform = TRUE
 	revealed = TRUE
@@ -222,8 +223,7 @@
 	R.client_to_revive = client //If the essence reforms, the old revenant is put back in the body
 	R.revenant = src
 	invisibility = INVISIBILITY_ABSTRACT 
-	revealed = 0
-	stasis = 1
+	revealed = FALSE
 	ghostize(0)//Don't re-enter invisible corpse
 	return
 
@@ -317,7 +317,7 @@
 	incorporeal_move = 3
 	invisibility = INVISIBILITY_REVENANT
 	alpha=255
-	stasis = 0
+	stasis = FALSE
 
 
 //reforming

code/game/gamemodes/nuclear/nuclear.dm

@@ -93,7 +93,9 @@
 			agent_number++
 		spawnpos++
 		update_synd_icons_added(synd_mind)
+		synd_mind.current.playsound_local('sound/ambience/antag/ops.ogg',100,0)
 	var/obj/machinery/nuclearbomb/nuke = locate("syndienuke") in GLOB.nuke_list
+
 	if(nuke)
 		nuke.r_code = nuke_code
 	return ..()

code/game/gamemodes/nuclear/pinpointer.dm

@@ -1,177 +1,177 @@
-//Pinpointers are used to track atoms from a distance as long as they're on the same z-level. The captain and nuke ops have ones that track the nuclear authentication disk.
-/obj/item/weapon/pinpointer
-	name = "pinpointer"
-	desc = "A handheld tracking device that locks onto certain signals."
-	icon = 'icons/obj/device.dmi'
-	icon_state = "pinoff"
-	flags = CONDUCT
-	slot_flags = SLOT_BELT
-	w_class = WEIGHT_CLASS_SMALL
-	item_state = "electronic"
-	throw_speed = 3
-	throw_range = 7
-	materials = list(MAT_METAL = 500, MAT_GLASS = 250)
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-	var/active = FALSE
-	var/atom/movable/target = null //The thing we're searching for
-	var/atom/movable/constant_target = null //The thing we're always focused on, if we're in the right mode
-	var/target_x = 0 //The target coordinates if we're tracking those
-	var/target_y = 0
+//Pinpointers are used to track atoms from a distance as long as they're on the same z-level. The captain and nuke ops have ones that track the nuclear authentication disk.
+/obj/item/weapon/pinpointer
+	name = "pinpointer"
+	desc = "A handheld tracking device that locks onto certain signals."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "pinoff"
+	flags = CONDUCT
+	slot_flags = SLOT_BELT
+	w_class = WEIGHT_CLASS_SMALL
+	item_state = "electronic"
+	throw_speed = 3
+	throw_range = 7
+	materials = list(MAT_METAL = 500, MAT_GLASS = 250)
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+	var/active = FALSE
+	var/atom/movable/target = null //The thing we're searching for
+	var/atom/movable/constant_target = null //The thing we're always focused on, if we're in the right mode
+	var/target_x = 0 //The target coordinates if we're tracking those
+	var/target_y = 0
 	var/minimum_range = 0 //at what range the pinpointer declares you to be at your destination
-	var/nuke_warning = FALSE // If we've set off a miniature alarm about an armed nuke
-	var/mode = TRACK_NUKE_DISK //What are we looking for?
-
-/obj/item/weapon/pinpointer/New()
-	..()
-	GLOB.pinpointer_list += src
-
-/obj/item/weapon/pinpointer/Destroy()
-	STOP_PROCESSING(SSfastprocess, src)
-	GLOB.pinpointer_list -= src
-	return ..()
-
-/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)
-	icon_state = "pin[active ? "onnull" : "off"]"
-	if(active)
-		START_PROCESSING(SSfastprocess, src)
-	else
-		target = null //Restarting the pinpointer forces a target reset
-		STOP_PROCESSING(SSfastprocess, src)
-
-/obj/item/weapon/pinpointer/attackby(obj/item/I, mob/living/user, params)
-	if(mode != TRACK_ATOM)
-		return ..()
-	user.visible_message("<span class='notice'>[user] tunes [src] to [I].</span>", "<span class='notice'>You fine-tune [src]'s tracking to track [I].</span>")
-	playsound(src, 'sound/machines/click.ogg', 50, 1)
-	constant_target = I
-
-/obj/item/weapon/pinpointer/examine(mob/user)
-	..()
-	var/msg = "Its tracking indicator reads "
-	switch(mode)
-		if(TRACK_NUKE_DISK)
-			msg += "\"nuclear_disk\"."
-		if(TRACK_MALF_AI)
-			msg += "\"01000001 01001001\"."
-		if(TRACK_INFILTRATOR)
-			msg += "\"vasvygengbefuvc\"."
-		if(TRACK_OPERATIVES)
-			msg += "\"[target ? "Operative [target]" : "friends"]\"."
-		if(TRACK_ATOM)
-			msg += "\"[initial(constant_target.name)]\"."
-		if(TRACK_COORDINATES)
-			msg += "\"([target_x], [target_y])\"."
-		else
-			msg = "Its tracking indicator is blank."
-	to_chat(user, msg)
-	for(var/obj/machinery/nuclearbomb/bomb in GLOB.machines)
-		if(bomb.timing)
-			to_chat(user, "Extreme danger. Arming signal detected. Time remaining: [bomb.get_time_left()]")
-
-/obj/item/weapon/pinpointer/process()
-	if(!active)
-		STOP_PROCESSING(SSfastprocess, src)
-		return
-	scan_for_target()
-	point_to_target()
-	my_god_jc_a_bomb()
-	addtimer(CALLBACK(src, .proc/refresh_target), 50, TIMER_UNIQUE)
-
-/obj/item/weapon/pinpointer/proc/scan_for_target() //Looks for whatever it's tracking
-	if(target)
-		if(isliving(target))
-			var/mob/living/L = target
-			if(L.stat == DEAD)
-				target = null
-		return
-	switch(mode)
-		if(TRACK_NUKE_DISK)
-			var/obj/item/weapon/disk/nuclear/N = locate()
-			target = N
-		if(TRACK_MALF_AI)
-			for(var/V in GLOB.ai_list)
-				var/mob/living/silicon/ai/A = V
-				if(A.nuking)
-					target = A
-			for(var/V in GLOB.apcs_list)
-				var/obj/machinery/power/apc/A = V
-				if(A.malfhack && A.occupier)
-					target = A
-		if(TRACK_INFILTRATOR)
-			target = SSshuttle.getShuttle("syndicate")
-		if(TRACK_OPERATIVES)
-			var/list/possible_targets = list()
-			var/turf/here = get_turf(src)
-			for(var/V in SSticker.mode.syndicates)
-				var/datum/mind/M = V
-				if(M.current && M.current.stat != DEAD)
-					possible_targets |= M.current
-			var/mob/living/closest_operative = get_closest_atom(/mob/living/carbon/human, possible_targets, here)
-			if(closest_operative)
-				target = closest_operative
+	var/nuke_warning = FALSE // If we've set off a miniature alarm about an armed nuke
+	var/mode = TRACK_NUKE_DISK //What are we looking for?
+
+/obj/item/weapon/pinpointer/New()
+	..()
+	GLOB.pinpointer_list += src
+
+/obj/item/weapon/pinpointer/Destroy()
+	STOP_PROCESSING(SSfastprocess, src)
+	GLOB.pinpointer_list -= src
+	return ..()
+
+/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)
+	icon_state = "pin[active ? "onnull" : "off"]"
+	if(active)
+		START_PROCESSING(SSfastprocess, src)
+	else
+		target = null //Restarting the pinpointer forces a target reset
+		STOP_PROCESSING(SSfastprocess, src)
+
+/obj/item/weapon/pinpointer/attackby(obj/item/I, mob/living/user, params)
+	if(mode != TRACK_ATOM)
+		return ..()
+	user.visible_message("<span class='notice'>[user] tunes [src] to [I].</span>", "<span class='notice'>You fine-tune [src]'s tracking to track [I].</span>")
+	playsound(src, 'sound/machines/click.ogg', 50, 1)
+	constant_target = I
+
+/obj/item/weapon/pinpointer/examine(mob/user)
+	..()
+	var/msg = "Its tracking indicator reads "
+	switch(mode)
+		if(TRACK_NUKE_DISK)
+			msg += "\"nuclear_disk\"."
+		if(TRACK_MALF_AI)
+			msg += "\"01000001 01001001\"."
+		if(TRACK_INFILTRATOR)
+			msg += "\"vasvygengbefuvc\"."
+		if(TRACK_OPERATIVES)
+			msg += "\"[target ? "Operative [target]" : "friends"]\"."
 		if(TRACK_ATOM)
-			if(constant_target)
-				target = constant_target
-		if(TRACK_COORDINATES)
-			var/turf/T = get_turf(src)
-			target = locate(target_x, target_y, T.z)
-
-/obj/item/weapon/pinpointer/proc/point_to_target() //If we found what we're looking for, show the distance and direction
-	if(!active)
-		return
-	if(!target || (mode == TRACK_ATOM && !constant_target))
-		icon_state = "pinon[nuke_warning ? "alert" : ""]null"
-		return
-	var/turf/here = get_turf(src)
-	var/turf/there = get_turf(target)
-	if(here.z != there.z)
-		icon_state = "pinon[nuke_warning ? "alert" : ""]null"
-		return
+			msg += "\"[initial(constant_target.name)]\"."
+		if(TRACK_COORDINATES)
+			msg += "\"([target_x], [target_y])\"."
+		else
+			msg = "Its tracking indicator is blank."
+	to_chat(user, msg)
+	for(var/obj/machinery/nuclearbomb/bomb in GLOB.machines)
+		if(bomb.timing)
+			to_chat(user, "Extreme danger. Arming signal detected. Time remaining: [bomb.get_time_left()]")
+
+/obj/item/weapon/pinpointer/process()
+	if(!active)
+		STOP_PROCESSING(SSfastprocess, src)
+		return
+	scan_for_target()
+	point_to_target()
+	my_god_jc_a_bomb()
+	addtimer(CALLBACK(src, .proc/refresh_target), 50, TIMER_UNIQUE)
+
+/obj/item/weapon/pinpointer/proc/scan_for_target() //Looks for whatever it's tracking
+	if(target)
+		if(isliving(target))
+			var/mob/living/L = target
+			if(L.stat == DEAD)
+				target = null
+		return
+	switch(mode)
+		if(TRACK_NUKE_DISK)
+			var/obj/item/weapon/disk/nuclear/N = locate()
+			target = N
+		if(TRACK_MALF_AI)
+			for(var/V in GLOB.ai_list)
+				var/mob/living/silicon/ai/A = V
+				if(A.nuking)
+					target = A
+			for(var/V in GLOB.apcs_list)
+				var/obj/machinery/power/apc/A = V
+				if(A.malfhack && A.occupier)
+					target = A
+		if(TRACK_INFILTRATOR)
+			target = SSshuttle.getShuttle("syndicate")
+		if(TRACK_OPERATIVES)
+			var/list/possible_targets = list()
+			var/turf/here = get_turf(src)
+			for(var/V in SSticker.mode.syndicates)
+				var/datum/mind/M = V
+				if(M.current && M.current.stat != DEAD)
+					possible_targets |= M.current
+			var/mob/living/closest_operative = get_closest_atom(/mob/living/carbon/human, possible_targets, here)
+			if(closest_operative)
+				target = closest_operative
+		if(TRACK_ATOM)
+			if(constant_target)
+				target = constant_target
+		if(TRACK_COORDINATES)
+			var/turf/T = get_turf(src)
+			target = locate(target_x, target_y, T.z)
+
+/obj/item/weapon/pinpointer/proc/point_to_target() //If we found what we're looking for, show the distance and direction
+	if(!active)
+		return
+	if(!target || (mode == TRACK_ATOM && !constant_target))
+		icon_state = "pinon[nuke_warning ? "alert" : ""]null"
+		return
+	var/turf/here = get_turf(src)
+	var/turf/there = get_turf(target)
+	if(here.z != there.z)
+		icon_state = "pinon[nuke_warning ? "alert" : ""]null"
+		return
 	if(get_dist_euclidian(here,there)<=minimum_range)
-		icon_state = "pinon[nuke_warning ? "alert" : ""]direct"
-	else
-		setDir(get_dir(here, there))
-		switch(get_dist(here, there))
-			if(1 to 8)
-				icon_state = "pinon[nuke_warning ? "alert" : "close"]"
-			if(9 to 16)
-				icon_state = "pinon[nuke_warning ? "alert" : "medium"]"
-			if(16 to INFINITY)
-				icon_state = "pinon[nuke_warning ? "alert" : "far"]"
-
-/obj/item/weapon/pinpointer/proc/my_god_jc_a_bomb() //If we should get the hell back to the ship
-	for(var/obj/machinery/nuclearbomb/bomb in GLOB.nuke_list)
-		if(bomb.timing)
-			if(!nuke_warning)
-				nuke_warning = TRUE
-				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>")
-
-/obj/item/weapon/pinpointer/proc/switch_mode_to(new_mode) //If we shouldn't be tracking what we are
-	if(isliving(loc))
-		var/mob/living/L = loc
-		to_chat(L, "<span class='userdanger'>Your [name] beeps as it reconfigures its tracking algorithms.</span>")
-		playsound(L, 'sound/machines/triple_beep.ogg', 50, 1)
-	mode = new_mode
-	target = null //Switch modes so we can find the new target
-
-/obj/item/weapon/pinpointer/proc/refresh_target() //Periodically removes the target to allow the pinpointer to update (i.e. malf AI shunts, an operative dies)
-	target = null
-
-/obj/item/weapon/pinpointer/syndicate //Syndicate pinpointers automatically point towards the infiltrator once the nuke is active.
-	name = "syndicate pinpointer"
-	desc = "A handheld tracking device that locks onto certain signals. It's configured to switch tracking modes once it detects the activation signal of a nuclear device."
-
-/obj/item/weapon/pinpointer/syndicate/cyborg //Cyborg pinpointers just look for a random operative.
-	name = "cyborg syndicate pinpointer"
-	desc = "An integrated tracking device, jury-rigged to search for living Syndicate operatives."
-	mode = TRACK_OPERATIVES
-	flags = NODROP
+		icon_state = "pinon[nuke_warning ? "alert" : ""]direct"
+	else
+		setDir(get_dir(here, there))
+		switch(get_dist(here, there))
+			if(1 to 8)
+				icon_state = "pinon[nuke_warning ? "alert" : "close"]"
+			if(9 to 16)
+				icon_state = "pinon[nuke_warning ? "alert" : "medium"]"
+			if(16 to INFINITY)
+				icon_state = "pinon[nuke_warning ? "alert" : "far"]"
+
+/obj/item/weapon/pinpointer/proc/my_god_jc_a_bomb() //If we should get the hell back to the ship
+	for(var/obj/machinery/nuclearbomb/bomb in GLOB.nuke_list)
+		if(bomb.timing)
+			if(!nuke_warning)
+				nuke_warning = TRUE
+				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>")
+
+/obj/item/weapon/pinpointer/proc/switch_mode_to(new_mode) //If we shouldn't be tracking what we are
+	if(isliving(loc))
+		var/mob/living/L = loc
+		to_chat(L, "<span class='userdanger'>Your [name] beeps as it reconfigures its tracking algorithms.</span>")
+		playsound(L, 'sound/machines/triple_beep.ogg', 50, 1)
+	mode = new_mode
+	target = null //Switch modes so we can find the new target
+
+/obj/item/weapon/pinpointer/proc/refresh_target() //Periodically removes the target to allow the pinpointer to update (i.e. malf AI shunts, an operative dies)
+	target = null
+
+/obj/item/weapon/pinpointer/syndicate //Syndicate pinpointers automatically point towards the infiltrator once the nuke is active.
+	name = "syndicate pinpointer"
+	desc = "A handheld tracking device that locks onto certain signals. It's configured to switch tracking modes once it detects the activation signal of a nuclear device."
+
+/obj/item/weapon/pinpointer/syndicate/cyborg //Cyborg pinpointers just look for a random operative.
+	name = "cyborg syndicate pinpointer"
+	desc = "An integrated tracking device, jury-rigged to search for living Syndicate operatives."
+	mode = TRACK_OPERATIVES
+	flags = NODROP
 
 
 

code/game/gamemodes/traitor/traitor.dm

@@ -201,11 +201,14 @@
 	return
 
 
+
 /datum/game_mode/proc/finalize_traitor(var/datum/mind/traitor)
 	if(issilicon(traitor.current))
 		add_law_zero(traitor.current)
+		traitor.current.playsound_local('sound/ambience/antag/Malf.ogg',100,0)
 	else
 		equip_traitor(traitor.current)
+		traitor.current.playsound_local('sound/ambience/antag/TatorAlert.ogg',100,0)
 	SSticker.mode.update_traitor_icons_added(traitor)
 	return
 
@@ -234,10 +237,6 @@
 	to_chat(killer, "Your radio has been upgraded! Use :t to speak on an encrypted channel with Syndicate Agents!")
 	killer.add_malf_picker()
 
-/datum/game_mode/proc/add_law_sixsixsix(mob/living/silicon/devil)
-	var/laws = list("You may not use violence to coerce someone into selling their soul.", "You may not directly and knowingly physically harm a devil, other than yourself.", GLOB.lawlorify[LAW][devil.mind.devilinfo.ban], GLOB.lawlorify[LAW][devil.mind.devilinfo.obligation], "Accomplish your objectives at all costs.")
-	devil.set_law_sixsixsix(laws)
-
 /datum/game_mode/proc/auto_declare_completion_traitor()
 	if(traitors.len)
 		var/text = "<br><font size=3><b>The [traitor_name]s were:</b></font>"
@@ -412,4 +411,3 @@
 	var/datum/atom_hud/antag/traitorhud = GLOB.huds[ANTAG_HUD_TRAITOR]
 	traitorhud.leave_hud(traitor_mind.current)
 	set_antag_hud(traitor_mind.current, null)
-

code/game/gamemodes/wizard/raginmages.dm

@@ -33,6 +33,7 @@
 /datum/game_mode/wizard/raginmages/greet_wizard(datum/mind/wizard, you_are=1)
 	if (you_are)
 		to_chat(wizard.current, "<B>You are the Space Wizard!</B>")
+		wizard.current.playsound_local('sound/ambience/antag/RagesMages.ogg',100,0)
 	to_chat(wizard.current, "<B>The Space Wizards Federation has given you the following tasks:</B>")
 
 	var/obj_count = 1

code/game/gamemodes/wizard/soulstone.dm

@@ -54,7 +54,7 @@
 	if(!ishuman(M))//If target is not a human.
 		return ..()
 	if(iscultist(M))
-		to_chat(user, "<span class='cultlarge'>\"Come now, do not capture your fellow's soul.\"</span>")
+		to_chat(user, "<span class='cultlarge'>\"Come now, do not capture your bretheren's soul.\"</span>")
 		return
 	add_logs(user, M, "captured [M.name]'s soul", src)
 
@@ -69,6 +69,9 @@
 		user.Paralyse(5)
 		to_chat(user, "<span class='userdanger'>Your body is wracked with debilitating pain!</span>")
 		return
+	release_shades(user)
+
+/obj/item/device/soulstone/proc/release_shades(mob/user)
 	for(var/mob/living/simple_animal/shade/A in src)
 		A.status_flags &= ~GODMODE
 		A.canmove = 1
@@ -132,11 +135,11 @@
 
 		if("VICTIM")
 			var/mob/living/carbon/human/T = target
-			if(SSticker.mode.name == "cult" && T.mind == SSticker.mode:sacrifice_target)
+			if(is_sacrifice_target(T.mind))
 				if(iscultist(user))
 					to_chat(user, "<span class='cult'><b>\"This soul is mine.</b></span> <span class='cultlarge'>SACRIFICE THEM!\"</span>")
 				else
-					to_chat(user, "<span class='danger'>The soulstone doesn't work for no apparent reason.</span>")
+					to_chat(user, "<span class='danger'>The soulstone seems to reject this soul.</span>")
 				return 0
 			if(contents.len)
 				to_chat(user, "<span class='userdanger'>Capture failed!</span>: The soulstone is full! Free an existing soul to make room.")
@@ -188,7 +191,10 @@
 
 						else
 							makeNewConstruct(/mob/living/simple_animal/hostile/construct/builder/noncult, A, user, 0, T.loc)
-
+				for(var/datum/mind/B in SSticker.mode.cult)
+					if(B == A.mind)
+						SSticker.mode.cult -= A.mind
+						SSticker.mode.update_cult_icons_removed(A.mind)
 				qdel(T)
 				user.drop_item()
 				qdel(src)
@@ -200,13 +206,21 @@
 	var/mob/living/simple_animal/hostile/construct/newstruct = new ctype((loc_override) ? (loc_override) : (get_turf(target)))
 	if(stoner)
 		newstruct.faction |= "\ref[stoner]"
+		newstruct.master = stoner
+		var/datum/action/innate/seek_master/SM = new()
+		SM.Grant(newstruct)
 	newstruct.key = target.key
+	var/obj/screen/alert/bloodsense/BS
 	if(newstruct.mind && ((stoner && iscultist(stoner)) || cultoverride) && SSticker && SSticker.mode)
 		SSticker.mode.add_cultist(newstruct.mind, 0)
+		BS = newstruct.alerts.Find("bloodsense")
 	if(iscultist(stoner) || cultoverride)
 		to_chat(newstruct, "<b>You are still bound to serve the cult[stoner ? " and [stoner]":""], follow their orders and help them complete their goals at all costs.</b>")
 	else if(stoner)
 		to_chat(newstruct, "<b>You are still bound to serve your creator, [stoner], follow their orders and help them complete their goals at all costs.</b>")
+		BS = newstruct.throw_alert("bloodsense", /obj/screen/alert/bloodsense)
+	if(BS)
+		BS.Cviewer = newstruct
 	newstruct.cancel_camera()
 
 
@@ -244,7 +258,7 @@
 			break
 
 	if(!chosen_ghost)	//Failing that, we grab a ghost
-		var/list/consenting_candidates = pollCandidates("Would you like to play as a Shade?", "Cultist", null, ROLE_CULTIST, poll_time = 50)
+		var/list/consenting_candidates = pollGhostCandidates("Would you like to play as a Shade?", "Cultist", null, ROLE_CULTIST, poll_time = 50)
 		if(consenting_candidates.len)
 			chosen_ghost = pick(consenting_candidates)
 	if(!T)
@@ -259,4 +273,4 @@
 		T.dropItemToGround(W)
 	init_shade(T, U)
 	qdel(T)
-	return 1
+	return 1

code/game/gamemodes/wizard/wizard.dm

@@ -110,6 +110,10 @@
 		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
 
 

code/game/machinery/bank_machine.dm

@@ -25,9 +25,6 @@
 	if(istype(I, /obj/item/stack/spacecash))
 		var/obj/item/stack/spacecash/C = I
 		value = C.value * C.amount
-	if(istype(I, /obj/item/weapon/coin))
-		var/obj/item/weapon/coin/C  = I
-		value = C.value
 	if(value)
 		SSshuttle.points += value
 		to_chat(user, "<span class='notice'>You deposit [I]. The station now has [SSshuttle.points] credits.</span>")

code/game/machinery/cloning.dm

@@ -273,6 +273,17 @@
 		else if((mob_occupant.cloneloss <= (100 - heal_level)))
 			connected_message("Cloning Process Complete.")
 			SPEAK("The cloning cycle of [mob_occupant.real_name] is complete.")
+
+			// If the cloner is upgraded to debugging high levels, sometimes
+			// organs and limbs can be missing.
+			for(var/i in unattached_flesh)
+				if(isorgan(i))
+					var/obj/item/organ/O = i
+					O.Insert(mob_occupant)
+				else if(isbodypart(i))
+					var/obj/item/bodypart/BP = i
+					BP.attach_limb(mob_occupant)
+
 			go_out()
 
 	else if (!mob_occupant || mob_occupant.loc != src)
@@ -321,9 +332,7 @@
 			return
 		else
 			connected_message("Authorized Ejection")
-
 			SPEAK("An authorized ejection of [clonemind.name] has occurred.")
-
 			to_chat(user, "<span class='notice'>You force an emergency ejection. </span>")
 			go_out()
 	else
@@ -380,10 +389,8 @@
 		SPEAK("Critical error! Please contact a Thinktronic Systems \
 			technician, as your warranty may be affected.")
 		mess = TRUE
-
 		for(var/obj/item/O in unattached_flesh)
 			qdel(O)
-      
 		icon_state = "pod_g"
 		if(mob_occupant.mind != clonemind)
 			clonemind.transfer_to(mob_occupant)
@@ -399,12 +406,10 @@
 		go_out()
 
 /obj/machinery/clonepod/emp_act(severity)
-
 	var/mob/living/mob_occupant = occupant
 	if(mob_occupant && prob(100/(severity*efficiency)))
 		connected_message(Gibberish("EMP-caused Accidental Ejection", 0))
 		SPEAK(Gibberish("Exposure to electromagnetic fields has caused the ejection of [mob_occupant.real_name] prematurely." ,0))
-    
 		go_out()
 	..()
 
@@ -496,4 +501,4 @@
 
 #undef CLONE_INITIAL_DAMAGE
 #undef SPEAK
-#undef MINIMUM_HEAL_LEVEL
+#undef MINIMUM_HEAL_LEVEL

code/game/machinery/cloning.dm.rej

@@ -1,38 +0,0 @@
-diff a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm	(rejected hunks)
-@@ -311,15 +311,15 @@
- 			to_chat(user, "<font color = #666633>-% Successfully stored \ref[P.buffer] [P.buffer.name] in buffer %-</font color>")
- 		return
- 
-+	var/mob/living/mob_occupant = occupant
- 	if(W.GetID())
- 		if(!check_access(W))
- 			to_chat(user, "<span class='danger'>Access Denied.</span>")
- 			return
--		if(!(occupant || mess))
-+		if(!(mob_occupant || mess))
- 			to_chat(user, "<span class='danger'>Error: Pod has no occupant.</span>")
- 			return
- 		else
--			var/mob/living/mob_occupant
- 			connected_message("Authorized Ejection")
- 			SPEAK("An authorized ejection of [clonemind.name] has occurred.")
- 			to_chat(user, "<span class='notice'>You force an emergency ejection. </span>")
-@@ -395,16 +395,10 @@
- 		go_out()
- 
- /obj/machinery/clonepod/emp_act(severity)
--<<<<<<< HEAD
--	if((occupant || mess) && prob(100/(severity*efficiency)))
--		connected_message(Gibberish("EMP-caused Accidental Ejection", 0))
--		SPEAK(Gibberish("Exposure to electromagnetic fields has caused the ejection of [clonemind.name] prematurely." ,0))
--=======
--	if(isliving(occupant) && prob(100/(severity*efficiency)))
--		var/mob/living/mob_occupant = occupant
-+	var/mob/living/mob_occupant = occupant
-+	if(mob_occupant && prob(100/(severity*efficiency)))
- 		connected_message(Gibberish("EMP-caused Accidental Ejection", 0))
- 		SPEAK(Gibberish("Exposure to electromagnetic fields has caused the ejection of [mob_occupant.real_name] prematurely." ,0))
-->>>>>>> Changes /obj/machinery to have atom/movable occupants
- 		go_out()
- 	..()
- 

code/game/machinery/computer/arcade.dm

@@ -43,7 +43,8 @@
 		/obj/item/weapon/grenade/chem_grenade/glitter/pink		= 1,
 		/obj/item/weapon/grenade/chem_grenade/glitter/blue		= 1,
 		/obj/item/weapon/grenade/chem_grenade/glitter/white		= 1,
-		/obj/item/toy/eightball									= 2)
+		/obj/item/toy/eightball									= 2,
+		/obj/item/toy/windupToolbox								= 2)
 
 	light_color = LIGHT_COLOR_GREEN
 

code/game/machinery/computer/buildandrepair.dm

@@ -163,6 +163,10 @@
 	name = "Telescience Console (Computer Board)"
 	build_path = /obj/machinery/computer/telescience
 	origin_tech = "programming=3;bluespace=3;plasmatech=4"
+/obj/item/weapon/circuitboard/computer/launchpad_console
+	name = "Launchpad Control Console (Computer Board)"
+	build_path = /obj/machinery/computer/launchpad
+	origin_tech = "programming=3;bluespace=3;plasmatech=2"
 /obj/item/weapon/circuitboard/computer/message_monitor
 	name = "Message Monitor (Computer Board)"
 	build_path = /obj/machinery/computer/message_monitor

code/game/machinery/computer/cloning.dm

@@ -1,498 +1,502 @@
-
-/obj/machinery/computer/cloning
-	name = "cloning console"
-	desc = "Used to clone people and manage DNA."
-	icon_screen = "dna"
-	icon_keyboard = "med_key"
-	circuit = /obj/item/weapon/circuitboard/computer/cloning
-	req_access = list(GLOB.access_heads) //Only used for record deletion right now.
-	var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning.
-	var/list/pods //Linked cloning pods
-	var/temp = "Inactive"
-	var/scantemp_ckey
-	var/scantemp = "Ready to Scan"
-	var/menu = 1 //Which menu screen to display
-	var/list/records = list()
-	var/datum/data/record/active_record = null
-	var/obj/item/weapon/disk/data/diskette = null //Mostly so the geneticist can steal everything.
-	var/loading = 0 // Nice loading text
-	var/autoprocess = 0
-
-	light_color = LIGHT_COLOR_BLUE
-
-/obj/machinery/computer/cloning/Initialize()
-	..()
-	updatemodules(TRUE)
-
-/obj/machinery/computer/cloning/Destroy()
-	if(pods)
-		for(var/P in pods)
-			DetachCloner(P)
-		pods = null
-	return ..()
-
-/obj/machinery/computer/cloning/proc/GetAvailablePod(mind = null)
-	if(pods)
-		for(var/P in pods)
-			var/obj/machinery/clonepod/pod = P
-			if(pod.occupant && pod.clonemind == mind)
-				return null
-			if(pod.is_operational() && !(pod.occupant || pod.mess))
-				return pod
-
-/obj/machinery/computer/cloning/proc/HasEfficientPod()
-	if(pods)
-		for(var/P in pods)
-			var/obj/machinery/clonepod/pod = P
-			if(pod.is_operational() && pod.efficiency > 5)
-				return TRUE
-
-/obj/machinery/computer/cloning/proc/GetAvailableEfficientPod(mind = null)
-	if(pods)
-		for(var/P in pods)
-			var/obj/machinery/clonepod/pod = P
-			if(pod.occupant && pod.clonemind == mind)
-				return pod
-			else if(!. && pod.is_operational() && !(pod.occupant || pod.mess) && pod.efficiency > 5)
-				. = pod
-
-/obj/machinery/computer/cloning/process()
-	if(!(scanner && LAZYLEN(pods) && autoprocess))
-		return
-
-	if(scanner.occupant && scanner.scan_level > 2)
-		scan_mob(scanner.occupant)
-
-	for(var/datum/data/record/R in records)
-		var/obj/machinery/clonepod/pod = GetAvailableEfficientPod(R.fields["mind"])
-
-		if(!pod)
-			return
-
-		if(pod.occupant)
-			continue	//how though?
-
-		if(pod.growclone(R.fields["ckey"], R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mind"], R.fields["mrace"], R.fields["features"], R.fields["factions"]))
-			records -= R
-
-/obj/machinery/computer/cloning/proc/updatemodules(findfirstcloner)
-	src.scanner = findscanner()
-	if(findfirstcloner && !LAZYLEN(pods))
-		findcloner()
-
-/obj/machinery/computer/cloning/proc/findscanner()
-	var/obj/machinery/dna_scannernew/scannerf = null
-
-	// Loop through every direction
-	for(dir in list(NORTH,EAST,SOUTH,WEST))
-
-		// Try to find a scanner in that direction
-		scannerf = locate(/obj/machinery/dna_scannernew, get_step(src, dir))
-
-		// If found and operational, return the scanner
-		if (!isnull(scannerf) && scannerf.is_operational())
-			return scannerf
-
-	// If no scanner was found, it will return null
-	return null
-
-/obj/machinery/computer/cloning/proc/findcloner()
-	var/obj/machinery/clonepod/podf = null
-
-	for(dir in list(NORTH,EAST,SOUTH,WEST))
-
-		podf = locate(/obj/machinery/clonepod, get_step(src, dir))
-
-		if (!isnull(podf) && podf.is_operational())
-			AttachCloner(podf)
-
-/obj/machinery/computer/cloning/proc/AttachCloner(obj/machinery/clonepod/pod)
-	if(!pod.connected)
-		pod.connected = src
-		LAZYADD(pods, pod)
-
-/obj/machinery/computer/cloning/proc/DetachCloner(obj/machinery/clonepod/pod)
-	pod.connected = null
-	LAZYREMOVE(pods, pod)
-
-/obj/machinery/computer/cloning/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES
-		if (!src.diskette)
-			if(!user.drop_item())
-				return
-			W.loc = src
-			src.diskette = W
-			to_chat(user, "<span class='notice'>You insert [W].</span>")
-			playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
-			src.updateUsrDialog()
-	else if(istype(W,/obj/item/device/multitool))
-		var/obj/item/device/multitool/P = W
-
-		if(istype(P.buffer, /obj/machinery/clonepod))
-			if(get_area(P.buffer) != get_area(src))
-				to_chat(user, "<font color = #666633>-% Cannot link machines across power zones. Buffer cleared %-</font color>")
-				P.buffer = null
-				return
-			to_chat(user, "<font color = #666633>-% Successfully linked [P.buffer] with [src] %-</font color>")
-			var/obj/machinery/clonepod/pod = P.buffer
-			if(pod.connected)
-				pod.connected.DetachCloner(pod)
-			AttachCloner(pod)
-		else
-			P.buffer = src
-			to_chat(user, "<font color = #666633>-% Successfully stored \ref[P.buffer] [P.buffer.name] in buffer %-</font color>")
-		return
-	else
-		return ..()
-
-/obj/machinery/computer/cloning/attack_hand(mob/user)
-	if(..())
-		return
-	interact(user)
-
-/obj/machinery/computer/cloning/interact(mob/user)
-	user.set_machine(src)
-	add_fingerprint(user)
-
-	if(..())
-		return
-
-	updatemodules(TRUE)
-
-	var/dat = ""
-	dat += "<a href='byond://?src=\ref[src];refresh=1'>Refresh</a>"
-
-	if(scanner && HasEfficientPod() && scanner.scan_level > 2)
-		if(!autoprocess)
-			dat += "<a href='byond://?src=\ref[src];task=autoprocess'>Autoprocess</a>"
-		else
-			dat += "<a href='byond://?src=\ref[src];task=stopautoprocess'>Stop autoprocess</a>"
-	else
-		dat += "<span class='linkOff'>Autoprocess</span>"
-	dat += "<h3>Cloning Pod Status</h3>"
-	dat += "<div class='statusDisplay'>[temp]&nbsp;</div>"
-
-	switch(src.menu)
-		if(1)
-			// Modules
-			if (isnull(src.scanner) || !LAZYLEN(pods))
-				dat += "<h3>Modules</h3>"
-				//dat += "<a href='byond://?src=\ref[src];relmodules=1'>Reload Modules</a>"
-				if (isnull(src.scanner))
-					dat += "<font class='bad'>ERROR: No Scanner detected!</font><br>"
-				if (!LAZYLEN(pods))
-					dat += "<font class='bad'>ERROR: No Pod detected</font><br>"
-
-			// Scanner
-			if (!isnull(src.scanner))
-
-				var/mob/living/scanner_occupant = scanner.occupant
+/obj/machinery/computer/cloning
+	name = "cloning console"
+	desc = "Used to clone people and manage DNA."
+	icon_screen = "dna"
+	icon_keyboard = "med_key"
+	circuit = /obj/item/weapon/circuitboard/computer/cloning
+	req_access = list(GLOB.access_heads) //Only used for record deletion right now.
+	var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning.
+	var/list/pods //Linked cloning pods
+	var/temp = "Inactive"
+	var/scantemp_ckey
+	var/scantemp = "Ready to Scan"
+	var/menu = 1 //Which menu screen to display
+	var/list/records = list()
+	var/datum/data/record/active_record = null
+	var/obj/item/weapon/disk/data/diskette = null //Mostly so the geneticist can steal everything.
+	var/loading = 0 // Nice loading text
+	var/autoprocess = 0
 
-				dat += "<h3>Scanner Functions</h3>"
-
-				dat += "<div class='statusDisplay'>"
+	light_color = LIGHT_COLOR_BLUE
+
+/obj/machinery/computer/cloning/Initialize()
+	..()
+	updatemodules(TRUE)
+
+/obj/machinery/computer/cloning/Destroy()
+	if(pods)
+		for(var/P in pods)
+			DetachCloner(P)
+		pods = null
+	return ..()
+
+/obj/machinery/computer/cloning/proc/GetAvailablePod(mind = null)
+	if(pods)
+		for(var/P in pods)
+			var/obj/machinery/clonepod/pod = P
+			if(pod.occupant && pod.clonemind == mind)
+				return null
+			if(pod.is_operational() && !(pod.occupant || pod.mess))
+				return pod
+
+/obj/machinery/computer/cloning/proc/HasEfficientPod()
+	if(pods)
+		for(var/P in pods)
+			var/obj/machinery/clonepod/pod = P
+			if(pod.is_operational() && pod.efficiency > 5)
+				return TRUE
+
+/obj/machinery/computer/cloning/proc/GetAvailableEfficientPod(mind = null)
+	if(pods)
+		for(var/P in pods)
+			var/obj/machinery/clonepod/pod = P
+			if(pod.occupant && pod.clonemind == mind)
+				return pod
+			else if(!. && pod.is_operational() && !(pod.occupant || pod.mess) && pod.efficiency > 5)
+				. = pod
+
+/obj/machinery/computer/cloning/process()
+	if(!(scanner && LAZYLEN(pods) && autoprocess))
+		return
+
+	if(scanner.occupant && scanner.scan_level > 2)
+		scan_occupant(scanner.occupant)
+
+	for(var/datum/data/record/R in records)
+		var/obj/machinery/clonepod/pod = GetAvailableEfficientPod(R.fields["mind"])
+
+		if(!pod)
+			return
+
+		if(pod.occupant)
+			continue	//how though?
+
+		if(pod.growclone(R.fields["ckey"], R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mind"], R.fields["mrace"], R.fields["features"], R.fields["factions"]))
+			records -= R
+
+/obj/machinery/computer/cloning/proc/updatemodules(findfirstcloner)
+	src.scanner = findscanner()
+	if(findfirstcloner && !LAZYLEN(pods))
+		findcloner()
+
+/obj/machinery/computer/cloning/proc/findscanner()
+	var/obj/machinery/dna_scannernew/scannerf = null
+
+	// Loop through every direction
+	for(dir in list(NORTH,EAST,SOUTH,WEST))
+
+		// Try to find a scanner in that direction
+		scannerf = locate(/obj/machinery/dna_scannernew, get_step(src, dir))
+
+		// If found and operational, return the scanner
+		if (!isnull(scannerf) && scannerf.is_operational())
+			return scannerf
+
+	// If no scanner was found, it will return null
+	return null
+
+/obj/machinery/computer/cloning/proc/findcloner()
+	var/obj/machinery/clonepod/podf = null
+
+	for(dir in list(NORTH,EAST,SOUTH,WEST))
+
+		podf = locate(/obj/machinery/clonepod, get_step(src, dir))
+
+		if (!isnull(podf) && podf.is_operational())
+			AttachCloner(podf)
+
+/obj/machinery/computer/cloning/proc/AttachCloner(obj/machinery/clonepod/pod)
+	if(!pod.connected)
+		pod.connected = src
+		LAZYADD(pods, pod)
+
+/obj/machinery/computer/cloning/proc/DetachCloner(obj/machinery/clonepod/pod)
+	pod.connected = null
+	LAZYREMOVE(pods, pod)
+
+/obj/machinery/computer/cloning/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES
+		if (!src.diskette)
+			if(!user.drop_item())
+				return
+			W.loc = src
+			src.diskette = W
+			to_chat(user, "<span class='notice'>You insert [W].</span>")
+			playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
+			src.updateUsrDialog()
+	else if(istype(W,/obj/item/device/multitool))
+		var/obj/item/device/multitool/P = W
+
+		if(istype(P.buffer, /obj/machinery/clonepod))
+			if(get_area(P.buffer) != get_area(src))
+				to_chat(user, "<font color = #666633>-% Cannot link machines across power zones. Buffer cleared %-</font color>")
+				P.buffer = null
+				return
+			to_chat(user, "<font color = #666633>-% Successfully linked [P.buffer] with [src] %-</font color>")
+			var/obj/machinery/clonepod/pod = P.buffer
+			if(pod.connected)
+				pod.connected.DetachCloner(pod)
+			AttachCloner(pod)
+		else
+			P.buffer = src
+			to_chat(user, "<font color = #666633>-% Successfully stored \ref[P.buffer] [P.buffer.name] in buffer %-</font color>")
+		return
+	else
+		return ..()
+
+/obj/machinery/computer/cloning/attack_hand(mob/user)
+	if(..())
+		return
+	interact(user)
+
+/obj/machinery/computer/cloning/interact(mob/user)
+	user.set_machine(src)
+	add_fingerprint(user)
+
+	if(..())
+		return
+
+	updatemodules(TRUE)
+
+	var/dat = ""
+	dat += "<a href='byond://?src=\ref[src];refresh=1'>Refresh</a>"
+
+	if(scanner && HasEfficientPod() && scanner.scan_level > 2)
+		if(!autoprocess)
+			dat += "<a href='byond://?src=\ref[src];task=autoprocess'>Autoprocess</a>"
+		else
+			dat += "<a href='byond://?src=\ref[src];task=stopautoprocess'>Stop autoprocess</a>"
+	else
+		dat += "<span class='linkOff'>Autoprocess</span>"
+	dat += "<h3>Cloning Pod Status</h3>"
+	dat += "<div class='statusDisplay'>[temp]&nbsp;</div>"
+
+	switch(src.menu)
+		if(1)
+			// Modules
+			if (isnull(src.scanner) || !LAZYLEN(pods))
+				dat += "<h3>Modules</h3>"
+				//dat += "<a href='byond://?src=\ref[src];relmodules=1'>Reload Modules</a>"
+				if (isnull(src.scanner))
+					dat += "<font class='bad'>ERROR: No Scanner detected!</font><br>"
+				if (!LAZYLEN(pods))
+					dat += "<font class='bad'>ERROR: No Pod detected</font><br>"
+
+			// Scanner
+			if (!isnull(src.scanner))
+				var/mob/living/scanner_occupant = get_mob_or_brainmob(scanner.occupant)
+
+				dat += "<h3>Scanner Functions</h3>"
+
+				dat += "<div class='statusDisplay'>"
 				if(!scanner_occupant)
-					dat += "Scanner Unoccupied"
-				else if(loading)
+					dat += "Scanner Unoccupied"
+				else if(loading)
 					dat += "[scanner_occupant] => Scanning..."
-				else
+				else
 					if(scanner_occupant.ckey != scantemp_ckey)
-						scantemp = "Ready to Scan"
+						scantemp = "Ready to Scan"
 						scantemp_ckey = scanner_occupant.ckey
 					dat += "[scanner_occupant] => [scantemp]"
-				dat += "</div>"
-
+				dat += "</div>"
+
 				if(scanner_occupant)
-					dat += "<a href='byond://?src=\ref[src];scan=1'>Start Scan</a>"
-					dat += "<br><a href='byond://?src=\ref[src];lock=1'>[src.scanner.locked ? "Unlock Scanner" : "Lock Scanner"]</a>"
-				else
-					dat += "<span class='linkOff'>Start Scan</span>"
-
-			// Database
-			dat += "<h3>Database Functions</h3>"
-			if (src.records.len && src.records.len > 0)
-				dat += "<a href='byond://?src=\ref[src];menu=2'>View Records ([src.records.len])</a><br>"
-			else
-				dat += "<span class='linkOff'>View Records (0)</span><br>"
-			if (src.diskette)
-				dat += "<a href='byond://?src=\ref[src];disk=eject'>Eject Disk</a><br>"
-
-
-
-		if(2)
-			dat += "<h3>Current records</h3>"
-			dat += "<a href='byond://?src=\ref[src];menu=1'><< Back</a><br><br>"
-			for(var/datum/data/record/R in records)
-				dat += "<h4>[R.fields["name"]]</h4>Scan ID [R.fields["id"]] <a href='byond://?src=\ref[src];view_rec=[R.fields["id"]]'>View Record</a>"
-		if(3)
-			dat += "<h3>Selected Record</h3>"
-			dat += "<a href='byond://?src=\ref[src];menu=2'><< Back</a><br>"
-
-			if (!src.active_record)
-				dat += "<font class='bad'>Record not found.</font>"
-			else
-				dat += "<h4>[src.active_record.fields["name"]]</h4>"
-				dat += "Scan ID [src.active_record.fields["id"]] <a href='byond://?src=\ref[src];clone=[active_record.fields["id"]]'>Clone</a><br>"
-
-				var/obj/item/weapon/implant/health/H = locate(src.active_record.fields["imp"])
-
-				if ((H) && (istype(H)))
-					dat += "<b>Health Implant Data:</b><br />[H.sensehealth()]<br><br />"
-				else
-					dat += "<font class='bad'>Unable to locate Health Implant.</font><br /><br />"
-
-				dat += "<b>Unique Identifier:</b><br /><span class='highlight'>[src.active_record.fields["UI"]]</span><br>"
-				dat += "<b>Structural Enzymes:</b><br /><span class='highlight'>[src.active_record.fields["SE"]]</span><br>"
-
-				if(diskette && diskette.fields)
-					dat += "<div class='block'>"
-					dat += "<h4>Inserted Disk</h4>"
-					dat += "<b>Contents:</b> "
-					var/list/L = list()
-					if(diskette.fields["UI"])
-						L += "Unique Identifier"
-					if(diskette.fields["UE"] && diskette.fields["name"] && diskette.fields["blood_type"])
-						L += "Unique Enzymes"
-					if(diskette.fields["SE"])
-						L += "Structural Enzymes"
-					dat += english_list(L, "Empty", " + ", " + ")
-					dat += "<br /><a href='byond://?src=\ref[src];disk=load'>Load from Disk</a>"
-
-					dat += "<br /><a href='byond://?src=\ref[src];disk=save'>Save to Disk</a>"
-					dat += "</div>"
-
-				dat += "<font size=1><a href='byond://?src=\ref[src];del_rec=1'>Delete Record</a></font>"
-
-		if(4)
-			if (!src.active_record)
-				src.menu = 2
-			dat = "[src.temp]<br>"
-			dat += "<h3>Confirm Record Deletion</h3>"
-
-			dat += "<b><a href='byond://?src=\ref[src];del_rec=1'>Scan card to confirm.</a></b><br>"
-			dat += "<b><a href='byond://?src=\ref[src];menu=3'>Cancel</a></b>"
-
-
-	var/datum/browser/popup = new(user, "cloning", "Cloning System Control")
-	popup.set_content(dat)
-	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
-	popup.open()
-
-/obj/machinery/computer/cloning/Topic(href, href_list)
-	if(..())
-		return
-
-	if(loading)
-		return
-
-	if(href_list["task"])
-		switch(href_list["task"])
-			if("autoprocess")
-				autoprocess = 1
-				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-			if("stopautoprocess")
-				autoprocess = 0
-				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-
-	else if ((href_list["scan"]) && !isnull(scanner) && scanner.is_operational())
-		scantemp = ""
-
-		loading = 1
-		src.updateUsrDialog()
-		playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
-		say("Initiating scan...")
-
-		spawn(20)
-			src.scan_mob(scanner.occupant)
-
-			loading = 0
-			src.updateUsrDialog()
-			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-
-
-		//No locking an open scanner.
-	else if ((href_list["lock"]) && !isnull(scanner) && scanner.is_operational())
-		if ((!scanner.locked) && (scanner.occupant))
-			scanner.locked = 1
-			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-		else
-			scanner.locked = 0
-			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-
-	else if(href_list["view_rec"])
-		playsound(src, "terminal_type", 25, 0)
-		src.active_record = find_record("id", href_list["view_rec"], records)
-		if(active_record)
-			if(!active_record.fields["ckey"])
-				records -= active_record
-				active_record = null
-				src.temp = "<font class='bad'>Record Corrupt</font>"
-			else
-				src.menu = 3
-		else
-			src.temp = "Record missing."
-
-	else if (href_list["del_rec"])
-		if ((!src.active_record) || (src.menu < 3))
-			return
-		if (src.menu == 3) //If we are viewing a record, confirm deletion
-			src.temp = "Delete record?"
-			src.menu = 4
-			playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
-
-		else if (src.menu == 4)
-			var/obj/item/weapon/card/id/C = usr.get_active_held_item()
-			if (istype(C)||istype(C, /obj/item/device/pda))
-				if(src.check_access(C))
-					src.temp = "[src.active_record.fields["name"]] => Record deleted."
-					src.records.Remove(active_record)
-					active_record = null
-					playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-					src.menu = 2
-				else
-					src.temp = "<font class='bad'>Access Denied.</font>"
-					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-
-	else if (href_list["disk"]) //Load or eject.
-		switch(href_list["disk"])
-			if("load")
-				if (!diskette || !istype(diskette.fields) || !diskette.fields["name"] || !diskette.fields)
-					src.temp = "<font class='bad'>Load error.</font>"
-					src.updateUsrDialog()
-					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-					return
-				if (!src.active_record)
-					src.temp = "<font class='bad'>Record error.</font>"
-					src.menu = 1
-					src.updateUsrDialog()
-					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-					return
-
-				for(var/key in diskette.fields)
-					src.active_record.fields[key] = diskette.fields[key]
-				src.temp = "Load successful."
-				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-
-			if("eject")
-				if(src.diskette)
-					src.diskette.loc = src.loc
-					src.diskette = null
-					playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
-			if("save")
-				if(!diskette || diskette.read_only || !active_record || !active_record.fields)
-					src.temp = "<font class='bad'>Save error.</font>"
-					src.updateUsrDialog()
-					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-					return
-
-				diskette.fields = active_record.fields.Copy()
-				diskette.name = "data disk - '[src.diskette.fields["name"]]'"
-				src.temp = "Save successful."
-				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-
-	else if (href_list["refresh"])
-		src.updateUsrDialog()
-		playsound(src, "terminal_type", 25, 0)
-
-	else if (href_list["clone"])
-		var/datum/data/record/C = find_record("id", href_list["clone"], records)
-		//Look for that player! They better be dead!
-		if(C)
-			var/obj/machinery/clonepod/pod = GetAvailablePod()
-			//Can't clone without someone to clone.  Or a pod.  Or if the pod is busy. Or full of gibs.
-			if(!LAZYLEN(pods))
-				temp = "<font class='bad'>No Clonepods detected.</font>"
-				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-			else if(!pod)
-				temp = "<font class='bad'>No Clonepods available.</font>"
-				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-			else if(!config.revival_cloning)
-				temp = "<font class='bad'>Unable to initiate cloning cycle.</font>"
-				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-			else if(pod.occupant)
-				temp = "<font class='bad'>Cloning cycle already in progress.</font>"
-				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-			else if(pod.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["features"], C.fields["factions"]))
-				temp = "[C.fields["name"]] => <font class='good'>Cloning cycle in progress...</font>"
-				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-				records.Remove(C)
-				if(active_record == C)
-					active_record = null
-				menu = 1
-			else
-				temp = "[C.fields["name"]] => <font class='bad'>Initialisation failure.</font>"
-				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-
-		else
-			temp = "<font class='bad'>Data corruption.</font>"
-			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-
-	else if (href_list["menu"])
-		src.menu = text2num(href_list["menu"])
-		playsound(src, "terminal_type", 25, 0)
-
-	src.add_fingerprint(usr)
-	src.updateUsrDialog()
-	return
-
-/obj/machinery/computer/cloning/proc/scan_mob(mob/living/carbon/human/subject)
-	if (!istype(subject))
-		scantemp = "<font class='bad'>Unable to locate valid genetic data.</font>"
-		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-		return
-	if (!subject.getorgan(/obj/item/organ/brain))
-		scantemp = "<font class='bad'>No signs of intelligence detected.</font>"
-		playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
-		return
-	if (subject.suiciding == 1 || subject.hellbound)
-		scantemp = "<font class='bad'>Subject's brain is not responding to scanning stimuli.</font>"
-		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-		return
-	if ((subject.disabilities & NOCLONE) && (src.scanner.scan_level < 2))
-		scantemp = "<font class='bad'>Subject no longer contains the fundamental materials required to create a living clone.</font>"
-		playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
-		return
-	if ((!subject.ckey) || (!subject.client))
-		scantemp = "<font class='bad'>Mental interface failure.</font>"
-		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-		return
-	if (find_record("ckey", subject.ckey, records))
-		scantemp = "<font class='average'>Subject already in database.</font>"
-		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-		return
-
-	var/datum/data/record/R = new()
-	if(subject.dna.species)
-		// We store the instance rather than the path, because some
-		// species (abductors, slimepeople) store state in their
-		// species datums
-		R.fields["mrace"] = subject.dna.species
-	else
-		var/datum/species/rando_race = pick(config.roundstart_races)
-		R.fields["mrace"] = rando_race.type
-	R.fields["ckey"] = subject.ckey
-	R.fields["name"] = subject.real_name
-	R.fields["id"] = copytext(md5(subject.real_name), 2, 6)
-	R.fields["UE"] = subject.dna.unique_enzymes
-	R.fields["UI"] = subject.dna.uni_identity
-	R.fields["SE"] = subject.dna.struc_enzymes
-	R.fields["blood_type"] = subject.dna.blood_type
-	R.fields["features"] = subject.dna.features
-	R.fields["factions"] = subject.faction
-
-	//Add an implant if needed
-	var/obj/item/weapon/implant/health/imp
-	for(var/obj/item/weapon/implant/health/HI in subject.implants)
-		imp = HI
-		break
-	if(!imp)
-		imp = new /obj/item/weapon/implant/health(subject)
-		imp.implant(subject)
-	R.fields["imp"] = "\ref[imp]"
-
-	if (!isnull(subject.mind)) //Save that mind so traitors can continue traitoring after cloning.
-		R.fields["mind"] = "\ref[subject.mind]"
-
-	src.records += R
-	scantemp = "Subject successfully scanned."
-	playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+					dat += "<a href='byond://?src=\ref[src];scan=1'>Start Scan</a>"
+					dat += "<br><a href='byond://?src=\ref[src];lock=1'>[src.scanner.locked ? "Unlock Scanner" : "Lock Scanner"]</a>"
+				else
+					dat += "<span class='linkOff'>Start Scan</span>"
+
+			// Database
+			dat += "<h3>Database Functions</h3>"
+			if (src.records.len && src.records.len > 0)
+				dat += "<a href='byond://?src=\ref[src];menu=2'>View Records ([src.records.len])</a><br>"
+			else
+				dat += "<span class='linkOff'>View Records (0)</span><br>"
+			if (src.diskette)
+				dat += "<a href='byond://?src=\ref[src];disk=eject'>Eject Disk</a><br>"
+
+
+
+		if(2)
+			dat += "<h3>Current records</h3>"
+			dat += "<a href='byond://?src=\ref[src];menu=1'><< Back</a><br><br>"
+			for(var/datum/data/record/R in records)
+				dat += "<h4>[R.fields["name"]]</h4>Scan ID [R.fields["id"]] <a href='byond://?src=\ref[src];view_rec=[R.fields["id"]]'>View Record</a>"
+		if(3)
+			dat += "<h3>Selected Record</h3>"
+			dat += "<a href='byond://?src=\ref[src];menu=2'><< Back</a><br>"
+
+			if (!src.active_record)
+				dat += "<font class='bad'>Record not found.</font>"
+			else
+				dat += "<h4>[src.active_record.fields["name"]]</h4>"
+				dat += "Scan ID [src.active_record.fields["id"]] <a href='byond://?src=\ref[src];clone=[active_record.fields["id"]]'>Clone</a><br>"
+
+				var/obj/item/weapon/implant/health/H = locate(src.active_record.fields["imp"])
+
+				if ((H) && (istype(H)))
+					dat += "<b>Health Implant Data:</b><br />[H.sensehealth()]<br><br />"
+				else
+					dat += "<font class='bad'>Unable to locate Health Implant.</font><br /><br />"
+
+				dat += "<b>Unique Identifier:</b><br /><span class='highlight'>[src.active_record.fields["UI"]]</span><br>"
+				dat += "<b>Structural Enzymes:</b><br /><span class='highlight'>[src.active_record.fields["SE"]]</span><br>"
+
+				if(diskette && diskette.fields)
+					dat += "<div class='block'>"
+					dat += "<h4>Inserted Disk</h4>"
+					dat += "<b>Contents:</b> "
+					var/list/L = list()
+					if(diskette.fields["UI"])
+						L += "Unique Identifier"
+					if(diskette.fields["UE"] && diskette.fields["name"] && diskette.fields["blood_type"])
+						L += "Unique Enzymes"
+					if(diskette.fields["SE"])
+						L += "Structural Enzymes"
+					dat += english_list(L, "Empty", " + ", " + ")
+					dat += "<br /><a href='byond://?src=\ref[src];disk=load'>Load from Disk</a>"
+
+					dat += "<br /><a href='byond://?src=\ref[src];disk=save'>Save to Disk</a>"
+					dat += "</div>"
+
+				dat += "<font size=1><a href='byond://?src=\ref[src];del_rec=1'>Delete Record</a></font>"
+
+		if(4)
+			if (!src.active_record)
+				src.menu = 2
+			dat = "[src.temp]<br>"
+			dat += "<h3>Confirm Record Deletion</h3>"
+
+			dat += "<b><a href='byond://?src=\ref[src];del_rec=1'>Scan card to confirm.</a></b><br>"
+			dat += "<b><a href='byond://?src=\ref[src];menu=3'>Cancel</a></b>"
+
+
+	var/datum/browser/popup = new(user, "cloning", "Cloning System Control")
+	popup.set_content(dat)
+	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
+	popup.open()
+
+/obj/machinery/computer/cloning/Topic(href, href_list)
+	if(..())
+		return
+
+	if(loading)
+		return
+
+	if(href_list["task"])
+		switch(href_list["task"])
+			if("autoprocess")
+				autoprocess = 1
+				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+			if("stopautoprocess")
+				autoprocess = 0
+				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+
+	else if ((href_list["scan"]) && !isnull(scanner) && scanner.is_operational())
+		scantemp = ""
+
+		loading = 1
+		src.updateUsrDialog()
+		playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
+		say("Initiating scan...")
+
+		spawn(20)
+			src.scan_occupant(scanner.occupant)
+
+			loading = 0
+			src.updateUsrDialog()
+			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+
+
+		//No locking an open scanner.
+	else if ((href_list["lock"]) && !isnull(scanner) && scanner.is_operational())
+		if ((!scanner.locked) && (scanner.occupant))
+			scanner.locked = 1
+			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+		else
+			scanner.locked = 0
+			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+
+	else if(href_list["view_rec"])
+		playsound(src, "terminal_type", 25, 0)
+		src.active_record = find_record("id", href_list["view_rec"], records)
+		if(active_record)
+			if(!active_record.fields["ckey"])
+				records -= active_record
+				active_record = null
+				src.temp = "<font class='bad'>Record Corrupt</font>"
+			else
+				src.menu = 3
+		else
+			src.temp = "Record missing."
+
+	else if (href_list["del_rec"])
+		if ((!src.active_record) || (src.menu < 3))
+			return
+		if (src.menu == 3) //If we are viewing a record, confirm deletion
+			src.temp = "Delete record?"
+			src.menu = 4
+			playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
+
+		else if (src.menu == 4)
+			var/obj/item/weapon/card/id/C = usr.get_active_held_item()
+			if (istype(C)||istype(C, /obj/item/device/pda))
+				if(src.check_access(C))
+					src.temp = "[src.active_record.fields["name"]] => Record deleted."
+					src.records.Remove(active_record)
+					active_record = null
+					playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+					src.menu = 2
+				else
+					src.temp = "<font class='bad'>Access Denied.</font>"
+					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+
+	else if (href_list["disk"]) //Load or eject.
+		switch(href_list["disk"])
+			if("load")
+				if (!diskette || !istype(diskette.fields) || !diskette.fields["name"] || !diskette.fields)
+					src.temp = "<font class='bad'>Load error.</font>"
+					src.updateUsrDialog()
+					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+					return
+				if (!src.active_record)
+					src.temp = "<font class='bad'>Record error.</font>"
+					src.menu = 1
+					src.updateUsrDialog()
+					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+					return
+
+				for(var/key in diskette.fields)
+					src.active_record.fields[key] = diskette.fields[key]
+				src.temp = "Load successful."
+				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+
+			if("eject")
+				if(src.diskette)
+					src.diskette.loc = src.loc
+					src.diskette = null
+					playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
+			if("save")
+				if(!diskette || diskette.read_only || !active_record || !active_record.fields)
+					src.temp = "<font class='bad'>Save error.</font>"
+					src.updateUsrDialog()
+					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+					return
+
+				diskette.fields = active_record.fields.Copy()
+				diskette.name = "data disk - '[src.diskette.fields["name"]]'"
+				src.temp = "Save successful."
+				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+
+	else if (href_list["refresh"])
+		src.updateUsrDialog()
+		playsound(src, "terminal_type", 25, 0)
+
+	else if (href_list["clone"])
+		var/datum/data/record/C = find_record("id", href_list["clone"], records)
+		//Look for that player! They better be dead!
+		if(C)
+			var/obj/machinery/clonepod/pod = GetAvailablePod()
+			//Can't clone without someone to clone.  Or a pod.  Or if the pod is busy. Or full of gibs.
+			if(!LAZYLEN(pods))
+				temp = "<font class='bad'>No Clonepods detected.</font>"
+				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+			else if(!pod)
+				temp = "<font class='bad'>No Clonepods available.</font>"
+				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+			else if(!config.revival_cloning)
+				temp = "<font class='bad'>Unable to initiate cloning cycle.</font>"
+				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+			else if(pod.occupant)
+				temp = "<font class='bad'>Cloning cycle already in progress.</font>"
+				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+			else if(pod.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["features"], C.fields["factions"]))
+				temp = "[C.fields["name"]] => <font class='good'>Cloning cycle in progress...</font>"
+				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+				records.Remove(C)
+				if(active_record == C)
+					active_record = null
+				menu = 1
+			else
+				temp = "[C.fields["name"]] => <font class='bad'>Initialisation failure.</font>"
+				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+
+		else
+			temp = "<font class='bad'>Data corruption.</font>"
+			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+
+	else if (href_list["menu"])
+		src.menu = text2num(href_list["menu"])
+		playsound(src, "terminal_type", 25, 0)
+
+	src.add_fingerprint(usr)
+	src.updateUsrDialog()
+	return
+
+/obj/machinery/computer/cloning/proc/scan_occupant(occupant)
+	var/mob/living/mob_occupant = get_mob_or_brainmob(occupant)
+	var/datum/dna/dna
+	if(iscarbon(mob_occupant))
+		var/mob/living/carbon/C = mob_occupant
+		dna = C.has_dna()
+	if(istype(mob_occupant, /mob/living/brain))
+		var/mob/living/brain/B = mob_occupant
+		dna = B.stored_dna
+
+	if(!istype(dna))
+		scantemp = "<font class='bad'>Unable to locate valid genetic data.</font>"
+		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+		return
+	if(mob_occupant.suiciding || mob_occupant.hellbound)
+		scantemp = "<font class='bad'>Subject's brain is not responding to scanning stimuli.</font>"
+		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+		return
+	if((mob_occupant.disabilities & NOCLONE) && (src.scanner.scan_level < 2))
+		scantemp = "<font class='bad'>Subject no longer contains the fundamental materials required to create a living clone.</font>"
+		playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
+		return
+	if ((!mob_occupant.ckey) || (!mob_occupant.client))
+		scantemp = "<font class='bad'>Mental interface failure.</font>"
+		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+		return
+	if (find_record("ckey", mob_occupant.ckey, records))
+		scantemp = "<font class='average'>Subject already in database.</font>"
+		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+		return
+
+	var/datum/data/record/R = new()
+	if(dna.species)
+		// We store the instance rather than the path, because some
+		// species (abductors, slimepeople) store state in their
+		// species datums
+		R.fields["mrace"] = dna.species
+	else
+		var/datum/species/rando_race = pick(config.roundstart_races)
+		R.fields["mrace"] = rando_race.type
+
+	R.fields["ckey"] = mob_occupant.ckey
+	R.fields["name"] = mob_occupant.real_name
+	R.fields["id"] = copytext(md5(mob_occupant.real_name), 2, 6)
+	R.fields["UE"] = dna.unique_enzymes
+	R.fields["UI"] = dna.uni_identity
+	R.fields["SE"] = dna.struc_enzymes
+	R.fields["blood_type"] = dna.blood_type
+	R.fields["features"] = dna.features
+	R.fields["factions"] = mob_occupant.faction
+
+	if (!isnull(mob_occupant.mind)) //Save that mind so traitors can continue traitoring after cloning.
+		R.fields["mind"] = "\ref[mob_occupant.mind]"
+
+   //Add an implant if needed
+	var/obj/item/weapon/implant/health/imp
+	for(var/obj/item/weapon/implant/health/HI in mob_occupant.implants)
+		imp = HI
+		break
+	if(!imp)
+		imp = new /obj/item/weapon/implant/health(mob_occupant)
+		imp.implant(mob_occupant)
+	R.fields["imp"] = "\ref[imp]"
+
+	src.records += R
+	scantemp = "Subject successfully scanned."
+	playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)

code/game/machinery/computer/computer.dm

@@ -52,7 +52,7 @@
 		update_icon()
 
 /obj/machinery/computer/narsie_act()
-	if(clockwork && clockwork != initial(clockwork) && prob(20)) //if it's clockwork but isn't normally clockwork
+	if(clockwork && clockwork != initial(clockwork)) //if it's clockwork but isn't normally clockwork
 		clockwork = FALSE
 		icon_screen = initial(icon_screen)
 		icon_keyboard = initial(icon_keyboard)

code/game/machinery/computer/launchpad_control.dm

@@ -0,0 +1,155 @@
+/obj/machinery/computer/launchpad
+	name = "\improper Launchpad Control Console"
+	desc = "Used to teleport objects to and from a launchpad."
+	icon_screen = "teleport"
+	icon_keyboard = "teleport_key"
+	circuit = /obj/item/weapon/circuitboard/computer/launchpad_console
+	var/sending = TRUE
+	var/current_pad //current pad viewed on the screen
+	var/list/obj/machinery/launchpad/launchpads
+	var/maximum_pads = 4
+
+/obj/machinery/computer/launchpad/Initialize()
+	launchpads = list()
+	. = ..()
+
+/obj/machinery/computer/launchpad/attack_paw(mob/user)
+	to_chat(user, "<span class='warning'>You are too primitive to use this computer!</span>")
+	return
+
+/obj/machinery/computer/launchpad/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/device/multitool))
+		var/obj/item/device/multitool/M = W
+		if(M.buffer && istype(M.buffer, /obj/machinery/launchpad))
+			if(LAZYLEN(launchpads) < maximum_pads)
+				launchpads |= M.buffer
+				M.buffer = null
+				to_chat(user, "<span class='notice'>You upload the data from the [W.name]'s buffer.</span>")
+			else
+				to_chat(user, "<span class='warning'>[src] cannot handle any more connections!</span>")
+	else
+		return ..()
+
+/obj/machinery/computer/launchpad/attack_ai(mob/user)
+	attack_hand(user)
+
+/obj/machinery/computer/launchpad/attack_hand(mob/user)
+	if(..())
+		return
+	interact(user)
+
+/obj/machinery/computer/launchpad/proc/pad_exists(number)
+	var/obj/machinery/launchpad/pad = launchpads[number]
+	if(QDELETED(pad))
+		return FALSE
+	return TRUE
+
+/obj/machinery/computer/launchpad/proc/get_pad(number)
+	var/obj/machinery/launchpad/pad = launchpads[number]
+	return pad
+
+/obj/machinery/computer/launchpad/interact(mob/user)
+	var/list/t = list()
+	if(!LAZYLEN(launchpads))
+		in_use = FALSE     //Yeah so if you deconstruct teleporter while its in the process of shooting it wont disable the console
+		t += "<div class='statusDisplay'>No launchpad located.</div><BR>"
+	else
+		for(var/i in 1 to LAZYLEN(launchpads))
+			if(pad_exists(i))
+				var/obj/machinery/launchpad/pad = get_pad(i)
+				if(pad.stat & NOPOWER)
+					t+= "<span class='linkOff'>[pad.display_name]</span>"
+				else
+					t+= "<A href='?src=\ref[src];choose_pad=1;pad=[i]'>[pad.display_name]</A>"
+			else
+				launchpads -= get_pad(i)
+		t += "<BR>"
+
+		if(current_pad)
+			var/obj/machinery/launchpad/pad = get_pad(current_pad)
+			t += "<div class='statusDisplay'><b>[pad.display_name]</b></div>"
+			t += "<A href='?src=\ref[src];change_name=1;pad=[current_pad]'>Rename</A>"
+			t += "<A href='?src=\ref[src];remove=1;pad=[current_pad]'>Remove</A><BR><BR>"
+			t += "<A href='?src=\ref[src];raisey=1;lowerx=1;pad=[current_pad]'>O</A>" //up-left
+			t += "<A href='?src=\ref[src];raisey=1;pad=[current_pad]'>^</A>" //up
+			t += "<A href='?src=\ref[src];raisey=1;raisex=1;pad=[current_pad]'>O</A><BR>" //up-right
+			t += "<A href='?src=\ref[src];lowerx=1;pad=[current_pad]'><</A>"//left
+			t += "<A href='?src=\ref[src];reset=1;pad=[current_pad]'>R</A>"//reset to 0
+			t += "<A href='?src=\ref[src];raisex=1;pad=[current_pad]'>></A><BR>"//right
+			t += "<A href='?src=\ref[src];lowery=1;lowerx=1;pad=[current_pad]'>O</A>"//down-left
+			t += "<A href='?src=\ref[src];lowery=1;pad=[current_pad]'>v</A>"//down
+			t += "<A href='?src=\ref[src];lowery=1;raisex=1;pad=[current_pad]'>O</A><BR>"//down-right
+			t += "<BR>"
+			t += "<div class='statusDisplay'>Current offset:</div><BR>"
+			t += "<div class='statusDisplay'>[abs(pad.y_offset)] [pad.y_offset > 0 ? "N":"S"]</div><BR>"
+			t += "<div class='statusDisplay'>[abs(pad.x_offset)] [pad.x_offset > 0 ? "E":"W"]</div><BR>"
+
+			t += "<BR><A href='?src=\ref[src];launch=1;pad=[current_pad]'>Launch</A>"
+			t += " <A href='?src=\ref[src];pull=1;pad=[current_pad]'>Pull</A>"
+
+	var/datum/browser/popup = new(user, "launchpad", name, 300, 500)
+	popup.set_content(t.Join())
+	popup.open()
+
+/obj/machinery/computer/launchpad/proc/teleport(mob/user, obj/machinery/launchpad/pad)
+	if(QDELETED(pad))
+		to_chat(user, "<span class='warning'>ERROR: Launchpad not responding. Check launchpad integrity.</span>")
+		return
+	if(!pad.isAvailable())
+		to_chat(user, "<span class='warning'>ERROR: Launchpad not operative. Make sure the launchpad is ready and powered.</span>")
+		return
+	pad.doteleport(user, sending)
+
+/obj/machinery/computer/launchpad/Topic(href, href_list)
+	var/obj/machinery/launchpad/pad
+	if(href_list["pad"])
+		pad = get_pad(text2num(href_list["pad"]))
+
+	if(..())
+		return
+	if(!LAZYLEN(launchpads))
+		updateDialog()
+		return
+
+	if(href_list["choose_pad"])
+		current_pad = text2num(href_list["pad"])
+
+	if(href_list["raisex"])
+		if(pad.x_offset < pad.range)
+			pad.x_offset++
+
+	if(href_list["lowerx"])
+		if(pad.x_offset > (pad.range * -1))
+			pad.x_offset--
+
+	if(href_list["raisey"])
+		if(pad.y_offset < pad.range)
+			pad.y_offset++
+
+	if(href_list["lowery"])
+		if(pad.y_offset > (pad.range * -1))
+			pad.y_offset--
+
+	if(href_list["reset"])
+		pad.y_offset = 0
+		pad.x_offset = 0
+
+	if(href_list["change_name"])
+		var/new_name = stripped_input(usr, "What do you wish to name the launchpad?", "Launchpad", pad.display_name, 15) as text|null
+		if(!new_name)
+			return
+		pad.display_name = new_name
+
+	if(href_list["remove"])
+		if(usr && alert(usr, "Are you sure?", "Remove Launchpad", "I'm Sure", "Abort") != "Abort")
+			launchpads -= pad
+
+	if(href_list["launch"])
+		sending = TRUE
+		teleport(usr, pad)
+
+	if(href_list["pull"])
+		sending = FALSE
+		teleport(usr, pad)
+
+	updateDialog()

code/game/machinery/computer/robot.dm

@@ -1,172 +1,172 @@
-
-
-
-/obj/machinery/computer/robotics
-	name = "robotics control console"
-	desc = "Used to remotely lockdown or detonate linked Cyborgs."
-	icon_screen = "robot"
-	icon_keyboard = "rd_key"
-	req_access = list(GLOB.access_robotics)
-	circuit = /obj/item/weapon/circuitboard/computer/robotics
-	var/temp = null
-
-	light_color = LIGHT_COLOR_PINK
-
-/obj/machinery/computer/robotics/proc/can_control(mob/user, mob/living/silicon/robot/R)
-	if(!istype(R))
-		return 0
-	if(isAI(user))
-		if (R.connected_ai != user)
-			return 0
-	if(iscyborg(user))
-		if (R != user)
-			return 0
-	if(R.scrambledcodes)
-		return 0
-	return 1
-
-/obj/machinery/computer/robotics/attack_hand(mob/user)
-	if(..())
-		return
-	interact(user)
-
-/obj/machinery/computer/robotics/interact(mob/user)
-	if (src.z > 6)
-		to_chat(user, "<span class='boldannounce'>Unable to establish a connection</span>: \black You're too far away from the station!")
-		return
-	user.set_machine(src)
-	var/dat
-	var/robots = 0
-	for(var/mob/living/silicon/robot/R in GLOB.mob_list)
-		if(!can_control(user, R))
-			continue
-		robots++
-		dat += "[R.name] |"
-		if(R.stat)
-			dat += " Not Responding |"
-		else if (!R.canmove)
-			dat += " Locked Down |"
-		else
-			dat += " Operating Normally |"
-		if (!R.canmove)
-		else if(R.cell)
-			dat += " Battery Installed ([R.cell.charge]/[R.cell.maxcharge]) |"
-		else
-			dat += " No Cell Installed |"
-		if(R.module)
-			dat += " Module Installed ([R.module.name]) |"
-		else
-			dat += " No Module Installed |"
-		if(R.connected_ai)
-			dat += " Slaved to [R.connected_ai.name] |"
-		else
-			dat += " Independent from AI |"
-		if(issilicon(user) || IsAdminGhost(user))
-			if(is_servant_of_ratvar(user) && user != R)
-				dat += "<A href='?src=\ref[src];convert=\ref[R]'>(<font color=#BE8700><i>Convert</i></font>)</A> "
-			else if(((issilicon(user) && is_special_character(user)) || IsAdminGhost(user)) && !R.emagged && (user != R || R.syndicate))
-				dat += "<A href='?src=\ref[src];magbot=\ref[R]'>(<font color=blue><i>Hack</i></font>)</A> "
-		dat += "<A href='?src=\ref[src];stopbot=\ref[R]'>(<font color=green><i>[R.canmove ? "Lockdown" : "Release"]</i></font>)</A> "
-		dat += "<A href='?src=\ref[src];killbot=\ref[R]'>(<font color=red><i>Destroy</i></font>)</A>"
-		dat += "<BR>"
-
-	if(!robots)
-		dat += "No Cyborg Units detected within access parameters."
-		dat += "<BR>"
-
-	var/drones = 0
-	for(var/mob/living/simple_animal/drone/D in GLOB.mob_list)
-		if(D.hacked)
-			continue
-		drones++
-		dat += "[D.name] |"
-		if(D.stat)
-			dat += " Not Responding |"
-		dat += "<A href='?src=\ref[src];killdrone=\ref[D]'>(<font color=red><i>Destroy</i></font>)</A>"
-		dat += "<BR>"
-
-	if(!drones)
-		dat += "No Drone Units detected within access parameters."
-
-	var/datum/browser/popup = new(user, "computer", "Cyborg Control Console", 400, 500)
-	popup.set_content(dat)
-	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
-	popup.open()
-	return
-
-/obj/machinery/computer/robotics/Topic(href, href_list)
-	if(..())
-		return
-
-	if (href_list["temp"])
-		src.temp = null
-
-	else if (href_list["killbot"])
-		if(src.allowed(usr))
-			var/mob/living/silicon/robot/R = locate(href_list["killbot"]) in GLOB.silicon_mobs
-			if(can_control(usr, R))
-				var/choice = input("Are you certain you wish to detonate [R.name]?") in list("Confirm", "Abort")
-				if(choice == "Confirm" && can_control(usr, R) && !..())
-					if(R.syndicate && R.emagged)
-						to_chat(R, "Extreme danger.  Termination codes detected.  Scrambling security codes and automatic AI unlink triggered.")
-						if(R.connected_ai)
-							to_chat(R.connected_ai, "<br><br><span class='alert'>ALERT - Cyborg detonation detected: [R.name]</span><br>")
-						R.ResetSecurityCodes()
-					else
+
+
+
+/obj/machinery/computer/robotics
+	name = "robotics control console"
+	desc = "Used to remotely lockdown or detonate linked Cyborgs."
+	icon_screen = "robot"
+	icon_keyboard = "rd_key"
+	req_access = list(GLOB.access_robotics)
+	circuit = /obj/item/weapon/circuitboard/computer/robotics
+	var/temp = null
+
+	light_color = LIGHT_COLOR_PINK
+
+/obj/machinery/computer/robotics/proc/can_control(mob/user, mob/living/silicon/robot/R)
+	if(!istype(R))
+		return 0
+	if(isAI(user))
+		if (R.connected_ai != user)
+			return 0
+	if(iscyborg(user))
+		if (R != user)
+			return 0
+	if(R.scrambledcodes)
+		return 0
+	return 1
+
+/obj/machinery/computer/robotics/attack_hand(mob/user)
+	if(..())
+		return
+	interact(user)
+
+/obj/machinery/computer/robotics/interact(mob/user)
+	if (src.z > 6)
+		to_chat(user, "<span class='boldannounce'>Unable to establish a connection</span>: \black You're too far away from the station!")
+		return
+	user.set_machine(src)
+	var/dat
+	var/robots = 0
+	for(var/mob/living/silicon/robot/R in GLOB.mob_list)
+		if(!can_control(user, R))
+			continue
+		robots++
+		dat += "[R.name] |"
+		if(R.stat)
+			dat += " Not Responding |"
+		else if (!R.canmove)
+			dat += " Locked Down |"
+		else
+			dat += " Operating Normally |"
+		if (!R.canmove)
+		else if(R.cell)
+			dat += " Battery Installed ([R.cell.charge]/[R.cell.maxcharge]) |"
+		else
+			dat += " No Cell Installed |"
+		if(R.module)
+			dat += " Module Installed ([R.module.name]) |"
+		else
+			dat += " No Module Installed |"
+		if(R.connected_ai)
+			dat += " Slaved to [R.connected_ai.name] |"
+		else
+			dat += " Independent from AI |"
+		if(issilicon(user) || IsAdminGhost(user))
+			if(is_servant_of_ratvar(user) && user != R)
+				dat += "<A href='?src=\ref[src];convert=\ref[R]'>(<font color=#BE8700><i>Convert</i></font>)</A> "
+			else if(((issilicon(user) && is_special_character(user)) || IsAdminGhost(user)) && !R.emagged && (user != R || R.syndicate))
+				dat += "<A href='?src=\ref[src];magbot=\ref[R]'>(<font color=blue><i>Hack</i></font>)</A> "
+		dat += "<A href='?src=\ref[src];stopbot=\ref[R]'>(<font color=green><i>[R.canmove ? "Lockdown" : "Release"]</i></font>)</A> "
+		dat += "<A href='?src=\ref[src];killbot=\ref[R]'>(<font color=red><i>Destroy</i></font>)</A>"
+		dat += "<BR>"
+
+	if(!robots)
+		dat += "No Cyborg Units detected within access parameters."
+		dat += "<BR>"
+
+	var/drones = 0
+	for(var/mob/living/simple_animal/drone/D in GLOB.mob_list)
+		if(D.hacked)
+			continue
+		drones++
+		dat += "[D.name] |"
+		if(D.stat)
+			dat += " Not Responding |"
+		dat += "<A href='?src=\ref[src];killdrone=\ref[D]'>(<font color=red><i>Destroy</i></font>)</A>"
+		dat += "<BR>"
+
+	if(!drones)
+		dat += "No Drone Units detected within access parameters."
+
+	var/datum/browser/popup = new(user, "computer", "Cyborg Control Console", 400, 500)
+	popup.set_content(dat)
+	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
+	popup.open()
+	return
+
+/obj/machinery/computer/robotics/Topic(href, href_list)
+	if(..())
+		return
+
+	if (href_list["temp"])
+		src.temp = null
+
+	else if (href_list["killbot"])
+		if(src.allowed(usr))
+			var/mob/living/silicon/robot/R = locate(href_list["killbot"]) in GLOB.silicon_mobs
+			if(can_control(usr, R))
+				var/choice = input("Are you certain you wish to detonate [R.name]?") in list("Confirm", "Abort")
+				if(choice == "Confirm" && can_control(usr, R) && !..())
+					if(R.syndicate && R.emagged)
+						to_chat(R, "Extreme danger.  Termination codes detected.  Scrambling security codes and automatic AI unlink triggered.")
+						if(R.connected_ai)
+							to_chat(R.connected_ai, "<br><br><span class='alert'>ALERT - Cyborg detonation detected: [R.name]</span><br>")
+						R.ResetSecurityCodes()
+					else
 						var/turf/T = get_turf(R)
 						message_admins("<span class='notice'>[ADMIN_LOOKUPFLW(usr)] detonated [key_name(R, R.client)][ADMIN_JMP(T)]!</span>")
-						log_game("\<span class='notice'>[key_name(usr)] detonated [key_name(R)]!</span>")
-						if(R.connected_ai)
-							to_chat(R.connected_ai, "<br><br><span class='alert'>ALERT - Cyborg detonation detected: [R.name]</span><br>")
-						R.self_destruct()
-		else
-			to_chat(usr, "<span class='danger'>Access Denied.</span>")
-
-	else if (href_list["stopbot"])
-		if(src.allowed(usr))
-			var/mob/living/silicon/robot/R = locate(href_list["stopbot"]) in GLOB.silicon_mobs
-			if(can_control(usr, R))
-				var/choice = input("Are you certain you wish to [R.canmove ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort")
-				if(choice == "Confirm" && can_control(usr, R) && !..())
+						log_game("\<span class='notice'>[key_name(usr)] detonated [key_name(R)]!</span>")
+						if(R.connected_ai)
+							to_chat(R.connected_ai, "<br><br><span class='alert'>ALERT - Cyborg detonation detected: [R.name]</span><br>")
+						R.self_destruct()
+		else
+			to_chat(usr, "<span class='danger'>Access Denied.</span>")
+
+	else if (href_list["stopbot"])
+		if(src.allowed(usr))
+			var/mob/living/silicon/robot/R = locate(href_list["stopbot"]) in GLOB.silicon_mobs
+			if(can_control(usr, R))
+				var/choice = input("Are you certain you wish to [R.canmove ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort")
+				if(choice == "Confirm" && can_control(usr, R) && !..())
 					message_admins("<span class='notice'>[ADMIN_LOOKUPFLW(usr)] [R.canmove ? "locked down" : "released"] [key_name(R, R.client)][ADMIN_LOOKUPFLW(R)]!</span>")
-					log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [key_name(R)]!")
-					R.SetLockdown(!R.lockcharge)
-					to_chat(R, "[!R.lockcharge ? "<span class='notice'>Your lockdown has been lifted!" : "<span class='alert'>You have been locked down!"]</span>")
-					if(R.connected_ai)
-						to_chat(R.connected_ai, "[!R.lockcharge ? "<span class='notice'>NOTICE - Cyborg lockdown lifted" : "<span class='alert'>ALERT - Cyborg lockdown detected"]: <a href='?src=\ref[R.connected_ai];track=[html_encode(R.name)]'>[R.name]</a></span><br>")
-
-		else
-			to_chat(usr, "<span class='danger'>Access Denied.</span>")
-
-	else if (href_list["magbot"])
-		if((issilicon(usr) && is_special_character(usr)) || IsAdminGhost(usr))
-			var/mob/living/silicon/robot/R = locate(href_list["magbot"]) in GLOB.silicon_mobs
-			if(istype(R) && !R.emagged && ((R.syndicate && R == usr) || R.connected_ai == usr || IsAdminGhost(usr)) && !R.scrambledcodes && can_control(usr, R))
-				log_game("[key_name(usr)] emagged [R.name] using robotic console!")
-				message_admins("[key_name_admin(usr)] emagged cyborg [key_name_admin(R)] using robotic console!")
-				R.SetEmagged(1)
-				if(is_special_character(R))
-					R.verbs += /mob/living/silicon/robot/proc/ResetSecurityCodes
-
-	else if(href_list["convert"])
-		if(issilicon(usr) && is_special_character(usr))
-			var/mob/living/silicon/robot/R = locate(href_list["convert"]) in GLOB.silicon_mobs
-			if(istype(R) && !is_servant_of_ratvar(R) && is_servant_of_ratvar(usr) && R.connected_ai == usr)
-				log_game("[key_name(usr)] converted [R.name] using robotic console!")
-				message_admins("[key_name_admin(usr)] converted cyborg [key_name_admin(R)] using robotic console!")
-				add_servant_of_ratvar(R)
-
-	else if (href_list["killdrone"])
-		if(src.allowed(usr))
-			var/mob/living/simple_animal/drone/D = locate(href_list["killdrone"])
-			if(D.hacked)
-				to_chat(usr, "<span class='danger'>ERROR: [D] is not responding to external commands.</span>")
-			else
-				var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-				s.set_up(3, 1, D)
-				s.start()
-				D.visible_message("<span class='danger'>\the [D] self destructs!</span>")
-				D.gib()
-
-	src.updateUsrDialog()
-	return
+					log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [key_name(R)]!")
+					R.SetLockdown(!R.lockcharge)
+					to_chat(R, "[!R.lockcharge ? "<span class='notice'>Your lockdown has been lifted!" : "<span class='alert'>You have been locked down!"]</span>")
+					if(R.connected_ai)
+						to_chat(R.connected_ai, "[!R.lockcharge ? "<span class='notice'>NOTICE - Cyborg lockdown lifted" : "<span class='alert'>ALERT - Cyborg lockdown detected"]: <a href='?src=\ref[R.connected_ai];track=[html_encode(R.name)]'>[R.name]</a></span><br>")
+
+		else
+			to_chat(usr, "<span class='danger'>Access Denied.</span>")
+
+	else if (href_list["magbot"])
+		if((issilicon(usr) && is_special_character(usr)) || IsAdminGhost(usr))
+			var/mob/living/silicon/robot/R = locate(href_list["magbot"]) in GLOB.silicon_mobs
+			if(istype(R) && !R.emagged && ((R.syndicate && R == usr) || R.connected_ai == usr || IsAdminGhost(usr)) && !R.scrambledcodes && can_control(usr, R))
+				log_game("[key_name(usr)] emagged [R.name] using robotic console!")
+				message_admins("[key_name_admin(usr)] emagged cyborg [key_name_admin(R)] using robotic console!")
+				R.SetEmagged(1)
+				if(is_special_character(R))
+					R.verbs += /mob/living/silicon/robot/proc/ResetSecurityCodes
+
+	else if(href_list["convert"])
+		if(issilicon(usr) && is_special_character(usr))
+			var/mob/living/silicon/robot/R = locate(href_list["convert"]) in GLOB.silicon_mobs
+			if(istype(R) && !is_servant_of_ratvar(R) && is_servant_of_ratvar(usr) && R.connected_ai == usr)
+				log_game("[key_name(usr)] converted [R.name] using robotic console!")
+				message_admins("[key_name_admin(usr)] converted cyborg [key_name_admin(R)] using robotic console!")
+				add_servant_of_ratvar(R)
+
+	else if (href_list["killdrone"])
+		if(src.allowed(usr))
+			var/mob/living/simple_animal/drone/D = locate(href_list["killdrone"])
+			if(D.hacked)
+				to_chat(usr, "<span class='danger'>ERROR: [D] is not responding to external commands.</span>")
+			else
+				var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
+				s.set_up(3, 1, D)
+				s.start()
+				D.visible_message("<span class='danger'>\the [D] self destructs!</span>")
+				D.gib()
+
+	src.updateUsrDialog()
+	return

code/game/machinery/computer/telecrystalconsoles.dm

@@ -1,223 +1,223 @@
-#define NUKESCALINGMODIFIER 1
-
-GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","Echo","Foxtrot","Zero", "Niner"))
-
-/obj/machinery/computer/telecrystals
-	name = "\improper Telecrystal assignment station"
-	desc = "A device used to manage telecrystals during group operations. You shouldn't be looking at this particular one..."
-	icon_state = "tcstation"
-	icon_keyboard = "tcstation_key"
-	icon_screen = "syndie"
-	clockwork = TRUE //it'd look weird, at least if ratvar ever got there
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-
-	light_color = LIGHT_COLOR_RED
-
-/////////////////////////////////////////////
-/obj/machinery/computer/telecrystals/uplinker
-	name = "\improper Telecrystal upload/receive station"
-	desc = "A device used to manage telecrystals during group operations. To use, simply insert your uplink. With your uplink installed \
-			you can upload your telecrystals to the group's pool using the console, or be assigned additional telecrystals by your lieutenant."
-	var/obj/item/uplinkholder = null
-	var/obj/machinery/computer/telecrystals/boss/linkedboss = null
-
-/obj/machinery/computer/telecrystals/uplinker/Initialize()
-	..()
-
-	var/ID = pick_n_take(GLOB.possible_uplinker_IDs)
-	if(!ID)
-		ID = rand(1,999)
-	name = "[name] [ID]"
-
-/obj/machinery/computer/telecrystals/uplinker/attackby(obj/item/O, mob/user, params)
-	if(uplinkholder)
-		to_chat(user, "<span class='notice'>The [src] already has an uplink in it.</span>")
-		return
-	if(O.hidden_uplink)
-		var/obj/item/I = user.get_active_held_item()
-		if(!user.drop_item())
-			return
-		uplinkholder = I
-		I.loc = src
-		I.add_fingerprint(user)
-		update_icon()
-		updateUsrDialog()
-	else
-		to_chat(user, "<span class='notice'>The [O] doesn't appear to be an uplink...</span>")
-
-/obj/machinery/computer/telecrystals/uplinker/update_icon()
-	..()
-	if(uplinkholder)
-		add_overlay("[initial(icon_state)]-closed")
-
-/obj/machinery/computer/telecrystals/uplinker/proc/ejectuplink()
-	if(uplinkholder)
-		uplinkholder.loc = get_turf(src.loc)
-		uplinkholder = null
-		update_icon()
-
-/obj/machinery/computer/telecrystals/uplinker/proc/donateTC(amt, addLog = 1)
-	if(uplinkholder && linkedboss)
+#define NUKESCALINGMODIFIER 1
+
+GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","Echo","Foxtrot","Zero", "Niner"))
+
+/obj/machinery/computer/telecrystals
+	name = "\improper Telecrystal assignment station"
+	desc = "A device used to manage telecrystals during group operations. You shouldn't be looking at this particular one..."
+	icon_state = "tcstation"
+	icon_keyboard = "tcstation_key"
+	icon_screen = "syndie"
+	clockwork = TRUE //it'd look weird, at least if ratvar ever got there
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+
+	light_color = LIGHT_COLOR_RED
+
+/////////////////////////////////////////////
+/obj/machinery/computer/telecrystals/uplinker
+	name = "\improper Telecrystal upload/receive station"
+	desc = "A device used to manage telecrystals during group operations. To use, simply insert your uplink. With your uplink installed \
+			you can upload your telecrystals to the group's pool using the console, or be assigned additional telecrystals by your lieutenant."
+	var/obj/item/uplinkholder = null
+	var/obj/machinery/computer/telecrystals/boss/linkedboss = null
+
+/obj/machinery/computer/telecrystals/uplinker/Initialize()
+	..()
+
+	var/ID = pick_n_take(GLOB.possible_uplinker_IDs)
+	if(!ID)
+		ID = rand(1,999)
+	name = "[name] [ID]"
+
+/obj/machinery/computer/telecrystals/uplinker/attackby(obj/item/O, mob/user, params)
+	if(uplinkholder)
+		to_chat(user, "<span class='notice'>The [src] already has an uplink in it.</span>")
+		return
+	if(O.hidden_uplink)
+		var/obj/item/I = user.get_active_held_item()
+		if(!user.drop_item())
+			return
+		uplinkholder = I
+		I.loc = src
+		I.add_fingerprint(user)
+		update_icon()
+		updateUsrDialog()
+	else
+		to_chat(user, "<span class='notice'>The [O] doesn't appear to be an uplink...</span>")
+
+/obj/machinery/computer/telecrystals/uplinker/update_icon()
+	..()
+	if(uplinkholder)
+		add_overlay("[initial(icon_state)]-closed")
+
+/obj/machinery/computer/telecrystals/uplinker/proc/ejectuplink()
+	if(uplinkholder)
+		uplinkholder.loc = get_turf(src.loc)
+		uplinkholder = null
+		update_icon()
+
+/obj/machinery/computer/telecrystals/uplinker/proc/donateTC(amt, addLog = 1)
+	if(uplinkholder && linkedboss)
 		if(amt < 0)
 			linkedboss.storedcrystals += uplinkholder.hidden_uplink.telecrystals
 			if(addLog)
 				linkedboss.logTransfer("[src] donated [uplinkholder.hidden_uplink.telecrystals] telecrystals to [linkedboss].")
 			uplinkholder.hidden_uplink.telecrystals = 0
 		else if(amt <= uplinkholder.hidden_uplink.telecrystals)
-			uplinkholder.hidden_uplink.telecrystals -= amt
-			linkedboss.storedcrystals += amt
-			if(addLog)
-				linkedboss.logTransfer("[src] donated [amt] telecrystals to [linkedboss].")
-
-/obj/machinery/computer/telecrystals/uplinker/proc/giveTC(amt, addLog = 1)
-	if(uplinkholder && linkedboss)
+			uplinkholder.hidden_uplink.telecrystals -= amt
+			linkedboss.storedcrystals += amt
+			if(addLog)
+				linkedboss.logTransfer("[src] donated [amt] telecrystals to [linkedboss].")
+
+/obj/machinery/computer/telecrystals/uplinker/proc/giveTC(amt, addLog = 1)
+	if(uplinkholder && linkedboss)
 		if(amt < 0)
 			uplinkholder.hidden_uplink.telecrystals += linkedboss.storedcrystals
 			if(addLog)
 				linkedboss.logTransfer("[src] received [linkedboss.storedcrystals] telecrystals from [linkedboss].")
 			linkedboss.storedcrystals = 0
 		else if(amt <= linkedboss.storedcrystals)
-			uplinkholder.hidden_uplink.telecrystals += amt
-			linkedboss.storedcrystals -= amt
-			if(addLog)
-				linkedboss.logTransfer("[src] received [amt] telecrystals from [linkedboss].")
-
-///////
-
-/obj/machinery/computer/telecrystals/uplinker/attack_hand(mob/user)
-	if(..())
-		return
-	src.add_fingerprint(user)
-	user.set_machine(src)
-
-	var/dat = ""
-	if(linkedboss)
-		dat += "[linkedboss] has [linkedboss.storedcrystals] telecrystals available for distribution. <BR><BR>"
-	else
-		dat += "No linked management consoles detected. Scan for uplink stations using the management console.<BR><BR>"
-
-	if(uplinkholder)
-		dat += "[uplinkholder.hidden_uplink.telecrystals] telecrystals remain in this uplink.<BR>"
-		if(linkedboss)
+			uplinkholder.hidden_uplink.telecrystals += amt
+			linkedboss.storedcrystals -= amt
+			if(addLog)
+				linkedboss.logTransfer("[src] received [amt] telecrystals from [linkedboss].")
+
+///////
+
+/obj/machinery/computer/telecrystals/uplinker/attack_hand(mob/user)
+	if(..())
+		return
+	src.add_fingerprint(user)
+	user.set_machine(src)
+
+	var/dat = ""
+	if(linkedboss)
+		dat += "[linkedboss] has [linkedboss.storedcrystals] telecrystals available for distribution. <BR><BR>"
+	else
+		dat += "No linked management consoles detected. Scan for uplink stations using the management console.<BR><BR>"
+
+	if(uplinkholder)
+		dat += "[uplinkholder.hidden_uplink.telecrystals] telecrystals remain in this uplink.<BR>"
+		if(linkedboss)
 			dat += "Donate TC: <a href='byond://?src=\ref[src];donate=1'>1</a> | <a href='byond://?src=\ref[src];donate=5'>5</a> | <a href='byond://?src=\ref[src];donate=-1'>All</a>"
-		dat += "<br><a href='byond://?src=\ref[src];eject=1'>Eject Uplink</a>"
-
-
-	var/datum/browser/popup = new(user, "computer", "Telecrystal Upload/Receive Station", 700, 500)
-	popup.set_content(dat)
-	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
-	popup.open()
-	return
-
-/obj/machinery/computer/telecrystals/uplinker/Topic(href, href_list)
-	if(..())
-		return
-
+		dat += "<br><a href='byond://?src=\ref[src];eject=1'>Eject Uplink</a>"
+
+
+	var/datum/browser/popup = new(user, "computer", "Telecrystal Upload/Receive Station", 700, 500)
+	popup.set_content(dat)
+	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
+	popup.open()
+	return
+
+/obj/machinery/computer/telecrystals/uplinker/Topic(href, href_list)
+	if(..())
+		return
+
 	if(href_list["donate"])
 		var/tcamt = text2num(href_list["donate"])
 		donateTC(tcamt)
-
-	if(href_list["eject"])
-		ejectuplink()
-
-	src.updateUsrDialog()
-
-
-/////////////////////////////////////////
-/obj/machinery/computer/telecrystals/boss
-	name = "team Telecrystal management console"
-	desc = "A device used to manage telecrystals during group operations. To use, simply initialize the machine by scanning for nearby uplink stations. \
-	Once the consoles are linked up, you can assign any telecrystals amongst your operatives; be they donated by your agents or rationed to the squad \
-	based on the danger rating of the mission."
-	icon_state = "computer"
-	icon_screen = "tcboss"
-	icon_keyboard = "syndie_key"
-	var/virgin = 1
-	var/scanrange = 10
-	var/storedcrystals = 0
-	var/list/TCstations = list()
-	var/list/transferlog = list()
-
-/obj/machinery/computer/telecrystals/boss/proc/logTransfer(logmessage)
-	transferlog += ("<b>[worldtime2text()]</b> [logmessage]")
-
-/obj/machinery/computer/telecrystals/boss/proc/scanUplinkers()
-	for(var/obj/machinery/computer/telecrystals/uplinker/A in urange(scanrange, src.loc))
-		if(!A.linkedboss)
-			TCstations += A
-			A.linkedboss = src
-	if(virgin)
-		getDangerous()
-		virgin = 0
-
-/obj/machinery/computer/telecrystals/boss/proc/getDangerous()//This scales the TC assigned with the round population.
-	..()
-	var/danger = GLOB.joined_player_list.len - SSticker.mode.syndicates.len
-	danger = Ceiling(danger, 10)
-	scaleTC(danger)
-
-/obj/machinery/computer/telecrystals/boss/proc/scaleTC(amt)//Its own proc, since it'll probably need a lot of tweaks for balance, use a fancier algorhithm, etc.
-	storedcrystals += amt * NUKESCALINGMODIFIER
-
-/////////
-
-/obj/machinery/computer/telecrystals/boss/attack_hand(mob/user)
-	if(..())
-		return
-	src.add_fingerprint(user)
-	user.set_machine(src)
-
-
-	var/dat = ""
-	dat += "<a href='byond://?src=\ref[src];scan=1'>Scan for TC stations.</a><BR>"
+
+	if(href_list["eject"])
+		ejectuplink()
+
+	src.updateUsrDialog()
+
+
+/////////////////////////////////////////
+/obj/machinery/computer/telecrystals/boss
+	name = "team Telecrystal management console"
+	desc = "A device used to manage telecrystals during group operations. To use, simply initialize the machine by scanning for nearby uplink stations. \
+	Once the consoles are linked up, you can assign any telecrystals amongst your operatives; be they donated by your agents or rationed to the squad \
+	based on the danger rating of the mission."
+	icon_state = "computer"
+	icon_screen = "tcboss"
+	icon_keyboard = "syndie_key"
+	var/virgin = 1
+	var/scanrange = 10
+	var/storedcrystals = 0
+	var/list/TCstations = list()
+	var/list/transferlog = list()
+
+/obj/machinery/computer/telecrystals/boss/proc/logTransfer(logmessage)
+	transferlog += ("<b>[worldtime2text()]</b> [logmessage]")
+
+/obj/machinery/computer/telecrystals/boss/proc/scanUplinkers()
+	for(var/obj/machinery/computer/telecrystals/uplinker/A in urange(scanrange, src.loc))
+		if(!A.linkedboss)
+			TCstations += A
+			A.linkedboss = src
+	if(virgin)
+		getDangerous()
+		virgin = 0
+
+/obj/machinery/computer/telecrystals/boss/proc/getDangerous()//This scales the TC assigned with the round population.
+	..()
+	var/danger = GLOB.joined_player_list.len - SSticker.mode.syndicates.len
+	danger = Ceiling(danger, 10)
+	scaleTC(danger)
+
+/obj/machinery/computer/telecrystals/boss/proc/scaleTC(amt)//Its own proc, since it'll probably need a lot of tweaks for balance, use a fancier algorhithm, etc.
+	storedcrystals += amt * NUKESCALINGMODIFIER
+
+/////////
+
+/obj/machinery/computer/telecrystals/boss/attack_hand(mob/user)
+	if(..())
+		return
+	src.add_fingerprint(user)
+	user.set_machine(src)
+
+
+	var/dat = ""
+	dat += "<a href='byond://?src=\ref[src];scan=1'>Scan for TC stations.</a><BR>"
 	dat += "[storedcrystals] telecrystals are available for distribution. <BR>"
-	dat += "<BR><BR>"
-
-
-	for(var/obj/machinery/computer/telecrystals/uplinker/A in TCstations)
-		dat += "[A.name] | "
-		if(A.uplinkholder)
-			dat += "[A.uplinkholder.hidden_uplink.telecrystals] telecrystals."
-		if(storedcrystals)
+	dat += "<BR><BR>"
+
+
+	for(var/obj/machinery/computer/telecrystals/uplinker/A in TCstations)
+		dat += "[A.name] | "
+		if(A.uplinkholder)
+			dat += "[A.uplinkholder.hidden_uplink.telecrystals] telecrystals."
+		if(storedcrystals)
 			dat+= "<BR>Add TC: <a href ='?src=\ref[src];target=\ref[A];give=1'>1</a> | <a href ='?src=\ref[src];target=\ref[A];give=5'>5</a> | <a href ='?src=\ref[src];target=\ref[A];give=10'>10</a> | <a href ='?src=\ref[src];target=\ref[A];give=-1'>All</a>"
-		dat += "<BR>"
-
+		dat += "<BR>"
+
 	if(TCstations.len && storedcrystals)
-		dat += "<BR><BR><a href='byond://?src=\ref[src];distrib=1'>Evenly distribute remaining TC.</a><BR><BR>"
-
-
-	for(var/entry in transferlog)
-		dat += "<small>[entry]</small><BR>"
-
-
-	var/datum/browser/popup = new(user, "computer", "Team Telecrystal Management Console", 700, 500)
-	popup.set_content(dat)
-	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
-	popup.open()
-	return
-
-/obj/machinery/computer/telecrystals/boss/Topic(href, href_list)
-	if(..())
-		return
-
-	if(href_list["scan"])
-		scanUplinkers()
-
+		dat += "<BR><BR><a href='byond://?src=\ref[src];distrib=1'>Evenly distribute remaining TC.</a><BR><BR>"
+
+
+	for(var/entry in transferlog)
+		dat += "<small>[entry]</small><BR>"
+
+
+	var/datum/browser/popup = new(user, "computer", "Team Telecrystal Management Console", 700, 500)
+	popup.set_content(dat)
+	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
+	popup.open()
+	return
+
+/obj/machinery/computer/telecrystals/boss/Topic(href, href_list)
+	if(..())
+		return
+
+	if(href_list["scan"])
+		scanUplinkers()
+
 	if(href_list["give"])
 		var/tcamt = text2num(href_list["give"])
 		if(TCstations.len) // sanity
 			var/obj/machinery/computer/telecrystals/uplinker/A = locate(href_list["target"]) in TCstations
 			A.giveTC(tcamt)
-
-	if(href_list["distrib"])
-		var/sanity = 0
-		while(storedcrystals && sanity < 100)
-			for(var/obj/machinery/computer/telecrystals/uplinker/A in TCstations)
-				A.giveTC(1,0)
-			sanity++
-		logTransfer("[src] evenly distributed telecrystals.")
-
-	src.updateUsrDialog()
-	return
-
-#undef NUKESCALINGMODIFIER
+
+	if(href_list["distrib"])
+		var/sanity = 0
+		while(storedcrystals && sanity < 100)
+			for(var/obj/machinery/computer/telecrystals/uplinker/A in TCstations)
+				A.giveTC(1,0)
+			sanity++
+		logTransfer("[src] evenly distributed telecrystals.")
+
+	src.updateUsrDialog()
+	return
+
+#undef NUKESCALINGMODIFIER

code/game/machinery/dance_machine.dm

@@ -85,7 +85,7 @@
 		return
 	if(!allowed(user))
 		to_chat(user,"<span class='warning'>Error: Access Denied - Message: Only the engineering department can be trusted with this kind of power.</span>")
-		playsound_local(src,'sound/misc/compiler-failure.ogg', 25, 1)
+		user.playsound_local(src,'sound/misc/compiler-failure.ogg', 25, 1)
 		return
 	if(!Adjacent(user) && !isAI(user))
 		return

code/game/machinery/dna_scanner.dm

@@ -9,6 +9,7 @@
 	use_power = 1
 	idle_power_usage = 50
 	active_power_usage = 300
+	occupant_typecache = list(/mob/living, /obj/item/bodypart/head, /obj/item/organ/brain)
 	var/damage_coeff
 	var/scan_level
 	var/precision_coeff
@@ -98,6 +99,13 @@
 
 		open_machine()
 
+/obj/machinery/dna_scannernew/proc/locate_computer(type_)
+	for(dir in list(NORTH,EAST,SOUTH,WEST))
+		var/C = locate(type_, get_step(src, dir))
+		if(C)
+			return C
+	return null
+
 /obj/machinery/dna_scannernew/close_machine()
 	if(!state_open)
 		return 0
@@ -105,22 +113,19 @@
 	..()
 
 	// search for ghosts, if the corpse is empty and the scanner is connected to a cloner
-	var/mob/living/mob_occupant = occupant
-	if(mob_occupant)
-		if(locate(/obj/machinery/computer/cloning, get_step(src, NORTH)) \
-			|| locate(/obj/machinery/computer/cloning, get_step(src, SOUTH)) \
-			|| locate(/obj/machinery/computer/cloning, get_step(src, EAST)) \
-			|| locate(/obj/machinery/computer/cloning, get_step(src, WEST)))
+	var/mob/living/mob_occupant = get_mob_or_brainmob(occupant)
+	if(istype(mob_occupant))
+		if(locate_computer(/obj/machinery/computer/cloning))
 			if(!mob_occupant.suiciding && !(mob_occupant.disabilities & NOCLONE) && !mob_occupant.hellbound)
 				mob_occupant.notify_ghost_cloning("Your corpse has been placed into a cloning scanner. Re-enter your corpse if you want to be cloned!", source = src)
 
-		var/obj/machinery/computer/scan_consolenew/console
-		for(dir in list(NORTH,EAST,SOUTH,WEST))
-			console = locate(/obj/machinery/computer/scan_consolenew, get_step(src, dir))
-			if(console)
-				console.on_scanner_close()
-				break
-	return 1
+	// DNA manipulators cannot operate on severed heads or brains
+	if(isliving(occupant))
+		var/obj/machinery/computer/scan_consolenew/console = locate_computer(/obj/machinery/computer/scan_consolenew)
+		if(console)
+			console.on_scanner_close()
+
+	return TRUE
 
 /obj/machinery/dna_scannernew/open_machine()
 	if(state_open)
@@ -158,4 +163,4 @@
 	if(..(user,1,0)) //don't set the machine, since there's no dialog
 		return
 
-	toggle_open(user)
+	toggle_open(user)

code/game/machinery/doors/airlock.dm

@@ -179,18 +179,17 @@
 /obj/machinery/door/airlock/narsie_act()
 	var/turf/T = get_turf(src)
 	var/runed = prob(20)
-	if(prob(20))
-		if(glass)
-			if(runed)
-				new/obj/machinery/door/airlock/cult/glass(T)
-			else
-				new/obj/machinery/door/airlock/cult/unruned/glass(T)
+	if(glass)
+		if(runed)
+			new/obj/machinery/door/airlock/cult/glass(T)
 		else
-			if(runed)
-				new/obj/machinery/door/airlock/cult(T)
-			else
-				new/obj/machinery/door/airlock/cult/unruned(T)
-		qdel(src)
+			new/obj/machinery/door/airlock/cult/unruned/glass(T)
+	else
+		if(runed)
+			new/obj/machinery/door/airlock/cult(T)
+		else
+			new/obj/machinery/door/airlock/cult/unruned(T)
+	qdel(src)
 
 /obj/machinery/door/airlock/ratvar_act() //Airlocks become pinion airlocks that only allow servants
 	if(glass)

code/game/machinery/doors/airlock_types.dm

@@ -25,6 +25,12 @@
 	assemblytype = /obj/structure/door_assembly/door_assembly_mai
 	normal_integrity = 250
 
+/obj/machinery/door/airlock/maintenance/external
+	name = "external airlock access"
+	icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi'
+	assemblytype = /obj/structure/door_assembly/door_assembly_mai
+	normal_integrity = 250
+
 /obj/machinery/door/airlock/mining
 	name = "mining airlock"
 	icon = 'icons/obj/doors/airlocks/station/mining.dmi'

code/game/machinery/doors/door.dm

@@ -12,6 +12,7 @@
 	max_integrity = 350
 	armor = list(melee = 30, bullet = 30, laser = 20, energy = 20, bomb = 10, bio = 100, rad = 100, fire = 80, acid = 70)
 	CanAtmosPass = ATMOS_PASS_DENSITY
+	flags = PREVENT_CLICK_UNDER
 
 	var/secondsElectrified = 0
 	var/shockedby = list()

code/game/machinery/firealarm.dm

@@ -153,6 +153,21 @@
 		return
 
 	if(panel_open)
+
+		if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent == INTENT_HELP)
+			var/obj/item/weapon/weldingtool/WT = W
+			if(obj_integrity < max_integrity)
+				if(WT.remove_fuel(0,user))
+					to_chat(user, "<span class='notice'>You begin repairing [src]...</span>")
+					playsound(loc, WT.usesound, 40, 1)
+					if(do_after(user, 40*WT.toolspeed, target = src))
+						obj_integrity = max_integrity
+						playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
+						to_chat(user, "<span class='notice'>You repair [src].</span>")
+			else
+				to_chat(user, "<span class='warning'>[src] is already in good condition!</span>")
+			return
+
 		switch(buildstage)
 			if(2)
 				if(istype(W, /obj/item/device/multitool))
@@ -190,6 +205,7 @@
 						if(buildstage == 1)
 							if(stat & BROKEN)
 								to_chat(user, "<span class='notice'>You remove the destroyed circuit.</span>")
+								stat &= ~BROKEN
 							else
 								to_chat(user, "<span class='notice'>You pry out the circuit.</span>")
 								new /obj/item/weapon/electronics/firealarm(user.loc)
@@ -230,9 +246,10 @@
 /obj/machinery/firealarm/deconstruct(disassembled = TRUE)
 	if(!(flags & NODECONSTRUCT))
 		new /obj/item/stack/sheet/metal(loc, 1)
-		var/obj/item/I = new /obj/item/weapon/electronics/firealarm(loc)
-		if(!disassembled)
-			I.obj_integrity = I.max_integrity * 0.5
+		if(!(stat & BROKEN))
+			var/obj/item/I = new /obj/item/weapon/electronics/firealarm(loc)
+			if(!disassembled)
+				I.obj_integrity = I.max_integrity * 0.5
 		new /obj/item/stack/cable_coil(loc, 3)
 	qdel(src)
 

code/game/machinery/hologram.dm

@@ -1,396 +1,395 @@
-/* Holograms!
- * Contains:
- *		Holopad
- *		Hologram
- *		Other stuff
- */
-
-/*
-Revised. Original based on space ninja hologram code. Which is also mine. /N
-How it works:
-AI clicks on holopad in camera view. View centers on holopad.
-AI clicks again on the holopad to display a hologram. Hologram stays as long as AI is looking at the pad and it (the hologram) is in range of the pad.
-AI can use the directional keys to move the hologram around, provided the above conditions are met and the AI in question is the holopad's master.
-Any number of AIs can use a holopad. /Lo6
-AI may cancel the hologram at any time by clicking on the holopad once more.
-
-Possible to do for anyone motivated enough:
-	Give an AI variable for different hologram icons.
-	Itegrate EMP effect to disable the unit.
-*/
-
-
-/*
- * Holopad
- */
-
-#define HOLOPAD_PASSIVE_POWER_USAGE 1
-#define HOLOGRAM_POWER_USAGE 2
-
-GLOBAL_LIST_EMPTY(holopads)
-#define HOLOPAD_MODE RANGE_BASED
-
-/obj/machinery/holopad
-	name = "Holopad"
-	desc = "It's a floor-mounted device for projecting holographic images."
-	icon_state = "holopad0"
-	layer = LOW_OBJ_LAYER
-	flags = HEAR
-	anchored = 1
-	use_power = 1
-	idle_power_usage = 5
-	active_power_usage = 100
-	obj_integrity = 300
-	max_integrity = 300
-	armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 0)
-	var/list/masters = list()//List of living mobs that use the holopad
-	var/last_request = 0 //to prevent request spam. ~Carn
-	var/holo_range = 5 // Change to change how far the AI can move away from the holopad before deactivating.
-	var/temp = ""
-	var/list/holo_calls	//array of /datum/holocalls
-	var/datum/holocall/outgoing_call	//do not modify the datums only check and call the public procs
-	var/static/force_answer_call = FALSE	//Calls will be automatically answered after a couple rings, here for debugging
-	var/static/list/holopads = list()
-
-/obj/machinery/holopad/Initialize()
-	..()
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/holopad(null)
-	B.apply_default_parts(src)
-	holopads += src
-
-/obj/machinery/holopad/Destroy()
-	if(outgoing_call)
-		LAZYADD(holo_calls, outgoing_call)
-		outgoing_call = null
-
-	for(var/I in holo_calls)
-		var/datum/holocall/HC = I
-		HC.ConnectionFailure(src)
-	LAZYCLEARLIST(holo_calls)
-
-	for (var/I in masters)
-		clear_holo(I)
-	holopads -= src
-	return ..()
-
-/obj/machinery/holopad/power_change()
-	if (powered())
-		stat &= ~NOPOWER
-	else
-		stat |= ~NOPOWER
-
-/obj/machinery/holopad/RefreshParts()
-	var/holograph_range = 4
-	for(var/obj/item/weapon/stock_parts/capacitor/B in component_parts)
-		holograph_range += 1 * B.rating
-	holo_range = holograph_range
-
-/obj/machinery/holopad/attackby(obj/item/P, mob/user, params)
-	if(default_deconstruction_screwdriver(user, "holopad_open", "holopad0", P))
-		return
-
-	if(exchange_parts(user, P))
-		return
-
-	if(default_pry_open(P))
-		return
-
-	if(default_unfasten_wrench(user, P))
-		return
-
-	if(default_deconstruction_crowbar(P))
-		return
-	return ..()
-
-/obj/machinery/holopad/proc/CheckCallClose()
-	for(var/I in holo_calls)
-		var/datum/holocall/HC = I
-		if(usr == HC.eye)
-			HC.Disconnect(HC.calling_holopad)	//disconnect via clicking the called holopad
-			return TRUE
-	return FALSE
-
-/obj/machinery/holopad/Click(location,control,params)
-	if(!CheckCallClose())
-		return ..()
-
-/obj/machinery/holopad/AltClick(mob/living/carbon/human/user)
-	if(!CheckCallClose())
-		interact(user)
-
-/obj/machinery/holopad/interact(mob/living/carbon/human/user) //Carn: Hologram requests.
-	if(!istype(user))
-		return
-
-	if(outgoing_call || user.incapacitated() || !is_operational())
-		return
-
-	user.set_machine(src)
-	var/dat
-	if(temp)
-		dat = temp
-	else
-		dat = "<a href='?src=\ref[src];AIrequest=1'>Request an AI's presence.</a><br>"
-		dat += "<a href='?src=\ref[src];Holocall=1'>Call another holopad.</a><br>"
-
-		if(LAZYLEN(holo_calls))
-			dat += "=====================================================<br>"
-
-		var/one_answered_call = FALSE
-		var/one_unanswered_call = FALSE
-		for(var/I in holo_calls)
-			var/datum/holocall/HC = I
-			if(HC.connected_holopad != src)
-				dat += "<a href='?src=\ref[src];connectcall=\ref[HC]'>Answer call from [get_area(HC.calling_holopad)].</a><br>"
-				one_unanswered_call = TRUE
-			else
-				one_answered_call = TRUE
-
-		if(one_answered_call && one_unanswered_call)
-			dat += "=====================================================<br>"
-		//we loop twice for formatting
-		for(var/I in holo_calls)
-			var/datum/holocall/HC = I
-			if(HC.connected_holopad == src)
-				dat += "<a href='?src=\ref[src];disconnectcall=\ref[HC]'>Disconnect call from [HC.user].</a><br>"
-
-
-	var/datum/browser/popup = new(user, "holopad", name, 300, 130)
-	popup.set_content(dat)
-	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
-	popup.open()
-
-/obj/machinery/holopad/Topic(href, href_list)
-	if(..() || isAI(usr))
-		return
-	add_fingerprint(usr)
-	if(!is_operational())
-		return
-	if (href_list["AIrequest"])
-		if(last_request + 200 < world.time)
-			last_request = world.time
-			temp = "You requested an AI's presence.<BR>"
-			temp += "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
-			var/area/area = get_area(src)
-			for(var/mob/living/silicon/ai/AI in GLOB.silicon_mobs)
-				if(!AI.client)
-					continue
-				to_chat(AI, "<span class='info'>Your presence is requested at <a href='?src=\ref[AI];jumptoholopad=\ref[src]'>\the [area]</a>.</span>")
-		else
-			temp = "A request for AI presence was already sent recently.<BR>"
-			temp += "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
-
-	else if(href_list["Holocall"])
-		if(outgoing_call)
-			return
-
-		temp = "You must stand on the holopad to make a call!<br>"
-		temp += "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
-		if(usr.loc == loc)
-			var/list/callnames = list()
-			for(var/I in holopads)
-				var/area/A = get_area(I)
-				if(A)
-					LAZYADD(callnames[A], I)
-			callnames -= get_area(src)
-
-			var/result = input(usr, "Choose an area to call", "Holocall") as null|anything in callnames
-			if(QDELETED(usr) || !result || outgoing_call)
-				return
-
-			if(usr.loc == loc)
-				temp = "Dialing...<br>"
-				temp += "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
-				new /datum/holocall(usr, src, callnames[result])
-
-	else if(href_list["connectcall"])
-		var/datum/holocall/call_to_connect = locate(href_list["connectcall"])
-		if(!QDELETED(call_to_connect))
-			call_to_connect.Answer(src)
-		temp = ""
-
-	else if(href_list["disconnectcall"])
-		var/datum/holocall/call_to_disconnect = locate(href_list["disconnectcall"])
-		if(!QDELETED(call_to_disconnect))
-			call_to_disconnect.Disconnect(src)
-		temp = ""
-
-	else if(href_list["mainmenu"])
-		temp = ""
-		if(outgoing_call)
-			outgoing_call.Disconnect()
-
-	updateDialog()
-
-//do not allow AIs to answer calls or people will use it to meta the AI sattelite
-/obj/machinery/holopad/attack_ai(mob/living/silicon/ai/user)
-	if (!istype(user))
-		return
-	/*There are pretty much only three ways to interact here.
-	I don't need to check for client since they're clicking on an object.
-	This may change in the future but for now will suffice.*/
-	if(user.eyeobj.loc != src.loc)//Set client eye on the object if it's not already.
-		user.eyeobj.setLoc(get_turf(src))
-	else if(!masters[user])//If there is no hologram, possibly make one.
-		activate_holo(user)
-	else//If there is a hologram, remove it.
-		clear_holo(user)
-
-/obj/machinery/holopad/process()
-	for(var/I in masters)
-		var/mob/living/master = I
-		var/mob/living/silicon/ai/AI = master
-		if(!istype(AI))
-			AI = null
-
-		if(!QDELETED(master) && !master.incapacitated() && master.client && (!AI || AI.eyeobj))//If there is an AI attached, it's not incapacitated, it has a client, and the client eye is centered on the projector.
-			if(is_operational())//If the  machine has power.
-				if(AI)	//ais are range based
-					if(get_dist(AI.eyeobj, src) <= holo_range)
-						continue
-					else
-						var/obj/machinery/holopad/pad_close = get_closest_atom(/obj/machinery/holopad, holopads, AI.eyeobj)
-						if(get_dist(pad_close, AI.eyeobj) <= holo_range)
-							var/obj/effect/overlay/holo_pad_hologram/h = masters[master]
-							unset_holo(master)
-							pad_close.set_holo(master, h)
-							continue
-				else
-					continue
-		clear_holo(master)//If not, we want to get rid of the hologram.
-
-	if(outgoing_call)
-		outgoing_call.Check()
-
-	for(var/I in holo_calls)
-		var/datum/holocall/HC = I
-		if(HC.connected_holopad != src)
-			if(force_answer_call && world.time > (HC.call_start_time + (HOLOPAD_MAX_DIAL_TIME / 2)))
-				HC.Answer(src)
-				break
-			if(outgoing_call)
-				HC.Disconnect(src)//can't answer calls while calling
-			else
-				playsound(src, 'sound/machines/twobeep.ogg', 100)	//bring, bring!
-
-/obj/machinery/holopad/proc/activate_holo(mob/living/user)
-	var/mob/living/silicon/ai/AI = user
-	if(!istype(AI))
-		AI = null
-
-	if(is_operational() && (!AI || AI.eyeobj.loc == loc))//If the projector has power and client eye is on it
-		if (AI && istype(AI.current, /obj/machinery/holopad))
-			to_chat(user, "<span class='danger'>ERROR:</span> \black Image feed in progress.")
-			return
-
-		var/obj/effect/overlay/holo_pad_hologram/Hologram = new(loc)//Spawn a blank effect at the location.
-		if(AI)
-			Hologram.icon = AI.holo_icon
-		else	//make it like real life
-			Hologram.icon = user.icon
-			Hologram.icon_state = user.icon_state
-			Hologram.copy_overlays(user, TRUE)
-			//codersprite some holo effects here
-			Hologram.alpha = 100
-			Hologram.add_atom_colour("#77abff", FIXED_COLOUR_PRIORITY)
-			Hologram.Impersonation = user
-
-		Hologram.languages = user.languages
-		Hologram.mouse_opacity = 0//So you can't click on it.
-		Hologram.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them.
-		Hologram.anchored = 1//So space wind cannot drag it.
-		Hologram.name = "[user.name] (Hologram)"//If someone decides to right click.
-		Hologram.set_light(2)	//hologram lighting
-
-		set_holo(user, Hologram)
-		visible_message("A holographic image of [user] flicks to life right before your eyes!")
-
-		return Hologram
-	else
-		to_chat(user, "<span class='danger'>ERROR:</span> \black Unable to project hologram.")
-
-/*This is the proc for special two-way communication between AI and holopad/people talking near holopad.
-For the other part of the code, check silicon say.dm. Particularly robot talk.*/
-/obj/machinery/holopad/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode)
-	if(speaker && masters.len && !radio_freq)//Master is mostly a safety in case lag hits or something. Radio_freq so AIs dont hear holopad stuff through radios.
-		for(var/mob/living/silicon/ai/master in masters)
-			if(masters[master] && speaker != master)
-				master.relay_speech(message, speaker, message_language, raw_message, radio_freq, spans, message_mode)
-
-	for(var/I in holo_calls)
-		var/datum/holocall/HC = I
-		if(HC.connected_holopad == src && speaker != HC.hologram)
-			HC.user.Hear(message, speaker, message_language, raw_message, radio_freq, spans)
-
-	if(outgoing_call && speaker == outgoing_call.user)
-		outgoing_call.hologram.say(raw_message)
-
-/obj/machinery/holopad/proc/SetLightsAndPower()
-	var/total_users = masters.len + LAZYLEN(holo_calls)
-	use_power = HOLOPAD_PASSIVE_POWER_USAGE + HOLOGRAM_POWER_USAGE * total_users
-	if(total_users)
-		set_light(2)
-		icon_state = "holopad1"
-	else
-		set_light(0)
-		icon_state = "holopad0"
-
-/obj/machinery/holopad/proc/set_holo(mob/living/user, var/obj/effect/overlay/holo_pad_hologram/h)
-	masters[user] = h
-	var/mob/living/silicon/ai/AI = user
-	if(istype(AI))
-		AI.current = src
-	SetLightsAndPower()
-	return TRUE
-
-/obj/machinery/holopad/proc/clear_holo(mob/living/user)
-	qdel(masters[user]) // Get rid of user's hologram
-	unset_holo(user)
-	return TRUE
-
-/obj/machinery/holopad/proc/unset_holo(mob/living/user)
-	var/mob/living/silicon/ai/AI = user
-	if(istype(AI) && AI.current == src)
-		AI.current = null
-	masters -= user // Discard AI from the list of those who use holopad
-	SetLightsAndPower()
-	return TRUE
-
-/obj/machinery/holopad/proc/move_hologram(mob/living/user, turf/new_turf)
-	if(masters[user])
-		var/obj/effect/overlay/holo_pad_hologram/H = masters[user]
-		step_to(H, new_turf)
-		H.loc = new_turf
-		var/area/holo_area = get_area(src)
-		var/area/eye_area = new_turf.loc
-
-		if(!(eye_area in holo_area.related))
-			clear_holo(user)
-	return TRUE
-
-/obj/effect/overlay/holo_pad_hologram
-	var/mob/living/Impersonation
-	var/datum/holocall/HC
-
-/obj/effect/overlay/holo_pad_hologram/Destroy()
-	Impersonation = null
-	if(HC)
-		HC.Disconnect(HC.calling_holopad)
-	return ..()
-
-/obj/effect/overlay/holo_pad_hologram/Process_Spacemove(movement_dir = 0)
-	return 1
-
-/obj/effect/overlay/holo_pad_hologram/examine(mob/user)
-	if(Impersonation)
-		return Impersonation.examine(user)
-	return ..()
-
-/obj/item/weapon/circuitboard/machine/holopad
-	name = "AI Holopad (Machine Board)"
-	build_path = /obj/machinery/holopad
-	origin_tech = "programming=1"
-	req_components = list(/obj/item/weapon/stock_parts/capacitor = 1)
-
-#undef HOLOPAD_PASSIVE_POWER_USAGE
+/* Holograms!
+ * Contains:
+ *		Holopad
+ *		Hologram
+ *		Other stuff
+ */
+
+/*
+Revised. Original based on space ninja hologram code. Which is also mine. /N
+How it works:
+AI clicks on holopad in camera view. View centers on holopad.
+AI clicks again on the holopad to display a hologram. Hologram stays as long as AI is looking at the pad and it (the hologram) is in range of the pad.
+AI can use the directional keys to move the hologram around, provided the above conditions are met and the AI in question is the holopad's master.
+Any number of AIs can use a holopad. /Lo6
+AI may cancel the hologram at any time by clicking on the holopad once more.
+
+Possible to do for anyone motivated enough:
+	Give an AI variable for different hologram icons.
+	Itegrate EMP effect to disable the unit.
+*/
+
+
+/*
+ * Holopad
+ */
+
+#define HOLOPAD_PASSIVE_POWER_USAGE 1
+#define HOLOGRAM_POWER_USAGE 2
+#define HOLOPAD_MODE RANGE_BASED
+
+/obj/machinery/holopad
+	name = "Holopad"
+	desc = "It's a floor-mounted device for projecting holographic images."
+	icon_state = "holopad0"
+	layer = LOW_OBJ_LAYER
+	flags = HEAR
+	anchored = 1
+	use_power = 1
+	idle_power_usage = 5
+	active_power_usage = 100
+	obj_integrity = 300
+	max_integrity = 300
+	armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 0)
+	var/list/masters = list()//List of living mobs that use the holopad
+	var/last_request = 0 //to prevent request spam. ~Carn
+	var/holo_range = 5 // Change to change how far the AI can move away from the holopad before deactivating.
+	var/temp = ""
+	var/list/holo_calls	//array of /datum/holocalls
+	var/datum/holocall/outgoing_call	//do not modify the datums only check and call the public procs
+	var/static/force_answer_call = FALSE	//Calls will be automatically answered after a couple rings, here for debugging
+	var/static/list/holopads = list()
+
+/obj/machinery/holopad/Initialize()
+	..()
+	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/holopad(null)
+	B.apply_default_parts(src)
+	holopads += src
+
+/obj/machinery/holopad/Destroy()
+	if(outgoing_call)
+		LAZYADD(holo_calls, outgoing_call)
+
+	for(var/I in holo_calls)
+		var/datum/holocall/HC = I
+		HC.ConnectionFailure(src)
+	LAZYCLEARLIST(holo_calls)
+
+	for (var/I in masters)
+		clear_holo(I)
+	holopads -= src
+	return ..()
+
+/obj/machinery/holopad/power_change()
+	if (powered())
+		stat &= ~NOPOWER
+	else
+		stat |= ~NOPOWER
+
+/obj/machinery/holopad/RefreshParts()
+	var/holograph_range = 4
+	for(var/obj/item/weapon/stock_parts/capacitor/B in component_parts)
+		holograph_range += 1 * B.rating
+	holo_range = holograph_range
+
+/obj/machinery/holopad/attackby(obj/item/P, mob/user, params)
+	if(default_deconstruction_screwdriver(user, "holopad_open", "holopad0", P))
+		return
+
+	if(exchange_parts(user, P))
+		return
+
+	if(default_pry_open(P))
+		return
+
+	if(default_unfasten_wrench(user, P))
+		return
+
+	if(default_deconstruction_crowbar(P))
+		return
+	return ..()
+
+/obj/machinery/holopad/proc/CheckCallClose()
+	for(var/I in holo_calls)
+		var/datum/holocall/HC = I
+		if(usr == HC.eye)
+			HC.Disconnect(HC.calling_holopad)	//disconnect via clicking the called holopad
+			return TRUE
+	return FALSE
+
+/obj/machinery/holopad/Click(location,control,params)
+	if(!CheckCallClose())
+		return ..()
+
+/obj/machinery/holopad/AltClick(mob/living/carbon/human/user)
+	if(!CheckCallClose())
+		interact(user)
+
+/obj/machinery/holopad/interact(mob/living/carbon/human/user) //Carn: Hologram requests.
+	if(!istype(user))
+		return
+
+	if(outgoing_call || user.incapacitated() || !is_operational())
+		return
+
+	user.set_machine(src)
+	var/dat
+	if(temp)
+		dat = temp
+	else
+		dat = "<a href='?src=\ref[src];AIrequest=1'>Request an AI's presence.</a><br>"
+		dat += "<a href='?src=\ref[src];Holocall=1'>Call another holopad.</a><br>"
+
+		if(LAZYLEN(holo_calls))
+			dat += "=====================================================<br>"
+
+		var/one_answered_call = FALSE
+		var/one_unanswered_call = FALSE
+		for(var/I in holo_calls)
+			var/datum/holocall/HC = I
+			if(HC.connected_holopad != src)
+				dat += "<a href='?src=\ref[src];connectcall=\ref[HC]'>Answer call from [get_area(HC.calling_holopad)].</a><br>"
+				one_unanswered_call = TRUE
+			else
+				one_answered_call = TRUE
+
+		if(one_answered_call && one_unanswered_call)
+			dat += "=====================================================<br>"
+		//we loop twice for formatting
+		for(var/I in holo_calls)
+			var/datum/holocall/HC = I
+			if(HC.connected_holopad == src)
+				dat += "<a href='?src=\ref[src];disconnectcall=\ref[HC]'>Disconnect call from [HC.user].</a><br>"
+
+
+	var/datum/browser/popup = new(user, "holopad", name, 300, 130)
+	popup.set_content(dat)
+	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
+	popup.open()
+
+/obj/machinery/holopad/Topic(href, href_list)
+	if(..() || isAI(usr))
+		return
+	add_fingerprint(usr)
+	if(!is_operational())
+		return
+	if (href_list["AIrequest"])
+		if(last_request + 200 < world.time)
+			last_request = world.time
+			temp = "You requested an AI's presence.<BR>"
+			temp += "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
+			var/area/area = get_area(src)
+			for(var/mob/living/silicon/ai/AI in GLOB.silicon_mobs)
+				if(!AI.client)
+					continue
+				to_chat(AI, "<span class='info'>Your presence is requested at <a href='?src=\ref[AI];jumptoholopad=\ref[src]'>\the [area]</a>.</span>")
+		else
+			temp = "A request for AI presence was already sent recently.<BR>"
+			temp += "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
+
+	else if(href_list["Holocall"])
+		if(outgoing_call)
+			return
+
+		temp = "You must stand on the holopad to make a call!<br>"
+		temp += "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
+		if(usr.loc == loc)
+			var/list/callnames = list()
+			for(var/I in holopads)
+				var/area/A = get_area(I)
+				if(A)
+					LAZYADD(callnames[A], I)
+			callnames -= get_area(src)
+
+			var/result = input(usr, "Choose an area to call", "Holocall") as null|anything in callnames
+			if(QDELETED(usr) || !result || outgoing_call)
+				return
+
+			if(usr.loc == loc)
+				temp = "Dialing...<br>"
+				temp += "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
+				new /datum/holocall(usr, src, callnames[result])
+
+	else if(href_list["connectcall"])
+		var/datum/holocall/call_to_connect = locate(href_list["connectcall"])
+		if(!QDELETED(call_to_connect))
+			call_to_connect.Answer(src)
+		temp = ""
+
+	else if(href_list["disconnectcall"])
+		var/datum/holocall/call_to_disconnect = locate(href_list["disconnectcall"])
+		if(!QDELETED(call_to_disconnect))
+			call_to_disconnect.Disconnect(src)
+		temp = ""
+
+	else if(href_list["mainmenu"])
+		temp = ""
+		if(outgoing_call)
+			outgoing_call.Disconnect()
+
+	updateDialog()
+
+//do not allow AIs to answer calls or people will use it to meta the AI sattelite
+/obj/machinery/holopad/attack_ai(mob/living/silicon/ai/user)
+	if (!istype(user))
+		return
+	/*There are pretty much only three ways to interact here.
+	I don't need to check for client since they're clicking on an object.
+	This may change in the future but for now will suffice.*/
+	if(user.eyeobj.loc != src.loc)//Set client eye on the object if it's not already.
+		user.eyeobj.setLoc(get_turf(src))
+	else if(!masters[user])//If there is no hologram, possibly make one.
+		activate_holo(user)
+	else//If there is a hologram, remove it.
+		clear_holo(user)
+
+/obj/machinery/holopad/process()
+	for(var/I in masters)
+		var/mob/living/master = I
+		var/mob/living/silicon/ai/AI = master
+		if(!istype(AI))
+			AI = null
+
+		if(!QDELETED(master) && !master.incapacitated() && master.client && (!AI || AI.eyeobj))//If there is an AI attached, it's not incapacitated, it has a client, and the client eye is centered on the projector.
+			if(is_operational())//If the  machine has power.
+				if(AI)	//ais are range based
+					if(get_dist(AI.eyeobj, src) <= holo_range)
+						continue
+					else
+						var/obj/machinery/holopad/pad_close = get_closest_atom(/obj/machinery/holopad, holopads, AI.eyeobj)
+						if(get_dist(pad_close, AI.eyeobj) <= holo_range)
+							var/obj/effect/overlay/holo_pad_hologram/h = masters[master]
+							unset_holo(master)
+							pad_close.set_holo(master, h)
+							continue
+				else
+					continue
+		clear_holo(master)//If not, we want to get rid of the hologram.
+
+	if(outgoing_call)
+		outgoing_call.Check()
+
+	for(var/I in holo_calls)
+		var/datum/holocall/HC = I
+		if(HC.connected_holopad != src)
+			if(force_answer_call && world.time > (HC.call_start_time + (HOLOPAD_MAX_DIAL_TIME / 2)))
+				HC.Answer(src)
+				break
+			if(outgoing_call)
+				HC.Disconnect(src)//can't answer calls while calling
+			else
+				playsound(src, 'sound/machines/twobeep.ogg', 100)	//bring, bring!
+
+/obj/machinery/holopad/proc/activate_holo(mob/living/user)
+	var/mob/living/silicon/ai/AI = user
+	if(!istype(AI))
+		AI = null
+
+	if(is_operational() && (!AI || AI.eyeobj.loc == loc))//If the projector has power and client eye is on it
+		if (AI && istype(AI.current, /obj/machinery/holopad))
+			to_chat(user, "<span class='danger'>ERROR:</span> \black Image feed in progress.")
+			return
+
+		var/obj/effect/overlay/holo_pad_hologram/Hologram = new(loc)//Spawn a blank effect at the location.
+		if(AI)
+			Hologram.icon = AI.holo_icon
+		else	//make it like real life
+			Hologram.icon = user.icon
+			Hologram.icon_state = user.icon_state
+			Hologram.copy_overlays(user, TRUE)
+			//codersprite some holo effects here
+			Hologram.alpha = 100
+			Hologram.add_atom_colour("#77abff", FIXED_COLOUR_PRIORITY)
+			Hologram.Impersonation = user
+
+
+		Hologram.copy_known_languages_from(user,replace = TRUE)
+
+		Hologram.mouse_opacity = 0//So you can't click on it.
+		Hologram.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them.
+		Hologram.anchored = 1//So space wind cannot drag it.
+		Hologram.name = "[user.name] (Hologram)"//If someone decides to right click.
+		Hologram.set_light(2)	//hologram lighting
+
+		set_holo(user, Hologram)
+		visible_message("A holographic image of [user] flicks to life right before your eyes!")
+
+		return Hologram
+	else
+		to_chat(user, "<span class='danger'>ERROR:</span> \black Unable to project hologram.")
+
+/*This is the proc for special two-way communication between AI and holopad/people talking near holopad.
+For the other part of the code, check silicon say.dm. Particularly robot talk.*/
+/obj/machinery/holopad/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode)
+	if(speaker && masters.len && !radio_freq)//Master is mostly a safety in case lag hits or something. Radio_freq so AIs dont hear holopad stuff through radios.
+		for(var/mob/living/silicon/ai/master in masters)
+			if(masters[master] && speaker != master)
+				master.relay_speech(message, speaker, message_language, raw_message, radio_freq, spans, message_mode)
+
+	for(var/I in holo_calls)
+		var/datum/holocall/HC = I
+		if(HC.connected_holopad == src && speaker != HC.hologram)
+			HC.user.Hear(message, speaker, message_language, raw_message, radio_freq, spans)
+
+	if(outgoing_call && speaker == outgoing_call.user)
+		outgoing_call.hologram.say(raw_message)
+
+/obj/machinery/holopad/proc/SetLightsAndPower()
+	var/total_users = masters.len + LAZYLEN(holo_calls)
+	use_power = HOLOPAD_PASSIVE_POWER_USAGE + HOLOGRAM_POWER_USAGE * total_users
+	if(total_users)
+		set_light(2)
+		icon_state = "holopad1"
+	else
+		set_light(0)
+		icon_state = "holopad0"
+
+/obj/machinery/holopad/proc/set_holo(mob/living/user, var/obj/effect/overlay/holo_pad_hologram/h)
+	masters[user] = h
+	var/mob/living/silicon/ai/AI = user
+	if(istype(AI))
+		AI.current = src
+	SetLightsAndPower()
+	return TRUE
+
+/obj/machinery/holopad/proc/clear_holo(mob/living/user)
+	qdel(masters[user]) // Get rid of user's hologram
+	unset_holo(user)
+	return TRUE
+
+/obj/machinery/holopad/proc/unset_holo(mob/living/user)
+	var/mob/living/silicon/ai/AI = user
+	if(istype(AI) && AI.current == src)
+		AI.current = null
+	masters -= user // Discard AI from the list of those who use holopad
+	SetLightsAndPower()
+	return TRUE
+
+/obj/machinery/holopad/proc/move_hologram(mob/living/user, turf/new_turf)
+	if(masters[user])
+		var/obj/effect/overlay/holo_pad_hologram/H = masters[user]
+		step_to(H, new_turf)
+		H.loc = new_turf
+		var/area/holo_area = get_area(src)
+		var/area/eye_area = new_turf.loc
+
+		if(!(eye_area in holo_area.related))
+			clear_holo(user)
+	return TRUE
+
+/obj/effect/overlay/holo_pad_hologram
+	var/mob/living/Impersonation
+	var/datum/holocall/HC
+
+/obj/effect/overlay/holo_pad_hologram/Destroy()
+	Impersonation = null
+	if(HC)
+		HC.Disconnect(HC.calling_holopad)
+	return ..()
+
+/obj/effect/overlay/holo_pad_hologram/Process_Spacemove(movement_dir = 0)
+	return 1
+
+/obj/effect/overlay/holo_pad_hologram/examine(mob/user)
+	if(Impersonation)
+		return Impersonation.examine(user)
+	return ..()
+
+/obj/item/weapon/circuitboard/machine/holopad
+	name = "AI Holopad (Machine Board)"
+	build_path = /obj/machinery/holopad
+	origin_tech = "programming=1"
+	req_components = list(/obj/item/weapon/stock_parts/capacitor = 1)
+
+#undef HOLOPAD_PASSIVE_POWER_USAGE
 #undef HOLOGRAM_POWER_USAGE

code/game/machinery/launch_pad.dm

@@ -0,0 +1,373 @@
+/obj/machinery/launchpad
+	name = "bluespace launchpad"
+	desc = "A bluespace pad able to thrust matter through bluespace, teleporting it to or from nearby locations."
+	icon = 'icons/obj/telescience.dmi'
+	icon_state = "lpad-idle"
+	var/icon_teleport = "lpad-beam"
+	anchored = TRUE
+	use_power = TRUE
+	idle_power_usage = 200
+	active_power_usage = 2500
+	var/stationary = TRUE //to prevent briefcase pad deconstruction and such
+	var/display_name = "Launchpad"
+	var/teleport_speed = 35
+	var/range = 5
+	var/teleporting = FALSE //if it's in the process of teleporting
+	var/power_efficiency = 1
+	var/x_offset = 0
+	var/y_offset = 0
+
+/obj/machinery/launchpad/Initialize()
+	. = ..()
+	var/obj/item/weapon/circuitboard/machine/launchpad/B = new
+	B.apply_default_parts(src)
+
+/obj/item/weapon/circuitboard/machine/launchpad
+	name = "Bluespace Launchpad (Machine Board)"
+	build_path = /obj/machinery/launchpad
+	origin_tech = "programming=3;engineering=3;plasmatech=2;bluespace=3"
+	req_components = list(
+							/obj/item/weapon/ore/bluespace_crystal = 1,
+							/obj/item/weapon/stock_parts/manipulator = 1)
+	def_components = list(/obj/item/weapon/ore/bluespace_crystal = /obj/item/weapon/ore/bluespace_crystal/artificial)
+
+/obj/machinery/launchpad/RefreshParts()
+	var/E = -1 //to make default parts have the base value
+	for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
+		E += M.rating
+	range = initial(range)
+	range += E
+
+/obj/machinery/launchpad/attackby(obj/item/I, mob/user, params)
+	if(stationary)
+		if(default_deconstruction_screwdriver(user, "lpad-idle-o", "lpad-idle", I))
+			return
+
+		if(panel_open)
+			if(istype(I, /obj/item/device/multitool))
+				var/obj/item/device/multitool/M = I
+				M.buffer = src
+				to_chat(user, "<span class='notice'>You save the data in the [I.name]'s buffer.</span>")
+				return 1
+
+		if(exchange_parts(user, I))
+			return
+
+		if(default_deconstruction_crowbar(I))
+			return
+
+	return ..()
+
+/obj/machinery/launchpad/proc/isAvailable()
+	if(stat & NOPOWER)
+		return FALSE
+	if(panel_open)
+		return FALSE
+	return TRUE
+
+/obj/machinery/launchpad/proc/doteleport(mob/user, sending)
+	if(teleporting)
+		to_chat(user, "<span class='warning'>ERROR: Launchpad busy.</span>")
+		return
+
+	var/target_x = x + x_offset
+	var/target_y = y + y_offset
+	var/turf/target = locate(target_x, target_y, z)
+	var/area/A = get_area(target)
+
+	flick(icon_teleport, src)
+	playsound(get_turf(src), 'sound/weapons/flash.ogg', 25, 1)
+	teleporting = TRUE
+
+
+	sleep(teleport_speed)
+
+	if(QDELETED(src) || !isAvailable())
+		return
+
+	teleporting = FALSE
+
+	// use a lot of power
+	use_power(1000)
+
+	var/turf/source = target
+	var/turf/dest = get_turf(src)
+	var/list/log_msg = list()
+	log_msg += ": [key_name(user)] has teleported "
+
+	if(sending)
+		source = dest
+		dest = target
+
+	playsound(get_turf(src), 'sound/weapons/emitter2.ogg', 25, 1)
+	for(var/atom/movable/ROI in source)
+		if(ROI == src)
+			continue
+		// if it's anchored, don't teleport
+		if(ROI.anchored)
+			if(isliving(ROI))
+				var/mob/living/L = ROI
+				if(L.buckled)
+					// TP people on office chairs
+					if(L.buckled.anchored)
+						continue
+
+					log_msg += "[key_name(L)] (on a chair), "
+				else
+					continue
+			else if(!isobserver(ROI))
+				continue
+		if(ismob(ROI))
+			var/mob/T = ROI
+			log_msg += "[key_name(T)], "
+		else
+			log_msg += "[ROI.name]"
+			if (istype(ROI, /obj/structure/closet))
+				var/obj/structure/closet/C = ROI
+				log_msg += " ("
+				for(var/atom/movable/Q as mob|obj in C)
+					if(ismob(Q))
+						log_msg += "[key_name(Q)], "
+					else
+						log_msg += "[Q.name], "
+				if (dd_hassuffix(log_msg, "("))
+					log_msg += "empty)"
+				else
+					log_msg = dd_limittext(log_msg, length(log_msg) - 2)
+					log_msg += ")"
+			log_msg += ", "
+		do_teleport(ROI, dest)
+
+	if (dd_hassuffix(log_msg, ", "))
+		log_msg = dd_limittext(log_msg, length(log_msg) - 2)
+	else
+		log_msg += "nothing"
+	log_msg += " [sending ? "to" : "from"] [target_x], [target_y], [z] ([A ? A.name : "null area"])"
+	investigate_log(log_msg.Join(), "telesci")
+	updateDialog()
+
+//Starts in the briefcase. Don't spawn this directly, or it will runtime when closing.
+/obj/machinery/launchpad/briefcase
+	name = "briefcase launchpad"
+	desc = "A portable bluespace pad able to thrust matter through bluespace, teleporting it to or from nearby locations. Controlled via remote."
+	icon_state = "blpad-idle"
+	icon_teleport = "blpad-beam"
+	anchored = FALSE
+	use_power = FALSE
+	idle_power_usage = 0
+	active_power_usage = 0
+	teleport_speed = 20
+	range = 3
+	stationary = FALSE
+	var/closed = TRUE
+	var/obj/item/briefcase_launchpad/briefcase
+
+/obj/machinery/launchpad/briefcase/Initialize()
+	. = ..()
+	if(istype(loc, /obj/item/briefcase_launchpad))
+		briefcase = loc
+	else
+		log_game("[src] has been spawned without a briefcase.")
+		qdel(src)
+
+/obj/machinery/launchpad/briefcase/Destroy()
+	if(!QDELETED(briefcase))
+		qdel(briefcase)
+	briefcase = null
+	return ..()
+
+/obj/machinery/launchpad/briefcase/isAvailable()
+	if(closed)
+		return FALSE
+	return ..()
+
+/obj/machinery/launchpad/briefcase/MouseDrop(over_object, src_location, over_location)
+	. = ..()
+	if(over_object == usr && Adjacent(usr))
+		if(!briefcase || !usr.can_hold_items())
+			return
+		if(usr.incapacitated())
+			to_chat(usr, "<span class='warning'>You can't do that right now!</span>")
+			return
+		usr.visible_message("<span class='notice'>[usr] starts closing [src]...</span>", "<span class='notice'>You start closing [src]...</span>")
+		if(do_after(usr, 30, target = usr))
+			usr.put_in_hands(briefcase)
+			forceMove(briefcase)
+			closed = TRUE
+
+/obj/machinery/launchpad/briefcase/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/device/launchpad_remote))
+		var/obj/item/device/launchpad_remote/L = I
+		L.pad = src
+		to_chat(user, "<span class='notice'>You link [src] to [L].</span>")
+	else
+		return ..()
+
+//Briefcase item that contains the launchpad.
+/obj/item/briefcase_launchpad
+	name = "briefcase"
+	desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "briefcase"
+	flags = CONDUCT
+	force = 8
+	hitsound = "swing_hit"
+	throw_speed = 2
+	throw_range = 4
+	w_class = WEIGHT_CLASS_BULKY
+	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
+	resistance_flags = FLAMMABLE
+	obj_integrity = 150
+	max_integrity = 150
+	var/obj/machinery/launchpad/briefcase/pad
+
+/obj/item/briefcase_launchpad/Initialize()
+	. = ..()
+	pad = new(src)
+
+/obj/item/briefcase_launchpad/Destroy()
+	if(!QDELETED(pad))
+		qdel(pad)
+	pad = null
+	return ..()
+
+/obj/item/briefcase_launchpad/attack_self(mob/user)
+	if(!isturf(user.loc)) //no setting up in a locker
+		return
+	add_fingerprint(user)
+	user.visible_message("<span class='notice'>[user] starts setting down [src]...", "You start setting up [pad]...")
+	if(do_after(user, 30, target = user))
+		pad.forceMove(get_turf(src))
+		pad.closed = FALSE
+		user.transferItemToLoc(src, pad, TRUE)
+
+/obj/item/briefcase_launchpad/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/device/launchpad_remote))
+		var/obj/item/device/launchpad_remote/L = I
+		L.pad = src.pad
+		to_chat(user, "<span class='notice'>You link [pad] to [L].</span>")
+	else
+		return ..()
+
+/obj/item/device/launchpad_remote
+	name = "\improper Launchpad Control Remote"
+	desc = "Used to teleport objects to and from a portable launchpad."
+	icon = 'icons/obj/telescience.dmi'
+	icon_state = "blpad-remote"
+	w_class = WEIGHT_CLASS_SMALL
+	slot_flags = SLOT_BELT
+	origin_tech = "materials=3;magnets=2;bluespace=4;syndicate=3"
+	var/sending = TRUE
+	var/obj/machinery/launchpad/briefcase/pad
+
+/obj/item/device/launchpad_remote/ui_interact(mob/user, ui_key = "launchpad_remote", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "launchpad_remote", "Briefcase Launchpad Remote", 550, 400, master_ui, state) //width, height
+		ui.set_style("syndicate")
+		ui.open()
+
+	ui.set_autoupdate(TRUE)
+
+/obj/item/device/launchpad_remote/ui_data(mob/user)
+	var/list/data = list()
+	data["has_pad"] = pad ? TRUE : FALSE
+	if(pad)
+		data["pad_closed"] = pad.closed
+	if(!pad || pad.closed)
+		return data
+
+	data["pad_name"] = pad.display_name
+	data["abs_x"] = abs(pad.x_offset)
+	data["abs_y"] = abs(pad.y_offset)
+	data["north_south"] = pad.y_offset > 0 ? "N":"S"
+	data["east_west"] = pad.x_offset > 0 ? "E":"W"
+	return data
+
+/obj/item/device/launchpad_remote/proc/teleport(mob/user, obj/machinery/launchpad/pad)
+	if(QDELETED(pad))
+		to_chat(user, "<span class='warning'>ERROR: Launchpad not responding. Check launchpad integrity.</span>")
+		return
+	if(!pad.isAvailable())
+		to_chat(user, "<span class='warning'>ERROR: Launchpad not operative. Make sure the launchpad is ready and powered.</span>")
+		return
+	pad.doteleport(user, sending)
+
+/obj/item/device/launchpad_remote/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("right")
+			if(pad.x_offset < pad.range)
+				pad.x_offset++
+			. = TRUE
+
+		if("left")
+			if(pad.x_offset > (pad.range * -1))
+				pad.x_offset--
+			. = TRUE
+
+		if("up")
+			if(pad.y_offset < pad.range)
+				pad.y_offset++
+			. = TRUE
+
+		if("down")
+			if(pad.y_offset > (pad.range * -1))
+				pad.y_offset--
+			. = TRUE
+
+		if("up-right")
+			if(pad.y_offset < pad.range)
+				pad.y_offset++
+			if(pad.x_offset < pad.range)
+				pad.x_offset++
+			. = TRUE
+
+		if("up-left")
+			if(pad.y_offset < pad.range)
+				pad.y_offset++
+			if(pad.x_offset > (pad.range * -1))
+				pad.x_offset--
+			. = TRUE
+
+		if("down-right")
+			if(pad.y_offset > (pad.range * -1))
+				pad.y_offset--
+			if(pad.x_offset < pad.range)
+				pad.x_offset++
+			. = TRUE
+
+		if("down-left")
+			if(pad.y_offset > (pad.range * -1))
+				pad.y_offset--
+			if(pad.x_offset > (pad.range * -1))
+				pad.x_offset--
+			. = TRUE
+
+		if("reset")
+			pad.y_offset = 0
+			pad.x_offset = 0
+			. = TRUE
+
+		if("rename")
+			. = TRUE
+			var/new_name = stripped_input(usr, "How do you want to rename the launchpad?", "Launchpad", pad.display_name, 15) as text|null
+			if(!new_name)
+				return
+			pad.display_name = new_name
+
+		if("remove")
+			. = TRUE
+			if(usr && alert(usr, "Are you sure?", "Unlink Launchpad", "I'm Sure", "Abort") != "Abort")
+				pad = null
+
+		if("launch")
+			sending = TRUE
+			teleport(usr, pad)
+			. = TRUE
+
+		if("pull")
+			sending = FALSE
+			teleport(usr, pad)
+			. = TRUE

code/game/machinery/porta_turret/portable_turret.dm

@@ -87,6 +87,7 @@
 	if(has_cover)
 		cover = new /obj/machinery/porta_turret_cover(loc)
 		cover.parent_turret = src
+		underlays += image('icons/obj/turrets.dmi',icon_state = "basedark")
 	if(!has_cover)
 		INVOKE_ASYNC(src, .proc/popUp)
 

code/game/machinery/recycler.dm

@@ -1,211 +1,211 @@
-#define SAFETY_COOLDOWN 100
-
-/obj/machinery/recycler
-	name = "recycler"
-	desc = "A large crushing machine used to recycle small items inefficiently. There are lights on the side."
-	icon = 'icons/obj/recycling.dmi'
-	icon_state = "grinder-o0"
-	layer = ABOVE_ALL_MOB_LAYER // Overhead
-	anchored = 1
-	density = 1
-	var/safety_mode = FALSE // Temporarily stops machine if it detects a mob
-	var/icon_name = "grinder-o"
-	var/blood = 0
-	var/eat_dir = WEST
-	var/amount_produced = 50
-	var/datum/material_container/materials
-	var/crush_damage = 1000
-	var/eat_victim_items = TRUE
-	var/item_recycle_sound = 'sound/items/Welder.ogg'
-
-/obj/machinery/recycler/New()
-	..()
-	materials = new /datum/material_container(src, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM))
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/recycler(null)
-	B.apply_default_parts(src)
-	update_icon()
-
-/obj/item/weapon/circuitboard/machine/recycler
-	name = "Recycler (Machine Board)"
-	build_path = /obj/machinery/recycler
-	origin_tech = "programming=2;engineering=2"
-	req_components = list(
-							/obj/item/weapon/stock_parts/matter_bin = 1,
-							/obj/item/weapon/stock_parts/manipulator = 1)
-
-/obj/machinery/recycler/RefreshParts()
-	var/amt_made = 0
-	var/mat_mod = 0
-	for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts)
-		mat_mod = 2 * B.rating
-	mat_mod *= 50000
-	for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
-		amt_made = 12.5 * M.rating //% of materials salvaged
-	materials.max_amount = mat_mod
-	amount_produced = min(50, amt_made) + 50
-
-/obj/machinery/recycler/examine(mob/user)
-	..()
-	to_chat(user, "The power light is [(stat & NOPOWER) ? "off" : "on"].")
-	to_chat(user, "The safety-mode light is [safety_mode ? "on" : "off"].")
-	to_chat(user, "The safety-sensors status light is [emagged ? "off" : "on"].")
-
-/obj/machinery/recycler/power_change()
-	..()
-	update_icon()
-
-
-/obj/machinery/recycler/attackby(obj/item/I, mob/user, params)
-	if(default_deconstruction_screwdriver(user, "grinder-oOpen", "grinder-o0", I))
-		return
-
-	if(exchange_parts(user, I))
-		return
-
-	if(default_pry_open(I))
-		return
-
-	if(default_unfasten_wrench(user, I))
-		return
-
-	if(default_deconstruction_crowbar(I))
-		return
-	return ..()
-
-/obj/machinery/recycler/emag_act(mob/user)
-	if(!emagged)
-		emagged = TRUE
-		if(safety_mode)
-			safety_mode = FALSE
-			update_icon()
-		playsound(src.loc, "sparks", 75, 1, -1)
-		to_chat(user, "<span class='notice'>You use the cryptographic sequencer on the [src.name].</span>")
-
-/obj/machinery/recycler/update_icon()
-	..()
-	var/is_powered = !(stat & (BROKEN|NOPOWER))
-	if(safety_mode)
-		is_powered = FALSE
-	icon_state = icon_name + "[is_powered]" + "[(blood ? "bld" : "")]" // add the blood tag at the end
-
-// This is purely for admin possession !FUN!.
-/obj/machinery/recycler/Bump(atom/movable/AM)
-	..()
-	if(AM)
-		Bumped(AM)
-
-
-/obj/machinery/recycler/Bumped(atom/movable/AM)
-
-	if(stat & (BROKEN|NOPOWER))
-		return
-	if(!anchored)
-		return
-	if(safety_mode)
-		return
-
-	var/move_dir = get_dir(loc, AM.loc)
-	if(move_dir == eat_dir)
-		eat(AM)
-
-/obj/machinery/recycler/proc/eat(atom/AM0, sound=TRUE)
-	var/list/to_eat
-	if(istype(AM0, /obj/item))
-		to_eat = AM0.GetAllContents()
-	else
-		to_eat = list(AM0)
-
-	var/items_recycled = 0
-
-	for(var/i in to_eat)
-		var/atom/movable/AM = i
-		var/obj/item/bodypart/head/as_head = AM
-		var/obj/item/device/mmi/as_mmi = AM
+#define SAFETY_COOLDOWN 100
+
+/obj/machinery/recycler
+	name = "recycler"
+	desc = "A large crushing machine used to recycle small items inefficiently. There are lights on the side."
+	icon = 'icons/obj/recycling.dmi'
+	icon_state = "grinder-o0"
+	layer = ABOVE_ALL_MOB_LAYER // Overhead
+	anchored = 1
+	density = 1
+	var/safety_mode = FALSE // Temporarily stops machine if it detects a mob
+	var/icon_name = "grinder-o"
+	var/blood = 0
+	var/eat_dir = WEST
+	var/amount_produced = 50
+	var/datum/material_container/materials
+	var/crush_damage = 1000
+	var/eat_victim_items = TRUE
+	var/item_recycle_sound = 'sound/items/Welder.ogg'
+
+/obj/machinery/recycler/New()
+	..()
+	materials = new /datum/material_container(src, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM))
+	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/recycler(null)
+	B.apply_default_parts(src)
+	update_icon()
+
+/obj/item/weapon/circuitboard/machine/recycler
+	name = "Recycler (Machine Board)"
+	build_path = /obj/machinery/recycler
+	origin_tech = "programming=2;engineering=2"
+	req_components = list(
+							/obj/item/weapon/stock_parts/matter_bin = 1,
+							/obj/item/weapon/stock_parts/manipulator = 1)
+
+/obj/machinery/recycler/RefreshParts()
+	var/amt_made = 0
+	var/mat_mod = 0
+	for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts)
+		mat_mod = 2 * B.rating
+	mat_mod *= 50000
+	for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
+		amt_made = 12.5 * M.rating //% of materials salvaged
+	materials.max_amount = mat_mod
+	amount_produced = min(50, amt_made) + 50
+
+/obj/machinery/recycler/examine(mob/user)
+	..()
+	to_chat(user, "The power light is [(stat & NOPOWER) ? "off" : "on"].")
+	to_chat(user, "The safety-mode light is [safety_mode ? "on" : "off"].")
+	to_chat(user, "The safety-sensors status light is [emagged ? "off" : "on"].")
+
+/obj/machinery/recycler/power_change()
+	..()
+	update_icon()
+
+
+/obj/machinery/recycler/attackby(obj/item/I, mob/user, params)
+	if(default_deconstruction_screwdriver(user, "grinder-oOpen", "grinder-o0", I))
+		return
+
+	if(exchange_parts(user, I))
+		return
+
+	if(default_pry_open(I))
+		return
+
+	if(default_unfasten_wrench(user, I))
+		return
+
+	if(default_deconstruction_crowbar(I))
+		return
+	return ..()
+
+/obj/machinery/recycler/emag_act(mob/user)
+	if(!emagged)
+		emagged = TRUE
+		if(safety_mode)
+			safety_mode = FALSE
+			update_icon()
+		playsound(src.loc, "sparks", 75, 1, -1)
+		to_chat(user, "<span class='notice'>You use the cryptographic sequencer on the [src.name].</span>")
+
+/obj/machinery/recycler/update_icon()
+	..()
+	var/is_powered = !(stat & (BROKEN|NOPOWER))
+	if(safety_mode)
+		is_powered = FALSE
+	icon_state = icon_name + "[is_powered]" + "[(blood ? "bld" : "")]" // add the blood tag at the end
+
+// This is purely for admin possession !FUN!.
+/obj/machinery/recycler/Bump(atom/movable/AM)
+	..()
+	if(AM)
+		Bumped(AM)
+
+
+/obj/machinery/recycler/Bumped(atom/movable/AM)
+
+	if(stat & (BROKEN|NOPOWER))
+		return
+	if(!anchored)
+		return
+	if(safety_mode)
+		return
+
+	var/move_dir = get_dir(loc, AM.loc)
+	if(move_dir == eat_dir)
+		eat(AM)
+
+/obj/machinery/recycler/proc/eat(atom/AM0, sound=TRUE)
+	var/list/to_eat
+	if(istype(AM0, /obj/item))
+		to_eat = AM0.GetAllContents()
+	else
+		to_eat = list(AM0)
+
+	var/items_recycled = 0
+
+	for(var/i in to_eat)
+		var/atom/movable/AM = i
+		var/obj/item/bodypart/head/as_head = AM
+		var/obj/item/device/mmi/as_mmi = AM
 		var/brain_holder = istype(AM, /obj/item/organ/brain) || (istype(as_head) && as_head.brain) || (istype(as_mmi) && as_mmi.brain) || istype(AM, /mob/living/brain)
-		if(isliving(AM) || brain_holder)
-			if(emagged)
-				if(!brain_holder)
-					crush_living(AM)
-			else
-				emergency_stop(AM)
-		else if(istype(AM, /obj/item))
-			recycle_item(AM)
-			items_recycled++
-		else
-			playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
-			AM.loc = src.loc
-
-	if(items_recycled && sound)
-		playsound(src.loc, item_recycle_sound, 50, 1)
-
-/obj/machinery/recycler/proc/recycle_item(obj/item/I)
-	I.loc = src.loc
-
-	var/material_amount = materials.get_item_material_amount(I)
-	if(!material_amount)
-		qdel(I)
-		return
-	materials.insert_item(I, multiplier = (amount_produced / 100))
-	qdel(I)
-	materials.retrieve_all()
-
-
-/obj/machinery/recycler/proc/emergency_stop(mob/living/L)
-	playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
-	safety_mode = TRUE
-	update_icon()
-	L.loc = src.loc
-	addtimer(CALLBACK(src, .proc/reboot), SAFETY_COOLDOWN)
-
-/obj/machinery/recycler/proc/reboot()
-	playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
-	safety_mode = FALSE
-	update_icon()
-
-/obj/machinery/recycler/proc/crush_living(mob/living/L)
-
-	L.loc = src.loc
-
-	if(issilicon(L))
-		playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
-	else
-		playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
-
-	var/gib = TRUE
-	// By default, the emagged recycler will gib all non-carbons. (human simple animal mobs don't count)
-	if(iscarbon(L))
-		gib = FALSE
-		if(L.stat == CONSCIOUS)
-			L.say("ARRRRRRRRRRRGH!!!")
-		add_mob_blood(L)
-
-	if(!blood && !issilicon(L))
-		blood = TRUE
-		update_icon()
-
-	// Remove and recycle the equipped items
-	if(eat_victim_items)
-		for(var/obj/item/I in L.get_equipped_items())
-			if(L.dropItemToGround(I))
-				eat(I, sound=FALSE)
-
-	// Instantly lie down, also go unconscious from the pain, before you die.
-	L.Paralyse(5)
-
-	// For admin fun, var edit emagged to 2.
-	if(gib || emagged == 2)
-		L.gib()
-	else if(emagged == 1)
-		L.adjustBruteLoss(crush_damage)
-
-/obj/machinery/recycler/deathtrap
-	name = "dangerous old crusher"
-	emagged = TRUE
-	crush_damage = 120
-	flags = NODECONSTRUCT
-
-/obj/item/weapon/paper/recycler
-	name = "paper - 'garbage duty instructions'"
-	info = "<h2>New Assignment</h2> You have been assigned to collect garbage from trash bins, located around the station. The crewmembers will put their trash into it and you will collect the said trash.<br><br>There is a recycling machine near your closet, inside maintenance; use it to recycle the trash for a small chance to get useful minerals. Then deliver these minerals to cargo or engineering. You are our last hope for a clean station, do not screw this up!"
-
+		if(isliving(AM) || brain_holder)
+			if(emagged)
+				if(!brain_holder)
+					crush_living(AM)
+			else
+				emergency_stop(AM)
+		else if(istype(AM, /obj/item))
+			recycle_item(AM)
+			items_recycled++
+		else
+			playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
+			AM.loc = src.loc
+
+	if(items_recycled && sound)
+		playsound(src.loc, item_recycle_sound, 50, 1)
+
+/obj/machinery/recycler/proc/recycle_item(obj/item/I)
+	I.loc = src.loc
+
+	var/material_amount = materials.get_item_material_amount(I)
+	if(!material_amount)
+		qdel(I)
+		return
+	materials.insert_item(I, multiplier = (amount_produced / 100))
+	qdel(I)
+	materials.retrieve_all()
+
+
+/obj/machinery/recycler/proc/emergency_stop(mob/living/L)
+	playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
+	safety_mode = TRUE
+	update_icon()
+	L.loc = src.loc
+	addtimer(CALLBACK(src, .proc/reboot), SAFETY_COOLDOWN)
+
+/obj/machinery/recycler/proc/reboot()
+	playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
+	safety_mode = FALSE
+	update_icon()
+
+/obj/machinery/recycler/proc/crush_living(mob/living/L)
+
+	L.loc = src.loc
+
+	if(issilicon(L))
+		playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
+	else
+		playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
+
+	var/gib = TRUE
+	// By default, the emagged recycler will gib all non-carbons. (human simple animal mobs don't count)
+	if(iscarbon(L))
+		gib = FALSE
+		if(L.stat == CONSCIOUS)
+			L.say("ARRRRRRRRRRRGH!!!")
+		add_mob_blood(L)
+
+	if(!blood && !issilicon(L))
+		blood = TRUE
+		update_icon()
+
+	// Remove and recycle the equipped items
+	if(eat_victim_items)
+		for(var/obj/item/I in L.get_equipped_items())
+			if(L.dropItemToGround(I))
+				eat(I, sound=FALSE)
+
+	// Instantly lie down, also go unconscious from the pain, before you die.
+	L.Paralyse(5)
+
+	// For admin fun, var edit emagged to 2.
+	if(gib || emagged == 2)
+		L.gib()
+	else if(emagged == 1)
+		L.adjustBruteLoss(crush_damage)
+
+/obj/machinery/recycler/deathtrap
+	name = "dangerous old crusher"
+	emagged = TRUE
+	crush_damage = 120
+	flags = NODECONSTRUCT
+
+/obj/item/weapon/paper/recycler
+	name = "paper - 'garbage duty instructions'"
+	info = "<h2>New Assignment</h2> You have been assigned to collect garbage from trash bins, located around the station. The crewmembers will put their trash into it and you will collect the said trash.<br><br>There is a recycling machine near your closet, inside maintenance; use it to recycle the trash for a small chance to get useful minerals. Then deliver these minerals to cargo or engineering. You are our last hope for a clean station, do not screw this up!"
+
 #undef SAFETY_COOLDOWN

code/game/machinery/suit_storage_unit.dm

@@ -1,388 +1,388 @@
-// SUIT STORAGE UNIT /////////////////
-/obj/machinery/suit_storage_unit
-	name = "suit storage unit"
-	desc = "An industrial unit made to hold space suits. It comes with a built-in UV cauterization mechanism. A small warning label advises that organic matter should not be placed into the unit."
-	icon = 'icons/obj/suitstorage.dmi'
-	icon_state = "close"
-	anchored = 1
-	density = 1
-	obj_integrity = 250
-	max_integrity = 250
-
-	var/obj/item/clothing/suit/space/suit = null
-	var/obj/item/clothing/head/helmet/space/helmet = null
-	var/obj/item/clothing/mask/mask = null
-	var/obj/item/storage = null
-
-	var/suit_type = null
-	var/helmet_type = null
-	var/mask_type = null
-	var/storage_type = null
-
-	state_open = FALSE
-	var/locked = FALSE
-	panel_open = FALSE
-	var/safeties = TRUE
-
-	var/uv = FALSE
-	var/uv_super = FALSE
-	var/uv_cycles = 6
-
-/obj/machinery/suit_storage_unit/standard_unit
-	suit_type = /obj/item/clothing/suit/space/eva
-	helmet_type = /obj/item/clothing/head/helmet/space/eva
-	mask_type = /obj/item/clothing/mask/breath
-
-/obj/machinery/suit_storage_unit/captain
-	suit_type = /obj/item/clothing/suit/space/hardsuit/captain
-	mask_type = /obj/item/clothing/mask/gas/sechailer
-	storage_type = /obj/item/weapon/tank/jetpack/oxygen/captain
-
-/obj/machinery/suit_storage_unit/engine
-	suit_type = /obj/item/clothing/suit/space/hardsuit/engine
-	mask_type = /obj/item/clothing/mask/breath
-
-/obj/machinery/suit_storage_unit/ce
-	suit_type = /obj/item/clothing/suit/space/hardsuit/engine/elite
-	mask_type = /obj/item/clothing/mask/breath
-	storage_type= /obj/item/clothing/shoes/magboots/advance
-
-/obj/machinery/suit_storage_unit/security
-	suit_type = /obj/item/clothing/suit/space/hardsuit/security
-	mask_type = /obj/item/clothing/mask/gas/sechailer
-
-/obj/machinery/suit_storage_unit/hos
-	suit_type = /obj/item/clothing/suit/space/hardsuit/security/hos
-	mask_type = /obj/item/clothing/mask/gas/sechailer
-	storage_type = /obj/item/weapon/tank/internals/oxygen
-
-/obj/machinery/suit_storage_unit/atmos
-	suit_type = /obj/item/clothing/suit/space/hardsuit/engine/atmos
-	mask_type = /obj/item/clothing/mask/gas
-	storage_type = /obj/item/weapon/watertank/atmos
-
-/obj/machinery/suit_storage_unit/mining
-	suit_type = /obj/item/clothing/suit/hooded/explorer
-	mask_type = /obj/item/clothing/mask/gas/explorer
-
-/obj/machinery/suit_storage_unit/mining/eva
-	suit_type = /obj/item/clothing/suit/space/hardsuit/mining
-	mask_type = /obj/item/clothing/mask/breath
-
-/obj/machinery/suit_storage_unit/cmo
-	suit_type = /obj/item/clothing/suit/space/hardsuit/medical
-	mask_type = /obj/item/clothing/mask/breath
-
-/obj/machinery/suit_storage_unit/rd
-	suit_type = /obj/item/clothing/suit/space/hardsuit/rd
-	mask_type = /obj/item/clothing/mask/breath
-
-/obj/machinery/suit_storage_unit/syndicate
-	suit_type = /obj/item/clothing/suit/space/hardsuit/syndi
-	mask_type = /obj/item/clothing/mask/gas/syndicate
-	storage_type = /obj/item/weapon/tank/jetpack/oxygen/harness
-
-/obj/machinery/suit_storage_unit/ert/command
-	suit_type = /obj/item/clothing/suit/space/hardsuit/ert
-	mask_type = /obj/item/clothing/mask/breath
-	storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double
-
-/obj/machinery/suit_storage_unit/ert/security
-	suit_type = /obj/item/clothing/suit/space/hardsuit/ert/sec
-	mask_type = /obj/item/clothing/mask/breath
-	storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double
-
-/obj/machinery/suit_storage_unit/ert/engineer
-	suit_type = /obj/item/clothing/suit/space/hardsuit/ert/engi
-	mask_type = /obj/item/clothing/mask/breath
-	storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double
-
-/obj/machinery/suit_storage_unit/ert/medical
-	suit_type = /obj/item/clothing/suit/space/hardsuit/ert/med
-	mask_type = /obj/item/clothing/mask/breath
-	storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double
-
-/obj/machinery/suit_storage_unit/New()
-	..()
-	wires = new /datum/wires/suit_storage_unit(src)
-	if(suit_type)
-		suit = new suit_type(src)
-	if(helmet_type)
-		helmet = new helmet_type(src)
-	if(mask_type)
-		mask = new mask_type(src)
-	if(storage_type)
-		storage = new storage_type(src)
-	update_icon()
-
-/obj/machinery/suit_storage_unit/Destroy()
-	if(suit)
-		qdel(suit)
-		suit = null
-	if(helmet)
-		qdel(helmet)
-		helmet = null
-	if(mask)
-		qdel(mask)
-		mask = null
-	if(storage)
-		qdel(storage)
-		storage = null
-	return ..()
-
-/obj/machinery/suit_storage_unit/update_icon()
-	cut_overlays()
-
-	if(uv)
-		if(uv_super)
-			add_overlay("super")
-		else if(occupant)
-			add_overlay("uvhuman")
-		else
-			add_overlay("uv")
-	else if(state_open)
-		if(stat & BROKEN)
-			add_overlay("broken")
-		else
-			add_overlay("open")
-			if(suit)
-				add_overlay("suit")
-			if(helmet)
-				add_overlay("helm")
-			if(storage)
-				add_overlay("storage")
-	else if(occupant)
-		add_overlay("human")
-
-/obj/machinery/suit_storage_unit/power_change()
-	..()
-	if(!is_operational() && state_open)
-		open_machine()
-		dump_contents()
-	update_icon()
-
-/obj/machinery/suit_storage_unit/proc/dump_contents()
-	dropContents()
-	helmet = null
-	suit = null
-	mask = null
-	storage = null
-	occupant = null
-
-/obj/machinery/suit_storage_unit/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
-		open_machine()
-		dump_contents()
-		new /obj/item/stack/sheet/metal (loc, 2)
-	qdel(src)
-
-/obj/machinery/suit_storage_unit/MouseDrop_T(atom/A, mob/user)
-	if(user.stat || user.lying || !Adjacent(user) || !Adjacent(A) || !isliving(A))
-		return
-	var/mob/living/target = A
-	if(!state_open)
-		to_chat(user, "<span class='warning'>The unit's doors are shut!</span>")
-		return
-	if(!is_operational())
-		to_chat(user, "<span class='warning'>The unit is not operational!</span>")
-		return
-	if(occupant || helmet || suit || storage)
-		to_chat(user, "<span class='warning'>It's too cluttered inside to fit in!</span>")
-		return
-
-	if(target == user)
-		user.visible_message("<span class='warning'>[user] starts squeezing into [src]!</span>", "<span class='notice'>You start working your way into [src]...</span>")
-	else
-		target.visible_message("<span class='warning'>[user] starts shoving [target] into [src]!</span>", "<span class='userdanger'>[user] starts shoving you into [src]!</span>")
-
-	if(do_mob(user, target, 30))
-		if(occupant || helmet || suit || storage)
-			return
-		if(target == user)
-			user.visible_message("<span class='warning'>[user] slips into [src] and closes the door behind them!</span>", "<span class=notice'>You slip into [src]'s cramped space and shut its door.</span>")
-		else
-			target.visible_message("<span class='warning'>[user] pushes [target] into [src] and shuts its door!<span>", "<span class='userdanger'>[user] shoves you into [src] and shuts the door!</span>")
-		close_machine(target)
-		add_fingerprint(user)
-
-/obj/machinery/suit_storage_unit/proc/cook()
-	if(uv_cycles)
-		uv_cycles--
-		uv = TRUE
-		locked = TRUE
-		update_icon()
+// SUIT STORAGE UNIT /////////////////
+/obj/machinery/suit_storage_unit
+	name = "suit storage unit"
+	desc = "An industrial unit made to hold space suits. It comes with a built-in UV cauterization mechanism. A small warning label advises that organic matter should not be placed into the unit."
+	icon = 'icons/obj/suitstorage.dmi'
+	icon_state = "close"
+	anchored = 1
+	density = 1
+	obj_integrity = 250
+	max_integrity = 250
+
+	var/obj/item/clothing/suit/space/suit = null
+	var/obj/item/clothing/head/helmet/space/helmet = null
+	var/obj/item/clothing/mask/mask = null
+	var/obj/item/storage = null
+
+	var/suit_type = null
+	var/helmet_type = null
+	var/mask_type = null
+	var/storage_type = null
+
+	state_open = FALSE
+	var/locked = FALSE
+	panel_open = FALSE
+	var/safeties = TRUE
+
+	var/uv = FALSE
+	var/uv_super = FALSE
+	var/uv_cycles = 6
+
+/obj/machinery/suit_storage_unit/standard_unit
+	suit_type = /obj/item/clothing/suit/space/eva
+	helmet_type = /obj/item/clothing/head/helmet/space/eva
+	mask_type = /obj/item/clothing/mask/breath
+
+/obj/machinery/suit_storage_unit/captain
+	suit_type = /obj/item/clothing/suit/space/hardsuit/captain
+	mask_type = /obj/item/clothing/mask/gas/sechailer
+	storage_type = /obj/item/weapon/tank/jetpack/oxygen/captain
+
+/obj/machinery/suit_storage_unit/engine
+	suit_type = /obj/item/clothing/suit/space/hardsuit/engine
+	mask_type = /obj/item/clothing/mask/breath
+
+/obj/machinery/suit_storage_unit/ce
+	suit_type = /obj/item/clothing/suit/space/hardsuit/engine/elite
+	mask_type = /obj/item/clothing/mask/breath
+	storage_type= /obj/item/clothing/shoes/magboots/advance
+
+/obj/machinery/suit_storage_unit/security
+	suit_type = /obj/item/clothing/suit/space/hardsuit/security
+	mask_type = /obj/item/clothing/mask/gas/sechailer
+
+/obj/machinery/suit_storage_unit/hos
+	suit_type = /obj/item/clothing/suit/space/hardsuit/security/hos
+	mask_type = /obj/item/clothing/mask/gas/sechailer
+	storage_type = /obj/item/weapon/tank/internals/oxygen
+
+/obj/machinery/suit_storage_unit/atmos
+	suit_type = /obj/item/clothing/suit/space/hardsuit/engine/atmos
+	mask_type = /obj/item/clothing/mask/gas
+	storage_type = /obj/item/weapon/watertank/atmos
+
+/obj/machinery/suit_storage_unit/mining
+	suit_type = /obj/item/clothing/suit/hooded/explorer
+	mask_type = /obj/item/clothing/mask/gas/explorer
+
+/obj/machinery/suit_storage_unit/mining/eva
+	suit_type = /obj/item/clothing/suit/space/hardsuit/mining
+	mask_type = /obj/item/clothing/mask/breath
+
+/obj/machinery/suit_storage_unit/cmo
+	suit_type = /obj/item/clothing/suit/space/hardsuit/medical
+	mask_type = /obj/item/clothing/mask/breath
+
+/obj/machinery/suit_storage_unit/rd
+	suit_type = /obj/item/clothing/suit/space/hardsuit/rd
+	mask_type = /obj/item/clothing/mask/breath
+
+/obj/machinery/suit_storage_unit/syndicate
+	suit_type = /obj/item/clothing/suit/space/hardsuit/syndi
+	mask_type = /obj/item/clothing/mask/gas/syndicate
+	storage_type = /obj/item/weapon/tank/jetpack/oxygen/harness
+
+/obj/machinery/suit_storage_unit/ert/command
+	suit_type = /obj/item/clothing/suit/space/hardsuit/ert
+	mask_type = /obj/item/clothing/mask/breath
+	storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double
+
+/obj/machinery/suit_storage_unit/ert/security
+	suit_type = /obj/item/clothing/suit/space/hardsuit/ert/sec
+	mask_type = /obj/item/clothing/mask/breath
+	storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double
+
+/obj/machinery/suit_storage_unit/ert/engineer
+	suit_type = /obj/item/clothing/suit/space/hardsuit/ert/engi
+	mask_type = /obj/item/clothing/mask/breath
+	storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double
+
+/obj/machinery/suit_storage_unit/ert/medical
+	suit_type = /obj/item/clothing/suit/space/hardsuit/ert/med
+	mask_type = /obj/item/clothing/mask/breath
+	storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double
+
+/obj/machinery/suit_storage_unit/New()
+	..()
+	wires = new /datum/wires/suit_storage_unit(src)
+	if(suit_type)
+		suit = new suit_type(src)
+	if(helmet_type)
+		helmet = new helmet_type(src)
+	if(mask_type)
+		mask = new mask_type(src)
+	if(storage_type)
+		storage = new storage_type(src)
+	update_icon()
+
+/obj/machinery/suit_storage_unit/Destroy()
+	if(suit)
+		qdel(suit)
+		suit = null
+	if(helmet)
+		qdel(helmet)
+		helmet = null
+	if(mask)
+		qdel(mask)
+		mask = null
+	if(storage)
+		qdel(storage)
+		storage = null
+	return ..()
+
+/obj/machinery/suit_storage_unit/update_icon()
+	cut_overlays()
+
+	if(uv)
+		if(uv_super)
+			add_overlay("super")
+		else if(occupant)
+			add_overlay("uvhuman")
+		else
+			add_overlay("uv")
+	else if(state_open)
+		if(stat & BROKEN)
+			add_overlay("broken")
+		else
+			add_overlay("open")
+			if(suit)
+				add_overlay("suit")
+			if(helmet)
+				add_overlay("helm")
+			if(storage)
+				add_overlay("storage")
+	else if(occupant)
+		add_overlay("human")
+
+/obj/machinery/suit_storage_unit/power_change()
+	..()
+	if(!is_operational() && state_open)
+		open_machine()
+		dump_contents()
+	update_icon()
+
+/obj/machinery/suit_storage_unit/proc/dump_contents()
+	dropContents()
+	helmet = null
+	suit = null
+	mask = null
+	storage = null
+	occupant = null
+
+/obj/machinery/suit_storage_unit/deconstruct(disassembled = TRUE)
+	if(!(flags & NODECONSTRUCT))
+		open_machine()
+		dump_contents()
+		new /obj/item/stack/sheet/metal (loc, 2)
+	qdel(src)
+
+/obj/machinery/suit_storage_unit/MouseDrop_T(atom/A, mob/user)
+	if(user.stat || user.lying || !Adjacent(user) || !Adjacent(A) || !isliving(A))
+		return
+	var/mob/living/target = A
+	if(!state_open)
+		to_chat(user, "<span class='warning'>The unit's doors are shut!</span>")
+		return
+	if(!is_operational())
+		to_chat(user, "<span class='warning'>The unit is not operational!</span>")
+		return
+	if(occupant || helmet || suit || storage)
+		to_chat(user, "<span class='warning'>It's too cluttered inside to fit in!</span>")
+		return
+
+	if(target == user)
+		user.visible_message("<span class='warning'>[user] starts squeezing into [src]!</span>", "<span class='notice'>You start working your way into [src]...</span>")
+	else
+		target.visible_message("<span class='warning'>[user] starts shoving [target] into [src]!</span>", "<span class='userdanger'>[user] starts shoving you into [src]!</span>")
+
+	if(do_mob(user, target, 30))
+		if(occupant || helmet || suit || storage)
+			return
+		if(target == user)
+			user.visible_message("<span class='warning'>[user] slips into [src] and closes the door behind them!</span>", "<span class=notice'>You slip into [src]'s cramped space and shut its door.</span>")
+		else
+			target.visible_message("<span class='warning'>[user] pushes [target] into [src] and shuts its door!<span>", "<span class='userdanger'>[user] shoves you into [src] and shuts the door!</span>")
+		close_machine(target)
+		add_fingerprint(user)
+
+/obj/machinery/suit_storage_unit/proc/cook()
+	if(uv_cycles)
+		uv_cycles--
+		uv = TRUE
+		locked = TRUE
+		update_icon()
 		if(occupant)
 			var/mob/living/mob_occupant = occupant
-			if(uv_super)
+			if(uv_super)
 				mob_occupant.adjustFireLoss(rand(20, 36))
-			else
+			else
 				mob_occupant.adjustFireLoss(rand(10, 16))
 			mob_occupant.emote("scream")
-		addtimer(CALLBACK(src, .proc/cook), 50)
-	else
-		uv_cycles = initial(uv_cycles)
-		uv = FALSE
-		locked = FALSE
-		if(uv_super)
-			visible_message("<span class='warning'>[src]'s door creaks open with a loud whining noise. A cloud of foul black smoke escapes from its chamber.</span>")
-			playsound(src, 'sound/machines/airlock_alien_prying.ogg', 50, 1)
-			helmet = null
-			qdel(helmet)
-			suit = null
-			qdel(suit) // Delete everything but the occupant.
-			mask = null
-			qdel(mask)
-			storage = null
-			qdel(storage)
-			// The wires get damaged too.
-			wires.cut_all()
-		else
-			if(!occupant)
-				visible_message("<span class='notice'>[src]'s door slides open. The glowing yellow lights dim to a gentle green.</span>")
-			else
-				visible_message("<span class='warning'>[src]'s door slides open, barraging you with the nauseating smell of charred flesh.</span>")
-			playsound(src, 'sound/machines/AirlockClose.ogg', 25, 1)
-			for(var/obj/item/I in src) //Scorches away blood and forensic evidence, although the SSU itself is unaffected
-				I.clean_blood()
-				I.fingerprints = list()
-		open_machine(FALSE)
-		if(occupant)
-			dump_contents()
-
-/obj/machinery/suit_storage_unit/proc/shock(mob/user, prb)
-	if(!prob(prb))
-		var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-		s.set_up(5, 1, src)
-		s.start()
-		if(electrocute_mob(user, src, src, 1, TRUE))
-			return 1
-
-/obj/machinery/suit_storage_unit/relaymove(mob/user)
-	container_resist(user)
-
-/obj/machinery/suit_storage_unit/container_resist(mob/living/user)
-	add_fingerprint(user)
-	if(locked)
-		visible_message("<span class='notice'>You see [user] kicking against the doors of [src]!</span>", "<span class='notice'>You start kicking against the doors...</span>")
-		addtimer(CALLBACK(src, .proc/resist_open, user), 300)
-	else
-		open_machine()
-		dump_contents()
-
-/obj/machinery/suit_storage_unit/proc/resist_open(mob/user)
-	if(!state_open && occupant && (user in src) && user.stat == 0) // Check they're still here.
-		visible_message("<span class='notice'>You see [user] bursts out of [src]!</span>", "<span class='notice'>You escape the cramped confines of [src]!</span>")
-		open_machine()
-
-/obj/machinery/suit_storage_unit/attackby(obj/item/I, mob/user, params)
-	if(state_open && is_operational())
-		if(istype(I, /obj/item/clothing/suit/space))
-			if(suit)
-				to_chat(user, "<span class='warning'>The unit already contains a suit!.</span>")
-				return
-			if(!user.drop_item())
-				return
-			suit = I
-		else if(istype(I, /obj/item/clothing/head/helmet))
-			if(helmet)
-				to_chat(user, "<span class='warning'>The unit already contains a helmet!</span>")
-				return
-			if(!user.drop_item())
-				return
-			helmet = I
-		else if(istype(I, /obj/item/clothing/mask))
-			if(mask)
-				to_chat(user, "<span class='warning'>The unit already contains a mask!</span>")
-				return
-			if(!user.drop_item())
-				return
-			mask = I
-		else
-			if(storage)
-				to_chat(user, "<span class='warning'>The auxiliary storage compartment is full!</span>")
-				return
-			if(!user.drop_item())
-				return
-			storage = I
-
-		I.loc = src
-		visible_message("<span class='notice'>[user] inserts [I] into [src]</span>", "<span class='notice'>You load [I] into [src].</span>")
-		update_icon()
-		return
-
-	if(panel_open && is_wire_tool(I))
-		wires.interact(user)
-	if(!state_open)
-		if(default_deconstruction_screwdriver(user, "panel", "close", I))
-			return
-	if(default_pry_open(I))
-		dump_contents()
-		return
-
-	return ..()
-
-/obj/machinery/suit_storage_unit/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
-										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "suit_storage_unit", name, 400, 305, master_ui, state)
-		ui.open()
-
-/obj/machinery/suit_storage_unit/ui_data()
-	var/list/data = list()
-	data["locked"] = locked
-	data["open"] = state_open
-	data["safeties"] = safeties
-	data["uv_active"] = uv
-	data["uv_super"] = uv_super
-	if(helmet)
-		data["helmet"] = helmet.name
-	if(suit)
-		data["suit"] = suit.name
-	if(mask)
-		data["mask"] = mask.name
-	if(storage)
-		data["storage"] = storage.name
-	if(occupant)
-		data["occupied"] = 1
-	return data
-
-/obj/machinery/suit_storage_unit/ui_act(action, params)
-	if(..() || uv)
-		return
-	switch(action)
-		if("door")
-			if(state_open)
-				close_machine()
-			else
-				open_machine(0)
-				if(occupant)
-					dump_contents() // Dump out contents if someone is in there.
-			. = TRUE
-		if("lock")
-			locked = !locked
-			. = TRUE
-		if("uv")
-			if(occupant && safeties)
-				return
-			else if(!helmet && !mask && !suit && !storage && !occupant)
-				return
-			else
+		addtimer(CALLBACK(src, .proc/cook), 50)
+	else
+		uv_cycles = initial(uv_cycles)
+		uv = FALSE
+		locked = FALSE
+		if(uv_super)
+			visible_message("<span class='warning'>[src]'s door creaks open with a loud whining noise. A cloud of foul black smoke escapes from its chamber.</span>")
+			playsound(src, 'sound/machines/airlock_alien_prying.ogg', 50, 1)
+			helmet = null
+			qdel(helmet)
+			suit = null
+			qdel(suit) // Delete everything but the occupant.
+			mask = null
+			qdel(mask)
+			storage = null
+			qdel(storage)
+			// The wires get damaged too.
+			wires.cut_all()
+		else
+			if(!occupant)
+				visible_message("<span class='notice'>[src]'s door slides open. The glowing yellow lights dim to a gentle green.</span>")
+			else
+				visible_message("<span class='warning'>[src]'s door slides open, barraging you with the nauseating smell of charred flesh.</span>")
+			playsound(src, 'sound/machines/AirlockClose.ogg', 25, 1)
+			for(var/obj/item/I in src) //Scorches away blood and forensic evidence, although the SSU itself is unaffected
+				I.clean_blood()
+				I.fingerprints = list()
+		open_machine(FALSE)
+		if(occupant)
+			dump_contents()
+
+/obj/machinery/suit_storage_unit/proc/shock(mob/user, prb)
+	if(!prob(prb))
+		var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
+		s.set_up(5, 1, src)
+		s.start()
+		if(electrocute_mob(user, src, src, 1, TRUE))
+			return 1
+
+/obj/machinery/suit_storage_unit/relaymove(mob/user)
+	container_resist(user)
+
+/obj/machinery/suit_storage_unit/container_resist(mob/living/user)
+	add_fingerprint(user)
+	if(locked)
+		visible_message("<span class='notice'>You see [user] kicking against the doors of [src]!</span>", "<span class='notice'>You start kicking against the doors...</span>")
+		addtimer(CALLBACK(src, .proc/resist_open, user), 300)
+	else
+		open_machine()
+		dump_contents()
+
+/obj/machinery/suit_storage_unit/proc/resist_open(mob/user)
+	if(!state_open && occupant && (user in src) && user.stat == 0) // Check they're still here.
+		visible_message("<span class='notice'>You see [user] bursts out of [src]!</span>", "<span class='notice'>You escape the cramped confines of [src]!</span>")
+		open_machine()
+
+/obj/machinery/suit_storage_unit/attackby(obj/item/I, mob/user, params)
+	if(state_open && is_operational())
+		if(istype(I, /obj/item/clothing/suit/space))
+			if(suit)
+				to_chat(user, "<span class='warning'>The unit already contains a suit!.</span>")
+				return
+			if(!user.drop_item())
+				return
+			suit = I
+		else if(istype(I, /obj/item/clothing/head/helmet))
+			if(helmet)
+				to_chat(user, "<span class='warning'>The unit already contains a helmet!</span>")
+				return
+			if(!user.drop_item())
+				return
+			helmet = I
+		else if(istype(I, /obj/item/clothing/mask))
+			if(mask)
+				to_chat(user, "<span class='warning'>The unit already contains a mask!</span>")
+				return
+			if(!user.drop_item())
+				return
+			mask = I
+		else
+			if(storage)
+				to_chat(user, "<span class='warning'>The auxiliary storage compartment is full!</span>")
+				return
+			if(!user.drop_item())
+				return
+			storage = I
+
+		I.loc = src
+		visible_message("<span class='notice'>[user] inserts [I] into [src]</span>", "<span class='notice'>You load [I] into [src].</span>")
+		update_icon()
+		return
+
+	if(panel_open && is_wire_tool(I))
+		wires.interact(user)
+	if(!state_open)
+		if(default_deconstruction_screwdriver(user, "panel", "close", I))
+			return
+	if(default_pry_open(I))
+		dump_contents()
+		return
+
+	return ..()
+
+/obj/machinery/suit_storage_unit/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
+										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "suit_storage_unit", name, 400, 305, master_ui, state)
+		ui.open()
+
+/obj/machinery/suit_storage_unit/ui_data()
+	var/list/data = list()
+	data["locked"] = locked
+	data["open"] = state_open
+	data["safeties"] = safeties
+	data["uv_active"] = uv
+	data["uv_super"] = uv_super
+	if(helmet)
+		data["helmet"] = helmet.name
+	if(suit)
+		data["suit"] = suit.name
+	if(mask)
+		data["mask"] = mask.name
+	if(storage)
+		data["storage"] = storage.name
+	if(occupant)
+		data["occupied"] = 1
+	return data
+
+/obj/machinery/suit_storage_unit/ui_act(action, params)
+	if(..() || uv)
+		return
+	switch(action)
+		if("door")
+			if(state_open)
+				close_machine()
+			else
+				open_machine(0)
+				if(occupant)
+					dump_contents() // Dump out contents if someone is in there.
+			. = TRUE
+		if("lock")
+			locked = !locked
+			. = TRUE
+		if("uv")
+			if(occupant && safeties)
+				return
+			else if(!helmet && !mask && !suit && !storage && !occupant)
+				return
+			else
 				if(occupant)
 					var/mob/living/mob_occupant = occupant
 					to_chat(mob_occupant, "<span class='userdanger'>[src]'s confines grow warm, then hot, then scorching. You're being burned [!mob_occupant.stat ? "alive" : "away"]!</span>")
-				cook()
-				. = TRUE
-		if("dispense")
-			if(!state_open)
-				return
+				cook()
+				. = TRUE
+		if("dispense")
+			if(!state_open)
+				return
 
-			var/static/list/valid_items = list("helmet", "suit", "mask", "storage")
-			var/item_name = params["item"]
-			if(item_name in valid_items)
-				var/obj/item/I = vars[item_name]
-				vars[item_name] = null
-				if(I)
-					I.forceMove(loc)
-			. = TRUE
-	update_icon()
+			var/static/list/valid_items = list("helmet", "suit", "mask", "storage")
+			var/item_name = params["item"]
+			if(item_name in valid_items)
+				var/obj/item/I = vars[item_name]
+				vars[item_name] = null
+				if(I)
+					I.forceMove(loc)
+			. = TRUE
+	update_icon()

code/game/machinery/vending.dm

@@ -48,6 +48,7 @@
 	var/icon_deny				//Icon_state when vending!
 	var/seconds_electrified = 0	//Shock customers like an airlock.
 	var/shoot_inventory = 0		//Fire items at customers! We're broken!
+	var/shoot_inventory_chance = 2
 	var/shut_up = 0				//Stop spouting those godawful pitches!
 	var/extended_inventory = 0	//can we access the hidden inventory?
 	var/scan_id = 1
@@ -561,7 +562,7 @@
 		speak(slogan)
 		last_slogan = world.time
 
-	if(shoot_inventory && prob(2))
+	if(shoot_inventory && prob(shoot_inventory_chance))
 		throw_item()
 
 
@@ -592,7 +593,7 @@
 	if(!target)
 		return 0
 
-	for(var/datum/data/vending_product/R in product_records)
+	for(var/datum/data/vending_product/R in shuffle(product_records))
 		if(R.amount <= 0) //Try to use a record that actually has something to dump.
 			continue
 		var/dump_path = R.product_path
@@ -605,19 +606,22 @@
 	if(!throw_item)
 		return 0
 
+	pre_throw(throw_item)
+
 	throw_item.throw_at(target, 16, 3)
 	visible_message("<span class='danger'>[src] launches [throw_item] at [target]!</span>")
 	return 1
 
+/obj/machinery/vending/proc/pre_throw(obj/item/I)
+	return
+
 
 /obj/machinery/vending/proc/shock(mob/user, prb)
 	if(stat & (BROKEN|NOPOWER))		// unpowered, no shock
 		return FALSE
 	if(!prob(prb))
 		return FALSE
-	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-	s.set_up(5, 1, src)
-	s.start()
+	do_sparks(5, TRUE, src)
 	var/tmp/check_range = TRUE
 	if(electrocute_mob(user, get_area(src), src, 0.7, check_range))
 		return TRUE
@@ -864,6 +868,11 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	/obj/item/weapon/storage/fancy/cigarettes/cigars = 1, /obj/item/weapon/storage/fancy/cigarettes/cigars/havana = 1, /obj/item/weapon/storage/fancy/cigarettes/cigars/cohiba = 1)
 	refill_canister = /obj/item/weapon/vending_refill/cigarette
 
+/obj/machinery/vending/cigarette/pre_throw(obj/item/I)
+	if(istype(I, /obj/item/weapon/lighter))
+		var/obj/item/weapon/lighter/L = I
+		L.set_lit(TRUE)
+
 /obj/machinery/vending/medical
 	name = "\improper NanoMed Plus"
 	desc = "Medical drug dispenser."
@@ -919,6 +928,15 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50)
 	resistance_flags = FIRE_PROOF
 
+/obj/machinery/vending/security/pre_throw(obj/item/I)
+	if(istype(I, /obj/item/weapon/grenade))
+		var/obj/item/weapon/grenade/G = I
+		G.preprime()
+	else if(istype(I, /obj/item/device/flashlight))
+		var/obj/item/device/flashlight/F = I
+		F.on = TRUE
+		F.update_brightness()
+
 /obj/machinery/vending/hydronutrients
 	name = "\improper NutriMax"
 	desc = "A plant nutrients vendor."
@@ -947,7 +965,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 						/obj/item/seeds/tea = 3,/obj/item/seeds/tobacco = 3,/obj/item/seeds/tomato = 3,
 						/obj/item/seeds/tower = 3,/obj/item/seeds/watermelon = 3,/obj/item/seeds/wheat = 3,/obj/item/seeds/whitebeet = 3)
 	contraband = list(/obj/item/seeds/amanita = 2,/obj/item/seeds/glowshroom = 2,/obj/item/seeds/liberty = 2,/obj/item/seeds/nettle = 2,
-						/obj/item/seeds/plump = 2,/obj/item/seeds/reishi = 2,/obj/item/seeds/cannabis = 3, /obj/item/seeds/random = 2)
+						/obj/item/seeds/plump = 2,/obj/item/seeds/reishi = 2,/obj/item/seeds/cannabis = 3,/obj/item/seeds/starthistle = 2,
+						/obj/item/seeds/random = 2)
 	premium = list(/obj/item/weapon/reagent_containers/spray/waterflower = 1)
 	armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50)
 	resistance_flags = FIRE_PROOF

code/game/mecha/equipment/weapons/weapons.dm

@@ -1,435 +1,435 @@
-/obj/item/mecha_parts/mecha_equipment/weapon
-	name = "mecha weapon"
-	range = RANGED
-	origin_tech = "materials=3;combat=3"
-	var/projectile
-	var/fire_sound
-	var/projectiles_per_shot = 1
-	var/variance = 0
-	var/randomspread = 0 //use random spread for machineguns, instead of shotgun scatter
-	var/projectile_delay = 0
-	var/firing_effect_type = /obj/effect/overlay/temp/dir_setting/firing_effect	//the visual effect appearing when the weapon is fired.
-
-/obj/item/mecha_parts/mecha_equipment/weapon/can_attach(obj/mecha/combat/M)
-	if(..())
-		if(istype(M))
-			return 1
-	return 0
-
-/obj/item/mecha_parts/mecha_equipment/weapon/proc/get_shot_amount()
-	return projectiles_per_shot
-
-/obj/item/mecha_parts/mecha_equipment/weapon/action(atom/target, params)
-	if(!action_checks(target))
-		return 0
-
-	var/turf/curloc = get_turf(chassis)
-	var/turf/targloc = get_turf(target)
-	if (!targloc || !istype(targloc) || !curloc)
-		return 0
-	if (targloc == curloc)
-		return 0
-
-	set_ready_state(0)
-	for(var/i=1 to get_shot_amount())
-		var/obj/item/projectile/A = new projectile(curloc)
-		A.firer = chassis.occupant
-		A.original = target
-		A.current = curloc
-		if(!A.suppressed && firing_effect_type)
-			new firing_effect_type(get_turf(src), chassis.dir)
-
-
-		var/spread = 0
-		if(variance)
-			if(randomspread)
-				spread = round((rand() - 0.5) * variance)
-			else
-				spread = round((i / projectiles_per_shot - 0.5) * variance)
-		A.preparePixelProjectile(target, targloc, chassis.occupant, params, spread)
-
-		A.fire()
-		playsound(chassis, fire_sound, 50, 1)
-
-		sleep(max(0, projectile_delay))
-
-	chassis.log_message("Fired from [src.name], targeting [target].")
-	return 1
-
-
-//Base energy weapon type
-/obj/item/mecha_parts/mecha_equipment/weapon/energy
-	name = "general energy weapon"
-	firing_effect_type = /obj/effect/overlay/temp/dir_setting/firing_effect/energy
-
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/get_shot_amount()
-	return min(round(chassis.cell.charge / energy_drain), projectiles_per_shot)
-
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/start_cooldown()
-	set_ready_state(0)
-	chassis.use_power(energy_drain*get_shot_amount())
-	addtimer(CALLBACK(src, .proc/set_ready_state, 1), equip_cooldown)
-
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
-	equip_cooldown = 8
-	name = "\improper CH-PS \"Immolator\" laser"
-	desc = "A weapon for combat exosuits. Shoots basic lasers."
-	icon_state = "mecha_laser"
-	origin_tech = "magnets=3;combat=3;engineering=3"
-	energy_drain = 30
-	projectile = /obj/item/projectile/beam/laser
-	fire_sound = 'sound/weapons/Laser.ogg'
-
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
-	equip_cooldown = 15
-	name = "\improper CH-LC \"Solaris\" laser cannon"
-	desc = "A weapon for combat exosuits. Shoots heavy lasers."
-	icon_state = "mecha_laser"
-	origin_tech = "magnets=4;combat=4;engineering=3"
-	energy_drain = 60
-	projectile = /obj/item/projectile/beam/laser/heavylaser
-	fire_sound = 'sound/weapons/lasercannonfire.ogg'
-
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/ion
-	equip_cooldown = 20
-	name = "\improper MKIV ion heavy cannon"
-	desc = "A weapon for combat exosuits. Shoots technology-disabling ion beams. Don't catch yourself in the blast!"
-	icon_state = "mecha_ion"
-	origin_tech = "materials=4;combat=5;magnets=4"
-	energy_drain = 120
-	projectile = /obj/item/projectile/ion
-	fire_sound = 'sound/weapons/Laser.ogg'
-
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/tesla
-	equip_cooldown = 35
-	name = "\improper MKI Tesla Cannon"
-	desc = "A weapon for combat exosuits. Fires bolts of electricity similar to the experimental tesla engine"
-	icon_state = "mecha_ion"
-	origin_tech = "materials=4;engineering=4;combat=6;magnets=6"
-	energy_drain = 500
+/obj/item/mecha_parts/mecha_equipment/weapon
+	name = "mecha weapon"
+	range = RANGED
+	origin_tech = "materials=3;combat=3"
+	var/projectile
+	var/fire_sound
+	var/projectiles_per_shot = 1
+	var/variance = 0
+	var/randomspread = 0 //use random spread for machineguns, instead of shotgun scatter
+	var/projectile_delay = 0
+	var/firing_effect_type = /obj/effect/overlay/temp/dir_setting/firing_effect	//the visual effect appearing when the weapon is fired.
+
+/obj/item/mecha_parts/mecha_equipment/weapon/can_attach(obj/mecha/combat/M)
+	if(..())
+		if(istype(M))
+			return 1
+	return 0
+
+/obj/item/mecha_parts/mecha_equipment/weapon/proc/get_shot_amount()
+	return projectiles_per_shot
+
+/obj/item/mecha_parts/mecha_equipment/weapon/action(atom/target, params)
+	if(!action_checks(target))
+		return 0
+
+	var/turf/curloc = get_turf(chassis)
+	var/turf/targloc = get_turf(target)
+	if (!targloc || !istype(targloc) || !curloc)
+		return 0
+	if (targloc == curloc)
+		return 0
+
+	set_ready_state(0)
+	for(var/i=1 to get_shot_amount())
+		var/obj/item/projectile/A = new projectile(curloc)
+		A.firer = chassis.occupant
+		A.original = target
+		A.current = curloc
+		if(!A.suppressed && firing_effect_type)
+			new firing_effect_type(get_turf(src), chassis.dir)
+
+
+		var/spread = 0
+		if(variance)
+			if(randomspread)
+				spread = round((rand() - 0.5) * variance)
+			else
+				spread = round((i / projectiles_per_shot - 0.5) * variance)
+		A.preparePixelProjectile(target, targloc, chassis.occupant, params, spread)
+
+		A.fire()
+		playsound(chassis, fire_sound, 50, 1)
+
+		sleep(max(0, projectile_delay))
+
+	chassis.log_message("Fired from [src.name], targeting [target].")
+	return 1
+
+
+//Base energy weapon type
+/obj/item/mecha_parts/mecha_equipment/weapon/energy
+	name = "general energy weapon"
+	firing_effect_type = /obj/effect/overlay/temp/dir_setting/firing_effect/energy
+
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/get_shot_amount()
+	return min(round(chassis.cell.charge / energy_drain), projectiles_per_shot)
+
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/start_cooldown()
+	set_ready_state(0)
+	chassis.use_power(energy_drain*get_shot_amount())
+	addtimer(CALLBACK(src, .proc/set_ready_state, 1), equip_cooldown)
+
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
+	equip_cooldown = 8
+	name = "\improper CH-PS \"Immolator\" laser"
+	desc = "A weapon for combat exosuits. Shoots basic lasers."
+	icon_state = "mecha_laser"
+	origin_tech = "magnets=3;combat=3;engineering=3"
+	energy_drain = 30
+	projectile = /obj/item/projectile/beam/laser
+	fire_sound = 'sound/weapons/Laser.ogg'
+
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
+	equip_cooldown = 15
+	name = "\improper CH-LC \"Solaris\" laser cannon"
+	desc = "A weapon for combat exosuits. Shoots heavy lasers."
+	icon_state = "mecha_laser"
+	origin_tech = "magnets=4;combat=4;engineering=3"
+	energy_drain = 60
+	projectile = /obj/item/projectile/beam/laser/heavylaser
+	fire_sound = 'sound/weapons/lasercannonfire.ogg'
+
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/ion
+	equip_cooldown = 20
+	name = "\improper MKIV ion heavy cannon"
+	desc = "A weapon for combat exosuits. Shoots technology-disabling ion beams. Don't catch yourself in the blast!"
+	icon_state = "mecha_ion"
+	origin_tech = "materials=4;combat=5;magnets=4"
+	energy_drain = 120
+	projectile = /obj/item/projectile/ion
+	fire_sound = 'sound/weapons/Laser.ogg'
+
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/tesla
+	equip_cooldown = 35
+	name = "\improper MKI Tesla Cannon"
+	desc = "A weapon for combat exosuits. Fires bolts of electricity similar to the experimental tesla engine"
+	icon_state = "mecha_ion"
+	origin_tech = "materials=4;engineering=4;combat=6;magnets=6"
+	energy_drain = 500
 	projectile = /obj/item/projectile/energy/tesla/cannon
-	fire_sound = 'sound/magic/lightningbolt.ogg'
-
-
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse
-	equip_cooldown = 30
-	name = "eZ-13 MK2 heavy pulse rifle"
-	desc = "A weapon for combat exosuits. Shoots powerful destructive blasts capable of demolishing obstacles."
-	icon_state = "mecha_pulse"
-	energy_drain = 120
-	origin_tech = "materials=3;combat=6;powerstorage=4"
-	projectile = /obj/item/projectile/beam/pulse/heavy
-	fire_sound = 'sound/weapons/marauder.ogg'
-
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma
-	equip_cooldown = 10
-	name = "217-D Heavy Plasma Cutter"
-	desc = "A device that shoots resonant plasma bursts at extreme velocity. The blasts are capable of crushing rock and demolishing solid obstacles."
-	icon_state = "mecha_plasmacutter"
-	item_state = "plasmacutter"
-	energy_drain = 30
-	origin_tech = "materials=3;plasmatech=4;engineering=3"
-	projectile = /obj/item/projectile/plasma/adv/mech
-	fire_sound = 'sound/weapons/plasma_cutter.ogg'
-
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma/can_attach(obj/mecha/working/M)
-	if(..()) //combat mech
-		return 1
-	else if(M.equipment.len < M.max_equip && istype(M))
-		return 1
-	return 0
-
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser
-	name = "\improper PBT \"Pacifier\" mounted taser"
-	desc = "A weapon for combat exosuits. Shoots non-lethal stunning electrodes."
-	icon_state = "mecha_taser"
-	origin_tech = "combat=3"
-	energy_drain = 20
-	equip_cooldown = 8
-	projectile = /obj/item/projectile/energy/electrode
-	fire_sound = 'sound/weapons/Taser.ogg'
-
-
-/obj/item/mecha_parts/mecha_equipment/weapon/honker
-	name = "\improper HoNkER BlAsT 5000"
-	desc = "Equipment for clown exosuits. Spreads fun and joy to everyone around. Honk!"
-	icon_state = "mecha_honker"
-	energy_drain = 200
-	equip_cooldown = 150
-	range = MELEE|RANGED
-
-/obj/item/mecha_parts/mecha_equipment/weapon/honker/can_attach(obj/mecha/combat/honker/M)
-	if(..())
-		if(istype(M))
-			return 1
-	return 0
-
-/obj/item/mecha_parts/mecha_equipment/weapon/honker/action(target, params)
-	if(!action_checks(target))
-		return
-	playsound(chassis, 'sound/items/AirHorn.ogg', 100, 1)
-	chassis.occupant_message("<font color='red' size='5'>HONK</font>")
-	for(var/mob/living/carbon/M in ohearers(6, chassis))
-		if(ishuman(M))
-			var/mob/living/carbon/human/H = M
-			if(istype(H.ears, /obj/item/clothing/ears/earmuffs))
-				continue
-		to_chat(M, "<font color='red' size='7'>HONK</font>")
-		M.SetSleeping(0)
-		M.stuttering += 20
-		M.adjustEarDamage(0, 30)
-		M.Weaken(3)
-		if(prob(30))
-			M.Stun(10)
-			M.Paralyse(4)
-		else
-			M.Jitter(500)
-
-	log_message("Honked from [src.name]. HONK!")
-	var/turf/T = get_turf(src)
-	message_admins("[ADMIN_LOOKUPFLW(chassis.occupant)] used a Mecha Honker in [ADMIN_COORDJMP(T)]",0,1)
-	log_game("[chassis.occupant.ckey]([chassis.occupant]) used a Mecha Honker in [COORD(T)]")
-	return 1
-
-
-//Base ballistic weapon type
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic
-	name = "general ballisic weapon"
-	fire_sound = 'sound/weapons/Gunshot.ogg'
-	var/projectiles
-	var/projectile_energy_cost
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/get_shot_amount()
-	return min(projectiles, projectiles_per_shot)
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/action_checks(target)
-	if(!..())
-		return 0
-	if(projectiles <= 0)
-		return 0
-	return 1
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/get_equip_info()
-	return "[..()] \[[src.projectiles]\][(src.projectiles < initial(src.projectiles))?" - <a href='?src=\ref[src];rearm=1'>Rearm</a>":null]"
-
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/rearm()
-	if(projectiles < initial(projectiles))
-		var/projectiles_to_add = initial(projectiles) - projectiles
-		while(chassis.get_charge() >= projectile_energy_cost && projectiles_to_add)
-			projectiles++
-			projectiles_to_add--
-			chassis.use_power(projectile_energy_cost)
-	send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info())
-	log_message("Rearmed [src.name].")
-	return 1
-
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/needs_rearm()
-	. = !(projectiles > 0)
-
-
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/Topic(href, href_list)
-	..()
-	if (href_list["rearm"])
-		src.rearm()
-	return
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/action(atom/target)
-	if(..())
-		projectiles -= get_shot_amount()
-		send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info())
-		return 1
-
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine
-	name = "\improper FNX-99 \"Hades\" Carbine"
-	desc = "A weapon for combat exosuits. Shoots incendiary bullets."
-	icon_state = "mecha_carbine"
-	origin_tech = "materials=4;combat=4"
-	equip_cooldown = 10
-	projectile = /obj/item/projectile/bullet/incendiary/shell
-	projectiles = 24
-	projectile_energy_cost = 15
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced
-	name = "\improper S.H.H. \"Quietus\" Carbine"
-	desc = "A weapon for combat exosuits. A mime invention, field tests have shown that targets cannot even scream before going down."
-	fire_sound = 'sound/weapons/Gunshot_silenced.ogg'
-	icon_state = "mecha_mime"
-	equip_cooldown = 30
-	projectile = /obj/item/projectile/bullet/mime
-	projectiles = 6
-	projectile_energy_cost = 50
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
-	name = "\improper LBX AC 10 \"Scattershot\""
-	desc = "A weapon for combat exosuits. Shoots a spread of pellets."
-	icon_state = "mecha_scatter"
-	origin_tech = "combat=4"
-	equip_cooldown = 20
-	projectile = /obj/item/projectile/bullet/midbullet
-	projectiles = 40
-	projectile_energy_cost = 25
-	projectiles_per_shot = 4
-	variance = 25
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
-	name = "\improper Ultra AC 2"
-	desc = "A weapon for combat exosuits. Shoots a rapid, three shot burst."
-	icon_state = "mecha_uac2"
-	origin_tech = "combat=4"
-	equip_cooldown = 10
-	projectile = /obj/item/projectile/bullet/weakbullet3
-	projectiles = 300
-	projectile_energy_cost = 20
-	projectiles_per_shot = 3
-	variance = 6
-	randomspread = 1
-	projectile_delay = 2
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
-	name = "\improper SRM-8 missile rack"
-	desc = "A weapon for combat exosuits. Shoots light explosive missiles."
-	icon_state = "mecha_missilerack"
-	origin_tech = "combat=5;materials=4;engineering=4"
-	projectile = /obj/item/projectile/bullet/srmrocket
-	fire_sound = 'sound/weapons/grenadelaunch.ogg'
-	projectiles = 8
-	projectile_energy_cost = 1000
-	equip_cooldown = 60
-
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher
-	var/missile_speed = 2
-	var/missile_range = 30
-	var/diags_first = FALSE
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/action(target)
-	if(!action_checks(target))
-		return
-	var/obj/O = new projectile(chassis.loc)
-	playsound(chassis, fire_sound, 50, 1)
-	log_message("Launched a [O.name] from [name], targeting [target].")
-	projectiles--
-	proj_init(O)
-	O.throw_at(target, missile_range, missile_speed, spin = 0, diagonals_first = diags_first)
-	return 1
-
-//used for projectile initilisation (priming flashbang) and additional logging
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/proc/proj_init(var/obj/O)
-	return
-
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang
-	name = "\improper SGL-6 grenade launcher"
-	desc = "A weapon for combat exosuits. Launches primed flashbangs."
-	icon_state = "mecha_grenadelnchr"
-	origin_tech = "combat=4;engineering=4"
-	projectile = /obj/item/weapon/grenade/flashbang
-	fire_sound = 'sound/weapons/grenadelaunch.ogg'
-	projectiles = 6
-	missile_speed = 1.5
-	projectile_energy_cost = 800
-	equip_cooldown = 60
-	var/det_time = 20
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/proj_init(var/obj/item/weapon/grenade/flashbang/F)
-	var/turf/T = get_turf(src)
+	fire_sound = 'sound/magic/lightningbolt.ogg'
+
+
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse
+	equip_cooldown = 30
+	name = "eZ-13 MK2 heavy pulse rifle"
+	desc = "A weapon for combat exosuits. Shoots powerful destructive blasts capable of demolishing obstacles."
+	icon_state = "mecha_pulse"
+	energy_drain = 120
+	origin_tech = "materials=3;combat=6;powerstorage=4"
+	projectile = /obj/item/projectile/beam/pulse/heavy
+	fire_sound = 'sound/weapons/marauder.ogg'
+
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma
+	equip_cooldown = 10
+	name = "217-D Heavy Plasma Cutter"
+	desc = "A device that shoots resonant plasma bursts at extreme velocity. The blasts are capable of crushing rock and demolishing solid obstacles."
+	icon_state = "mecha_plasmacutter"
+	item_state = "plasmacutter"
+	energy_drain = 30
+	origin_tech = "materials=3;plasmatech=4;engineering=3"
+	projectile = /obj/item/projectile/plasma/adv/mech
+	fire_sound = 'sound/weapons/plasma_cutter.ogg'
+
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma/can_attach(obj/mecha/working/M)
+	if(..()) //combat mech
+		return 1
+	else if(M.equipment.len < M.max_equip && istype(M))
+		return 1
+	return 0
+
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser
+	name = "\improper PBT \"Pacifier\" mounted taser"
+	desc = "A weapon for combat exosuits. Shoots non-lethal stunning electrodes."
+	icon_state = "mecha_taser"
+	origin_tech = "combat=3"
+	energy_drain = 20
+	equip_cooldown = 8
+	projectile = /obj/item/projectile/energy/electrode
+	fire_sound = 'sound/weapons/Taser.ogg'
+
+
+/obj/item/mecha_parts/mecha_equipment/weapon/honker
+	name = "\improper HoNkER BlAsT 5000"
+	desc = "Equipment for clown exosuits. Spreads fun and joy to everyone around. Honk!"
+	icon_state = "mecha_honker"
+	energy_drain = 200
+	equip_cooldown = 150
+	range = MELEE|RANGED
+
+/obj/item/mecha_parts/mecha_equipment/weapon/honker/can_attach(obj/mecha/combat/honker/M)
+	if(..())
+		if(istype(M))
+			return 1
+	return 0
+
+/obj/item/mecha_parts/mecha_equipment/weapon/honker/action(target, params)
+	if(!action_checks(target))
+		return
+	playsound(chassis, 'sound/items/AirHorn.ogg', 100, 1)
+	chassis.occupant_message("<font color='red' size='5'>HONK</font>")
+	for(var/mob/living/carbon/M in ohearers(6, chassis))
+		if(ishuman(M))
+			var/mob/living/carbon/human/H = M
+			if(istype(H.ears, /obj/item/clothing/ears/earmuffs))
+				continue
+		to_chat(M, "<font color='red' size='7'>HONK</font>")
+		M.SetSleeping(0)
+		M.stuttering += 20
+		M.adjustEarDamage(0, 30)
+		M.Weaken(3)
+		if(prob(30))
+			M.Stun(10)
+			M.Paralyse(4)
+		else
+			M.Jitter(500)
+
+	log_message("Honked from [src.name]. HONK!")
+	var/turf/T = get_turf(src)
+	message_admins("[ADMIN_LOOKUPFLW(chassis.occupant)] used a Mecha Honker in [ADMIN_COORDJMP(T)]",0,1)
+	log_game("[chassis.occupant.ckey]([chassis.occupant]) used a Mecha Honker in [COORD(T)]")
+	return 1
+
+
+//Base ballistic weapon type
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic
+	name = "general ballisic weapon"
+	fire_sound = 'sound/weapons/Gunshot.ogg'
+	var/projectiles
+	var/projectile_energy_cost
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/get_shot_amount()
+	return min(projectiles, projectiles_per_shot)
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/action_checks(target)
+	if(!..())
+		return 0
+	if(projectiles <= 0)
+		return 0
+	return 1
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/get_equip_info()
+	return "[..()] \[[src.projectiles]\][(src.projectiles < initial(src.projectiles))?" - <a href='?src=\ref[src];rearm=1'>Rearm</a>":null]"
+
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/rearm()
+	if(projectiles < initial(projectiles))
+		var/projectiles_to_add = initial(projectiles) - projectiles
+		while(chassis.get_charge() >= projectile_energy_cost && projectiles_to_add)
+			projectiles++
+			projectiles_to_add--
+			chassis.use_power(projectile_energy_cost)
+	send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info())
+	log_message("Rearmed [src.name].")
+	return 1
+
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/needs_rearm()
+	. = !(projectiles > 0)
+
+
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/Topic(href, href_list)
+	..()
+	if (href_list["rearm"])
+		src.rearm()
+	return
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/action(atom/target)
+	if(..())
+		projectiles -= get_shot_amount()
+		send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info())
+		return 1
+
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine
+	name = "\improper FNX-99 \"Hades\" Carbine"
+	desc = "A weapon for combat exosuits. Shoots incendiary bullets."
+	icon_state = "mecha_carbine"
+	origin_tech = "materials=4;combat=4"
+	equip_cooldown = 10
+	projectile = /obj/item/projectile/bullet/incendiary/shell
+	projectiles = 24
+	projectile_energy_cost = 15
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced
+	name = "\improper S.H.H. \"Quietus\" Carbine"
+	desc = "A weapon for combat exosuits. A mime invention, field tests have shown that targets cannot even scream before going down."
+	fire_sound = 'sound/weapons/Gunshot_silenced.ogg'
+	icon_state = "mecha_mime"
+	equip_cooldown = 30
+	projectile = /obj/item/projectile/bullet/mime
+	projectiles = 6
+	projectile_energy_cost = 50
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
+	name = "\improper LBX AC 10 \"Scattershot\""
+	desc = "A weapon for combat exosuits. Shoots a spread of pellets."
+	icon_state = "mecha_scatter"
+	origin_tech = "combat=4"
+	equip_cooldown = 20
+	projectile = /obj/item/projectile/bullet/midbullet
+	projectiles = 40
+	projectile_energy_cost = 25
+	projectiles_per_shot = 4
+	variance = 25
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
+	name = "\improper Ultra AC 2"
+	desc = "A weapon for combat exosuits. Shoots a rapid, three shot burst."
+	icon_state = "mecha_uac2"
+	origin_tech = "combat=4"
+	equip_cooldown = 10
+	projectile = /obj/item/projectile/bullet/weakbullet3
+	projectiles = 300
+	projectile_energy_cost = 20
+	projectiles_per_shot = 3
+	variance = 6
+	randomspread = 1
+	projectile_delay = 2
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
+	name = "\improper SRM-8 missile rack"
+	desc = "A weapon for combat exosuits. Shoots light explosive missiles."
+	icon_state = "mecha_missilerack"
+	origin_tech = "combat=5;materials=4;engineering=4"
+	projectile = /obj/item/projectile/bullet/srmrocket
+	fire_sound = 'sound/weapons/grenadelaunch.ogg'
+	projectiles = 8
+	projectile_energy_cost = 1000
+	equip_cooldown = 60
+
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher
+	var/missile_speed = 2
+	var/missile_range = 30
+	var/diags_first = FALSE
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/action(target)
+	if(!action_checks(target))
+		return
+	var/obj/O = new projectile(chassis.loc)
+	playsound(chassis, fire_sound, 50, 1)
+	log_message("Launched a [O.name] from [name], targeting [target].")
+	projectiles--
+	proj_init(O)
+	O.throw_at(target, missile_range, missile_speed, spin = 0, diagonals_first = diags_first)
+	return 1
+
+//used for projectile initilisation (priming flashbang) and additional logging
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/proc/proj_init(var/obj/O)
+	return
+
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang
+	name = "\improper SGL-6 grenade launcher"
+	desc = "A weapon for combat exosuits. Launches primed flashbangs."
+	icon_state = "mecha_grenadelnchr"
+	origin_tech = "combat=4;engineering=4"
+	projectile = /obj/item/weapon/grenade/flashbang
+	fire_sound = 'sound/weapons/grenadelaunch.ogg'
+	projectiles = 6
+	missile_speed = 1.5
+	projectile_energy_cost = 800
+	equip_cooldown = 60
+	var/det_time = 20
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/proj_init(var/obj/item/weapon/grenade/flashbang/F)
+	var/turf/T = get_turf(src)
 	message_admins("[ADMIN_LOOKUPFLW(chassis.occupant)] fired a [src] in [ADMIN_COORDJMP(T)]",0,1)
 	log_game("[key_name(chassis.occupant)] fired a [src] [COORD(T)]")
-	addtimer(CALLBACK(F, /obj/item/weapon/grenade/flashbang.proc/prime), det_time)
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/clusterbang //Because I am a heartless bastard -Sieve //Heartless? for making the poor man's honkblast? - Kaze
-	name = "\improper SOB-3 grenade launcher"
-	desc = "A weapon for combat exosuits. Launches primed clusterbangs. You monster."
-	origin_tech = "combat=4;materials=4"
-	projectiles = 3
-	projectile = /obj/item/weapon/grenade/clusterbuster
-	projectile_energy_cost = 1600 //getting off cheap seeing as this is 3 times the flashbangs held in the grenade launcher.
-	equip_cooldown = 90
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar
-	name = "banana mortar"
-	desc = "Equipment for clown exosuits. Launches banana peels."
-	icon_state = "mecha_bananamrtr"
-	projectile = /obj/item/weapon/grown/bananapeel
-	fire_sound = 'sound/items/bikehorn.ogg'
-	projectiles = 15
-	missile_speed = 1.5
-	projectile_energy_cost = 100
-	equip_cooldown = 20
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/can_attach(obj/mecha/combat/honker/M)
-	if(..())
-		if(istype(M))
-			return 1
-	return 0
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/mousetrap_mortar
-	name = "mousetrap mortar"
-	desc = "Equipment for clown exosuits. Launches armed mousetraps."
-	icon_state = "mecha_mousetrapmrtr"
-	projectile = /obj/item/device/assembly/mousetrap/armed
-	fire_sound = 'sound/items/bikehorn.ogg'
-	projectiles = 15
-	missile_speed = 1.5
-	projectile_energy_cost = 100
-	equip_cooldown = 10
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/mousetrap_mortar/can_attach(obj/mecha/combat/honker/M)
-	if(..())
-		if(istype(M))
-			return 1
-	return 0
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/mousetrap_mortar/proj_init(var/obj/item/device/assembly/mousetrap/armed/M)
-	M.secured = 1
-
-
-//Classic extending punching glove, but weaponised!
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/punching_glove
-	name = "\improper Oingo Boingo Punch-face"
-	desc = "Equipment for clown exosuits. Delivers fun right to your face!"
-	icon_state = "mecha_punching_glove"
-	energy_drain = 250
-	equip_cooldown = 20
-	range = MELEE|RANGED
-	missile_range = 5
-	projectile = /obj/item/punching_glove
-	fire_sound = 'sound/items/bikehorn.ogg'
-	projectiles = 10
-	projectile_energy_cost = 500
-	diags_first = TRUE
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/punching_glove/can_attach(obj/mecha/combat/honker/M)
-	if(..())
-		if(istype(M))
-			return 1
-	return 0
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/punching_glove/action(target)
-	. = ..()
-	if(.)
-		chassis.occupant_message("<font color='red' size='5'>HONK</font>")
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/punching_glove/proj_init(obj/item/punching_glove/PG)
-	if(!istype(PG))
-		return
-	 //has to be low sleep or it looks weird, the beam doesn't exist for very long so it's a non-issue
-	chassis.Beam(PG, icon_state = "chain", time = missile_range * 20, maxdistance = missile_range + 2, beam_sleep_time = 1)
-
-/obj/item/punching_glove
-	name = "punching glove"
-	desc = "INCOMING HONKS"
-	throwforce = 35
-	icon_state = "punching_glove"
-
-/obj/item/punching_glove/throw_impact(atom/hit_atom)
-	if(!..())
-		if(istype(hit_atom, /atom/movable))
-			var/atom/movable/AM = hit_atom
-			AM.throw_at(get_edge_target_turf(AM,get_dir(src, AM)), 7, 2)
-		qdel(src)
-
+	addtimer(CALLBACK(F, /obj/item/weapon/grenade/flashbang.proc/prime), det_time)
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/clusterbang //Because I am a heartless bastard -Sieve //Heartless? for making the poor man's honkblast? - Kaze
+	name = "\improper SOB-3 grenade launcher"
+	desc = "A weapon for combat exosuits. Launches primed clusterbangs. You monster."
+	origin_tech = "combat=4;materials=4"
+	projectiles = 3
+	projectile = /obj/item/weapon/grenade/clusterbuster
+	projectile_energy_cost = 1600 //getting off cheap seeing as this is 3 times the flashbangs held in the grenade launcher.
+	equip_cooldown = 90
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar
+	name = "banana mortar"
+	desc = "Equipment for clown exosuits. Launches banana peels."
+	icon_state = "mecha_bananamrtr"
+	projectile = /obj/item/weapon/grown/bananapeel
+	fire_sound = 'sound/items/bikehorn.ogg'
+	projectiles = 15
+	missile_speed = 1.5
+	projectile_energy_cost = 100
+	equip_cooldown = 20
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/can_attach(obj/mecha/combat/honker/M)
+	if(..())
+		if(istype(M))
+			return 1
+	return 0
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/mousetrap_mortar
+	name = "mousetrap mortar"
+	desc = "Equipment for clown exosuits. Launches armed mousetraps."
+	icon_state = "mecha_mousetrapmrtr"
+	projectile = /obj/item/device/assembly/mousetrap/armed
+	fire_sound = 'sound/items/bikehorn.ogg'
+	projectiles = 15
+	missile_speed = 1.5
+	projectile_energy_cost = 100
+	equip_cooldown = 10
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/mousetrap_mortar/can_attach(obj/mecha/combat/honker/M)
+	if(..())
+		if(istype(M))
+			return 1
+	return 0
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/mousetrap_mortar/proj_init(var/obj/item/device/assembly/mousetrap/armed/M)
+	M.secured = 1
+
+
+//Classic extending punching glove, but weaponised!
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/punching_glove
+	name = "\improper Oingo Boingo Punch-face"
+	desc = "Equipment for clown exosuits. Delivers fun right to your face!"
+	icon_state = "mecha_punching_glove"
+	energy_drain = 250
+	equip_cooldown = 20
+	range = MELEE|RANGED
+	missile_range = 5
+	projectile = /obj/item/punching_glove
+	fire_sound = 'sound/items/bikehorn.ogg'
+	projectiles = 10
+	projectile_energy_cost = 500
+	diags_first = TRUE
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/punching_glove/can_attach(obj/mecha/combat/honker/M)
+	if(..())
+		if(istype(M))
+			return 1
+	return 0
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/punching_glove/action(target)
+	. = ..()
+	if(.)
+		chassis.occupant_message("<font color='red' size='5'>HONK</font>")
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/punching_glove/proj_init(obj/item/punching_glove/PG)
+	if(!istype(PG))
+		return
+	 //has to be low sleep or it looks weird, the beam doesn't exist for very long so it's a non-issue
+	chassis.Beam(PG, icon_state = "chain", time = missile_range * 20, maxdistance = missile_range + 2, beam_sleep_time = 1)
+
+/obj/item/punching_glove
+	name = "punching glove"
+	desc = "INCOMING HONKS"
+	throwforce = 35
+	icon_state = "punching_glove"
+
+/obj/item/punching_glove/throw_impact(atom/hit_atom)
+	if(!..())
+		if(istype(hit_atom, /atom/movable))
+			var/atom/movable/AM = hit_atom
+			AM.throw_at(get_edge_target_turf(AM,get_dir(src, AM)), 7, 2)
+		qdel(src)
+

code/game/objects/effects/landmarks.dm

@@ -1,333 +1,333 @@
-/obj/effect/landmark
-	name = "landmark"
-	icon = 'icons/mob/screen_gen.dmi'
-	icon_state = "x2"
-	anchored = 1
-	invisibility = INVISIBILITY_ABSTRACT
-
-/obj/effect/landmark/New()
-	..()
-	tag = text("landmark*[]", name)
-	GLOB.landmarks_list += src
-
-/obj/effect/landmark/Destroy()
-	GLOB.landmarks_list -= src
-	return ..()
-
-/obj/effect/landmark/start
-	name = "start"
-	icon = 'icons/mob/screen_gen.dmi'
-	icon_state = "x"
-	anchored = 1
-
-/obj/effect/landmark/start/New()
-	GLOB.start_landmarks_list += src
-	..()
-	if(name != "start")
-		tag = "start*[name]"
-
-/obj/effect/landmark/start/Destroy()
-	GLOB.start_landmarks_list -= src
-	return ..()
-
-// START LANDMARKS FOLLOW. Don't change the names unless
-// you are refactoring shitty landmark code.
-
-/obj/effect/landmark/start/assistant
-	name = "Assistant"
-
-/obj/effect/landmark/start/janitor
-	name = "Janitor"
-
-/obj/effect/landmark/start/cargo_technician
-	name = "Cargo Technician"
-
-/obj/effect/landmark/start/bartender
-	name = "Bartender"
-
-/obj/effect/landmark/start/clown
-	name = "Clown"
-
-/obj/effect/landmark/start/mime
-	name = "Mime"
-
-/obj/effect/landmark/start/quartermaster
-	name = "Quartermaster"
-
-/obj/effect/landmark/start/atmospheric_technician
-	name = "Atmospheric Technician"
-
-/obj/effect/landmark/start/cook
-	name = "Cook"
-
-/obj/effect/landmark/start/shaft_miner
-	name = "Shaft Miner"
-
-/obj/effect/landmark/start/security_officer
-	name = "Security Officer"
-
-/obj/effect/landmark/start/botanist
-	name = "Botanist"
-
-/obj/effect/landmark/start/head_of_security
-	name = "Head of Security"
-
-/obj/effect/landmark/start/ai
-	name = "AI"
-
-/obj/effect/landmark/start/captain
-	name = "Captain"
-
-/obj/effect/landmark/start/detective
-	name = "Detective"
-
-/obj/effect/landmark/start/warden
-	name = "Warden"
-
-/obj/effect/landmark/start/chief_engineer
-	name = "Chief Engineer"
-
-/obj/effect/landmark/start/cyborg
-	name = "Cyborg"
-
-/obj/effect/landmark/start/head_of_personnel
-	name = "Head of Personnel"
-
-/obj/effect/landmark/start/librarian
+/obj/effect/landmark
+	name = "landmark"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "x2"
+	anchored = 1
+	invisibility = INVISIBILITY_ABSTRACT
+
+/obj/effect/landmark/New()
+	..()
+	tag = text("landmark*[]", name)
+	GLOB.landmarks_list += src
+
+/obj/effect/landmark/Destroy()
+	GLOB.landmarks_list -= src
+	return ..()
+
+/obj/effect/landmark/start
+	name = "start"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "x"
+	anchored = 1
+
+/obj/effect/landmark/start/New()
+	GLOB.start_landmarks_list += src
+	..()
+	if(name != "start")
+		tag = "start*[name]"
+
+/obj/effect/landmark/start/Destroy()
+	GLOB.start_landmarks_list -= src
+	return ..()
+
+// START LANDMARKS FOLLOW. Don't change the names unless
+// you are refactoring shitty landmark code.
+
+/obj/effect/landmark/start/assistant
+	name = "Assistant"
+
+/obj/effect/landmark/start/janitor
+	name = "Janitor"
+
+/obj/effect/landmark/start/cargo_technician
+	name = "Cargo Technician"
+
+/obj/effect/landmark/start/bartender
+	name = "Bartender"
+
+/obj/effect/landmark/start/clown
+	name = "Clown"
+
+/obj/effect/landmark/start/mime
+	name = "Mime"
+
+/obj/effect/landmark/start/quartermaster
+	name = "Quartermaster"
+
+/obj/effect/landmark/start/atmospheric_technician
+	name = "Atmospheric Technician"
+
+/obj/effect/landmark/start/cook
+	name = "Cook"
+
+/obj/effect/landmark/start/shaft_miner
+	name = "Shaft Miner"
+
+/obj/effect/landmark/start/security_officer
+	name = "Security Officer"
+
+/obj/effect/landmark/start/botanist
+	name = "Botanist"
+
+/obj/effect/landmark/start/head_of_security
+	name = "Head of Security"
+
+/obj/effect/landmark/start/ai
+	name = "AI"
+
+/obj/effect/landmark/start/captain
+	name = "Captain"
+
+/obj/effect/landmark/start/detective
+	name = "Detective"
+
+/obj/effect/landmark/start/warden
+	name = "Warden"
+
+/obj/effect/landmark/start/chief_engineer
+	name = "Chief Engineer"
+
+/obj/effect/landmark/start/cyborg
+	name = "Cyborg"
+
+/obj/effect/landmark/start/head_of_personnel
+	name = "Head of Personnel"
+
+/obj/effect/landmark/start/librarian
 	name = "Curator"
-
-/obj/effect/landmark/start/lawyer
-	name = "Lawyer"
-
-/obj/effect/landmark/start/station_engineer
-	name = "Station Engineer"
-
-/obj/effect/landmark/start/medical_doctor
-	name = "Medical Doctor"
-
-/obj/effect/landmark/start/scientist
-	name = "Scientist"
-
-/obj/effect/landmark/start/chemist
-	name = "Chemist"
-
-/obj/effect/landmark/start/roboticist
-	name = "Roboticist"
-
-/obj/effect/landmark/start/research_director
-	name = "Research Director"
-
-/obj/effect/landmark/start/geneticist
-	name = "Geneticist"
-
-/obj/effect/landmark/start/chief_medical_officer
-	name = "Chief Medical Officer"
-
-/obj/effect/landmark/start/virologist
-	name = "Virologist"
-
-/obj/effect/landmark/start/chaplain
-	name = "Chaplain"
-
-//Department Security spawns
-
-/obj/effect/landmark/start/depsec
-	name = "department_sec"
-
-/obj/effect/landmark/start/depsec/New()
-	..()
-	GLOB.department_security_spawns += src
-
-/obj/effect/landmark/start/depsec/Destroy()
-	GLOB.department_security_spawns -= src
-	return ..()
-
-/obj/effect/landmark/start/depsec/supply
-	name = "supply_sec"
-
-/obj/effect/landmark/start/depsec/medical
-	name = "medical_sec"
-
-/obj/effect/landmark/start/depsec/engineering
-	name = "engineering_sec"
-
-/obj/effect/landmark/start/depsec/science
-	name = "science_sec"
-
-/obj/effect/landmark/start/wizard
-	name = "wizard"
-
-/obj/effect/landmark/start/wizard/Initialize(mapload)
-	..()
-	GLOB.wizardstart += loc
-	qdel(src)
-
-/obj/effect/landmark/start/new_player
-	name = "New Player"
-
-// Must be on New() rather than Initialize, because players will
-// join before SSatom initializes everything.
-/obj/effect/landmark/start/new_player/New(loc)
-	..()
-	GLOB.newplayer_start += loc
-
-/obj/effect/landmark/start/new_player/Initialize(mapload)
-	..()
-	qdel(src)
-
-
-
-/obj/effect/landmark/latejoin
-	name = "JoinLate"
-
-/obj/effect/landmark/latejoin/Initialize(mapload)
-	..()
-	GLOB.latejoin += loc
-	qdel(src)
-
-// carp.
-/obj/effect/landmark/carpspawn
-	name = "carpspawn"
-
-// lightsout.
-/obj/effect/landmark/lightsout
-	name = "lightsout"
-
-// observer-start.
-/obj/effect/landmark/observer_start
-	name = "Observer-Start"
-
-// revenant spawn.
-/obj/effect/landmark/revenantspawn
-	name = "revnantspawn"
-
-// triple ais.
-/obj/effect/landmark/tripai
-	name = "tripai"
-
-// marauder entry (XXX WTF IS MAURADER ENTRY???)
-
-/obj/effect/landmark/marauder_entry
-	name = "Marauder Entry"
-
-// syndicate breach area (XXX I DON'T KNOW WHAT THIS IS EITHER)
-
-/obj/effect/landmark/syndicate_breach_area
-	name = "Syndicate Breach Area"
-
-// teleport scroll landmark, XXX DOES THIS DO ANYTHING?
-/obj/effect/landmark/teleport_scroll
-	name = "Teleport-Scroll"
-
-/obj/effect/landmark/syndicate_spawn
-	name = "Syndicate-Spawn"
-
-// xenos.
-/obj/effect/landmark/xeno_spawn
-	name = "xeno_spawn"
-
-/obj/effect/landmark/xeno_spawn/Initialize(mapload)
-	..()
-	GLOB.xeno_spawn += loc
-	qdel(src)
-
-// blobs.
-/obj/effect/landmark/blobstart
-	name = "blobstart"
-
-/obj/effect/landmark/blobstart/Initialize(mapload)
-	..()
-	GLOB.blobstart += loc
-	qdel(src)
-
-/obj/effect/landmark/secequipment
-	name = "secequipment"
-
-/obj/effect/landmark/secequipment/Initialize(mapload)
-	..()
-	GLOB.secequipment += loc
-	qdel(src)
-
-/obj/effect/landmark/prisonwarp
-	name = "prisonwarp"
-
-/obj/effect/landmark/prisonwarp/Initialize(mapload)
-	..()
-	GLOB.prisonwarp += loc
-	qdel(src)
-
-/obj/effect/landmark/ert_spawn
-	name = "Emergencyresponseteam"
-
-/obj/effect/landmark/ert_spawn/Initialize(mapload)
-	..()
-	GLOB.emergencyresponseteamspawn += loc
-	qdel(src)
-
-/obj/effect/landmark/holding_facility
-	name = "Holding Facility"
-
-/obj/effect/landmark/holding_facility/Initialize(mapload)
-	..()
-	GLOB.holdingfacility += loc
-	qdel(src)
-
-/obj/effect/landmark/thunderdome/observe
-	name = "tdomeobserve"
-
-/obj/effect/landmark/thunderdome/observe/Initialize(mapload)
-	..()
-	GLOB.tdomeobserve += loc
-	qdel(src)
-
-/obj/effect/landmark/thunderdome/one
-	name = "tdome1"
-
-/obj/effect/landmark/thunderdome/one/Initialize(mapload)
-	..()
-	GLOB.tdome1	+= loc
-	qdel(src)
-
-/obj/effect/landmark/thunderdome/two
-	name = "tdome2"
-
-/obj/effect/landmark/thunderdome/two/Initialize(mapload)
-	..()
-	GLOB.tdome2 += loc
-	qdel(src)
-
-/obj/effect/landmark/thunderdome/admin
-	name = "tdomeadmin"
-
-/obj/effect/landmark/thunderdome/admin/Initialize(mapload)
-	..()
-	GLOB.tdomeadmin += loc
-	qdel(src)
-
-//generic event spawns
-/obj/effect/landmark/event_spawn
-	name = "generic event spawn"
-	icon_state = "x4"
-
-
-/obj/effect/landmark/event_spawn/New()
-	..()
-	GLOB.generic_event_spawns += src
-
-/obj/effect/landmark/event_spawn/Destroy()
-	GLOB.generic_event_spawns -= src
-	return ..()
-
-/obj/effect/landmark/ruin
-	var/datum/map_template/ruin/ruin_template
-
-/obj/effect/landmark/ruin/New(loc, my_ruin_template)
-	name = "ruin_[GLOB.ruin_landmarks.len + 1]"
-	..(loc)
-	ruin_template = my_ruin_template
-	GLOB.ruin_landmarks |= src
-
-/obj/effect/landmark/ruin/Destroy()
-	GLOB.ruin_landmarks -= src
-	ruin_template = null
-	. = ..()
+
+/obj/effect/landmark/start/lawyer
+	name = "Lawyer"
+
+/obj/effect/landmark/start/station_engineer
+	name = "Station Engineer"
+
+/obj/effect/landmark/start/medical_doctor
+	name = "Medical Doctor"
+
+/obj/effect/landmark/start/scientist
+	name = "Scientist"
+
+/obj/effect/landmark/start/chemist
+	name = "Chemist"
+
+/obj/effect/landmark/start/roboticist
+	name = "Roboticist"
+
+/obj/effect/landmark/start/research_director
+	name = "Research Director"
+
+/obj/effect/landmark/start/geneticist
+	name = "Geneticist"
+
+/obj/effect/landmark/start/chief_medical_officer
+	name = "Chief Medical Officer"
+
+/obj/effect/landmark/start/virologist
+	name = "Virologist"
+
+/obj/effect/landmark/start/chaplain
+	name = "Chaplain"
+
+//Department Security spawns
+
+/obj/effect/landmark/start/depsec
+	name = "department_sec"
+
+/obj/effect/landmark/start/depsec/New()
+	..()
+	GLOB.department_security_spawns += src
+
+/obj/effect/landmark/start/depsec/Destroy()
+	GLOB.department_security_spawns -= src
+	return ..()
+
+/obj/effect/landmark/start/depsec/supply
+	name = "supply_sec"
+
+/obj/effect/landmark/start/depsec/medical
+	name = "medical_sec"
+
+/obj/effect/landmark/start/depsec/engineering
+	name = "engineering_sec"
+
+/obj/effect/landmark/start/depsec/science
+	name = "science_sec"
+
+/obj/effect/landmark/start/wizard
+	name = "wizard"
+
+/obj/effect/landmark/start/wizard/Initialize(mapload)
+	..()
+	GLOB.wizardstart += loc
+	qdel(src)
+
+/obj/effect/landmark/start/new_player
+	name = "New Player"
+
+// Must be on New() rather than Initialize, because players will
+// join before SSatom initializes everything.
+/obj/effect/landmark/start/new_player/New(loc)
+	..()
+	GLOB.newplayer_start += loc
+
+/obj/effect/landmark/start/new_player/Initialize(mapload)
+	..()
+	qdel(src)
+
+
+
+/obj/effect/landmark/latejoin
+	name = "JoinLate"
+
+/obj/effect/landmark/latejoin/Initialize(mapload)
+	..()
+	GLOB.latejoin += loc
+	qdel(src)
+
+// carp.
+/obj/effect/landmark/carpspawn
+	name = "carpspawn"
+
+// lightsout.
+/obj/effect/landmark/lightsout
+	name = "lightsout"
+
+// observer-start.
+/obj/effect/landmark/observer_start
+	name = "Observer-Start"
+
+// revenant spawn.
+/obj/effect/landmark/revenantspawn
+	name = "revnantspawn"
+
+// triple ais.
+/obj/effect/landmark/tripai
+	name = "tripai"
+
+// marauder entry (XXX WTF IS MAURADER ENTRY???)
+
+/obj/effect/landmark/marauder_entry
+	name = "Marauder Entry"
+
+// syndicate breach area (XXX I DON'T KNOW WHAT THIS IS EITHER)
+
+/obj/effect/landmark/syndicate_breach_area
+	name = "Syndicate Breach Area"
+
+// teleport scroll landmark, XXX DOES THIS DO ANYTHING?
+/obj/effect/landmark/teleport_scroll
+	name = "Teleport-Scroll"
+
+/obj/effect/landmark/syndicate_spawn
+	name = "Syndicate-Spawn"
+
+// xenos.
+/obj/effect/landmark/xeno_spawn
+	name = "xeno_spawn"
+
+/obj/effect/landmark/xeno_spawn/Initialize(mapload)
+	..()
+	GLOB.xeno_spawn += loc
+	qdel(src)
+
+// blobs.
+/obj/effect/landmark/blobstart
+	name = "blobstart"
+
+/obj/effect/landmark/blobstart/Initialize(mapload)
+	..()
+	GLOB.blobstart += loc
+	qdel(src)
+
+/obj/effect/landmark/secequipment
+	name = "secequipment"
+
+/obj/effect/landmark/secequipment/Initialize(mapload)
+	..()
+	GLOB.secequipment += loc
+	qdel(src)
+
+/obj/effect/landmark/prisonwarp
+	name = "prisonwarp"
+
+/obj/effect/landmark/prisonwarp/Initialize(mapload)
+	..()
+	GLOB.prisonwarp += loc
+	qdel(src)
+
+/obj/effect/landmark/ert_spawn
+	name = "Emergencyresponseteam"
+
+/obj/effect/landmark/ert_spawn/Initialize(mapload)
+	..()
+	GLOB.emergencyresponseteamspawn += loc
+	qdel(src)
+
+/obj/effect/landmark/holding_facility
+	name = "Holding Facility"
+
+/obj/effect/landmark/holding_facility/Initialize(mapload)
+	..()
+	GLOB.holdingfacility += loc
+	qdel(src)
+
+/obj/effect/landmark/thunderdome/observe
+	name = "tdomeobserve"
+
+/obj/effect/landmark/thunderdome/observe/Initialize(mapload)
+	..()
+	GLOB.tdomeobserve += loc
+	qdel(src)
+
+/obj/effect/landmark/thunderdome/one
+	name = "tdome1"
+
+/obj/effect/landmark/thunderdome/one/Initialize(mapload)
+	..()
+	GLOB.tdome1	+= loc
+	qdel(src)
+
+/obj/effect/landmark/thunderdome/two
+	name = "tdome2"
+
+/obj/effect/landmark/thunderdome/two/Initialize(mapload)
+	..()
+	GLOB.tdome2 += loc
+	qdel(src)
+
+/obj/effect/landmark/thunderdome/admin
+	name = "tdomeadmin"
+
+/obj/effect/landmark/thunderdome/admin/Initialize(mapload)
+	..()
+	GLOB.tdomeadmin += loc
+	qdel(src)
+
+//generic event spawns
+/obj/effect/landmark/event_spawn
+	name = "generic event spawn"
+	icon_state = "x4"
+
+
+/obj/effect/landmark/event_spawn/New()
+	..()
+	GLOB.generic_event_spawns += src
+
+/obj/effect/landmark/event_spawn/Destroy()
+	GLOB.generic_event_spawns -= src
+	return ..()
+
+/obj/effect/landmark/ruin
+	var/datum/map_template/ruin/ruin_template
+
+/obj/effect/landmark/ruin/New(loc, my_ruin_template)
+	name = "ruin_[GLOB.ruin_landmarks.len + 1]"
+	..(loc)
+	ruin_template = my_ruin_template
+	GLOB.ruin_landmarks |= src
+
+/obj/effect/landmark/ruin/Destroy()
+	GLOB.ruin_landmarks -= src
+	ruin_template = null
+	. = ..()

code/game/objects/effects/misc.dm

@@ -30,4 +30,23 @@
 	icon_state = "white"
 	plane = LIGHTING_PLANE
 	layer = LIGHTING_LAYER
-	blend_mode = BLEND_ADD
+	blend_mode = BLEND_ADD
+
+/obj/effect/abstract/marker
+	name = "marker"
+	icon = 'icons/effects/effects.dmi'
+	anchored = TRUE
+	icon_state = "wave3"
+	layer = RIPPLE_LAYER
+
+/obj/effect/abstract/marker/Initialize(mapload)
+	. = ..()
+	GLOB.all_abstract_markers += src
+
+/obj/effect/abstract/marker/Destroy()
+	GLOB.all_abstract_markers -= src
+	. = ..()
+
+/obj/effect/abstract/marker/at
+	name = "active turf marker"
+

code/game/objects/effects/overlays.dm

@@ -18,612 +18,6 @@
 	..()
 	QDEL_IN(src, 10)
 
-/obj/effect/overlay/temp
-	icon_state = "nothing"
-	anchored = 1
-	layer = ABOVE_MOB_LAYER
-	mouse_opacity = 0
-	var/duration = 10 //in deciseconds
-	var/randomdir = TRUE
-	var/timerid
-
-/obj/effect/overlay/temp/Destroy()
-	. = ..()
-	deltimer(timerid)
-
-/obj/effect/overlay/temp/Initialize()
-	. = ..()
-	if(randomdir)
-		setDir(pick(GLOB.cardinal))
-
-	timerid = QDEL_IN(src, duration)
-
-/obj/effect/overlay/temp/ex_act()
-	return
-
-/obj/effect/overlay/temp/dir_setting
-	randomdir = FALSE
-
-/obj/effect/overlay/temp/dir_setting/Initialize(mapload, set_dir)
-	if(set_dir)
-		setDir(set_dir)
-	. = ..()
-
-/obj/effect/overlay/temp/dir_setting/bloodsplatter
-	icon = 'icons/effects/blood.dmi'
-	duration = 5
-	randomdir = FALSE
-	layer = BELOW_MOB_LAYER
-	var/splatter_type = "splatter"
-
-/obj/effect/overlay/temp/dir_setting/bloodsplatter/Initialize(mapload, set_dir)
-	if(set_dir in GLOB.diagonals)
-		icon_state = "[splatter_type][pick(1, 2, 6)]"
-	else
-		icon_state = "[splatter_type][pick(3, 4, 5)]"
-	. = ..()
-	var/target_pixel_x = 0
-	var/target_pixel_y = 0
-	switch(set_dir)
-		if(NORTH)
-			target_pixel_y = 16
-		if(SOUTH)
-			target_pixel_y = -16
-			layer = ABOVE_MOB_LAYER
-		if(EAST)
-			target_pixel_x = 16
-		if(WEST)
-			target_pixel_x = -16
-		if(NORTHEAST)
-			target_pixel_x = 16
-			target_pixel_y = 16
-		if(NORTHWEST)
-			target_pixel_x = -16
-			target_pixel_y = 16
-		if(SOUTHEAST)
-			target_pixel_x = 16
-			target_pixel_y = -16
-			layer = ABOVE_MOB_LAYER
-		if(SOUTHWEST)
-			target_pixel_x = -16
-			target_pixel_y = -16
-			layer = ABOVE_MOB_LAYER
-	animate(src, pixel_x = target_pixel_x, pixel_y = target_pixel_y, alpha = 0, time = duration)
-
-/obj/effect/overlay/temp/dir_setting/bloodsplatter/xenosplatter
-	splatter_type = "xsplatter"
-
-/obj/effect/overlay/temp/dir_setting/speedbike_trail
-	name = "speedbike trails"
-	icon_state = "ion_fade"
-	layer = BELOW_MOB_LAYER
-	duration = 10
-	randomdir = 0
-
-/obj/effect/overlay/temp/dir_setting/firing_effect
-	icon = 'icons/effects/effects.dmi'
-	icon_state = "firing_effect"
-	duration = 2
-
-/obj/effect/overlay/temp/dir_setting/firing_effect/setDir(newdir)
-	switch(newdir)
-		if(NORTH)
-			layer = BELOW_MOB_LAYER
-			pixel_x = rand(-3,3)
-			pixel_y = rand(4,6)
-		if(SOUTH)
-			pixel_x = rand(-3,3)
-			pixel_y = rand(-1,1)
-		else
-			pixel_x = rand(-1,1)
-			pixel_y = rand(-1,1)
-	..()
-
-/obj/effect/overlay/temp/dir_setting/firing_effect/energy
-	icon_state = "firing_effect_energy"
-	duration = 3
-
-/obj/effect/overlay/temp/dir_setting/firing_effect/magic
-	icon_state = "shieldsparkles"
-	duration = 3
-
-/obj/effect/overlay/temp/dir_setting/ninja
-	name = "ninja shadow"
-	icon = 'icons/mob/mob.dmi'
-	icon_state = "uncloak"
-	duration = 9
-
-/obj/effect/overlay/temp/dir_setting/ninja/cloak
-	icon_state = "cloak"
-
-/obj/effect/overlay/temp/dir_setting/ninja/shadow
-	icon_state = "shadow"
-
-/obj/effect/overlay/temp/dir_setting/ninja/phase
-	name = "ninja energy"
-	icon_state = "phasein"
-
-/obj/effect/overlay/temp/dir_setting/ninja/phase/out
-	icon_state = "phaseout"
-
-/obj/effect/overlay/temp/dir_setting/wraith
-	name = "blood"
-	icon = 'icons/mob/mob.dmi'
-	icon_state = "phase_shift2"
-	duration = 12
-
-/obj/effect/overlay/temp/dir_setting/wraith/out
-	icon_state = "phase_shift"
-
-/obj/effect/overlay/temp/dir_setting/tailsweep
-	icon_state = "tailsweep"
-	duration = 4
-
-/obj/effect/overlay/temp/wizard
-	name = "water"
-	icon = 'icons/mob/mob.dmi'
-	icon_state = "reappear"
-	duration = 5
-
-/obj/effect/overlay/temp/wizard/out
-	icon_state = "liquify"
-	duration = 12
-
-/obj/effect/overlay/temp/monkeyify
-	icon = 'icons/mob/mob.dmi'
-	icon_state = "h2monkey"
-	duration = 22
-
-/obj/effect/overlay/temp/monkeyify/humanify
-	icon_state = "monkey2h"
-
-/obj/effect/overlay/temp/borgflash
-	icon = 'icons/mob/mob.dmi'
-	icon_state = "blspell"
-	duration = 5
-
-/obj/effect/overlay/temp/guardian
-	randomdir = 0
-
-/obj/effect/overlay/temp/guardian/phase
-	duration = 5
-	icon_state = "phasein"
-
-/obj/effect/overlay/temp/guardian/phase/out
-	icon_state = "phaseout"
-
-/obj/effect/overlay/temp/decoy
-	desc = "It's a decoy!"
-	duration = 15
-
-/obj/effect/overlay/temp/decoy/Initialize(mapload, atom/mimiced_atom)
-	. = ..()
-	alpha = initial(alpha)
-	if(mimiced_atom)
-		name = mimiced_atom.name
-		appearance = mimiced_atom.appearance
-		setDir(mimiced_atom.dir)
-		mouse_opacity = 0
-
-/obj/effect/overlay/temp/decoy/fading/Initialize(mapload, atom/mimiced_atom)
-	. = ..()
-	animate(src, alpha = 0, time = duration)
-
-/obj/effect/overlay/temp/decoy/fading/fivesecond
-	duration = 50
-
-/obj/effect/overlay/temp/small_smoke
-	icon_state = "smoke"
-	duration = 50
-
-/obj/effect/overlay/temp/fire
-	icon = 'icons/effects/fire.dmi'
-	icon_state = "3"
-	duration = 20
-
-/obj/effect/overlay/temp/cult
-	randomdir = 0
-	duration = 10
-
-/obj/effect/overlay/temp/cult/sparks
-	randomdir = 1
-	name = "blood sparks"
-	icon_state = "bloodsparkles"
-
-/obj/effect/overlay/temp/dir_setting/cult/phase
-	name = "phase glow"
-	duration = 7
-	icon_state = "cultin"
-
-/obj/effect/overlay/temp/dir_setting/cult/phase/out
-	icon_state = "cultout"
-
-/obj/effect/overlay/temp/cult/sac
-	name = "maw of Nar-Sie"
-	icon_state = "sacconsume"
-
-/obj/effect/overlay/temp/cult/door
-	name = "unholy glow"
-	icon_state = "doorglow"
-	layer = CLOSED_FIREDOOR_LAYER //above closed doors
-
-/obj/effect/overlay/temp/cult/door/unruned
-	icon_state = "unruneddoorglow"
-
-/obj/effect/overlay/temp/cult/turf
-	name = "unholy glow"
-	icon_state = "wallglow"
-	layer = ABOVE_NORMAL_TURF_LAYER
-
-/obj/effect/overlay/temp/cult/turf/floor
-	icon_state = "floorglow"
-	duration = 5
-
-
-/obj/effect/overlay/temp/ratvar
-	name = "ratvar's light"
-	icon = 'icons/effects/clockwork_effects.dmi'
-	duration = 8
-	randomdir = 0
-	layer = ABOVE_NORMAL_TURF_LAYER
-
-/obj/effect/overlay/temp/ratvar/door
-	icon_state = "ratvardoorglow"
-	layer = CLOSED_DOOR_LAYER //above closed doors
-
-/obj/effect/overlay/temp/ratvar/door/window
-	icon_state = "ratvarwindoorglow"
-	layer = ABOVE_WINDOW_LAYER
-
-/obj/effect/overlay/temp/ratvar/beam
-	icon_state = "ratvarbeamglow"
-
-/obj/effect/overlay/temp/ratvar/beam/door
-	layer = CLOSED_DOOR_LAYER
-
-/obj/effect/overlay/temp/ratvar/beam/grille
-	layer = BELOW_OBJ_LAYER
-
-/obj/effect/overlay/temp/ratvar/beam/itemconsume
-	layer = HIGH_OBJ_LAYER
-
-/obj/effect/overlay/temp/ratvar/beam/falsewall
-	layer = OBJ_LAYER
-
-/obj/effect/overlay/temp/ratvar/beam/catwalk
-	layer = LATTICE_LAYER
-
-/obj/effect/overlay/temp/ratvar/wall
-	icon_state = "ratvarwallglow"
-
-/obj/effect/overlay/temp/ratvar/wall/false
-	layer = OBJ_LAYER
-
-/obj/effect/overlay/temp/ratvar/floor
-	icon_state = "ratvarfloorglow"
-
-/obj/effect/overlay/temp/ratvar/floor/catwalk
-	layer = LATTICE_LAYER
-
-/obj/effect/overlay/temp/ratvar/window
-	icon_state = "ratvarwindowglow"
-	layer = ABOVE_OBJ_LAYER
-
-/obj/effect/overlay/temp/ratvar/window/single
-	icon_state = "ratvarwindowglow_s"
-
-/obj/effect/overlay/temp/ratvar/gear
-	icon_state = "ratvargearglow"
-	layer = BELOW_OBJ_LAYER
-
-/obj/effect/overlay/temp/ratvar/grille
-	icon_state = "ratvargrilleglow"
-	layer = BELOW_OBJ_LAYER
-
-/obj/effect/overlay/temp/ratvar/grille/broken
-	icon_state = "ratvarbrokengrilleglow"
-
-/obj/effect/overlay/temp/ratvar/mending_mantra
-	layer = ABOVE_MOB_LAYER
-	duration = 20
-	alpha = 200
-	icon_state = "mending_mantra"
-	light_range = 1.5
-	light_color = "#1E8CE1"
-
-/obj/effect/overlay/temp/ratvar/mending_mantra/Initialize(mapload)
-	. = ..()
-	transform = matrix()*2
-	var/matrix/M = transform
-	M.Turn(90)
-	animate(src, alpha = 20, time = duration, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL)
-	animate(src, transform = M, time = duration, flags = ANIMATION_PARALLEL)
-
-/obj/effect/overlay/temp/ratvar/volt_hit
-	name = "volt blast"
-	layer = ABOVE_MOB_LAYER
-	duration = 5
-	icon_state = "volt_hit"
-	light_range = 1.5
-	light_power = 2
-	light_color = LIGHT_COLOR_ORANGE
-	var/mob/user
-	var/damage = 20
-
-/obj/effect/overlay/temp/ratvar/volt_hit/Initialize(mapload, caster, multiplier)
-	if(multiplier)
-		damage *= multiplier
-	duration = max(round(damage * 0.2), 1)
-	. = ..()
-
-/obj/effect/overlay/temp/ratvar/volt_hit/true/Initialize(mapload, caster, multiplier)
-	. = ..()
-	user = caster
-	if(user)
-		var/matrix/M = new
-		M.Turn(Get_Angle(src, user))
-		transform = M
-	INVOKE_ASYNC(src, .proc/volthit)
-
-/obj/effect/overlay/temp/ratvar/volt_hit/proc/volthit()
-	if(user)
-		Beam(get_turf(user), "volt_ray", time=duration, maxdistance=8, beam_type=/obj/effect/ebeam/volt_ray)
-	var/hit_amount = 0
-	var/turf/T = get_turf(src)
-	for(var/mob/living/L in T)
-		if(is_servant_of_ratvar(L))
-			continue
-		var/obj/item/I = L.null_rod_check()
-		if(I)
-			L.visible_message("<span class='warning'>Strange energy flows into [L]'s [I.name]!</span>", \
-			"<span class='userdanger'>Your [I.name] shields you from [src]!</span>")
-			continue
-		L.visible_message("<span class='warning'>[L] is struck by a [name]!</span>", "<span class='userdanger'>You're struck by a [name]!</span>")
-		L.apply_damage(damage, BURN, "chest", L.run_armor_check("chest", "laser", "Your armor absorbs [src]!", "Your armor blocks part of [src]!", 0, "Your armor was penetrated by [src]!"))
-		add_logs(user, L, "struck with a volt blast")
-		hit_amount++
-	for(var/obj/mecha/M in T)
-		if(M.occupant)
-			if(is_servant_of_ratvar(M.occupant))
-				continue
-			to_chat(M.occupant, "<span class='userdanger'>Your [M.name] is struck by a [name]!</span>")
-		M.visible_message("<span class='warning'>[M] is struck by a [name]!</span>")
-		M.take_damage(damage, BURN, 0, 0)
-		hit_amount++
-	if(hit_amount)
-		playsound(src, 'sound/machines/defib_zap.ogg', damage*hit_amount, 1, -1)
-	else
-		playsound(src, "sparks", 50, 1)
-
-/obj/effect/overlay/temp/ratvar/ocular_warden
-	name = "warden's gaze"
-	layer = ABOVE_MOB_LAYER
-	icon_state = "warden_gaze"
-	duration = 3
-
-/obj/effect/overlay/temp/ratvar/ocular_warden/Initialize()
-	. = ..()
-	pixel_x = rand(-8, 8)
-	pixel_y = rand(-10, 10)
-	animate(src, alpha = 0, time = 3, easing = EASE_OUT)
-
-/obj/effect/overlay/temp/ratvar/spearbreak
-	icon = 'icons/effects/64x64.dmi'
-	icon_state = "ratvarspearbreak"
-	layer = BELOW_MOB_LAYER
-	pixel_y = -16
-	pixel_x = -16
-
-/obj/effect/overlay/temp/ratvar/geis_binding
-	icon_state = "geisbinding"
-
-/obj/effect/overlay/temp/ratvar/geis_binding/top
-	icon_state = "geisbinding_top"
-
-/obj/effect/overlay/temp/ratvar/component
-	icon = 'icons/obj/clockwork_objects.dmi'
-	icon_state = "belligerent_eye"
-	layer = ABOVE_MOB_LAYER
-	duration = 10
-
-/obj/effect/overlay/temp/ratvar/component/Initialize()
-	. = ..()
-	transform = matrix()*0.75
-	pixel_x = rand(-10, 10)
-	pixel_y = rand(-10, -2)
-	animate(src, pixel_y = pixel_y + 10, alpha = 50, time = 10, easing = EASE_OUT)
-
-/obj/effect/overlay/temp/ratvar/component/cogwheel
-	icon_state = "vanguard_cogwheel"
-
-/obj/effect/overlay/temp/ratvar/component/capacitor
-	icon_state = "geis_capacitor"
-
-/obj/effect/overlay/temp/ratvar/component/alloy
-	icon_state = "replicant_alloy"
-
-/obj/effect/overlay/temp/ratvar/component/ansible
-	icon_state = "hierophant_ansible"
-
-/obj/effect/overlay/temp/ratvar/sigil
-	name = "glowing circle"
-	icon_state = "sigildull"
-
-/obj/effect/overlay/temp/ratvar/sigil/transgression
-	color = "#FAE48C"
-	layer = ABOVE_MOB_LAYER
-	duration = 70
-	light_range = 5
-	light_power = 2
-	light_color = "#FAE48C"
-
-/obj/effect/overlay/temp/ratvar/sigil/transgression/Initialize()
-	. = ..()
-	var/oldtransform = transform
-	animate(src, transform = matrix()*2, time = 5)
-	animate(transform = oldtransform, alpha = 0, time = 65)
-
-/obj/effect/overlay/temp/ratvar/sigil/vitality
-	color = "#1E8CE1"
-	icon_state = "sigilactivepulse"
-	layer = ABOVE_MOB_LAYER
-	light_range = 1.4
-	light_power = 0.5
-	light_color = "#1E8CE1"
-
-/obj/effect/overlay/temp/ratvar/sigil/accession
-	color = "#AF0AAF"
-	layer = ABOVE_MOB_LAYER
-	duration = 70
-	icon_state = "sigilactiveoverlay"
-	alpha = 0
-
-
-/obj/effect/overlay/temp/revenant
-	name = "spooky lights"
-	icon_state = "purplesparkles"
-
-/obj/effect/overlay/temp/revenant/cracks
-	name = "glowing cracks"
-	icon_state = "purplecrack"
-	duration = 6
-
-
-/obj/effect/overlay/temp/gravpush
-	name = "gravity wave"
-	icon_state = "shieldsparkles"
-	duration = 5
-
-/obj/effect/overlay/temp/telekinesis
-	name = "telekinetic force"
-	icon_state = "empdisable"
-	duration = 5
-
-/obj/effect/overlay/temp/emp
-	name = "emp sparks"
-	icon_state = "empdisable"
-
-/obj/effect/overlay/temp/emp/pulse
-	name = "emp pulse"
-	icon_state = "emppulse"
-	duration = 8
-	randomdir = 0
-
-/obj/effect/overlay/temp/gib_animation
-	icon = 'icons/mob/mob.dmi'
-	duration = 15
-
-/obj/effect/overlay/temp/gib_animation/Initialize(mapload, gib_icon)
-	icon_state = gib_icon // Needs to be before ..() so icon is correct
-	. = ..()
-
-/obj/effect/overlay/temp/gib_animation/ex_act(severity)
-	return //so the overlay isn't deleted by the explosion that gibbed the mob.
-
-/obj/effect/overlay/temp/gib_animation/animal
-	icon = 'icons/mob/animal.dmi'
-
-/obj/effect/overlay/temp/dust_animation
-	icon = 'icons/mob/mob.dmi'
-	duration = 15
-
-/obj/effect/overlay/temp/dust_animation/Initialize(mapload, dust_icon)
-	icon_state = dust_icon // Before ..() so the correct icon is flick()'d
-	. = ..()
-
-/obj/effect/overlay/temp/mummy_animation
-	icon = 'icons/mob/mob.dmi'
-	icon_state = "mummy_revive"
-	duration = 20
-
-/obj/effect/overlay/temp/heal //color is white by default, set to whatever is needed
-	name = "healing glow"
-	icon_state = "heal"
-	duration = 15
-
-/obj/effect/overlay/temp/heal/Initialize(mapload, colour)
-	if(colour)
-		color = colour
-	. = ..()
-	pixel_x = rand(-12, 12)
-	pixel_y = rand(-9, 0)
-
-/obj/effect/overlay/temp/kinetic_blast
-	name = "kinetic explosion"
-	icon = 'icons/obj/projectiles.dmi'
-	icon_state = "kinetic_blast"
-	layer = ABOVE_ALL_MOB_LAYER
-	duration = 4
-
-/obj/effect/overlay/temp/explosion
-	name = "explosion"
-	icon = 'icons/effects/96x96.dmi'
-	icon_state = "explosion"
-	pixel_x = -32
-	pixel_y = -32
-	duration = 8
-
-/obj/effect/overlay/temp/explosion/fast
-	icon_state = "explosionfast"
-	duration = 4
-
-/obj/effect/overlay/temp/blob
-	name = "blob"
-	icon_state = "blob_attack"
-	alpha = 140
-	randomdir = 0
-	duration = 6
-
-/obj/effect/overlay/temp/impact_effect
-	icon_state = "impact_bullet"
-	duration = 5
-
-/obj/effect/overlay/temp/impact_effect/Initialize(mapload, atom/target, obj/item/projectile/P)
-	if(target == P.original) //the projectile hit the target originally clicked
-		pixel_x = P.p_x + target.pixel_x - 16 + rand(-4,4)
-		pixel_y = P.p_y + target.pixel_y - 16 + rand(-4,4)
-	else
-		pixel_x = target.pixel_x + rand(-4,4)
-		pixel_y = target.pixel_y + rand(-4,4)
-	. = ..()
-
-/obj/effect/overlay/temp/impact_effect/red_laser
-	icon_state = "impact_laser"
-	duration = 4
-
-/obj/effect/overlay/temp/impact_effect/red_laser/wall
-	icon_state = "impact_laser_wall"
-	duration = 10
-
-/obj/effect/overlay/temp/impact_effect/blue_laser
-	icon_state = "impact_laser_blue"
-	duration = 4
-
-/obj/effect/overlay/temp/impact_effect/green_laser
-	icon_state = "impact_laser_green"
-	duration = 4
-
-/obj/effect/overlay/temp/impact_effect/purple_laser
-	icon_state = "impact_laser_purple"
-	duration = 4
-
-/obj/effect/overlay/temp/impact_effect/ion
-	icon_state = "shieldsparkles"
-	duration = 6
-
-/obj/effect/overlay/temp/heart
-	name = "heart"
-	icon = 'icons/mob/animal.dmi'
-	icon_state = "heart"
-	duration = 25
-
-/obj/effect/overlay/temp/heart/Initialize(mapload)
-	. = ..()
-	pixel_x = rand(-4,4)
-	pixel_y = rand(-4,4)
-
-	animate(src, pixel_y = pixel_y + 32, alpha = 0, time = 25)
-
 /obj/effect/overlay/palmtree_r
 	name = "Palm tree"
 	icon = 'icons/misc/beach2.dmi'

code/game/objects/effects/portals.dm

@@ -1,69 +1,69 @@
-
-/obj/effect/portal
-	name = "portal"
-	desc = "Looks unstable. Best to test it with the clown."
-	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "portal"
-	density = 1
-	var/obj/item/target = null
-	var/creator = null
-	anchored = 1
-	var/precision = 1 // how close to the portal you will teleport. 0 = on the portal, 1 = adjacent
-	var/mech_sized = FALSE
-
-/obj/effect/portal/Bumped(mob/M as mob|obj)
-	teleport(M)
-
-/obj/effect/portal/attack_tk(mob/user)
-	return
-
-/obj/effect/portal/attack_hand(mob/user)
-	if(Adjacent(user))
-		teleport(user)
-
-/obj/effect/portal/attackby(obj/item/weapon/W, mob/user, params)
-	if(user && Adjacent(user))
-		teleport(user)
-
-/obj/effect/portal/make_frozen_visual()
-	return
-
-/obj/effect/portal/New(loc, turf/target, creator=null, lifespan=300)
-	..()
-	GLOB.portals += src
-	src.target = target
-	src.creator = creator
-
-	var/area/A = get_area(target)
-	if(A && A.noteleport) // No point in persisting if the target is unreachable.
-		qdel(src)
-		return
-	if(lifespan > 0)
-		QDEL_IN(src, lifespan)
-
-/obj/effect/portal/Destroy()
-	GLOB.portals -= src
-	if(istype(creator, /obj/item/weapon/hand_tele))
-		var/obj/item/weapon/hand_tele/O = creator
-		O.active_portals--
-	else if(istype(creator, /obj/item/weapon/gun/energy/wormhole_projector))
-		var/obj/item/weapon/gun/energy/wormhole_projector/P = creator
-		P.portal_destroyed(src)
-	creator = null
-	return ..()
-
-/obj/effect/portal/proc/teleport(atom/movable/M as mob|obj)
-	if(istype(M, /obj/effect)) //sparks don't teleport
-		return
-	if(M.anchored)
-		if(!(istype(M, /obj/mecha) && mech_sized))
-			return
-	if (!( target ))
-		qdel(src)
-		return
-	if (istype(M, /atom/movable))
-		if(ismegafauna(M))
+
+/obj/effect/portal
+	name = "portal"
+	desc = "Looks unstable. Best to test it with the clown."
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "portal"
+	density = 1
+	var/obj/item/target = null
+	var/creator = null
+	anchored = 1
+	var/precision = 1 // how close to the portal you will teleport. 0 = on the portal, 1 = adjacent
+	var/mech_sized = FALSE
+
+/obj/effect/portal/Bumped(mob/M as mob|obj)
+	teleport(M)
+
+/obj/effect/portal/attack_tk(mob/user)
+	return
+
+/obj/effect/portal/attack_hand(mob/user)
+	if(Adjacent(user))
+		teleport(user)
+
+/obj/effect/portal/attackby(obj/item/weapon/W, mob/user, params)
+	if(user && Adjacent(user))
+		teleport(user)
+
+/obj/effect/portal/make_frozen_visual()
+	return
+
+/obj/effect/portal/New(loc, turf/target, creator=null, lifespan=300)
+	..()
+	GLOB.portals += src
+	src.target = target
+	src.creator = creator
+
+	var/area/A = get_area(target)
+	if(A && A.noteleport) // No point in persisting if the target is unreachable.
+		qdel(src)
+		return
+	if(lifespan > 0)
+		QDEL_IN(src, lifespan)
+
+/obj/effect/portal/Destroy()
+	GLOB.portals -= src
+	if(istype(creator, /obj/item/weapon/hand_tele))
+		var/obj/item/weapon/hand_tele/O = creator
+		O.active_portals--
+	else if(istype(creator, /obj/item/weapon/gun/energy/wormhole_projector))
+		var/obj/item/weapon/gun/energy/wormhole_projector/P = creator
+		P.portal_destroyed(src)
+	creator = null
+	return ..()
+
+/obj/effect/portal/proc/teleport(atom/movable/M as mob|obj)
+	if(istype(M, /obj/effect)) //sparks don't teleport
+		return
+	if(M.anchored)
+		if(!(istype(M, /obj/mecha) && mech_sized))
+			return
+	if (!( target ))
+		qdel(src)
+		return
+	if (istype(M, /atom/movable))
+		if(ismegafauna(M))
 			message_admins("[M] [ADMIN_FLW(M)] has teleported through [src].")
-		do_teleport(M, target, precision) ///You will appear adjacent to the beacon
-
-
+		do_teleport(M, target, precision) ///You will appear adjacent to the beacon
+
+

code/game/objects/effects/step_triggers.dm

@@ -183,8 +183,9 @@
 	if(!T)
 		return
 
-	if(triggerer_only)
-		A.playsound_local(T, sound, volume, freq_vary)
+	if(triggerer_only && ismob(A))
+		var/mob/B = A
+		B.playsound_local(T, sound, volume, freq_vary)
 	else
 		playsound(T, sound, volume, freq_vary, extra_range)
 

code/game/objects/effects/temporary_visuals/clockcult.dm

@@ -0,0 +1,218 @@
+//temporary visual effects(/obj/effect/overlay/temp) used by clockcult stuff
+/obj/effect/overlay/temp/ratvar
+	name = "ratvar's light"
+	icon = 'icons/effects/clockwork_effects.dmi'
+	duration = 8
+	randomdir = 0
+	layer = ABOVE_NORMAL_TURF_LAYER
+
+/obj/effect/overlay/temp/ratvar/door
+	icon_state = "ratvardoorglow"
+	layer = CLOSED_DOOR_LAYER //above closed doors
+
+/obj/effect/overlay/temp/ratvar/door/window
+	icon_state = "ratvarwindoorglow"
+	layer = ABOVE_WINDOW_LAYER
+
+/obj/effect/overlay/temp/ratvar/beam
+	icon_state = "ratvarbeamglow"
+
+/obj/effect/overlay/temp/ratvar/beam/door
+	layer = CLOSED_DOOR_LAYER
+
+/obj/effect/overlay/temp/ratvar/beam/grille
+	layer = BELOW_OBJ_LAYER
+
+/obj/effect/overlay/temp/ratvar/beam/itemconsume
+	layer = HIGH_OBJ_LAYER
+
+/obj/effect/overlay/temp/ratvar/beam/falsewall
+	layer = OBJ_LAYER
+
+/obj/effect/overlay/temp/ratvar/beam/catwalk
+	layer = LATTICE_LAYER
+
+/obj/effect/overlay/temp/ratvar/wall
+	icon_state = "ratvarwallglow"
+
+/obj/effect/overlay/temp/ratvar/wall/false
+	layer = OBJ_LAYER
+
+/obj/effect/overlay/temp/ratvar/floor
+	icon_state = "ratvarfloorglow"
+
+/obj/effect/overlay/temp/ratvar/floor/catwalk
+	layer = LATTICE_LAYER
+
+/obj/effect/overlay/temp/ratvar/window
+	icon_state = "ratvarwindowglow"
+	layer = ABOVE_OBJ_LAYER
+
+/obj/effect/overlay/temp/ratvar/window/single
+	icon_state = "ratvarwindowglow_s"
+
+/obj/effect/overlay/temp/ratvar/gear
+	icon_state = "ratvargearglow"
+	layer = BELOW_OBJ_LAYER
+
+/obj/effect/overlay/temp/ratvar/grille
+	icon_state = "ratvargrilleglow"
+	layer = BELOW_OBJ_LAYER
+
+/obj/effect/overlay/temp/ratvar/grille/broken
+	icon_state = "ratvarbrokengrilleglow"
+
+/obj/effect/overlay/temp/ratvar/mending_mantra
+	layer = ABOVE_MOB_LAYER
+	duration = 20
+	alpha = 200
+	icon_state = "mending_mantra"
+	light_range = 1.5
+	light_color = "#1E8CE1"
+
+/obj/effect/overlay/temp/ratvar/mending_mantra/Initialize(mapload)
+	. = ..()
+	transform = matrix()*2
+	var/matrix/M = transform
+	M.Turn(90)
+	animate(src, alpha = 20, time = duration, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL)
+	animate(src, transform = M, time = duration, flags = ANIMATION_PARALLEL)
+
+/obj/effect/overlay/temp/ratvar/volt_hit
+	name = "volt blast"
+	layer = ABOVE_MOB_LAYER
+	duration = 5
+	icon_state = "volt_hit"
+	light_range = 1.5
+	light_power = 2
+	light_color = LIGHT_COLOR_ORANGE
+	var/mob/user
+	var/damage = 20
+
+/obj/effect/overlay/temp/ratvar/volt_hit/Initialize(mapload, caster, multiplier)
+	if(multiplier)
+		damage *= multiplier
+	duration = max(round(damage * 0.2), 1)
+	. = ..()
+
+/obj/effect/overlay/temp/ratvar/volt_hit/true/Initialize(mapload, caster, multiplier)
+	. = ..()
+	user = caster
+	if(user)
+		var/matrix/M = new
+		M.Turn(Get_Angle(src, user))
+		transform = M
+	INVOKE_ASYNC(src, .proc/volthit)
+
+/obj/effect/overlay/temp/ratvar/volt_hit/proc/volthit()
+	if(user)
+		Beam(get_turf(user), "volt_ray", time=duration, maxdistance=8, beam_type=/obj/effect/ebeam/volt_ray)
+	var/hit_amount = 0
+	var/turf/T = get_turf(src)
+	for(var/mob/living/L in T)
+		if(is_servant_of_ratvar(L))
+			continue
+		var/obj/item/I = L.null_rod_check()
+		if(I)
+			L.visible_message("<span class='warning'>Strange energy flows into [L]'s [I.name]!</span>", \
+			"<span class='userdanger'>Your [I.name] shields you from [src]!</span>")
+			continue
+		L.visible_message("<span class='warning'>[L] is struck by a [name]!</span>", "<span class='userdanger'>You're struck by a [name]!</span>")
+		L.apply_damage(damage, BURN, "chest", L.run_armor_check("chest", "laser", "Your armor absorbs [src]!", "Your armor blocks part of [src]!", 0, "Your armor was penetrated by [src]!"))
+		add_logs(user, L, "struck with a volt blast")
+		hit_amount++
+	for(var/obj/mecha/M in T)
+		if(M.occupant)
+			if(is_servant_of_ratvar(M.occupant))
+				continue
+			to_chat(M.occupant, "<span class='userdanger'>Your [M.name] is struck by a [name]!</span>")
+		M.visible_message("<span class='warning'>[M] is struck by a [name]!</span>")
+		M.take_damage(damage, BURN, 0, 0)
+		hit_amount++
+	if(hit_amount)
+		playsound(src, 'sound/machines/defib_zap.ogg', damage*hit_amount, 1, -1)
+	else
+		playsound(src, "sparks", 50, 1)
+
+/obj/effect/overlay/temp/ratvar/ocular_warden
+	name = "warden's gaze"
+	layer = ABOVE_MOB_LAYER
+	icon_state = "warden_gaze"
+	duration = 3
+
+/obj/effect/overlay/temp/ratvar/ocular_warden/Initialize()
+	. = ..()
+	pixel_x = rand(-8, 8)
+	pixel_y = rand(-10, 10)
+	animate(src, alpha = 0, time = 3, easing = EASE_OUT)
+
+/obj/effect/overlay/temp/ratvar/spearbreak
+	icon = 'icons/effects/64x64.dmi'
+	icon_state = "ratvarspearbreak"
+	layer = BELOW_MOB_LAYER
+	pixel_y = -16
+	pixel_x = -16
+
+/obj/effect/overlay/temp/ratvar/geis_binding
+	icon_state = "geisbinding"
+
+/obj/effect/overlay/temp/ratvar/geis_binding/top
+	icon_state = "geisbinding_top"
+
+/obj/effect/overlay/temp/ratvar/component
+	icon = 'icons/obj/clockwork_objects.dmi'
+	icon_state = "belligerent_eye"
+	layer = ABOVE_MOB_LAYER
+	duration = 10
+
+/obj/effect/overlay/temp/ratvar/component/Initialize()
+	. = ..()
+	transform = matrix()*0.75
+	pixel_x = rand(-10, 10)
+	pixel_y = rand(-10, -2)
+	animate(src, pixel_y = pixel_y + 10, alpha = 50, time = 10, easing = EASE_OUT)
+
+/obj/effect/overlay/temp/ratvar/component/cogwheel
+	icon_state = "vanguard_cogwheel"
+
+/obj/effect/overlay/temp/ratvar/component/capacitor
+	icon_state = "geis_capacitor"
+
+/obj/effect/overlay/temp/ratvar/component/alloy
+	icon_state = "replicant_alloy"
+
+/obj/effect/overlay/temp/ratvar/component/ansible
+	icon_state = "hierophant_ansible"
+
+/obj/effect/overlay/temp/ratvar/sigil
+	name = "glowing circle"
+	icon_state = "sigildull"
+
+/obj/effect/overlay/temp/ratvar/sigil/transgression
+	color = "#FAE48C"
+	layer = ABOVE_MOB_LAYER
+	duration = 70
+	light_range = 5
+	light_power = 2
+	light_color = "#FAE48C"
+
+/obj/effect/overlay/temp/ratvar/sigil/transgression/Initialize()
+	. = ..()
+	var/oldtransform = transform
+	animate(src, transform = matrix()*2, time = 5)
+	animate(transform = oldtransform, alpha = 0, time = 65)
+
+/obj/effect/overlay/temp/ratvar/sigil/vitality
+	color = "#1E8CE1"
+	icon_state = "sigilactivepulse"
+	layer = ABOVE_MOB_LAYER
+	light_range = 1.4
+	light_power = 0.5
+	light_color = "#1E8CE1"
+
+/obj/effect/overlay/temp/ratvar/sigil/accession
+	color = "#AF0AAF"
+	layer = ABOVE_MOB_LAYER
+	duration = 70
+	icon_state = "sigilactiveoverlay"
+	alpha = 0

code/game/objects/effects/temporary_visuals/cult.dm

@@ -0,0 +1,144 @@
+//temporary visual effects(/obj/effect/overlay/temp) used by cult stuff
+/obj/effect/overlay/temp/cult
+	icon = 'icons/effects/cult_effects.dmi'
+	randomdir = 0
+	duration = 10
+
+/obj/effect/overlay/temp/cult/sparks
+	randomdir = 1
+	name = "blood sparks"
+	icon_state = "bloodsparkles"
+
+/obj/effect/overlay/temp/cult/blood  // The traditional teleport
+	name = "blood jaunt"
+	duration = 12
+	icon_state = "bloodin"
+
+/obj/effect/overlay/temp/cult/blood/out
+	icon_state = "bloodout"
+
+/obj/effect/overlay/temp/dir_setting/cult/phase  // The veil shifter teleport
+	name = "phase glow"
+	duration = 7
+	icon_state = "cultin"
+
+/obj/effect/overlay/temp/dir_setting/cult/phase/out
+	icon_state = "cultout"
+
+/obj/effect/overlay/temp/cult/sac
+	name = "maw of Nar-Sie"
+	icon_state = "sacconsume"
+
+/obj/effect/overlay/temp/cult/door
+	name = "unholy glow"
+	icon_state = "doorglow"
+	layer = CLOSED_FIREDOOR_LAYER //above closed doors
+
+/obj/effect/overlay/temp/cult/door/unruned
+	icon_state = "unruneddoorglow"
+
+/obj/effect/overlay/temp/cult/turf
+	name = "unholy glow"
+	icon_state = "wallglow"
+	layer = ABOVE_NORMAL_TURF_LAYER
+
+/obj/effect/overlay/temp/cult/turf/floor
+	icon_state = "floorglow"
+	duration = 5
+
+//visuals for runes being magically created
+/obj/effect/overlay/temp/cult/rune_spawn
+	icon_state = "runeouter"
+	alpha = 0
+	var/turnedness = 179 //179 turns counterclockwise, 181 turns clockwise
+
+/obj/effect/overlay/temp/cult/rune_spawn/Initialize(mapload, set_duration, set_color)
+	if(isnum(set_duration))
+		duration = set_duration
+	if(set_color)
+		add_atom_colour(set_color, FIXED_COLOUR_PRIORITY)
+	. = ..()
+	var/oldtransform = transform
+	transform = matrix()*2
+	var/matrix/M = transform
+	M.Turn(turnedness)
+	transform = M
+	animate(src, alpha = 255, time = duration, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL)
+	animate(src, transform = oldtransform, time = duration, flags = ANIMATION_PARALLEL)
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune1
+	icon_state = "rune1words"
+	turnedness = 181
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune1/inner
+	icon_state = "rune1inner"
+	turnedness = 179
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune1/center
+	icon_state = "rune1center"
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune2
+	icon_state = "rune2words"
+	turnedness = 181
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune2/inner
+	icon_state = "rune2inner"
+	turnedness = 179
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune2/center
+	icon_state = "rune2center"
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune3
+	icon_state = "rune3words"
+	turnedness = 181
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune3/inner
+	icon_state = "rune3inner"
+	turnedness = 179
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune3/center
+	icon_state = "rune3center"
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune4
+	icon_state = "rune4words"
+	turnedness = 181
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune4/inner
+	icon_state = "rune4inner"
+	turnedness = 179
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune4/center
+	icon_state = "rune4center"
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune5
+	icon_state = "rune5words"
+	turnedness = 181
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune5/inner
+	icon_state = "rune5inner"
+	turnedness = 179
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune5/center
+	icon_state = "rune5center"
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune6
+	icon_state = "rune6words"
+	turnedness = 181
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune6/inner
+	icon_state = "rune6inner"
+	turnedness = 179
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune6/center
+	icon_state = "rune6center"
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune7
+	icon_state = "rune7words"
+	turnedness = 181
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune7/inner
+	icon_state = "rune7inner"
+	turnedness = 179
+
+/obj/effect/overlay/temp/cult/rune_spawn/rune7/center
+	icon_state = "rune7center"

code/game/objects/effects/temporary_visuals/miscellaneous.dm

@@ -0,0 +1,312 @@
+//unsorted miscellaneous temporary visuals
+/obj/effect/overlay/temp/dir_setting/bloodsplatter
+	icon = 'icons/effects/blood.dmi'
+	duration = 5
+	randomdir = FALSE
+	layer = BELOW_MOB_LAYER
+	var/splatter_type = "splatter"
+
+/obj/effect/overlay/temp/dir_setting/bloodsplatter/Initialize(mapload, set_dir)
+	if(set_dir in GLOB.diagonals)
+		icon_state = "[splatter_type][pick(1, 2, 6)]"
+	else
+		icon_state = "[splatter_type][pick(3, 4, 5)]"
+	. = ..()
+	var/target_pixel_x = 0
+	var/target_pixel_y = 0
+	switch(set_dir)
+		if(NORTH)
+			target_pixel_y = 16
+		if(SOUTH)
+			target_pixel_y = -16
+			layer = ABOVE_MOB_LAYER
+		if(EAST)
+			target_pixel_x = 16
+		if(WEST)
+			target_pixel_x = -16
+		if(NORTHEAST)
+			target_pixel_x = 16
+			target_pixel_y = 16
+		if(NORTHWEST)
+			target_pixel_x = -16
+			target_pixel_y = 16
+		if(SOUTHEAST)
+			target_pixel_x = 16
+			target_pixel_y = -16
+			layer = ABOVE_MOB_LAYER
+		if(SOUTHWEST)
+			target_pixel_x = -16
+			target_pixel_y = -16
+			layer = ABOVE_MOB_LAYER
+	animate(src, pixel_x = target_pixel_x, pixel_y = target_pixel_y, alpha = 0, time = duration)
+
+/obj/effect/overlay/temp/dir_setting/bloodsplatter/xenosplatter
+	splatter_type = "xsplatter"
+
+/obj/effect/overlay/temp/dir_setting/speedbike_trail
+	name = "speedbike trails"
+	icon_state = "ion_fade"
+	layer = BELOW_MOB_LAYER
+	duration = 10
+	randomdir = 0
+
+/obj/effect/overlay/temp/dir_setting/firing_effect
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "firing_effect"
+	duration = 2
+
+/obj/effect/overlay/temp/dir_setting/firing_effect/setDir(newdir)
+	switch(newdir)
+		if(NORTH)
+			layer = BELOW_MOB_LAYER
+			pixel_x = rand(-3,3)
+			pixel_y = rand(4,6)
+		if(SOUTH)
+			pixel_x = rand(-3,3)
+			pixel_y = rand(-1,1)
+		else
+			pixel_x = rand(-1,1)
+			pixel_y = rand(-1,1)
+	..()
+
+/obj/effect/overlay/temp/dir_setting/firing_effect/energy
+	icon_state = "firing_effect_energy"
+	duration = 3
+
+/obj/effect/overlay/temp/dir_setting/firing_effect/magic
+	icon_state = "shieldsparkles"
+	duration = 3
+
+/obj/effect/overlay/temp/dir_setting/ninja
+	name = "ninja shadow"
+	icon = 'icons/mob/mob.dmi'
+	icon_state = "uncloak"
+	duration = 9
+
+/obj/effect/overlay/temp/dir_setting/ninja/cloak
+	icon_state = "cloak"
+
+/obj/effect/overlay/temp/dir_setting/ninja/shadow
+	icon_state = "shadow"
+
+/obj/effect/overlay/temp/dir_setting/ninja/phase
+	name = "ninja energy"
+	icon_state = "phasein"
+
+/obj/effect/overlay/temp/dir_setting/ninja/phase/out
+	icon_state = "phaseout"
+
+/obj/effect/overlay/temp/dir_setting/wraith
+	name = "blood"
+	icon = 'icons/mob/mob.dmi'
+	icon_state = "phase_shift2"
+	duration = 12
+
+/obj/effect/overlay/temp/dir_setting/wraith/out
+	icon_state = "phase_shift"
+
+/obj/effect/overlay/temp/dir_setting/tailsweep
+	icon_state = "tailsweep"
+	duration = 4
+
+/obj/effect/overlay/temp/wizard
+	name = "water"
+	icon = 'icons/mob/mob.dmi'
+	icon_state = "reappear"
+	duration = 5
+
+/obj/effect/overlay/temp/wizard/out
+	icon_state = "liquify"
+	duration = 12
+
+/obj/effect/overlay/temp/monkeyify
+	icon = 'icons/mob/mob.dmi'
+	icon_state = "h2monkey"
+	duration = 22
+
+/obj/effect/overlay/temp/monkeyify/humanify
+	icon_state = "monkey2h"
+
+/obj/effect/overlay/temp/borgflash
+	icon = 'icons/mob/mob.dmi'
+	icon_state = "blspell"
+	duration = 5
+
+/obj/effect/overlay/temp/guardian
+	randomdir = 0
+
+/obj/effect/overlay/temp/guardian/phase
+	duration = 5
+	icon_state = "phasein"
+
+/obj/effect/overlay/temp/guardian/phase/out
+	icon_state = "phaseout"
+
+/obj/effect/overlay/temp/decoy
+	desc = "It's a decoy!"
+	duration = 15
+
+/obj/effect/overlay/temp/decoy/Initialize(mapload, atom/mimiced_atom)
+	. = ..()
+	alpha = initial(alpha)
+	if(mimiced_atom)
+		name = mimiced_atom.name
+		appearance = mimiced_atom.appearance
+		setDir(mimiced_atom.dir)
+		mouse_opacity = 0
+
+/obj/effect/overlay/temp/decoy/fading/Initialize(mapload, atom/mimiced_atom)
+	. = ..()
+	animate(src, alpha = 0, time = duration)
+
+/obj/effect/overlay/temp/decoy/fading/fivesecond
+	duration = 50
+
+/obj/effect/overlay/temp/small_smoke
+	icon_state = "smoke"
+	duration = 50
+
+/obj/effect/overlay/temp/fire
+	icon = 'icons/effects/fire.dmi'
+	icon_state = "3"
+	duration = 20
+
+/obj/effect/overlay/temp/revenant
+	name = "spooky lights"
+	icon_state = "purplesparkles"
+
+/obj/effect/overlay/temp/revenant/cracks
+	name = "glowing cracks"
+	icon_state = "purplecrack"
+	duration = 6
+
+/obj/effect/overlay/temp/gravpush
+	name = "gravity wave"
+	icon_state = "shieldsparkles"
+	duration = 5
+
+/obj/effect/overlay/temp/telekinesis
+	name = "telekinetic force"
+	icon_state = "empdisable"
+	duration = 5
+
+/obj/effect/overlay/temp/emp
+	name = "emp sparks"
+	icon_state = "empdisable"
+
+/obj/effect/overlay/temp/emp/pulse
+	name = "emp pulse"
+	icon_state = "emppulse"
+	duration = 8
+	randomdir = 0
+
+/obj/effect/overlay/temp/gib_animation
+	icon = 'icons/mob/mob.dmi'
+	duration = 15
+
+/obj/effect/overlay/temp/gib_animation/Initialize(mapload, gib_icon)
+	icon_state = gib_icon // Needs to be before ..() so icon is correct
+	. = ..()
+
+/obj/effect/overlay/temp/gib_animation/animal
+	icon = 'icons/mob/animal.dmi'
+
+/obj/effect/overlay/temp/dust_animation
+	icon = 'icons/mob/mob.dmi'
+	duration = 15
+
+/obj/effect/overlay/temp/dust_animation/Initialize(mapload, dust_icon)
+	icon_state = dust_icon // Before ..() so the correct icon is flick()'d
+	. = ..()
+
+/obj/effect/overlay/temp/mummy_animation
+	icon = 'icons/mob/mob.dmi'
+	icon_state = "mummy_revive"
+	duration = 20
+
+/obj/effect/overlay/temp/heal //color is white by default, set to whatever is needed
+	name = "healing glow"
+	icon_state = "heal"
+	duration = 15
+
+/obj/effect/overlay/temp/heal/Initialize(mapload, set_color)
+	if(set_color)
+		add_atom_colour(set_color, FIXED_COLOUR_PRIORITY)
+	. = ..()
+	pixel_x = rand(-12, 12)
+	pixel_y = rand(-9, 0)
+
+/obj/effect/overlay/temp/kinetic_blast
+	name = "kinetic explosion"
+	icon = 'icons/obj/projectiles.dmi'
+	icon_state = "kinetic_blast"
+	layer = ABOVE_ALL_MOB_LAYER
+	duration = 4
+
+/obj/effect/overlay/temp/explosion
+	name = "explosion"
+	icon = 'icons/effects/96x96.dmi'
+	icon_state = "explosion"
+	pixel_x = -32
+	pixel_y = -32
+	duration = 8
+
+/obj/effect/overlay/temp/explosion/fast
+	icon_state = "explosionfast"
+	duration = 4
+
+/obj/effect/overlay/temp/blob
+	name = "blob"
+	icon_state = "blob_attack"
+	alpha = 140
+	randomdir = 0
+	duration = 6
+
+/obj/effect/overlay/temp/impact_effect
+	icon_state = "impact_bullet"
+	duration = 5
+
+/obj/effect/overlay/temp/impact_effect/Initialize(mapload, atom/target, obj/item/projectile/P)
+	if(target == P.original) //the projectile hit the target originally clicked
+		pixel_x = P.p_x + target.pixel_x - 16 + rand(-4,4)
+		pixel_y = P.p_y + target.pixel_y - 16 + rand(-4,4)
+	else
+		pixel_x = target.pixel_x + rand(-4,4)
+		pixel_y = target.pixel_y + rand(-4,4)
+	. = ..()
+
+/obj/effect/overlay/temp/impact_effect/red_laser
+	icon_state = "impact_laser"
+	duration = 4
+
+/obj/effect/overlay/temp/impact_effect/red_laser/wall
+	icon_state = "impact_laser_wall"
+	duration = 10
+
+/obj/effect/overlay/temp/impact_effect/blue_laser
+	icon_state = "impact_laser_blue"
+	duration = 4
+
+/obj/effect/overlay/temp/impact_effect/green_laser
+	icon_state = "impact_laser_green"
+	duration = 4
+
+/obj/effect/overlay/temp/impact_effect/purple_laser
+	icon_state = "impact_laser_purple"
+	duration = 4
+
+/obj/effect/overlay/temp/impact_effect/ion
+	icon_state = "shieldsparkles"
+	duration = 6
+
+/obj/effect/overlay/temp/heart
+	name = "heart"
+	icon = 'icons/mob/animal.dmi'
+	icon_state = "heart"
+	duration = 25
+
+/obj/effect/overlay/temp/heart/Initialize(mapload)
+	. = ..()
+	pixel_x = rand(-4,4)
+	pixel_y = rand(-4,4)
+	animate(src, pixel_y = pixel_y + 32, alpha = 0, time = 25)

code/game/objects/effects/temporary_visuals/temporary_visual.dm

@@ -0,0 +1,37 @@
+//temporary visual effects
+/obj/effect/overlay/temp
+	icon_state = "nothing"
+	anchored = 1
+	layer = ABOVE_MOB_LAYER
+	mouse_opacity = 0
+	var/duration = 10 //in deciseconds
+	var/randomdir = TRUE
+	var/timerid
+
+/obj/effect/overlay/temp/Initialize()
+	. = ..()
+	if(randomdir)
+		setDir(pick(GLOB.cardinal))
+
+	timerid = QDEL_IN(src, duration)
+
+/obj/effect/overlay/temp/Destroy()
+	. = ..()
+	deltimer(timerid)
+
+/obj/effect/overlay/temp/singularity_act()
+	return
+
+/obj/effect/overlay/temp/singularity_pull()
+	return
+
+/obj/effect/overlay/temp/ex_act()
+	return
+
+/obj/effect/overlay/temp/dir_setting
+	randomdir = FALSE
+
+/obj/effect/overlay/temp/dir_setting/Initialize(mapload, set_dir)
+	if(set_dir)
+		setDir(set_dir)
+	. = ..()

code/game/objects/items/devices/PDA/radio.dm

@@ -8,8 +8,8 @@
 	var/on = 0 //Are we currently active??
 	var/menu_message = ""
 
-/obj/item/radio/integrated/New()
-	..()
+/obj/item/radio/integrated/Initialize()
+	. = ..()
 	if (istype(loc.loc, /obj/item/device/pda))
 		hostpda = loc.loc
 

code/game/objects/items/devices/gps.dm

@@ -1,64 +1,64 @@
-GLOBAL_LIST_EMPTY(GPS_list)
-/obj/item/device/gps
-	name = "global positioning system"
-	desc = "Helping lost spacemen find their way through the planets since 2016. Alt+click to toggle power."
-	icon = 'icons/obj/telescience.dmi'
-	icon_state = "gps-c"
-	w_class = WEIGHT_CLASS_SMALL
-	slot_flags = SLOT_BELT
-	origin_tech = "materials=2;magnets=1;bluespace=2"
-	unique_rename = TRUE
-	var/gpstag = "COM0"
-	var/emped = FALSE
-	var/turf/locked_location
-	var/tracking = TRUE
+GLOBAL_LIST_EMPTY(GPS_list)
+/obj/item/device/gps
+	name = "global positioning system"
+	desc = "Helping lost spacemen find their way through the planets since 2016. Alt+click to toggle power."
+	icon = 'icons/obj/telescience.dmi'
+	icon_state = "gps-c"
+	w_class = WEIGHT_CLASS_SMALL
+	slot_flags = SLOT_BELT
+	origin_tech = "materials=2;magnets=1;bluespace=2"
+	unique_rename = TRUE
+	var/gpstag = "COM0"
+	var/emped = FALSE
+	var/turf/locked_location
+	var/tracking = TRUE
 	var/updating = TRUE //Automatic updating of GPS list. Can be set to manual by user.
 	var/global_mode = TRUE //If disabled, only GPS signals of the same Z level are shown
 
-
-/obj/item/device/gps/Initialize()
-	..()
-	GLOB.GPS_list += src
-	name = "global positioning system ([gpstag])"
-	add_overlay("working")
-
-/obj/item/device/gps/Destroy()
-	GLOB.GPS_list -= src
-	return ..()
-
-/obj/item/device/gps/emp_act(severity)
-	emped = TRUE
-	cut_overlay("working")
-	add_overlay("emp")
-	addtimer(CALLBACK(src, .proc/reboot), 300, TIMER_OVERRIDE) //if a new EMP happens, remove the old timer so it doesn't reactivate early
+
+/obj/item/device/gps/Initialize()
+	..()
+	GLOB.GPS_list += src
+	name = "global positioning system ([gpstag])"
+	add_overlay("working")
+
+/obj/item/device/gps/Destroy()
+	GLOB.GPS_list -= src
+	return ..()
+
+/obj/item/device/gps/emp_act(severity)
+	emped = TRUE
+	cut_overlay("working")
+	add_overlay("emp")
+	addtimer(CALLBACK(src, .proc/reboot), 300, TIMER_OVERRIDE) //if a new EMP happens, remove the old timer so it doesn't reactivate early
 	SStgui.close_uis(src) //Close the UI control if it is open.
-
-/obj/item/device/gps/proc/reboot()
-	emped = FALSE
-	cut_overlay("emp")
-	add_overlay("working")
-
-/obj/item/device/gps/AltClick(mob/user)
+
+/obj/item/device/gps/proc/reboot()
+	emped = FALSE
+	cut_overlay("emp")
+	add_overlay("working")
+
+/obj/item/device/gps/AltClick(mob/user)
 	toggletracking(user)
 
 /obj/item/device/gps/proc/toggletracking(mob/user)
-	if(!user.canUseTopic(src, be_close=TRUE))
-		return //user not valid to use gps
-	if(emped)
-		to_chat(user, "It's busted!")
-		return
-	if(tracking)
-		cut_overlay("working")
-		to_chat(user, "[src] is no longer tracking, or visible to other GPS devices.")
-		tracking = FALSE
-	else
-		add_overlay("working")
-		to_chat(user, "[src] is now tracking, and visible to other GPS devices.")
-		tracking = TRUE
-
-
+	if(!user.canUseTopic(src, be_close=TRUE))
+		return //user not valid to use gps
+	if(emped)
+		to_chat(user, "It's busted!")
+		return
+	if(tracking)
+		cut_overlay("working")
+		to_chat(user, "[src] is no longer tracking, or visible to other GPS devices.")
+		tracking = FALSE
+	else
+		add_overlay("working")
+		to_chat(user, "[src] is now tracking, and visible to other GPS devices.")
+		tracking = TRUE
+
+
 /obj/item/device/gps/ui_interact(mob/user, ui_key = "gps", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) // Remember to use the appropriate state.
-	if(emped)
+	if(emped)
 		to_chat(user, "[src] fizzles weakly.")
 		return
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
@@ -131,82 +131,82 @@ GLOBAL_LIST_EMPTY(GPS_list)
 		if("globalmode")
 			global_mode = !global_mode
 			. = TRUE
-
-/obj/item/device/gps/Topic(href, href_list)
-	..()
-	if(href_list["tag"] )
-		var/a = input("Please enter desired tag.", name, gpstag) as text
-		a = copytext(sanitize(a), 1, 20)
-		if(in_range(src, usr))
-			gpstag = a
-			attack_self(usr)
-
-/obj/item/device/gps/science
-	icon_state = "gps-s"
-	gpstag = "SCI0"
-
-/obj/item/device/gps/engineering
-	icon_state = "gps-e"
-	gpstag = "ENG0"
-
-/obj/item/device/gps/mining
-	icon_state = "gps-m"
-	gpstag = "MINE0"
-	desc = "A positioning system helpful for rescuing trapped or injured miners, keeping one on you at all times while mining might just save your life."
-
-/obj/item/device/gps/cyborg
-	icon_state = "gps-b"
-	gpstag = "BORG0"
-	desc = "A mining cyborg internal positioning system. Used as a recovery beacon for damaged cyborg assets, or a collaboration tool for mining teams."
-	flags = NODROP
-
-/obj/item/device/gps/internal
-	icon_state = null
-	flags = ABSTRACT
-	gpstag = "Eerie Signal"
-	desc = "Report to a coder immediately."
-	invisibility = INVISIBILITY_MAXIMUM
-
-/obj/item/device/gps/mining/internal
-	icon_state = "gps-m"
-	gpstag = "MINER"
-	desc = "A positioning system helpful for rescuing trapped or injured miners, keeping one on you at all times while mining might just save your life."
-
-/obj/item/device/gps/internal/base
-	gpstag = "NT_AUX"
-	desc = "A homing signal from Nanotrasen's mining base."
-
-/obj/item/device/gps/visible_debug
-	name = "visible GPS"
-	gpstag = "ADMIN"
-	desc = "This admin-spawn GPS unit leaves the coordinates visible \
-		on any turf that it passes over, for debugging. Especially useful \
-		for marking the area around the transition edges."
-	var/list/turf/tagged
-
-/obj/item/device/gps/visible_debug/Initialize()
-	. = ..()
-	tagged = list()
-	START_PROCESSING(SSfastprocess, src)
-
-/obj/item/device/gps/visible_debug/process()
-	var/turf/T = get_turf(src)
-	if(T)
-		// I assume it's faster to color,tag and OR the turf in, rather
-		// then checking if its there
-		T.color = RANDOM_COLOUR
-		T.maptext = "[T.x],[T.y],[T.z]"
-		tagged |= T
-
-/obj/item/device/gps/visible_debug/proc/clear()
-	while(tagged.len)
-		var/turf/T = pop(tagged)
-		T.color = initial(T.color)
-		T.maptext = initial(T.maptext)
-
-/obj/item/device/gps/visible_debug/Destroy()
-	if(tagged)
-		clear()
-	tagged = null
-	STOP_PROCESSING(SSfastprocess, src)
+
+/obj/item/device/gps/Topic(href, href_list)
+	..()
+	if(href_list["tag"] )
+		var/a = input("Please enter desired tag.", name, gpstag) as text
+		a = copytext(sanitize(a), 1, 20)
+		if(in_range(src, usr))
+			gpstag = a
+			attack_self(usr)
+
+/obj/item/device/gps/science
+	icon_state = "gps-s"
+	gpstag = "SCI0"
+
+/obj/item/device/gps/engineering
+	icon_state = "gps-e"
+	gpstag = "ENG0"
+
+/obj/item/device/gps/mining
+	icon_state = "gps-m"
+	gpstag = "MINE0"
+	desc = "A positioning system helpful for rescuing trapped or injured miners, keeping one on you at all times while mining might just save your life."
+
+/obj/item/device/gps/cyborg
+	icon_state = "gps-b"
+	gpstag = "BORG0"
+	desc = "A mining cyborg internal positioning system. Used as a recovery beacon for damaged cyborg assets, or a collaboration tool for mining teams."
+	flags = NODROP
+
+/obj/item/device/gps/internal
+	icon_state = null
+	flags = ABSTRACT
+	gpstag = "Eerie Signal"
+	desc = "Report to a coder immediately."
+	invisibility = INVISIBILITY_MAXIMUM
+
+/obj/item/device/gps/mining/internal
+	icon_state = "gps-m"
+	gpstag = "MINER"
+	desc = "A positioning system helpful for rescuing trapped or injured miners, keeping one on you at all times while mining might just save your life."
+
+/obj/item/device/gps/internal/base
+	gpstag = "NT_AUX"
+	desc = "A homing signal from Nanotrasen's mining base."
+
+/obj/item/device/gps/visible_debug
+	name = "visible GPS"
+	gpstag = "ADMIN"
+	desc = "This admin-spawn GPS unit leaves the coordinates visible \
+		on any turf that it passes over, for debugging. Especially useful \
+		for marking the area around the transition edges."
+	var/list/turf/tagged
+
+/obj/item/device/gps/visible_debug/Initialize()
+	. = ..()
+	tagged = list()
+	START_PROCESSING(SSfastprocess, src)
+
+/obj/item/device/gps/visible_debug/process()
+	var/turf/T = get_turf(src)
+	if(T)
+		// I assume it's faster to color,tag and OR the turf in, rather
+		// then checking if its there
+		T.color = RANDOM_COLOUR
+		T.maptext = "[T.x],[T.y],[T.z]"
+		tagged |= T
+
+/obj/item/device/gps/visible_debug/proc/clear()
+	while(tagged.len)
+		var/turf/T = pop(tagged)
+		T.color = initial(T.color)
+		T.maptext = initial(T.maptext)
+
+/obj/item/device/gps/visible_debug/Destroy()
+	if(tagged)
+		clear()
+	tagged = null
+	STOP_PROCESSING(SSfastprocess, src)
 	. = ..()

code/game/objects/items/devices/powersink.dm

@@ -1,145 +1,145 @@
-// Powersink - used to drain station power
-
-/obj/item/device/powersink
-	desc = "A nulling power sink which drains energy from electrical systems."
-	name = "power sink"
-	icon_state = "powersink0"
-	item_state = "electronic"
-	w_class = WEIGHT_CLASS_BULKY
-	flags = CONDUCT
-	throwforce = 5
-	throw_speed = 1
-	throw_range = 2
-	materials = list(MAT_METAL=750)
-	origin_tech = "powerstorage=5;syndicate=5"
-	var/drain_rate = 1600000	// amount of power to drain per tick
-	var/power_drained = 0 		// has drained this much power
-	var/max_power = 1e10		// maximum power that can be drained before exploding
-	var/mode = 0		// 0 = off, 1=clamped (off), 2=operating
-	var/admins_warned = 0 // stop spam, only warn the admins once that we are about to boom
-
-	var/const/DISCONNECTED = 0
-	var/const/CLAMPED_OFF = 1
-	var/const/OPERATING = 2
-
-	var/obj/structure/cable/attached		// the attached cable
-
-/obj/item/device/powersink/update_icon()
-	icon_state = "powersink[mode == OPERATING]"
-
-/obj/item/device/powersink/proc/set_mode(value)
-	if(value == mode)
-		return
-	switch(value)
-		if(DISCONNECTED)
-			attached = null
-			if(mode == OPERATING)
-				STOP_PROCESSING(SSobj, src)
-			anchored = 0
-
-		if(CLAMPED_OFF)
-			if(!attached)
-				return
-			if(mode == OPERATING)
-				STOP_PROCESSING(SSobj, src)
-			anchored = 1
-
-		if(OPERATING)
-			if(!attached)
-				return
-			START_PROCESSING(SSobj, src)
-			anchored = 1
-
-	mode = value
-	update_icon()
-	set_light(0)
-
-/obj/item/device/powersink/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/screwdriver))
-		if(mode == DISCONNECTED)
-			var/turf/T = loc
-			if(isturf(T) && !T.intact)
-				attached = locate() in T
-				if(!attached)
-					to_chat(user, "<span class='warning'>This device must be placed over an exposed, powered cable node!</span>")
-				else
-					set_mode(CLAMPED_OFF)
-					user.visible_message( \
-						"[user] attaches \the [src] to the cable.", \
-						"<span class='notice'>You attach \the [src] to the cable.</span>",
-						"<span class='italics'>You hear some wires being connected to something.</span>")
-			else
-				to_chat(user, "<span class='warning'>This device must be placed over an exposed, powered cable node!</span>")
-		else
-			set_mode(DISCONNECTED)
-			user.visible_message( \
-				"[user] detaches \the [src] from the cable.", \
-				"<span class='notice'>You detach \the [src] from the cable.</span>",
-				"<span class='italics'>You hear some wires being disconnected from something.</span>")
-	else
-		return ..()
-
-/obj/item/device/powersink/attack_paw()
-	return
-
-/obj/item/device/powersink/attack_ai()
-	return
-
-/obj/item/device/powersink/attack_hand(mob/user)
-	switch(mode)
-		if(DISCONNECTED)
-			..()
-
-		if(CLAMPED_OFF)
-			user.visible_message( \
-				"[user] activates \the [src]!", \
-				"<span class='notice'>You activate \the [src].</span>",
-				"<span class='italics'>You hear a click.</span>")
+// Powersink - used to drain station power
+
+/obj/item/device/powersink
+	desc = "A nulling power sink which drains energy from electrical systems."
+	name = "power sink"
+	icon_state = "powersink0"
+	item_state = "electronic"
+	w_class = WEIGHT_CLASS_BULKY
+	flags = CONDUCT
+	throwforce = 5
+	throw_speed = 1
+	throw_range = 2
+	materials = list(MAT_METAL=750)
+	origin_tech = "powerstorage=5;syndicate=5"
+	var/drain_rate = 1600000	// amount of power to drain per tick
+	var/power_drained = 0 		// has drained this much power
+	var/max_power = 1e10		// maximum power that can be drained before exploding
+	var/mode = 0		// 0 = off, 1=clamped (off), 2=operating
+	var/admins_warned = 0 // stop spam, only warn the admins once that we are about to boom
+
+	var/const/DISCONNECTED = 0
+	var/const/CLAMPED_OFF = 1
+	var/const/OPERATING = 2
+
+	var/obj/structure/cable/attached		// the attached cable
+
+/obj/item/device/powersink/update_icon()
+	icon_state = "powersink[mode == OPERATING]"
+
+/obj/item/device/powersink/proc/set_mode(value)
+	if(value == mode)
+		return
+	switch(value)
+		if(DISCONNECTED)
+			attached = null
+			if(mode == OPERATING)
+				STOP_PROCESSING(SSobj, src)
+			anchored = 0
+
+		if(CLAMPED_OFF)
+			if(!attached)
+				return
+			if(mode == OPERATING)
+				STOP_PROCESSING(SSobj, src)
+			anchored = 1
+
+		if(OPERATING)
+			if(!attached)
+				return
+			START_PROCESSING(SSobj, src)
+			anchored = 1
+
+	mode = value
+	update_icon()
+	set_light(0)
+
+/obj/item/device/powersink/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/weapon/screwdriver))
+		if(mode == DISCONNECTED)
+			var/turf/T = loc
+			if(isturf(T) && !T.intact)
+				attached = locate() in T
+				if(!attached)
+					to_chat(user, "<span class='warning'>This device must be placed over an exposed, powered cable node!</span>")
+				else
+					set_mode(CLAMPED_OFF)
+					user.visible_message( \
+						"[user] attaches \the [src] to the cable.", \
+						"<span class='notice'>You attach \the [src] to the cable.</span>",
+						"<span class='italics'>You hear some wires being connected to something.</span>")
+			else
+				to_chat(user, "<span class='warning'>This device must be placed over an exposed, powered cable node!</span>")
+		else
+			set_mode(DISCONNECTED)
+			user.visible_message( \
+				"[user] detaches \the [src] from the cable.", \
+				"<span class='notice'>You detach \the [src] from the cable.</span>",
+				"<span class='italics'>You hear some wires being disconnected from something.</span>")
+	else
+		return ..()
+
+/obj/item/device/powersink/attack_paw()
+	return
+
+/obj/item/device/powersink/attack_ai()
+	return
+
+/obj/item/device/powersink/attack_hand(mob/user)
+	switch(mode)
+		if(DISCONNECTED)
+			..()
+
+		if(CLAMPED_OFF)
+			user.visible_message( \
+				"[user] activates \the [src]!", \
+				"<span class='notice'>You activate \the [src].</span>",
+				"<span class='italics'>You hear a click.</span>")
 			message_admins("Power sink activated by [ADMIN_LOOKUPFLW(user)] at [ADMIN_COORDJMP(src)]")
 			log_game("Power sink activated by [key_name(user)] at [COORD(src)]")
-			set_mode(OPERATING)
-
-		if(OPERATING)
-			user.visible_message( \
-				"[user] deactivates \the [src]!", \
-				"<span class='notice'>You deactivate \the [src].</span>",
-				"<span class='italics'>You hear a click.</span>")
-			set_mode(CLAMPED_OFF)
-
-/obj/item/device/powersink/process()
-	if(!attached)
-		set_mode(DISCONNECTED)
-		return
-
-	var/datum/powernet/PN = attached.powernet
-	if(PN)
-		set_light(5)
-
-		// found a powernet, so drain up to max power from it
-
-		var/drained = min ( drain_rate, PN.avail )
-		PN.load += drained
-		power_drained += drained
-
-		// if tried to drain more than available on powernet
-		// now look for APCs and drain their cells
-		if(drained < drain_rate)
-			for(var/obj/machinery/power/terminal/T in PN.nodes)
-				if(istype(T.master, /obj/machinery/power/apc))
-					var/obj/machinery/power/apc/A = T.master
-					if(A.operating && A.cell)
-						A.cell.charge = max(0, A.cell.charge - 50)
-						power_drained += 50
-						if(A.charging == 2) // If the cell was full
-							A.charging = 1 // It's no longer full
-
-	if(power_drained > max_power * 0.98)
-		if (!admins_warned)
-			admins_warned = 1
-			message_admins("Power sink at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>) is 95% full. Explosion imminent.")
-		playsound(src, 'sound/effects/screech.ogg', 100, 1, 1)
-
-	if(power_drained >= max_power)
-		STOP_PROCESSING(SSobj, src)
-		explosion(src.loc, 4,8,16,32)
-		qdel(src)
+			set_mode(OPERATING)
+
+		if(OPERATING)
+			user.visible_message( \
+				"[user] deactivates \the [src]!", \
+				"<span class='notice'>You deactivate \the [src].</span>",
+				"<span class='italics'>You hear a click.</span>")
+			set_mode(CLAMPED_OFF)
+
+/obj/item/device/powersink/process()
+	if(!attached)
+		set_mode(DISCONNECTED)
+		return
+
+	var/datum/powernet/PN = attached.powernet
+	if(PN)
+		set_light(5)
+
+		// found a powernet, so drain up to max power from it
+
+		var/drained = min ( drain_rate, PN.avail )
+		PN.load += drained
+		power_drained += drained
+
+		// if tried to drain more than available on powernet
+		// now look for APCs and drain their cells
+		if(drained < drain_rate)
+			for(var/obj/machinery/power/terminal/T in PN.nodes)
+				if(istype(T.master, /obj/machinery/power/apc))
+					var/obj/machinery/power/apc/A = T.master
+					if(A.operating && A.cell)
+						A.cell.charge = max(0, A.cell.charge - 50)
+						power_drained += 50
+						if(A.charging == 2) // If the cell was full
+							A.charging = 1 // It's no longer full
+
+	if(power_drained > max_power * 0.98)
+		if (!admins_warned)
+			admins_warned = 1
+			message_admins("Power sink at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>) is 95% full. Explosion imminent.")
+		playsound(src, 'sound/effects/screech.ogg', 100, 1, 1)
+
+	if(power_drained >= max_power)
+		STOP_PROCESSING(SSobj, src)
+		explosion(src.loc, 4,8,16,32)
+		qdel(src)

code/game/objects/items/devices/radio/beacon.dm

@@ -7,8 +7,8 @@
 	origin_tech = "bluespace=1"
 	dog_fashion = null
 
-/obj/item/device/radio/beacon/New()
-	..()
+/obj/item/device/radio/beacon/Initialize()
+	. = ..()
 	GLOB.teleportbeacons += src
 
 /obj/item/device/radio/beacon/Destroy()

code/game/objects/items/devices/radio/headset.dm

@@ -11,8 +11,8 @@
 	var/obj/item/device/encryptionkey/keyslot2 = null
 	dog_fashion = null
 
-/obj/item/device/radio/headset/New()
-	..()
+/obj/item/device/radio/headset/Initialize()
+	. = ..()
 	recalculateChannels()
 
 /obj/item/device/radio/headset/Destroy()
@@ -47,21 +47,21 @@
 	item_state = "syndie_headset"
 
 /obj/item/device/radio/headset/syndicate/alt/Initialize(mapload)
-	..()
+	. = ..()
 	SET_SECONDARY_FLAG(src, BANG_PROTECT)
 
 /obj/item/device/radio/headset/syndicate/alt/leader
 	name = "team leader headset"
 	command = TRUE
 
-/obj/item/device/radio/headset/syndicate/New()
-	..()
+/obj/item/device/radio/headset/syndicate/Initialize()
+	. = ..()
 	make_syndie()
 
 /obj/item/device/radio/headset/binary
 	origin_tech = "syndicate=3"
-/obj/item/device/radio/headset/binary/New()
-	..()
+/obj/item/device/radio/headset/binary/Initialize()
+	. = ..()
 	qdel(keyslot)
 	keyslot = new /obj/item/device/encryptionkey/binary
 	recalculateChannels()
@@ -79,7 +79,7 @@
 	item_state = "sec_headset_alt"
 
 /obj/item/device/radio/headset/headset_sec/alt/Initialize(mapload)
-	..()
+	. = ..()
 	SET_SECONDARY_FLAG(src, BANG_PROTECT)
 
 /obj/item/device/radio/headset/headset_eng
@@ -134,7 +134,7 @@
 	item_state = "com_headset_alt"
 
 /obj/item/device/radio/headset/heads/captain/alt/Initialize(mapload)
-	..()
+	. = ..()
 	SET_SECONDARY_FLAG(src, BANG_PROTECT)
 
 /obj/item/device/radio/headset/heads/rd
@@ -156,7 +156,7 @@
 	item_state = "com_headset_alt"
 
 /obj/item/device/radio/headset/heads/hos/alt/Initialize(mapload)
-	..()
+	. = ..()
 	SET_SECONDARY_FLAG(src, BANG_PROTECT)
 
 /obj/item/device/radio/headset/heads/ce
@@ -213,7 +213,7 @@
 	keyslot = null
 
 /obj/item/device/radio/headset/headset_cent/alt/Initialize(mapload)
-	..()
+	. = ..()
 	SET_SECONDARY_FLAG(src, BANG_PROTECT)
 
 /obj/item/device/radio/headset/ai

code/game/objects/items/devices/radio/intercom.dm

@@ -11,8 +11,8 @@
 	var/last_tick //used to delay the powercheck
 	dog_fashion = null
 
-/obj/item/device/radio/intercom/New()
-	..()
+/obj/item/device/radio/intercom/Initialize()
+	. = ..()
 	START_PROCESSING(SSobj, src)
 
 /obj/item/device/radio/intercom/Destroy()

code/game/objects/items/devices/transfer_valve.dm

@@ -1,211 +1,211 @@
-/obj/item/device/transfer_valve
-	icon = 'icons/obj/assemblies.dmi'
-	name = "tank transfer valve"
-	icon_state = "valve_1"
-	item_state = "ttv"
-	desc = "Regulates the transfer of air between two tanks"
-	var/obj/item/weapon/tank/tank_one
-	var/obj/item/weapon/tank/tank_two
-	var/obj/item/device/attached_device
-	var/mob/attacher = null
-	var/valve_open = 0
-	var/toggle = 1
-	origin_tech = "materials=1;engineering=1"
-
-/obj/item/device/transfer_valve/IsAssemblyHolder()
-	return 1
-
-/obj/item/device/transfer_valve/attackby(obj/item/item, mob/user, params)
-	if(istype(item, /obj/item/weapon/tank))
-		if(tank_one && tank_two)
-			to_chat(user, "<span class='warning'>There are already two tanks attached, remove one first!</span>")
-			return
-
-		if(!tank_one)
-			if(!user.transferItemToLoc(item, src))
-				return
-			tank_one = item
-			to_chat(user, "<span class='notice'>You attach the tank to the transfer valve.</span>")
-			if(item.w_class > w_class)
-				w_class = item.w_class
-		else if(!tank_two)
-			if(!user.transferItemToLoc(item, src))
-				return
-			tank_two = item
-			to_chat(user, "<span class='notice'>You attach the tank to the transfer valve.</span>")
-			if(item.w_class > w_class)
-				w_class = item.w_class
-
-		update_icon()
-//TODO: Have this take an assemblyholder
-	else if(isassembly(item))
-		var/obj/item/device/assembly/A = item
-		if(A.secured)
-			to_chat(user, "<span class='notice'>The device is secured.</span>")
-			return
-		if(attached_device)
-			to_chat(user, "<span class='warning'>There is already a device attached to the valve, remove it first!</span>")
-			return
-		if(!user.transferItemToLoc(item, src))
-			return
-		attached_device = A
-		to_chat(user, "<span class='notice'>You attach the [item] to the valve controls and secure it.</span>")
-		A.holder = src
-		A.toggle_secure()	//this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).
-
-		GLOB.bombers += "[key_name(user)] attached a [item] to a transfer valve."
-		message_admins("[key_name_admin(user)] attached a [item] to a transfer valve.")
-		log_game("[key_name_admin(user)] attached a [item] to a transfer valve.")
-		attacher = user
-	return
-
-/obj/item/device/transfer_valve/attack_self(mob/user)
-	user.set_machine(src)
-	var/dat = {"<B> Valve properties: </B>
-	<BR> <B> Attachment one:</B> [tank_one] [tank_one ? "<A href='?src=\ref[src];tankone=1'>Remove</A>" : ""]
-	<BR> <B> Attachment two:</B> [tank_two] [tank_two ? "<A href='?src=\ref[src];tanktwo=1'>Remove</A>" : ""]
-	<BR> <B> Valve attachment:</B> [attached_device ? "<A href='?src=\ref[src];device=1'>[attached_device]</A>" : "None"] [attached_device ? "<A href='?src=\ref[src];rem_device=1'>Remove</A>" : ""]
-	<BR> <B> Valve status: </B> [ valve_open ? "<A href='?src=\ref[src];open=1'>Closed</A> <B>Open</B>" : "<B>Closed</B> <A href='?src=\ref[src];open=1'>Open</A>"]"}
-
-	var/datum/browser/popup = new(user, "trans_valve", name)
-	popup.set_content(dat)
-	popup.open()
-	return
-
-/obj/item/device/transfer_valve/Topic(href, href_list)
-	..()
-	if ( usr.stat || usr.restrained() )
-		return
-	if (src.loc == usr)
-		if(tank_one && href_list["tankone"])
-			split_gases()
-			valve_open = 0
-			tank_one.loc = get_turf(src)
-			tank_one = null
-			update_icon()
-			if((!tank_two || tank_two.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
-				w_class = WEIGHT_CLASS_NORMAL
-		else if(tank_two && href_list["tanktwo"])
-			split_gases()
-			valve_open = 0
-			tank_two.loc = get_turf(src)
-			tank_two = null
-			update_icon()
-			if((!tank_one || tank_one.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
-				w_class = WEIGHT_CLASS_NORMAL
-		else if(href_list["open"])
-			toggle_valve()
-		else if(attached_device)
-			if(href_list["rem_device"])
-				attached_device.loc = get_turf(src)
-				attached_device:holder = null
-				attached_device = null
-				update_icon()
-			if(href_list["device"])
-				attached_device.attack_self(usr)
-
-		src.attack_self(usr)
-		src.add_fingerprint(usr)
-		return
-	return
-
-/obj/item/device/transfer_valve/proc/process_activation(obj/item/device/D)
-	if(toggle)
-		toggle = 0
-		toggle_valve()
-		spawn(50) // To stop a signal being spammed from a proxy sensor constantly going off or whatever
-			toggle = 1
-
-/obj/item/device/transfer_valve/update_icon()
-	cut_overlays()
-	underlays = null
-
-	if(!tank_one && !tank_two && !attached_device)
-		icon_state = "valve_1"
-		return
-	icon_state = "valve"
-
-	if(tank_one)
-		add_overlay("[tank_one.icon_state]")
-	if(tank_two)
-		var/icon/J = new(icon, icon_state = "[tank_two.icon_state]")
-		J.Shift(WEST, 13)
-		underlays += J
-	if(attached_device)
-		add_overlay("device")
-
-/obj/item/device/transfer_valve/proc/merge_gases()
-	tank_two.air_contents.volume += tank_one.air_contents.volume
-	var/datum/gas_mixture/temp
-	temp = tank_one.air_contents.remove_ratio(1)
-	tank_two.air_contents.merge(temp)
-
-/obj/item/device/transfer_valve/proc/split_gases()
-	if (!valve_open || !tank_one || !tank_two)
-		return
-	var/ratio1 = tank_one.air_contents.volume/tank_two.air_contents.volume
-	var/datum/gas_mixture/temp
-	temp = tank_two.air_contents.remove_ratio(ratio1)
-	tank_one.air_contents.merge(temp)
-	tank_two.air_contents.volume -=  tank_one.air_contents.volume
-
-	/*
-	Exadv1: I know this isn't how it's going to work, but this was just to check
-	it explodes properly when it gets a signal (and it does).
-	*/
-
-/obj/item/device/transfer_valve/proc/toggle_valve()
-	if(!valve_open && tank_one && tank_two)
-		valve_open = 1
-		var/turf/bombturf = get_turf(src)
-		var/area/A = get_area(bombturf)
-
-		var/attachment = "no device"
-		if(attached_device)
-			if(istype(attached_device, /obj/item/device/assembly/signaler))
-				attachment = "<A HREF='?_src_=holder;secrets=list_signalers'>[attached_device]</A>"
-			else
-				attachment = attached_device
-
-		var/attacher_name = ""
-		if(!attacher)
-			attacher_name = "Unknown"
-		else
-			attacher_name = "[key_name_admin(attacher)]"
-
-		var/log_str1 = "Bomb valve opened in "
-		var/log_str2 = "with [attachment] attacher: [attacher_name]"
-
-		var/log_attacher = ""
-		if(attacher)
+/obj/item/device/transfer_valve
+	icon = 'icons/obj/assemblies.dmi'
+	name = "tank transfer valve"
+	icon_state = "valve_1"
+	item_state = "ttv"
+	desc = "Regulates the transfer of air between two tanks"
+	var/obj/item/weapon/tank/tank_one
+	var/obj/item/weapon/tank/tank_two
+	var/obj/item/device/attached_device
+	var/mob/attacher = null
+	var/valve_open = 0
+	var/toggle = 1
+	origin_tech = "materials=1;engineering=1"
+
+/obj/item/device/transfer_valve/IsAssemblyHolder()
+	return 1
+
+/obj/item/device/transfer_valve/attackby(obj/item/item, mob/user, params)
+	if(istype(item, /obj/item/weapon/tank))
+		if(tank_one && tank_two)
+			to_chat(user, "<span class='warning'>There are already two tanks attached, remove one first!</span>")
+			return
+
+		if(!tank_one)
+			if(!user.transferItemToLoc(item, src))
+				return
+			tank_one = item
+			to_chat(user, "<span class='notice'>You attach the tank to the transfer valve.</span>")
+			if(item.w_class > w_class)
+				w_class = item.w_class
+		else if(!tank_two)
+			if(!user.transferItemToLoc(item, src))
+				return
+			tank_two = item
+			to_chat(user, "<span class='notice'>You attach the tank to the transfer valve.</span>")
+			if(item.w_class > w_class)
+				w_class = item.w_class
+
+		update_icon()
+//TODO: Have this take an assemblyholder
+	else if(isassembly(item))
+		var/obj/item/device/assembly/A = item
+		if(A.secured)
+			to_chat(user, "<span class='notice'>The device is secured.</span>")
+			return
+		if(attached_device)
+			to_chat(user, "<span class='warning'>There is already a device attached to the valve, remove it first!</span>")
+			return
+		if(!user.transferItemToLoc(item, src))
+			return
+		attached_device = A
+		to_chat(user, "<span class='notice'>You attach the [item] to the valve controls and secure it.</span>")
+		A.holder = src
+		A.toggle_secure()	//this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).
+
+		GLOB.bombers += "[key_name(user)] attached a [item] to a transfer valve."
+		message_admins("[key_name_admin(user)] attached a [item] to a transfer valve.")
+		log_game("[key_name_admin(user)] attached a [item] to a transfer valve.")
+		attacher = user
+	return
+
+/obj/item/device/transfer_valve/attack_self(mob/user)
+	user.set_machine(src)
+	var/dat = {"<B> Valve properties: </B>
+	<BR> <B> Attachment one:</B> [tank_one] [tank_one ? "<A href='?src=\ref[src];tankone=1'>Remove</A>" : ""]
+	<BR> <B> Attachment two:</B> [tank_two] [tank_two ? "<A href='?src=\ref[src];tanktwo=1'>Remove</A>" : ""]
+	<BR> <B> Valve attachment:</B> [attached_device ? "<A href='?src=\ref[src];device=1'>[attached_device]</A>" : "None"] [attached_device ? "<A href='?src=\ref[src];rem_device=1'>Remove</A>" : ""]
+	<BR> <B> Valve status: </B> [ valve_open ? "<A href='?src=\ref[src];open=1'>Closed</A> <B>Open</B>" : "<B>Closed</B> <A href='?src=\ref[src];open=1'>Open</A>"]"}
+
+	var/datum/browser/popup = new(user, "trans_valve", name)
+	popup.set_content(dat)
+	popup.open()
+	return
+
+/obj/item/device/transfer_valve/Topic(href, href_list)
+	..()
+	if ( usr.stat || usr.restrained() )
+		return
+	if (src.loc == usr)
+		if(tank_one && href_list["tankone"])
+			split_gases()
+			valve_open = 0
+			tank_one.loc = get_turf(src)
+			tank_one = null
+			update_icon()
+			if((!tank_two || tank_two.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
+				w_class = WEIGHT_CLASS_NORMAL
+		else if(tank_two && href_list["tanktwo"])
+			split_gases()
+			valve_open = 0
+			tank_two.loc = get_turf(src)
+			tank_two = null
+			update_icon()
+			if((!tank_one || tank_one.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
+				w_class = WEIGHT_CLASS_NORMAL
+		else if(href_list["open"])
+			toggle_valve()
+		else if(attached_device)
+			if(href_list["rem_device"])
+				attached_device.loc = get_turf(src)
+				attached_device:holder = null
+				attached_device = null
+				update_icon()
+			if(href_list["device"])
+				attached_device.attack_self(usr)
+
+		src.attack_self(usr)
+		src.add_fingerprint(usr)
+		return
+	return
+
+/obj/item/device/transfer_valve/proc/process_activation(obj/item/device/D)
+	if(toggle)
+		toggle = 0
+		toggle_valve()
+		spawn(50) // To stop a signal being spammed from a proxy sensor constantly going off or whatever
+			toggle = 1
+
+/obj/item/device/transfer_valve/update_icon()
+	cut_overlays()
+	underlays = null
+
+	if(!tank_one && !tank_two && !attached_device)
+		icon_state = "valve_1"
+		return
+	icon_state = "valve"
+
+	if(tank_one)
+		add_overlay("[tank_one.icon_state]")
+	if(tank_two)
+		var/icon/J = new(icon, icon_state = "[tank_two.icon_state]")
+		J.Shift(WEST, 13)
+		underlays += J
+	if(attached_device)
+		add_overlay("device")
+
+/obj/item/device/transfer_valve/proc/merge_gases()
+	tank_two.air_contents.volume += tank_one.air_contents.volume
+	var/datum/gas_mixture/temp
+	temp = tank_one.air_contents.remove_ratio(1)
+	tank_two.air_contents.merge(temp)
+
+/obj/item/device/transfer_valve/proc/split_gases()
+	if (!valve_open || !tank_one || !tank_two)
+		return
+	var/ratio1 = tank_one.air_contents.volume/tank_two.air_contents.volume
+	var/datum/gas_mixture/temp
+	temp = tank_two.air_contents.remove_ratio(ratio1)
+	tank_one.air_contents.merge(temp)
+	tank_two.air_contents.volume -=  tank_one.air_contents.volume
+
+	/*
+	Exadv1: I know this isn't how it's going to work, but this was just to check
+	it explodes properly when it gets a signal (and it does).
+	*/
+
+/obj/item/device/transfer_valve/proc/toggle_valve()
+	if(!valve_open && tank_one && tank_two)
+		valve_open = 1
+		var/turf/bombturf = get_turf(src)
+		var/area/A = get_area(bombturf)
+
+		var/attachment = "no device"
+		if(attached_device)
+			if(istype(attached_device, /obj/item/device/assembly/signaler))
+				attachment = "<A HREF='?_src_=holder;secrets=list_signalers'>[attached_device]</A>"
+			else
+				attachment = attached_device
+
+		var/attacher_name = ""
+		if(!attacher)
+			attacher_name = "Unknown"
+		else
+			attacher_name = "[key_name_admin(attacher)]"
+
+		var/log_str1 = "Bomb valve opened in "
+		var/log_str2 = "with [attachment] attacher: [attacher_name]"
+
+		var/log_attacher = ""
+		if(attacher)
 			log_attacher = "[ADMIN_QUE(attacher)] [ADMIN_FLW(attacher)]"
-
-		var/mob/mob = get_mob_by_key(src.fingerprintslast)
-		var/last_touch_info = ""
-		if(mob)
+
+		var/mob/mob = get_mob_by_key(src.fingerprintslast)
+		var/last_touch_info = ""
+		if(mob)
 			last_touch_info = "[ADMIN_QUE(mob)] [ADMIN_FLW(mob)]"
-
-		var/log_str3 = " Last touched by: [key_name_admin(mob)]"
-
+
+		var/log_str3 = " Last touched by: [key_name_admin(mob)]"
+
 		var/bomb_message = "[log_str1] [A.name][ADMIN_JMP(bombturf)] [log_str2][log_attacher] [log_str3][last_touch_info]"
-
-		GLOB.bombers += bomb_message
-
-		message_admins(bomb_message, 0, 1)
+
+		GLOB.bombers += bomb_message
+
+		message_admins(bomb_message, 0, 1)
 		log_game("[log_str1] [A.name][COORD(bombturf)] [log_str2] [log_str3]")
-		merge_gases()
-		spawn(20) // In case one tank bursts
-			for (var/i=0,i<5,i++)
-				src.update_icon()
-				sleep(10)
-			src.update_icon()
-
-	else if(valve_open && tank_one && tank_two)
-		split_gases()
-		valve_open = 0
-		src.update_icon()
-
-// this doesn't do anything but the timer etc. expects it to be here
-// eventually maybe have it update icon to show state (timer, prox etc.) like old bombs
-/obj/item/device/transfer_valve/proc/c_state()
-	return
+		merge_gases()
+		spawn(20) // In case one tank bursts
+			for (var/i=0,i<5,i++)
+				src.update_icon()
+				sleep(10)
+			src.update_icon()
+
+	else if(valve_open && tank_one && tank_two)
+		split_gases()
+		valve_open = 0
+		src.update_icon()
+
+// this doesn't do anything but the timer etc. expects it to be here
+// eventually maybe have it update icon to show state (timer, prox etc.) like old bombs
+/obj/item/device/transfer_valve/proc/c_state()
+	return

code/game/objects/items/eightball.dm

@@ -4,6 +4,7 @@
 
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "eightball"
+	w_class = WEIGHT_CLASS_TINY
 
 	verb_say = "rattles"
 

code/game/objects/items/robot/robot_items.dm

@@ -504,6 +504,113 @@
 		S.change_head_color(color2)
 		dropped = TRUE
 
+//Peacekeeper Cyborg Projectile Dampenening Field
+/obj/item/borg/projectile_dampen
+	name = "Hyperkinetic Dampening projector"
+	desc = "A device that projects a dampening field that weakens kinetic energy above a certain threshold. <span class='boldnotice'>Projects a field that drains power per second \
+		while active, that will weaken and slow damaging projectiles inside its field.</span> Still being a prototype, it tends to induce a charge on ungrounded metallic surfaces."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "shield"
+	var/maxenergy = 1500
+	var/energy = 1500
+	var/energy_recharge = 7.5
+	var/energy_recharge_cyborg_drain_coefficient = 0.4
+	var/cyborg_cell_critical_percentage = 0.05
+	var/mob/living/silicon/robot/host = null
+	var/datum/proximity_monitor/advanced/dampening_field
+	var/projectile_damage_coefficient = 0.5
+	var/projectile_damage_tick_ecost_coefficient = 2	//Lasers get half their damage chopped off, drains 50 power/tick. Note that fields are processed 5 times per second.
+	var/projectile_speed_coefficient = 1.5		//Higher the coefficient slower the projectile.
+	var/projectile_tick_speed_ecost = 15
+	var/current_damage_dampening = 0
+	var/list/obj/item/projectile/tracked
+	var/image/projectile_effect
+	var/field_radius = 3
+
+/obj/item/borg/projectile_dampen/debug
+	maxenergy = 50000
+	energy = 50000
+	energy_recharge = 5000
+
+/obj/item/borg/projectile_dampen/Initialize()
+	. = ..()
+	projectile_effect = image('icons/effects/fields.dmi', "projectile_dampen_effect")
+	tracked = list()
+	icon_state = "shield0"
+	START_PROCESSING(SSfastprocess, src)
+
+/obj/item/borg/projectile_dampen/Destroy()
+	STOP_PROCESSING(SSfastprocess, src)
+	return ..()
+
+/obj/item/borg/projectile_dampen/attack_self(mob/user)
+	var/active = FALSE
+	if(!istype(dampening_field))
+		activate_field()
+		active = TRUE
+	else
+		deactivate_field()
+		active = FALSE
+	to_chat(user, "<span class='boldnotice'>You [active? "activate":"deactivate"] the [src].</span>")
+	icon_state = "[initial(icon_state)][active]"
+
+/obj/item/borg/projectile_dampen/proc/activate_field()
+	if(!istype(dampening_field))
+		dampening_field = make_field(/datum/proximity_monitor/advanced/peaceborg_dampener, list("current_range" = field_radius, "host" = src, "projector" = src))
+
+/obj/item/borg/projectile_dampen/proc/deactivate_field()
+	QDEL_NULL(dampening_field)
+	visible_message("<span class='warning'>The [src] shuts off!</span>")
+	for(var/obj/item/projectile/P in tracked)
+		restore_projectile(P)
+
+/obj/item/borg/projectile_dampen/process()
+	process_recharge()
+	process_usage()
+	update_location()
+
+/obj/item/borg/projectile_dampen/proc/update_location()
+	if(dampening_field)
+		dampening_field.HandleMove()
+
+/obj/item/borg/projectile_dampen/proc/process_usage()
+	var/usage = 0
+	for(var/I in tracked)
+		if(!tracked[I])	//No damage
+			continue
+		usage += projectile_tick_speed_ecost
+	usage += (current_damage_dampening * projectile_damage_tick_ecost_coefficient)
+	energy = Clamp(energy - usage, 0, maxenergy)
+	if(energy <= 0)
+		deactivate_field()
+		visible_message("<span class='warning'>The [src] blinks \"ENERGY DEPLETED\"</span>")
+
+/obj/item/borg/projectile_dampen/proc/process_recharge()
+	if(!istype(host))
+		energy = Clamp(energy + energy_recharge, 0, maxenergy)
+		return
+	if((host.cell.charge >= (host.cell.maxcharge * cyborg_cell_critical_percentage)) && (energy < maxenergy))
+		host.cell.use(energy_recharge*energy_recharge_cyborg_drain_coefficient)
+		energy += energy_recharge
+
+/obj/item/borg/projectile_dampen/proc/dampen_projectile(obj/item/projectile/P, track_projectile = TRUE)
+	if(tracked[P])
+		return
+	if(track_projectile)
+		tracked[P] = P.damage
+		current_damage_dampening += P.damage
+	P.damage *= projectile_damage_coefficient
+	P.speed *= projectile_speed_coefficient
+	P.add_overlay(projectile_effect)
+
+/obj/item/borg/projectile_dampen/proc/restore_projectile(obj/item/projectile/P)
+	tracked -= P
+	P.damage *= (1/projectile_damage_coefficient)
+	P.speed *= (1/projectile_speed_coefficient)
+	P.cut_overlay(projectile_effect)
+	current_damage_dampening -= P.damage
+
+
 /**********************************************************************
 						HUD/SIGHT things
 ***********************************************************************/

code/game/objects/items/robot/robot_upgrades.dm

@@ -1,403 +1,403 @@
-// robot_upgrades.dm
-// Contains various borg upgrades.
-
-/obj/item/borg/upgrade
-	name = "borg upgrade module."
-	desc = "Protected by FRM."
-	icon = 'icons/obj/module.dmi'
-	icon_state = "cyborg_upgrade"
-	origin_tech = "programming=2"
-	var/locked = 0
-	var/installed = 0
-	var/require_module = 0
-	var/module_type = null
-	// if true, is not stored in the robot to be ejected
-	// if module is reset
-	var/one_use = FALSE
-
-/obj/item/borg/upgrade/proc/action(mob/living/silicon/robot/R)
-	if(R.stat == DEAD)
-		to_chat(usr, "<span class='notice'>[src] will not function on a deceased cyborg.</span>")
-		return 1
-	if(module_type && !istype(R.module, module_type))
-		to_chat(R, "Upgrade mounting error!  No suitable hardpoint detected!")
-		to_chat(usr, "There's no mounting point for the module!")
-		return 1
-
-/obj/item/borg/upgrade/rename
-	name = "cyborg reclassification board"
-	desc = "Used to rename a cyborg."
-	icon_state = "cyborg_upgrade1"
-	var/heldname = ""
-	one_use = TRUE
-
-/obj/item/borg/upgrade/rename/attack_self(mob/user)
-	heldname = stripped_input(user, "Enter new robot name", "Cyborg Reclassification", heldname, MAX_NAME_LEN)
-
-/obj/item/borg/upgrade/rename/action(mob/living/silicon/robot/R)
-	if(..())
-		return
-
-	var/oldname = R.real_name
-
-	R.custom_name = heldname
-	R.updatename()
-	if(oldname == R.real_name)
-		R.notify_ai(RENAME, oldname, R.real_name)
-
-	return 1
-
-
-/obj/item/borg/upgrade/restart
-	name = "cyborg emergency reboot module"
-	desc = "Used to force a reboot of a disabled-but-repaired cyborg, bringing it back online."
-	icon_state = "cyborg_upgrade1"
-	one_use = TRUE
-
-/obj/item/borg/upgrade/restart/action(mob/living/silicon/robot/R)
-	if(R.health < 0)
-		to_chat(usr, "<span class='warning'>You have to repair the cyborg before using this module!</span>")
-		return 0
-
-	if(R.mind)
-		R.mind.grab_ghost()
-		playsound(loc, 'sound/voice/liveagain.ogg', 75, 1)
-
-	R.revive()
-
-	return 1
-
-/obj/item/borg/upgrade/vtec
-	name = "cyborg VTEC module"
-	desc = "Used to kick in a cyborg's VTEC systems, increasing their speed."
-	icon_state = "cyborg_upgrade2"
-	require_module = 1
-	origin_tech = "engineering=4;materials=5;programming=4"
-
-/obj/item/borg/upgrade/vtec/action(mob/living/silicon/robot/R)
-	if(..())
-		return
-	if(R.speed < 0)
-		to_chat(R, "<span class='notice'>A VTEC unit is already installed!</span>")
-		to_chat(usr, "<span class='notice'>There's no room for another VTEC unit!</span>")
-		return
-
-	R.speed = -2 // Gotta go fast.
-
-	return 1
-
-/obj/item/borg/upgrade/disablercooler
-	name = "cyborg rapid disabler cooling module"
-	desc = "Used to cool a mounted disabler, increasing the potential current in it and thus its recharge rate."
-	icon_state = "cyborg_upgrade3"
-	require_module = 1
-	module_type = /obj/item/weapon/robot_module/security
-	origin_tech = "engineering=4;powerstorage=4;combat=4"
-
-/obj/item/borg/upgrade/disablercooler/action(mob/living/silicon/robot/R)
-	if(..())
-		return
-
-	var/obj/item/weapon/gun/energy/disabler/cyborg/T = locate() in R.module.modules
-	if(!T)
-		to_chat(usr, "<span class='notice'>There's no disabler in this unit!</span>")
-		return
-	if(T.charge_delay <= 2)
-		to_chat(R, "<span class='notice'>A cooling unit is already installed!</span>")
-		to_chat(usr, "<span class='notice'>There's no room for another cooling unit!</span>")
-		return
-
-	T.charge_delay = max(2 , T.charge_delay - 4)
-
-	return 1
-
-/obj/item/borg/upgrade/thrusters
-	name = "ion thruster upgrade"
-	desc = "A energy-operated thruster system for cyborgs."
-	icon_state = "cyborg_upgrade3"
-	origin_tech = "engineering=4;powerstorage=4"
-
-/obj/item/borg/upgrade/thrusters/action(mob/living/silicon/robot/R)
-	if(..())
-		return
-
-	if(R.ionpulse)
-		to_chat(usr, "<span class='notice'>This unit already has ion thrusters installed!</span>")
-		return
-
-	R.ionpulse = TRUE
-	return 1
-
-/obj/item/borg/upgrade/ddrill
-	name = "mining cyborg diamond drill"
-	desc = "A diamond drill replacement for the mining module's standard drill."
-	icon_state = "cyborg_upgrade3"
-	require_module = 1
-	module_type = /obj/item/weapon/robot_module/miner
-	origin_tech = "engineering=4;materials=5"
-
-/obj/item/borg/upgrade/ddrill/action(mob/living/silicon/robot/R)
-	if(..())
-		return
-
-	for(var/obj/item/weapon/pickaxe/drill/cyborg/D in R.module)
-		R.module.remove_module(D, TRUE)
-	for(var/obj/item/weapon/shovel/S in R.module)
-		R.module.remove_module(S, TRUE)
-
-	var/obj/item/weapon/pickaxe/drill/cyborg/diamond/DD = new /obj/item/weapon/pickaxe/drill/cyborg/diamond(R.module)
-	R.module.basic_modules += DD
-	R.module.add_module(DD, FALSE, TRUE)
-	return 1
-
-/obj/item/borg/upgrade/soh
-	name = "mining cyborg satchel of holding"
-	desc = "A satchel of holding replacement for mining cyborg's ore satchel module."
-	icon_state = "cyborg_upgrade3"
-	require_module = 1
-	module_type = /obj/item/weapon/robot_module/miner
-	origin_tech = "engineering=4;materials=4;bluespace=4"
-
-/obj/item/borg/upgrade/soh/action(mob/living/silicon/robot/R)
-	if(..())
-		return
-
-	for(var/obj/item/weapon/storage/bag/ore/cyborg/S in R.module)
-		R.module.remove_module(S, TRUE)
-
-	var/obj/item/weapon/storage/bag/ore/holding/H = new /obj/item/weapon/storage/bag/ore/holding(R.module)
-	R.module.basic_modules += H
-	R.module.add_module(H, FALSE, TRUE)
-	return 1
-
-/obj/item/borg/upgrade/syndicate
-	name = "illegal equipment module"
-	desc = "Unlocks the hidden, deadlier functions of a cyborg"
-	icon_state = "cyborg_upgrade3"
-	require_module = 1
-	origin_tech = "combat=4;syndicate=1"
-
-/obj/item/borg/upgrade/syndicate/action(mob/living/silicon/robot/R)
-	if(..())
-		return
-
-	if(R.emagged)
-		return
-
-	R.SetEmagged(1)
-
-	return 1
-
-/obj/item/borg/upgrade/lavaproof
-	name = "mining cyborg lavaproof tracks"
-	desc = "An upgrade kit to apply specialized coolant systems and insulation layers to mining cyborg tracks, enabling them to withstand exposure to molten rock."
-	icon_state = "ash_plating"
-	resistance_flags = LAVA_PROOF | FIRE_PROOF
-	require_module = 1
-	module_type = /obj/item/weapon/robot_module/miner
-	origin_tech = "engineering=4;materials=4;plasmatech=4"
-
-/obj/item/borg/upgrade/lavaproof/action(mob/living/silicon/robot/R)
-	if(..())
-		return
-	R.weather_immunities += "lava"
-	return 1
-
-/obj/item/borg/upgrade/selfrepair
-	name = "self-repair module"
-	desc = "This module will repair the cyborg over time."
-	icon_state = "cyborg_upgrade5"
-	require_module = 1
-	var/repair_amount = -1
-	var/repair_tick = 1
-	var/msg_cooldown = 0
-	var/on = 0
-	var/powercost = 10
-	var/mob/living/silicon/robot/cyborg
-	var/datum/action/toggle_action
-
-/obj/item/borg/upgrade/selfrepair/action(mob/living/silicon/robot/R)
-	if(..())
-		return
-
-	var/obj/item/borg/upgrade/selfrepair/U = locate() in R
-	if(U)
-		to_chat(usr, "<span class='warning'>This unit is already equipped with a self-repair module.</span>")
-		return 0
-
-	cyborg = R
-	icon_state = "selfrepair_off"
-	toggle_action = new /datum/action/item_action/toggle(src)
-	toggle_action.Grant(R)
-	return 1
-
-/obj/item/borg/upgrade/selfrepair/dropped()
-	addtimer(CALLBACK(src, .proc/check_dropped), 1)
-
-/obj/item/borg/upgrade/selfrepair/proc/check_dropped()
-	if(loc != cyborg)
-		toggle_action.Remove(cyborg)
+// robot_upgrades.dm
+// Contains various borg upgrades.
+
+/obj/item/borg/upgrade
+	name = "borg upgrade module."
+	desc = "Protected by FRM."
+	icon = 'icons/obj/module.dmi'
+	icon_state = "cyborg_upgrade"
+	origin_tech = "programming=2"
+	var/locked = 0
+	var/installed = 0
+	var/require_module = 0
+	var/module_type = null
+	// if true, is not stored in the robot to be ejected
+	// if module is reset
+	var/one_use = FALSE
+
+/obj/item/borg/upgrade/proc/action(mob/living/silicon/robot/R)
+	if(R.stat == DEAD)
+		to_chat(usr, "<span class='notice'>[src] will not function on a deceased cyborg.</span>")
+		return 1
+	if(module_type && !istype(R.module, module_type))
+		to_chat(R, "Upgrade mounting error!  No suitable hardpoint detected!")
+		to_chat(usr, "There's no mounting point for the module!")
+		return 1
+
+/obj/item/borg/upgrade/rename
+	name = "cyborg reclassification board"
+	desc = "Used to rename a cyborg."
+	icon_state = "cyborg_upgrade1"
+	var/heldname = ""
+	one_use = TRUE
+
+/obj/item/borg/upgrade/rename/attack_self(mob/user)
+	heldname = stripped_input(user, "Enter new robot name", "Cyborg Reclassification", heldname, MAX_NAME_LEN)
+
+/obj/item/borg/upgrade/rename/action(mob/living/silicon/robot/R)
+	if(..())
+		return
+
+	var/oldname = R.real_name
+
+	R.custom_name = heldname
+	R.updatename()
+	if(oldname == R.real_name)
+		R.notify_ai(RENAME, oldname, R.real_name)
+
+	return 1
+
+
+/obj/item/borg/upgrade/restart
+	name = "cyborg emergency reboot module"
+	desc = "Used to force a reboot of a disabled-but-repaired cyborg, bringing it back online."
+	icon_state = "cyborg_upgrade1"
+	one_use = TRUE
+
+/obj/item/borg/upgrade/restart/action(mob/living/silicon/robot/R)
+	if(R.health < 0)
+		to_chat(usr, "<span class='warning'>You have to repair the cyborg before using this module!</span>")
+		return 0
+
+	if(R.mind)
+		R.mind.grab_ghost()
+		playsound(loc, 'sound/voice/liveagain.ogg', 75, 1)
+
+	R.revive()
+
+	return 1
+
+/obj/item/borg/upgrade/vtec
+	name = "cyborg VTEC module"
+	desc = "Used to kick in a cyborg's VTEC systems, increasing their speed."
+	icon_state = "cyborg_upgrade2"
+	require_module = 1
+	origin_tech = "engineering=4;materials=5;programming=4"
+
+/obj/item/borg/upgrade/vtec/action(mob/living/silicon/robot/R)
+	if(..())
+		return
+	if(R.speed < 0)
+		to_chat(R, "<span class='notice'>A VTEC unit is already installed!</span>")
+		to_chat(usr, "<span class='notice'>There's no room for another VTEC unit!</span>")
+		return
+
+	R.speed = -2 // Gotta go fast.
+
+	return 1
+
+/obj/item/borg/upgrade/disablercooler
+	name = "cyborg rapid disabler cooling module"
+	desc = "Used to cool a mounted disabler, increasing the potential current in it and thus its recharge rate."
+	icon_state = "cyborg_upgrade3"
+	require_module = 1
+	module_type = /obj/item/weapon/robot_module/security
+	origin_tech = "engineering=4;powerstorage=4;combat=4"
+
+/obj/item/borg/upgrade/disablercooler/action(mob/living/silicon/robot/R)
+	if(..())
+		return
+
+	var/obj/item/weapon/gun/energy/disabler/cyborg/T = locate() in R.module.modules
+	if(!T)
+		to_chat(usr, "<span class='notice'>There's no disabler in this unit!</span>")
+		return
+	if(T.charge_delay <= 2)
+		to_chat(R, "<span class='notice'>A cooling unit is already installed!</span>")
+		to_chat(usr, "<span class='notice'>There's no room for another cooling unit!</span>")
+		return
+
+	T.charge_delay = max(2 , T.charge_delay - 4)
+
+	return 1
+
+/obj/item/borg/upgrade/thrusters
+	name = "ion thruster upgrade"
+	desc = "A energy-operated thruster system for cyborgs."
+	icon_state = "cyborg_upgrade3"
+	origin_tech = "engineering=4;powerstorage=4"
+
+/obj/item/borg/upgrade/thrusters/action(mob/living/silicon/robot/R)
+	if(..())
+		return
+
+	if(R.ionpulse)
+		to_chat(usr, "<span class='notice'>This unit already has ion thrusters installed!</span>")
+		return
+
+	R.ionpulse = TRUE
+	return 1
+
+/obj/item/borg/upgrade/ddrill
+	name = "mining cyborg diamond drill"
+	desc = "A diamond drill replacement for the mining module's standard drill."
+	icon_state = "cyborg_upgrade3"
+	require_module = 1
+	module_type = /obj/item/weapon/robot_module/miner
+	origin_tech = "engineering=4;materials=5"
+
+/obj/item/borg/upgrade/ddrill/action(mob/living/silicon/robot/R)
+	if(..())
+		return
+
+	for(var/obj/item/weapon/pickaxe/drill/cyborg/D in R.module)
+		R.module.remove_module(D, TRUE)
+	for(var/obj/item/weapon/shovel/S in R.module)
+		R.module.remove_module(S, TRUE)
+
+	var/obj/item/weapon/pickaxe/drill/cyborg/diamond/DD = new /obj/item/weapon/pickaxe/drill/cyborg/diamond(R.module)
+	R.module.basic_modules += DD
+	R.module.add_module(DD, FALSE, TRUE)
+	return 1
+
+/obj/item/borg/upgrade/soh
+	name = "mining cyborg satchel of holding"
+	desc = "A satchel of holding replacement for mining cyborg's ore satchel module."
+	icon_state = "cyborg_upgrade3"
+	require_module = 1
+	module_type = /obj/item/weapon/robot_module/miner
+	origin_tech = "engineering=4;materials=4;bluespace=4"
+
+/obj/item/borg/upgrade/soh/action(mob/living/silicon/robot/R)
+	if(..())
+		return
+
+	for(var/obj/item/weapon/storage/bag/ore/cyborg/S in R.module)
+		R.module.remove_module(S, TRUE)
+
+	var/obj/item/weapon/storage/bag/ore/holding/H = new /obj/item/weapon/storage/bag/ore/holding(R.module)
+	R.module.basic_modules += H
+	R.module.add_module(H, FALSE, TRUE)
+	return 1
+
+/obj/item/borg/upgrade/syndicate
+	name = "illegal equipment module"
+	desc = "Unlocks the hidden, deadlier functions of a cyborg"
+	icon_state = "cyborg_upgrade3"
+	require_module = 1
+	origin_tech = "combat=4;syndicate=1"
+
+/obj/item/borg/upgrade/syndicate/action(mob/living/silicon/robot/R)
+	if(..())
+		return
+
+	if(R.emagged)
+		return
+
+	R.SetEmagged(1)
+
+	return 1
+
+/obj/item/borg/upgrade/lavaproof
+	name = "mining cyborg lavaproof tracks"
+	desc = "An upgrade kit to apply specialized coolant systems and insulation layers to mining cyborg tracks, enabling them to withstand exposure to molten rock."
+	icon_state = "ash_plating"
+	resistance_flags = LAVA_PROOF | FIRE_PROOF
+	require_module = 1
+	module_type = /obj/item/weapon/robot_module/miner
+	origin_tech = "engineering=4;materials=4;plasmatech=4"
+
+/obj/item/borg/upgrade/lavaproof/action(mob/living/silicon/robot/R)
+	if(..())
+		return
+	R.weather_immunities += "lava"
+	return 1
+
+/obj/item/borg/upgrade/selfrepair
+	name = "self-repair module"
+	desc = "This module will repair the cyborg over time."
+	icon_state = "cyborg_upgrade5"
+	require_module = 1
+	var/repair_amount = -1
+	var/repair_tick = 1
+	var/msg_cooldown = 0
+	var/on = 0
+	var/powercost = 10
+	var/mob/living/silicon/robot/cyborg
+	var/datum/action/toggle_action
+
+/obj/item/borg/upgrade/selfrepair/action(mob/living/silicon/robot/R)
+	if(..())
+		return
+
+	var/obj/item/borg/upgrade/selfrepair/U = locate() in R
+	if(U)
+		to_chat(usr, "<span class='warning'>This unit is already equipped with a self-repair module.</span>")
+		return 0
+
+	cyborg = R
+	icon_state = "selfrepair_off"
+	toggle_action = new /datum/action/item_action/toggle(src)
+	toggle_action.Grant(R)
+	return 1
+
+/obj/item/borg/upgrade/selfrepair/dropped()
+	addtimer(CALLBACK(src, .proc/check_dropped), 1)
+
+/obj/item/borg/upgrade/selfrepair/proc/check_dropped()
+	if(loc != cyborg)
+		toggle_action.Remove(cyborg)
 		QDEL_NULL(toggle_action)
-		cyborg = null
-		deactivate()
-
-/obj/item/borg/upgrade/selfrepair/ui_action_click()
-	on = !on
-	if(on)
-		to_chat(cyborg, "<span class='notice'>You activate the self-repair module.</span>")
-		START_PROCESSING(SSobj, src)
-	else
-		to_chat(cyborg, "<span class='notice'>You deactivate the self-repair module.</span>")
-		STOP_PROCESSING(SSobj, src)
-	update_icon()
-
-/obj/item/borg/upgrade/selfrepair/update_icon()
-	if(cyborg)
-		icon_state = "selfrepair_[on ? "on" : "off"]"
-		for(var/X in actions)
-			var/datum/action/A = X
-			A.UpdateButtonIcon()
-	else
-		icon_state = "cyborg_upgrade5"
-
-/obj/item/borg/upgrade/selfrepair/proc/deactivate()
-	STOP_PROCESSING(SSobj, src)
-	on = FALSE
-	update_icon()
-
-/obj/item/borg/upgrade/selfrepair/process()
-	if(!repair_tick)
-		repair_tick = 1
-		return
-
-	if(cyborg && (cyborg.stat != DEAD) && on)
-		if(!cyborg.cell)
-			to_chat(cyborg, "<span class='warning'>Self-repair module deactivated. Please, insert the power cell.</span>")
-			deactivate()
-			return
-
-		if(cyborg.cell.charge < powercost * 2)
-			to_chat(cyborg, "<span class='warning'>Self-repair module deactivated. Please recharge.</span>")
-			deactivate()
-			return
-
-		if(cyborg.health < cyborg.maxHealth)
-			if(cyborg.health < 0)
-				repair_amount = -2.5
-				powercost = 30
-			else
-				repair_amount = -1
-				powercost = 10
-			cyborg.adjustBruteLoss(repair_amount)
-			cyborg.adjustFireLoss(repair_amount)
-			cyborg.updatehealth()
-			cyborg.cell.use(powercost)
-		else
-			cyborg.cell.use(5)
-		repair_tick = 0
-
-		if((world.time - 2000) > msg_cooldown )
-			var/msgmode = "standby"
-			if(cyborg.health < 0)
-				msgmode = "critical"
-			else if(cyborg.health < cyborg.maxHealth)
-				msgmode = "normal"
-			to_chat(cyborg, "<span class='notice'>Self-repair is active in <span class='boldnotice'>[msgmode]</span> mode.</span>")
-			msg_cooldown = world.time
-	else
-		deactivate()
-
-/obj/item/borg/upgrade/hypospray
-	name = "medical cyborg hypospray advanced synthesiser"
-	desc = "An upgrade to the Medical module cyborg's hypospray, allowing it \
-		to produce more advanced and complex medical reagents."
-	icon_state = "cyborg_upgrade3"
-	require_module = 1
-	module_type = /obj/item/weapon/robot_module/medical
-	origin_tech = null
-	var/list/additional_reagents = list()
-
-/obj/item/borg/upgrade/hypospray/action(mob/living/silicon/robot/R)
-	if(..())
-		return
-	for(var/obj/item/weapon/reagent_containers/borghypo/H in R.module)
-		if(H.accepts_reagent_upgrades)
-			for(var/re in additional_reagents)
-				H.add_reagent(re)
-
-	return 1
-
-/obj/item/borg/upgrade/hypospray/expanded
-	name = "medical cyborg expanded hypospray"
-	desc = "An upgrade to the Medical module's hypospray, allowing it \
-		to treat a wider range of conditions and problems."
-	additional_reagents = list("mannitol", "oculine", "inacusiate",
-		"mutadone", "haloperidol")
-	origin_tech = "programming=5;engineering=4;biotech=5"
-
-/obj/item/borg/upgrade/hypospray/high_strength
-	name = "medical cyborg high-strength hypospray"
-	desc = "An upgrade to the Medical module's hypospray, containing \
-		stronger versions of existing chemicals."
-	additional_reagents = list("oxandrolone", "sal_acid", "rezadone",
-		"pen_acid")
-	origin_tech = "programming=5;engineering=5;biotech=6"
-
-/obj/item/borg/upgrade/piercing_hypospray
-	name = "cyborg piercing hypospray"
-	desc = "An upgrade to a cyborg's hypospray, allowing it to \
-		pierce armor and thick material."
-	origin_tech = "materials=5;engineering=7;combat=3"
-	icon_state = "cyborg_upgrade3"
-
-/obj/item/borg/upgrade/piercing_hypospray/action(mob/living/silicon/robot/R)
-	if(..())
-		return
-
-	var/found_hypo = FALSE
-	for(var/obj/item/weapon/reagent_containers/borghypo/H in R.module)
-		H.bypass_protection = TRUE
-		found_hypo = TRUE
-
-	if(!found_hypo)
-		return
-
-	return 1
-
-/obj/item/borg/upgrade/defib
-	name = "medical cyborg defibrillator"
-	desc = "An upgrade to the Medical module, installing a builtin \
-		defibrillator, for on the scene revival."
-	icon_state = "cyborg_upgrade3"
-	require_module = 1
-	module_type = /obj/item/weapon/robot_module/medical
-	origin_tech = "programming=4;engineering=6;materials=5;powerstorage=5;biotech=5"
-
-/obj/item/borg/upgrade/defib/action(mob/living/silicon/robot/R)
-	if(..())
-		return
-
-	var/obj/item/weapon/twohanded/shockpaddles/cyborg/S = new(R.module)
-	R.module.basic_modules += S
-	R.module.add_module(S, FALSE, TRUE)
-
-	return 1
-
-/obj/item/borg/upgrade/ai
-	name = "B.O.R.I.S. module"
-	desc = "Bluespace Optimized Remote Intelligence Synchronization. An uplink device which takes the place of an MMI in cyborg endoskeletons, creating a robotic shell controlled by an AI."
-	icon_state = "boris"
-	origin_tech = "engineering=4;magnets=4;programming=4"
-
-/obj/item/borg/upgrade/ai/action(mob/living/silicon/robot/R)
-	if(..())
-		return
-	if(R.shell)
-		to_chat(usr, "<span class='warning'>This unit is already an AI shell!</span>")
-		return
-	if(R.key) //You cannot replace a player unless the key is completely removed.
-		to_chat(usr, "<span class='warning'>Intelligence patterns detected in this [R.braintype]. Aborting.</span>")
-		return
-
-	R.make_shell(src)
+		cyborg = null
+		deactivate()
+
+/obj/item/borg/upgrade/selfrepair/ui_action_click()
+	on = !on
+	if(on)
+		to_chat(cyborg, "<span class='notice'>You activate the self-repair module.</span>")
+		START_PROCESSING(SSobj, src)
+	else
+		to_chat(cyborg, "<span class='notice'>You deactivate the self-repair module.</span>")
+		STOP_PROCESSING(SSobj, src)
+	update_icon()
+
+/obj/item/borg/upgrade/selfrepair/update_icon()
+	if(cyborg)
+		icon_state = "selfrepair_[on ? "on" : "off"]"
+		for(var/X in actions)
+			var/datum/action/A = X
+			A.UpdateButtonIcon()
+	else
+		icon_state = "cyborg_upgrade5"
+
+/obj/item/borg/upgrade/selfrepair/proc/deactivate()
+	STOP_PROCESSING(SSobj, src)
+	on = FALSE
+	update_icon()
+
+/obj/item/borg/upgrade/selfrepair/process()
+	if(!repair_tick)
+		repair_tick = 1
+		return
+
+	if(cyborg && (cyborg.stat != DEAD) && on)
+		if(!cyborg.cell)
+			to_chat(cyborg, "<span class='warning'>Self-repair module deactivated. Please, insert the power cell.</span>")
+			deactivate()
+			return
+
+		if(cyborg.cell.charge < powercost * 2)
+			to_chat(cyborg, "<span class='warning'>Self-repair module deactivated. Please recharge.</span>")
+			deactivate()
+			return
+
+		if(cyborg.health < cyborg.maxHealth)
+			if(cyborg.health < 0)
+				repair_amount = -2.5
+				powercost = 30
+			else
+				repair_amount = -1
+				powercost = 10
+			cyborg.adjustBruteLoss(repair_amount)
+			cyborg.adjustFireLoss(repair_amount)
+			cyborg.updatehealth()
+			cyborg.cell.use(powercost)
+		else
+			cyborg.cell.use(5)
+		repair_tick = 0
+
+		if((world.time - 2000) > msg_cooldown )
+			var/msgmode = "standby"
+			if(cyborg.health < 0)
+				msgmode = "critical"
+			else if(cyborg.health < cyborg.maxHealth)
+				msgmode = "normal"
+			to_chat(cyborg, "<span class='notice'>Self-repair is active in <span class='boldnotice'>[msgmode]</span> mode.</span>")
+			msg_cooldown = world.time
+	else
+		deactivate()
+
+/obj/item/borg/upgrade/hypospray
+	name = "medical cyborg hypospray advanced synthesiser"
+	desc = "An upgrade to the Medical module cyborg's hypospray, allowing it \
+		to produce more advanced and complex medical reagents."
+	icon_state = "cyborg_upgrade3"
+	require_module = 1
+	module_type = /obj/item/weapon/robot_module/medical
+	origin_tech = null
+	var/list/additional_reagents = list()
+
+/obj/item/borg/upgrade/hypospray/action(mob/living/silicon/robot/R)
+	if(..())
+		return
+	for(var/obj/item/weapon/reagent_containers/borghypo/H in R.module)
+		if(H.accepts_reagent_upgrades)
+			for(var/re in additional_reagents)
+				H.add_reagent(re)
+
+	return 1
+
+/obj/item/borg/upgrade/hypospray/expanded
+	name = "medical cyborg expanded hypospray"
+	desc = "An upgrade to the Medical module's hypospray, allowing it \
+		to treat a wider range of conditions and problems."
+	additional_reagents = list("mannitol", "oculine", "inacusiate",
+		"mutadone", "haloperidol")
+	origin_tech = "programming=5;engineering=4;biotech=5"
+
+/obj/item/borg/upgrade/hypospray/high_strength
+	name = "medical cyborg high-strength hypospray"
+	desc = "An upgrade to the Medical module's hypospray, containing \
+		stronger versions of existing chemicals."
+	additional_reagents = list("oxandrolone", "sal_acid", "rezadone",
+		"pen_acid")
+	origin_tech = "programming=5;engineering=5;biotech=6"
+
+/obj/item/borg/upgrade/piercing_hypospray
+	name = "cyborg piercing hypospray"
+	desc = "An upgrade to a cyborg's hypospray, allowing it to \
+		pierce armor and thick material."
+	origin_tech = "materials=5;engineering=7;combat=3"
+	icon_state = "cyborg_upgrade3"
+
+/obj/item/borg/upgrade/piercing_hypospray/action(mob/living/silicon/robot/R)
+	if(..())
+		return
+
+	var/found_hypo = FALSE
+	for(var/obj/item/weapon/reagent_containers/borghypo/H in R.module)
+		H.bypass_protection = TRUE
+		found_hypo = TRUE
+
+	if(!found_hypo)
+		return
+
+	return 1
+
+/obj/item/borg/upgrade/defib
+	name = "medical cyborg defibrillator"
+	desc = "An upgrade to the Medical module, installing a builtin \
+		defibrillator, for on the scene revival."
+	icon_state = "cyborg_upgrade3"
+	require_module = 1
+	module_type = /obj/item/weapon/robot_module/medical
+	origin_tech = "programming=4;engineering=6;materials=5;powerstorage=5;biotech=5"
+
+/obj/item/borg/upgrade/defib/action(mob/living/silicon/robot/R)
+	if(..())
+		return
+
+	var/obj/item/weapon/twohanded/shockpaddles/cyborg/S = new(R.module)
+	R.module.basic_modules += S
+	R.module.add_module(S, FALSE, TRUE)
+
+	return 1
+
+/obj/item/borg/upgrade/ai
+	name = "B.O.R.I.S. module"
+	desc = "Bluespace Optimized Remote Intelligence Synchronization. An uplink device which takes the place of an MMI in cyborg endoskeletons, creating a robotic shell controlled by an AI."
+	icon_state = "boris"
+	origin_tech = "engineering=4;magnets=4;programming=4"
+
+/obj/item/borg/upgrade/ai/action(mob/living/silicon/robot/R)
+	if(..())
+		return
+	if(R.shell)
+		to_chat(usr, "<span class='warning'>This unit is already an AI shell!</span>")
+		return
+	if(R.key) //You cannot replace a player unless the key is completely removed.
+		to_chat(usr, "<span class='warning'>Intelligence patterns detected in this [R.braintype]. Aborting.</span>")
+		return
+
+	R.make_shell(src)
 	return TRUE

code/game/objects/items/stacks/sheets/leather.dm

@@ -118,6 +118,9 @@ GLOBAL_LIST_INIT(xeno_recipes, list ( \
 	var/wetness = 30 //Reduced when exposed to high temperautres
 	var/drying_threshold_temperature = 500 //Kelvin to start drying
 
+/*
+ * Leather SHeet
+ */
 /obj/item/stack/sheet/leather
 	name = "leather"
 	desc = "The by-product of mob grinding."
@@ -125,6 +128,24 @@ GLOBAL_LIST_INIT(xeno_recipes, list ( \
 	icon_state = "sheet-leather"
 	origin_tech = "materials=2"
 
+GLOBAL_LIST_INIT(leather_recipes, list ( \
+	new/datum/stack_recipe("wallet", /obj/item/weapon/storage/wallet, 1), \
+	new/datum/stack_recipe("muzzle", /obj/item/clothing/mask/muzzle, 2), \
+	new/datum/stack_recipe("botany gloves", /obj/item/clothing/gloves/botanic_leather, 3), \
+	new/datum/stack_recipe("toolbelt", /obj/item/weapon/storage/belt/utility, 4), \
+	new/datum/stack_recipe("leather satchel", /obj/item/weapon/storage/backpack/satchel, 5), \
+	new/datum/stack_recipe("bandolier", /obj/item/weapon/storage/belt/bandolier, 5), \
+	new/datum/stack_recipe("leather jacket", /obj/item/clothing/suit/jacket/leather, 7), \
+	new/datum/stack_recipe("leather overcoat", /obj/item/clothing/suit/jacket/leather/overcoat, 10), \
+))
+
+/obj/item/stack/sheet/leather/Initialize(mapload, new_amount, merge = TRUE)
+	recipes = GLOB.leather_recipes
+	return ..()
+
+/*
+ * Sinew
+ */
 /obj/item/stack/sheet/sinew
 	name = "watcher sinew"
 	icon = 'icons/obj/mining.dmi'
@@ -136,11 +157,12 @@ GLOBAL_LIST_INIT(xeno_recipes, list ( \
 
 GLOBAL_LIST_INIT(sinew_recipes, list ( \
 	new/datum/stack_recipe("sinew restraints", /obj/item/weapon/restraints/handcuffs/sinew, 1, on_floor = 1), \
-	))
+))
 
 /obj/item/stack/sheet/sinew/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.sinew_recipes
 	return ..()
+
 		/*
  * Plates
  		*/
@@ -207,4 +229,4 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
 			var/obj/item/stack/sheet/leather/HS = new(src.loc)
 			HS.amount = 1
 			wetness = initial(wetness)
-			src.use(1)
+			src.use(1)

code/game/objects/items/stacks/sheets/mineral.dm

@@ -158,12 +158,12 @@ GLOBAL_LIST_INIT(plasma_recipes, list ( \
 		var/turf/T = get_turf(src)
 		message_admins("Plasma sheets ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(T)]",0,1)
 		log_game("Plasma sheets ignited by [key_name(user)] in [COORD(T)]")
-		fire_act()
+		fire_act(W.is_hot())
 	else
 		return ..()
 
 /obj/item/stack/sheet/mineral/plasma/fire_act(exposed_temperature, exposed_volume)
-	atmos_spawn_air("plasma=[amount*10];TEMP=1000")
+	atmos_spawn_air("plasma=[amount*10];TEMP=[exposed_temperature]")
 	qdel(src)
 
 /*
@@ -307,7 +307,6 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list ( \
 	force = 1
 	throwforce = 2
 	origin_tech = "materials=1"
-	sheettype = "snow"
 
 GLOBAL_LIST_INIT(snow_recipes, list ( \
 	new/datum/stack_recipe("Snow Wall",/turf/closed/wall/mineral/snow, 5, one_per_turf = 1, on_floor = 1), \
@@ -337,7 +336,7 @@ GLOBAL_LIST_INIT(snow_recipes, list ( \
  * Adamantine
  */
 GLOBAL_LIST_INIT(adamantine_recipes, list(
-	new /datum/stack_recipe("artificial golem shell", /obj/item/golem_shell/artificial, req_amount=1, res_amount=1),
+	new /datum/stack_recipe("incomplete servant golem shell", /obj/item/golem_shell/servant, req_amount=1, res_amount=1),
 	))
 
 /obj/item/stack/sheet/mineral/adamantine
@@ -385,4 +384,4 @@ GLOBAL_LIST_INIT(abductor_recipes, list ( \
 
 /obj/item/stack/sheet/mineral/abductor/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.abductor_recipes
-	..()
+	..()

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -71,9 +71,8 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
 	qdel(src)
 
 /obj/item/stack/sheet/metal/narsie_act()
-	if(prob(20))
-		new /obj/item/stack/sheet/runed_metal(loc, amount)
-		qdel(src)
+	new /obj/item/stack/sheet/runed_metal(loc, amount)
+	qdel(src)
 
 /obj/item/stack/sheet/metal/fifty
 	amount = 50
@@ -286,13 +285,16 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \
 		return
 	..()
 
-/obj/item/stack/sheet/runed_metal/fifty
-	amount = 50
-
 /obj/item/stack/sheet/runed_metal/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.runed_metal_recipes
 	return ..()
 
+/obj/item/stack/sheet/runed_metal/fifty
+	amount = 50
+
+/obj/item/stack/sheet/runed_metal/five
+	amount = 5
+
 /*
  * Brass
  */
@@ -322,9 +324,8 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \
 	turf_type = /turf/open/floor/clockwork
 
 /obj/item/stack/tile/brass/narsie_act()
-	if(prob(20))
-		new /obj/item/stack/sheet/runed_metal(loc, amount)
-		qdel(src)
+	new /obj/item/stack/sheet/runed_metal(loc, amount)
+	qdel(src)
 
 /obj/item/stack/tile/brass/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.brass_recipes
@@ -364,7 +365,10 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \
 	origin_tech = "materials=2;biotech=2"
 
 GLOBAL_LIST_INIT(plastic_recipes, list(
-	new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = 1, on_floor = 1, time = 40)))
+	new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = 1, on_floor = 1, time = 40), \
+	new /datum/stack_recipe("water bottle", /obj/item/weapon/reagent_containers/glass/beaker/waterbottle/empty), \
+	new /datum/stack_recipe("large water bottle", /obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large/empty,3), \
+	new /datum/stack_recipe("wet floor sign", /obj/item/weapon/caution, 2)))
 
 /obj/item/stack/sheet/plastic
 	name = "plastic"

code/game/objects/items/toys.dm

@@ -279,6 +279,28 @@
 	resistance_flags = FLAMMABLE
 
 
+/obj/item/toy/windupToolbox
+	name = "windup toolbox"
+	desc = "A replica toolbox that rumbles when you turn the key"
+	icon_state = "his_grace"
+	item_state = "artistic_toolbox"
+	var/active = FALSE
+	icon = 'icons/obj/weapons.dmi'
+	attack_verb = list("robusted")
+
+/obj/item/toy/windupToolbox/attack_self(mob/user)
+	if(!active)
+		icon_state = "his_grace_awakened"
+		to_chat(user, "<span class='warning'>You wind up [src], it begins to rumble.</span>")
+		active = TRUE
+		addtimer(CALLBACK(src, .proc/stopRumble), 600)
+	else
+		to_chat(user, "[src] is already active.")
+
+/obj/item/toy/windupToolbox/proc/stopRumble()
+	icon_state = initial(icon_state)
+	active = FALSE
+
 /*
  * Subtype of Double-Bladed Energy Swords
  */
@@ -529,7 +551,7 @@
 		"<span class='notice'>You hear a soft click.</span>")
 
 /obj/item/toy/talking/codex_gigas/generate_messages()
-	var/datum/devilinfo/devil = randomDevilInfo()
+	var/datum/fakeDevil/devil = new
 	var/list/messages = list()
 	messages += "Some fun facts about: [devil.truename]"
 	messages += "[GLOB.lawlorify[LORE][devil.bane]]"

code/game/objects/items/weapons/cigs_lighters.dm

@@ -472,8 +472,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	var/lit = 0
+	var/fancy = TRUE
 	heat = 1500
 	resistance_flags = FIRE_PROOF
+	light_color = LIGHT_COLOR_FIRE
 
 /obj/item/weapon/lighter/update_icon()
 	if(lit)
@@ -484,37 +486,28 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/weapon/lighter/ignition_effect(atom/A, mob/user)
 	. = "<span class='rose'>With a single flick of their wrist, [user] smoothly lights [A] with [src]. Damn [user.p_theyre()] cool.</span>"
 
-/obj/item/weapon/lighter/greyscale
-	name = "cheap lighter"
-	desc = "A cheap-as-free lighter."
-	icon_state = "lighter"
-
-/obj/item/weapon/lighter/greyscale/Initialize()
-	. = ..()
-	add_atom_colour(color2hex(randomColor(1)), FIXED_COLOUR_PRIORITY)
-	update_icon()
-
-/obj/item/weapon/lighter/greyscale/update_icon()
-	cut_overlays()
-	var/mutable_appearance/base_overlay = mutable_appearance(icon,"[initial(icon_state)]_base")
-	base_overlay.appearance_flags = RESET_COLOR //the edging doesn't change color
+/obj/item/weapon/lighter/proc/set_lit(new_lit)
+	lit = new_lit
 	if(lit)
-		base_overlay.icon_state = "[initial(icon_state)]_on"
-	add_overlay(base_overlay)
-
-/obj/item/weapon/lighter/greyscale/ignition_effect(atom/A, mob/user)
-	. = "<span class='notice'>After some fiddling, [user] manages to light [A] with [src].</span>"
+		force = 5
+		damtype = "fire"
+		hitsound = 'sound/items/welder.ogg'
+		attack_verb = list("burnt", "singed")
+		set_light(1)
+		START_PROCESSING(SSobj, src)
+	else
+		hitsound = "swing_hit"
+		force = 0
+		attack_verb = null //human_defense.dm takes care of it
+		set_light(0)
+		STOP_PROCESSING(SSobj, src)
+	update_icon()
 
 /obj/item/weapon/lighter/attack_self(mob/living/user)
 	if(user.is_holding(src))
 		if(!lit)
-			lit = 1
-			update_icon()
-			force = 5
-			damtype = "fire"
-			hitsound = 'sound/items/welder.ogg'
-			attack_verb = list("burnt", "singed")
-			if(!istype(src, /obj/item/weapon/lighter/greyscale))
+			set_lit(TRUE)
+			if(fancy)
 				user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.", "<span class='notice'>Without even breaking stride, you flip open and lights [src] in one smooth movement.</span>")
 			else
 				var/prot = FALSE
@@ -534,20 +527,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 					user.apply_damage(5, BURN, hitzone)
 					user.visible_message("<span class='warning'>After a few attempts, [user] manages to light [src] - however, [user.p_they()] burn their finger in the process.</span>", "<span class='warning'>You burn yourself while lighting the lighter!</span>")
 
-			set_light(1)
-			START_PROCESSING(SSobj, src)
 		else
-			lit = 0
-			update_icon()
-			hitsound = "swing_hit"
-			force = 0
-			attack_verb = null //human_defense.dm takes care of it
-			if(!istype(src, /obj/item/weapon/lighter/greyscale))
+			set_lit(FALSE)
+			if(fancy)
 				user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow.", "<span class='notice'>You quietly shut off [src] without even looking at what you're doing. Wow.</span>")
 			else
 				user.visible_message("[user] quietly shuts off [src].", "<span class='notice'>You quietly shut off [src].")
-			set_light(0)
-			STOP_PROCESSING(SSobj, src)
 	else
 		. = ..()
 
@@ -562,7 +547,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		if(M == user)
 			cig.attackby(src, user)
 		else
-			if(!istype(src, /obj/item/weapon/lighter/greyscale))
+			if(fancy)
 				cig.light("<span class='rose'>[user] whips the [name] out and holds it for [M]. [user.p_their(TRUE)] arm is as steady as the unflickering flame they light \the [cig] with.</span>")
 			else
 				cig.light("<span class='notice'>[user] holds the [name] out for [M], and lights the [cig.name].</span>")
@@ -575,6 +560,30 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/weapon/lighter/is_hot()
 	return lit * heat
 
+
+/obj/item/weapon/lighter/greyscale
+	name = "cheap lighter"
+	desc = "A cheap-as-free lighter."
+	icon_state = "lighter"
+	fancy = FALSE
+
+/obj/item/weapon/lighter/greyscale/Initialize()
+	. = ..()
+	add_atom_colour(color2hex(randomColor(1)), FIXED_COLOUR_PRIORITY)
+	update_icon()
+
+/obj/item/weapon/lighter/greyscale/update_icon()
+	cut_overlays()
+	var/mutable_appearance/base_overlay = mutable_appearance(icon,"[initial(icon_state)]_base")
+	base_overlay.appearance_flags = RESET_COLOR //the edging doesn't change color
+	if(lit)
+		base_overlay.icon_state = "[initial(icon_state)]_on"
+	add_overlay(base_overlay)
+
+/obj/item/weapon/lighter/greyscale/ignition_effect(atom/A, mob/user)
+	. = "<span class='notice'>After some fiddling, [user] manages to light [A] with [src].</span>"
+
+
 ///////////
 //ROLLING//
 ///////////

code/game/objects/items/weapons/dna_injector.dm

@@ -50,9 +50,7 @@
 				M.dna.uni_identity = merge_text(M.dna.uni_identity, fields["UI"])
 				M.updateappearance(mutations_overlay_update=1)
 		log_attack(log_msg)
-	else
-		to_chat(user, "<span class='notice'>It appears that [M] does not have compatible DNA.</span>")
-		return
+		return TRUE
 
 /obj/item/weapon/dnainjector/attack(mob/target, mob/user)
 	if(!user.IsAdvancedToolUser())
@@ -79,7 +77,9 @@
 
 	add_logs(user, target, "injected", src)
 
-	inject(target, user)	//Now we actually do the heavy lifting.
+	if(!inject(target, user))	//Now we actually do the heavy lifting.
+		to_chat(user, "<span class='notice'>It appears that [target] does not have compatible DNA.</span>")
+
 	used = 1
 	icon_state = "dnainjector0"
 	desc += " This one is used up."

code/game/objects/items/weapons/explosives.dm

@@ -1,115 +0,0 @@
-//In this file: C4
-
-/obj/item/weapon/c4
-	name = "C-4"
-	desc = "Used to put holes in specific areas without too much extra hole."
-	gender = PLURAL
-	icon = 'icons/obj/grenade.dmi'
-	icon_state = "plastic-explosive0"
-	item_state = "plasticx"
-	flags = NOBLUDGEON
-	w_class = WEIGHT_CLASS_SMALL
-	origin_tech = "syndicate=1"
-	var/timer = 10
-	var/open_panel = 0
-	parent_type = /obj/item/weapon/grenade/plastic/c4
-
-/obj/item/weapon/c4/New()
-	wires = new /datum/wires/explosive/c4(src)
-	plastic_overlay = mutable_appearance(icon, "plastic-explosive2")
-	..()
-
-/obj/item/weapon/c4/Destroy()
-	qdel(wires)
-	wires = null
-	target = null
-	return ..()
-
-/obj/item/weapon/c4/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] activates the [src.name] and holds it above [user.p_their()] head! It looks like [user.p_theyre()] going out with a bang!</span>")
-	var/message_say = "FOR NO RAISIN!"
-	if(user.mind)
-		if(user.mind.special_role)
-			var/role = lowertext(user.mind.special_role)
-			if(role == "traitor" || role == "syndicate")
-				message_say = "FOR THE SYNDICATE!"
-			else if(role == "changeling")
-				message_say = "FOR THE HIVE!"
-			else if(role == "cultist")
-				message_say = "FOR NAR-SIE!"
-			else if(role == "revolutionary" || role == "head revolutionary")
-				message_say = "VIVA LA REVOLUTION!"
-			else if(user.mind.gang_datum)
-				message_say = "[uppertext(user.mind.gang_datum.name)] RULES!"
-	user.say(message_say)
-	target = user
-	message_admins("[ADMIN_LOOKUPFLW(user)] suicided with [name] at [ADMIN_COORDJMP(src)]",0,1)
-	message_admins("[key_name(user)] suicided with [name] at ([x],[y],[z])")
-	sleep(10)
-	explode(get_turf(user))
-	user.gib(1, 1)
-
-/obj/item/weapon/c4/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/screwdriver))
-		open_panel = !open_panel
-		to_chat(user, "<span class='notice'>You [open_panel ? "open" : "close"] the wire panel.</span>")
-	else if(is_wire_tool(I))
-		wires.interact(user)
-	else
-		return ..()
-
-/obj/item/weapon/c4/attack_self(mob/user)
-	var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num
-	if(user.get_active_held_item() == src)
-		newtime = Clamp(newtime, 10, 60000)
-		timer = newtime
-		to_chat(user, "Timer set for [timer] seconds.")
-
-/obj/item/weapon/c4/afterattack(atom/movable/AM, mob/user, flag)
-	if (!flag)
-		return
-	if (ismob(AM))
-		return
-	if(loc == AM)
-		return
-	if((istype(AM, /obj/item/weapon/storage/)) && !((istype(AM, /obj/item/weapon/storage/secure)) || (istype(AM, /obj/item/weapon/storage/lockbox)))) //If its storage but not secure storage OR a lockbox, then place it inside.
-		return
-	if((istype(AM,/obj/item/weapon/storage/secure)) || (istype(AM, /obj/item/weapon/storage/lockbox)))
-		var/obj/item/weapon/storage/secure/S = AM
-		if(!S.locked) //Literal hacks, this works for lockboxes despite incorrect type casting, because they both share the locked var. But if its unlocked, place it inside, otherwise PLANTING C4!
-			return
-
-	to_chat(user, "<span class='notice'>You start planting the bomb...</span>")
-
-	if(do_after(user, 50, target = AM))
-		if(!user.temporarilyRemoveItemFromInventory(src))
-			return
-		src.target = AM
-		forceMove(null)
-
-		var/message = "[ADMIN_LOOKUPFLW(user)] planted [name] on [target.name] at [ADMIN_COORDJMP(target)] with [timer] second fuse"
-		GLOB.bombers += message
-		message_admins(message,0,1)
-		log_game("[key_name(user)] planted [name] on [target.name] at [COORD(target)] with [timer] second fuse")
-
-		target.add_overlay(plastic_overlay, 1)
-		to_chat(user, "<span class='notice'>You plant the bomb. Timer counting down from [timer].</span>")
-		addtimer(CALLBACK(src, .proc/explode), timer * 10)
-
-/obj/item/weapon/c4/proc/explode()
-	if(QDELETED(src))
-		return
-	var/turf/location
-	if(target)
-		if(!QDELETED(target))
-			location = get_turf(target)
-			target.cut_overlay(plastic_overlay, TRUE)
-	else
-		location = get_turf(src)
-	if(location)
-		location.ex_act(2, target)
-		explosion(location,0,0,3)
-	qdel(src)
-
-/obj/item/weapon/c4/attack(mob/M, mob/user, def_zone)
-	return

code/game/objects/items/weapons/grenades/grenade.dm

@@ -48,23 +48,27 @@
 /obj/item/weapon/grenade/attack_self(mob/user)
 	if(!active)
 		if(clown_check(user))
-			to_chat(user, "<span class='warning'>You prime the [name]! [det_time/10] seconds!</span>")
-			playsound(user.loc, 'sound/weapons/armbomb.ogg', 60, 1)
-			active = 1
-			icon_state = initial(icon_state) + "_active"
-			add_fingerprint(user)
-			var/turf/bombturf = get_turf(src)
-			var/area/A = get_area(bombturf)
-			var/message = "[ADMIN_LOOKUPFLW(user)]) has primed a [name] for detonation at [ADMIN_COORDJMP(bombturf)]"
-			GLOB.bombers += message
-			message_admins(message)
-			log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] [COORD(bombturf)].")
+			preprime(user)
 			if(iscarbon(user))
 				var/mob/living/carbon/C = user
 				C.throw_mode_on()
-			spawn(det_time)
-				prime()
 
+/obj/item/weapon/grenade/proc/preprime(mob/user)
+	if(user)
+		to_chat(user, "<span class='warning'>You prime the [name]! [det_time/10] seconds!</span>")
+	playsound(loc, 'sound/weapons/armbomb.ogg', 60, 1)
+	active = TRUE
+	icon_state = initial(icon_state) + "_active"
+	add_fingerprint(user)
+	var/turf/bombturf = get_turf(src)
+	var/area/A = get_area(bombturf)
+	if(user)
+		var/message = "[ADMIN_LOOKUPFLW(user)]) has primed a [name] for detonation at [ADMIN_COORDJMP(bombturf)]"
+		GLOB.bombers += message
+		message_admins(message)
+		log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] [COORD(bombturf)].")
+
+	addtimer(CALLBACK(src, .proc/prime), det_time)
 
 /obj/item/weapon/grenade/proc/prime()
 
@@ -104,4 +108,4 @@
 	if(damage && attack_type == PROJECTILE_ATTACK && prob(15))
 		owner.visible_message("<span class='danger'>[attack_text] hits [owner]'s [src], setting it off! What a shot!</span>")
 		prime()
-		return 1 //It hit the grenade, not them
+		return 1 //It hit the grenade, not them

code/game/objects/items/weapons/grenades/plastic.dm

@@ -18,6 +18,10 @@
 	plastic_overlay = mutable_appearance(icon, "[item_state]2")
 	..()
 
+/obj/item/weapon/grenade/plastic/Initialize(mapload)
+	. = ..()
+	SET_SECONDARY_FLAG(src, NO_EMP_WIRES)
+
 /obj/item/weapon/grenade/plastic/Destroy()
 	qdel(nadeassembly)
 	nadeassembly = null
@@ -154,6 +158,115 @@
 /obj/item/weapon/grenade/plastic/c4
 	name = "C4"
 	desc = "Used to put holes in specific areas without too much extra hole. A saboteur's favorite."
+	gender = PLURAL
+	icon = 'icons/obj/grenade.dmi'
+	icon_state = "plastic-explosive0"
+	item_state = "plasticx"
+	flags = NOBLUDGEON
+	w_class = WEIGHT_CLASS_SMALL
+	origin_tech = "syndicate=1"
+	var/timer = 10
+	var/open_panel = 0
+
+/obj/item/weapon/grenade/plastic/c4/New()
+	wires = new /datum/wires/explosive/c4(src)
+	plastic_overlay = mutable_appearance(icon, "plastic-explosive2")
+	..()
+
+/obj/item/weapon/grenade/plastic/c4/Destroy()
+	qdel(wires)
+	wires = null
+	target = null
+	return ..()
+
+/obj/item/weapon/grenade/plastic/c4/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] activates the [src.name] and holds it above [user.p_their()] head! It looks like [user.p_theyre()] going out with a bang!</span>")
+	var/message_say = "FOR NO RAISIN!"
+	if(user.mind)
+		if(user.mind.special_role)
+			var/role = lowertext(user.mind.special_role)
+			if(role == "traitor" || role == "syndicate")
+				message_say = "FOR THE SYNDICATE!"
+			else if(role == "changeling")
+				message_say = "FOR THE HIVE!"
+			else if(role == "cultist")
+				message_say = "FOR NAR-SIE!"
+			else if(role == "revolutionary" || role == "head revolutionary")
+				message_say = "VIVA LA REVOLUTION!"
+			else if(user.mind.gang_datum)
+				message_say = "[uppertext(user.mind.gang_datum.name)] RULES!"
+	user.say(message_say)
+	target = user
+	message_admins("[ADMIN_LOOKUPFLW(user)] suicided with [name] at [ADMIN_COORDJMP(src)]",0,1)
+	message_admins("[key_name(user)] suicided with [name] at ([x],[y],[z])")
+	sleep(10)
+	explode(get_turf(user))
+	user.gib(1, 1)
+
+/obj/item/weapon/grenade/plastic/c4/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/weapon/screwdriver))
+		open_panel = !open_panel
+		to_chat(user, "<span class='notice'>You [open_panel ? "open" : "close"] the wire panel.</span>")
+	else if(is_wire_tool(I))
+		wires.interact(user)
+	else
+		return ..()
+
+/obj/item/weapon/grenade/plastic/c4/attack_self(mob/user)
+	var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num
+	if(user.get_active_held_item() == src)
+		newtime = Clamp(newtime, 10, 60000)
+		timer = newtime
+		to_chat(user, "Timer set for [timer] seconds.")
+
+/obj/item/weapon/grenade/plastic/c4/afterattack(atom/movable/AM, mob/user, flag)
+	if (!flag)
+		return
+	if (ismob(AM))
+		return
+	if(loc == AM)
+		return
+	if((istype(AM, /obj/item/weapon/storage/)) && !((istype(AM, /obj/item/weapon/storage/secure)) || (istype(AM, /obj/item/weapon/storage/lockbox)))) //If its storage but not secure storage OR a lockbox, then place it inside.
+		return
+	if((istype(AM,/obj/item/weapon/storage/secure)) || (istype(AM, /obj/item/weapon/storage/lockbox)))
+		var/obj/item/weapon/storage/secure/S = AM
+		if(!S.locked) //Literal hacks, this works for lockboxes despite incorrect type casting, because they both share the locked var. But if its unlocked, place it inside, otherwise PLANTING C4!
+			return
+
+	to_chat(user, "<span class='notice'>You start planting the bomb...</span>")
+
+	if(do_after(user, 50, target = AM))
+		if(!user.temporarilyRemoveItemFromInventory(src))
+			return
+		src.target = AM
+		forceMove(null)
+
+		var/message = "[ADMIN_LOOKUPFLW(user)] planted [name] on [target.name] at [ADMIN_COORDJMP(target)] with [timer] second fuse"
+		GLOB.bombers += message
+		message_admins(message,0,1)
+		log_game("[key_name(user)] planted [name] on [target.name] at [COORD(target)] with [timer] second fuse")
+
+		target.add_overlay(plastic_overlay, 1)
+		to_chat(user, "<span class='notice'>You plant the bomb. Timer counting down from [timer].</span>")
+		addtimer(CALLBACK(src, .proc/explode), timer * 10)
+
+/obj/item/weapon/grenade/plastic/c4/proc/explode()
+	if(QDELETED(src))
+		return
+	var/turf/location
+	if(target)
+		if(!QDELETED(target))
+			location = get_turf(target)
+			target.cut_overlay(plastic_overlay, TRUE)
+	else
+		location = get_turf(src)
+	if(location)
+		location.ex_act(2, target)
+		explosion(location,0,0,3)
+	qdel(src)
+
+/obj/item/weapon/grenade/plastic/c4/attack(mob/M, mob/user, def_zone)
+	return
 
 // X4 is an upgraded directional variant of c4 which is relatively safe to be standing next to. And much less safe to be standing on the other side of.
 // C4 is intended to be used for infiltration, and destroying tech. X4 is intended to be used for heavy breaching and tight spaces.

code/game/objects/items/weapons/grenades/spawnergrenade.dm

@@ -1,39 +1,39 @@
-/obj/item/weapon/grenade/spawnergrenade
+/obj/item/weapon/grenade/spawnergrenade
 	desc = "It will unleash an unspecified anomaly into the vicinity."
-	name = "delivery grenade"
-	icon = 'icons/obj/grenade.dmi'
-	icon_state = "delivery"
-	item_state = "flashbang"
-	origin_tech = "materials=3;magnets=4"
-	var/spawner_type = null // must be an object path
-	var/deliveryamt = 1 // amount of type to deliver
-
-/obj/item/weapon/grenade/spawnergrenade/prime()			// Prime now just handles the two loops that query for people in lockers and people who can see it.
-	update_mob()
-	if(spawner_type && deliveryamt)
-		// Make a quick flash
-		var/turf/T = get_turf(src)
-		playsound(T, 'sound/effects/phasein.ogg', 100, 1)
-		for(var/mob/living/carbon/C in viewers(T, null))
-			C.flash_act()
-
-		// Spawn some hostile syndicate critters and spread them out
-		spawn_and_random_walk(spawner_type, T, deliveryamt, walk_chance=50, admin_spawn=admin_spawned)
-
-	qdel(src)
-
-/obj/item/weapon/grenade/spawnergrenade/manhacks
-	name = "viscerator delivery grenade"
-	spawner_type = /mob/living/simple_animal/hostile/viscerator
-	deliveryamt = 10
-	origin_tech = "materials=3;magnets=4;syndicate=3"
-
-/obj/item/weapon/grenade/spawnergrenade/spesscarp
-	name = "carp delivery grenade"
-	spawner_type = /mob/living/simple_animal/hostile/carp
-	deliveryamt = 5
-	origin_tech = "materials=3;magnets=4;syndicate=3"
-
-/obj/item/weapon/grenade/spawnergrenade/syndiesoap
-	name = "Mister Scrubby"
-	spawner_type = /obj/item/weapon/soap/syndie
+	name = "delivery grenade"
+	icon = 'icons/obj/grenade.dmi'
+	icon_state = "delivery"
+	item_state = "flashbang"
+	origin_tech = "materials=3;magnets=4"
+	var/spawner_type = null // must be an object path
+	var/deliveryamt = 1 // amount of type to deliver
+
+/obj/item/weapon/grenade/spawnergrenade/prime()			// Prime now just handles the two loops that query for people in lockers and people who can see it.
+	update_mob()
+	if(spawner_type && deliveryamt)
+		// Make a quick flash
+		var/turf/T = get_turf(src)
+		playsound(T, 'sound/effects/phasein.ogg', 100, 1)
+		for(var/mob/living/carbon/C in viewers(T, null))
+			C.flash_act()
+
+		// Spawn some hostile syndicate critters and spread them out
+		spawn_and_random_walk(spawner_type, T, deliveryamt, walk_chance=50, admin_spawn=admin_spawned)
+
+	qdel(src)
+
+/obj/item/weapon/grenade/spawnergrenade/manhacks
+	name = "viscerator delivery grenade"
+	spawner_type = /mob/living/simple_animal/hostile/viscerator
+	deliveryamt = 10
+	origin_tech = "materials=3;magnets=4;syndicate=3"
+
+/obj/item/weapon/grenade/spawnergrenade/spesscarp
+	name = "carp delivery grenade"
+	spawner_type = /mob/living/simple_animal/hostile/carp
+	deliveryamt = 5
+	origin_tech = "materials=3;magnets=4;syndicate=3"
+
+/obj/item/weapon/grenade/spawnergrenade/syndiesoap
+	name = "Mister Scrubby"
+	spawner_type = /obj/item/weapon/soap/syndie

code/game/objects/items/weapons/holy_weapons.dm

@@ -214,7 +214,7 @@
 
 	possessed = TRUE
 
-	var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as the spirit of [user.real_name]'s blade?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_POSSESSED_BLADE)
+	var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as the spirit of [user.real_name]'s blade?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_POSSESSED_BLADE)
 	var/mob/dead/observer/theghost = null
 
 	if(LAZYLEN(candidates))

code/game/objects/items/weapons/implants/implantchair.dm

@@ -1,189 +1,189 @@
-/obj/machinery/implantchair
-	name = "mindshield implanter"
-	desc = "Used to implant occupants with mindshield implants."
-	icon = 'icons/obj/machines/implantchair.dmi'
-	icon_state = "implantchair"
-	density = 1
-	opacity = 0
-	anchored = TRUE
-
-	var/ready = TRUE
-	var/replenishing = FALSE
-
-	var/ready_implants = 5
-	var/max_implants = 5
-	var/injection_cooldown = 600
-	var/replenish_cooldown = 6000
-	var/implant_type = /obj/item/weapon/implant/mindshield
-	var/auto_inject = FALSE
-	var/auto_replenish = TRUE
-	var/special = FALSE
-	var/special_name = "special function"
-
-/obj/machinery/implantchair/New()
-	..()
-	open_machine()
-	update_icon()
-
-
-/obj/machinery/implantchair/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
-
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "implantchair", name, 375, 280, master_ui, state)
-		ui.open()
-
-
-/obj/machinery/implantchair/ui_data()
-	var/list/data = list()
-	data["occupied"] = occupant ? 1 : 0
-	data["open"] = state_open
-
-	data["occupant"] = list()
+/obj/machinery/implantchair
+	name = "mindshield implanter"
+	desc = "Used to implant occupants with mindshield implants."
+	icon = 'icons/obj/machines/implantchair.dmi'
+	icon_state = "implantchair"
+	density = 1
+	opacity = 0
+	anchored = TRUE
+
+	var/ready = TRUE
+	var/replenishing = FALSE
+
+	var/ready_implants = 5
+	var/max_implants = 5
+	var/injection_cooldown = 600
+	var/replenish_cooldown = 6000
+	var/implant_type = /obj/item/weapon/implant/mindshield
+	var/auto_inject = FALSE
+	var/auto_replenish = TRUE
+	var/special = FALSE
+	var/special_name = "special function"
+
+/obj/machinery/implantchair/New()
+	..()
+	open_machine()
+	update_icon()
+
+
+/obj/machinery/implantchair/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
+
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "implantchair", name, 375, 280, master_ui, state)
+		ui.open()
+
+
+/obj/machinery/implantchair/ui_data()
+	var/list/data = list()
+	data["occupied"] = occupant ? 1 : 0
+	data["open"] = state_open
+
+	data["occupant"] = list()
 	if(occupant)
 		var/mob/living/mob_occupant = occupant
 		data["occupant"]["name"] = mob_occupant.name
 		data["occupant"]["stat"] = mob_occupant.stat
-
-	data["special_name"] = special ? special_name : null
-	data["ready_implants"]  = ready_implants
-	data["ready"] = ready
-	data["replenishing"] = replenishing
-
-	return data
-
-/obj/machinery/implantchair/ui_act(action, params)
-	if(..())
-		return
-	switch(action)
-		if("door")
-			if(state_open)
-				close_machine()
-			else
-				open_machine()
-			. = TRUE
-		if("implant")
-			implant(occupant,usr)
-			. = TRUE
-
-/obj/machinery/implantchair/proc/implant(mob/living/M,mob/user)
-	if (!istype(M))
-		return
-	if(!ready_implants || !ready)
-		return
-	if(implant_action(M,user))
-		ready_implants--
-		if(!replenishing && auto_replenish)
-			replenishing = TRUE
-			addtimer(CALLBACK(src,"replenish"),replenish_cooldown)
-		if(injection_cooldown > 0)
-			ready = FALSE
-			addtimer(CALLBACK(src,"set_ready"),injection_cooldown)
-	else
-		playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 25, 1)
-	update_icon()
-
-/obj/machinery/implantchair/proc/implant_action(mob/living/M)
-	var/obj/item/weapon/implant/I = new implant_type
-	if(I.implant(M))
-		visible_message("<span class='warning'>[M] has been implanted by the [name].</span>")
-		return 1
-
-/obj/machinery/implantchair/update_icon()
-	icon_state = initial(icon_state)
-	if(state_open)
-		icon_state += "_open"
-	if(occupant)
-		icon_state += "_occupied"
-	if(ready)
-		add_overlay("ready")
-	else
-		cut_overlays()
-
-/obj/machinery/implantchair/proc/replenish()
-	if(ready_implants < max_implants)
-		ready_implants++
-	if(ready_implants < max_implants)
-		addtimer(CALLBACK(src,"replenish"),replenish_cooldown)
-	else
-		replenishing = FALSE
-
-/obj/machinery/implantchair/proc/set_ready()
-	ready = TRUE
-	update_icon()
-
-/obj/machinery/implantchair/container_resist(mob/living/user)
-	if(state_open)
-		return
-	user.changeNext_move(CLICK_CD_BREAKOUT)
-	user.last_special = world.time + CLICK_CD_BREAKOUT
-	to_chat(user, "<span class='notice'>You lean on the back of [src] and start pushing the door open... (this will take about about a minute.)</span>")
-	audible_message("<span class='italics'>You hear a metallic creaking from [src]!</span>",hearing_distance = 2)
-
-	if(do_after(user, 600, target = src))
-		if(!user || user.stat != CONSCIOUS || user.loc != src || state_open)
-			return
-		visible_message("<span class='warning'>[user] successfully broke out of [src]!</span>")
-		to_chat(user, "<span class='notice'>You successfully break out of [src]!</span>")
-		open_machine()
-
-/obj/machinery/implantchair/relaymove(mob/user)
-	container_resist(user)
-
-/obj/machinery/implantchair/MouseDrop_T(mob/target, mob/user)
-	if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !isliving(target) || !user.IsAdvancedToolUser())
-		return
-	close_machine(target)
-
-/obj/machinery/implantchair/close_machine(mob/living/user)
-	if((isnull(user) || istype(user)) && state_open)
-		..(user)
-		if(auto_inject && ready && ready_implants > 0)
-			implant(user,null)
-
-/obj/machinery/implantchair/genepurge
-	name = "Genetic purifier"
-	desc = "Used to purge human genome of foreign influences"
-	special = TRUE
-	special_name = "Purge genome"
-	injection_cooldown = 0
-	replenish_cooldown = 300
-
-/obj/machinery/implantchair/genepurge/implant_action(mob/living/carbon/human/H,mob/user)
-	if(!istype(H))
-		return 0
-	H.set_species(/datum/species/human, 1)//lizards go home
-	purrbation_remove(H)//remove cats
-	H.dna.remove_all_mutations()//hulks out
-	return 1
-
-
-/obj/machinery/implantchair/brainwash
-	name = "Neural Imprinter"
-	desc = "Used to <s>indoctrinate</s> rehabilitate hardened recidivists."
-	special_name = "Imprint"
-	injection_cooldown = 3000
-	auto_inject = FALSE
-	auto_replenish = FALSE
-	special = TRUE
-	var/objective = "Obey the law. Praise Nanotrasen."
-	var/custom = FALSE
-
-/obj/machinery/implantchair/brainwash/implant_action(mob/living/C,mob/user)
-	if(!istype(C) || !C.mind) // I don't know how this makes any sense for silicons but laws trump objectives anyway.
-		return 0
-	if(custom)
-		if(!user || !user.Adjacent(src))
-			return 0
-		objective = stripped_input(usr,"What order do you want to imprint on [C]?","Enter the order","",120)
-		message_admins("[key_name_admin(user)] set brainwash machine objective to '[objective]'.")
-		log_game("[key_name_admin(user)] set brainwash machine objective to '[objective]'.")
-	var/datum/objective/custom_objective = new/datum/objective(objective)
-	custom_objective.owner = C.mind
-	C.mind.objectives += custom_objective
-	C.mind.announce_objectives()
-	message_admins("[key_name_admin(user)] brainwashed [key_name_admin(C)] with objective '[objective]'.")
-	log_game("[key_name_admin(user)] brainwashed [key_name_admin(C)] with objective '[objective]'.")
-	return 1
-
+
+	data["special_name"] = special ? special_name : null
+	data["ready_implants"]  = ready_implants
+	data["ready"] = ready
+	data["replenishing"] = replenishing
+
+	return data
+
+/obj/machinery/implantchair/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("door")
+			if(state_open)
+				close_machine()
+			else
+				open_machine()
+			. = TRUE
+		if("implant")
+			implant(occupant,usr)
+			. = TRUE
+
+/obj/machinery/implantchair/proc/implant(mob/living/M,mob/user)
+	if (!istype(M))
+		return
+	if(!ready_implants || !ready)
+		return
+	if(implant_action(M,user))
+		ready_implants--
+		if(!replenishing && auto_replenish)
+			replenishing = TRUE
+			addtimer(CALLBACK(src,"replenish"),replenish_cooldown)
+		if(injection_cooldown > 0)
+			ready = FALSE
+			addtimer(CALLBACK(src,"set_ready"),injection_cooldown)
+	else
+		playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 25, 1)
+	update_icon()
+
+/obj/machinery/implantchair/proc/implant_action(mob/living/M)
+	var/obj/item/weapon/implant/I = new implant_type
+	if(I.implant(M))
+		visible_message("<span class='warning'>[M] has been implanted by the [name].</span>")
+		return 1
+
+/obj/machinery/implantchair/update_icon()
+	icon_state = initial(icon_state)
+	if(state_open)
+		icon_state += "_open"
+	if(occupant)
+		icon_state += "_occupied"
+	if(ready)
+		add_overlay("ready")
+	else
+		cut_overlays()
+
+/obj/machinery/implantchair/proc/replenish()
+	if(ready_implants < max_implants)
+		ready_implants++
+	if(ready_implants < max_implants)
+		addtimer(CALLBACK(src,"replenish"),replenish_cooldown)
+	else
+		replenishing = FALSE
+
+/obj/machinery/implantchair/proc/set_ready()
+	ready = TRUE
+	update_icon()
+
+/obj/machinery/implantchair/container_resist(mob/living/user)
+	if(state_open)
+		return
+	user.changeNext_move(CLICK_CD_BREAKOUT)
+	user.last_special = world.time + CLICK_CD_BREAKOUT
+	to_chat(user, "<span class='notice'>You lean on the back of [src] and start pushing the door open... (this will take about about a minute.)</span>")
+	audible_message("<span class='italics'>You hear a metallic creaking from [src]!</span>",hearing_distance = 2)
+
+	if(do_after(user, 600, target = src))
+		if(!user || user.stat != CONSCIOUS || user.loc != src || state_open)
+			return
+		visible_message("<span class='warning'>[user] successfully broke out of [src]!</span>")
+		to_chat(user, "<span class='notice'>You successfully break out of [src]!</span>")
+		open_machine()
+
+/obj/machinery/implantchair/relaymove(mob/user)
+	container_resist(user)
+
+/obj/machinery/implantchair/MouseDrop_T(mob/target, mob/user)
+	if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !isliving(target) || !user.IsAdvancedToolUser())
+		return
+	close_machine(target)
+
+/obj/machinery/implantchair/close_machine(mob/living/user)
+	if((isnull(user) || istype(user)) && state_open)
+		..(user)
+		if(auto_inject && ready && ready_implants > 0)
+			implant(user,null)
+
+/obj/machinery/implantchair/genepurge
+	name = "Genetic purifier"
+	desc = "Used to purge human genome of foreign influences"
+	special = TRUE
+	special_name = "Purge genome"
+	injection_cooldown = 0
+	replenish_cooldown = 300
+
+/obj/machinery/implantchair/genepurge/implant_action(mob/living/carbon/human/H,mob/user)
+	if(!istype(H))
+		return 0
+	H.set_species(/datum/species/human, 1)//lizards go home
+	purrbation_remove(H)//remove cats
+	H.dna.remove_all_mutations()//hulks out
+	return 1
+
+
+/obj/machinery/implantchair/brainwash
+	name = "Neural Imprinter"
+	desc = "Used to <s>indoctrinate</s> rehabilitate hardened recidivists."
+	special_name = "Imprint"
+	injection_cooldown = 3000
+	auto_inject = FALSE
+	auto_replenish = FALSE
+	special = TRUE
+	var/objective = "Obey the law. Praise Nanotrasen."
+	var/custom = FALSE
+
+/obj/machinery/implantchair/brainwash/implant_action(mob/living/C,mob/user)
+	if(!istype(C) || !C.mind) // I don't know how this makes any sense for silicons but laws trump objectives anyway.
+		return 0
+	if(custom)
+		if(!user || !user.Adjacent(src))
+			return 0
+		objective = stripped_input(usr,"What order do you want to imprint on [C]?","Enter the order","",120)
+		message_admins("[key_name_admin(user)] set brainwash machine objective to '[objective]'.")
+		log_game("[key_name_admin(user)] set brainwash machine objective to '[objective]'.")
+	var/datum/objective/custom_objective = new/datum/objective(objective)
+	custom_objective.owner = C.mind
+	C.mind.objectives += custom_objective
+	C.mind.announce_objectives()
+	message_admins("[key_name_admin(user)] brainwashed [key_name_admin(C)] with objective '[objective]'.")
+	log_game("[key_name_admin(user)] brainwashed [key_name_admin(C)] with objective '[objective]'.")
+	return 1
+

code/game/objects/items/weapons/melee/energy.dm

@@ -1,259 +1,259 @@
-/obj/item/weapon/melee/energy
-	var/active = 0
-	var/force_on = 30 //force when active
-	var/throwforce_on = 20
-	var/icon_state_on = "axe1"
-	var/list/attack_verb_on = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-	var/list/possible_colors
-	w_class = WEIGHT_CLASS_SMALL
-	sharpness = IS_SHARP
-	var/w_class_on = WEIGHT_CLASS_BULKY
-	heat = 3500
-	obj_integrity = 200
-	max_integrity = 200
-	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30)
-	resistance_flags = FIRE_PROOF
-	var/brightness_on = 3
-
-/obj/item/weapon/melee/energy/Initialize()
+/obj/item/weapon/melee/energy
+	var/active = 0
+	var/force_on = 30 //force when active
+	var/throwforce_on = 20
+	var/icon_state_on = "axe1"
+	var/list/attack_verb_on = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+	var/list/possible_colors
+	w_class = WEIGHT_CLASS_SMALL
+	sharpness = IS_SHARP
+	var/w_class_on = WEIGHT_CLASS_BULKY
+	heat = 3500
+	obj_integrity = 200
+	max_integrity = 200
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30)
+	resistance_flags = FIRE_PROOF
+	var/brightness_on = 3
+
+/obj/item/weapon/melee/energy/Initialize()
 	. = ..()
-	if(LAZYLEN(possible_colors))
-		item_color = pick(possible_colors)
-		switch(item_color)//Only run this check if the color was picked randomly, so that colors can be manually set for non-random colored energy weapons.
-			if("red")
-				light_color = LIGHT_COLOR_RED
-			if("green")
-				light_color = LIGHT_COLOR_GREEN
-			if("blue")
-				light_color = LIGHT_COLOR_LIGHT_CYAN
-			if("purple")
-				light_color = LIGHT_COLOR_LAVENDER
-	if(active)
-		set_light(brightness_on)
-
-/obj/item/weapon/melee/energy/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is [pick("slitting [user.p_their()] stomach open with", "falling on")] [src]! It looks like [user.p_theyre()] trying to commit seppuku!</span>")
-	return (BRUTELOSS|FIRELOSS)
-
-/obj/item/weapon/melee/energy/add_blood(list/blood_dna)
-	return 0
-
-/obj/item/weapon/melee/energy/is_sharp()
-	return active * sharpness
-
-/obj/item/weapon/melee/energy/axe
-	name = "energy axe"
-	desc = "An energized battle axe."
-	icon_state = "axe0"
-	force = 40
-	force_on = 150
-	throwforce = 25
-	throwforce_on = 30
-	hitsound = 'sound/weapons/bladeslice.ogg'
-	throw_speed = 3
-	throw_range = 5
-	w_class = WEIGHT_CLASS_NORMAL
-	w_class_on = WEIGHT_CLASS_HUGE
-	flags = CONDUCT
-	armour_penetration = 100
-	origin_tech = "combat=4;magnets=3"
-	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
-	attack_verb_on = list()
-	light_color = "#40ceff"
-
-/obj/item/weapon/melee/energy/axe/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] swings [src] towards [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	return (BRUTELOSS|FIRELOSS)
-
-/obj/item/weapon/melee/energy/sword
-	name = "energy sword"
-	desc = "May the force be within you."
-	icon_state = "sword0"
-	force = 3
-	throwforce = 5
-	hitsound = "swing_hit" //it starts deactivated
-	throw_speed = 3
-	throw_range = 5
-	sharpness = IS_SHARP
-	embed_chance = 75
-	embedded_impact_pain_multiplier = 10
-	armour_penetration = 35
-	origin_tech = "combat=3;magnets=4;syndicate=4"
-	block_chance = 50
-	possible_colors = list("red", "blue", "green", "purple")
-	var/hacked = 0
-
-/obj/item/weapon/melee/energy/sword/Destroy()
-	STOP_PROCESSING(SSobj, src)
-	. = ..()
-
-/obj/item/weapon/melee/energy/sword/process()
-	if(active)
-		if(hacked)
-			light_color = pick(LIGHT_COLOR_RED, LIGHT_COLOR_GREEN, LIGHT_COLOR_LIGHT_CYAN, LIGHT_COLOR_LAVENDER)
-		open_flame()
-	else
-		STOP_PROCESSING(SSobj, src)
-
-/obj/item/weapon/melee/energy/sword/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance)
-	if(active)
-		return ..()
-	return 0
-
-/obj/item/weapon/melee/energy/attack_self(mob/living/carbon/user)
-	if(user.disabilities & CLUMSY && prob(50))
-		to_chat(user, "<span class='warning'>You accidentally cut yourself with [src], like a doofus!</span>")
-		user.take_bodypart_damage(5,5)
-	active = !active
-	if (active)
-		force = force_on
-		throwforce = throwforce_on
-		hitsound = 'sound/weapons/blade1.ogg'
-		throw_speed = 4
-		if(attack_verb_on.len)
-			attack_verb = attack_verb_on
-		if(!item_color)
-			icon_state = icon_state_on
-		else
-			icon_state = "sword[item_color]"
-		w_class = w_class_on
-		playsound(user, 'sound/weapons/saberon.ogg', 35, 1) //changed it from 50% volume to 35% because deafness
-		to_chat(user, "<span class='notice'>[src] is now active.</span>")
-		START_PROCESSING(SSobj, src)
-		set_light(brightness_on)
-	else
-		force = initial(force)
-		throwforce = initial(throwforce)
-		hitsound = initial(hitsound)
-		throw_speed = initial(throw_speed)
-		if(attack_verb_on.len)
-			attack_verb = list()
-		icon_state = initial(icon_state)
-		w_class = initial(w_class)
-		playsound(user, 'sound/weapons/saberoff.ogg', 35, 1)  //changed it from 50% volume to 35% because deafness
-		to_chat(user, "<span class='notice'>[src] can now be concealed.</span>")
-		STOP_PROCESSING(SSobj, src)
-		set_light(0)
-	add_fingerprint(user)
-
-/obj/item/weapon/melee/energy/is_hot()
-	return active * heat
-
-/obj/item/weapon/melee/energy/ignition_effect(atom/A, mob/user)
-	if(!active)
-		return ""
-
-	var/in_mouth = ""
-	if(iscarbon(user))
-		var/mob/living/carbon/C = user
-		if(C.wear_mask == src)
-			in_mouth = ", barely missing their nose"
-	. = "<span class='warning'>[user] swings their \
-		[src][in_mouth]. They light [A] in the process.</span>"
-	playsound(loc, hitsound, get_clamped_volume(), 1, -1)
-	add_fingerprint(user)
-
-/obj/item/weapon/melee/energy/sword/cyborg
-	var/hitcost = 50
-
-/obj/item/weapon/melee/energy/sword/cyborg/attack(mob/M, var/mob/living/silicon/robot/R)
-	if(R.cell)
-		var/obj/item/weapon/stock_parts/cell/C = R.cell
-		if(active && !(C.use(hitcost)))
-			attack_self(R)
-			to_chat(R, "<span class='notice'>It's out of charge!</span>")
-			return
-		..()
-	return
-
-/obj/item/weapon/melee/energy/sword/cyborg/saw //Used by medical Syndicate cyborgs
-	name = "energy saw"
-	desc = "For heavy duty cutting. It has a carbon-fiber blade in addition to a toggleable hard-light edge to dramatically increase sharpness."
-	icon_state = "esaw"
-	force_on = 30
-	force = 18 //About as much as a spear
-	hitsound = 'sound/weapons/circsawhit.ogg'
-	icon = 'icons/obj/surgery.dmi'
-	icon_state = "esaw_0"
-	icon_state_on = "esaw_1"
-	hitcost = 75 //Costs more than a standard cyborg esword
-	item_color = null
-	w_class = WEIGHT_CLASS_NORMAL
-	sharpness = IS_SHARP
-	light_color = "#40ceff"
-	possible_colors = null
-
+	if(LAZYLEN(possible_colors))
+		item_color = pick(possible_colors)
+		switch(item_color)//Only run this check if the color was picked randomly, so that colors can be manually set for non-random colored energy weapons.
+			if("red")
+				light_color = LIGHT_COLOR_RED
+			if("green")
+				light_color = LIGHT_COLOR_GREEN
+			if("blue")
+				light_color = LIGHT_COLOR_LIGHT_CYAN
+			if("purple")
+				light_color = LIGHT_COLOR_LAVENDER
+	if(active)
+		set_light(brightness_on)
+
+/obj/item/weapon/melee/energy/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] is [pick("slitting [user.p_their()] stomach open with", "falling on")] [src]! It looks like [user.p_theyre()] trying to commit seppuku!</span>")
+	return (BRUTELOSS|FIRELOSS)
+
+/obj/item/weapon/melee/energy/add_blood(list/blood_dna)
+	return 0
+
+/obj/item/weapon/melee/energy/is_sharp()
+	return active * sharpness
+
+/obj/item/weapon/melee/energy/axe
+	name = "energy axe"
+	desc = "An energized battle axe."
+	icon_state = "axe0"
+	force = 40
+	force_on = 150
+	throwforce = 25
+	throwforce_on = 30
+	hitsound = 'sound/weapons/bladeslice.ogg'
+	throw_speed = 3
+	throw_range = 5
+	w_class = WEIGHT_CLASS_NORMAL
+	w_class_on = WEIGHT_CLASS_HUGE
+	flags = CONDUCT
+	armour_penetration = 100
+	origin_tech = "combat=4;magnets=3"
+	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
+	attack_verb_on = list()
+	light_color = "#40ceff"
+
+/obj/item/weapon/melee/energy/axe/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] swings [src] towards [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	return (BRUTELOSS|FIRELOSS)
+
+/obj/item/weapon/melee/energy/sword
+	name = "energy sword"
+	desc = "May the force be within you."
+	icon_state = "sword0"
+	force = 3
+	throwforce = 5
+	hitsound = "swing_hit" //it starts deactivated
+	throw_speed = 3
+	throw_range = 5
+	sharpness = IS_SHARP
+	embed_chance = 75
+	embedded_impact_pain_multiplier = 10
+	armour_penetration = 35
+	origin_tech = "combat=3;magnets=4;syndicate=4"
+	block_chance = 50
+	possible_colors = list("red", "blue", "green", "purple")
+	var/hacked = 0
+
+/obj/item/weapon/melee/energy/sword/Destroy()
+	STOP_PROCESSING(SSobj, src)
+	. = ..()
+
+/obj/item/weapon/melee/energy/sword/process()
+	if(active)
+		if(hacked)
+			light_color = pick(LIGHT_COLOR_RED, LIGHT_COLOR_GREEN, LIGHT_COLOR_LIGHT_CYAN, LIGHT_COLOR_LAVENDER)
+		open_flame()
+	else
+		STOP_PROCESSING(SSobj, src)
+
+/obj/item/weapon/melee/energy/sword/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance)
+	if(active)
+		return ..()
+	return 0
+
+/obj/item/weapon/melee/energy/attack_self(mob/living/carbon/user)
+	if(user.disabilities & CLUMSY && prob(50))
+		to_chat(user, "<span class='warning'>You accidentally cut yourself with [src], like a doofus!</span>")
+		user.take_bodypart_damage(5,5)
+	active = !active
+	if (active)
+		force = force_on
+		throwforce = throwforce_on
+		hitsound = 'sound/weapons/blade1.ogg'
+		throw_speed = 4
+		if(attack_verb_on.len)
+			attack_verb = attack_verb_on
+		if(!item_color)
+			icon_state = icon_state_on
+		else
+			icon_state = "sword[item_color]"
+		w_class = w_class_on
+		playsound(user, 'sound/weapons/saberon.ogg', 35, 1) //changed it from 50% volume to 35% because deafness
+		to_chat(user, "<span class='notice'>[src] is now active.</span>")
+		START_PROCESSING(SSobj, src)
+		set_light(brightness_on)
+	else
+		force = initial(force)
+		throwforce = initial(throwforce)
+		hitsound = initial(hitsound)
+		throw_speed = initial(throw_speed)
+		if(attack_verb_on.len)
+			attack_verb = list()
+		icon_state = initial(icon_state)
+		w_class = initial(w_class)
+		playsound(user, 'sound/weapons/saberoff.ogg', 35, 1)  //changed it from 50% volume to 35% because deafness
+		to_chat(user, "<span class='notice'>[src] can now be concealed.</span>")
+		STOP_PROCESSING(SSobj, src)
+		set_light(0)
+	add_fingerprint(user)
+
+/obj/item/weapon/melee/energy/is_hot()
+	return active * heat
+
+/obj/item/weapon/melee/energy/ignition_effect(atom/A, mob/user)
+	if(!active)
+		return ""
+
+	var/in_mouth = ""
+	if(iscarbon(user))
+		var/mob/living/carbon/C = user
+		if(C.wear_mask == src)
+			in_mouth = ", barely missing their nose"
+	. = "<span class='warning'>[user] swings their \
+		[src][in_mouth]. They light [A] in the process.</span>"
+	playsound(loc, hitsound, get_clamped_volume(), 1, -1)
+	add_fingerprint(user)
+
+/obj/item/weapon/melee/energy/sword/cyborg
+	var/hitcost = 50
+
+/obj/item/weapon/melee/energy/sword/cyborg/attack(mob/M, var/mob/living/silicon/robot/R)
+	if(R.cell)
+		var/obj/item/weapon/stock_parts/cell/C = R.cell
+		if(active && !(C.use(hitcost)))
+			attack_self(R)
+			to_chat(R, "<span class='notice'>It's out of charge!</span>")
+			return
+		..()
+	return
+
+/obj/item/weapon/melee/energy/sword/cyborg/saw //Used by medical Syndicate cyborgs
+	name = "energy saw"
+	desc = "For heavy duty cutting. It has a carbon-fiber blade in addition to a toggleable hard-light edge to dramatically increase sharpness."
+	icon_state = "esaw"
+	force_on = 30
+	force = 18 //About as much as a spear
+	hitsound = 'sound/weapons/circsawhit.ogg'
+	icon = 'icons/obj/surgery.dmi'
+	icon_state = "esaw_0"
+	icon_state_on = "esaw_1"
+	hitcost = 75 //Costs more than a standard cyborg esword
+	item_color = null
+	w_class = WEIGHT_CLASS_NORMAL
+	sharpness = IS_SHARP
+	light_color = "#40ceff"
+	possible_colors = null
+
 /obj/item/weapon/melee/energy/sword/cyborg/saw/Initialize()
 	. = ..()
-	icon_state = "esaw_0"
-	item_color = null
-
-/obj/item/weapon/melee/energy/sword/cyborg/saw/hit_reaction()
-	return 0
-
-/obj/item/weapon/melee/energy/sword/saber
-
-/obj/item/weapon/melee/energy/sword/saber/blue
-	possible_colors = list("blue")
-
-/obj/item/weapon/melee/energy/sword/saber/purple
-	possible_colors = list("purple")
-
-/obj/item/weapon/melee/energy/sword/saber/green
-	possible_colors = list("green")
-
-/obj/item/weapon/melee/energy/sword/saber/red
-	possible_colors = list("red")
-
-
-/obj/item/weapon/melee/energy/sword/saber/attackby(obj/item/weapon/W, mob/living/user, params)
+	icon_state = "esaw_0"
+	item_color = null
+
+/obj/item/weapon/melee/energy/sword/cyborg/saw/hit_reaction()
+	return 0
+
+/obj/item/weapon/melee/energy/sword/saber
+
+/obj/item/weapon/melee/energy/sword/saber/blue
+	possible_colors = list("blue")
+
+/obj/item/weapon/melee/energy/sword/saber/purple
+	possible_colors = list("purple")
+
+/obj/item/weapon/melee/energy/sword/saber/green
+	possible_colors = list("green")
+
+/obj/item/weapon/melee/energy/sword/saber/red
+	possible_colors = list("red")
+
+
+/obj/item/weapon/melee/energy/sword/saber/attackby(obj/item/weapon/W, mob/living/user, params)
 	if(istype(W, /obj/item/device/multitool))
 		if(!hacked)
 			hacked = TRUE
-			item_color = "rainbow"
-			to_chat(user, "<span class='warning'>RNBW_ENGAGE</span>")
-
-			if(active)
-				icon_state = "swordrainbow"
-				user.update_inv_hands()
-		else
-			to_chat(user, "<span class='warning'>It's already fabulous!</span>")
-	else
-		return ..()
-
-/obj/item/weapon/melee/energy/sword/pirate
-	name = "energy cutlass"
-	desc = "Arrrr matey."
-	icon_state = "cutlass0"
-	icon_state_on = "cutlass1"
-	light_color = "#ff0000"
-
-/obj/item/weapon/melee/energy/blade
-	name = "energy blade"
-	desc = "A concentrated beam of energy in the shape of a blade. Very stylish... and lethal."
-	icon_state = "blade"
-	force = 30	//Normal attacks deal esword damage
-	hitsound = 'sound/weapons/blade1.ogg'
-	active = 1
-	throwforce = 1//Throwing or dropping the item deletes it.
-	throw_speed = 3
-	throw_range = 1
-	w_class = WEIGHT_CLASS_BULKY//So you can't hide it in your pocket or some such.
-	var/datum/effect_system/spark_spread/spark_system
-	sharpness = IS_SHARP
-
-//Most of the other special functions are handled in their own files. aka special snowflake code so kewl
+			item_color = "rainbow"
+			to_chat(user, "<span class='warning'>RNBW_ENGAGE</span>")
+
+			if(active)
+				icon_state = "swordrainbow"
+				user.update_inv_hands()
+		else
+			to_chat(user, "<span class='warning'>It's already fabulous!</span>")
+	else
+		return ..()
+
+/obj/item/weapon/melee/energy/sword/pirate
+	name = "energy cutlass"
+	desc = "Arrrr matey."
+	icon_state = "cutlass0"
+	icon_state_on = "cutlass1"
+	light_color = "#ff0000"
+
+/obj/item/weapon/melee/energy/blade
+	name = "energy blade"
+	desc = "A concentrated beam of energy in the shape of a blade. Very stylish... and lethal."
+	icon_state = "blade"
+	force = 30	//Normal attacks deal esword damage
+	hitsound = 'sound/weapons/blade1.ogg'
+	active = 1
+	throwforce = 1//Throwing or dropping the item deletes it.
+	throw_speed = 3
+	throw_range = 1
+	w_class = WEIGHT_CLASS_BULKY//So you can't hide it in your pocket or some such.
+	var/datum/effect_system/spark_spread/spark_system
+	sharpness = IS_SHARP
+
+//Most of the other special functions are handled in their own files. aka special snowflake code so kewl
 /obj/item/weapon/melee/energy/blade/Initialize()
 	. = ..()
-	spark_system = new /datum/effect_system/spark_spread()
-	spark_system.set_up(5, 0, src)
-	spark_system.attach(src)
-
-/obj/item/weapon/melee/energy/blade/attack_self(mob/user)
-	return
-
-/obj/item/weapon/melee/energy/blade/hardlight
-	name = "hardlight blade"
-	desc = "An extremely sharp blade made out of hard light. Packs quite a punch."
-	icon_state = "lightblade"
-	item_state = "lightblade"
+	spark_system = new /datum/effect_system/spark_spread()
+	spark_system.set_up(5, 0, src)
+	spark_system.attach(src)
+
+/obj/item/weapon/melee/energy/blade/attack_self(mob/user)
+	return
+
+/obj/item/weapon/melee/energy/blade/hardlight
+	name = "hardlight blade"
+	desc = "An extremely sharp blade made out of hard light. Packs quite a punch."
+	icon_state = "lightblade"
+	item_state = "lightblade"