Update nuclear.dm

2018-05-02 10:33:50 -04:00
parent e966c95de6
commit c7ea689679
1 changed files with 0 additions and 5 deletions
@@ -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)