From 34a8ce31921e737b178adc8d1f3a3690f0ff3ae1 Mon Sep 17 00:00:00 2001 From: larentoun <31931237+larentoun@users.noreply.github.com> Date: Mon, 15 Jul 2024 19:35:08 +0300 Subject: [PATCH 1/6] it works --- code/__DEFINES/cargo.dm | 1 + code/modules/cargo/supplypod.dm | 2 +- .../aesthetics/_aesthetics.dm | 4 ++ .../aesthetics/_aesthetics.dme | 3 ++ .../supply_pods/code/supply_pods.dm | 38 +++++++++++++++++++ 5 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm diff --git a/code/__DEFINES/cargo.dm b/code/__DEFINES/cargo.dm index 1d34ed6b3cff8..7a950ea797bb6 100644 --- 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_TELEPORTER 15 // BANDASTATION EDIT #define POD_SHAPE 1 #define POD_BASE 2 diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index 417e5519ba00f..35b7ab0d14357 100644 --- 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_TELEPORTER) // 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 index bcccd31589222..26bb86dbac4aa 100644 --- 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, "Delivery Portal", "Someone got some loot.")) diff --git a/modular_bandastation/aesthetics/_aesthetics.dme b/modular_bandastation/aesthetics/_aesthetics.dme index 5830a370f4333..976d0c1591e7b 100644 --- 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 new file mode 100644 index 0000000000000..98ff902175800 --- /dev/null +++ b/modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm @@ -0,0 +1,38 @@ +/obj/item/choice_beacon/spawn_option(obj/choice_path, mob/living/user) + podspawn(list( + "target" = get_turf(src), + "spawn" = choice_path, + "path" = /obj/structure/closet/supplypod/teleporter + )) + +/obj/structure/closet/supplypod/teleporter + style = STYLE_TELEPORTER + 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 = "portal1" + +/obj/effect/pod_landingzone/setupSmoke(rotation) + if(pod.style == STYLE_TELEPORTER) + return + . = ..() + +/obj/effect/pod_landingzone/drawSmoke() + if(pod.style == STYLE_TELEPORTER) + return + . = ..() + +/obj/effect/pod_landingzone/endLaunch() + if(pod.style == STYLE_TELEPORTER) + pod.pixel_x = 0 + pod.pixel_z = 0 + pod.transform = matrix() + . = ..() From e0b37e81cd47d705ae77e8631ab790ff33132b71 Mon Sep 17 00:00:00 2001 From: larentoun <31931237+larentoun@users.noreply.github.com> Date: Mon, 15 Jul 2024 19:38:00 +0300 Subject: [PATCH 2/6] go into core code to know changes --- code/game/objects/items/choice_beacon.dm | 2 +- .../aesthetics/supply_pods/code/supply_pods.dm | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/code/game/objects/items/choice_beacon.dm b/code/game/objects/items/choice_beacon.dm index 75a3f35c80b97..427521d26473a 100644 --- 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/modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm b/modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm index 98ff902175800..0918f67c35195 100644 --- a/modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm +++ b/modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm @@ -1,10 +1,3 @@ -/obj/item/choice_beacon/spawn_option(obj/choice_path, mob/living/user) - podspawn(list( - "target" = get_turf(src), - "spawn" = choice_path, - "path" = /obj/structure/closet/supplypod/teleporter - )) - /obj/structure/closet/supplypod/teleporter style = STYLE_TELEPORTER bluespace = TRUE From 6363e0306b7096fb98f064ad5423b52676d1e36e Mon Sep 17 00:00:00 2001 From: larentoun <31931237+larentoun@users.noreply.github.com> Date: Mon, 15 Jul 2024 19:41:03 +0300 Subject: [PATCH 3/6] express order consoles now use teleport --- .../machinery/computer/orders/order_computer/order_computer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/orders/order_computer/order_computer.dm b/code/game/machinery/computer/orders/order_computer/order_computer.dm index 770897a2fe4fb..b6d5862f74b01 100644 --- 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() From e9eebe623e315f48ade4e2c04ed28285b2c839cb Mon Sep 17 00:00:00 2001 From: larentoun <31931237+larentoun@users.noreply.github.com> Date: Mon, 15 Jul 2024 20:01:47 +0300 Subject: [PATCH 4/6] make it blue --- modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm b/modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm index 0918f67c35195..61d72a088c557 100644 --- a/modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm +++ b/modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm @@ -11,7 +11,7 @@ /obj/structure/closet/supplypod/teleporter/setStyle(chosenStyle) . = ..() icon = 'icons/obj/anomaly.dmi' - icon_state = "portal1" + icon_state = "portal" /obj/effect/pod_landingzone/setupSmoke(rotation) if(pod.style == STYLE_TELEPORTER) From 88481c8b4f0d7b4db4e092b01ee9c5351e8044fe Mon Sep 17 00:00:00 2001 From: larentoun <31931237+larentoun@users.noreply.github.com> Date: Tue, 16 Jul 2024 16:12:30 +0300 Subject: [PATCH 5/6] STYLE_TELEPORTER rename --- code/__DEFINES/cargo.dm | 2 +- code/modules/cargo/supplypod.dm | 2 +- .../aesthetics/supply_pods/code/supply_pods.dm | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/__DEFINES/cargo.dm b/code/__DEFINES/cargo.dm index 7a950ea797bb6..926a768c4af93 100644 --- a/code/__DEFINES/cargo.dm +++ b/code/__DEFINES/cargo.dm @@ -12,7 +12,7 @@ #define STYLE_INVISIBLE 12 #define STYLE_GONDOLA 13 #define STYLE_SEETHROUGH 14 -#define STYLE_TELEPORTER 15 // BANDASTATION EDIT +#define STYLE_TELEPORT 15 // BANDASTATION EDIT #define POD_SHAPE 1 #define POD_BASE 2 diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index 35b7ab0d14357..6ab420b8bf1e9 100644 --- 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 && pod.style != STYLE_TELEPORTER) // BANDASTATION EDIT. Original: 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/supply_pods/code/supply_pods.dm b/modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm index 61d72a088c557..e01bdc820b424 100644 --- a/modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm +++ b/modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm @@ -1,5 +1,5 @@ /obj/structure/closet/supplypod/teleporter - style = STYLE_TELEPORTER + style = STYLE_TELEPORT bluespace = TRUE explosionSize = list(0,0,0,0) fallingSound = null @@ -14,17 +14,17 @@ icon_state = "portal" /obj/effect/pod_landingzone/setupSmoke(rotation) - if(pod.style == STYLE_TELEPORTER) + if(pod.style == STYLE_TELEPORT) return . = ..() /obj/effect/pod_landingzone/drawSmoke() - if(pod.style == STYLE_TELEPORTER) + if(pod.style == STYLE_TELEPORT) return . = ..() /obj/effect/pod_landingzone/endLaunch() - if(pod.style == STYLE_TELEPORTER) + if(pod.style == STYLE_TELEPORT) pod.pixel_x = 0 pod.pixel_z = 0 pod.transform = matrix() From 981b694aee1cba2cf5231315350c53c3589eb4fc Mon Sep 17 00:00:00 2001 From: larentoun <31931237+larentoun@users.noreply.github.com> Date: Tue, 16 Jul 2024 16:13:32 +0300 Subject: [PATCH 6/6] description update --- modular_bandastation/aesthetics/_aesthetics.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_bandastation/aesthetics/_aesthetics.dm b/modular_bandastation/aesthetics/_aesthetics.dm index 26bb86dbac4aa..b98a3f0a84fb7 100644 --- a/modular_bandastation/aesthetics/_aesthetics.dm +++ b/modular_bandastation/aesthetics/_aesthetics.dm @@ -5,4 +5,4 @@ /datum/modpack/aesthetics/post_initialize() . = ..() - GLOB.podstyles += list(list(POD_SHAPE_OTHER, FALSE, FALSE, FALSE, FALSE, RUBBLE_NONE, "Delivery Portal", "Someone got some loot.")) + GLOB.podstyles += list(list(POD_SHAPE_OTHER, FALSE, FALSE, FALSE, FALSE, RUBBLE_NONE, "Портал доставки", "Высокотехнологичный портал для межзвездной доставки. Обеспечивает мгновенный доступ к товарам из любой точки вселенной."))