From a39a405b60828b321e45844fb529ae2a732cf7f3 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 24 Apr 2017 17:59:57 -0500 Subject: [PATCH] fixes people with no skin/golems dropping skin when gibbed --- .../food_and_drinks/kitchen_machinery/gibber.dm | 7 +++---- code/modules/mob/living/carbon/human/species.dm | 2 +- code/modules/mob/living/carbon/human/species.dm.rej | 10 ++++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 code/modules/mob/living/carbon/human/species.dm.rej diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 9784a03a20..13442c4032 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/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 diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 03053a5b45..ecca978880 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/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. diff --git a/code/modules/mob/living/carbon/human/species.dm.rej b/code/modules/mob/living/carbon/human/species.dm.rej new file mode 100644 index 0000000000..fdbf73f505 --- /dev/null +++ b/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