Cobpipe fix

Smoking pipe icon fix.
Eye-stab admin logging fix.

Tasers now do halloss, representing non-lethal PAIN.
http://baystation12.net/forums/viewtopic.php?f=5&t=7773

Tasers now check their target's limb for armor, and deflect if armored (Represented by coeffecient = 0).
http://baystation12.net/forums/viewtopic.php?f=5&t=7772

Attempting to merge with BEF

code/modules/client/preferences.dm

@@ -19,6 +19,10 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 
 var/const/MAX_SAVE_SLOTS = 10
 
+//used for alternate_option
+#define GET_RANDOM_JOB 0
+#define BE_ASSISTANT 1
+#define RETURN_TO_LOBBY 2
 
 datum/preferences
 	//doohickeys for savefiles
@@ -32,7 +36,6 @@ datum/preferences
 	var/last_ip
 	var/last_id
 
-
 	//game-preferences
 	var/lastchangelog = ""				//Saved changlog filesize to detect if there was a change
 	var/ooccolor = "#b82e00"
@@ -79,9 +82,8 @@ datum/preferences
 	var/job_engsec_med = 0
 	var/job_engsec_low = 0
 
-		// Want randomjob if preferences already filled - Donkie
-	var/userandomjob = 1 //defaults to 1 for fewer assistants
-
+	//Keeps track of preferrence for not getting any wanted jobs
+	var/alternate_option = 0
 
 	var/used_skillpoints = 0
 	var/skill_specialization = null
@@ -441,7 +443,14 @@ datum/preferences
 
 		HTML += "</center></table>"
 
-		HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=[userandomjob ? "green>Get random job if preferences unavailable" : "red>Be assistant if preference unavailable"]</font></a></u></center><br>"
+		switch(alternate_option)
+			if(GET_RANDOM_JOB)
+				HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=green>Get random job if preferences unavailable</font></a></u></center><br>"
+			if(BE_ASSISTANT)
+				HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=red>Be assistant if preference unavailable</font></a></u></center><br>"
+			if(RETURN_TO_LOBBY)
+				HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=purple>Return to lobby if prefernce unavailable</font></a></u></center><br>"
+
 		HTML += "<center><a href='?_src_=prefs;preference=job;task=reset'>\[Reset\]</a></center>"
 		HTML += "</tt>"
 
@@ -641,7 +650,12 @@ datum/preferences
 					ResetJobs()
 					SetChoices(user)
 				if("random")
-					userandomjob = !userandomjob
+					if(alternate_option == GET_RANDOM_JOB || alternate_option == BE_ASSISTANT)
+						alternate_option += 1
+					else if(alternate_option == RETURN_TO_LOBBY)
+						alternate_option = 0
+					else
+						return 0
 					SetChoices(user)
 				if ("alt_title")
 					var/datum/job/job = locate(href_list["job"])

code/modules/client/preferences_savefile.dm

@@ -122,7 +122,7 @@
 	S["b_type"]				>> b_type
 
 	//Jobs
-	S["userandomjob"]		>> userandomjob
+	S["alternate_option"]	>> alternate_option
 	S["job_civilian_high"]	>> job_civilian_high
 	S["job_civilian_med"]	>> job_civilian_med
 	S["job_civilian_low"]	>> job_civilian_low
@@ -173,7 +173,7 @@
 	backbag			= sanitize_integer(backbag, 1, backbaglist.len, initial(backbag))
 	b_type			= sanitize_text(b_type, initial(b_type))
 
-	userandomjob	= sanitize_integer(userandomjob, 0, 1, initial(userandomjob))
+	alternate_option = sanitize_integer(alternate_option, 0, 2, initial(alternate_option))
 	job_civilian_high = sanitize_integer(job_civilian_high, 0, 65535, initial(job_civilian_high))
 	job_civilian_med = sanitize_integer(job_civilian_med, 0, 65535, initial(job_civilian_med))
 	job_civilian_low = sanitize_integer(job_civilian_low, 0, 65535, initial(job_civilian_low))
@@ -223,7 +223,7 @@
 	S["b_type"]				<< b_type
 
 	//Jobs
-	S["userandomjob"]		<< userandomjob
+	S["alternate_option"]	<< alternate_option
 	S["job_civilian_high"]	<< job_civilian_high
 	S["job_civilian_med"]	<< job_civilian_med
 	S["job_civilian_low"]	<< job_civilian_low

code/modules/events/money_spam.dm

@@ -36,7 +36,7 @@
 
 			var/sender
 			var/message
-			switch(pick(1,2,3,4,5,6))
+			switch(pick(1,2,3,4,5,6,7))
 				if(1)
 					sender = pick("MaxBet","MaxBet Online Casino","There is no better time to register","I'm excited for you to join us")
 					message = pick("Triple deposits are waiting for you at MaxBet Online when you register to play with us.",\
@@ -68,7 +68,7 @@
 					sender = pick("Dr","Crown prince","King Regent","Professor","Captain")
 					sender += " " + pick("Robert","Alfred","Josephat","Kingsley","Sehi","Zbahi")
 					sender += " " + pick("Mugawe","Nkem","Gbatokwia","Nchekwube","Ndim","Ndubisi")
-					message = pick("YOUR FUND HAS BEEN MOVED TO [pick("Salusa","Segunda","Cepheus","Andromeda","Gruis","Corona","Aquila","Asellus")] DEVELOPMENTARY BANK FOR ONWARD REMITTANCE.",\
+					message = pick("YOUR FUND HAS BEEN MOVED TO [pick("Salusa","Segunda","Cepheus","Andromeda","Gruis","Corona","Aquila","ARES","Asellus")] DEVELOPMENTARY BANK FOR ONWARD REMITTANCE.",\
 					"We are happy to inform you that due to the delay, we have been instructed to IMMEDIATELY deposit all funds into your account",\
 					"Dear fund beneficiary, We have please to inform you that overdue funds payment has finally been approved and released for payment",\
 					"Due to my lack of agents I require an off-world financial account to immediately deposit the sum of 1 POINT FIVE MILLION credits.",\
@@ -79,6 +79,12 @@
 					"WetSkrell.nt is a xenophillic website endorsed by NT for the use of male crewmembers among it's many stations and outposts.",\
 					"Wetskrell.nt only provides the higest quality of male entertaiment to NanoTrasen Employees.",\
 					"Simply enter your NanoTrasen Bank account system number and pin. With three easy steps this service could be yours!")
+				if(7)
+					sender = pick("You have won free tickets!","Click here to claim your prize!","You are the 1000th vistor!","You are our lucky grand prize winner!")
+					message = pick("You have won tickets to the newest ACTION JAXSON MOVIE!",\
+					"You have won tickets to the newest crime drama DETECTIVE MYSTERY IN THE CLAMITY CAPER!",\
+					"You have won tickets to the newest romantic comedy 16 RULES OF LOVE!",\
+					"You have won tickets to the newest thriller THE CULT OF THE SLEEPING ONE!")
 
 			useMS.send_pda_message("[P.owner]", sender, message)
 

code/modules/flufftext/Dreaming.dm

@@ -7,7 +7,12 @@ mob/living/carbon/proc/dream()
 		"a hat","the Luna","a ruined station","a planet","plasma","air","the medical bay","the bridge","blinking lights",
 		"a blue light","an abandoned laboratory","Nanotrasen","The Syndicate","blood","healing","power","respect",
 		"riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs","money",
-		"a beach","the holodeck","a smokey room","a voice","the cold","a mouse","an operating table","the bar","the rain"
+		"the head of personnel","the head of security","a chief engineer","a research director","a chief medical officer",
+		"the detective","the warden","a member of the internal affairs","a station engineer","the janitor","atmospheric technician",
+		"the quartermaster","a cargo technician","the botanist","a shaft miner","the psychologist","the chemist","the geneticist",
+		"the virologist","the roboticist","the chef","the bartender","the chaplain","the librarian","a mouse","an ert member",
+		"a beach","the holodeck","a smokey room","a voice","the cold","a mouse","an operating table","the bar","the rain","a skrell",
+		"a unathi","a tajaran","the ai core","the mining station","the research station","a beaker of strange liquid",
 		)
 	spawn(0)
 		for(var/i = rand(1,4),i > 0, i--)

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

@@ -37,7 +37,7 @@
 		spawn(0)
 			if(!C)	return
 			var/response = alert(C, "Someone is requesting a personality for a positronic brain. Would you like to play as one?", "Positronic brain request", "Yes", "No", "Never for this round")
-			if(!C || brainmob.key)	return		//handle logouts that happen whilst the alert is waiting for a response, and responses issued after a brain has been located.
+			if(!C || brainmob.key || 0 == searching)	return		//handle logouts that happen whilst the alert is waiting for a response, and responses issued after a brain has been located.
 			if(response == "Yes")
 				transfer_personality(C.mob)
 			else if (response == "Never for this round")
@@ -49,7 +49,7 @@
 
 		src.searching = 0
 		src.brainmob.mind = candidate.mind
-		src.brainmob.key = candidate.key
+		//src.brainmob.key = candidate.key
 		src.brainmob.ckey = candidate.ckey
 		src.name = "positronic brain ([src.brainmob.name])"
 

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

@@ -54,8 +54,8 @@
 		var/datum/organ/external/temp = M:organs_by_name["r_hand"]
 		if (M.hand)
 			temp = M:organs_by_name["l_hand"]
-		if(temp && temp.status & ORGAN_DESTROYED)
-			M << "\red Yo- wait a minute."
+		if(temp && !temp.is_usable())
+			M << "\red You can't use your [temp.display_name]"
 			return
 
 	for(var/datum/disease/D in viruses)
@@ -76,14 +76,6 @@
 /mob/living/carbon/attack_paw(mob/M as mob)
 	if(!istype(M, /mob/living/carbon)) return
 
-	if (hasorgans(M))
-		var/datum/organ/external/temp = M:organs_by_name["r_hand"]
-		if (M.hand)
-			temp = M:organs_by_name["l_hand"]
-		if(temp && temp.status & ORGAN_DESTROYED)
-			M << "\red Yo- wait a minute."
-			return
-
 	for(var/datum/disease/D in viruses)
 
 		if(D.spread_by_touch())
@@ -187,6 +179,8 @@
 					status += "numb"
 				if(org.status & ORGAN_DESTROYED)
 					status = "MISSING!"
+				if(org.status & ORGAN_MUTATED)
+					status = "weirdly shapen."
 				if(status == "")
 					status = "OK"
 				src.show_message(text("\t []My [] is [].",status=="OK"?"\blue ":"\red ",org.display_name,status),1)

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

@@ -3,6 +3,13 @@
 		M << "No attacking people at spawn, you jackass."
 		return
 
+	var/datum/organ/external/temp = M:organs_by_name["r_hand"]
+	if (M.hand)
+		temp = M:organs_by_name["l_hand"]
+	if(temp && !temp.is_usable())
+		M << "\red You can't use your [temp.display_name]."
+		return
+
 	..()
 
 	if((M != src) && check_shields(0, M.name))

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

@@ -63,6 +63,35 @@
 	if(HULK in mutations)	return
 	..()
 
+/mob/living/carbon/human/adjustCloneLoss(var/amount)
+	..()
+	var/heal_prob = max(0, 80 - getCloneLoss())
+	var/mut_prob = min(80, getCloneLoss()+10)
+	if (amount > 0)
+		if (prob(mut_prob))
+			var/list/datum/organ/external/candidates = list()
+			for (var/datum/organ/external/O in organs)
+				if(!(O.status & ORGAN_MUTATED))
+					candidates |= O
+			if (candidates.len)
+				var/datum/organ/external/O = pick(candidates)
+				O.mutate()
+				src << "<span class = 'notice'>Something is not right with your [O.display_name]...</span>"
+				return
+	else
+		if (prob(heal_prob))
+			for (var/datum/organ/external/O in organs)
+				if (O.status & ORGAN_MUTATED)
+					O.unmutate()
+					src << "<span class = 'notice'>Your [O.display_name] is shaped normally again.</span>"
+					return
+
+	if (getCloneLoss() < 1)
+		for (var/datum/organ/external/O in organs)
+			world << "[O.display_name]!"
+			if (O.status & ORGAN_MUTATED)
+				O.unmutate()
+				src << "<span class = 'notice'>Your [O.display_name] is shaped normally again.</span>"
 ////////////////////////////////////////////
 
 //Returns a list of damaged organs

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

@@ -126,7 +126,8 @@ Please contact me on #coderbus IRC. ~Carn x
 	var/list/overlays_lying[TOTAL_LAYERS]
 	var/list/overlays_standing[TOTAL_LAYERS]
 	var/previous_damage_appearance // store what the body last looked like, so we only have to update it if something changed
-	var/race_icon
+	var/icon/race_icon
+	var/icon/deform_icon
 
 //UPDATES OVERLAYS FROM OVERLAYS_LYING/OVERLAYS_STANDING
 //this proc is messy as I was forced to include some old laggy cloaking code to it so that I don't break cloakers
@@ -234,18 +235,16 @@ proc/get_damage_icon_part(damage_state, body_part)
 	var/g = "m"
 	if(gender == FEMALE)	g = "f"
 
+	var/datum/organ/external/chest = get_organ("chest")
+	stand_icon = chest.get_icon(g)
 	if(!skeleton)
-		stand_icon = new /icon(race_icon, "torso_[g][fat?"_fat":""]")
 		if(husk)
 			stand_icon.ColorTone(husk_color_mod)
 		else if(hulk)
-//			stand_icon.ColorTone(hulk_color_mod)
 			var/list/TONE = ReadRGB(hulk_color_mod)
 			stand_icon.MapColors(rgb(TONE[1],0,0),rgb(0,TONE[2],0),rgb(0,0,TONE[3]))
 		else if(plant)
 			stand_icon.ColorTone(plant_color_mod)
-	else
-		stand_icon = new /icon(race_icon, "torso")
 
 	var/datum/organ/external/head = get_organ("head")
 	var/has_head = 0
@@ -255,28 +254,22 @@ proc/get_damage_icon_part(damage_state, body_part)
 	for(var/datum/organ/external/part in organs)
 		if(!istype(part, /datum/organ/external/chest) && !(part.status & ORGAN_DESTROYED))
 			var/icon/temp
-			if(istype(part, /datum/organ/external/groin))
-				if(skeleton)
-					temp = new /icon(race_icon, "groin")
-				else
-					temp = new /icon(race_icon, "groin_[g]")
-			else if(istype(part, /datum/organ/external/head))
-				if(skeleton)
-					temp = new /icon(race_icon, "head")
-				else
-					temp = new /icon(race_icon, "head_[g]")
+			if (istype(part, /datum/organ/external/groin) || istype(part, /datum/organ/external/head))
+				temp = part.get_icon(g)
 			else
-				temp = new /icon(race_icon, "[part.icon_name]")
+				temp = part.get_icon()
+
 			if(part.status & ORGAN_ROBOT)
 				temp.GrayScale()
+
 			if(part.status & ORGAN_DEAD)
 				temp.ColorTone(necrosis_color_mod)
 				temp.SetIntensity(0.7)
+
 			else if(!skeleton)
 				if(husk)
 					temp.ColorTone(husk_color_mod)
 				else if(hulk)
-//					temp.ColorTone(hulk_color_mod)
 					var/list/TONE = ReadRGB(hulk_color_mod)
 					temp.MapColors(rgb(TONE[1],0,0),rgb(0,TONE[2],0),rgb(0,0,TONE[3]))
 				else if(plant)
@@ -442,12 +435,16 @@ proc/get_damage_icon_part(damage_state, body_part)
 		switch(dna.mutantrace)
 			if("tajaran")
 				race_icon = 'icons/mob/human_races/r_tajaran.dmi'
+				deform_icon = 'icons/mob/human_races/r_def_tajaran.dmi'
 			if("lizard")
 				race_icon = 'icons/mob/human_races/r_lizard.dmi'
+				deform_icon = 'icons/mob/human_races/r_def_lizard.dmi'
 			if("skrell")
 				race_icon = 'icons/mob/human_races/r_skrell.dmi'
+				deform_icon = 'icons/mob/human_races/r_def_skrell.dmi'
 			else
 				race_icon = 'icons/mob/human_races/r_human.dmi'
+				deform_icon = 'icons/mob/human_races/r_def_human.dmi'
 	else
 		icon = 'icons/mob/human_races/r_human.dmi'
 

code/modules/mob/new_player/new_player.dm

@@ -384,7 +384,7 @@
 		dat += "<h4>Crew Manifest</h4>"
 		dat += data_core.get_manifest()
 
-		src << browse(dat, "window=manifest;size=300x420;can_close=1")
+		src << browse(dat, "window=manifest;size=370x420;can_close=1")
 
 	Move()
 		return 0

code/modules/organs/organ.dm

@@ -11,6 +11,9 @@
 	proc/receive_chem(chemical as obj)
 		return 0
 
+/datum/organ/proc/get_icon()
+	return icon('icons/mob/human.dmi',"blank")
+
 //Handles chem traces
 /mob/living/carbon/human/proc/handle_trace_chems()
 	//New are added for reagents to random organs.

code/modules/organs/organ_external.dm

@@ -547,6 +547,14 @@
 		if(T)
 			T.robotize()
 
+/datum/organ/external/proc/mutate()
+	src.status |= ORGAN_MUTATED
+	owner.update_body()
+
+/datum/organ/external/proc/unmutate()
+	src.status &= ~ORGAN_MUTATED
+	owner.update_body()
+
 /datum/organ/external/proc/get_damage()	//returns total damage
 	return max(brute_dam + burn_dam - perma_injury, perma_injury)	//could use health?
 
@@ -556,21 +564,32 @@
 			return 1
 	return 0
 
+/datum/organ/external/get_icon(gender="")
+	if (status & ORGAN_MUTATED)
+		return new /icon(owner.deform_icon, "[icon_name][gender ? "_[gender]" : ""]")
+	else
+		return new /icon(owner.race_icon, "[icon_name][gender ? "_[gender]" : ""]")
+
+
+/datum/organ/external/proc/is_usable()
+	return !(status & (ORGAN_DESTROYED|ORGAN_MUTATED|ORGAN_DEAD))
+
 /****************************************************
 			   ORGAN DEFINES
 ****************************************************/
 
 /datum/organ/external/chest
 	name = "chest"
-	icon_name = "chest"
+	icon_name = "torso"
 	display_name = "chest"
 	max_damage = 150
 	min_broken_damage = 75
 	body_part = UPPER_TORSO
 
+
 /datum/organ/external/groin
 	name = "groin"
-	icon_name = "diaper"
+	icon_name = "groin"
 	display_name = "groin"
 	max_damage = 115
 	min_broken_damage = 70
@@ -653,27 +672,37 @@
 	body_part = HEAD
 	var/disfigured = 0
 
-	take_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list())
-		..(brute, burn, sharp, used_weapon, forbidden_limbs)
-		if (!disfigured)
-			if (brute_dam > 40)
-				if (prob(50))
-					disfigure("brute")
-			if (burn_dam > 40)
-				disfigure("burn")
+/datum/organ/external/head/get_icon()
+	if (!owner)
+	 return ..()
+	var/g = "m"
+	if(owner.gender == FEMALE)	g = "f"
+	if (status & ORGAN_MUTATED)
+		. = new /icon(owner.deform_icon, "[icon_name]_[g]")
+	else
+		. = new /icon(owner.race_icon, "[icon_name]_[g]")
 
-	proc/disfigure(var/type = "brute")
-		if (disfigured)
-			return
-		if(type == "brute")
-			owner.visible_message("\red You hear a sickening cracking sound coming from \the [owner]'s face.",	\
-			"\red <b>Your face becomes unrecognizible mangled mess!</b>",	\
-			"\red You hear a sickening crack.")
-		else
-			owner.visible_message("\red [owner]'s face melts away, turning into mangled mess!",	\
-			"\red <b>Your face melts off!</b>",	\
-			"\red You hear a sickening sizzle.")
-		disfigured = 1
+/datum/organ/external/head/take_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list())
+	..(brute, burn, sharp, used_weapon, forbidden_limbs)
+	if (!disfigured)
+		if (brute_dam > 40)
+			if (prob(50))
+				disfigure("brute")
+		if (burn_dam > 40)
+			disfigure("burn")
+
+/datum/organ/external/head/proc/disfigure(var/type = "brute")
+	if (disfigured)
+		return
+	if(type == "brute")
+		owner.visible_message("\red You hear a sickening cracking sound coming from \the [owner]'s face.",	\
+		"\red <b>Your face becomes unrecognizible mangled mess!</b>",	\
+		"\red You hear a sickening crack.")
+	else
+		owner.visible_message("\red [owner]'s face melts away, turning into mangled mess!",	\
+		"\red <b>Your face melts off!</b>",	\
+		"\red You hear a sickening sizzle.")
+	disfigured = 1
 
 /****************************************************
 			   EXTERNAL ORGAN ITEMS

code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm

@@ -118,7 +118,7 @@
 	"/obj/item/weapon/pickaxe/five_pick",\
 	"/obj/item/weapon/pickaxe/six_pick",\
 	"/obj/item/weapon/pickaxe/hand")
-	max_combined_w_class = 11
+	max_combined_w_class = 17
 	max_w_class = 4
 	use_to_pickup = 1 // for picking up broken bulbs, not that most people will try