merge fixes

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

@@ -334,24 +334,24 @@
 //Throwing stuff
 
 /mob/living/carbon/proc/toggle_throw_mode()
-	if (src.in_throw_mode)
+	if (in_throw_mode)
 		throw_mode_off()
 	else
 		throw_mode_on()
 
 /mob/living/carbon/proc/throw_mode_off()
-	src.in_throw_mode = 0
-	src.throw_icon.icon_state = "act_throw_off"
+	in_throw_mode = 0
+	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"
+	in_throw_mode = 1
+	throw_icon.icon_state = "act_throw_on"
 
 /mob/proc/throw_item(atom/target)
 	return
 
 /mob/living/carbon/throw_item(atom/target)
-	src.throw_mode_off()
+	throw_mode_off()
 	if(usr.stat || !target)
 		return
 	if(target.type == /obj/screen) return
@@ -382,7 +382,7 @@
 	update_icons()
 
 	if (istype(usr, /mob/living/carbon)) //Check if a carbon mob is throwing. Modify/remove this line as required.
-		item.loc = src.loc
+		item.loc = usr.loc
 		if(src.client)
 			src.client.screen -= item
 		if(istype(item, /obj/item))

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

@@ -1,12 +1,17 @@
-/mob/living/carbon/hitby(atom/movable/AM, skip)
-	if(!skip)  //ugly, but easy
-		if(in_throw_mode && !get_active_hand())  //empty active hand and we're in throw mode
-			if(canmove && !restrained())
-				if(istype(AM, /obj/item))
-					var/obj/item/I = AM
-					if(isturf(I.loc))
-						put_in_active_hand(I)
-						visible_message("<span class='warning'>[src] catches [I]!</span>")
-						throw_mode_off()
-						return
+/mob/living/carbon/hitby(atom/movable/AM)
+//	if(!skip)  //ugly, but easy
+//		message_admins("Skip Check Passed")
+	if(in_throw_mode && !get_active_hand())  //empty active hand and we're in throw mode
+		message_admins("In Throw Mode and active hand check passed")
+		if(canmove && !restrained())
+			message_admins("Restrained/moving check passed")
+			if(istype(AM, /obj/item))
+				message_admins("Item check passed")
+				var/obj/item/I = AM
+				if(isturf(I.loc))
+					message_admins("Turf check passed")
+					put_in_active_hand(I)
+					visible_message("<span class='warning'>[src] catches [I]!</span>")
+					throw_mode_off()
+					return
 	..()

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

@@ -10,7 +10,6 @@
 	var/sight_mode = 0
 	var/custom_name = ""
 	var/custom_sprite = 0 //Due to all the sprites involved, a var for our custom borgs may be best
-	var/crisis //Admin-settable for combat module use.
 
 //Hud stuff
 
@@ -153,7 +152,7 @@
 		return
 
 	var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor", "Service", "Security")
-	if(crisis && security_level == SEC_LEVEL_RED) //Leaving this in until it's balanced appropriately.
+	if(security_level >= SEC_LEVEL_RED)
 		src << "\red Crisis mode active. Combat module available."
 		modules+="Combat"
 	if(mmi != null && mmi.alien)