From 983fb72a3f8e323cedd2933f40fd5f343426b158 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Thu, 22 Sep 2022 21:03:29 -0700 Subject: [PATCH] powder that makes you say yes --- code/modules/materials/sheets/stone.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/materials/sheets/stone.dm b/code/modules/materials/sheets/stone.dm index 4da4093cc8..c30766cda4 100644 --- a/code/modules/materials/sheets/stone.dm +++ b/code/modules/materials/sheets/stone.dm @@ -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)