Manual icon file merge.

code/_onclick/click.dm

@@ -116,7 +116,7 @@
 			if(!resolved && A && W)
 				W.afterattack(A,src,1,params) // 1 indicates adjacency
 		else
-			UnarmedAttack(A)
+			UnarmedAttack(A, 1)
 		return
 
 	if(!isturf(loc)) // This is going to stop you from telekinesing from inside a closet, but I don't shed many tears for that

code/game/dna/genes/disabilities.dm

@@ -32,7 +32,7 @@
 		M.mutations.Add(mutation)
 	if(disability)
 		M.disabilities|=disability
-	if(mutation)
+	if(sdisability)
 		M.sdisabilities|=sdisability
 	if(activation_message)
 		M << "\red [activation_message]"
@@ -43,9 +43,9 @@
 	if(mutation && (mutation in M.mutations))
 		M.mutations.Remove(mutation)
 	if(disability)
-		M.disabilities-=disability
-	if(mutation)
-		M.sdisabilities-=sdisability
+		M.disabilities &= (~disability)
+	if(sdisability)
+		M.sdisabilities &= (~sdisability)
 	if(deactivation_message)
 		M << "\red [deactivation_message]"
 	else

code/modules/admin/verbs/vox_raiders.dm

@@ -14,7 +14,7 @@ var/global/vox_tick = 1
 		if(1) // Vox raider!
 			equip_to_slot_or_del(new /obj/item/clothing/suit/space/vox/carapace(src), slot_wear_suit)
 			equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/vox/carapace(src), slot_head)
-			equip_to_slot_or_del(new /obj/item/weapon/melee/telebaton(src), slot_belt)
+			equip_to_slot_or_del(new /obj/item/weapon/melee/baton/loaded(src), slot_belt)
 			equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(src), slot_glasses) // REPLACE WITH CODED VOX ALTERNATIVE.
 			equip_to_slot_or_del(new /obj/item/device/chameleon(src), slot_l_store)
 
@@ -66,4 +66,4 @@ var/global/vox_tick = 1
 	vox_tick++
 	if (vox_tick > 4) vox_tick = 1
 
-	return 1
+	return 1

code/modules/customitems/item_defines.dm

@@ -1005,8 +1005,9 @@
 	desc = "A well maintained uniform from one of the many Private Security firms Nanotrasen hires from. The name Harper is printed on the back."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "harper_uniform"
-	item_state = "harper_uniform"
+	item_state = "jensensuit"
 	item_color = "harper_uniform"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
 
 //////////////////// Layla's Dress - Layla Davies-Halabi - sabirm ///////////////
 

code/modules/mob/dead/observer/observer.dm

@@ -179,6 +179,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 
 /mob/dead/observer/Move(NewLoc, direct)
+	following = null
 	dir = direct
 	if(NewLoc)
 		loc = NewLoc
@@ -306,6 +307,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		usr << "No area available."
 
 	usr.loc = pick(L)
+	following = null
 
 /mob/dead/observer/verb/follow()
 	set category = "Ghost"
@@ -325,18 +327,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		following = target
 		src << "\blue Now following [target]"
 		spawn(0)
-			var/turf/pos = get_turf(src)
-			while(loc == pos && target && following == target && client)
+			while(target && following == target && client)
 				var/turf/T = get_turf(target)
 				if(!T)
 					break
 				// To stop the ghost flickering.
 				if(loc != T)
 					loc = T
-				pos = loc
 				sleep(15)
-			following = null
-
 
 /mob/dead/observer/verb/jumptomob() //Moves the ghost instead of just changing the ghosts's eye -Nodrak
 	set category = "Ghost"
@@ -361,6 +359,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 			if(T && isturf(T))	//Make sure the turf exists, then move the source to that destination.
 				A.loc = T
+				following = null
 			else
 				A << "This mob is not located in the game world."
 /*

code/modules/paperwork/silicon_photography.dm

@@ -66,13 +66,13 @@
 	// TG uses a special garbage collector.. qdel(P)
 	del(P) //so 10 thousand pictures items are not left in memory should an AI take them and then view them all.
 
-/obj/item/device/camera/siliconcam/proc/deletepicture(obj/item/device/camera/siliconcam/cam)
-	var/datum/picture/selection = selectpicture(cam)
+/obj/item/device/camera/siliconcam/proc/deletepicture()
+	var/datum/picture/selection = selectpicture()
 
 	if(!selection)
 		return
 
-	cam.aipictures -= selection
+	aipictures -= selection
 	usr << "<span class='unconscious'>Image deleted</span>"
 
 /obj/item/device/camera/siliconcam/ai_camera/can_capture_turf(turf/T, mob/user)
@@ -147,7 +147,12 @@
 	set src in usr
 
 	// Explicitly only allow deletion from the local camera
-	deletepicture(src)
+	var/mob/living/silicon/robot/C = src.loc
+	if(C.connected_ai)
+		C << "Not allowed to delete from the remote database."
+		return
+
+	deletepicture()
 
 obj/item/device/camera/siliconcam/proc/getsource()
 	if(istype(src.loc, /mob/living/silicon/ai))

code/modules/recycling/disposal-construction.dm

@@ -234,7 +234,7 @@
 							user << "There is already a [nicetype] at that location."
 							return
 
-					anchored = 1
+				anchored = 1
 				if(ispipe)
 					level = 1 // We don't want disposal bins to disappear under the floors
 					density = 0