Merge branch 'master' into Projectile_Rework

2022-04-09 04:19:56 +00:00
parent 1b83713f43 3d91de2f10
commit fd286c325e
410 changed files with 7476 additions and 7443 deletions
@@ -42,7 +42,7 @@
 	icon_state = null
 	damage = 50
 	damage_type = BRUTE
-	flag = "bomb"
+	flag = BOMB
 	range = 4
 	log_override = TRUE

@@ -220,7 +220,7 @@
 	icon_state = null
 	damage = 40
 	damage_type = BRUTE
-	flag = "bomb"
+	flag = BOMB
 	range = 3
 	log_override = TRUE