From b3ee0e766f7292be076be486090900653a6fed62 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 27 Mar 2019 14:24:57 -0400 Subject: [PATCH] Why is this even a conflict. --- code/modules/client/preference_setup/loadout/loadout_eyes.dm | 4 ---- code/modules/clothing/glasses/glasses.dm | 3 --- 2 files changed, 7 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index 601df0115f0..8dcb6a61e2f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -124,9 +124,6 @@ /datum/gear/eyes/circuitry display_name = "goggles, circuitry (empty)" -<<<<<<< HEAD - path = /obj/item/clothing/glasses/circuitry -======= path = /obj/item/clothing/glasses/circuitry /datum/gear/eyes/glasses/rimless @@ -144,4 +141,3 @@ /datum/gear/eyes/glasses/prescriptionthin display_name = "Glasses, prescription thin frame" path = /obj/item/clothing/glasses/regular/thin ->>>>>>> e0d442b... Merge pull request #5838 from Cerebulon/glassesfix diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index aa57ae4f729..2230e146032 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -232,8 +232,6 @@ BLIND // can't see anything item_state_slots = list(slot_r_hand_str = "glasses", slot_l_hand_str = "glasses") body_parts_covered = 0 -<<<<<<< HEAD -======= /obj/item/clothing/glasses/regular/rimless name = "prescription rimless glasses" desc = "Sleek modern glasses with a single sculpted lens." @@ -258,7 +256,6 @@ BLIND // can't see anything prescription = 0 ->>>>>>> e0d442b... Merge pull request #5838 from Cerebulon/glassesfix /obj/item/clothing/glasses/sunglasses name = "sunglasses" desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes."