cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 23:29:10 +01: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:29 -07:00
committed by GitHub
parent 69883123d9
commit 983fb72a3f
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/sheets/stone.dm
-4
View File
@@ -22,9 +22,6 @@
drop_sound = 'sound/items/drop/boots.ogg'
pickup_sound = 'sound/items/pickup/boots.ogg'
pass_color = TRUE
<<<<<<< HEAD
apply_colour = TRUE
=======
apply_colour = TRUE
/obj/item/stack/material/concrete
@@ -33,4 +30,3 @@
default_type = "concrete"
no_variants = FALSE
apply_colour = 1
>>>>>>> 1a8f1760fa... [MIRROR] conk rete (ABLE TO BE MERGED) (#13467)