Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Conflicts:
	html/changelog.html

code/game/objects/items/bodybag.dm

@@ -34,6 +34,7 @@
 	icon_state = "bodybag_closed"
 	icon_closed = "bodybag_closed"
 	icon_opened = "bodybag_open"
+	var/item_path = /obj/item/bodybag
 	density = 0
 
 
@@ -74,7 +75,7 @@
 			if(opened)	return 0
 			if(contents.len)	return 0
 			visible_message("[usr] folds up the [src.name]")
-			new/obj/item/bodybag(get_turf(src))
+			new item_path(get_turf(src))
 			spawn(0)
 				del(src)
 			return
@@ -92,7 +93,6 @@
 	icon = 'icons/obj/cryobag.dmi'
 	icon_state = "bodybag_folded"
 
-
 	attack_self(mob/user)
 		var/obj/structure/closet/body_bag/cryobag/R = new /obj/structure/closet/body_bag/cryobag(user.loc)
 		R.add_fingerprint(user)
@@ -104,11 +104,7 @@
 	name = "stasis bag"
 	desc = "A non-reusable plastic bag designed for the preservation of an occupant's brain by stasis."
 	icon = 'icons/obj/cryobag.dmi'
-	icon_state = "bodybag_closed"
-	icon_closed = "bodybag_closed"
-	icon_opened = "bodybag_open"
-	density = 0
-
+	item_path = /obj/item/bodybag/cryobag
 	var/used = 0
 
 	open()

code/game/objects/items/stacks/medical.dm

@@ -33,6 +33,16 @@
 	if (istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
 		var/datum/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
+
+		if(affecting.display_name == "head")
+			if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space))
+				user << "\red You can't apply [src] through [H.head]!"
+				return 1
+		else
+			if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space))
+				user << "\red You can't apply [src] through [H.wear_suit]!"
+				return 1
+
 		if(affecting.status & ORGAN_ROBOT)
 			user << "\red This isn't useful at all on a robotic limb.."
 			return 1

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

@@ -80,6 +80,14 @@
 	var/rank = null			//actual job
 	var/dorm = 0		// determines if this ID has claimed a dorm already
 
+/obj/item/weapon/card/id/New()
+	..()
+	spawn(30)
+	if(istype(loc, /mob/living/carbon/human))
+		blood_type = loc:dna:b_type
+		dna_hash = loc:dna:unique_enzymes
+		fingerprint_hash = md5(loc:dna:uni_identity)
+
 /obj/item/weapon/card/id/attack_self(mob/user as mob)
 	for(var/mob/O in viewers(user, null))
 		O.show_message(text("[] shows you: \icon[] []: assignment: []", user, src, src.name, src.assignment), 1)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -154,6 +154,7 @@
 		new /obj/item/weapon/reagent_containers/spray/pepper(src)
 		new /obj/item/weapon/melee/baton(src)
 		new /obj/item/weapon/gun/energy/taser(src)
+		new /obj/item/weapon/storage/box/holobadge(src)
 		return