From f52cbbd43bacd30e9e24d47706b7ab8161727d9d Mon Sep 17 00:00:00 2001 From: bgobandit Date: Fri, 20 May 2016 00:30:35 -0400 Subject: [PATCH 1/2] Fixes meat naming. --- code/modules/food&drinks/food/snacks/meat.dm | 16 ++++++++-------- .../food&drinks/kitchen machinery/gibber.dm | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/food&drinks/food/snacks/meat.dm b/code/modules/food&drinks/food/snacks/meat.dm index 6564bd05163..0d8cee8dff4 100644 --- a/code/modules/food&drinks/food/snacks/meat.dm +++ b/code/modules/food&drinks/food/snacks/meat.dm @@ -31,7 +31,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human - name = "-meat" + name = " meat" cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human slice_path = /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/plain/human @@ -56,19 +56,19 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/slime icon_state = "slimemeat" - desc = "Because jello wasn't offensive enough to vegans" + desc = "Because jello wasn't offensive enough to vegans." list_reagents = list("nutriment" = 3, "slimejelly" = 3) filling_color = "#00FFFF" /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem icon_state = "golemmeat" - desc = "Edible rocks, welcome to the future" + desc = "Edible rocks, welcome to the future." list_reagents = list("nutriment" = 3, "iron" = 3) filling_color = "#A9A9A9" /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine icon_state = "agolemmeat" - desc = "From the slime pen to the rune to the kitchen, science" + desc = "From the slime pen to the rune to the kitchen, science." filling_color = "#66CDAA" /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard @@ -78,7 +78,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/plant icon_state = "plantmeat" - desc = "All the joys of healthy eating with all the fun of cannibalism" + desc = "All the joys of healthy eating with all the fun of cannibalism." filling_color = "#E9967A" /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/shadow @@ -88,18 +88,18 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/fly icon_state = "flymeat" - desc = "Nothing says tasty like maggot filled radioactive mutant flesh" + desc = "Nothing says tasty like maggot filled radioactive mutant flesh." list_reagents = list("nutriment" = 3, "uranium" = 3) /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton name = "-bone" icon_state = "skeletonmeat" - desc = "There's a point where this needs to stop and clearly we have passed it" + desc = "There's a point where this needs to stop, and clearly we have passed it." filling_color = "#F0F0F0" slice_path = null //can't slice a bone into cutlets /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/zombie - name = "-meat (rotten)" + name = " meat (rotten)" icon_state = "lizardmeat" //Close enough. desc = "Halfway to becoming fertilizer for your garden." filling_color = "#6B8E23" diff --git a/code/modules/food&drinks/kitchen machinery/gibber.dm b/code/modules/food&drinks/kitchen machinery/gibber.dm index b31d4f68e18..652e48807d0 100644 --- a/code/modules/food&drinks/kitchen machinery/gibber.dm +++ b/code/modules/food&drinks/kitchen machinery/gibber.dm @@ -204,7 +204,7 @@ for (var/i=1 to meat_produced) 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.name = "[sourcename] meat" newmeat.subjectname = sourcename if(sourcejob) newmeat.subjectjob = sourcejob From e96a09a8016c93a3a14c70a04a3d2b72334c4301 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Sat, 21 May 2016 19:29:20 -0400 Subject: [PATCH 2/2] clarifies name --- code/modules/food&drinks/kitchen machinery/gibber.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food&drinks/kitchen machinery/gibber.dm b/code/modules/food&drinks/kitchen machinery/gibber.dm index 652e48807d0..d3df1ef47f9 100644 --- a/code/modules/food&drinks/kitchen machinery/gibber.dm +++ b/code/modules/food&drinks/kitchen machinery/gibber.dm @@ -204,7 +204,7 @@ for (var/i=1 to meat_produced) 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] meat" + newmeat.name = "[sourcename] [newmeat.name]" newmeat.subjectname = sourcename if(sourcejob) newmeat.subjectjob = sourcejob