diff --git a/code/defines/global.dm b/code/defines/global.dm
index 3b72e853f17..7f74688d0c9 100644
--- a/code/defines/global.dm
+++ b/code/defines/global.dm
@@ -71,7 +71,7 @@ var
 	enter_allowed = 1
 	shuttle_frozen = 0
 	shuttle_left = 0
-	tinted_weldhelh = 0
+	tinted_weldhelh = 1
 
 	captainMax = 1
 	engineerMax = 5
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 767beb163e0..6af2baba0f1 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -349,6 +349,7 @@
 	var/access = list()
 	var/registered = null
 	var/assignment = null
+	var/obj/item/weapon/photo/PHOTO = null
 
 /obj/item/weapon/card/id/gold
 	name = "identification card"
diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm
index d186db0a0a7..bd348661588 100644
--- a/code/game/jobs/jobprocs.dm
+++ b/code/game/jobs/jobprocs.dm
@@ -652,6 +652,17 @@
 				if(clear)
 					NL += T
 		src.loc = pick(NL)
+
+	/*
+	spawn(10)
+		var/obj/item/weapon/camera_test/CT = new/obj/item/weapon/camera_test(src.loc)
+		CT.afterattack(src, src, 10)
+		var/obj/item/weapon/photo/PH
+		PH = locate(/obj/item/weapon/photo,src.loc)
+		if(PH)
+			PH.layer = 3
+			src.equip_if_possible(PH, slot_in_backpack)
+		del(CT)*/ //--For another day - errorage
 	return
 
 
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 433ca19ac61..12607670124 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -50,7 +50,34 @@ FINGERPRINT CARD
 	else
 		..()
 
+/obj/item/weapon/card/id/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	..()
+	if(istype(W,/obj/item/weapon/photo))
+		if(!(PHOTO))
+			src.PHOTO = W
+			usr.u_equip(W)
+			W.loc = src
+			if ((usr.client && usr.s_active != src))
+				usr.client.screen -= W
+			//src.orient2hud(usr)
+			W.dropped(usr)
+			add_fingerprint(usr)
+			usr << "\blue You add the photo to the ID"
+		else
+			usr << "\blue There is already a photo on this ID"
 
+			//PHOTO.loc = locate(0,0,0)
+
+/obj/item/weapon/card/id/verb/removePhoto()
+	set name = "Remove Photo"
+
+	if(PHOTO)
+		contents -= PHOTO
+		PHOTO.loc = usr.loc
+		PHOTO.layer = 3
+		PHOTO = null
+	else
+		usr << "\blue There is no photo to remove"
 
 
 // FINGERPRINT HOLDER
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index c8ab841aa98..2285f18bfcc 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -78,15 +78,24 @@
 
 	if (src.wear_id)
 		var/id
+		var/photo = 0
 		if(istype(src:wear_id, /obj/item/device/pda))
 			var/obj/item/device/pda/pda = src:wear_id
 			id = pda.owner
 		else
 			id = src.wear_id.registered
+			if (src.wear_id.PHOTO)
+				photo = 1
 		if (id != src.real_name && in_range(src, usr) && prob(10))
-			usr << "\red [src.name] is wearing \icon[src.wear_id] [src.wear_id.name] yet doesn't seem to be that person!!!"
+			if (photo)
+				usr << "\red [src.name] is wearing \icon[src.wear_id] [src.wear_id.name] with a photo yet doesn't seem to be that person!!!"
+			else
+				usr << "\red [src.name] is wearing \icon[src.wear_id] [src.wear_id.name] yet doesn't seem to be that person!!!"
 		else
-			usr << "\blue [src.name] is wearing \icon[src.wear_id] [src.wear_id.name]."
+			if (photo)
+				usr << "\blue [src.name] is wearing \icon[src.wear_id] [src.wear_id.name] with a photo."
+			else
+				usr << "\blue [src.name] is wearing \icon[src.wear_id] [src.wear_id.name]."
 
 	if (src.is_jittery)
 		switch(src.jitteriness)
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 95682dd71cb..b4badec5e9a 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -407,7 +407,7 @@ mob/new_player
 		if (IsJobAvailable("Warden", wardenMax))
 			dat += "<a href='byond://?src=\ref[src];SelectedJob=28'>Warden</a><br>"
 		if (IsJobAvailable("Shaft Miner",minerMax))
-			dat += "<a href='byond://?src=\ref[src];SelectedJob=29'>Shaft Miner</a> (BETA)<br>"
+			dat += "<a href='byond://?src=\ref[src];SelectedJob=29'>Shaft Miner</a><br>"
 		if (IsJobAvailable("Mail Sorter",sorterMax))
 			dat += "<a href='byond://?src=\ref[src];SelectedJob=31'>Mail Sorter</a> (BETA)<br>"
 		if (!jobban_isbanned(src,"Assistant"))