Merge branch 'master' into mapsyncs43293845982

2018-01-07 20:23:00 +00:00
parent ca058b1266 cc0cb03046
commit d2ec28b1e6
29 changed files with 207 additions and 153 deletions
@@ -94,6 +94,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 	update_icon()

 /obj/item/device/pda/equipped(mob/user, slot)
+	. = ..()
 	if(!equipped)
 		if(user.client)
 			background_color = user.client.prefs.pda_color