From 7a28cc1883f308c156477def16e3643595628e44 Mon Sep 17 00:00:00 2001
From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Date: Mon, 22 Apr 2024 13:47:23 +0200
Subject: [PATCH] More optimizations (#18987)

Removed a background set.
Refactored away some world loops.
---
 .../secrets/admin_secrets/move_shuttle.dm     |  6 +-
 code/modules/cargo/randomstock.dm             | 12 +++-
 .../hydroponics/spreading/spreading.dm        |  4 +-
 .../xenoarchaeology/tools/tools_locater.dm    | 32 +++++-----
 .../fluffyghost-moreoptimizations.yml         | 59 +++++++++++++++++++
 5 files changed, 90 insertions(+), 23 deletions(-)
 create mode 100644 html/changelogs/fluffyghost-moreoptimizations.yml

diff --git a/code/modules/admin/secrets/admin_secrets/move_shuttle.dm b/code/modules/admin/secrets/admin_secrets/move_shuttle.dm
index 46249e57081..2ec24dcef9a 100644
--- a/code/modules/admin/secrets/admin_secrets/move_shuttle.dm
+++ b/code/modules/admin/secrets/admin_secrets/move_shuttle.dm
@@ -21,8 +21,10 @@
 	var/datum/shuttle/S = SSshuttle.shuttles[shuttle_tag]
 
 	var/list/destinations = list()
-	for(var/obj/effect/shuttle_landmark/WP in world)
-		destinations += WP
+	for(var/k in SSshuttle.registered_shuttle_landmarks)
+		var/obj/effect/shuttle_landmark/WP = SSshuttle.registered_shuttle_landmarks[k]
+		if(istype(WP))
+			destinations += WP
 
 	var/obj/effect/shuttle_landmark/destination = input(user, "Select the destination.") as null|anything in destinations
 	if(!destination) return
diff --git a/code/modules/cargo/randomstock.dm b/code/modules/cargo/randomstock.dm
index ce8529c874e..188f570eed0 100644
--- a/code/modules/cargo/randomstock.dm
+++ b/code/modules/cargo/randomstock.dm
@@ -132,7 +132,7 @@ var/list/global/random_stock_large = list()
 	//First, we spawn the larger items
 	//Large objects are spawned on preset locations around cargo
 	//These locations are designated by large stock marker objects, which are manually mapped in
-	for (var/obj/effect/large_stock_marker/LSM in world)
+	for (var/obj/effect/large_stock_marker/LSM in GLOB.large_stock_markers)
 		if (prob(STOCK_LARGE_PROB))
 			var/type = pickweight(random_stock_large)
 			if (type)
@@ -235,9 +235,17 @@ var/list/global/random_stock_large = list()
 		var/turf/T = get_turf(a)
 		T.contents = shuffle(T.contents)
 
-
+GLOBAL_LIST_EMPTY_TYPED(large_stock_markers, /obj/effect/large_stock_marker)
 /obj/effect/large_stock_marker
 	name = "Large Stock Marker"
 	desc = "This marks a place where a large object could spawn in cargo"
 	icon = 'icons/mob/screen/generic.dmi'
 	icon_state = "x3"
+
+/obj/effect/large_stock_marker/Initialize(mapload, ...)
+	. = ..()
+	GLOB.large_stock_markers += src
+
+/obj/effect/large_stock_marker/Destroy()
+	GLOB.large_stock_markers -= src
+	. = ..()
diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm
index c8811c9c5ed..370a182808d 100644
--- a/code/modules/hydroponics/spreading/spreading.dm
+++ b/code/modules/hydroponics/spreading/spreading.dm
@@ -202,9 +202,9 @@
 		density = 0
 
 /obj/effect/plant/proc/calc_dir()
-	set background = 1
 	var/turf/T = get_turf(src)
-	if(!istype(T)) return
+	if(!istype(T))
+		return
 
 	var/direction = 16
 
diff --git a/code/modules/research/xenoarchaeology/tools/tools_locater.dm b/code/modules/research/xenoarchaeology/tools/tools_locater.dm
index 5fdd5e53dbb..157957049a8 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_locater.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_locater.dm
@@ -37,24 +37,22 @@
 			icon_state = "pinonnull"
 			scan_ticks++
 			if(prob(scan_ticks * 10))
-				spawn(0)
-					set background = 1
-					if(datum_flags & DF_ISPROCESSING)
-						//scan radios in the world to try and find one
-						var/cur_dist = 999
-						for(var/obj/item/device/radio/beacon/R in world)
-							if(R.z == src.z && R.get_frequency() == src.frequency)
-								var/check_dist = get_dist(src,R)
-								if(check_dist < cur_dist)
-									cur_dist = check_dist
-									target_radio = R
+				if(datum_flags & DF_ISPROCESSING)
+					//scan radios in the world to try and find one
+					var/cur_dist = 999
+					for(var/obj/item/device/radio/beacon/R in GLOB.teleportbeacons)
+						if(R.z == src.z && R.get_frequency() == src.frequency)
+							var/check_dist = get_dist(src,R)
+							if(check_dist < cur_dist)
+								cur_dist = check_dist
+								target_radio = R
 
-						scan_ticks = 0
-						var/turf/T = get_turf(src)
-						if(target_radio)
-							T.visible_message("[icon2html(src, viewers(get_turf(T)))] [src] [pick("chirps","chirrups","cheeps")] happily.")
-						else
-							T.visible_message("[icon2html(src, viewers(get_turf(T)))] [src] [pick("chirps","chirrups","cheeps")] sadly.")
+					scan_ticks = 0
+					var/turf/T = get_turf(src)
+					if(target_radio)
+						T.visible_message("[icon2html(src, viewers(get_turf(T)))] [src] [pick("chirps","chirrups","cheeps")] happily.")
+					else
+						T.visible_message("[icon2html(src, viewers(get_turf(T)))] [src] [pick("chirps","chirrups","cheeps")] sadly.")
 		else
 			icon_state = "pinoff"
 
diff --git a/html/changelogs/fluffyghost-moreoptimizations.yml b/html/changelogs/fluffyghost-moreoptimizations.yml
new file mode 100644
index 00000000000..2f7406943df
--- /dev/null
+++ b/html/changelogs/fluffyghost-moreoptimizations.yml
@@ -0,0 +1,59 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: FluffyGhost
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - code_imp: "Removed a background set."
+  - refactor: "Refactored away some world loops."