Merge pull request #7783 from R3dtail/new_carpet

Added a new carpet
This commit is contained in:
nik707
2018-12-02 21:52:03 -06:00
committed by GitHub
5 changed files with 15 additions and 0 deletions
@@ -111,6 +111,14 @@
/obj/item/stack/tile/carpet/black/fifty
amount = 50
/obj/item/stack/tile/carpet/red
name = "red carpet"
icon_state = "tile-carpet-red"
turf_type = /turf/open/floor/carpet/red
/obj/item/stack/tile/carpet/red/fifty
amount = 50
/obj/item/stack/tile/fakespace
name = "astral carpet"
singular_name = "astral carpet"
@@ -182,6 +182,11 @@
floor_tile = /obj/item/stack/tile/carpet/black
canSmoothWith = list(/turf/open/floor/carpet/black)
/turf/open/floor/carpet/red
icon = 'icons/turf/floors/carpet_red.dmi'
floor_tile = /obj/item/stack/tile/carpet/red
icon_state ="tile-carpet-red"
canSmoothWith = list(/turf/open/floor/carpet/red)
/turf/open/floor/carpet/narsie_act(force, ignore_mobs, probability = 20)
. = (prob(probability) || force)
+2
View File
@@ -1448,6 +1448,8 @@
cost = 1000
contains = list(/obj/item/stack/tile/carpet/fifty,
/obj/item/stack/tile/carpet/fifty,
/obj/item/stack/tile/carpet/red/fifty,
/obj/item/stack/tile/carpet/red/fifty,
/obj/item/stack/tile/carpet/black/fifty,
/obj/item/stack/tile/carpet/black/fifty)
crate_name = "premium carpet crate"