Merge pull request #37549 from ShizCalev/bounce_away-fixes

Resolved var name conflict for bounce_away()

code/modules/holodeck/turfs.dm

@@ -27,11 +27,13 @@
 	gender = PLURAL
 	name = "lush grass"
 	icon_state = "grass"
+	bullet_bounce_sound = null
 
 /turf/open/floor/holofloor/beach
 	name = "sand"
 	icon = 'icons/misc/beach.dmi'
 	icon_state = "sand"
+	bullet_bounce_sound = null
 
 /turf/open/floor/holofloor/beach/coast_t
 	name = "coastline"
@@ -44,6 +46,7 @@
 /turf/open/floor/holofloor/beach/water
 	name = "water"
 	icon_state = "water"
+	bullet_sizzle = TRUE
 
 /turf/open/floor/holofloor/asteroid
 	name = "asteroid"
@@ -76,6 +79,7 @@
 	name = "hyperspace"
 	icon = 'icons/turf/space.dmi'
 	icon_state = "speedspace_ns_1"
+	bullet_bounce_sound = null
 
 /turf/open/floor/holofloor/hyperspace/Initialize()
 	icon_state = "speedspace_ns_[(x + 5*y + (y%2+1)*7)%15+1]"
@@ -93,6 +97,7 @@
 	floor_tile = /obj/item/stack/tile/carpet
 	smooth = SMOOTH_TRUE
 	canSmoothWith = null
+	bullet_bounce_sound = null
 
 /turf/open/floor/holofloor/carpet/Initialize()
 	. = ..()
@@ -110,6 +115,8 @@
 	icon = 'icons/turf/snow.dmi'
 	icon_state = "snow"
 	slowdown = 2
+	bullet_sizzle = TRUE
+	bullet_bounce_sound = null
 
 /turf/open/floor/holofloor/snow/cold
 	initial_gas_mix = "nob=7500;TEMP=2.7"