Merge pull request #133 from skull132/master

Update 26JUN2014

code/modules/admin/admin_verbs.dm

@@ -609,22 +609,22 @@ var/list/admin_verbs_mod = list(
 	feedback_add_details("admin_verb","GD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	log_admin("[key_name(usr)] gave [key_name(T)] the disease [D].")
 	message_admins("\blue [key_name_admin(usr)] gave [key_name(T)] the disease [D].", 1)
-
+	
 /client/proc/give_disease2(mob/T as mob in mob_list) // -- Giacom
 	set category = "Fun"
 	set name = "Give Disease"
 	set desc = "Gives a Disease to a mob."
-
+	
 	var/datum/disease2/disease/D = new /datum/disease2/disease()
-
+	
 	var/greater = ((input("Is this a lesser or greater disease?", "Give Disease") in list("Lesser", "Greater")) == "Greater")
-
+	
 	D.makerandom(greater)
 	if (!greater)
 		D.infectionchance = 1
-
+		
 	D.infectionchance = input("How virulent is this disease? (1-100)", "Give Disease", D.infectionchance) as num
-
+	
 	if(istype(T,/mob/living/carbon/human))
 		var/mob/living/carbon/human/H = T
 		if (H.species)
@@ -633,7 +633,7 @@ var/list/admin_verbs_mod = list(
 		var/mob/living/carbon/monkey/M = T
 		D.affected_species = list(M.greaterform)
 	infect_virus2(T,D,1)
-
+	
 	feedback_add_details("admin_verb","GD2") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	log_admin("[key_name(usr)] gave [key_name(T)] a [(greater)? "greater":"lesser"] disease2 with infection chance [D.infectionchance].")
 	message_admins("\blue [key_name_admin(usr)] gave [key_name(T)] a [(greater)? "greater":"lesser"] disease2 with infection chance [D.infectionchance].", 1)

code/modules/admin/verbs/adminpm.dm

@@ -114,7 +114,7 @@
 
 	//play the recieving admin the adminhelp sound (if they have them enabled)
 	//non-admins shouldn't be able to disable this
-	if(C.prefs.toggles & SOUND_ADMINHELP)
+	if(C.prefs && C.prefs.toggles & SOUND_ADMINHELP)
 		C << 'sound/effects/adminhelp.ogg'
 
 	log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]")

code/modules/clothing/shoes/colour.dm

@@ -84,22 +84,31 @@
 	name = "orange shoes"
 	icon_state = "orange"
 	item_color = "orange"
+	var/obj/item/weapon/handcuffs/chained = null
+
+/obj/item/clothing/shoes/orange/proc/attach_cuffs(var/obj/item/weapon/handcuffs/cuffs)
+	if (src.chained) return
+
+	cuffs.loc = src
+	src.chained = cuffs
+	src.slowdown = 15
+	src.icon_state = "orange1"
+
+/obj/item/clothing/shoes/orange/proc/remove_cuffs()
+	if (!src.chained) return
+
+	src.chained.loc = get_turf(src)
+	src.slowdown = initial(slowdown)
+	src.icon_state = "orange"
+	src.chained = null
+
+/obj/item/clothing/shoes/orange/attack_self(mob/user as mob)
+	..()
+	remove_cuffs()
+
+/obj/item/clothing/shoes/orange/attackby(H as obj, mob/user as mob)
+	..()
+	if (istype(H, /obj/item/weapon/handcuffs))
+		attach_cuffs(H)
 
-///obj/item/clothing/shoes/orange/attack_self(mob/user as mob)
-//	if (src.chained)
-//		src.chained = null
-//		src.slowdown = SHOES_SLOWDOWN
-//		new /obj/item/weapon/handcuffs( user.loc )
-//		src.icon_state = "orange"
-//	return
 
-///obj/item/clothing/shoes/orange/attackby(H as obj, loc)
-//	..()
-//	if ((istype(H, /obj/item/weapon/handcuffs) && !( src.chained )))
-//		//H = null
-//		if (src.icon_state != "orange") return
-//		del(H)
-//		src.chained = 1
-//		src.slowdown = 15
-//		src.icon_state = "orange1"
-//	return

code/modules/clothing/under/jobs/engineering.dm

@@ -30,42 +30,4 @@
 	name = "roboticist's jumpsuit"
 	icon_state = "robotics"
 	item_state = "robotics"
-	item_color = "robotics"
-
-//Down below follows a partial attempt at getting the rolldown verb for jumpsuits.
-//Issue: Sprites vanishing again... Hueh - Skull132
-/*
-/obj/item/clothing/under/rank/verb/rolldown()
-	set name = "Roll Down Jumpsuit"
-	set category = "Object"
-	set src in usr
-
-	if(!usr.canmove || usr.stat || usr.restrained())
-		return 0
-
-	switch(icon_state)
-		if("atmos")
-			src.icon_state = "atmos_rd"
-			src.item_color = "atmos_rd"
-			src.item_state = "atmos_rd"
-			usr << "You roll down the jumpsuit."
-		if("atmos_rd")
-			src.icon_state = "atmos"
-			src.item_color = "atmos"
-			src.item_state = "atmos"
-			usr << "You roll the jumpsuit back up."
-		if("engine")
-			src.icon_state = "engine_rd"
-			src.item_color = "engine_rd"
-			src.item_state = "engine_rd"
-			usr << "You roll down the jumpsuit."
-		if("engine_rd")
-			src.icon_state = "engine"
-			src.item_color = "engine"
-			src.item_state = "engine"
-			usr << "You roll the jumpsuit back up."
-		else
-			usr << "You attempt to roll down your [src], before promptly realising how stupid it would be for you to expose your chest."
-			return
-	usr.update_inv_w_uniform() */
-
+	item_color = "robotics"

code/modules/customitems/item_defines.dm

@@ -632,7 +632,7 @@
 	w_class = 1.0
 	slot_flags = SLOT_GLOVES
 
-/obj/item/luff/delivander_ring //Old wedding ring - Delivander Starbreeze - gollee - DONE
+/obj/item/fluff/delivander_ring //Old wedding ring - Delivander Starbreeze - gollee - DONE
 	name = "old wedding ring"
 	desc = "A tarnished gold ring, there is writing inside it, “To Liura, forever.”"
 	icon = 'icons/obj/custom_items.dmi'
@@ -654,4 +654,37 @@
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = ""
 	item_state = ""
-	clipped = 1
+	clipped = 1
+
+/obj/item/clothing/tie/storage/fluff/cecillia_locket
+	name = "Old Locket"
+	desc = ""
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "cecillia_locket0"
+	item_state = "cecillia_locket0"
+	slots = 1
+
+/obj/item/weapon/reagent_containers/pill/cecillia_pill
+	name = "Cici's moonshine pill"
+	desc = "Smells of home-made remedies."
+	icon_state = "pill8"
+	New()
+		..()
+		reagents.add_reagent("space_drugs", 5)
+		reagents.add_reagent("paroxetine", 5)
+
+/obj/item/clothing/tie/storage/fluff/cecillia_locket/proc/update()
+	var/count = 0
+	for(var/obj/item/I in hold)
+		if(istype(I,/obj/item/weapon/reagent_containers/pill))
+			count++
+	if(count>1) count = 1
+	item_state = "cecillia_locket[count]"
+	icon_state = item_state
+	item_color = item_state
+
+	if(istype(loc, /obj/item/clothing))
+		var/obj/item/clothing/U = loc
+		if(istype(U.loc, /mob/living/carbon/human))
+			var/mob/living/carbon/human/H = U.loc
+			H.update_inv_w_uniform()

code/modules/customitems/item_spawning.dm

@@ -4,13 +4,15 @@
 //for multiple items just add mutliple entries, unless i change it to be a listlistlist
 //yes, it has to be an item, you can't pick up nonitems
 
+/var/list/custom_items = list()
+
+/hook/startup/proc/loadCustomItems()
+	var/custom_items_file = file2text("config/custom_items.txt")
+	custom_items = text2list(custom_items_file, "\n")
+	return 1
 
 /proc/EquipCustomItems(mob/living/carbon/human/M)
-	// load lines
-	var/file = file2text("config/custom_items.txt")
-	var/lines = text2list(file, "\n")
-
-	for(var/line in lines)
+	for(var/line in custom_items)
 		// split & clean up
 		var/list/Entry = text2list(line, ":")
 		for(var/i = 1 to Entry.len)
@@ -25,6 +27,8 @@
 				var/ok = 0  // 1 if the item was placed successfully
 				P = trim(P)
 				var/path = text2path(P)
+				if(!path) continue
+
 				var/obj/item/Item = new path()
 				if(istype(Item,/obj/item/weapon/card/id))
 					//id card needs to replace the original ID
@@ -58,6 +62,23 @@
 						del(C)
 						ok = M.equip_if_possible(I, slot_wear_id, 0)	//if 1, last argument deletes on fail
 						break
+/*				else if(istype(Item,/obj/item/weapon/storage/belt))
+					if(M.ckey == "jakksergal" && M.real_name == "Nashi Ra'hal" && M.mind.role_alt_title && M.mind.role_alt_title != "Nurse" && M.mind.role_alt_title != "Chemist")
+						ok = 1
+						del(Item)
+						goto skip
+					var/obj/item/weapon/storage/belt/medical/fluff/nashi_belt/I = Item
+					if(istype(M.belt,/obj/item/weapon/storage/belt))
+						for(var/obj/item/weapon/storage/belt/B in M)
+							del(B)
+							M.belt=null
+						ok = M.equip_if_possible(I, slot_belt, 0)
+						break
+					if(istype(M.belt,/obj/item/device/pda))
+						for(var/obj/item/device/pda/Pda in M)
+							M.belt=null
+							M.equip_if_possible(Pda, slot_l_store, 0)
+						ok = M.equip_if_possible(I, slot_belt, 0)*/
 				else if(istype(M.back,/obj/item/weapon/storage) && M.back:contents.len < M.back:storage_slots) // Try to place it in something on the mob's back
 					Item.loc = M.back
 					ok = 1

code/modules/mining/mine_items.dm

@@ -190,6 +190,7 @@ proc/move_mining_shuttle()
 	attack_verb = list("hit", "pierced", "sliced", "attacked")
 	var/drill_sound = 'sound/weapons/Genhit.ogg'
 	var/drill_verb = "picking"
+	sharp = 1
 
 	var/excavation_amount = 100
 

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

@@ -72,7 +72,7 @@ var/const/MAX_ACTIVE_TIME = 400
 	Die()
 	return
 
-/obj/item/clothing/mask/facehugger/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+/obj/item/clothing/mask/facehugger/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	if(exposed_temperature > 300)
 		Die()
 	return

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

@@ -279,4 +279,4 @@
 				emp_damage += rand(10,20)
 			if(3)
 				emp_damage += rand(0,10)
-	..()*/
+	..()*/

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

@@ -52,6 +52,7 @@
 		brainmob.real_name = H.real_name
 		brainmob.dna = H.dna
 		brainmob.timeofhostdeath = H.timeofdeath
+		brainmob.stat = 0
 		if(brainmob.mind)
 			brainmob.mind.assigned_role = "Positronic Brain"
 		if(H.mind)

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

@@ -252,11 +252,13 @@
 
 /mob/living/carbon/proc/throw_mode_off()
 	src.in_throw_mode = 0
-	src.throw_icon.icon_state = "act_throw_off"
+	if(src.throw_icon) //in case we don't have the HUD and we use the hotkey
+		src.throw_icon.icon_state = "act_throw_off"
 
 /mob/living/carbon/proc/throw_mode_on()
 	src.in_throw_mode = 1
-	src.throw_icon.icon_state = "act_throw_on"
+	if(src.throw_icon)
+		src.throw_icon.icon_state = "act_throw_on"
 
 /mob/proc/throw_item(atom/target)
 	return

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

@@ -111,19 +111,16 @@
 			return 1
 
 		if("hurt")
+			var/datum/unarmed_attack/attack = M.species.unarmed
 
-			M.attack_log += text("\[[time_stamp()]\] <font color='red'>[M.species.attack_verb]ed [src.name] ([src.ckey])</font>")
-			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [M.species.attack_verb]ed by [M.name] ([M.ckey])</font>")
-			msg_admin_attack("[key_name(M)] [M.species.attack_verb]ed [key_name(src)]")
+			M.attack_log += text("\[[time_stamp()]\] <font color='red'>[pick(attack.attack_verb)]ed [src.name] ([src.ckey])</font>")
+			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [pick(attack.attack_verb)]ed by [M.name] ([M.ckey])</font>")
+			msg_admin_attack("[key_name(M)] [pick(attack.attack_verb)]ed [key_name(src)]")
 
 			var/damage = rand(0, 5)//BS12 EDIT
 			if(!damage)
-				if(M.species.attack_verb == "punch")
-					playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
-				else
-					playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
-
-				visible_message("\red <B>[M] has attempted to [M.species.attack_verb] [src]!</B>")
+				playsound(loc, attack.miss_sound, 25, 1, -1)
+				visible_message("\red <B>[M] tried to [pick(attack.attack_verb)] [src]!</B>")
 				return 0
 
 
@@ -133,20 +130,16 @@
 			if(HULK in M.mutations)			damage += 5
 
 
-			if(M.species.attack_verb == "punch")
-				playsound(loc, "punch", 25, 1, -1)
-			else
-				playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+			playsound(loc, attack.attack_sound, 25, 1, -1)
 
-			visible_message("\red <B>[M] has [M.species.attack_verb]ed [src]!</B>")
+			visible_message("\red <B>[M] [pick(attack.attack_verb)]ed [src]!</B>")
 			//Rearranged, so claws don't increase weaken chance.
 			if(damage >= 5 && prob(50))
 				visible_message("\red <B>[M] has weakened [src]!</B>")
 				apply_effect(2, WEAKEN, armor_block)
 
-			if(M.species.punch_damage)
-				damage += M.species.punch_damage
-			apply_damage(damage, BRUTE, affecting, armor_block)
+			damage += attack.damage
+			apply_damage(damage, BRUTE, affecting, armor_block, sharp=attack.sharp, edge=attack.edge)
 
 
 		if("disarm")

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

@@ -59,6 +59,36 @@
 		heal_overall_damage(0, -amount)
 	hud_updateflag |= 1 << HEALTH_HUD
 
+/mob/living/carbon/human/proc/adjustBruteLossByPart(var/amount, var/organ_name, var/obj/damage_source = null)
+	if(species && species.brute_mod)
+		amount = amount*species.brute_mod
+
+	if (organ_name in organs_by_name)
+		var/datum/organ/external/O = get_organ(organ_name)
+	
+		if(amount > 0)
+			O.take_damage(amount, 0, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source)
+		else
+			//if you don't want to heal robot organs, they you will have to check that yourself before using this proc.
+			O.heal_damage(-amount, 0, internal=0, robo_repair=(O.status & ORGAN_ROBOT))
+	
+	hud_updateflag |= 1 << HEALTH_HUD
+
+/mob/living/carbon/human/proc/adjustFireLossByPart(var/amount, var/organ_name, var/obj/damage_source = null)
+	if(species && species.burn_mod)
+		amount = amount*species.burn_mod
+
+	if (organ_name in organs_by_name)
+		var/datum/organ/external/O = get_organ(organ_name)
+	
+		if(amount > 0)
+			O.take_damage(0, amount, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source)
+		else
+			//if you don't want to heal robot organs, they you will have to check that yourself before using this proc.
+			O.heal_damage(0, -amount, internal=0, robo_repair=(O.status & ORGAN_ROBOT))
+	
+	hud_updateflag |= 1 << HEALTH_HUD
+
 /mob/living/carbon/human/Stun(amount)
 	if(HULK in mutations)	return
 	..()
@@ -138,11 +168,11 @@
 //Damages ONE external organ, organ gets randomly selected from damagable ones.
 //It automatically updates damage overlays if necesary
 //It automatically updates health status
-/mob/living/carbon/human/take_organ_damage(var/brute, var/burn, var/sharp = 0)
+/mob/living/carbon/human/take_organ_damage(var/brute, var/burn, var/sharp = 0, var/edge = 0)
 	var/list/datum/organ/external/parts = get_damageable_organs()
 	if(!parts.len)	return
 	var/datum/organ/external/picked = pick(parts)
-	if(picked.take_damage(brute,burn,sharp))
+	if(picked.take_damage(brute,burn,sharp,edge))
 		UpdateDamageIcon()
 		hud_updateflag |= 1 << HEALTH_HUD
 	updatehealth()
@@ -172,7 +202,7 @@
 	if(update)	UpdateDamageIcon()
 
 // damage MANY external organs, in random order
-/mob/living/carbon/human/take_overall_damage(var/brute, var/burn, var/sharp = 0, var/used_weapon = null)
+/mob/living/carbon/human/take_overall_damage(var/brute, var/burn, var/sharp = 0, var/edge = 0, var/used_weapon = null)
 	if(status_flags & GODMODE)	return	//godmode
 	var/list/datum/organ/external/parts = get_damageable_organs()
 	var/update = 0
@@ -182,7 +212,7 @@
 		var/brute_was = picked.brute_dam
 		var/burn_was = picked.burn_dam
 
-		update |= picked.take_damage(brute,burn,sharp,used_weapon)
+		update |= picked.take_damage(brute,burn,sharp,edge,used_weapon)
 		brute	-= (picked.brute_dam - brute_was)
 		burn	-= (picked.burn_dam - burn_was)
 
@@ -227,7 +257,7 @@ This function restores all organs.
 		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, var/obj/used_weapon = null)
+/mob/living/carbon/human/apply_damage(var/damage = 0, var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/sharp = 0, var/edge = 0, var/obj/used_weapon = null)
 
 	//visible_message("Hit debug. [damage] | [damagetype] | [def_zone] | [blocked] | [sharp] | [used_weapon]")
 	if((damagetype != BRUTE) && (damagetype != BURN))
@@ -250,11 +280,15 @@ This function restores all organs.
 	switch(damagetype)
 		if(BRUTE)
 			damageoverlaytemp = 20
-			if(organ.take_damage(damage, 0, sharp, used_weapon))
+			if(species && species.brute_mod)
+				damage = damage*species.brute_mod
+			if(organ.take_damage(damage, 0, sharp, edge, used_weapon))
 				UpdateDamageIcon()
 		if(BURN)
 			damageoverlaytemp = 20
-			if(organ.take_damage(0, damage, sharp, used_weapon))
+			if(species && species.burn_mod)
+				damage = damage*species.burn_mod
+			if(organ.take_damage(0, damage, sharp, edge, used_weapon))
 				UpdateDamageIcon()
 
 	// Will set our damageoverlay icon to the next level, which will then be set back to the normal level the next mob.Life().

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

@@ -232,7 +232,7 @@ emp_act
 	if(armor >= 2)	return 0
 	if(!I.force)	return 0
 
-	apply_damage(I.force, I.damtype, affecting, armor , is_sharp(I), I)
+	apply_damage(I.force, I.damtype, affecting, armor , is_sharp(I), has_edge(I), I)
 
 	var/bloody = 0
 	if(((I.damtype == BRUTE) || (I.damtype == HALLOSS)) && prob(25 + (I.force * 2)))

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

@@ -1488,21 +1488,21 @@
 			for (var/ID in virus2)
 				var/datum/disease2/disease/V = virus2[ID]
 				V.cure(src)
+		if(life_tick % 3) //don't spam checks over all objects in view every tick.
+			for(var/obj/effect/decal/cleanable/O in view(1,src))
+				if(istype(O,/obj/effect/decal/cleanable/blood))
+					var/obj/effect/decal/cleanable/blood/B = O
+					if(B.virus2.len)
+						for (var/ID in B.virus2)
+							var/datum/disease2/disease/V = B.virus2[ID]
+							infect_virus2(src,V.getcopy())
 
-		for(var/obj/effect/decal/cleanable/O in view(1,src))
-			if(istype(O,/obj/effect/decal/cleanable/blood))
-				var/obj/effect/decal/cleanable/blood/B = O
-				if(B.virus2.len)
-					for (var/ID in B.virus2)
-						var/datum/disease2/disease/V = B.virus2[ID]
-						infect_virus2(src,V)
-
-			else if(istype(O,/obj/effect/decal/cleanable/mucus))
-				var/obj/effect/decal/cleanable/mucus/M = O
-				if(M.virus2.len)
-					for (var/ID in M.virus2)
-						var/datum/disease2/disease/V = M.virus2[ID]
-						infect_virus2(src,V)
+				else if(istype(O,/obj/effect/decal/cleanable/mucus))
+					var/obj/effect/decal/cleanable/mucus/M = O
+					if(M.virus2.len)
+						for (var/ID in M.virus2)
+							var/datum/disease2/disease/V = M.virus2[ID]
+							infect_virus2(src,V.getcopy())
 
 
 		if(virus2.len)

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

@@ -184,6 +184,29 @@
 /mob/living/carbon/human/proc/GetSpecialVoice()
 	return special_voice
 
+
+/* 
+   ***Deprecated***
+   let this be handled at the hear_say or hear_radio proc
+   This is left in for robot speaking when humans gain binary channel access until I get around to rewriting
+   robot_talk() proc.
+   There is no language handling build into it however there is at the /mob level so we accept the call
+   for it but just ignore it.
+*/
+
+/mob/living/carbon/human/say_quote(var/message, var/datum/language/speaking = null)
+	var/verb = "says"
+	var/ending = copytext(message, length(message))
+	if(ending=="!")
+		verb=pick("exclaims","shouts","yells")
+	else if(ending=="?")
+		verb="asks"
+
+	return verb
+
+	
+
+
 /mob/living/carbon/human/proc/handle_speech_problems(var/message)
 	var/list/returns[3]
 	var/verb = "says"

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

@@ -10,6 +10,8 @@
 	icon_state = "nymph1"
 	var/list/donors = list()
 	var/ready_evolve = 0
+	universal_understand = 0 // Dionaea do not need to speak to people
+	universal_speak = 0      // before becoming an adult. Use *chirp.
 
 /mob/living/carbon/monkey/diona/attack_hand(mob/living/carbon/human/M as mob)
 
@@ -207,7 +209,7 @@
 	src.visible_message("\red [src] flicks out a feeler and neatly steals a sample of [M]'s blood.","\red You flick out a feeler and neatly steal a sample of [M]'s blood.")
 	donors += M.real_name
 	for(var/datum/language/L in M.languages)
-		languages += L
+		languages |= L
 
 	spawn(25)
 		update_progression()
@@ -245,14 +247,11 @@
 
 	message =  trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
 
-
 	if(stat == 2)
 		return say_dead(message)
 
 	var/datum/language/speaking = null
 
-
-
 	if(length(message) >= 2)
 		var/channel_prefix = copytext(message, 1 ,3)
 		if(languages.len)
@@ -270,6 +269,4 @@
 	if(!message || stat)
 		return
 
-
-
 	..(message, speaking, verb, null, null, message_range, null)

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

@@ -86,14 +86,4 @@ mob/living/carbon/monkey/react_to_attack(mob/M)
 				emote("me", 2, "whimpers fearfully!")
 
 		npc_fleeing = M
-		fleeing_duration = 30
-
-
-/*/mob/living/proc/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/slash = 0, var/used_weapon = null)
-	if(!client && !stat)
-		if(damage > 10)
-			if(prob(40) || health == 100)
-				emote("me", 2, pick("screams loudly!", "whimpers in pain!"))
-		else if(health == 100 || (damage > 0 && prob(10)))
-			emote("me", 1, pick("flails about wildly!", "cringes visibly!", "chimpers nervously."))
-	return ..()*/
+		fleeing_duration = 30

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

@@ -12,8 +12,8 @@
 	var/primitive                // Lesser form, if any (ie. monkey for humans)
 	var/tail                     // Name of tail image in species effects icon file.
 	var/language                 // Default racial language, if any.
-	var/attack_verb = "punch"    // Empty hand hurt intent verb.
-	var/punch_damage = 0		 // Extra empty hand attack damage.
+	var/unarmed                  //For empty hand harm-intent attack
+	var/unarmed_type = /datum/unarmed_attack
 	var/mutantrace               // Safeguard due to old code.
 
 	var/breath_type = "oxygen"   // Non-oxygen gas breathed, if any.
@@ -68,6 +68,9 @@
 
 	var/list/sprite_sheets = list()
 
+/datum/species/New()
+	unarmed = new unarmed_type()
+
 /datum/species/proc/create_organs(var/mob/living/carbon/human/H) //Handles creation of mob organs.
 	//This is a basic humanoid limb setup.
 	H.organs = list()
@@ -121,6 +124,7 @@
 	name = "Human"
 	language = "Sol Common"
 	primitive = /mob/living/carbon/monkey
+	unarmed_type = /datum/unarmed_attack/punch
 
 	flags = HAS_SKIN_TONE | HAS_LIPS | HAS_UNDERWEAR
 
@@ -133,8 +137,7 @@
 	deform = 'icons/mob/human_races/r_def_lizard.dmi'
 	language = "Sinta'unathi"
 	tail = "sogtail"
-	attack_verb = "scratch"
-	punch_damage = 5
+	unarmed_type = /datum/unarmed_attack/claws
 	primitive = /mob/living/carbon/monkey/unathi
 	darksight = 3
 
@@ -156,8 +159,7 @@
 	deform = 'icons/mob/human_races/r_def_tajaran.dmi'
 	language = "Siik'tajr"
 	tail = "tajtail"
-	attack_verb = "scratch"
-	punch_damage = 5
+	unarmed_type = /datum/unarmed_attack/claws
 	darksight = 8
 
 	cold_level_1 = 200 //Default 260
@@ -180,6 +182,7 @@
 	deform = 'icons/mob/human_races/r_def_skrell.dmi'
 	language = "Skrellian"
 	primitive = /mob/living/carbon/monkey/skrell
+	unarmed_type = /datum/unarmed_attack/punch
 
 	flags = IS_WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR
 
@@ -190,6 +193,7 @@
 	icobase = 'icons/mob/human_races/r_vox.dmi'
 	deform = 'icons/mob/human_races/r_def_vox.dmi'
 	language = "Vox-pidgin"
+	unarmed_type = /datum/unarmed_attack/claws	//I dont think it will hurt to give vox claws too.
 
 	warning_low_pressure = 50
 	hazard_low_pressure = 0
@@ -231,7 +235,7 @@
 	icobase = 'icons/mob/human_races/r_armalis.dmi'
 	deform = 'icons/mob/human_races/r_armalis.dmi'
 	language = "Vox-pidgin"
-	attack_verb = "slash"
+	unarmed_type = /datum/unarmed_attack/claws/armalis
 
 	warning_low_pressure = 50
 	hazard_low_pressure = 0
@@ -295,8 +299,7 @@
 	icobase = 'icons/mob/human_races/r_diona.dmi'
 	deform = 'icons/mob/human_races/r_def_plant.dmi'
 	language = "Rootspeak"
-	attack_verb = "slash"
-	punch_damage = 5
+	unarmed_type = /datum/unarmed_attack/diona
 	primitive = /mob/living/carbon/monkey/diona
 
 	warning_low_pressure = 50
@@ -341,7 +344,7 @@
 	icobase = 'icons/mob/human_races/r_machine.dmi'
 	deform = 'icons/mob/human_races/r_machine.dmi'
 	language = "Tradeband"
-	punch_damage = 2
+	unarmed_type = /datum/unarmed_attack/punch
 
 	eyes = "blank_eyes"
 	brute_mod = 0.5
@@ -362,3 +365,32 @@
 
 	blood_color = "#1F181F"
 	flesh_color = "#575757"
+
+//Species unarmed attacks
+
+/datum/unarmed_attack
+	var/attack_verb = list("attack")	// Empty hand hurt intent verb.
+	var/damage = 0						// Extra empty hand attack damage.
+	var/attack_sound = "punch"
+	var/miss_sound = 'sound/weapons/punchmiss.ogg'
+	var/sharp = 0
+	var/edge = 0
+	
+/datum/unarmed_attack/punch
+	attack_verb = list("punch")
+
+/datum/unarmed_attack/diona
+	attack_verb = list("lash", "bludgeon")
+	damage = 5
+
+/datum/unarmed_attack/claws
+	attack_verb = list("scratch", "claw")
+	attack_sound = 'sound/weapons/slice.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	damage = 5
+	sharp = 1
+	edge = 1
+
+/datum/unarmed_attack/claws/armalis
+	attack_verb = list("slash", "claw")
+	damage = 10	//they're huge! they should do a little more damage, i'd even go for 15-20 maybe...

code/modules/mob/living/damage_procs.dm

@@ -8,7 +8,7 @@
 	Returns
 	standard 0 if fail
 */
-/mob/living/proc/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/used_weapon = null)
+/mob/living/proc/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/used_weapon = null, var/sharp = 0, var/edge = 0)
 	if(!damage || (blocked >= 2))	return 0
 	switch(damagetype)
 		if(BRUTE)

code/modules/mob/living/living.dm

@@ -431,7 +431,8 @@
 	else
 		stop_pulling()
 		. = ..()
-	if ((s_active && !( s_active in contents ) ))
+
+	if (s_active && !( s_active in contents ) && get_turf(s_active) != get_turf(src))	//check !( s_active in contents ) first so we hopefully don't have to call get_turf() so much.
 		s_active.close(src)
 
 	if(update_slimes)

code/modules/mob/living/living_defense.dm

@@ -53,11 +53,8 @@
 			signaler.signal()
 
 	var/absorb = run_armor_check(def_zone, P.flag)
-	if(absorb >= 2)
-		P.on_hit(src,2)
-		return 2
 	if(!P.nodamage)
-		apply_damage((P.damage/(absorb+1)), P.damage_type, def_zone, absorb, 0, P)
+		apply_damage(P.damage, P.damage_type, def_zone, absorb, 0, P, sharp=is_sharp(P), edge=has_edge(P))
 	P.on_hit(src, absorb, def_zone)
 	return absorb
 
@@ -72,7 +69,7 @@
 		src.visible_message("\red [src] has been hit by [O].")
 		var/armor = run_armor_check(zone, "melee", "Your armor has protected your [zone].", "Your armor has softened hit to your [zone].")
 		if(armor < 2)
-			apply_damage(O.throwforce*(speed/5), dtype, zone, armor, O.sharp, O)
+			apply_damage(O.throwforce*(speed/5), dtype, zone, armor, O, sharp=is_sharp(O), edge=has_edge(O))
 
 		if(!O.fingerprintslast)
 			return

code/modules/mob/living/say.dm

@@ -103,7 +103,7 @@ var/list/department_radio_keys = list(
 				var/obj/O = I
 				hearturfs += O.locs[1]
 				objects |= O
-		
+
 		for(var/mob/M in player_list)
 			if(M.stat == DEAD && M.client && (M.client.prefs.toggles & CHAT_GHOSTEARS))
 				listening |= M
@@ -113,7 +113,8 @@ var/list/department_radio_keys = list(
 
 		for(var/obj/O in objects)
 			spawn(0)
-				O.hear_talk(src, message, verb, speaking)	
+				if(O) //It's possible that it could be deleted in the meantime.
+					O.hear_talk(src, message, verb, speaking)
 
 	var/speech_bubble_test = say_test(message)
 	var/image/speech_bubble = image('icons/mob/talk.dmi',src,"h[speech_bubble_test]")

code/modules/mob/living/silicon/ai/ai.dm

@@ -241,13 +241,13 @@ var/list/ai_list = list()
 			for (var/area_name in alarmlist)
 				var/datum/alarm/alarm = alarmlist[area_name]
 				dat += "<NOBR>"
-				
+
 				var/cameratext = ""
 				if (alarm.cameras)
 					for (var/obj/machinery/camera/I in alarm.cameras)
 						cameratext += text("[]<A HREF=?src=\ref[];switchcamera=\ref[]>[]</A>", (cameratext=="") ? "" : " | ", src, I, I.c_tag)
 				dat += text("-- [] ([])", alarm.area.name, (cameratext)? cameratext : "No Camera")
-				
+
 				if (alarm.sources.len > 1)
 					dat += text(" - [] sources", alarm.sources.len)
 				dat += "</NOBR><BR>\n"
@@ -398,23 +398,11 @@ var/list/ai_list = list()
 
 	if (href_list["track"])
 		var/mob/target = locate(href_list["track"]) in mob_list
-/*
-		var/mob/living/silicon/ai/A = locate(href_list["track2"]) in mob_list
-		if(A && target)
-			A.ai_actual_track(target)
-*/
 
-		//Strip off any "(as Derplord)".
-		//If there's a way to do this via a var that doesn't give the AI extra info, please let me know.
-		var/seeking = target.name
-		var/index = findtext(seeking, "(as ")
-		if(index)
-			seeking = copytext(seeking, 1, index-1)
-
-		if(target && html_decode(href_list["trackname"]) == seeking)
+		if(target && (!istype(target, /mob/living/carbon/human) || html_decode(href_list["trackname"]) == target:get_face_name()))
 			ai_actual_track(target)
-		else
-			src << "\red System error. Cannot locate [html_decode(href_list["trackname"])]."
+
+		src << "\red System error. Cannot locate [html_decode(href_list["trackname"])]."
 		return
 
 	else if (href_list["faketrack"])
@@ -530,24 +518,24 @@ var/list/ai_list = list()
 /mob/living/silicon/ai/triggerAlarm(var/class, area/A, list/cameralist, var/source)
 	if (stat == 2)
 		return 1
-	
+
 	..()
-	
+
 	var/cameratext = ""
 	for (var/obj/machinery/camera/C in cameralist)
 		cameratext += "[(cameratext == "")? "" : "|"]<A HREF=?src=\ref[src];switchcamera=\ref[C]>[C.c_tag]</A>"
-			
+
 	queueAlarm("--- [class] alarm detected in [A.name]! ([(cameratext)? cameratext : "No Camera"])", class)
-	
+
 	if (viewalerts) ai_alerts()
 
 /mob/living/silicon/ai/cancelAlarm(var/class, area/A as area, var/source)
 	var/has_alarm = ..()
-	
+
 	if (!has_alarm)
 		queueAlarm(text("--- [] alarm in [] has been cleared.", class, A.name), class, 0)
 		if (viewalerts) ai_alerts()
-	
+
 	return has_alarm
 
 /mob/living/silicon/ai/cancel_camera()

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

@@ -33,7 +33,7 @@
 	installed = -1
 	uninstall()
 
-/datum/robot_component/proc/take_damage(brute, electronics, sharp)
+/datum/robot_component/proc/take_damage(brute, electronics, sharp, edge)
 	if(installed != 1) return
 
 	brute_damage += brute

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

@@ -60,7 +60,6 @@
 
 	//Some tidying-up.
 	flavor_text = "It's a tiny little repair drone. The casing is stamped with an NT logo and the subscript: 'NanoTrasen Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'"
-	updatename()
 	updateicon()
 
 //Redefining some robot procs...
@@ -104,15 +103,8 @@
 	if(copytext(message,1,2) == "*")
 		return emote(copytext(message,2))
 	else if(length(message) >= 2)
-		if(copytext(message, 1 ,3) == ":b" || copytext(message, 1 ,3) == ":B")
 
-			if(!is_component_functioning("comms"))
-				src << "\red Your binary communications component isn't functional."
-				return
-
-			robot_talk(trim(copytext(message,3)))
-
-		else if(copytext(message, 1 ,3) == ":d" || copytext(message, 1 ,3) == ":D")
+		if(copytext(message, 1 ,3) == ":d" || copytext(message, 1 ,3) == ":D")
 
 			if(!is_component_functioning("radio"))
 				src << "\red Your radio transmitter isn't functional."
@@ -329,8 +321,8 @@
 	full_law_reset()
 	src << "<br><b>You are a maintenance drone, a tiny-brained robotic repair machine</b>."
 	src << "You have no individual will, no personality, and no drives or urges other than your laws."
-	src << "Use <b>:b</b> to talk to your fellow synthetics, <b>:d</b> to talk to other drones, and <b>say</b> to speak silently to your nearby fellows."
-	src << "Remember,  you are <b>lawed against interference with the crew</b>."
+	src << "Use <b>:d</b> to talk to other drones and <b>say</b> to speak silently to your nearby fellows."
+	src << "Remember,  you are <b>lawed against interference with the crew</b>. Also remember, <b>you DO NOT take orders from the AI.</b>"
 	src << "<b>Don't invade their worksites, don't steal their resources, don't tell them about the changeling in the toilets.</b>"
 	src << "<b>If a crewmember has noticed you, <i>you are probably breaking your third law</i></b>."
 

code/modules/mob/living/silicon/robot/drone/drone_items.dm

@@ -266,10 +266,8 @@
 	if(!module)
 		module = new /obj/item/weapon/robot_module/drone(src)
 
-	var/dat = "<HEAD><TITLE>Drone modules</TITLE><META HTTP-EQUIV='Refresh' CONTENT='10'></HEAD><BODY>\n"
-	dat += {"<A HREF='?src=\ref[src];mach_close=robotmod'>Close</A>
-	<BR>
-	<BR>
+	var/dat = "<HEAD><TITLE>Drone modules</TITLE></HEAD><BODY>\n"
+	dat += {"
 	<B>Activated Modules</B>
 	<BR>
 	Module 1: [module_state_1 ? "<A HREF=?src=\ref[src];mod=\ref[module_state_1]>[module_state_1]<A>" : "No Module"]<BR>
@@ -310,7 +308,7 @@
 
 	dat += resources
 
-	src << browse(dat, "window=robotmod&can_close=0")
+	src << browse(dat, "window=robotmod")
 
 //Putting the decompiler here to avoid doing list checks every tick.
 /mob/living/silicon/robot/drone/use_power()

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

@@ -559,9 +559,6 @@
 				if(istype(WC))
 					C.brute_damage = WC.brute
 					C.electronics_damage = WC.burn
-				else //This will nominally mean that removing and replacing a power cell will repair the mount, but I don't care at this point. ~Z
-					C.brute_damage = 0
-					C.electronics_damage = 0
 
 				usr << "\blue You install the [W.name]."
 
@@ -599,8 +596,12 @@
 				user << "You close the cover."
 				opened = 0
 				updateicon()
-			else if(mmi && wiresexposed && isWireCut(1) && isWireCut(2) && isWireCut(3) && isWireCut(4) && isWireCut(5))
+			else if(wiresexposed && isWireCut(1) && isWireCut(2) && isWireCut(3) && isWireCut(4) && isWireCut(5))
 				//Cell is out, wires are exposed, remove MMI, produce damaged chassis, baleet original mob.
+				if(!mmi)
+					user << "\The [src] has no brain to remove."
+					return
+
 				user << "You jam the crowbar into the robot and begin levering [mmi]."
 				sleep(30)
 				user << "You damage some parts of the chassis, but eventually manage to rip out [mmi]!"
@@ -660,6 +661,9 @@
 			C.installed = 1
 			C.wrapped = W
 			C.install()
+			//This will mean that removing and replacing a power cell will repair the mount, but I don't care at this point. ~Z
+			C.brute_damage = 0
+			C.electronics_damage = 0
 
 	else if (istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/device/multitool))
 		if (wiresexposed)
@@ -1026,10 +1030,8 @@
 	if(!module)
 		pick_module()
 		return
-	var/dat = "<HEAD><TITLE>Modules</TITLE><META HTTP-EQUIV='Refresh' CONTENT='10'></HEAD><BODY>\n"
-	dat += {"<A HREF='?src=\ref[src];mach_close=robotmod'>Close</A>
-	<BR>
-	<BR>
+	var/dat = "<HEAD><TITLE>Modules</TITLE></HEAD><BODY>\n"
+	dat += {"
 	<B>Activated Modules</B>
 	<BR>
 	Module 1: [module_state_1 ? "<A HREF=?src=\ref[src];mod=\ref[module_state_1]>[module_state_1]<A>" : "No Module"]<BR>
@@ -1057,16 +1059,11 @@
 		else
 			dat += text("[obj]: \[<A HREF=?src=\ref[src];act=\ref[obj]>Activate</A> | <B>Deactivated</B>\]<BR>")
 */
-	src << browse(dat, "window=robotmod&can_close=0")
+	src << browse(dat, "window=robotmod")
 
 
 /mob/living/silicon/robot/Topic(href, href_list)
 	..()
-	if (href_list["mach_close"])
-		var/t1 = text("window=[href_list["mach_close"]]")
-		unset_machine()
-		src << browse(null, t1)
-		return
 
 	if (href_list["showalerts"])
 		robot_alerts()

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

@@ -62,7 +62,7 @@
 	var/datum/robot_component/picked = pick(parts)
 	picked.heal_damage(brute,burn)
 
-/mob/living/silicon/robot/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0)
+/mob/living/silicon/robot/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/edge = 0)
 	var/list/components = get_damageable_components()
 	if(!components.len)
 		return
@@ -86,11 +86,11 @@
 
 	var/datum/robot_component/armour/A = get_armour()
 	if(A)
-		A.take_damage(brute,burn,sharp)
+		A.take_damage(brute,burn,sharp,edge)
 		return
 
 	var/datum/robot_component/C = pick(components)
-	C.take_damage(brute,burn,sharp)
+	C.take_damage(brute,burn,sharp,edge)
 
 /mob/living/silicon/robot/heal_overall_damage(var/brute, var/burn)
 	var/list/datum/robot_component/parts = get_damaged_components(brute,burn)

code/modules/mob/living/silicon/say.dm

@@ -23,7 +23,7 @@
 		if (src.client.handle_spam_prevention(message,MUTE_IC))
 			return
 
-	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) 
+	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
 
 	if (stat == 2)
 		return say_dead(message)
@@ -65,7 +65,7 @@
 		if(message_mode != "binary" && !R.is_component_functioning("radio"))
 			src << "\red Your radio isn't functional at this time."
 			return
-			
+
 
 	if(message_mode && message_mode != "general")
 		message = trim(copytext(message,3))
@@ -73,7 +73,7 @@
 	switch(message_mode)
 		if("department")
 			switch(bot_type)
-				if(IS_AI)			
+				if(IS_AI)
 					AI.holopad_talk(message)
 				if(IS_ROBOT)
 					log_say("[key_name(src)] : [message]")
@@ -118,9 +118,9 @@
 						R.radio.talk_into(src,message,message_mode,verb)
 					if(IS_PAI)
 						log_say("[key_name(src)] : [message]")
-						P.radio.talk_into(src,message,message_mode,verb)	
+						P.radio.talk_into(src,message,message_mode,verb)
 				return
-		
+
 
 	return ..(message,null,verb)
 
@@ -167,14 +167,14 @@
 		return
 
 	var/verb = say_quote(message)
-	
+
 
 	var/rendered = "<i><span class='game say'>Robotic Talk, <span class='name'>[name]</span> <span class='message'>[verb], \"[message]\"</span></span></i>"
 
 	for (var/mob/living/S in living_mob_list)
 		if(S.robot_talk_understand && (S.robot_talk_understand == robot_talk_understand)) // This SHOULD catch everything caught by the one below, but I'm not going to change it.
 			if(istype(S , /mob/living/silicon/ai))
-				var/renderedAI = "<i><span class='game say'>Robotic Talk, <a href='byond://?src=\ref[S];track2=\ref[S];track=\ref[src]'><span class='name'>[name]</span></a> <span class='message'>[verb], \"[message]\"</span></span></i>"
+				var/renderedAI = "<i><span class='game say'>Robotic Talk, <a href='byond://?src=\ref[S];track2=\ref[S];track=\ref[src];trackname=[html_encode(src.name)]'><span class='name'>[name]</span></a> <span class='message'>[verb], \"[message]\"</span></span></i>"
 				S.show_message(renderedAI, 2)
 			else
 				S.show_message(rendered, 2)
@@ -182,14 +182,13 @@
 
 		else if (S.binarycheck())
 			if(istype(S , /mob/living/silicon/ai))
-				var/renderedAI = "<i><span class='game say'>Robotic Talk, <a href='byond://?src=\ref[S];track2=\ref[S];track=\ref[src]'><span class='name'>[name]</span></a> <span class='message'>[verb], \"[message]\"</span></span></i>"
+				var/renderedAI = "<i><span class='game say'>Robotic Talk, <a href='byond://?src=\ref[S];track2=\ref[S];track=\ref[src];trackname=[html_encode(src.name)]'><span class='name'>[name]</span></a> <span class='message'>[verb], \"[message]\"</span></span></i>"
 				S.show_message(renderedAI, 2)
 			else
 				S.show_message(rendered, 2)
 
 	var/list/listening = hearers(1, src)
 	listening -= src
-	listening += src
 
 	var/list/heard = list()
 	for (var/mob/M in listening)
@@ -199,7 +198,7 @@
 		var/message_beep
 		verb = "beeps"
 		message_beep = "beep beep beep"
-		
+
 		rendered = "<i><span class='game say'><span class='name'>[voice_name]</span> <span class='message'>[verb], \"[message_beep]\"</span></span></i>"
 
 		for (var/mob/M in heard)

code/modules/mob/living/simple_animal/bees.dm

@@ -41,7 +41,7 @@
 				if(worn_helmet)
 					sting_prob -= min(worn_helmet.armor["bio"],30) // Is your helmet sealed? I can't get to 30% of your body.
 				if( prob(sting_prob) && (M.stat == CONSCIOUS || (M.stat == UNCONSCIOUS && prob(25))) ) // Try to sting! If you're not moving, think about stinging.
-					M.apply_damage(min(strength,2)+mut, BRUTE) // Stinging. The more mutated I am, the harder I sting.
+					M.apply_damage(min(strength,2)+mut, BRUTE, sharp=1) // Stinging. The more mutated I am, the harder I sting.
 					M.apply_damage((round(feral/10,1)*(max((round(strength/20,1)),1)))+toxic, TOX) // Bee venom based on how angry I am and how many there are of me!
 					M << "\red You have been stung!"
 					M.flash_pain()

code/modules/mob/living/simple_animal/constructs.dm

@@ -34,7 +34,7 @@
 	for(var/spell in construct_spells)
 		spell_list += new spell(src)
 
-/mob/living/simple_animal/construct/Die()
+/mob/living/simple_animal/construct/death()
 	..()
 	new /obj/item/weapon/ectoplasm (src.loc)
 	for(var/mob/M in viewers(src, null))

code/modules/mob/living/simple_animal/friendly/crab.dm

@@ -46,7 +46,7 @@
 		if(prob(50))
 			user << "\red \b This kills the crab."
 			health -= 20
-			Die()
+			death()
 		else
 			GetMad()
 			get

code/modules/mob/living/simple_animal/friendly/farm_animals.dm

@@ -222,7 +222,7 @@ var/global/chicken_count = 0
 	pixel_y = rand(0, 10)
 	chicken_count += 1
 
-/mob/living/simple_animal/chicken/Die()
+/mob/living/simple_animal/chicken/death()
 	..()
 	chicken_count -= 1
 

code/modules/mob/living/simple_animal/friendly/mouse.dm

@@ -134,7 +134,7 @@
 			M << 'sound/effects/mousesqueek.ogg'
 	..()
 
-/mob/living/simple_animal/mouse/Die()
+/mob/living/simple_animal/mouse/death()
 	layer = MOB_LAYER
 	if(client)
 		client.time_died_as_mouse = world.time

code/modules/mob/living/simple_animal/friendly/slime.dm

@@ -70,7 +70,7 @@
 	overlays += "aslime-:33"
 
 
-/mob/living/simple_animal/slime/adult/Die()
+/mob/living/simple_animal/slime/adult/death()
 	var/mob/living/simple_animal/slime/S1 = new /mob/living/simple_animal/slime (src.loc)
 	S1.icon_state = "[src.colour] baby slime"
 	S1.icon_living = "[src.colour] baby slime"

code/modules/mob/living/simple_animal/friendly/spiderbot.dm

@@ -162,7 +162,7 @@
 			M.show_message("\red [src] makes an odd warbling noise, fizzles, and explodes.")
 	explosion(get_turf(loc), -1, -1, 3, 5)
 	eject_brain()
-	Die()
+	death()
 
 /mob/living/simple_animal/spiderbot/proc/update_icon()
 	if(mmi)
@@ -200,7 +200,7 @@
 
 	..()
 
-/mob/living/simple_animal/spiderbot/Die()
+/mob/living/simple_animal/spiderbot/death()
 
 	living_mob_list -= src
 	dead_mob_list += src

code/modules/mob/living/simple_animal/hostile/alien.dm

@@ -87,7 +87,7 @@
 	damage = 30
 	icon_state = "toxin"
 
-/mob/living/simple_animal/hostile/alien/Die()
+/mob/living/simple_animal/hostile/alien/death()
 	..()
 	visible_message("[src] lets out a waning guttural screech, green blood bubbling from its maw...")
 	playsound(src, 'sound/voice/hiss6.ogg', 100, 1)

code/modules/mob/living/simple_animal/hostile/bear.dm

@@ -135,7 +135,7 @@
 		var/mob/living/carbon/human/H = target_mob
 		var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg")
 		var/datum/organ/external/affecting = H.get_organ(ran_zone(dam_zone))
-		H.apply_damage(damage, BRUTE, affecting, H.run_armor_check(affecting, "melee"))
+		H.apply_damage(damage, BRUTE, affecting, H.run_armor_check(affecting, "melee"), sharp=1, edge=1)
 		return H
 	else if(isliving(target_mob))
 		var/mob/living/L = target_mob

code/modules/mob/living/simple_animal/hostile/hivebot.dm

@@ -44,7 +44,7 @@
 	ranged = 1
 
 
-/mob/living/simple_animal/hostile/hivebot/Die()
+/mob/living/simple_animal/hostile/hivebot/death()
 	..()
 	visible_message("<b>[src]</b> blows apart!")
 	new /obj/effect/decal/cleanable/blood/gibs/robot(src.loc)

code/modules/mob/living/simple_animal/hostile/hostile.dm

@@ -116,7 +116,7 @@
 	L += mechas_list
 	return L
 
-/mob/living/simple_animal/hostile/Die()
+/mob/living/simple_animal/hostile/death()
 	..()
 	walk(src, 0)
 

code/modules/mob/living/simple_animal/hostile/mimic.dm

@@ -41,7 +41,7 @@
 	if(.)
 		emote("growls at [.]")
 
-/mob/living/simple_animal/hostile/mimic/Die()
+/mob/living/simple_animal/hostile/mimic/death()
 	..()
 	visible_message("\red <b>[src]</b> stops moving!")
 	del(src)
@@ -107,7 +107,7 @@
 	..()
 	icon_state = initial(icon_state)
 
-/mob/living/simple_animal/hostile/mimic/crate/Die()
+/mob/living/simple_animal/hostile/mimic/crate/death()
 
 	var/obj/structure/closet/crate/C = new(get_turf(src))
 	// Put loot in crate
@@ -141,7 +141,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
 	..(loc)
 	CopyObject(copy, creator)
 
-/mob/living/simple_animal/hostile/mimic/copy/Die()
+/mob/living/simple_animal/hostile/mimic/copy/death()
 
 	for(var/atom/movable/M in src)
 		M.loc = get_turf(src)

code/modules/mob/living/simple_animal/hostile/pirate.dm

@@ -47,7 +47,7 @@
 	weapon1 = /obj/item/weapon/gun/energy/laser
 
 
-/mob/living/simple_animal/hostile/pirate/Die()
+/mob/living/simple_animal/hostile/pirate/death()
 	..()
 	if(corpse)
 		new corpse (src.loc)

code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm

@@ -157,7 +157,7 @@
 	hostile_drone = 0
 	walk(src,0)
 
-/mob/living/simple_animal/hostile/retaliate/malf_drone/Die()
+/mob/living/simple_animal/hostile/retaliate/malf_drone/death()
 	src.visible_message("\blue \icon[src] [src] suddenly breaks apart.")
 	..()
 	del(src)

code/modules/mob/living/simple_animal/hostile/russian.dm

@@ -45,7 +45,7 @@
 	casingtype = /obj/item/ammo_casing/a357
 
 
-/mob/living/simple_animal/hostile/russian/Die()
+/mob/living/simple_animal/hostile/russian/death()
 	..()
 	if(corpse)
 		new corpse (src.loc)

code/modules/mob/living/simple_animal/hostile/syndicate.dm

@@ -35,7 +35,7 @@
 	faction = "syndicate"
 	status_flags = CANPUSH
 
-/mob/living/simple_animal/hostile/syndicate/Die()
+/mob/living/simple_animal/hostile/syndicate/death()
 	..()
 	if(corpse)
 		new corpse (src.loc)
@@ -157,7 +157,7 @@
 	max_n2 = 0
 	minbodytemp = 0
 
-/mob/living/simple_animal/hostile/viscerator/Die()
+/mob/living/simple_animal/hostile/viscerator/death()
 	..()
 	visible_message("\red <b>[src]</b> is smashed into pieces!")
 	del src

code/modules/mob/living/simple_animal/hostile/tree.dm

@@ -50,7 +50,7 @@
 			L.Weaken(3)
 			L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>")
 
-/mob/living/simple_animal/hostile/tree/Die()
+/mob/living/simple_animal/hostile/tree/death()
 	..()
 	visible_message("\red <b>[src]</b> is hacked into pieces!")
 	new /obj/item/stack/sheet/wood(loc)

code/modules/mob/living/simple_animal/parrot.dm

@@ -101,7 +101,7 @@
 			  /mob/living/simple_animal/parrot/proc/perch_player)
 
 
-/mob/living/simple_animal/parrot/Die()
+/mob/living/simple_animal/parrot/death()
 	if(held_item)
 		held_item.loc = src.loc
 		held_item = null
@@ -496,7 +496,7 @@
 				var/mob/living/carbon/human/H = parrot_interest
 				var/datum/organ/external/affecting = H.get_organ(ran_zone(pick(parrot_dam_zone)))
 
-				H.apply_damage(damage, BRUTE, affecting, H.run_armor_check(affecting, "melee"))
+				H.apply_damage(damage, BRUTE, affecting, H.run_armor_check(affecting, "melee"), sharp=1)
 				emote(pick("pecks [H]'s [affecting]", "cuts [H]'s [affecting] with its talons"))
 
 			else

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -82,7 +82,7 @@
 
 
 	if(health < 1)
-		Die()
+		death()
 
 	if(health > maxHealth)
 		health = maxHealth
@@ -405,13 +405,11 @@
 	statpanel("Status")
 	stat(null, "Health: [round((health / maxHealth) * 100)]%")
 
-/mob/living/simple_animal/proc/Die()
-	living_mob_list -= src
-	dead_mob_list += src
+/mob/living/simple_animal/death()
 	icon_state = icon_dead
 	stat = DEAD
 	density = 0
-	return
+	return ..()
 
 /mob/living/simple_animal/ex_act(severity)
 	if(!blinded)

code/modules/mob/living/simple_animal/vox.dm

@@ -23,7 +23,7 @@
 	var/amp = null
 	var/quills = 3
 
-/mob/living/simple_animal/vox/armalis/Die()
+/mob/living/simple_animal/vox/armalis/death()
 
 	living_mob_list -= src
 	dead_mob_list += src

code/modules/mob/living/simple_animal/worm.dm

@@ -167,7 +167,7 @@
 		newHead.Attach(newHeadPrevious)
 
 		if(die)
-			newHead.Die()
+			newHead.death()
 
 		del(src)
 

code/modules/mob/new_player/preferences_setup.dm

@@ -198,12 +198,7 @@ datum/preferences
 		preview_icon.Blend(new /icon(icobase, "groin_[g]"), ICON_OVERLAY)
 		preview_icon.Blend(new /icon(icobase, "head_[g]"), 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)
+		for(var/name in list("r_arm","r_hand","r_leg","r_foot","l_leg","l_foot","l_arm","l_hand"))
 			if(organ_data[name] == "amputated") continue
 
 			var/icon/temp = new /icon(icobase, "[name]")
@@ -212,6 +207,11 @@ datum/preferences
 
 			preview_icon.Blend(temp, ICON_OVERLAY)
 
+		//Tail
+		if(current_species && (current_species.flags & HAS_TAIL))
+			var/icon/temp = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[current_species.tail]_s")
+			preview_icon.Blend(temp, ICON_OVERLAY)
+
 		// Skin color
 		if(current_species && (current_species.flags & HAS_SKIN_COLOR))
 			preview_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)

code/modules/mob/say.dm

@@ -157,7 +157,7 @@
 	if(length(message) >= 2)
 		var/channel_prefix = copytext(message, 1 ,3)
 		return department_radio_keys[channel_prefix]
-
+	
 	return null
 
 //parses the language code (e.g. :j) from text, such as that supplied to say.

code/modules/mob/transform_procs.dm

@@ -160,12 +160,11 @@
 	O.gender = gender
 	O.invisibility = 0
 
-
 	if(mind)		//TODO
 		mind.transfer_to(O)
 		if(O.mind.assigned_role == "Cyborg")
 			O.mind.original = O
-		else if(mind&&mind.special_role)
+		else if(mind && mind.special_role)
 			O.mind.store_memory("In case you look at this after being borged, the objectives are only here until I find a way to make them not show up for you, as I can't simply delete them without screwing up round-end reporting. --NeoFite")
 	else
 		O.key = key
@@ -175,11 +174,12 @@
 	if(O.mind.assigned_role == "Cyborg")
 		if(O.mind.role_alt_title == "Android")
 			O.mmi = new /obj/item/device/mmi/posibrain(O)
-		if(O.mind.role_alt_title == "Robot")
-			O.mmi = new /obj/item/device/mmi/posibrain(O) //Ravensdale wants a circuit based brain for another robot class, this is a placeholder.
-	else
-		O.mmi = new /obj/item/device/mmi(O)
-		O.mmi.transfer_identity(src)//Does not transfer key/client.
+		else if(O.mind.role_alt_title == "Robot")
+			O.mmi = null //Robots do not have removable brains.
+		else
+			O.mmi = new /obj/item/device/mmi(O)
+
+		if(O.mmi) O.mmi.transfer_identity(src) //Does not transfer key/client.
 
 	O.Namepick()
 

code/modules/organs/blood.dm

@@ -159,6 +159,9 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 		this.icon_state = pick(iconL)
 		this.blood_DNA = list()
 		this.blood_DNA[dna.unique_enzymes] = dna.b_type
+		for (var/ID in virus2)
+			var/datum/disease2/disease/V = virus2[ID]
+			this.virus2[ID] = V.getcopy()
 		if (species) this.basecolor = species.blood_color
 		this.update_icon()
 

code/modules/organs/organ_external.dm

@@ -70,9 +70,9 @@
 	if(prob(probability))
 		droplimb(1)
 	else
-		take_damage(damage, 0, 1, used_weapon = "EMP")
+		take_damage(damage, 0, 1, 1, used_weapon = "EMP")
 
-/datum/organ/external/proc/take_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list())
+/datum/organ/external/proc/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list())
 	if((brute <= 0) && (burn <= 0))
 		return 0
 
@@ -95,7 +95,7 @@
 	//If limb took enough damage, try to cut or tear it off
 	if(body_part != UPPER_TORSO && body_part != LOWER_TORSO) //as hilarious as it is, getting hit on the chest too much shouldn't effectively gib you.
 		if(config.limbs_can_break && brute_dam >= max_damage * config.organ_health_multiplier)
-			if( (sharp && prob(5 * brute)) || (brute > 20 && prob(2 * brute)) )
+			if( (edge && prob(5 * brute)) || (brute > 20 && prob(2 * brute)) )
 				droplimb(1)
 				return
 
@@ -159,7 +159,7 @@
 				if(possible_points.len)
 					//And pass the pain around
 					var/datum/organ/external/target = pick(possible_points)
-					target.take_damage(brute, burn, sharp, used_weapon, forbidden_limbs + src)
+					target.take_damage(brute, burn, sharp, edge, used_weapon, forbidden_limbs + src)
 
 	// sync the organ's damage with its wounds
 	src.update_damages()
@@ -223,35 +223,7 @@ This function completely restores a damaged organ to perfect condition.
 /datum/organ/external/proc/createwound(var/type = CUT, var/damage)
 	if(damage == 0) return
 
-	// first check whether we can widen an existing wound
-	if(wounds.len > 0 && prob(max(50+owner.number_wounds*10,100)))
-		if((type == CUT || type == BRUISE) && damage >= 5)
-			var/datum/wound/W = pick(wounds)
-			if(W.amount == 1 && W.started_healing())
-				W.open_wound(damage)
-				if(prob(25))
-					owner.visible_message("\red The wound on [owner.name]'s [display_name] widens with a nasty ripping voice.",\
-					"\red The wound on your [display_name] widens with a nasty ripping voice.",\
-					"You hear a nasty ripping noise, as if flesh is being torn apart.")
-				return
-
-	//Creating wound
-	var/datum/wound/W
-	var/size = min( max( 1, damage/10 ) , 6)
-	//Possible types of wound
-	var/list/size_names = list()
-	switch(type)
-		if(CUT)
-			size_names = typesof(/datum/wound/cut/) - /datum/wound/cut/
-		if(BRUISE)
-			size_names = typesof(/datum/wound/bruise/) - /datum/wound/bruise/
-		if(BURN)
-			size_names = typesof(/datum/wound/burn/) - /datum/wound/burn/
-
-	size = min(size,size_names.len)
-	var/wound_type = size_names[size]
-	W = new wound_type(damage)
-
+	//moved this before the open_wound check so that having many small wounds for example doesn't somehow protect you from taking internal damage
 	//Possibly trigger an internal wound, too.
 	var/local_damage = brute_dam + burn_dam + damage
 	if(damage > 15 && type != BURN && local_damage > 30 && prob(damage) && !(status & ORGAN_ROBOT))
@@ -259,16 +231,58 @@ This function completely restores a damaged organ to perfect condition.
 		wounds += I
 		owner.custom_pain("You feel something rip in your [display_name]!", 1)
 
-	//Check whether we can add the wound to an existing wound
-	for(var/datum/wound/other in wounds)
-		if(other.desc == W.desc)
-			// okay, add it!
-			other.damage += W.damage
-			other.amount += 1
-			W = null // to signify that the wound was added
-			break
-	if(W)
-		wounds += W
+	// first check whether we can widen an existing wound
+	if(wounds.len > 0 && prob(max(50+(number_wounds-1)*10,90)))
+		if((type == CUT || type == BRUISE) && damage >= 5)
+			//we need to make sure that the wound we are going to worsen is compatible with the type of damage...
+			var/list/compatible_wounds = list()
+			for (var/datum/wound/W in wounds)
+				if (W.can_worsen(type, damage))
+					compatible_wounds += W
+
+			if(compatible_wounds.len)
+				var/datum/wound/W = pick(compatible_wounds)
+				W.open_wound(damage)
+				if(prob(25))
+					//maybe have a separate message for BRUISE type damage?
+					owner.visible_message("\red The wound on [owner.name]'s [display_name] widens with a nasty ripping voice.",\
+					"\red The wound on your [display_name] widens with a nasty ripping voice.",\
+					"You hear a nasty ripping noise, as if flesh is being torn apart.")
+				return
+
+	//Creating wound
+	var/wound_type = get_wound_type(type, damage)
+
+	if(wound_type)
+		var/datum/wound/W = new wound_type(damage)
+
+		//Check whether we can add the wound to an existing wound
+		for(var/datum/wound/other in wounds)
+			if(other.can_merge(W))
+				other.merge_wound(W)
+				W = null // to signify that the wound was added
+				break
+		if(W)
+			wounds += W
+
+/datum/organ/external/proc/get_wound_type(var/type = CUT, var/damage)
+	//if you look a the names in the wound's stages list for each wound type you will see the logic behind these values
+	switch(type)
+		if(CUT)
+			if (damage <= 5) return /datum/wound/cut/small
+			if (damage <= 15) return /datum/wound/cut/deep
+			if (damage <= 25) return /datum/wound/cut/flesh
+			if (damage <= 50) return /datum/wound/cut/gaping
+			if (damage <= 60) return /datum/wound/cut/gaping_big
+			return /datum/wound/cut/massive
+		if(BRUISE)
+			return /datum/wound/bruise
+		if(BURN)
+			if (damage <= 5) return /datum/wound/burn/moderate
+			if (damage <= 15) return /datum/wound/burn/large
+			if (damage <= 30) return /datum/wound/burn/severe
+			if (damage <= 40) return /datum/wound/burn/deep
+			return /datum/wound/burn/carbonised
 
 /****************************************************
 			   PROCESSING & UPDATING
@@ -388,15 +402,12 @@ This function completely restores a damaged organ to perfect condition.
 			if(prob(1 * wound_update_accuracy))
 				owner.custom_pain("You feel a stabbing pain in your [display_name]!",1)
 
-
 		// slow healing
 		var/heal_amt = 0
 
-		if (W.damage < 15) //this thing's edges are not in day's travel of each other, what healing?
-			heal_amt += 0.2
-
-		if(W.is_treated() && W.damage < 50) //whoa, not even magical band aid can hold it together
-			heal_amt += 0.3
+		// if damage >= 50 AFTER treatment then it's probably too severe to heal within the timeframe of a round.
+		if (W.is_treated() && W.wound_damage() < 50)
+			heal_amt += 0.5
 
 		//we only update wounds once in [wound_update_accuracy] ticks so have to emulate realtime
 		heal_amt = heal_amt * wound_update_accuracy
@@ -800,8 +811,8 @@ This function completely restores a damaged organ to perfect condition.
 	else
 		. = new /icon(owner.race_icon, "[icon_name]_[g]")
 
-/datum/organ/external/head/take_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list())
-	..(brute, burn, sharp, used_weapon, forbidden_limbs)
+/datum/organ/external/head/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list())
+	..(brute, burn, sharp, edge, used_weapon, forbidden_limbs)
 	if (!disfigured)
 		if (brute_dam > 40)
 			if (prob(50))

code/modules/organs/wound.dm

@@ -3,8 +3,6 @@
 					WOUNDS
 ****************************************************/
 /datum/wound
-	// stages such as "cut", "deep cut", etc.
-	var/list/stages
 	// number representing the current stage
 	var/current_stage = 0
 
@@ -18,38 +16,42 @@
 	// amount of damage the current wound type requires(less means we need to apply the next healing stage)
 	var/min_damage = 0
 
-	// one of CUT, BRUISE, BURN
-	var/damage_type = CUT
-
-	// whether this wound needs a bandage/salve to heal at all
-	var/needs_treatment = 0
-
 	// is the wound bandaged?
-	var/tmp/bandaged = 0
+	var/bandaged = 0
 	// Similar to bandaged, but works differently
-	var/tmp/clamped = 0
+	var/clamped = 0
 	// is the wound salved?
-	var/tmp/salved = 0
+	var/salved = 0
 	// is the wound disinfected?
-	var/tmp/disinfected = 0
-	var/tmp/created = 0
-
+	var/disinfected = 0
+	var/created = 0
 	// number of wounds of this type
-	var/tmp/amount = 1
+	var/amount = 1
+	// amount of germs in the wound
+	var/germ_level = 0
 
+	/*  These are defined by the wound type and should not be changed */
+	
+	// stages such as "cut", "deep cut", etc.
+	var/list/stages
+	// internal wounds can only be fixed through surgery
+	var/internal = 0
 	// maximum stage at which bleeding should still happen, counted from the right rather than the left of the list
 	// 1 means all stages except the last should bleed
 	var/max_bleeding_stage = 1
+	// one of CUT, BRUISE, BURN
+	var/damage_type = CUT
+	// whether this wound needs a bandage/salve to heal at all
+	// the maximum amount of damage that this wound can have and still autoheal
+	var/autoheal_cutoff = 15
+
 
-	// internal wounds can only be fixed through surgery
-	var/internal = 0
 
-	// amount of germs in the wound
-	var/germ_level = 0
 
 	// helper lists
 	var/tmp/list/desc_list = list()
 	var/tmp/list/damage_list = list()
+	
 	New(var/damage)
 
 		created = world.time
@@ -62,42 +64,58 @@
 
 		src.damage = damage
 
-		// initialize with the first stage
-		next_stage()
-
-		// this will ensure the size of the wound matches the damage
-		src.heal_damage(0)
-
-		// make the max_bleeding_stage count from the end of the list rather than the start
-		// this is more robust to changes to the list
 		max_bleeding_stage = src.desc_list.len - max_bleeding_stage
+		
+		// initialize with the appropriate stage
+		src.init_stage(damage)
 
 		bleed_timer += damage
 
 	// returns 1 if there's a next stage, 0 otherwise
-	proc/next_stage()
-		if(current_stage + 1 > src.desc_list.len)
-			return 0
-
-		current_stage++
+	proc/init_stage(var/initial_damage)
+		current_stage = stages.len
+		
+		while(src.current_stage > 1 && src.damage_list[current_stage-1] <= initial_damage / src.amount)
+			src.current_stage--
 
 		src.min_damage = damage_list[current_stage]
 		src.desc = desc_list[current_stage]
-		return 1
-
-	// returns 1 if the wound has started healing
-	proc/started_healing()
-		return (current_stage > 1)
 
+	// the amount of damage per wound
+	proc/wound_damage()
+		return src.damage / src.amount
+	
 	// checks whether the wound has been appropriately treated
-	// always returns 1 for wounds that don't need to be treated
+	// always returns 1 for wounds that are too minor to need treatment
 	proc/is_treated()
-		if(!needs_treatment) return 1
+		if(src.wound_damage() <= autoheal_cutoff)
+			return 1
 
 		if(damage_type == BRUISE || damage_type == CUT)
 			return bandaged
 		else if(damage_type == BURN)
 			return salved
+	
+	
+	// Checks whether other other can be merged into src.
+	proc/can_merge(var/datum/wound/other)
+		if (other.type != src.type) return 0
+		if (other.current_stage != src.current_stage) return 0
+		if (other.damage_type != src.damage_type) return 0
+		if (!(other.is_treated()) != !(src.is_treated())) return 0
+		if (!(other.bandaged) != !(src.bandaged)) return 0
+		if (!(other.clamped) != !(src.clamped)) return 0
+		if (!(other.salved) != !(src.salved)) return 0
+		if (!(other.disinfected) != !(src.disinfected)) return 0
+		//if (other.germ_level != src.germ_level) return 0
+		return 1
+
+	proc/merge_wound(var/datum/wound/other)
+		src.damage += other.damage
+		src.amount += other.amount
+		src.bleed_timer += other.bleed_timer
+		src.germ_level = max(src.germ_level, other.germ_level)
+		src.created = max(src.created, other.created)	//take the newer created time
 
 	// checks if wound is considered open for external infections
 	// untreated cuts (and bleeding bruises) and burns are possibly infectable, chance higher if wound is bigger
@@ -128,7 +146,7 @@
 		amount -= healed_damage
 		src.damage -= healed_damage
 
-		while(src.damage / src.amount < damage_list[current_stage] && current_stage < src.desc_list.len)
+		while(src.wound_damage() < damage_list[current_stage] && current_stage < src.desc_list.len)
 			current_stage++
 		desc = desc_list[current_stage]
 		src.min_damage = damage_list[current_stage]
@@ -141,118 +159,98 @@
 		src.damage += damage
 		bleed_timer += damage
 
-		while(src.current_stage > 1 && src.damage_list[current_stage-1] <= src.damage)
+		while(src.current_stage > 1 && src.damage_list[current_stage-1] <= src.damage / src.amount)
 			src.current_stage--
 
 		src.desc = desc_list[current_stage]
 		src.min_damage = damage_list[current_stage]
 
+	// returns whether this wound can absorb the given amount of damage.
+	// this will prevent large amounts of damage being trapped in less severe wound types
+	proc/can_worsen(damage_type, damage)
+		if (src.damage_type != damage_type)
+			return 0	//incompatible damage types
+		
+		if (src.amount > 1)
+			return 0
+		
+		//with 1.5*, a shallow cut will be able to carry at most 30 damage,
+		//37.5 for a deep cut
+		//52.5 for a flesh wound, etc.
+		var/max_wound_damage = 1.5*src.damage_list[1]
+		if (src.damage + damage > max_wound_damage)
+			return 0
+		
+		return 1
+
+	
 	proc/bleeding()
 		// internal wounds don't bleed in the sense of this function
-		return ((damage > 30 || bleed_timer > 0) && !(bandaged||clamped) && (damage_type == BRUISE && damage >= 20 || damage_type == CUT && damage >= 5) && current_stage <= max_bleeding_stage && !src.internal)
+		return ((wound_damage() > 30 || bleed_timer > 0) && !(bandaged||clamped) && (damage_type == BRUISE && wound_damage() >= 20 || damage_type == CUT && wound_damage() >= 5) && current_stage <= max_bleeding_stage && !src.internal)
 
 /** CUTS **/
 /datum/wound/cut/small
 	// link wound descriptions to amounts of damage
 	max_bleeding_stage = 2
 	stages = list("ugly ripped cut" = 20, "ripped cut" = 10, "cut" = 5, "healing cut" = 2, "small scab" = 0)
+	damage_type = CUT
 
 /datum/wound/cut/deep
 	max_bleeding_stage = 3
 	stages = list("ugly deep ripped cut" = 25, "deep ripped cut" = 20, "deep cut" = 15, "clotted cut" = 8, "scab" = 2, "fresh skin" = 0)
+	damage_type = CUT
 
 /datum/wound/cut/flesh
 	max_bleeding_stage = 3
 	stages = list("ugly ripped flesh wound" = 35, "ugly flesh wound" = 30, "flesh wound" = 25, "blood soaked clot" = 15, "large scab" = 5, "fresh skin" = 0)
+	damage_type = CUT
 
 /datum/wound/cut/gaping
 	max_bleeding_stage = 2
-	stages = list("gaping wound" = 50, "large blood soaked clot" = 25, "large clot" = 15, "small angry scar" = 5, \
-				   "small straight scar" = 0)
+	stages = list("gaping wound" = 50, "large blood soaked clot" = 25, "large clot" = 15, "small angry scar" = 5, "small straight scar" = 0)
+	damage_type = CUT
 
 /datum/wound/cut/gaping_big
 	max_bleeding_stage = 2
 	stages = list("big gaping wound" = 60, "healing gaping wound" = 40, "large angry scar" = 10, "large straight scar" = 0)
-
-	needs_treatment = 1 // this only heals when bandaged
+	damage_type = CUT
 
 datum/wound/cut/massive
 	max_bleeding_stage = 2
 	stages = list("massive wound" = 70, "massive healing wound" = 50, "massive angry scar" = 10,  "massive jagged scar" = 0)
-
-	needs_treatment = 1 // this only heals when bandaged
+	damage_type = CUT
 
 /** BRUISES **/
 /datum/wound/bruise
 	stages = list("monumental bruise" = 80, "huge bruise" = 50, "large bruise" = 30,\
 				  "moderate bruise" = 20, "small bruise" = 10, "tiny bruise" = 5)
-
-	needs_treatment = 1 // this only heals when bandaged
+	max_bleeding_stage = 3
+	autoheal_cutoff = 30
 	damage_type = BRUISE
 
-/datum/wound/bruise/monumental
-
-// implement sub-paths by starting at a later stage
-
-/datum/wound/bruise/tiny
-	current_stage = 5
-	needs_treatment = 0
-
-/datum/wound/bruise/small
-	current_stage = 4
-	needs_treatment = 0
-
-/datum/wound/bruise/moderate
-	current_stage = 3
-	needs_treatment = 0
-
-/datum/wound/bruise/large
-	current_stage = 2
-
-/datum/wound/bruise/huge
-	current_stage = 1
-
 /** BURNS **/
 /datum/wound/burn/moderate
 	stages = list("ripped burn" = 10, "moderate burn" = 5, "moderate salved burn" = 2, "fresh skin" = 0)
-
-	needs_treatment = 1 // this only heals when bandaged
-
 	damage_type = BURN
 
 /datum/wound/burn/large
 	stages = list("ripped large burn" = 20, "large burn" = 15, "large salved burn" = 5, "fresh skin" = 0)
-
-	needs_treatment = 1 // this only heals when bandaged
-
 	damage_type = BURN
 
 /datum/wound/burn/severe
 	stages = list("ripped severe burn" = 35, "severe burn" = 30, "severe salved burn" = 10, "burn scar" = 0)
-
-	needs_treatment = 1 // this only heals when bandaged
-
 	damage_type = BURN
 
 /datum/wound/burn/deep
 	stages = list("ripped deep burn" = 45, "deep burn" = 40, "deep salved burn" = 15,  "large burn scar" = 0)
-
-	needs_treatment = 1 // this only heals when bandaged
-
 	damage_type = BURN
 
-
 /datum/wound/burn/carbonised
 	stages = list("carbonised area" = 50, "treated carbonised area" = 20, "massive burn scar" = 0)
-
-	needs_treatment = 1 // this only heals when bandaged
-
 	damage_type = BURN
 
 /datum/wound/internal_bleeding
 	internal = 1
-
 	stages = list("severed vein" = 30, "cut vein" = 20, "damaged vein" = 10, "bruised vein" = 5)
-	max_bleeding_stage = 0
-
-	needs_treatment = 1
+	autoheal_cutoff = 5
+	max_bleeding_stage = 0	//all stages bleed. It's called internal bleeding after all.

code/modules/paperwork/paper_bundle.dm

@@ -61,7 +61,10 @@
 			usr << browse("", "window=[name]") //Closes the dialog
 		P = src[page]
 		P.attackby(W, user)
+
+
 	update_icon()
+	attack_self(usr) //Update the browsed page.
 	add_fingerprint(usr)
 	return
 

code/modules/power/lighting.dm

@@ -618,7 +618,7 @@
 
 // called when on fire
 
-/obj/machinery/light/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+/obj/machinery/light/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	if(prob(max(0, exposed_temperature - 673)))   //0% at <400C, 100% at >500C
 		broken()
 
@@ -750,5 +750,6 @@
 		src.visible_message("\red [name] shatters.","\red You hear a small glass object shatter.")
 		status = LIGHT_BROKEN
 		force = 5
+		sharp = 1
 		playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
 		update()

code/modules/projectiles/gun.dm

@@ -201,7 +201,7 @@
 
 			in_chamber.on_hit(M)
 			if (in_chamber.damage_type != HALLOSS)
-				user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]")
+				user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]", sharp=1)
 				user.death()
 			else
 				user << "<span class = 'notice'>Ow...</span>"

code/modules/projectiles/guns/alien.dm

@@ -5,6 +5,7 @@
 	name = "alloy spike"
 	desc = "It's about a foot of weird silver metal with a wicked point."
 	sharp = 1
+	edge = 0
 	throwforce = 5
 	w_class = 2
 	icon = 'icons/obj/weapons.dmi'

code/modules/projectiles/guns/projectile/bow.dm

@@ -9,6 +9,7 @@
 	throwforce = 8
 	w_class = 3.0
 	sharp = 1
+	edge = 0
 
 /obj/item/weapon/arrow/proc/removed() //Helper for metal rods falling apart.
 	return

code/modules/projectiles/guns/projectile/revolver.dm

@@ -191,7 +191,7 @@
 				playsound(user, fire_sound, 50, 1)
 				user.visible_message("<span class='danger'>[user.name] fires [src] at \his head!</span>", "<span class='danger'>You fire [src] at your head!</span>", "You hear a [istype(in_chamber, /obj/item/projectile/beam) ? "laser blast" : "gunshot"]!")
 				if(!P.nodamage)
-					user.apply_damage(300, BRUTE, affecting) // You are dead, dead, dead.
+					user.apply_damage(300, BRUTE, affecting, sharp=1) // You are dead, dead, dead.
 				return
 	..()
 

code/modules/projectiles/projectile/bullets.dm

@@ -6,6 +6,7 @@
 	nodamage = 0
 	flag = "bullet"
 	embed = 1
+	sharp = 1
 
 	on_hit(var/atom/target, var/blocked = 0)
 		if (..(target, blocked))
@@ -17,6 +18,7 @@
 	stun = 5
 	weaken = 5
 	embed = 0
+	sharp = 0
 
 /obj/item/projectile/bullet/weakbullet/beanbag		//because beanbags are not bullets
 	name = "beanbag"
@@ -47,6 +49,8 @@
 /obj/item/projectile/bullet/burstbullet//I think this one needs something for the on hit
 	name = "exploding bullet"
 	damage = 20
+	embed = 0
+	edge = 1
 
 
 /obj/item/projectile/bullet/stunshot
@@ -56,6 +60,7 @@
 	weaken = 10
 	stutter = 10
 	embed = 0
+	sharp = 0
 
 /obj/item/projectile/bullet/a762
 	damage = 25

code/modules/projectiles/projectile/special.dm

@@ -17,7 +17,8 @@
 	icon_state= "bolter"
 	damage = 50
 	flag = "bullet"
-
+	sharp = 1
+	edge = 1
 
 	on_hit(var/atom/target, var/blocked = 0)
 		explosion(target, -1, 0, 2)

code/modules/reagents/Chemistry-Machinery.dm

@@ -293,6 +293,7 @@
 	var/max_pill_count = 20
 
 /obj/machinery/chem_master/New()
+	..()
 	var/datum/reagents/R = new/datum/reagents(100)
 	reagents = R
 	R.my_atom = src

code/modules/reagents/Chemistry-Reagents.dm

@@ -118,10 +118,15 @@ datum
 						else //injected
 							M.contract_disease(D, 1, 0)
 				if(self.data && self.data["virus2"] && istype(M, /mob/living/carbon))//infecting...
-					if(method == TOUCH)
-						infect_virus2(M,self.data["virus2"])
-					else
-						infect_virus2(M,self.data["virus2"],1) //injected, force infection!
+					var/list/vlist = self.data["virus2"]
+					if (vlist.len)
+						for (var/ID in vlist)
+							var/datum/disease2/disease/V = vlist[ID]
+
+							if(method == TOUCH)
+								infect_virus2(M,V.getcopy())
+							else
+								infect_virus2(M,V.getcopy(),1) //injected, force infection!
 				if(self.data && self.data["antibodies"] && istype(M, /mob/living/carbon))//... and curing
 					var/mob/living/carbon/C = M
 					C.antibodies |= self.data["antibodies"]
@@ -146,6 +151,9 @@ datum
 						blood_prop.viruses += newVirus
 						newVirus.holder = blood_prop
 
+					if(self.data["virus2"])
+						blood_prop.virus2 = virus_copylist(self.data["virus2"])
+
 
 				else if(istype(self.data["donor"], /mob/living/carbon/monkey))
 					var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T
@@ -778,6 +786,8 @@ datum
 			on_mob_life(var/mob/living/M as mob)
 				if (volume > overdose)
 					M.hallucination = max(M.hallucination, 2)
+				..()
+				return
 
 		tramadol
 			name = "Tramadol"
@@ -790,6 +800,8 @@ datum
 			on_mob_life(var/mob/living/M as mob)
 				if (volume > overdose)
 					M.hallucination = max(M.hallucination, 2)
+				..()
+				return
 
 		oxycodone
 			name = "Oxycodone"
@@ -803,6 +815,8 @@ datum
 				if (volume > overdose)
 					M.druggy = max(M.druggy, 10)
 					M.hallucination = max(M.hallucination, 3)
+				..()
+				return
 
 
 		virus_food
@@ -1574,14 +1588,14 @@ datum
 				var/turf/the_turf = get_turf(O)
 				var/datum/gas_mixture/napalm = new
 				var/datum/gas/volatile_fuel/fuel = new
-				fuel.moles = 5
+				fuel.moles = volume
 				napalm.trace_gases += fuel
 				the_turf.assume_air(napalm)
 			reaction_turf(var/turf/T, var/volume)
 				src = null
 				var/datum/gas_mixture/napalm = new
 				var/datum/gas/volatile_fuel/fuel = new
-				fuel.moles = 5
+				fuel.moles = volume
 				napalm.trace_gases += fuel
 				T.assume_air(napalm)
 				return

code/modules/reagents/reagent_containers/food/drinks/bottle.dm

@@ -77,7 +77,7 @@
 	armor_duration /= 10
 
 	//Apply the damage!
-	target.apply_damage(force, BRUTE, affecting, armor_block)
+	target.apply_damage(force, BRUTE, affecting, armor_block, sharp=0)
 
 	// You are going to knock someone out for longer if they are not wearing a helmet.
 	if(affecting == "head" && istype(target, /mob/living/carbon/))
@@ -125,6 +125,8 @@
 	throw_range = 5
 	item_state = "beer"
 	attack_verb = list("stabbed", "slashed", "attacked")
+	sharp = 1
+	edge = 0
 	var/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken")
 
 /obj/item/weapon/broken_bottle/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)

code/modules/reagents/reagent_containers/syringes.dm

@@ -16,6 +16,7 @@
 	possible_transfer_amounts = null //list(5,10,15)
 	volume = 15
 	w_class = 1
+	sharp = 1
 	var/mode = SYRINGE_DRAW
 
 	on_reagent_change()

code/modules/reagents/reagent_dispenser.dm

@@ -166,7 +166,7 @@
 	if(src)
 		del(src)
 
-/obj/structure/reagent_dispensers/fueltank/temperature_expose(datum/gas_mixture/air, temperature, volume)
+/obj/structure/reagent_dispensers/fueltank/fire_act(datum/gas_mixture/air, temperature, volume)
 	if(temperature > T0C+500)
 		explode()
 	return ..()

code/modules/recycling/sortingmachinery.dm

@@ -234,20 +234,8 @@
 	flush()
 		flushing = 1
 		flick("intake-closing", src)
-		var/deliveryCheck = 0
 		var/obj/structure/disposalholder/H = new()	// virtual holder object which actually
 													// travels through the pipes.
-		for(var/obj/structure/bigDelivery/O in src)
-			deliveryCheck = 1
-			if(O.sortTag == 0)
-				O.sortTag = 1
-		for(var/obj/item/smallDelivery/O in src)
-			deliveryCheck = 1
-			if (O.sortTag == 0)
-				O.sortTag = 1
-		if(deliveryCheck == 0)
-			H.destinationTag = 1
-
 		air_contents = new()		// new empty gas resv.
 
 		sleep(10)

code/modules/research/xenoarchaeology/geosample.dm

@@ -20,6 +20,7 @@
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "sliver1"	//0-4
 	w_class = 1
+	sharp = 1
 	//item_state = "electronic"
 	var/source_rock = "/turf/simulated/mineral/"
 	var/datum/geosample/geological_data

code/modules/surgery/appendix.dm

@@ -8,6 +8,8 @@
 	can_infect = 1
 	blood_level = 1
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		if (!hasorgans(target))
+			return 0
 		if (target_zone != "groin")
 			return 0
 		var/datum/organ/external/groin = target.get_organ("groin")

code/modules/surgery/bones.dm

@@ -15,6 +15,8 @@
 	max_duration = 60
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		if (!hasorgans(target))
+			return 0
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		return affected.open == 2 && affected.stage == 0
 
@@ -47,6 +49,8 @@
 	max_duration = 70
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		if (!hasorgans(target))
+			return 0
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		return affected.name != "head" && affected.open == 2 && affected.stage == 1
 
@@ -84,6 +88,8 @@
 	max_duration = 70
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		if (!hasorgans(target))
+			return 0
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		return affected.name == "head" && affected.open == 2 && affected.stage == 1
 
@@ -118,6 +124,8 @@
 	max_duration = 60
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		if (!hasorgans(target))
+			return 0
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		return affected.open == 2 && affected.stage == 2
 

code/modules/surgery/braincore.dm

@@ -62,7 +62,7 @@
 	fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		user.visible_message("\red [user]'s hand slips, cutting a vein in [target]'s brain with \the [tool]!", \
 		"\red Your hand slips, cutting a vein in [target]'s brain with \the [tool]!")
-		target.apply_damage(50, BRUTE, "head", 1)
+		target.apply_damage(50, BRUTE, "head", 1, sharp=1)
 
 /datum/surgery_step/brain/saw_spine
 	allowed_tools = list(
@@ -114,7 +114,7 @@
 	fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		user.visible_message("\red [user]'s hand slips, cutting a vein in [target]'s brain with \the [tool]!", \
 		"\red Your hand slips, cutting a vein in [target]'s brain with \the [tool]!")
-		target.apply_damage(30, BRUTE, "head", 1)
+		target.apply_damage(30, BRUTE, "head", 1, sharp=1)
 		if (ishuman(user))
 			user:bloody_body(target)
 			user:bloody_hands(target, 0)
@@ -151,7 +151,7 @@
 	fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		user.visible_message("\red [user]'s hand slips, jabbing \the [tool] in [target]'s brain!", \
 		"\red Your hand slips, jabbing \the [tool] in [target]'s brain!")
-		target.apply_damage(30, BRUTE, "head", 1)
+		target.apply_damage(30, BRUTE, "head", 1, sharp=1)
 
 /datum/surgery_step/brain/hematoma
 	allowed_tools = list(
@@ -181,7 +181,7 @@
 	fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		user.visible_message("\red [user]'s hand slips, bruising [target]'s brain with \the [tool]!", \
 		"\red Your hand slips, bruising [target]'s brain with \the [tool]!")
-		target.apply_damage(20, BRUTE, "head", 1)
+		target.apply_damage(20, BRUTE, "head", 1, sharp=1)
 
 //////////////////////////////////////////////////////////////////
 //				SLIME CORE EXTRACTION							//

code/modules/surgery/eye.dm

@@ -104,7 +104,7 @@
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		user.visible_message("\red [user]'s hand slips, stabbing \the [tool] into [target]'s eye!", \
 		"\red Your hand slips, stabbing \the [tool] into [target]'s eye!")
-		target.apply_damage(10, BRUTE, affected)
+		target.apply_damage(10, BRUTE, affected, sharp=1)
 		eyes.take_damage(5, 0)
 
 /datum/surgery_step/eye/cauterize

code/modules/surgery/face.dm

@@ -98,7 +98,7 @@
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		user.visible_message("\red [user]'s hand slips, tearing skin on [target]'s face with \the [tool]!", \
 		"\red Your hand slips, tearing skin on [target]'s face with \the [tool]!")
-		target.apply_damage(10, BRUTE, affected)
+		target.apply_damage(10, BRUTE, affected, sharp=1, sharp=1)
 
 /datum/surgery_step/face/cauterize
 	allowed_tools = list(

code/modules/surgery/generic.dm

@@ -35,8 +35,9 @@
 	max_duration = 110
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		return ..() && affected.open == 0 && target_zone != "mouth"
+		if(..())
+			var/datum/organ/external/affected = target.get_organ(target_zone)
+			return affected.open == 0 && target_zone != "mouth"
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/external/affected = target.get_organ(target_zone)
@@ -74,8 +75,9 @@
 	max_duration = 120
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		return ..() && affected.open == 0 && target_zone != "mouth"
+		if(..())
+			var/datum/organ/external/affected = target.get_organ(target_zone)
+			return affected.open == 0 && target_zone != "mouth"
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/external/affected = target.get_organ(target_zone)
@@ -114,10 +116,9 @@
 	max_duration = 110
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		if(isslime(target))
-			return 0
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		return ..() && affected.open == 0 && target_zone != "mouth"
+		if(..())
+			var/datum/organ/external/affected = target.get_organ(target_zone)
+			return affected.open == 0 && target_zone != "mouth"
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/external/affected = target.get_organ(target_zone)
@@ -153,8 +154,9 @@
 	max_duration = 60
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		return ..() && affected.open && (affected.status & ORGAN_BLEEDING)
+		if(..())
+			var/datum/organ/external/affected = target.get_organ(target_zone)
+			return affected.open && (affected.status & ORGAN_BLEEDING)
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/external/affected = target.get_organ(target_zone)
@@ -187,8 +189,9 @@
 	max_duration = 40
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		return ..() && affected.open == 1 && !(affected.status & ORGAN_BLEEDING)
+		if(..())
+			var/datum/organ/external/affected = target.get_organ(target_zone)
+			return affected.open == 1 && !(affected.status & ORGAN_BLEEDING)
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/external/affected = target.get_organ(target_zone)
@@ -228,7 +231,7 @@
 			msg = "\red [user]'s hand slips, damaging several organs in [target]'s lower abdomen with \the [tool]"
 			self_msg = "\red Your hand slips, damaging several organs in [target]'s lower abdomen with \the [tool]!"
 		user.visible_message(msg, self_msg)
-		target.apply_damage(12, BRUTE, affected)
+		target.apply_damage(12, BRUTE, affected, sharp=1)
 
 /datum/surgery_step/generic/cauterize
 	allowed_tools = list(
@@ -242,8 +245,9 @@
 	max_duration = 100
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		return ..() && affected.open && target_zone != "mouth"
+		if(..())
+			var/datum/organ/external/affected = target.get_organ(target_zone)
+			return affected.open && target_zone != "mouth"
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/external/affected = target.get_organ(target_zone)

code/modules/surgery/headreattach.dm

@@ -28,8 +28,9 @@
 	max_duration = 100
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		return ..() && !(affected.status & ORGAN_CUT_AWAY)
+		if(..())
+			var/datum/organ/external/affected = target.get_organ(target_zone)
+			return !(affected.status & ORGAN_CUT_AWAY)
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		user.visible_message("[user] starts peeling back tattered flesh where [target]'s head used to be with \the [tool].", \
@@ -61,8 +62,9 @@
 	max_duration = 100
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		return ..() && affected.status & ORGAN_CUT_AWAY && affected.open < 3 && !(affected.status & ORGAN_ATTACHABLE)
+		if(..())
+			var/datum/organ/external/affected = target.get_organ(target_zone)
+			return affected.status & ORGAN_CUT_AWAY && affected.open < 3 && !(affected.status & ORGAN_ATTACHABLE)
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/external/affected = target.get_organ(target_zone)
@@ -94,8 +96,9 @@
 	max_duration = 100
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		return ..() && affected.open == 3
+		if(..())
+			var/datum/organ/external/affected = target.get_organ(target_zone)
+			return affected.open == 3
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		user.visible_message("[user] is stapling and suturing flesh into place in [target]'s esophagal and vocal region with \the [tool].", \
@@ -128,8 +131,9 @@
 	max_duration = 70
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		return ..() && affected.open == 4
+		if(..())
+			var/datum/organ/external/affected = target.get_organ(target_zone)
+			return affected.open == 4
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		user.visible_message("[user] starts adjusting area around [target]'s neck with \the [tool].", \
@@ -162,8 +166,9 @@
 	max_duration = 100
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/head = target.get_organ(target_zone)
-		return ..() && head.status & ORGAN_ATTACHABLE
+		if(..())
+			var/datum/organ/external/head = target.get_organ(target_zone)
+			return head.status & ORGAN_ATTACHABLE
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		user.visible_message("[user] starts attaching [tool] to [target]'s reshaped neck.", \
@@ -189,4 +194,4 @@
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		user.visible_message("\red [user]'s hand slips, damaging connectors on [target]'s neck!", \
 		"\red Your hand slips, damaging connectors on [target]'s neck!")
-		target.apply_damage(10, BRUTE, affected)
+		target.apply_damage(10, BRUTE, affected, sharp=1)

code/modules/surgery/implant.dm

@@ -7,6 +7,8 @@
 /datum/surgery_step/cavity
 	priority = 1
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		if(!hasorgans(target))
+			return 0
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		return affected.open == 2 && !(affected.status & ORGAN_BLEEDING) && (target_zone != "chest" || target.op_stage.ribcage == 2)
 
@@ -41,8 +43,9 @@
 	max_duration = 80
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		return ..() && !affected.cavity && !affected.hidden
+		if(..())
+			var/datum/organ/external/affected = target.get_organ(target_zone)
+			return !affected.cavity && !affected.hidden
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/external/affected = target.get_organ(target_zone)
@@ -76,8 +79,9 @@
 	max_duration = 80
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		return ..() && affected.cavity
+		if(..())
+			var/datum/organ/external/affected = target.get_organ(target_zone)
+			return affected.cavity
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/external/affected = target.get_organ(target_zone)
@@ -106,11 +110,9 @@
 	max_duration = 100
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		if(isslime(target))
-			return 0
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		var/can_fit = !affected.hidden && affected.cavity && tool.w_class <= get_max_wclass(affected)
-		return ..() && can_fit
+		if(..())
+			var/datum/organ/external/affected = target.get_organ(target_zone)
+			return !affected.hidden && affected.cavity && tool.w_class <= get_max_wclass(affected)
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/external/affected = target.get_organ(target_zone)
@@ -185,7 +187,7 @@
 				affected.implants -= obj
 
 				target.hud_updateflag |= 1 << IMPLOYAL_HUD
-				
+
 				//Handle possessive brain borers.
 				if(istype(obj,/mob/living/simple_animal/borer))
 					var/mob/living/simple_animal/borer/worm = obj

code/modules/surgery/other.dm

@@ -17,6 +17,9 @@
 	max_duration = 90
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		if(!hasorgans(target))
+			return 0
+
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 
 		var/internal_bleeding = 0

code/modules/surgery/ribcage.dm

@@ -19,7 +19,7 @@
 	max_duration = 70
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		if (!istype(target))
+		if (!hasorgans(target))
 			return
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		return ..() && target.op_stage.ribcage == 0 && affected.open >= 2
@@ -197,6 +197,9 @@
 	max_duration = 90
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		if(!hasorgans(target))
+			return 0
+
 		var/is_chest_organ_damaged = 0
 		var/datum/organ/external/chest/chest = target.get_organ("chest")
 		for(var/datum/organ/internal/I in chest.internal_organs) if(I.damage > 0)
@@ -278,6 +281,9 @@
 	max_duration = 90
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		if(!hasorgans(target))
+			return 0
+
 		var/is_chest_organ_damaged = 0
 		var/datum/organ/internal/heart/heart = target.internal_organs["heart"]
 		var/datum/organ/external/chest/chest = target.get_organ("chest")

code/modules/surgery/robolimbs.dm

@@ -30,8 +30,9 @@
 	max_duration = 100
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		return ..() && !(affected.status & ORGAN_CUT_AWAY)
+		if(..())
+			var/datum/organ/external/affected = target.get_organ(target_zone)
+			return !(affected.status & ORGAN_CUT_AWAY)
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/external/affected = target.get_organ(target_zone)
@@ -64,8 +65,9 @@
 	max_duration = 100
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		return ..() && affected.status & ORGAN_CUT_AWAY && affected.open < 3 && !(affected.status & ORGAN_ATTACHABLE)
+		if(..())
+			var/datum/organ/external/affected = target.get_organ(target_zone)
+			return affected.status & ORGAN_CUT_AWAY && affected.open < 3 && !(affected.status & ORGAN_ATTACHABLE)
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/external/affected = target.get_organ(target_zone)
@@ -85,7 +87,7 @@
 			affected = affected.parent
 			user.visible_message("\red [user]'s hand slips, tearing flesh on [target]'s [affected.display_name]!", \
 			"\red Your hand slips, tearing flesh on [target]'s [affected.display_name]!")
-			target.apply_damage(10, BRUTE, affected)
+			target.apply_damage(10, BRUTE, affected, sharp=1)
 
 
 /datum/surgery_step/limb/prepare
@@ -100,8 +102,9 @@
 	max_duration = 70
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		return ..() && affected.open == 3
+		if(..())
+			var/datum/organ/external/affected = target.get_organ(target_zone)
+			return affected.open == 3
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/external/affected = target.get_organ(target_zone)
@@ -134,12 +137,13 @@
 	max_duration = 100
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/obj/item/robot_parts/p = tool
-		if (p.part)
-			if (!(target_zone in p.part))
-				return 0
-		var/datum/organ/external/affected = target.get_organ(target_zone)
-		return ..() && affected.status & ORGAN_ATTACHABLE
+		if(..())
+			var/obj/item/robot_parts/p = tool
+			if (p.part)
+				if (!(target_zone in p.part))
+					return 0
+			var/datum/organ/external/affected = target.get_organ(target_zone)
+			return affected.status & ORGAN_ATTACHABLE
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/external/affected = target.get_organ(target_zone)
@@ -166,4 +170,4 @@
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		user.visible_message("\red [user]'s hand slips, damaging connectors on [target]'s [affected.display_name]!", \
 		"\red Your hand slips, damaging connectors on [target]'s [affected.display_name]!")
-		target.apply_damage(10, BRUTE, affected)
+		target.apply_damage(10, BRUTE, affected, sharp=1)

code/modules/virus2/helpers.dm

@@ -68,7 +68,7 @@ proc/airborne_can_reach(turf/source, turf/target)
 	if ("[disease.uniqueID]" in M.virus2)
 		return
 	// if one of the antibodies in the mob's body matches one of the disease's antigens, don't infect
-	if(M.antibodies & disease.antigen != 0)
+	if((M.antibodies & disease.antigen) != 0)
 		return
 	if(M.reagents.has_reagent("spaceacillin"))
 		return