Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature

Conflicts:
	code/ZAS/ZAS_Zones.dm
	code/game/gamemodes/events.dm

code/modules/client/client defines.dm

@@ -26,6 +26,7 @@
 	var/be_alien		= 0		//Check if that guy wants to be an alien
 	var/be_pai			= 1		//Consider client when searching for players to recruit as a pAI
 	var/be_syndicate    = 1     //Consider client for late-game autotraitor
+	var/be_spaceninja	= 0
 	var/activeslot		= 1		//Default active slot!
 	var/STFU_ghosts				//80+ people rounds are fun to admin when text flies faster than airport security
 	var/STFU_radio				//80+ people rounds are fun to admin when text flies faster than airport security

code/modules/customitems/item_defines.dm

@@ -1,3 +1,4 @@
+hi
 // Add custom items you give to people here, and put their icons in custom_items.dmi
 // Remember to change 'icon = 'custom_items.dmi'' for items not using /obj/item/fluff as a base
 // Clothing item_state doesn't use custom_items.dmi. Just add them to the normal clothing files.
@@ -66,10 +67,20 @@
 	desc = "A neatly folded handkerchief embroidered with a 'M'."
 	icon_state = "maurice_bedford_1"
 
+/obj/item/weapon/book/fluff/johnathan_falcian_1
+	name = "sketchbook"
+	desc = "A small, well-used sketchbook."
+	icon = 'custom_items.dmi'
+	icon_state = "johnathan_notebook"
+	dat = "In the notebook there are numerous drawings of various crew-mates, locations, and scenes on the ship. They are of fairly good quality."
+	author = "Johnathan Falcian"
+	title = "Falcian's sketchbook"
+
 //////////////////////////////////
 ////////// Usable Items //////////
 //////////////////////////////////
 
+
 /obj/item/weapon/pen/fluff/multi //spaceman96: Trenna Seber
 	name = "multicolor pen"
 	desc = "It's a cool looking pen. Lots of colors!"
@@ -330,10 +341,17 @@
 /obj/item/weapon/crowbar/fluff/zelda_creedy_1 //daaneesh: Zelda Creedy
 	name = "Zelda's Crowbar"
 	desc = "A pink crow bar that has an engraving that reads, 'To Zelda. Love always, Dawn'"
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'custom_items.dmi'
 	icon_state = "zeldacrowbar"
 	item_state = "crowbar"
 
+////// Ripley customisation kit - Butchery Royce - MayeDay
+
+/obj/item/weapon/fluff/butcher_royce_1
+	name = "Ripley customisation kit"
+	desc = "A kit containing all the needed tools and parts to turn an APLU Ripley into a Titan's Fist worker mech."
+	icon = 'custom_items.dmi'
+	icon_state = "royce_kit"
 
 //////////////////////////////////
 //////////// Clothing ////////////
@@ -384,6 +402,19 @@
 	icon = 'custom_items.dmi'
 	icon_state = "ian_colm_1"
 
+////// Medical eyepatch - Thysse Ezinwa - Jadepython
+/obj/item/clothing/glasses/eyepatch/fluff/thysse_1
+	name = "medical eyepatch"
+	desc = "On the strap, EZINWA is written in white block letters."
+
+////// Safety Goggles - Arjun Chopra - MindPhyre - APPROVED
+/obj/item/clothing/glasses/fluff/arjun_chopra_1
+	name = "safety goggles"
+	desc = "A used pair of leather safety goggles."
+	icon = 'custom_items.dmi'
+	icon_state = "arjun_chopra"
+	item_state = "arjun_chopra"
+
 //////////// Hats ////////////
 
 /obj/item/clothing/head/secsoft/fluff/swatcap //deusdactyl: James Girard
@@ -500,6 +531,50 @@
 	item_state = "ara_bar_uniform"
 	color = "ara_bar_uniform"
 
+/////// NT-SID Suit //Zuhayr: Jane Doe
+
+/obj/item/clothing/under/fluff/jane_sidsuit
+	name = "NT-SID jumpsuit"
+	desc = "A NanoTrasen Synthetic Intelligence Division jumpsuit, issued to 'volunteers'. On other people it looks fine, but right here a scientist has noted: on you it looks stupid."
+
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "jane_sid_suit"
+	item_state = "jane_sid_suit"
+	color = "jane_sid_suit"
+	has_sensor = 2
+	sensor_mode = 3
+	flags = FPRINT | TABLEPASS
+
+//Suit roll-down toggle.
+/obj/item/clothing/under/fluff/jane_sidsuit/verb/toggle_zipper()
+	set name = "Toggle Jumpsuit Zipper"
+	set category = "Object"
+	set src in usr
+
+	if(!usr.canmove || usr.stat || usr.restrained())
+		return 0
+
+	if(src.icon_state == "jane_sid_suit_down")
+		src.color = "jane_sid_suit"
+		usr << "You zip up the [src]."
+	else
+		src.color = "jane_sid_suit_down"
+		usr << "You unzip and roll down the [src]."
+
+	src.icon_state = "[color]"
+	src.item_state = "[color]"
+	usr.update_inv_w_uniform()
+
+////// Wyatt's Ex-Commander Jumpsuit - RawrTaicho
+/obj/item/clothing/under/fluff/wyatt_1
+
+	name = "ex-commander jumpsuit"
+	desc = "A standard Central Command Engineering Commander jumpsuit tailored to fight the wearer tightly. It has a Medal of Service pinned onto the left side of it."
+	icon = 'custom_items.dmi'
+	icon_state = "wyatt_uniform"
+	item_state = "wyatt_uniform"
+	color = "wyatt_uniform"
+
 //////////// Masks ////////////
 
 /*
@@ -522,6 +597,41 @@
 	flags = FPRINT|TABLEPASS
 	w_class = 1
 
+////// Small locket - Altair An-Nasaqan - Serithi
+
+/obj/item/clothing/tie/fluff/altair_locket
+	name = "small locket"
+	desc = "A small golden locket attached to an Ii'rka-reed string. Inside the locket is a holo-picture of a female Tajaran, and an inscription writtin in Siik'mas."
+	icon = 'custom_items.dmi'
+	icon_state = "altair_locket"
+	item_state = "altair_locket"
+	color = "altair_locket"
+	slot_flags = 0
+	flags = FPRINT|TABLEPASS
+	w_class = 1
+	slot_flags = SLOT_MASK
+
+//////  Medallion - Nasir Khayyam - Jamini
+
+/obj/item/clothing/tie/fluff/nasir_khayyam_1
+	name = "medallion"
+	desc = "This silvered medallion bears the symbol of the Hadii Clan of the Tajaran."
+	icon = 'custom_items.dmi'
+	icon_state = "nasir_khayyam_1"
+	flags = FPRINT|TABLEPASS
+	w_class = 1
+	slot_flags = SLOT_MASK
+
+////// Emerald necklace - Ty Foster - Nega
+
+/obj/item/clothing/mask/mara_kilpatrick_1
+	name = "emerald necklace"
+	desc = "A brass necklace with a green emerald placed at the end. It has a small inscription on the top of the chain, saying \'Foster\'"
+	icon = 'custom_items.dmi'
+	icon_state = "ty_foster"
+	flags = FPRINT|TABLEPASS
+	w_class = 1
+
 //////////// Shoes ////////////
 
 /obj/item/clothing/shoes/magboots/fluff/susan_harris_1 //sniperyeti: Susan Harris
@@ -529,22 +639,6 @@
 	desc = "A colorful pair of magboots with the name Susan Harris clearly written on the back."
 	icon = 'custom_items.dmi'
 	icon_state = "atmosmagboots0"
-	toggle()
-		set name = "Toggle Magboots"
-		set category = "Object"
-		set src in usr
-		if(src.magpulse)
-			src.flags &= ~NOSLIP
-			src.slowdown = SHOES_SLOWDOWN
-			src.magpulse = 0
-			icon_state = "atmosmagboots0"
-			usr << "You disable the mag-pulse traction system."
-		else
-			src.flags |= NOSLIP
-			src.slowdown = 2
-			src.magpulse = 1
-			icon_state = "atmosmagboots1"
-			usr << "You enable the mag-pulse traction system."
 
 //////////// Sets ////////////
 
@@ -593,3 +687,13 @@
 	icon_state = "retpoluniform"
 	color = "retpoluniform"
 
+//////////// Weapons ////////////
+
+///// Colt Peacemaker - Ana Ka'Rimah - SueTheCake
+
+/obj/item/weapon/gun/energy/stunrevolver/fluff/ana_peacemaker
+
+	name = "Peacemaker"
+	desc = "A nickel-plated revolver with pearl grips. It has a certain Old West flair!"
+	icon = 'custom_items.dmi'
+	icon_state = "peacemaker"

code/modules/mob/dead/observer/observer.dm

@@ -257,6 +257,17 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		client.be_pai = 1
 		src << "You will now be considered a viable candidate when a pAI device requests a new personality, effective until the end of this round."
 
+/mob/dead/observer/verb/toggle_spaceninja_candidate()
+	set name = "Toggle Be Space Ninja Candidate"
+	set category = "Ghost"
+	set desc = "Determines whether you will be a candidate for when a new space ninja spawns. (toggle)"
+	if(client.be_spaceninja)
+		client.be_spaceninja = 0
+		src << "You are now excluded from space ninja candidate lists until end of round."
+	else
+		client.be_spaceninja = 1
+		src << "You are now included in space ninja candidate lists until end of round."
+
 /mob/dead/observer/memory()
 	set hidden = 1
 	src << "\red You are dead! You have no mind to store memory!"

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

@@ -21,7 +21,7 @@
 	var/move_delay_add = 0 // movement delay to add
 
 	status_flags = CANPARALYSE
-	var/heal_rate = 5
+	var/heal_rate = 1
 	var/plasma_rate = 5
 
 	var/oxygen_alert = 0

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

@@ -106,7 +106,7 @@ I kind of like the right click only--the window version can get a little confusi
 
 /mob/living/carbon/alien/humanoid/proc/neurotoxin(mob/target as mob in oview())
 	set name = "Spit Neurotoxin (50)"
-	set desc = "Spits neurotoxin at someone, paralyzing them for a short time."
+	set desc = "Spits neurotoxin at someone, paralyzing them for a short time if they are not wearing protective gear."
 	set category = "Alien"
 
 	if(powerc(50))
@@ -129,12 +129,12 @@ I kind of like the right click only--the window version can get a little confusi
 		if(!istype(T, /turf))
 			return
 		if (U == T)
-			usr.bullet_act(src, get_organ_target())
+			usr.bullet_act(new /obj/item/projectile/neurotoxin(usr.loc), get_organ_target())
 			return
 		if(!istype(U, /turf))
 			return
 
-		var/obj/item/projectile/energy/dart/A = new /obj/item/projectile/energy/dart(usr.loc)
+		var/obj/item/projectile/neurotoxin/A = new /obj/item/projectile/neurotoxin(usr.loc)
 
 		A.current = U
 		A.yo = U.y - T.y

code/modules/mob/living/carbon/alien/special/facehugger.dm

@@ -89,7 +89,8 @@ var/const/MAX_ACTIVE_TIME = 400
 	return
 
 /obj/item/clothing/mask/facehugger/throw_impact(atom/hit_atom)
-	Attach(hit_atom)
+	if(prob(25))
+		Attach(hit_atom)
 	return
 
 /obj/item/clothing/mask/facehugger/proc/Attach(M as mob)
@@ -129,17 +130,21 @@ var/const/MAX_ACTIVE_TIME = 400
 		for(var/mob/O in viewers(target, null))
 			O.show_message("\red \b [src] tears [W] off of [target]'s face!", 1)
 
-	loc = target
-	layer = 20
-	target.wear_mask = src
-	target.update_inv_wear_mask()
+	if(prob(75))
+		loc = target
+		layer = 20
+		target.wear_mask = src
+		target.update_inv_wear_mask()
 
-	GoIdle() //so it doesn't jump the people that tear it off
+		GoIdle() //so it doesn't jump the people that tear it off
 
-	if(!sterile) target.Paralyse(MAX_IMPREGNATION_TIME/6) //something like 25 ticks = 20 seconds with the default settings
+		if(!sterile) target.Paralyse(MAX_IMPREGNATION_TIME/6) //something like 25 ticks = 20 seconds with the default settings
 
-	spawn(rand(MIN_IMPREGNATION_TIME,MAX_IMPREGNATION_TIME))
-		Impregnate(target)
+		spawn(rand(MIN_IMPREGNATION_TIME,MAX_IMPREGNATION_TIME))
+			Impregnate(target)
+	else
+		for(var/mob/O in viewers(target, null))
+			O.show_message("\red \b [src] misses [target]'s face!", 1)
 
 	return
 

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

@@ -192,7 +192,7 @@
 		swap_hand()
 
 /mob/living/carbon/proc/help_shake_act(mob/living/carbon/M)
-	if (src.health > 0)
+	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( \

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

@@ -11,6 +11,14 @@
 	animation.icon = 'icons/mob/mob.dmi'
 	animation.master = src
 
+	for(var/datum/organ/external/E in src.organs)
+		if(istype(E, /datum/organ/external/chest))
+			continue
+		// Only make the limb drop if it's not too damaged
+		if(prob(100 - E.get_damage()))
+			// Override the current limb status and don't cause an explosion
+			E.droplimb(1,1)
+
 	flick("gibbed-h", animation)
 	hgibs(loc, viruses, dna)
 
@@ -100,4 +108,4 @@
 /mob/living/carbon/human/proc/Drain()
 	ChangeToHusk()
 	mutations |= NOCLONE
-	return
+	return

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

@@ -42,19 +42,20 @@
 			apply_damage(damage, BRUTE, affecting, armor_block)
 			if (damage >= 25)
 				visible_message("\red <B>[M] has wounded [src]!</B>")
-				apply_effect(4, WEAKEN, armor_block)
+				apply_effect(rand(0.5,3), WEAKEN, armor_block)
 			updatehealth()
 
 		if("disarm")
-			var/randn = rand(1, 100)
-			if (randn <= 90)
+			if (prob(80))
 				playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
-				Weaken(rand(10,15))
+				Weaken(rand(0.5,3))
 				for(var/mob/O in viewers(src, null))
 					if ((O.client && !( O.blinded )))
 						O.show_message(text("\red <B>[] has tackled down []!</B>", M, src), 1)
+				if (prob(25))
+					M.Weaken(rand(2,4))
 			else
-				if (randn <= 99)
+				if (prob(80))
 					playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
 					drop_item()
 					for(var/mob/O in viewers(src, null))

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

@@ -304,7 +304,7 @@
 /obj/effect/equip_e/human/process()
 	if (item)
 		item.add_fingerprint(source)
-	if (!item)
+	else
 		switch(place)
 			if("mask")
 				if (!( target.wear_mask ))
@@ -541,7 +541,7 @@ It can still be worn/put on as normal.
 			if (target.legcuffed)
 				strip_item = target.legcuffed
 		if("CPR")
-			if ((target.health >= -99.0 && target.health <= 0))
+			if ((target.health > config.health_threshold_dead && target.health < config.health_threshold_crit))
 				var/suff = min(target.getOxyLoss(), 7)
 				target.adjustOxyLoss(-suff)
 				target.updatehealth()

code/modules/mob/new_player/preferences.dm

@@ -12,6 +12,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 	"pAI candidate" = 1, // -- TLE                       // 7
 	"cultist" = IS_MODE_COMPILED("cult"),                // 8
 	"infested monkey" = IS_MODE_COMPILED("monkey"),      // 9
+	"space ninja" = "true",							 // 9
 )
 
 var/global/list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "Mankini", "Love-Hearts", "Black2", "Grey2", "Stripey", "Kinky", "None") //Curse whoever made male/female underwear diffrent colours
@@ -28,6 +29,7 @@ var/const/BE_ALIEN     =(1<<6)
 var/const/BE_PAI       =(1<<7)
 var/const/BE_CULTIST   =(1<<8)
 var/const/BE_MONKEY    =(1<<9)
+var/const/BE_SPACENINJA=(1<<10)
 
 
 var/const/MAX_SAVE_SLOTS = 10
@@ -236,8 +238,8 @@ datum/preferences
 		dat += "<a href=\"byond://?src=\ref[user];preference=slotname;task=input\">Rename slot</a> - "
 		dat += "<a href=\"byond://?src=\ref[user];preference=reload\">Reload slot</a>"
 
-		//column 1
-		dat += "</center><hr><table><tr><td width='310px'>"
+		//COLUMN 1
+		dat += "</center><hr><table><tr><td width='285px'>"
 
 		dat += "<b>Name:</b> "
 		dat += "<a href=\"byond://?src=\ref[user];preference=name;task=input\"><b>[real_name]</b></a> "
@@ -263,41 +265,68 @@ datum/preferences
 			dat += "[(sound_adminhelp)?"On":"Off"] <a href='byond://?src=\ref[user];preference=hear_adminhelps'>toggle</a><br>"
 
 			if(user.client.holder.level >= 5)
-				dat += "<br><b>OOC</b><br>"
-				dat += "<a href='byond://?src=\ref[user];preference=ooccolor;task=input'>Change color</a> <font face=\"fixedsys\" size=\"3\" color=\"[ooccolor]\"><table style='display:inline;'  bgcolor=\"[ooccolor]\"><tr><td>__</td></tr></table></font><br>"
+				dat += "<br><a href='byond://?src=\ref[user];preference=ooccolor;task=input'><b>OOC color</b></a> <font face=\"fixedsys\" size=\"3\" color=\"[ooccolor]\"><table style='display:inline;'  bgcolor=\"[ooccolor]\"><tr><td>__</td></tr></table></font><br>"
 
-		dat += "<br><b>Occupation Choices</b><br>"
-		dat += "\t<a href=\"byond://?src=\ref[user];preference=job;task=menu\"><b>Set Preferences</b></a><br><br>"
+		dat += "\t<a href=\"byond://?src=\ref[user];preference=job;task=menu\"><b>Occupation Preferences</b></a><br>"
 
 		if(jobban_isbanned(user, "Records"))
 			dat += "<b>You are banned from using character records.</b><br>"
 		else
-			dat += "<b><a href=\"byond://?src=\ref[user];preference=records;record=1\">Character Records</a></b><br><br>"
+			dat += "<b><a href=\"byond://?src=\ref[user];preference=records;record=1\">Character Records</a></b><br>"
 
-		dat += "<b>Flavor Text</b><br>"
-		dat += "<a href='byond://?src=\ref[user];preference=flavor_text;task=input'>Change</a><br>"
+		dat += "\t<a href=\"byond://?src=\ref[user];preference=skills\"><b>Set Skills</b> (<i>[GetSkillClass(used_skillpoints)][used_skillpoints > 0 ? " [used_skillpoints]" : "0"])</i></a><br>"
+
+		dat += "<a href='byond://?src=\ref[user];preference=flavor_text;task=input'><b>Set Flavor Text</b></a><br>"
 		if(lentext(flavor_text) <= 40)
-			dat += "[flavor_text]"
+			if(!lentext(flavor_text))
+				dat += "\[...\]"
+			else
+				dat += "[flavor_text]"
 		else
 			dat += "[copytext(flavor_text, 1, 37)]...<br>"
 		dat += "<br>"
 
-		dat += "<b>Skill Choices</b><br>"
-		dat += "\t<i>[GetSkillClass(used_skillpoints)]</i> ([used_skillpoints])<br>"
-		dat += "\t<a href=\"byond://?src=\ref[user];preference=skills\"><b>Set Skills</b></a><br><br>"
-
-		//column 2
-		dat += "</td><td width='310px'>"	//height='300px'
-
-		dat += "<table><tr><td width=100><b>Body</b> "
-		dat += "(<a href=\"byond://?src=\ref[user];preference=all;task=random\">&reg;</A>)"
+		//antag
 		dat += "<br>"
+		if(jobban_isbanned(user, "Syndicate"))
+			dat += "<b>You are banned from antagonist roles.</b>"
+			src.be_special = 0
+		else
+			var/n = 0
+			for (var/i in special_roles)
+				if(special_roles[i]) //if mode is available on the server
+					if(jobban_isbanned(user, i))
+						dat += "<b>Be [i]:</b> <font color=red><b> \[BANNED]</b></font><br>"
+					else if(i == "pai candidate")
+						if(jobban_isbanned(user, "pAI"))
+							dat += "<b>Be [i]:</b> <font color=red><b> \[BANNED]</b></font><br>"
+					else
+						dat += "<b>Be [i]:</b> <a href=\"byond://?src=\ref[user];preference=be_special;num=[n]\"><b>[src.be_special&(1<<n) ? "Yes" : "No"]</b></a><br>"
+				n++
+		dat += "</td>"
+
+		//COLUMN 2
+		dat += "<td>"
+		dat += "<table><tr>"
+
+		dat += "<td width='142px'>"
+		dat += "<b>Body</b> (<a href=\"byond://?src=\ref[user];preference=all;task=random\">&reg;</A>)<br>"
 		dat += "Species: <a href='byond://?src=\ref[user];preference=species;task=input'>[species]</a><br>"
 		dat += "Blood Type: <a href='byond://?src=\ref[user];preference=b_type;task=input'>[b_type]</a><br>"
-		dat += "Skin Tone: <a href='byond://?src=\ref[user];preference=s_tone;task=input'>[-s_tone + 35]/220<br></a>"
+		dat += "Skin Tone: <a href='byond://?src=\ref[user];preference=s_tone;task=input'>[-s_tone + 35]/220</a><br>"
+		dat += "<a href='byond://?src=\ref[user];preference=skin_style;task=input'>Adjust Skin</a><br>"
+		dat += "<a href='byond://?src=\ref[user];preference=limbs;task=input'>Adjust Limbs</a><br>"
+		dat += "</td>"
 
-		dat += "Limbs: <a href='byond://?src=\ref[user];preference=limbs;task=input'>Adjust Limbs</a><br>"
+		dat += "<td><b>Preview</b></br>"
+		dat += "<img src=previewicon.png height=64 width=64><img src=previewicon2.png height=64 width=64></br></td>"
+
+		dat += "</tr></table>"
+
+		//display limbs below
+		var/ind = 0
 		for(var/name in organ_data)
+			//world << "[ind] \ [organ_data.len]"
 			var/status = organ_data[name]
 			var/organ_name = null
 			switch(name)
@@ -319,11 +348,18 @@ datum/preferences
 					organ_name = "right hand"
 
 			if(status == "cyborg")
-				dat += "\tRobotical [organ_name] prothesis<br>"
-			if(status == "amputated")
-				dat += "\tAmputated [organ_name]<br>"
-		dat+="<br>"
-
+				++ind
+				if(ind > 1)
+					dat += ", "
+				dat += "\tMechanical [organ_name] prothesis"
+			else if(status == "amputated")
+				++ind
+				if(ind > 1)
+					dat += ", "
+				dat += "\tAmputated [organ_name]"
+		if(ind)
+			dat += "\[...\]"
+		dat += "<br><br>"
 
 		if(gender == MALE)
 			dat += "Underwear: <a href =\"byond://?src=\ref[user];preference=underwear;task=input\"><b>[underwear_m[underwear]]</b></a><br>"
@@ -332,8 +368,6 @@ datum/preferences
 
 		dat += "Backpack Type:<br><a href =\"byond://?src=\ref[user];preference=bag;task=input\"><b>[backbaglist[backbag]]</b></a><br>"
 
-		dat += "</td><td><b>Preview</b><br><img src=previewicon.png height=64 width=64><img src=previewicon2.png height=64 width=64></td></tr></table>"
-
 		dat += "<br><b>Hair</b><br>"
 		dat += "<a href='byond://?src=\ref[user];preference=hair;task=input'>Change Color</a> <font face=\"fixedsys\" size=\"3\" color=\"#[num2hex(r_hair, 2)][num2hex(g_hair, 2)][num2hex(b_hair, 2)]\"><table style='display:inline;' bgcolor=\"#[num2hex(r_hair, 2)][num2hex(g_hair, 2)][num2hex(b_hair)]\"><tr><td>__</td></tr></table></font><br>"
 		dat += "Style: <a href='byond://?src=\ref[user];preference=h_style;task=input'>[h_style]</a><br>"
@@ -345,22 +379,7 @@ datum/preferences
 		dat += "<br><b>Eyes</b><br>"
 		dat += "<a href='byond://?src=\ref[user];preference=eyes;task=input'>Change Color</a> <font face=\"fixedsys\" size=\"3\" color=\"#[num2hex(r_eyes, 2)][num2hex(g_eyes, 2)][num2hex(b_eyes, 2)]\"><table  style='display:inline;' bgcolor=\"#[num2hex(r_eyes, 2)][num2hex(g_eyes, 2)][num2hex(b_eyes)]\"><tr><td>__</td></tr></table></font>"
 
-		dat += "<br><br>"
-		if(jobban_isbanned(user, "Syndicate"))
-			dat += "<b>You are banned from antagonist roles.</b>"
-			src.be_special = 0
-		else
-			var/n = 0
-			for (var/i in special_roles)
-				if(special_roles[i]) //if mode is available on the server
-					if(jobban_isbanned(user, i))
-						dat += "<b>Be [i]:</b> <font color=red><b> \[BANNED]</b></font><br>"
-					else if(i == "pai candidate")
-						if(jobban_isbanned(user, "pAI"))
-							dat += "<b>Be [i]:</b> <font color=red><b> \[BANNED]</b></font><br>"
-					else
-						dat += "<b>Be [i]:</b> <a href=\"byond://?src=\ref[user];preference=be_special;num=[n]\"><b>[src.be_special&(1<<n) ? "Yes" : "No"]</b></a><br>"
-				n++
+		dat += "<br>"
 		dat += "</td></tr></table><center>"
 
 		dat += "<hr>"
@@ -1021,6 +1040,10 @@ datum/preferences
 								if(second_limb)
 									organ_data[second_limb] = "cyborg"
 
+					if("skin_style")
+						var/skin_style_name = input(user, "Select a new skin style") as null|anything in list("default1", "default2", "default3")
+						if(!skin_style_name) return
+
 
 			else
 				switch(href_list["preference"])
@@ -1231,6 +1254,7 @@ datum/preferences
 			C.be_alien = be_special & BE_ALIEN
 			C.be_pai = be_special & BE_PAI
 			C.be_syndicate = be_special & BE_TRAITOR
+			C.be_spaceninja = be_special & BE_SPACENINJA
 			if(isnull(src.ghost_ears)) src.ghost_ears = 1 //There were problems where the default was null before someone saved their profile.
 			C.ghost_ears = src.ghost_ears
 			C.ghost_sight = src.ghost_sight

code/modules/mob/new_player/sprite_accessories.dm

@@ -331,3 +331,29 @@
 		name = "Tajaran Ears"
 		icon_state = "tajears"
 		species_allowed = list("Tajaran")
+
+//skin styles - WIP
+
+/datum/sprite_accessory/skin
+	human
+		name = "Default human skin"
+		icon = "human"
+
+	human_tatt01
+		name = "Tatt01 human skin"
+		icon = "human_tattoo1"
+
+	tajaran
+		name = "Default tajaran skin"
+		icon = "tajaran"
+		species_allowed = list("Tajaran")
+
+	soghun
+		name = "Default soghun skin"
+		icon = "soghun"
+		species_allowed = list("Soghun")
+
+	skrell
+		name = "Default skrell skin"
+		icon = "skrell"
+		species_allowed = list("Skrell")

code/modules/mob/screen.dm

@@ -518,6 +518,7 @@
 	if ((!( L.stat ) && L.canmove && !( L.restrained() )))
 		var/resisting = 0
 		for(var/obj/O in L.requests)
+			L.requests.Remove(O)
 			del(O)
 			resisting++
 		for(var/obj/item/weapon/grab/G in usr.grabbed_by)

code/modules/mob/transform_procs.dm

@@ -29,7 +29,7 @@
 	dna = null
 	O.dna.uni_identity = "00600200A00E0110148FC01300B009"
 	//O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8"
-	O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*13)]BB8"
+	O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8"
 	O.loc = loc
 	O.viruses = viruses
 	viruses = list()

code/modules/power/port_gen.dm

@@ -213,12 +213,22 @@ display round(lastgen) and plasmatank amount
 				user << "\blue You open the access panel."
 			else
 				user << "\blue You close the access panel."
-		else if(istype(O, /obj/item/weapon/crowbar) && !open)
+		else if(istype(O, /obj/item/weapon/crowbar) && open)
 			var/obj/machinery/constructable_frame/machine_frame/new_frame = new /obj/machinery/constructable_frame/machine_frame(src.loc)
 			for(var/obj/item/I in component_parts)
 				if(I.reliability < 100)
 					I.crit_fail = 1
 				I.loc = src.loc
+			while ( sheets > 0 )
+				var/obj/item/stack/sheet/G = new sheet_path(src.loc)
+
+				if ( sheets > 50 )
+					G.amount = 50
+				else
+					G.amount = sheets
+
+				sheets -= G.amount
+
 			new_frame.state = 2
 			new_frame.icon_state = "box_1"
 			del(src)

code/modules/projectiles/projectile.dm

@@ -36,7 +36,7 @@
 	var/damage = 10
 	var/damage_type = BRUTE //BRUTE, BURN, TOX, OXY, CLONE are the only things that should be in here
 	var/nodamage = 0 //Determines if the projectile will skip any damage inflictions
-	var/flag = "bullet" //Defines what armor to use when it hits things.  Must be set to bullet, laser, energy,or bomb
+	var/flag = "bullet" //Defines what armor to use when it hits things.  Must be set to bullet, laser, energy,or bomb	//Cael - bio and rad are also valid
 	var/projectile_type = "/obj/item/projectile"
 	var/kill_count = 50 //This will de-increment every process(). When 0, it will delete the projectile.
 		//Effects

code/modules/projectiles/projectile/special.dm

@@ -124,4 +124,12 @@
 		else if (istype(target, /mob/living/carbon/))
 			M.show_message("\blue The radiation beam dissipates harmlessly through your body.")
 		else
-			return 1
+			return 1
+
+/obj/item/projectile/neurotoxin
+	name = "neurotoxin"
+	icon_state = "toxin"
+	damage = 5
+	damage_type = TOX
+	weaken = 5
+	flag = "bio"

code/modules/reagents/reagent_containers/hypospray.dm

@@ -6,8 +6,9 @@
 	name = "hypospray"
 	desc = "The DeForest Medical Corporation hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients."
 	icon = 'icons/obj/syringe.dmi'
-	item_state = "hypo"
+	item_state = "hypo1"
 	icon_state = "hypo"
+	var/original_icon_state = "hypo"
 	amount_per_transfer_from_this = 5
 	volume = 30
 	possible_transfer_amounts = null
@@ -56,6 +57,7 @@
 	name = "autoinjector"
 	desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel."
 	icon_state = "autoinjector"
+	original_icon_state = "autoinjector"
 	item_state = "autoinjector"
 	amount_per_transfer_from_this = 5
 	volume = 5
@@ -74,9 +76,9 @@
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector/update_icon()
 	if(reagents.total_volume > 0)
-		icon_state = "[initial(icon_state)]1"
+		icon_state = "[original_icon_state]1"
 	else
-		icon_state = "[initial(icon_state)]0"
+		icon_state = "[original_icon_state]0"
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector/examine()
 	..()