Merged master into BEF.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

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

@@ -106,6 +106,7 @@
 	can_hold = list("/obj/item/weapon/reagent_containers/pill","/obj/item/weapon/dice")
 	allow_quick_gather = 1
 	use_to_pickup = 1
+	storage_slots = 14
 
 /obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri
 

code/game/objects/structures/lamarr_cage.dm

@@ -89,9 +89,16 @@
 
 /obj/structure/lamarr/proc/Break()
 	if(occupied)
-		var/obj/item/clothing/mask/facehugger/A = new /obj/item/clothing/mask/facehugger( src.loc )
-		A.sterile = 1
-		A.name = "Lamarr"
+		new /obj/item/clothing/mask/facehugger/lamarr(src.loc)
 		occupied = 0
 	update_icon()
+	return
+
+/obj/item/clothing/mask/facehugger/lamarr
+	name = "Lamarr"
+	desc = "The worst she might do is attempt to... couple with your head."//hope we don't get sued over a harmless reference, rite?
+	sterile = 1
+	gender = FEMALE
+
+/obj/item/clothing/mask/facehugger/lamarr/New()//to prevent deleting it if aliums are disabled
 	return