From 5f56d40f5812e5334e72b9d9046249e541d6b83d Mon Sep 17 00:00:00 2001 From: Useroth Date: Sat, 7 Dec 2019 06:41:24 +0100 Subject: [PATCH] Incorporated the bamboo grammar fixes. --- code/game/objects/items/stacks/sheets/sheet_types.dm | 1 - code/modules/hydroponics/grown/towercap.dm | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 36597e2295..166d851400 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -257,7 +257,6 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \ icon_state = "sheet-bamboo" item_state = "sheet-bamboo" icon = 'icons/obj/stack_objects.dmi' - sheettype = "bamboo" throwforce = 15 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0) resistance_flags = FLAMMABLE diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index b2bb42a91d..ed380b7657 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -100,7 +100,7 @@ /obj/item/seeds/bamboo name = "pack of bamboo seeds" - desc = "Plant known for their flexible and resistant logs." + desc = "A plant known for its flexible and resistant logs." icon_state = "seed-bamboo" species = "bamboo" plantname = "Bamboo" @@ -119,7 +119,7 @@ /obj/item/grown/log/bamboo seed = /obj/item/seeds/bamboo name = "bamboo log" - desc = "An long and resistant bamboo log." + desc = "A long and resistant bamboo log." icon_state = "bamboo" plank_type = /obj/item/stack/sheet/mineral/bamboo plank_name = "bamboo sticks" @@ -129,7 +129,7 @@ /obj/structure/punji_sticks name = "punji sticks" - desc = "Dont step on this." + desc = "Don't step on this." icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "punji" resistance_flags = FLAMMABLE