diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 7a33134afd..91ffae9cb1 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -211,6 +211,12 @@ turf_type = /turf/open/floor/carpet/black tableVariant = /obj/structure/table/wood/fancy/black +/obj/item/stack/tile/carpet/arcade + name = "arcade carpet" + icon_state = "tile-carpet-arcade" + turf_type = /turf/open/floor + tableVariant = null + /obj/item/stack/tile/carpet/blackred name = "red carpet" icon_state = "tile-carpet-blackred" @@ -297,6 +303,15 @@ /obj/item/stack/tile/carpet/black/fifty amount = 50 +/obj/item/stack/tile/carpet/arcade/ten + amount = 10 + +/obj/item/stack/tile/carpet/arcade/twenty + amount = 20 + +/obj/item/stack/tile/carpet/arcade/fifty + amount = 50 + /obj/item/stack/tile/carpet/blackred/ten amount = 10 diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 877d236e84..ddec9750d9 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -46,7 +46,7 @@ "basalt0","basalt1","basalt2","basalt3","basalt4", "basalt5","basalt6","basalt7","basalt8","basalt9","basalt10","basalt11","basalt12", "oldburning","light-on-r","light-on-y","light-on-g","light-on-b", "wood", "carpetsymbol", "carpetstar", - "carpetcorner", "carpetside", "carpet", "ironsand1", "ironsand2", "ironsand3", "ironsand4", "ironsand5", + "carpetcorner", "carpetside", "carpet", "arcade", "ironsand1", "ironsand2", "ironsand3", "ironsand4", "ironsand5", "ironsand6", "ironsand7", "ironsand8", "ironsand9", "ironsand10", "ironsand11", "ironsand12", "ironsand13", "ironsand14", "ironsand15", "snow", "snow0", "snow1", "snow2", "snow3", "snow4", "snow5", "snow6", "snow7", "snow8", "snow9", "snow10", "snow11", "snow12", "snow-ice", "snow_dug", diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index eae45bfd76..3cf6cc7511 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -273,6 +273,13 @@ smooth = SMOOTH_MORE canSmoothWith = list(/turf/open/floor/carpet/black, /turf/open/floor/carpet/blackred, /turf/open/floor/carpet/monochrome) +/turf/open/floor/carpet/arcade + icon = 'icons/turf/floors.dmi' + icon_state = "arcade" + floor_tile = /obj/item/stack/tile/carpet/arcade + smooth = SMOOTH_FALSE + canSmoothWith = list() + /turf/open/floor/carpet/blackred icon = 'icons/turf/floors/carpet_blackred.dmi' floor_tile = /obj/item/stack/tile/carpet/blackred diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index 394b86bb81..9c15e75cd6 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -351,6 +351,10 @@ name = "Black Carpet Single-Pack" contains = list(/obj/item/stack/tile/carpet/black/fifty) +/datum/supply_pack/misc/carpet/arcade + name = "Arcade Carpet Single-Pack" + contains = list(/obj/item/stack/tile/carpet/arcade/fifty) + /datum/supply_pack/misc/carpet/premium name = "Monochrome Carpet Single-Pack" desc = "Exotic carpets for all your decorating needs. This 30 units stack of extra soft carpet will tie any room together." diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 0d3e9a4139..0021a49e51 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1978,6 +1978,11 @@ color = "#363636" carpet_type = /turf/open/floor/carpet/black +/datum/reagent/carpet/arcade + name = "Liquid Arcade Carpet" + color = "#b51d05" + carpet_type = /turf/open/floor/carpet/arcade + /datum/reagent/carpet/blackred name = "Liquid Red Black Carpet" color = "#342125" diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index 92861a94ed..0ab8a69aa0 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -757,6 +757,12 @@ results = list(/datum/reagent/carpet/black = 2) required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/carbon = 1) +/datum/chemical_reaction/carpet/arcade + name = "liquid arcade carpet" + id = /datum/reagent/carpet/arcade + results = list(/datum/reagent/carpet/arcade = 2) + required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/consumable/pwr_game = 1) + /datum/chemical_reaction/carpet/blackred name = "liquid red black carpet" id = /datum/reagent/carpet/blackred diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index 5f0fbb4104..088b6c2c7b 100644 Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 65fba49309..19d4dca13d 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ