Secure Airlock update!

4 new wires, completely randomised! (2nd bolt wire, 2 only-drop-bolts wires, and an AI alert wire that alerts an AI 20% of the time, when messed with)
Emags have a limited number of uses, between 3 and 7, and cost 5 TC
Hacktools are more useful than they were, and have a lower chance of alerting the AI
(This is unmapped ATM)

code/game/objects/closets/secure/personal.dm

@@ -41,6 +41,12 @@
 		else
 			user << "\red Access Denied"
 	else if( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken)
+		if(istype(W, /obj/item/weapon/card/emag))
+			var/obj/item/weapon/card/emag/E = W
+			if(E.uses)
+				E.uses--
+			else
+				return
 		broken = 1
 		locked = 0
 		desc = "It appears to be broken."

code/game/objects/closets/secure/secure_closets.dm

@@ -38,6 +38,12 @@
 		user << "\red It appears to be broken."
 		return
 	else if((istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken)
+		if(istype(W, /obj/item/weapon/card/emag))
+			var/obj/item/weapon/card/emag/E = W
+			if(E.uses)
+				E.uses--
+			else
+				return
 		broken = 1
 		locked = 0
 		desc = "It appears to be broken."

code/game/objects/closets/walllocker.dm

@@ -48,6 +48,11 @@
 		user << "\red It appears to be broken."
 		return
 	else if(istype(W, /obj/item/weapon/card/emag) && !src.broken)
+		var/obj/item/weapon/card/emag/E = W
+		if(E.uses)
+			E.uses--
+		else
+			return
 		src.broken = 1
 		src.locked = 0
 		src.icon_state = src.icon_broken

code/game/objects/door_assembly.dm

@@ -43,7 +43,7 @@ obj/structure/door_assembly
 		name = "Security Airlock Assembly"
 		icon_state = "door_as_sec1"
 		glass_base_icon_state = "door_as_gsec"
-		glass_type = /obj/machinery/door/airlock/glass_security
+		glass_type = /obj/machinery/door/airlock/glass/glass_security
 		airlock_type = /obj/machinery/door/airlock/security
 		anchored = 1
 		density = 1
@@ -58,7 +58,7 @@ obj/structure/door_assembly
 		name = "Engineering Airlock Assembly"
 		icon_state = "door_as_eng1"
 		glass_base_icon_state = "door_as_geng"
-		glass_type = /obj/machinery/door/airlock/glass_engineering
+		glass_type = /obj/machinery/door/airlock/glass/glass_engineering
 		airlock_type = /obj/machinery/door/airlock/engineering
 		anchored = 1
 		density = 1
@@ -73,7 +73,7 @@ obj/structure/door_assembly
 		name = "Medical Airlock Assembly"
 		icon_state = "door_as_med1"
 		glass_base_icon_state = "door_as_gmed"
-		glass_type = /obj/machinery/door/airlock/glass_medical
+		glass_type = /obj/machinery/door/airlock/glass/glass_medical
 		airlock_type = /obj/machinery/door/airlock/medical
 		anchored = 1
 		density = 1

code/game/objects/secstorage/secstorage.dm

@@ -93,7 +93,13 @@
 
 /obj/item/weapon/secstorage/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	..()
-	if ( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && (src.locked == 1) && (!src.emagged))
+	if ((istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && (src.locked == 1) && (!src.emagged))
+		if(istype(W, /obj/item/weapon/card/emag))
+			var/obj/item/weapon/card/emag/E = W
+			if(E.uses)
+				E.uses--
+			else
+				return
 		emagged = 1
 		src.overlays += image('storage.dmi', icon_sparking)
 		sleep(6)

code/game/objects/storage/crates.dm

@@ -258,6 +258,12 @@
 		overlays += redlight
 		return
 	else if ( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && locked &&!broken)
+		if(istype(W, /obj/item/weapon/card/emag))
+			var/obj/item/weapon/card/emag/E = W
+			if(E.uses)
+				E.uses--
+			else
+				return
 		overlays = null
 		overlays += emag
 		overlays += sparks

code/game/objects/storage/lockbox.dm

@@ -34,6 +34,12 @@
 			else
 				user << "\red Access Denied"
 		else if((istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken)
+			if(istype(W, /obj/item/weapon/card/emag))
+				var/obj/item/weapon/card/emag/E = W
+				if(E.uses)
+					E.uses--
+				else
+					return
 			broken = 1
 			locked = 0
 			desc = "It appears to be broken."