Merge conflicts begone

code/modules/admin/admin_verbs.dm

@@ -113,7 +113,8 @@ var/list/admin_verbs_event = list(
 
 var/list/admin_verbs_spawn = list(
 	/datum/admins/proc/spawn_atom,		/*allows us to spawn instances*/
-	/client/proc/respawn_character
+	/client/proc/respawn_character,
+	/client/proc/admin_deserialize
 	)
 var/list/admin_verbs_server = list(
 	/client/proc/ToRban,
@@ -161,7 +162,9 @@ var/list/admin_verbs_debug = list(
 	/proc/machine_upgrade,
 	/client/proc/map_template_load,
 	/client/proc/map_template_upload,
-	/client/proc/view_runtimes
+	/client/proc/view_runtimes,
+	/client/proc/admin_serialize,
+	/client/proc/admin_deserialize
 	)
 var/list/admin_verbs_possess = list(
 	/proc/possess,

code/modules/admin/verbs/serialization.dm

@@ -0,0 +1,26 @@
+/client/proc/admin_serialize()
+	set name = "Serialize Marked Datum"
+	set desc = "Turns your marked object into a JSON string you can later use to re-create the object"
+	set category = "Debug"
+
+	if(!check_rights(R_ADMIN))
+		return
+
+	if(!istype(holder.marked_datum, /atom/movable))
+		to_chat(src, "The marked datum is not an atom/movable!")
+		return
+
+	var/atom/movable/AM = holder.marked_datum
+	to_chat(src, json_encode(AM.serialize()))
+
+/client/proc/admin_deserialize()
+	set name = "Deserialize JSON datum"
+	set desc = "Creates an object from a JSON string"
+	set category = "Debug"
+
+	if(!check_rights(R_ADMIN|R_DEBUG))
+		return
+
+	var/json_text = input("Enter the JSON code:","Text") as message|null
+	if(json_text)
+		json_to_object(json_text, get_turf(usr))