emperor protects

Aurorastation · Oct 9, 2024 · 5641954 · 5641954
1 parent c1ef79c
commit 5641954
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 52 deletions.
diff --git a/code/modules/admin/verbs/map_template_loadverb.dm b/code/modules/admin/verbs/map_template_loadverb.dm
@@ -59,9 +59,9 @@
 	SSair.can_fire = FALSE
 	log_and_message_admins("is attempting to place a map template [log_name].")
 	to_chat(usr, "Attempting to place map template [log_name].")
-	var/new_z_centre = template.load_new_z(FALSE) // Don't skip changeturf
-	if (new_z_centre)
-		log_and_message_admins("has placed a map template [log_name].", location = new_z_centre)
+	var/bounds = template.load_new_z(FALSE) // Don't skip changeturf
+	if (bounds)
+		log_and_message_admins("has placed a map template [log_name] on Z bounds [bounds[MAP_MINZ]] - [bounds[MAP_MAXZ]].")
 		to_chat(usr, "Successfully place map template [log_name].")
 	else
 		log_and_message_admins("has failed to place a map template [log_name].")

diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm
@@ -52,8 +52,6 @@
 	return bounds
 
 /datum/map_template/proc/load_new_z(var/no_changeturf = TRUE)
-	RETURN_TYPE(/turf)
-
 	var/x = round((world.maxx - width)/2)
 	var/y = round((world.maxy - height)/2)
 	var/initial_z = world.maxz + 1

diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
@@ -795,7 +795,7 @@
 
 	level = 1			// underfloor only
 	var/dpdir = 0		// bitmask of pipe directions
-	dir = 0				// dir will contain dominant direction for junction pipes
+	//dir = 0				// dir will contain dominant direction for junction pipes
 	var/health = 10 	// health points 0-10
 	layer = EXPOSED_DISPOSALS_PIPE_LAYER
 	var/sortType = ""

diff --git a/maps/away/away_site/abandoned_diner/abandoned_diner.dmm b/maps/away/away_site/abandoned_diner/abandoned_diner.dmm
@@ -2627,7 +2627,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/junction{
-	dir = 2;
 	icon_state = "pipe-j2"
 	},
 /obj/structure/cable/green{
@@ -2826,7 +2825,6 @@
 	dir = 6
 	},
 /obj/structure/disposalpipe/segment{
-	dir = 2;
 	icon_state = "pipe-c"
 	},
 /obj/structure/bed/stool/chair/folding{
@@ -3114,7 +3112,6 @@
 	},
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /obj/structure/disposalpipe/segment{
-	dir = 2;
 	icon_state = "pipe-c"
 	},
 /obj/structure/cable/green{
@@ -3491,7 +3488,6 @@
 	id = "diner_a"
 	},
 /obj/structure/disposalpipe/segment{
-	dir = 2;
 	icon_state = "pipe-c"
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on,
@@ -3691,7 +3687,6 @@
 	dir = 10
 	},
 /obj/structure/disposalpipe/segment{
-	dir = 2;
 	icon_state = "pipe-c"
 	},
 /obj/structure/cable/green{
@@ -4209,7 +4204,6 @@
 	icon_state = "4-8"
 	},
 /obj/structure/disposalpipe/segment{
-	dir = 2;
 	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/tiled/dark,

diff --git a/maps/away/away_site/racers/racers.dmm b/maps/away/away_site/racers/racers.dmm
@@ -1125,9 +1125,7 @@
 /area/racers)
 "fnY" = (
 /obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
-	dir = 2
-	},
+/obj/structure/disposalpipe/trunk,
 /obj/item/trash/ramen,
 /turf/simulated/floor/lino/diamond,
 /area/racers)
@@ -1475,7 +1473,6 @@
 /area/racers)
 "hiw" = (
 /obj/structure/disposalpipe/segment{
-	dir = 2;
 	icon_state = "pipe-c"
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
@@ -1948,7 +1945,6 @@
 /area/racers)
 "jmo" = (
 /obj/structure/disposalpipe/segment{
-	dir = 2;
 	icon_state = "pipe-c"
 	},
 /obj/item/trash/ramen,
@@ -4022,9 +4018,7 @@
 /area/racers)
 "tmd" = (
 /obj/machinery/disposal/small/west,
-/obj/structure/disposalpipe/trunk{
-	dir = 2
-	},
+/obj/structure/disposalpipe/trunk,
 /turf/simulated/floor/wood,
 /area/racers)
 "tmG" = (
@@ -4266,9 +4260,7 @@
 /area/racers)
 "uwM" = (
 /obj/machinery/disposal/small/south,
-/obj/structure/disposalpipe/trunk{
-	dir = 2
-	},
+/obj/structure/disposalpipe/trunk,
 /obj/effect/decal/cleanable/cobweb,
 /turf/simulated/floor/wood,
 /area/racers)

diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dm b/maps/away/ships/coc/coc_ranger/coc_ship.dm
@@ -118,7 +118,14 @@
 	invisible_until_ghostrole_spawn = TRUE
 
 /obj/effect/overmap/visitable/ship/ranger_corvette/New()
-	designation = "[pick("Nouvelle Rochelle", "Kuenoi", "Xansan", "Greentree", "Rautakaivos Kaupunki", "Dorshafen", "Inverkeithing", "Uusi Viipuri", "Horner Station", "Commander Ashia Patvardhan", "Sevaschaiv", "Rahe", "Czsari", "Suwon", "Kamoga", "Jagalaw", "Dalakyhr", "Gurmori", "Ohdker", "Dainshu", "Boch-Zivir", "Kill Emperor Boleslaw", "Expletive Sol", "Letter of Marque", "Free Fisanduh", "Gaucho", "Treaty of Xansan", "Pirates Beware", "Moroz Here We Come!", "This Ship Kills Privateers", "Lower The Black Flag", "Frontier Spirit", "Freedom", "Independence", "Self-Determination", "Let's Have A Second Collapse", "Send More Solarians", "You Can Run But You Can't Hide", "Frontier Alliance", "Here's To You, Governor Hawkins", "Remember Jamestown", "Good Riddance to Kambiz Entezam", "We're Coming For You In Hell, Terrence Hopper", "Warpway Safari Company", "Badlands Gun Club", "Light's Edge Light Foot", "Now Entering Free Xanu", "Weeping Stars, Weep No More", "Rebel's Reach Outreach Program", "Rugged Individualism", "Don't Tread On Me", "Snake In The Grass", "Konyang Yacht Club", "Ranger Ship")]"
+	designation = "[pick("Nouvelle Rochelle", "Kuenoi", "Xansan", "Greentree", "Rautakaivos Kaupunki", "Dorshafen", "Inverkeithing", "Uusi Viipuri",
+					"Horner Station", "Commander Ashia Patvardhan", "Sevaschaiv", "Rahe", "Czsari", "Suwon", "Kamoga", "Jagalaw", "Dalakyhr", "Gurmori", "Ohdker",
+					"Dainshu","Boch-Zivir", "Kill Emperor Boleslaw", "Expletive Sol", "Letter of Marque", "Free Fisanduh", "Gaucho", "Treaty of Xansan", "Pirates Beware",
+					"Moroz Here We Come!", "This Ship Kills Privateers", "Lower The Black Flag", "Frontier Spirit", "Freedom", "Independence", "Self-Determination",
+					"Let's Have A Second Collapse", "Send More Solarians", "You Can Run But You Can't Hide", "Frontier Alliance", "Here's To You, Governor Hawkins", "Remember Jamestown",
+					"Good Riddance to Kambiz Entezam", "We're Coming For You In Hell, Terrence Hopper", "Warpway Safari Company", "Badlands Gun Club", "Light's Edge Light Foot",
+					"Now Entering Free Xanu", "Weeping Stars, Weep No More", "Rebel's Reach Outreach Program", "Rugged Individualism", "Don't Tread On Me", "Snake In The Grass",
+					"Konyang Yacht Club", "Ranger Ship")]"
 	..()
 
 /obj/effect/overmap/visitable/ship/ranger_corvette/get_skybox_representation()

diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dmm b/maps/away/ships/coc/coc_ranger/coc_ship.dmm
@@ -195,8 +195,7 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/blast/regular/open{
 	dir = 4;
-	id = "coc_midship";
-	name = "blast door"
+	id = "coc_midship"
 	},
 /turf/simulated/floor/tiled/dark,
 /area/ship/ranger_corvette/foyer)
@@ -419,15 +418,13 @@
 "bsV" = (
 /obj/machinery/door/blast/regular/open{
 	dir = 4;
-	id = "coc_bridge";
-	name = "blast door"
+	id = "coc_bridge"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/door/blast/regular/open{
 	dir = 4;
-	id = "coc_bridge";
-	name = "blast door"
+	id = "coc_bridge"
 	},
 /obj/machinery/door/airlock/glass_command{
 	name = "Bridge";
@@ -1792,8 +1789,7 @@
 	},
 /obj/machinery/door/blast/regular/open{
 	dir = 4;
-	id = "coc_midship";
-	name = "blast door"
+	id = "coc_midship"
 	},
 /obj/machinery/door/airlock/service{
 	name = "Dormitory";
@@ -2010,8 +2006,7 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/blast/regular/open{
 	dir = 4;
-	id = "coc_fore";
-	name = "blast door"
+	id = "coc_fore"
 	},
 /obj/machinery/light{
 	dir = 8;
@@ -2224,8 +2219,7 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/blast/regular/open{
 	dir = 4;
-	id = "coc_fore";
-	name = "blast door"
+	id = "coc_fore"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -2672,8 +2666,7 @@
 "kyh" = (
 /obj/machinery/door/blast/regular/open{
 	dir = 4;
-	id = "coc_bridge";
-	name = "blast door"
+	id = "coc_bridge"
 	},
 /obj/effect/map_effect/window_spawner/full/shuttle{
 	color = "#5b5b5b";
@@ -2995,8 +2988,7 @@
 /obj/effect/floor_decal/corner/brown/diagonal,
 /obj/machinery/door/blast/regular/open{
 	dir = 2;
-	id = "coc_midship";
-	name = "blast door"
+	id = "coc_midship"
 	},
 /obj/machinery/door/airlock/silver{
 	name = "Kitchen";
@@ -3124,8 +3116,7 @@
 /area/ship/ranger_corvette/telecomms)
 "muQ" = (
 /obj/machinery/door/blast/regular/open{
-	id = "coc_bridge";
-	name = "blast door"
+	id = "coc_bridge"
 	},
 /obj/effect/landmark/entry_point/port{
 	name = "port, bridge"
@@ -4785,8 +4776,7 @@
 "sJP" = (
 /obj/machinery/door/blast/regular/open{
 	dir = 4;
-	id = "coc_bridge";
-	name = "blast door"
+	id = "coc_bridge"
 	},
 /obj/effect/landmark/entry_point/fore{
 	name = "fore, bridge"
@@ -5471,8 +5461,7 @@
 /area/ship/ranger_corvette/crew)
 "unz" = (
 /obj/machinery/door/blast/regular/open{
-	id = "coc_bridge";
-	name = "blast door"
+	id = "coc_bridge"
 	},
 /obj/effect/landmark/entry_point/starboard{
 	name = "starboard, bridge"
@@ -5643,8 +5632,7 @@
 /area/ship/ranger_corvette/engineering)
 "uAk" = (
 /obj/machinery/door/blast/regular/open{
-	id = "coc_bridge";
-	name = "blast door"
+	id = "coc_bridge"
 	},
 /obj/effect/map_effect/window_spawner/full/shuttle{
 	color = "#5b5b5b";
@@ -6087,8 +6075,7 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/blast/regular/open{
 	dir = 4;
-	id = "coc_midship";
-	name = "blast door"
+	id = "coc_midship"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,

diff --git a/maps/runtime/runtime.dmm b/maps/runtime/runtime.dmm
@@ -1451,7 +1451,6 @@
 	name = "Physician"
 	},
 /obj/structure/disposalpipe/segment{
-	dir = 2;
 	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/tiled,
@@ -2026,7 +2025,6 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment{
-	dir = 2;
 	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/tiled{