Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi

code/modules/surgery/organs/augments_internal.dm

@@ -164,7 +164,7 @@
 	desc = "This implant with synthesize and pump into your bloodstream a small amount of nutriment when you are starving."
 	icon_state = "chest_implant"
 	implant_color = "#00AA00"
-	var/hunger_threshold = 150
+	var/hunger_threshold = NUTRITION_LEVEL_STARVING
 	var/synthesizing = 0
 	var/poison_amount = 5
 	slot = "stomach"
@@ -195,7 +195,7 @@
 	desc = "This implant will synthesize and pump into your bloodstream a small amount of nutriment when you are hungry."
 	icon_state = "chest_implant"
 	implant_color = "#006607"
-	hunger_threshold = 300
+	hunger_threshold = NUTRITION_LEVEL_HUNGRY
 	poison_amount = 10
 	origin_tech = "materials=5;programming=3;biotech=5"
 

code/modules/surgery/organs/blood.dm

@@ -66,7 +66,7 @@
 					if(mind) //Handles vampires "eating" blood that isn't their own.
 						if(mind in ticker.mode.vampires)
 							for(var/datum/reagent/blood/BL in vessel.reagent_list)
-								if(nutrition >= 450)
+								if(nutrition >= NUTRITION_LEVEL_WELL_FED)
 									break //We don't want blood tranfusions making vampires fat.
 								if(BL.data["donor"] != src)
 									nutrition += (15 * REAGENTS_METABOLISM)

code/modules/surgery/organs/subtypes/standard.dm

@@ -103,7 +103,7 @@
 	can_stand = 1
 
 /obj/item/organ/external/foot/remove()
-	if(owner.shoes) owner.unEquip(owner.shoes)
+	if(owner && owner.shoes) owner.unEquip(owner.shoes)
 	. = ..()
 
 /obj/item/organ/external/foot/right
@@ -128,12 +128,13 @@
 	can_grasp = 1
 
 /obj/item/organ/external/hand/remove()
-	if(owner.gloves)
-		owner.unEquip(owner.gloves)
-	if(owner.l_hand)
-		owner.unEquip(owner.l_hand,1)
-	if(owner.r_hand)
-		owner.unEquip(owner.r_hand,1)
+	if(owner)
+		if(owner.gloves)
+			owner.unEquip(owner.gloves)
+		if(owner.l_hand)
+			owner.unEquip(owner.l_hand,1)
+		if(owner.r_hand)
+			owner.unEquip(owner.r_hand,1)
 
 	. = ..()