cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Razgriz
2022-09-22 21:03:08 -07:00
committed by GitHub
parent a7bec1ce06
commit 69883123d9
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/materials/materials/stone.dm
View File

@@ -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)