insert funny commit name here

BeeStation · Nov 19, 2024 · 074b8a8 · 074b8a8
1 parent b664a7a
commit 074b8a8
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 16 deletions.
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
@@ -55,9 +55,6 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/door/window)
 	AddElement(/datum/element/connect_loc, loc_connections)
 	RegisterSignal(src, COMSIG_COMPONENT_NTNET_RECEIVE, PROC_REF(ntnet_receive))
 
-/obj/machinery/door/window/ComponentInitialize()
-	. = ..()
-	AddComponent(/datum/component/ntnet_interface)
 
 /obj/machinery/door/window/Destroy()
 	set_density(FALSE)

diff --git a/code/game/machinery/telecomms/computers/telemonitor.dm b/code/game/machinery/telecomms/computers/telemonitor.dm
@@ -77,10 +77,6 @@
 		if(!A.network_root_id)
 			log_telecomms("Area '[A.name]([REF(A)])' has no network network_root_id, force assigning in object [src]([REF(src)])")
 			SSnetworks.lookup_area_root_id(A)
-			new_network_id = NETWORK_NAME_COMBINE(A.network_root_id, new_network_id) // should result in something like SS13.SERVER.TCOMMSAT
-		else
-			log_telecomms("Created [src]([REF(src)] in nullspace, assuming network to be in station")
-			new_network_id = NETWORK_NAME_COMBINE(STATION_NETWORK_ROOT, new_network_id) // should result in something like SS13.SERVER.TCOMMSAT
 	new_network_id = simple_network_name_fix(new_network_id) // make sure the network name is valid
 	var/datum/ntnet/new_network = SSnetworks.create_network_simple(new_network_id)
 	new_network.move_interface(GetComponent(/datum/component/ntnet_interface), new_network_id, network_id)

diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm
@@ -166,9 +166,6 @@ GLOBAL_LIST_EMPTY(telecomms_list)
 		log_telecomms("Area '[A.name]([REF(A)])' has no network network_root_id, force assigning in object [src]([REF(src)])")
 		SSnetworks.lookup_area_root_id(A)
 		new_network_id = NETWORK_NAME_COMBINE(A.network_root_id, new_network_id) // should result in something like SS13.SERVER.TCOMMSAT
-	else
-		log_telecomms("Created [src]([REF(src)] in nullspace, assuming network to be in station")
-		new_network_id = NETWORK_NAME_COMBINE(STATION_NETWORK_ROOT, new_network_id) // should result in something like SS13.SERVER.TCOMMSAT
 	new_network_id = simple_network_name_fix(new_network_id) // make sure the network name is valid
 	var/datum/ntnet/new_network = SSnetworks.create_network_simple(new_network_id)
 	new_network.move_interface(GetComponent(/datum/component/ntnet_interface), new_network_id, network_id)

diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
@@ -102,10 +102,7 @@ CREATION_TEST_IGNORE_SELF(/obj)
 			if(!A.network_root_id)
 				log_telecomms("Area '[A.name]([REF(A)])' has no network network_root_id, force assigning in object [src]([REF(src)])")
 				SSnetworks.lookup_area_root_id(A)
-			network_id = NETWORK_NAME_COMBINE(A.network_root_id, network_id) // I regret nothing!!
-		else
-			log_telecomms("Created [src]([REF(src)] in nullspace, assuming network to be in station")
-			network_id = NETWORK_NAME_COMBINE(STATION_NETWORK_ROOT, network_id) // I regret nothing!!
+			network_id = NETWORK_NAME_COMBINE(A.network_root_id, network_id) // I regret everything!!
 		AddComponent(/datum/component/ntnet_interface, network_id, id_tag)
 		/// Needs to run before as ComponentInitialize runs after this statement...why do we have ComponentInitialize again?
 

diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm
@@ -180,6 +180,7 @@
 // PDA Version of the SSD, contains all the programs that PDAs have by default, however with the variables of the SSD.
 /obj/item/computer_hardware/hard_drive/small/pda/install_default_programs()
 	store_file(new /datum/computer_file/program/messenger(src))
+	store_file(new /datum/computer_file/program/chatclient(src))
 	store_file(new /datum/computer_file/program/notepad(src))
 	store_file(new/datum/computer_file/program/crew_manifest(src))
 	store_file(new/datum/computer_file/program/databank_uplink(src))	// Wiki Uplink, allows the user to access the Wiki from in-game!

diff --git a/tgui/packages/tgui/interfaces/NtosNetChat.js b/tgui/packages/tgui/interfaces/NtosNetChat.js
@@ -40,7 +40,7 @@ const NoChannelDimmer = (props, context) => {
 };
 
 const ChannelList = ({ all_channels, active_channel, act }) => (
-  <Section title="Channels" fill>
+  <Section title="Channels" fill fluid grow={1} height="fill">
     <Button.Input
       fluid
       content="New Channel..."
@@ -298,7 +298,7 @@ export const NtosNetChat = (props, context) => {
             <Flex.Item fill>
               <ChannelList all_channels={all_channels} active_channel={active_channel} act={act} />
             </Flex.Item>
-            <Flex.Item grow={1} fill>
+            <Flex.Item>
               <UsernameSection username={username} can_admin={can_admin} adminmode={adminmode} act={act} />
             </Flex.Item>
           </Flex>