[MIRROR] Linter diagnostics + bans non-var relative pathing

code/modules/client/client procs.dm

@@ -412,7 +412,6 @@
 	query_accesslog.Execute()
 	qdel(query_accesslog) //CHOMPEdit TGSQL
 
-#undef TOPIC_SPAM_DELAY
 #undef UPLOAD_LIMIT
 #undef MIN_CLIENT_VERSION
 
@@ -442,17 +441,17 @@
 		//Precache the client with all other assets slowly, so as to not block other browse() calls
 		addtimer(CALLBACK(GLOBAL_PROC, /proc/getFilesSlow, src, SSassets.preload, FALSE), 5 SECONDS)
 
-mob/proc/MayRespawn()
+/mob/proc/MayRespawn()
 	return 0
 
-client/proc/MayRespawn()
+/client/proc/MayRespawn()
 	if(mob)
 		return mob.MayRespawn()
 
 	// Something went wrong, client is usually kicked or transfered to a new mob at this point
 	return 0
 
-client/verb/character_setup()
+/client/verb/character_setup()
 	set name = "Character Setup"
 	set category = "Preferences"
 	if(prefs)

code/modules/client/preference_setup/general/01_basic.dm

@@ -1,8 +1,8 @@
-datum/preferences
+/datum/preferences
 	var/biological_gender = MALE
 	var/identifying_gender = MALE
 
-datum/preferences/proc/set_biological_gender(var/gender)
+/datum/preferences/proc/set_biological_gender(var/gender)
 	biological_gender = gender
 	identifying_gender = gender
 
@@ -140,7 +140,13 @@ datum/preferences/proc/set_biological_gender(var/gender)
 		return TOPIC_REFRESH
 
 	else if(href_list["metadata"])
+<<<<<<< HEAD
 		var/new_metadata = sanitize(input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , html_decode(pref.metadata)) as message, MAX_RECORD_LENGTH, extra = 0) //VOREStation Edit
+||||||| parent of 18962f7a77... Merge pull request #10719 from VOREStation/upstream-merge-8150
+		var/new_metadata = sanitize(input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , html_decode(pref.metadata)) as message, extra = 0) //VOREStation Edit
+=======
+		var/new_metadata = sanitize(input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , html_decode(pref.metadata)) as message|null, extra = 0) //VOREStation Edit
+>>>>>>> 18962f7a77... Merge pull request #10719 from VOREStation/upstream-merge-8150
 		if(new_metadata && CanUseTopic(user))
 			pref.metadata = new_metadata
 			return TOPIC_REFRESH

code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -100,7 +100,7 @@
 	display_name = "trenchcoat, grey"
 	path = /obj/item/clothing/suit/storage/trench/grey
 
-datum/gear/suit/duster
+/datum/gear/suit/duster
 	display_name = "cowboy duster"
 	path = /obj/item/clothing/suit/storage/duster
 

code/modules/client/preference_setup/occupation/occupation.dm

@@ -1,8 +1,3 @@
-//used for pref.alternate_option
-#define GET_RANDOM_JOB 0
-#define BE_ASSISTANT 1
-#define RETURN_TO_LOBBY 2
-
 /datum/category_item/player_setup_item/occupation
 	name = "Occupation"
 	sort_order = 1

code/modules/client/preferences.dm

@@ -2,7 +2,7 @@
 
 var/list/preferences_datums = list()
 
-datum/preferences
+/datum/preferences
 	//doohickeys for savefiles
 	var/path
 	var/default_slot = 1				//Holder so it doesn't default to slot 1, rather the last one used

code/modules/client/preferences_spawnpoints.dm

@@ -15,25 +15,25 @@ var/list/spawntypes = list()
 	var/announce_channel = "Common"
 	var/allowed_mob_types = JOB_SILICON|JOB_CARBON
 
-	proc/check_job_spawning(job)
-		if(restrict_job && !(job in restrict_job))
-			return 0
+/datum/spawnpoint/proc/check_job_spawning(job)
+	if(restrict_job && !(job in restrict_job))
+		return 0
 
-		if(disallow_job && (job in disallow_job))
-			return 0
+	if(disallow_job && (job in disallow_job))
+		return 0
 
-		var/datum/job/J = SSjob.get_job(job)
-		if(!J) // Couldn't find, admin shenanigans? Allow it
-			return 1
-
-		if(J.offmap_spawn && !(job in restrict_job))
-			return 0
-
-		if(!(J.mob_type & allowed_mob_types))
-			return 0
-		
+	var/datum/job/J = SSjob.get_job(job)
+	if(!J) // Couldn't find, admin shenanigans? Allow it
 		return 1
 
+	if(J.offmap_spawn && !(job in restrict_job))
+		return 0
+
+	if(!(J.mob_type & allowed_mob_types))
+		return 0
+	
+	return 1
+
 /datum/spawnpoint/proc/get_spawn_position()
 	return get_turf(pick(turfs))