Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

Conflicts:
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm

code/modules/projectiles/gun.dm

@@ -15,6 +15,9 @@
 
 	for(var/propname in properties)
 		var/propvalue = properties[propname]
+		
+		if(propname == "mode_name")
+			name = propvalue
 		if(isnull(propvalue))
 			settings[propname] = gun.vars[propname] //better than initial() as it handles list vars like burst_accuracy
 		else