From 69883123d9133e9c804d6c513e13e9d19a91b47f Mon Sep 17 00:00:00 2001 From: Razgriz Date: Thu, 22 Sep 2022 21:03:08 -0700 Subject: [PATCH] powder that makes you say yes --- code/modules/materials/materials/stone.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/materials/materials/stone.dm b/code/modules/materials/materials/stone.dm index 6bbfb12e4c..811e2e2ed9 100644 --- a/code/modules/materials/materials/stone.dm +++ b/code/modules/materials/materials/stone.dm @@ -47,9 +47,6 @@ /datum/material/stone/flint/generate_recipes() return -<<<<<<< HEAD -//VOREStation Addition End -======= //VOREStation Addition End /datum/material/stone/concrete @@ -74,4 +71,3 @@ /datum/material/stone/concrete/get_wall_texture() return texture ->>>>>>> 1a8f1760fa... [MIRROR] conk rete (ABLE TO BE MERGED) (#13467)