Merge remote-tracking branch 'citadel/master' into combat_rework_experimental

2020-10-10 22:23:22 -07:00
parent 1b1efce556 376f59c8cd
commit 7f611a98e1
215 changed files with 7532 additions and 2391 deletions
@@ -374,7 +374,7 @@
 	inaccuracy_modifier = 0.5
 	zoomable = TRUE
 	zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you.
-	zoom_out_amt = 13
+	zoom_out_amt = 5
 	slot_flags = ITEM_SLOT_BACK
 	automatic_burst_overlay = FALSE
 	actions_types = list()