security pet bed

fucking merge conflicts make me want to detonate

code/game/objects/structures/beds_chairs/bed.dm

@@ -196,6 +196,13 @@
 	name = "[M]'s bed"
 	desc = "[M]'s bed! Looks comfy."
 
+/obj/structure/bed/dogbed/sec
+	name = "security bed"
+	desc = "A comfy-looking pet bed, now in the classic security colors."
+
+/obj/structure/bed/dogbed/proc/update_owner()
+	return
+
 /obj/structure/bed/dogbed/buckle_mob(mob/living/M, force, check_loc)
 	. = ..()
 	update_owner(M)

code/modules/vending/security.dm

@@ -23,10 +23,8 @@
 					  /obj/item/electropack/shockcollar/security = 5,
 					  /obj/item/storage/belt/slut = 5,
 					  /obj/item/clothing/mask/gas/sechailer/slut = 5,
-<<<<<<< HEAD
 					  /obj/item/bdsm_whip/ridingcrop = 3,
-=======
->>>>>>> slaveImplant
+					  /obj/structure/bed/dogbed/sec = 3,
 					  /obj/item/dildo/flared/gigantic = 1)
 	premium = list(/obj/item/coin/antagtoken = 1,
 					/obj/item/clothing/head/helmet/blueshirt = 1,