Fixes conflict in autolathe_designs.dm

code/game/objects/structures/artstuff.dm

@@ -19,6 +19,9 @@
 	burntime = 15
 	var/obj/item/weapon/canvas/painting = null
 
+/obj/structure/easel/Destroy()
+	QDEL_NULL(painting)
+	return ..()
 
 //Adding canvases
 /obj/structure/easel/attackby(var/obj/item/I, var/mob/user, params)

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

@@ -1,5 +1,5 @@
 /obj/structure/closet/secure_closet/freezer
-	desc = "It's an immobile card-locked refrigerative storage unit. This one is lead-lined."
+	desc = "It's a card-locked refrigerative storage unit. This one is lead-lined."
 
 /obj/structure/closet/secure_closet/freezer/update_icon()
 	if(broken)

code/game/objects/structures/displaycase.dm

@@ -22,6 +22,11 @@ var/global/list/captain_display_cases = list()
 	var/obj/item/device/assembly/prox_sensor/sensor = null
 	var/state = DISPLAYCASE_FRAME_CIRCUIT
 
+/obj/structure/displaycase_frame/Destroy()
+	QDEL_NULL(circuit)
+	QDEL_NULL(sensor)
+	return ..()
+
 /obj/structure/displaycase_frame/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	var/pstate = state
 	var/turf/T = get_turf(src)
@@ -116,8 +121,7 @@ var/global/list/captain_display_cases = list()
 
 /obj/structure/displaycase/Destroy()
 	dump()
-	qdel(circuit)
-	circuit = null
+	QDEL_NULL(circuit)
 	return ..()
 
 /obj/structure/displaycase/captains_laser/Destroy()

code/game/objects/structures/door_assembly.dm

@@ -17,6 +17,10 @@
 /obj/structure/door_assembly/New()
 	update_state()
 
+/obj/structure/door_assembly/Destroy()
+	QDEL_NULL(electronics)
+	return ..()
+
 /obj/structure/door_assembly/door_assembly_com
 	base_icon_state = "com"
 	base_name = "Command Airlock"

code/game/objects/structures/engicart.dm

@@ -14,6 +14,17 @@
 	var/obj/item/weapon/storage/toolbox/emergency/myredtoolbox = null
 	var/obj/item/taperoll/engineering/myengitape = null
 
+/obj/structure/engineeringcart/Destroy()
+	QDEL_NULL(myglass)
+	QDEL_NULL(mymetal)
+	QDEL_NULL(myplasteel)
+	QDEL_NULL(myflashlight)
+	QDEL_NULL(mybluetoolbox)
+	QDEL_NULL(myyellowtoolbox)
+	QDEL_NULL(myredtoolbox)
+	QDEL_NULL(myengitape)
+	return ..()
+
 /obj/structure/engineeringcart/proc/put_in_cart(obj/item/I, mob/user)
 	user.drop_item()
 	I.loc = src

code/game/objects/structures/extinguisher.dm

@@ -8,6 +8,9 @@
 	var/obj/item/weapon/extinguisher/has_extinguisher = new/obj/item/weapon/extinguisher
 	var/opened = 0
 
+/obj/structure/extinguisher_cabinet/Destroy()
+	QDEL_NULL(has_extinguisher)
+	return ..()
 
 /obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user, params)
 	if(isrobot(user) || isalien(user))

code/game/objects/structures/grille.dm

@@ -296,8 +296,16 @@
 	if(ismob(AM))
 		tforce = 5
 	else if(isobj(AM))
-		var/obj/item/I = AM
-		tforce = max(0, I.throwforce * 0.5)
+		if(prob(50))
+			var/obj/item/I = AM
+			tforce = max(0, I.throwforce * 0.5)
+		else if(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.powernet.avail * 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.powernet.load += C.powernet.avail * 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.
 	take_damage(tforce)
 
 /obj/structure/grille/broken // Pre-broken grilles for map placement

code/game/objects/structures/janicart.dm

@@ -19,12 +19,16 @@
 
 
 /obj/structure/janitorialcart/New()
+	..()
 	create_reagents(100)
 	janitorial_equipment += src
 
-
 /obj/structure/janitorialcart/Destroy()
 	janitorial_equipment -= src
+	QDEL_NULL(mybag)
+	QDEL_NULL(mymop)
+	QDEL_NULL(myspray)
+	QDEL_NULL(myreplacer)
 	return ..()
 
 /obj/structure/janitorialcart/proc/wet_mop(obj/item/weapon/mop, mob/user)

code/game/objects/structures/ladders.dm

@@ -76,7 +76,7 @@
 	return attack_hand(user)
 
 /obj/structure/ladder/dive_point/buoy
-	name = "diving point bouy"
+	name = "diving point buoy"
 	desc = "A buoy marking the location of an underwater dive area."
 	icon = 'icons/misc/beach.dmi'
 	icon_state = "buoy"

code/game/objects/structures/misc.dm

@@ -84,22 +84,28 @@
 	var/active = FALSE
 	var/ghost_alert_delay = 30 SECONDS
 	var/last_ghost_alert
+	var/alert_title = "Ethereal Beacon Active!"
+	var/atom/attack_atom
 
 
 /obj/structure/ghost_beacon/initialize()
 	. = ..()
 	last_ghost_alert = world.time
+	attack_atom = src
 	if(active)
 		processing_objects.Add(src)
 
 /obj/structure/ghost_beacon/Destroy()
 	if(active)
 		processing_objects.Remove(src)
+	attack_atom = null
 	return ..()
 
 /obj/structure/ghost_beacon/attack_ghost(mob/dead/observer/user)
 	if(user.can_advanced_admin_interact())
 		attack_hand(user)
+	else if(attack_atom != src)
+		attack_atom.attack_ghost(user)
 
 /obj/structure/ghost_beacon/attack_hand(mob/user)
 	if(!is_admin(user))
@@ -113,5 +119,5 @@
 
 /obj/structure/ghost_beacon/process()
 	if(last_ghost_alert + ghost_alert_delay < world.time)
-		notify_ghosts("[src] active in [get_area(src)].", 'sound/effects/ghost2.ogg', source = src)
+		notify_ghosts("[src] active in [get_area(src)].", 'sound/effects/ghost2.ogg', title = alert_title, source = attack_atom, action = (attack_atom == src ? NOTIFY_JUMP : NOTIFY_ATTACK))
 		last_ghost_alert = world.time

code/game/objects/structures/mop_bucket.dm

@@ -8,6 +8,7 @@
 	var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
 
 /obj/structure/mopbucket/New()
+	..()
 	create_reagents(100)
 	janitorial_equipment += src
 

code/game/objects/structures/morgue.dm

@@ -160,9 +160,7 @@
 	return
 
 /obj/structure/morgue/Destroy()
-	if(connected)
-		qdel(connected)
-		connected = null
+	QDEL_NULL(connected)
 	return ..()
 
 /obj/structure/morgue/container_resist(var/mob/living/L)
@@ -405,9 +403,7 @@
 	return
 
 /obj/structure/crematorium/Destroy()
-	if(connected)
-		qdel(connected)
-		connected = null
+	QDEL_NULL(connected)
 	return ..()
 
 /obj/structure/crematorium/container_resist(var/mob/living/L)
@@ -471,7 +467,7 @@
 		connected.connected = null
 	connected = null
 	return ..()
-	
+
 // Crematorium switch
 /obj/machinery/crema_switch
 	desc = "Burn baby burn!"
@@ -484,7 +480,7 @@
 	var/area/area = null
 	var/otherarea = null
 	var/id = 1
-	
+
 /obj/machinery/crema_switch/attack_ghost(mob/user)
 	if(user.can_advanced_admin_interact())
 		return attack_hand(user)

code/game/objects/structures/musician.dm

@@ -281,8 +281,7 @@
 		icon_state = "piano"
 
 /obj/structure/piano/Destroy()
-	qdel(song)
-	song = null
+	QDEL_NULL(song)
 	return ..()
 
 /obj/structure/piano/initialize()

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

@@ -15,21 +15,17 @@
 	buckle_lying = 1
 	burn_state = FLAMMABLE
 	burntime = 30
+	buildstackamount = 2
 	var/movable = 0 // For mobility checks
 
 /obj/structure/stool/bed/MouseDrop(atom/over_object)
 	..(over_object, skip_fucking_stool_shit = 1)
 
-/obj/structure/stool/bed/attackby(obj/item/weapon/W as obj, mob/user, params)
-	if(iswrench(W))
-		playsound(loc, W.usesound, 50, 1)
-		new /obj/item/stack/sheet/metal(loc, 2)
-		qdel(src)
-
 /obj/structure/stool/psychbed
 	name = "psych bed"
 	desc = "For prime comfort during psychiatric evaluations."
 	icon_state = "psychbed"
+	buildstackamount = 5
 	can_buckle = 1
 	buckle_lying = 1
 
@@ -38,32 +34,29 @@
 	icon_state = "dogbed"
 	desc = "A comfy-looking dog bed. You can even strap your pet in, in case the gravity turns off."
 	anchored = 0
+	buildstackamount = 10
+	buildstacktype = /obj/item/stack/sheet/wood
 
 /obj/structure/stool/bed/dogbed/ian
 	name = "Ian's bed"
 	desc = "Ian's bed! Looks comfy."
 	anchored = 1
 
-/obj/structure/stool/bed/dogbed/attackby(obj/item/weapon/W, mob/user, params)
-	if(iswrench(W))
-		playsound(loc, W.usesound, 50, 1)
-		new /obj/item/stack/sheet/wood(loc, 10)
-		qdel(src)
-
 /obj/structure/stool/bed/alien
 	name = "resting contraption"
-	desc = "This looks similar to contraptions from earth. Could aliens be stealing our technology?"
+	desc = "This looks similar to contraptions from Earth. Could aliens be stealing our technology?"
 	icon_state = "abed"
 
 /obj/structure/stool/bed/proc/handle_rotation()
 	return
 
-/obj/structure/stool/bed/attack_animal(var/mob/living/simple_animal/M)//No more buckling hostile mobs to chairs to render them immobile forever
-	if(M.environment_smash)
-		new /obj/item/stack/sheet/metal(loc)
+/obj/structure/stool/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
  */
@@ -95,7 +88,6 @@
 		M.pixel_x = M.get_standard_pixel_x_offset(M.lying)
 		M.pixel_y = M.get_standard_pixel_y_offset(M.lying)
 
-
 /obj/item/roller
 	name = "roller bed"
 	desc = "A collapsed roller bed that can be carried around."
@@ -103,7 +95,6 @@
 	icon_state = "folded"
 	w_class = 4 // Can't be put in backpacks.
 
-
 /obj/item/roller/attack_self(mob/user)
 	var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc)
 	R.add_fingerprint(user)
@@ -129,8 +120,6 @@
 		qdel(src)
 		return
 
-
-
 /obj/item/roller_holder
 	name = "roller bed rack"
 	desc = "A rack for carrying a collapsed roller bed."

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

@@ -4,6 +4,7 @@
 	icon_state = "chair"
 	buckle_lying = 0 //you sit in a chair, not lay
 	burn_state = FIRE_PROOF
+	buildstackamount = 1
 
 	var/propelled = 0 // Check for fire-extinguisher-driven chairs
 
@@ -82,6 +83,8 @@
 /obj/structure/stool/bed/chair/wood
 	burn_state = FLAMMABLE
 	burntime = 20
+	buildstackamount = 3
+	buildstacktype = /obj/item/stack/sheet/wood
 	// TODO:  Special ash subtype that looks like charred chair legs
 
 /obj/structure/stool/bed/chair/wood/narsie_act()
@@ -97,16 +100,6 @@
 	name = "wooden chair"
 	desc = "Old is never too old to not be in fashion."
 
-/obj/structure/stool/bed/chair/wood/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/wrench))
-		playsound(src.loc, W.usesound, 50, 1)
-		new /obj/item/stack/sheet/wood(get_turf(src))
-		new /obj/item/stack/sheet/wood(get_turf(src))
-		new /obj/item/stack/sheet/wood(get_turf(src))
-		qdel(src)
-	else
-		..()
-
 /obj/structure/stool/bed/chair/comfy
 	name = "comfy chair"
 	desc = "It looks comfy."
@@ -114,6 +107,7 @@
 	color = rgb(255,255,255)
 	burn_state = FLAMMABLE
 	burntime = 30
+	buildstackamount = 2
 	var/image/armrest = null
 
 /obj/structure/stool/bed/chair/comfy/New()
@@ -158,15 +152,7 @@
 /obj/structure/stool/bed/chair/office
 	anchored = 0
 	movable = 1
-
-/obj/structure/stool/bed/chair/comfy/attackby(obj/item/weapon/W, mob/user, params)
-	if(iswrench(W))
-		playsound(loc, W.usesound, 50, 1)
-		new /obj/item/stack/sheet/metal(get_turf(src))
-		new /obj/item/stack/sheet/metal(get_turf(src))
-		qdel(src)
-	else
-		..()
+	buildstackamount = 5
 
 /obj/structure/stool/bed/chair/office/Bump(atom/A)
 	..()
@@ -196,11 +182,13 @@
 
 /obj/structure/stool/bed/chair/barber
 	icon_state = "barber_chair"
+	buildstackamount = 1
 
 /obj/structure/stool/bed/chair/sofa
 	name = "old ratty sofa"
 	icon_state = "sofamiddle"
 	anchored = 1
+	buildstackamount = 1
 
 /obj/structure/stool/bed/chair/sofa/left
 	icon_state = "sofaend_left"

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

@@ -4,6 +4,8 @@
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "stool"
 	anchored = 1.0
+	var/buildstackamount = 1
+	var/buildstacktype = /obj/item/stack/sheet/metal
 
 /obj/structure/stool/ex_act(severity)
 	switch(severity)
@@ -12,25 +14,25 @@
 			return
 		if(2.0)
 			if(prob(70))
-				new /obj/item/stack/sheet/metal(loc)
+				new buildstacktype(loc, buildstackamount)
 				qdel(src)
 				return
 		if(3.0)
 			if(prob(50))
-				new /obj/item/stack/sheet/metal(loc)
+				new buildstacktype(loc, buildstackamount)
 				qdel(src)
 				return
 	return
 
 /obj/structure/stool/blob_act()
 	if(prob(75))
-		new /obj/item/stack/sheet/metal(loc)
+		new buildstacktype(loc, buildstackamount)
 		qdel(src)
 
 /obj/structure/stool/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/wrench))
 		playsound(loc, W.usesound, 50, 1)
-		new /obj/item/stack/sheet/metal(loc)
+		new buildstacktype(loc, buildstackamount)
 		qdel(src)
 
 /obj/structure/stool/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params, skip_fucking_stool_shit = 0)

code/game/objects/structures/target_stake.dm

@@ -8,45 +8,48 @@
 	flags = CONDUCT
 	var/obj/item/target/pinned_target // the current pinned target
 
-	Move()
-		..()
-		// Move the pinned target along with the stake
-		if(pinned_target in view(3, src))
-			pinned_target.loc = loc
+/obj/structure/target_stake/Destroy()
+	QDEL_NULL(pinned_target)
+	return ..()
 
-		else // Sanity check: if the pinned target can't be found in immediate view
-			pinned_target = null
-			density = 1
+/obj/structure/target_stake/Move()
+	..()
+	// Move the pinned target along with the stake
+	if(pinned_target in view(3, src))
+		pinned_target.loc = loc
 
-	attackby(obj/item/W as obj, mob/user as mob, params)
-		// Putting objects on the stake. Most importantly, targets
-		if(pinned_target)
-			return // get rid of that pinned target first!
+	else // Sanity check: if the pinned target can't be found in immediate view
+		pinned_target = null
+		density = 1
 
-		if(istype(W, /obj/item/target))
-			density = 0
-			W.density = 1
-			user.drop_item(src)
-			W.loc = loc
-			W.layer = 3.1
-			pinned_target = W
-			to_chat(user, "You slide the target into the stake.")
-		return
+/obj/structure/target_stake/attackby(obj/item/W, mob/user, params)
+	// Putting objects on the stake. Most importantly, targets
+	if(pinned_target)
+		return // get rid of that pinned target first!
 
-	attack_hand(mob/user as mob)
-		// taking pinned targets off!
-		if(pinned_target)
-			density = 1
-			pinned_target.density = 0
-			pinned_target.layer = OBJ_LAYER
+	if(istype(W, /obj/item/target))
+		density = 0
+		W.density = 1
+		user.drop_item(src)
+		W.loc = loc
+		W.layer = 3.1
+		pinned_target = W
+		to_chat(user, "You slide the target into the stake.")
 
-			pinned_target.loc = user.loc
-			if(ishuman(user))
-				if(!user.get_active_hand())
-					user.put_in_hands(pinned_target)
-					to_chat(user, "You take the target out of the stake.")
-			else
-				pinned_target.loc = get_turf(user)
+/obj/structure/target_stake/attack_hand(mob/user)
+	// taking pinned targets off!
+	if(pinned_target)
+		density = 1
+		pinned_target.density = 0
+		pinned_target.layer = OBJ_LAYER
+
+		pinned_target.loc = user.loc
+		if(ishuman(user))
+			if(!user.get_active_hand())
+				user.put_in_hands(pinned_target)
 				to_chat(user, "You take the target out of the stake.")
+		else
+			pinned_target.loc = get_turf(user)
+			to_chat(user, "You take the target out of the stake.")
 
-			pinned_target = null
+		pinned_target = null

code/game/objects/structures/watercloset.dm

@@ -14,9 +14,13 @@
 
 
 /obj/structure/toilet/New()
+	..()
 	open = round(rand(0, 1))
 	update_icon()
 
+/obj/structure/toilet/Destroy()
+	swirlie = null
+	return ..()
 
 /obj/structure/toilet/attack_hand(mob/living/user)
 	if(swirlie)

code/game/objects/structures/windoor_assembly.dm

@@ -34,6 +34,7 @@ obj/structure/windoor_assembly/New(dir=NORTH)
 
 obj/structure/windoor_assembly/Destroy()
 	density = 0
+	QDEL_NULL(electronics)
 	air_update_turf(1)
 	return ..()
 

code/game/objects/structures/window.dm

@@ -108,21 +108,22 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 
 	return 1
 
-/obj/structure/window/hitby(AM as mob|obj)
-	..()
-	var/tforce = 0
-	if(isobj(AM))
-		var/obj/item/I = AM
-		tforce = I.throwforce
-	if(reinf) tforce *= 0.25
-	playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
-	health = max(0, health - tforce)
-	if(health <= 7 && !reinf)
-		anchored = 0
-		update_nearby_icons()
-		step(src, get_dir(AM, src))
-	if(health <= 0)
-		destroy()
+/obj/structure/window/hitby(atom/movable/AM)
+	if(!CanPass(AM, get_step(src, AM.dir))) //So thrown objects that cross a tile with non-full windows will no longer hit the window even if it isn't visually obstructing the path.
+		..()
+		var/tforce = 0
+		if(isobj(AM))
+			var/obj/item/I = AM
+			tforce = I.throwforce
+		if(reinf) tforce *= 0.25
+		playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
+		health = max(0, health - tforce)
+		if(health <= 7 && !reinf)
+			anchored = 0
+			update_nearby_icons()
+			step(src, get_dir(AM, src))
+		if(health <= 0)
+			destroy()
 
 
 /obj/structure/window/attack_hand(mob/user as mob)