diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm index a02deed31ca..dc55d7ab695 100644 --- a/code/__DEFINES/icon_smoothing.dm +++ b/code/__DEFINES/icon_smoothing.dm @@ -93,14 +93,15 @@ DEFINE_BITFIELD(smoothing_flags, list( #define SMOOTH_GROUP_CARPET_SIMPLE_NEON_PURPLE_NODOTS S_TURF(49) //![turf/open/floor/carpet/neon/simple/purple/nodots] #define SMOOTH_GROUP_CARPET_SIMPLE_NEON_VIOLET_NODOTS S_TURF(50) //![turf/open/floor/carpet/neon/simple/violet/nodots] #define SMOOTH_GROUP_CARPET_SIMPLE_NEON_PINK_NODOTS S_TURF(51) //![turf/open/floor/carpet/neon/simple/pink/nodots] +#define SMOOTH_GROUP_BAMBOO_FLOOR S_TURF(52) //![/turf/open/floor/bamboo] -#define SMOOTH_GROUP_CLOSED_TURFS S_TURF(52) ///turf/closed -#define SMOOTH_GROUP_MATERIAL_WALLS S_TURF(53) ///turf/closed/wall/material -#define SMOOTH_GROUP_SYNDICATE_WALLS S_TURF(54) ///turf/closed/wall/r_wall/syndicate, /turf/closed/indestructible/syndicate -#define SMOOTH_GROUP_HOTEL_WALLS S_TURF(55) ///turf/closed/indestructible/hotelwall -#define SMOOTH_GROUP_MINERAL_WALLS S_TURF(56) ///turf/closed/mineral, /turf/closed/indestructible -#define SMOOTH_GROUP_BOSS_WALLS S_TURF(57) ///turf/closed/indestructible/riveted/boss -#define SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS S_TURF(58) ///turf/closed/wall/mineral/titanium/survival +#define SMOOTH_GROUP_CLOSED_TURFS S_TURF(53) ///turf/closed +#define SMOOTH_GROUP_MATERIAL_WALLS S_TURF(54) ///turf/closed/wall/material +#define SMOOTH_GROUP_SYNDICATE_WALLS S_TURF(55) ///turf/closed/wall/r_wall/syndicate, /turf/closed/indestructible/syndicate +#define SMOOTH_GROUP_HOTEL_WALLS S_TURF(56) ///turf/closed/indestructible/hotelwall +#define SMOOTH_GROUP_MINERAL_WALLS S_TURF(57) ///turf/closed/mineral, /turf/closed/indestructible +#define SMOOTH_GROUP_BOSS_WALLS S_TURF(58) ///turf/closed/indestructible/riveted/boss +#define SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS S_TURF(59) ///turf/closed/wall/mineral/titanium/survival #define MAX_S_TURF SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS //Always match this value with the one above it. @@ -123,6 +124,7 @@ DEFINE_BITFIELD(smoothing_flags, list( #define SMOOTH_GROUP_PLASTITANIUM_WALLS S_OBJ(13) ///turf/closed/wall/mineral/plastitanium, /obj/structure/falsewall/plastitanium #define SMOOTH_GROUP_SURVIVAL_TIANIUM_POD S_OBJ(14) ///turf/closed/wall/mineral/titanium/survival/pod, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/reinforced/shuttle/survival_pod #define SMOOTH_GROUP_HIERO_WALL S_OBJ(15) ///obj/effect/temp_visual/elite_tumor_wall, /obj/effect/temp_visual/hierophant/wall +#define SMOOTH_GROUP_BAMBOO_WALLS S_TURF(16) //![/turf/closed/wall/mineral/bamboo, /obj/structure/falsewall/bamboo] #define SMOOTH_GROUP_PAPERFRAME S_OBJ(20) ///obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index f889933fb83..b4115edc248 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -69,7 +69,7 @@ result = /obj/item/spear/explosive reqs = list(/obj/item/spear = 1, /obj/item/grenade = 1) - blacklist = list(/obj/item/spear/bonespear) + blacklist = list(/obj/item/spear/bonespear, /obj/item/spear/bamboospear) parts = list(/obj/item/spear = 1, /obj/item/grenade = 1) time = 15 @@ -955,7 +955,7 @@ /obj/item/bodypart/head = 1) parts = list(/obj/item/bodypart/head = 1, /obj/item/spear = 1) - blacklist = list(/obj/item/spear/explosive, /obj/item/spear/bonespear) + blacklist = list(/obj/item/spear/explosive, /obj/item/spear/bonespear, /obj/item/spear/bamboospear) result = /obj/structure/headpike category = CAT_PRIMAL @@ -969,6 +969,16 @@ result = /obj/structure/headpike/bone category = CAT_PRIMAL +/datum/crafting_recipe/headpikebamboo + name = "Spike Head (Bamboo Spear)" + time = 65 + reqs = list(/obj/item/spear/bamboospear = 1, + /obj/item/bodypart/head = 1) + parts = list(/obj/item/bodypart/head = 1, + /obj/item/spear/bamboospear = 1) + result = /obj/structure/headpike/bamboo + category = CAT_PRIMAL + /datum/crafting_recipe/pressureplate name = "Pressure Plate" result = /obj/item/pressure_plate diff --git a/code/datums/materials/basemats.dm b/code/datums/materials/basemats.dm index a974b67e373..c16526aface 100644 --- a/code/datums/materials/basemats.dm +++ b/code/datums/materials/basemats.dm @@ -517,8 +517,8 @@ Unless you know what you're doing, only use the first three numbers. They're in /datum/material/bamboo name = "bamboo" desc = "If it's good enough for pandas, it's good enough for you." - color = "#339933" - greyscale_colors = "#339933" + color = "#87a852" + greyscale_colors = "#87a852" categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_ITEM_MATERIAL=TRUE) sheet_type = /obj/item/stack/sheet/mineral/bamboo value_per_unit = 0.0025 diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm index c0fa9c9752b..f171d5535fa 100644 --- a/code/game/objects/items/spear.dm +++ b/code/game/objects/items/spear.dm @@ -186,3 +186,18 @@ /obj/item/spear/bonespear/ComponentInitialize() . = ..() AddComponent(/datum/component/two_handed, force_unwielded=12, force_wielded=20, icon_wielded="[icon_prefix]1") + +/* + * Bamboo Spear + */ +/obj/item/spear/bamboospear //Blatant imitation of spear, but all natural. Also not valid for explosive modification. + icon_state = "bamboo_spear0" + base_icon_state = "bamboo_spear0" + icon_prefix = "bamboo_spear" + name = "bamboo spear" + desc = "A haphazardly-constructed bamboo stick with a sharpened tip, ready to poke holes into unsuspecting people." + throwforce = 22 //Better to throw + +/obj/item/spear/bonespear/ComponentInitialize() + . = ..() + AddComponent(/datum/component/two_handed, force_unwielded=10, force_wielded=18, icon_wielded="[icon_prefix]1") diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index be23d9e031f..e8f77ad3d34 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -313,7 +313,18 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ GLOBAL_LIST_INIT(bamboo_recipes, list ( \ new/datum/stack_recipe("punji sticks trap", /obj/structure/punji_sticks, 5, time = 30, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("bamboo spear", /obj/item/spear/bamboospear, 25, time = 90), \ new/datum/stack_recipe("blow gun", /obj/item/gun/syringe/blowgun, 10, time = 70), \ + new/datum/stack_recipe("crude syringe", /obj/item/reagent_containers/syringe/crude, 5, time = 10), \ + null, \ + new/datum/stack_recipe("bamboo stool", /obj/structure/chair/stool/bamboo, 2, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("bamboo mat piece", /obj/item/stack/tile/bamboo, 1, 4, 20), \ + null, \ + new/datum/stack_recipe_list("bamboo benches", list( + new /datum/stack_recipe("bamboo bench (middle)", /obj/structure/chair/sofa/bamboo, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("bamboo bench (left)", /obj/structure/chair/sofa/bamboo/left, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("bamboo bench (right)", /obj/structure/chair/sofa/bamboo/right, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE) + )), \ )) /obj/item/stack/sheet/mineral/bamboo @@ -323,6 +334,7 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \ icon_state = "sheet-bamboo" inhand_icon_state = "sheet-bamboo" icon = 'icons/obj/stack_objects.dmi' + sheettype = "bamboo" mats_per_unit = list(/datum/material/bamboo = MINERAL_MATERIAL_AMOUNT) throwforce = 15 armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 50, ACID = 0) @@ -330,6 +342,7 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \ merge_type = /obj/item/stack/sheet/mineral/bamboo grind_results = list(/datum/reagent/cellulose = 10) material_type = /datum/material/bamboo + walltype = /turf/closed/wall/mineral/bamboo /obj/item/stack/sheet/mineral/bamboo/get_main_recipes() . = ..() diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 0eeb96fe132..8713c0d9197 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -124,6 +124,17 @@ turf_type = /turf/open/floor/wood/tile merge_type = /obj/item/stack/tile/wood/tile +//Bamboo +/obj/item/stack/tile/bamboo + name = "bamboo mat pieces" + singular_name = "bamboo mat piece" + desc = "A piece of a bamboo mat with a decorative trim." + icon_state = "tile_bamboo" + turf_type = /turf/open/floor/bamboo + merge_type = /obj/item/stack/tile/bamboo + resistance_flags = FLAMMABLE + + //Basalt /obj/item/stack/tile/basalt name = "basalt tile" diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 4dbdba87cad..76ab13e8d17 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -107,7 +107,7 @@ weapon.play_tool_sound(src) deconstruct(disassembled = TRUE) return TRUE - + /obj/structure/chair/attack_tk(mob/user) if(!anchored || has_buckled_mobs() || !isturf(user.loc)) return ..() @@ -297,6 +297,16 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool, 0) MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0) +/obj/structure/chair/stool/bamboo + name = "bamboo stool" + desc = "A makeshift bamboo stool with a rustic look." + icon_state = "bamboo_stool" + resistance_flags = FLAMMABLE + max_integrity = 60 + buildstacktype = /obj/item/stack/sheet/mineral/bamboo + buildstackamount = 2 + item_chair = /obj/item/chair/stool/bamboo + /obj/item/chair name = "chair" desc = "Bar brawl essential." @@ -399,6 +409,14 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0) inhand_icon_state = "stool_bar" origin_type = /obj/structure/chair/stool/bar +/obj/item/chair/stool/bamboo + name = "bamboo stool" + icon_state = "bamboo_stool" + inhand_icon_state = "stool_bamboo" + hitsound = 'sound/weapons/genhit1.ogg' + origin_type = /obj/structure/chair/stool/bamboo + break_chance = 50 //Submissive and breakable unlike the chad iron stool + /obj/item/chair/stool/narsie_act() return //sturdy enough to ignore a god diff --git a/code/game/objects/structures/beds_chairs/sofa.dm b/code/game/objects/structures/beds_chairs/sofa.dm index a3595020d4d..e966ca25940 100644 --- a/code/game/objects/structures/beds_chairs/sofa.dm +++ b/code/game/objects/structures/beds_chairs/sofa.dm @@ -78,3 +78,19 @@ icon_state = "bench_corner" greyscale_config = /datum/greyscale_config/bench_corner greyscale_colors = "#af7d28" + +// Bamboo benches +/obj/structure/chair/sofa/bamboo + name = "bamboo bench" + desc = "A makeshift bench with a rustic aesthetic." + icon_state = "bamboo_sofamiddle" + resistance_flags = FLAMMABLE + max_integrity = 60 + buildstacktype = /obj/item/stack/sheet/mineral/bamboo + buildstackamount = 3 + +/obj/structure/chair/sofa/bamboo/left + icon_state = "bamboo_sofaend_left" + +/obj/structure/chair/sofa/bamboo/right + icon_state = "bamboo_sofaend_right" diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index ebd6b8bf4c0..5c97406c9ec 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -288,6 +288,17 @@ smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WOOD_WALLS) canSmoothWith = list(SMOOTH_GROUP_WOOD_WALLS) +/obj/structure/falsewall/bamboo + name = "bamboo wall" + desc = "A wall with bamboo finish. Zen." + icon = 'icons/turf/walls/bamboo_wall.dmi' + icon_state = "bamboo" + mineral = /obj/item/stack/sheet/mineral/bamboo + walltype = /turf/closed/wall/mineral/bamboo + smoothing_flags = SMOOTH_BITMASK + smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BAMBOO_WALLS) + canSmoothWith = list(SMOOTH_GROUP_BAMBOO_WALLS) + /obj/structure/falsewall/iron name = "rough iron wall" desc = "A wall with rough metal plating." diff --git a/code/game/objects/structures/headpike.dm b/code/game/objects/structures/headpike.dm index b504a4e3bc7..7f228397eb3 100644 --- a/code/game/objects/structures/headpike.dm +++ b/code/game/objects/structures/headpike.dm @@ -5,13 +5,17 @@ icon_state = "headpike" density = FALSE anchored = TRUE - var/bonespear = FALSE var/obj/item/spear/spear + var/obj/item/spear/speartype var/obj/item/bodypart/head/victim /obj/structure/headpike/bone //for bone spears icon_state = "headpike-bone" - bonespear = TRUE + speartype = /obj/item/spear/bonespear + +/obj/structure/headpike/bamboo //for bamboo spears + icon_state = "headpike-bamboo" + speartype = /obj/item/spear/bamboospear /obj/structure/headpike/Initialize(mapload) . = ..() @@ -29,9 +33,9 @@ if(!victim) //likely a mapspawned one victim = new(src) victim.real_name = random_unique_name(prob(50)) - spear = locate(bonespear ? /obj/item/spear/bonespear : /obj/item/spear) in parts_list + spear = locate(speartype) in parts_list if(!spear) - spear = bonespear ? new/obj/item/spear/bonespear(src) : new/obj/item/spear(src) + spear = new speartype(src) update_appearance() return ..() diff --git a/code/game/turfs/closed/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm index 9127004ed87..876ed1c3f3c 100644 --- a/code/game/turfs/closed/wall/mineral_walls.dm +++ b/code/game/turfs/closed/wall/mineral_walls.dm @@ -167,6 +167,17 @@ girder_type = /obj/structure/barricade/wooden hardness = 50 +/turf/closed/wall/mineral/bamboo + name = "bamboo wall" + desc = "A wall with a bamboo finish." + icon = 'icons/turf/walls/bamboo_wall.dmi' + icon_state = "bamboo" + smoothing_flags = SMOOTH_BITMASK + smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BAMBOO_WALLS) + canSmoothWith = list(SMOOTH_GROUP_BAMBOO_WALLS) + sheet_type = /obj/item/stack/sheet/mineral/bamboo + hardness = 60 + /turf/closed/wall/mineral/iron name = "rough iron wall" desc = "A wall with rough iron plating." diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm index 32970eec2dd..7de78691736 100644 --- a/code/game/turfs/open/floor/fancy_floor.dm +++ b/code/game/turfs/open/floor/fancy_floor.dm @@ -1,5 +1,6 @@ /* In this file: * Wood floor + * Bamboo floor * Grass floor * Fake Basalt * Carpet floor @@ -89,6 +90,24 @@ /turf/open/floor/wood/large/setup_broken_states() return list("wood_large-broken", "wood_large-broken2", "wood_large-broken3") +/turf/open/floor/bamboo + desc = "A bamboo mat with a decorative trim." + icon = 'icons/turf/floors/bamboo_mat.dmi' + icon_state = "mat-0" + base_icon_state = "mat" + floor_tile = /obj/item/stack/tile/bamboo + smoothing_flags = SMOOTH_BITMASK + smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_BAMBOO_FLOOR) + canSmoothWith = list(SMOOTH_GROUP_BAMBOO_FLOOR) + flags_1 = NONE + footstep = FOOTSTEP_WOOD + barefootstep = FOOTSTEP_WOOD_BAREFOOT + clawfootstep = FOOTSTEP_WOOD_CLAW + heavyfootstep = FOOTSTEP_GENERIC_HEAVY + +/turf/open/floor/bamboo/setup_broken_states() + return list("damaged") + /turf/open/floor/grass name = "grass patch" desc = "You can't tell if this is real grass or just cheap plastic imitation." diff --git a/code/modules/hydroponics/grown/sugarcane.dm b/code/modules/hydroponics/grown/sugarcane.dm index 189d8cf5be7..11544f589e5 100644 --- a/code/modules/hydroponics/grown/sugarcane.dm +++ b/code/modules/hydroponics/grown/sugarcane.dm @@ -40,7 +40,7 @@ production = 2 yield = 5 potency = 50 - growthstages = 2 + growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing.dmi' icon_dead = "bamboo-dead" genes = list(/datum/plant_gene/trait/repeated_harvest) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 88368910ee5..f996b5d8e3f 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -231,6 +231,14 @@ possible_transfer_amounts = list(5, 10) inject_flags = INJECT_CHECK_PENETRATE_THICK +/obj/item/reagent_containers/syringe/crude + name = "crude syringe" + desc = "A crudely made syringe. The flimsy wooden construction makes it hold a minimal amounts of reagents, but its very disposable." + icon_state = "crude_0" + base_icon_state = "crude" + possible_transfer_amounts = list(1,5) + volume = 5 + /obj/item/reagent_containers/syringe/spider_extract name = "spider extract syringe" desc = "Contains crikey juice - makes any gold core create the most deadly companions in the world." diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index b7f444e2daf..3403bcf3f2a 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/inhands/misc/chairs_lefthand.dmi b/icons/mob/inhands/misc/chairs_lefthand.dmi index 65b9d15a2b4..e8077781355 100644 Binary files a/icons/mob/inhands/misc/chairs_lefthand.dmi and b/icons/mob/inhands/misc/chairs_lefthand.dmi differ diff --git a/icons/mob/inhands/misc/chairs_righthand.dmi b/icons/mob/inhands/misc/chairs_righthand.dmi index e14415856d4..70641157357 100644 Binary files a/icons/mob/inhands/misc/chairs_righthand.dmi and b/icons/mob/inhands/misc/chairs_righthand.dmi differ diff --git a/icons/mob/inhands/misc/sheets_lefthand.dmi b/icons/mob/inhands/misc/sheets_lefthand.dmi index 7e8eaf9a12f..aed1d5eddca 100644 Binary files a/icons/mob/inhands/misc/sheets_lefthand.dmi and b/icons/mob/inhands/misc/sheets_lefthand.dmi differ diff --git a/icons/mob/inhands/misc/sheets_righthand.dmi b/icons/mob/inhands/misc/sheets_righthand.dmi index 433a2ea7fb1..e669afcae7d 100644 Binary files a/icons/mob/inhands/misc/sheets_righthand.dmi and b/icons/mob/inhands/misc/sheets_righthand.dmi differ diff --git a/icons/mob/inhands/misc/tiles_lefthand.dmi b/icons/mob/inhands/misc/tiles_lefthand.dmi index 2202f77928b..54d2ad82fdd 100644 Binary files a/icons/mob/inhands/misc/tiles_lefthand.dmi and b/icons/mob/inhands/misc/tiles_lefthand.dmi differ diff --git a/icons/mob/inhands/misc/tiles_righthand.dmi b/icons/mob/inhands/misc/tiles_righthand.dmi index a075ae65e98..7aec49bf3ed 100644 Binary files a/icons/mob/inhands/misc/tiles_righthand.dmi and b/icons/mob/inhands/misc/tiles_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi index 02ee2ea0bf0..2b41f9db172 100644 Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi index 3532b44ad75..5f4fd82ddb8 100644 Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/polearms_lefthand.dmi b/icons/mob/inhands/weapons/polearms_lefthand.dmi index dfb27f8d1c8..9eb1ebe4613 100644 Binary files a/icons/mob/inhands/weapons/polearms_lefthand.dmi and b/icons/mob/inhands/weapons/polearms_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/polearms_righthand.dmi b/icons/mob/inhands/weapons/polearms_righthand.dmi index af529977adb..b563ade888b 100644 Binary files a/icons/mob/inhands/weapons/polearms_righthand.dmi and b/icons/mob/inhands/weapons/polearms_righthand.dmi differ diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi index b02e46c9ff6..98e975e09b5 100644 Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ diff --git a/icons/obj/guns/ballistic.dmi b/icons/obj/guns/ballistic.dmi index b79f9da0656..7c76fce70d4 100644 Binary files a/icons/obj/guns/ballistic.dmi and b/icons/obj/guns/ballistic.dmi differ diff --git a/icons/obj/hydroponics/equipment.dmi b/icons/obj/hydroponics/equipment.dmi index c23d13972eb..fa9755543a5 100644 Binary files a/icons/obj/hydroponics/equipment.dmi and b/icons/obj/hydroponics/equipment.dmi differ diff --git a/icons/obj/hydroponics/growing.dmi b/icons/obj/hydroponics/growing.dmi index fcee1c05928..e1eddacf6c1 100644 Binary files a/icons/obj/hydroponics/growing.dmi and b/icons/obj/hydroponics/growing.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index ce3da2f4b90..46c109ebfcc 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ diff --git a/icons/obj/sofa.dmi b/icons/obj/sofa.dmi index 683c37f6222..9578156867f 100644 Binary files a/icons/obj/sofa.dmi and b/icons/obj/sofa.dmi differ diff --git a/icons/obj/stack_objects.dmi b/icons/obj/stack_objects.dmi index cf699f52c1e..94f3c22054f 100644 Binary files a/icons/obj/stack_objects.dmi and b/icons/obj/stack_objects.dmi differ diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi index 65d6ac311d1..bc3a2f1ba4c 100644 Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi index 4119d0a38e7..990395e8f35 100644 Binary files a/icons/obj/syringe.dmi and b/icons/obj/syringe.dmi differ diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index 7ef0da347a7..5a395b738fe 100644 Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ diff --git a/icons/turf/floors/bamboo_mat.dmi b/icons/turf/floors/bamboo_mat.dmi new file mode 100644 index 00000000000..ec4bcf1c0de Binary files /dev/null and b/icons/turf/floors/bamboo_mat.dmi differ diff --git a/icons/turf/walls/bamboo_wall.dmi b/icons/turf/walls/bamboo_wall.dmi new file mode 100644 index 00000000000..4eafc79ad48 Binary files /dev/null and b/icons/turf/walls/bamboo_wall.dmi differ