From e69a597fb2cc4721475275b049d4286465e5a83c Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 11 Feb 2018 18:31:57 -0500 Subject: [PATCH] Update lavaland_ruin_code.dm --- code/modules/ruins/lavaland_ruin_code.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index de7dd1d8ee..3230115eea 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -137,9 +137,6 @@ r_hand = /obj/item/melee/transforming/energy/sword/saber mask = /obj/item/clothing/mask/chameleon suit = /obj/item/clothing/suit/armor/vest -<<<<<<< HEAD - l_pocket = /obj/item/card/id/syndicate/anyone -======= /obj/item/clothing/mask/chameleon/gps/Initialize() . = ..() @@ -147,4 +144,3 @@ /obj/item/device/gps/internal/lavaland_syndicate_base gpstag = "Encrypted Signal" ->>>>>>> 47ed29c... Merge pull request #35514 from ShizCalev/ghost-role-syndi-access