diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 896ecf90dca..51a244be613 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -100,6 +100,17 @@ resistance_flags = FLAMMABLE merge_type = /obj/item/stack/tile/grass +//Hay +/obj/item/stack/tile/hay + name = "hay tile" + singular_name = "hay floor tile" + desc = "Man, I'm so hungry I could eat a-" + icon_state = "tile_hay" + inhand_icon_state = "tile-hay" + turf_type = /turf/open/floor/hay + resistance_flags = FLAMMABLE + merge_type = /obj/item/stack/tile/hay + //Fairygrass /obj/item/stack/tile/fairygrass name = "fairygrass tile" diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm index 3c0add8b183..74de1945e5c 100644 --- a/code/game/turfs/open/floor/fancy_floor.dm +++ b/code/game/turfs/open/floor/fancy_floor.dm @@ -189,6 +189,22 @@ /turf/open/floor/grass/fairy/spawniconchange() icon_state = "fairygrass[rand(0,3)]" +/turf/open/floor/hay + name = "hay" + desc = "HOW hungry?" + icon = 'icons/turf/floors.dmi' + icon_state = "hay" + base_icon_state = "hay" + floor_tile = /obj/item/stack/tile/hay + flags_1 = NONE + bullet_bounce_sound = null + footstep = FOOTSTEP_GRASS + barefootstep = FOOTSTEP_GRASS + clawfootstep = FOOTSTEP_GRASS + heavyfootstep = FOOTSTEP_GENERIC_HEAVY + tiled_dirt = FALSE + rust_resistance = RUST_RESISTANCE_ORGANIC + /turf/open/floor/fake_snow gender = PLURAL name = "snow" diff --git a/code/modules/hydroponics/grown/grass_carpet.dm b/code/modules/hydroponics/grown/grass_carpet.dm index 8177dafa13f..dc1f11a85b5 100644 --- a/code/modules/hydroponics/grown/grass_carpet.dm +++ b/code/modules/hydroponics/grown/grass_carpet.dm @@ -40,6 +40,9 @@ new stacktype(user.drop_location(), grassAmt) qdel(src) +/obj/item/food/grown/grass/make_dryable() + AddElement(/datum/element/dryable, /obj/item/stack/tile/hay) + //Fairygrass /obj/item/seeds/grass/fairy name = "fairygrass seed pack" diff --git a/icons/mob/inhands/items/tiles_lefthand.dmi b/icons/mob/inhands/items/tiles_lefthand.dmi index 6bbe621db82..8bf2417299d 100644 Binary files a/icons/mob/inhands/items/tiles_lefthand.dmi and b/icons/mob/inhands/items/tiles_lefthand.dmi differ diff --git a/icons/mob/inhands/items/tiles_righthand.dmi b/icons/mob/inhands/items/tiles_righthand.dmi index 4d1d5073c98..b4376dee0ab 100644 Binary files a/icons/mob/inhands/items/tiles_righthand.dmi and b/icons/mob/inhands/items/tiles_righthand.dmi differ diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index 6d197abc8b4..908f2ddc16f 100644 Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ