ss220club · larentoun · Jul 16, 2024 · Jul 15, 2024 · Jul 15, 2024 · Jul 15, 2024
diff --git a/code/__DEFINES/cargo.dm b/code/__DEFINES/cargo.dm
@@ -12,6 +12,7 @@
 #define STYLE_INVISIBLE 12
 #define STYLE_GONDOLA 13
 #define STYLE_SEETHROUGH 14
+#define STYLE_TELEPORT 15 // BANDASTATION EDIT
 
 #define POD_SHAPE 1
 #define POD_BASE 2

diff --git a/code/game/machinery/computer/orders/order_computer/order_computer.dm b/code/game/machinery/computer/orders/order_computer/order_computer.dm
@@ -201,7 +201,7 @@ GLOBAL_LIST_EMPTY(order_console_products)
 					ordered_paths += item.item_path
 			podspawn(list(
 				"target" = get_turf(living_user),
-				"style" = STYLE_BLUESPACE,
+				"path" = /obj/structure/closet/supplypod/teleporter, // BANDASTATION EDIT - Original: "style" = STYLE_BLUESPACE,
 				"spawn" = ordered_paths,
 			))
 			grocery_list.Cut()

diff --git a/code/game/objects/items/choice_beacon.dm b/code/game/objects/items/choice_beacon.dm
@@ -64,7 +64,7 @@
 /obj/item/choice_beacon/proc/spawn_option(obj/choice_path, mob/living/user)
 	podspawn(list(
 		"target" = get_turf(src),
-		"style" = STYLE_BLUESPACE,
+		"path" = /obj/structure/closet/supplypod/teleporter, // BANDASTATION EDIT - Original: "style" = STYLE_BLUESPACE,
 		"spawn" = choice_path,
 	))
 

diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm
@@ -717,7 +717,7 @@
 	pod.transform = matrix().Turn(rotation)
 	pod.layer = FLY_LAYER
 	SET_PLANE_EXPLICIT(pod, ABOVE_GAME_PLANE, src)
-	if (pod.style != STYLE_INVISIBLE)
+	if (pod.style != STYLE_INVISIBLE && pod.style != STYLE_TELEPORT) // BANDASTATION EDIT. Original: if (pod.style != STYLE_INVISIBLE)
 		animate(pod, pixel_z = -1 * abs(sin(rotation))*4, pixel_x = SUPPLYPOD_X_OFFSET + (sin(rotation) * 20), time = pod.delays[POD_FALLING], easing = LINEAR_EASING) //Make the pod fall! At an angle!
 	addtimer(CALLBACK(src, PROC_REF(endLaunch)), pod.delays[POD_FALLING], TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation
 

diff --git a/modular_bandastation/aesthetics/_aesthetics.dm b/modular_bandastation/aesthetics/_aesthetics.dm
@@ -2,3 +2,7 @@
 	name = "Эстетика"
 	desc = "Обновление визуального ряда"
 	author = "larentoun, Aylong220"
+
+/datum/modpack/aesthetics/post_initialize()
+	. = ..()
+	GLOB.podstyles += list(list(POD_SHAPE_OTHER, FALSE, FALSE, FALSE, FALSE, RUBBLE_NONE, "Портал доставки", "Высокотехнологичный портал для межзвездной доставки. Обеспечивает мгновенный доступ к товарам из любой точки вселенной."))
diff --git a/modular_bandastation/aesthetics/_aesthetics.dme b/modular_bandastation/aesthetics/_aesthetics.dme
@@ -44,6 +44,9 @@
 // Radio
 #include "radio/code/radio.dm"
 
+// Supply Pods
+#include "supply_pods/code/supply_pods.dm"
+
 // Walls
 #include "walls/code/walls.dm"
 

diff --git a/modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm b/modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm
@@ -0,0 +1,31 @@
+/obj/structure/closet/supplypod/teleporter
+	style = STYLE_TELEPORT
+	bluespace = TRUE
+	explosionSize = list(0,0,0,0)
+	fallingSound = null
+	landingSound = SFX_PORTAL_CREATED
+	openingSound = SFX_PORTAL_ENTER
+	leavingSound = SFX_PORTAL_CLOSE
+	pod_flags = FIRST_SOUNDS
+
+/obj/structure/closet/supplypod/teleporter/setStyle(chosenStyle)
+	. = ..()
+	icon = 'icons/obj/anomaly.dmi'
+	icon_state = "portal"
+
+/obj/effect/pod_landingzone/setupSmoke(rotation)
+	if(pod.style == STYLE_TELEPORT)
+		return
+	. = ..()
+
+/obj/effect/pod_landingzone/drawSmoke()
+	if(pod.style == STYLE_TELEPORT)
+		return
+	. = ..()
+
+/obj/effect/pod_landingzone/endLaunch()
+	if(pod.style == STYLE_TELEPORT)
+		pod.pixel_x = 0
+		pod.pixel_z = 0
+		pod.transform = matrix()
+	. = ..()
diff --git a/code/modules/unit_tests/subsystem_init.dm b/code/modules/unit_tests/subsystem_init.dm
 			continue

 		message_strings += "This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking."
 		TEST_NOTICE(src, jointext(message_strings, "\n"))
	continue

	message_strings += "This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking."
	TEST_NOTICE(src, jointext(message_strings, "\n"))
Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm GitHub Actions / Integration Tests (birdshot) / run_integration_tests Birdshot Station: /datum/unit_test/subsystem_init `Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized. The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id) This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.` Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm GitHub Actions / Integration Tests (deltastation) / run_integration_tests Delta Station: /datum/unit_test/subsystem_init `Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized. The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id) This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.` Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm GitHub Actions / Integration Tests (gateway_test) / run_integration_tests Gateway Test: /datum/unit_test/subsystem_init `Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized. The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id) This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.` Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm GitHub Actions / Integration Tests (icebox) / run_integration_tests Ice Box Station: /datum/unit_test/subsystem_init `Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized. The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id) This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.` Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm GitHub Actions / Integration Tests (metastation) / run_integration_tests MetaStation: /datum/unit_test/subsystem_init `Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized. The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id) This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.` Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm GitHub Actions / Integration Tests (multiz_debug) / run_integration_tests MultiZ Debug: /datum/unit_test/subsystem_init `Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized. The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id) This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.` Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm GitHub Actions / Integration Tests (northstar) / run_integration_tests NorthStar: /datum/unit_test/subsystem_init `Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized. The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id) This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.` Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm GitHub Actions / Integration Tests (runtimestation) / run_integration_tests Runtime Station: /datum/unit_test/subsystem_init `Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized. The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id) This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.` Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm GitHub Actions / Integration Tests (tramstation) / run_integration_tests Tramstation: /datum/unit_test/subsystem_init `Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized. The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id) This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.` Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm GitHub Actions / Integration Tests (wawastation) / run_integration_tests Wawastation: /datum/unit_test/subsystem_init `Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized. The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id) This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.` Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm GitHub Actions / Alternate Tests (515, 1627, runtimestation) / run_integration_tests Runtime Station: /datum/unit_test/subsystem_init `Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized. The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id) This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.`