and finally, the modules folder. Now I can publish and take a break

code/modules/mob/living/silicon/ai/ai.dm

@@ -124,7 +124,7 @@
 	job = "AI"
 
 	create_eye()
-	rename_self("ai")
+	apply_pref_name("ai")
 
 	holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"default"))
 
@@ -824,7 +824,7 @@
 		//apc_override is needed here because AIs use their own APC when depowered
 		return (GLOB.cameranet && GLOB.cameranet.checkTurfVis(get_turf_pixel(A))) || apc_override
 	//AI is carded/shunted
-	//view(src) returns nothing for carded/shunted AIs and they have x-ray vision so just use get_dist
+	//view(src) returns nothing for carded/shunted AIs and they have X-ray vision so just use get_dist
 	var/list/viewscale = getviewsize(client.view)
 	return get_dist(src, A) <= max(viewscale[1]*0.5,viewscale[2]*0.5)
 

code/modules/mob/living/silicon/pai/pai.dm

@@ -236,7 +236,7 @@
 		P.fold_out()
 
 /datum/action/innate/pai/chassis
-	name = "Holochassis Appearence Composite"
+	name = "Holochassis Appearance Composite"
 	button_icon_state = "pai_chassis"
 	background_icon_state = "bg_tech"
 

code/modules/mob/living/silicon/pai/pai_shell.dm

@@ -116,6 +116,6 @@
 
 /mob/living/silicon/pai/mob_try_pickup(mob/living/user)
 	if(!possible_chassis[chassis])
-		to_chat(user, "<span class='wraning'>[src]'s current form isn't able to be carried!</span>")
+		to_chat(user, "<span class='warning'>[src]'s current form isn't able to be carried!</span>")
 		return FALSE
 	return ..()

code/modules/mob/living/silicon/pai/software.dm

@@ -209,7 +209,7 @@
 					pda.silent = !pda.silent
 				else if(href_list["target"])
 					if(silent)
-						return alert("Communications circuits remain unitialized.")
+						return alert("Communications circuits remain uninitialized.")
 
 					var/target = locate(href_list["target"])
 					pda.create_message(src, target)

code/modules/mob/living/silicon/robot/inventory.dm

@@ -16,7 +16,6 @@
 		sight_mode &= ~S.sight_mode
 		update_sight()
 	else if(istype(O, /obj/item/storage/bag/tray/))
-		O.SendSignal(COMSIG_TRY_STORAGE_QUICK_EMPTY)
 	//CITADEL EDIT reee proc, Dogborg modules
 	if(istype(O,/obj/item/gun/energy/laser/cyborg))
 		laser = FALSE
@@ -31,15 +30,10 @@
 		var/obj/item/dogborg/sleeper/S = O
 		S.go_out() //this should stop edgecase deletions
 	//END CITADEL EDIT
+		SEND_SIGNAL(O, COMSIG_TRY_STORAGE_QUICK_EMPTY)
 	if(client)
 		client.screen -= O
 	observer_screen_update(O,FALSE)
-	O.forceMove(module) //Return item to module so it appears in its contents, so it can be taken out again.
-
-	if(O.flags_1 & DROPDEL_1)
-		O.flags_1 &= ~DROPDEL_1 //we shouldn't HAVE things with DROPDEL_1 in our modules, but better safe than runtiming horribly
-
-	O.dropped(src)
 
 	if(module_active == O)
 		module_active = null
@@ -52,6 +46,12 @@
 	else if(held_items[3] == O)
 		inv3.icon_state = "inv3"
 		held_items[3] = null
+
+	if(O.item_flags & DROPDEL)
+		O.item_flags &= ~DROPDEL //we shouldn't HAVE things with DROPDEL_1 in our modules, but better safe than runtiming horribly
+
+	O.forceMove(module) //Return item to module so it appears in its contents, so it can be taken out again.
+
 	hud_used.update_robot_modules_display()
 	return 1
 

code/modules/mob/living/silicon/robot/robot.dm

@@ -238,15 +238,17 @@
 	module.transform_to(modulelist[input_module])
 
 
-/mob/living/silicon/robot/proc/updatename()
+/mob/living/silicon/robot/proc/updatename(client/C)
 	if(shell)
 		return
+	if(!C)
+		C = client
 	var/changed_name = ""
 	if(custom_name)
 		changed_name = custom_name
-	if(changed_name == "" && client)
-		rename_self(src, client)
-		return //built in camera handled in proc
+	if(changed_name == "" && C && C.prefs.custom_names["cyborg"] != DEFAULT_CYBORG_NAME)
+		if(apply_pref_name("cyborg", C))
+			return //built in camera handled in proc
 	if(!changed_name)
 		changed_name = get_standard_name()
 
@@ -388,12 +390,8 @@
 			to_chat(user, "<span class='notice'>You start fixing yourself...</span>")
 			if(!W.use_tool(src, user, 50))
 				return
-			adjustBruteLoss(-10)
-		else
-			to_chat(user, "<span class='notice'>You start fixing [src]...</span>")
-			if(!do_after(user, 30, target = src))
-				return
-			adjustBruteLoss(-30)
+
+		adjustBruteLoss(-30)
 		updatehealth()
 		add_fingerprint(user)
 		visible_message("<span class='notice'>[user] has fixed some of the dents on [src].</span>")

code/modules/mob/living/silicon/robot/robot_defense.dm

@@ -47,7 +47,7 @@
 		damage = rand(20, 40)
 	else
 		damage = rand(5, 35)
-	damage = round(damage / 2) // borgs recieve half damage
+	damage = round(damage / 2) // borgs receive half damage
 	adjustBruteLoss(damage)
 	updatehealth()
 

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -119,7 +119,7 @@
 	if(I.loc != src)
 		I.forceMove(src)
 	modules += I
-	I.flags_1 |= NODROP_1
+	I.item_flags |= NODROP
 	I.mouse_opacity = MOUSE_OPACITY_OPAQUE
 	if(nonstandard)
 		added_modules += I

code/modules/mob/living/silicon/silicon.dm

@@ -405,4 +405,7 @@
 	return 1
 
 /mob/living/silicon/get_inactive_held_item()
-	return FALSE
+	return FALSE
+
+/mob/living/silicon/handle_high_gravity(gravity)
+	return