From bc7f3c67a6d93640f7288020010814ccc4d86cd8 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Wed, 31 Aug 2016 01:48:02 -0400
Subject: [PATCH 01/52] Cloning Update

---
 code/__DEFINES/genetics.dm                 |   3 +
 code/controllers/Processes/fast_process.dm |   2 +-
 code/game/machinery/cloning.dm             | 251 +++++++++++----------
 code/game/machinery/computer/cloning.dm    |  14 +-
 code/modules/countdown/countdown.dm        |  69 ++++++
 paradise.dme                               |   1 +
 6 files changed, 202 insertions(+), 138 deletions(-)
 create mode 100644 code/modules/countdown/countdown.dm

diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm
index 3828392f99e..11393957fc1 100644
--- a/code/__DEFINES/genetics.dm
+++ b/code/__DEFINES/genetics.dm
@@ -111,3 +111,6 @@
 #define GENETIC_DAMAGE_STAGE_1 80
 #define GENETIC_DAMAGE_STAGE_2 65
 #define GENETIC_DAMAGE_STAGE_3 35
+
+#define CLONER_FRESH_CLONE "fresh"
+#define CLONER_MATURE_CLONE "mature"
\ No newline at end of file
diff --git a/code/controllers/Processes/fast_process.dm b/code/controllers/Processes/fast_process.dm
index 85a688c3d12..72ed0e68fee 100644
--- a/code/controllers/Processes/fast_process.dm
+++ b/code/controllers/Processes/fast_process.dm
@@ -6,7 +6,7 @@
 
 /datum/controller/process/fast_process/statProcess()
 	..()
-	stat(null, "[fast_processing.len] fast machines")
+	stat(null, "[fast_processing.len] fast processes")
 
 /datum/controller/process/fast_process/doWork()
 	for(last_object in fast_processing)
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 6da0eb3fd55..750a1e77acf 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -25,19 +25,33 @@
 	var/speed_coeff
 	var/efficiency
 
+	var/datum/mind/clonemind
+	var/grab_ghost_when = CLONER_MATURE_CLONE
+
+	var/obj/item/device/radio/Radio
+
+	var/obj/effect/countdown/clonepod/countdown
+
 	light_color = LIGHT_COLOR_PURE_GREEN
-	power_change()
-		..()
-		if(!(stat & (BROKEN|NOPOWER)))
-			set_light(2)
-		else
-			set_light(0)
+
+/obj/machinery/clonepod/power_change()
+	..()
+	if(!(stat & (BROKEN|NOPOWER)))
+		set_light(2)
+	else
+		set_light(0)
 
 /obj/machinery/clonepod/biomass
 	biomass = CLONE_BIOMASS
 
 /obj/machinery/clonepod/New()
 	..()
+	countdown = new(src)
+
+	Radio = new /obj/item/device/radio(src)
+	Radio.listening = 0
+	Radio.config(list("Medical" = 0))
+
 	component_parts = list()
 	component_parts += new /obj/item/weapon/circuitboard/clonepod(null)
 	component_parts += new /obj/item/weapon/stock_parts/scanning_module(null)
@@ -67,6 +81,12 @@
 /obj/machinery/clonepod/Destroy()
 	if(connected)
 		connected.pods -= src
+	if(Radio)
+		qdel(Radio)
+		Radio = null
+	if(countdown)
+		qdel(countdown)
+		countdown = null
 	return ..()
 
 /obj/machinery/clonepod/RefreshParts()
@@ -97,49 +117,29 @@
 	name = "data disk - 'God Emperor of Mankind'"
 	read_only = 1
 
-	New()
-		Initialize()
-		buf.types=DNA2_BUF_UE|DNA2_BUF_UI
-		//data = "066000033000000000AF00330660FF4DB002690"
-		//data = "0C80C80C80C80C80C8000000000000161FBDDEF" - Farmer Jeff
-		buf.dna.real_name="God Emperor of Mankind"
-		buf.dna.unique_enzymes = md5(buf.dna.real_name)
-		buf.dna.UI=list(0x066,0x000,0x033,0x000,0x000,0x000,0xAF0,0x033,0x066,0x0FF,0x4DB,0x002,0x690)
-		//buf.dna.UI=list(0x0C8,0x0C8,0x0C8,0x0C8,0x0C8,0x0C8,0x000,0x000,0x000,0x000,0x161,0xFBD,0xDEF) // Farmer Jeff
-		buf.dna.UpdateUI()
+/obj/item/weapon/disk/data/demo/New()
+	Initialize()
+	buf.types=DNA2_BUF_UE|DNA2_BUF_UI
+	//data = "066000033000000000AF00330660FF4DB002690"
+	//data = "0C80C80C80C80C80C8000000000000161FBDDEF" - Farmer Jeff
+	buf.dna.real_name="God Emperor of Mankind"
+	buf.dna.unique_enzymes = md5(buf.dna.real_name)
+	buf.dna.UI=list(0x066,0x000,0x033,0x000,0x000,0x000,0xAF0,0x033,0x066,0x0FF,0x4DB,0x002,0x690)
+	//buf.dna.UI=list(0x0C8,0x0C8,0x0C8,0x0C8,0x0C8,0x0C8,0x000,0x000,0x000,0x000,0x161,0xFBD,0xDEF) // Farmer Jeff
+	buf.dna.UpdateUI()
 
 /obj/item/weapon/disk/data/monkey
 	name = "data disk - 'Mr. Muggles'"
 	read_only = 1
 
-	New()
-		Initialize()
-		buf.types=DNA2_BUF_SE
-		var/list/new_SE=list(0x098,0x3E8,0x403,0x44C,0x39F,0x4B0,0x59D,0x514,0x5FC,0x578,0x5DC,0x640,0x6A4)
-		for(var/i=new_SE.len;i<=DNA_SE_LENGTH;i++)
-			new_SE += rand(1,1024)
-		buf.dna.SE=new_SE
-		buf.dna.SetSEValueRange(MONKEYBLOCK,0xDAC, 0xFFF)
-
-
-//Find a dead mob with a brain and client.
-/proc/find_dead_player(var/find_key)
-	if(isnull(find_key))
-		return
-
-	var/mob/selected = null
-	for(var/mob/M in player_list)
-		//Dead people only thanks!
-		if((M.stat != 2) || (!M.client))
-			continue
-		//They need a brain!
-		if(istype(M, /mob/living/carbon/human) && !M.get_int_organ(/obj/item/organ/internal/brain))
-			continue
-
-		if(M.ckey == find_key)
-			selected = M
-			break
-	return selected
+/obj/item/weapon/disk/data/monkey/New()
+	Initialize()
+	buf.types=DNA2_BUF_SE
+	var/list/new_SE=list(0x098,0x3E8,0x403,0x44C,0x39F,0x4B0,0x59D,0x514,0x5FC,0x578,0x5DC,0x640,0x6A4)
+	for(var/i=new_SE.len;i<=DNA_SE_LENGTH;i++)
+		new_SE += rand(1,1024)
+	buf.dna.SE=new_SE
+	buf.dna.SetSEValueRange(MONKEYBLOCK,0xDAC, 0xFFF)
 
 //Disk stuff.
 /obj/item/weapon/disk/data/New()
@@ -173,44 +173,40 @@
 			healthstring = "ERROR"
 		return healthstring
 
-/obj/machinery/clonepod/attack_ai(mob/user as mob)
-	return attack_hand(user)
-
-/obj/machinery/clonepod/attack_hand(mob/user as mob)
-	if((isnull(occupant)) || (stat & NOPOWER))
-		if(mess)
-			go_out()
-		return
-	if((!isnull(occupant)) && (occupant.stat != 2))
-		var/completion = (100 * ((occupant.health + 100) / (heal_level + 100)))
-		to_chat(user, "Current clone cycle is [round(completion)]% complete.")
-	return
-
 //Clonepod
 
+/obj/machinery/clonepod/examine(mob/user)
+	..()
+	if(mess)
+		to_chat(user, "It's filled with blood and vicerea. You swear you can see it moving...")
+	if(!occupant || stat & (NOPOWER|BROKEN))
+		return
+	if(occupant && occupant.stat != DEAD)
+		to_chat(user,  "Current clone cycle is [round(get_completion())]% complete.")
+
+/obj/machinery/clonepod/proc/get_completion()
+	. = (100 * ((occupant.health + 100) / (heal_level + 100)))
+
+/obj/machinery/clonepod/attack_ai(mob/user)
+	return examine(user)
+
 //Start growing a human clone in the pod!
-/obj/machinery/clonepod/proc/growclone(var/datum/dna2/record/R)
+/obj/machinery/clonepod/proc/growclone(datum/dna2/record/R)
 	if(mess || attempting || panel_open || stat & (NOPOWER|BROKEN))
 		return 0
-	var/datum/mind/clonemind = locate(R.mind)
+	clonemind = locate(R.mind)
 	if(!istype(clonemind))	//not a mind
 		return 0
 	if( clonemind.current && clonemind.current.stat != DEAD )	//mind is associated with a non-dead body
 		return 0
 	if(clonemind.active)	//somebody is using that mind
-		if( ckey(clonemind.key)!=R.ckey )
+		if(ckey(clonemind.key) != R.ckey)
 			return 0
 	else
-		for(var/mob/M in player_list)
-			if(M.ckey == R.ckey)
-				if(istype(M, /mob/dead/observer))
-					var/mob/dead/observer/G = M
-					if(G.can_reenter_corpse)
-						break
-				if(istype(M, /mob/living/simple_animal))
-					if(M in respawnable_list)
-						break
-				return 0
+		// get_ghost() will fail if they're unable to reenter their body
+		var/mob/dead/observer/G = clonemind.get_ghost()
+		if(!G)
+			return 0
 
 	if(biomass >= CLONE_BIOMASS)
 		biomass -= CLONE_BIOMASS
@@ -219,6 +215,7 @@
 
 	attempting = 1 //One at a time!!
 	locked = 1
+	countdown.start()
 
 	eject_wait = 1
 	spawn(30)
@@ -239,8 +236,16 @@
 	//Here let's calculate their health so the pod doesn't immediately eject them!!!
 	H.updatehealth()
 
-	clonemind.transfer_to(H)
-	to_chat(H, "<span class='notice'><b>Consciousness slowly creeps over you as your body regenerates.</b><br><i>So this is what cloning feels like?</i></span>")
+	if(grab_ghost_when == CLONER_FRESH_CLONE)
+		clonemind.transfer_to(H)
+		H.ckey = R.ckey
+		to_chat(H, "<span class='notice'><b>Consciousness slowly creeps over you \
+			as your body regenerates.</b><br><i>So this is what cloning \
+			feels like?</i></span>")
+	else if(grab_ghost_when == CLONER_MATURE_CLONE)
+		to_chat(clonemind.current, "<span class='notice'>Your body is \
+			beginning to regenerate in a cloning pod. You will \
+			become conscious when it is complete.</span>")
 
 	// -- Mode/mind specific stuff goes here
 	callHook("clone", list(H))
@@ -299,20 +304,20 @@
 		biomass += BIOMASS_MEAT_AMOUNT
 		show_message = 1
 	if(show_message)
-		visible_message("\The [src] sucks in and processes the nearby biomass.")
+		visible_message("[src] sucks in and processes the nearby biomass.")
 
 	if(stat & NOPOWER) //Autoeject if power is lost
 		if(occupant)
 			locked = 0
 			go_out()
-		return
+			connected_message("Clone Ejected: Loss of power.")
 
-	if((occupant) && (occupant.loc == src))
-		if((occupant.stat == DEAD) || (occupant.suiciding) || !occupant.key)  //Autoeject corpses and suiciding dudes.
+	else if((occupant) && (occupant.loc == src))
+		if((occupant.stat == DEAD) || (occupant.suiciding))  //Autoeject corpses and suiciding dudes.
 			locked = 0
 			go_out()
 			connected_message("Clone Rejected: Deceased.")
-			return
+			Radio.autosay("The cloning of <b>[occupant]</b> has been aborted due to unrecoverable tissue failure.", name, "Medical", list(z))
 
 		else if(occupant.cloneloss > (100 - heal_level))
 			occupant.Paralyse(4)
@@ -331,48 +336,40 @@
 			occupant.adjustOxyLoss(-4)
 
 			use_power(7500) //This might need tweaking.
-			return
 
 		else if((occupant.cloneloss <= (100 - heal_level)) && (!eject_wait))
 			connected_message("Cloning Process Complete.")
+			Radio.autosay("The cloning cycle of <b>[occupant]</b> is complete.", name, "Medical", list(z))
 			locked = 0
 			go_out()
-			return
 
 	else if((!occupant) || (occupant.loc != src))
 		occupant = null
 		if(locked)
 			locked = 0
-		//use_power(200)
-		return
-
-	return
+		update_icon()
+		use_power(200)
 
 //Let's unlock this early I guess.  Might be too early, needs tweaking.
-/obj/machinery/clonepod/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/screwdriver))
-		if(occupant || mess || locked)
-			to_chat(user, "<span class='notice'>The maintenance panel is locked.</span>")
+/obj/machinery/clonepod/attackby(obj/item/weapon/W, mob/user, params)
+	if(!(occupant || mess || locked))
+		if(default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]", W))
 			return
-		default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]", W)
-		return
 
 	if(exchange_parts(user, W))
 		return
 
-	if(istype(W, /obj/item/weapon/crowbar))
-		if(panel_open)
-			default_deconstruction_crowbar(W)
+	if(default_deconstruction_crowbar(W))
 		return
 
-	if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
+	if(W.GetID())
 		if(!check_access(W))
-			to_chat(user, "\red Access Denied.")
+			to_chat(user, "<span class='danger'>Access Denied.</span>")
 			return
-		if((!locked) || (isnull(occupant)))
+		if (!locked || !occupant)
 			return
-		if((occupant.health < -20) && (occupant.stat != 2))
-			to_chat(user, "\red Access Refused.")
+		if(occupant.health < -20 && occupant.stat != DEAD)
+			to_chat(user, "<span class='danger'>Access Refused. Patient status still unstable.</span>")
 			return
 		else
 			locked = 0
@@ -408,16 +405,15 @@
 	else
 		..()
 
-/obj/machinery/clonepod/emag_act(user as mob)
+/obj/machinery/clonepod/emag_act(user)
 	if(isnull(occupant))
 		return
 	to_chat(user, "You force an emergency ejection.")
 	locked = 0
 	go_out()
-	return
 
 //Put messages in the connected computer's temp var for display.
-/obj/machinery/clonepod/proc/connected_message(var/message)
+/obj/machinery/clonepod/proc/connected_message(message)
 	if((isnull(connected)) || (!istype(connected, /obj/machinery/computer/cloning)))
 		return 0
 	if(!message)
@@ -434,49 +430,58 @@
 
 	if(!usr)
 		return
-	if(usr.stat != 0)
+	if(usr.incapacitated())
 		return
-	go_out(usr)
+	go_out()
 	add_fingerprint(usr)
-	return
 
-/obj/machinery/clonepod/proc/go_out(user)
+/obj/machinery/clonepod/proc/go_out()
+	if(locked)
+		return
+	countdown.stop()
+
 	if(mess) //Clean that mess and dump those gibs!
-		if(occupant)
-			return
 		mess = 0
 		gibs(loc)
 		playsound(loc, 'sound/effects/splat.ogg', 50, 1)
 		update_icon()
 		return
 
-	if(!(occupant))
-		to_chat(user, "<span class=\"warning\">The cloning pod is empty!</span>")
+	if(!occupant)
 		return
 
-	if(locked)
-		to_chat(user, "<span class=\"warning\">The cloning pod is locked!</span>")
-		return
+	if(grab_ghost_when == CLONER_MATURE_CLONE)
+		clonemind.transfer_to(occupant)
+		occupant.grab_ghost()
+		to_chat(occupant, "<span class='notice'><b>There is a bright flash!</b><br>\
+			<i>You feel like a new being.</i></span>")
+		occupant.flash_eyes()
 
-	if(occupant.client)
-		occupant.client.eye = occupant.client.mob
-		occupant.client.perspective = MOB_PERSPECTIVE
 	occupant.forceMove(get_turf(src))
 	eject_wait = 0 //If it's still set somehow.
 	domutcheck(occupant) //Waiting until they're out before possible notransform.
+	if(ishuman(occupant))
+		var/mob/living/carbon/human/H = occupant
+		H.shock_stage = 0 //Reset Shock
 	occupant = null
 	update_icon()
-	return
 
 /obj/machinery/clonepod/proc/malfunction()
 	if(occupant)
 		connected_message("Critical Error!")
+		Radio.autosay("Critical error! Please contact a Thinktronic Systems technician, as your warranty may be affected.", name, "Medical", list(z))
 		mess = 1
-		occupant.ghostize()
-		qdel(occupant)
-		occupant = null
 		update_icon()
-	return
+		if(occupant.mind != clonemind)
+			clonemind.transfer_to(occupant)
+		occupant.grab_ghost() // We really just want to make you suffer.
+		to_chat(occupant, "<span class='warning'><b>Agony blazes across your \
+			consciousness as your body is torn apart.</b><br>\
+			<i>Is this what dying is like? Yes it is.</i></span>")
+		playsound(loc, 'sound/machines/warning-buzzer.ogg', 50, 0)
+		occupant << sound('sound/hallucinations/veryfar_noise.ogg',0,1,50)
+		spawn(40)
+			qdel(occupant)
 
 /obj/machinery/clonepod/update_icon()
 	..()
@@ -486,11 +491,9 @@
 	else if(mess && !panel_open)
 		icon_state = "pod_g"
 
-/obj/machinery/clonepod/relaymove(mob/user as mob)
-	if(user.stat)
-		return
-	go_out()
-	return
+/obj/machinery/clonepod/relaymove(mob/user)
+	if(user.stat == CONSCIOUS)
+		go_out()
 
 /obj/machinery/clonepod/emp_act(severity)
 	if(prob(100/(severity*efficiency))) malfunction()
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 6f4a373580c..4afe9ba3cff 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -323,19 +323,7 @@
 					qdel(C)
 					menu = 1
 				else
-					var/mob/selected = find_dead_player("[C.ckey]")
-					if(!selected)
-						return
-						selected << 'sound/machines/chime.ogg' //probably not the best sound but I think it's reasonable
-
-					var/answer = alert(selected,"Do you want to return to life?","Cloning","Yes","No")
-					if(answer != "No" && pod.growclone(C))
-						temp = "Initiating cloning cycle..."
-						records.Remove(C)
-						qdel(C)
-						menu = 1
-					else
-						temp = "Initiating cloning cycle...<br /><span class=\"bad\">Error: Post-initialisation failed. Cloning cycle aborted.</span>"
+					temp = "[C.name] => <font class='bad'>Initialisation failure.</font>"
 
 		else
 			temp = "<span class=\"bad\">Error: Data corruption.</span>"
diff --git a/code/modules/countdown/countdown.dm b/code/modules/countdown/countdown.dm
new file mode 100644
index 00000000000..2ef85d6a9d7
--- /dev/null
+++ b/code/modules/countdown/countdown.dm
@@ -0,0 +1,69 @@
+/obj/effect/countdown
+	name = "countdown"
+	desc = "We're leaving together\n\
+		But still it's farewell\n\
+		And maybe we'll come back\n\
+		To earth, who can tell?"
+
+	var/displayed_text
+	var/atom/attached_to
+	color = "#ff0000"
+	var/text_size = 4
+	var/started = 0
+	invisibility = INVISIBILITY_OBSERVER
+	anchored = 1
+	layer = 5
+
+/obj/effect/countdown/New(atom/A)
+	. = ..()
+	attach(A)
+
+/obj/effect/countdown/proc/attach(atom/A)
+	attached_to = A
+	loc = get_turf(A)
+
+/obj/effect/countdown/proc/start()
+	if(!started)
+		fast_processing += src
+		started = 1
+
+/obj/effect/countdown/proc/stop()
+	if(started)
+		maptext = null
+		fast_processing -= src
+		started = 0
+
+/obj/effect/countdown/proc/get_value()
+	// Get the value from our atom
+	return
+
+/obj/effect/countdown/process()
+	if(!attached_to || qdeleted(attached_to))
+		qdel(src)
+	forceMove(get_turf(attached_to))
+	var/new_val = get_value()
+	if(new_val == displayed_text)
+		return
+	displayed_text = new_val
+
+	if(displayed_text)
+		maptext = "<font size = [text_size]>[displayed_text]</font>"
+	else
+		maptext = null
+
+/obj/effect/countdown/Destroy()
+	attached_to = null
+	fast_processing -= src
+	return ..()
+
+/obj/effect/countdown/clonepod
+	name = "cloning pod countdown"
+	text_size = 1
+
+/obj/effect/countdown/clonepod/get_value()
+	var/obj/machinery/clonepod/C = attached_to
+	if(!istype(C))
+		return
+	else if(C.occupant)
+		var/completion = round(C.get_completion())
+		return completion
diff --git a/paradise.dme b/paradise.dme
index 0d2e7261f3e..a005c1bafd8 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1225,6 +1225,7 @@
 #include "code\modules\computer3\computers\robot.dm"
 #include "code\modules\computer3\computers\security.dm"
 #include "code\modules\computer3\computers\welcome.dm"
+#include "code\modules\countdown\countdown.dm"
 #include "code\modules\crafting\craft.dm"
 #include "code\modules\crafting\guncrafting.dm"
 #include "code\modules\crafting\recipes.dm"

From 72512fa04e00e33eaa9711288e3a2148a62599a9 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Thu, 1 Sep 2016 23:59:55 -0400
Subject: [PATCH 02/52] fixups

---
 code/game/machinery/cloning.dm | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 750a1e77acf..bc6bb9fc709 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -14,7 +14,7 @@
 	icon = 'icons/obj/cloning.dmi'
 	icon_state = "pod_0"
 	req_access = list(access_genetics) //For premature unlocking.
-	var/mob/living/occupant
+	var/mob/living/carbon/human/occupant
 	var/heal_level = 90 //The clone is released once its health reaches this level.
 	var/locked = 0
 	var/obj/machinery/computer/cloning/connected = null //So we remember the connected clone machine.
@@ -178,7 +178,7 @@
 /obj/machinery/clonepod/examine(mob/user)
 	..()
 	if(mess)
-		to_chat(user, "It's filled with blood and vicerea. You swear you can see it moving...")
+		to_chat(user, "It's filled with blood and viscera. You swear you can see it moving...")
 	if(!occupant || stat & (NOPOWER|BROKEN))
 		return
 	if(occupant && occupant.stat != DEAD)
@@ -239,13 +239,13 @@
 	if(grab_ghost_when == CLONER_FRESH_CLONE)
 		clonemind.transfer_to(H)
 		H.ckey = R.ckey
-		to_chat(H, "<span class='notice'><b>Consciousness slowly creeps over you \
-			as your body regenerates.</b><br><i>So this is what cloning \
-			feels like?</i></span>")
+		to_chat(H, {"<span class='notice'><b>Consciousness slowly creeps over you
+			as your body regenerates.</b><br><i>So this is what cloning
+			feels like?</i></span>"})
 	else if(grab_ghost_when == CLONER_MATURE_CLONE)
-		to_chat(clonemind.current, "<span class='notice'>Your body is \
-			beginning to regenerate in a cloning pod. You will \
-			become conscious when it is complete.</span>")
+		to_chat(clonemind.current, {"<span class='notice'>Your body is
+			beginning to regenerate in a cloning pod. You will
+			become conscious when it is complete.</span>"})
 
 	// -- Mode/mind specific stuff goes here
 	callHook("clone", list(H))
@@ -315,9 +315,9 @@
 	else if((occupant) && (occupant.loc == src))
 		if((occupant.stat == DEAD) || (occupant.suiciding))  //Autoeject corpses and suiciding dudes.
 			locked = 0
+			Radio.autosay("The cloning of <b>[occupant]</b> has been aborted due to unrecoverable tissue failure.", name, "Medical", list(z))
 			go_out()
 			connected_message("Clone Rejected: Deceased.")
-			Radio.autosay("The cloning of <b>[occupant]</b> has been aborted due to unrecoverable tissue failure.", name, "Medical", list(z))
 
 		else if(occupant.cloneloss > (100 - heal_level))
 			occupant.Paralyse(4)
@@ -460,9 +460,7 @@
 	occupant.forceMove(get_turf(src))
 	eject_wait = 0 //If it's still set somehow.
 	domutcheck(occupant) //Waiting until they're out before possible notransform.
-	if(ishuman(occupant))
-		var/mob/living/carbon/human/H = occupant
-		H.shock_stage = 0 //Reset Shock
+	occupant.shock_stage = 0 //Reset Shock
 	occupant = null
 	update_icon()
 
@@ -475,9 +473,9 @@
 		if(occupant.mind != clonemind)
 			clonemind.transfer_to(occupant)
 		occupant.grab_ghost() // We really just want to make you suffer.
-		to_chat(occupant, "<span class='warning'><b>Agony blazes across your \
-			consciousness as your body is torn apart.</b><br>\
-			<i>Is this what dying is like? Yes it is.</i></span>")
+		to_chat(occupant, {"<span class='warning'><b>Agony blazes across your
+			consciousness as your body is torn apart.</b><br>
+			<i>Is this what dying is like? Yes it is.</i></span>"})
 		playsound(loc, 'sound/machines/warning-buzzer.ogg', 50, 0)
 		occupant << sound('sound/hallucinations/veryfar_noise.ogg',0,1,50)
 		spawn(40)

From 1d8edbbee66bb2f994a78d2bb5940c8d7f056e33 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Sat, 3 Sep 2016 01:14:32 -0400
Subject: [PATCH 03/52] tweaks

---
 code/game/machinery/cloning.dm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index bc6bb9fc709..735182c0d5b 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -29,6 +29,7 @@
 	var/grab_ghost_when = CLONER_MATURE_CLONE
 
 	var/obj/item/device/radio/Radio
+	var/radio_announce = 0
 
 	var/obj/effect/countdown/clonepod/countdown
 
@@ -190,6 +191,13 @@
 /obj/machinery/clonepod/attack_ai(mob/user)
 	return examine(user)
 
+//Radio Announcement
+
+/obj/machinery/clonepod/proc/announce_radio_message(message)
+	if(radio_announce)
+		Radio.autosay(message, name, "Medical", list(z))
+
+
 //Start growing a human clone in the pod!
 /obj/machinery/clonepod/proc/growclone(datum/dna2/record/R)
 	if(mess || attempting || panel_open || stat & (NOPOWER|BROKEN))
@@ -315,7 +323,7 @@
 	else if((occupant) && (occupant.loc == src))
 		if((occupant.stat == DEAD) || (occupant.suiciding))  //Autoeject corpses and suiciding dudes.
 			locked = 0
-			Radio.autosay("The cloning of <b>[occupant]</b> has been aborted due to unrecoverable tissue failure.", name, "Medical", list(z))
+			announce_radio_message("The cloning of <b>[occupant]</b> has been aborted due to unrecoverable tissue failure.")
 			go_out()
 			connected_message("Clone Rejected: Deceased.")
 
@@ -339,7 +347,7 @@
 
 		else if((occupant.cloneloss <= (100 - heal_level)) && (!eject_wait))
 			connected_message("Cloning Process Complete.")
-			Radio.autosay("The cloning cycle of <b>[occupant]</b> is complete.", name, "Medical", list(z))
+			announce_radio_message("The cloning cycle of <b>[occupant]</b> is complete.")
 			locked = 0
 			go_out()
 
@@ -455,7 +463,7 @@
 		occupant.grab_ghost()
 		to_chat(occupant, "<span class='notice'><b>There is a bright flash!</b><br>\
 			<i>You feel like a new being.</i></span>")
-		occupant.flash_eyes()
+		occupant.flash_eyes(visual = 1)
 
 	occupant.forceMove(get_turf(src))
 	eject_wait = 0 //If it's still set somehow.
@@ -467,7 +475,7 @@
 /obj/machinery/clonepod/proc/malfunction()
 	if(occupant)
 		connected_message("Critical Error!")
-		Radio.autosay("Critical error! Please contact a Thinktronic Systems technician, as your warranty may be affected.", name, "Medical", list(z))
+		announce_radio_message("Critical error! Please contact a Thinktronic Systems technician, as your warranty may be affected.")
 		mess = 1
 		update_icon()
 		if(occupant.mind != clonemind)

From 491523149d4bffae8699dc7da47851c444538e39 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Mon, 5 Sep 2016 18:05:46 -0400
Subject: [PATCH 04/52] Removes Unused Gamemodes

---
 code/game/gamemodes/borer/borer.dm | 159 -------------------------
 code/game/gamemodes/game_mode.dm   |   1 +
 code/game/gamemodes/xenos/xenos.dm | 185 -----------------------------
 config/example/config.txt          |   4 +-
 paradise.dme                       |   2 -
 5 files changed, 2 insertions(+), 349 deletions(-)
 delete mode 100644 code/game/gamemodes/borer/borer.dm
 delete mode 100644 code/game/gamemodes/xenos/xenos.dm

diff --git a/code/game/gamemodes/borer/borer.dm b/code/game/gamemodes/borer/borer.dm
deleted file mode 100644
index 2cd9eab452f..00000000000
--- a/code/game/gamemodes/borer/borer.dm
+++ /dev/null
@@ -1,159 +0,0 @@
-//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04
-// TOTALLY NOT COPY-PASTA FROM meme.dm
-
-/datum/game_mode/var/list/borers = list()
-
-/datum/game_mode/borer
-	name = "corticalborers"
-	config_tag = "borer"
-	required_players = 10
-	restricted_jobs = list("AI", "Cyborg", "Mobile MMI")
-	recommended_enemies = 2 // need at least a borer and a host
-	votable = 0 // temporarily disable this mode for voting
-
-	var/var/list/datum/mind/first_hosts = list()
-	var/var/list/assigned_hosts = list()
-
-	var/list/found_vents = list()
-
-/datum/game_mode/borer/announce()
-	to_chat(world, "<B>The current game mode is - Cortical Borer!</B>")
-	to_chat(world, "<B>An unknown creature has infested the mind of a crew member. Find and destroy it by any means necessary.</B>")
-
-/datum/game_mode/borer/can_start()
-	if(!..())
-		return 0
-
-	// for every 10 players, get 1 borer, and for each borer, get a host
-	// also make sure that there's at least one borer and one host
-	recommended_enemies = max(src.num_players() / 20 * 2, 2)
-
-	var/list/datum/mind/possible_borers = get_players_for_role(ROLE_BORER)
-
-	if(possible_borers.len < 2)
-		log_admin("MODE FAILURE: BORER. NOT ENOUGH BORER CANDIDATES.")
-		return 0 // not enough candidates for borer
-
-	for(var/obj/machinery/atmospherics/unary/vent_pump/v in world)
-		if(!v.welded && is_station_level(v.z))
-			found_vents.Add(v)
-
-	// for each 2 possible borers, add one borer and one host
-	while(possible_borers.len >= 2)
-		var/datum/mind/borer = pick(possible_borers)
-		possible_borers.Remove(borer)
-
-		var/datum/mind/first_host = pick(possible_borers)
-		possible_borers.Remove(first_host)
-
-		modePlayer += borer
-		modePlayer += first_host
-		borers += borer
-		first_hosts += first_host
-
-		// so that we can later know which host belongs to which borer
-		assigned_hosts[borer.key] = first_host
-
-		borer.assigned_role = "MODE" //So they aren't chosen for other jobs.
-		borer.special_role = SPECIAL_ROLE_BORER
-
-	return 1
-
-/datum/game_mode/borer/pre_setup()
-	return 1
-
-
-/datum/game_mode/borer/post_setup()
-	// create a borer and enter it
-	for(var/datum/mind/borer in borers)
-		// Pick a backup location to spawn at if we can't infest.
-		var/spawn_loc
-		if(found_vents.len)
-			var/vent = pick(found_vents)
-			found_vents.Remove(vent)
-			spawn_loc=get_turf(vent)
-		else
-			spawn_loc=pick(xeno_spawn)
-
-		var/mob/living/simple_animal/borer/M = new(spawn_loc,1) // loc, by_gamemode=0
-		var/mob/original = borer.current
-		borer.transfer_to(M)
-		//M.clearHUD()
-
-		// get the host for this borer
-		var/datum/mind/first_host = assigned_hosts[borer.key]
-		// this is a redundant check, but I don't think the above works..
-		// if picking hosts works with this method, remove the method above
-		if(!first_host)
-			first_host = pick(first_hosts)
-			first_hosts.Remove(first_host)
-		M.perform_infestation(first_host.current)
-		forge_borer_objectives(borer, first_host)
-
-		qdel(original)
-
-	log_admin("Created [borers.len] borers.")
-
-	..()
-
-/datum/game_mode/proc/greet_borer(var/datum/mind/borer, var/you_are=1)
-	if(you_are)
-		to_chat(borer.current, "<span class='danger'>You are a Cortical Borer!</span>")
-
-	var/obj_count = 1
-	for(var/datum/objective/objective in borer.objectives)
-		to_chat(borer.current, "<B>Objective #[obj_count]</B>: [objective.explanation_text]")
-		obj_count++
-	return
-
-/datum/game_mode/borer/check_finished()
-	var/borers_alive = 0
-	for(var/datum/mind/borer in borers)
-		if(!istype(borer.current,/mob/living))
-			continue
-		if(borer.current.stat==2)
-			continue
-		borers_alive++
-
-	if(borers_alive)
-		return ..()
-	else
-		return 1
-
-/datum/game_mode/proc/auto_declare_completion_borer()
-	for(var/datum/mind/borer in borers)
-		var/borerwin = 1
-		if((borer.current) && istype(borer.current,/mob/living/simple_animal/borer))
-			to_chat(world, "<B>The borer was [borer.current.key].</B>")
-			to_chat(world, "<B>The last host was [borer.current:host.key].</B>")
-
-			var/count = 1
-			for(var/datum/objective/objective in borer.objectives)
-				if(objective.check_completion())
-					to_chat(world, "<B>Objective #[count]</B>: [objective.explanation_text] \green <B>Success</B>")
-					feedback_add_details("borer_objective","[objective.type]|SUCCESS")
-				else
-					to_chat(world, "<B>Objective #[count]</B>: [objective.explanation_text] \red Failed")
-					feedback_add_details("borer_objective","[objective.type]|FAIL")
-					borerwin = 0
-				count++
-
-		else
-			borerwin = 0
-
-		if(borerwin)
-			to_chat(world, "<B>The borer was successful!<B>")
-			feedback_add_details("borer_success","SUCCESS")
-		else
-			to_chat(world, "<B>The borer has failed!<B>")
-			feedback_add_details("borer_success","FAIL")
-	return 1
-
-/datum/game_mode/proc/forge_borer_objectives(var/datum/mind/borer, var/datum/mind/first_host)
-	var/datum/objective/survive/survive_objective = new
-	survive_objective.owner = borer
-	borer.objectives += survive_objective
-
-	greet_borer(borer)
-
-	return
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 06f071366e1..6058b1a2d76 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -35,6 +35,7 @@
 	var/const/waittime_l = 600  //lower bound on time before intercept arrives (in tenths of seconds)
 	var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds)
 	var/list/player_draft_log = list()
+	var/list/datum/mind/xenos = list()
 
 /datum/game_mode/proc/announce() //to be calles when round starts
 	to_chat(world, "<B>Notice</B>: [src] did not define announce()")
diff --git a/code/game/gamemodes/xenos/xenos.dm b/code/game/gamemodes/xenos/xenos.dm
deleted file mode 100644
index c4659993e45..00000000000
--- a/code/game/gamemodes/xenos/xenos.dm
+++ /dev/null
@@ -1,185 +0,0 @@
-/datum/game_mode
-	var/list/datum/mind/xenos = list()
-
-
-/datum/game_mode/xenos
-	name = "xenos"
-	config_tag = "xenos"
-	required_players = 30
-	required_enemies = 3
-	var/result = 0
-	var/checkwin_counter = 0
-	var/xenos_list = list()
-	var/gammacalled = 0
-
-	var/gammaratio = 4 //At what alien to human ratio will the Gamma security level be called and the nuke be made available?
-
-/datum/game_mode/xenos/announce()
-	to_chat(world, "<B>The current game mode is - Xenos!</B>")
-	to_chat(world, "<B>There is an Xenomorph attack on the station.<BR>Aliens - Kill or infect the crew. Protect the Queen. <BR>Crew - Protect the station. Exterminate all aliens.</B>")
-
-/datum/game_mode/xenos/can_start()
-	if(!..())
-		return 0
-
-	var/list/candidates = get_players_for_role(ROLE_ALIEN)
-	var/playersready = 0
-	var/xenos_num = required_enemies
-	for(var/mob/new_player/player in player_list)
-		if((player.client)&&(player.ready))
-			playersready += 1
-
-	//Check that we have enough alien candidates
-	if(candidates.len < required_enemies)
-		return 0
-
-	//Grab candidates randomly until we have enough.
-	while(xenos_num > 0)
-		var/datum/mind/new_xenos = pick(candidates)
-		xenos += new_xenos
-		candidates -= new_xenos
-		xenos_num--
-
-	for(var/datum/mind/xeno in xenos)
-		xeno.assigned_role = "MODE"
-		xeno.special_role = SPECIAL_ROLE_XENOMORPH
-		set_antag_hud(xeno, "hudalien")//like this is needed...
-	return 1
-
-/datum/game_mode/xenos/pre_setup()
-	return 1
-
-/datum/game_mode/xenos/post_setup()
-
-	var/list/turf/xenos_spawn = list()
-
-	for(var/obj/effect/landmark/A in landmarks_list)
-		if(A.name == "Xenos-Spawn")
-			xenos_spawn += get_turf(A)
-			qdel(A)
-			continue
-
-	var/xenoqueen_selected = 0
-	var/spawnpos = 1
-
-	for(var/datum/mind/xeno_mind in xenos)
-		if(spawnpos > xenos_spawn.len)
-			spawnpos = 1
-		//XenoQueen Selection
-		if(!xenoqueen_selected)
-			var/mob/living/carbon/alien/humanoid/queen/O = new(xenos_spawn[spawnpos])
-			if(xeno_mind.current)
-				xeno_mind.transfer_to(O)
-			else
-				O.key = xeno_mind.current.key
-			xeno_mind.name = O.name
-			//qdel(xeno_mind)
-			xenoqueen_selected = 1
-			spawnpos++
-			continue
-		//Additional larvas if playercount > 20
-		else
-			var/mob/living/carbon/alien/larva/O = new(xenos_spawn[spawnpos])
-			if(xeno_mind.current)
-				xeno_mind.transfer_to(O)
-			else
-				O.key = xeno_mind.current.key
-			xeno_mind.name = O.name
-			//qdel(xeno_mind)
-		spawnpos++
-
-	return ..()
-
-/datum/game_mode/xenos/process()
-	checkwin_counter++
-	if(checkwin_counter >= 5)
-		if(!result)
-			ticker.mode.check_win()
-		checkwin_counter = 0
-	return 0
-
-
-/datum/game_mode/xenos/check_win()
-	var/xenosalive = xenos_alive()
-	var/playersalive = players_alive()
-	var/playeralienratio = 0
-	if(playersalive)
-		playeralienratio = xenosalive / playersalive
-	if(shuttle_master && shuttle_master.emergency.mode >= SHUTTLE_ESCAPE)
-		return ..()
-	if(!xenosalive)
-		result = 1
-		return 1
-	else if(!playersalive)
-		result = 2
-		return 1
-	else if(station_was_nuked)
-		result = 3
-		return 1
-	else
-		if(playeralienratio >= gammaratio && !gammacalled)
-			gammacalled = 1
-			command_announcement.Announce("The aliens have nearly succeeded in capturing the station and exterminating the crew. Activate the nuclear failsafe to stop the alien threat once and for all. The Nuclear Authentication Code is [get_nuke_code()] ", "Alien Lifeform Alert")
-			set_security_level("gamma")
-			var/obj/machinery/door/airlock/vault/V = locate(/obj/machinery/door/airlock/vault) in world
-			if(V && is_station_level(V.z))
-				V.locked = 0
-				V.update_icon()
-		return ..()
-
-/datum/game_mode/xenos/check_finished()
-	return result != 0
-
-/datum/game_mode/xenos/proc/xenos_alive()
-	var/list/livingxenos = list()
-	for(var/datum/mind/xeno in xenos)
-		if((xeno) && (xeno.current) && (xeno.current.stat != 2) && (xeno.current.client))
-			if(istype(xeno.current,/mob/living/carbon/alien))
-				livingxenos += xeno
-	return livingxenos.len
-
-/datum/game_mode/xenos/proc/players_alive()
-	var/list/livingplayers = list()
-	for(var/mob/M in player_list)
-		var/turf/T = get_turf(M)
-		if((M) && (M.stat != DEAD) && M.client && T && (is_station_level(T.z) || shuttle_master.emergency.mode >= SHUTTLE_ESCAPE && is_secure_level(T.z)))
-			if(ishuman(M))
-				livingplayers += 1
-	return livingplayers.len
-
-/datum/game_mode/xenos/declare_completion()
-	if(station_was_nuked)
-		feedback_set_details("round_end_result","win - xenos nuked")
-		to_chat(world, "<FONT size = 3><B>Crew Victory</B></FONT>")
-		to_chat(world, "<B>The station was destroyed in a nuclear explosion, preventing the aliens from overrunning it!</B>")
-	else if(result == 1)
-		feedback_set_details("round_end_result","win - xenos killed")
-		to_chat(world, "<FONT size = 3><B>Crew Victory</B></FONT>")
-		to_chat(world, "<B>The aliens did not succeed and were exterminated by the crew!</B>")
-	else if(result == 2)
-		feedback_set_details("round_end_result","win - crew killed")
-		to_chat(world, "<FONT size = 3><B>Alien Victory</B></FONT>")
-		to_chat(world, "<B>The aliens were successful and slaughtered the crew!</B>")
-	else
-		feedback_set_details("round_end_result","win - crew escaped")
-		to_chat(world, "<FONT size = 3><B>Draw</B></FONT>")
-		to_chat(world, "<B>The crew has escaped from the aliens but did not exterminate them, allowing them to overrun the station.</B>")
-
-	var/text = "<br><FONT size=3><B>There were [xenos.len] aliens.</B></FONT>"
-	text += "<br><FONT size=3><B>The aliens were:</B></FONT>"
-	for(var/datum/mind/xeno in xenos)
-		text += "<br><b>[xeno.key]</b> was <b>[xeno.name]</b> ("
-		if(xeno.current)
-			if(xeno.current.stat == DEAD)
-				text += "died"
-			else if(!xeno.current.client)
-				text += "SSD"
-			else
-				text += "survived"
-		else
-			text += "body destroyed"
-		text += ")"
-	to_chat(world, text)
-
-	..()
-	return 1
diff --git a/config/example/config.txt b/config/example/config.txt
index e25941413fd..f2087eebaa2 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -72,7 +72,7 @@ KICK_INACTIVE
 ## set to 0 to disable that mode
 PROBABILITY EXTENDED 2
 PROBABILITY NUCLEAR 3
-PROBABILITY ABDUCTION 2
+PROBABILITY ABDUCTION 0
 PROBABILITY CHANGELING 3
 PROBABILITY CULT 4
 PROBABILITY EXTEND-A-TRAITORMONGOUS 5
@@ -84,8 +84,6 @@ PROBABILITY HEIST 1
 PROBABILITY WIZARD 2
 PROBABILITY VAMPIRE 3
 PROBABILITY RAGINMAGES 0
-PROBABILITY BORER 0
-PROBABILITY XENOS 0
 PROBABILITY METEOR 0
 PROBABILITY TRAITOR 0
 PROBABILITY SHADOWLING 2
diff --git a/paradise.dme b/paradise.dme
index 7246870bf24..6efa0a7f84b 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -380,7 +380,6 @@
 #include "code\game\gamemodes\blob\blobs\resource.dm"
 #include "code\game\gamemodes\blob\blobs\shield.dm"
 #include "code\game\gamemodes\blob\blobs\storage.dm"
-#include "code\game\gamemodes\borer\borer.dm"
 #include "code\game\gamemodes\changeling\changeling.dm"
 #include "code\game\gamemodes\changeling\changeling_power.dm"
 #include "code\game\gamemodes\changeling\evolution_menu.dm"
@@ -462,7 +461,6 @@
 #include "code\game\gamemodes\wizard\soulstone.dm"
 #include "code\game\gamemodes\wizard\spellbook.dm"
 #include "code\game\gamemodes\wizard\wizard.dm"
-#include "code\game\gamemodes\xenos\xenos.dm"
 #include "code\game\jobs\access.dm"
 #include "code\game\jobs\job_controller.dm"
 #include "code\game\jobs\job_objective.dm"

From 521fba608dc3df3e14b92996e9f391bb9ff136ca Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Mon, 5 Sep 2016 18:33:03 -0400
Subject: [PATCH 05/52] how did I miss that. Derp

---
 code/game/machinery/cloning.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 012b992b357..f07cd94438d 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -118,7 +118,6 @@
 	name = "data disk - 'God Emperor of Mankind'"
 	read_only = 1
 
-<<<<<<< HEAD
 /obj/item/weapon/disk/data/demo/New()
 	Initialize()
 	buf.types=DNA2_BUF_UE|DNA2_BUF_UI

From 010293bbf8aa90ccd59ad879df0dbbd72b0be6a6 Mon Sep 17 00:00:00 2001
From: GeneralChaos81 <generalchaos81@gmail.com>
Date: Fri, 9 Sep 2016 16:35:08 +1000
Subject: [PATCH 06/52] Port of TGs buildable conveyors. We can finally repair
 broken conveyors!

---
 code/datums/supplypacks.dm                    |  13 ++
 code/modules/recycling/conveyor2.dm           | 170 ++++++++++++++++--
 .../research/designs/autolathe_designs.dm     |  16 ++
 3 files changed, 189 insertions(+), 10 deletions(-)

diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index 9d9f171bda8..22b6d6791b0 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -616,6 +616,19 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 	access = access_ce
 	announce_beacons = list("Engineering" = list("Chief Engineer's Desk", "Atmospherics"))
 
+/datum/supply_packs/engineering/conveyor  // NEW
+	name = "Conveyor Assembly Crate"
+	contains = list(/obj/item/conveyor_construct,
+					/obj/item/conveyor_construct,
+					/obj/item/conveyor_construct,
+					/obj/item/conveyor_construct,
+					/obj/item/conveyor_construct,
+					/obj/item/conveyor_construct,
+					/obj/item/conveyor_switch_construct,
+					/obj/item/weapon/paper/conveyor)
+	cost = 15
+	containername = "conveyor assembly crate"
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Medical /////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 6ff39d21b0d..d827f3bb36f 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -44,10 +44,20 @@
 	icon_state = "conveyor[operating * verted]"
 
 	// create a conveyor
+/*/obj/machinery/conveyor/New(loc, newdir)
+	..(loc)
+	if(newdir)
+		dir = newdir
+	update_move_direction()*/ // Old
+
 /obj/machinery/conveyor/New(loc, newdir)
 	..(loc)
 	if(newdir)
 		dir = newdir
+	update_move_direction()
+
+
+/obj/machinery/conveyor/proc/update_move_direction() //This proc is new, moved stuff from New
 	switch(dir)
 		if(NORTH)
 			forwards = NORTH
@@ -65,11 +75,11 @@
 			forwards = EAST
 			backwards = SOUTH
 		if(NORTHWEST)
-			forwards = SOUTH
-			backwards = WEST
-		if(SOUTHEAST)
 			forwards = NORTH
 			backwards = EAST
+		if(SOUTHEAST)
+			forwards = SOUTH
+			backwards = WEST
 		if(SOUTHWEST)
 			forwards = WEST
 			backwards = NORTH
@@ -77,6 +87,11 @@
 		var/temp = forwards
 		forwards = backwards
 		backwards = temp
+	if(operating == 1)
+		movedir = forwards
+	else
+		movedir = backwards
+	update()
 
 /obj/machinery/conveyor/proc/setmove()
 	if(operating == 1)
@@ -114,11 +129,33 @@
 		CHECK_TICK
 
 // attack with item, place item on conveyor
-/obj/machinery/conveyor/attackby(var/obj/item/I, mob/user, params)
+/*/obj/machinery/conveyor/attackby(var/obj/item/I, mob/user, params)
 	if(isrobot(user))	return //Carn: fix for borgs dropping their modules on conveyor belts
 	user.drop_item()
 	if(I && I.loc)	I.loc = src.loc
-	return
+	return*/ // NEW CODE HERE ---v
+/obj/machinery/conveyor/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/weapon/crowbar))
+		if(!(stat & BROKEN))
+			var/obj/item/conveyor_construct/C = new/obj/item/conveyor_construct(src.loc)
+			C.id = id
+			transfer_fingerprints_to(C)
+		user << "<span class='notice'>You remove the conveyor belt.</span>"
+		qdel(src)
+
+	else if(istype(I, /obj/item/weapon/wrench))
+		if(!(stat & BROKEN))
+			playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
+			//setDir(turn(dir,-45)) //No such proc
+			dir = turn(dir,-45)
+			update_move_direction()
+			user << "<span class='notice'>You rotate [src].</span>"
+
+	else if(user.a_intent != "harm")
+		if(user.drop_item())
+			I.loc = src.loc
+	else
+		return ..()
 
 // attack with hand, move pulled object onto conveyor
 /obj/machinery/conveyor/attack_hand(mob/user as mob)
@@ -176,6 +213,7 @@
 	var/position = 0			// 0 off, -1 reverse, 1 forward
 	var/last_pos = -1			// last direction setting
 	var/operated = 1			// true if just operated
+	var/convdir = 0				// 0 is two way switch, 1 and -1 means one way
 
 	var/id = "" 				// must match conveyor IDs to control them
 
@@ -184,13 +222,24 @@
 	speed_process = 1
 
 
-/obj/machinery/conveyor_switch/New()
+/*/obj/machinery/conveyor_switch/New()
 	..()
 	update()
 
 	spawn(5)		// allow map load
 		conveyors = list()
 		for(var/obj/machinery/conveyor/C in world)
+			if(C.id == id)
+				conveyors += C*/ //NEW CODE -v
+obj/machinery/conveyor_switch/New(newloc, newid)
+	..(newloc)
+	if(!id)
+		id = newid
+	update()
+
+	spawn(5)		// allow map load
+		conveyors = list()
+		for(var/obj/machinery/conveyor/C in machines)
 			if(C.id == id)
 				conveyors += C
 
@@ -218,8 +267,12 @@
 		C.setmove()
 		CHECK_TICK
 
+/obj/machinery/conveyor_switch/oneway
+	convdir = 1 //Set to 1 or -1 depending on which way you want the convayor to go. (In other words keep at 1 and set the proper dir on the belts.)
+	desc = "A conveyor control switch. It appears to only go in one direction."
+
 // attack with hand, switch position
-/obj/machinery/conveyor_switch/attack_hand(mob/user)
+/*/obj/machinery/conveyor_switch/attack_hand(mob/user)
 	if(!allowed(user))
 		to_chat(user, "<span class='warning'>Access denied.</span>")
 		return
@@ -239,6 +292,34 @@
 	operated = 1
 	update()
 
+	// find any switches with same id as this one, and set their positions to match us
+	for(var/obj/machinery/conveyor_switch/S in machines)
+		if(S.id == src.id)
+			S.position = position
+			S.update()
+		CHECK_TICK*/ //New vode
+/obj/machinery/conveyor_switch/attack_hand(mob/user)
+	if(!allowed(user)) //this is in Para but not TG
+		to_chat(user, "<span class='warning'>Access denied.</span>")
+		return
+	add_fingerprint(user)
+	if(position == 0)
+		if(convdir)   //is it a oneway switch
+			position = convdir
+		else
+			if(last_pos < 0)
+				position = 1
+				last_pos = 0
+			else
+				position = -1
+				last_pos = 0
+	else
+		last_pos = position
+		position = 0
+
+	operated = 1
+	update()
+
 	// find any switches with same id as this one, and set their positions to match us
 	for(var/obj/machinery/conveyor_switch/S in machines)
 		if(S.id == src.id)
@@ -246,9 +327,6 @@
 			S.update()
 		CHECK_TICK
 
-/obj/machinery/conveyor_switch/oneway
-	var/convdir = 1 //Set to 1 or -1 depending on which way you want the convayor to go. (In other words keep at 1 and set the proper dir on the belts.)
-	desc = "A conveyor control switch. It appears to only go in one direction."
 
 // attack with hand, switch position
 /obj/machinery/conveyor_switch/oneway/attack_hand(mob/user)
@@ -265,3 +343,75 @@
 		if(S.id == src.id)
 			S.position = position
 			S.update()
+
+/obj/machinery/conveyor_switch/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/weapon/crowbar))
+		var/obj/item/conveyor_switch_construct/C = new/obj/item/conveyor_switch_construct(src.loc)
+		C.id = id
+		transfer_fingerprints_to(C)
+		user << "<span class='notice'>You deattach the conveyor switch.</span>"
+		qdel(src)
+
+
+
+//
+// CONVEYOR CONSTRUCTION STARTS HERE
+//   All new here.
+
+/obj/item/conveyor_construct
+	icon = 'icons/obj/recycling.dmi'
+	icon_state = "conveyor0"
+	name = "conveyor belt assembly"
+	desc = "A conveyor belt assembly."
+	w_class = 4
+	var/id = "" //inherited by the belt
+
+/obj/item/conveyor_construct/attackby(obj/item/I, mob/user, params)
+	..()
+	if(istype(I, /obj/item/conveyor_switch_construct))
+		user << "<span class='notice'>You link the switch to the conveyor belt assembly.</span>"
+		var/obj/item/conveyor_switch_construct/C = I
+		id = C.id
+
+/obj/item/conveyor_construct/afterattack(atom/A, mob/user, proximity)
+	if(!proximity || user.stat || !istype(A, /turf/simulated/floor) || istype(A, /area/shuttle))
+		return
+	var/cdir = get_dir(A, user)
+	if(A == user.loc)
+		user << "<span class='notice'>You cannot place a conveyor belt under yourself.</span>"
+		return
+	var/obj/machinery/conveyor/C = new/obj/machinery/conveyor(A,cdir)
+	C.id = id
+	transfer_fingerprints_to(C)
+	qdel(src)
+
+/obj/item/conveyor_switch_construct
+	name = "conveyor switch assembly"
+	desc = "A conveyor control switch assembly."
+	icon = 'icons/obj/recycling.dmi'
+	icon_state = "switch-off"
+	w_class = 4
+	var/id = "" //inherited by the switch
+
+/obj/item/conveyor_switch_construct/New()
+	..()
+	id = rand() //this couldn't possibly go wrong
+
+/obj/item/conveyor_switch_construct/afterattack(atom/A, mob/user, proximity)
+	if(!proximity || user.stat || !istype(A, /turf/simulated/floor) || istype(A, /area/shuttle))
+		return
+	var/found = 0
+	for(var/obj/machinery/conveyor/C in view())
+		if(C.id == src.id)
+			found = 1
+			break
+	if(!found)
+		user << "\icon[src]<span class=notice>The conveyor switch did not detect any linked conveyor belts in range.</span>"
+		return
+	var/obj/machinery/conveyor_switch/NC = new/obj/machinery/conveyor_switch(A, id)
+	transfer_fingerprints_to(NC)
+	qdel(src)
+
+/obj/item/weapon/paper/conveyor
+	name = "paper- 'Nano-it-up U-build series, #9: Build your very own conveyor belt, in SPACE'"
+	info = "<h1>Congratulations!</h1><p>You are now the proud owner of the best conveyor set available for space mail order! We at Nano-it-up know you love to prepare your own structures without wasting time, so we have devised a special streamlined assembly procedure that puts all other mail-order products to shame!</p><p>Firstly, you need to link the conveyor switch assembly to each of the conveyor belt assemblies. After doing so, you simply need to install the belt assemblies onto the floor, et voila, belt built. Our special Nano-it-up smart switch will detected any linked assemblies as far as the eye can see! This convenience, you can only have it when you Nano-it-up. Stay nano!</p>"
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 8337e0ffaf7..f34d9797124 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -713,3 +713,19 @@
 	materials = list(MAT_GLASS = 750, MAT_METAL = 250)
 	build_path = /obj/item/weapon/circuitboard/vendor
 	category = list("initial", "Electronics")
+
+/datum/design/conveyor_belt
+	name = "Conveyor belt"
+	id = "conveyor_belt"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 5000)
+	build_path = /obj/item/conveyor_construct
+	category = list("initial", "Construction")
+
+/datum/design/conveyor_switch
+	name = "Conveyor belt switch"
+	id = "conveyor_switch"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 450, MAT_GLASS = 190)
+	build_path = /obj/item/conveyor_switch_construct
+	category = list("initial", "Construction")
\ No newline at end of file

From 4af47209aebce0cce7d14962dfac7669b8a93612 Mon Sep 17 00:00:00 2001
From: GeneralChaos81 <generalchaos81@gmail.com>
Date: Fri, 9 Sep 2016 17:53:11 +1000
Subject: [PATCH 07/52] Removed all the commented sections after testing.

---
 code/datums/supplypacks.dm          |  2 +-
 code/modules/recycling/conveyor2.dm | 52 ++---------------------------
 2 files changed, 4 insertions(+), 50 deletions(-)

diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index 22b6d6791b0..73c653369eb 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -616,7 +616,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 	access = access_ce
 	announce_beacons = list("Engineering" = list("Chief Engineer's Desk", "Atmospherics"))
 
-/datum/supply_packs/engineering/conveyor  // NEW
+/datum/supply_packs/engineering/conveyor
 	name = "Conveyor Assembly Crate"
 	contains = list(/obj/item/conveyor_construct,
 					/obj/item/conveyor_construct,
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index d827f3bb36f..8ecd9ed9dc3 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -23,7 +23,7 @@
 	id = "round_end_belt"
 
 
-// Auto conveyour is always on unless unpowered
+// Auto conveyor is always on unless unpowered
 
 /obj/machinery/conveyor/auto/New(loc, newdir)
 	..(loc, newdir)
@@ -44,12 +44,6 @@
 	icon_state = "conveyor[operating * verted]"
 
 	// create a conveyor
-/*/obj/machinery/conveyor/New(loc, newdir)
-	..(loc)
-	if(newdir)
-		dir = newdir
-	update_move_direction()*/ // Old
-
 /obj/machinery/conveyor/New(loc, newdir)
 	..(loc)
 	if(newdir)
@@ -57,7 +51,7 @@
 	update_move_direction()
 
 
-/obj/machinery/conveyor/proc/update_move_direction() //This proc is new, moved stuff from New
+/obj/machinery/conveyor/proc/update_move_direction()
 	switch(dir)
 		if(NORTH)
 			forwards = NORTH
@@ -129,11 +123,6 @@
 		CHECK_TICK
 
 // attack with item, place item on conveyor
-/*/obj/machinery/conveyor/attackby(var/obj/item/I, mob/user, params)
-	if(isrobot(user))	return //Carn: fix for borgs dropping their modules on conveyor belts
-	user.drop_item()
-	if(I && I.loc)	I.loc = src.loc
-	return*/ // NEW CODE HERE ---v
 /obj/machinery/conveyor/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/crowbar))
 		if(!(stat & BROKEN))
@@ -222,15 +211,6 @@
 	speed_process = 1
 
 
-/*/obj/machinery/conveyor_switch/New()
-	..()
-	update()
-
-	spawn(5)		// allow map load
-		conveyors = list()
-		for(var/obj/machinery/conveyor/C in world)
-			if(C.id == id)
-				conveyors += C*/ //NEW CODE -v
 obj/machinery/conveyor_switch/New(newloc, newid)
 	..(newloc)
 	if(!id)
@@ -272,34 +252,8 @@ obj/machinery/conveyor_switch/New(newloc, newid)
 	desc = "A conveyor control switch. It appears to only go in one direction."
 
 // attack with hand, switch position
-/*/obj/machinery/conveyor_switch/attack_hand(mob/user)
-	if(!allowed(user))
-		to_chat(user, "<span class='warning'>Access denied.</span>")
-		return
-
-
-	if(position == 0)
-		if(last_pos < 0)
-			position = 1
-			last_pos = 0
-		else
-			position = -1
-			last_pos = 0
-	else
-		last_pos = position
-		position = 0
-
-	operated = 1
-	update()
-
-	// find any switches with same id as this one, and set their positions to match us
-	for(var/obj/machinery/conveyor_switch/S in machines)
-		if(S.id == src.id)
-			S.position = position
-			S.update()
-		CHECK_TICK*/ //New vode
 /obj/machinery/conveyor_switch/attack_hand(mob/user)
-	if(!allowed(user)) //this is in Para but not TG
+	if(!allowed(user)) //this is in Para but not TG. I don't think there's any which are coded anyway.
 		to_chat(user, "<span class='warning'>Access denied.</span>")
 		return
 	add_fingerprint(user)

From df9ba20f23e01a5df2e6932c5e16b28b4874ac9b Mon Sep 17 00:00:00 2001
From: GeneralChaos81 <generalchaos81@gmail.com>
Date: Fri, 9 Sep 2016 23:19:48 +1000
Subject: [PATCH 08/52] Trying stuff to get conveyors to initialize with the
 map

---
 code/game/machinery/machinery.dm    | 10 +++++++++-
 code/modules/recycling/conveyor2.dm | 15 +++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index b003d9ef1d6..cc93a00cb2f 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -120,7 +120,7 @@ Class Procs:
 	var/speed_process = 0 // Process as fast as possible?
 
 /obj/machinery/initialize()
-	addAtProcessing()
+//	addAtProcessing() //Testing this in new conveyors
 	. = ..()
 	power_change()
 
@@ -128,11 +128,19 @@ Class Procs:
 	if(use_power)
 		myArea = get_area_master(src)
 
+/*	machines += src
+	if(!speed_process)
+		machine_processing += src
+	else
+		fast_processing += src */ //Also testing in NEW conveyors
+
+/obj/machinery/new() //new for trying to get the conveyors working with machinery, not world
 	machines += src
 	if(!speed_process)
 		machine_processing += src
 	else
 		fast_processing += src
+	. = ..()
 
 /obj/machinery/Destroy()
 	if(myArea)
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 8ecd9ed9dc3..20779370974 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -211,17 +211,24 @@
 	speed_process = 1
 
 
-obj/machinery/conveyor_switch/New(newloc, newid)
+/obj/machinery/conveyor_switch/New(newloc, newid)
 	..(newloc)
 	if(!id)
 		id = newid
 	update()
 
-	spawn(5)		// allow map load
+/*	spawn(5)		// allow map load
 		conveyors = list()
-		for(var/obj/machinery/conveyor/C in machines)
+		for(var/obj/machinery/conveyor/C in machines) //This works if it's: `C in world` , but that's bad practice. Best to try to fix it.
 			if(C.id == id)
-				conveyors += C
+				conveyors += C */ //Moving this to initialise to see if it gets around the bug... do we need the spawn thing? Let's find out.
+
+/obj/machinery/conveyor_switch/initialize() //This whole thing is new
+	conveyors = list()
+	for(var/obj/machinery/conveyor/C in machines)
+		if(C.id == id)
+			conveyors += C
+
 
 // update the icon depending on the position
 

From 9a0b8b7c3929ccd27a842b304d0804e828d556a2 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Fri, 9 Sep 2016 13:53:53 -0400
Subject: [PATCH 09/52] Atmos Grenade Balance

---
 code/datums/uplink_item.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index 5f7b5e8237a..971b6d49570 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -483,7 +483,8 @@ var/list/uplink_items = list()
 	desc = "A box of two (2) grenades that wreak havoc with the atmosphere of the target area. Capable of engulfing a large area in lit plasma, or N2O. Deploy with extreme caution!"
 	reference = "AGG"
 	item = /obj/item/weapon/storage/box/syndie_kit/atmosgasgrenades
-	cost = 6
+	cost = 8
+	gamemodes = list(/datum/game_mode/nuclear)
 
 /datum/uplink_item/dangerous/emp
 	name = "EMP Grenades and Implanter Kit"
@@ -791,7 +792,7 @@ var/list/uplink_items = list()
 	reference = "CHHUD"
 	item = /obj/item/clothing/glasses/hud/security/chameleon
 	cost = 2
-	
+
 /datum/uplink_item/stealthy_weapons/chameleonflag
 	name = "Chameleon Flag"
 	desc = "A flag that can be disguised as any other known flag. There is a heat sensitive bomb loaded into the pole that will be detonated if the flag is lit on fire."

From d5e855a548eb98aa6071e2089702c33514cda3bc Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Fri, 9 Sep 2016 18:18:13 -0400
Subject: [PATCH 10/52] Mice Worn Sprites

---
 icons/mob/head.dmi                    | Bin 254443 -> 255636 bytes
 icons/mob/inhands/items_lefthand.dmi  | Bin 176457 -> 177614 bytes
 icons/mob/inhands/items_righthand.dmi | Bin 174630 -> 176186 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 3be9bc8b7ea0450e55675f61457f2aed9f37c291..e0cc9a7e997d3af490c82fef8326feecb595e693 100644
GIT binary patch
delta 5128
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

delta 3930
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

diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index b02e2563aa4d0cbd02e4e9ab1fcf544ac4069d5d..1003b7f7585af8e1910ae70efe0307e565df7816 100644
GIT binary patch
delta 8524
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

delta 7358
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
C#e@I=

diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 59531a73db96a9469bfaafdd229c68b1e4b338af..927a56bdaa378fb7c650d2e3af78f332375ec771 100644
GIT binary patch
delta 4788
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
VRWItB%76B*j>Zjm;WfJ#{{fxJ6R!XO

delta 3220
zcmZuzdo+}57k|Y`>Cj0bcZY;zgh`w!Be^SdK^>voQ%K0&>q|85B)7y=L`)1yt~1jq
zG%gt>q%n=mXk15T$P8oNZ=8-lzV)5G*1Ohz_S(;H|DOF^-e2puSj9)NZ0Vi9jBnct
z06>A+tuO%CzEZEw*uFRKL!Gh<8iZb~E|IZEAmKNEb_bR+G))r?#O@e~2{jprZDA#B
zQCe-%NZay75=`GSDf?>C?=Rxc)2Z*KDHpT@cJ!3Yhdga8zgdvxI+vv_({sEoIT`Ni
z=-2{$8z@ZMzWp9emESyg8)>b5N=(z@id4@p!FDGG&b9Q6=ASxYQH;y8OZqKo$0BoH
z+2}2EjH%y-c+RG+$4d&gArS1owK>Fd6Vk8bPoJhd_a%WgS!CGs+Cs-FTWjS901QwX
ze0t6HKtcd89svgc`lRpswmtT6?XhdgoGR`X!D<B-{7?u`(PaY7w-G-Bz_`ZW$xR3#
z9aKhdMjs;N0D#4!DFTU!iH}si2puvq+B+edAV3$`C8wvAVCCESy+GteE2}%7+aj<_
zOH2M9v6<$o)%EqKow4pU>*s$Kct!UA=>UMKsfFsUrV|Ni9F2s{*fteGp?^%|H}Opu
z*n-;FpPwdVF1+a`0FQrC06+mA@P0FH3x~tYZKD){2d103wXB$sSbu-(PTFF7ZwD=e
zx}X6-kN%kr^ght^Tx&53+5^eU$(eEUuloCM<3=HcIJ-AFocElxUGd~J8U;0Sg1^tk
zZ~3mfNwxWzSsF-53J}c6P(%#pgd-k(T70-2c=%v*ttz^eX;A#xnaBYVz!4_s@ZXlb
zyAwKjGeh(g08E++zuGVJ`1JB$?NPPLbvVg8LGAiX_mmSy++`!M9gpO(>1{3(0~sz|
z6z!0yE^Qh!&nS$R7qVij(7M>u9HS0OP$GTCdZk1+AhR|g?X_Kn$IajY)26=R#@Hfw
zP<x+(oOBaGBvM_%fQ5BY@TGfTjrxcL_mILI5I1p14T|o(Y{_3veUr|cmAWI#-D$6|
z2Qn}|tOOTo_Zmt(72sfXvL?E&>RAh_({p3c>8WQTT<10_2jqfX8H72T>BK1Z$MO(b
zuhiWd7%wDv>a&eYi(<0hzkrWu|33@pQpfQ{<XJZmb3c5>#tH<YhO0E5)DoPAmYdFq
zz@86QI%K7D2Xb!n)@fxvRA%})v-nuo3x+%1-2-ccE-jbSlXCs*Yn714&CT&fFFp(j
zH@Zw%Tk)6E)D*cRx|v~g4}#H$9B}>Lf?!vUdsqbrJw5cJC4e=d<}*4>@3f*<&G$>A
zGcaQ-VIs2up<d`zTr|k&F9~4PQ1eA!>g4B*oN6>~<$>gy+S+`dg;-64Gbs&$GOL<)
z!k56%=lb@x1)<BF?G1#M(FoCpOS$u<YJR==_0^7OC-ix=UQkd+jyN|$i5nrqC1vms
zS-iG19>bDfV#TLe@I%$0el>_G7Qm0e7$&D<NG0tbD6p^A=D5!$O$X8FtgXrA(@gE2
zdM)ru>zWwX{}Qo&85><^W8v#ee2#@K_?AoFJum-*qR_X$-tbv^Tx#F5Y|mog@ZrNO
zmi$PMFj?Bp)zx*htD>U9Qt8k4u!t8r(z|kAzBC*f9hF6my^6aa54`=OApMUb6zUvQ
z<20l(j7epB9H1?H8+o_Dofxn^%;=MqRgwdxbJ8@buaV)U%1Uzi#(w>uhAprT&s+qP
zKbc&f**)tNovw@5Q=uil?Kwg!$(?B;k#Q{#1iN%*1M>+vv-?BfTXS>U%tW56t1edq
z>hfYa@Vk)$uZ$*W!|xC`2YQ_YUY%8k=+sDsa$fPWbKtLev$iW|WRqB+pAvzzsCuQh
zg6Syuvfu9u@stl=uc>Yd@OtWVHeza4%B$p4hxH=FPqvK;?UkIKL94p0pS9HS+k-|R
z5KgYHWFk0CDxw-hE>+#awo?apou!$?bmuSftR~@6bCt;7cI8;~`brInpe)NIGb}C4
z%NubX%xXduz481(@Z0(0U)tSv<#_9B;c&RSSKI$%<{jvvgw$YBbZn;QdSdx4O?UO<
zCOStf?y9P?rXDyuMZMc+Q?h=tG)7x%2eU7hgrp+1*_fd0uexhp4(<8bzg)EnW~You
z-e^M+3$s6-qo}kAG9t!YKj2e{o$H06&xwjpu(sx~((4N#9)E-Gy+$n1GikVNHHGs(
z_pYicXVn3jJAy^m265@lffSZkiQUI}YO7^!^GZ^BIG)p$(5@-WA|@-Ukq9H;8QYXZ
z9>e!Al;!S(iC>OF&vJG5OR&)LY&6dRvLJ$dUc^YUlaI&PGEZi=sNlGA9r(sjS~mEN
zunpwyoZyl6e;K5m&mr6E6t|w}QUtIsNlr-DHtHfmI$agFd)Dy&4xE$x3H$lp{P`HO
zz`(!*N5k__sFV0`yWz>Z-QHd3QFjA!#3A*ZBB@_G2SdY5qw^PXb;t!WOZaP<r8RgC
zqXT8#hO%zFHi~b28UjyUL>4t&r>_qUfkQWDK5FU3mq*MFPYeh8v`x>FmdjoxTA|OZ
zNmP_yX<QFci8MQQ?3jAZc-{~79?qG%OY^~2aZ}Dmd37^5maPqc;VhTJW$Ulyxfvr1
z@5sP0Xoo_TArGAM4D4cde=Up@i^>Xzokq6KYO^@XCcAcZ8-10Nn4@Czk1b_`3Z;={
z`(B0<R~A|ahdF4EChN)1H;rk6*GE^cYkiR)qEFM+Z7T&UH{KpWD2`f`UH)U?`Z379
zGbfYh@tQY+fT}*%-H&5>jW7s<A?0dNK_P?k;t8g+f4^fro5~bCU67p-lneGlMPYql
zHiMAc8HA9H0A5_10dK;GZ)8|SvpZAf=f_&krg%#iSDq}I;2!m`Uv**$F1)I0!}YJP
zZ~f3-7mc!L$V#g(5ggU<@bCuD&eXea`+IH<$`UA!){98Vls!`Nw;s{Anwq#RlsXm{
zFXUo;kD%n#ZZNT;J`{YDx?zpyN71mWo~D7#5JG=3MqE;G|GB*H$1gm`xGI%~r)fx-
zIosn&Sl9CVD;3@=!7p2sBB~9ajb)Zi()TWZeo!ULMT5;AhAySbQiJzDiZsUDbh6|#
zaLbR5h7Q&Rv(VMz7!PPV8-)^#uWS0SogO+zX=RQwO!|q?*OVi^I+lBTD;UU;hM>AX
zptrD3Dxm7bDsLfr<@OCkrdcL*yb#)`Zhw%ft~wDtrlavzvx%lj=P2J}BiTrUt#02y
z0iT<Pom0tds?mr6H19OULqlm#YU3mHz7dK;rr=P9&sZt6^&0^fb`&a3n~K-sziAcx
zfiS|N67*QyfM-j=-cuRZ9>4cLE-rxqJ0r_>eP0@MAnOMu848J62%83H8Up4p{?6`E
zIyiZM2HX9Gg7sc!`F*;-*D-@FgQ{<LNd-0Cd%N`lRs#nu%;{8!duX-*`9{!?<&5IW
zR1|R$RE$`+gWLMi3Dd)~-k~dqC^p&zYTK!BecdkX_r6ooM~Y$Ysb#YiaQ6&e7keN@
z*;uvyid320nJ(HjHnoOxIZMzD*WJPgVoAqTRq@3T5k}^b8V@p{@%LBwF_RZ3^Nh@w
zN+I{|#J?AvNSxLteKjc~UJDZ8EC(elJ&vl4J8%<B4=;#0`rtE69KacW0TS?HI+oE-
zBDcSCcV;x88L`!%VS7u1E`I-rm)k_$-4k9#X8DarYyrTQkr#STpj=8^SmSv{<8j|G
z@5JK|@a1p4(6xUo^zev4Ln(MQR-IsrCU`svc+;!BHlceV&V(2;0BixKI<y&D*bbo$
z(Kr>DP8I^T!PqkIFM6D;fr&!aL&;$9WE7@X$UP4OHoNyv5L_neZp<0xYk6P5+6^Ta
z6f057uPSgeDb86?L5w)i{`w~#@Eyk7P+%_wNy?bHG-UB?$fI5%pk0@&H#W0~q&5J+
zL-^QFdH_&&s@jnErU%a{E{ORua{~ZCLFwSCxis{lV<V2EGRQ)oQR~wrzZfL&N(l}u
qS#D}hU`y)OgfE;;2?_kKj9mitu8>$ClYFx_xY$_Oo7b9My7gb~FHDO7


From 96361631278d0cfcbbabcee03e8a8aeb9d2feacc Mon Sep 17 00:00:00 2001
From: GeneralChaos81 <generalchaos81@gmail.com>
Date: Sat, 10 Sep 2016 16:52:20 +1000
Subject: [PATCH 11/52] Back to how it was before, when it was even working at
 all.

---
 code/game/machinery/machinery.dm    | 10 +---------
 code/modules/recycling/conveyor2.dm | 10 +++++-----
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index cc93a00cb2f..b003d9ef1d6 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -120,7 +120,7 @@ Class Procs:
 	var/speed_process = 0 // Process as fast as possible?
 
 /obj/machinery/initialize()
-//	addAtProcessing() //Testing this in new conveyors
+	addAtProcessing()
 	. = ..()
 	power_change()
 
@@ -128,19 +128,11 @@ Class Procs:
 	if(use_power)
 		myArea = get_area_master(src)
 
-/*	machines += src
-	if(!speed_process)
-		machine_processing += src
-	else
-		fast_processing += src */ //Also testing in NEW conveyors
-
-/obj/machinery/new() //new for trying to get the conveyors working with machinery, not world
 	machines += src
 	if(!speed_process)
 		machine_processing += src
 	else
 		fast_processing += src
-	. = ..()
 
 /obj/machinery/Destroy()
 	if(myArea)
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 20779370974..e46b8d8b932 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -217,17 +217,17 @@
 		id = newid
 	update()
 
-/*	spawn(5)		// allow map load
+	spawn(5)		// allow map load
 		conveyors = list()
 		for(var/obj/machinery/conveyor/C in machines) //This works if it's: `C in world` , but that's bad practice. Best to try to fix it.
 			if(C.id == id)
-				conveyors += C */ //Moving this to initialise to see if it gets around the bug... do we need the spawn thing? Let's find out.
+				conveyors += C  //Moving this to initialise to see if it gets around the bug... do we need the spawn thing? Let's find out.
 
-/obj/machinery/conveyor_switch/initialize() //This whole thing is new
+/*/obj/machinery/conveyor_switch/initialize() //This whole thing is new
 	conveyors = list()
-	for(var/obj/machinery/conveyor/C in machines)
+	for(var/obj/machinery/conveyor/C in world) //This works if it's: `C in world` , but that's bad practice. Best to try to fix it so it's in machines
 		if(C.id == id)
-			conveyors += C
+			conveyors += C*/
 
 
 // update the icon depending on the position

From a430d43e38a7b3fecdec7eb72fbeb5e9f7fdc068 Mon Sep 17 00:00:00 2001
From: GeneralChaos81 <generalchaos81@gmail.com>
Date: Sun, 11 Sep 2016 11:06:30 +1000
Subject: [PATCH 12/52] Initial conveyors are working. Now for multi on the
 levers...

---
 code/game/machinery/machinery.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index b003d9ef1d6..8c3181c10fc 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -128,12 +128,15 @@ Class Procs:
 	if(use_power)
 		myArea = get_area_master(src)
 
-	machines += src
+	machines += src //Moved this to New
 	if(!speed_process)
 		machine_processing += src
 	else
 		fast_processing += src
 
+/obj/machinery/New() //new
+	machines += src
+
 /obj/machinery/Destroy()
 	if(myArea)
 		myArea = null

From 9bae9f5c574602147bce5dcb564fa661bfbf10db Mon Sep 17 00:00:00 2001
From: GeneralChaos81 <generalchaos81@gmail.com>
Date: Sun, 11 Sep 2016 19:28:40 +1000
Subject: [PATCH 13/52] Multitool code in... not quite working.

---
 code/game/machinery/machinery.dm    |  3 +--
 code/modules/recycling/conveyor2.dm | 23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 8c3181c10fc..519a7177d7a 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -127,8 +127,6 @@ Class Procs:
 /obj/machinery/proc/addAtProcessing()
 	if(use_power)
 		myArea = get_area_master(src)
-
-	machines += src //Moved this to New
 	if(!speed_process)
 		machine_processing += src
 	else
@@ -136,6 +134,7 @@ Class Procs:
 
 /obj/machinery/New() //new
 	machines += src
+	..()
 
 /obj/machinery/Destroy()
 	if(myArea)
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index e46b8d8b932..6b408e25ece 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -122,6 +122,8 @@
 				step(A,movedir)
 		CHECK_TICK
 
+
+
 // attack with item, place item on conveyor
 /obj/machinery/conveyor/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/crowbar))
@@ -146,6 +148,7 @@
 	else
 		return ..()
 
+
 // attack with hand, move pulled object onto conveyor
 /obj/machinery/conveyor/attack_hand(mob/user as mob)
 	user.Move_Pulled(src)
@@ -219,15 +222,9 @@
 
 	spawn(5)		// allow map load
 		conveyors = list()
-		for(var/obj/machinery/conveyor/C in machines) //This works if it's: `C in world` , but that's bad practice. Best to try to fix it.
+		for(var/obj/machinery/conveyor/C in machines)
 			if(C.id == id)
-				conveyors += C  //Moving this to initialise to see if it gets around the bug... do we need the spawn thing? Let's find out.
-
-/*/obj/machinery/conveyor_switch/initialize() //This whole thing is new
-	conveyors = list()
-	for(var/obj/machinery/conveyor/C in world) //This works if it's: `C in world` , but that's bad practice. Best to try to fix it so it's in machines
-		if(C.id == id)
-			conveyors += C*/
+				conveyors += C
 
 
 // update the icon depending on the position
@@ -313,6 +310,16 @@
 		user << "<span class='notice'>You deattach the conveyor switch.</span>"
 		qdel(src)
 
+	else if(istype(I, /obj/item/device/multitool))
+		update_multitool_menu(user)
+		return 1
+
+
+/obj/machinery/conveyor_switch/multitool_menu(var/mob/user, var/obj/item/device/multitool/P)
+	return {"
+ 	<ul>
+ 	<li><b>One direction only:</b> <a href='?src=\ref[src];toggle_logic=1'>[convdir ? "On" : "Off"]</a></li>
+ 	</ul>"}
 
 
 //

From 94cddf84ae334755c8f8f7a290aba9d2ab26298d Mon Sep 17 00:00:00 2001
From: GeneralChaos81 <generalchaos81@gmail.com>
Date: Mon, 12 Sep 2016 10:41:48 +1000
Subject: [PATCH 14/52] Multitool working, but the GUI for it doesn't refresh.

---
 code/modules/recycling/conveyor2.dm | 38 ++++++++++-------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 6b408e25ece..10e1e85baeb 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -220,12 +220,10 @@
 		id = newid
 	update()
 
-	spawn(5)		// allow map load
-		conveyors = list()
-		for(var/obj/machinery/conveyor/C in machines)
-			if(C.id == id)
-				conveyors += C
-
+	conveyors = list()
+	for(var/obj/machinery/conveyor/C in machines)
+		if(C.id == id)
+			conveyors += C
 
 // update the icon depending on the position
 
@@ -253,7 +251,6 @@
 
 /obj/machinery/conveyor_switch/oneway
 	convdir = 1 //Set to 1 or -1 depending on which way you want the convayor to go. (In other words keep at 1 and set the proper dir on the belts.)
-	desc = "A conveyor control switch. It appears to only go in one direction."
 
 // attack with hand, switch position
 /obj/machinery/conveyor_switch/attack_hand(mob/user)
@@ -286,22 +283,6 @@
 		CHECK_TICK
 
 
-// attack with hand, switch position
-/obj/machinery/conveyor_switch/oneway/attack_hand(mob/user)
-	if(position == 0)
-		position = convdir
-	else
-		position = 0
-
-	operated = 1
-	update()
-
-	// find any switches with same id as this one, and set their positions to match us
-	for(var/obj/machinery/conveyor_switch/S in world)
-		if(S.id == src.id)
-			S.position = position
-			S.update()
-
 /obj/machinery/conveyor_switch/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/crowbar))
 		var/obj/item/conveyor_switch_construct/C = new/obj/item/conveyor_switch_construct(src.loc)
@@ -315,6 +296,12 @@
 		return 1
 
 
+/obj/machinery/conveyor_switch/multitool_topic(var/mob/user,var/list/href_list,var/obj/O)
+	..()
+	if("toggle_logic" in href_list)
+		convdir = !convdir //reverses?
+
+
 /obj/machinery/conveyor_switch/multitool_menu(var/mob/user, var/obj/item/device/multitool/P)
 	return {"
  	<ul>
@@ -322,9 +309,10 @@
  	</ul>"}
 
 
+
 //
 // CONVEYOR CONSTRUCTION STARTS HERE
-//   All new here.
+//
 
 /obj/item/conveyor_construct
 	icon = 'icons/obj/recycling.dmi'
@@ -382,4 +370,4 @@
 
 /obj/item/weapon/paper/conveyor
 	name = "paper- 'Nano-it-up U-build series, #9: Build your very own conveyor belt, in SPACE'"
-	info = "<h1>Congratulations!</h1><p>You are now the proud owner of the best conveyor set available for space mail order! We at Nano-it-up know you love to prepare your own structures without wasting time, so we have devised a special streamlined assembly procedure that puts all other mail-order products to shame!</p><p>Firstly, you need to link the conveyor switch assembly to each of the conveyor belt assemblies. After doing so, you simply need to install the belt assemblies onto the floor, et voila, belt built. Our special Nano-it-up smart switch will detected any linked assemblies as far as the eye can see! This convenience, you can only have it when you Nano-it-up. Stay nano!</p>"
+	info = "<h1>Congratulations!</h1><p>You are now the proud owner of the best conveyor set available for space mail order! We at Nano-it-up know you love to prepare your own structures without wasting time, so we have devised a special streamlined assembly procedure that puts all other mail-order products to shame!</p><p>Firstly, you need to link the conveyor switch assembly to each of the conveyor belt assemblies. After doing so, you simply need to install the belt assemblies onto the floor, et voila, belt built. Our special Nano-it-up smart switch will detected any linked assemblies as far as the eye can see! </p><p> Set single directional switches by using your multitool on the switch after you've installed the switch assembly.</p><p> This convenience, you can only have it when you Nano-it-up. Stay nano!</p>"

From d9bd16a0db4712e6e936381710d426a3478e36a5 Mon Sep 17 00:00:00 2001
From: GeneralChaos81 <generalchaos81@gmail.com>
Date: Mon, 12 Sep 2016 11:47:54 +1000
Subject: [PATCH 15/52] Diagonal pieces directions were not correct.

---
 code/modules/recycling/conveyor2.dm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 10e1e85baeb..81c171d4031 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -68,15 +68,15 @@
 		if(NORTHEAST)
 			forwards = EAST
 			backwards = SOUTH
-		if(NORTHWEST)
+		if(SOUTHEAST)
 			forwards = NORTH
 			backwards = EAST
-		if(SOUTHEAST)
-			forwards = SOUTH
-			backwards = WEST
 		if(SOUTHWEST)
 			forwards = WEST
 			backwards = NORTH
+		if(NORTHWEST)
+			forwards = SOUTH
+			backwards = WEST
 	if(verted == -1)
 		var/temp = forwards
 		forwards = backwards

From 12d23a061f3c81274b0d3c6f79c5c304fdef099b Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Mon, 12 Sep 2016 14:32:10 -0400
Subject: [PATCH 16/52] tweak 2

---
 code/datums/uplink_item.dm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index 971b6d49570..8e4621d5400 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -483,8 +483,7 @@ var/list/uplink_items = list()
 	desc = "A box of two (2) grenades that wreak havoc with the atmosphere of the target area. Capable of engulfing a large area in lit plasma, or N2O. Deploy with extreme caution!"
 	reference = "AGG"
 	item = /obj/item/weapon/storage/box/syndie_kit/atmosgasgrenades
-	cost = 8
-	gamemodes = list(/datum/game_mode/nuclear)
+	cost = 11
 
 /datum/uplink_item/dangerous/emp
 	name = "EMP Grenades and Implanter Kit"

From fb335d3a4f602f7748160f084e4deabc7a467f9e Mon Sep 17 00:00:00 2001
From: GeneralChaos81 <generalchaos81@gmail.com>
Date: Tue, 13 Sep 2016 11:28:28 +1000
Subject: [PATCH 17/52] to_chat and I.forcemove changes. Noticed half (almost
 exactly) of the conveyors weren't synced to their levers, so put Spawn(5)
 back in.

---
 code/modules/recycling/conveyor2.dm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 81c171d4031..39a4b1b86e8 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -131,20 +131,19 @@
 			var/obj/item/conveyor_construct/C = new/obj/item/conveyor_construct(src.loc)
 			C.id = id
 			transfer_fingerprints_to(C)
-		user << "<span class='notice'>You remove the conveyor belt.</span>"
+		to_chat(usr,"<span class='notice'>You remove the conveyor belt.</span>")
 		qdel(src)
 
 	else if(istype(I, /obj/item/weapon/wrench))
 		if(!(stat & BROKEN))
 			playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
-			//setDir(turn(dir,-45)) //No such proc
 			dir = turn(dir,-45)
 			update_move_direction()
-			user << "<span class='notice'>You rotate [src].</span>"
+			to_chat(user, "<span class='notice'>You rotate [src].</span>")
 
 	else if(user.a_intent != "harm")
 		if(user.drop_item())
-			I.loc = src.loc
+			I.forceMove(loc)
 	else
 		return ..()
 
@@ -220,10 +219,11 @@
 		id = newid
 	update()
 
-	conveyors = list()
-	for(var/obj/machinery/conveyor/C in machines)
-		if(C.id == id)
-			conveyors += C
+	spawn(5)
+		conveyors = list()
+		for(var/obj/machinery/conveyor/C in machines)
+			if(C.id == id)
+				conveyors += C
 
 // update the icon depending on the position
 
@@ -250,7 +250,7 @@
 		CHECK_TICK
 
 /obj/machinery/conveyor_switch/oneway
-	convdir = 1 //Set to 1 or -1 depending on which way you want the convayor to go. (In other words keep at 1 and set the proper dir on the belts.)
+	convdir = 1 //Set to 1 or -1 depending on which way you want the convayor to go. (In other words keep at 1 and set the proper dir on the belts.) - Cargo uses a reverse belt.
 
 // attack with hand, switch position
 /obj/machinery/conveyor_switch/attack_hand(mob/user)
@@ -288,7 +288,7 @@
 		var/obj/item/conveyor_switch_construct/C = new/obj/item/conveyor_switch_construct(src.loc)
 		C.id = id
 		transfer_fingerprints_to(C)
-		user << "<span class='notice'>You deattach the conveyor switch.</span>"
+		to_chat(user,"<span class='notice'>You deattach the conveyor switch.</span>")
 		qdel(src)
 
 	else if(istype(I, /obj/item/device/multitool))
@@ -325,7 +325,7 @@
 /obj/item/conveyor_construct/attackby(obj/item/I, mob/user, params)
 	..()
 	if(istype(I, /obj/item/conveyor_switch_construct))
-		user << "<span class='notice'>You link the switch to the conveyor belt assembly.</span>"
+		to_chat(user, "<span class='notice'>You link the switch to the conveyor belt assembly.</span>")
 		var/obj/item/conveyor_switch_construct/C = I
 		id = C.id
 
@@ -334,7 +334,7 @@
 		return
 	var/cdir = get_dir(A, user)
 	if(A == user.loc)
-		user << "<span class='notice'>You cannot place a conveyor belt under yourself.</span>"
+		to_chat(user, "<span class='notice'>You cannot place a conveyor belt under yourself.</span>")
 		return
 	var/obj/machinery/conveyor/C = new/obj/machinery/conveyor(A,cdir)
 	C.id = id
@@ -362,7 +362,7 @@
 			found = 1
 			break
 	if(!found)
-		user << "\icon[src]<span class=notice>The conveyor switch did not detect any linked conveyor belts in range.</span>"
+		to_chat(usr, "\icon[src]<span class=notice>The conveyor switch did not detect any linked conveyor belts in range.</span>")
 		return
 	var/obj/machinery/conveyor_switch/NC = new/obj/machinery/conveyor_switch(A, id)
 	transfer_fingerprints_to(NC)

From 9112d5cf85cf66dfe7c7682522e8e1e59d4e7ef0 Mon Sep 17 00:00:00 2001
From: GeneralChaos81 <generalchaos81@gmail.com>
Date: Thu, 15 Sep 2016 11:18:23 +1000
Subject: [PATCH 18/52] removed redundant setmove proc. Put directions back the
 the original setup, which was correct

---
 code/modules/recycling/conveyor2.dm | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 39a4b1b86e8..2a36ba585df 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -28,7 +28,7 @@
 /obj/machinery/conveyor/auto/New(loc, newdir)
 	..(loc, newdir)
 	operating = 1
-	setmove()
+	update_move_direction()
 
 /obj/machinery/conveyor/auto/update()
 	if(stat & BROKEN)
@@ -68,15 +68,15 @@
 		if(NORTHEAST)
 			forwards = EAST
 			backwards = SOUTH
+		if(NORTHWEST)
+			forwards = SOUTH
+			backwards = WEST
 		if(SOUTHEAST)
 			forwards = NORTH
 			backwards = EAST
 		if(SOUTHWEST)
 			forwards = WEST
 			backwards = NORTH
-		if(NORTHWEST)
-			forwards = SOUTH
-			backwards = WEST
 	if(verted == -1)
 		var/temp = forwards
 		forwards = backwards
@@ -87,12 +87,6 @@
 		movedir = backwards
 	update()
 
-/obj/machinery/conveyor/proc/setmove()
-	if(operating == 1)
-		movedir = forwards
-	else
-		movedir = backwards
-	update()
 
 /obj/machinery/conveyor/proc/update()
 	if(stat & BROKEN)
@@ -225,6 +219,7 @@
 			if(C.id == id)
 				conveyors += C
 
+
 // update the icon depending on the position
 
 /obj/machinery/conveyor_switch/proc/update()
@@ -246,7 +241,7 @@
 
 	for(var/obj/machinery/conveyor/C in conveyors)
 		C.operating = position
-		C.setmove()
+		C.update_move_direction()
 		CHECK_TICK
 
 /obj/machinery/conveyor_switch/oneway
@@ -254,7 +249,7 @@
 
 // attack with hand, switch position
 /obj/machinery/conveyor_switch/attack_hand(mob/user)
-	if(!allowed(user)) //this is in Para but not TG. I don't think there's any which are coded anyway.
+	if(!allowed(user)) //this is in Para but not TG. I don't think there's any which are set anyway.
 		to_chat(user, "<span class='warning'>Access denied.</span>")
 		return
 	add_fingerprint(user)

From 47912cfd4380c0495ce0c4c15550fba60743ecf7 Mon Sep 17 00:00:00 2001
From: shazbot194 <spartenmaster194@hotmail.com>
Date: Wed, 14 Sep 2016 20:11:38 -0800
Subject: [PATCH 19/52] Small fixes for foam force weapons

-Adds a new icon for the toy tommy gun with a blue muzzle, so it doesn't
have to use the real tommy gun's icon or what is was using, nothing.
-fixes the rounding on the toy smg so it now doesn't have an invisable
magazine when loaded and displays the correct amount of ammo.
---
 .../projectiles/ammunition/magazines.dm       |   2 +-
 .../projectiles/guns/projectile/toy.dm        |   4 ++--
 icons/obj/guns/toy.dmi                        | Bin 2484 -> 2672 bytes
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index a5eafacba51..139126fe2c2 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -378,7 +378,7 @@
 
 /obj/item/ammo_box/magazine/toy/smg/update_icon()
 	..()
-	icon_state = "smg9mm-[round(ammo_count(),5)]"
+	icon_state = "smg9mm-[round(ammo_count()+1,4)*6/4]"
 
 /obj/item/ammo_box/magazine/toy/smg/riot
 	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm
index 4efeb570e0f..809647e4186 100644
--- a/code/modules/projectiles/guns/projectile/toy.dm
+++ b/code/modules/projectiles/guns/projectile/toy.dm
@@ -92,8 +92,8 @@
 /obj/item/weapon/gun/projectile/shotgun/toy/tommygun
 	name = "tommy gun"
 	desc = "Looks almost like the real thing! Great for practicing Drive-bys. Ages 8 and up."
-	icon = 'icons/obj/guns/projectile.dmi'
-	icon_state = "tommy"
+	icon = 'icons/obj/guns/toy.dmi'
+	icon_state = "tommygun"
 	item_state = "shotgun"
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/tommygun
 	w_class = 2
diff --git a/icons/obj/guns/toy.dmi b/icons/obj/guns/toy.dmi
index d05231e7718b8e09fbc17999dce5647122258bc0..c832bb3670addd818247b2da280f846dd854db9c 100644
GIT binary patch
delta 2412
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

delta 2223
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


From c856472ff79a21a2ce7e216c4f5e99e018eb62b9 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Thu, 15 Sep 2016 01:25:37 -0400
Subject: [PATCH 20/52] Fixes Alert Images

---
 code/modules/mob/dead/observer/observer.dm | 3 +++
 code/modules/mob/mob_helpers.dm            | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 11f0b3a11f4..a1fc5699d62 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -274,9 +274,12 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 					A.icon = ui_style2icon(client.prefs.UI_style)
 				A.desc = message
 				var/old_layer = source.layer
+				var/old_plane = source.plane
 				source.layer = FLOAT_LAYER
+				source.plane = FLOAT_PLANE
 				A.overlays += source
 				source.layer = old_layer
+				source.plane = old_plane
 	to_chat(src, "<span class='ghostalert'><a href=?src=[UID()];reenter=1>(Click to re-enter)</a></span>")
 	if(sound)
 		src << sound(sound)
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index a8025091a05..2108760c589 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -456,11 +456,15 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM)
 					A.jump_target = source
 					if(!alert_overlay)
 						var/old_layer = source.layer
+						var/old_plane = source.plane
 						source.layer = FLOAT_LAYER
+						source.plane = FLOAT_PLANE
 						A.overlays += source
 						source.layer = old_layer
+						source.plane = old_plane
 					else
 						alert_overlay.layer = FLOAT_LAYER
+						alert_overlay.plane = FLOAT_PLANE
 						A.overlays += alert_overlay
 
 /mob/proc/switch_to_camera(var/obj/machinery/camera/C)

From e8be72a101cc46abfb271257316c275cab6ef166 Mon Sep 17 00:00:00 2001
From: Codingale <Codingale@users.noreply.github.com>
Date: Tue, 20 Sep 2016 23:17:19 -0400
Subject: [PATCH 21/52] Update COPYING

Inc. Goonstation to license.
---
 COPYING | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/COPYING b/COPYING
index 5c2d485924d..a4192d74542 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,5 @@
 Paradise
-Copyright (C) 2010-2014 Paradise, Baystation12 and tgstation13.
+Copyright (C) 2010-2016 Paradise, Baystation12, Goonstation and tgstation13.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -13,3 +13,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+
+Any files located in the Paradise/goon, Paradise/icons/goonstation, or Paradise/sound/goonstation directories, or any subdirectories of mentioned directories are licensed under the Creative Commons 3.0 BY-NC-SA license (https://creativecommons.org/licenses/by-nc-sa/3.0) from Goonstation.

From 62cd6c77017d7c3ee199c134824b15f8af19b28d Mon Sep 17 00:00:00 2001
From: Codingale <Codingale@users.noreply.github.com>
Date: Tue, 20 Sep 2016 23:19:52 -0400
Subject: [PATCH 22/52] Create LICENSE-CC-BY-NC-SA.txt

Inc. copy of Creative Commons Attribution, ShareAlike, No Commercial, 3.0. As reference for Goon license.
---
 LICENSE-CC-BY-NC-SA.txt | 60 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 LICENSE-CC-BY-NC-SA.txt

diff --git a/LICENSE-CC-BY-NC-SA.txt b/LICENSE-CC-BY-NC-SA.txt
new file mode 100644
index 00000000000..860915c5c0e
--- /dev/null
+++ b/LICENSE-CC-BY-NC-SA.txt
@@ -0,0 +1,60 @@
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+    "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+    "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(g) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License.
+    "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
+    "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, Noncommercial, ShareAlike.
+    "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
+    "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
+    "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
+    "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+    "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
+    "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
+
+2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+
+    to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
+    to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
+    to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
+    to Distribute and Publicly Perform Adaptations.
+
+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved, including but not limited to the rights described in Section 4(e).
+
+4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+
+    You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(d), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(d), as requested.
+    You may Distribute or Publicly Perform an Adaptation only under: (i) the terms of this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-NonCommercial-ShareAlike 3.0 US) ("Applicable License"). You must include a copy of, or the URI, for Applicable License with every copy of each Adaptation You Distribute or Publicly Perform. You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License. You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
+    You may not exercise any of the rights granted to You in Section 3 above in any manner that is primarily intended for or directed toward commercial advantage or private monetary compensation. The exchange of the Work for other copyrighted works by means of digital file-sharing or otherwise shall not be considered to be intended for or directed toward commercial advantage or private monetary compensation, provided there is no payment of any monetary compensation in con-nection with the exchange of copyrighted works.
+    If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and, (iv) consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(d) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
+
+    For the avoidance of doubt:
+        Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
+        Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License if Your exercise of such rights is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(c) and otherwise waives the right to collect royalties through any statutory or compulsory licensing scheme; and,
+        Voluntary License Schemes. The Licensor reserves the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License that is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(c).
+    Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING AND TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO THIS EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+    This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+    Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+
+8. Miscellaneous
+
+    Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+    Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+    If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+    No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+    This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
+    The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.

From 4beac970c6800bab7f23777e688ee2d289559781 Mon Sep 17 00:00:00 2001
From: Codingale <Brady_P_B@hotmail.com>
Date: Fri, 23 Sep 2016 16:49:20 -0400
Subject: [PATCH 23/52] Fixes #5673

---
 code/modules/surgery/organs/blood.dm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/code/modules/surgery/organs/blood.dm b/code/modules/surgery/organs/blood.dm
index eca74a216b2..73c517e5ade 100644
--- a/code/modules/surgery/organs/blood.dm
+++ b/code/modules/surgery/organs/blood.dm
@@ -231,6 +231,9 @@
 
 	var/datum/reagent/blood/injected = get_blood(container.reagents)
 
+	if (!istype(injected)) //Sanity..
+		return
+
 	if(species && species.flags & NO_BLOOD)
 		reagents.add_reagent("blood", amount, injected.data)
 		reagents.update_total()
@@ -238,8 +241,16 @@
 
 	var/datum/reagent/blood/our = get_blood(vessel)
 
-	if(!istype(injected) || !istype(our))
+	if(!istype(our)) // Do we not have blood?
+		vessel.add_reagent("blood", amount, injected.data) // This is only ran once, so we need to add back thier DNA.
+		vessel.update_total()
+		..()
+		our = get_blood(vessel) // Get the new blood.
+		our.data["blood_DNA"] = src.dna.unique_enzymes // Give it the proper DNA we had before
+		our.data["blood_type"] = src.dna.b_type  // Proper blood type.
+		our.data["donor"] = src // Without this, it'd be random each time it was extracted or Null.
 		return
+
 	if(blood_incompatible(injected.data["blood_type"],our.data["blood_type"]) )
 		reagents.add_reagent("toxin",amount * 0.5)
 		reagents.update_total()

From f231f8f27aee55e0935710d88346a3e8469e6f78 Mon Sep 17 00:00:00 2001
From: Codingale <Codingale@users.noreply.github.com>
Date: Fri, 23 Sep 2016 17:10:42 -0400
Subject: [PATCH 24/52] Update blood.dm

Conform to agreed upon standards.
---
 code/modules/surgery/organs/blood.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/surgery/organs/blood.dm b/code/modules/surgery/organs/blood.dm
index 73c517e5ade..ebabbe8be1f 100644
--- a/code/modules/surgery/organs/blood.dm
+++ b/code/modules/surgery/organs/blood.dm
@@ -231,7 +231,7 @@
 
 	var/datum/reagent/blood/injected = get_blood(container.reagents)
 
-	if (!istype(injected)) //Sanity..
+	if(!istype(injected)) //Sanity..
 		return
 
 	if(species && species.flags & NO_BLOOD)

From 79b527d82b1d8c7abfd6056eef053ac6f086efc8 Mon Sep 17 00:00:00 2001
From: Codingale <Codingale@users.noreply.github.com>
Date: Sat, 24 Sep 2016 08:55:33 -0400
Subject: [PATCH 25/52] Modify to implied src

Corrected typo in comment. Modified not to use src.
---
 code/modules/surgery/organs/blood.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/modules/surgery/organs/blood.dm b/code/modules/surgery/organs/blood.dm
index ebabbe8be1f..9034393bfe2 100644
--- a/code/modules/surgery/organs/blood.dm
+++ b/code/modules/surgery/organs/blood.dm
@@ -242,12 +242,12 @@
 	var/datum/reagent/blood/our = get_blood(vessel)
 
 	if(!istype(our)) // Do we not have blood?
-		vessel.add_reagent("blood", amount, injected.data) // This is only ran once, so we need to add back thier DNA.
+		vessel.add_reagent("blood", amount, injected.data) // This is only ran once, so we need to add back their DNA.
 		vessel.update_total()
 		..()
 		our = get_blood(vessel) // Get the new blood.
-		our.data["blood_DNA"] = src.dna.unique_enzymes // Give it the proper DNA we had before
-		our.data["blood_type"] = src.dna.b_type  // Proper blood type.
+		our.data["blood_DNA"] = dna.unique_enzymes // Give it the proper DNA we had before (src.dna)
+		our.data["blood_type"] = dna.b_type  // Proper blood type.
 		our.data["donor"] = src // Without this, it'd be random each time it was extracted or Null.
 		return
 

From b6fef2185c9874ab1aac233bf472f21faeb35146 Mon Sep 17 00:00:00 2001
From: shazbot194 <spartenmaster194@hotmail.com>
Date: Sun, 25 Sep 2016 01:45:38 -0800
Subject: [PATCH 26/52] Changed the way smg & toy icon updates.

Switched from using math to fit the icon's name to having the icon's
name fit the math, also changed the normal SMG's mag so it can also
updates properly.
---
 .../projectiles/ammunition/magazines.dm       |   6 +++---
 icons/obj/ammo.dmi                            | Bin 24099 -> 24289 bytes
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index 139126fe2c2..0f587c54bf4 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -269,7 +269,7 @@
 
 /obj/item/ammo_box/magazine/smgm9mm/update_icon()
 	..()
-	icon_state = "[initial(icon_state)]-[round(ammo_count(),6)]"
+	icon_state = "[initial(icon_state)]-[round(ammo_count()+1,4)]"
 
 /obj/item/ammo_box/magazine/pistolm9mm
 	name = "pistol magazine (9mm)"
@@ -373,12 +373,12 @@
 
 /obj/item/ammo_box/magazine/toy/smg
 	name = "foam force SMG magazine"
-	icon_state = "smg9mm-30"
+	icon_state = "smg9mm-20"
 	max_ammo = 20
 
 /obj/item/ammo_box/magazine/toy/smg/update_icon()
 	..()
-	icon_state = "smg9mm-[round(ammo_count()+1,4)*6/4]"
+	icon_state = "smg9mm-[round(ammo_count()+1,4)]"
 
 /obj/item/ammo_box/magazine/toy/smg/riot
 	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index b6bbd8ab349323993bbbeb6690685be217bb0b51..a7db164c0fc06ad2f8a97d2cf108edee8f6de3f1 100644
GIT binary patch
delta 3816
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
W8&7fBV^LEBj+e2%1)^NnE#^N+>1s3p

delta 3625
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
Ohk=f%c7>*M#D4(3w(QaX


From 755b282b6d260f238c086c6190dc4063333a24ca Mon Sep 17 00:00:00 2001
From: FalseIncarnate <false_incarnate@yahoo.com>
Date: Mon, 26 Sep 2016 23:48:50 -0400
Subject: [PATCH 27/52] Arcade duplication fix

Arcade machines should no longer spawn additional arcade machines after
spawning additional arcade machines after spawning additional...
---
 code/modules/arcade/arcade_base.dm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/modules/arcade/arcade_base.dm b/code/modules/arcade/arcade_base.dm
index d886fa3f4be..b40e935422a 100644
--- a/code/modules/arcade/arcade_base.dm
+++ b/code/modules/arcade/arcade_base.dm
@@ -12,13 +12,14 @@
 	var/freeplay = 0				//for debugging and admin kindness
 	var/token_price = 0
 	var/last_winner = null			//for letting people who to hunt down and steal prizes from
-	var/window_name = "arcade"		//in case you want to change the window name for certain machines
+	var/window_name = "arcade"		//the window name for arcade machines (also prevents New() from spawning a new machine, so make sure you change this for subtypes)
 
 /obj/machinery/arcade/New()
 	..()
-	var/choice = pick(subtypesof(/obj/machinery/arcade))
-	new choice(loc)
-	qdel(src)
+	if(window_name == "arcade")		//if the window_name is not changed, this will assume it is the base type and spawn a new subtype machine in its place.
+		var/choice = pick(subtypesof(/obj/machinery/arcade))
+		new choice(loc)
+		qdel(src)
 
 /obj/machinery/arcade/examine(mob/user)
 	..(user)
@@ -76,7 +77,7 @@
 			if(pay_with_cash(C, user))
 				tokens += 1
 			return
-	if(panel_open&& component_parts && istype(O, /obj/item/weapon/crowbar))
+	if(panel_open && component_parts && istype(O, /obj/item/weapon/crowbar))
 		default_deconstruction_crowbar(O)
 
 /obj/machinery/arcade/update_icon()

From 11a37ae96019e23ad96fd9d8a2256b8115d00d44 Mon Sep 17 00:00:00 2001
From: Crazylemon64 <tlrgue17@gmail.com>
Date: Tue, 13 Sep 2016 17:10:34 -0700
Subject: [PATCH 28/52] Should make the rnd console less prone to freezing

"wait_message" is now guaranteed to be unset provided that the timer
controller doesn't go down, and it'll be reset anyways by the `spawn` if
nothing runtimes in there
---
 code/controllers/Processes/timer.dm |   5 ++
 code/modules/research/rdconsole.dm  | 133 +++++++++++++++++-----------
 2 files changed, 88 insertions(+), 50 deletions(-)

diff --git a/code/controllers/Processes/timer.dm b/code/controllers/Processes/timer.dm
index 711412608ba..2e60f8752b8 100644
--- a/code/controllers/Processes/timer.dm
+++ b/code/controllers/Processes/timer.dm
@@ -79,6 +79,11 @@ var/global/datum/controller/process/timer/timer_master
 	return event.id
 
 /proc/deltimer(id)
+	if(id == 0)
+		// No event will correspond to an id of 0 - the timer does not exist
+		// Save us a possibly expensive iteration through the timer list
+		// This would probably be more efficient in general if we used an associative list instead
+		return 0
 	for(var/datum/timedevent/event in timer_master.processing_timers)
 		if(event.id == id)
 			qdel(event)
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index cc6d48dc269..84fc3573bae 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -31,6 +31,18 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 
 */
 
+// Who likes #defines?
+// I don't!
+// but I gotta add 'em anyways because we have a bias against /const statements for some reason
+#define TECH_UPDATE_DELAY 50
+#define DESIGN_UPDATE_DELAY 50
+#define PROTOLATHE_CONSTRUCT_DELAY 32
+#define SYNC_RESEARCH_DELAY 30
+#define DECONSTRUCT_DELAY 24
+#define SYNC_DEVICE_DELAY 20
+#define RESET_RESEARCH_DELAY 20
+#define IMPRINTER_DELAY 16
+
 /obj/machinery/computer/rdconsole
 	name = "\improper R&D console"
 	icon_screen = "rdcomp"
@@ -50,6 +62,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 	var/menu = 0 // Current menu.
 	var/submenu = 0
 	var/wait_message = 0
+	var/wait_message_timer = 0
 
 	var/id = 0			//ID of the computer (for server restrictions).
 	var/sync = 1		//If sync = 0, it doesn't show up on Server Control Console
@@ -139,6 +152,17 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 	..()
 	SyncRDevices()
 
+/obj/machinery/computer/rdconsole/Destroy()
+	if(wait_message_timer)
+		deltimer(wait_message_timer)
+		wait_message_timer = 0
+	return ..()
+
+/*	Instead of calling this every tick, it is only being called when needed
+/obj/machinery/computer/rdconsole/process()
+	griefProtection()
+*/
+
 /obj/machinery/computer/rdconsole/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob, params)
 
 	//Loading a disk into it.
@@ -206,9 +230,9 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 		selected_category = "Viewing Category [href_list["category"]]"
 
 	else if(href_list["updt_tech"]) //Update the research holder with information from the technology disk.
-		wait_message = "Updating Database...."
-		spawn(50)
-			wait_message = 0
+		add_wait_message("Updating Database...", TECH_UPDATE_DELAY)
+		spawn(TECH_UPDATE_DELAY)
+			clear_wait_message()
 			files.AddTech2Known(t_disk.stored)
 			nanomanager.update_uis(src)
 			griefProtection() //Update centcom too
@@ -231,9 +255,9 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 		submenu = 0
 
 	else if(href_list["updt_design"]) //Updates the research holder with design data from the design disk.
-		wait_message = "Updating Database...."
-		spawn(50)
-			wait_message = 0
+		add_wait_message("Updating Database...", DESIGN_UPDATE_DELAY)
+		spawn(DESIGN_UPDATE_DELAY)
+			clear_wait_message()
 			files.AddDesign2Known(d_disk.blueprint)
 			nanomanager.update_uis(src)
 			griefProtection() //Update centcom too
@@ -252,7 +276,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 	else if(href_list["copy_design"]) //Copy design data from the research holder to the design disk.
 		// This href ALSO makes me very nervous
 		var/datum/design/D = files.known_designs[href_list["copy_design_ID"]]
-		if(D)
+		if(D)
 			// eeeeeep design datums are global be careful!
 			var/autolathe_friendly = 1
 			for(var/x in D.materials)
@@ -299,16 +323,16 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 				var/choice = input("Proceeding will destroy loaded item.") in list("Proceed", "Cancel")
 				if(choice == "Cancel" || !linked_destroy) return
 				linked_destroy.busy = 1
-				wait_message = "Processing and Updating Database..."
+				add_wait_message("Processing and Updating Database...", DECONSTRUCT_DELAY)
 				nanomanager.update_uis(src)
 				flick("d_analyzer_process", linked_destroy)
-				spawn(24)
+				spawn(DECONSTRUCT_DELAY)
+					clear_wait_message()
 					if(linked_destroy)
 						linked_destroy.busy = 0
 						if(!linked_destroy.hacked)
 							if(!linked_destroy.loaded_item)
 								to_chat(usr, "<span class='danger'>The destructive analyzer appears to be empty.</span>")
-								wait_message = 0
 								menu = 0
 								submenu = 0
 								return
@@ -318,19 +342,16 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 									if(prob(linked_destroy.loaded_item.reliability))               //If deconstructed item is not reliable enough its just being wasted, else it is pocessed
 										files.UpdateTech(T, temp_tech[T])                          //Check if deconstructed item has research levels higher/same/one less than current ones
 								files.UpdateDesigns(linked_destroy.loaded_item, temp_tech, src)    //If if such reseach type found all the known designs are checked for having this research type in them
-								wait_message = 0                                                   //If design have it it gains some reliability
-								menu = 0
+								menu = 0                           //If design have it it gains some reliability
 								submenu = 0
 							else                                                                   //Same design always gain quality
-								wait_message = 0                                                   //Crit fail gives the same design a lot of reliability, like really a lot
-								menu = 2
+								menu = 2                           //Crit fail gives the same design a lot of reliability, like really a lot
 								submenu = 0
 							if(linked_lathe) //Also sends salvaged materials to a linked protolathe, if any.
 								for(var/material in linked_destroy.loaded_item.materials)
 									linked_lathe.materials.insert_amount(min((linked_lathe.materials.max_amount - linked_lathe.materials.total_amount), (linked_destroy.loaded_item.materials[material]*(linked_destroy.decon_mod/10))), material)
 							linked_destroy.loaded_item = null
 						else
-							wait_message = 0
 							menu = 0
 							submenu = 0
 						for(var/obj/I in linked_destroy.contents)
@@ -352,26 +373,26 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 						nanomanager.update_uis(src)
 
 	else if(href_list["sync"]) //Sync the research holder with all the R&D consoles in the game that aren't sync protected.
-		wait_message = "Updating Database...."
 		if(!sync)
 			to_chat(usr, "<span class='danger'>You must connect to the network first!</span>")
 		else
+			add_wait_message("Updating Database...", SYNC_RESEARCH_DELAY)
 			griefProtection() //Putting this here because I dont trust the sync process
-			spawn(30)
+			spawn(SYNC_RESEARCH_DELAY)
+				clear_wait_message()
 				if(src)
 					for(var/obj/machinery/r_n_d/server/S in world)
 						var/server_processed = 0
 						if(S.disabled)
 							continue
-						if((id in S.id_with_upload) || istype(S, /obj/machinery/r_n_d/server/centcom))
+						if((id in S.id_with_upload) || istype(S, /obj/machinery/r_n_d/server/centcom))
 							files.push_data(S.files)
 							server_processed = 1
-						if(((id in S.id_with_download) && !istype(S, /obj/machinery/r_n_d/server/centcom)) || S.hacked)
+						if(((id in S.id_with_download) && !istype(S, /obj/machinery/r_n_d/server/centcom)) || S.hacked)
 							S.files.push_data(files)
 							server_processed = 1
 						if(!istype(S, /obj/machinery/r_n_d/server/centcom) && server_processed)
 							S.produce_heat(100)
-					wait_message = 0
 					nanomanager.update_uis(src)
 
 	else if(href_list["togglesync"]) //Prevents the console from being synced by other consoles. Can still send data.
@@ -393,7 +414,6 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 				for(var/M in being_built.materials)
 					power += round(being_built.materials[M] * amount / 5)
 				power = max(2000, power)
-				wait_message = "Constructing Prototype. Please Wait..."
 				if(linked_lathe.busy)
 					g2g = 0
 				var/key = usr.key	//so we don't lose the info during the spawn delay
@@ -404,7 +424,11 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 
 
 				if(g2g) //If input is incorrect, nothing happens
+					var/time_to_construct = PROTOLATHE_CONSTRUCT_DELAY * amount / coeff
 					var/enough_materials = 1
+
+					time_to_construct /= being_built.lathe_time_factor
+					add_wait_message("Constructing Prototype. Please Wait...", time_to_construct)
 					linked_lathe.busy = 1
 					flick("protolathe_n",linked_lathe)
 					use_power(power)
@@ -432,9 +456,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 					var/P = being_built.build_path //lets save these values before the spawn() just in case. Nobody likes runtimes.
 					var/O = being_built.locked
 
-					coeff *= being_built.lathe_time_factor
-
-					spawn(32*amount/coeff)
+					spawn(time_to_construct)
 						if(g2g) //And if we only fail the material requirements, we still spend time and power
 							for(var/i = 0, i<amount, i++)
 								var/obj/item/new_item = new P(src)
@@ -455,8 +477,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 									L.desc = "A locked box. It is locked to [lockbox_access]access."
 								else
 									new_item.loc = linked_lathe.loc
+						clear_wait_message()
 						linked_lathe.busy = 0
-						wait_message = 0
 						nanomanager.update_uis(src)
 
 	else if(href_list["imprint"]) //Causes the Circuit Imprinter to build something.
@@ -470,7 +492,6 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 				for(var/M in being_built.materials)
 					power += round(being_built.materials[M] / 5)
 				power = max(2000, power)
-				wait_message = "Imprinting Circuit. Please Wait..."
 				if(linked_imprinter.busy)
 					g2g = 0
 				if(!(being_built.build_type & IMPRINTER))
@@ -478,6 +499,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 					message_admins("Circuit imprinter exploit attempted by [key_name(usr, usr.client)]!")
 
 				if(g2g) //Again, if input is wrong, do nothing
+					add_wait_message("Imprinting Circuit. Please Wait...", IMPRINTER_DELAY)
 					linked_imprinter.busy = 1
 					flick("circuit_imprinter_ani",linked_imprinter)
 					use_power(power)
@@ -498,13 +520,13 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 								linked_imprinter.reagents.remove_reagent(M, being_built.materials[M]/coeff)
 
 					var/P = being_built.build_path //lets save these values before the spawn() just in case. Nobody likes runtimes.
-					spawn(16)
+					spawn(IMPRINTER_DELAY)
 						if(g2g)
 							var/obj/item/new_item = new P(src)
 							new_item.reliability = 100
 							new_item.loc = linked_imprinter.loc
 						linked_imprinter.busy = 0
-						wait_message = 0
+						clear_wait_message()
 						nanomanager.update_uis(src)
 
 	else if(href_list["disposeI"] && linked_imprinter)  //Causes the circuit imprinter to dispose of a single reagent (all of it)
@@ -562,10 +584,10 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 				qdel(sheet)
 
 	else if(href_list["find_device"]) //The R&D console looks for devices nearby to link up with.
-		wait_message = "Updating Database...."
-		spawn(20)
+		add_wait_message("Updating Database...", SYNC_DEVICE_DELAY)
+		spawn(SYNC_DEVICE_DELAY)
 			SyncRDevices()
-			wait_message = 0
+			clear_wait_message()
 			nanomanager.update_uis(src)
 
 	else if(href_list["disconnect"]) //The R&D console disconnects with a specific device.
@@ -584,11 +606,11 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 		griefProtection()
 		var/choice = alert("Are you sure you want to reset the R&D console's database? Data lost cannot be recovered.", "R&D Console Database Reset", "Continue", "Cancel")
 		if(choice == "Continue")
-			wait_message = "Updating Database...."
+			add_wait_message("Updating Database...", RESET_RESEARCH_DELAY)
 			qdel(files)
 			files = new /datum/research(src)
-			spawn(20)
-				wait_message = 0
+			spawn(RESET_RESEARCH_DELAY)
+				clear_wait_message()
 				nanomanager.update_uis(src)
 
 	else if(href_list["search"]) //Search for designs with name matching pattern
@@ -841,24 +863,26 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 		ui.set_initial_data(data)
 		ui.open()
 
-//helper proc, which return a table containing categories
-/obj/machinery/computer/rdconsole/proc/list_categories(var/list/categories, var/menu_num as num)
-	if(!categories)
-		return
+//helper proc that guarantees the wait message will not freeze the UI
+/obj/machinery/computer/rdconsole/proc/add_wait_message(message, delay)
+	wait_message = message
+	wait_message_timer = addtimer(src, "clear_wait_message", delay, TRUE)
 
-	var/line_length = 1
-	var/dat = "<table style='width:100%' align='center'><tr>"
+// This is here to guarantee that we never lock the console, so long as the timer
+// process is running
+// So long as the spawns never runtime, though, the timer should be stopped
+// before it gets the chance to fire
+// Since the timer process can have significant delays, you should call this
+// in the operations that take time, once they complete
+/obj/machinery/computer/rdconsole/proc/clear_wait_message()
+	wait_message = ""
+	if(wait_message_timer)
+		// This could be expensive, and will still be called
+		// if the timer calls this function
+		deltimer(wait_message_timer)
+		wait_message_timer = 0
+	nanomanager.update_uis(src)
 
-	for(var/C in categories)
-		if(line_length > 2)
-			dat += "</tr><tr>"
-			line_length = 1
-
-		dat += "<td><A href='?src=[UID()];category=[C];menu=[menu_num]'>[C]</A></td>"
-		line_length++
-
-	dat += "</tr></table></div>"
-	return dat
 
 /obj/machinery/computer/rdconsole/core
 	name = "core R&D console"
@@ -891,3 +915,12 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 	id = 5
 	req_access = list()
 	circuit = /obj/item/weapon/circuitboard/rdconsole/public
+
+#undef TECH_UPDATE_DELAY
+#undef DESIGN_UPDATE_DELAY
+#undef PROTOLATHE_CONSTRUCT_DELAY
+#undef SYNC_RESEARCH_DELAY
+#undef DECONSTRUCT_DELAY
+#undef SYNC_DEVICE_DELAY
+#undef RESET_RESEARCH_DELAY
+#undef IMPRINTER_DELAY

From 977950b1c22ecc63daef2476fcd954c0b414105b Mon Sep 17 00:00:00 2001
From: FalseIncarnate <false_incarnate@yahoo.com>
Date: Wed, 28 Sep 2016 18:57:43 -0400
Subject: [PATCH 29/52] type-check instead of variable check

---
 code/modules/arcade/arcade_base.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/arcade/arcade_base.dm b/code/modules/arcade/arcade_base.dm
index b40e935422a..3c68c7142f4 100644
--- a/code/modules/arcade/arcade_base.dm
+++ b/code/modules/arcade/arcade_base.dm
@@ -12,11 +12,11 @@
 	var/freeplay = 0				//for debugging and admin kindness
 	var/token_price = 0
 	var/last_winner = null			//for letting people who to hunt down and steal prizes from
-	var/window_name = "arcade"		//the window name for arcade machines (also prevents New() from spawning a new machine, so make sure you change this for subtypes)
+	var/window_name = "arcade"		//in case you want to change the window name for certain machines
 
 /obj/machinery/arcade/New()
 	..()
-	if(window_name == "arcade")		//if the window_name is not changed, this will assume it is the base type and spawn a new subtype machine in its place.
+	if(type == /obj/machinery/arcade)		//if you spawn the base-type, it will replace itself with a random subtype for randomness
 		var/choice = pick(subtypesof(/obj/machinery/arcade))
 		new choice(loc)
 		qdel(src)

From 34b0a94763be2c562b94a0b1c57a6534c93a2d30 Mon Sep 17 00:00:00 2001
From: Isaac Erwin <isaacerwin2000@gmail.com>
Date: Thu, 29 Sep 2016 15:16:12 -0400
Subject: [PATCH 30/52] Tossed out guardians are now respawnable

---
 code/game/gamemodes/miniantags/guardian/guardian.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm
index 6de3308f75e..69d87a37b7f 100644
--- a/code/game/gamemodes/miniantags/guardian/guardian.dm
+++ b/code/game/gamemodes/miniantags/guardian/guardian.dm
@@ -195,7 +195,7 @@
 				to_chat(G, "Your user reset you, and your body was taken over by a ghost. Looks like they weren't happy with your performance.")
 				to_chat(src, "Your guardian has been successfully reset.")
 				message_admins("[key_name_admin(new_stand)] has taken control of ([key_name_admin(G)])")
-				G.ghostize(0)
+				G.ghostize()
 				G.key = new_stand.key
 			else
 				to_chat(src, "There were no ghosts willing to take control. Looks like you're stuck with your Guardian for now.")

From 0cc8a94d5ddf2fe295f3f05dce41663c2d0ef62c Mon Sep 17 00:00:00 2001
From: Isaac Erwin <isaacerwin2000@gmail.com>
Date: Tue, 4 Oct 2016 17:49:42 -0400
Subject: [PATCH 31/52] Fine

---
 code/modules/client/preference/preferences.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
index 8094ef82966..82f76a04824 100644
--- a/code/modules/client/preference/preferences.dm
+++ b/code/modules/client/preference/preferences.dm
@@ -1148,7 +1148,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 				if("name")
 					var/raw_name = input(user, "Choose your character's name:", "Character Preference") as text|null
 					if(!isnull(raw_name)) // Check to ensure that the user entered text (rather than cancel.)
-						var/new_name = reject_bad_name(raw_name)
+						var/new_name = reject_bad_name(raw_name, 1)
 						if(new_name)
 							real_name = new_name
 						else

From 176d6cffae0e308f300f6ebaae092d486570699e Mon Sep 17 00:00:00 2001
From: FlattestGuitar <mieszko335@gmail.com>
Date: Wed, 5 Oct 2016 15:44:01 +0200
Subject: [PATCH 32/52] no more nodrop spam

---
 code/modules/mob/living/carbon/human/human_organs.dm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm
index 96a23acf5c7..8288c2dbd8b 100644
--- a/code/modules/mob/living/carbon/human/human_organs.dm
+++ b/code/modules/mob/living/carbon/human/human_organs.dm
@@ -108,11 +108,13 @@
 			if((E.body_part == HAND_LEFT) || (E.body_part == ARM_LEFT))
 				if(!l_hand)
 					continue
-				unEquip(l_hand)
+				if(!unEquip(l_hand))
+					continue
 			else
 				if(!r_hand)
 					continue
-				unEquip(r_hand)
+				if(!unEquip(r_hand))
+					continue
 
 			var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")
 			custom_emote(1, "[(species.flags & NO_PAIN) ? "" : emote_scream ]drops what they were holding in their [E.name]!")
@@ -122,11 +124,13 @@
 			if((E.body_part == HAND_LEFT) || (E.body_part == ARM_LEFT))
 				if(!l_hand)
 					continue
-				unEquip(l_hand)
+				if(!unEquip(l_hand))
+					continue
 			else
 				if(!r_hand)
 					continue
-				unEquip(r_hand)
+				if(!unEquip(r_hand))
+					continue
 
 			custom_emote(1, "drops what they were holding, their [E.name] malfunctioning!")
 

From f07f476a3c60e58195f593896b3bae5f607d8c49 Mon Sep 17 00:00:00 2001
From: FlattestGuitar <mieszko335@gmail.com>
Date: Fri, 7 Oct 2016 10:56:36 +0200
Subject: [PATCH 33/52] Fixes cluwnes forever

---
 code/modules/mob/mob_helpers.dm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index a8025091a05..1e00e6b31c4 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -510,10 +510,9 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM)
 					search_pda = 0
 
 		//Fixes renames not being reflected in objective text
-		var/list/O = subtypesof(/datum/objective)
 		var/length
 		var/pos
-		for(var/datum/objective/objective in O)
+		for(var/datum/objective/objective in all_objectives)
 			if(objective.target != mind) continue
 			length = lentext(oldname)
 			pos = findtextEx(objective.explanation_text, oldname)

From 7592c65fe09920d71e8194fb3931f8404e48daa4 Mon Sep 17 00:00:00 2001
From: FlattestGuitar <mieszko335@gmail.com>
Date: Fri, 7 Oct 2016 20:13:24 +0200
Subject: [PATCH 34/52] =?UTF-8?q?=E2=9D=84=EF=B8=8F=20=E2=9D=84=EF=B8=8F?=
 =?UTF-8?q?=20=E2=9D=84=EF=B8=8F=20=E2=9D=84=EF=B8=8F=20=E2=9D=84=EF=B8=8F?=
 =?UTF-8?q?=20=E2=9D=84=EF=B8=8F=20=E2=9D=84=EF=B8=8F=20=E2=9D=84=EF=B8=8F?=
 =?UTF-8?q?=20=E2=9D=84=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/datums/uplink_item.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index 5f7b5e8237a..11b013718a0 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -791,7 +791,7 @@ var/list/uplink_items = list()
 	reference = "CHHUD"
 	item = /obj/item/clothing/glasses/hud/security/chameleon
 	cost = 2
-	
+
 /datum/uplink_item/stealthy_weapons/chameleonflag
 	name = "Chameleon Flag"
 	desc = "A flag that can be disguised as any other known flag. There is a heat sensitive bomb loaded into the pole that will be detonated if the flag is lit on fire."
@@ -1181,6 +1181,9 @@ var/list/uplink_items = list()
 	if(item)
 		if(findtext(item, /obj/item/organ/internal/cyberimp))
 			return new /obj/item/weapon/storage/box/cyber_implants(loc, item)
+			U.uses -= max(cost, 0)
+			U.used_TC += cost
+			feedback_add_details("traitor_uplink_items_bought", name) //this one and the line before copypasted because snowflaek code
 		else
 			return ..()
 

From 514222b6d7a8ce4598227cdd34d1f749d5a286d0 Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Sun, 9 Oct 2016 16:36:09 +0200
Subject: [PATCH 35/52] Fixes silicons not having their antag powers/antagHUD
 removed properly. Fixes traitors/abductors not having their antagHUD added at
 roundstart.

---
 code/game/gamemodes/changeling/changeling.dm  |  2 +-
 .../miniantags/abduction/abduction.dm         | 17 ++++++-
 code/game/gamemodes/nuclear/nuclear.dm        | 14 +++++-
 code/game/gamemodes/traitor/traitor.dm        | 49 ++++++++++++-------
 code/game/gamemodes/vampire/vampire.dm        | 16 ++++++
 code/game/gamemodes/wizard/wizard.dm          | 15 +++++-
 code/modules/mob/living/silicon/login.dm      | 11 ++++-
 .../modules/mob/living/silicon/robot/login.dm |  6 ---
 8 files changed, 101 insertions(+), 29 deletions(-)

diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
index 9fb2402f889..805db2be393 100644
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -152,7 +152,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
 		changeling_mind.current.remove_changeling_powers()
 		changeling_mind.memory = ""
 		changeling_mind.special_role = null
-		if(issilicon(changeling_mind))
+		if(issilicon(changeling_mind.current))
 			to_chat(changeling_mind.current, "<span class='userdanger'>You have been robotized!</span>")
 			to_chat(changeling_mind.current, "<span class='danger'>You must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead.</span>")
 		else
diff --git a/code/game/gamemodes/miniantags/abduction/abduction.dm b/code/game/gamemodes/miniantags/abduction/abduction.dm
index 3e969af60c2..32e4b081e94 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction.dm
@@ -119,6 +119,7 @@
 		equip_common(H,team_number)
 		equip_agent(H,team_number)
 		greet_agent(agent,team_number)
+		update_abductor_icons_added(agent)
 
 		scientist = scientists[team_number]
 		H = scientist.current
@@ -132,6 +133,8 @@
 		equip_common(H,team_number)
 		equip_scientist(H,team_number)
 		greet_scientist(scientist,team_number)
+		update_abductor_icons_added(scientist)
+		
 	return ..()
 
 //Used for create antag buttons
@@ -165,7 +168,7 @@
 	equip_common(H,team_number)
 	equip_agent(H,team_number)
 	greet_agent(agent,team_number)
-
+	update_abductor_icons_added(agent)
 
 	scientist = scientists[team_number]
 	H = scientist.current
@@ -179,6 +182,7 @@
 	equip_common(H,team_number)
 	equip_scientist(H,team_number)
 	greet_scientist(scientist,team_number)
+	update_abductor_icons_added(scientist)
 
 
 /datum/abductor //stores abductor's team and whether they're a scientist or agent; since species datums are global, we have to use this, instead.
@@ -337,6 +341,17 @@
 			else
 				return 0
 	return 0
+	
+/datum/game_mode/proc/remove_abductor(datum/mind/abductor_mind)
+	if(abductor_mind in abductors)
+		ticker.mode.abductors -= abductor_mind
+		abductor_mind.special_role = null
+		abductor_mind.current.attack_log += "\[[time_stamp()]\] <span class='danger'>No longer abductor</span>"
+		if(issilicon(abductor_mind.current))
+			to_chat(abductor_mind.current, "<span class='userdanger'>You have been turned into a robot! You are no longer an abductor.</span>")
+		else
+			to_chat(abductor_mind.current, "<span class='userdanger'>You have been brainwashed! You are no longer an abductor.</span>")
+		ticker.mode.update_abductor_icons_added(abductor_mind)	
 
 /datum/game_mode/proc/update_abductor_icons_added(datum/mind/alien_mind)
 	var/datum/atom_hud/antag/hud = huds[ANTAG_HUD_ABDUCTOR]
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 1a607bea3ca..28a5ad2c922 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -57,7 +57,19 @@ proc/issyndicate(mob/living/M as mob)
 /datum/game_mode/nuclear/pre_setup()
 	return 1
 
-
+/datum/game_mode/proc/remove_operative(datum/mind/operative_mind)
+	if(operative_mind in syndicates)
+		ticker.mode.syndicates -= operative_mind
+		operative_mind.special_role = null
+		for(var/datum/objective/nuclear/O in operative_mind.objectives)
+			operative_mind.objectives -= O
+		operative_mind.current.attack_log += "\[[time_stamp()]\] <span class='danger'>No longer nuclear operative</span>"
+		if(issilicon(operative_mind.current))
+			to_chat(operative_mind.current, "<span class='userdanger'>You have been turned into a robot! You are no longer a Syndicate operative.</span>")
+		else
+			to_chat(operative_mind.current, "<span class='userdanger'>You have been brainwashed! You are no longer a Syndicate operative.</span>")
+		ticker.mode.update_synd_icons_removed(operative_mind)		
+			
 ////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index 9474526655e..60a90b70638 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -63,6 +63,7 @@
 /datum/game_mode/traitor/post_setup()
 	for(var/datum/mind/traitor in traitors)
 		forge_traitor_objectives(traitor)
+		update_traitor_icons_added(traitor)
 		spawn(rand(10,100))
 			finalize_traitor(traitor)
 			greet_traitor(traitor)
@@ -345,9 +346,19 @@
 		to_chat(traitor_mob, "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting them.")
 		traitor_mob.mind.store_memory("<b>Potential Collaborator</b>: [M.real_name]")
 
+/datum/game_mode/proc/remove_traitor(datum/mind/traitor_mind)
+	if(traitor_mind in traitors)
+		ticker.mode.traitors -= traitor_mind
+		traitor_mind.special_role = null
+		traitor_mind.current.attack_log += "\[[time_stamp()]\] <span class='danger'>De-traitored</span>"
+		if(issilicon(traitor_mind.current))
+			to_chat(traitor_mind.current, "<span class='userdanger'>You have been turned into a robot! You are no longer a traitor.</span>")
+		else
+			to_chat(traitor_mind.current, "<span class='userdanger'>You have been brainwashed! You are no longer a traitor.</span>")
+		ticker.mode.update_traitor_icons_removed(traitor_mind)		
+		
 /datum/game_mode/proc/update_traitor_icons_added(datum/mind/traitor_mind)
 	var/datum/atom_hud/antag/tatorhud = huds[ANTAG_HUD_TRAITOR]
-	//var/ref = "\ref[traitor_mind]"
 	tatorhud.join_hud(traitor_mind.current)
 	set_antag_hud(traitor_mind.current, "hudsyndicate")
 
@@ -358,23 +369,27 @@
 
 
 /datum/game_mode/proc/remove_traitor_mind(datum/mind/traitor_mind, datum/mind/head)
-	//var/list/removal
-	var/ref = "\ref[head]"
-	if(ref in implanter)
-		implanter[ref] -= traitor_mind
-	implanted -= traitor_mind
-	traitors -= traitor_mind
-	if(traitor_mind.som)
-		var/datum/mindslaves/slaved = traitor_mind.som
-		slaved.serv -= traitor_mind
-		traitor_mind.special_role = null
-		traitor_mind.som = null
-		slaved.leave_serv_hud(traitor_mind)
-		for(var/datum/objective/protect/mindslave/MS in traitor_mind.objectives)
-			traitor_mind.objectives -= MS
+	if(traitor_mind in implanted)
+		//var/list/removal
+		var/ref = "\ref[head]"
+		if(ref in implanter)
+			implanter[ref] -= traitor_mind
+		implanted -= traitor_mind
+		traitors -= traitor_mind
+		if(traitor_mind.som)
+			var/datum/mindslaves/slaved = traitor_mind.som
+			slaved.serv -= traitor_mind
+			traitor_mind.special_role = null
+			traitor_mind.som = null
+			slaved.leave_serv_hud(traitor_mind)
+			for(var/datum/objective/protect/mindslave/MS in traitor_mind.objectives)
+				traitor_mind.objectives -= MS
 
-	update_traitor_icons_removed(traitor_mind)
-	to_chat(traitor_mind.current, "<span class='userdanger'>You are no longer a mindslave; you have complete and free control of your own faculties, once more!</span>")
+		update_traitor_icons_removed(traitor_mind)
+		if(issilicon(traitor_mind.current))
+			to_chat(traitor_mind.current, "<span class='userdanger'>You have been turned into a robot! You are no longer a mindslave.</span>")
+		else
+			to_chat(traitor_mind.current, "<span class='userdanger'>You are no longer a mindslave: you have complete and free control of your own faculties, once more!</span>")
 
 /datum/game_mode/proc/assign_exchange_role(var/datum/mind/owner)
 	//set faction
diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm
index 5a78826ab0c..dd40a6817b6 100644
--- a/code/game/gamemodes/vampire/vampire.dm
+++ b/code/game/gamemodes/vampire/vampire.dm
@@ -325,6 +325,22 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
 			else if(istype(p, /datum/vampire_passive))
 				var/datum/vampire_passive/power = p
 				to_chat(owner, "<span class='notice'>[power.gain_desc]</span>")
+				
+	
+/datum/game_mode/proc/remove_vampire(datum/mind/vampire_mind)
+	if(vampire_mind in vampires)
+		ticker.mode.vampires -= vampire_mind
+		vampire_mind.special_role = null
+		vampire_mind.current.attack_log += "\[[time_stamp()]\] <span class='danger'>De-vampired</span>"
+		if(vampire_mind.vampire)
+			vampire_mind.vampire.remove_vampire_powers()
+			qdel(vampire_mind.vampire)
+			vampire_mind.vampire = null	
+		if(issilicon(vampire_mind.current))
+			to_chat(vampire_mind.current, "<span class='userdanger'>You have been turned into a robot! You can feel your powers fading away...</span>")
+		else
+			to_chat(vampire_mind.current, "<span class='userdanger'>You have been brainwashed! You are no longer a vampire.</span>")
+		ticker.mode.update_vampire_icons_removed(vampire_mind)	
 
 //prepare for copypaste
 /datum/game_mode/proc/update_vampire_icons_added(datum/mind/vampire_mind)
diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm
index b98d97d790e..a38e7dc5541 100644
--- a/code/game/gamemodes/wizard/wizard.dm
+++ b/code/game/gamemodes/wizard/wizard.dm
@@ -54,7 +54,20 @@
 			update_wiz_icons_added(wizard)
 
 	..()
-
+	
+/datum/game_mode/proc/remove_wizard(datum/mind/wizard_mind)
+	if(wizard_mind in wizards)
+		ticker.mode.wizards -= wizard_mind
+		wizard_mind.special_role = null
+		wizard_mind.current.attack_log += "\[[time_stamp()]\] <span class='danger'>De-wizarded</span>"
+		wizard_mind.current.spellremove(wizard_mind.current)
+		wizard_mind.current.faction = list("Station")
+		if(issilicon(wizard_mind.current))
+			to_chat(wizard_mind.current, "<span class='userdanger'>You have been turned into a robot! You can feel your magical powers fading away...</span>")
+		else
+			to_chat(wizard_mind.current, "<span class='userdanger'>You have been brainwashed! You are no longer a wizard.</span>")
+		ticker.mode.update_wiz_icons_removed(wizard_mind)		
+	
 /datum/game_mode/proc/update_wiz_icons_added(datum/mind/wiz_mind)
 	var/datum/atom_hud/antag/wizhud = huds[ANTAG_HUD_WIZ]
 	wizhud.join_hud(wiz_mind.current)
diff --git a/code/modules/mob/living/silicon/login.dm b/code/modules/mob/living/silicon/login.dm
index cc2cb3e8435..fa71b48232e 100644
--- a/code/modules/mob/living/silicon/login.dm
+++ b/code/modules/mob/living/silicon/login.dm
@@ -1,8 +1,15 @@
 /mob/living/silicon/Login()
 	sleeping = 0
 	if(mind && ticker && ticker.mode)
-		ticker.mode.remove_cultist(mind, 1)
+		ticker.mode.remove_traitor(mind)
+		ticker.mode.remove_traitor_mind(mind)
 		ticker.mode.remove_revolutionary(mind, 1)
-		ticker.mode.remove_thrall(mind,0)
+		ticker.mode.remove_cultist(mind, 1)
+		ticker.mode.remove_wizard(mind)
+		ticker.mode.remove_changeling(mind)
+		ticker.mode.remove_vampire(mind)
+		ticker.mode.remove_thrall(mind, 0)
+		ticker.mode.remove_operative(mind)
 		ticker.mode.remove_shadowling(mind)
+		ticker.mode.remove_abductor(mind)
 	..()
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/login.dm b/code/modules/mob/living/silicon/robot/login.dm
index 84fcd64f849..2dd61d9a2ce 100644
--- a/code/modules/mob/living/silicon/robot/login.dm
+++ b/code/modules/mob/living/silicon/robot/login.dm
@@ -4,9 +4,3 @@
 		client.hotkeytype = "Cyborg"
 	regenerate_icons()
 	show_laws(0)
-	if(mind)	ticker.mode.remove_cultist(mind)
-	if(mind)	ticker.mode.remove_revolutionary(mind)
-	if(mind)	ticker.mode.remove_thrall(mind,0)
-	if(mind)	ticker.mode.remove_shadowling(mind)
-	if(mind)	ticker.mode.remove_changeling(mind)
-	return

From 8a2a9ee3b03051a340ec3d80b17168ddbbc4e2f0 Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Sun, 9 Oct 2016 18:20:20 +0200
Subject: [PATCH 36/52] Fixes multiple holograms being active at the same time,
 fixes AI's being unable to set wanted status.

---
 code/game/machinery/hologram.dm                |  5 ++++-
 code/modules/mob/living/carbon/human/human.dm  | 14 ++------------
 code/modules/mob/living/silicon/ai/ai.dm       |  5 -----
 code/modules/mob/living/silicon/robot/robot.dm |  7 ++-----
 4 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 8120bae4216..41952adf355 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -90,12 +90,15 @@ var/const/HOLOPAD_MODE = 0
 		user.eyeobj.setLoc(get_turf(src))
 	else if(!hologram)//If there is no hologram, possibly make one.
 		activate_holo(user)
-	else if(master==user)//If there is a hologram, remove it. But only if the user is the master. Otherwise do nothing.
+	else if(master == user)//If there is a hologram, remove it. But only if the user is the master. Otherwise do nothing.
 		clear_holo()
 	return
 
 /obj/machinery/hologram/holopad/proc/activate_holo(mob/living/silicon/ai/user)
 	if(!(stat & NOPOWER) && user.eyeobj.loc == src.loc)//If the projector has power and client eye is on it.
+		if(user.holo)
+			var/obj/machinery/hologram/holopad/current = user.holo
+			current.clear_holo()
 		if(!hologram)//If there is not already a hologram.
 			create_holo(user)//Create one.
 			src.visible_message("A holographic image of [user] flicks to life right before your eyes!")
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 86232208e2e..ed48c229b89 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -854,12 +854,7 @@
 										modified = 1
 
 										spawn()
-											if(istype(usr,/mob/living/carbon/human))
-												//var/mob/living/carbon/human/U = usr
-												sec_hud_set_security_status()
-											if(istype(usr,/mob/living/silicon/robot))
-												//var/mob/living/silicon/robot/U = usr
-												sec_hud_set_security_status()
+											sec_hud_set_security_status()
 
 			if(!modified)
 				to_chat(usr, "\red Unable to locate a data core entry for this person.")
@@ -984,12 +979,7 @@
 										PDA_Manifest.Cut()
 
 									spawn()
-										if(istype(usr,/mob/living/carbon/human))
-											//var/mob/living/carbon/human/U = usr
-											sec_hud_set_security_status()
-										if(istype(usr,/mob/living/silicon/robot))
-											//var/mob/living/silicon/robot/U = usr
-											sec_hud_set_security_status()
+										sec_hud_set_security_status()
 
 			if(!modified)
 				to_chat(usr, "\red Unable to locate a data core entry for this person.")
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index c0800a2413d..95f9362684b 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -97,12 +97,7 @@ var/list/ai_verbs_default = list(
 
 	var/obj/machinery/camera/portable/builtInCamera
 
-	//var/obj/item/borg/sight/hud/sec/sechud = null
-	//var/obj/item/borg/sight/hud/med/healthhud = null
-
 	var/arrivalmsg = "$name, $rank, has arrived on the station."
-	med_hud = DATA_HUD_MEDICAL_BASIC
-	sec_hud = DATA_HUD_SECURITY_BASIC
 
 /mob/living/silicon/ai/proc/add_ai_verbs()
 	src.verbs |= ai_verbs_default
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index afae06678d2..7e771b2f372 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -78,16 +78,13 @@ var/list/robot_verbs_default = list(
 
 	var/updating = 0 //portable camera camerachunk update
 
-	hud_possible = list(SPECIALROLE_HUD, DIAG_STAT_HUD, DIAG_HUD, DIAG_BATT_HUD,NATIONS_HUD)
+	hud_possible = list(SPECIALROLE_HUD, DIAG_STAT_HUD, DIAG_HUD, DIAG_BATT_HUD, NATIONS_HUD)
 
 	var/magpulse = 0
 	var/ionpulse = 0 // Jetpack-like effect.
 	var/ionpulse_on = 0 // Jetpack-like effect.
 	var/datum/effect/system/ion_trail_follow/ion_trail // Ionpulse effect.
-
-	var/obj/item/borg/sight/hud/sec/sechud = null
-	var/obj/item/borg/sight/hud/med/healthhud = null
-
+	
 	var/datum/action/item_action/toggle_research_scanner/scanner = null
 
 /mob/living/silicon/robot/New(loc,var/syndie = 0,var/unfinished = 0, var/alien = 0)

From e0d9572107cea8a05d17907118744aa2629867d1 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <leonardo.o.costa7+GITBOT@gmail.com>
Date: Sun, 9 Oct 2016 12:41:10 -0400
Subject: [PATCH 37/52] Automatic changelog generation for PR #5744

---
 html/changelogs/AutoChangeLog-pr-5744.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5744.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5744.yml b/html/changelogs/AutoChangeLog-pr-5744.yml
new file mode 100644
index 00000000000..982ede22fe8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5744.yml
@@ -0,0 +1,4 @@
+author: FlattestGuitar
+delete-after: True
+changes: 
+  - bugfix: "NODROP items will no longer attempt to be dropped if your hand is broken"

From 1b3cae082e8cdb32cfbf99e77f036a005eafe8e9 Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Sun, 9 Oct 2016 19:06:42 +0200
Subject: [PATCH 38/52] Better nuke disk finish checking

---
 code/game/gamemodes/nuclear/nuclear.dm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 1a607bea3ca..be1b4a12fcc 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -296,10 +296,7 @@ proc/issyndicate(mob/living/M as mob)
 /datum/game_mode/nuclear/declare_completion()
 	var/disk_rescued = 1
 	for(var/obj/item/weapon/disk/nuclear/D in world)
-		var/disk_area = get_area(D)
-		if(!is_type_in_list(disk_area, centcom_areas))
-			if(disk_area == shuttle_master.emergency.areaInstance && shuttle_master.emergency.mode >= SHUTTLE_ESCAPE) //snowflaked into objectives because shitty bay shuttles had areas to auto-determine this
-				break
+		if(!D.onCentcom())
 			disk_rescued = 0
 			break
 	var/crew_evacuated = (shuttle_master.emergency.mode >= SHUTTLE_ESCAPE)

From f7f1e493ed58c06db11ac1af42ed8377b82c1e7b Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Sun, 9 Oct 2016 14:04:52 -0400
Subject: [PATCH 39/52] Fixes Dual Location Objects with Grinder and
 Biogenerator

---
 code/game/machinery/biogenerator.dm          |  5 +++--
 code/modules/reagents/Chemistry-Machinery.dm | 14 ++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm
index fa285e5e457..e6ff40bc7d0 100644
--- a/code/game/machinery/biogenerator.dm
+++ b/code/game/machinery/biogenerator.dm
@@ -97,16 +97,17 @@
 	else if(processing)
 		to_chat(user, "<span class='warning'>The biogenerator is currently processing.</span>")
 	else if(istype(O, /obj/item/weapon/storage/bag/plants))
+		var/obj/item/weapon/storage/bag/plants/PB = O
 		var/i = 0
 		for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents)
 			i++
 		if(i >= max_items)
 			to_chat(user, "<span class='warning'>The biogenerator is already full! Activate it.</span>")
 		else
-			for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in O.contents)
+			for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in PB.contents)
 				if(i >= max_items)
 					break
-				G.forceMove(src)
+				PB.remove_from_storage(G, src)
 				i++
 			if(i < max_items)
 				to_chat(user, "<span class='info'>You empty the plant bag into the biogenerator.</span>")
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index bf107eebd16..ddd53d98fdf 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -829,7 +829,6 @@
 
 
 		//All types that you can put into the grinder to transfer the reagents to the beaker. !Put all recipes above this.!
-		/obj/item/weapon/reagent_containers/food/pill = list(),
 		/obj/item/weapon/reagent_containers/food = list(),
 		/obj/item/weapon/reagent_containers/honeycomb = list()
 	)
@@ -895,19 +894,18 @@
 		to_chat(usr, "<span class='warning'>The machine cannot hold anymore items.</span>")
 		return 1
 
-	//Fill machine with the plantbag!
+	//Fill machine with a plantbag!
 	if(istype(O, /obj/item/weapon/storage/bag/plants))
-
-		for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in O.contents)
-			O.contents -= G
-			G.forceMove(src)
+		var/obj/item/weapon/storage/bag/plants/PB = O
+		for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in PB.contents)
+			PB.remove_from_storage(G, src)
 			holdingitems += G
 			if(holdingitems && holdingitems.len >= limit) //Sanity checking so the blender doesn't overfill
 				to_chat(user, "<span class='notice>You fill the All-In-One grinder to the brim.</span>")
 				break
 
-		if(!O.contents.len)
-			to_chat(user, "<span class='notice'>You empty the plant bag into the All-In-One grinder.</span>")
+		if(!PB.contents.len)
+			to_chat(user, "<span class='notice'>You empty [PB] into the All-In-One grinder.</span>")
 
 		updateUsrDialog()
 		return 0

From a64f1849c09115c007b66c6df1d870c7e25ce42f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= <mieszko335@gmail.com>
Date: Mon, 10 Oct 2016 12:51:56 +0200
Subject: [PATCH 40/52] Actually fixes the implants this time

---
 code/datums/uplink_item.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index 713ddd59e90..1d57ffcfd2e 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -1201,10 +1201,10 @@ var/list/uplink_items = list()
 /datum/uplink_item/cyber_implants/spawn_item(turf/loc, obj/item/device/uplink/U)
 	if(item)
 		if(findtext(item, /obj/item/organ/internal/cyberimp))
-			return new /obj/item/weapon/storage/box/cyber_implants(loc, item)
 			U.uses -= max(cost, 0)
 			U.used_TC += cost
 			feedback_add_details("traitor_uplink_items_bought", name) //this one and the line before copypasted because snowflaek code
+			return new /obj/item/weapon/storage/box/cyber_implants(loc, item)
 		else
 			return ..()
 

From 2e839794b14353fcadad86e8b81fb9b694c805c4 Mon Sep 17 00:00:00 2001
From: Isaac Erwin <isaacerwin2000@gmail.com>
Date: Mon, 10 Oct 2016 07:08:00 -0400
Subject: [PATCH 41/52] Adds an APC to the APC-less Engineering foyer

---
 _maps/map_files/cyberiad/cyberiad.dmm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 9c606a4fbdd..b535dd748a6 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -6934,7 +6934,7 @@
 "cDr" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1; level = 1},/turf/simulated/wall/r_wall,/area/engine/chiefs_office)
 "cDs" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/wall/r_wall,/area/engine/chiefs_office)
 "cDt" = (/turf/simulated/wall/r_wall,/area/engine/chiefs_office)
-"cDu" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/suit/storage/hazardvest,/obj/item/weapon/tank/emergency_oxygen/engi,/obj/item/clothing/suit/storage/hazardvest,/obj/item/weapon/tank/emergency_oxygen/engi,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas{pixel_x = -3; pixel_y = -3},/turf/simulated/floor/plasteel,/area/engine/break_room)
+"cDu" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/suit/storage/hazardvest,/obj/item/weapon/tank/emergency_oxygen/engi,/obj/item/clothing/suit/storage/hazardvest,/obj/item/weapon/tank/emergency_oxygen/engi,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas{pixel_x = -3; pixel_y = -3},/obj/machinery/power/apc{dir = 8; name = "west bump Engineering"; pixel_x = -24; shock_proof = 1},/turf/simulated/floor/plasteel,/area/engine/break_room)
 "cDv" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor/plasteel,/area/engine/equipmentstorage)
 "cDw" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/engine/equipmentstorage)
 "cDx" = (/obj/machinery/camera{c_tag = "Engineering Equipment North"; network = list("SS13")},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/vending/engivend,/turf/simulated/floor/plasteel,/area/engine/equipmentstorage)

From 4528e4d469df3ddd44c72968196e4e09feda6685 Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Mon, 10 Oct 2016 23:42:31 +0200
Subject: [PATCH 42/52] De-snowflakes Dronespeak

---
 code/modules/mob/language.dm                  | 11 +++++
 .../mob/living/silicon/robot/drone/drone.dm   |  7 ++-
 .../living/silicon/robot/drone/drone_say.dm   | 48 ++++---------------
 code/modules/mob/living/silicon/silicon.dm    |  1 -
 4 files changed, 24 insertions(+), 43 deletions(-)

diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm
index fbb3c5edfd4..81b54bcc3a6 100644
--- a/code/modules/mob/language.dm
+++ b/code/modules/mob/language.dm
@@ -559,6 +559,17 @@
 	flags = RESTRICTED | HIVEMIND
 	drone_only = 1
 	follow = 1
+	
+/datum/language/drone
+	name = "Drone"
+	desc = "An encrypted stream of data converted to speech patterns."
+	speech_verb = "states"
+	ask_verb = "queries"
+	exclaim_verb = "declares"
+	key = "]"
+	flags = RESTRICTED
+	follow = 1
+	syllables = list ("beep", "boop")
 
 /datum/language/swarmer
 	name = "Swarmer"
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index 1089e05862a..76dadd6533a 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -13,9 +13,10 @@
 	lawupdate = 0
 	density = 0
 	req_access = list(access_engine, access_robotics)
-	local_transmit = 1
 	ventcrawler = 2
 	magpulse = 1
+	
+	default_language = "Drone"
 
 	// We need to keep track of a few module items so we don't need to do list operations
 	// every time we need them. These get set in New() after the module is chosen.
@@ -39,7 +40,9 @@
 	..()
 
 	remove_language("Robot Talk")
+	remove_language("Galactic Common")
 	add_language("Drone Talk", 1)
+	add_language("Drone", 1)
 
 	if(camera && "Robots" in camera.network)
 		camera.network.Add("Engineering")
@@ -284,7 +287,7 @@
 	full_law_reset()
 	to_chat(src, "<br><b>You are a maintenance drone, a tiny-brained robotic repair machine</b>.")
 	to_chat(src, "You have no individual will, no personality, and no drives or urges other than your laws.")
-	to_chat(src, "Use <b>;</b> to talk to other drones, and <b>say</b> to speak silently to your nearby fellows.")
+	to_chat(src, "Use <b>:d</b> to talk to other drones, and <b>say</b> to speak silently in a language only your fellows understand.")
 	to_chat(src, "Remember, you are <b>lawed against interference with the crew</b>. Also remember, <b>you DO NOT take orders from the AI.</b>")
 	to_chat(src, "<b>Don't invade their worksites, don't steal their resources, don't tell them about the changeling in the toilets.</b>")
 	to_chat(src, "<b>Make sure crew members do not notice you.</b>.")
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_say.dm b/code/modules/mob/living/silicon/robot/drone/drone_say.dm
index 5d00d45f97c..0a98e276c43 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_say.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_say.dm
@@ -1,43 +1,11 @@
-/mob/living/silicon/robot/drone/say(var/message)
-	if(local_transmit)
-		if(src.client)
-			if(client.prefs.muted & MUTE_IC)
-				to_chat(src, "You cannot send IC messages (muted).")
-				return 0
-			if(src.client.handle_spam_prevention(message,MUTE_IC))
-				return 0
-
-		message = sanitize(message)
-
-		if(stat == 2)
-			return say_dead(message)
-
-		if(copytext(message,1,2) == "*")
-			return emote(copytext(message,2))
-
-		if(copytext(message,1,2) == ";")
-			var/datum/language/L = all_languages["Drone Talk"]
-			if(istype(L))
-				return L.broadcast(src,trim(copytext(message,2)))
-
-		//Must be concious to speak
-		if(stat)
-			return 0
-
-		var/list/listeners = hearers(5,src)
-		listeners |= src
-
-		for(var/mob/living/silicon/D in listeners)
-			if(D.client && D.local_transmit)
-				to_chat(D, "<b>[src]</b> transmits, \"[message]\"")
-
-		for(var/mob/M in player_list)
-			if(istype(M, /mob/new_player))
-				continue
-			else if(M.stat == 2 && M.client && M.client.prefs.toggles & CHAT_GHOSTEARS)
-				to_chat(M, "<b>[src]</b> transmits, \"[message]\"")
-		return 1
-	return ..(message, 0)
+/mob/living/silicon/robot/drone/say(var/message, var/datum/language/speaking = null)			
+	if(!speaking)
+		speaking = parse_language(message)
+		if(!speaking)
+			speaking = istype(get_default_language(), /datum/language) ? get_default_language() : all_languages[get_default_language()]
+			message = speaking.key + " " + message; // Prepend key to prevent the message from getting trimmed
+	if(speaking)
+		return ..()
 
 /mob/living/silicon/robot/drone/whisper_say(var/message, var/datum/language/speaking = null, var/alt_name="", var/verb="whispers")
 	say(message) //drones do not get to whisper, only speak normally
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index fcc5c5dcbdd..75bbec89a1b 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -32,7 +32,6 @@
 	var/sec_hud = DATA_HUD_SECURITY_ADVANCED //Determines the sec hud to use
 	var/d_hud = DATA_HUD_DIAGNOSTIC //There is only one kind of diag hud
 
-	var/local_transmit //If set, can only speak to others of the same type within a short range.
 	var/obj/item/device/radio/common_radio
 
 /mob/living/silicon/New()

From 92bc8350ad00f462e01b2f258e8685b8eee1a850 Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Mon, 10 Oct 2016 23:54:16 +0200
Subject: [PATCH 43/52] Handle Drone radio

---
 code/modules/mob/living/silicon/robot/drone/drone.dm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index 76dadd6533a..0e354b4c4a6 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -43,6 +43,10 @@
 	remove_language("Galactic Common")
 	add_language("Drone Talk", 1)
 	add_language("Drone", 1)
+	
+	// Disable the microphone wire on Drones
+	if(radio)
+		radio.wires.CutWireIndex(WIRE_TRANSMIT)
 
 	if(camera && "Robots" in camera.network)
 		camera.network.Add("Engineering")

From 0ad84c1ca19500e8dee932b453e976e1116f1090 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <leonardo.o.costa7+GITBOT@gmail.com>
Date: Mon, 10 Oct 2016 20:18:25 -0400
Subject: [PATCH 44/52] Automatic changelog generation for PR #5755

---
 html/changelogs/AutoChangeLog-pr-5755.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5755.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5755.yml b/html/changelogs/AutoChangeLog-pr-5755.yml
new file mode 100644
index 00000000000..d1d10015a82
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5755.yml
@@ -0,0 +1,4 @@
+author: Fox McCloud
+delete-after: True
+changes: 
+  - bugfix: "Fixes items being in two locations at once when loading things into the bio-generator or reagent grinder."

From ecbc140033a0a8114b4ffba81c7f6b19ce594556 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <leonardo.o.costa7+GITBOT@gmail.com>
Date: Mon, 10 Oct 2016 20:38:09 -0400
Subject: [PATCH 45/52] Automatic changelog generation for PR #5685

---
 html/changelogs/AutoChangeLog-pr-5685.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5685.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5685.yml b/html/changelogs/AutoChangeLog-pr-5685.yml
new file mode 100644
index 00000000000..0fdc18d2454
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5685.yml
@@ -0,0 +1,4 @@
+author: Fox McCloud
+delete-after: True
+changes: 
+  - bugfix: "Fixes various ghost alerts having barely visible icons"

From 729d33d0d32680656bbf600839234694792f5dbd Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <leonardo.o.costa7+GITBOT@gmail.com>
Date: Mon, 10 Oct 2016 20:44:25 -0400
Subject: [PATCH 46/52] Automatic changelog generation for PR #5679

---
 html/changelogs/AutoChangeLog-pr-5679.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5679.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5679.yml b/html/changelogs/AutoChangeLog-pr-5679.yml
new file mode 100644
index 00000000000..9292e91fee9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5679.yml
@@ -0,0 +1,4 @@
+author: Crazylemon64
+delete-after: True
+changes: 
+  - bugfix: "The R&D console should now no longer freeze on the \"Syncing Database\" message or whatever."

From 54cb5f7749079a46c3fdd3cfca9f4230ba5e749f Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <leonardo.o.costa7+GITBOT@gmail.com>
Date: Mon, 10 Oct 2016 20:53:11 -0400
Subject: [PATCH 47/52] Automatic changelog generation for PR #5649

---
 html/changelogs/AutoChangeLog-pr-5649.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5649.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5649.yml b/html/changelogs/AutoChangeLog-pr-5649.yml
new file mode 100644
index 00000000000..5dddb44c4c3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5649.yml
@@ -0,0 +1,4 @@
+author: Fox McCloud
+delete-after: True
+changes: 
+  - rscadd: "Mice now have sprites when worn"

From 5219268adce6716689602333add377879d3ce47e Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <leonardo.o.costa7+GITBOT@gmail.com>
Date: Mon, 10 Oct 2016 20:54:25 -0400
Subject: [PATCH 48/52] Automatic changelog generation for PR #5646

---
 html/changelogs/AutoChangeLog-pr-5646.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5646.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5646.yml b/html/changelogs/AutoChangeLog-pr-5646.yml
new file mode 100644
index 00000000000..022b08350f1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5646.yml
@@ -0,0 +1,4 @@
+author: Fox McCloud
+delete-after: True
+changes: 
+  - tweak: "Atmos grenades cost increased from 6 to 11"

From 4df07bd3c3262aa53fc9413d00e002f95074c1cb Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Tue, 11 Oct 2016 11:51:59 -0400
Subject: [PATCH 49/52] Power Gloves Sound Fix

---
 code/_onclick/click_override.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm
index d37b7368b8f..df5cc6a4214 100644
--- a/code/_onclick/click_override.dm
+++ b/code/_onclick/click_override.dm
@@ -62,7 +62,7 @@
 		to_chat(user, "<span class='warning'>There is no cable here to power the gloves.</span>")
 		return
 	user.visible_message("<span class='warning'>[user.name] fires an arc of electricity at [L]!</span>", "<span class='warning'>You fire an arc of electricity at [L]!</span>", "You hear the loud crackle of electricity!")
-	var/datum/powernet/PN = C.get_powernet()
+	playsound(user.loc, 'sound/effects/eleczap.ogg', 75, 1)
 	user.Beam(L,icon_state="lightning[rand(1,12)]",icon='icons/effects/effects.dmi',time=5)
-	electrocute_mob(L, PN, user)
+	electrocute_mob(L, C, user)
 	last_shocked = world.time

From 88e283cb6dcd3029bb1ff45cc8034761c52d786b Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <leonardo.o.costa7+GITBOT@gmail.com>
Date: Tue, 11 Oct 2016 16:51:40 -0400
Subject: [PATCH 50/52] Automatic changelog generation for PR #5581

---
 html/changelogs/AutoChangeLog-pr-5581.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5581.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5581.yml b/html/changelogs/AutoChangeLog-pr-5581.yml
new file mode 100644
index 00000000000..f79c2493863
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5581.yml
@@ -0,0 +1,6 @@
+author: Fox McCloud
+delete-after: True
+changes: 
+  - tweak: "Cloners will now put you inside the cloned body when it is fully grown as opposed to initially created"
+  - tweak: "Examining a cloner will tell you the clone progress"
+  - rscadd: "Observers can now see a visual countdown of the cloning status progression"

From 1d900c4cbece2516f89d32eb11c835db5d1042a8 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <leonardo.o.costa7+GITBOT@gmail.com>
Date: Tue, 11 Oct 2016 20:27:51 -0400
Subject: [PATCH 51/52] Automatic changelog generation for PR #5644

---
 html/changelogs/AutoChangeLog-pr-5644.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-5644.yml

diff --git a/html/changelogs/AutoChangeLog-pr-5644.yml b/html/changelogs/AutoChangeLog-pr-5644.yml
new file mode 100644
index 00000000000..f336a56d07a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5644.yml
@@ -0,0 +1,4 @@
+author: GeneralChaos81
+delete-after: True
+changes: 
+  - rscadd: "Ability to place and remove conveyor belts and levers."

From 15684d4850a20996f3667c68b4a2d8d0f65d1149 Mon Sep 17 00:00:00 2001
From: FlattestGuitar <mieszko335@gmail.com>
Date: Wed, 12 Oct 2016 23:07:01 +0200
Subject: [PATCH 52/52] Only bullets now

---
 code/modules/projectiles/projectile/bullets.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 88d5946742a..0ae9b10752e 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -9,6 +9,7 @@
 	hitsound_wall = "ricochet"
 
 /obj/item/projectile/bullet/weakbullet //beanbag, heavy stamina damage
+	name = "beanbag slug"
 	damage = 5
 	stamina = 80
 
@@ -37,6 +38,7 @@
 			A.volume += 5 //Because we can
 
 /obj/item/projectile/bullet/weakbullet2  //detective revolver instastuns, but multiple shots are better for keeping punks down
+	name = "rubber bullet"
 	damage = 5
 	weaken = 3
 	stamina = 60
@@ -130,6 +132,7 @@
 	damage = 35
 
 /obj/item/projectile/bullet/rpellet
+	name = "rubber pellet"
 	damage = 3
 	stamina = 25