Merge pull request #2 from Absolucy/plexora-bot-pr

meow
flleeppyy · Sep 5, 2024 · b561cca · b561cca
2 parents c570713 + 25844dc
commit b561cca
Show file tree

Hide file tree

Showing 6 changed files with 285 additions and 305 deletions.
diff --git a/code/__DEFINES/~monkestation/helpers.dm b/code/__DEFINES/~monkestation/helpers.dm
@@ -0,0 +1,7 @@
+/// Until a condition is true, sleep, or until a certain amount of time has passed.
+/// Basically, UNTIL() but with a timeout.
+#define UNTIL_OR_TIMEOUT(Condition, Timeout) \
+	do { \
+		var/__end_time = REALTIMEOFDAY + (Timeout); \
+		UNTIL((Condition) || (REALTIMEOFDAY > __end_time)); \
+	} while(0)
diff --git a/code/datums/http.dm b/code/datums/http.dm
@@ -11,6 +11,11 @@
 
 	var/_raw_response
 
+/datum/http_request/New(...)
+	. = ..()
+	if(length(args))
+		src.prepare(arglist(args))
+
 /datum/http_request/proc/prepare(method, url, body = "", list/headers, output_file)
 	if (!length(headers))
 		headers = ""