From b0dadd95726f2193d6dccf6faeba1db2eadb80b9 Mon Sep 17 00:00:00 2001 From: RalseiDreemuurr Date: Sat, 13 Apr 2024 12:28:48 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=80=D0=B0?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=D0=B9=D0=BC=D0=B0=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=BA=D0=BE?= =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/modules/overmap/objects/outpost/outpost.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/overmap/objects/outpost/outpost.dm b/code/modules/overmap/objects/outpost/outpost.dm index 774057b68a08..f6dceda3ca74 100644 --- a/code/modules/overmap/objects/outpost/outpost.dm +++ b/code/modules/overmap/objects/outpost/outpost.dm @@ -240,7 +240,7 @@ signal.send_to_receivers() return -/datum/overmap/outpost/post_undocked(datum/overmap/ship/controlled/dock_requester) +/* /datum/overmap/outpost/post_undocked(datum/overmap/ship/controlled/dock_requester) // just get an arbitrary hangar dock. for the message source. at this point, // we don't have enough information to know which hangar the ship was docked to. // however, so long as the speaker is an atom on a virtual_level in the right mapzone, we should be good. @@ -249,11 +249,11 @@ for(var/datum/hangar_shaft/shaft as anything in shaft_datums) if(length(shaft.hangar_docks)) message_src = shaft.hangar_docks[1] - break + break */ // Prepare and send a radio message about the undock over Common, in Common. // See outpost post_docked() for some notes on what we're doing here. - var/atom/movable/virtualspeaker/v_speaker = new(null, token, null) +/* var/atom/movable/virtualspeaker/v_speaker = new(null, token, null) // Вырезано так как создаёт рантаймы при удалении корабля через манипулятор (омг) var/datum/signal/subspace/vocal/signal = new( message_src, FREQ_COMMON, @@ -263,7 +263,7 @@ list(SPAN_ROBOT), list(MODE_CUSTOM_SAY_EMOTE = "coldly states") ) - signal.send_to_receivers() + signal.send_to_receivers() */ /datum/overmap/outpost/proc/get_hangar_template(obj/docking_port/mobile/request_port) RETURN_TYPE(/datum/map_template/outpost) From e79afa30ec52bf22d86f6adf80c0c42403d462d7 Mon Sep 17 00:00:00 2001 From: RalseiDreemuurr Date: Sat, 13 Apr 2024 12:34:28 +0300 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"=D0=A4=D0=B8=D0=BA=D1=81=20=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D1=82=D0=B0=D0=B9=D0=BC=D0=B0=20=D0=BF=D1=80=D0=B8?= =?UTF-8?q?=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=BA?= =?UTF-8?q?=D0=BE=D1=80=D0=B0=D0=B1=D0=BB=D0=B5=D0=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b0dadd95726f2193d6dccf6faeba1db2eadb80b9. --- code/modules/overmap/objects/outpost/outpost.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/overmap/objects/outpost/outpost.dm b/code/modules/overmap/objects/outpost/outpost.dm index f6dceda3ca74..774057b68a08 100644 --- a/code/modules/overmap/objects/outpost/outpost.dm +++ b/code/modules/overmap/objects/outpost/outpost.dm @@ -240,7 +240,7 @@ signal.send_to_receivers() return -/* /datum/overmap/outpost/post_undocked(datum/overmap/ship/controlled/dock_requester) +/datum/overmap/outpost/post_undocked(datum/overmap/ship/controlled/dock_requester) // just get an arbitrary hangar dock. for the message source. at this point, // we don't have enough information to know which hangar the ship was docked to. // however, so long as the speaker is an atom on a virtual_level in the right mapzone, we should be good. @@ -249,11 +249,11 @@ for(var/datum/hangar_shaft/shaft as anything in shaft_datums) if(length(shaft.hangar_docks)) message_src = shaft.hangar_docks[1] - break */ + break // Prepare and send a radio message about the undock over Common, in Common. // See outpost post_docked() for some notes on what we're doing here. -/* var/atom/movable/virtualspeaker/v_speaker = new(null, token, null) // Вырезано так как создаёт рантаймы при удалении корабля через манипулятор (омг) + var/atom/movable/virtualspeaker/v_speaker = new(null, token, null) var/datum/signal/subspace/vocal/signal = new( message_src, FREQ_COMMON, @@ -263,7 +263,7 @@ list(SPAN_ROBOT), list(MODE_CUSTOM_SAY_EMOTE = "coldly states") ) - signal.send_to_receivers() */ + signal.send_to_receivers() /datum/overmap/outpost/proc/get_hangar_template(obj/docking_port/mobile/request_port) RETURN_TYPE(/datum/map_template/outpost) From 3f4c0e1085e8eb83948b43b65571eb6856d19efe Mon Sep 17 00:00:00 2001 From: RalseiDreemuurr Date: Sat, 13 Apr 2024 12:35:31 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=80=D0=B0?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=D0=B9=D0=BC=D0=B0=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=BA=D0=BE?= =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/modules/overmap/objects/outpost/outpost.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/overmap/objects/outpost/outpost.dm b/code/modules/overmap/objects/outpost/outpost.dm index 774057b68a08..bcaf3972cc4a 100644 --- a/code/modules/overmap/objects/outpost/outpost.dm +++ b/code/modules/overmap/objects/outpost/outpost.dm @@ -240,7 +240,7 @@ signal.send_to_receivers() return -/datum/overmap/outpost/post_undocked(datum/overmap/ship/controlled/dock_requester) +/* /datum/overmap/outpost/post_undocked(datum/overmap/ship/controlled/dock_requester) // Вырезано, так как создаёт рантаймы при удалении корабля через манипулятор // just get an arbitrary hangar dock. for the message source. at this point, // we don't have enough information to know which hangar the ship was docked to. // however, so long as the speaker is an atom on a virtual_level in the right mapzone, we should be good. @@ -263,7 +263,7 @@ list(SPAN_ROBOT), list(MODE_CUSTOM_SAY_EMOTE = "coldly states") ) - signal.send_to_receivers() + signal.send_to_receivers() */ /datum/overmap/outpost/proc/get_hangar_template(obj/docking_port/mobile/request_port) RETURN_TYPE(/datum/map_template/outpost)