Merge branch 'master' into upstream-merge-26760

code/game/mecha/equipment/weapons/weapons.dm

@@ -107,7 +107,7 @@
 	icon_state = "mecha_ion"
 	origin_tech = "materials=4;engineering=4;combat=6;magnets=6"
 	energy_drain = 500
-	projectile = /obj/item/projectile/energy/tesla_cannon
+	projectile = /obj/item/projectile/energy/tesla/cannon
 	fire_sound = 'sound/magic/lightningbolt.ogg'
 
 

code/game/mecha/mecha_construction_paths.dm

@@ -277,7 +277,7 @@
 
 /datum/construction/reversible/mecha/ripley/spawn_result()
 	..()
-	feedback_inc("mecha_ripley_created",1)
+	SSblackbox.inc("mecha_ripley_created",1)
 	return
 
 
@@ -564,7 +564,7 @@
 	var/obj/mecha/combat/gygax/M = new result(get_turf(holder))
 	M.CheckParts(holder.contents)
 	qdel(holder)
-	feedback_inc("mecha_gygax_created",1)
+	SSblackbox.inc("mecha_gygax_created",1)
 	return
 
 /datum/construction/mecha/firefighter_chassis
@@ -786,7 +786,7 @@
 
 /datum/construction/reversible/mecha/firefighter/spawn_result()
 	..()
-	feedback_inc("mecha_firefighter_created",1)
+	SSblackbox.inc("mecha_firefighter_created",1)
 	return
 
 
@@ -864,7 +864,7 @@
 
 /datum/construction/mecha/honker/spawn_result()
 	..()
-	feedback_inc("mecha_honker_created",1)
+	SSblackbox.inc("mecha_honker_created",1)
 	return
 
 /datum/construction/mecha/durand_chassis
@@ -1149,7 +1149,7 @@
 	var/obj/mecha/combat/gygax/M = new result(get_turf(holder))
 	M.CheckParts(holder.contents)
 	qdel(holder)
-	feedback_inc("mecha_durand_created",1)
+	SSblackbox.inc("mecha_durand_created",1)
 	return
 
 //PHAZON
@@ -1481,7 +1481,7 @@
 	var/obj/mecha/combat/gygax/M = new result(get_turf(holder))
 	M.CheckParts(holder.contents)
 	qdel(holder)
-	feedback_inc("mecha_phazon_created",1)
+	SSblackbox.inc("mecha_phazon_created",1)
 	return
 
 //ODYSSEUS
@@ -1692,5 +1692,5 @@
 
 /datum/construction/reversible/mecha/odysseus/spawn_result()
 	..()
-	feedback_inc("mecha_odysseus_created",1)
+	SSblackbox.inc("mecha_odysseus_created",1)
 	return