From 6606c683d38cf633e319e4e0d5b06939e9b6c6fc Mon Sep 17 00:00:00 2001 From: Razgriz Date: Sat, 3 Jul 2021 14:00:25 -0700 Subject: [PATCH] powder that makes you say please add chomp comments --- .../mining/ore_redemption_machine/equipment_vendor.dm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm index fd9f0625e8..b136a83e2a 100644 --- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm @@ -51,13 +51,8 @@ EQUIPMENT("Jump Boots", /obj/item/clothing/shoes/bhop, 2500), EQUIPMENT("Mini-Translocator", /obj/item/device/perfect_tele/one_beacon, 1200), EQUIPMENT("Survival Equipment - Insulated Poncho", /obj/random/thermalponcho, 750), -<<<<<<< HEAD - EQUIPMENT("Large Mining Satchel", /obj/item/weapon/storage/bag/ore/large, 1000), //CHOMPstation addition -||||||| parent of 1d2eddce4b... Merge pull request #10791 from VOREStation/Arokha/orehold - -======= + EQUIPMENT("Large Mining Satchel", /obj/item/weapon/storage/bag/ore/large, 1000), //CHOMP Add //CHOMPstation addition EQUIPMENT("Mining Satchel of Holding", /obj/item/weapon/storage/bag/ore/holding, 1500), ->>>>>>> 1d2eddce4b... Merge pull request #10791 from VOREStation/Arokha/orehold ) prize_list["Consumables"] = list( EQUIPMENT("1 Marker Beacon", /obj/item/stack/marker_beacon, 1),