cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Port Eris mining satchel sprites, satchel of holding

Browse Source
This commit is contained in:
Chompstation Bot
2021-07-03 20:17:02 +00:00
parent 654ef75433
commit 42cbf0e1e5
4 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mining/ore_redemption_machine/equipment_vendor.dm
View File

@@ -51,7 +51,13 @@
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("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),