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

Conflicts:
	baystation12.dme

code/modules/mob/death.dm

@@ -47,6 +47,7 @@
 
 /mob/proc/death(gibbed)
 	timeofdeath = world.time
+	client.onDeath()
 
 	var/cancel = 0
 	for(var/mob/M in world)

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

@@ -321,4 +321,24 @@
 		var/datum/organ/external/O = organs[name]
 		if(O.name == zone)
 			return O
-	return null
+	return null
+
+/mob/living/carbon/proc/drip()
+
+/mob/living/carbon/proc/vomit()
+	// only humanoids and monkeys can vomit
+	if(!istype(src,/mob/living/carbon/human) && !istype(src,/mob/living/carbon/monkey))
+		return
+
+	// Make the human vomit on the floor
+	for(var/mob/O in viewers(world.view, src))
+		O.show_message(text("<b>\red [] throws up!</b>", src), 1)
+	playsound(src.loc, 'splat.ogg', 50, 1)
+
+	var/turf/location = loc
+	if (istype(location, /turf/simulated))
+		location.add_vomit_floor(src, 1)
+
+	nutrition -= 20
+	adjustToxLoss(-3)
+

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

@@ -164,7 +164,7 @@
 		if(B.id == "blood")
 			B.data = list("donor"=src,"viruses"=null,"blood_DNA"=dna.unique_enzymes,"blood_type"=dna.b_type,"resistances"=null,"trace_chem"=null,"virus2"=(virus2 ? virus2.getcopy() : null),"antibodies"=0)
 
-/mob/living/carbon/human/proc/drip(var/amt as num)
+/mob/living/carbon/human/drip(var/amt as num)
 	if(!amt)
 		return
 

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

@@ -431,20 +431,6 @@
 			if(breath)
 				loc.assume_air(breath)
 
-		vomit()
-			// Make the human vomit on the floor
-			for(var/mob/O in viewers(world.view, src))
-				O.show_message(text("<b>\red [] throws up!</b>", src), 1)
-			playsound(src.loc, 'splat.ogg', 50, 1)
-
-			var/turf/location = loc
-			if (istype(location, /turf/simulated))
-				location.add_vomit_floor(src, 1)
-
-			nutrition -= 20
-			adjustToxLoss(-3)
-
-
 		get_breath_from_internal(volume_needed)
 			if(internal)
 				if (!contents.Find(internal))

code/modules/mob/mob.dm

@@ -488,9 +488,25 @@
 	set name = "Changelog"
 	set category = "OOC"
 	if (client)
-		src << browse_rsc('postcardsmall.jpg')
-		src << browse_rsc('somerights20.png')
-		src << browse_rsc('88x31.png')
+		src.getFiles('postcardsmall.jpg',
+							 'somerights20.png',
+							 '88x31.png',
+							 'bug-minus.png',
+							 'cross-circle.png',
+							 'hard-hat-exclamation.png',
+							 'image-minus.png',
+							 'image-plus.png',
+							 'music-minus.png',
+							 'music-plus.png',
+							 'tick-circle.png',
+							 'wrench-screwdriver.png',
+							 'spell-check.png',
+							 'burn-exclamation.png',
+							 'chevron.png',
+							 'chevron-expand.png',
+							 'changelog.css',
+							 'changelog.js'
+							 )
 		src << browse('changelog.html', "window=changes;size=675x650")
 		client.changes = 1
 
@@ -1138,4 +1154,14 @@ note dizziness decrements automatically in the mob's Life() proc.
 /mob/proc/setBrainLoss(var/amount)
 	brainloss = amount
 
-// ++++ROCKDTBEN++++ MOB PROCS //END
+// ++++ROCKDTBEN++++ MOB PROCS //END
+
+/*
+ * Sends resource files to client cache
+ */
+/mob/proc/getFiles()
+	if(!isemptylist(args))
+		for(var/file in args)
+			src << browse_rsc(file)
+		return 1
+	return 0

code/modules/mob/mob_defines.dm

@@ -74,7 +74,7 @@
 	var/computer_id = null
 	var/lastattacker = null
 	var/lastattacked = null
-	var/attack_log = list( )
+	var/list/attack_log = list( )
 	var/already_placed = 0.0
 	var/obj/machinery/machine = null
 	var/other_mobs = null