reset

code/__HELPERS/mobs.dm

@@ -340,20 +340,20 @@ Proc for attack log creation, because really why not
 		qdel(progbar)
 
 
-//some additional checks as a callback for for do_afters that want to break on losing health or on the mob taking action
-/mob/proc/break_do_after_checks(list/checked_health, check_clicks)
-	if(check_clicks && next_move > world.time)
-		return FALSE
-	return TRUE
-
-//pass a list in the format list("health" = mob's health var) to check health during this
-/mob/living/break_do_after_checks(list/checked_health, check_clicks)
-	if(islist(checked_health))
-		if(health < checked_health["health"])
-			return FALSE
-		checked_health["health"] = health
-	return ..()
-
+//some additional checks as a callback for for do_afters that want to break on losing health or on the mob taking action
+/mob/proc/break_do_after_checks(list/checked_health, check_clicks)
+	if(check_clicks && next_move > world.time)
+		return FALSE
+	return TRUE
+
+//pass a list in the format list("health" = mob's health var) to check health during this
+/mob/living/break_do_after_checks(list/checked_health, check_clicks)
+	if(islist(checked_health))
+		if(health < checked_health["health"])
+			return FALSE
+		checked_health["health"] = health
+	return ..()
+
 /proc/do_after(mob/user, delay, needhand = 1, atom/target = null, progress = 1, datum/callback/extra_checks = null)
 	if(!user)
 		return 0

code/_onclick/item_attack.dm

@@ -28,7 +28,7 @@
 		if(sharpness)
 			to_chat(user, "<span class='notice'>You begin to butcher [src]...</span>")
 			playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1)
-			if(do_mob(user, src, 80/sharpness) && Adjacent(I))
+			if(do_mob(user, src, 80/sharpness) && Adjacent(I))
 				harvest(user)
 			return 1
 	return I.attack(src, user)

code/controllers/subsystem/server_maint.dm

@@ -9,7 +9,6 @@ SUBSYSTEM_DEF(server_maint)
 	var/list/currentrun
 
 /datum/controller/subsystem/server_maint/Initialize(timeofday)
-	reload_custom_roundstart_items_list()
 	if (config.hub)
 		world.visibility = 1
 	..()

code/controllers/subsystem/spacedrift.dm

@@ -3,7 +3,7 @@ SUBSYSTEM_DEF(spacedrift)
 	priority = 30
 	wait = 5
 	flags = SS_NO_INIT|SS_KEEP_TIMING
-	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
 	var/list/currentrun = list()
 	var/list/processing = list()

code/game/gamemodes/antag_spawner.dm

@@ -142,25 +142,25 @@
 /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
+		return FALSE
 	if(!(user.mind in SSticker.mode.syndicates))
 		to_chat(user, "<span class='danger'>AUTHENTICATION FAILURE. ACCESS DENIED.</span>")
-		return 0
+		return FALSE
 	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
+		return FALSE
+	return TRUE
 
 
 /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)
+	var/list/nuke_candidates = pollGhostCandidates("Do you want to play as a syndicate [borg_to_spawn ? "[lowertext(borg_to_spawn)] cyborg":"operative"]?", ROLE_OPERATIVE, null, ROLE_OPERATIVE, 150, POLL_IGNORE_SYNDICATE)
 	if(nuke_candidates.len)
 		if(!(check_usability(user)))
 			return
-		used = 1
+		used = TRUE
 		var/mob/dead/observer/theghost = pick(nuke_candidates)
 		spawn_antag(theghost.client, get_turf(src), "syndieborg")
 		do_sparks(4, TRUE, src)

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
-						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) && !..())
-					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
+
+
+
+/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) && !..())
+					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

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
-		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!"
-
+#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!"
+
 #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()
-		if(occupant)
-			var/mob/living/mob_occupant = occupant
-			if(uv_super)
-				mob_occupant.adjustFireLoss(rand(20, 36))
-			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
-				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
-
-			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()
+// 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)
+				mob_occupant.adjustFireLoss(rand(20, 36))
+			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
+				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
+
+			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/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))
-			message_admins("[M] [ADMIN_FLW(M)] has teleported through [src].")
-		do_teleport(M, target, precision) ///You will appear adjacent to the beacon
-
-
+
+/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
+
+

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/Initialize()
-	. = ..()
+/obj/item/radio/integrated/Initialize()
+	. = ..()
 	if (istype(loc.loc, /obj/item/device/pda))
 		hostpda = loc.loc
 

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>")
-			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)
+// 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)

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

@@ -7,8 +7,8 @@
 	origin_tech = "bluespace=1"
 	dog_fashion = null
 
-/obj/item/device/radio/beacon/Initialize()
-	. = ..()
+/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/Initialize()
-	. = ..()
+/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/Initialize()
-	. = ..()
+/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/Initialize()
-	. = ..()
+/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/Initialize()
-	. = ..()
+/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)
-			log_attacher = "[ADMIN_QUE(attacher)] [ADMIN_FLW(attacher)]"
-
-		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/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)
-		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
+/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)
+			last_touch_info = "[ADMIN_QUE(mob)] [ADMIN_FLW(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)
+		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

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

@@ -50,7 +50,7 @@
 				M.dna.uni_identity = merge_text(M.dna.uni_identity, fields["UI"])
 				M.updateappearance(mutations_overlay_update=1)
 		log_attack(log_msg)
-		return TRUE
+		return TRUE
 
 /obj/item/weapon/dnainjector/attack(mob/target, mob/user)
 	if(!user.IsAdvancedToolUser())
@@ -77,9 +77,9 @@
 
 	add_logs(user, target, "injected", src)
 
-	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>")
-
+	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/grenades/grenade.dm

@@ -48,27 +48,27 @@
 /obj/item/weapon/grenade/attack_self(mob/user)
 	if(!active)
 		if(clown_check(user))
-			preprime(user)
+			preprime(user)
 			if(iscarbon(user))
 				var/mob/living/carbon/C = user
 				C.throw_mode_on()
 
-/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/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()
 
@@ -108,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/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()
-	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
-
+/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
+

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -1,305 +1,305 @@
-/obj/item/weapon/storage/box/syndicate
-
-/obj/item/weapon/storage/box/syndicate/PopulateContents()
-	switch (pickweight(list("bloodyspai" = 3, "stealth" = 2, "bond" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "darklord" = 1, "sniper" = 1, "metaops" = 1, "ninja" = 1)))
-		if("bloodyspai") // 27 tc now this is more right
-			new /obj/item/clothing/under/chameleon(src) // 2 tc since it's not the full set
-			new /obj/item/clothing/mask/chameleon(src) // Goes with above
-			new /obj/item/weapon/card/id/syndicate(src) // 2 tc
-			new /obj/item/clothing/shoes/chameleon(src) // 2 tc
-			new /obj/item/device/camera_bug(src) // 1 tc
-			new /obj/item/device/multitool/ai_detect(src) // 1 tc
-			new /obj/item/device/encryptionkey/syndicate(src) // 2 tc
-			new /obj/item/weapon/reagent_containers/syringe/mulligan(src) // 4 tc
-			new /obj/item/weapon/switchblade(src) //I'll count this as 2 tc
-			new /obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate (src) // 2 tc this shit heals
-			new /obj/item/device/flashlight/emp(src) // 2 tc
-			new /obj/item/device/chameleon(src) // 7 tc
-
-		if("stealth") // 31 tc
-			new /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow(src)
-			new /obj/item/weapon/pen/sleepy(src)
-			new /obj/item/device/healthanalyzer/rad_laser(src)
-			new /obj/item/device/chameleon(src)
-			new /obj/item/weapon/soap/syndie(src)
-			new /obj/item/clothing/glasses/thermal/syndi(src)
-
-		if("bond") // 29 tc
-			new /obj/item/weapon/gun/ballistic/automatic/pistol(src)
-			new /obj/item/weapon/suppressor(src)
-			new /obj/item/ammo_box/magazine/m10mm(src)
-			new /obj/item/ammo_box/magazine/m10mm(src)
-			new /obj/item/clothing/under/chameleon(src)
-			new /obj/item/weapon/card/id/syndicate(src)
-			new /obj/item/weapon/reagent_containers/syringe/stimulants(src)
-
-		if("screwed") // 29 tc
-			new /obj/item/device/sbeacondrop/bomb(src)
-			new /obj/item/weapon/grenade/syndieminibomb(src)
-			new /obj/item/device/sbeacondrop/powersink(src)
-			new /obj/item/clothing/suit/space/syndicate/black/red(src)
-			new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
-			new /obj/item/device/encryptionkey/syndicate(src)
-
-		if("guns") // 28 tc now
-			new /obj/item/weapon/gun/ballistic/revolver(src)
-			new /obj/item/ammo_box/a357(src)
-			new /obj/item/ammo_box/a357(src)
-			new /obj/item/weapon/card/emag(src)
-			new /obj/item/weapon/grenade/plastic/c4(src)
-			new /obj/item/clothing/gloves/color/latex/nitrile(src)
-			new /obj/item/clothing/mask/gas/clown_hat(src)
-			new /obj/item/clothing/under/suit_jacket/really_black(src)
-
-		if("murder") // 28 tc now
-			new /obj/item/weapon/melee/energy/sword/saber(src)
-			new /obj/item/clothing/glasses/thermal/syndi(src)
-			new /obj/item/weapon/card/emag(src)
-			new /obj/item/clothing/shoes/chameleon(src)
-			new /obj/item/device/encryptionkey/syndicate(src)
-			new /obj/item/weapon/grenade/syndieminibomb(src)
-
-		if("implant") // 55+ tc holy shit what the fuck this is a lottery disguised as fun boxes isn't it?
-			new /obj/item/weapon/implanter/freedom(src)
-			new /obj/item/weapon/implanter/uplink/precharged(src)
-			new /obj/item/weapon/implanter/emp(src)
-			new /obj/item/weapon/implanter/adrenalin(src)
-			new /obj/item/weapon/implanter/explosive(src)
-			new /obj/item/weapon/implanter/storage(src)
-
-		if("hacker") // 26 tc
-			new /obj/item/weapon/aiModule/syndicate(src)
-			new /obj/item/weapon/card/emag(src)
-			new /obj/item/device/encryptionkey/binary(src)
-			new /obj/item/weapon/aiModule/toyAI(src)
-			new /obj/item/device/multitool/ai_detect(src)
-
-		if("lordsingulo") // 24 tc
-			new /obj/item/device/sbeacondrop(src)
-			new /obj/item/clothing/suit/space/syndicate/black/red(src)
-			new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
-			new /obj/item/weapon/card/emag(src)
-
-		if("sabotage") // 26 tc now
-			new /obj/item/weapon/grenade/plastic/c4 (src)
-			new /obj/item/weapon/grenade/plastic/c4 (src)
-			new /obj/item/device/doorCharge(src)
-			new /obj/item/device/doorCharge(src)
-			new /obj/item/device/camera_bug(src)
-			new /obj/item/device/sbeacondrop/powersink(src)
-			new /obj/item/weapon/cartridge/syndicate(src)
-			new /obj/item/weapon/storage/toolbox/syndicate(src) //To actually get to those places
-			new /obj/item/pizzabox/bomb
-
-		if("darklord") //20 tc + tk + summon item close enough for now
-			new /obj/item/weapon/twohanded/dualsaber(src)
-			new /obj/item/weapon/dnainjector/telemut/darkbundle(src)
-			new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
-			new /obj/item/weapon/card/id/syndicate(src)
-			new /obj/item/clothing/shoes/chameleon(src) //because slipping while being a dark lord sucks
-			new /obj/item/weapon/spellbook/oneuse/summonitem(src)
-
-		if("sniper") //This shit is unique so can't really balance it around tc, also no silencer because getting killed without ANY indicator on what killed you sucks
-			new /obj/item/weapon/gun/ballistic/automatic/sniper_rifle(src) // 12 tc
-			new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src)
-			new /obj/item/clothing/glasses/thermal/syndi(src)
-			new /obj/item/clothing/gloves/color/latex/nitrile(src)
-			new /obj/item/clothing/mask/gas/clown_hat(src)
-			new /obj/item/clothing/under/suit_jacket/really_black(src)
-
-		if("metaops") // 30 tc
-			new /obj/item/clothing/suit/space/hardsuit/syndi(src) // 8 tc
-			new /obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog/unrestricted(src) // 8 tc
-			new /obj/item/weapon/implanter/explosive(src) // 2 tc
-			new /obj/item/ammo_box/magazine/m12g/buckshot(src) // 2 tc
-			new /obj/item/ammo_box/magazine/m12g/buckshot(src) // 2 tc
-			new /obj/item/weapon/grenade/plastic/c4 (src) // 1 tc
-			new /obj/item/weapon/grenade/plastic/c4 (src) // 1 tc
-			new /obj/item/weapon/card/emag(src) // 6 tc
-
-		if("ninja") // 33 tc worth
-			new /obj/item/weapon/katana(src) // Unique , hard to tell how much tc this is worth. 8 tc?
-			new /obj/item/weapon/implanter/adrenalin(src) // 8 tc
-			new /obj/item/weapon/throwing_star(src) // ~5 tc for all 6
-			new /obj/item/weapon/throwing_star(src)
-			new /obj/item/weapon/throwing_star(src)
-			new /obj/item/weapon/throwing_star(src)
-			new /obj/item/weapon/throwing_star(src)
-			new /obj/item/weapon/throwing_star(src)
-			new /obj/item/weapon/storage/belt/chameleon(src) // Unique but worth at least 2 tc
-			new /obj/item/weapon/card/id/syndicate(src) // 2 tc
-			new /obj/item/device/chameleon(src) // 7 tc
-
-/obj/item/weapon/storage/box/syndie_kit
-	name = "box"
-	desc = "A sleek, sturdy box."
-	icon_state = "syndiebox"
-	illustration = "writing_syndie"
-
-/obj/item/weapon/storage/box/syndie_kit/imp_freedom
-	name = "boxed freedom implant (with injector)"
-
-/obj/item/weapon/storage/box/syndie_kit/imp_freedom/PopulateContents()
-	var/obj/item/weapon/implanter/O = new(src)
-	O.imp = new /obj/item/weapon/implant/freedom(O)
-	O.update_icon()
-
-/obj/item/weapon/storage/box/syndie_kit/imp_microbomb
-	name = "Microbomb Implant (with injector)"
-
-/obj/item/weapon/storage/box/syndie_kit/imp_microbomb/PopulateContents()
-	var/obj/item/weapon/implanter/O = new(src)
-	O.imp = new /obj/item/weapon/implant/explosive(O)
-	O.update_icon()
-
-/obj/item/weapon/storage/box/syndie_kit/imp_macrobomb
-	name = "Macrobomb Implant (with injector)"
-
-/obj/item/weapon/storage/box/syndie_kit/imp_macrobomb/PopulateContents()
-	var/obj/item/weapon/implanter/O = new(src)
-	O.imp = new /obj/item/weapon/implant/explosive/macro(O)
-	O.update_icon()
-
-/obj/item/weapon/storage/box/syndie_kit/imp_uplink
-	name = "boxed uplink implant (with injector)"
-
-/obj/item/weapon/storage/box/syndie_kit/imp_uplink/PopulateContents()
-	..()
-	var/obj/item/weapon/implanter/O = new(src)
-	O.imp = new /obj/item/weapon/implant/uplink(O)
-	O.update_icon()
-
-/obj/item/weapon/storage/box/syndie_kit/bioterror
-	name = "bioterror syringe box"
-
-/obj/item/weapon/storage/box/syndie_kit/bioterror/PopulateContents()
-	for(var/i in 1 to 7)
-		new /obj/item/weapon/reagent_containers/syringe/bioterror(src)
-
-/obj/item/weapon/storage/box/syndie_kit/imp_adrenal
-	name = "boxed adrenal implant (with injector)"
-
-/obj/item/weapon/storage/box/syndie_kit/imp_adrenal/PopulateContents()
-	var/obj/item/weapon/implanter/O = new(src)
-	O.imp = new /obj/item/weapon/implant/adrenalin(O)
-	O.update_icon()
-
-/obj/item/weapon/storage/box/syndie_kit/imp_storage
-	name = "boxed storage implant (with injector)"
-
-/obj/item/weapon/storage/box/syndie_kit/imp_storage/PopulateContents()
-	new /obj/item/weapon/implanter/storage(src)
-
-/obj/item/weapon/storage/box/syndie_kit/space
-	name = "boxed space suit and helmet"
-	can_hold = list(/obj/item/clothing/suit/space/syndicate, /obj/item/clothing/head/helmet/space/syndicate)
-	max_w_class = WEIGHT_CLASS_NORMAL
-
-/obj/item/weapon/storage/box/syndie_kit/space/PopulateContents()
-	new /obj/item/clothing/suit/space/syndicate/black/red(src) // Black and red is so in right now
-	new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
-
-/obj/item/weapon/storage/box/syndie_kit/emp
-	name = "boxed EMP kit"
-
-/obj/item/weapon/storage/box/syndie_kit/emp/PopulateContents()
-	new /obj/item/weapon/grenade/empgrenade(src)
-	new /obj/item/weapon/grenade/empgrenade(src)
-	new /obj/item/weapon/grenade/empgrenade(src)
-	new /obj/item/weapon/grenade/empgrenade(src)
-	new /obj/item/weapon/grenade/empgrenade(src)
-	new /obj/item/weapon/implanter/emp(src)
-
-/obj/item/weapon/storage/box/syndie_kit/chemical
-	name = "boxed chemical kit"
-	storage_slots = 14
-
-/obj/item/weapon/storage/box/syndie_kit/chemical/PopulateContents()
-	new /obj/item/weapon/reagent_containers/glass/bottle/polonium(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/venom(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/neurotoxin2(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/formaldehyde(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/spewium(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/cyanide(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/histamine(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/initropidril(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/pancuronium(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/sodium_thiopental(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/coniine(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/curare(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/amanitin(src)
-	new /obj/item/weapon/reagent_containers/syringe(src)
-
-/obj/item/weapon/storage/box/syndie_kit/nuke
-	name = "box"
-
-/obj/item/weapon/storage/box/syndie_kit/nuke/PopulateContents()
-	new /obj/item/weapon/screwdriver/nuke(src)
-	new /obj/item/nuke_core_container(src)
-	new /obj/item/weapon/paper/nuke_instructions(src)
-
-/obj/item/weapon/storage/box/syndie_kit/tuberculosisgrenade
-	name = "boxed virus grenade kit"
-
-/obj/item/weapon/storage/box/syndie_kit/tuberculosisgrenade/PopulateContents()
-	new /obj/item/weapon/grenade/chem_grenade/tuberculosis(src)
-	for(var/i in 1 to 5)
-		new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure(src)
-	new /obj/item/weapon/reagent_containers/syringe(src)
-	new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure(src)
-
-/obj/item/weapon/storage/box/syndie_kit/chameleon
-	name = "chameleon kit"
-
-/obj/item/weapon/storage/box/syndie_kit/chameleon/PopulateContents()
-	new /obj/item/clothing/under/chameleon(src)
-	new /obj/item/clothing/suit/chameleon(src)
-	new /obj/item/clothing/gloves/chameleon(src)
-	new /obj/item/clothing/shoes/chameleon(src)
-	new /obj/item/clothing/glasses/chameleon(src)
-	new /obj/item/clothing/head/chameleon(src)
-	new /obj/item/clothing/mask/chameleon(src)
-	new /obj/item/weapon/storage/backpack/chameleon(src)
-	new /obj/item/device/radio/headset/chameleon(src)
-	new /obj/item/weapon/stamp/chameleon(src)
-	new /obj/item/device/pda/chameleon(src)
-	new /obj/item/weapon/gun/energy/laser/chameleon(src)
-
-//5*(2*4) = 5*8 = 45, 45 damage if you hit one person with all 5 stars.
-//Not counting the damage it will do while embedded (2*4 = 8, at 15% chance)
-/obj/item/weapon/storage/box/syndie_kit/throwing_weapons/PopulateContents()
-	new /obj/item/weapon/throwing_star(src)
-	new /obj/item/weapon/throwing_star(src)
-	new /obj/item/weapon/throwing_star(src)
-	new /obj/item/weapon/throwing_star(src)
-	new /obj/item/weapon/throwing_star(src)
-	new /obj/item/weapon/restraints/legcuffs/bola/tactical(src)
-	new /obj/item/weapon/restraints/legcuffs/bola/tactical(src)
-
-/obj/item/weapon/storage/box/syndie_kit/cutouts/PopulateContents()
-	for(var/i in 1 to 3)
-		new/obj/item/cardboard_cutout/adaptive(src)
-	new/obj/item/toy/crayon/rainbow(src)
-
-/obj/item/weapon/storage/box/syndie_kit/romerol/PopulateContents()
-	new /obj/item/weapon/reagent_containers/glass/bottle/romerol(src)
-	new /obj/item/weapon/reagent_containers/syringe(src)
-	new /obj/item/weapon/reagent_containers/dropper(src)
-
-/obj/item/weapon/storage/box/syndie_kit/ez_clean/PopulateContents()
-	for(var/i in 1 to 3)
-		new/obj/item/weapon/grenade/chem_grenade/ez_clean(src)
-
-/obj/item/weapon/storage/box/hug/reverse_revolver/PopulateContents()
-	new /obj/item/weapon/gun/ballistic/revolver/reverse(src)
-
-/obj/item/weapon/storage/box/syndie_kit/mimery/PopulateContents()
-	new /obj/item/weapon/spellbook/oneuse/mimery_blockade(src)
-	new /obj/item/weapon/spellbook/oneuse/mimery_guns(src)
-
-/obj/item/weapon/storage/box/syndie_kit/holoparasite
-	name = "box"
-
-/obj/item/weapon/storage/box/syndie_kit/holoparasite/PopulateContents()
-	new /obj/item/weapon/guardiancreator/tech/choose/traitor(src)
+/obj/item/weapon/storage/box/syndicate
+
+/obj/item/weapon/storage/box/syndicate/PopulateContents()
+	switch (pickweight(list("bloodyspai" = 3, "stealth" = 2, "bond" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "darklord" = 1, "sniper" = 1, "metaops" = 1, "ninja" = 1)))
+		if("bloodyspai") // 27 tc now this is more right
+			new /obj/item/clothing/under/chameleon(src) // 2 tc since it's not the full set
+			new /obj/item/clothing/mask/chameleon(src) // Goes with above
+			new /obj/item/weapon/card/id/syndicate(src) // 2 tc
+			new /obj/item/clothing/shoes/chameleon(src) // 2 tc
+			new /obj/item/device/camera_bug(src) // 1 tc
+			new /obj/item/device/multitool/ai_detect(src) // 1 tc
+			new /obj/item/device/encryptionkey/syndicate(src) // 2 tc
+			new /obj/item/weapon/reagent_containers/syringe/mulligan(src) // 4 tc
+			new /obj/item/weapon/switchblade(src) //I'll count this as 2 tc
+			new /obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate (src) // 2 tc this shit heals
+			new /obj/item/device/flashlight/emp(src) // 2 tc
+			new /obj/item/device/chameleon(src) // 7 tc
+
+		if("stealth") // 31 tc
+			new /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow(src)
+			new /obj/item/weapon/pen/sleepy(src)
+			new /obj/item/device/healthanalyzer/rad_laser(src)
+			new /obj/item/device/chameleon(src)
+			new /obj/item/weapon/soap/syndie(src)
+			new /obj/item/clothing/glasses/thermal/syndi(src)
+
+		if("bond") // 29 tc
+			new /obj/item/weapon/gun/ballistic/automatic/pistol(src)
+			new /obj/item/weapon/suppressor(src)
+			new /obj/item/ammo_box/magazine/m10mm(src)
+			new /obj/item/ammo_box/magazine/m10mm(src)
+			new /obj/item/clothing/under/chameleon(src)
+			new /obj/item/weapon/card/id/syndicate(src)
+			new /obj/item/weapon/reagent_containers/syringe/stimulants(src)
+
+		if("screwed") // 29 tc
+			new /obj/item/device/sbeacondrop/bomb(src)
+			new /obj/item/weapon/grenade/syndieminibomb(src)
+			new /obj/item/device/sbeacondrop/powersink(src)
+			new /obj/item/clothing/suit/space/syndicate/black/red(src)
+			new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
+			new /obj/item/device/encryptionkey/syndicate(src)
+
+		if("guns") // 28 tc now
+			new /obj/item/weapon/gun/ballistic/revolver(src)
+			new /obj/item/ammo_box/a357(src)
+			new /obj/item/ammo_box/a357(src)
+			new /obj/item/weapon/card/emag(src)
+			new /obj/item/weapon/grenade/plastic/c4(src)
+			new /obj/item/clothing/gloves/color/latex/nitrile(src)
+			new /obj/item/clothing/mask/gas/clown_hat(src)
+			new /obj/item/clothing/under/suit_jacket/really_black(src)
+
+		if("murder") // 28 tc now
+			new /obj/item/weapon/melee/energy/sword/saber(src)
+			new /obj/item/clothing/glasses/thermal/syndi(src)
+			new /obj/item/weapon/card/emag(src)
+			new /obj/item/clothing/shoes/chameleon(src)
+			new /obj/item/device/encryptionkey/syndicate(src)
+			new /obj/item/weapon/grenade/syndieminibomb(src)
+
+		if("implant") // 55+ tc holy shit what the fuck this is a lottery disguised as fun boxes isn't it?
+			new /obj/item/weapon/implanter/freedom(src)
+			new /obj/item/weapon/implanter/uplink/precharged(src)
+			new /obj/item/weapon/implanter/emp(src)
+			new /obj/item/weapon/implanter/adrenalin(src)
+			new /obj/item/weapon/implanter/explosive(src)
+			new /obj/item/weapon/implanter/storage(src)
+
+		if("hacker") // 26 tc
+			new /obj/item/weapon/aiModule/syndicate(src)
+			new /obj/item/weapon/card/emag(src)
+			new /obj/item/device/encryptionkey/binary(src)
+			new /obj/item/weapon/aiModule/toyAI(src)
+			new /obj/item/device/multitool/ai_detect(src)
+
+		if("lordsingulo") // 24 tc
+			new /obj/item/device/sbeacondrop(src)
+			new /obj/item/clothing/suit/space/syndicate/black/red(src)
+			new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
+			new /obj/item/weapon/card/emag(src)
+
+		if("sabotage") // 26 tc now
+			new /obj/item/weapon/grenade/plastic/c4 (src)
+			new /obj/item/weapon/grenade/plastic/c4 (src)
+			new /obj/item/device/doorCharge(src)
+			new /obj/item/device/doorCharge(src)
+			new /obj/item/device/camera_bug(src)
+			new /obj/item/device/sbeacondrop/powersink(src)
+			new /obj/item/weapon/cartridge/syndicate(src)
+			new /obj/item/weapon/storage/toolbox/syndicate(src) //To actually get to those places
+			new /obj/item/pizzabox/bomb
+
+		if("darklord") //20 tc + tk + summon item close enough for now
+			new /obj/item/weapon/twohanded/dualsaber(src)
+			new /obj/item/weapon/dnainjector/telemut/darkbundle(src)
+			new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
+			new /obj/item/weapon/card/id/syndicate(src)
+			new /obj/item/clothing/shoes/chameleon(src) //because slipping while being a dark lord sucks
+			new /obj/item/weapon/spellbook/oneuse/summonitem(src)
+
+		if("sniper") //This shit is unique so can't really balance it around tc, also no silencer because getting killed without ANY indicator on what killed you sucks
+			new /obj/item/weapon/gun/ballistic/automatic/sniper_rifle(src) // 12 tc
+			new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src)
+			new /obj/item/clothing/glasses/thermal/syndi(src)
+			new /obj/item/clothing/gloves/color/latex/nitrile(src)
+			new /obj/item/clothing/mask/gas/clown_hat(src)
+			new /obj/item/clothing/under/suit_jacket/really_black(src)
+
+		if("metaops") // 30 tc
+			new /obj/item/clothing/suit/space/hardsuit/syndi(src) // 8 tc
+			new /obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog/unrestricted(src) // 8 tc
+			new /obj/item/weapon/implanter/explosive(src) // 2 tc
+			new /obj/item/ammo_box/magazine/m12g/buckshot(src) // 2 tc
+			new /obj/item/ammo_box/magazine/m12g/buckshot(src) // 2 tc
+			new /obj/item/weapon/grenade/plastic/c4 (src) // 1 tc
+			new /obj/item/weapon/grenade/plastic/c4 (src) // 1 tc
+			new /obj/item/weapon/card/emag(src) // 6 tc
+
+		if("ninja") // 33 tc worth
+			new /obj/item/weapon/katana(src) // Unique , hard to tell how much tc this is worth. 8 tc?
+			new /obj/item/weapon/implanter/adrenalin(src) // 8 tc
+			new /obj/item/weapon/throwing_star(src) // ~5 tc for all 6
+			new /obj/item/weapon/throwing_star(src)
+			new /obj/item/weapon/throwing_star(src)
+			new /obj/item/weapon/throwing_star(src)
+			new /obj/item/weapon/throwing_star(src)
+			new /obj/item/weapon/throwing_star(src)
+			new /obj/item/weapon/storage/belt/chameleon(src) // Unique but worth at least 2 tc
+			new /obj/item/weapon/card/id/syndicate(src) // 2 tc
+			new /obj/item/device/chameleon(src) // 7 tc
+
+/obj/item/weapon/storage/box/syndie_kit
+	name = "box"
+	desc = "A sleek, sturdy box."
+	icon_state = "syndiebox"
+	illustration = "writing_syndie"
+
+/obj/item/weapon/storage/box/syndie_kit/imp_freedom
+	name = "boxed freedom implant (with injector)"
+
+/obj/item/weapon/storage/box/syndie_kit/imp_freedom/PopulateContents()
+	var/obj/item/weapon/implanter/O = new(src)
+	O.imp = new /obj/item/weapon/implant/freedom(O)
+	O.update_icon()
+
+/obj/item/weapon/storage/box/syndie_kit/imp_microbomb
+	name = "Microbomb Implant (with injector)"
+
+/obj/item/weapon/storage/box/syndie_kit/imp_microbomb/PopulateContents()
+	var/obj/item/weapon/implanter/O = new(src)
+	O.imp = new /obj/item/weapon/implant/explosive(O)
+	O.update_icon()
+
+/obj/item/weapon/storage/box/syndie_kit/imp_macrobomb
+	name = "Macrobomb Implant (with injector)"
+
+/obj/item/weapon/storage/box/syndie_kit/imp_macrobomb/PopulateContents()
+	var/obj/item/weapon/implanter/O = new(src)
+	O.imp = new /obj/item/weapon/implant/explosive/macro(O)
+	O.update_icon()
+
+/obj/item/weapon/storage/box/syndie_kit/imp_uplink
+	name = "boxed uplink implant (with injector)"
+
+/obj/item/weapon/storage/box/syndie_kit/imp_uplink/PopulateContents()
+	..()
+	var/obj/item/weapon/implanter/O = new(src)
+	O.imp = new /obj/item/weapon/implant/uplink(O)
+	O.update_icon()
+
+/obj/item/weapon/storage/box/syndie_kit/bioterror
+	name = "bioterror syringe box"
+
+/obj/item/weapon/storage/box/syndie_kit/bioterror/PopulateContents()
+	for(var/i in 1 to 7)
+		new /obj/item/weapon/reagent_containers/syringe/bioterror(src)
+
+/obj/item/weapon/storage/box/syndie_kit/imp_adrenal
+	name = "boxed adrenal implant (with injector)"
+
+/obj/item/weapon/storage/box/syndie_kit/imp_adrenal/PopulateContents()
+	var/obj/item/weapon/implanter/O = new(src)
+	O.imp = new /obj/item/weapon/implant/adrenalin(O)
+	O.update_icon()
+
+/obj/item/weapon/storage/box/syndie_kit/imp_storage
+	name = "boxed storage implant (with injector)"
+
+/obj/item/weapon/storage/box/syndie_kit/imp_storage/PopulateContents()
+	new /obj/item/weapon/implanter/storage(src)
+
+/obj/item/weapon/storage/box/syndie_kit/space
+	name = "boxed space suit and helmet"
+	can_hold = list(/obj/item/clothing/suit/space/syndicate, /obj/item/clothing/head/helmet/space/syndicate)
+	max_w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/weapon/storage/box/syndie_kit/space/PopulateContents()
+	new /obj/item/clothing/suit/space/syndicate/black/red(src) // Black and red is so in right now
+	new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
+
+/obj/item/weapon/storage/box/syndie_kit/emp
+	name = "boxed EMP kit"
+
+/obj/item/weapon/storage/box/syndie_kit/emp/PopulateContents()
+	new /obj/item/weapon/grenade/empgrenade(src)
+	new /obj/item/weapon/grenade/empgrenade(src)
+	new /obj/item/weapon/grenade/empgrenade(src)
+	new /obj/item/weapon/grenade/empgrenade(src)
+	new /obj/item/weapon/grenade/empgrenade(src)
+	new /obj/item/weapon/implanter/emp(src)
+
+/obj/item/weapon/storage/box/syndie_kit/chemical
+	name = "boxed chemical kit"
+	storage_slots = 14
+
+/obj/item/weapon/storage/box/syndie_kit/chemical/PopulateContents()
+	new /obj/item/weapon/reagent_containers/glass/bottle/polonium(src)
+	new /obj/item/weapon/reagent_containers/glass/bottle/venom(src)
+	new /obj/item/weapon/reagent_containers/glass/bottle/neurotoxin2(src)
+	new /obj/item/weapon/reagent_containers/glass/bottle/formaldehyde(src)
+	new /obj/item/weapon/reagent_containers/glass/bottle/spewium(src)
+	new /obj/item/weapon/reagent_containers/glass/bottle/cyanide(src)
+	new /obj/item/weapon/reagent_containers/glass/bottle/histamine(src)
+	new /obj/item/weapon/reagent_containers/glass/bottle/initropidril(src)
+	new /obj/item/weapon/reagent_containers/glass/bottle/pancuronium(src)
+	new /obj/item/weapon/reagent_containers/glass/bottle/sodium_thiopental(src)
+	new /obj/item/weapon/reagent_containers/glass/bottle/coniine(src)
+	new /obj/item/weapon/reagent_containers/glass/bottle/curare(src)
+	new /obj/item/weapon/reagent_containers/glass/bottle/amanitin(src)
+	new /obj/item/weapon/reagent_containers/syringe(src)
+
+/obj/item/weapon/storage/box/syndie_kit/nuke
+	name = "box"
+
+/obj/item/weapon/storage/box/syndie_kit/nuke/PopulateContents()
+	new /obj/item/weapon/screwdriver/nuke(src)
+	new /obj/item/nuke_core_container(src)
+	new /obj/item/weapon/paper/nuke_instructions(src)
+
+/obj/item/weapon/storage/box/syndie_kit/tuberculosisgrenade
+	name = "boxed virus grenade kit"
+
+/obj/item/weapon/storage/box/syndie_kit/tuberculosisgrenade/PopulateContents()
+	new /obj/item/weapon/grenade/chem_grenade/tuberculosis(src)
+	for(var/i in 1 to 5)
+		new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure(src)
+	new /obj/item/weapon/reagent_containers/syringe(src)
+	new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure(src)
+
+/obj/item/weapon/storage/box/syndie_kit/chameleon
+	name = "chameleon kit"
+
+/obj/item/weapon/storage/box/syndie_kit/chameleon/PopulateContents()
+	new /obj/item/clothing/under/chameleon(src)
+	new /obj/item/clothing/suit/chameleon(src)
+	new /obj/item/clothing/gloves/chameleon(src)
+	new /obj/item/clothing/shoes/chameleon(src)
+	new /obj/item/clothing/glasses/chameleon(src)
+	new /obj/item/clothing/head/chameleon(src)
+	new /obj/item/clothing/mask/chameleon(src)
+	new /obj/item/weapon/storage/backpack/chameleon(src)
+	new /obj/item/device/radio/headset/chameleon(src)
+	new /obj/item/weapon/stamp/chameleon(src)
+	new /obj/item/device/pda/chameleon(src)
+	new /obj/item/weapon/gun/energy/laser/chameleon(src)
+
+//5*(2*4) = 5*8 = 45, 45 damage if you hit one person with all 5 stars.
+//Not counting the damage it will do while embedded (2*4 = 8, at 15% chance)
+/obj/item/weapon/storage/box/syndie_kit/throwing_weapons/PopulateContents()
+	new /obj/item/weapon/throwing_star(src)
+	new /obj/item/weapon/throwing_star(src)
+	new /obj/item/weapon/throwing_star(src)
+	new /obj/item/weapon/throwing_star(src)
+	new /obj/item/weapon/throwing_star(src)
+	new /obj/item/weapon/restraints/legcuffs/bola/tactical(src)
+	new /obj/item/weapon/restraints/legcuffs/bola/tactical(src)
+
+/obj/item/weapon/storage/box/syndie_kit/cutouts/PopulateContents()
+	for(var/i in 1 to 3)
+		new/obj/item/cardboard_cutout/adaptive(src)
+	new/obj/item/toy/crayon/rainbow(src)
+
+/obj/item/weapon/storage/box/syndie_kit/romerol/PopulateContents()
+	new /obj/item/weapon/reagent_containers/glass/bottle/romerol(src)
+	new /obj/item/weapon/reagent_containers/syringe(src)
+	new /obj/item/weapon/reagent_containers/dropper(src)
+
+/obj/item/weapon/storage/box/syndie_kit/ez_clean/PopulateContents()
+	for(var/i in 1 to 3)
+		new/obj/item/weapon/grenade/chem_grenade/ez_clean(src)
+
+/obj/item/weapon/storage/box/hug/reverse_revolver/PopulateContents()
+	new /obj/item/weapon/gun/ballistic/revolver/reverse(src)
+
+/obj/item/weapon/storage/box/syndie_kit/mimery/PopulateContents()
+	new /obj/item/weapon/spellbook/oneuse/mimery_blockade(src)
+	new /obj/item/weapon/spellbook/oneuse/mimery_guns(src)
+
+/obj/item/weapon/storage/box/syndie_kit/holoparasite
+	name = "box"
+
+/obj/item/weapon/storage/box/syndie_kit/holoparasite/PopulateContents()
+	new /obj/item/weapon/guardiancreator/tech/choose/traitor(src)
 	new /obj/item/weapon/paper/guardian(src)

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -140,8 +140,8 @@
 	item_state = "plasmaman_tank_belt"
 	slot_flags = SLOT_BELT
 	force = 5
-	volume = 3
-	w_class = WEIGHT_CLASS_SMALL //thanks i forgot this
+	volume = 3
+	w_class = WEIGHT_CLASS_SMALL //thanks i forgot this
 
 /obj/item/weapon/tank/internals/plasmaman/belt/full/New()
 	..()

code/game/objects/structures/bedsheet_bin.dm

@@ -1,316 +1,316 @@
-/*
-CONTAINS:
-BEDSHEETS
-LINEN BINS
-*/
-
-/obj/item/weapon/bedsheet
-	name = "bedsheet"
-	desc = "A surprisingly soft linen bedsheet."
-	icon = 'icons/obj/bedsheets.dmi'
-	icon_state = "sheetwhite"
-	item_state = "bedsheet"
-	slot_flags = SLOT_NECK
-	layer = MOB_LAYER
-	throwforce = 0
-	throw_speed = 1
-	throw_range = 2
-	w_class = WEIGHT_CLASS_TINY
-	item_color = "white"
-	resistance_flags = FLAMMABLE
-
-	dog_fashion = /datum/dog_fashion/head/ghost
-
-/obj/item/weapon/bedsheet/attack(mob/living/M, mob/user)
-	if(!attempt_initiate_surgery(src, M, user))
-		..()
-
-/obj/item/weapon/bedsheet/attack_self(mob/user)
-	user.drop_item()
-	if(layer == initial(layer))
-		layer = ABOVE_MOB_LAYER
-		to_chat(user, "<span class='notice'>You cover yourself with [src].</span>")
-	else
-		layer = initial(layer)
-		to_chat(user, "<span class='notice'>You smooth [src] out beneath you.</span>")
-	add_fingerprint(user)
-	return
-
-/obj/item/weapon/bedsheet/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/wirecutters) || I.is_sharp())
-		var/obj/item/stack/sheet/cloth/C = new (get_turf(src), 3)
-		transfer_fingerprints_to(C)
-		C.add_fingerprint(user)
-		qdel(src)
-		to_chat(user, "<span class='notice'>You tear [src] up.</span>")
-	else
-		return ..()
-
-/obj/item/weapon/bedsheet/blue
-	icon_state = "sheetblue"
-	item_color = "blue"
-
-/obj/item/weapon/bedsheet/green
-	icon_state = "sheetgreen"
-	item_color = "green"
-
-/obj/item/weapon/bedsheet/orange
-	icon_state = "sheetorange"
-	item_color = "orange"
-
-/obj/item/weapon/bedsheet/purple
-	icon_state = "sheetpurple"
-	item_color = "purple"
-
-/obj/item/weapon/bedsheet/patriot
-	name = "patriotic bedsheet"
-	desc = "You've never felt more free than when sleeping on this."
-	icon_state = "sheetUSA"
-	item_color = "sheetUSA"
-
-/obj/item/weapon/bedsheet/rainbow
-	name = "rainbow bedsheet"
-	desc = "A multicolored blanket. It's actually several different sheets cut up and sewn together."
-	icon_state = "sheetrainbow"
-	item_color = "rainbow"
-
-/obj/item/weapon/bedsheet/red
-	icon_state = "sheetred"
-	item_color = "red"
-
-/obj/item/weapon/bedsheet/yellow
-	icon_state = "sheetyellow"
-	item_color = "yellow"
-
-/obj/item/weapon/bedsheet/mime
-	name = "mime's blanket"
-	desc = "A very soothing striped blanket.  All the noise just seems to fade out when you're under the covers in this."
-	icon_state = "sheetmime"
-	item_color = "mime"
-
-/obj/item/weapon/bedsheet/clown
-	name = "clown's blanket"
-	desc = "A rainbow blanket with a clown mask woven in. It smells faintly of bananas."
-	icon_state = "sheetclown"
-	item_color = "clown"
-
-/obj/item/weapon/bedsheet/captain
-	name = "captain's bedsheet"
-	desc = "It has a Nanotrasen symbol on it, and was woven with a revolutionary new kind of thread guaranteed to have 0.01% permeability for most non-chemical substances, popular among most modern captains."
-	icon_state = "sheetcaptain"
-	item_color = "captain"
-
-/obj/item/weapon/bedsheet/rd
-	name = "research director's bedsheet"
-	desc = "It appears to have a beaker emblem, and is made out of fire-resistant material, although it probably won't protect you in the event of fires you're familiar with every day."
-	icon_state = "sheetrd"
-	item_color = "director"
-
-// for Free Golems.
-/obj/item/weapon/bedsheet/rd/royal_cape
-	name = "Royal Cape of the Liberator"
-	desc = "Majestic."
-
-/obj/item/weapon/bedsheet/medical
-	name = "medical blanket"
-	desc = "It's a sterilized* blanket commonly used in the Medbay.  *Sterilization is voided if a virologist is present onboard the station."
-	icon_state = "sheetmedical"
-	item_color = "medical"
-
-/obj/item/weapon/bedsheet/cmo
-	name = "chief medical officer's bedsheet"
-	desc = "It's a sterilized blanket that has a cross emblem. There's some cat fur on it, likely from Runtime."
-	icon_state = "sheetcmo"
-	item_color = "cmo"
-
-/obj/item/weapon/bedsheet/hos
-	name = "head of security's bedsheet"
-	desc = "It is decorated with a shield emblem. While crime doesn't sleep, you do, but you are still THE LAW!"
-	icon_state = "sheethos"
-	item_color = "hosred"
-
-/obj/item/weapon/bedsheet/hop
-	name = "head of personnel's bedsheet"
-	desc = "It is decorated with a key emblem. For those rare moments when you can rest and cuddle with Ian without someone screaming for you over the radio."
-	icon_state = "sheethop"
-	item_color = "hop"
-
-/obj/item/weapon/bedsheet/ce
-	name = "chief engineer's bedsheet"
-	desc = "It is decorated with a wrench emblem. It's highly reflective and stain resistant, so you don't need to worry about ruining it with oil."
-	icon_state = "sheetce"
-	item_color = "chief"
-
-/obj/item/weapon/bedsheet/qm
-	name = "quartermaster's bedsheet"
-	desc = "It is decorated with a crate emblem in silver lining.  It's rather tough, and just the thing to lie on after a hard day of pushing paper."
-	icon_state = "sheetqm"
-	item_color = "qm"
-
-/obj/item/weapon/bedsheet/brown
-	icon_state = "sheetbrown"
-	item_color = "cargo"
-
-/obj/item/weapon/bedsheet/black
-	icon_state = "sheetblack"
-	item_color = "black"
-
-/obj/item/weapon/bedsheet/centcom
-	name = "\improper Centcom bedsheet"
-	desc = "Woven with advanced nanothread for warmth as well as being very decorated, essential for all officials."
-	icon_state = "sheetcentcom"
-	item_color = "centcom"
-
-/obj/item/weapon/bedsheet/syndie
-	name = "syndicate bedsheet"
-	desc = "It has a syndicate emblem and it has an aura of evil."
-	icon_state = "sheetsyndie"
-	item_color = "syndie"
-
-/obj/item/weapon/bedsheet/cult
-	name = "cultist's bedsheet"
-	desc = "You might dream of Nar'Sie if you sleep with this. It seems rather tattered and glows of an eldritch presence."
-	icon_state = "sheetcult"
-	item_color = "cult"
-
-/obj/item/weapon/bedsheet/wiz
-	name = "wizard's bedsheet"
-	desc = "A special fabric enchanted with magic so you can have an enchanted night. It even glows!"
-	icon_state = "sheetwiz"
-	item_color = "wiz"
-
-/obj/item/weapon/bedsheet/nanotrasen
-	name = "nanotrasen bedsheet"
-	desc = "It has the Nanotrasen logo on it and has an aura of duty."
-	icon_state = "sheetNT"
-	item_color = "nanotrasen"
-
-/obj/item/weapon/bedsheet/ian
-	icon_state = "sheetian"
-	item_color = "ian"
-
-
-/obj/item/weapon/bedsheet/random
-	icon_state = "sheetrainbow"
-	item_color = "rainbow"
-	name = "random bedsheet"
-	desc = "If you're reading this description ingame, something has gone wrong! Honk!"
-
-/obj/item/weapon/bedsheet/random/New()
-	var/obj/item/weapon/bedsheet/B = pick(subtypesof(/obj/item/weapon/bedsheet) - /obj/item/weapon/bedsheet/random)
-	name = initial(B.name)
-	desc = initial(B.desc)
-	icon_state = initial(B.icon_state)
-	item_state = initial(B.item_state)
-	item_color = initial(B.item_color)
-
-/obj/structure/bedsheetbin
-	name = "linen bin"
-	desc = "It looks rather cosy."
-	icon = 'icons/obj/structures.dmi'
-	icon_state = "linenbin-full"
-	anchored = 1
-	resistance_flags = FLAMMABLE
-	obj_integrity = 70
-	max_integrity = 70
-	var/amount = 10
-	var/list/sheets = list()
-	var/obj/item/hidden = null
-
-
-/obj/structure/bedsheetbin/examine(mob/user)
-	..()
-	if(amount < 1)
-		to_chat(user, "There are no bed sheets in the bin.")
-	else if(amount == 1)
-		to_chat(user, "There is one bed sheet in the bin.")
-	else
-		to_chat(user, "There are [amount] bed sheets in the bin.")
-
-
-/obj/structure/bedsheetbin/update_icon()
-	switch(amount)
-		if(0)
-			icon_state = "linenbin-empty"
-		if(1 to 5)
-			icon_state = "linenbin-half"
-		else
-			icon_state = "linenbin-full"
-
-/obj/structure/bedsheetbin/fire_act(exposed_temperature, exposed_volume)
-	if(amount)
-		amount = 0
-		update_icon()
-	..()
-
-/obj/structure/bedsheetbin/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/bedsheet))
-		if(!user.drop_item())
-			return
-		I.loc = src
-		sheets.Add(I)
-		amount++
-		to_chat(user, "<span class='notice'>You put [I] in [src].</span>")
-		update_icon()
-	else if(amount && !hidden && I.w_class < WEIGHT_CLASS_BULKY)	//make sure there's sheets to hide it among, make sure nothing else is hidden in there.
-		if(!user.drop_item())
-			to_chat(user, "<span class='warning'>\The [I] is stuck to your hand, you cannot hide it among the sheets!</span>")
-			return
-		I.loc = src
-		hidden = I
-		to_chat(user, "<span class='notice'>You hide [I] among the sheets.</span>")
-
-
-
-/obj/structure/bedsheetbin/attack_paw(mob/user)
-	return attack_hand(user)
-
-
-/obj/structure/bedsheetbin/attack_hand(mob/user)
-	if(user.lying)
-		return
-	if(amount >= 1)
-		amount--
-
-		var/obj/item/weapon/bedsheet/B
-		if(sheets.len > 0)
-			B = sheets[sheets.len]
-			sheets.Remove(B)
-
-		else
-			B = new /obj/item/weapon/bedsheet(loc)
-
-		B.loc = user.loc
-		user.put_in_hands(B)
-		to_chat(user, "<span class='notice'>You take [B] out of [src].</span>")
-		update_icon()
-
-		if(hidden)
-			hidden.loc = user.loc
-			to_chat(user, "<span class='notice'>[hidden] falls out of [B]!</span>")
-			hidden = null
-
-
-	add_fingerprint(user)
-/obj/structure/bedsheetbin/attack_tk(mob/user)
-	if(amount >= 1)
-		amount--
-
-		var/obj/item/weapon/bedsheet/B
-		if(sheets.len > 0)
-			B = sheets[sheets.len]
-			sheets.Remove(B)
-
-		else
-			B = new /obj/item/weapon/bedsheet(loc)
-
-		B.loc = loc
-		to_chat(user, "<span class='notice'>You telekinetically remove [B] from [src].</span>")
-		update_icon()
-
-		if(hidden)
-			hidden.loc = loc
-			hidden = null
-
-
-	add_fingerprint(user)
+/*
+CONTAINS:
+BEDSHEETS
+LINEN BINS
+*/
+
+/obj/item/weapon/bedsheet
+	name = "bedsheet"
+	desc = "A surprisingly soft linen bedsheet."
+	icon = 'icons/obj/bedsheets.dmi'
+	icon_state = "sheetwhite"
+	item_state = "bedsheet"
+	slot_flags = SLOT_NECK
+	layer = MOB_LAYER
+	throwforce = 0
+	throw_speed = 1
+	throw_range = 2
+	w_class = WEIGHT_CLASS_TINY
+	item_color = "white"
+	resistance_flags = FLAMMABLE
+
+	dog_fashion = /datum/dog_fashion/head/ghost
+
+/obj/item/weapon/bedsheet/attack(mob/living/M, mob/user)
+	if(!attempt_initiate_surgery(src, M, user))
+		..()
+
+/obj/item/weapon/bedsheet/attack_self(mob/user)
+	user.drop_item()
+	if(layer == initial(layer))
+		layer = ABOVE_MOB_LAYER
+		to_chat(user, "<span class='notice'>You cover yourself with [src].</span>")
+	else
+		layer = initial(layer)
+		to_chat(user, "<span class='notice'>You smooth [src] out beneath you.</span>")
+	add_fingerprint(user)
+	return
+
+/obj/item/weapon/bedsheet/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/weapon/wirecutters) || I.is_sharp())
+		var/obj/item/stack/sheet/cloth/C = new (get_turf(src), 3)
+		transfer_fingerprints_to(C)
+		C.add_fingerprint(user)
+		qdel(src)
+		to_chat(user, "<span class='notice'>You tear [src] up.</span>")
+	else
+		return ..()
+
+/obj/item/weapon/bedsheet/blue
+	icon_state = "sheetblue"
+	item_color = "blue"
+
+/obj/item/weapon/bedsheet/green
+	icon_state = "sheetgreen"
+	item_color = "green"
+
+/obj/item/weapon/bedsheet/orange
+	icon_state = "sheetorange"
+	item_color = "orange"
+
+/obj/item/weapon/bedsheet/purple
+	icon_state = "sheetpurple"
+	item_color = "purple"
+
+/obj/item/weapon/bedsheet/patriot
+	name = "patriotic bedsheet"
+	desc = "You've never felt more free than when sleeping on this."
+	icon_state = "sheetUSA"
+	item_color = "sheetUSA"
+
+/obj/item/weapon/bedsheet/rainbow
+	name = "rainbow bedsheet"
+	desc = "A multicolored blanket. It's actually several different sheets cut up and sewn together."
+	icon_state = "sheetrainbow"
+	item_color = "rainbow"
+
+/obj/item/weapon/bedsheet/red
+	icon_state = "sheetred"
+	item_color = "red"
+
+/obj/item/weapon/bedsheet/yellow
+	icon_state = "sheetyellow"
+	item_color = "yellow"
+
+/obj/item/weapon/bedsheet/mime
+	name = "mime's blanket"
+	desc = "A very soothing striped blanket.  All the noise just seems to fade out when you're under the covers in this."
+	icon_state = "sheetmime"
+	item_color = "mime"
+
+/obj/item/weapon/bedsheet/clown
+	name = "clown's blanket"
+	desc = "A rainbow blanket with a clown mask woven in. It smells faintly of bananas."
+	icon_state = "sheetclown"
+	item_color = "clown"
+
+/obj/item/weapon/bedsheet/captain
+	name = "captain's bedsheet"
+	desc = "It has a Nanotrasen symbol on it, and was woven with a revolutionary new kind of thread guaranteed to have 0.01% permeability for most non-chemical substances, popular among most modern captains."
+	icon_state = "sheetcaptain"
+	item_color = "captain"
+
+/obj/item/weapon/bedsheet/rd
+	name = "research director's bedsheet"
+	desc = "It appears to have a beaker emblem, and is made out of fire-resistant material, although it probably won't protect you in the event of fires you're familiar with every day."
+	icon_state = "sheetrd"
+	item_color = "director"
+
+// for Free Golems.
+/obj/item/weapon/bedsheet/rd/royal_cape
+	name = "Royal Cape of the Liberator"
+	desc = "Majestic."
+
+/obj/item/weapon/bedsheet/medical
+	name = "medical blanket"
+	desc = "It's a sterilized* blanket commonly used in the Medbay.  *Sterilization is voided if a virologist is present onboard the station."
+	icon_state = "sheetmedical"
+	item_color = "medical"
+
+/obj/item/weapon/bedsheet/cmo
+	name = "chief medical officer's bedsheet"
+	desc = "It's a sterilized blanket that has a cross emblem. There's some cat fur on it, likely from Runtime."
+	icon_state = "sheetcmo"
+	item_color = "cmo"
+
+/obj/item/weapon/bedsheet/hos
+	name = "head of security's bedsheet"
+	desc = "It is decorated with a shield emblem. While crime doesn't sleep, you do, but you are still THE LAW!"
+	icon_state = "sheethos"
+	item_color = "hosred"
+
+/obj/item/weapon/bedsheet/hop
+	name = "head of personnel's bedsheet"
+	desc = "It is decorated with a key emblem. For those rare moments when you can rest and cuddle with Ian without someone screaming for you over the radio."
+	icon_state = "sheethop"
+	item_color = "hop"
+
+/obj/item/weapon/bedsheet/ce
+	name = "chief engineer's bedsheet"
+	desc = "It is decorated with a wrench emblem. It's highly reflective and stain resistant, so you don't need to worry about ruining it with oil."
+	icon_state = "sheetce"
+	item_color = "chief"
+
+/obj/item/weapon/bedsheet/qm
+	name = "quartermaster's bedsheet"
+	desc = "It is decorated with a crate emblem in silver lining.  It's rather tough, and just the thing to lie on after a hard day of pushing paper."
+	icon_state = "sheetqm"
+	item_color = "qm"
+
+/obj/item/weapon/bedsheet/brown
+	icon_state = "sheetbrown"
+	item_color = "cargo"
+
+/obj/item/weapon/bedsheet/black
+	icon_state = "sheetblack"
+	item_color = "black"
+
+/obj/item/weapon/bedsheet/centcom
+	name = "\improper Centcom bedsheet"
+	desc = "Woven with advanced nanothread for warmth as well as being very decorated, essential for all officials."
+	icon_state = "sheetcentcom"
+	item_color = "centcom"
+
+/obj/item/weapon/bedsheet/syndie
+	name = "syndicate bedsheet"
+	desc = "It has a syndicate emblem and it has an aura of evil."
+	icon_state = "sheetsyndie"
+	item_color = "syndie"
+
+/obj/item/weapon/bedsheet/cult
+	name = "cultist's bedsheet"
+	desc = "You might dream of Nar'Sie if you sleep with this. It seems rather tattered and glows of an eldritch presence."
+	icon_state = "sheetcult"
+	item_color = "cult"
+
+/obj/item/weapon/bedsheet/wiz
+	name = "wizard's bedsheet"
+	desc = "A special fabric enchanted with magic so you can have an enchanted night. It even glows!"
+	icon_state = "sheetwiz"
+	item_color = "wiz"
+
+/obj/item/weapon/bedsheet/nanotrasen
+	name = "nanotrasen bedsheet"
+	desc = "It has the Nanotrasen logo on it and has an aura of duty."
+	icon_state = "sheetNT"
+	item_color = "nanotrasen"
+
+/obj/item/weapon/bedsheet/ian
+	icon_state = "sheetian"
+	item_color = "ian"
+
+
+/obj/item/weapon/bedsheet/random
+	icon_state = "sheetrainbow"
+	item_color = "rainbow"
+	name = "random bedsheet"
+	desc = "If you're reading this description ingame, something has gone wrong! Honk!"
+
+/obj/item/weapon/bedsheet/random/New()
+	var/obj/item/weapon/bedsheet/B = pick(subtypesof(/obj/item/weapon/bedsheet) - /obj/item/weapon/bedsheet/random)
+	name = initial(B.name)
+	desc = initial(B.desc)
+	icon_state = initial(B.icon_state)
+	item_state = initial(B.item_state)
+	item_color = initial(B.item_color)
+
+/obj/structure/bedsheetbin
+	name = "linen bin"
+	desc = "It looks rather cosy."
+	icon = 'icons/obj/structures.dmi'
+	icon_state = "linenbin-full"
+	anchored = 1
+	resistance_flags = FLAMMABLE
+	obj_integrity = 70
+	max_integrity = 70
+	var/amount = 10
+	var/list/sheets = list()
+	var/obj/item/hidden = null
+
+
+/obj/structure/bedsheetbin/examine(mob/user)
+	..()
+	if(amount < 1)
+		to_chat(user, "There are no bed sheets in the bin.")
+	else if(amount == 1)
+		to_chat(user, "There is one bed sheet in the bin.")
+	else
+		to_chat(user, "There are [amount] bed sheets in the bin.")
+
+
+/obj/structure/bedsheetbin/update_icon()
+	switch(amount)
+		if(0)
+			icon_state = "linenbin-empty"
+		if(1 to 5)
+			icon_state = "linenbin-half"
+		else
+			icon_state = "linenbin-full"
+
+/obj/structure/bedsheetbin/fire_act(exposed_temperature, exposed_volume)
+	if(amount)
+		amount = 0
+		update_icon()
+	..()
+
+/obj/structure/bedsheetbin/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/weapon/bedsheet))
+		if(!user.drop_item())
+			return
+		I.loc = src
+		sheets.Add(I)
+		amount++
+		to_chat(user, "<span class='notice'>You put [I] in [src].</span>")
+		update_icon()
+	else if(amount && !hidden && I.w_class < WEIGHT_CLASS_BULKY)	//make sure there's sheets to hide it among, make sure nothing else is hidden in there.
+		if(!user.drop_item())
+			to_chat(user, "<span class='warning'>\The [I] is stuck to your hand, you cannot hide it among the sheets!</span>")
+			return
+		I.loc = src
+		hidden = I
+		to_chat(user, "<span class='notice'>You hide [I] among the sheets.</span>")
+
+
+
+/obj/structure/bedsheetbin/attack_paw(mob/user)
+	return attack_hand(user)
+
+
+/obj/structure/bedsheetbin/attack_hand(mob/user)
+	if(user.lying)
+		return
+	if(amount >= 1)
+		amount--
+
+		var/obj/item/weapon/bedsheet/B
+		if(sheets.len > 0)
+			B = sheets[sheets.len]
+			sheets.Remove(B)
+
+		else
+			B = new /obj/item/weapon/bedsheet(loc)
+
+		B.loc = user.loc
+		user.put_in_hands(B)
+		to_chat(user, "<span class='notice'>You take [B] out of [src].</span>")
+		update_icon()
+
+		if(hidden)
+			hidden.loc = user.loc
+			to_chat(user, "<span class='notice'>[hidden] falls out of [B]!</span>")
+			hidden = null
+
+
+	add_fingerprint(user)
+/obj/structure/bedsheetbin/attack_tk(mob/user)
+	if(amount >= 1)
+		amount--
+
+		var/obj/item/weapon/bedsheet/B
+		if(sheets.len > 0)
+			B = sheets[sheets.len]
+			sheets.Remove(B)
+
+		else
+			B = new /obj/item/weapon/bedsheet(loc)
+
+		B.loc = loc
+		to_chat(user, "<span class='notice'>You telekinetically remove [B] from [src].</span>")
+		update_icon()
+
+		if(hidden)
+			hidden.loc = loc
+			hidden = null
+
+
+	add_fingerprint(user)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -1,283 +1,283 @@
-/obj/structure/closet/secure_closet/captains
-	name = "\proper captain's locker"
-	req_access = list(GLOB.access_captain)
-	icon_state = "cap"
-
-/obj/structure/closet/secure_closet/captains/PopulateContents()
-	..()
-	new /obj/item/clothing/suit/hooded/wintercoat/captain(src)
-	if(prob(50))
-		new /obj/item/weapon/storage/backpack/captain(src)
-	else
-		new /obj/item/weapon/storage/backpack/satchel/cap(src)
-	new /obj/item/clothing/neck/cloak/cap(src)
-	new /obj/item/weapon/storage/daki(src) 
-	new /obj/item/weapon/storage/backpack/dufflebag/captain(src)
-	new /obj/item/clothing/head/crown/fancy(src)
-	new /obj/item/clothing/suit/captunic(src)
-	new /obj/item/clothing/under/captainparade(src)
-	new /obj/item/clothing/head/caphat/parade(src)
-	new /obj/item/clothing/under/rank/captain(src)
-	new /obj/item/clothing/suit/armor/vest/capcarapace/alt(src)
-	new /obj/item/weapon/cartridge/captain(src)
-	new /obj/item/clothing/shoes/sneakers/brown(src)
-	new /obj/item/weapon/storage/box/silver_ids(src)
-	new /obj/item/device/radio/headset/heads/captain/alt(src)
-	new /obj/item/device/radio/headset/heads/captain(src)
-	new /obj/item/clothing/glasses/sunglasses/gar/supergar(src)
-	new /obj/item/clothing/gloves/color/captain(src)
-	new /obj/item/weapon/restraints/handcuffs/cable/zipties(src)
-	new /obj/item/weapon/storage/belt/sabre(src)
-	new /obj/item/weapon/gun/energy/e_gun(src)
-	new /obj/item/weapon/door_remote/captain(src)
-
-/obj/structure/closet/secure_closet/hop
-	name = "\proper head of personnel's locker"
-	req_access = list(GLOB.access_hop)
-	icon_state = "hop"
-
-/obj/structure/closet/secure_closet/hop/PopulateContents()
-	..()
-	new /obj/item/clothing/neck/cloak/hop(src)
-	new /obj/item/clothing/under/rank/head_of_personnel(src)
-	new /obj/item/clothing/head/hopcap(src)
-	new /obj/item/weapon/cartridge/hop(src)
-	new /obj/item/device/radio/headset/heads/hop(src)
-	new /obj/item/clothing/shoes/sneakers/brown(src)
-	new /obj/item/weapon/storage/box/ids(src)
-	new /obj/item/weapon/storage/box/ids(src)
-	new /obj/item/device/megaphone/command(src)
-	new /obj/item/clothing/suit/armor/vest/alt(src)
-	new /obj/item/device/assembly/flash/handheld(src)
-	new /obj/item/clothing/glasses/sunglasses(src)
-	new /obj/item/weapon/restraints/handcuffs/cable/zipties(src)
-	new /obj/item/weapon/gun/energy/e_gun(src)
-	new /obj/item/clothing/neck/petcollar(src)
-	new /obj/item/weapon/door_remote/civillian(src)
-
-/obj/structure/closet/secure_closet/hos
-	name = "\proper head of security's locker"
-	req_access = list(GLOB.access_hos)
-	icon_state = "hos"
-
-/obj/structure/closet/secure_closet/hos/PopulateContents()
-	..()
-	new /obj/item/clothing/neck/cloak/hos(src)
-	new /obj/item/weapon/cartridge/hos(src)
-	new /obj/item/device/radio/headset/heads/hos(src)
-	new /obj/item/clothing/under/hosparadefem(src)
-	new /obj/item/clothing/under/hosparademale(src)
-	new /obj/item/clothing/suit/armor/vest/leather(src)
-	new /obj/item/clothing/suit/armor/hos(src)
-	new /obj/item/clothing/under/rank/head_of_security/alt(src)
-	new /obj/item/clothing/head/HoS(src)
-	new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src)
-	new /obj/item/clothing/glasses/hud/security/sunglasses/gars/supergars(src)
-	new /obj/item/device/megaphone/sec(src)
-	new /obj/item/weapon/holosign_creator/security(src)
-	new /obj/item/weapon/storage/lockbox/loyalty(src)
-	new /obj/item/clothing/mask/gas/sechailer/swat(src)
-	new /obj/item/weapon/storage/box/flashbangs(src)
-	new /obj/item/weapon/shield/riot/tele(src)
-	new /obj/item/weapon/storage/belt/security/full(src)
-	new /obj/item/weapon/gun/energy/e_gun/hos(src)
-	new /obj/item/device/flashlight/seclite(src)
-	new /obj/item/weapon/pinpointer(src)
-
-/obj/structure/closet/secure_closet/warden
-	name = "\proper warden's locker"
-	req_access = list(GLOB.access_armory)
-	icon_state = "warden"
-
-/obj/structure/closet/secure_closet/warden/PopulateContents()
-	..()
-	new /obj/item/device/radio/headset/headset_sec(src)
-	new /obj/item/clothing/suit/armor/vest/warden(src)
-	new /obj/item/clothing/head/warden(src)
-	new /obj/item/clothing/head/beret/sec/navywarden(src)
-	new /obj/item/clothing/suit/armor/vest/warden/alt(src)
-	new /obj/item/clothing/under/rank/warden/navyblue(src)
-	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
-	new /obj/item/weapon/holosign_creator/security(src)
-	new /obj/item/clothing/mask/gas/sechailer(src)
-	new /obj/item/weapon/storage/box/zipties(src)
-	new /obj/item/weapon/storage/box/flashbangs(src)
-	new /obj/item/weapon/storage/belt/security/full(src)
-	new /obj/item/device/flashlight/seclite(src)
-	new /obj/item/clothing/gloves/krav_maga/sec(src)
-	new /obj/item/weapon/door_remote/head_of_security(src)
-	new /obj/item/weapon/gun/ballistic/shotgun/automatic/dual_tube(src)
-
-/obj/structure/closet/secure_closet/security
-	name = "security officer's locker"
-	req_access = list(GLOB.access_security)
-	icon_state = "sec"
-
-/obj/structure/closet/secure_closet/security/PopulateContents()
-	..()
-	new /obj/item/clothing/suit/armor/vest(src)
-	new /obj/item/clothing/head/helmet/sec(src)
-	new /obj/item/device/radio/headset/headset_sec(src)
-	new /obj/item/device/radio/headset/headset_sec/alt(src)
-	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
-	new /obj/item/device/flashlight/seclite(src)
-
-/obj/structure/closet/secure_closet/security/sec
-
-/obj/structure/closet/secure_closet/security/sec/PopulateContents()
-	..()
-	new /obj/item/weapon/storage/belt/security/full(src)
-
-/obj/structure/closet/secure_closet/security/cargo
-
-/obj/structure/closet/secure_closet/security/cargo/PopulateContents()
-	..()
-	new /obj/item/clothing/tie/armband/cargo(src)
-	new /obj/item/device/encryptionkey/headset_cargo(src)
-
-/obj/structure/closet/secure_closet/security/engine
-
-/obj/structure/closet/secure_closet/security/engine/PopulateContents()
-	..()
-	new /obj/item/clothing/tie/armband/engine(src)
-	new /obj/item/device/encryptionkey/headset_eng(src)
-
-/obj/structure/closet/secure_closet/security/science
-
-/obj/structure/closet/secure_closet/security/science/PopulateContents()
-	..()
-	new /obj/item/clothing/tie/armband/science(src)
-	new /obj/item/device/encryptionkey/headset_sci(src)
-
-/obj/structure/closet/secure_closet/security/med
-
-/obj/structure/closet/secure_closet/security/med/PopulateContents()
-	..()
-	new /obj/item/clothing/tie/armband/medblue(src)
-	new /obj/item/device/encryptionkey/headset_med(src)
-
-/obj/structure/closet/secure_closet/detective
-	name = "\proper detective's cabinet"
-	req_access = list(GLOB.access_forensics_lockers)
-	icon_state = "cabinet"
-	resistance_flags = FLAMMABLE
-	obj_integrity = 70
-	max_integrity = 70
-
-/obj/structure/closet/secure_closet/detective/PopulateContents()
-	..()
-	new /obj/item/clothing/under/rank/det(src)
-	new /obj/item/clothing/suit/det_suit(src)
-	new /obj/item/clothing/head/det_hat(src)
-	new /obj/item/clothing/gloves/color/black(src)
-	new /obj/item/clothing/under/rank/det/grey(src)
-	new /obj/item/clothing/tie/waistcoat(src)
-	new /obj/item/clothing/suit/det_suit/grey(src)
-	new /obj/item/clothing/head/fedora(src)
-	new /obj/item/clothing/shoes/laceup(src)
-	new /obj/item/weapon/storage/box/evidence(src)
-	new /obj/item/device/radio/headset/headset_sec(src)
-	new /obj/item/device/detective_scanner(src)
-	new /obj/item/device/flashlight/seclite(src)
-	new /obj/item/weapon/holosign_creator/security(src)
-	new /obj/item/weapon/reagent_containers/spray/pepper(src)
-	new /obj/item/clothing/suit/armor/vest/det_suit(src)
-	new /obj/item/weapon/storage/belt/holster/full(src)
-
-/obj/structure/closet/secure_closet/injection
-	name = "lethal injections"
-	req_access = list(GLOB.access_hos)
-
-/obj/structure/closet/secure_closet/injection/PopulateContents()
-	..()
-	for(var/i in 1 to 5)
-		new /obj/item/weapon/reagent_containers/syringe/lethal/execution(src)
-
-/obj/structure/closet/secure_closet/brig
-	name = "brig locker"
-	req_access = list(GLOB.access_brig)
-	anchored = 1
-	var/id = null
-
-/obj/structure/closet/secure_closet/brig/PopulateContents()
-	..()
-	new /obj/item/clothing/under/rank/prisoner( src )
-	new /obj/item/clothing/shoes/sneakers/orange( src )
-
-/obj/structure/closet/secure_closet/courtroom
-	name = "courtroom locker"
-	req_access = list(GLOB.access_court)
-
-/obj/structure/closet/secure_closet/courtroom/PopulateContents()
-	..()
-	new /obj/item/clothing/shoes/sneakers/brown(src)
-	for(var/i in 1 to 3)
-		new /obj/item/weapon/paper/Court (src)
-	new /obj/item/weapon/pen (src)
-	new /obj/item/clothing/suit/judgerobe (src)
-	new /obj/item/clothing/head/powdered_wig (src)
-	new /obj/item/weapon/storage/briefcase(src)
-
-/obj/structure/closet/secure_closet/armory1
-	name = "armory armor locker"
-	req_access = list(GLOB.access_armory)
-	icon_state = "armory"
-
-/obj/structure/closet/secure_closet/armory1/PopulateContents()
-	..()
-	new /obj/item/clothing/suit/armor/laserproof(src)
-	for(var/i in 1 to 3)
-		new /obj/item/clothing/suit/armor/riot(src)
-	for(var/i in 1 to 3)
-		new /obj/item/clothing/head/helmet/riot(src)
-	for(var/i in 1 to 3)
-		new /obj/item/weapon/shield/riot(src)
-
-/obj/structure/closet/secure_closet/armory2
-	name = "armory ballistics locker"
-	req_access = list(GLOB.access_armory)
-	icon_state = "armory"
-
-/obj/structure/closet/secure_closet/armory2/PopulateContents()
-	..()
-	new /obj/item/weapon/storage/box/firingpins(src)
-	for(var/i in 1 to 3)
-		new /obj/item/weapon/storage/box/rubbershot(src)
-	for(var/i in 1 to 3)
-		new /obj/item/weapon/gun/ballistic/shotgun/riot(src)
-
-/obj/structure/closet/secure_closet/armory3
-	name = "armory energy gun locker"
-	req_access = list(GLOB.access_armory)
-	icon_state = "armory"
-
-/obj/structure/closet/secure_closet/armory3/PopulateContents()
-	..()
-	new /obj/item/weapon/storage/box/firingpins(src)
-	new /obj/item/weapon/gun/energy/ionrifle(src)
-	for(var/i in 1 to 3)
-		new /obj/item/weapon/gun/energy/e_gun(src)
-	for(var/i in 1 to 3)
-		new /obj/item/weapon/gun/energy/laser(src)
-
-/obj/structure/closet/secure_closet/tac
-	name = "armory tac locker"
-	req_access = list(GLOB.access_armory)
-	icon_state = "tac"
-
-/obj/structure/closet/secure_closet/tac/PopulateContents()
-	..()
-	new /obj/item/weapon/gun/ballistic/automatic/wt550(src)
-	new /obj/item/clothing/head/helmet/alt(src)
-	new /obj/item/clothing/mask/gas/sechailer(src)
-	new /obj/item/clothing/suit/armor/bulletproof(src)
-
-/obj/structure/closet/secure_closet/lethalshots
-	name = "shotgun lethal rounds"
-	req_access = list(GLOB.access_armory)
-	icon_state = "tac"
-
-/obj/structure/closet/secure_closet/lethalshots/PopulateContents()
-	..()
-	for(var/i in 1 to 3)
-		new /obj/item/weapon/storage/box/lethalshot(src)
+/obj/structure/closet/secure_closet/captains
+	name = "\proper captain's locker"
+	req_access = list(GLOB.access_captain)
+	icon_state = "cap"
+
+/obj/structure/closet/secure_closet/captains/PopulateContents()
+	..()
+	new /obj/item/clothing/suit/hooded/wintercoat/captain(src)
+	if(prob(50))
+		new /obj/item/weapon/storage/backpack/captain(src)
+	else
+		new /obj/item/weapon/storage/backpack/satchel/cap(src)
+	new /obj/item/clothing/neck/cloak/cap(src)
+	new /obj/item/weapon/storage/daki(src) 
+	new /obj/item/weapon/storage/backpack/dufflebag/captain(src)
+	new /obj/item/clothing/head/crown/fancy(src)
+	new /obj/item/clothing/suit/captunic(src)
+	new /obj/item/clothing/under/captainparade(src)
+	new /obj/item/clothing/head/caphat/parade(src)
+	new /obj/item/clothing/under/rank/captain(src)
+	new /obj/item/clothing/suit/armor/vest/capcarapace/alt(src)
+	new /obj/item/weapon/cartridge/captain(src)
+	new /obj/item/clothing/shoes/sneakers/brown(src)
+	new /obj/item/weapon/storage/box/silver_ids(src)
+	new /obj/item/device/radio/headset/heads/captain/alt(src)
+	new /obj/item/device/radio/headset/heads/captain(src)
+	new /obj/item/clothing/glasses/sunglasses/gar/supergar(src)
+	new /obj/item/clothing/gloves/color/captain(src)
+	new /obj/item/weapon/restraints/handcuffs/cable/zipties(src)
+	new /obj/item/weapon/storage/belt/sabre(src)
+	new /obj/item/weapon/gun/energy/e_gun(src)
+	new /obj/item/weapon/door_remote/captain(src)
+
+/obj/structure/closet/secure_closet/hop
+	name = "\proper head of personnel's locker"
+	req_access = list(GLOB.access_hop)
+	icon_state = "hop"
+
+/obj/structure/closet/secure_closet/hop/PopulateContents()
+	..()
+	new /obj/item/clothing/neck/cloak/hop(src)
+	new /obj/item/clothing/under/rank/head_of_personnel(src)
+	new /obj/item/clothing/head/hopcap(src)
+	new /obj/item/weapon/cartridge/hop(src)
+	new /obj/item/device/radio/headset/heads/hop(src)
+	new /obj/item/clothing/shoes/sneakers/brown(src)
+	new /obj/item/weapon/storage/box/ids(src)
+	new /obj/item/weapon/storage/box/ids(src)
+	new /obj/item/device/megaphone/command(src)
+	new /obj/item/clothing/suit/armor/vest/alt(src)
+	new /obj/item/device/assembly/flash/handheld(src)
+	new /obj/item/clothing/glasses/sunglasses(src)
+	new /obj/item/weapon/restraints/handcuffs/cable/zipties(src)
+	new /obj/item/weapon/gun/energy/e_gun(src)
+	new /obj/item/clothing/neck/petcollar(src)
+	new /obj/item/weapon/door_remote/civillian(src)
+
+/obj/structure/closet/secure_closet/hos
+	name = "\proper head of security's locker"
+	req_access = list(GLOB.access_hos)
+	icon_state = "hos"
+
+/obj/structure/closet/secure_closet/hos/PopulateContents()
+	..()
+	new /obj/item/clothing/neck/cloak/hos(src)
+	new /obj/item/weapon/cartridge/hos(src)
+	new /obj/item/device/radio/headset/heads/hos(src)
+	new /obj/item/clothing/under/hosparadefem(src)
+	new /obj/item/clothing/under/hosparademale(src)
+	new /obj/item/clothing/suit/armor/vest/leather(src)
+	new /obj/item/clothing/suit/armor/hos(src)
+	new /obj/item/clothing/under/rank/head_of_security/alt(src)
+	new /obj/item/clothing/head/HoS(src)
+	new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src)
+	new /obj/item/clothing/glasses/hud/security/sunglasses/gars/supergars(src)
+	new /obj/item/device/megaphone/sec(src)
+	new /obj/item/weapon/holosign_creator/security(src)
+	new /obj/item/weapon/storage/lockbox/loyalty(src)
+	new /obj/item/clothing/mask/gas/sechailer/swat(src)
+	new /obj/item/weapon/storage/box/flashbangs(src)
+	new /obj/item/weapon/shield/riot/tele(src)
+	new /obj/item/weapon/storage/belt/security/full(src)
+	new /obj/item/weapon/gun/energy/e_gun/hos(src)
+	new /obj/item/device/flashlight/seclite(src)
+	new /obj/item/weapon/pinpointer(src)
+
+/obj/structure/closet/secure_closet/warden
+	name = "\proper warden's locker"
+	req_access = list(GLOB.access_armory)
+	icon_state = "warden"
+
+/obj/structure/closet/secure_closet/warden/PopulateContents()
+	..()
+	new /obj/item/device/radio/headset/headset_sec(src)
+	new /obj/item/clothing/suit/armor/vest/warden(src)
+	new /obj/item/clothing/head/warden(src)
+	new /obj/item/clothing/head/beret/sec/navywarden(src)
+	new /obj/item/clothing/suit/armor/vest/warden/alt(src)
+	new /obj/item/clothing/under/rank/warden/navyblue(src)
+	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
+	new /obj/item/weapon/holosign_creator/security(src)
+	new /obj/item/clothing/mask/gas/sechailer(src)
+	new /obj/item/weapon/storage/box/zipties(src)
+	new /obj/item/weapon/storage/box/flashbangs(src)
+	new /obj/item/weapon/storage/belt/security/full(src)
+	new /obj/item/device/flashlight/seclite(src)
+	new /obj/item/clothing/gloves/krav_maga/sec(src)
+	new /obj/item/weapon/door_remote/head_of_security(src)
+	new /obj/item/weapon/gun/ballistic/shotgun/automatic/dual_tube(src)
+
+/obj/structure/closet/secure_closet/security
+	name = "security officer's locker"
+	req_access = list(GLOB.access_security)
+	icon_state = "sec"
+
+/obj/structure/closet/secure_closet/security/PopulateContents()
+	..()
+	new /obj/item/clothing/suit/armor/vest(src)
+	new /obj/item/clothing/head/helmet/sec(src)
+	new /obj/item/device/radio/headset/headset_sec(src)
+	new /obj/item/device/radio/headset/headset_sec/alt(src)
+	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
+	new /obj/item/device/flashlight/seclite(src)
+
+/obj/structure/closet/secure_closet/security/sec
+
+/obj/structure/closet/secure_closet/security/sec/PopulateContents()
+	..()
+	new /obj/item/weapon/storage/belt/security/full(src)
+
+/obj/structure/closet/secure_closet/security/cargo
+
+/obj/structure/closet/secure_closet/security/cargo/PopulateContents()
+	..()
+	new /obj/item/clothing/tie/armband/cargo(src)
+	new /obj/item/device/encryptionkey/headset_cargo(src)
+
+/obj/structure/closet/secure_closet/security/engine
+
+/obj/structure/closet/secure_closet/security/engine/PopulateContents()
+	..()
+	new /obj/item/clothing/tie/armband/engine(src)
+	new /obj/item/device/encryptionkey/headset_eng(src)
+
+/obj/structure/closet/secure_closet/security/science
+
+/obj/structure/closet/secure_closet/security/science/PopulateContents()
+	..()
+	new /obj/item/clothing/tie/armband/science(src)
+	new /obj/item/device/encryptionkey/headset_sci(src)
+
+/obj/structure/closet/secure_closet/security/med
+
+/obj/structure/closet/secure_closet/security/med/PopulateContents()
+	..()
+	new /obj/item/clothing/tie/armband/medblue(src)
+	new /obj/item/device/encryptionkey/headset_med(src)
+
+/obj/structure/closet/secure_closet/detective
+	name = "\proper detective's cabinet"
+	req_access = list(GLOB.access_forensics_lockers)
+	icon_state = "cabinet"
+	resistance_flags = FLAMMABLE
+	obj_integrity = 70
+	max_integrity = 70
+
+/obj/structure/closet/secure_closet/detective/PopulateContents()
+	..()
+	new /obj/item/clothing/under/rank/det(src)
+	new /obj/item/clothing/suit/det_suit(src)
+	new /obj/item/clothing/head/det_hat(src)
+	new /obj/item/clothing/gloves/color/black(src)
+	new /obj/item/clothing/under/rank/det/grey(src)
+	new /obj/item/clothing/tie/waistcoat(src)
+	new /obj/item/clothing/suit/det_suit/grey(src)
+	new /obj/item/clothing/head/fedora(src)
+	new /obj/item/clothing/shoes/laceup(src)
+	new /obj/item/weapon/storage/box/evidence(src)
+	new /obj/item/device/radio/headset/headset_sec(src)
+	new /obj/item/device/detective_scanner(src)
+	new /obj/item/device/flashlight/seclite(src)
+	new /obj/item/weapon/holosign_creator/security(src)
+	new /obj/item/weapon/reagent_containers/spray/pepper(src)
+	new /obj/item/clothing/suit/armor/vest/det_suit(src)
+	new /obj/item/weapon/storage/belt/holster/full(src)
+
+/obj/structure/closet/secure_closet/injection
+	name = "lethal injections"
+	req_access = list(GLOB.access_hos)
+
+/obj/structure/closet/secure_closet/injection/PopulateContents()
+	..()
+	for(var/i in 1 to 5)
+		new /obj/item/weapon/reagent_containers/syringe/lethal/execution(src)
+
+/obj/structure/closet/secure_closet/brig
+	name = "brig locker"
+	req_access = list(GLOB.access_brig)
+	anchored = 1
+	var/id = null
+
+/obj/structure/closet/secure_closet/brig/PopulateContents()
+	..()
+	new /obj/item/clothing/under/rank/prisoner( src )
+	new /obj/item/clothing/shoes/sneakers/orange( src )
+
+/obj/structure/closet/secure_closet/courtroom
+	name = "courtroom locker"
+	req_access = list(GLOB.access_court)
+
+/obj/structure/closet/secure_closet/courtroom/PopulateContents()
+	..()
+	new /obj/item/clothing/shoes/sneakers/brown(src)
+	for(var/i in 1 to 3)
+		new /obj/item/weapon/paper/Court (src)
+	new /obj/item/weapon/pen (src)
+	new /obj/item/clothing/suit/judgerobe (src)
+	new /obj/item/clothing/head/powdered_wig (src)
+	new /obj/item/weapon/storage/briefcase(src)
+
+/obj/structure/closet/secure_closet/armory1
+	name = "armory armor locker"
+	req_access = list(GLOB.access_armory)
+	icon_state = "armory"
+
+/obj/structure/closet/secure_closet/armory1/PopulateContents()
+	..()
+	new /obj/item/clothing/suit/armor/laserproof(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/suit/armor/riot(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/head/helmet/riot(src)
+	for(var/i in 1 to 3)
+		new /obj/item/weapon/shield/riot(src)
+
+/obj/structure/closet/secure_closet/armory2
+	name = "armory ballistics locker"
+	req_access = list(GLOB.access_armory)
+	icon_state = "armory"
+
+/obj/structure/closet/secure_closet/armory2/PopulateContents()
+	..()
+	new /obj/item/weapon/storage/box/firingpins(src)
+	for(var/i in 1 to 3)
+		new /obj/item/weapon/storage/box/rubbershot(src)
+	for(var/i in 1 to 3)
+		new /obj/item/weapon/gun/ballistic/shotgun/riot(src)
+
+/obj/structure/closet/secure_closet/armory3
+	name = "armory energy gun locker"
+	req_access = list(GLOB.access_armory)
+	icon_state = "armory"
+
+/obj/structure/closet/secure_closet/armory3/PopulateContents()
+	..()
+	new /obj/item/weapon/storage/box/firingpins(src)
+	new /obj/item/weapon/gun/energy/ionrifle(src)
+	for(var/i in 1 to 3)
+		new /obj/item/weapon/gun/energy/e_gun(src)
+	for(var/i in 1 to 3)
+		new /obj/item/weapon/gun/energy/laser(src)
+
+/obj/structure/closet/secure_closet/tac
+	name = "armory tac locker"
+	req_access = list(GLOB.access_armory)
+	icon_state = "tac"
+
+/obj/structure/closet/secure_closet/tac/PopulateContents()
+	..()
+	new /obj/item/weapon/gun/ballistic/automatic/wt550(src)
+	new /obj/item/clothing/head/helmet/alt(src)
+	new /obj/item/clothing/mask/gas/sechailer(src)
+	new /obj/item/clothing/suit/armor/bulletproof(src)
+
+/obj/structure/closet/secure_closet/lethalshots
+	name = "shotgun lethal rounds"
+	req_access = list(GLOB.access_armory)
+	icon_state = "tac"
+
+/obj/structure/closet/secure_closet/lethalshots/PopulateContents()
+	..()
+	for(var/i in 1 to 3)
+		new /obj/item/weapon/storage/box/lethalshot(src)

code/game/objects/structures/mineral_doors.dm

@@ -1,221 +1,221 @@
-//NOT using the existing /obj/machinery/door type, since that has some complications on its own, mainly based on its
-//machineryness
-
-/obj/structure/mineral_door
-	name = "metal door"
-	density = 1
-	anchored = 1
-	opacity = 1
-
-	icon = 'icons/obj/doors/mineral_doors.dmi'
-	icon_state = "metal"
-
-	var/initial_state
-	var/state = 0 //closed, 1 == open
-	var/isSwitchingStates = 0
-	var/close_delay = -1 //-1 if does not auto close.
-	obj_integrity = 200
-	max_integrity = 200
-	armor = list(melee = 10, bullet = 0, laser = 0, energy = 100, bomb = 10, bio = 100, rad = 100, fire = 50, acid = 50)
-	var/sheetType = /obj/item/stack/sheet/metal
-	var/sheetAmount = 7
-	var/openSound = 'sound/effects/stonedoor_openclose.ogg'
-	var/closeSound = 'sound/effects/stonedoor_openclose.ogg'
-	CanAtmosPass = ATMOS_PASS_DENSITY
-
-/obj/structure/mineral_door/New(location)
-	..()
-	initial_state = icon_state
-	air_update_turf(1)
-
-/obj/structure/mineral_door/Destroy()
-	density = 0
-	air_update_turf(1)
-	return ..()
-
-/obj/structure/mineral_door/Move()
-	var/turf/T = loc
-	..()
-	move_update_air(T)
-
-/obj/structure/mineral_door/Bumped(atom/user)
-	..()
-	if(!state)
-		return TryToSwitchState(user)
-
-/obj/structure/mineral_door/attack_ai(mob/user) //those aren't machinery, they're just big fucking slabs of a mineral
-	if(isAI(user)) //so the AI can't open it
-		return
-	else if(iscyborg(user)) //but cyborgs can
-		if(get_dist(user,src) <= 1) //not remotely though
-			return TryToSwitchState(user)
-
-/obj/structure/mineral_door/attack_paw(mob/user)
-	return TryToSwitchState(user)
-
-/obj/structure/mineral_door/attack_hand(mob/user)
-	return TryToSwitchState(user)
-
-/obj/structure/mineral_door/CanPass(atom/movable/mover, turf/target, height=0)
-	if(istype(mover, /obj/effect/beam))
-		return !opacity
-	return !density
-
-/obj/structure/mineral_door/proc/TryToSwitchState(atom/user)
-	if(isSwitchingStates)
-		return
-	if(isliving(user))
-		var/mob/living/M = user
-		if(world.time - M.last_bumped <= 60)
-			return //NOTE do we really need that?
-		if(M.client)
-			if(iscarbon(M))
-				var/mob/living/carbon/C = M
-				if(!C.handcuffed)
-					SwitchState()
-			else
-				SwitchState()
-	else if(istype(user, /obj/mecha))
-		SwitchState()
-
-/obj/structure/mineral_door/proc/SwitchState()
-	if(state)
-		Close()
-	else
-		Open()
-
-/obj/structure/mineral_door/proc/Open()
-	isSwitchingStates = 1
-	playsound(loc, openSound, 100, 1)
-	flick("[initial_state]opening",src)
-	sleep(10)
-	density = 0
-	opacity = 0
-	state = 1
-	air_update_turf(1)
-	update_icon()
-	isSwitchingStates = 0
-
-	if(close_delay != -1)
-		addtimer(CALLBACK(src, .proc/Close), close_delay)
-
-/obj/structure/mineral_door/proc/Close()
-	if(isSwitchingStates || state != 1)
-		return
-	var/turf/T = get_turf(src)
-	for(var/mob/living/L in T)
-		return
-	isSwitchingStates = 1
-	playsound(loc, closeSound, 100, 1)
-	flick("[initial_state]closing",src)
-	sleep(10)
-	density = 1
-	opacity = 1
-	state = 0
-	air_update_turf(1)
-	update_icon()
-	isSwitchingStates = 0
-
-/obj/structure/mineral_door/update_icon()
-	if(state)
-		icon_state = "[initial_state]open"
-	else
-		icon_state = initial_state
-
-/obj/structure/mineral_door/attackby(obj/item/weapon/W, mob/user, params)
-	if(istype(W,/obj/item/weapon/pickaxe))
-		var/obj/item/weapon/pickaxe/digTool = W
-		to_chat(user, "<span class='notice'>You start digging the [name]...</span>")
-		if(do_after(user,digTool.digspeed*(1+round(max_integrity*0.01)), target = src) && src)
-			to_chat(user, "<span class='notice'>You finish digging.</span>")
-			deconstruct(TRUE)
-	else if(user.a_intent != INTENT_HARM)
-		attack_hand(user)
-	else
-		return ..()
-
-/obj/structure/mineral_door/deconstruct(disassembled = TRUE)
-	var/turf/T = get_turf(src)
-	if(disassembled)
-		new sheetType(T, sheetAmount)
-	else
-		new sheetType(T, max(sheetAmount - 2, 1))
-	qdel(src)
-
-/obj/structure/mineral_door/iron
-	name = "iron door"
-	obj_integrity = 300
-	max_integrity = 300
-
-/obj/structure/mineral_door/silver
-	name = "silver door"
-	icon_state = "silver"
-	sheetType = /obj/item/stack/sheet/mineral/silver
-	obj_integrity = 300
-	max_integrity = 300
-
-/obj/structure/mineral_door/gold
-	name = "gold door"
-	icon_state = "gold"
-	sheetType = /obj/item/stack/sheet/mineral/gold
-
-/obj/structure/mineral_door/uranium
-	name = "uranium door"
-	icon_state = "uranium"
-	sheetType = /obj/item/stack/sheet/mineral/uranium
-	obj_integrity = 300
-	max_integrity = 300
-	light_range = 2
-
-/obj/structure/mineral_door/sandstone
-	name = "sandstone door"
-	icon_state = "sandstone"
-	sheetType = /obj/item/stack/sheet/mineral/sandstone
-	obj_integrity = 100
-	max_integrity = 100
-
-/obj/structure/mineral_door/transparent
-	opacity = 0
-
-/obj/structure/mineral_door/transparent/Close()
-	..()
-	opacity = 0
-
-/obj/structure/mineral_door/transparent/plasma
-	name = "plasma door"
-	icon_state = "plasma"
-	sheetType = /obj/item/stack/sheet/mineral/plasma
-
-/obj/structure/mineral_door/transparent/plasma/attackby(obj/item/weapon/W, mob/user, params)
-	if(W.is_hot())
-		var/turf/T = get_turf(src)
-		message_admins("Plasma mineral door ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(T)]",0,1)
-		log_game("Plasma mineral door ignited by [key_name(user)] in [COORD(T)]")
-		TemperatureAct()
-	else
-		return ..()
-
-/obj/structure/mineral_door/transparent/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-	if(exposed_temperature > 300)
-		TemperatureAct()
-
-/obj/structure/mineral_door/transparent/plasma/proc/TemperatureAct()
-	atmos_spawn_air("plasma=500;TEMP=1000")
-	deconstruct(FALSE)
-
-/obj/structure/mineral_door/transparent/diamond
-	name = "diamond door"
-	icon_state = "diamond"
-	sheetType = /obj/item/stack/sheet/mineral/diamond
-	obj_integrity = 1000
-	max_integrity = 1000
-
-/obj/structure/mineral_door/wood
-	name = "wood door"
-	icon_state = "wood"
-	openSound = 'sound/effects/doorcreaky.ogg'
-	closeSound = 'sound/effects/doorcreaky.ogg'
-	sheetType = /obj/item/stack/sheet/mineral/wood
-	resistance_flags = FLAMMABLE
-	obj_integrity = 200
-	max_integrity = 200
+//NOT using the existing /obj/machinery/door type, since that has some complications on its own, mainly based on its
+//machineryness
+
+/obj/structure/mineral_door
+	name = "metal door"
+	density = 1
+	anchored = 1
+	opacity = 1
+
+	icon = 'icons/obj/doors/mineral_doors.dmi'
+	icon_state = "metal"
+
+	var/initial_state
+	var/state = 0 //closed, 1 == open
+	var/isSwitchingStates = 0
+	var/close_delay = -1 //-1 if does not auto close.
+	obj_integrity = 200
+	max_integrity = 200
+	armor = list(melee = 10, bullet = 0, laser = 0, energy = 100, bomb = 10, bio = 100, rad = 100, fire = 50, acid = 50)
+	var/sheetType = /obj/item/stack/sheet/metal
+	var/sheetAmount = 7
+	var/openSound = 'sound/effects/stonedoor_openclose.ogg'
+	var/closeSound = 'sound/effects/stonedoor_openclose.ogg'
+	CanAtmosPass = ATMOS_PASS_DENSITY
+
+/obj/structure/mineral_door/New(location)
+	..()
+	initial_state = icon_state
+	air_update_turf(1)
+
+/obj/structure/mineral_door/Destroy()
+	density = 0
+	air_update_turf(1)
+	return ..()
+
+/obj/structure/mineral_door/Move()
+	var/turf/T = loc
+	..()
+	move_update_air(T)
+
+/obj/structure/mineral_door/Bumped(atom/user)
+	..()
+	if(!state)
+		return TryToSwitchState(user)
+
+/obj/structure/mineral_door/attack_ai(mob/user) //those aren't machinery, they're just big fucking slabs of a mineral
+	if(isAI(user)) //so the AI can't open it
+		return
+	else if(iscyborg(user)) //but cyborgs can
+		if(get_dist(user,src) <= 1) //not remotely though
+			return TryToSwitchState(user)
+
+/obj/structure/mineral_door/attack_paw(mob/user)
+	return TryToSwitchState(user)
+
+/obj/structure/mineral_door/attack_hand(mob/user)
+	return TryToSwitchState(user)
+
+/obj/structure/mineral_door/CanPass(atom/movable/mover, turf/target, height=0)
+	if(istype(mover, /obj/effect/beam))
+		return !opacity
+	return !density
+
+/obj/structure/mineral_door/proc/TryToSwitchState(atom/user)
+	if(isSwitchingStates)
+		return
+	if(isliving(user))
+		var/mob/living/M = user
+		if(world.time - M.last_bumped <= 60)
+			return //NOTE do we really need that?
+		if(M.client)
+			if(iscarbon(M))
+				var/mob/living/carbon/C = M
+				if(!C.handcuffed)
+					SwitchState()
+			else
+				SwitchState()
+	else if(istype(user, /obj/mecha))
+		SwitchState()
+
+/obj/structure/mineral_door/proc/SwitchState()
+	if(state)
+		Close()
+	else
+		Open()
+
+/obj/structure/mineral_door/proc/Open()
+	isSwitchingStates = 1
+	playsound(loc, openSound, 100, 1)
+	flick("[initial_state]opening",src)
+	sleep(10)
+	density = 0
+	opacity = 0
+	state = 1
+	air_update_turf(1)
+	update_icon()
+	isSwitchingStates = 0
+
+	if(close_delay != -1)
+		addtimer(CALLBACK(src, .proc/Close), close_delay)
+
+/obj/structure/mineral_door/proc/Close()
+	if(isSwitchingStates || state != 1)
+		return
+	var/turf/T = get_turf(src)
+	for(var/mob/living/L in T)
+		return
+	isSwitchingStates = 1
+	playsound(loc, closeSound, 100, 1)
+	flick("[initial_state]closing",src)
+	sleep(10)
+	density = 1
+	opacity = 1
+	state = 0
+	air_update_turf(1)
+	update_icon()
+	isSwitchingStates = 0
+
+/obj/structure/mineral_door/update_icon()
+	if(state)
+		icon_state = "[initial_state]open"
+	else
+		icon_state = initial_state
+
+/obj/structure/mineral_door/attackby(obj/item/weapon/W, mob/user, params)
+	if(istype(W,/obj/item/weapon/pickaxe))
+		var/obj/item/weapon/pickaxe/digTool = W
+		to_chat(user, "<span class='notice'>You start digging the [name]...</span>")
+		if(do_after(user,digTool.digspeed*(1+round(max_integrity*0.01)), target = src) && src)
+			to_chat(user, "<span class='notice'>You finish digging.</span>")
+			deconstruct(TRUE)
+	else if(user.a_intent != INTENT_HARM)
+		attack_hand(user)
+	else
+		return ..()
+
+/obj/structure/mineral_door/deconstruct(disassembled = TRUE)
+	var/turf/T = get_turf(src)
+	if(disassembled)
+		new sheetType(T, sheetAmount)
+	else
+		new sheetType(T, max(sheetAmount - 2, 1))
+	qdel(src)
+
+/obj/structure/mineral_door/iron
+	name = "iron door"
+	obj_integrity = 300
+	max_integrity = 300
+
+/obj/structure/mineral_door/silver
+	name = "silver door"
+	icon_state = "silver"
+	sheetType = /obj/item/stack/sheet/mineral/silver
+	obj_integrity = 300
+	max_integrity = 300
+
+/obj/structure/mineral_door/gold
+	name = "gold door"
+	icon_state = "gold"
+	sheetType = /obj/item/stack/sheet/mineral/gold
+
+/obj/structure/mineral_door/uranium
+	name = "uranium door"
+	icon_state = "uranium"
+	sheetType = /obj/item/stack/sheet/mineral/uranium
+	obj_integrity = 300
+	max_integrity = 300
+	light_range = 2
+
+/obj/structure/mineral_door/sandstone
+	name = "sandstone door"
+	icon_state = "sandstone"
+	sheetType = /obj/item/stack/sheet/mineral/sandstone
+	obj_integrity = 100
+	max_integrity = 100
+
+/obj/structure/mineral_door/transparent
+	opacity = 0
+
+/obj/structure/mineral_door/transparent/Close()
+	..()
+	opacity = 0
+
+/obj/structure/mineral_door/transparent/plasma
+	name = "plasma door"
+	icon_state = "plasma"
+	sheetType = /obj/item/stack/sheet/mineral/plasma
+
+/obj/structure/mineral_door/transparent/plasma/attackby(obj/item/weapon/W, mob/user, params)
+	if(W.is_hot())
+		var/turf/T = get_turf(src)
+		message_admins("Plasma mineral door ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(T)]",0,1)
+		log_game("Plasma mineral door ignited by [key_name(user)] in [COORD(T)]")
+		TemperatureAct()
+	else
+		return ..()
+
+/obj/structure/mineral_door/transparent/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	if(exposed_temperature > 300)
+		TemperatureAct()
+
+/obj/structure/mineral_door/transparent/plasma/proc/TemperatureAct()
+	atmos_spawn_air("plasma=500;TEMP=1000")
+	deconstruct(FALSE)
+
+/obj/structure/mineral_door/transparent/diamond
+	name = "diamond door"
+	icon_state = "diamond"
+	sheetType = /obj/item/stack/sheet/mineral/diamond
+	obj_integrity = 1000
+	max_integrity = 1000
+
+/obj/structure/mineral_door/wood
+	name = "wood door"
+	icon_state = "wood"
+	openSound = 'sound/effects/doorcreaky.ogg'
+	closeSound = 'sound/effects/doorcreaky.ogg'
+	sheetType = /obj/item/stack/sheet/mineral/wood
+	resistance_flags = FLAMMABLE
+	obj_integrity = 200
+	max_integrity = 200

code/modules/admin/verbs/randomverbs.dm

@@ -387,8 +387,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
 			for(var/obj/effect/landmark/L in GLOB.landmarks_list)
 				if(L.name=="carpspawn")
 					ninja_spawn += L
-			var/datum/antagonist/ninja/ninjadatum = new_character.mind.has_antag_datum(ANTAG_DATUM_NINJA)
-			ninjadatum.equip_space_ninja()
+			var/datum/antagonist/ninja/ninjadatum = new_character.mind.has_antag_datum(ANTAG_DATUM_NINJA)
+			ninjadatum.equip_space_ninja()
 			if(ninja_spawn.len)
 				var/obj/effect/landmark/ninja_spawn_here = pick(ninja_spawn)
 				new_character.loc = ninja_spawn_here.loc
@@ -586,7 +586,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 		empulse(O, heavy, light)
 		log_admin("[key_name(usr)] created an EM Pulse ([heavy],[light]) at ([O.x],[O.y],[O.z])")
-		message_admins("[key_name_admin(usr)] created an EM Pulse ([heavy],[light]) at ([O.x],[O.y],[O.z])")
+		message_admins("[key_name_admin(usr)] created an EM Pulse ([heavy],[light]) at ([O.x],[O.y],[O.z])")
 		SSblackbox.add_details("admin_verb","EM Pulse") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 		return

code/modules/assembly/timer.dm

@@ -1,115 +1,115 @@
-/obj/item/device/assembly/timer
-	name = "timer"
-	desc = "Used to time things. Works well with contraptions which has to count down. Tick tock."
-	icon_state = "timer"
-	materials = list(MAT_METAL=500, MAT_GLASS=50)
-	origin_tech = "magnets=1;engineering=1"
-	attachable = 1
-
-	var/timing = 0
-	var/time = 5
-	var/saved_time = 5
-	var/loop = 0
-
-
-/obj/item/device/assembly/timer/New()
-	..()
-	START_PROCESSING(SSobj, src)
-
-/obj/item/device/assembly/timer/describe()
-	if(timing)
-		return "The timer is counting down from [time]!"
-	return "The timer is set for [time] seconds."
-
-
-/obj/item/device/assembly/timer/activate()
-	if(!..())
-		return 0//Cooldown check
-	timing = !timing
-	update_icon()
-	return 1
-
-
-/obj/item/device/assembly/timer/toggle_secure()
-	secured = !secured
-	if(secured)
-		START_PROCESSING(SSobj, src)
-	else
-		timing = 0
-		STOP_PROCESSING(SSobj, src)
-	update_icon()
-	return secured
-
-
-/obj/item/device/assembly/timer/proc/timer_end()
-	if(!secured || next_activate > world.time)
-		return FALSE
-	pulse(0)
-	audible_message("\icon[src] *beep* *beep*", null, 3)
-	if(loop)
-		timing = 1
-	update_icon()
-
-
-/obj/item/device/assembly/timer/process()
-	if(timing)
-		time--
-		if(time <= 0)
-			timing = 0
-			timer_end()
-			time = saved_time
-
-
-/obj/item/device/assembly/timer/update_icon()
-	cut_overlays()
-	attached_overlays = list()
-	if(timing)
-		add_overlay("timer_timing")
-		attached_overlays += "timer_timing"
-	if(holder)
-		holder.update_icon()
-
-
-/obj/item/device/assembly/timer/interact(mob/user)//TODO: Have this use the wires
-	if(is_secured(user))
-		var/second = time % 60
-		var/minute = (time - second) / 60
-		var/dat = "<TT><B>Timing Unit</B>\n[(timing ? "<A href='?src=\ref[src];time=0'>Timing</A>" : "<A href='?src=\ref[src];time=1'>Not Timing</A>")] [minute]:[second]\n<A href='?src=\ref[src];tp=-30'>-</A> <A href='?src=\ref[src];tp=-1'>-</A> <A href='?src=\ref[src];tp=1'>+</A> <A href='?src=\ref[src];tp=30'>+</A>\n</TT>"
-		dat += "<BR><BR><A href='?src=\ref[src];repeat=[(loop ? "0'>Stop repeating" : "1'>Set to repeat")]</A>"
-		dat += "<BR><BR><A href='?src=\ref[src];refresh=1'>Refresh</A>"
-		dat += "<BR><BR><A href='?src=\ref[src];close=1'>Close</A>"
-		var/datum/browser/popup = new(user, "timer", name)
-		popup.set_content(dat)
-		popup.open()
-
-
-/obj/item/device/assembly/timer/Topic(href, href_list)
-	..()
-	if(usr.incapacitated() || !in_range(loc, usr))
-		usr << browse(null, "window=timer")
-		onclose(usr, "timer")
-		return
-
-	if(href_list["time"])
-		timing = text2num(href_list["time"])
-		if(timing && istype(holder, /obj/item/device/transfer_valve))
-			var/timer_message = "[ADMIN_LOOKUPFLW(usr)] activated [src] attachment on [holder]."
-			message_admins(timer_message)
-			GLOB.bombers += timer_message
-			log_game("[key_name(usr)] activated [src] attachment on [holder]")
-		update_icon()
-	if(href_list["repeat"])
-		loop = text2num(href_list["repeat"])
-
-	if(href_list["tp"])
-		var/tp = text2num(href_list["tp"])
-		time += tp
-		time = min(max(round(time), 1), 600)
-		saved_time = time
-
-	if(href_list["close"])
-		usr << browse(null, "window=timer")
-		return
-
-	if(usr)
-		attack_self(usr)
+/obj/item/device/assembly/timer
+	name = "timer"
+	desc = "Used to time things. Works well with contraptions which has to count down. Tick tock."
+	icon_state = "timer"
+	materials = list(MAT_METAL=500, MAT_GLASS=50)
+	origin_tech = "magnets=1;engineering=1"
+	attachable = 1
+
+	var/timing = 0
+	var/time = 5
+	var/saved_time = 5
+	var/loop = 0
+
+
+/obj/item/device/assembly/timer/New()
+	..()
+	START_PROCESSING(SSobj, src)
+
+/obj/item/device/assembly/timer/describe()
+	if(timing)
+		return "The timer is counting down from [time]!"
+	return "The timer is set for [time] seconds."
+
+
+/obj/item/device/assembly/timer/activate()
+	if(!..())
+		return 0//Cooldown check
+	timing = !timing
+	update_icon()
+	return 1
+
+
+/obj/item/device/assembly/timer/toggle_secure()
+	secured = !secured
+	if(secured)
+		START_PROCESSING(SSobj, src)
+	else
+		timing = 0
+		STOP_PROCESSING(SSobj, src)
+	update_icon()
+	return secured
+
+
+/obj/item/device/assembly/timer/proc/timer_end()
+	if(!secured || next_activate > world.time)
+		return FALSE
+	pulse(0)
+	audible_message("\icon[src] *beep* *beep*", null, 3)
+	if(loop)
+		timing = 1
+	update_icon()
+
+
+/obj/item/device/assembly/timer/process()
+	if(timing)
+		time--
+		if(time <= 0)
+			timing = 0
+			timer_end()
+			time = saved_time
+
+
+/obj/item/device/assembly/timer/update_icon()
+	cut_overlays()
+	attached_overlays = list()
+	if(timing)
+		add_overlay("timer_timing")
+		attached_overlays += "timer_timing"
+	if(holder)
+		holder.update_icon()
+
+
+/obj/item/device/assembly/timer/interact(mob/user)//TODO: Have this use the wires
+	if(is_secured(user))
+		var/second = time % 60
+		var/minute = (time - second) / 60
+		var/dat = "<TT><B>Timing Unit</B>\n[(timing ? "<A href='?src=\ref[src];time=0'>Timing</A>" : "<A href='?src=\ref[src];time=1'>Not Timing</A>")] [minute]:[second]\n<A href='?src=\ref[src];tp=-30'>-</A> <A href='?src=\ref[src];tp=-1'>-</A> <A href='?src=\ref[src];tp=1'>+</A> <A href='?src=\ref[src];tp=30'>+</A>\n</TT>"
+		dat += "<BR><BR><A href='?src=\ref[src];repeat=[(loop ? "0'>Stop repeating" : "1'>Set to repeat")]</A>"
+		dat += "<BR><BR><A href='?src=\ref[src];refresh=1'>Refresh</A>"
+		dat += "<BR><BR><A href='?src=\ref[src];close=1'>Close</A>"
+		var/datum/browser/popup = new(user, "timer", name)
+		popup.set_content(dat)
+		popup.open()
+
+
+/obj/item/device/assembly/timer/Topic(href, href_list)
+	..()
+	if(usr.incapacitated() || !in_range(loc, usr))
+		usr << browse(null, "window=timer")
+		onclose(usr, "timer")
+		return
+
+	if(href_list["time"])
+		timing = text2num(href_list["time"])
+		if(timing && istype(holder, /obj/item/device/transfer_valve))
+			var/timer_message = "[ADMIN_LOOKUPFLW(usr)] activated [src] attachment on [holder]."
+			message_admins(timer_message)
+			GLOB.bombers += timer_message
+			log_game("[key_name(usr)] activated [src] attachment on [holder]")
+		update_icon()
+	if(href_list["repeat"])
+		loop = text2num(href_list["repeat"])
+
+	if(href_list["tp"])
+		var/tp = text2num(href_list["tp"])
+		time += tp
+		time = min(max(round(time), 1), 600)
+		saved_time = time
+
+	if(href_list["close"])
+		usr << browse(null, "window=timer")
+		return
+
+	if(usr)
+		attack_self(usr)

code/modules/atmospherics/machinery/portable/pump.dm

@@ -1,142 +1,142 @@
-#define PUMP_OUT "out"
-#define PUMP_IN "in"
-#define PUMP_MAX_PRESSURE (ONE_ATMOSPHERE * 30)
-#define PUMP_MIN_PRESSURE (ONE_ATMOSPHERE / 10)
-#define PUMP_DEFAULT_PRESSURE (ONE_ATMOSPHERE)
-
-/obj/machinery/portable_atmospherics/pump
-	name = "portable air pump"
-	icon_state = "psiphon:0"
-	density = 1
-
-	var/on = FALSE
-	var/direction = PUMP_OUT
-	var/obj/machinery/atmospherics/components/binary/pump/pump
-
-	volume = 1000
-
-/obj/machinery/portable_atmospherics/pump/Initialize()
-	..()
-	pump = new(src, FALSE)
-	pump.on = TRUE
-	pump.stat = 0
-	pump.build_network()
-
-/obj/machinery/portable_atmospherics/pump/Destroy()
-	var/turf/T = get_turf(src)
-	T.assume_air(air_contents)
-	air_update_turf()
-	qdel(pump)
-	pump = null
-	return ..()
-
-/obj/machinery/portable_atmospherics/pump/update_icon()
-	icon_state = "psiphon:[on]"
-
-	cut_overlays()
-	if(holding)
-		add_overlay("siphon-open")
-	if(connected_port)
-		add_overlay("siphon-connector")
-
-/obj/machinery/portable_atmospherics/pump/process_atmos()
-	..()
-	if(!on)
-		pump.AIR1 = null
-		pump.AIR2 = null
-		return
-
-	var/turf/T = get_turf(src)
-	if(direction == PUMP_OUT) // Hook up the internal pump.
-		pump.AIR1 = holding ? holding.air_contents : air_contents
-		pump.AIR2 = holding ? air_contents : T.return_air()
-	else
-		pump.AIR1 = holding ? air_contents : T.return_air()
-		pump.AIR2 = holding ? holding.air_contents : air_contents
-
-	pump.process_atmos() // Pump gas.
-	if(!holding)
-		air_update_turf() // Update the environment if needed.
-
-/obj/machinery/portable_atmospherics/pump/emp_act(severity)
-	if(is_operational())
-		if(prob(50 / severity))
-			on = !on
-		if(prob(100 / severity))
-			direction = PUMP_OUT
-		pump.target_pressure = rand(0, 100 * ONE_ATMOSPHERE)
-		update_icon()
-	..()
-
-
-/obj/machinery/portable_atmospherics/pump/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
-														datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "portable_pump", name, 420, 415, master_ui, state)
-		ui.open()
-
-/obj/machinery/portable_atmospherics/pump/ui_data()
-	var/data = list()
-	data["on"] = on
-	data["direction"] = direction
-	data["connected"] = connected_port ? 1 : 0
-	data["pressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0)
-	data["target_pressure"] = round(pump.target_pressure ? pump.target_pressure : 0)
-	data["default_pressure"] = round(PUMP_DEFAULT_PRESSURE)
-	data["min_pressure"] = round(PUMP_MIN_PRESSURE)
-	data["max_pressure"] = round(PUMP_MAX_PRESSURE)
-
-	if(holding)
-		data["holding"] = list()
-		data["holding"]["name"] = holding.name
-		data["holding"]["pressure"] = round(holding.air_contents.return_pressure())
-	return data
-
-/obj/machinery/portable_atmospherics/pump/ui_act(action, params)
-	if(..())
-		return
-	switch(action)
-		if("power")
-			on = !on
-			if(on && !holding)
-				var/plasma = air_contents.gases["plasma"]
-				var/n2o = air_contents.gases["n2o"]
-				if(n2o || plasma)
-					var/area/A = get_area(src)
-					message_admins("[ADMIN_LOOKUPFLW(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [A][ADMIN_JMP(src)]")
-					log_admin("[key_name(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [A][COORD(src)]")
-			. = TRUE
-		if("direction")
-			if(direction == PUMP_OUT)
-				direction = PUMP_IN
-			else
-				direction = PUMP_OUT
-			. = TRUE
-		if("pressure")
-			var/pressure = params["pressure"]
-			if(pressure == "reset")
-				pressure = PUMP_DEFAULT_PRESSURE
-				. = TRUE
-			else if(pressure == "min")
-				pressure = PUMP_MIN_PRESSURE
-				. = TRUE
-			else if(pressure == "max")
-				pressure = PUMP_MAX_PRESSURE
-				. = TRUE
-			else if(pressure == "input")
-				pressure = input("New release pressure ([PUMP_MIN_PRESSURE]-[PUMP_MAX_PRESSURE] kPa):", name, pump.target_pressure) as num|null
-				if(!isnull(pressure) && !..())
-					. = TRUE
-			else if(text2num(pressure) != null)
-				pressure = text2num(pressure)
-				. = TRUE
-			if(.)
-				pump.target_pressure = Clamp(round(pressure), PUMP_MIN_PRESSURE, PUMP_MAX_PRESSURE)
-				investigate_log("was set to [pump.target_pressure] kPa by [key_name(usr)].", "atmos")
-		if("eject")
-			if(holding)
-				holding.loc = get_turf(src)
-				holding = null
-				. = TRUE
+#define PUMP_OUT "out"
+#define PUMP_IN "in"
+#define PUMP_MAX_PRESSURE (ONE_ATMOSPHERE * 30)
+#define PUMP_MIN_PRESSURE (ONE_ATMOSPHERE / 10)
+#define PUMP_DEFAULT_PRESSURE (ONE_ATMOSPHERE)
+
+/obj/machinery/portable_atmospherics/pump
+	name = "portable air pump"
+	icon_state = "psiphon:0"
+	density = 1
+
+	var/on = FALSE
+	var/direction = PUMP_OUT
+	var/obj/machinery/atmospherics/components/binary/pump/pump
+
+	volume = 1000
+
+/obj/machinery/portable_atmospherics/pump/Initialize()
+	..()
+	pump = new(src, FALSE)
+	pump.on = TRUE
+	pump.stat = 0
+	pump.build_network()
+
+/obj/machinery/portable_atmospherics/pump/Destroy()
+	var/turf/T = get_turf(src)
+	T.assume_air(air_contents)
+	air_update_turf()
+	qdel(pump)
+	pump = null
+	return ..()
+
+/obj/machinery/portable_atmospherics/pump/update_icon()
+	icon_state = "psiphon:[on]"
+
+	cut_overlays()
+	if(holding)
+		add_overlay("siphon-open")
+	if(connected_port)
+		add_overlay("siphon-connector")
+
+/obj/machinery/portable_atmospherics/pump/process_atmos()
+	..()
+	if(!on)
+		pump.AIR1 = null
+		pump.AIR2 = null
+		return
+
+	var/turf/T = get_turf(src)
+	if(direction == PUMP_OUT) // Hook up the internal pump.
+		pump.AIR1 = holding ? holding.air_contents : air_contents
+		pump.AIR2 = holding ? air_contents : T.return_air()
+	else
+		pump.AIR1 = holding ? air_contents : T.return_air()
+		pump.AIR2 = holding ? holding.air_contents : air_contents
+
+	pump.process_atmos() // Pump gas.
+	if(!holding)
+		air_update_turf() // Update the environment if needed.
+
+/obj/machinery/portable_atmospherics/pump/emp_act(severity)
+	if(is_operational())
+		if(prob(50 / severity))
+			on = !on
+		if(prob(100 / severity))
+			direction = PUMP_OUT
+		pump.target_pressure = rand(0, 100 * ONE_ATMOSPHERE)
+		update_icon()
+	..()
+
+
+/obj/machinery/portable_atmospherics/pump/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
+														datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "portable_pump", name, 420, 415, master_ui, state)
+		ui.open()
+
+/obj/machinery/portable_atmospherics/pump/ui_data()
+	var/data = list()
+	data["on"] = on
+	data["direction"] = direction
+	data["connected"] = connected_port ? 1 : 0
+	data["pressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0)
+	data["target_pressure"] = round(pump.target_pressure ? pump.target_pressure : 0)
+	data["default_pressure"] = round(PUMP_DEFAULT_PRESSURE)
+	data["min_pressure"] = round(PUMP_MIN_PRESSURE)
+	data["max_pressure"] = round(PUMP_MAX_PRESSURE)
+
+	if(holding)
+		data["holding"] = list()
+		data["holding"]["name"] = holding.name
+		data["holding"]["pressure"] = round(holding.air_contents.return_pressure())
+	return data
+
+/obj/machinery/portable_atmospherics/pump/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("power")
+			on = !on
+			if(on && !holding)
+				var/plasma = air_contents.gases["plasma"]
+				var/n2o = air_contents.gases["n2o"]
+				if(n2o || plasma)
+					var/area/A = get_area(src)
+					message_admins("[ADMIN_LOOKUPFLW(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [A][ADMIN_JMP(src)]")
+					log_admin("[key_name(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [A][COORD(src)]")
+			. = TRUE
+		if("direction")
+			if(direction == PUMP_OUT)
+				direction = PUMP_IN
+			else
+				direction = PUMP_OUT
+			. = TRUE
+		if("pressure")
+			var/pressure = params["pressure"]
+			if(pressure == "reset")
+				pressure = PUMP_DEFAULT_PRESSURE
+				. = TRUE
+			else if(pressure == "min")
+				pressure = PUMP_MIN_PRESSURE
+				. = TRUE
+			else if(pressure == "max")
+				pressure = PUMP_MAX_PRESSURE
+				. = TRUE
+			else if(pressure == "input")
+				pressure = input("New release pressure ([PUMP_MIN_PRESSURE]-[PUMP_MAX_PRESSURE] kPa):", name, pump.target_pressure) as num|null
+				if(!isnull(pressure) && !..())
+					. = TRUE
+			else if(text2num(pressure) != null)
+				pressure = text2num(pressure)
+				. = TRUE
+			if(.)
+				pump.target_pressure = Clamp(round(pressure), PUMP_MIN_PRESSURE, PUMP_MAX_PRESSURE)
+				investigate_log("was set to [pump.target_pressure] kPa by [key_name(usr)].", "atmos")
+		if("eject")
+			if(holding)
+				holding.loc = get_turf(src)
+				holding = null
+				. = TRUE
 	update_icon()

code/modules/jobs/job_types/job.dm

@@ -75,8 +75,6 @@
 		H.dna.features["ears"] = "None"
 		H.regenerate_icons()
 
-	handle_roundstart_items(H)
-
 /datum/job/proc/get_access()
 	if(!config)	//Needed for robots.
 		return src.minimal_access.Copy()

code/modules/mapping/ruins.dm

@@ -1,93 +1,93 @@
-
-
-/proc/seedRuins(list/z_levels = null, budget = 0, whitelist = /area/space, list/potentialRuins)
-	if(!z_levels || !z_levels.len)
-		WARNING("No Z levels provided - Not generating ruins")
-		return
-
-	for(var/zl in z_levels)
-		var/turf/T = locate(1, 1, zl)
-		if(!T)
-			WARNING("Z level [zl] does not exist - Not generating ruins")
-			return
-
-	var/overall_sanity = 100
-	var/list/ruins = potentialRuins.Copy()
-
-	while(budget > 0 && overall_sanity > 0)
-		// Pick a ruin
-		var/datum/map_template/ruin/ruin = null
-		if(ruins && ruins.len)
-			ruin = ruins[pick(ruins)]
-		else
-			log_world("Ruin loader had no ruins to pick from with [budget] left to spend.")
-			break
-		// Can we afford it
-		if(ruin.cost > budget)
-			overall_sanity--
-			continue
-		// If so, try to place it
-		var/sanity = 100
-		// And if we can't fit it anywhere, give up, try again
-
-		while(sanity > 0)
-			sanity--
-			var/width_border = TRANSITIONEDGE + SPACERUIN_MAP_EDGE_PAD + round(ruin.width / 2)
-			var/height_border = TRANSITIONEDGE + SPACERUIN_MAP_EDGE_PAD + round(ruin.height / 2)
-			var/z_level = pick(z_levels)
-			var/turf/T = locate(rand(width_border, world.maxx - width_border), rand(height_border, world.maxy - height_border), z_level)
-			var/valid = TRUE
-
-			for(var/turf/check in ruin.get_affected_turfs(T,1))
-				var/area/new_area = get_area(check)
-				if(!(istype(new_area, whitelist)))
-					valid = FALSE
-					break
-
-			if(!valid)
-				continue
-
-			log_world("Ruin \"[ruin.name]\" placed at ([T.x], [T.y], [T.z])")
-
-			var/obj/effect/ruin_loader/R = new /obj/effect/ruin_loader(T)
-			R.Load(ruins,ruin)
-			budget -= ruin.cost
-			if(!ruin.allow_duplicates)
-				ruins -= ruin.name
-			break
-
-	if(!overall_sanity)
-		log_world("Ruin loader gave up with [budget] left to spend.")
-
-
-/obj/effect/ruin_loader
-	name = "random ruin"
-	icon = 'icons/obj/weapons.dmi'
-	icon_state = "syndballoon"
-	invisibility = 0
-
-/obj/effect/ruin_loader/proc/Load(list/potentialRuins, datum/map_template/template)
-	var/list/possible_ruins = list()
-	for(var/A in potentialRuins)
-		var/datum/map_template/T = potentialRuins[A]
-		if(!T.loaded)
-			possible_ruins += T
-	if(!template && possible_ruins.len)
-		template = safepick(possible_ruins)
-	if(!template)
-		return FALSE
-	var/turf/central_turf = get_turf(src)
-	for(var/i in template.get_affected_turfs(central_turf, 1))
-		var/turf/T = i
-		for(var/mob/living/simple_animal/monster in T)
-			qdel(monster)
-		for(var/obj/structure/flora/ash/plant in T)
-			qdel(plant)
-	template.load(central_turf,centered = TRUE)
-	template.loaded++
-	var/datum/map_template/ruin = template
-	if(istype(ruin))
-		new /obj/effect/landmark/ruin(central_turf, ruin)
-
-	qdel(src)
-	return TRUE
+
+
+/proc/seedRuins(list/z_levels = null, budget = 0, whitelist = /area/space, list/potentialRuins)
+	if(!z_levels || !z_levels.len)
+		WARNING("No Z levels provided - Not generating ruins")
+		return
+
+	for(var/zl in z_levels)
+		var/turf/T = locate(1, 1, zl)
+		if(!T)
+			WARNING("Z level [zl] does not exist - Not generating ruins")
+			return
+
+	var/overall_sanity = 100
+	var/list/ruins = potentialRuins.Copy()
+
+	while(budget > 0 && overall_sanity > 0)
+		// Pick a ruin
+		var/datum/map_template/ruin/ruin = null
+		if(ruins && ruins.len)
+			ruin = ruins[pick(ruins)]
+		else
+			log_world("Ruin loader had no ruins to pick from with [budget] left to spend.")
+			break
+		// Can we afford it
+		if(ruin.cost > budget)
+			overall_sanity--
+			continue
+		// If so, try to place it
+		var/sanity = 100
+		// And if we can't fit it anywhere, give up, try again
+
+		while(sanity > 0)
+			sanity--
+			var/width_border = TRANSITIONEDGE + SPACERUIN_MAP_EDGE_PAD + round(ruin.width / 2)
+			var/height_border = TRANSITIONEDGE + SPACERUIN_MAP_EDGE_PAD + round(ruin.height / 2)
+			var/z_level = pick(z_levels)
+			var/turf/T = locate(rand(width_border, world.maxx - width_border), rand(height_border, world.maxy - height_border), z_level)
+			var/valid = TRUE
+
+			for(var/turf/check in ruin.get_affected_turfs(T,1))
+				var/area/new_area = get_area(check)
+				if(!(istype(new_area, whitelist)))
+					valid = FALSE
+					break
+
+			if(!valid)
+				continue
+
+			log_world("Ruin \"[ruin.name]\" placed at ([T.x], [T.y], [T.z])")
+
+			var/obj/effect/ruin_loader/R = new /obj/effect/ruin_loader(T)
+			R.Load(ruins,ruin)
+			budget -= ruin.cost
+			if(!ruin.allow_duplicates)
+				ruins -= ruin.name
+			break
+
+	if(!overall_sanity)
+		log_world("Ruin loader gave up with [budget] left to spend.")
+
+
+/obj/effect/ruin_loader
+	name = "random ruin"
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "syndballoon"
+	invisibility = 0
+
+/obj/effect/ruin_loader/proc/Load(list/potentialRuins, datum/map_template/template)
+	var/list/possible_ruins = list()
+	for(var/A in potentialRuins)
+		var/datum/map_template/T = potentialRuins[A]
+		if(!T.loaded)
+			possible_ruins += T
+	if(!template && possible_ruins.len)
+		template = safepick(possible_ruins)
+	if(!template)
+		return FALSE
+	var/turf/central_turf = get_turf(src)
+	for(var/i in template.get_affected_turfs(central_turf, 1))
+		var/turf/T = i
+		for(var/mob/living/simple_animal/monster in T)
+			qdel(monster)
+		for(var/obj/structure/flora/ash/plant in T)
+			qdel(plant)
+	template.load(central_turf,centered = TRUE)
+	template.loaded++
+	var/datum/map_template/ruin = template
+	if(istype(ruin))
+		new /obj/effect/landmark/ruin(central_turf, ruin)
+
+	qdel(src)
+	return TRUE

code/modules/mob/dead/new_player/new_player.dm

@@ -24,10 +24,10 @@
 		loc = pick(GLOB.newplayer_start)
 	else
 		loc = locate(1,1,1)
-	. = ..()
-
-/mob/dead/new_player/prepare_huds()
-	return
+	. = ..()
+
+/mob/dead/new_player/prepare_huds()
+	return
 
 /mob/dead/new_player/proc/new_player_panel()
 
@@ -146,7 +146,7 @@
 			return 1
 
 	if(href_list["late_join"])
-		if(!SSticker || !SSticker.IsRoundInProgress())
+		if(!SSticker || !SSticker.IsRoundInProgress())
 			to_chat(usr, "<span class='danger'>The round is either not ready, or has already finished...</span>")
 			return
 
@@ -371,7 +371,6 @@
 				if(SHUTTLE_CALL)
 					if(SSshuttle.emergency.timeLeft(1) > initial(SSshuttle.emergencyCallTime)*0.5)
 						SSticker.mode.make_antag_chance(humanc)
-	handle_roundstart_items(character)
 	qdel(src)
 
 /mob/dead/new_player/proc/AddEmploymentContract(mob/living/carbon/human/employee)

code/modules/mob/inventory.dm

@@ -354,8 +354,8 @@
 		dropItemToGround(I)
 	drop_all_held_items()
 
-/obj/item/proc/equip_to_best_slot(var/mob/M, override_held_check = FALSE)
-	if((src != M.get_active_held_item()) && !override_held_check)
+/obj/item/proc/equip_to_best_slot(var/mob/M)
+	if(src != M.get_active_held_item())
 		to_chat(M, "<span class='warning'>You are not holding anything to equip!</span>")
 		return FALSE
 

code/modules/mob/living/carbon/human/inventory.dm

@@ -1,245 +1,245 @@
-/mob/living/carbon/human/can_equip(obj/item/I, slot, disable_warning = 0)
-	return dna.species.can_equip(I, slot, disable_warning, src)
-
-// Return the item currently in the slot ID
-/mob/living/carbon/human/get_item_by_slot(slot_id)
-	switch(slot_id)
-		if(slot_back)
-			return back
-		if(slot_wear_mask)
-			return wear_mask
-		if(slot_neck)
-			return wear_neck
-		if(slot_handcuffed)
-			return handcuffed
-		if(slot_legcuffed)
-			return legcuffed
-		if(slot_belt)
-			return belt
-		if(slot_wear_id)
-			return wear_id
-		if(slot_ears)
-			return ears
-		if(slot_glasses)
-			return glasses
-		if(slot_gloves)
-			return gloves
-		if(slot_head)
-			return head
-		if(slot_shoes)
-			return shoes
-		if(slot_wear_suit)
-			return wear_suit
-		if(slot_w_uniform)
-			return w_uniform
-		if(slot_l_store)
-			return l_store
-		if(slot_r_store)
-			return r_store
-		if(slot_s_store)
-			return s_store
-	return null
-
-/mob/living/carbon/human/proc/get_all_slots()
-	. = get_head_slots() | get_body_slots()
-
-/mob/living/carbon/human/proc/get_body_slots()
-	return list(
-		back,
-		s_store,
-		handcuffed,
-		legcuffed,
-		wear_suit,
-		gloves,
-		shoes,
-		belt,
-		wear_id,
-		l_store,
-		r_store,
-		w_uniform
-		)
-
-/mob/living/carbon/human/proc/get_head_slots()
-	return list(
-		head,
-		wear_mask,
-		glasses,
-		ears,
-		)
-
-/mob/living/carbon/human/proc/get_storage_slots()
-	return list(
-		back,
-		belt,
-		l_store,
-		r_store,
-		s_store,
-		)
-
-//This is an UNSAFE proc. Use mob_can_equip() before calling this one! Or rather use equip_to_slot_if_possible() or advanced_equip_to_slot_if_possible()
-/mob/living/carbon/human/equip_to_slot(obj/item/I, slot)
-	if(!..()) //a check failed or the item has already found its slot
-		return
-
-	var/not_handled = FALSE //Added in case we make this type path deeper one day
-	switch(slot)
-		if(slot_belt)
-			belt = I
-			update_inv_belt()
-		if(slot_wear_id)
-			wear_id = I
-			sec_hud_set_ID()
-			update_inv_wear_id()
-		if(slot_ears)
-			ears = I
-			update_inv_ears()
-		if(slot_glasses)
-			glasses = I
-			var/obj/item/clothing/glasses/G = I
-			if(G.glass_colour_type)
-				update_glasses_color(G, 1)
-			if(G.tint)
-				update_tint()
-			if(G.vision_correction)
-				clear_fullscreen("nearsighted")
-			if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha))
-				update_sight()
-			update_inv_glasses()
-		if(slot_gloves)
-			gloves = I
-			update_inv_gloves()
-		if(slot_shoes)
-			shoes = I
-			update_inv_shoes()
-		if(slot_wear_suit)
-			wear_suit = I
-			if(I.flags_inv & HIDEJUMPSUIT)
-				update_inv_w_uniform()
-			if(wear_suit.breakouttime) //when equipping a straightjacket
-				stop_pulling() //can't pull if restrained
-				update_action_buttons_icon() //certain action buttons will no longer be usable.
-			update_inv_wear_suit()
-		if(slot_w_uniform)
-			w_uniform = I
-			update_suit_sensors()
-			update_inv_w_uniform()
-		if(slot_l_store)
-			l_store = I
-			update_inv_pockets()
-		if(slot_r_store)
-			r_store = I
-			update_inv_pockets()
-		if(slot_s_store)
-			s_store = I
-			update_inv_s_store()
-		else
-			to_chat(src, "<span class='danger'>You are trying to equip this item to an unsupported inventory slot. Report this to a coder!</span>")
-
-	//Item is handled and in slot, valid to call callback, for this proc should always be true
-	if(!not_handled)
-		I.equipped(src, slot)
-
-	return not_handled //For future deeper overrides
-
-/mob/living/carbon/human/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE)
-	var/index = get_held_index_of_item(I)
-	. = ..() //See mob.dm for an explanation on this and some rage about people copypasting instead of calling ..() like they should.
-	if(!. || !I)
-		return
-	if(index && dna.species.mutanthands)
-		put_in_hand(new dna.species.mutanthands(), index)
-	if(I == wear_suit)
-		if(s_store && invdrop)
-			dropItemToGround(s_store, TRUE) //It makes no sense for your suit storage to stay on you if you drop your suit.
-		if(wear_suit.breakouttime) //when unequipping a straightjacket
-			update_action_buttons_icon() //certain action buttons may be usable again.
-		wear_suit = null
-		if(I.flags_inv & HIDEJUMPSUIT)
-			update_inv_w_uniform()
-		update_inv_wear_suit()
-	else if(I == w_uniform)
-		if(invdrop)
-			if(r_store)
-				dropItemToGround(r_store, TRUE) //Again, makes sense for pockets to drop.
-			if(l_store)
-				dropItemToGround(l_store, TRUE)
-			if(wear_id)
-				dropItemToGround(wear_id)
-			if(belt)
-				dropItemToGround(belt)
-		w_uniform = null
-		update_suit_sensors()
-		update_inv_w_uniform(invdrop)
-	else if(I == gloves)
-		gloves = null
-		update_inv_gloves()
-	else if(I == glasses)
-		glasses = null
-		var/obj/item/clothing/glasses/G = I
-		if(G.glass_colour_type)
-			update_glasses_color(G, 0)
-		if(G.tint)
-			update_tint()
-		if(G.vision_correction)
-			if(disabilities & NEARSIGHT)
-				overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1)
-		if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha))
-			update_sight()
-		update_inv_glasses()
-	else if(I == ears)
-		ears = null
-		update_inv_ears()
-	else if(I == shoes)
-		shoes = null
-		update_inv_shoes()
-	else if(I == belt)
-		belt = null
-		update_inv_belt()
-	else if(I == wear_id)
-		wear_id = null
-		sec_hud_set_ID()
-		update_inv_wear_id()
-	else if(I == r_store)
-		r_store = null
-		update_inv_pockets()
-	else if(I == l_store)
-		l_store = null
-		update_inv_pockets()
-	else if(I == s_store)
-		s_store = null
-		update_inv_s_store()
-
-/mob/living/carbon/human/wear_mask_update(obj/item/clothing/C, toggle_off = 1)
-	if((C.flags_inv & (HIDEHAIR|HIDEFACIALHAIR)) || (initial(C.flags_inv) & (HIDEHAIR|HIDEFACIALHAIR)))
-		update_hair()
-	if(toggle_off && internal && !getorganslot("breathing_tube"))
-		update_internals_hud_icon(0)
-		internal = null
-	if(C.flags_inv & HIDEEYES)
-		update_inv_glasses()
-	sec_hud_set_security_status()
-	..()
-
-/mob/living/carbon/human/head_update(obj/item/I, forced)
-	if((I.flags_inv & (HIDEHAIR|HIDEFACIALHAIR)) || forced)
-		update_hair()
-	if(I.flags_inv & HIDEEYES || forced)
-		update_inv_glasses()
-	if(I.flags_inv & HIDEEARS || forced)
-		update_body()
-	sec_hud_set_security_status()
-	..()
-
-/mob/living/carbon/human/proc/equipOutfit(outfit, visualsOnly = FALSE)
-	var/datum/outfit/O = null
-
-	if(ispath(outfit))
-		O = new outfit
-	else
-		O = outfit
-		if(!istype(O))
-			return 0
-	if(!O)
-		return 0
-
-	return O.equip(src, visualsOnly)
+/mob/living/carbon/human/can_equip(obj/item/I, slot, disable_warning = 0)
+	return dna.species.can_equip(I, slot, disable_warning, src)
+
+// Return the item currently in the slot ID
+/mob/living/carbon/human/get_item_by_slot(slot_id)
+	switch(slot_id)
+		if(slot_back)
+			return back
+		if(slot_wear_mask)
+			return wear_mask
+		if(slot_neck)
+			return wear_neck
+		if(slot_handcuffed)
+			return handcuffed
+		if(slot_legcuffed)
+			return legcuffed
+		if(slot_belt)
+			return belt
+		if(slot_wear_id)
+			return wear_id
+		if(slot_ears)
+			return ears
+		if(slot_glasses)
+			return glasses
+		if(slot_gloves)
+			return gloves
+		if(slot_head)
+			return head
+		if(slot_shoes)
+			return shoes
+		if(slot_wear_suit)
+			return wear_suit
+		if(slot_w_uniform)
+			return w_uniform
+		if(slot_l_store)
+			return l_store
+		if(slot_r_store)
+			return r_store
+		if(slot_s_store)
+			return s_store
+	return null
+
+/mob/living/carbon/human/proc/get_all_slots()
+	. = get_head_slots() | get_body_slots()
+
+/mob/living/carbon/human/proc/get_body_slots()
+	return list(
+		back,
+		s_store,
+		handcuffed,
+		legcuffed,
+		wear_suit,
+		gloves,
+		shoes,
+		belt,
+		wear_id,
+		l_store,
+		r_store,
+		w_uniform
+		)
+
+/mob/living/carbon/human/proc/get_head_slots()
+	return list(
+		head,
+		wear_mask,
+		glasses,
+		ears,
+		)
+
+/mob/living/carbon/human/proc/get_storage_slots()
+	return list(
+		back,
+		belt,
+		l_store,
+		r_store,
+		s_store,
+		)
+
+//This is an UNSAFE proc. Use mob_can_equip() before calling this one! Or rather use equip_to_slot_if_possible() or advanced_equip_to_slot_if_possible()
+/mob/living/carbon/human/equip_to_slot(obj/item/I, slot)
+	if(!..()) //a check failed or the item has already found its slot
+		return
+
+	var/not_handled = FALSE //Added in case we make this type path deeper one day
+	switch(slot)
+		if(slot_belt)
+			belt = I
+			update_inv_belt()
+		if(slot_wear_id)
+			wear_id = I
+			sec_hud_set_ID()
+			update_inv_wear_id()
+		if(slot_ears)
+			ears = I
+			update_inv_ears()
+		if(slot_glasses)
+			glasses = I
+			var/obj/item/clothing/glasses/G = I
+			if(G.glass_colour_type)
+				update_glasses_color(G, 1)
+			if(G.tint)
+				update_tint()
+			if(G.vision_correction)
+				clear_fullscreen("nearsighted")
+			if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha))
+				update_sight()
+			update_inv_glasses()
+		if(slot_gloves)
+			gloves = I
+			update_inv_gloves()
+		if(slot_shoes)
+			shoes = I
+			update_inv_shoes()
+		if(slot_wear_suit)
+			wear_suit = I
+			if(I.flags_inv & HIDEJUMPSUIT)
+				update_inv_w_uniform()
+			if(wear_suit.breakouttime) //when equipping a straightjacket
+				stop_pulling() //can't pull if restrained
+				update_action_buttons_icon() //certain action buttons will no longer be usable.
+			update_inv_wear_suit()
+		if(slot_w_uniform)
+			w_uniform = I
+			update_suit_sensors()
+			update_inv_w_uniform()
+		if(slot_l_store)
+			l_store = I
+			update_inv_pockets()
+		if(slot_r_store)
+			r_store = I
+			update_inv_pockets()
+		if(slot_s_store)
+			s_store = I
+			update_inv_s_store()
+		else
+			to_chat(src, "<span class='danger'>You are trying to equip this item to an unsupported inventory slot. Report this to a coder!</span>")
+
+	//Item is handled and in slot, valid to call callback, for this proc should always be true
+	if(!not_handled)
+		I.equipped(src, slot)
+
+	return not_handled //For future deeper overrides
+
+/mob/living/carbon/human/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE)
+	var/index = get_held_index_of_item(I)
+	. = ..() //See mob.dm for an explanation on this and some rage about people copypasting instead of calling ..() like they should.
+	if(!. || !I)
+		return
+	if(index && dna.species.mutanthands)
+		put_in_hand(new dna.species.mutanthands(), index)
+	if(I == wear_suit)
+		if(s_store && invdrop)
+			dropItemToGround(s_store, TRUE) //It makes no sense for your suit storage to stay on you if you drop your suit.
+		if(wear_suit.breakouttime) //when unequipping a straightjacket
+			update_action_buttons_icon() //certain action buttons may be usable again.
+		wear_suit = null
+		if(I.flags_inv & HIDEJUMPSUIT)
+			update_inv_w_uniform()
+		update_inv_wear_suit()
+	else if(I == w_uniform)
+		if(invdrop)
+			if(r_store)
+				dropItemToGround(r_store, TRUE) //Again, makes sense for pockets to drop.
+			if(l_store)
+				dropItemToGround(l_store, TRUE)
+			if(wear_id)
+				dropItemToGround(wear_id)
+			if(belt)
+				dropItemToGround(belt)
+		w_uniform = null
+		update_suit_sensors()
+		update_inv_w_uniform(invdrop)
+	else if(I == gloves)
+		gloves = null
+		update_inv_gloves()
+	else if(I == glasses)
+		glasses = null
+		var/obj/item/clothing/glasses/G = I
+		if(G.glass_colour_type)
+			update_glasses_color(G, 0)
+		if(G.tint)
+			update_tint()
+		if(G.vision_correction)
+			if(disabilities & NEARSIGHT)
+				overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1)
+		if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha))
+			update_sight()
+		update_inv_glasses()
+	else if(I == ears)
+		ears = null
+		update_inv_ears()
+	else if(I == shoes)
+		shoes = null
+		update_inv_shoes()
+	else if(I == belt)
+		belt = null
+		update_inv_belt()
+	else if(I == wear_id)
+		wear_id = null
+		sec_hud_set_ID()
+		update_inv_wear_id()
+	else if(I == r_store)
+		r_store = null
+		update_inv_pockets()
+	else if(I == l_store)
+		l_store = null
+		update_inv_pockets()
+	else if(I == s_store)
+		s_store = null
+		update_inv_s_store()
+
+/mob/living/carbon/human/wear_mask_update(obj/item/clothing/C, toggle_off = 1)
+	if((C.flags_inv & (HIDEHAIR|HIDEFACIALHAIR)) || (initial(C.flags_inv) & (HIDEHAIR|HIDEFACIALHAIR)))
+		update_hair()
+	if(toggle_off && internal && !getorganslot("breathing_tube"))
+		update_internals_hud_icon(0)
+		internal = null
+	if(C.flags_inv & HIDEEYES)
+		update_inv_glasses()
+	sec_hud_set_security_status()
+	..()
+
+/mob/living/carbon/human/head_update(obj/item/I, forced)
+	if((I.flags_inv & (HIDEHAIR|HIDEFACIALHAIR)) || forced)
+		update_hair()
+	if(I.flags_inv & HIDEEYES || forced)
+		update_inv_glasses()
+	if(I.flags_inv & HIDEEARS || forced)
+		update_body()
+	sec_hud_set_security_status()
+	..()
+
+/mob/living/carbon/human/proc/equipOutfit(outfit, visualsOnly = FALSE)
+	var/datum/outfit/O = null
+
+	if(ispath(outfit))
+		O = new outfit
+	else
+		O = outfit
+		if(!istype(O))
+			return 0
+	if(!O)
+		return 0
+
+	return O.equip(src, visualsOnly)

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

@@ -1,50 +1,50 @@
-/datum/species/zombie
-	// 1spooky
-	name = "High Functioning Zombie"
-	id = "zombie"
-	say_mod = "moans"
-	sexes = 0
-	blacklisted = 1
-	meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
-	species_traits = list(NOBREATH,RESISTCOLD,RESISTPRESSURE,NOBLOOD,RADIMMUNE,NOZOMBIE,EASYDISMEMBER,EASYLIMBATTACHMENT)
-	mutant_organs = list(/obj/item/organ/tongue/zombie)
-
-/datum/species/zombie/infectious
-	name = "Infectious Zombie"
-	id = "memezombies"
-	limbs_id = "zombie"
-	mutanthands = /obj/item/zombie_hand
-	no_equip = list(slot_wear_mask, slot_head)
-	armor = 20 // 120 damage to KO a zombie, which kills it
-	speedmod = 2
-	mutanteyes = /obj/item/organ/eyes/night_vision/zombie
-
-/datum/species/zombie/infectious/spec_life(mob/living/carbon/C)
-	. = ..()
-	C.a_intent = INTENT_HARM // THE SUFFERING MUST FLOW
-	if(C.InCritical())
-		C.death()
-		// Zombies only move around when not in crit, they instantly
-		// succumb otherwise, and will standup again soon
-
-/datum/species/zombie/infectious/on_species_gain(mob/living/carbon/C, datum/species/old_species)
-	. = ..()
-
-	// Deal with the source of this zombie corruption
-	//  Infection organ needs to be handled separately from mutant_organs
-	//  because it persists through species transitions
-	var/obj/item/organ/zombie_infection/infection
-	infection = C.getorganslot("zombie_infection")
-	if(!infection)
-		infection = new()
-		infection.Insert(C)
-
-
-// Your skin falls off
-/datum/species/krokodil_addict
-	name = "Human"
-	id = "goofzombies"
-	limbs_id = "zombie" //They look like zombies
-	sexes = 0
-	meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
-	mutant_organs = list(/obj/item/organ/tongue/zombie)
+/datum/species/zombie
+	// 1spooky
+	name = "High Functioning Zombie"
+	id = "zombie"
+	say_mod = "moans"
+	sexes = 0
+	blacklisted = 1
+	meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
+	species_traits = list(NOBREATH,RESISTCOLD,RESISTPRESSURE,NOBLOOD,RADIMMUNE,NOZOMBIE,EASYDISMEMBER,EASYLIMBATTACHMENT)
+	mutant_organs = list(/obj/item/organ/tongue/zombie)
+
+/datum/species/zombie/infectious
+	name = "Infectious Zombie"
+	id = "memezombies"
+	limbs_id = "zombie"
+	mutanthands = /obj/item/zombie_hand
+	no_equip = list(slot_wear_mask, slot_head)
+	armor = 20 // 120 damage to KO a zombie, which kills it
+	speedmod = 2
+	mutanteyes = /obj/item/organ/eyes/night_vision/zombie
+
+/datum/species/zombie/infectious/spec_life(mob/living/carbon/C)
+	. = ..()
+	C.a_intent = INTENT_HARM // THE SUFFERING MUST FLOW
+	if(C.InCritical())
+		C.death()
+		// Zombies only move around when not in crit, they instantly
+		// succumb otherwise, and will standup again soon
+
+/datum/species/zombie/infectious/on_species_gain(mob/living/carbon/C, datum/species/old_species)
+	. = ..()
+
+	// Deal with the source of this zombie corruption
+	//  Infection organ needs to be handled separately from mutant_organs
+	//  because it persists through species transitions
+	var/obj/item/organ/zombie_infection/infection
+	infection = C.getorganslot("zombie_infection")
+	if(!infection)
+		infection = new()
+		infection.Insert(C)
+
+
+// Your skin falls off
+/datum/species/krokodil_addict
+	name = "Human"
+	id = "goofzombies"
+	limbs_id = "zombie" //They look like zombies
+	sexes = 0
+	meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
+	mutant_organs = list(/obj/item/organ/tongue/zombie)

code/modules/mob/living/simple_animal/friendly/cat.dm

@@ -1,274 +1,274 @@
-//Cat
-/mob/living/simple_animal/pet/cat
-	name = "cat"
-	desc = "Kitty!!"
-	icon = 'icons/mob/pets.dmi'
-	icon_state = "cat2"
-	icon_living = "cat2"
-	icon_dead = "cat2_dead"
-	gender = MALE
-	speak = list("Meow!", "Esp!", "Purr!", "HSSSSS")
-	speak_emote = list("purrs", "meows")
-	emote_hear = list("meows", "mews")
-	emote_see = list("shakes its head", "shivers")
-	speak_chance = 1
-	turns_per_move = 5
-	see_in_dark = 6
-	ventcrawler = VENTCRAWLER_ALWAYS
-	pass_flags = PASSTABLE
-	mob_size = MOB_SIZE_SMALL
-	minbodytemp = 200
-	maxbodytemp = 400
-	unsuitable_atmos_damage = 1
-	animal_species = /mob/living/simple_animal/pet/cat
-	childtype = list(/mob/living/simple_animal/pet/cat/kitten)
-	butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab = 2)
-	response_help  = "pets"
-	response_disarm = "gently pushes aside"
-	response_harm   = "kicks"
-	var/turns_since_scan = 0
-	var/mob/living/simple_animal/mouse/movement_target
-	gold_core_spawnable = 2
-	devourable = TRUE
-
-/mob/living/simple_animal/pet/cat/Initialize()
-	..()
-	verbs += /mob/living/proc/lay_down
-
-/mob/living/simple_animal/pet/cat/update_canmove()
-	..()
-	if(client)
-		if (resting)
-			icon_state = "[icon_living]_rest"
-		else
-			icon_state = "[icon_living]"
-
-
-/mob/living/simple_animal/pet/cat/space
-	name = "space cat"
-	desc = "It's a cat... in space!"
-	icon_state = "spacecat"
-	icon_living = "spacecat"
-	icon_dead = "spacecat_dead"
-	unsuitable_atmos_damage = 0
-	minbodytemp = TCMB
-	maxbodytemp = T0C + 40
-
-/mob/living/simple_animal/pet/cat/original
-	name = "Batsy"
-	desc = "The product of alien DNA and bored geneticists."
-	gender = FEMALE
-	icon_state = "original"
-	icon_living = "original"
-	icon_dead = "original_dead"
-
-/mob/living/simple_animal/pet/cat/kitten
-	name = "kitten"
-	desc = "D'aaawwww."
-	icon_state = "kitten"
-	icon_living = "kitten"
-	icon_dead = "kitten_dead"
-	density = 0
-	pass_flags = PASSMOB
-	mob_size = MOB_SIZE_SMALL
-
-//RUNTIME IS ALIVE! SQUEEEEEEEE~
-/mob/living/simple_animal/pet/cat/Runtime
-	name = "Runtime"
-	desc = "GCAT"
-	icon_state = "cat"
-	icon_living = "cat"
-	icon_dead = "cat_dead"
-	gender = FEMALE
-	gold_core_spawnable = 0
-	var/list/family = list()//var restored from savefile, has count of each child type
-	var/list/children = list()//Actual mob instances of children
-	var/cats_deployed = 0
-	var/memory_saved = 0
-
-/mob/living/simple_animal/pet/cat/Runtime/Initialize()
-	if(prob(5))
-		icon_state = "original"
-		icon_living = "original"
-		icon_dead = "original_dead"
-	Read_Memory()
-	..()
-
-/mob/living/simple_animal/pet/cat/Runtime/Life()
-	if(!cats_deployed && SSticker.current_state >= GAME_STATE_SETTING_UP)
-		Deploy_The_Cats()
-	if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
-		Write_Memory()
-	..()
-
-/mob/living/simple_animal/pet/cat/Runtime/make_babies()
-	var/mob/baby = ..()
-	if(baby)
-		children += baby
-		return baby
-
-/mob/living/simple_animal/pet/cat/Runtime/death()
-	if(!memory_saved)
-		Write_Memory(1)
-	..()
-
-/mob/living/simple_animal/pet/cat/Runtime/proc/Read_Memory()
-	var/savefile/S = new /savefile("data/npc_saves/Runtime.sav")
-	S["family"] 			>> family
-
-	if(isnull(family))
-		family = list()
-
-/mob/living/simple_animal/pet/cat/Runtime/proc/Write_Memory(dead)
-	var/savefile/S = new /savefile("data/npc_saves/Runtime.sav")
-	family = list()
-	if(!dead)
-		for(var/mob/living/simple_animal/pet/cat/kitten/C in children)
-			if(istype(C,type) || C.stat || !C.z || !C.butcher_results) //That last one is a work around for hologram cats
-				continue
-			if(C.type in family)
-				family[C.type] += 1
-			else
-				family[C.type] = 1
-	S["family"]				<< family
-	memory_saved = 1
-
-/mob/living/simple_animal/pet/cat/Runtime/proc/Deploy_The_Cats()
-	cats_deployed = 1
-	for(var/cat_type in family)
-		if(family[cat_type] > 0)
-			for(var/i in 1 to min(family[cat_type],100)) //Limits to about 500 cats, you wouldn't think this would be needed (BUT IT IS)
-				new cat_type(loc)
-
-/mob/living/simple_animal/pet/cat/Proc
-	name = "Proc"
-	gender = MALE
-	gold_core_spawnable = 0
-
-/mob/living/simple_animal/pet/cat/Life()
-	if(!stat && !buckled && !client)
-		if(prob(1))
-			emote("me", 1, pick("stretches out for a belly rub.", "wags its tail.", "lies down."))
-			icon_state = "[icon_living]_rest"
-			resting = 1
-			update_canmove()
-		else if (prob(1))
-			emote("me", 1, pick("sits down.", "crouches on its hind legs.", "looks alert."))
-			icon_state = "[icon_living]_sit"
-			resting = 1
-			update_canmove()
-		else if (prob(1))
-			if (resting)
-				emote("me", 1, pick("gets up and meows.", "walks around.", "stops resting."))
-				icon_state = "[icon_living]"
-				resting = 0
-				update_canmove()
-			else
-				emote("me", 1, pick("grooms its fur.", "twitches its whiskers.", "shakes out its coat."))
-
-	//MICE!
-	if((src.loc) && isturf(src.loc))
-		if(!stat && !resting && !buckled)
-			for(var/mob/living/simple_animal/mouse/M in view(1,src))
-				if(!M.stat && Adjacent(M))
-					emote("me", 1, "splats \the [M]!")
-					M.splat()
-					movement_target = null
-					stop_automated_movement = 0
-					break
-			for(var/obj/item/toy/cattoy/T in view(1,src))
-				if (T.cooldown < (world.time - 400))
-					emote("me", 1, "bats \the [T] around with its paw!")
-					T.cooldown = world.time
-
-	..()
-
-	make_babies()
-
-	if(!stat && !resting && !buckled)
-		turns_since_scan++
-		if(turns_since_scan > 5)
-			walk_to(src,0)
-			turns_since_scan = 0
-			if((movement_target) && !(isturf(movement_target.loc) || ishuman(movement_target.loc) ))
-				movement_target = null
-				stop_automated_movement = 0
-			if( !movement_target || !(movement_target.loc in oview(src, 3)) )
-				movement_target = null
-				stop_automated_movement = 0
-				for(var/mob/living/simple_animal/mouse/snack in oview(src,3))
-					if(isturf(snack.loc) && !snack.stat)
-						movement_target = snack
-						break
-			if(movement_target)
-				stop_automated_movement = 1
-				walk_to(src,movement_target,0,3)
-
-/mob/living/simple_animal/pet/cat/attack_hand(mob/living/carbon/human/M)
-	. = ..()
-	switch(M.a_intent)
-		if("help")
-			wuv(1, M)
-		if("harm")
-			wuv(-1, M)
-
-/mob/living/simple_animal/pet/cat/proc/wuv(change, mob/M)
-	if(change)
-		if(change > 0)
-			if(M && stat != DEAD)
-				new /obj/effect/overlay/temp/heart(loc)
-				emote("me", 1, "purrs!")
-		else
-			if(M && stat != DEAD)
-				emote("me", 1, "hisses!")
-
-/mob/living/simple_animal/pet/cat/cak //I told you I'd do it, Remie
-	name = "Keeki"
-	desc = "It's a cat made out of cake."
-	icon_state = "cak"
-	icon_living = "cak"
-	icon_dead = "cak_dead"
-	health = 50
-	maxHealth = 50
-	gender = FEMALE
-	harm_intent_damage = 10
-	butcher_results = list(/obj/item/organ/brain = 1, /obj/item/organ/heart = 1, /obj/item/weapon/reagent_containers/food/snacks/cakeslice/birthday = 3,  \
-	/obj/item/weapon/reagent_containers/food/snacks/meat/slab = 2)
-	response_harm = "takes a bite out of"
-	attacked_sound = 'sound/items/eatfood.ogg'
-	deathmessage = "loses its false life and collapses!"
-	death_sound = "bodyfall"
-
-/mob/living/simple_animal/pet/cat/cak/CheckParts(list/parts)
-	..()
-	var/obj/item/organ/brain/B = locate(/obj/item/organ/brain) in contents
-	if(!B || !B.brainmob || !B.brainmob.mind)
-		return
-	B.brainmob.mind.transfer_to(src)
-	to_chat(src, "<font size=3><b>Y</b></font><b>ou are a cak! You're a harmless cat/cake hybrid that everyone loves. People can take bites out of you if they're hungry, but you regenerate health \
-	so quickly that it generally doesn't matter. You're remarkably resilient to any damage besides this and it's hard for you to really die at all. You should go around and bring happiness and \
-	free cake to the station!</b>")
-	var/new_name = stripped_input(src, "Enter your name, or press \"Cancel\" to stick with Keeki.", "Name Change")
-	if(new_name)
-		to_chat(src, "<span class='notice'>Your name is now <b>\"new_name\"</b>!</span>")
-		name = new_name
-
-/mob/living/simple_animal/pet/cat/cak/Life()
-	..()
-	if(stat)
-		return
-	if(health < maxHealth)
-		adjustBruteLoss(-8) //Fast life regen
-	for(var/obj/item/weapon/reagent_containers/food/snacks/donut/D in range(1, src)) //Frosts nearby donuts!
-		if(D.icon_state != "donut2")
-			D.name = "frosted donut"
-			D.icon_state = "donut2"
-			D.reagents.add_reagent("sprinkles", 2)
-			D.bonus_reagents = list("sprinkles" = 2, "sugar" = 1)
-			D.filling_color = "#FF69B4"
-
-/mob/living/simple_animal/pet/cat/cak/attack_hand(mob/living/L)
-	..()
-	if(L.a_intent == INTENT_HARM && L.reagents && !stat)
-		L.reagents.add_reagent("nutriment", 0.4)
-		L.reagents.add_reagent("vitamin", 0.4)
+//Cat
+/mob/living/simple_animal/pet/cat
+	name = "cat"
+	desc = "Kitty!!"
+	icon = 'icons/mob/pets.dmi'
+	icon_state = "cat2"
+	icon_living = "cat2"
+	icon_dead = "cat2_dead"
+	gender = MALE
+	speak = list("Meow!", "Esp!", "Purr!", "HSSSSS")
+	speak_emote = list("purrs", "meows")
+	emote_hear = list("meows", "mews")
+	emote_see = list("shakes its head", "shivers")
+	speak_chance = 1
+	turns_per_move = 5
+	see_in_dark = 6
+	ventcrawler = VENTCRAWLER_ALWAYS
+	pass_flags = PASSTABLE
+	mob_size = MOB_SIZE_SMALL
+	minbodytemp = 200
+	maxbodytemp = 400
+	unsuitable_atmos_damage = 1
+	animal_species = /mob/living/simple_animal/pet/cat
+	childtype = list(/mob/living/simple_animal/pet/cat/kitten)
+	butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab = 2)
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "kicks"
+	var/turns_since_scan = 0
+	var/mob/living/simple_animal/mouse/movement_target
+	gold_core_spawnable = 2
+	devourable = TRUE
+
+/mob/living/simple_animal/pet/cat/Initialize()
+	..()
+	verbs += /mob/living/proc/lay_down
+
+/mob/living/simple_animal/pet/cat/update_canmove()
+	..()
+	if(client)
+		if (resting)
+			icon_state = "[icon_living]_rest"
+		else
+			icon_state = "[icon_living]"
+
+
+/mob/living/simple_animal/pet/cat/space
+	name = "space cat"
+	desc = "It's a cat... in space!"
+	icon_state = "spacecat"
+	icon_living = "spacecat"
+	icon_dead = "spacecat_dead"
+	unsuitable_atmos_damage = 0
+	minbodytemp = TCMB
+	maxbodytemp = T0C + 40
+
+/mob/living/simple_animal/pet/cat/original
+	name = "Batsy"
+	desc = "The product of alien DNA and bored geneticists."
+	gender = FEMALE
+	icon_state = "original"
+	icon_living = "original"
+	icon_dead = "original_dead"
+
+/mob/living/simple_animal/pet/cat/kitten
+	name = "kitten"
+	desc = "D'aaawwww."
+	icon_state = "kitten"
+	icon_living = "kitten"
+	icon_dead = "kitten_dead"
+	density = 0
+	pass_flags = PASSMOB
+	mob_size = MOB_SIZE_SMALL
+
+//RUNTIME IS ALIVE! SQUEEEEEEEE~
+/mob/living/simple_animal/pet/cat/Runtime
+	name = "Runtime"
+	desc = "GCAT"
+	icon_state = "cat"
+	icon_living = "cat"
+	icon_dead = "cat_dead"
+	gender = FEMALE
+	gold_core_spawnable = 0
+	var/list/family = list()//var restored from savefile, has count of each child type
+	var/list/children = list()//Actual mob instances of children
+	var/cats_deployed = 0
+	var/memory_saved = 0
+
+/mob/living/simple_animal/pet/cat/Runtime/Initialize()
+	if(prob(5))
+		icon_state = "original"
+		icon_living = "original"
+		icon_dead = "original_dead"
+	Read_Memory()
+	..()
+
+/mob/living/simple_animal/pet/cat/Runtime/Life()
+	if(!cats_deployed && SSticker.current_state >= GAME_STATE_SETTING_UP)
+		Deploy_The_Cats()
+	if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
+		Write_Memory()
+	..()
+
+/mob/living/simple_animal/pet/cat/Runtime/make_babies()
+	var/mob/baby = ..()
+	if(baby)
+		children += baby
+		return baby
+
+/mob/living/simple_animal/pet/cat/Runtime/death()
+	if(!memory_saved)
+		Write_Memory(1)
+	..()
+
+/mob/living/simple_animal/pet/cat/Runtime/proc/Read_Memory()
+	var/savefile/S = new /savefile("data/npc_saves/Runtime.sav")
+	S["family"] 			>> family
+
+	if(isnull(family))
+		family = list()
+
+/mob/living/simple_animal/pet/cat/Runtime/proc/Write_Memory(dead)
+	var/savefile/S = new /savefile("data/npc_saves/Runtime.sav")
+	family = list()
+	if(!dead)
+		for(var/mob/living/simple_animal/pet/cat/kitten/C in children)
+			if(istype(C,type) || C.stat || !C.z || !C.butcher_results) //That last one is a work around for hologram cats
+				continue
+			if(C.type in family)
+				family[C.type] += 1
+			else
+				family[C.type] = 1
+	S["family"]				<< family
+	memory_saved = 1
+
+/mob/living/simple_animal/pet/cat/Runtime/proc/Deploy_The_Cats()
+	cats_deployed = 1
+	for(var/cat_type in family)
+		if(family[cat_type] > 0)
+			for(var/i in 1 to min(family[cat_type],100)) //Limits to about 500 cats, you wouldn't think this would be needed (BUT IT IS)
+				new cat_type(loc)
+
+/mob/living/simple_animal/pet/cat/Proc
+	name = "Proc"
+	gender = MALE
+	gold_core_spawnable = 0
+
+/mob/living/simple_animal/pet/cat/Life()
+	if(!stat && !buckled && !client)
+		if(prob(1))
+			emote("me", 1, pick("stretches out for a belly rub.", "wags its tail.", "lies down."))
+			icon_state = "[icon_living]_rest"
+			resting = 1
+			update_canmove()
+		else if (prob(1))
+			emote("me", 1, pick("sits down.", "crouches on its hind legs.", "looks alert."))
+			icon_state = "[icon_living]_sit"
+			resting = 1
+			update_canmove()
+		else if (prob(1))
+			if (resting)
+				emote("me", 1, pick("gets up and meows.", "walks around.", "stops resting."))
+				icon_state = "[icon_living]"
+				resting = 0
+				update_canmove()
+			else
+				emote("me", 1, pick("grooms its fur.", "twitches its whiskers.", "shakes out its coat."))
+
+	//MICE!
+	if((src.loc) && isturf(src.loc))
+		if(!stat && !resting && !buckled)
+			for(var/mob/living/simple_animal/mouse/M in view(1,src))
+				if(!M.stat && Adjacent(M))
+					emote("me", 1, "splats \the [M]!")
+					M.splat()
+					movement_target = null
+					stop_automated_movement = 0
+					break
+			for(var/obj/item/toy/cattoy/T in view(1,src))
+				if (T.cooldown < (world.time - 400))
+					emote("me", 1, "bats \the [T] around with its paw!")
+					T.cooldown = world.time
+
+	..()
+
+	make_babies()
+
+	if(!stat && !resting && !buckled)
+		turns_since_scan++
+		if(turns_since_scan > 5)
+			walk_to(src,0)
+			turns_since_scan = 0
+			if((movement_target) && !(isturf(movement_target.loc) || ishuman(movement_target.loc) ))
+				movement_target = null
+				stop_automated_movement = 0
+			if( !movement_target || !(movement_target.loc in oview(src, 3)) )
+				movement_target = null
+				stop_automated_movement = 0
+				for(var/mob/living/simple_animal/mouse/snack in oview(src,3))
+					if(isturf(snack.loc) && !snack.stat)
+						movement_target = snack
+						break
+			if(movement_target)
+				stop_automated_movement = 1
+				walk_to(src,movement_target,0,3)
+
+/mob/living/simple_animal/pet/cat/attack_hand(mob/living/carbon/human/M)
+	. = ..()
+	switch(M.a_intent)
+		if("help")
+			wuv(1, M)
+		if("harm")
+			wuv(-1, M)
+
+/mob/living/simple_animal/pet/cat/proc/wuv(change, mob/M)
+	if(change)
+		if(change > 0)
+			if(M && stat != DEAD)
+				new /obj/effect/overlay/temp/heart(loc)
+				emote("me", 1, "purrs!")
+		else
+			if(M && stat != DEAD)
+				emote("me", 1, "hisses!")
+
+/mob/living/simple_animal/pet/cat/cak //I told you I'd do it, Remie
+	name = "Keeki"
+	desc = "It's a cat made out of cake."
+	icon_state = "cak"
+	icon_living = "cak"
+	icon_dead = "cak_dead"
+	health = 50
+	maxHealth = 50
+	gender = FEMALE
+	harm_intent_damage = 10
+	butcher_results = list(/obj/item/organ/brain = 1, /obj/item/organ/heart = 1, /obj/item/weapon/reagent_containers/food/snacks/cakeslice/birthday = 3,  \
+	/obj/item/weapon/reagent_containers/food/snacks/meat/slab = 2)
+	response_harm = "takes a bite out of"
+	attacked_sound = 'sound/items/eatfood.ogg'
+	deathmessage = "loses its false life and collapses!"
+	death_sound = "bodyfall"
+
+/mob/living/simple_animal/pet/cat/cak/CheckParts(list/parts)
+	..()
+	var/obj/item/organ/brain/B = locate(/obj/item/organ/brain) in contents
+	if(!B || !B.brainmob || !B.brainmob.mind)
+		return
+	B.brainmob.mind.transfer_to(src)
+	to_chat(src, "<font size=3><b>Y</b></font><b>ou are a cak! You're a harmless cat/cake hybrid that everyone loves. People can take bites out of you if they're hungry, but you regenerate health \
+	so quickly that it generally doesn't matter. You're remarkably resilient to any damage besides this and it's hard for you to really die at all. You should go around and bring happiness and \
+	free cake to the station!</b>")
+	var/new_name = stripped_input(src, "Enter your name, or press \"Cancel\" to stick with Keeki.", "Name Change")
+	if(new_name)
+		to_chat(src, "<span class='notice'>Your name is now <b>\"new_name\"</b>!</span>")
+		name = new_name
+
+/mob/living/simple_animal/pet/cat/cak/Life()
+	..()
+	if(stat)
+		return
+	if(health < maxHealth)
+		adjustBruteLoss(-8) //Fast life regen
+	for(var/obj/item/weapon/reagent_containers/food/snacks/donut/D in range(1, src)) //Frosts nearby donuts!
+		if(D.icon_state != "donut2")
+			D.name = "frosted donut"
+			D.icon_state = "donut2"
+			D.reagents.add_reagent("sprinkles", 2)
+			D.bonus_reagents = list("sprinkles" = 2, "sugar" = 1)
+			D.filling_color = "#FF69B4"
+
+/mob/living/simple_animal/pet/cat/cak/attack_hand(mob/living/L)
+	..()
+	if(L.a_intent == INTENT_HARM && L.reagents && !stat)
+		L.reagents.add_reagent("nutriment", 0.4)
+		L.reagents.add_reagent("vitamin", 0.4)

code/modules/paperwork/clipboard.dm

@@ -1,122 +1,122 @@
-/obj/item/weapon/clipboard
-	name = "clipboard"
-	icon = 'icons/obj/bureaucracy.dmi'
-	icon_state = "clipboard"
-	item_state = "clipboard"
-	throwforce = 0
-	w_class = WEIGHT_CLASS_SMALL
-	throw_speed = 3
-	throw_range = 7
-	var/obj/item/weapon/pen/haspen		//The stored pen.
-	var/obj/item/weapon/paper/toppaper	//The topmost piece of paper.
-	slot_flags = SLOT_BELT
-	resistance_flags = FLAMMABLE
-
-/obj/item/weapon/clipboard/Initialize()
-	update_icon()
-	. = ..()
-
-/obj/item/weapon/clipboard/Destroy()
-	QDEL_NULL(haspen)
-	QDEL_NULL(toppaper)	//let movable/Destroy handle the rest
-	return ..()
-
-/obj/item/weapon/clipboard/update_icon()
-	cut_overlays()
-	if(toppaper)
-		add_overlay(toppaper.icon_state)
-		copy_overlays(toppaper)
-	if(haspen)
-		add_overlay("clipboard_pen")
-	add_overlay("clipboard_over")
-
-
-/obj/item/weapon/clipboard/attackby(obj/item/weapon/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/paper))
-		if(!user.transferItemToLoc(W, src))
-			return
-		toppaper = W
-		to_chat(user, "<span class='notice'>You clip the paper onto \the [src].</span>")
-		update_icon()
-	else if(toppaper)
-		toppaper.attackby(user.get_active_held_item(), user)
-		update_icon()
-
-
-/obj/item/weapon/clipboard/attack_self(mob/user)
-	var/dat = "<title>Clipboard</title>"
-	if(haspen)
-		dat += "<A href='?src=\ref[src];pen=1'>Remove Pen</A><BR><HR>"
-	else
-		dat += "<A href='?src=\ref[src];addpen=1'>Add Pen</A><BR><HR>"
-
-	//The topmost paper. You can't organise contents directly in byond, so this is what we're stuck with.	-Pete
-	if(toppaper)
-		var/obj/item/weapon/paper/P = toppaper
-		dat += "<A href='?src=\ref[src];write=\ref[P]'>Write</A> <A href='?src=\ref[src];remove=\ref[P]'>Remove</A> - <A href='?src=\ref[src];read=\ref[P]'>[P.name]</A><BR><HR>"
-
-		for(P in src)
-			if(P == toppaper)
-				continue
-			dat += "<A href='?src=\ref[src];write=\ref[P]'>Write</A> <A href='?src=\ref[src];remove=\ref[P]'>Remove</A> <A href='?src=\ref[src];top=\ref[P]'>Move to top</A> - <A href='?src=\ref[src];read=\ref[P]'>[P.name]</A><BR>"
-	user << browse(dat, "window=clipboard")
-	onclose(user, "clipboard")
-	add_fingerprint(usr)
-
-
-/obj/item/weapon/clipboard/Topic(href, href_list)
-	..()
-	if(usr.stat || usr.restrained())
-		return
-
-	if(usr.contents.Find(src))
-
-		if(href_list["pen"])
-			if(haspen)
-				haspen.loc = usr.loc
-				usr.put_in_hands(haspen)
-				haspen = null
-
-		if(href_list["addpen"])
-			if(!haspen)
-				var/obj/item/held = usr.get_active_held_item()
-				if(istype(held, /obj/item/weapon/pen))
-					var/obj/item/weapon/pen/W = held
-					if(!usr.transferItemToLoc(W, src))
-						return
-					haspen = W
-					to_chat(usr, "<span class='notice'>You slot [W] into [src].</span>")
-
-		if(href_list["write"])
-			var/obj/item/P = locate(href_list["write"])
-			if(istype(P) && P.loc == src)
-				if(usr.get_active_held_item())
-					P.attackby(usr.get_active_held_item(), usr)
-
-		if(href_list["remove"])
-			var/obj/item/P = locate(href_list["remove"])
-			if(istype(P) && P.loc == src)
-				P.loc = usr.loc
-				usr.put_in_hands(P)
-				if(P == toppaper)
-					toppaper = null
-					var/obj/item/weapon/paper/newtop = locate(/obj/item/weapon/paper) in src
-					if(newtop && (newtop != P))
-						toppaper = newtop
-					else
-						toppaper = null
-
-		if(href_list["read"])
-			var/obj/item/weapon/paper/P = locate(href_list["read"])
-			if(istype(P) && P.loc == src)
-				usr.examinate(P)
-
-		if(href_list["top"])
-			var/obj/item/P = locate(href_list["top"])
-			if(istype(P) && P.loc == src)
-				toppaper = P
-				to_chat(usr, "<span class='notice'>You move [P.name] to the top.</span>")
-
-		//Update everything
-		attack_self(usr)
-		update_icon()
+/obj/item/weapon/clipboard
+	name = "clipboard"
+	icon = 'icons/obj/bureaucracy.dmi'
+	icon_state = "clipboard"
+	item_state = "clipboard"
+	throwforce = 0
+	w_class = WEIGHT_CLASS_SMALL
+	throw_speed = 3
+	throw_range = 7
+	var/obj/item/weapon/pen/haspen		//The stored pen.
+	var/obj/item/weapon/paper/toppaper	//The topmost piece of paper.
+	slot_flags = SLOT_BELT
+	resistance_flags = FLAMMABLE
+
+/obj/item/weapon/clipboard/Initialize()
+	update_icon()
+	. = ..()
+
+/obj/item/weapon/clipboard/Destroy()
+	QDEL_NULL(haspen)
+	QDEL_NULL(toppaper)	//let movable/Destroy handle the rest
+	return ..()
+
+/obj/item/weapon/clipboard/update_icon()
+	cut_overlays()
+	if(toppaper)
+		add_overlay(toppaper.icon_state)
+		copy_overlays(toppaper)
+	if(haspen)
+		add_overlay("clipboard_pen")
+	add_overlay("clipboard_over")
+
+
+/obj/item/weapon/clipboard/attackby(obj/item/weapon/W, mob/user, params)
+	if(istype(W, /obj/item/weapon/paper))
+		if(!user.transferItemToLoc(W, src))
+			return
+		toppaper = W
+		to_chat(user, "<span class='notice'>You clip the paper onto \the [src].</span>")
+		update_icon()
+	else if(toppaper)
+		toppaper.attackby(user.get_active_held_item(), user)
+		update_icon()
+
+
+/obj/item/weapon/clipboard/attack_self(mob/user)
+	var/dat = "<title>Clipboard</title>"
+	if(haspen)
+		dat += "<A href='?src=\ref[src];pen=1'>Remove Pen</A><BR><HR>"
+	else
+		dat += "<A href='?src=\ref[src];addpen=1'>Add Pen</A><BR><HR>"
+
+	//The topmost paper. You can't organise contents directly in byond, so this is what we're stuck with.	-Pete
+	if(toppaper)
+		var/obj/item/weapon/paper/P = toppaper
+		dat += "<A href='?src=\ref[src];write=\ref[P]'>Write</A> <A href='?src=\ref[src];remove=\ref[P]'>Remove</A> - <A href='?src=\ref[src];read=\ref[P]'>[P.name]</A><BR><HR>"
+
+		for(P in src)
+			if(P == toppaper)
+				continue
+			dat += "<A href='?src=\ref[src];write=\ref[P]'>Write</A> <A href='?src=\ref[src];remove=\ref[P]'>Remove</A> <A href='?src=\ref[src];top=\ref[P]'>Move to top</A> - <A href='?src=\ref[src];read=\ref[P]'>[P.name]</A><BR>"
+	user << browse(dat, "window=clipboard")
+	onclose(user, "clipboard")
+	add_fingerprint(usr)
+
+
+/obj/item/weapon/clipboard/Topic(href, href_list)
+	..()
+	if(usr.stat || usr.restrained())
+		return
+
+	if(usr.contents.Find(src))
+
+		if(href_list["pen"])
+			if(haspen)
+				haspen.loc = usr.loc
+				usr.put_in_hands(haspen)
+				haspen = null
+
+		if(href_list["addpen"])
+			if(!haspen)
+				var/obj/item/held = usr.get_active_held_item()
+				if(istype(held, /obj/item/weapon/pen))
+					var/obj/item/weapon/pen/W = held
+					if(!usr.transferItemToLoc(W, src))
+						return
+					haspen = W
+					to_chat(usr, "<span class='notice'>You slot [W] into [src].</span>")
+
+		if(href_list["write"])
+			var/obj/item/P = locate(href_list["write"])
+			if(istype(P) && P.loc == src)
+				if(usr.get_active_held_item())
+					P.attackby(usr.get_active_held_item(), usr)
+
+		if(href_list["remove"])
+			var/obj/item/P = locate(href_list["remove"])
+			if(istype(P) && P.loc == src)
+				P.loc = usr.loc
+				usr.put_in_hands(P)
+				if(P == toppaper)
+					toppaper = null
+					var/obj/item/weapon/paper/newtop = locate(/obj/item/weapon/paper) in src
+					if(newtop && (newtop != P))
+						toppaper = newtop
+					else
+						toppaper = null
+
+		if(href_list["read"])
+			var/obj/item/weapon/paper/P = locate(href_list["read"])
+			if(istype(P) && P.loc == src)
+				usr.examinate(P)
+
+		if(href_list["top"])
+			var/obj/item/P = locate(href_list["top"])
+			if(istype(P) && P.loc == src)
+				toppaper = P
+				to_chat(usr, "<span class='notice'>You move [P.name] to the top.</span>")
+
+		//Update everything
+		attack_self(usr)
+		update_icon()

code/modules/paperwork/folders.dm

@@ -78,8 +78,8 @@
 	name = "folder- 'TOP SECRET'"
 	desc = "A folder stamped \"Top Secret - Property of Nanotrasen Corporation. Unauthorized distribution is punishable by death.\""
 
-/obj/item/weapon/folder/documents/Initialize()
-	. = ..()
+/obj/item/weapon/folder/documents/Initialize()
+	. = ..()
 	new /obj/item/documents/nanotrasen(src)
 	update_icon()
 
@@ -91,20 +91,20 @@
 /obj/item/weapon/folder/syndicate/red
 	icon_state = "folder_sred"
 
-/obj/item/weapon/folder/syndicate/red/Initialize()
-	. = ..()
+/obj/item/weapon/folder/syndicate/red/Initialize()
+	. = ..()
 	new /obj/item/documents/syndicate/red(src)
 	update_icon()
 
 /obj/item/weapon/folder/syndicate/blue
 	icon_state = "folder_sblue"
 
-/obj/item/weapon/folder/syndicate/blue/Initialize()
-	. = ..()
+/obj/item/weapon/folder/syndicate/blue/Initialize()
+	. = ..()
 	new /obj/item/documents/syndicate/blue(src)
 	update_icon()
 
-/obj/item/weapon/folder/syndicate/mining/Initialize()
-	. = ..()
+/obj/item/weapon/folder/syndicate/mining/Initialize()
+	. = ..()
 	new /obj/item/documents/syndicate/mining(src)
-	update_icon()
+	update_icon()

code/modules/power/gravitygenerator.dm

@@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
 
 /obj/machinery/gravity_generator
 	name = "gravitational generator"
-	desc = "A device which produces a graviton field when set up."
+	desc = "A device which produces a graviton field when set up."
 	icon = 'icons/obj/machines/gravity_generator.dmi'
 	anchored = 1
 	density = 1
@@ -304,17 +304,17 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
 	// Sound the alert if gravity was just enabled or disabled.
 	var/alert = 0
 	var/area/A = get_area(src)
-	if(SSticker.IsRoundInProgress())
-		if(on) // If we turned on and the game is live.
-			if(gravity_in_level() == 0)
-				alert = 1
-				investigate_log("was brought online and is now producing gravity for this level.", "gravity")
-				message_admins("The gravity generator was brought online [A][ADMIN_COORDJMP(src)]")
-		else
-			if(gravity_in_level() == 1)
-				alert = 1
-				investigate_log("was brought offline and there is now no gravity for this level.", "gravity")
-				message_admins("The gravity generator was brought offline with no backup generator. [A][ADMIN_COORDJMP(src)]")
+	if(SSticker.IsRoundInProgress())
+		if(on) // If we turned on and the game is live.
+			if(gravity_in_level() == 0)
+				alert = 1
+				investigate_log("was brought online and is now producing gravity for this level.", "gravity")
+				message_admins("The gravity generator was brought online [A][ADMIN_COORDJMP(src)]")
+		else
+			if(gravity_in_level() == 1)
+				alert = 1
+				investigate_log("was brought offline and there is now no gravity for this level.", "gravity")
+				message_admins("The gravity generator was brought offline with no backup generator. [A][ADMIN_COORDJMP(src)]")
 
 	update_icon()
 	update_list()

code/modules/power/singularity/emitter.dm

@@ -1,493 +1,493 @@
-/obj/machinery/power/emitter
-	name = "Emitter"
-	desc = "A heavy duty industrial laser.\n<span class='notice'>Alt-click to rotate it clockwise.</span>"
-	icon = 'icons/obj/singularity.dmi'
-	icon_state = "emitter"
-	var/icon_state_on = "emitter_+a"
-	anchored = 0
-	density = 1
-	req_access = list(GLOB.access_engine_equip)
-
-	// The following 3 vars are mostly for the prototype
-	var/manual = FALSE
-	var/charge = 0
-	var/atom/target = null
-
-	use_power = 0
-	idle_power_usage = 10
-	active_power_usage = 300
-
-	var/active = 0
-	var/powered = 0
-	var/fire_delay = 100
-	var/maximum_fire_delay = 100
-	var/minimum_fire_delay = 20
-	var/last_shot = 0
-	var/shot_number = 0
-	var/state = 0
-	var/locked = 0
-
-	var/projectile_type = /obj/item/projectile/beam/emitter
-
-	var/projectile_sound = 'sound/weapons/emitter.ogg'
-
-	var/datum/effect_system/spark_spread/sparks
-
-/obj/machinery/power/emitter/New()
-	..()
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/emitter(null)
-	B.apply_default_parts(src)
-	RefreshParts()
-	wires = new /datum/wires/emitter(src)
-
-/obj/item/weapon/circuitboard/machine/emitter
-	name = "Emitter (Machine Board)"
-	build_path = /obj/machinery/power/emitter
-	origin_tech = "programming=3;powerstorage=4;engineering=4"
-	req_components = list(
-							/obj/item/weapon/stock_parts/micro_laser = 1,
-							/obj/item/weapon/stock_parts/manipulator = 1)
-
-/obj/machinery/power/emitter/RefreshParts()
-	var/max_firedelay = 120
-	var/firedelay = 120
-	var/min_firedelay = 24
-	var/power_usage = 350
-	for(var/obj/item/weapon/stock_parts/micro_laser/L in component_parts)
-		max_firedelay -= 20 * L.rating
-		min_firedelay -= 4 * L.rating
-		firedelay -= 20 * L.rating
-	maximum_fire_delay = max_firedelay
-	minimum_fire_delay = min_firedelay
-	fire_delay = firedelay
-	for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
-		power_usage -= 50 * M.rating
-	active_power_usage = power_usage
-
-/obj/machinery/power/emitter/verb/rotate()
-	set name = "Rotate"
-	set category = "Object"
-	set src in oview(1)
-
-	if(usr.stat || !usr.canmove || usr.restrained())
-		return
-	if (src.anchored)
-		to_chat(usr, "<span class='warning'>It is fastened to the floor!</span>")
-		return 0
-	src.setDir(turn(src.dir, 270))
-	return 1
-
-/obj/machinery/power/emitter/AltClick(mob/user)
-	..()
-	if(user.incapacitated())
-		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
-		return
-	if(!in_range(src, user))
-		return
-	else
-		rotate()
-
-/obj/machinery/power/emitter/Initialize()
-	. = ..()
-	if(state == 2 && anchored)
-		connect_to_network()
-
-	sparks = new
-	sparks.attach(src)
-	sparks.set_up(5, TRUE, src)
-
-/obj/machinery/power/emitter/Destroy()
-	if(SSticker && SSticker.IsRoundInProgress())
-		message_admins("Emitter deleted at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
-		log_game("Emitter deleted at ([x],[y],[z])")
-		investigate_log("<font color='red'>deleted</font> at ([x],[y],[z]) at [get_area(src)]","singulo")
-	QDEL_NULL(sparks)
-	return ..()
-
-/obj/machinery/power/emitter/update_icon()
-	if (active && powernet && avail(active_power_usage))
-		icon_state = icon_state_on
-	else
-		icon_state = initial(icon_state)
-
-
-/obj/machinery/power/emitter/attack_hand(mob/user)
-	src.add_fingerprint(user)
-	if(state == 2)
-		if(!powernet)
-			to_chat(user, "<span class='warning'>The emitter isn't connected to a wire!</span>")
-			return 1
-		if(!src.locked)
-			if(src.active==1)
-				src.active = 0
-				to_chat(user, "<span class='notice'>You turn off \the [src].</span>")
-				message_admins("Emitter turned off by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(src)]",0,1)
-				log_game("Emitter turned off by [key_name(user)] in [COORD(src)]")
-				investigate_log("turned <font color='red'>off</font> by [key_name(user)] at [get_area(src)]","singulo")
-			else
-				src.active = 1
-				to_chat(user, "<span class='notice'>You turn on \the [src].</span>")
-				src.shot_number = 0
-				src.fire_delay = maximum_fire_delay
-				investigate_log("turned <font color='green'>on</font> by [key_name(user)] at [get_area(src)]","singulo")
-			update_icon()
-		else
-			to_chat(user, "<span class='warning'>The controls are locked!</span>")
-	else
-		to_chat(user, "<span class='warning'>The [src] needs to be firmly secured to the floor first!</span>")
-		return 1
-
-/obj/machinery/power/emitter/attack_animal(mob/living/simple_animal/M)
-	if(ismegafauna(M) && anchored)
-		state = 0
-		anchored = FALSE
-		M.visible_message("<span class='warning'>[M] rips [src] free from its moorings!</span>")
-	else
-		..()
-	if(!anchored)
-		step(src, get_dir(M, src))
-
-
-/obj/machinery/power/emitter/emp_act(severity)//Emitters are hardened but still might have issues
-//	add_load(1000)
-/*	if((severity == 1)&&prob(1)&&prob(1))
-		if(src.active)
-			src.active = 0
-			src.use_power = 1	*/
-	return 1
-
-
-/obj/machinery/power/emitter/process()
-	if(stat & (BROKEN))
-		return
-	if(src.state != 2 || (!powernet && active_power_usage))
-		src.active = 0
-		update_icon()
-		return
-	if(src.active == 1)
-		if(!active_power_usage || avail(active_power_usage))
-			add_load(active_power_usage)
-			if(!powered)
-				powered = 1
-				update_icon()
-				investigate_log("regained power and turned <font color='green'>on</font> at [get_area(src)]","singulo")
-		else
-			if(powered)
-				powered = 0
-				update_icon()
-				investigate_log("lost power and turned <font color='red'>off</font> at [get_area(src)]","singulo")
-				log_game("Emitter lost power in ([x],[y],[z])")
-			return
-		if(charge <=80)
-			charge+=5
-		if(!check_delay() || manual == TRUE)
-			return FALSE
-		fire_beam(target)
-
-/obj/machinery/power/emitter/proc/check_delay()
-	if((src.last_shot + src.fire_delay) <= world.time)
-		return TRUE
-	return FALSE
-
-/obj/machinery/power/emitter/proc/fire_beam_pulse()
-	if(!check_delay())
-		return FALSE
-	if(state != 2)
-		return FALSE
-	if(avail(active_power_usage))
-		add_load(active_power_usage)
-		fire_beam()
-
-/obj/machinery/power/emitter/proc/fire_beam(atom/targeted_atom, mob/user)
-	var/turf/targets_from = get_turf(src)
-	if(targeted_atom && (targeted_atom == user || targeted_atom == targets_from || targeted_atom == src))
-		return
-	var/obj/item/projectile/P = new projectile_type(targets_from)
-	playsound(src.loc, projectile_sound, 50, 1)
-	if(prob(35))
-		sparks.start()
-	switch(dir)
-		if(NORTH)
-			P.yo = 20
-			P.xo = 0
-		if(NORTHEAST)
-			P.yo = 20
-			P.xo = 20
-		if(EAST)
-			P.yo = 0
-			P.xo = 20
-		if(SOUTHEAST)
-			P.yo = -20
-			P.xo = 20
-		if(WEST)
-			P.yo = 0
-			P.xo = -20
-		if(SOUTHWEST)
-			P.yo = -20
-			P.xo = -20
-		if(NORTHWEST)
-			P.yo = 20
-			P.xo = -20
-		else // Any other
-			P.yo = -20
-			P.xo = 0
-	if(target)
-		P.yo = targeted_atom.y - targets_from.y
-		P.xo = targeted_atom.x - targets_from.x
-		P.current = targets_from
-		P.starting = targets_from
-		P.firer = src
-		P.original = targeted_atom
-	if(!manual)
-		last_shot = world.time
-		if(shot_number < 3)
-			fire_delay = 20
-			shot_number ++
-		else
-			fire_delay = rand(minimum_fire_delay,maximum_fire_delay)
-			shot_number = 0
-		if(!target)
-			P.setDir(src.dir)
-			P.starting = loc
-		else
-			if(QDELETED(target))
-				target = null
-	P.fire()
-	return P
-
-/obj/machinery/power/emitter/can_be_unfasten_wrench(mob/user, silent)
-	if(state == EM_WELDED)
-		if(!silent)
-			to_chat(user, "<span class='warning'>[src] is welded to the floor!</span>")
-		return FAILED_UNFASTEN
-	return ..()
-
-/obj/machinery/power/emitter/default_unfasten_wrench(mob/user, obj/item/weapon/wrench/W, time = 20)
-	. = ..()
-	if(. == SUCCESSFUL_UNFASTEN)
-		if(anchored)
-			state = EM_SECURED
-		else
-			state = EM_UNSECURED
-
-/obj/machinery/power/emitter/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/wrench))
-		if(active)
-			to_chat(user, "<span class='warning'>Turn \the [src] off first!</span>")
-			return
-		default_unfasten_wrench(user, W, 0)
-		return
-
-	if(istype(W, /obj/item/weapon/weldingtool))
-		var/obj/item/weapon/weldingtool/WT = W
-		if(active)
-			to_chat(user, "Turn \the [src] off first.")
-			return
-		switch(state)
-			if(EM_UNSECURED)
-				to_chat(user, "<span class='warning'>The [src.name] needs to be wrenched to the floor!</span>")
-			if(EM_SECURED)
-				if(WT.remove_fuel(0,user))
-					playsound(loc, WT.usesound, 50, 1)
-					user.visible_message("[user.name] starts to weld the [name] to the floor.", \
-						"<span class='notice'>You start to weld \the [src] to the floor...</span>", \
-						"<span class='italics'>You hear welding.</span>")
-					if(do_after(user,20*W.toolspeed, target = src) && WT.isOn())
-						state = EM_WELDED
-						to_chat(user, "<span class='notice'>You weld \the [src] to the floor.</span>")
-						connect_to_network()
-			if(EM_WELDED)
-				if(WT.remove_fuel(0,user))
-					playsound(loc, WT.usesound, 50, 1)
-					user.visible_message("[user.name] starts to cut the [name] free from the floor.", \
-						"<span class='notice'>You start to cut \the [src] free from the floor...</span>", \
-						"<span class='italics'>You hear welding.</span>")
-					if(do_after(user,20*W.toolspeed, target = src) && WT.isOn())
-						state = EM_SECURED
-						to_chat(user, "<span class='notice'>You cut \the [src] free from the floor.</span>")
-						disconnect_from_network()
-		return
-
-	if(W.GetID())
-		if(emagged)
-			to_chat(user, "<span class='warning'>The lock seems to be broken!</span>")
-			return
-		if(allowed(user))
-			if(active)
-				locked = !locked
-				to_chat(user, "<span class='notice'>You [src.locked ? "lock" : "unlock"] the controls.</span>")
-			else
-				to_chat(user, "<span class='warning'>The controls can only be locked when \the [src] is online!</span>")
-		else
-			to_chat(user, "<span class='danger'>Access denied.</span>")
-		return
-
-	if(is_wire_tool(W) && panel_open)
-		wires.interact(user)
-		return
-
-	if(default_deconstruction_screwdriver(user, "emitter_open", "emitter", W))
-		return
-
-	if(exchange_parts(user, W))
-		return
-
-	if(default_pry_open(W))
-		return
-
-	if(default_deconstruction_crowbar(W))
-		return
-
-	return ..()
-
-/obj/machinery/power/emitter/emag_act(mob/user)
-	if(!emagged)
-		locked = 0
-		emagged = 1
-		if(user)
-			user.visible_message("[user.name] emags the [src.name].","<span class='notice'>You short out the lock.</span>")
-
-
-/obj/machinery/power/emitter/prototype
-	name = "Prototype Emitter"
-	icon = 'icons/obj/turrets.dmi'
-	icon_state = "protoemitter"
-	icon_state_on = "protoemitter_+a"
-	can_buckle = TRUE
-	buckle_lying = 0
-	var/view_range = 12
-	var/datum/action/innate/protoemitter/firing/auto
-
-//BUCKLE HOOKS
-
-/obj/machinery/power/emitter/prototype/unbuckle_mob(mob/living/buckled_mob,force = 0)
-	playsound(src,'sound/mecha/mechmove01.ogg', 50, 1)
-	manual = FALSE
-	for(var/obj/item/I in buckled_mob.held_items)
-		if(istype(I, /obj/item/weapon/turret_control))
-			qdel(I)
-	if(istype(buckled_mob))
-		buckled_mob.pixel_x = 0
-		buckled_mob.pixel_y = 0
-		if(buckled_mob.client)
-			buckled_mob.client.change_view(world.view)
-	auto.Remove(buckled_mob)
-	. = ..()
-
-/obj/machinery/power/emitter/prototype/user_buckle_mob(mob/living/M, mob/living/carbon/user)
-	if(user.incapacitated() || !istype(user))
-		return
-	for(var/atom/movable/A in get_turf(src))
-		if(A.density && (A != src && A != M))
-			return
-	M.forceMove(get_turf(src))
-	..()
-	playsound(src,'sound/mecha/mechmove01.ogg', 50, 1)
-	M.pixel_y = 14
-	layer = 4.1
-	if(M.client)
-		M.client.change_view(view_range)
-	if(!auto)
-		auto = new()
-	auto.Grant(M, src)
-
-/datum/action/innate/protoemitter
-	check_flags = AB_CHECK_RESTRAINED | AB_CHECK_STUNNED | AB_CHECK_CONSCIOUS
-	var/obj/machinery/power/emitter/prototype/PE
-	var/mob/living/carbon/U
-
-
-/datum/action/innate/protoemitter/Grant(mob/living/carbon/L, obj/machinery/power/emitter/prototype/proto)
-	PE = proto
-	U = L
-	. = ..()
-
-/datum/action/innate/protoemitter/firing
-	name = "Switch to Manual Firing"
-	desc = "The emitter will only fire on your command and at your designated target"
-	button_icon_state = "mech_zoom_on"
-
-/datum/action/innate/protoemitter/firing/Activate()
-	if(PE.manual)
-		playsound(PE,'sound/mecha/mechmove01.ogg', 50, 1)
-		PE.manual = FALSE
-		name = "Switch to Manual Firing"
-		desc = "The emitter will only fire on your command and at your designated target"
-		button_icon_state = "mech_zoom_on"
-		for(var/obj/item/I in U.held_items)
-			if(istype(I, /obj/item/weapon/turret_control))
-				qdel(I)
-		UpdateButtonIcon()
-		return
-	else
-		playsound(PE,'sound/mecha/mechmove01.ogg', 50, 1)
-		name = "Switch to Automatic Firing"
-		desc = "Emitters will switch to periodic firing at your last target"
-		button_icon_state = "mech_zoom_off"
-		PE.manual = TRUE
-		for(var/V in U.held_items)
-			var/obj/item/I = V
-			if(istype(I))
-				if(U.dropItemToGround(I))
-					var/obj/item/weapon/turret_control/TC = new /obj/item/weapon/turret_control()
-					U.put_in_hands(TC)
-			else	//Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand
-				var/obj/item/weapon/turret_control/TC = new /obj/item/weapon/turret_control()
-				U.put_in_hands(TC)
-		UpdateButtonIcon()
-
-
-/obj/item/weapon/turret_control
-	name = "turret controls"
-	icon_state = "offhand"
-	w_class = WEIGHT_CLASS_HUGE
-	flags = ABSTRACT | NODROP
-	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF | NOBLUDGEON
-	var/delay = 0
-
-/obj/item/weapon/turret_control/afterattack(atom/targeted_atom, mob/user)
-	..()
-	var/obj/machinery/power/emitter/E = user.buckled
-	E.setDir(get_dir(E,targeted_atom))
-	user.setDir(E.dir)
-	switch(E.dir)
-		if(NORTH)
-			E.layer = 3.9
-			user.pixel_x = 0
-			user.pixel_y = -14
-		if(NORTHEAST)
-			E.layer = 3.9
-			user.pixel_x = -8
-			user.pixel_y = -12
-		if(EAST)
-			E.layer = 4.1
-			user.pixel_x = -14
-			user.pixel_y = 0
-		if(SOUTHEAST)
-			E.layer = 3.9
-			user.pixel_x = -8
-			user.pixel_y = 12
-		if(SOUTH)
-			E.layer = 4.1
-			user.pixel_x = 0
-			user.pixel_y = 14
-		if(SOUTHWEST)
-			E.layer = 3.9
-			user.pixel_x = 8
-			user.pixel_y = 12
-		if(WEST)
-			E.layer = 4.1
-			user.pixel_x = 14
-			user.pixel_y = 0
-		if(NORTHWEST)
-			E.layer = 3.9
-			user.pixel_x = 8
-			user.pixel_y = -12
-
-	if(E.charge >= 10 && world.time > delay)
-		E.charge -= 10
-		E.target = targeted_atom
-		E.fire_beam(targeted_atom, user)
-		delay = world.time + 10
-	else if (E.charge < 10)
-		playsound(get_turf(user),'sound/machines/buzz-sigh.ogg', 50, 1)
+/obj/machinery/power/emitter
+	name = "Emitter"
+	desc = "A heavy duty industrial laser.\n<span class='notice'>Alt-click to rotate it clockwise.</span>"
+	icon = 'icons/obj/singularity.dmi'
+	icon_state = "emitter"
+	var/icon_state_on = "emitter_+a"
+	anchored = 0
+	density = 1
+	req_access = list(GLOB.access_engine_equip)
+
+	// The following 3 vars are mostly for the prototype
+	var/manual = FALSE
+	var/charge = 0
+	var/atom/target = null
+
+	use_power = 0
+	idle_power_usage = 10
+	active_power_usage = 300
+
+	var/active = 0
+	var/powered = 0
+	var/fire_delay = 100
+	var/maximum_fire_delay = 100
+	var/minimum_fire_delay = 20
+	var/last_shot = 0
+	var/shot_number = 0
+	var/state = 0
+	var/locked = 0
+
+	var/projectile_type = /obj/item/projectile/beam/emitter
+
+	var/projectile_sound = 'sound/weapons/emitter.ogg'
+
+	var/datum/effect_system/spark_spread/sparks
+
+/obj/machinery/power/emitter/New()
+	..()
+	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/emitter(null)
+	B.apply_default_parts(src)
+	RefreshParts()
+	wires = new /datum/wires/emitter(src)
+
+/obj/item/weapon/circuitboard/machine/emitter
+	name = "Emitter (Machine Board)"
+	build_path = /obj/machinery/power/emitter
+	origin_tech = "programming=3;powerstorage=4;engineering=4"
+	req_components = list(
+							/obj/item/weapon/stock_parts/micro_laser = 1,
+							/obj/item/weapon/stock_parts/manipulator = 1)
+
+/obj/machinery/power/emitter/RefreshParts()
+	var/max_firedelay = 120
+	var/firedelay = 120
+	var/min_firedelay = 24
+	var/power_usage = 350
+	for(var/obj/item/weapon/stock_parts/micro_laser/L in component_parts)
+		max_firedelay -= 20 * L.rating
+		min_firedelay -= 4 * L.rating
+		firedelay -= 20 * L.rating
+	maximum_fire_delay = max_firedelay
+	minimum_fire_delay = min_firedelay
+	fire_delay = firedelay
+	for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
+		power_usage -= 50 * M.rating
+	active_power_usage = power_usage
+
+/obj/machinery/power/emitter/verb/rotate()
+	set name = "Rotate"
+	set category = "Object"
+	set src in oview(1)
+
+	if(usr.stat || !usr.canmove || usr.restrained())
+		return
+	if (src.anchored)
+		to_chat(usr, "<span class='warning'>It is fastened to the floor!</span>")
+		return 0
+	src.setDir(turn(src.dir, 270))
+	return 1
+
+/obj/machinery/power/emitter/AltClick(mob/user)
+	..()
+	if(user.incapacitated())
+		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
+		return
+	if(!in_range(src, user))
+		return
+	else
+		rotate()
+
+/obj/machinery/power/emitter/Initialize()
+	. = ..()
+	if(state == 2 && anchored)
+		connect_to_network()
+
+	sparks = new
+	sparks.attach(src)
+	sparks.set_up(5, TRUE, src)
+
+/obj/machinery/power/emitter/Destroy()
+	if(SSticker && SSticker.IsRoundInProgress())
+		message_admins("Emitter deleted at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
+		log_game("Emitter deleted at ([x],[y],[z])")
+		investigate_log("<font color='red'>deleted</font> at ([x],[y],[z]) at [get_area(src)]","singulo")
+	QDEL_NULL(sparks)
+	return ..()
+
+/obj/machinery/power/emitter/update_icon()
+	if (active && powernet && avail(active_power_usage))
+		icon_state = icon_state_on
+	else
+		icon_state = initial(icon_state)
+
+
+/obj/machinery/power/emitter/attack_hand(mob/user)
+	src.add_fingerprint(user)
+	if(state == 2)
+		if(!powernet)
+			to_chat(user, "<span class='warning'>The emitter isn't connected to a wire!</span>")
+			return 1
+		if(!src.locked)
+			if(src.active==1)
+				src.active = 0
+				to_chat(user, "<span class='notice'>You turn off \the [src].</span>")
+				message_admins("Emitter turned off by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(src)]",0,1)
+				log_game("Emitter turned off by [key_name(user)] in [COORD(src)]")
+				investigate_log("turned <font color='red'>off</font> by [key_name(user)] at [get_area(src)]","singulo")
+			else
+				src.active = 1
+				to_chat(user, "<span class='notice'>You turn on \the [src].</span>")
+				src.shot_number = 0
+				src.fire_delay = maximum_fire_delay
+				investigate_log("turned <font color='green'>on</font> by [key_name(user)] at [get_area(src)]","singulo")
+			update_icon()
+		else
+			to_chat(user, "<span class='warning'>The controls are locked!</span>")
+	else
+		to_chat(user, "<span class='warning'>The [src] needs to be firmly secured to the floor first!</span>")
+		return 1
+
+/obj/machinery/power/emitter/attack_animal(mob/living/simple_animal/M)
+	if(ismegafauna(M) && anchored)
+		state = 0
+		anchored = FALSE
+		M.visible_message("<span class='warning'>[M] rips [src] free from its moorings!</span>")
+	else
+		..()
+	if(!anchored)
+		step(src, get_dir(M, src))
+
+
+/obj/machinery/power/emitter/emp_act(severity)//Emitters are hardened but still might have issues
+//	add_load(1000)
+/*	if((severity == 1)&&prob(1)&&prob(1))
+		if(src.active)
+			src.active = 0
+			src.use_power = 1	*/
+	return 1
+
+
+/obj/machinery/power/emitter/process()
+	if(stat & (BROKEN))
+		return
+	if(src.state != 2 || (!powernet && active_power_usage))
+		src.active = 0
+		update_icon()
+		return
+	if(src.active == 1)
+		if(!active_power_usage || avail(active_power_usage))
+			add_load(active_power_usage)
+			if(!powered)
+				powered = 1
+				update_icon()
+				investigate_log("regained power and turned <font color='green'>on</font> at [get_area(src)]","singulo")
+		else
+			if(powered)
+				powered = 0
+				update_icon()
+				investigate_log("lost power and turned <font color='red'>off</font> at [get_area(src)]","singulo")
+				log_game("Emitter lost power in ([x],[y],[z])")
+			return
+		if(charge <=80)
+			charge+=5
+		if(!check_delay() || manual == TRUE)
+			return FALSE
+		fire_beam(target)
+
+/obj/machinery/power/emitter/proc/check_delay()
+	if((src.last_shot + src.fire_delay) <= world.time)
+		return TRUE
+	return FALSE
+
+/obj/machinery/power/emitter/proc/fire_beam_pulse()
+	if(!check_delay())
+		return FALSE
+	if(state != 2)
+		return FALSE
+	if(avail(active_power_usage))
+		add_load(active_power_usage)
+		fire_beam()
+
+/obj/machinery/power/emitter/proc/fire_beam(atom/targeted_atom, mob/user)
+	var/turf/targets_from = get_turf(src)
+	if(targeted_atom && (targeted_atom == user || targeted_atom == targets_from || targeted_atom == src))
+		return
+	var/obj/item/projectile/P = new projectile_type(targets_from)
+	playsound(src.loc, projectile_sound, 50, 1)
+	if(prob(35))
+		sparks.start()
+	switch(dir)
+		if(NORTH)
+			P.yo = 20
+			P.xo = 0
+		if(NORTHEAST)
+			P.yo = 20
+			P.xo = 20
+		if(EAST)
+			P.yo = 0
+			P.xo = 20
+		if(SOUTHEAST)
+			P.yo = -20
+			P.xo = 20
+		if(WEST)
+			P.yo = 0
+			P.xo = -20
+		if(SOUTHWEST)
+			P.yo = -20
+			P.xo = -20
+		if(NORTHWEST)
+			P.yo = 20
+			P.xo = -20
+		else // Any other
+			P.yo = -20
+			P.xo = 0
+	if(target)
+		P.yo = targeted_atom.y - targets_from.y
+		P.xo = targeted_atom.x - targets_from.x
+		P.current = targets_from
+		P.starting = targets_from
+		P.firer = src
+		P.original = targeted_atom
+	if(!manual)
+		last_shot = world.time
+		if(shot_number < 3)
+			fire_delay = 20
+			shot_number ++
+		else
+			fire_delay = rand(minimum_fire_delay,maximum_fire_delay)
+			shot_number = 0
+		if(!target)
+			P.setDir(src.dir)
+			P.starting = loc
+		else
+			if(QDELETED(target))
+				target = null
+	P.fire()
+	return P
+
+/obj/machinery/power/emitter/can_be_unfasten_wrench(mob/user, silent)
+	if(state == EM_WELDED)
+		if(!silent)
+			to_chat(user, "<span class='warning'>[src] is welded to the floor!</span>")
+		return FAILED_UNFASTEN
+	return ..()
+
+/obj/machinery/power/emitter/default_unfasten_wrench(mob/user, obj/item/weapon/wrench/W, time = 20)
+	. = ..()
+	if(. == SUCCESSFUL_UNFASTEN)
+		if(anchored)
+			state = EM_SECURED
+		else
+			state = EM_UNSECURED
+
+/obj/machinery/power/emitter/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/weapon/wrench))
+		if(active)
+			to_chat(user, "<span class='warning'>Turn \the [src] off first!</span>")
+			return
+		default_unfasten_wrench(user, W, 0)
+		return
+
+	if(istype(W, /obj/item/weapon/weldingtool))
+		var/obj/item/weapon/weldingtool/WT = W
+		if(active)
+			to_chat(user, "Turn \the [src] off first.")
+			return
+		switch(state)
+			if(EM_UNSECURED)
+				to_chat(user, "<span class='warning'>The [src.name] needs to be wrenched to the floor!</span>")
+			if(EM_SECURED)
+				if(WT.remove_fuel(0,user))
+					playsound(loc, WT.usesound, 50, 1)
+					user.visible_message("[user.name] starts to weld the [name] to the floor.", \
+						"<span class='notice'>You start to weld \the [src] to the floor...</span>", \
+						"<span class='italics'>You hear welding.</span>")
+					if(do_after(user,20*W.toolspeed, target = src) && WT.isOn())
+						state = EM_WELDED
+						to_chat(user, "<span class='notice'>You weld \the [src] to the floor.</span>")
+						connect_to_network()
+			if(EM_WELDED)
+				if(WT.remove_fuel(0,user))
+					playsound(loc, WT.usesound, 50, 1)
+					user.visible_message("[user.name] starts to cut the [name] free from the floor.", \
+						"<span class='notice'>You start to cut \the [src] free from the floor...</span>", \
+						"<span class='italics'>You hear welding.</span>")
+					if(do_after(user,20*W.toolspeed, target = src) && WT.isOn())
+						state = EM_SECURED
+						to_chat(user, "<span class='notice'>You cut \the [src] free from the floor.</span>")
+						disconnect_from_network()
+		return
+
+	if(W.GetID())
+		if(emagged)
+			to_chat(user, "<span class='warning'>The lock seems to be broken!</span>")
+			return
+		if(allowed(user))
+			if(active)
+				locked = !locked
+				to_chat(user, "<span class='notice'>You [src.locked ? "lock" : "unlock"] the controls.</span>")
+			else
+				to_chat(user, "<span class='warning'>The controls can only be locked when \the [src] is online!</span>")
+		else
+			to_chat(user, "<span class='danger'>Access denied.</span>")
+		return
+
+	if(is_wire_tool(W) && panel_open)
+		wires.interact(user)
+		return
+
+	if(default_deconstruction_screwdriver(user, "emitter_open", "emitter", W))
+		return
+
+	if(exchange_parts(user, W))
+		return
+
+	if(default_pry_open(W))
+		return
+
+	if(default_deconstruction_crowbar(W))
+		return
+
+	return ..()
+
+/obj/machinery/power/emitter/emag_act(mob/user)
+	if(!emagged)
+		locked = 0
+		emagged = 1
+		if(user)
+			user.visible_message("[user.name] emags the [src.name].","<span class='notice'>You short out the lock.</span>")
+
+
+/obj/machinery/power/emitter/prototype
+	name = "Prototype Emitter"
+	icon = 'icons/obj/turrets.dmi'
+	icon_state = "protoemitter"
+	icon_state_on = "protoemitter_+a"
+	can_buckle = TRUE
+	buckle_lying = 0
+	var/view_range = 12
+	var/datum/action/innate/protoemitter/firing/auto
+
+//BUCKLE HOOKS
+
+/obj/machinery/power/emitter/prototype/unbuckle_mob(mob/living/buckled_mob,force = 0)
+	playsound(src,'sound/mecha/mechmove01.ogg', 50, 1)
+	manual = FALSE
+	for(var/obj/item/I in buckled_mob.held_items)
+		if(istype(I, /obj/item/weapon/turret_control))
+			qdel(I)
+	if(istype(buckled_mob))
+		buckled_mob.pixel_x = 0
+		buckled_mob.pixel_y = 0
+		if(buckled_mob.client)
+			buckled_mob.client.change_view(world.view)
+	auto.Remove(buckled_mob)
+	. = ..()
+
+/obj/machinery/power/emitter/prototype/user_buckle_mob(mob/living/M, mob/living/carbon/user)
+	if(user.incapacitated() || !istype(user))
+		return
+	for(var/atom/movable/A in get_turf(src))
+		if(A.density && (A != src && A != M))
+			return
+	M.forceMove(get_turf(src))
+	..()
+	playsound(src,'sound/mecha/mechmove01.ogg', 50, 1)
+	M.pixel_y = 14
+	layer = 4.1
+	if(M.client)
+		M.client.change_view(view_range)
+	if(!auto)
+		auto = new()
+	auto.Grant(M, src)
+
+/datum/action/innate/protoemitter
+	check_flags = AB_CHECK_RESTRAINED | AB_CHECK_STUNNED | AB_CHECK_CONSCIOUS
+	var/obj/machinery/power/emitter/prototype/PE
+	var/mob/living/carbon/U
+
+
+/datum/action/innate/protoemitter/Grant(mob/living/carbon/L, obj/machinery/power/emitter/prototype/proto)
+	PE = proto
+	U = L
+	. = ..()
+
+/datum/action/innate/protoemitter/firing
+	name = "Switch to Manual Firing"
+	desc = "The emitter will only fire on your command and at your designated target"
+	button_icon_state = "mech_zoom_on"
+
+/datum/action/innate/protoemitter/firing/Activate()
+	if(PE.manual)
+		playsound(PE,'sound/mecha/mechmove01.ogg', 50, 1)
+		PE.manual = FALSE
+		name = "Switch to Manual Firing"
+		desc = "The emitter will only fire on your command and at your designated target"
+		button_icon_state = "mech_zoom_on"
+		for(var/obj/item/I in U.held_items)
+			if(istype(I, /obj/item/weapon/turret_control))
+				qdel(I)
+		UpdateButtonIcon()
+		return
+	else
+		playsound(PE,'sound/mecha/mechmove01.ogg', 50, 1)
+		name = "Switch to Automatic Firing"
+		desc = "Emitters will switch to periodic firing at your last target"
+		button_icon_state = "mech_zoom_off"
+		PE.manual = TRUE
+		for(var/V in U.held_items)
+			var/obj/item/I = V
+			if(istype(I))
+				if(U.dropItemToGround(I))
+					var/obj/item/weapon/turret_control/TC = new /obj/item/weapon/turret_control()
+					U.put_in_hands(TC)
+			else	//Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand
+				var/obj/item/weapon/turret_control/TC = new /obj/item/weapon/turret_control()
+				U.put_in_hands(TC)
+		UpdateButtonIcon()
+
+
+/obj/item/weapon/turret_control
+	name = "turret controls"
+	icon_state = "offhand"
+	w_class = WEIGHT_CLASS_HUGE
+	flags = ABSTRACT | NODROP
+	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF | NOBLUDGEON
+	var/delay = 0
+
+/obj/item/weapon/turret_control/afterattack(atom/targeted_atom, mob/user)
+	..()
+	var/obj/machinery/power/emitter/E = user.buckled
+	E.setDir(get_dir(E,targeted_atom))
+	user.setDir(E.dir)
+	switch(E.dir)
+		if(NORTH)
+			E.layer = 3.9
+			user.pixel_x = 0
+			user.pixel_y = -14
+		if(NORTHEAST)
+			E.layer = 3.9
+			user.pixel_x = -8
+			user.pixel_y = -12
+		if(EAST)
+			E.layer = 4.1
+			user.pixel_x = -14
+			user.pixel_y = 0
+		if(SOUTHEAST)
+			E.layer = 3.9
+			user.pixel_x = -8
+			user.pixel_y = 12
+		if(SOUTH)
+			E.layer = 4.1
+			user.pixel_x = 0
+			user.pixel_y = 14
+		if(SOUTHWEST)
+			E.layer = 3.9
+			user.pixel_x = 8
+			user.pixel_y = 12
+		if(WEST)
+			E.layer = 4.1
+			user.pixel_x = 14
+			user.pixel_y = 0
+		if(NORTHWEST)
+			E.layer = 3.9
+			user.pixel_x = 8
+			user.pixel_y = -12
+
+	if(E.charge >= 10 && world.time > delay)
+		E.charge -= 10
+		E.target = targeted_atom
+		E.fire_beam(targeted_atom, user)
+		delay = world.time + 10
+	else if (E.charge < 10)
+		playsound(get_turf(user),'sound/machines/buzz-sigh.ogg', 50, 1)

code/modules/power/singularity/particle_accelerator/particle_control.dm

@@ -1,328 +1,328 @@
-/obj/machinery/particle_accelerator/control_box
-	name = "Particle Accelerator Control Console"
-	desc = "This controls the density of the particles."
-	icon = 'icons/obj/machines/particle_accelerator.dmi'
-	icon_state = "control_box"
-	anchored = 0
-	density = 1
-	use_power = 0
-	idle_power_usage = 500
-	active_power_usage = 10000
-	dir = NORTH
-	var/strength_upper_limit = 2
-	var/interface_control = 1
-	var/list/obj/structure/particle_accelerator/connected_parts
-	var/assembled = 0
-	var/construction_state = PA_CONSTRUCTION_UNSECURED
-	var/active = 0
-	var/strength = 0
-	var/powered = 0
-	mouse_opacity = 2
-
-/obj/machinery/particle_accelerator/control_box/New()
-	wires = new /datum/wires/particle_accelerator/control_box(src)
-	connected_parts = list()
-	..()
-
-/obj/machinery/particle_accelerator/control_box/Destroy()
-	if(active)
-		toggle_power()
-	for(var/CP in connected_parts)
-		var/obj/structure/particle_accelerator/part = CP
-		part.master = null
-	connected_parts.Cut()
-	qdel(wires)
-	wires = null
-	return ..()
-
-/obj/machinery/particle_accelerator/control_box/attack_hand(mob/user)
-	if(construction_state == PA_CONSTRUCTION_COMPLETE)
-		interact(user)
-	else if(construction_state == PA_CONSTRUCTION_PANEL_OPEN)
-		wires.interact(user)
-
-/obj/machinery/particle_accelerator/control_box/proc/update_state()
-	if(construction_state < PA_CONSTRUCTION_COMPLETE)
-		use_power = 0
-		assembled = 0
-		active = 0
-		for(var/CP in connected_parts)
-			var/obj/structure/particle_accelerator/part = CP
-			part.strength = null
-			part.powered = 0
-			part.update_icon()
-		connected_parts.Cut()
-		return
-	if(!part_scan())
-		use_power = 1
-		active = 0
-		connected_parts.Cut()
-
-/obj/machinery/particle_accelerator/control_box/update_icon()
-	if(active)
-		icon_state = "control_boxp1"
-	else
-		if(use_power)
-			if(assembled)
-				icon_state = "control_boxp"
-			else
-				icon_state = "ucontrol_boxp"
-		else
-			switch(construction_state)
-				if(PA_CONSTRUCTION_UNSECURED, PA_CONSTRUCTION_UNWIRED)
-					icon_state = "control_box"
-				if(PA_CONSTRUCTION_PANEL_OPEN)
-					icon_state = "control_boxw"
-				else
-					icon_state = "control_boxc"
-
-/obj/machinery/particle_accelerator/control_box/Topic(href, href_list)
-	if(..())
-		return
-
-	if(!interface_control)
-		to_chat(usr, "<span class='error'>ERROR: Request timed out. Check wire contacts.</span>")
-		return
-
-	if(href_list["close"])
-		usr << browse(null, "window=pacontrol")
-		usr.unset_machine()
-		return
-	if(href_list["togglep"])
-		if(!wires.is_cut(WIRE_POWER))
-			toggle_power()
-
-	else if(href_list["scan"])
-		part_scan()
-
-	else if(href_list["strengthup"])
-		if(!wires.is_cut(WIRE_STRENGTH))
-			add_strength()
-
-	else if(href_list["strengthdown"])
-		if(!wires.is_cut(WIRE_STRENGTH))
-			remove_strength()
-
-	updateDialog()
-	update_icon()
-
-/obj/machinery/particle_accelerator/control_box/proc/strength_change()
-	for(var/CP in connected_parts)
-		var/obj/structure/particle_accelerator/part = CP
-		part.strength = strength
-		part.update_icon()
-
-/obj/machinery/particle_accelerator/control_box/proc/add_strength(s)
-	if(assembled && (strength < strength_upper_limit))
-		strength++
-		strength_change()
-
-		message_admins("PA Control Computer increased to [strength] by [ADMIN_LOOKUPFLW(usr)] in [ADMIN_COORDJMP(src)]",0,1)
-		log_game("PA Control Computer increased to [strength] by [key_name(usr)] in [COORD(src)]")
-		investigate_log("increased to <font color='red'>[strength]</font> by [key_name(usr)]","singulo")
-
-
-/obj/machinery/particle_accelerator/control_box/proc/remove_strength(s)
-	if(assembled && (strength > 0))
-		strength--
-		strength_change()
-
-		message_admins("PA Control Computer decreased to [strength] by [ADMIN_LOOKUPFLW(usr)] in [ADMIN_COORDJMP(src)]",0,1)
-		log_game("PA Control Computer decreased to [strength] by [key_name(usr)] in [COORD(src)]")
-		investigate_log("decreased to <font color='green'>[strength]</font> by [key_name(usr)]","singulo")
-
-
-/obj/machinery/particle_accelerator/control_box/power_change()
-	..()
-	if(stat & NOPOWER)
-		active = 0
-		use_power = 0
-	else if(!stat && construction_state == PA_CONSTRUCTION_COMPLETE)
-		use_power = 1
-
-/obj/machinery/particle_accelerator/control_box/process()
-	if(active)
-		//a part is missing!
-		if(connected_parts.len < 6)
-			investigate_log("lost a connected part; It <font color='red'>powered down</font>.","singulo")
-			toggle_power()
-			update_icon()
-			return
-		//emit some particles
-		for(var/obj/structure/particle_accelerator/particle_emitter/PE in connected_parts)
-			PE.emit_particle(strength)
-
-/obj/machinery/particle_accelerator/control_box/proc/part_scan()
-	var/ldir = turn(dir,-90)
-	var/rdir = turn(dir,90)
-	var/odir = turn(dir,180)
-	var/turf/T = loc
-
-	assembled = 0
-	critical_machine = FALSE
-
-	var/obj/structure/particle_accelerator/fuel_chamber/F = locate() in orange(1,src)
-	if(!F)
-		return 0
-
-	setDir(F.dir)
-	connected_parts.Cut()
-
-	T = get_step(T,rdir)
-	if(!check_part(T,/obj/structure/particle_accelerator/fuel_chamber))
-		return 0
-	T = get_step(T,odir)
-	if(!check_part(T,/obj/structure/particle_accelerator/end_cap))
-		return 0
-	T = get_step(T,dir)
-	T = get_step(T,dir)
-	if(!check_part(T,/obj/structure/particle_accelerator/power_box))
-		return 0
-	T = get_step(T,dir)
-	if(!check_part(T,/obj/structure/particle_accelerator/particle_emitter/center))
-		return 0
-	T = get_step(T,ldir)
-	if(!check_part(T,/obj/structure/particle_accelerator/particle_emitter/left))
-		return 0
-	T = get_step(T,rdir)
-	T = get_step(T,rdir)
-	if(!check_part(T,/obj/structure/particle_accelerator/particle_emitter/right))
-		return 0
-
-	assembled = 1
-	critical_machine = TRUE	//Only counts if the PA is actually assembled.
-	return 1
-
-/obj/machinery/particle_accelerator/control_box/proc/check_part(turf/T, type)
-	var/obj/structure/particle_accelerator/PA = locate(/obj/structure/particle_accelerator) in T
-	if(istype(PA, type) && (PA.construction_state == PA_CONSTRUCTION_COMPLETE))
-		if(PA.connect_master(src))
-			connected_parts.Add(PA)
-			return 1
-	return 0
-
-
-/obj/machinery/particle_accelerator/control_box/proc/toggle_power()
-	active = !active
-	investigate_log("turned [active?"<font color='green'>ON</font>":"<font color='red'>OFF</font>"] by [usr ? key_name(usr) : "outside forces"]","singulo")
-	message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? key_name_admin(usr) : "outside forces"](<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[usr]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
-	log_game("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? "[key_name(usr)]" : "outside forces"] in ([x],[y],[z])")
-	if(active)
-		use_power = 2
-		for(var/CP in connected_parts)
-			var/obj/structure/particle_accelerator/part = CP
-			part.strength = strength
-			part.powered = 1
-			part.update_icon()
-	else
-		use_power = 1
-		for(var/CP in connected_parts)
-			var/obj/structure/particle_accelerator/part = CP
-			part.strength = null
-			part.powered = 0
-			part.update_icon()
-	return 1
-
-
-/obj/machinery/particle_accelerator/control_box/interact(mob/user)
-	if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER)))
-		if(!issilicon(user))
-			user.unset_machine()
-			user << browse(null, "window=pacontrol")
-			return
-	user.set_machine(src)
-
-	var/dat = ""
-	dat += "<A href='?src=\ref[src];close=1'>Close</A><BR><BR>"
-	dat += "<h3>Status</h3>"
-	if(!assembled)
-		dat += "Unable to detect all parts!<BR>"
-		dat += "<A href='?src=\ref[src];scan=1'>Run Scan</A><BR><BR>"
-	else
-		dat += "All parts in place.<BR><BR>"
-		dat += "Power:"
-		if(active)
-			dat += "On<BR>"
-		else
-			dat += "Off <BR>"
-		dat += "<A href='?src=\ref[src];togglep=1'>Toggle Power</A><BR><BR>"
-		dat += "Particle Strength: [strength] "
-		dat += "<A href='?src=\ref[src];strengthdown=1'>--</A>|<A href='?src=\ref[src];strengthup=1'>++</A><BR><BR>"
-
-	var/datum/browser/popup = new(user, "pacontrol", name, 420, 300)
-	popup.set_content(dat)
-	popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
-	popup.open()
-
-/obj/machinery/particle_accelerator/control_box/examine(mob/user)
-	..()
-	switch(construction_state)
-		if(PA_CONSTRUCTION_UNSECURED)
-			to_chat(user, "Looks like it's not attached to the flooring")
-		if(PA_CONSTRUCTION_UNWIRED)
-			to_chat(user, "It is missing some cables")
-		if(PA_CONSTRUCTION_PANEL_OPEN)
-			to_chat(user, "The panel is open")
-
-
-/obj/machinery/particle_accelerator/control_box/attackby(obj/item/W, mob/user, params)
-	var/did_something = FALSE
-
-	switch(construction_state)
-		if(PA_CONSTRUCTION_UNSECURED)
-			if(istype(W, /obj/item/weapon/wrench) && !isinspace())
-				playsound(loc, W.usesound, 75, 1)
-				anchored = 1
-				user.visible_message("[user.name] secures the [name] to the floor.", \
-					"You secure the external bolts.")
-				construction_state = PA_CONSTRUCTION_UNWIRED
-				did_something = TRUE
-		if(PA_CONSTRUCTION_UNWIRED)
-			if(istype(W, /obj/item/weapon/wrench))
-				playsound(loc, W.usesound, 75, 1)
-				anchored = 0
-				user.visible_message("[user.name] detaches the [name] from the floor.", \
-					"You remove the external bolts.")
-				construction_state = PA_CONSTRUCTION_UNSECURED
-				did_something = TRUE
-			else if(istype(W, /obj/item/stack/cable_coil))
-				var/obj/item/stack/cable_coil/CC = W
-				if(CC.use(1))
-					user.visible_message("[user.name] adds wires to the [name].", \
-						"You add some wires.")
-					construction_state = PA_CONSTRUCTION_PANEL_OPEN
-					did_something = TRUE
-		if(PA_CONSTRUCTION_PANEL_OPEN)
-			if(istype(W, /obj/item/weapon/wirecutters))//TODO:Shock user if its on?
-				user.visible_message("[user.name] removes some wires from the [name].", \
-					"You remove some wires.")
-				construction_state = PA_CONSTRUCTION_UNWIRED
-				did_something = TRUE
-			else if(istype(W, /obj/item/weapon/screwdriver))
-				user.visible_message("[user.name] closes the [name]'s access panel.", \
-					"You close the access panel.")
-				construction_state = PA_CONSTRUCTION_COMPLETE
-				did_something = TRUE
-		if(PA_CONSTRUCTION_COMPLETE)
-			if(istype(W, /obj/item/weapon/screwdriver))
-				user.visible_message("[user.name] opens the [name]'s access panel.", \
-					"You open the access panel.")
-				construction_state = PA_CONSTRUCTION_PANEL_OPEN
-				did_something = TRUE
-
-	if(did_something)
-		user.changeNext_move(CLICK_CD_MELEE)
-		update_state()
-		update_icon()
-		return
-
-	..()
-
-/obj/machinery/particle_accelerator/control_box/blob_act(obj/structure/blob/B)
-	if(prob(50))
-		qdel(src)
-
-#undef PA_CONSTRUCTION_UNSECURED
-#undef PA_CONSTRUCTION_UNWIRED
-#undef PA_CONSTRUCTION_PANEL_OPEN
-#undef PA_CONSTRUCTION_COMPLETE
+/obj/machinery/particle_accelerator/control_box
+	name = "Particle Accelerator Control Console"
+	desc = "This controls the density of the particles."
+	icon = 'icons/obj/machines/particle_accelerator.dmi'
+	icon_state = "control_box"
+	anchored = 0
+	density = 1
+	use_power = 0
+	idle_power_usage = 500
+	active_power_usage = 10000
+	dir = NORTH
+	var/strength_upper_limit = 2
+	var/interface_control = 1
+	var/list/obj/structure/particle_accelerator/connected_parts
+	var/assembled = 0
+	var/construction_state = PA_CONSTRUCTION_UNSECURED
+	var/active = 0
+	var/strength = 0
+	var/powered = 0
+	mouse_opacity = 2
+
+/obj/machinery/particle_accelerator/control_box/New()
+	wires = new /datum/wires/particle_accelerator/control_box(src)
+	connected_parts = list()
+	..()
+
+/obj/machinery/particle_accelerator/control_box/Destroy()
+	if(active)
+		toggle_power()
+	for(var/CP in connected_parts)
+		var/obj/structure/particle_accelerator/part = CP
+		part.master = null
+	connected_parts.Cut()
+	qdel(wires)
+	wires = null
+	return ..()
+
+/obj/machinery/particle_accelerator/control_box/attack_hand(mob/user)
+	if(construction_state == PA_CONSTRUCTION_COMPLETE)
+		interact(user)
+	else if(construction_state == PA_CONSTRUCTION_PANEL_OPEN)
+		wires.interact(user)
+
+/obj/machinery/particle_accelerator/control_box/proc/update_state()
+	if(construction_state < PA_CONSTRUCTION_COMPLETE)
+		use_power = 0
+		assembled = 0
+		active = 0
+		for(var/CP in connected_parts)
+			var/obj/structure/particle_accelerator/part = CP
+			part.strength = null
+			part.powered = 0
+			part.update_icon()
+		connected_parts.Cut()
+		return
+	if(!part_scan())
+		use_power = 1
+		active = 0
+		connected_parts.Cut()
+
+/obj/machinery/particle_accelerator/control_box/update_icon()
+	if(active)
+		icon_state = "control_boxp1"
+	else
+		if(use_power)
+			if(assembled)
+				icon_state = "control_boxp"
+			else
+				icon_state = "ucontrol_boxp"
+		else
+			switch(construction_state)
+				if(PA_CONSTRUCTION_UNSECURED, PA_CONSTRUCTION_UNWIRED)
+					icon_state = "control_box"
+				if(PA_CONSTRUCTION_PANEL_OPEN)
+					icon_state = "control_boxw"
+				else
+					icon_state = "control_boxc"
+
+/obj/machinery/particle_accelerator/control_box/Topic(href, href_list)
+	if(..())
+		return
+
+	if(!interface_control)
+		to_chat(usr, "<span class='error'>ERROR: Request timed out. Check wire contacts.</span>")
+		return
+
+	if(href_list["close"])
+		usr << browse(null, "window=pacontrol")
+		usr.unset_machine()
+		return
+	if(href_list["togglep"])
+		if(!wires.is_cut(WIRE_POWER))
+			toggle_power()
+
+	else if(href_list["scan"])
+		part_scan()
+
+	else if(href_list["strengthup"])
+		if(!wires.is_cut(WIRE_STRENGTH))
+			add_strength()
+
+	else if(href_list["strengthdown"])
+		if(!wires.is_cut(WIRE_STRENGTH))
+			remove_strength()
+
+	updateDialog()
+	update_icon()
+
+/obj/machinery/particle_accelerator/control_box/proc/strength_change()
+	for(var/CP in connected_parts)
+		var/obj/structure/particle_accelerator/part = CP
+		part.strength = strength
+		part.update_icon()
+
+/obj/machinery/particle_accelerator/control_box/proc/add_strength(s)
+	if(assembled && (strength < strength_upper_limit))
+		strength++
+		strength_change()
+
+		message_admins("PA Control Computer increased to [strength] by [ADMIN_LOOKUPFLW(usr)] in [ADMIN_COORDJMP(src)]",0,1)
+		log_game("PA Control Computer increased to [strength] by [key_name(usr)] in [COORD(src)]")
+		investigate_log("increased to <font color='red'>[strength]</font> by [key_name(usr)]","singulo")
+
+
+/obj/machinery/particle_accelerator/control_box/proc/remove_strength(s)
+	if(assembled && (strength > 0))
+		strength--
+		strength_change()
+
+		message_admins("PA Control Computer decreased to [strength] by [ADMIN_LOOKUPFLW(usr)] in [ADMIN_COORDJMP(src)]",0,1)
+		log_game("PA Control Computer decreased to [strength] by [key_name(usr)] in [COORD(src)]")
+		investigate_log("decreased to <font color='green'>[strength]</font> by [key_name(usr)]","singulo")
+
+
+/obj/machinery/particle_accelerator/control_box/power_change()
+	..()
+	if(stat & NOPOWER)
+		active = 0
+		use_power = 0
+	else if(!stat && construction_state == PA_CONSTRUCTION_COMPLETE)
+		use_power = 1
+
+/obj/machinery/particle_accelerator/control_box/process()
+	if(active)
+		//a part is missing!
+		if(connected_parts.len < 6)
+			investigate_log("lost a connected part; It <font color='red'>powered down</font>.","singulo")
+			toggle_power()
+			update_icon()
+			return
+		//emit some particles
+		for(var/obj/structure/particle_accelerator/particle_emitter/PE in connected_parts)
+			PE.emit_particle(strength)
+
+/obj/machinery/particle_accelerator/control_box/proc/part_scan()
+	var/ldir = turn(dir,-90)
+	var/rdir = turn(dir,90)
+	var/odir = turn(dir,180)
+	var/turf/T = loc
+
+	assembled = 0
+	critical_machine = FALSE
+
+	var/obj/structure/particle_accelerator/fuel_chamber/F = locate() in orange(1,src)
+	if(!F)
+		return 0
+
+	setDir(F.dir)
+	connected_parts.Cut()
+
+	T = get_step(T,rdir)
+	if(!check_part(T,/obj/structure/particle_accelerator/fuel_chamber))
+		return 0
+	T = get_step(T,odir)
+	if(!check_part(T,/obj/structure/particle_accelerator/end_cap))
+		return 0
+	T = get_step(T,dir)
+	T = get_step(T,dir)
+	if(!check_part(T,/obj/structure/particle_accelerator/power_box))
+		return 0
+	T = get_step(T,dir)
+	if(!check_part(T,/obj/structure/particle_accelerator/particle_emitter/center))
+		return 0
+	T = get_step(T,ldir)
+	if(!check_part(T,/obj/structure/particle_accelerator/particle_emitter/left))
+		return 0
+	T = get_step(T,rdir)
+	T = get_step(T,rdir)
+	if(!check_part(T,/obj/structure/particle_accelerator/particle_emitter/right))
+		return 0
+
+	assembled = 1
+	critical_machine = TRUE	//Only counts if the PA is actually assembled.
+	return 1
+
+/obj/machinery/particle_accelerator/control_box/proc/check_part(turf/T, type)
+	var/obj/structure/particle_accelerator/PA = locate(/obj/structure/particle_accelerator) in T
+	if(istype(PA, type) && (PA.construction_state == PA_CONSTRUCTION_COMPLETE))
+		if(PA.connect_master(src))
+			connected_parts.Add(PA)
+			return 1
+	return 0
+
+
+/obj/machinery/particle_accelerator/control_box/proc/toggle_power()
+	active = !active
+	investigate_log("turned [active?"<font color='green'>ON</font>":"<font color='red'>OFF</font>"] by [usr ? key_name(usr) : "outside forces"]","singulo")
+	message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? key_name_admin(usr) : "outside forces"](<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[usr]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
+	log_game("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? "[key_name(usr)]" : "outside forces"] in ([x],[y],[z])")
+	if(active)
+		use_power = 2
+		for(var/CP in connected_parts)
+			var/obj/structure/particle_accelerator/part = CP
+			part.strength = strength
+			part.powered = 1
+			part.update_icon()
+	else
+		use_power = 1
+		for(var/CP in connected_parts)
+			var/obj/structure/particle_accelerator/part = CP
+			part.strength = null
+			part.powered = 0
+			part.update_icon()
+	return 1
+
+
+/obj/machinery/particle_accelerator/control_box/interact(mob/user)
+	if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER)))
+		if(!issilicon(user))
+			user.unset_machine()
+			user << browse(null, "window=pacontrol")
+			return
+	user.set_machine(src)
+
+	var/dat = ""
+	dat += "<A href='?src=\ref[src];close=1'>Close</A><BR><BR>"
+	dat += "<h3>Status</h3>"
+	if(!assembled)
+		dat += "Unable to detect all parts!<BR>"
+		dat += "<A href='?src=\ref[src];scan=1'>Run Scan</A><BR><BR>"
+	else
+		dat += "All parts in place.<BR><BR>"
+		dat += "Power:"
+		if(active)
+			dat += "On<BR>"
+		else
+			dat += "Off <BR>"
+		dat += "<A href='?src=\ref[src];togglep=1'>Toggle Power</A><BR><BR>"
+		dat += "Particle Strength: [strength] "
+		dat += "<A href='?src=\ref[src];strengthdown=1'>--</A>|<A href='?src=\ref[src];strengthup=1'>++</A><BR><BR>"
+
+	var/datum/browser/popup = new(user, "pacontrol", name, 420, 300)
+	popup.set_content(dat)
+	popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
+	popup.open()
+
+/obj/machinery/particle_accelerator/control_box/examine(mob/user)
+	..()
+	switch(construction_state)
+		if(PA_CONSTRUCTION_UNSECURED)
+			to_chat(user, "Looks like it's not attached to the flooring")
+		if(PA_CONSTRUCTION_UNWIRED)
+			to_chat(user, "It is missing some cables")
+		if(PA_CONSTRUCTION_PANEL_OPEN)
+			to_chat(user, "The panel is open")
+
+
+/obj/machinery/particle_accelerator/control_box/attackby(obj/item/W, mob/user, params)
+	var/did_something = FALSE
+
+	switch(construction_state)
+		if(PA_CONSTRUCTION_UNSECURED)
+			if(istype(W, /obj/item/weapon/wrench) && !isinspace())
+				playsound(loc, W.usesound, 75, 1)
+				anchored = 1
+				user.visible_message("[user.name] secures the [name] to the floor.", \
+					"You secure the external bolts.")
+				construction_state = PA_CONSTRUCTION_UNWIRED
+				did_something = TRUE
+		if(PA_CONSTRUCTION_UNWIRED)
+			if(istype(W, /obj/item/weapon/wrench))
+				playsound(loc, W.usesound, 75, 1)
+				anchored = 0
+				user.visible_message("[user.name] detaches the [name] from the floor.", \
+					"You remove the external bolts.")
+				construction_state = PA_CONSTRUCTION_UNSECURED
+				did_something = TRUE
+			else if(istype(W, /obj/item/stack/cable_coil))
+				var/obj/item/stack/cable_coil/CC = W
+				if(CC.use(1))
+					user.visible_message("[user.name] adds wires to the [name].", \
+						"You add some wires.")
+					construction_state = PA_CONSTRUCTION_PANEL_OPEN
+					did_something = TRUE
+		if(PA_CONSTRUCTION_PANEL_OPEN)
+			if(istype(W, /obj/item/weapon/wirecutters))//TODO:Shock user if its on?
+				user.visible_message("[user.name] removes some wires from the [name].", \
+					"You remove some wires.")
+				construction_state = PA_CONSTRUCTION_UNWIRED
+				did_something = TRUE
+			else if(istype(W, /obj/item/weapon/screwdriver))
+				user.visible_message("[user.name] closes the [name]'s access panel.", \
+					"You close the access panel.")
+				construction_state = PA_CONSTRUCTION_COMPLETE
+				did_something = TRUE
+		if(PA_CONSTRUCTION_COMPLETE)
+			if(istype(W, /obj/item/weapon/screwdriver))
+				user.visible_message("[user.name] opens the [name]'s access panel.", \
+					"You open the access panel.")
+				construction_state = PA_CONSTRUCTION_PANEL_OPEN
+				did_something = TRUE
+
+	if(did_something)
+		user.changeNext_move(CLICK_CD_MELEE)
+		update_state()
+		update_icon()
+		return
+
+	..()
+
+/obj/machinery/particle_accelerator/control_box/blob_act(obj/structure/blob/B)
+	if(prob(50))
+		qdel(src)
+
+#undef PA_CONSTRUCTION_UNSECURED
+#undef PA_CONSTRUCTION_UNWIRED
+#undef PA_CONSTRUCTION_PANEL_OPEN
+#undef PA_CONSTRUCTION_COMPLETE

code/modules/projectiles/ammunition/energy.dm

@@ -9,6 +9,7 @@
 	firing_effect_type = /obj/effect/overlay/temp/dir_setting/firing_effect/energy
 
 /obj/item/ammo_casing/energy/chameleon
+	projectile_type = /obj/item/projectile/energy/chameleon
 	e_cost = 0
 	var/list/projectile_vars = list()
 

code/modules/projectiles/projectile/bullets.dm

@@ -190,7 +190,7 @@
 	name = "dart"
 	icon_state = "cbbolt"
 	damage = 6
-	var/piercing = FALSE
+	var/piercing = FALSE
 
 /obj/item/projectile/bullet/dart/New()
 	..()
@@ -201,15 +201,15 @@
 	if(iscarbon(target))
 		var/mob/living/carbon/M = target
 		if(blocked != 100) // not completely blocked
-			if(M.can_inject(null, FALSE, def_zone, piercing)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
+			if(M.can_inject(null, FALSE, def_zone, piercing)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
 				..()
 				reagents.reaction(M, INJECT)
 				reagents.trans_to(M, reagents.total_volume)
-				return TRUE
+				return TRUE
 			else
 				blocked = 100
-				target.visible_message("<span class='danger'>\The [src] was deflected!</span>", \
-									   "<span class='userdanger'>You were protected against \the [src]!</span>")
+				target.visible_message("<span class='danger'>\The [src] was deflected!</span>", \
+									   "<span class='userdanger'>You were protected against \the [src]!</span>")
 
 	..(target, blocked)
 	reagents.set_reacting(TRUE)
@@ -240,28 +240,28 @@
 		nodamage = 1
 	. = ..() // Execute the rest of the code.
 
-/obj/item/projectile/bullet/dnainjector
-	name = "\improper DNA injector"
-	icon_state = "syringeproj"
-	var/obj/item/weapon/dnainjector/injector
-	
-/obj/item/projectile/bullet/dnainjector/on_hit(atom/target, blocked = 0)
-	if(iscarbon(target))
-		var/mob/living/carbon/M = target
-		if(blocked != 100)
-			if(M.can_inject(null, FALSE, def_zone, FALSE))
-				if(injector.inject(M, firer))
-					QDEL_NULL(injector)
-					return TRUE
-			else
-				blocked = 100
-				target.visible_message("<span class='danger'>\The [src] was deflected!</span>", \
-									   "<span class='userdanger'>You were protected against \the [src]!</span>")
-	return ..()
-
-/obj/item/projectile/bullet/dnainjector/Destroy()
-	QDEL_NULL(injector)
-	return ..()
+/obj/item/projectile/bullet/dnainjector
+	name = "\improper DNA injector"
+	icon_state = "syringeproj"
+	var/obj/item/weapon/dnainjector/injector
+	
+/obj/item/projectile/bullet/dnainjector/on_hit(atom/target, blocked = 0)
+	if(iscarbon(target))
+		var/mob/living/carbon/M = target
+		if(blocked != 100)
+			if(M.can_inject(null, FALSE, def_zone, FALSE))
+				if(injector.inject(M, firer))
+					QDEL_NULL(injector)
+					return TRUE
+			else
+				blocked = 100
+				target.visible_message("<span class='danger'>\The [src] was deflected!</span>", \
+									   "<span class='userdanger'>You were protected against \the [src]!</span>")
+	return ..()
+
+/obj/item/projectile/bullet/dnainjector/Destroy()
+	QDEL_NULL(injector)
+	return ..()
 
 //// SNIPER BULLETS
 

code/modules/projectiles/projectile/energy.dm

@@ -5,6 +5,8 @@
 	damage_type = BURN
 	flag = "energy"
 
+/obj/item/projectile/energy/chameleon
+	nodamage = TRUE
 
 /obj/item/projectile/energy/electrode
 	name = "electrode"

code/modules/reagents/reagent_containers/spray.dm

@@ -1,239 +1,239 @@
-/obj/item/weapon/reagent_containers/spray
-	name = "spray bottle"
-	desc = "A spray bottle, with an unscrewable top."
-	icon = 'icons/obj/janitor.dmi'
-	icon_state = "cleaner"
-	item_state = "cleaner"
-	flags = NOBLUDGEON
-	container_type = OPENCONTAINER
-	slot_flags = SLOT_BELT
-	throwforce = 0
-	w_class = WEIGHT_CLASS_SMALL
-	throw_speed = 3
-	throw_range = 7
-	var/stream_mode = 0 //whether we use the more focused mode
-	var/current_range = 3 //the range of tiles the sprayer will reach.
-	var/spray_range = 3 //the range of tiles the sprayer will reach when in spray mode.
-	var/stream_range = 1 //the range of tiles the sprayer will reach when in stream mode.
-	var/stream_amount = 10 //the amount of reagents transfered when in stream mode.
-	amount_per_transfer_from_this = 5
-	volume = 250
-	possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
-
-
-/obj/item/weapon/reagent_containers/spray/afterattack(atom/A as mob|obj, mob/user)
-	if(istype(A, /obj/structure/sink) || istype(A, /obj/structure/janitorialcart) || istype(A, /obj/machinery/hydroponics))
-		return
-
-	if(istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1) //this block copypasted from reagent_containers/glass, for lack of a better solution
-		if(!A.reagents.total_volume && A.reagents)
-			to_chat(user, "<span class='notice'>\The [A] is empty.</span>")
-			return
-
-		if(reagents.total_volume >= reagents.maximum_volume)
-			to_chat(user, "<span class='notice'>\The [src] is full.</span>")
-			return
-
-		var/trans = A.reagents.trans_to(src, 50) //transfer 50u , using the spray's transfer amount would take too long to refill
-		to_chat(user, "<span class='notice'>You fill \the [src] with [trans] units of the contents of \the [A].</span>")
-		return
-
-	if(reagents.total_volume < amount_per_transfer_from_this)
-		to_chat(user, "<span class='warning'>\The [src] is empty!</span>")
-		return
-
-	spray(A)
-
-	playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
-	user.changeNext_move(CLICK_CD_RANGE*2)
-	user.newtonian_move(get_dir(A, user))
-	var/turf/T = get_turf(src)
-	var/area/area = get_area(src)
-	if(reagents.has_reagent("sacid"))
-		message_admins("[ADMIN_LOOKUPFLW(user)] fired sulphuric acid from \a [src] at [area] [ADMIN_COORDJMP(T)].")
-		log_game("[key_name(user)] fired sulphuric acid from \a [src] at [area] ([T.x], [T.y], [T.z]).")
-	if(reagents.has_reagent("facid"))
-		message_admins("[ADMIN_LOOKUPFLW(user)] fired Fluacid from \a [src] at [area] [ADMIN_COORDJMP(T)].")
-		log_game("[key_name(user)] fired Fluacid from \a [src] at [area] [COORD(T)].")
-	if(reagents.has_reagent("lube"))
-		message_admins("[ADMIN_LOOKUPFLW(user)] fired Space lube from \a [src] at [area] [ADMIN_COORDJMP(T)].")
-		log_game("[key_name(user)] fired Space lube from \a [src] at [area] [COORD(T)].")
-	return
-
-
-/obj/item/weapon/reagent_containers/spray/proc/spray(atom/A)
-	var/range = max(min(current_range, get_dist(src, A)), 1)
-	var/obj/effect/decal/chempuff/D = new /obj/effect/decal/chempuff(get_turf(src))
-	D.create_reagents(amount_per_transfer_from_this)
-	var/puff_reagent_left = range //how many turf, mob or dense objet we can react with before we consider the chem puff consumed
-	if(stream_mode)
-		reagents.trans_to(D, amount_per_transfer_from_this)
-		puff_reagent_left = 1
-	else
-		reagents.trans_to(D, amount_per_transfer_from_this, 1/range)
-	D.color = mix_color_from_reagents(D.reagents.reagent_list)
-	var/wait_step = max(round(2+3/range), 2)
-	spawn(0)
-		var/range_left = range
-		for(var/i=0, i<range, i++)
-			range_left--
-			step_towards(D,A)
-			sleep(wait_step)
-
-			for(var/atom/T in get_turf(D))
-				if(T == D || T.invisibility) //we ignore the puff itself and stuff below the floor
-					continue
-				if(puff_reagent_left <= 0)
-					break
-
-				if(stream_mode)
-					if(ismob(T))
-						var/mob/M = T
-						if(!M.lying || !range_left)
-							D.reagents.reaction(M, VAPOR)
-							puff_reagent_left -= 1
-					else if(!range_left)
-						D.reagents.reaction(T, VAPOR)
-				else
-					D.reagents.reaction(T, VAPOR)
-					if(ismob(T))
-						puff_reagent_left -= 1
-
-			if(puff_reagent_left > 0 && (!stream_mode || !range_left))
-				D.reagents.reaction(get_turf(D), VAPOR)
-				puff_reagent_left -= 1
-
-			if(puff_reagent_left <= 0) // we used all the puff so we delete it.
-				qdel(D)
-				return
-		qdel(D)
-
-/obj/item/weapon/reagent_containers/spray/attack_self(mob/user)
-	stream_mode = !stream_mode
-	if(stream_mode)
-		amount_per_transfer_from_this = stream_amount
-		current_range = stream_range
-	else
-		amount_per_transfer_from_this = initial(amount_per_transfer_from_this)
-		current_range = spray_range
-	to_chat(user, "<span class='notice'>You switch the nozzle setting to [stream_mode ? "\"stream\"":"\"spray\""]. You'll now use [amount_per_transfer_from_this] units per use.</span>")
-
-/obj/item/weapon/reagent_containers/spray/verb/empty()
-	set name = "Empty Spray Bottle"
-	set category = "Object"
-	set src in usr
-	if(usr.incapacitated())
-		return
-	if (alert(usr, "Are you sure you want to empty that?", "Empty Bottle:", "Yes", "No") != "Yes")
-		return
-	if(isturf(usr.loc) && src.loc == usr)
-		to_chat(usr, "<span class='notice'>You empty \the [src] onto the floor.</span>")
-		reagents.reaction(usr.loc)
-		src.reagents.clear_reagents()
-
-//space cleaner
-/obj/item/weapon/reagent_containers/spray/cleaner
-	name = "space cleaner"
-	desc = "BLAM!-brand non-foaming space cleaner!"
-	list_reagents = list("cleaner" = 250)
-
-//spray tan
-/obj/item/weapon/reagent_containers/spray/spraytan
-	name = "spray tan"
-	volume = 50
-	desc = "Gyaro brand spray tan. Do not spray near eyes or other orifices."
-	list_reagents = list("spraytan" = 50)
-
-
-/obj/item/weapon/reagent_containers/spray/medical
-	name = "medical spray"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "medspray"
-	volume = 100
-
-
-/obj/item/weapon/reagent_containers/spray/medical/sterilizer
-	name = "sterilizer spray"
-	desc = "Spray bottle loaded with non-toxic sterilizer. Useful in preparation for surgery."
-	list_reagents = list("sterilizine" = 100)
-
-
-//pepperspray
-/obj/item/weapon/reagent_containers/spray/pepper
-	name = "pepperspray"
-	desc = "Manufactured by UhangInc, used to blind and down an opponent quickly."
-	icon = 'icons/obj/weapons.dmi'
-	icon_state = "pepperspray"
-	item_state = "pepperspray"
-	volume = 40
-	stream_range = 4
-	amount_per_transfer_from_this = 5
-	list_reagents = list("condensedcapsaicin" = 40)
-
-// Fix pepperspraying yourself
-/obj/item/weapon/reagent_containers/spray/pepper/afterattack(atom/A as mob|obj, mob/user)
-	if (A.loc == user)
-		return
-	..()
-
-//water flower
-/obj/item/weapon/reagent_containers/spray/waterflower
-	name = "water flower"
-	desc = "A seemingly innocent sunflower...with a twist."
-	icon = 'icons/obj/hydroponics/harvest.dmi'
-	icon_state = "sunflower"
-	item_state = "sunflower"
-	amount_per_transfer_from_this = 1
-	volume = 10
-	list_reagents = list("water" = 10)
-
-/obj/item/weapon/reagent_containers/spray/waterflower/attack_self(mob/user) //Don't allow changing how much the flower sprays
-	return
-
-//chemsprayer
-/obj/item/weapon/reagent_containers/spray/chemsprayer
-	name = "chem sprayer"
-	desc = "A utility used to spray large amounts of reagents in a given area."
-	icon = 'icons/obj/guns/projectile.dmi'
-	icon_state = "chemsprayer"
-	item_state = "chemsprayer"
-	throwforce = 0
-	w_class = WEIGHT_CLASS_NORMAL
-	stream_mode = 1
-	current_range = 7
-	spray_range = 4
-	stream_range = 7
-	amount_per_transfer_from_this = 10
-	volume = 600
-	origin_tech = "combat=3;materials=3;engineering=3"
-
-/obj/item/weapon/reagent_containers/spray/chemsprayer/afterattack(atom/A as mob|obj, mob/user)
-	// Make it so the bioterror spray doesn't spray yourself when you click your inventory items
-	if (A.loc == user)
-		return
-	..()
-
-/obj/item/weapon/reagent_containers/spray/chemsprayer/spray(atom/A)
-	var/direction = get_dir(src, A)
-	var/turf/T = get_turf(A)
-	var/turf/T1 = get_step(T,turn(direction, 90))
-	var/turf/T2 = get_step(T,turn(direction, -90))
-	var/list/the_targets = list(T,T1,T2)
-
-	for(var/i=1, i<=3, i++) // intialize sprays
-		if(reagents.total_volume < 1)
-			return
-		..(the_targets[i])
-
-/obj/item/weapon/reagent_containers/spray/chemsprayer/bioterror
-	list_reagents = list("sodium_thiopental" = 100, "coniine" = 100, "venom" = 100, "condensedcapsaicin" = 100, "initropidril" = 100, "polonium" = 100)
-
-// Plant-B-Gone
-/obj/item/weapon/reagent_containers/spray/plantbgone // -- Skie
-	name = "Plant-B-Gone"
-	desc = "Kills those pesky weeds!"
-	icon = 'icons/obj/hydroponics/equipment.dmi'
-	icon_state = "plantbgone"
-	item_state = "plantbgone"
-	volume = 100
-	list_reagents = list("plantbgone" = 100)
+/obj/item/weapon/reagent_containers/spray
+	name = "spray bottle"
+	desc = "A spray bottle, with an unscrewable top."
+	icon = 'icons/obj/janitor.dmi'
+	icon_state = "cleaner"
+	item_state = "cleaner"
+	flags = NOBLUDGEON
+	container_type = OPENCONTAINER
+	slot_flags = SLOT_BELT
+	throwforce = 0
+	w_class = WEIGHT_CLASS_SMALL
+	throw_speed = 3
+	throw_range = 7
+	var/stream_mode = 0 //whether we use the more focused mode
+	var/current_range = 3 //the range of tiles the sprayer will reach.
+	var/spray_range = 3 //the range of tiles the sprayer will reach when in spray mode.
+	var/stream_range = 1 //the range of tiles the sprayer will reach when in stream mode.
+	var/stream_amount = 10 //the amount of reagents transfered when in stream mode.
+	amount_per_transfer_from_this = 5
+	volume = 250
+	possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
+
+
+/obj/item/weapon/reagent_containers/spray/afterattack(atom/A as mob|obj, mob/user)
+	if(istype(A, /obj/structure/sink) || istype(A, /obj/structure/janitorialcart) || istype(A, /obj/machinery/hydroponics))
+		return
+
+	if(istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1) //this block copypasted from reagent_containers/glass, for lack of a better solution
+		if(!A.reagents.total_volume && A.reagents)
+			to_chat(user, "<span class='notice'>\The [A] is empty.</span>")
+			return
+
+		if(reagents.total_volume >= reagents.maximum_volume)
+			to_chat(user, "<span class='notice'>\The [src] is full.</span>")
+			return
+
+		var/trans = A.reagents.trans_to(src, 50) //transfer 50u , using the spray's transfer amount would take too long to refill
+		to_chat(user, "<span class='notice'>You fill \the [src] with [trans] units of the contents of \the [A].</span>")
+		return
+
+	if(reagents.total_volume < amount_per_transfer_from_this)
+		to_chat(user, "<span class='warning'>\The [src] is empty!</span>")
+		return
+
+	spray(A)
+
+	playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
+	user.changeNext_move(CLICK_CD_RANGE*2)
+	user.newtonian_move(get_dir(A, user))
+	var/turf/T = get_turf(src)
+	var/area/area = get_area(src)
+	if(reagents.has_reagent("sacid"))
+		message_admins("[ADMIN_LOOKUPFLW(user)] fired sulphuric acid from \a [src] at [area] [ADMIN_COORDJMP(T)].")
+		log_game("[key_name(user)] fired sulphuric acid from \a [src] at [area] ([T.x], [T.y], [T.z]).")
+	if(reagents.has_reagent("facid"))
+		message_admins("[ADMIN_LOOKUPFLW(user)] fired Fluacid from \a [src] at [area] [ADMIN_COORDJMP(T)].")
+		log_game("[key_name(user)] fired Fluacid from \a [src] at [area] [COORD(T)].")
+	if(reagents.has_reagent("lube"))
+		message_admins("[ADMIN_LOOKUPFLW(user)] fired Space lube from \a [src] at [area] [ADMIN_COORDJMP(T)].")
+		log_game("[key_name(user)] fired Space lube from \a [src] at [area] [COORD(T)].")
+	return
+
+
+/obj/item/weapon/reagent_containers/spray/proc/spray(atom/A)
+	var/range = max(min(current_range, get_dist(src, A)), 1)
+	var/obj/effect/decal/chempuff/D = new /obj/effect/decal/chempuff(get_turf(src))
+	D.create_reagents(amount_per_transfer_from_this)
+	var/puff_reagent_left = range //how many turf, mob or dense objet we can react with before we consider the chem puff consumed
+	if(stream_mode)
+		reagents.trans_to(D, amount_per_transfer_from_this)
+		puff_reagent_left = 1
+	else
+		reagents.trans_to(D, amount_per_transfer_from_this, 1/range)
+	D.color = mix_color_from_reagents(D.reagents.reagent_list)
+	var/wait_step = max(round(2+3/range), 2)
+	spawn(0)
+		var/range_left = range
+		for(var/i=0, i<range, i++)
+			range_left--
+			step_towards(D,A)
+			sleep(wait_step)
+
+			for(var/atom/T in get_turf(D))
+				if(T == D || T.invisibility) //we ignore the puff itself and stuff below the floor
+					continue
+				if(puff_reagent_left <= 0)
+					break
+
+				if(stream_mode)
+					if(ismob(T))
+						var/mob/M = T
+						if(!M.lying || !range_left)
+							D.reagents.reaction(M, VAPOR)
+							puff_reagent_left -= 1
+					else if(!range_left)
+						D.reagents.reaction(T, VAPOR)
+				else
+					D.reagents.reaction(T, VAPOR)
+					if(ismob(T))
+						puff_reagent_left -= 1
+
+			if(puff_reagent_left > 0 && (!stream_mode || !range_left))
+				D.reagents.reaction(get_turf(D), VAPOR)
+				puff_reagent_left -= 1
+
+			if(puff_reagent_left <= 0) // we used all the puff so we delete it.
+				qdel(D)
+				return
+		qdel(D)
+
+/obj/item/weapon/reagent_containers/spray/attack_self(mob/user)
+	stream_mode = !stream_mode
+	if(stream_mode)
+		amount_per_transfer_from_this = stream_amount
+		current_range = stream_range
+	else
+		amount_per_transfer_from_this = initial(amount_per_transfer_from_this)
+		current_range = spray_range
+	to_chat(user, "<span class='notice'>You switch the nozzle setting to [stream_mode ? "\"stream\"":"\"spray\""]. You'll now use [amount_per_transfer_from_this] units per use.</span>")
+
+/obj/item/weapon/reagent_containers/spray/verb/empty()
+	set name = "Empty Spray Bottle"
+	set category = "Object"
+	set src in usr
+	if(usr.incapacitated())
+		return
+	if (alert(usr, "Are you sure you want to empty that?", "Empty Bottle:", "Yes", "No") != "Yes")
+		return
+	if(isturf(usr.loc) && src.loc == usr)
+		to_chat(usr, "<span class='notice'>You empty \the [src] onto the floor.</span>")
+		reagents.reaction(usr.loc)
+		src.reagents.clear_reagents()
+
+//space cleaner
+/obj/item/weapon/reagent_containers/spray/cleaner
+	name = "space cleaner"
+	desc = "BLAM!-brand non-foaming space cleaner!"
+	list_reagents = list("cleaner" = 250)
+
+//spray tan
+/obj/item/weapon/reagent_containers/spray/spraytan
+	name = "spray tan"
+	volume = 50
+	desc = "Gyaro brand spray tan. Do not spray near eyes or other orifices."
+	list_reagents = list("spraytan" = 50)
+
+
+/obj/item/weapon/reagent_containers/spray/medical
+	name = "medical spray"
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "medspray"
+	volume = 100
+
+
+/obj/item/weapon/reagent_containers/spray/medical/sterilizer
+	name = "sterilizer spray"
+	desc = "Spray bottle loaded with non-toxic sterilizer. Useful in preparation for surgery."
+	list_reagents = list("sterilizine" = 100)
+
+
+//pepperspray
+/obj/item/weapon/reagent_containers/spray/pepper
+	name = "pepperspray"
+	desc = "Manufactured by UhangInc, used to blind and down an opponent quickly."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "pepperspray"
+	item_state = "pepperspray"
+	volume = 40
+	stream_range = 4
+	amount_per_transfer_from_this = 5
+	list_reagents = list("condensedcapsaicin" = 40)
+
+// Fix pepperspraying yourself
+/obj/item/weapon/reagent_containers/spray/pepper/afterattack(atom/A as mob|obj, mob/user)
+	if (A.loc == user)
+		return
+	..()
+
+//water flower
+/obj/item/weapon/reagent_containers/spray/waterflower
+	name = "water flower"
+	desc = "A seemingly innocent sunflower...with a twist."
+	icon = 'icons/obj/hydroponics/harvest.dmi'
+	icon_state = "sunflower"
+	item_state = "sunflower"
+	amount_per_transfer_from_this = 1
+	volume = 10
+	list_reagents = list("water" = 10)
+
+/obj/item/weapon/reagent_containers/spray/waterflower/attack_self(mob/user) //Don't allow changing how much the flower sprays
+	return
+
+//chemsprayer
+/obj/item/weapon/reagent_containers/spray/chemsprayer
+	name = "chem sprayer"
+	desc = "A utility used to spray large amounts of reagents in a given area."
+	icon = 'icons/obj/guns/projectile.dmi'
+	icon_state = "chemsprayer"
+	item_state = "chemsprayer"
+	throwforce = 0
+	w_class = WEIGHT_CLASS_NORMAL
+	stream_mode = 1
+	current_range = 7
+	spray_range = 4
+	stream_range = 7
+	amount_per_transfer_from_this = 10
+	volume = 600
+	origin_tech = "combat=3;materials=3;engineering=3"
+
+/obj/item/weapon/reagent_containers/spray/chemsprayer/afterattack(atom/A as mob|obj, mob/user)
+	// Make it so the bioterror spray doesn't spray yourself when you click your inventory items
+	if (A.loc == user)
+		return
+	..()
+
+/obj/item/weapon/reagent_containers/spray/chemsprayer/spray(atom/A)
+	var/direction = get_dir(src, A)
+	var/turf/T = get_turf(A)
+	var/turf/T1 = get_step(T,turn(direction, 90))
+	var/turf/T2 = get_step(T,turn(direction, -90))
+	var/list/the_targets = list(T,T1,T2)
+
+	for(var/i=1, i<=3, i++) // intialize sprays
+		if(reagents.total_volume < 1)
+			return
+		..(the_targets[i])
+
+/obj/item/weapon/reagent_containers/spray/chemsprayer/bioterror
+	list_reagents = list("sodium_thiopental" = 100, "coniine" = 100, "venom" = 100, "condensedcapsaicin" = 100, "initropidril" = 100, "polonium" = 100)
+
+// Plant-B-Gone
+/obj/item/weapon/reagent_containers/spray/plantbgone // -- Skie
+	name = "Plant-B-Gone"
+	desc = "Kills those pesky weeds!"
+	icon = 'icons/obj/hydroponics/equipment.dmi'
+	icon_state = "plantbgone"
+	item_state = "plantbgone"
+	volume = 100
+	list_reagents = list("plantbgone" = 100)

code/modules/shuttle/ferry.dm

@@ -1,33 +1,33 @@
-/obj/machinery/computer/shuttle/ferry
-	name = "transport ferry console"
-	circuit = /obj/item/weapon/circuitboard/computer/ferry
-	shuttleId = "ferry"
-	possible_destinations = "ferry_home;ferry_away"
-	req_access = list(GLOB.access_cent_general)
-
-	var/aiControlDisabled = 1
-
-/obj/machinery/computer/shuttle/ferry/proc/canAIControl(mob/user)
-	return ((aiControlDisabled != 1));
-
-/obj/machinery/computer/shuttle/ferry/attack_ai(mob/user)
-	if(!src.canAIControl(user))
-		return
-
-/obj/machinery/computer/shuttle/ferry/request
-	name = "ferry console"
-	circuit = /obj/item/weapon/circuitboard/computer/ferry/request
-	var/last_request //prevents spamming admins
-	var/cooldown = 600
-	possible_destinations = "ferry_home;ferry_away"
-	req_access = list(GLOB.access_cent_general)
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-
-/obj/machinery/computer/shuttle/ferry/request/Topic(href, href_list)
-	..()
-	if(href_list["request"])
-		if(last_request && (last_request + cooldown > world.time))
-			return
-		last_request = world.time
-		to_chat(usr, "<span class='notice'>Your request has been recieved by Centcom.</span>")
-		to_chat(GLOB.admins, "<b>FERRY: <font color='blue'>[ADMIN_LOOKUPFLW(usr)] (<A HREF='?_src_=holder;secrets=moveferry'>Move Ferry</a>)</b> is requesting to move the transport ferry to Centcom.</font>")
+/obj/machinery/computer/shuttle/ferry
+	name = "transport ferry console"
+	circuit = /obj/item/weapon/circuitboard/computer/ferry
+	shuttleId = "ferry"
+	possible_destinations = "ferry_home;ferry_away"
+	req_access = list(GLOB.access_cent_general)
+
+	var/aiControlDisabled = 1
+
+/obj/machinery/computer/shuttle/ferry/proc/canAIControl(mob/user)
+	return ((aiControlDisabled != 1));
+
+/obj/machinery/computer/shuttle/ferry/attack_ai(mob/user)
+	if(!src.canAIControl(user))
+		return
+
+/obj/machinery/computer/shuttle/ferry/request
+	name = "ferry console"
+	circuit = /obj/item/weapon/circuitboard/computer/ferry/request
+	var/last_request //prevents spamming admins
+	var/cooldown = 600
+	possible_destinations = "ferry_home;ferry_away"
+	req_access = list(GLOB.access_cent_general)
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+
+/obj/machinery/computer/shuttle/ferry/request/Topic(href, href_list)
+	..()
+	if(href_list["request"])
+		if(last_request && (last_request + cooldown > world.time))
+			return
+		last_request = world.time
+		to_chat(usr, "<span class='notice'>Your request has been recieved by Centcom.</span>")
+		to_chat(GLOB.admins, "<b>FERRY: <font color='blue'>[ADMIN_LOOKUPFLW(usr)] (<A HREF='?_src_=holder;secrets=moveferry'>Move Ferry</a>)</b> is requesting to move the transport ferry to Centcom.</font>")

tgstation.dme

@@ -33,6 +33,7 @@
 #include "code\__DEFINES\combat.dm"
 #include "code\__DEFINES\construction.dm"
 #include "code\__DEFINES\contracts.dm"
+#include "code\__DEFINES\cult.dm"
 #include "code\__DEFINES\DNA.dm"
 #include "code\__DEFINES\events.dm"
 #include "code\__DEFINES\flags.dm"
@@ -167,9 +168,6 @@
 #include "code\citadel\cit_uniforms.dm"
 #include "code\citadel\cit_vendors.dm"
 #include "code\citadel\dogborgstuff.dm"
-#include "code\citadel\custom_loadout\custom_items.dm"
-#include "code\citadel\custom_loadout\load_to_mob.dm"
-#include "code\citadel\custom_loadout\read_from_file.dm"
 #include "code\citadel\organs\breasts.dm"
 #include "code\citadel\organs\eggsack.dm"
 #include "code\citadel\organs\genitals.dm"
@@ -199,12 +197,14 @@
 #include "code\controllers\subsystem\dbcore.dm"
 #include "code\controllers\subsystem\disease.dm"
 #include "code\controllers\subsystem\events.dm"
+#include "code\controllers\subsystem\fields.dm"
 #include "code\controllers\subsystem\fire_burning.dm"
 #include "code\controllers\subsystem\garbage.dm"
 #include "code\controllers\subsystem\icon_smooth.dm"
 #include "code\controllers\subsystem\inbounds.dm"
 #include "code\controllers\subsystem\ipintel.dm"
 #include "code\controllers\subsystem\job.dm"
+#include "code\controllers\subsystem\language.dm"
 #include "code\controllers\subsystem\lighting.dm"
 #include "code\controllers\subsystem\machines.dm"
 #include "code\controllers\subsystem\mapping.dm"
@@ -266,6 +266,7 @@
 #include "code\datums\antagonists\antag_datum.dm"
 #include "code\datums\antagonists\datum_clockcult.dm"
 #include "code\datums\antagonists\datum_cult.dm"
+#include "code\datums\antagonists\ninja.dm"
 #include "code\datums\diseases\_disease.dm"
 #include "code\datums\diseases\_MobProcs.dm"
 #include "code\datums\diseases\anxiety.dm"
@@ -470,7 +471,9 @@
 #include "code\game\gamemodes\cult\cult_items.dm"
 #include "code\game\gamemodes\cult\cult_structures.dm"
 #include "code\game\gamemodes\cult\ritual.dm"
+#include "code\game\gamemodes\cult\rune_spawn_action.dm"
 #include "code\game\gamemodes\cult\runes.dm"
+#include "code\game\gamemodes\cult\supply.dm"
 #include "code\game\gamemodes\cult\talisman.dm"
 #include "code\game\gamemodes\devil\devil.dm"
 #include "code\game\gamemodes\devil\devil_game_mode.dm"
@@ -556,6 +559,7 @@
 #include "code\game\machinery\hologram.dm"
 #include "code\game\machinery\igniter.dm"
 #include "code\game\machinery\iv_drip.dm"
+#include "code\game\machinery\launch_pad.dm"
 #include "code\game\machinery\lightswitch.dm"
 #include "code\game\machinery\limbgrower.dm"
 #include "code\game\machinery\machinery.dm"
@@ -604,6 +608,7 @@
 #include "code\game\machinery\computer\crew.dm"
 #include "code\game\machinery\computer\dna_console.dm"
 #include "code\game\machinery\computer\gulag_teleporter.dm"
+#include "code\game\machinery\computer\launchpad_control.dm"
 #include "code\game\machinery\computer\law.dm"
 #include "code\game\machinery\computer\medical.dm"
 #include "code\game\machinery\computer\message.dm"
@@ -726,6 +731,10 @@
 #include "code\game\objects\effects\spawners\structure.dm"
 #include "code\game\objects\effects\spawners\vaultspawner.dm"
 #include "code\game\objects\effects\spawners\xeno_egg_delivery.dm"
+#include "code\game\objects\effects\temporary_visuals\clockcult.dm"
+#include "code\game\objects\effects\temporary_visuals\cult.dm"
+#include "code\game\objects\effects\temporary_visuals\miscellaneous.dm"
+#include "code\game\objects\effects\temporary_visuals\temporary_visual.dm"
 #include "code\game\objects\items\apc_frame.dm"
 #include "code\game\objects\items\blueprints.dm"
 #include "code\game\objects\items\body_egg.dm"
@@ -809,7 +818,6 @@
 #include "code\game\objects\items\weapons\defib.dm"
 #include "code\game\objects\items\weapons\dice.dm"
 #include "code\game\objects\items\weapons\dna_injector.dm"
-#include "code\game\objects\items\weapons\explosives.dm"
 #include "code\game\objects\items\weapons\extinguisher.dm"
 #include "code\game\objects\items\weapons\flamethrower.dm"
 #include "code\game\objects\items\weapons\gift.dm"
@@ -1304,6 +1312,9 @@
 #include "code\modules\events\wizard\rpgloot.dm"
 #include "code\modules\events\wizard\shuffle.dm"
 #include "code\modules\events\wizard\summons.dm"
+#include "code\modules\fields\fields.dm"
+#include "code\modules\fields\peaceborg_dampener.dm"
+#include "code\modules\fields\turf_objects.dm"
 #include "code\modules\flufftext\Dreaming.dm"
 #include "code\modules\flufftext\Hallucination.dm"
 #include "code\modules\flufftext\TextFilters.dm"
@@ -1426,12 +1437,15 @@
 #include "code\modules\jobs\job_types\security.dm"
 #include "code\modules\jobs\job_types\silicon.dm"
 #include "code\modules\language\common.dm"
+#include "code\modules\language\draconic.dm"
 #include "code\modules\language\drone.dm"
 #include "code\modules\language\language.dm"
+#include "code\modules\language\language_holder.dm"
 #include "code\modules\language\language_menu.dm"
 #include "code\modules\language\machine.dm"
 #include "code\modules\language\monkey.dm"
-#include "code\modules\language\ratvar.dm"
+#include "code\modules\language\narsian.dm"
+#include "code\modules\language\ratvarian.dm"
 #include "code\modules\language\slime.dm"
 #include "code\modules\language\swarmer.dm"
 #include "code\modules\language\xenocommon.dm"
@@ -1803,7 +1817,6 @@
 #include "code\modules\modular_computers\NTNet\NTNet_relay.dm"
 #include "code\modules\modular_computers\NTNet\NTNRC\conversation.dm"
 #include "code\modules\ninja\__ninjaDefines.dm"
-#include "code\modules\ninja\admin_ninja_verbs.dm"
 #include "code\modules\ninja\energy_katana.dm"
 #include "code\modules\ninja\ninja_event.dm"
 #include "code\modules\ninja\Ninja_Readme.dm"

tools/tgstation-server/Start Server.bat

@@ -3,37 +3,37 @@
 call config.bat
 call bin\findbyond.bat
 
-echo Welcome to the start server watch dog script, This will start the server and make sure it stays running. To continue, press any key or wait 30 seconds.
-timeout 30
+echo Welcome to the start server watch dog script, This will start the server and make sure it stays running. To continue, press any key or wait 30 seconds.
+timeout 30
 
 if not exist gamedata\data\logs\runtimes mkdir gamedata\data\logs\runtimes\
 
-@call python bot\nudge.py "WATCHDOG" "Watch Dog online. Starting server" >nul 2>nul
+@call python bot\nudge.py "WATCHDOG" "Watch Dog online. Starting server" >nul 2>nul
 :START
-
+
 call bin\getcurdate.bat
-
-call bin\getunixtime.bat UNIXTIME
-
-echo %UNIXTIME%
-
-set STARTTIME=%UNIXTIME%
-
+
+call bin\getunixtime.bat UNIXTIME
+
+echo %UNIXTIME%
+
+set STARTTIME=%UNIXTIME%
+
 cls
 echo Watch Dog.
 echo Server Running. Watching for server exits.
-start /WAIT /ABOVENORMAL "" dreamdaemon.exe gamefolder\%PROJECTNAME%.dmb -port %PORT% -trusted -close -public -verbose
+start /WAIT /ABOVENORMAL "" dreamdaemon.exe gamefolder\%PROJECTNAME%.dmb -port %PORT% -trusted -close -public -verbose
 cls
-
-call bin\getunixtime.bat UNIXTIME
-
-SET /A Result=%UNIXTIME% - %STARTTIME%
-SET /A Result=180 - (%Result%/3)
-if %Result% LSS 0 set /A Result=0
-
+
+call bin\getunixtime.bat UNIXTIME
+
+SET /A Result=%UNIXTIME% - %STARTTIME%
+SET /A Result=180 - (%Result%/3)
+if %Result% LSS 0 set /A Result=0
+
 echo Watch Dog.
-echo Server exit detected. Restarting in %Result% seconds.
-@python bot\nudge.py "WATCHDOG" "Server exit detected. Restarting server in %Result% seconds." >nul 2>nul
-timeout %Result%
+echo Server exit detected. Restarting in %Result% seconds.
+@python bot\nudge.py "WATCHDOG" "Server exit detected. Restarting server in %Result% seconds." >nul 2>nul
+timeout %Result%
 
 goto :START