Baymerge fixes (#12)

* Fixing compile errors

* Some more fixes

* Some more fixes

code/__defines/damage_organs.dm

@@ -34,6 +34,8 @@
 #define ORGAN_DEAD       (1<<6)
 #define ORGAN_MUTATED    (1<<7)
 #define ORGAN_ASSISTED   (1<<8)
+#define ORGAN_ADV_ROBOT  (1<<9)
+#define ORGAN_PLANT      (1<<10)
 
 #define DROPLIMB_EDGE 0
 #define DROPLIMB_BLUNT 1

code/__defines/mobs.dm

@@ -62,6 +62,10 @@
 #define HEAVY 64
 #define ALLMOBS (HUMAN|MONKEY|ALIEN|ROBOT|SLIME|SIMPLE_ANIMAL|HEAVY)
 
+//Types of diona, returned by is_diona
+#define DIONA_NYMPH		1
+#define DIONA_WORKER	2
+
 // Robot AI notifications
 #define ROBOT_NOTIFICATION_NEW_UNIT 1
 #define ROBOT_NOTIFICATION_NEW_NAME 2
@@ -117,7 +121,7 @@
 #define MOB_TINY 		5
 #define MOB_MINISCULE	1
 
-// Gluttony levels. 
+// Gluttony levels.
 #define GLUT_TINY 1       // Eat anything tiny and smaller
 #define GLUT_SMALLER 2    // Eat anything smaller than we are
 #define GLUT_ANYTHING 3   // Eat anything, ever
@@ -141,7 +145,7 @@
 #define INCAPACITATION_RESTRAINED 1
 #define INCAPACITATION_BUCKLED_PARTIALLY 2
 #define INCAPACITATION_BUCKLED_FULLY 4
-#define INCAPACITATION_DISABLED 8 
+#define INCAPACITATION_DISABLED 8
 
 #define INCAPACITATION_DEFAULT (INCAPACITATION_RESTRAINED|INCAPACITATION_BUCKLED_FULLY|INCAPACITATION_DISABLED)
 #define INCAPACITATION_ALL (INCAPACITATION_RESTRAINED|INCAPACITATION_BUCKLED_PARTIALLY|INCAPACITATION_BUCKLED_FULLY|INCAPACITATION_DISABLED)
@@ -151,3 +155,11 @@
 #define MOB_PULL_SAME 2
 #define MOB_PULL_LARGER 3
 
+//Time of Death constants
+//Used with a list in preference datums to track times of death
+#define CREW "crew" //Used for crewmembers, AI, cyborgs, nymphs, antags
+#define ANIMAL "animal" //Used for mice and any other simple animals
+#define MINISYNTH "minisynth"//Used for drones and pAIs
+
+#define RESPAWN_ANIMAL 3000
+#define RESPAWN_MINISYNTH 6000

code/modules/mob/living/living_defense.dm

@@ -10,6 +10,9 @@
 	1 - halfblock
 	2 - fullblock
 */
+#define MOB_FIRE_LIGHT_RANGE  3  //These control the intensity and range of light given off by a mob which is on fire
+#define MOB_FIRE_LIGHT_POWER  2
+
 /mob/living/proc/run_armor_check(var/def_zone = null, var/attack_flag = "melee", var/armour_pen = 0, var/absorb_text = null, var/soften_text = null)
 	if(armour_pen >= 100)
 		return 0 //might as well just skip the processing
@@ -373,3 +376,6 @@
 			hud_used.hide_actions_toggle.screen_loc = hud_used.ButtonNumberToScreenCoords(button_number+1)
 			//hud_used.SetButtonCoords(hud_used.hide_actions_toggle,button_number+1)
 		client.screen += hud_used.hide_actions_toggle
+
+#undef	MOB_FIRE_LIGHT_RANGE  //These control the intensity and range of light given off by a mob which is on fire
+#undef	MOB_FIRE_LIGHT_POWER

code/modules/reagents/reagent_containers.dm

@@ -102,14 +102,14 @@
 		user << "<span class='notice'>\The [src] is empty.</span>"
 		return 1
 
-	var/types = target.find_type()
+	//var/types = target.find_type()
 	var/mob/living/carbon/human/H
 	if(istype(target, /mob/living/carbon/human))
 		H = target
 
 	if(target == user)
 		if(istype(user, /mob/living/carbon/human))
-			var/mob/living/carbon/human/H = user
+			H = user
 			if(!H.check_has_mouth())
 				user << "Where do you intend to put \the [src]? You don't have a mouth!"
 				return 1
@@ -125,7 +125,7 @@
 		return 1
 	else
 		if(istype(target, /mob/living/carbon/human))
-			var/mob/living/carbon/human/H = target
+			H = target
 			if(!H.check_has_mouth())
 				user << "Where do you intend to put \the [src]? \The [H] doesn't have a mouth!"
 				return