Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

code/modules/food_and_drinks/kitchen_machinery/gibber.dm

@@ -186,10 +186,9 @@
 		var/mob/living/carbon/human/gibee = occupant
 		if(gibee.dna && gibee.dna.species)
 			typeofmeat = gibee.dna.species.meat
-			typeofskin = gibee.dna.species.skinned_type
-		else
-			typeofmeat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human
-			typeofskin = /obj/item/stack/sheet/animalhide/human
+			if(gibee.dna.species.skinned_type)
+				typeofskin = gibee.dna.species.skinned_type
+
 	else if(iscarbon(occupant))
 		var/mob/living/carbon/C = occupant
 		typeofmeat = C.type_of_meat

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

@@ -27,7 +27,7 @@
 	var/exotic_blood = ""	// If your race wants to bleed something other than bog standard blood, change this to reagent id.
 	var/exotic_bloodtype = "" //If your race uses a non standard bloodtype (A+, O-, AB-, etc)
 	var/meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human //What the species drops on gibbing
-	var/skinned_type = /obj/item/stack/sheet/animalhide/generic
+	var/skinned_type = null
 	var/list/no_equip = list()	// slots the race can't equip stuff to
 	var/nojumpsuit = 0	// this is sorta... weird. it basically lets you equip stuff that usually needs jumpsuits without one, like belts and pockets and ids
 	var/blacklisted = 0 //Flag to exclude from green slime core species.

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

@@ -0,0 +1,10 @@
+diff a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm	(rejected hunks)
+@@ -115,7 +115,7 @@
+ 		var/obj/item/thing = C.get_item_by_slot(slot_id)
+ 		if(thing && (!thing.species_exception || !is_type_in_list(src,thing.species_exception)))
+ 			C.dropItemToGround(thing)
+-	
++
+ 	// this needs to be FIRST because qdel calls update_body which checks if we have DIGITIGRADE legs or not and if not then removes DIGITIGRADE from species_traits
+ 	if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Digitigrade Legs")
+ 		species_traits += DIGITIGRADE

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

@@ -3,8 +3,7 @@
 	id = "abductor"
 	say_mod = "gibbers"
 	sexes = 0
-	species_traits = list(NOBLOOD,NOBREATH,VIRUSIMMUNE,NOGUNS)
+	species_traits = list(NOBLOOD,NOBREATH,VIRUSIMMUNE,NOGUNS,NOHUNGER)
 	mutant_organs = list(/obj/item/organ/tongue/abductor)
 	var/scientist = 0 // vars to not pollute spieces list with castes
-	var/agent = 0
 	var/team = 1