Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

code/modules/admin/admin_investigate.dm

@@ -48,3 +48,5 @@
 			else
 				to_chat(src, "<span class='filter_adminlog warning'>Error: admin_investigate: Href Logging is not on.</span>")
 				return
+
+#undef INVESTIGATE_DIR

code/modules/admin/verbs/SDQL2/SDQL_2.dm

@@ -168,9 +168,6 @@ Example: USING PROCCALL = BLOCKING, SELECT = FORCE_NULLS, PRIORITY = HIGH SELECT
 #define SDQL2_STATE_SWITCHING 5
 #define SDQL2_STATE_HALTING 6
 
-#define SDQL2_VALID_OPTION_TYPES list("proccall", "select", "priority", "autogc")
-#define SDQL2_VALID_OPTION_VALUES list("async", "blocking", "force_nulls", "skip_nulls", "high", "normal", "keep_alive")
-
 #define SDQL2_OPTION_SELECT_OUTPUT_SKIP_NULLS			(1<<0)
 #define SDQL2_OPTION_BLOCKING_CALLS						(1<<1)
 #define SDQL2_OPTION_HIGH_PRIORITY						(1<<2)		//High priority SDQL query, allow using almost all of the tick.

code/modules/admin/verbs/buildmode.dm

@@ -877,3 +877,4 @@
 #undef BUILDMODE_LIGHTS
 #undef BUILDMODE_AI
 #undef LAST_BUILDMODE
+#undef BUILDMODE_DROP

code/modules/admin/verbs/get_player_status.dm

@@ -42,3 +42,5 @@
 
 	message += "#### Over all, there are [players] eligible players, of which [inactives] were hidden due to inactivity.  ####"
 	to_chat(usr, SPAN_NOTICE(message))
+
+#undef INACTIVITY_CAP

code/modules/admin/verbs/lightning_strike.dm

@@ -95,5 +95,6 @@
 				C.ear_deaf += 10
 			to_chat(L, span("danger", "Lightning struck nearby, and the thunderclap is deafening!"))
 
+#undef LIGHTNING_REDIRECT_RANGE
 #undef LIGHTNING_ZAP_RANGE
 #undef LIGHTNING_POWER

code/modules/admin/verbs/modify_robot.dm

@@ -76,7 +76,7 @@
 					var/obj/item/weapon/robot_module/robot/robot_type = new module_type(robot)
 					robot.emag_items = 1
 					if(!istype(robot_type, /obj/item/weapon/robot_module/robot/))
-						robot.Destroy()
+						qdel(robot)
 						break
 					var/list/all_modules = robot.module.modules
 					all_modules += robot.module.emag
@@ -134,7 +134,7 @@
 									target.module.synths.Add(item_with_matter.plastic)
 								else
 									item_with_matter.plastic = target.module.synths[found]
-					robot.Destroy()
+					qdel(robot)
 			if(MODIFIY_ROBOT_MODULE_REMOVE)
 				while(TRUE)
 					var/list/active_modules = target.module.modules
@@ -326,7 +326,7 @@
 				target.hud_used.update_robot_modules_display(TRUE)
 				target.modtype = initial(target.modtype)
 				target.module.Reset(target)
-				target.module.Destroy()
+				qdel(target.module)
 				target.modtype = selected_module
 				var/module_type = robot_modules[selected_module]
 				target.transform_with_anim()