Merge pull request #10752 from Shadeykins/Z6-Remap2

Updates z6.dmm, Derelict/DJ Station/Teleporter Remap & Clown Shuttle Fix

code/game/objects/items/trash.dm

@@ -87,6 +87,12 @@
 	name = "bread tube"
 	icon_state = "tastybread"
 
+/obj/item/trash/spentcasing
+	icon = 'icons/obj/ammo.dmi'
+	name = "bullet casing"
+	desc = "A spent bullet casing. Smells like cordite."
+	icon_state = "gshell"
+
 /obj/item/trash/tapetrash
 	name = "old duct tape"
 	icon_state = "tape"

code/game/turfs/simulated/walls_mineral.dm

@@ -221,6 +221,31 @@
 /turf/simulated/wall/mineral/titanium/survival/pod
 	canSmoothWith = list(/turf/simulated/wall/mineral/titanium/survival, /obj/machinery/door/airlock/survival_pod)
 
+//undeconstructable type for derelict
+//these walls are undeconstructable/unthermitable
+/turf/simulated/wall/mineral/titanium/nodecon
+	name = "russian wall"
+	desc = "Like regular titanium, but able to deflect capitalist aggressors."
+
+/turf/simulated/wall/mineral/titanium/nodecon/tileblend
+	fixed_underlay = list("icon"='icons/turf/floors.dmi', "icon_state"="darkredfull")
+
+/turf/simulated/wall/mineral/titanium/nodecon/nodiagonal
+	smooth = SMOOTH_MORE
+	icon_state = "map-shuttle_nd"
+
+/turf/simulated/wall/mineral/titanium/nodecon/nosmooth
+	smooth = SMOOTH_FALSE
+	icon = 'icons/turf/shuttle.dmi'
+	icon_state = "wall"
+
+//properties for derelict sub-type to prevent said deconstruction/thermiting
+/turf/simulated/wall/mineral/titanium/nodecon/try_decon(obj/item/I, mob/user, params)
+	return
+
+/turf/simulated/wall/mineral/titanium/nodecon/thermitemelt(mob/user as mob, speed)
+	return
+
 /////////////////////Plastitanium walls/////////////////////
 
 /turf/simulated/wall/mineral/plastitanium