diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 860d26968e1..df0ac9636d1 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -34,6 +34,7 @@ /obj/item/toy/owl = 2, /obj/item/toy/griffin = 2, /obj/item/weapon/coin/antagtoken = 2, + /obj/item/stack/tile/fakespace = 2, ) /obj/machinery/computer/arcade/New() diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 27424a95a17..f87ad1e44d0 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -13,6 +13,12 @@ name = "broken tile" singular_name = "broken tile" desc = "A broken tile. This should not exist." + w_class = 3.0 + force = 1.0 + throwforce = 1.0 + throw_speed = 3 + throw_range = 7 + max_amount = 60 var/turf_type = null var/mineralType = null @@ -74,12 +80,6 @@ singular_name = "grass floor tile" desc = "A patch of grass like they often use on golf courses." icon_state = "tile_grass" - w_class = 3.0 - force = 1.0 - throwforce = 1.0 - throw_speed = 3 - throw_range = 7 - max_amount = 60 origin_tech = "biotech=1" turf_type = /turf/simulated/floor/grass burn_state = 0 //Burnable @@ -92,12 +92,6 @@ singular_name = "wood floor tile" desc = "an easy to fit wood floor tile." icon_state = "tile-wood" - w_class = 3.0 - force = 1.0 - throwforce = 1.0 - throw_speed = 3 - throw_range = 7 - max_amount = 60 origin_tech = "biotech=1" turf_type = /turf/simulated/floor/wood burn_state = 0 //Burnable @@ -110,15 +104,19 @@ singular_name = "carpet" desc = "A piece of carpet. It is the same size as a floor tile." icon_state = "tile-carpet" - w_class = 3.0 - force = 1.0 - throwforce = 1.0 - throw_speed = 3 - throw_range = 7 - max_amount = 60 turf_type = /turf/simulated/floor/carpet burn_state = 0 //Burnable + +/obj/item/stack/tile/fakespace + name = "astral carpet" + singular_name = "astral carpet" + desc = "A piece of carpet with a convincing star pattern." + icon_state = "tile_space" + amount = 30 + turf_type = /turf/simulated/floor/fakespace + burn_state = 0 //Burnable + /* * High-traction */ @@ -127,11 +125,5 @@ singular_name = "high-traction floor tile" desc = "A high-traction floor tile. It feels rubbery in your hand." icon_state = "tile_noslip" - w_class = 3.0 - force = 1.0 - throwforce = 1.0 - throw_speed = 3 - throw_range = 7 - max_amount = 60 turf_type = /turf/simulated/floor/noslip origin_tech = "material=3" \ No newline at end of file diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index 887ec3112fe..3e3a1f61358 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -73,4 +73,16 @@ /turf/simulated/floor/carpet/burn_tile() burnt = 1 - update_icon() \ No newline at end of file + update_icon() + + + +/turf/simulated/floor/fakespace + icon = 'icons/turf/space.dmi' + icon_state = "0" + floor_tile = /obj/item/stack/tile/fakespace + broken_states = list("damaged") + +/turf/simulated/floor/fakespace/New() + ..() + icon_state = "[rand(0,25)]" \ No newline at end of file diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index f05c3b70f5f..79e9c0ef2ad 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/turf/space.dmi b/icons/turf/space.dmi index 2bd62851550..d32279e7041 100644 Binary files a/icons/turf/space.dmi and b/icons/turf/space.dmi differ