From 9e7de62450afb9c2309e04adf29c4f9c72872e72 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Thu, 15 Sep 2022 09:51:15 -0400
Subject: [PATCH 1/2] Fixes some adminverb runtimes

---
 code/game/jobs/job_controller.dm        | 2 +-
 code/modules/admin/verbs/buildmode.dm   | 2 +-
 code/modules/admin/verbs/randomverbs.dm | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 5a414430ea..570fbf32ab 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -393,7 +393,7 @@ var/global/datum/controller/occupations/job_master
 		//Equip custom gear loadout.
 		var/list/custom_equip_slots = list()
 		var/list/custom_equip_leftovers = list()
-		if(H.client.prefs.gear && H.client.prefs.gear.len && !(job.mob_type & JOB_SILICON))
+		if(H.client && H.client.prefs && H.client.prefs.gear && H.client.prefs.gear.len && !(job.mob_type & JOB_SILICON))
 			for(var/thing in H.client.prefs.gear)
 				var/datum/gear/G = gear_datums[thing]
 				if(!G) //Not a real gear datum (maybe removed, as this is loaded from their savefile)
diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm
index d9aacdcaca..485cc88e22 100644
--- a/code/modules/admin/verbs/buildmode.dm
+++ b/code/modules/admin/verbs/buildmode.dm
@@ -364,7 +364,7 @@
 				if(ispath(holder.buildmode.objholder,/turf))
 					var/turf/T = get_turf(object)
 					T.ChangeTurf(holder.buildmode.objholder)
-				else
+				else if(ispath(holder.buildmode.objholder))
 					var/obj/A = new holder.buildmode.objholder (get_turf(object))
 					A.set_dir(holder.builddir.dir)
 			else if(pa.Find("right"))
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 960d3a6b99..6fa3f3b01e 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -529,10 +529,18 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	//If desired, apply equipment.
 	if(equipment)
 		if(charjob)
+<<<<<<< HEAD
 			job_master.EquipRank(new_character, charjob, 1, announce)
 			new_character.mind.assigned_role = charjob
 			new_character.mind.role_alt_title = job_master.GetPlayerAltTitle(new_character, charjob)
 		equip_custom_items(new_character)	//CHOMPEdit readded to enable custom_item.txt
+=======
+			job_master.EquipRank(new_character, charjob, 1)
+			if(new_character.mind)
+				new_character.mind.assigned_role = charjob
+				new_character.mind.role_alt_title = job_master.GetPlayerAltTitle(new_character, charjob)
+		//equip_custom_items(new_character)	//VOREStation Removal
+>>>>>>> 607d730743... Merge pull request #13738 from Heroman3003/admin-runtimes
 
 	//If desired, add records.
 	if(records)

From e62c484dda30de8c92c9ce1afc93b5974575133b Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 18 Sep 2022 20:34:31 -0400
Subject: [PATCH 2/2] powder that makes you say yes

---
 code/modules/admin/verbs/randomverbs.dm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 6fa3f3b01e..ceba8367ff 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -529,18 +529,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	//If desired, apply equipment.
 	if(equipment)
 		if(charjob)
-<<<<<<< HEAD
 			job_master.EquipRank(new_character, charjob, 1, announce)
-			new_character.mind.assigned_role = charjob
-			new_character.mind.role_alt_title = job_master.GetPlayerAltTitle(new_character, charjob)
-		equip_custom_items(new_character)	//CHOMPEdit readded to enable custom_item.txt
-=======
-			job_master.EquipRank(new_character, charjob, 1)
 			if(new_character.mind)
 				new_character.mind.assigned_role = charjob
 				new_character.mind.role_alt_title = job_master.GetPlayerAltTitle(new_character, charjob)
-		//equip_custom_items(new_character)	//VOREStation Removal
->>>>>>> 607d730743... Merge pull request #13738 from Heroman3003/admin-runtimes
+		equip_custom_items(new_character)	//CHOMPEdit readded to enable custom_item.txt
 
 	//If desired, add records.
 	if(records)