diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 79df492a9e4..fa6513635d4 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1353,6 +1353,15 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee contains = list(/obj/item/stack/tile/carpet) amount = 50 +/datum/supply_packs/linoleum + name = "Linoleum" + containertype = /obj/structure/closet + containername = "Linoleum crate" + cost = 15 + group = "Miscellaneous" + contains = list(/obj/item/stack/tile/linoleum) + amount = 50 + /datum/supply_packs/hydrotray name = "Empty hydroponics tray" cost = 30 diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 4f4b53c7c0a..96a6656795c 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -4,6 +4,7 @@ * Grass * Wood * Carpet + * Linoleum */ /obj/item/stack/tile @@ -126,3 +127,14 @@ charge_costs = list(250) stacktype = /obj/item/stack/tile/floor build_type = /obj/item/stack/tile/floor + +/obj/item/stack/tile/linoleum + name = "linoleum" + singular_name = "linoleum" + desc = "A piece of linoleum. It is the same size as a normal floor tile!" + icon_state = "tile-linoleum" + force = 1.0 + throwforce = 1.0 + throw_speed = 5 + throw_range = 20 + flags = 0 \ No newline at end of file diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index 12f8fa81d73..bd95b7f594d 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -88,6 +88,8 @@ var/list/flooring_types icon = 'icons/turf/flooring/linoleum.dmi' icon_base = "lino" can_paint = 1 + build_type = /obj/item/stack/tile/linoleum + flags = TURF_REMOVE_SCREWDRIVER /decl/flooring/tiling/red name = "floor" diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 47195936477..d8bcc7d184b 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ