diff --git a/code/modules/food&drinks/food/snacks/meat.dm b/code/modules/food&drinks/food/snacks/meat.dm index 82eed258268..91b2c27b243 100644 --- a/code/modules/food&drinks/food/snacks/meat.dm +++ b/code/modules/food&drinks/food/snacks/meat.dm @@ -19,6 +19,47 @@ var/subjectname = "" var/subjectjob = null +/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/slime + icon_state = "slimemeat" + desc = "Because jello wasn't offensive enough to vegans" + New() + ..() + reagents.add_reagent("slimejelly", 3) + +/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/golem + icon_state = "golemmeat" + desc = "Edible rocks, welcome to the future" + New() + ..() + reagents.add_reagent("iron", 3) + +/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/golem/adamantine + icon_state = "agolemmeat" + desc = "From the slime pen to the rune to the kitchen, science" + +/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/lizard + icon_state = "lizardmeat" + desc = "Delicious dino damage" + +/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/plant + icon_state = "plantmeat" + desc = "All the joys of healthy eating with all the fun of cannibalism" + +/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/shadow + icon_state = "shadowmeat" + desc = "Ow, the edge" + +/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/fly + icon_state = "flymeat" + desc = "Nothing says tasty like maggot filled radioactive mutant flesh" + New() + ..() + reagents.add_reagent("uranium", 3) + +/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/skeleton + name = "-bone" + icon_state = "skeletonmeat" + desc = "There's a point where this needs to stop and clearly we have passed it" /obj/item/weapon/reagent_containers/food/snacks/meat/monkey //same as plain meat diff --git a/code/modules/food&drinks/kitchen machinery/gibber.dm b/code/modules/food&drinks/kitchen machinery/gibber.dm index b39710779dd..39d2c4c2e98 100644 --- a/code/modules/food&drinks/kitchen machinery/gibber.dm +++ b/code/modules/food&drinks/kitchen machinery/gibber.dm @@ -9,6 +9,7 @@ var/operating = 0 //Is it on? var/dirty = 0 // Does it need cleaning? var/gibtime = 40 // Time from starting until meat appears + var/typeofmeat = /obj/item/weapon/reagent_containers/food/snacks/meat/ use_power = 1 idle_power_usage = 2 active_power_usage = 500 @@ -146,8 +147,15 @@ var/totalslabs = 3 var/obj/item/weapon/reagent_containers/food/snacks/meat/human/allmeat[totalslabs] + + if(ishuman(occupant)) + var/mob/living/carbon/human/gibee = occupant + if(gibee.dna && gibee.dna.species) + typeofmeat = gibee.dna.species.meat + else + typeofmeat = /obj/item/weapon/reagent_containers/food/snacks/meat/human for (var/i=1 to totalslabs) - var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new + var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new typeofmeat newmeat.name = sourcename + newmeat.name newmeat.subjectname = sourcename newmeat.subjectjob = sourcejob diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 40ef5dc682e..de73e267986 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -37,7 +37,7 @@ var/hair_color = null // this allows races to have specific hair colors... if null, it uses the H's hair/facial hair colors. if "mutcolor", it uses the H's mutant_color var/hair_alpha = 255 // the alpha used by the hair. 255 is completely solid, 0 is transparent. var/use_skintones = 0 // does it use skintones or not? (spoiler alert this is only used by humans) - + var/meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human //What the species drops on gibbing 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 diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index 7d159238fc5..e3e42effb46 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -32,6 +32,7 @@ attack_verb = "slash" attack_sound = 'sound/weapons/slash.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' + meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/lizard /datum/species/lizard/handle_speech(message) // jesus christ why @@ -55,6 +56,7 @@ miss_sound = 'sound/weapons/slashmiss.ogg' burnmod = 1.25 heatmod = 1.5 + meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/plant /datum/species/plant/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) if(chem.id == "plantbgone") @@ -122,6 +124,7 @@ darksight = 8 sexes = 0 ignored_by = list(/mob/living/simple_animal/hostile/faithless) + meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/shadow /datum/species/shadow/spec_life(mob/living/carbon/human/H) var/light_amount = 0 @@ -151,6 +154,7 @@ hair_color = "mutcolor" hair_alpha = 150 ignored_by = list(/mob/living/carbon/slime) + meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/slime /* JELLYPEOPLE @@ -164,6 +168,7 @@ say_mod = "chirps" eyes = "jelleyes" specflags = list(MUTCOLORS,EYECOLOR) + meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/slime /* GOLEMS @@ -179,6 +184,8 @@ punchmod = 5 no_equip = list(slot_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_head, slot_w_uniform) nojumpsuit = 1 + meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/golem + /* ADAMANTINE GOLEMS @@ -187,6 +194,7 @@ /datum/species/golem/adamantine name = "Adamantine Golem" id = "adamantine" + meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/golem/adamantine /* FLIES @@ -197,6 +205,7 @@ name = "Human?" id = "fly" say_mod = "buzzes" + meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/fly /datum/species/fly/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) if(chem.id == "pestkiller") @@ -218,4 +227,5 @@ // 2spooky name = "Spooky Scary Skeleton" id = "skeleton" - sexes = 0 \ No newline at end of file + sexes = 0 + meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/skeleton diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 63bbcc68797..a2a27697840 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ