New DNA mutation system: see http://tgstation13.pretentiousfool.com/phpBB3/viewtopic.php?f=7&t=5584 (the code that makes this actually work has been commented out, it will be implemented maybe sometime soon)

Fixed some spelling and grammar errors.

Tweaked the cost of Large Energy Crossbow designs.

Fixed a bug where people would generate two manifest entries when they late-joined. Annoying as fuck.



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

code/modules/admin/admin.dm

@@ -2299,6 +2299,7 @@ var/showadminmessages = 1
 	message_admins("\blue [key_name_admin(usr)] toggled guests game entering [guests_allowed?"":"dis"]allowed.", 1)
 
 
+
 /obj/admins/proc/view_txt_log()
 	set category = "Admin"
 	set desc="Shows todays server log in new window"

code/modules/chemical/Chemistry-Recipes.dm

@@ -543,9 +543,6 @@ datum
 				new /obj/item/weapon/syntiflesh(location)
 				return
 
-
-
-
 		metroidenzyme
 			name = "Metroid Enzyme"
 			id = "m_enzyme"
@@ -602,8 +599,6 @@ datum
 					S.start()
 				return
 
-
-
 		metroidchloral
 			name = "Metroid Chloral"
 			id = "m_bunch"

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

@@ -1015,6 +1015,9 @@
 	if (mutations & PORTALS)
 		overlays += image("icon" = 'genetics.dmi', "icon_state" = "telekinesishead[fat][!lying ? "_s" : "_l"]")
 
+	if (mutations & LASER)
+		overlays += image("icon" = 'genetics.dmi', "icon_state" = "lasereyes[!lying ? "_s" : "_l"]")
+
 	if (mutantrace)
 		switch(mutantrace)
 			if("lizard","golem","metroid")

code/modules/mob/living/living.dm

@@ -93,7 +93,7 @@
 		if(organStructure && organStructure.chest)
 			health = organStructure.chest.maxHealth - oxyloss - toxloss - fireloss - bruteloss
 		else
-			src.health = 100 - src.oxyloss - src.toxloss - src.fireloss - src.bruteloss
+			src.health = 100 - src.oxyloss - src.toxloss - src.fireloss - src.bruteloss - src.cloneloss
 	else
 		src.health = 100
 		src.stat = 0

code/modules/mob/new_player/new_player.dm

@@ -287,7 +287,6 @@ mob/new_player
 					else//Adds late joiners to minds so they can be linked to objectives.
 						ticker.minds += character.mind//Cyborgs and AIs handle this in the transform proc.
 
-					data_core.manifest_inject(character) // add all the necessary stuff into the manifest
 					del(src)
 
 		else

code/modules/research/designs.dm

@@ -1071,7 +1071,7 @@ datum
 			id = "largecrossbow"
 			req_tech = list("combat" = 4, "materials" = 5, "engineering" = 3, "biotech" = 4, "syndicate" = 3)
 			build_type = PROTOLATHE
-			materials = list("$metal" = 5000, "$glass" = 1000)
+			materials = list("$metal" = 5000, "$glass" = 1000, "$uranium" = 1000, "$silver" = 1000)
 			build_path = "/obj/item/weapon/gun/energy/largecrossbow"
 
 		freeze_gun