Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00
parent 892cb0a1be 11c1e8fbf7
commit 6a07a66cb3
738 changed files with 10463 additions and 18840 deletions
@@ -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()
 	. = ..()
@@ -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)
 	..()
@@ -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)
@@ -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()
 	. = ..()
@@ -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)
@@ -437,7 +437,7 @@
 	. = ..()

 /turf/closed/mineral/gibtonite/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner) && stage == 1)
+	if(istype(I, /obj/item/mining_scanner) || istype(I, /obj/item/t_scanner/adv_mining_scanner) && stage == 1)
 		user.visible_message("<span class='notice'>[user] holds [I] to [src]...</span>", "<span class='notice'>You use [I] to locate where to cut off the chain reaction and attempt to stop it...</span>")
 		defuse()
 	..()
@@ -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)
 	. = ..()
@@ -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"
@@ -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"
@@ -209,8 +209,8 @@
 		place_poster(W,user)
 		return TRUE
 	//wall mounted IC assembly stuff
-	else if(istype(W, /obj/item/device/electronic_assembly/wallmount))
-		var/obj/item/device/electronic_assembly/wallmount/A = W
+	else if(istype(W, /obj/item/electronic_assembly/wallmount))
+		var/obj/item/electronic_assembly/wallmount/A = W
 		A.mount_assembly(src, user)
 		return TRUE

@@ -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()
 	. = ..()