From ecf125477fd6dea43163157d9e4c1a561e641a5f Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Thu, 27 Feb 2020 13:11:14 +0100
Subject: [PATCH] fixing a couple silicon privileges runtimes. Also .dme
 alphabetic order

---
 code/modules/jobs/access.dm                         | 13 +++++--------
 .../modules/mob/living/simple_animal/bot/mulebot.dm |  2 +-
 tgstation.dme                                       |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm
index 9bd5dc1684..06e1863bc9 100644
--- a/code/modules/jobs/access.dm
+++ b/code/modules/jobs/access.dm
@@ -2,16 +2,13 @@
 //returns TRUE if this mob has sufficient access to use this object
 /obj/proc/allowed(mob/M)
 	//check if it doesn't require any access at all
-	if(src.check_access(null))
+	if(check_access(null))
 		return TRUE
+	if(!M)
+		return FALSE
 	if(hasSiliconAccessInArea(M))
-		if(ispAI(M))
-			return FALSE
-		return TRUE	//AI can do whatever it wants
-	if(IsAdminGhost(M))
-		//Access can't stop the abuse
-		return TRUE
-	else if(istype(M) && SEND_SIGNAL(M, COMSIG_MOB_ALLOWED, src))
+		return TRUE	//AI, robots and adminghosts can do whatever they want
+	else if(SEND_SIGNAL(M, COMSIG_MOB_ALLOWED, src))
 		return TRUE
 	else if(ishuman(M))
 		var/mob/living/carbon/human/H = M
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index b5aa8b6967..a46bcfdc3c 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -181,7 +181,7 @@
 	var/list/data = list()
 	data["on"] = on
 	data["locked"] = locked
-	data["siliconUser"] = hasSiliconAccessInArea(usr)
+	data["siliconUser"] = hasSiliconAccessInArea(user)
 	data["mode"] = mode ? mode_name[mode] : "Ready"
 	data["modeStatus"] = ""
 	switch(mode)
diff --git a/tgstation.dme b/tgstation.dme
index 9ecf1ddd5e..8f5fb9fae0 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -79,8 +79,8 @@
 #include "code\__DEFINES\obj_flags.dm"
 #include "code\__DEFINES\pinpointers.dm"
 #include "code\__DEFINES\pipe_construction.dm"
-#include "code\__DEFINES\power.dm"
 #include "code\__DEFINES\pool.dm"
+#include "code\__DEFINES\power.dm"
 #include "code\__DEFINES\preferences.dm"
 #include "code\__DEFINES\procpath.dm"
 #include "code\__DEFINES\profile.dm"