From e58053d211cbf0fdbff67c3a8874215ebea2f043 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Sun, 13 Feb 2022 01:17:59 -0700 Subject: [PATCH] powder that makes you say yes --- .../client/preference_setup/loadout/loadout_utility_vr.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm index 7ee718bf25..7a43fbba5b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -69,18 +69,14 @@ display_name = "contractor identification card" path = /obj/item/weapon/card/id/event/polymorphic/altcard cost = 1 -<<<<<<< HEAD -======= /datum/gear/utility/bs_bracelet display_name = "bluespace bracelet" path = /obj/item/clothing/gloves/bluespace cost = 5 - /datum/gear/utility/satchel_strapless display_name = "satchel strapless" path = /obj/item/weapon/storage/backpack/satchel/strapless slot = slot_back cost = 1 ->>>>>>> 4083e13dd27... Merge pull request #12191 from TheDavestDave/strapless