Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	code/game/objects/structures.dm
	code/game/objects/structures/inflatable.dm

code/game/objects/structures.dm

@@ -52,6 +52,9 @@
 	if(climbable)
 		verbs += /obj/structure/proc/climb_on
 
+/obj/structure/Del()
+	..()
+
 /obj/structure/proc/climb_on()
 
 	set name = "Climb structure"
@@ -173,4 +176,4 @@
 		return 0
 	visible_message("<span class='danger'>[user] [attack_verb] the [src] apart!</span>")
 	spawn(1) destroy()
-	return 1
+	return 1