Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

Conflicts:
	code/datums/disease.dm
	code/modules/reagents/Chemistry-Reagents.dm
	icons/turf/areas.dmi
	maps/tgstation.2.0.9.1.dmm

yep, this time going to merge map updates before making map changes >.>

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

code/modules/admin/player_panel.dm

@@ -478,6 +478,15 @@
 					dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td></tr>"
 			dat += "</table>"
 
+		if(istype(ticker.mode, /datum/game_mode/anti_revolution) && ticker.mode:heads.len)
+			dat += "<br><table cellspacing=5><tr><td><B>Corrupt Heads</B></td><td></td></tr>"
+			for(var/datum/mind/N in ticker.mode:heads)
+				var/mob/M = N.current
+				if(M)
+					dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+					dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td></tr>"
+			dat += "</table>"
+
 		if(ticker.mode.traitors.len > 0)
 			dat += "<br><table cellspacing=5><tr><td><B>Traitors</B></td><td></td><td></td></tr>"
 			for(var/datum/mind/traitor in ticker.mode.traitors)

code/modules/admin/verbs/adminhelp.dm

@@ -14,9 +14,10 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an", "monkey", "ali
 	if (src.handle_spam_prevention(msg,MUTE_ADMINHELP))
 		return
 
-	src.verbs -= /client/verb/adminhelp
+	/**src.verbs -= /client/verb/adminhelp
 	spawn(1200)
-		src.verbs += /client/verb/adminhelp	// 2 minute cool-down for adminhelps
+		src.verbs += /client/verb/adminhelp	// 2 minute cool-down for adminhelps//Go to hell
+	**/
 
 	if(!msg)	return
 	msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))

code/modules/assembly/igniter.dm

@@ -14,6 +14,9 @@
 		if(!..())	return 0//Cooldown check
 		var/turf/location = get_turf(loc)
 		if(location)	location.hotspot_expose(1000,1000)
+		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+		s.set_up(3, 1, src)
+		s.start()
 		return 1
 
 

code/modules/client/client defines.dm

@@ -25,6 +25,7 @@
 	var/played			= 0
 	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/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/clothing/suits/jobs.dm

@@ -66,6 +66,25 @@
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/cigpacket,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
 	armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
 
+//Forensics
+/obj/item/clothing/suit/forensics
+	name = "jacket"
+	desc = "A forensics technician jacket."
+	item_state = "det_suit"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+	allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/cigpacket,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
+	armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/suit/forensics/red
+	name = "red jacket"
+	desc = "A red forensics technician jacket."
+	icon_state = "forensics_red"
+
+/obj/item/clothing/suit/forensics/blue
+	name = "blue jacket"
+	desc = "A blue forensics technician jacket."
+	icon_state = "forensics_blue"
+
 //Engineering
 /obj/item/clothing/suit/hazardvest
 	name = "hazard vest"

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

@@ -1,11 +1,11 @@
 /mob/living/carbon/
 	gender = MALE
 	var/list/stomach_contents = list()
-
 	var/brain_op_stage = 0.0
+/*
 	var/eye_op_stage = 0.0
 	var/appendix_op_stage = 0.0
-
+*/
 	var/antibodies = 0
 
 	var/silent = null 		//Can't talk. Value goes down every life proc.

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

@@ -243,17 +243,6 @@
 	else if(!client && brain_op_stage != 4 && stat != DEAD)
 		msg += "[t_He] [t_has] a vacant, braindead stare...\n"
 
-	msg += "<span class='warning'>"
-
-	if(nutrition < 100)
-		msg += "[t_He] [t_is] severely malnourished.\n"
-	else if(nutrition >= 500)
-		if(usr.nutrition < 100)
-			msg += "[t_He] [t_is] plump and delicious looking - Like a fat little piggy. A tasty piggy.\n"
-		else
-			msg += "[t_He] [t_is] quite chubby.\n"
-	msg += "</span>"
-
 	var/list/wound_flavor_text = list()
 	var/list/is_destroyed = list()
 	var/list/is_bleeding = list()
@@ -285,6 +274,7 @@
 			else if(temp.wounds.len > 0)
 				var/list/wound_descriptors = list()
 				for(var/datum/wound/W in temp.wounds)
+					if(W.internal && !temp.open) continue // can't see internal wounds
 					var/this_wound_desc = W.desc
 					if(W.bleeding()) this_wound_desc = "bleeding [this_wound_desc]"
 					else if(W.bandaged) this_wound_desc = "bandaged [this_wound_desc]"

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

@@ -401,6 +401,26 @@
 							var/turf/location = M.loc
 							if (istype(location, /turf/simulated))
 								location.add_blood(M)
+								if(ishuman(M))
+									var/mob/living/carbon/H = M
+									var/blood_volume = round(H:vessel.get_reagent_amount("blood"))
+									if(blood_volume > 0)
+										H:vessel.remove_reagent("blood",1)
+							if(prob(5))
+								M.adjustBruteLoss(1)
+								visible_message("\red \The [M]'s wounds open more from being dragged!")
+						if(M.pull_damage())
+							if(prob(25))
+								M.adjustBruteLoss(2)
+								visible_message("\red \The [M]'s wounds worsen terribly from being dragged!")
+								var/turf/location = M.loc
+								if (istype(location, /turf/simulated))
+									location.add_blood(M)
+									if(ishuman(M))
+										var/mob/living/carbon/H = M
+										var/blood_volume = round(H:vessel.get_reagent_amount("blood"))
+										if(blood_volume > 0)
+											H:vessel.remove_reagent("blood",1)
 
 
 						step(pulling, get_dir(pulling.loc, T))

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

@@ -150,6 +150,8 @@
 
 /mob/living/carbon/human/proc/get_organ(var/zone)
 	if(!zone)	zone = "chest"
+	if (zone in list( "eyes", "mouth" ))
+		zone = "head"
 	return organs_by_name[zone]
 
 /mob/living/carbon/human/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/sharp = 0)

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

@@ -191,7 +191,7 @@
 				if(!(temp.status & ORGAN_BLEEDING) || temp.status & ORGAN_ROBOT)
 					continue
 				for(var/datum/wound/W in temp.wounds) if(W.bleeding())
-					blood_max += W.damage / 2
+					blood_max += W.damage / 4
 				if(temp.status & ORGAN_DESTROYED && !(temp.status & ORGAN_GAUZED))
 					blood_max += 20 //Yer missing a fucking limb.
 			drip(blood_max)
@@ -1053,7 +1053,8 @@
 
 			if(stuttering)
 				stuttering = max(stuttering-1, 0)
-
+			if (src.slurring)
+				stuttering = max(slurring-1, 0)
 			if(silent)
 				silent = max(silent-1, 0)
 

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

@@ -19,10 +19,10 @@
 				return
 
 	if(src.dna)
-		if(src.dna.mutantrace == "lizard")
+		/*if(src.dna.mutantrace == "lizard") //Soghun stutterss-s-ss-sss.
 			if(copytext(message, 1, 2) != "*")
 				message = dd_replacetext(message, "s", stutter("ss"))
-
+*/
 		if(src.dna.mutantrace == "metroid" && prob(5))
 			if(copytext(message, 1, 2) != "*")
 				if(copytext(message, 1, 2) == ";")
@@ -117,6 +117,8 @@
 			message = dd_replacetext(message, ".", "")
 			message = lowertext(message)
 			*/
+	if (src.slurring)
+		message = slur(message)
 	..(message)
 
 /mob/living/carbon/human/say_understands(var/other)

code/modules/mob/mob.dm

@@ -570,6 +570,17 @@ var/list/slot_equipment_priority = list( \
 	return
 
 
+/mob/proc/pull_damage()
+	if(ishuman(src))
+		var/mob/living/carbon/human/H = src
+		if(H.health - H.halloss <= config.health_threshold_crit)
+			for(var/name in H.organs_by_name)
+				var/datum/organ/external/e = H.organs_by_name[name]
+				if((H.lying) && ((e.status & ORGAN_BROKEN && !(e.status & ORGAN_SPLINTED)) || e.status & ORGAN_BLEEDING) && (H.getBruteLoss() + H.getFireLoss() >= 100))
+					return 1
+					break
+		return 0
+
 /mob/MouseDrop(mob/M as mob)
 	..()
 	if(M != usr) return

code/modules/mob/mob_helpers.dm

@@ -185,6 +185,28 @@ proc/hasorgans(A)
 		p++
 	return t
 
+proc/slur(phrase)
+	phrase = html_decode(phrase)
+	var/leng=lentext(phrase)
+	var/counter=lentext(phrase)
+	var/newphrase=""
+	var/newletter=""
+	while(counter>=1)
+		newletter=copytext(phrase,(leng-counter)+1,(leng-counter)+2)
+		if(rand(1,3)==3)
+			if(lowertext(newletter)=="o")	newletter="u"
+			if(lowertext(newletter)=="s")	newletter="ch"
+			if(lowertext(newletter)=="a")	newletter="ah"
+			if(lowertext(newletter)=="c")	newletter="k"
+		switch(rand(1,15))
+			if(1,3,5,8)	newletter="[lowertext(newletter)]"
+			if(2,4,6,15)	newletter="[uppertext(newletter)]"
+			if(7)	newletter+="'"
+			//if(9,10)	newletter="<b>[newletter]</b>"
+			//if(11,12)	newletter="<big>[newletter]</big>"
+			//if(13)	newletter="<small>[newletter]</small>"
+		newphrase+="[newletter]";counter-=1
+	return newphrase
 
 /proc/stutter(n)
 	var/te = html_decode(n)
@@ -382,4 +404,4 @@ var/list/intents = list("help","disarm","grab","hurt")
 			if(a_intent == "hurt")
 				hud_used.action_intent.icon_state = "harm"
 			else
-				hud_used.action_intent.icon_state = "help"
+				hud_used.action_intent.icon_state = "help"

code/modules/mob/new_player/new_player.dm

@@ -372,6 +372,11 @@
 		character.loc = pick(latejoin)
 		character.lastarea = get_area(loc)
 
+		if(character.client)
+			character.client.be_syndicate = preferences.be_special
+
+		ticker.mode.latespawn(character)
+
 		if(character.mind.assigned_role != "Cyborg")
 			data_core.manifest_inject(character)
 			ticker.minds += character.mind//Cyborgs and AIs handle this in the transform proc.	//TODO!!!!! ~Carn
@@ -391,13 +396,16 @@
 
 	proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank)
 		if (ticker.current_state == GAME_STATE_PLAYING)
-			var/mob/living/silicon/ai/announcer = new (null)
 			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")
+			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(a)
 			del(announcer)
+			*/
 
 	proc/LateChoices()
 		var/mills = world.time // 1/10 of a second, not real milliseconds but whatever

code/modules/mob/new_player/preferences.dm

@@ -296,6 +296,35 @@ datum/preferences
 		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 += "Limbs: <a href='byond://?src=\ref[user];preference=limbs;task=input'>Adjust Limbs</a><br>"
+		for(var/name in organ_data)
+			var/status = organ_data[name]
+			var/organ_name = null
+			switch(name)
+				if("l_arm")
+					organ_name = "left arm"
+				if("r_arm")
+					organ_name = "right arm"
+				if("l_leg")
+					organ_name = "left leg"
+				if("r_leg")
+					organ_name = "right leg"
+				if("l_foot")
+					organ_name = "left foot"
+				if("r_foot")
+					organ_name = "right foot"
+				if("l_hand")
+					organ_name = "left hand"
+				if("r_hand")
+					organ_name = "right hand"
+
+			if(status == "cyborg")
+				dat += "\tRobotical [organ_name] prothesis<br>"
+			if(status == "amputated")
+				dat += "\tAmputated [organ_name]<br>"
+		dat+="<br>"
+
+
 		if(gender == MALE)
 			dat += "Underwear: <a href =\"byond://?src=\ref[user];preference=underwear;task=input\"><b>[underwear_m[underwear]]</b></a><br>"
 		else
@@ -814,10 +843,6 @@ datum/preferences
 						var/list/valid_hairstyles = list()
 						for(var/hairstyle in hair_styles_list)
 							var/datum/sprite_accessory/S = hair_styles_list[hairstyle]
-							if(gender == MALE && !S.choose_male)
-								continue
-							if(gender == FEMALE && !S.choose_female)
-								continue
 							if( !(species in S.species_allowed))
 								continue
 
@@ -938,6 +963,57 @@ datum/preferences
 							sec_record = secmsg
 							SetRecords(user)
 
+					if("limbs")
+						var/limb_name = input(user, "Which limb do you want to change?") as null|anything in list("Left Leg","Right Leg","Left Arm","Right Arm","Left Foot","Right Foot","Left Hand","Right Hand")
+						if(!limb_name) return
+
+						var/limb = null
+						var/second_limb = null // if you try to change the arm, the hand should also change
+						var/third_limb = null  // if you try to unchange the hand, the arm should also change
+						switch(limb_name)
+							if("Left Leg")
+								limb = "l_leg"
+								second_limb = "l_foot"
+							if("Right Leg")
+								limb = "r_leg"
+								second_limb = "r_foot"
+							if("Left Arm")
+								limb = "l_arm"
+								second_limb = "l_hand"
+							if("Right Arm")
+								limb = "r_arm"
+								second_limb = "r_hand"
+							if("Left Foot")
+								limb = "l_foot"
+								third_limb = "l_leg"
+							if("Right Foot")
+								limb = "r_foot"
+								third_limb = "r_leg"
+							if("Left Hand")
+								limb = "l_hand"
+								third_limb = "l_arm"
+							if("Right Hand")
+								limb = "r_hand"
+								third_limb = "r_arm"
+
+						var/new_state = input(user, "What state do you wish the limb to be in?") as null|anything in list("Normal","Amputated","Prothesis")
+						if(!new_state) return
+
+						switch(new_state)
+							if("Normal")
+								organ_data[limb] = null
+								if(third_limb)
+									organ_data[third_limb] = null
+							if("Amputated")
+								organ_data[limb] = "amputated"
+								if(second_limb)
+									organ_data[second_limb] = "amputated"
+							if("Prothesis")
+								organ_data[limb] = "cyborg"
+								if(second_limb)
+									organ_data[second_limb] = "cyborg"
+
+
 			else
 				switch(href_list["preference"])
 					if("gender")
@@ -1087,6 +1163,22 @@ datum/preferences
 		character.h_style = h_style
 		character.f_style = f_style
 
+		character.skills = skills
+
+		// Destroy/cyborgize organs
+		for(var/name in organ_data)
+			var/datum/organ/external/O = character.organs[name]
+			if(!O) continue
+
+			var/status = organ_data[name]
+			if(status == "amputated")
+				O.amputated = 1
+				O.status |= ORGAN_DESTROYED
+				O.destspawn = 1
+			else if(status == "cyborg")
+				O.status |= ORGAN_ROBOT
+
+
 		switch(UI_style)
 			if("Orange")
 				character.UI = 'icons/mob/screen1_Orange.dmi'
@@ -1128,6 +1220,7 @@ datum/preferences
 			C.midis = src.midis
 			C.be_alien = be_special & BE_ALIEN
 			C.be_pai = be_special & BE_PAI
+			C.be_syndicate = be_special & BE_TRAITOR
 			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/preferences_setup.dm

@@ -215,7 +215,29 @@ datum/preferences
 		else if(species == "Skrell")
 			preview_icon = new /icon('icons/effects/species.dmi', "skrell_[g]_s")
 		else
-			preview_icon = new /icon('icons/mob/human.dmi', "body_[g]_s")
+			preview_icon = new /icon('human.dmi', "torso_[g]_s")
+
+			preview_icon.Blend(new /icon('human.dmi', "chest_[g]_s"), ICON_OVERLAY)
+
+			if(organ_data["head"] != "amputated")
+				preview_icon.Blend(new /icon('human.dmi', "head_[g]_s"), ICON_OVERLAY)
+
+			for(var/name in list("l_arm","r_arm","l_leg","r_leg","l_foot","r_foot","l_hand","r_hand"))
+				// make sure the organ is added to the list so it's drawn
+				if(organ_data[name] == null)
+					organ_data[name] = null
+
+			for(var/name in organ_data)
+				if(organ_data[name] == "amputated") continue
+
+				var/icon/temp = new /icon('human.dmi', "[name]_s")
+				if(organ_data[name] == "cyborg")
+					temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
+
+				preview_icon.Blend(temp, ICON_OVERLAY)
+
+			preview_icon.Blend(new /icon('human.dmi', "groin_[g]_s"), ICON_OVERLAY)
+
 
 		// Skin tone
 		if(species == "Human")

code/modules/mob/new_player/savefile.dm

@@ -127,6 +127,8 @@ datum/preferences/proc/savefile_save(mob/user)
 	F["slotname"] << src.slot_name
 	F["lobby_music"] << src.lobby_music
 
+	F["organ_data"] << src.organ_data
+
 	return 1
 
 // loads the savefile corresponding to the mob's ckey
@@ -260,6 +262,9 @@ datum/preferences/proc/savefile_load(mob/user)
 	if(isnull(metadata))
 		metadata = ""
 
+	F["organ_data"] >> src.organ_data
+	if(!src.organ_data) src.organ_data = list()
+
 	//NOTE: Conversion things go inside this if statement
 	//When updating the save file remember to add 1 to BOTH the savefile constants
 	//Also take the old conversion things that no longer apply out of this if

code/modules/mob/new_player/sprite_accessories.dm

@@ -63,10 +63,22 @@
 		name = "Shoulder-length Hair"
 		icon_state = "hair_b"
 
+	longalt
+		name = "Shoulder-length Hair Alt"
+		icon_state = "hair_longfringe"
+
+	longish
+		name = "Longer Hair"
+		icon_state = "hair_b2"
+
 	longer
 		name = "Long Hair"
 		icon_state = "hair_vlong"
 
+	longeralt
+		name = "Long Hair Alt"
+		icon_state = "hair_vlongfringe"
+
 	longest
 		name = "Very Long Hair"
 		icon_state = "hair_longest"

code/modules/power/cable.dm

@@ -523,3 +523,24 @@ obj/structure/cable/proc/cableColor(var/colorC)
 			icon = 'icons/obj/power_cond_cyan.dmi'
 		if("white")
 			icon = 'icons/obj/power_cond_white.dmi'
+
+
+/obj/item/weapon/cable_coil/attack(mob/M as mob, mob/user as mob)
+	if(hasorgans(M))
+		var/datum/organ/external/S = M:organs[user.zone_sel.selecting]
+		if(!(S.status & ORGAN_ROBOT) || user.a_intent != "help")
+			return ..()
+		if(S.burn_dam > 0)
+			S.heal_damage(0,15,0,1)
+			if(user != M)
+				user.visible_message("\red \The [user] repairs some burn damage on their [S.display_name] with \the [src]",\
+				"\red You repair some burn damage on your [S.display_name]",\
+				"You hear wires being cut.")
+			else
+				user.visible_message("\red \The [user] repairs some burn damage on their [S.display_name] with \the [src]",\
+				"\red You repair some burn damage on your [S.display_name]",\
+				"You hear wires being cut.")
+		else
+			user << "Nothing to fix!"
+	else
+		return ..()

code/modules/reagents/Chemistry-Holder.dm

@@ -88,9 +88,14 @@ datum
 					var/current_reagent_transfer = current_reagent.volume * part
 					if(preserve_data)
 						trans_data = current_reagent.data
-					R.add_reagent(current_reagent.id, (current_reagent_transfer * multiplier), trans_data)
-					src.remove_reagent(current_reagent.id, current_reagent_transfer)
-
+					if((current_reagent.id == "blood" && !ishuman(target)) || current_reagent.id != "blood")
+						R.add_reagent(current_reagent.id, (current_reagent_transfer * multiplier), trans_data)
+						src.remove_reagent(current_reagent.id, current_reagent_transfer)
+					else if(current_reagent.id == "blood" && ishuman(target)) // can never be sure
+						var/mob/living/carbon/human/H = target
+						H.vessel.add_reagent(current_reagent.id, (current_reagent_transfer * multiplier), trans_data)
+						src.remove_reagent(current_reagent.id, current_reagent_transfer)
+						H.vessel.update_total()
 				src.update_total()
 				R.update_total()
 				R.handle_reactions()

code/modules/reagents/reagent_containers/blood_pack.dm

@@ -0,0 +1,36 @@
+/obj/item/weapon/reagent_containers/blood
+	name = "BloodPack"
+	desc = "Contains blood used for transfusion."
+	icon = 'icons/obj/bloodpack.dmi'
+	volume = 200
+
+	var/blood_type = null
+
+	New()
+		..()
+		if(blood_type != null)
+			name = "BloodPack [blood_type]"
+			reagents.add_reagent("blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null))
+
+/obj/item/weapon/reagent_containers/blood/APlus
+	blood_type = "A+"
+
+/obj/item/weapon/reagent_containers/blood/AMinus
+	blood_type = "A-"
+
+/obj/item/weapon/reagent_containers/blood/BPlus
+	blood_type = "B+"
+
+/obj/item/weapon/reagent_containers/blood/BMinus
+	blood_type = "B-"
+
+/obj/item/weapon/reagent_containers/blood/OPlus
+	blood_type = "O+"
+
+/obj/item/weapon/reagent_containers/blood/OMinus
+	blood_type = "O-"
+
+/obj/item/weapon/reagent_containers/blood/empty
+	name = "Empty BloodPack"
+	desc = "Seems pretty useless... Maybe if there were a way to fill it?"
+	icon_state = "empty"

code/modules/reagents/reagent_containers/glass.dm

@@ -26,7 +26,8 @@
 		/obj/machinery/bot/medbot,
 		/obj/machinery/computer/pandemic,
 		/obj/item/weapon/secstorage/ssafe,
-		/obj/machinery/disposal
+		/obj/machinery/disposal,
+        /obj/machinery/iv_drip
 	)
 
 	examine()
@@ -222,4 +223,4 @@
 		..()
 		reagents.add_reagent("fluorosurfactant", 20)
 
-*/
+*/

code/modules/reagents/reagent_dispenser.dm

@@ -93,22 +93,18 @@
 		..()
 		reagents.add_reagent("fuel",1000)
 
-
 	bullet_act(var/obj/item/projectile/Proj)
 		if(istype(Proj ,/obj/item/projectile/beam)||istype(Proj,/obj/item/projectile/bullet))
-			explosion(src.loc,-1,0,2)
-			if(src)
-				del(src)
-
-
+			explode()
 
 	blob_act()
-		explosion(src.loc,0,1,5,7,10)
-		if(src)
-			del(src)
+		explode()
 
 	ex_act()
-		explosion(src.loc,-1,0,2)
+		explode()
+
+	proc/explode()
+		explosion(src.loc,1,2,4)
 		if(src)
 			del(src)