Manipulator

code/__DEFINES/mob.dm

@@ -93,6 +93,7 @@
 #define SKELETON_VOX	 "Skeleton Vox"
 #define SHADOWLING     	 "Shadowling"
 #define GOLEM          	 "Adamantine Golem"
+#define BLUESPACE        "Bluespace Being"
 #define HOMUNCULUS     	 "Homunculus"
 #define ZOMBIE         	 "Zombie"
 #define ZOMBIE_TAJARAN 	 "Zombie Tajaran"

code/_onclick/ai.dm

@@ -10,7 +10,7 @@
 	Note that AI have no need for the adjacency proc, and so this proc is a lot cleaner.
 */
 /mob/living/silicon/ai/DblClickOn(atom/A, params)
-	if(client.click_intercept) // handled in normal click.
+	if(client && client.click_intercept) // handled in normal click.
 		return
 
 	if(control_disabled || stat != CONSCIOUS) return

code/_onclick/click.dm

@@ -60,13 +60,13 @@
 	if(notransform)
 		return
 
-	if(client.click_intercept)
+	if(client && client.click_intercept)
 		client.click_intercept.InterceptClickOn(src, params, A)
 		return
 
 	var/list/modifiers = params2list(params)
 
-	if(client.cob && client.cob.in_building_mode)
+	if(client && client.cob && client.cob.in_building_mode)
 		cob_click(client, modifiers)
 		return
 
@@ -312,7 +312,8 @@
 			user.listed_turf = null
 		else
 			user.listed_turf = T
-			user.client.statpanel = T.name
+			if(user.client)
+				user.client.statpanel = T.name
 
 /mob/living/AltClick(mob/living/user)
 	/*

code/_onclick/cyborg.dm

@@ -11,13 +11,13 @@
 		return
 	next_click = world.time + 1
 
-	if(client.click_intercept) // comes after object.Click to allow buildmode gui objects to be clicked
+	if(client && client.click_intercept) // comes after object.Click to allow buildmode gui objects to be clicked
 		client.click_intercept.InterceptClickOn(src, params, A)
 		return
 
 	var/list/modifiers = params2list(params)
 
-	if(client.cob.in_building_mode)
+	if(client && client.cob.in_building_mode)
 		cob_click(client, modifiers)
 		return
 

code/datums/browser.dm

@@ -17,6 +17,10 @@
 		var/mob/M = nuser
 		nuser = M.client
 
+	if(!nuser)
+		qdel(src)
+		return
+
 	user = nuser
 	LAZYSET(user.browsers, nwindow_id, src)
 	window_id = nwindow_id
@@ -92,6 +96,9 @@
 </html>"}
 
 /datum/browser/proc/open()
+	if(!user)
+		return
+
 	var/window_size
 	if(width && height)
 		window_size = "size=[width]x[height];"

code/datums/wires/_wires.dm

@@ -346,6 +346,13 @@ var/global/list/wire_daltonism_colors = list()
 	else
 		CRASH("[color] is not a key in wires.")
 
+/datum/wires/proc/get_color_by_index(index)
+	for(var/col in wires)
+		var/other_index = wires[col]
+		if(index == other_index)
+			return col
+
+	CRASH("[index] is not an index in wires")
 
 ////////////////////////////
 // Is Index/Colour Cut procs

code/datums/wires/manipulator.dm

@@ -0,0 +1,52 @@
+var/global/const/MANIPULATOR_WIRE_ACTIVATE = 1
+var/global/const/MANIPULATOR_WIRE_AFTER_ACTIVATE = 2
+var/global/const/MANIPULATOR_WIRE_CHANGE_TARGET_ZONE = 4
+var/global/const/MANIPULATOR_WIRE_ATTACK_SELF_ON_INTERACTION = 8
+var/global/const/MANIPULATOR_WIRE_AUTO_ACTIVATION = 16
+
+/datum/wires/manipulator
+	holder_type = /obj/machinery/manipulator
+	wire_count = 5
+	window_y = 560
+
+/datum/wires/manipulator/can_use()
+	var/obj/machinery/manipulator/M = holder
+	return M.panel_open
+
+/datum/wires/manipulator/get_status()
+	var/obj/machinery/manipulator/M = holder
+	. += ..()
+	. += "Target selection screen displays: [parse_zone(M.target_zone)]"
+	. += "The 'Activate Instead' light is [M.attack_self_interaction ? "on" : "off"]."
+	. += "The 'Auto Activation' light is [M.auto_activation ? "on" : "off"]."
+
+/datum/wires/manipulator/update_cut(index, mended)
+	var/obj/machinery/manipulator/M = holder
+
+	switch(index)
+		if(MANIPULATOR_WIRE_AUTO_ACTIVATION)
+			M.auto_activation = mended
+			return
+
+		if(MANIPULATOR_WIRE_ATTACK_SELF_ON_INTERACTION)
+			M.attack_self_interaction = !mended
+			return
+
+	update_pulsed(index)
+
+/datum/wires/manipulator/update_pulsed(index)
+	var/obj/machinery/manipulator/M = holder
+
+	switch(index)
+		if(MANIPULATOR_WIRE_ACTIVATE)
+			if(!M.can_activate())
+				return
+
+			M.forced = TRUE
+			M.activate()
+
+		if(MANIPULATOR_WIRE_CHANGE_TARGET_ZONE)
+			M.cycle_target_zone()
+
+		if(MANIPULATOR_WIRE_ATTACK_SELF_ON_INTERACTION)
+			M.next_attack_self_interaction = TRUE

code/game/atoms.dm

@@ -336,6 +336,8 @@
 
 //called to set the atom's dir and used to add behaviour to dir-changes
 /atom/proc/set_dir(new_dir)
+	SHOULD_CALL_PARENT(TRUE)
+
 	. = new_dir != dir
 	dir = new_dir
 	if(.)

code/game/atoms_movable.dm

@@ -459,6 +459,8 @@
 
 /client/var/list/image/outlined_item = list()
 /atom/movable/proc/apply_outline(color)
+	if(!usr || !usr.client)
+		return
 	if(anchored || !usr.client.prefs.outline_enabled)
 		return
 	if(!color)
@@ -479,6 +481,8 @@
 
 
 /atom/movable/proc/remove_outline()
+	if(!usr || !usr.client)
+		return
 	usr.client.images -= usr.client.outlined_item[src]
 	usr.client.outlined_item -= src
 

code/game/machinery/autolathe.dm

@@ -78,6 +78,7 @@ var/global/list/datum/autolathe_recipe/autolathe_recipes = list(
 	R(/obj/item/weapon/storage/pill_bottle,                   CATEGORY_MEDICAL),
 	R(/obj/item/stack/cable_coil/random,             CATEGORY_ENGINEERING),
 	R(/obj/item/weapon/module/power_control,         CATEGORY_ENGINEERING),
+	R(/obj/item/weapon/circuitboard/manipulator,     CATEGORY_ENGINEERING),
 	R(/obj/item/weapon/airlock_electronics,          CATEGORY_ENGINEERING),
 	R(/obj/item/weapon/airalarm_electronics,         CATEGORY_ENGINEERING),
 	R(/obj/item/weapon/firealarm_electronics,        CATEGORY_ENGINEERING),

code/game/machinery/constructable_frame.dm

@@ -123,6 +123,9 @@
 				if(!anchored)
 					to_chat(user, "<span class='warning'>The frame needs to be secured first!</span>")
 					return
+				if(issilicon(user) && istype(P, /obj/item/weapon/circuitboard/manipulator))
+					to_chat(user, "<span class='warning'>Sorry! Automatic protocols preventing AI from becoming too powerful can't allow you to assemble this!</span>")
+					return
 				var/obj/item/weapon/circuitboard/B = P
 				if(B.board_type == "machine")
 					if(!user.drop_from_inventory(P, src))