From 9f53d396b5ed7901edaefd2aba3aedf7d367ab34 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sun, 14 Jun 2020 05:54:40 -0700
Subject: [PATCH] fix

---
 code/game/machinery/spaceheater.dm | 2 +-
 code/modules/admin/topic.dm        | 2 +-
 code/modules/mob/mob_helpers.dm    | 4 ++--
 code/modules/power/solar.dm        | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index c2b54cd9e89..6fbf2cb6d79 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -128,7 +128,7 @@
 				var/value = text2num(href_list["val"])
 
 				// limit to 0-90 degC
-				set_temperature = dd_range(T0C, T0C + 90, set_temperature + value)
+				set_temperature = clamp(set_temperature + value, T0C, T0C + 90)
 
 			if("cellremove")
 				if(panel_open && cell && !usr.get_active_hand())
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 57fea7b95a1..8a927ac454a 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1635,7 +1635,7 @@
 			alert("Removed:\n" + jointext(removed_paths, "\n"))
 
 		var/list/offset = splittext(href_list["offset"],",")
-		var/number = dd_range(1, 100, text2num(href_list["object_count"]))
+		var/number = clamp(text2num(href_list["object_count"]), 1, 100)
 		var/X = offset.len > 0 ? text2num(offset[1]) : 0
 		var/Y = offset.len > 1 ? text2num(offset[2]) : 0
 		var/Z = offset.len > 2 ? text2num(offset[3]) : 0
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 9b62acea5ca..88650327e17 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -290,9 +290,9 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 		var/x
 		for(x=0; x<duration, x++)
 			if(aiEyeFlag)
-				M.client.eye = locate(dd_range(1,oldeye.loc.x+rand(-strength,strength),world.maxx),dd_range(1,oldeye.loc.y+rand(-strength,strength),world.maxy),oldeye.loc.z)
+				M.client.eye = locate(clamp(oldeye.loc.x+rand(-strength,strength),1,world.maxx),clamp(oldeye.loc.y+rand(-strength,strength),world.maxy),1,oldeye.loc.z)
 			else
-				M.client.eye = locate(dd_range(1,M.loc.x+rand(-strength,strength),world.maxx),dd_range(1,M.loc.y+rand(-strength,strength),world.maxy),M.loc.z)
+				M.client.eye = locate(clamp(M.loc.x+rand(-strength,strength),1,world.maxx),clamp(M.loc.y+rand(-strength,strength),world.maxy),1,M.loc.z)
 			sleep(1)
 		M.client.eye=oldeye
 		M.shakecamera = 0
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 3ed2a43107c..c11080ee491 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -493,14 +493,14 @@ GLOBAL_LIST_EMPTY(solars_list)
 
 	if(href_list["rate control"])
 		if(href_list["cdir"])
-			src.cdir = dd_range(0,359,(360+src.cdir+text2num(href_list["cdir"]))%360)
+			src.cdir = clamp((360+src.cdir+text2num(href_list["cdir"]))%360, 0, 359)
 			src.targetdir = src.cdir
 			if(track == 2) //manual update, so losing auto-tracking
 				track = 0
 			spawn(1)
 				set_panels(cdir)
 		if(href_list["tdir"])
-			src.trackrate = dd_range(-7200,7200,src.trackrate+text2num(href_list["tdir"]))
+			src.trackrate = clamp(src.trackrate+text2num(href_list["tdir"]), -7200, 7200)
 			if(src.trackrate) nexttime = world.time + 36000/abs(trackrate)
 
 	if(href_list["track"])