From 5113c03c76a6f325d5495c126c49fb3ce6d70b03 Mon Sep 17 00:00:00 2001
From: Chinsky <krauchinsky@gmail.com>
Date: Tue, 17 Jun 2014 18:24:52 +0400
Subject: [PATCH] ixes #5075 Mech fabricator redefined check access for no
 reason, let base proc handle it. Adds span classes for messages guestpass
 console gives.

---
 code/WorkInProgress/Chinsky/guestpass.dm | 31 +++++++++++++-----------
 code/game/mecha/mech_fabricator.dm       | 10 --------
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/code/WorkInProgress/Chinsky/guestpass.dm b/code/WorkInProgress/Chinsky/guestpass.dm
index 1e2f3b8a957..e6a9d860ded 100644
--- a/code/WorkInProgress/Chinsky/guestpass.dm
+++ b/code/WorkInProgress/Chinsky/guestpass.dm
@@ -19,20 +19,20 @@
 /obj/item/weapon/card/id/guest/examine()
 	..()
 	if (world.time < expiration_time)
-		usr << "\blue This pass expires at [worldtime2text(expiration_time)]."
+		usr << "<span class='notice'>This pass expires at [worldtime2text(expiration_time)].</span>"
 	else
-		usr << "\red It expired at [worldtime2text(expiration_time)]."
+		usr << "<span class='warning'>It expired at [worldtime2text(expiration_time)].</span>"
 
 /obj/item/weapon/card/id/guest/read()
 	if (world.time > expiration_time)
-		usr << "This pass expired at [worldtime2text(expiration_time)]."
+		usr << "<span class='notice'>This pass expired at [worldtime2text(expiration_time)].</span>"
 	else
-		usr << "This pass expires at [worldtime2text(expiration_time)]."
+		usr << "<span class='notice'>This pass expires at [worldtime2text(expiration_time)].</span>"
 
-	usr << "It grants access to following areas:"
+	usr << "<span class='notice'>It grants access to following areas:</span>"
 	for (var/A in temp_access)
-		usr << "[get_access_desc(A)]."
-	usr << "Issuing reason: [reason]."
+		usr << "<span class='notice'>[get_access_desc(A)].</span>"
+	usr << "<span class='notice'>Issuing reason: [reason].</span>"
 	return
 
 /////////////////////////////////////////////
@@ -56,10 +56,13 @@
 
 /obj/machinery/computer/guestpass/attackby(obj/O, mob/user)
 	if(istype(O, /obj/item/weapon/card/id))
-		user.drop_item()
-		O.loc = src
-		giver = O
-		updateUsrDialog()
+		if(!giver)
+			user.drop_item()
+			O.loc = src
+			giver = O
+			updateUsrDialog()
+		else
+			user << "<span class='warning'>There is already ID card inside.</span>"
 
 /obj/machinery/computer/guestpass/attack_ai(var/mob/user as mob)
 	return attack_hand(user)
@@ -112,16 +115,16 @@
 			if ("giv_name")
 				var/nam = input("Person pass is issued to", "Name", name)
 				if (nam)
-					giv_name = nam
+					giv_name = strip_html_simple(nam)
 			if ("reason")
 				var/reas = input("Reason why pass is issued", "Reason", reason)
-				reason = reas
+				reason = strip_html_simple(reas)
 			if ("duration")
 				var/dur = input("Duration (in minutes) during which pass is valid.", "Duration") as num
 				if (dur > 0 && dur < 30)
 					duration = dur
 				else
-					usr << "\red Invalid duration."
+					usr << "<span class='warning'>Invalid duration.</span>"
 			if ("access")
 				var/A = text2num(href_list["access"])
 				if (A in accesses)
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index 09b9d3fe3e4..4995b6512fb 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -205,16 +205,6 @@
 	M << "<font color='red'>You don't have required permissions to use [src]</font>"
 	return 0
 
-/obj/machinery/mecha_part_fabricator/check_access(obj/item/weapon/card/id/I)
-	if(istype(I, /obj/item/device/pda))
-		var/obj/item/device/pda/pda = I
-		I = pda.id
-	if(!istype(I) || !I.access) //not ID or no access
-		return 0
-	for(var/req in req_access)
-		if(!(req in I.access)) //doesn't have this access
-			return 0
-	return 1
 
 /obj/machinery/mecha_part_fabricator/proc/emag()
 	sleep()