cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 16:48:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Manual MIRROR] Release Bugfixes and changes (MERGE BEFORE RELEASE)

Browse Source 
Unfucks https://github.com/CHOMPStation2/CHOMPStation2/pull/5019 due to yet another github merge conflict with a god damn .dmi file. Missing map files, but that's ok because that's for virgo specific maps.
This commit is contained in:
Razgriz
2022-09-23 00:14:16 -07:00
parent 680e388fe2
commit cf301c6346
8 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/materials/stone.dm
+9 -1
View File
@@ -39,7 +39,7 @@
icon_colour = "#9e9c99"
weight = 20
hardness = 30
integrity = 100
integrity = 100
stack_type = /obj/item/stack/material/flint
supply_conversion_value = 2
sheet_singular_name = "piece"
@@ -63,6 +63,14 @@
/datum/material/stone/concrete/generate_recipes()
..()
recipes += list(
new /datum/stack_recipe_list("Concrete Pathing",list(
new /datum/stack_recipe("Concrete Flooring", /obj/item/stack/tile/floor/concrete, 1, 4, 20, recycle_material = "[name]"),
new /datum/stack_recipe("Concrete Sidewalk", /obj/item/stack/tile/floor/sidewalk, 1, 4, 20, recycle_material = "[name]"),
new /datum/stack_recipe("Concrete Sidewalk (Side)", /obj/item/stack/tile/floor/sidewalk/side, 1, 4, 20, recycle_material = "[name]"),
new /datum/stack_recipe("Concrete Sidewalk (Slab)", /obj/item/stack/tile/floor/sidewalk/slab, 1, 4, 20, recycle_material = "[name]")
)),
)
/datum/material/stone/concrete/New()
. = ..()