From 6c5160ee5cd96bee4f3c7e3b05c2a23b2739c1c4 Mon Sep 17 00:00:00 2001
From: ZeroMan <cookiesvvww@gmail.com>
Date: Sat, 21 Mar 2020 02:18:44 -0400
Subject: [PATCH] i hurt myself today

---
 code/modules/uplink/uplink_items/uplink_badass.dm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/code/modules/uplink/uplink_items/uplink_badass.dm b/code/modules/uplink/uplink_items/uplink_badass.dm
index dceb614593..681efea5b3 100644
--- a/code/modules/uplink/uplink_items/uplink_badass.dm
+++ b/code/modules/uplink/uplink_items/uplink_badass.dm
@@ -76,7 +76,6 @@
 	cost = 2
 	illegal_tech = FALSE
 
-<<<<<<< HEAD
 /datum/uplink_item/badass/tactical_naptime
 	name = "Sleepy Time Pajama Bundle"
 	desc = "Even soldiers need to get a good nights rest. Comes with some cozy as heck sleeping wear, a blankie to keep yourself warm in deep space, a hot mug of cocoa for you and your fuzzy friend."
@@ -84,8 +83,8 @@
 	cost = 4
 	limited_stock = 1
 	cant_discount = TRUE
-	include_modes = list(/datum/game_mode/nuclear)
-=======
+	include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
 /datum/uplink_item/badass/shades
 	name = "Big Sunglasses"
 	desc = "Prevents flashes and looks badbass with some Smokes."
@@ -93,4 +92,3 @@
 	cost = 1
 	surplus = 5
 	illegal_tech = FALSE
->>>>>>> 9c40389e4f970e47f7fdcf5962be0a661b7932f0