From ea070a4680595ff0d36b9aa9a0f46c4d028ec93a Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 11 Jul 2016 21:52:47 -0400 Subject: [PATCH] Fixed a runtime when gibbing plasmamen in the gibber. Renamed generic skin to skin. --- code/game/objects/items/stacks/sheets/leather.dm | 6 +++--- code/modules/food_and_drinks/kitchen_machinery/gibber.dm | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index ee43c27dc91..6ecd56772c1 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -18,9 +18,9 @@ var/global/list/datum/stack_recipe/human_recipes = list( \ return ..() /obj/item/stack/sheet/animalhide/generic - name = "generic skin" - desc = "A piece of generic skin." - singular_name = "generic skin piece" + name = "skin" + desc = "A piece of skin." + singular_name = "skin piece" icon_state = "sheet-hide" /obj/item/stack/sheet/animalhide/corgi diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index c846c7ff0c9..2f88a2ae9d5 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -204,10 +204,11 @@ var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/newmeat = new typeofmeat var/obj/item/stack/sheet/animalhide/newskin = new typeofskin newmeat.name = "[sourcename] [newmeat.name]" - newmeat.subjectname = sourcename - if(sourcejob) - newmeat.subjectjob = sourcejob - newmeat.reagents.add_reagent ("nutriment", sourcenutriment / meat_produced) // Thehehe. Fat guys go first + if(istype(newmeat)) + newmeat.subjectname = sourcename + newmeat.reagents.add_reagent ("nutriment", sourcenutriment / meat_produced) // Thehehe. Fat guys go first + if(sourcejob) + newmeat.subjectjob = sourcejob src.occupant.reagents.trans_to (newmeat, round (sourcetotalreagents / meat_produced, 1)) // Transfer all the reagents from the allmeat[i] = newmeat allskin = newskin