Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)

2022-04-09 00:03:13 -03:00
parent 586a035132 3d91de2f10
commit 695835fcd6
428 changed files with 8031 additions and 7608 deletions
@@ -3,6 +3,6 @@
 	icon_state = "spark"
 	damage = 0
 	damage_type = BURN
-	flag = "energy"
+	flag = ENERGY
 	is_reflectable = TRUE

@@ -28,3 +28,7 @@
 /obj/item/projectile/energy/tesla/cannon
 	name = "tesla orb"
 	power = 20000
+
+/obj/item/projectile/energy/tesla/sphere
+	name = "tesla sphere"
+	power = 100000