nor-shall-our-souls-falter

code/game/objects/structures/aliens.dm

@@ -28,12 +28,12 @@
 	switch(damage_type)
 		if(BRUTE)
 			if(damage_amount)
-				playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+				playsound(loc, 'sound/effects/attackblob.ogg', 100, TRUE)
 			else
-				playsound(src, 'sound/weapons/tap.ogg', 50, 1)
+				playsound(src, 'sound/weapons/tap.ogg', 50, TRUE)
 		if(BURN)
 			if(damage_amount)
-				playsound(loc, 'sound/items/welder.ogg', 100, 1)
+				playsound(loc, 'sound/items/welder.ogg', 100, TRUE)
 
 /*
  * Resin

code/game/objects/structures/barsign.dm

@@ -38,7 +38,17 @@
 	else
 		desc = "It displays \"[name]\"."
 
+/obj/structure/sign/barsign/deconstruct(disassembled = TRUE)
+	new /obj/item/stack/sheet/metal(drop_location(), 2)
+	new /obj/item/stack/cable_coil(drop_location(), 2)
+	qdel(src)
 
+/obj/structure/sign/barsign/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+	switch(damage_type)
+		if(BRUTE)
+			playsound(src.loc, 'sound/effects/glasshit.ogg', 75, TRUE)
+		if(BURN)
+			playsound(src.loc, 'sound/items/welder.ogg', 100, TRUE)
 
 /obj/structure/sign/barsign/attack_ai(mob/user as mob)
 	return src.attack_hand(user)

code/game/objects/structures/crates_lockers/closets.dm

@@ -146,27 +146,6 @@
 				new /obj/item/stack/sheet/metal(loc)
 				qdel(src)
 
-/obj/structure/closet/bullet_act(var/obj/item/projectile/Proj)
-	..()
-	if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
-		health -= Proj.damage
-		if(health <= 0)
-			dump_contents()
-			qdel(src)
-
-/obj/structure/closet/attack_animal(mob/living/simple_animal/user)
-	if(user.environment_smash)
-		user.do_attack_animation(src)
-		visible_message("<span class='warning'>[user] destroys the [src].</span>")
-		dump_contents()
-		qdel(src)
-
-// this should probably use dump_contents()
-/obj/structure/closet/blob_act()
-	if(prob(75))
-		dump_contents()
-		qdel(src)
-
 /obj/structure/closet/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/rcs) && !opened)
 		if(user in contents) //to prevent self-teleporting.

code/game/objects/structures/crates_lockers/closets/secure/depot.dm

@@ -40,7 +40,7 @@
 	if(isanimal(M) && "syndicate" in M.faction)
 		to_chat(M, "<span class='warning'>The [src] resists your attack!</span>")
 		return
-	return ..(M)
+	return ..()
 
 /obj/structure/closet/secure_closet/syndicate/depot/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/rcs))

code/game/objects/structures/crates_lockers/closets/statue.dm

@@ -92,19 +92,6 @@
 		for(var/mob/M in src)
 			shatter(M)
 
-/obj/structure/closet/statue/bullet_act(var/obj/item/projectile/Proj)
-	health -= Proj.damage
-	check_health()
-
-/obj/structure/closet/statue/attack_animal(mob/living/simple_animal/user as mob)
-	if(user.environment_smash)
-		for(var/mob/M in src)
-			shatter(M)
-
-/obj/structure/closet/statue/blob_act()
-	for(var/mob/M in src)
-		shatter(M)
-
 /obj/structure/closet/statue/ex_act(severity)
 	for(var/mob/M in src)
 		M.ex_act(severity)

code/game/objects/structures/crates_lockers/crates.dm

@@ -194,9 +194,10 @@
 		if(3.0)
 			if(prob(50))
 				qdel(src)
-			return
-		else
-	return
+
+/obj/structure/closet/singularity_act()
+	dump_contents()
+	..()
 
 /obj/structure/closet/crate/attack_hand(mob/user)
 	if(manifest)

code/game/objects/structures/curtains.dm

@@ -14,18 +14,21 @@
 	layer = SHOWER_OPEN_LAYER
 	opacity = 0
 
-/obj/structure/curtain/bullet_act(obj/item/projectile/P, def_zone)
-	if(!P.nodamage)
-		visible_message("<span class='warning'>[P] tears [src] down!</span>")
-		qdel(src)
-	else
-		..(P, def_zone)
-
 /obj/structure/curtain/attack_hand(mob/user)
 	playsound(get_turf(loc), "rustle", 15, 1, -5)
 	toggle()
 	..()
 
+/obj/structure/curtain/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+	switch(damage_type)
+		if(BRUTE)
+			if(damage_amount)
+				playsound(src.loc, 'sound/weapons/slash.ogg', 80, TRUE)
+			else
+				playsound(loc, 'sound/weapons/tap.ogg', 50, TRUE)
+		if(BURN)
+			playsound(loc, 'sound/items/welder.ogg', 80, TRUE)
+
 /obj/structure/curtain/proc/toggle()
 	set_opacity(!opacity)
 	if(opacity)

code/game/objects/structures/depot.dm

@@ -33,11 +33,6 @@
 		obj_integrity = 0
 		healthcheck()
 
-/obj/structure/fusionreactor/bullet_act(obj/item/projectile/Proj)
-	obj_integrity -= Proj.damage
-	..()
-	healthcheck()
-
 /obj/structure/fusionreactor/proc/healthcheck()
 	if(obj_integrity <= 0 && istype(depotarea))
 		overload(TRUE)

code/game/objects/structures/displaycase.dm

@@ -163,6 +163,21 @@ GLOBAL_LIST_INIT(captain_display_cases, list())
 		occupant = null
 	occupant_overlay = null
 
+/obj/structure/displaycase/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+	switch(damage_type)
+		if(BRUTE)
+			playsound(src.loc, 'sound/effects/glasshit.ogg', 75, TRUE)
+		if(BURN)
+			playsound(src.loc, 'sound/items/welder.ogg', 100, TRUE)
+
+/obj/structure/displaycase/deconstruct(disassembled = TRUE)
+	if(!(flags & NODECONSTRUCT))
+		dump()
+		if(!disassembled)
+			new /obj/item/shard( src.loc )
+			burglar_alarm()
+	qdel(src)
+
 /obj/structure/displaycase/ex_act(severity)
 	switch(severity)
 		if(1)
@@ -179,19 +194,6 @@ GLOBAL_LIST_INIT(captain_display_cases, list())
 				src.health -= 5
 				src.healthcheck()
 
-/obj/structure/displaycase/bullet_act(var/obj/item/projectile/Proj)
-	if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
-		health -= Proj.damage
-	..()
-	src.healthcheck()
-	return
-
-/obj/structure/displaycase/blob_act()
-	if(prob(75))
-		new /obj/item/shard(loc)
-		if(occupant) dump()
-		qdel(src)
-
 /obj/structure/displaycase/proc/healthcheck()
 	if(src.health <= 0)
 		health = 0

code/game/objects/structures/door_assembly.dm

@@ -281,7 +281,7 @@
 	qdel(source)
 
 /obj/structure/door_assembly/deconstruct(disassembled = TRUE)
-	if(can_deconstruct)
+	if(!(flags & NODECONSTRUCT))
 		var/turf/T = get_turf(src)
 		if(!disassembled)
 			material_amt = rand(2,4)

code/game/objects/structures/dresser.dm

@@ -80,11 +80,15 @@
 				user.visible_message("[user] has secured [src]'s bolts.", \
 									 "<span class='notice'>You have secured [src]'s bolts.</span>")
 				anchored = 1
-	else
-		if(iscrowbar(W) && !anchored)
-			playsound(loc, W.usesound, 100, 1)
-			user.visible_message("[user] is attempting to dismantle [src].", \
-								"<span class='notice'>You begin to dismantle [src]...</span>")
-			if(do_after(user, 40 * W.toolspeed, target = src))
-				new /obj/item/stack/sheet/wood (loc, 30)
-				qdel(src)
+		return
+	if(iscrowbar(W) && !anchored)
+		playsound(loc, W.usesound, 100, 1)
+		user.visible_message("[user] is attempting to dismantle [src].", "<span class='notice'>You begin to dismantle [src]...</span>")
+		if(do_after(user, 40 * W.toolspeed, target = src))
+			deconstruct()
+		return
+	return ..()
+
+/obj/structure/dresser/deconstruct(disassembled = TRUE)
+	new /obj/item/stack/sheet/wood(drop_location(), 30)
+	qdel(src)

code/game/objects/structures/false_walls.dm

@@ -140,6 +140,15 @@
 	playsound(src, 'sound/items/welder.ogg', 100, 1)
 	qdel(src)
 
+/obj/structure/falsewall/deconstruct(disassembled = TRUE)
+	if(!(flags & NODECONSTRUCT))
+		if(disassembled)
+			new girder_type(loc)
+		if(mineral_amount)
+			for(var/i in 1 to mineral_amount)
+				new mineral(loc)
+	qdel(src)
+
 /*
  * False R-Walls
  */

code/game/objects/structures/girders.dm

@@ -29,18 +29,6 @@
 	for(var/i=0;i < metalAmount;i++)
 		new /obj/item/stack/sheet/metal(get_turf(src))
 
-/obj/structure/girder/attack_animal(mob/living/simple_animal/M)
-	M.changeNext_move(CLICK_CD_MELEE)
-	M.do_attack_animation(src)
-	if((M.environment_smash & ENVIRONMENT_SMASH_STRUCTURES) || (M.environment_smash & ENVIRONMENT_SMASH_WALLS) || (M.environment_smash & ENVIRONMENT_SMASH_RWALLS))
-		if(M.environment_smash & ENVIRONMENT_SMASH_RWALLS)
-			ex_act(2)
-			M.visible_message("<span class='warning'>[M] smashes through \the [src].</span>", "<span class='warning'>You smash through \the [src].</span>")
-		else
-			M.visible_message("<span class='warning'>[M] smashes against \the [src].</span>", "<span class='warning'>You smash against \the [src].</span>")
-			take_damage(rand(25, 75))
-			return
-
 /obj/structure/girder/temperature_expose(datum/gas_mixture/air, exposed_temperature)
 	..()
 	var/temp_check = exposed_temperature
@@ -372,28 +360,16 @@
 		. = . || mover.checkpass(PASSGRILLE)
 
 /obj/structure/girder/deconstruct(disassembled = TRUE)
-	if(can_deconstruct)
-		var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal)
+	if(!(flags & NODECONSTRUCT))
+		var/remains = pick(/obj/item/stack/rods, /obj/item/stack/sheet/metal)
 		new remains(loc)
 	qdel(src)
 
-/obj/structure/girder/blob_act()
-	if(prob(40))
-		qdel(src)
-
 /obj/structure/girder/narsie_act()
 	if(prob(25))
 		new /obj/structure/girder/cult(loc)
 		qdel(src)
 
-/obj/structure/girder/bullet_act(obj/item/projectile/Proj)
-	if(istype(Proj ,/obj/item/projectile/beam/pulse))
-		ex_act(2)
-	else
-		take_damage(Proj.damage)
-	..()
-	return 0
-
 /obj/structure/girder/ex_act(severity)
 	switch(severity)
 		if(1)
@@ -500,6 +476,6 @@
 	return
 
 /obj/structure/girder/cult/deconstruct(disassembled = TRUE)
-	if(can_deconstruct)
-		new/obj/item/stack/sheet/runed_metal/(get_turf(src), 1)
+	if(!(flags & NODECONSTRUCT))
+		new /obj/item/stack/sheet/runed_metal(drop_location(), 1)
 	qdel(src)

code/game/objects/structures/grille.dm

@@ -53,10 +53,6 @@
 	. = ..()
 	update_icon()
 
-/obj/structure/grille/blob_act()
-	if(!broken)
-		obj_break()
-
 /obj/structure/grille/examine(mob/user)
 	..()
 	if(anchored)
@@ -78,6 +74,11 @@
 		shock(user, 70)
 		shockcooldown = world.time + my_shockcooldown
 
+/obj/structure/grille/attack_animal(mob/user)
+	. = ..()
+	if(!shock(user, 70))
+		take_damage(rand(5,10), BRUTE, "melee", 1)
+
 /obj/structure/grille/hulk_damage()
 	return 60
 
@@ -98,14 +99,9 @@
 		take_damage(rand(5,10), BRUTE, "melee", 1)
 
 /obj/structure/grille/attack_alien(mob/living/user)
-	if(istype(user, /mob/living/carbon/alien/larva))
-		return
-	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(src)
-	user.visible_message("<span class='warning'>[user] mangles [src].</span>", \
-						 "<span class='warning'>You mangle [src].</span>", \
-						 "You hear twisting metal.")
-
+	user.changeNext_move(CLICK_CD_MELEE)
+	user.visible_message("<span class='warning'>[user] mangles [src].</span>")
 	if(!shock(user, 70))
 		take_damage(20, BRUTE, "melee", 1)
 
@@ -222,17 +218,17 @@
 	switch(damage_type)
 		if(BRUTE)
 			if(damage_amount)
-				playsound(src, 'sound/effects/grillehit.ogg', 80, 1)
+				playsound(src, 'sound/effects/grillehit.ogg', 80, TRUE)
 			else
-				playsound(src, 'sound/weapons/tap.ogg', 50, 1)
+				playsound(src, 'sound/weapons/tap.ogg', 50, TRUE)
 		if(BURN)
-			playsound(src, 'sound/items/welder.ogg', 80, 1)
+			playsound(src, 'sound/items/welder.ogg', 80, TRUE)
 
 /obj/structure/grille/deconstruct(disassembled = TRUE)
 	if(!loc) //if already qdel'd somehow, we do nothing
 		return
-	if(can_deconstruct)
-		var/obj/R = new rods_type(loc, rods_amount)
+	if(!(flags & NODECONSTRUCT))
+		var/obj/R = new rods_type(drop_location(), rods_amount)
 		transfer_fingerprints_to(R)
 		qdel(src)
 	..()
@@ -270,15 +266,17 @@
 		if(exposed_temperature > T0C + 1500)
 			take_damage(1, BURN, 0, 0)
 
-/obj/structure/grille/hitby(atom/movable/AM)
-	if(istype(AM, /obj))
+/obj/structure/grille/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
+	if(isobj(AM))
 		if(prob(50) && anchored && !broken)
-			var/turf/T = get_turf(src)
-			var/obj/structure/cable/C = T.get_cable_node()
-			if(C)
-				playsound(loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
-				tesla_zap(src, 3, C.newavail() * 0.01) //Zap for 1/100 of the amount of power. At a million watts in the grid, it will be as powerful as a tesla revolver shot.
-				C.add_delayedload(C.newavail() * 0.0375) // you can gain up to 3.5 via the 4x upgrades power is halved by the pole so thats 2x then 1X then .5X for 3.5x the 3 bounces shock.
+			var/obj/O = AM
+			if(O.throwforce != 0)//don't want to let people spam tesla bolts, this way it will break after time
+				var/turf/T = get_turf(src)
+				var/obj/structure/cable/C = T.get_cable_node()
+				if(C)
+					playsound(src, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5)
+					tesla_zap(src, 3, C.newavail() * 0.01) //Zap for 1/100 of the amount of power. At a million watts in the grid, it will be as powerful as a tesla revolver shot.
+					C.add_delayedload(C.newavail() * 0.0375) // you can gain up to 3.5 via the 4x upgrades power is halved by the pole so thats 2x then 1X then .5X for 3.5x the 3 bounces shock.
 	return ..()
 
 /obj/structure/grille/broken // Pre-broken grilles for map placement

code/game/objects/structures/holosign.dm

@@ -32,9 +32,9 @@
 /obj/structure/holosign/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
 	switch(damage_type)
 		if(BRUTE)
-			playsound(loc, 'sound/weapons/egloves.ogg', 80, 1)
+			playsound(loc, 'sound/weapons/egloves.ogg', 80, TRUE)
 		if(BURN)
-			playsound(loc, 'sound/weapons/egloves.ogg', 80, 1)
+			playsound(loc, 'sound/weapons/egloves.ogg', 80, TRUE)
 
 /obj/structure/holosign/wetsign
 	name = "wet floor sign"

code/game/objects/structures/inflatable.dm

@@ -41,13 +41,6 @@
 /obj/structure/inflatable/CanAtmosPass(turf/T)
 	return !density
 
-/obj/structure/inflatable/bullet_act(var/obj/item/projectile/Proj)
-	health -= Proj.damage
-	..()
-	if(health <= 0)
-		deflate(1)
-	return
-
 /obj/structure/inflatable/ex_act(severity)
 	switch(severity)
 		if(1.0)
@@ -61,9 +54,6 @@
 				deflate(1)
 				return
 
-/obj/structure/inflatable/blob_act()
-	deflate(1)
-
 /obj/structure/inflatable/attack_hand(mob/user as mob)
 	add_fingerprint(user)
 	return
@@ -76,25 +66,6 @@
 	else	//for nicer text~
 		user.visible_message("<span class='danger'>[user] tears at [src]!</span>")
 
-/obj/structure/inflatable/attack_alien(mob/user as mob)
-	if(islarva(user))
-		return
-	attack_generic(user, 15)
-
-/obj/structure/inflatable/attack_animal(mob/user as mob)
-	if(!isanimal(user))
-		return
-	var/mob/living/simple_animal/M = user
-	if(M.melee_damage_upper <= 0)
-		return
-	attack_generic(M, M.melee_damage_upper)
-
-/obj/structure/inflatable/attack_slime(mob/user as mob)
-	var/mob/living/carbon/slime/S = user
-	if(!S.is_adult)
-		return
-	attack_generic(user, rand(10, 15))
-
 /obj/structure/inflatable/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(!istype(W))
 		return

code/game/objects/structures/kitchen_spike.dm

@@ -136,3 +136,11 @@
 		M.emote("scream")
 		M.AdjustWeakened(10)
 
+/obj/structure/kitchenspike/deconstruct(disassembled = TRUE)
+	if(disassembled)
+		var/obj/F = new /obj/structure/kitchenspike_frame(loc)
+		transfer_fingerprints_to(F)
+	else
+		new /obj/item/stack/sheet/metal(src.loc, 4)
+	new /obj/item/stack/rods(loc, 4)
+	qdel(src)

code/game/objects/structures/lamarr_cage.dm

@@ -25,20 +25,6 @@
 				src.health -= 5
 				src.healthcheck()
 
-
-/obj/structure/lamarr/bullet_act(var/obj/item/projectile/Proj)
-	health -= Proj.damage
-	..()
-	src.healthcheck()
-	return
-
-
-/obj/structure/lamarr/blob_act()
-	if(prob(75))
-		new /obj/item/shard(loc)
-		Break()
-		qdel(src)
-
 /obj/structure/lamarr/proc/healthcheck()
 	if(src.health <= 0)
 		if(!( src.destroyed ))

code/game/objects/structures/lattice.dm

@@ -41,11 +41,13 @@
 		return T.attackby(C, user) //hand this off to the turf instead (for building plating, catwalks, etc)
 
 /obj/structure/lattice/deconstruct(disassembled = TRUE)
-	new /obj/item/stack/rods(get_turf(src), number_of_rods)
+	if(!(flags & NODECONSTRUCT))
+		new /obj/item/stack/rods(get_turf(src), number_of_rods)
 	qdel(src)
 
-/obj/structure/lattice/blob_act()
-	qdel(src)
+
+/obj/structure/lattice/blob_act(obj/structure/blob/B)
+	return
 
 /obj/structure/lattice/ex_act(severity)
 	switch(severity)
@@ -58,7 +60,7 @@
 
 /obj/structure/lattice/singularity_pull(S, current_size)
 	if(current_size >= STAGE_FOUR)
-		qdel(src)
+		deconstruct()
 
 /obj/structure/lattice/clockwork
 	name = "cog lattice"

code/game/objects/structures/mineral_doors.dm

@@ -52,9 +52,6 @@
 /obj/structure/mineral_door/attack_hand(mob/user)
 	return TryToSwitchState(user)
 
-/obj/structure/mineral_door/attack_animal(mob/user)
-	return TryToSwitchState(user)
-
 /obj/structure/mineral_door/attack_ghost(mob/user)
 	if(user.can_advanced_admin_interact())
 		SwitchState()

code/game/objects/structures/mirror.dm

@@ -42,16 +42,6 @@
 	playsound(src, "shatter", 70, 1)
 	desc = "Oh no, seven years of bad luck!"
 
-
-/obj/structure/mirror/bullet_act(obj/item/projectile/Proj)
-	if(prob(Proj.damage * 2))
-		if(!broken)
-			shatter()
-		else
-			playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
-	..()
-
-
 /obj/structure/mirror/attackby(obj/item/I, mob/living/user, params)
 	user.changeNext_move(CLICK_CD_MELEE)
 	if(isscrewdriver(I))
@@ -78,46 +68,18 @@
 		visible_message("<span class='warning'>[user] hits [src] with [I]!</span>")
 		playsound(src.loc, 'sound/effects/Glasshit.ogg', 70, 1)
 
+/obj/structure/mirror/deconstruct(disassembled = TRUE)
+	if(!(flags & NODECONSTRUCT))
+		if(!disassembled)
+			new /obj/item/shard( src.loc )
+	qdel(src)
 
-/obj/structure/mirror/attack_alien(mob/living/user)
-	user.changeNext_move(CLICK_CD_MELEE)
-	if(islarva(user))
-		return
-	user.do_attack_animation(src)
-	if(broken)
-		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
-		return
-	user.visible_message("<span class='danger'>[user] smashes [src]!</span>")
-	shatter()
-
-
-/obj/structure/mirror/attack_animal(mob/living/user)
-	user.changeNext_move(CLICK_CD_MELEE)
-	if(!isanimal(user))
-		return
-	var/mob/living/simple_animal/M = user
-	if(M.melee_damage_upper <= 0)
-		return
-	M.do_attack_animation(src)
-	if(broken)
-		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
-		return
-	user.visible_message("<span class='danger'>[user] smashes [src]!</span>")
-	shatter()
-
-
-/obj/structure/mirror/attack_slime(mob/living/user)
-	user.changeNext_move(CLICK_CD_MELEE)
-	var/mob/living/carbon/slime/S = user
-	if(!S.is_adult)
-		return
-	user.do_attack_animation(src)
-	if(broken)
-		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
-		return
-	user.visible_message("<span class='danger'>[user] smashes [src]!</span>")
-	shatter()
-
+/obj/structure/mirror/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+	switch(damage_type)
+		if(BRUTE)
+			playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 70, TRUE)
+		if(BURN)
+			playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 70, TRUE)
 
 /obj/item/mounted/mirror
 	name = "mirror"
@@ -153,7 +115,7 @@
 				H.dna.real_name = newname
 			if(H.mind)
 				H.mind.name = newname
-		
+
 			if(newname)
 				curse(user)
 
@@ -197,7 +159,7 @@
 
 			if(voice_choice)
 				curse(user)
-			
+
 /obj/structure/mirror/magic/on_ui_close(mob/user)
 	curse(user)
 

code/game/objects/structures/safe.dm

@@ -82,7 +82,7 @@ GLOBAL_LIST_EMPTY(safes)
 	if(open)
 		to_chat(user, "The inside of the the door has numbers written on it: <b>[get_combination()]</b>")
 
-/obj/structure/safe/blob_act()
+/obj/structure/safe/blob_act(obj/structure/blob/B)
 	return
 
 /obj/structure/safe/ex_act(severity)

code/game/objects/structures/signs.dm

@@ -6,6 +6,16 @@
 	layer = 3.5
 	armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 
+/obj/structure/sign/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+	switch(damage_type)
+		if(BRUTE)
+			if(damage_amount)
+				playsound(src.loc, 'sound/weapons/slash.ogg', 80, TRUE)
+			else
+				playsound(loc, 'sound/weapons/tap.ogg', 50, TRUE)
+		if(BURN)
+			playsound(loc, 'sound/items/welder.ogg', 80, TRUE)
+
 /obj/structure/sign/ex_act(severity)
 	switch(severity)
 		if(1.0)
@@ -16,13 +26,6 @@
 			return
 		if(3.0)
 			qdel(src)
-			return
-		else
-	return
-
-/obj/structure/sign/blob_act()
-	qdel(src)
-	return
 
 /obj/structure/sign/attackby(obj/item/tool as obj, mob/user as mob)	//deconstruction
 	if(istype(tool, /obj/item/screwdriver) && !istype(src, /obj/structure/sign/double))

code/game/objects/structures/spawner.dm

@@ -24,42 +24,6 @@
 		return
 	..()
 
-/obj/structure/spawner/blob_act(obj/structure/blob/B) //TO-DO-OBJECT-DAMAGE: Kill off when everything is damageable
-	take_damage(400, BRUTE, "melee", 0, get_dir(src, B))
-
-/obj/structure/spawner/ex_act(severity) //TO-DO-OBJECT-DAMAGE: Kill off when everything is damageable
-	if(resistance_flags & INDESTRUCTIBLE)
-		return
-	switch(severity)
-		if(1)
-			obj_integrity = 0
-			qdel(src)
-		if(2)
-			take_damage(rand(100, 250), BRUTE, "bomb", 0)
-		if(3)
-			take_damage(rand(10, 90), BRUTE, "bomb", 0)
-
-/obj/structure/spawner/mech_melee_attack(obj/mecha/M) //TO-DO-OBJECT-DAMAGE: Kill off when everything is damageable
-	M.do_attack_animation(src)
-	var/play_soundeffect = 0
-	var/mech_damtype = M.damtype
-	if(M.selected)
-		mech_damtype = M.selected.damtype
-		play_soundeffect = 1
-	else
-		switch(M.damtype)
-			if(BRUTE)
-				playsound(src, 'sound/weapons/punch4.ogg', 50, 1)
-			if(BURN)
-				playsound(src, 'sound/items/welder.ogg', 50, 1)
-			if(TOX)
-				playsound(src, 'sound/effects/spray2.ogg', 50, 1)
-				return 0
-			else
-				return 0
-	visible_message("<span class='danger'>[M.name] has hit [src].</span>")
-	return take_damage(M.force*3, mech_damtype, "melee", play_soundeffect, get_dir(src, M)) // multiplied by 3 so we can hit objs hard but not be overpowered against mobs.
-
 /obj/structure/spawner/syndicate
 	name = "warp beacon"
 	icon = 'icons/obj/device.dmi'

code/game/objects/structures/statues.dm

@@ -85,11 +85,6 @@
 /obj/structure/statue/CanAtmosPass()
 	return !density
 
-/obj/structure/statue/bullet_act(obj/item/projectile/Proj)
-	hardness -= Proj.damage
-	..()
-	CheckHardness()
-
 /obj/structure/statue/proc/CheckHardness()
 	if(hardness <= 0)
 		Dismantle(TRUE)

code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm

@@ -77,15 +77,15 @@
 		M.layer = initial(M.layer)
 		overlays -= nest_overlay
 
-/obj/structure/bed/nest/attackby(obj/item/W as obj, mob/user as mob, params)
-	user.changeNext_move(CLICK_CD_MELEE)
-	var/aforce = W.force
-	health = max(0, health - aforce)
-	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
-	visible_message("<span class='warning'>[user] hits [src] with [W]!</span>", 1)
-	healthcheck()
+/obj/structure/bed/nest/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+	switch(damage_type)
+		if(BRUTE)
+			playsound(loc, 'sound/effects/attackblob.ogg', 100, TRUE)
+		if(BURN)
+			playsound(loc, 'sound/items/welder.ogg', 100, TRUE)
 
-/obj/structure/bed/nest/proc/healthcheck()
-	if(health <= 0)
-		density = FALSE
-		qdel(src)
+/obj/structure/bed/nest/attack_alien(mob/living/carbon/alien/user)
+	if(user.a_intent != INTENT_HARM)
+		return attack_hand(user)
+	else
+		return ..()

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -47,14 +47,6 @@
 		playsound(loc, W.usesound, 50, 1)
 		new buildstacktype(loc, buildstackamount)
 		qdel(src)
-
-/obj/structure/bed/attack_animal(mob/living/simple_animal/user)
-	if(user.environment_smash)
-		user.do_attack_animation(src)
-		visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
-		new buildstacktype(loc, buildstackamount)
-		qdel(src)
-
 /*
  * Roller beds
  */

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -304,12 +304,6 @@
 			if(prob(50))
 				new buildstacktype(loc, buildstackamount)
 				qdel(src)
-				return
-
-/obj/structure/chair/stool/blob_act()
-	if(prob(75))
-		new buildstacktype(loc, buildstackamount)
-		qdel(src)
 
 /obj/item/chair
 	name = "chair"

code/game/objects/structures/tables_racks.dm

@@ -706,11 +706,11 @@
 	switch(damage_type)
 		if(BRUTE)
 			if(damage_amount)
-				playsound(loc, 'sound/items/dodgeball.ogg', 80, 1)
+				playsound(loc, 'sound/items/dodgeball.ogg', 80, TRUE)
 			else
-				playsound(loc, 'sound/weapons/tap.ogg', 50, 1)
+				playsound(loc, 'sound/weapons/tap.ogg', 50, TRUE)
 		if(BURN)
-			playsound(loc, 'sound/items/welder.ogg', 40, 1)
+			playsound(loc, 'sound/items/welder.ogg', 40, TRUE)
 
 /obj/structure/rack/skeletal_bar
 	name = "skeletal minibar"

code/game/objects/structures/window.dm

@@ -129,6 +129,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 	return
 
 /obj/structure/window/singularity_pull(S, current_size)
+	..()
 	if(current_size >= STAGE_FIVE)
 		deconstruct(FALSE)
 
@@ -333,11 +334,11 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 	switch(damage_type)
 		if(BRUTE)
 			if(damage_amount)
-				playsound(src, hitsound, 75, 1)
+				playsound(src, hitsound, 75, TRUE)
 			else
-				playsound(src, 'sound/weapons/tap.ogg', 50, 1)
+				playsound(src, 'sound/weapons/tap.ogg', 50, TRUE)
 		if(BURN)
-			playsound(src, 'sound/items/welder.ogg', 100, 1)
+			playsound(src, 'sound/items/Welder.ogg', 100, TRUE)
 
 /obj/structure/window/deconstruct(disassembled = TRUE)
 	if(QDELETED(src))