Merge pull request #1020 from Yoshax/floorfix

Fixes #890
This commit is contained in:
Neerti
2016-02-20 01:57:55 -05:00
4 changed files with 23 additions and 0 deletions
+9
View File
@@ -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
@@ -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
+2
View File
@@ -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"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 68 KiB