Removes duplicate typecaches

2017-10-23 09:24:41 -04:00
parent 095839becf
commit c51edc3bcd
15 changed files with 48 additions and 50 deletions
@@ -26,8 +26,11 @@
 	else
 		GLOB.living_mob_list += src
 	prepare_huds()
+<<<<<<< HEAD
 	can_ride_typecache = typecacheof(can_ride_typecache)
 	hook_vr("mob_new",list(src))
+=======
+>>>>>>> 8e434b7... Removes duplicate typecaches (#31883)
 	for(var/v in GLOB.active_alternate_appearances)
 		if(!v)
 			continue