From c7ea6896793fad9e01b81556efd49ece4b1ed6f2 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 2 May 2018 10:33:50 -0400 Subject: [PATCH] Update nuclear.dm --- code/game/gamemodes/nuclear/nuclear.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 68c9fd2b01..d3cb396fbb 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -154,13 +154,8 @@ R.command = TRUE if(tc) -<<<<<<< HEAD - var/obj/item/device/radio/uplink/U = new uplink_type(H, H.key, tc) - H.equip_to_slot_or_del(U, slot_in_backpack) -======= var/obj/item/radio/uplink/U = new uplink_type(H, H.key, tc) H.equip_to_slot_or_del(U, SLOT_IN_BACKPACK) ->>>>>>> ecd0d8b... Merge pull request #37476 from AnturK/thisalwaysbuggedme var/obj/item/implant/weapons_auth/W = new/obj/item/implant/weapons_auth(H) W.implant(H)