add: Rust UUID & Unbundle sun (#7069) [testmerge][42606ee]

Author: actions-user

code/__HELPERS/unique_ids.dm

@@ -14,8 +14,6 @@
 //   var/myUID = mydatum.UID()
 //   var/datum/D = locateUID(myUID)
 
-/// The next UID to be used (Increments by 1 for each UID)
-GLOBAL_VAR_INIT(next_unique_datum_id, 1)
 /// Log of all UIDs created in the round. Assoc list with type as key and amount as value
 GLOBAL_LIST_EMPTY(uid_log)
 
@@ -27,28 +25,15 @@ GLOBAL_LIST_EMPTY(uid_log)
   */
 /datum/proc/UID()
 	if(!unique_datum_id)
-		var/tag_backup = tag
-		tag = null // Grab the raw ref, not the tag
-		// num2text can output 8 significant figures max. If we go above 10 million UIDs in a round, shit breaks
-		unique_datum_id = "\ref[src]_[num2text(GLOB.next_unique_datum_id++, 8)]"
-		tag = tag_backup
+		unique_datum_id = RUSTLIB_CALL(get_uuid, src)
 		GLOB.uid_log[type]++
-	return unique_datum_id
-
-/datum/proc/get_num_uid()
-	if(numeric_datum_id)
-		return numeric_datum_id
-
-	numeric_datum_id = GLOB.next_unique_datum_id
 
-	GLOB.next_unique_datum_id++
-	GLOB.uid_log[type]++
-
-	return numeric_datum_id
+	return unique_datum_id
 
 /proc/UID_of(datum/target)
 	if(!isdatum(target))
 		CRASH("Non-datum passed as argument.")
+
 	return target.UID()
 
 
@@ -59,19 +44,10 @@ GLOBAL_LIST_EMPTY(uid_log)
   * Returns the datum, if found
   */
 /proc/locateUID(uid)
-	if(!istext(uid))
-		return null
-
-	var/splitat = findlasttext(uid, "_")
-
-	if(!splitat)
-		return null
-
-	var/datum/D = locate(copytext(uid, 1, splitat))
+	if(!uid)
+		return
 
-	if(D && D.unique_datum_id == uid)
-		return D
-	return null
+	return RUSTLIB_CALL(get_by_uuid, uid)
 
 
 /**
@@ -101,7 +77,7 @@ GLOBAL_LIST_EMPTY(uid_log)
 		return
 
 	var/list/sorted = sortTim(GLOB.uid_log, cmp = /proc/cmp_numeric_dsc, associative = TRUE)
-	var/list/text = list("<h1>UID Log</h1>", "<p>Current UID: [GLOB.next_unique_datum_id]</p>", "<ul>")
+	var/list/text = list("<h1>UID Log</h1>", "<p>Current UID: [RUSTLIB_CALL(get_uuid_counter_value)]</p>", "<ul>")
 	for(var/key in sorted)
 		text += "<li>[key] - [sorted[key]]</li>"
 

code/controllers/subsystem/sun.dm

@@ -6,35 +6,53 @@ SUBSYSTEM_DEF(sun)
 	offline_implications = "Solar panels will no longer rotate. No immediate action is needed."
 	cpu_display = SS_CPUDISPLAY_LOW
 	ss_id = "sun"
-	var/solar_gen_rate = 1500
-
 
-/datum/controller/subsystem/sun/Initialize()
-	RUSTLIB_CALL(sun_subsystem_initialize)
-	return SS_INIT_SUCCESS
+	var/angle
+	var/dx
+	var/dy
+	var/rate
 
+	var/list/solars	= list()
+	var/solar_gen_rate = 1500
 
-/datum/controller/subsystem/sun/get_stat_details()
-	return "P:[get_solars_length()]"
 
+/datum/controller/subsystem/sun/Initialize()
+	// Lets work out an angle for the "sun" to rotate around the station
+	angle = rand (0, 360)			// the station position to the sun is randomised at round start
+	rate = rand(50, 200) / 100			// 50% - 200% of standard rotation
 
-/datum/controller/subsystem/sun/fire()
-	RUSTLIB_CALL(sun_subsystem_fire)
+	if(prob(50))					// same chance to rotate clockwise than counter-clockwise
+		rate = -rate
 
-/datum/controller/subsystem/sun/proc/get_angle()
-	return RUSTLIB_CALL(get_sun_angle)
+	// Solar consoles need to load after machines init, so this handles that
+	for(var/obj/machinery/power/solar_control/control in solars)
+		control.setup()
 
-/datum/controller/subsystem/sun/proc/add_solar(obj/machinery/power/solar_control/solar)
-	return RUSTLIB_CALL(add_solar, solar, solar.get_num_uid())
+	return SS_INIT_SUCCESS
 
-/datum/controller/subsystem/sun/proc/remove_solar(obj/machinery/power/solar_control/solar)
-	return RUSTLIB_CALL(remove_solar, solar.get_num_uid())
 
-/datum/controller/subsystem/sun/proc/get_solars_length()
-	return RUSTLIB_CALL(get_solars_length)
+/datum/controller/subsystem/sun/get_stat_details()
+	return "P:[solars.len]"
 
-/datum/controller/subsystem/sun/proc/get_dy()
-	return RUSTLIB_CALL(get_sun_dy)
 
-/datum/controller/subsystem/sun/proc/get_dx()
-	return RUSTLIB_CALL(get_sun_dx)
+/datum/controller/subsystem/sun/fire()
+	angle = (360 + angle + rate * 6) % 360	 // increase/decrease the angle to the sun, adjusted by the rate
+
+	// now calculate and cache the (dx,dy) increments for line drawing
+	var/ang_sin = sin(angle)
+	var/ang_cos = cos(angle)
+
+	if(abs(ang_sin) < abs(ang_cos))
+		dx = ang_sin / abs(ang_cos)
+		dy = ang_cos / abs(ang_cos)
+	else
+		dx = ang_sin / abs(ang_sin)
+		dy = ang_cos / abs(ang_sin)
+
+	// now tell the solar control computers to update their status and linked devices
+	for(var/obj/machinery/power/solar_control/control in solars)
+		if(!control.powernet)
+			solars.Remove(control)
+			continue
+
+		control.update()

code/datums/datum.dm

@@ -26,7 +26,6 @@
 	var/list/list/signal_procs
 
 	var/tmp/unique_datum_id = null
-	var/tmp/numeric_datum_id = null
 	/// Datum level flags
 	var/datum_flags = NONE
 
@@ -67,6 +66,9 @@
 	tag = null
 	weak_reference = null //ensure prompt GCing of weakref.
 
+	if(unique_datum_id)
+		RUSTLIB_CALL(untick_by_uuid, unique_datum_id)
+
 	var/list/timers = active_timers
 	active_timers = null
 	for(var/thing in timers)
@@ -93,7 +95,6 @@
 
 	return QDEL_HINT_QUEUE
 
-
 ///Only override this if you know what you're doing. You do not know what you're doing
 ///This is a threat
 /datum/proc/_clear_signal_refs()

code/datums/weakrefs.dm

@@ -73,5 +73,5 @@
  * This will return `null` if the datum was deleted. This MUST be respected.
  */
 /datum/weakref/proc/resolve()
-	var/datum/D = locate(reference)
-	return (!QDELETED(D) && D.weak_reference == src) ? D : null
+	var/datum/datum = locateUID(reference)
+	return (!QDELETED(datum) && datum.weak_reference == src) ? datum : null

code/game/machinery/computer/camera.dm

@@ -133,10 +133,12 @@
 		return
 
 	if(action == "switch_camera")
-		var/obj/machinery/camera/selected_camera = locate(params["camera"]) in GLOB.cameranet.cameras
+		var/obj/machinery/camera/selected_camera = locateUID(params["camera"])
+		
 		if(isnull(selected_camera))
 			to_chat(usr, span_warning("ОШИБКА. Камера не найдена."))
 			return
+
 		active_camera?.computers_watched_by -= src
 		active_camera = selected_camera
 		active_camera.computers_watched_by += src

code/modules/antagonists/vampire/vampire_datum.dm

@@ -508,8 +508,8 @@
 	var/ay = owner.current.y
 
 	for(var/i = 1 to 20)
-		ax += SSsun.get_dy()
-		ay += SSsun.get_dx()
+		ax += SSsun.dy
+		ay += SSsun.dx
 
 		var/turf/T = locate(round(ax, 0.5), round(ay, 0.5), owner.current.z)
 

code/modules/hydroponics/gene_modder.dm

@@ -274,7 +274,7 @@
 
 	var/mob/user = ui.user
 
-	target = seed?.get_gene(params["id"])
+	target = locateUID(params["id"])
 
 	switch(action)
 		if("eject_seed")

code/modules/lootpanel/ui.dm

@@ -17,15 +17,17 @@
 /// Clicks an object from the contents. Validates the object and the user
 /datum/lootpanel/proc/grab(mob/user, list/params)
 	var/uid = params["uid"]
+
 	if(isnull(uid))
 		return FALSE
 
 	if(!source_turf.Adjacent(user)) // Source tile is no longer valid
 		reset_contents()
 		return FALSE
 
-	var/datum/search_object/index = locate(uid) in contents
+	var/datum/search_object/index = locateUID(uid)
 	var/atom/thing = index?.item
+	
 	if(QDELETED(index) || QDELETED(thing)) // Obj is gone
 		return FALSE
 

code/modules/mob/dead/observer/observer.dm

@@ -637,7 +637,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 			ManualFollow(target)
 
 	if(href_list["follow"])
-		var/atom/target = locate(href_list["follow"])
+		var/atom/target = locateUID(href_list["follow"])
 		if(target)
 			ManualFollow(target)
 

code/modules/mob/dead/observer/orbit.dm

@@ -38,6 +38,7 @@
 /datum/orbit_menu/proc/handle_orbit_action(list/params)
 	var/ref = params["ref"]
 	var/atom/movable/poi = (locate(ref) in GLOB.mob_list) || (locate(ref) in GLOB.poi_list)
+	
 	if(!poi)
 		return