Merge pull request #6595 from Citadel-Station-13/upstream-merge-37549

[MIRROR] Resolved var name conflict for bounce_away()

code/game/turfs/closed.dm

@@ -44,6 +44,7 @@
 	icon = 'icons/blank_title.png'
 	icon_state = ""
 	layer = FLY_LAYER
+	bullet_bounce_sound = null
 
 /turf/closed/indestructible/splashscreen/New()
 	SStitle.splash_turf = src
@@ -102,6 +103,8 @@
 	desc = "An extremely densely-packed rock, sheeted over with centuries worth of ice and snow."
 	icon = 'icons/turf/walls.dmi'
 	icon_state = "snowrock"
+	bullet_sizzle = TRUE
+	bullet_bounce_sound = null
 
 /turf/closed/indestructible/rock/snow/ice
 	name = "iced rock"

code/game/turfs/simulated/chasm.dm

@@ -8,6 +8,7 @@
 	icon_state = "smooth"
 	canSmoothWith = list(/turf/open/floor/fakepit, /turf/open/chasm)
 	density = TRUE //This will prevent hostile mobs from pathing into chasms, while the canpass override will still let it function like an open turf
+	bullet_bounce_sound = null //abandon all hope ye who enter
 
 /turf/open/chasm/Initialize()
 	. = ..()

code/game/turfs/simulated/floor/fancy_floor.dm

@@ -67,6 +67,7 @@
 	floor_tile = /obj/item/stack/tile/grass
 	broken_states = list("sand")
 	flags_1 = NONE
+	bullet_bounce_sound = null
 	var/ore_type = /obj/item/stack/ore/glass
 	var/turfverb = "uproot"
 
@@ -93,6 +94,7 @@
 	floor_tile = null
 	initial_gas_mix = "o2=22;n2=82;TEMP=180"
 	slowdown = 2
+	bullet_sizzle = TRUE
 
 /turf/open/floor/grass/snow/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
 	return
@@ -142,6 +144,7 @@
 	smooth = SMOOTH_TRUE
 	canSmoothWith = list(/turf/open/floor/carpet)
 	flags_1 = NONE
+	bullet_bounce_sound = null
 
 /turf/open/floor/carpet/examine(mob/user)
 	..()

code/game/turfs/simulated/floor/plating/asteroid.dm

@@ -279,6 +279,8 @@
 	planetary_atmos = TRUE
 	archdrops = list(/obj/item/stack/sheet/mineral/snow = list(ARCH_PROB = 100, ARCH_MAXDROP = 5))
 	burnt_states = list("snow_dug")
+	bullet_sizzle = TRUE
+	bullet_bounce_sound = null
 
 /turf/open/floor/plating/asteroid/snow/burn_tile()
 	if(!burnt)

code/game/turfs/simulated/floor/plating/misc_plating.dm

@@ -88,6 +88,7 @@
 	icon = 'icons/misc/beach.dmi'
 	flags_1 = NONE
 	attachment_holes = FALSE
+	bullet_bounce_sound = null
 
 /turf/open/floor/plating/beach/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
 	return
@@ -144,6 +145,7 @@
 	baseturfs = /turf/open/floor/plating/ice
 	slowdown = 1
 	attachment_holes = FALSE
+	bullet_sizzle = TRUE
 
 /turf/open/floor/plating/ice/Initialize()
 	. = ..()

code/game/turfs/simulated/lava.dm

@@ -10,6 +10,7 @@
 	light_range = 2
 	light_power = 0.75
 	light_color = LIGHT_COLOR_LAVA
+	bullet_bounce_sound = 'sound/items/welder2.ogg'
 
 /turf/open/lava/ex_act(severity, target)
 	contents_explosion(severity, target)

code/game/turfs/simulated/reebe_void.dm

@@ -4,6 +4,7 @@
 	layer = SPACE_LAYER
 	baseturfs = /turf/open/indestructible/reebe_void
 	planetary_atmos = TRUE
+	bullet_bounce_sound = null //forever falling
 
 /turf/open/indestructible/reebe_void/Initialize(mapload)
 	. = ..()

code/game/turfs/simulated/wall/mineral_walls.dm

@@ -167,6 +167,8 @@
 	sheet_type = /obj/item/stack/sheet/mineral/snow
 	canSmoothWith = null
 	girder_type = null
+	bullet_sizzle = TRUE
+	bullet_bounce_sound = null
 
 /turf/closed/wall/mineral/abductor
 	name = "alien wall"

code/game/turfs/simulated/wall/misc_walls.dm

@@ -158,6 +158,7 @@
 	canSmoothWith = null
 	hardness = 35
 	slicing_duration = 150 //welding through the ice+metal
+	bullet_sizzle = TRUE
 
 /turf/closed/wall/rust
 	name = "rusted wall"

code/game/turfs/simulated/water.dm

@@ -7,6 +7,8 @@
 	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
 	planetary_atmos = TRUE
 	slowdown = 1
+	bullet_sizzle = TRUE
+	bullet_bounce_sound = null //needs a splashing sound one day.
 
 /turf/open/water/Initialize()
 	. = ..()

code/game/turfs/space/space.dm

@@ -17,6 +17,7 @@
 	layer = SPACE_LAYER
 	light_power = 0.25
 	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
+	bullet_bounce_sound = null
 
 
 /turf/open/space/basic/New()	//Do not convert to Initialize

code/game/turfs/turf.dm

@@ -29,6 +29,10 @@
 	var/requires_activation	//add to air processing after initialize?
 	var/changing_turf = FALSE
 
+	var/bullet_bounce_sound = 'sound/weapons/bulletremove.ogg' //sound played when a shell casing is ejected ontop of the turf.
+	var/bullet_sizzle = FALSE //used by ammo_casing/bounce_away() to determine if the shell casing should make a sizzle sound when it's ejected over the turf
+							//IE if the turf is supposed to be water, set TRUE.
+
 /turf/vv_edit_var(var_name, new_value)
 	var/static/list/banned_edits = list("x", "y", "z")
 	if(var_name in banned_edits)