Merge pull request #37549 from ShizCalev/bounce_away-fixes

Resolved var name conflict for bounce_away()
2018-04-30 13:52:52 -04:00
parent 7205a15ef7
commit a9d452a24d
15 changed files with 37 additions and 36 deletions
@@ -474,3 +474,4 @@ GLOBAL_DATUM_INIT(_preloader, /dmm_suite/preloader, new)
 /turf/template_noop
 	name = "Turf Passthrough"
 	icon_state = "noop"
+	bullet_bounce_sound = null