copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm

@@ -137,7 +137,7 @@ Doesn't work on other aliens/AI.*/
 		if(!istype(T, /turf))
 			return
 		if (U == T)
-			usr.bullet_act(new /obj/item/projectile/neurotoxin(usr.loc), get_organ_target())
+			usr.bullet_act(new /obj/item/projectile/energy/neurotoxin(usr.loc), get_organ_target())
 			return
 		if(!istype(U, /turf))
 			return
@@ -185,4 +185,4 @@ Doesn't work on other aliens/AI.*/
 					M.loc = loc
 					//Paralyse(10)
 			src.visible_message("\green <B>[src] hurls out the contents of their stomach!</B>")
-	return
+	return

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

@@ -151,7 +151,8 @@
 		swap_hand()
 
 /mob/living/carbon/proc/help_shake_act(mob/living/carbon/M)
-	if (src.health >= config.health_threshold_crit)		if(src == M && istype(src, /mob/living/carbon/human))
+	if (src.health >= config.health_threshold_crit)
+		if(src == M && istype(src, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = src
 			src.visible_message( \
 				text("\blue [src] examines [].",src.gender==MALE?"himself":"herself"), \

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

@@ -57,7 +57,8 @@
 
 	switch(M.a_intent)
 		if("help")
-			if(health >= config.health_threshold_crit)				help_shake_act(M)
+			if(health >= config.health_threshold_crit)
+				help_shake_act(M)
 				return 1
 //			if(M.health < -75)	return 0
 

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

@@ -1340,7 +1340,8 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 			sight &= ~(SEE_TURFS|SEE_MOBS|SEE_OBJS)
 			if(dna)
 				switch(dna.mutantrace)
-					if("lizard","slime")						see_in_dark = 3
+					if("lizard","slime")
+						see_in_dark = 3
 						see_invisible = SEE_INVISIBLE_LEVEL_ONE
 					if("tajaran")
 						see_in_dark = 4

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

@@ -22,7 +22,7 @@
 		/*if(src.dna.mutantrace == "lizard") //Soghun stutterss-s-ss-sss.
 			if(copytext(message, 1, 2) != "*")
 				message = replacetext(message, "s", stutter("ss"))*/
-		/*if(src.dna.mutantrace == "slime" && prob(5))
+		if(src.dna.mutantrace == "slime" && prob(5))
 			if(copytext(message, 1, 2) != "*")
 				if(copytext(message, 1, 2) == ";")
 					message = ";"
@@ -31,7 +31,7 @@
 				message += "SKR"
 				var/imax = rand(5,20)
 				for(var/i = 0,i<imax,i++)
-					message += "E"*/
+					message += "E"
 
 	if(stat != DEAD)
 		for(var/datum/disease/pierrot_throat/D in viruses)
@@ -69,7 +69,6 @@
 			if(prob(25))
 				message += " OLE!"
 
-	if ((HULK in mutations) && health >= 25)
 	if ((HULK in mutations) && health >= 25 && length(message))
 		if(copytext(message, 1, 2) != "*")
 			message = "[uppertext(message)]!!" //because I don't know how to code properly in getting vars from other files -Bro

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

@@ -448,7 +448,8 @@ proc/get_damage_icon_part(damage_state, body_part)
 //BS12 EDIT
 	if(dna)
 		switch(dna.mutantrace)
-			if("lizard","golem","slime","shadow","adamantine")				overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_l")
+			if("lizard","golem","slime","shadow","adamantine")
+				overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_l")
 				overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_s")
 			if("lizard","tajaran","skrell")
 				overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/species.dmi', "icon_state" = "[dna.mutantrace]_[gender]_l")

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -179,7 +179,7 @@
 		src.modules += new /obj/item/weapon/reagent_containers/robodropper(src)
 
 		var/obj/item/weapon/lighter/zippo/L = new /obj/item/weapon/lighter/zippo(src)
-		L.light_on = 1
+		L.lit = 1
 		src.modules += L
 
 		src.modules += new /obj/item/weapon/tray/robotray(src)

code/modules/mob/new_player/new_player.dm

@@ -289,15 +289,14 @@
 	proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank)
 		if (ticker.current_state == GAME_STATE_PLAYING)
 			var/obj/item/device/radio/intercom/a = new /obj/item/device/radio/intercom(null)// BS12 EDIT Arrivals Announcement Computer, rather than the AI.
-			a.autosay("\"[character.real_name],[character.wear_id.assignment ? " [character.wear_id.assignment]," : "" ] has arrived on the station.\"", "Arrivals Announcement Computer")
+
+			//unlikely for this to be an issue, but just in case
+			if(istype(character.wear_id, /obj/item/weapon/card/id))
+				var/obj/item/weapon/card/id/I = character.wear_id
+				a.autosay("\"[character.real_name],[I.assignment ? " [I.assignment]," : "" ] has arrived on the station.\"", "Arrivals Announcement Computer")
+			else
+				a.autosay("\"[character.real_name], visitor, has arrived on the station.\"", "Arrivals Announcement Computer")
 			del(a)
-			/*
-			var/mob/living/silicon/ai/announcer = new (null)
-			announcer.name = "Arrivals Announcement Computer"
-			announcer.real_name = "Arrivals Announcement Computer"
-			a.autosay("\"[character.real_name],[character.wear_id.assignment ? " [character.wear_id.assignment]," : "" ] has arrived on the station.\"", announcer)
-			del(announcer)
-			*/
 
 	proc/LateChoices()
 		var/mills = world.time // 1/10 of a second, not real milliseconds but whatever