Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm

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

@@ -122,8 +122,9 @@
 	return 0
 
 /obj/item/weapon/card/id/proc/show(mob/user as mob)
-	user << browse_rsc(front, "front.png")
-	user << browse_rsc(side, "side.png")
+	if(front && side)
+		user << browse_rsc(front, "front.png")
+		user << browse_rsc(side, "side.png")
 	var/datum/browser/popup = new(user, "idcard", name, 600, 250)
 	popup.set_content(dat())
 	popup.set_title_image(usr.browse_rsc_icon(src.icon, src.icon_state))
@@ -137,17 +138,21 @@
 	front = getFlatIcon(M, SOUTH, always_use_defdir = 1)
 	side = getFlatIcon(M, WEST, always_use_defdir = 1)
 
-/obj/item/weapon/card/id/proc/set_owner_info(var/mob/living/carbon/human/H)
-	if(!H || !H.dna)
-		return
-	age 				= H.age
-	blood_type			= H.dna.b_type
-	dna_hash			= H.dna.unique_enzymes
-	fingerprint_hash	= md5(H.dna.uni_identity)
-	registered_name		= H.real_name
-	sex 				= capitalize(H.gender)
-	set_id_photo(H)
-	update_name()
+/mob/proc/set_id_info(var/obj/item/weapon/card/id/id_card)
+	id_card.age = 0
+	id_card.registered_name		= real_name
+	id_card.sex 				= capitalize(gender)
+	id_card.set_id_photo(src)
+
+	if(dna)
+		id_card.blood_type		= dna.b_type
+		id_card.dna_hash		= dna.unique_enzymes
+		id_card.fingerprint_hash= md5(dna.uni_identity)
+	id_card.update_name()
+	
+/mob/living/carbon/human/set_id_info(var/obj/item/weapon/card/id/id_card)
+	..()
+	id_card.age = age
 
 /obj/item/weapon/card/id/proc/dat()
 	var/dat = ("<table><tr><td>")
@@ -213,9 +218,20 @@
 	item_state = "gold_id"
 	registered_name = "Captain"
 	assignment = "Captain"
-	New()
-		access = get_all_station_access()
-		..()
+/obj/item/weapon/card/id/captains_spare/New()
+	access = get_all_station_access()
+	..()
+		
+/obj/item/weapon/card/id/synthetic
+	name = "\improper Synthetic ID"
+	desc = "Access module for NanoTrasen Synthetics"
+	icon_state = "id-robot"
+	item_state = "tdgreen"
+	assignment = "Synthetic"
+	
+/obj/item/weapon/card/id/synthetic/New()
+	access = get_all_station_access()
+	..()
 
 /obj/item/weapon/card/id/centcom
 	name = "\improper CentCom. ID"

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

@@ -6,12 +6,11 @@ var/global/list/syndicate_ids = list()
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/electronic_warfare = 1
 	var/registered_user = null
-	var/list/initial_access = list(access_maint_tunnels, access_syndicate, access_external_airlocks)
 
 /obj/item/weapon/card/id/syndicate/New(mob/user as mob)
 	syndicate_ids += src
 	..()
-	access = initial_access.Copy()
+	access = syndicate_access.Copy()
 
 /obj/item/weapon/card/id/syndicate/Destroy()
 	syndicate_ids -= src
@@ -39,8 +38,8 @@ var/global/list/syndicate_ids = list()
 /obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob)
 	if(!registered_user)
 		registered_user = user
-		set_owner_info(user)
-		user << "<span class='notice'>The microscanner marks you as its owner, preventing others some accessing its internals.</span>"
+		user.set_id_info(src)
+		user << "<span class='notice'>The microscanner marks you as its owner, preventing others from accessing its internals.</span>"
 	if(registered_user == user)
 		switch(alert("Would you like edit the ID, or show it?","Show or Edit?", "Edit","Show"))
 			if("Edit")
@@ -163,7 +162,7 @@ var/global/list/syndicate_ids = list()
 			if("Factory Reset")
 				if(alert("This will factory reset the card, including access and owner. Continue?", "Factory Reset", "No", "Yes") == "Yes" && CanUseTopic(user, state))
 					age = initial(age)
-					access = initial_access.Copy()
+					access = syndicate_access.Copy()
 					assignment = initial(assignment)
 					blood_type = initial(blood_type)
 					dna_hash = initial(dna_hash)

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

@@ -224,6 +224,9 @@
 //Set the stop_messages to stop it from printing messages
 /obj/item/weapon/storage/proc/can_be_inserted(obj/item/W as obj, stop_messages = 0)
 	if(!istype(W)) return //Not an item
+	
+	if(!usr.canUnEquip(W))
+		return 0
 
 	if(src.loc == W)
 		return 0 //Means the item is already in the storage item

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

@@ -9,6 +9,7 @@
 	throwforce = 0
 	w_class = 3
 	origin_tech = "materials=1"
+	matter = list(DEFAULT_WALL_MATERIAL = 18750)
 	var/deployed = 0
 
 /obj/item/weapon/beartrap/suicide_act(mob/user)