Merge remote-tracking branch 'upstream/master' into lungsss

# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/life.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station.dm
#	code/modules/surgery/surgery.dm

code/modules/awaymissions/maploader/swapmaps.dm

@@ -1,5 +1,3 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
 /*
 	SwapMaps library by Lummox JR
 	developed for digitalBYOND

code/modules/awaymissions/mission_code/UO71-terrorspiders.dm

@@ -179,6 +179,10 @@
 	(the writing trails off, as if the writer was interrupted)<br>
 	"}
 
+/obj/item/weapon/paper/terrorspiders9
+	name = "paper - 'Research Notes'"
+	info = "<b>The notes appear gibberish to you. Perhaps a destructive analyser in R&D could make sense of them.</b>"
+	origin_tech = "combat=4;materials=4;engineering=4;biotech=4"
 
 /obj/item/weapon/gun/energy/laser/awaymission_aeg
 	name = "Wireless Energy Gun"