- Dropped support for attaching photos to ID cards. The feature was never fully implemented and the information you got from them was misleading and wrong.

- Backpacks max_combined_w_class is now 21 instead of 20, meaning it can store 7 box-sized items instead of 6 box sized items + 1 small item (which the box is supposed to hold anyway)
- Added many fire alarms around the station to areas that either lacked them or where they were too rare
- Added 4 hazard vests to the atmospherics departments for atmos techs who prefer hazard vests to firesuits.
- Added these changes to the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3092 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/obj/storage.dm

@@ -5,7 +5,7 @@
 	w_class = 4.0
 	flags = 259.0
 	max_w_class = 3
-	max_combined_w_class = 20
+	max_combined_w_class = 21
 
 /obj/item/weapon/storage/backpack/cultpack
 	name = "Trophy Rack"

code/defines/obj/weapon.dm

@@ -457,7 +457,6 @@
 	var/access = list()
 	var/registered = null
 	var/assignment = null
-	var/obj/item/weapon/photo/PHOTO = null
 	var/dorm = 0		// determines if this ID has claimed a dorm already
 
 /obj/item/weapon/card/id/gold

code/game/objects/items/weapons/cards_ids.dm

@@ -53,33 +53,6 @@ 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.before_take_item(W)
-			W.loc = src
-			//src.orient2hud(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 From ID"
-	set category = "Object"
-
-	if(PHOTO)
-		contents -= PHOTO
-		PHOTO.loc = usr.loc
-		PHOTO.layer = 3
-		PHOTO = null
-	else
-		usr << "\blue There is no photo to remove"
-
 
 // FINGERPRINT HOLDER
 

code/modules/mob/living/carbon/human/examine.dm

@@ -109,24 +109,15 @@
 
 	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))
-			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!!!"
+			usr << "\red [src.name] is wearing \icon[src.wear_id] [src.wear_id.name] yet doesn't seem to be that person!!!"
 		else
-			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]."
+			usr << "\blue [src.name] is wearing \icon[src.wear_id] [src.wear_id.name]."
 
 
 	if (src.is_jittery)