Turbo Lifts Tweak (#10593)

aurorastation.dme

@@ -2939,6 +2939,7 @@
 #include "maps\exodus\code\exodus_shuttles.dm"
 #include "maps\exodus\code\exodus_unittest.dm"
 #include "maps\runtime\code\runtime.dm"
+#include "maps\runtime\code\runtime_lifts.dm"
 #include "maps\runtime\code\runtime_unittest.dm"
 #include "maps\templates\distress\distress_equipment.dm"
 #include "maps\templates\orbital\orbital_templates.dm"

code/game/objects/structures/flora.dm

@@ -183,48 +183,49 @@
 	if (number == 36)
 		if (prob(90))//Make the weird one rarer
 			number = rand(1,35)
-		else
+		else if(!desc)
 			desc = "A half-sentient plant borne from a mishap in a Zeng-Hu genetics lab."
 
-	switch(number) //Wezzy's cool new plant description code. Special thanks to Sindorman.
-		if(3)
-			desc = "A bouquet of Bieselite flora."
-		if(4)
-			desc = "A bamboo plant. Used widely in Japanese crafts."
-		if(5)
-			desc = "Some kind of fern."
-		if(7)
-			desc = "A reedy plant mostly used for decoration in Skrell homes, admired for its luxuriant stalks."
-		if(9)
-			desc = "A fleshy cave dwelling plant with huge nodules for flowers."
-		if(9)
-			desc = "A scrubby cactus adapted to the Moghes deserts."
-		if(13)
-			desc = "A hardy succulent adapted to the Moghes deserts."
-		if(14)
-			desc = "That's a huge flower. Previously, the petals would be used in dyes for unathi garb. Now it's more of a decorative plant."
-		if(15)
-			desc = "A pitiful pot of stubby flowers."
-		if(18)
-			desc = "An orchid plant. As beautiful as it is delicate."
-		if(19)
-			desc = "A ropey, aquatic plant with crystaline flowers."
-		if(20)
-			desc = "A bioluminescent half-plant half-fungus hybrid. Said to come from Sedantis I."
-		if(22)
-			desc = "A cone shrub. Sadly doesn't come from Coney Island."
-		if(26)
-			desc = "A bulrush. Commonly referred to as cattail."
-		if(27)
-			desc = "A rose bush. Don't prick yourself."
-		if(32)
-			desc = "A woody shrub."
-		if(33)
-			desc = "A woody shrub. Seems to be in need of watering."
-		if(34)
-			desc = "A woody shrub. This one seems to be in bloom. It's just like one of my japanese animes."
-		else
-			desc = "Just your common, everyday houseplant."
+	if(!desc)
+		switch(number) //Wezzy's cool new plant description code. Special thanks to Sindorman.
+			if(3)
+				desc = "A bouquet of Bieselite flora."
+			if(4)
+				desc = "A bamboo plant. Used widely in Japanese crafts."
+			if(5)
+				desc = "Some kind of fern."
+			if(7)
+				desc = "A reedy plant mostly used for decoration in Skrell homes, admired for its luxuriant stalks."
+			if(9)
+				desc = "A fleshy cave dwelling plant with huge nodules for flowers."
+			if(9)
+				desc = "A scrubby cactus adapted to the Moghes deserts."
+			if(13)
+				desc = "A hardy succulent adapted to the Moghes deserts."
+			if(14)
+				desc = "That's a huge flower. Previously, the petals would be used in dyes for unathi garb. Now it's more of a decorative plant."
+			if(15)
+				desc = "A pitiful pot of stubby flowers."
+			if(18)
+				desc = "An orchid plant. As beautiful as it is delicate."
+			if(19)
+				desc = "A ropey, aquatic plant with crystaline flowers."
+			if(20)
+				desc = "A bioluminescent half-plant half-fungus hybrid. Said to come from Sedantis I."
+			if(22)
+				desc = "A cone shrub. Sadly doesn't come from Coney Island."
+			if(26)
+				desc = "A bulrush. Commonly referred to as cattail."
+			if(27)
+				desc = "A rose bush. Don't prick yourself."
+			if(32)
+				desc = "A woody shrub."
+			if(33)
+				desc = "A woody shrub. Seems to be in need of watering."
+			if(34)
+				desc = "A woody shrub. This one seems to be in bloom. It's just like one of my japanese animes."
+			else
+				desc = "Just your common, everyday houseplant."
 
 
 

code/modules/turbolift/turbolift.dm

@@ -5,7 +5,7 @@
 	var/list/doors = list()                             // Doors inside the lift structure.
 	var/list/queued_floors = list()                     // Where are we moving to next?
 	var/list/floors = list()                            // All floors in this system.
-	var/move_delay = 45                                 // Time between floor changes.
+	var/move_delay = 15                                 // Time between floor changes.
 	var/floor_wait_delay = 95                           // Time to wait at floor stops.
 	var/obj/structure/lift/panel/control_panel_interior // Lift control panel.
 	var/doors_closing = 0								// Whether doors are in the process of closing
@@ -54,7 +54,7 @@
 		if(!doors_closing)
 			close_doors()
 			doors_closing = 1
-			queue_movement()
+			queue_movement(move_delay / 2)
 			return 1
 
 		else // We failed to close the doors - probably, someone is blocking them; stop trying to move

code/modules/turbolift/turbolift_map.dm

@@ -7,6 +7,7 @@
 	var/depth = 1       // Number of floors to generate, including the initial floor.
 	var/lift_size_x = 2 // Number of turfs on each axis to generate in addition to the first
 	var/lift_size_y = 2 // ie. a 3x3 lift would have a value of 2 in each of these variables.
+	var/no_first_z_level = TRUE
 
 	// Various turf and door types used when generating the turbolift floors.
 	var/wall_type =  /turf/simulated/wall/elevator
@@ -119,7 +120,7 @@
 			light_y2 = uy + lift_size_y - 1
 
 	// Generate each floor and store it in the controller datum.
-	if(uz != 1)
+	if(no_first_z_level && uz != 1)
 		for(var/i = 1, i < uz, i++)
 			lift.floors += null // This silly hack allows lifts to not start on the first zlevel
 

html/changelogs/geeves-turbo_lift.yml

@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - tweak: "Turbo lifts now move much faster."

maps/runtime/code/runtime_lifts.dm

@@ -0,0 +1,12 @@
+/obj/turbolift_map_holder/runtime
+	name = "Runtime Lift Placeholder"
+	dir = WEST
+	depth = 2
+	lift_size_x = 4
+	lift_size_y = 4
+	no_first_z_level = FALSE
+
+	areas_to_use = list(
+		/area/turbolift/main_station,
+		/area/turbolift/main_mid
+	)

maps/runtime/code/runtime_unittest.dm

@@ -1,5 +1,8 @@
 /datum/map/runtime
-	ut_environ_exempt_areas = list(/area/space)
+	ut_environ_exempt_areas = list(
+		/area/space,
+		/area/turbolift
+	)
 	ut_apc_exempt_areas = list(/area/maintenance/maintcentral)
 	ut_atmos_exempt_areas = list(/area)
 	excluded_test_types = list(

maps/runtime/runtime-1.dmm

@@ -968,15 +968,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
-"cq" = (
-/obj/effect/floor_decal/corner/blue{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/white{
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
-/area/hallway/secondary/entry)
 "cr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/wall/r_wall,
@@ -1446,6 +1437,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
+"gF" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/maintcentral)
 "ie" = (
 /obj/effect/map_effect/wingrille_spawn/reinforced,
 /obj/structure/cable{
@@ -1540,6 +1537,15 @@
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled,
 /area/bridge)
+"uI" = (
+/obj/effect/floor_decal/corner/blue{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/white{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/secondary/entry)
 "wk" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -1572,6 +1578,10 @@
 	},
 /turf/simulated/wall/r_wall,
 /area/construction)
+"Ct" = (
+/obj/machinery/door/airlock/glass,
+/turf/simulated/floor/plating,
+/area/storage/primary)
 "FZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/recharge_station,
@@ -1658,6 +1668,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/construction)
+"Uf" = (
+/turf/simulated/floor/plating,
+/area/turbolift/main_station)
 "UF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -1670,6 +1683,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
+"WS" = (
+/obj/turbolift_map_holder/runtime{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/turbolift/main_station)
 "YP" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -3590,8 +3609,8 @@ at
 bv
 bQ
 ch
-cq
-cq
+uI
+uI
 cE
 cF
 cG
@@ -3816,9 +3835,9 @@ cP
 cP
 cP
 cP
-cP
-cP
-cP
+Ct
+Ct
+Ct
 cP
 cP
 cP
@@ -3868,13 +3887,13 @@ ae
 ae
 ae
 ae
+gF
 ae
 ae
 ae
 ae
 ae
-ae
-ae
+gF
 ae
 ae
 ae
@@ -3976,13 +3995,13 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ac
+Uf
+Uf
+Uf
+Uf
+WS
+ac
 aa
 aa
 aa
@@ -4030,13 +4049,13 @@ ab
 ab
 ab
 ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+ac
+Uf
+Uf
+Uf
+Uf
+Uf
+ac
 ab
 ab
 ab
@@ -4084,13 +4103,13 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ac
+Uf
+Uf
+Uf
+Uf
+Uf
+ac
 aa
 aa
 aa
@@ -4138,13 +4157,13 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ac
+Uf
+Uf
+Uf
+Uf
+Uf
+ac
 aa
 aa
 aa
@@ -4192,13 +4211,13 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ac
+Uf
+Uf
+Uf
+Uf
+Uf
+ac
 aa
 aa
 aa
@@ -4246,13 +4265,13 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ac
+ac
+ac
+ac
+ac
+ac
+ac
 aa
 aa
 aa

maps/runtime/runtime-2.dmm

@@ -28,6 +28,14 @@
 	temperature = 278
 	},
 /area/tcommsat/computer)
+"bl" = (
+/obj/structure/flora/pottedplant/random{
+	desc = "I like moster truck";
+	name = "walter"
+	},
+/obj/effect/decal/warning_stripes,
+/turf/simulated/floor/tiled,
+/area/construction/Storage)
 "cB" = (
 /obj/machinery/light{
 	brightness_range = 16;
@@ -94,6 +102,9 @@
 	temperature = 278
 	},
 /area/turret_protected/ai_upload_foyer)
+"ev" = (
+/turf/simulated/open,
+/area/turbolift/main_mid)
 "eN" = (
 /obj/structure/cable/cyan{
 	d1 = 4;
@@ -1025,6 +1036,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/construction/Storage)
+"QS" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/construction/Storage)
 "QX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled{
@@ -3319,13 +3336,13 @@ hD
 hD
 hD
 hD
-hD
-hD
-hD
-hD
-hD
-hD
-hD
+Ex
+Ex
+Ex
+Ex
+Ex
+Ex
+Ex
 hD
 hD
 hD
@@ -3373,13 +3390,13 @@ hD
 hD
 hD
 hD
-hD
-hD
-hD
-hD
-hD
-hD
-hD
+Ex
+QS
+aO
+bl
+aO
+QS
+Ex
 hD
 hD
 hD
@@ -3427,13 +3444,13 @@ hD
 hD
 hD
 hD
-hD
-hD
-hD
-hD
-hD
-hD
-hD
+Ex
+aO
+aO
+aO
+aO
+aO
+Ex
 hD
 hD
 hD
@@ -3481,13 +3498,13 @@ hD
 hD
 hD
 hD
-hD
-hD
-hD
-hD
-hD
-hD
-hD
+Ex
+Ex
+Ex
+Ex
+Ex
+Ex
+Ex
 hD
 hD
 hD
@@ -3535,13 +3552,13 @@ iR
 iR
 iR
 iR
-iR
-iR
-iR
-iR
-iR
-iR
-iR
+Ex
+ev
+ev
+ev
+ev
+ev
+Ex
 iR
 iR
 iR
@@ -3589,13 +3606,13 @@ Zg
 Zg
 Zg
 Zg
-Zg
-Zg
-Zg
-Zg
-Zg
-Zg
-Zg
+Ex
+ev
+ev
+ev
+ev
+ev
+Ex
 Zg
 Zg
 Zg
@@ -3643,13 +3660,13 @@ iR
 iR
 iR
 iR
-iR
-iR
-iR
-iR
-iR
-iR
-iR
+Ex
+ev
+ev
+ev
+ev
+ev
+Ex
 iR
 iR
 iR
@@ -3697,13 +3714,13 @@ iR
 iR
 iR
 iR
-iR
-iR
-iR
-iR
-iR
-iR
-iR
+Ex
+ev
+ev
+ev
+ev
+ev
+Ex
 iR
 iR
 iR
@@ -3751,13 +3768,13 @@ iR
 iR
 iR
 iR
-iR
-iR
-iR
-iR
-iR
-iR
-iR
+Ex
+ev
+ev
+ev
+ev
+ev
+Ex
 iR
 iR
 iR
@@ -3805,13 +3822,13 @@ iR
 iR
 iR
 iR
-iR
-iR
-iR
-iR
-iR
-iR
-iR
+Ex
+Ex
+Ex
+Ex
+Ex
+Ex
+Ex
 iR
 iR
 iR