Adds marble floor tiles and crafting recipe (#7264)

* Adds marble floor tiles and crafting recipe

* swaps screwdriver removal for crowbar

* changelog fix
i'm a silly goose and forgot to edit out the screwdriver bit

code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm

@@ -50,4 +50,12 @@
 
 /obj/fiftyspawner/linoleum
 	name = "stack of linoleum tiles"
-	type_to_spawn = /obj/item/stack/tile/linoleum
+	type_to_spawn = /obj/item/stack/tile/linoleum
+
+/obj/fiftyspawner/wmarble
+	name = "stack of light marble tiles"
+	type_to_spawn = /obj/item/stack/tile/wmarble
+
+/obj/fiftyspawner/bmarble
+	name = "stack of dark marble tiles"
+	type_to_spawn = /obj/item/stack/tile/bmarble

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -202,6 +202,30 @@
 	flags = 0
 	no_variants = FALSE
 
+/obj/item/stack/tile/wmarble
+	name = "light marble tile"
+	singular_name = "light marble tile"
+	desc = "Some white marble tiles used for flooring."
+	icon_state = "tile-wmarble"
+	force = 6.0
+	throwforce = 15.0
+	throw_speed = 5
+	throw_range = 20
+	flags = 0
+	no_variants = FALSE
+
+/obj/item/stack/tile/bmarble
+	name = "dark marble tile"
+	singular_name = "dark marble tile"
+	desc = "Some black marble tiles used for flooring."
+	icon_state = "tile-bmarble"
+	force = 6.0
+	throwforce = 15.0
+	throw_speed = 5
+	throw_range = 20
+	flags = 0
+	no_variants = FALSE
+
 /obj/item/stack/tile/roofing
 	name = "roofing"
 	singular_name = "roofing"

code/game/turfs/flooring/flooring.dm

@@ -28,7 +28,7 @@ var/list/flooring_types
 	var/icon
 	var/icon_base // initial base icon_state without edges or corners.
 
-	var/has_base_range // This will pick between a range of 0 - x. Number icon_states accordingly. 
+	var/has_base_range // This will pick between a range of 0 - x. Number icon_states accordingly.
 					   // Note that this will append a 0 - x number automatically to icon_base, but NOT the dmi. Do icon_base = "grass", but name grass0 inside the dmi. etc etc.
 	var/has_damage_range
 	var/has_burn_range
@@ -43,7 +43,7 @@ var/list/flooring_types
 	var/descriptor = "tiles"
 	var/flags
 	var/can_paint
-	var/list/footstep_sounds = list() // key=species name, value = list of sounds, 
+	var/list/footstep_sounds = list() // key=species name, value = list of sounds,
 									  // For instance, footstep_sounds = list("key" = list(sound.ogg))
 	var/is_plating = FALSE
 	var/list/flooring_cache = list() // Cached overlays for our edges and corners and junk
@@ -428,6 +428,22 @@ var/list/flooring_types
 	icon_base = "freezer"
 	build_type = /obj/item/stack/tile/floor/freezer
 
+/decl/flooring/wmarble
+	name = "marble floor"
+	desc = "Very regal white marble flooring."
+	icon = 'icons/turf/flooring/misc.dmi'
+	icon_base = "lightmarble"
+	build_type = /obj/item/stack/tile/wmarble
+	flags = TURF_REMOVE_CROWBAR
+
+/decl/flooring/bmarble
+	name = "marble floor"
+	desc = "Very regal black marble flooring."
+	icon = 'icons/turf/flooring/misc.dmi'
+	icon_base = "darkmarble"
+	build_type = /obj/item/stack/tile/bmarble
+	flags = TURF_REMOVE_CROWBAR
+
 /decl/flooring/wood
 	name = "wooden floor"
 	desc = "Polished redwood planks."

code/game/turfs/flooring/flooring_premade.dm

@@ -324,6 +324,18 @@
 	icon_state = "lino"
 	initial_flooring = /decl/flooring/linoleum
 
+/turf/simulated/floor/wmarble
+	name = "marble"
+	icon = 'icons/turf/flooring/misc.dmi'
+	icon_state = "lightmarble"
+	initial_flooring = /decl/flooring/wmarble
+
+/turf/simulated/floor/bmarble
+	name = "marble"
+	icon = 'icons/turf/flooring/misc.dmi'
+	icon_state = "darkmarble"
+	initial_flooring = /decl/flooring/bmarble
+
 //ATMOS PREMADES
 /turf/simulated/floor/reinforced/airless
 	name = "vacuum floor"

code/modules/materials/material_recipes.dm

@@ -118,6 +118,11 @@
 	..()
 	recipes += new/datum/stack_recipe("planting bed", /obj/machinery/portable_atmospherics/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1)
 
+/material/stone/marble/generate_recipes()
+	..()
+	recipes += new/datum/stack_recipe("light marble floor tile", /obj/item/stack/tile/wmarble, 1, 4, 20)
+	recipes += new/datum/stack_recipe("dark marble floor tile", /obj/item/stack/tile/bmarble, 1, 4, 20)
+
 /material/plastic/generate_recipes()
 	..()
 	recipes += new/datum/stack_recipe("plastic crate", /obj/structure/closet/crate/plastic, 10, one_per_turf = 1, on_floor = 1, pass_stack_color = TRUE)

html/changelogs/billybangles-marbletile.yml

@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Billy Bangles
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Light and dark marble floor tiles can now be crafted with marble sheets."