From bb88a04785b26146b53a559eab5a044692f044a5 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Sun, 3 Jul 2022 17:21:24 -0700 Subject: [PATCH] powder that makes you say yes --- code/modules/power/lighting_vr.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/power/lighting_vr.dm b/code/modules/power/lighting_vr.dm index 89eb2c97b9..827fe11148 100644 --- a/code/modules/power/lighting_vr.dm +++ b/code/modules/power/lighting_vr.dm @@ -130,8 +130,6 @@ icon_state = "big_flamp-construct-stage2" if(3) icon_state = "big_flamp-empty" -<<<<<<< HEAD -======= // Fairy lights @@ -211,4 +209,3 @@ if(3) icon_state = "big_flamp-empty" */ ->>>>>>> 048fa34e2a... Merge pull request #13267 from Very-Soft/thatniceglow