Merge branch 'master' into development

code/modules/cciaa/cciaa_items.dm

@@ -256,7 +256,7 @@
 
 /obj/item/device/radio/headset/ert/ccia
 	name = "central command internal affairs radio headset"
-	ks2type = /obj/item/device/encryptionkey/ert
+	ks2type = /obj/item/device/encryptionkey/ccia
 
 /obj/item/device/encryptionkey/ccia
 	name = "\improper CCIA radio encryption key"

code/modules/mob/living/simple_animal/hostile/mimic.dm

@@ -153,11 +153,8 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
 
 	if((istype(O, /obj/item) || istype(O, /obj/structure)) && !is_type_in_list(O, protected_objects))
 
-		O.loc = src
-		name = O.name
-		desc = O.desc
-		icon = O.icon
-		icon_state = O.icon_state
+		O.forceMove(src)
+		appearance = O
 		icon_living = icon_state
 
 		if(istype(O, /obj/structure))
@@ -192,4 +189,4 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
 		if(istype(L))
 			if(prob(15))
 				L.Weaken(1)
-				L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>")
+				L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>")

code/modules/vehicles/bike.dm

@@ -51,12 +51,12 @@
 	if(usr.incapacitated()) return
 
 	if(kickstand)
-		src.visible_message("You put up \the [src]'s kickstand.")
+		src.visible_message("\The [usr] puts up \the [src]'s kickstand.", "You put up \the [src]'s kickstand.", "You hear a thunk.")
 	else
 		if(istype(src.loc,/turf/space))
 			usr << "<span class='warning'> You don't think kickstands work in space...</span>"
 			return
-		src.visible_message("You put down \the [src]'s kickstand.")
+		src.visible_message("\The [usr] puts down \the [src]'s kickstand.", "You put down \the [src]'s kickstand.", "You hear a thunk.")
 		if(pulledby)
 			pulledby.stop_pulling()