Merge remote-tracking branch 'upstream/master' into kansatsu_remap

_maps/configs/syndicate_panacea.json

@@ -3,6 +3,7 @@
 	"map_name": "Panacea-class Infirm Vessel",
 	"map_short_name": "Panacea-class",
 	"map_path": "_maps/shuttles/syndicate/syndicate_panacea.dmm",
+	"faction": "/datum/faction/syndicate/suns",
 	"description": "Shortly after Solcon breached the Oort Cloud, SUNS joined into the Syndicate Coalition. Holding close ties to both the ACLF and GEC, students jumped at the opportunity to see the rest of the galaxy. The Panacea-class was the first of its kind out of Sol, moving typically planetside inpatient care to a space vessel and jumping system to system. The Panacea class is a moderately well supplied ship, allowing for emergency pharmaceutical compounding, mental and physical therapy, and general medical work, while doubling as a student run vessel.",
 	"tags": [
 		"Generalist",

_maps/map_files/generic/CentCom.dmm

@@ -154,7 +154,7 @@
 /turf/open/floor/plating,
 /area/ctf)
 "agI" = (
-/obj/machinery/power/emitter/energycannon{
+/obj/machinery/power/emitter/energycannon/ctf{
 	active = 0
 	},
 /turf/open/floor/plating,
@@ -163,7 +163,7 @@
 /turf/open/floor/plating,
 /area/ctf)
 "aha" = (
-/obj/machinery/power/emitter/energycannon{
+/obj/machinery/power/emitter/energycannon/ctf{
 	active = 0;
 	dir = 1
 	},