Icon smoothing, and Rendering overhaul, and Camera fix, and mapmerge.py fix, and Multi-z, and THE PLANE CUBE

.github/guides/HARDDELETES.md

@@ -243,7 +243,7 @@ So then, we want to temporarily remember to clear a reference when it's deleted
 
 This is where I might lose you, but we're gonna use signals
 
-`qdel()`, the proc that sets off this whole deletion business, sends a signal called `COMSIG_PARENT_QDELETING`
+`qdel()`, the proc that sets off this whole deletion business, sends a signal called `COMSIG_QDELETING`
 
 We can listen for that signal, and if we hear it clear whatever reference we may have
 
@@ -255,10 +255,10 @@ Here's an example
 
 /somemob/proc/set_target(new_target)
     if(target)
-        UnregisterSignal(target, COMSIG_PARENT_QDELETING) //We need to make sure any old signals are cleared
+        UnregisterSignal(target, COMSIG_QDELETING) //We need to make sure any old signals are cleared
     target = new_target
     if(target)
-        RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(clear_target)) //Call clear_target if target is ever qdel()'d
+        RegisterSignal(target, COMSIG_QDELETING, PROC_REF(clear_target)) //Call clear_target if target is ever qdel()'d
 
 /somemob/proc/clear_target(datum/source)
     SIGNAL_HANDLER

_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm

@@ -93,7 +93,7 @@
 /turf/open/floor/wood,
 /area/ruin/unpowered)
 "s" = (
-/obj/effect/decal/cleanable/trail_holder,
+/obj/effect/decal/cleanable/blood/trail_holder,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
 "u" = (

_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm

@@ -1697,8 +1697,7 @@
 /area/ruin/syndicate_icemoon/medical)
 "lY" = (
 /obj/machinery/atmospherics/pipe/layer_manifold{
-	dir = 4;
-	level = 2
+	dir = 4
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ruin/syndicate_icemoon/engine)

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm

@@ -242,7 +242,7 @@
 /area/icemoon/underground/explored)
 "ut" = (
 /obj/item/flashlight/lantern{
-	on = 1
+	light_on = 1
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,

_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm

@@ -189,7 +189,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/paper/secretrecipe,
 /obj/item/flashlight/lantern/jade{
-	on = 1
+	light_on = 1
 	},
 /turf/open/floor/plasteel/cult,
 /area/ruin/unpowered/buried_library)
@@ -344,7 +344,7 @@
 /area/icemoon/underground/explored)
 "bz" = (
 /obj/item/flashlight/lantern/jade{
-	on = 1
+	light_on = 1
 	},
 /turf/open/floor/plating,
 /area/ruin/unpowered/buried_library)

_maps/RandomRuins/IceRuins/icemoon_underground_mining_site.dmm

@@ -11,7 +11,7 @@
 /area/template_noop)
 "f" = (
 /obj/item/flashlight/lantern{
-	on = 1
+	light_on = 1
 	},
 /turf/open/floor/plating/ice/icemoon,
 /area/icemoon/underground/explored)

_maps/RandomRuins/JungleRuins/jungleland_jungle_garden.dmm

@@ -67,7 +67,7 @@
 /area/template_noop)
 "A" = (
 /obj/structure/window/paperframe{
-	CanAtmosPass = 0
+	can_atmos_pass = 0
 	},
 /turf/open/floor/wood/jungle,
 /area/template_noop)

_maps/RandomRuins/JungleRuins/jungleland_jungle_ivymen_nest.dmm

@@ -38,7 +38,7 @@
 /area/jungleland/explored)
 "ai" = (
 /obj/item/flashlight/lantern{
-	on = 1
+	light_on = 1
 	},
 /turf/open/indestructible/grass,
 /area/ruin/unpowered/ivymen)
@@ -50,7 +50,7 @@
 /turf/open/floor/plating/dirt/jungleland/jungle,
 /area/ruin/unpowered/ivymen)
 "al" = (
-/turf/closed/indestructible/rock/wood,
+/turf/closed/indestructible/wood,
 /area/ruin/unpowered/ivymen)
 "am" = (
 /obj/machinery/iv_drip,
@@ -214,7 +214,7 @@
 /area/ruin/unpowered/ivymen)
 "uo" = (
 /obj/item/flashlight/lantern{
-	on = 1
+	light_on = 1
 	},
 /turf/open/floor/plating/dirt/jungleland/jungle,
 /area/jungleland/explored)

_maps/RandomRuins/JungleRuins/jungleland_jungle_tartemple.dmm

@@ -82,7 +82,7 @@
 "t" = (
 /obj/structure/stone_tile/slab,
 /obj/item/flashlight/lantern{
-	on = 1
+	light_on = 1
 	},
 /turf/open/floor/plating/dirt/jungleland/barren_rocks,
 /area/ruin/unpowered/tar_temple)

_maps/RandomRuins/JungleRuins/jungleland_jungle_xenos.dmm

@@ -164,7 +164,7 @@
 /turf/open/floor/plating/dirt/jungleland/jungle,
 /area/template_noop)
 "aV" = (
-/turf/closed/indestructible/rock/wood,
+/turf/closed/indestructible/wood,
 /area/ruin/unpowered)
 "aW" = (
 /obj/structure/flora/grass/jungle/b,
@@ -218,7 +218,7 @@
 /turf/open/floor/plating/dirt/jungleland/jungle,
 /area/ruin/unpowered)
 "uP" = (
-/turf/closed/indestructible/rock/wood,
+/turf/closed/indestructible/wood,
 /area/template_noop)
 "vl" = (
 /obj/structure/mineral_door/wood,
@@ -275,7 +275,7 @@
 /obj/structure/sign/warning{
 	desc = "A warning sign denoting landmines ahead."
 	},
-/turf/closed/indestructible/rock/wood,
+/turf/closed/indestructible/wood,
 /area/template_noop)
 "Ou" = (
 /obj/structure/alien/weeds,

_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm

@@ -3752,7 +3752,7 @@
 	dir = 4;
 	dwidth = 5;
 	height = 5;
-	id = "syndicatelavalandbase_cargo";
+	shuttle_id = "syndicatelavalandbase_cargo";
 	name = "Syndicate Jungle Base: Cargo Bay Dock";
 	width = 11
 	},

_maps/RandomRuins/JungleRuins/miningbase.dmm

@@ -2271,7 +2271,7 @@
 	dir = 8;
 	dwidth = 3;
 	height = 5;
-	id = "mining_away";
+	shuttle_id = "mining_away";
 	name = "lavaland mine";
 	width = 7
 	},

_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm

@@ -264,7 +264,7 @@
 /turf/open/floor/plating/beach/sand,
 /area/ruin/powered/beach)
 "bg" = (
-/obj/structure/sign/barsign,
+/obj/machinery/barsign,
 /turf/closed/wall/mineral/sandstone,
 /area/ruin/powered/beach)
 "bl" = (

_maps/RandomRuins/LavaRuins/lavaland_surface_cafe_of_broken_dreams.dmm

@@ -60,6 +60,7 @@
 "aF" = (
 /obj/item/reagent_containers/glass/bottle/radscrub{
 	desc = "War. War never changes. But this can clean your radiation contamination problems!";
+
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
@@ -442,7 +443,7 @@
 /turf/open/floor/plasteel/lavaland,
 /area/ruin/powered)
 "FQ" = (
-/obj/structure/sign/barsign{
+/obj/machinery/barsign{
 	icon_state = "maltesefalcon"
 	},
 /turf/closed/wall/r_wall/rust,

_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm

@@ -25,7 +25,7 @@
 	name = "Broken Computer"
 	},
 /obj/effect/decal/cleanable/glass,
-/turf/open/floor/carpet/exoticpurple,
+/turf/open/floor/carpet/purple,
 /area/ruin/powered/golem_ship)
 "da" = (
 /turf/open/floor/pod/dark,
@@ -43,7 +43,7 @@
 /turf/open/floor/plating,
 /area/ruin/powered/golem_ship)
 "fy" = (
-/turf/open/floor/carpet/exoticpurple,
+/turf/open/floor/carpet/purple,
 /area/ruin/powered/golem_ship)
 "gl" = (
 /obj/effect/decal/cleanable/dirt,
@@ -59,7 +59,7 @@
 "hk" = (
 /obj/effect/mob_spawn/human/golem/adamantine,
 /obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/carpet/exoticpurple,
+/turf/open/floor/carpet/purple,
 /area/ruin/powered/golem_ship)
 "hB" = (
 /obj/effect/decal/cleanable/dirt,
@@ -274,7 +274,7 @@
 /obj/effect/mob_spawn/human/golem/adamantine,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/carpet/exoticpurple,
+/turf/open/floor/carpet/purple,
 /area/ruin/powered/golem_ship)
 "xc" = (
 /obj/effect/decal/cleanable/dirt,
@@ -378,7 +378,7 @@
 /area/ruin/powered/golem_ship)
 "Dq" = (
 /obj/effect/mob_spawn/human/golem/adamantine,
-/turf/open/floor/carpet/exoticpurple,
+/turf/open/floor/carpet/purple,
 /area/ruin/powered/golem_ship)
 "Dw" = (
 /obj/structure/table/reinforced,
@@ -480,7 +480,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/carpet/exoticpurple,
+/turf/open/floor/carpet/purple,
 /area/ruin/powered/golem_ship)
 "Iu" = (
 /obj/structure/frame/computer,
@@ -526,7 +526,7 @@
 /area/ruin/powered/golem_ship)
 "Ls" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/carpet/exoticpurple,
+/turf/open/floor/carpet/purple,
 /area/ruin/powered/golem_ship)
 "LB" = (
 /obj/effect/decal/cleanable/oil,
@@ -549,7 +549,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/glass,
-/turf/open/floor/carpet/exoticpurple,
+/turf/open/floor/carpet/purple,
 /area/ruin/powered/golem_ship)
 "MH" = (
 /obj/machinery/light/small{
@@ -593,7 +593,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/open/floor/carpet/exoticpurple,
+/turf/open/floor/carpet/purple,
 /area/ruin/powered/golem_ship)
 "Ox" = (
 /obj/structure/frame/machine,
@@ -604,7 +604,7 @@
 "OL" = (
 /obj/item/resonator,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/carpet/exoticpurple,
+/turf/open/floor/carpet/purple,
 /area/ruin/powered/golem_ship)
 "OZ" = (
 /turf/open/floor/plating,
@@ -618,7 +618,7 @@
 /obj/structure/chair/office/dark{
 	dir = 8
 	},
-/turf/open/floor/carpet/exoticpurple,
+/turf/open/floor/carpet/purple,
 /area/ruin/powered/golem_ship)
 "Pt" = (
 /obj/machinery/light/broken{
@@ -653,7 +653,7 @@
 /area/ruin/powered/golem_ship)
 "Qd" = (
 /obj/item/resonator,
-/turf/open/floor/carpet/exoticpurple,
+/turf/open/floor/carpet/purple,
 /area/ruin/powered/golem_ship)
 "Qu" = (
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{

_maps/RandomRuins/LavaRuins/lavaland_surface_heralddtrap.dmm

@@ -95,7 +95,7 @@
 /turf/closed/wall/mineral/titanium/survival,
 /area/lavaland/surface/outdoors)
 "np" = (
-/turf/closed/mineral/gibtonite/volcanic/hard/harder,
+/turf/closed/mineral/gibtonite/volcanic/harder,
 /area/lavaland/surface/outdoors)
 "nL" = (
 /obj/structure/stone_tile/surrounding_tile{
@@ -354,10 +354,10 @@
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "CI" = (
-/turf/closed/mineral/diamond/volcanic/hard/harder,
+/turf/closed/mineral/diamond/volcanic/harder,
 /area/lavaland/surface/outdoors)
 "Di" = (
-/turf/closed/mineral/bananium/volcanic/hard/harder,
+/turf/closed/mineral/bananium/volcanic/harder,
 /area/lavaland/surface/outdoors)
 "EO" = (
 /obj/structure/stone_tile,
@@ -540,7 +540,7 @@
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "SX" = (
-/turf/closed/mineral/gem/volcanic/hard/harder,
+/turf/closed/mineral/gem/volcanic/harder,
 /area/lavaland/surface/outdoors)
 "Tf" = (
 /obj/effect/decal/remains/xeno,

_maps/RandomRuins/LavaRuins/lavaland_surface_legionnaire_pit_dtrap.dmm

@@ -911,7 +911,7 @@
 /turf/open/lava/smooth/lava_land_surface,
 /area/ruin/unpowered)
 "ty" = (
-/turf/closed/mineral/magmite/volcanic/hard/harder,
+/turf/closed/mineral/magmite/volcanic/harder,
 /area/ruin/unpowered)
 "ud" = (
 /obj/item/storage/bag/money/vault{
@@ -1032,7 +1032,7 @@
 /turf/open/lava/smooth/lava_land_surface,
 /area/ruin/unpowered)
 "yj" = (
-/turf/closed/mineral/volcanic/lava_land_surface/hard/harder,
+/turf/closed/mineral/volcanic/lava_land_surface/harder,
 /area/ruin/unpowered)
 "yn" = (
 /obj/structure/stone_tile/block{

_maps/RandomRuins/LavaRuins/lavaland_surface_maze.dmm

@@ -1,6 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "h" = (
-/turf/closed/mineral/volcanic/lava_land_surface/hard/harder,
+/turf/closed/mineral/volcanic/lava_land_surface/harder,
 /area/template_noop)
 "i" = (
 /turf/closed/mineral/volcanic/lava_land_surface/hard,