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

powder that makes you say yes

Browse Source
This commit is contained in:
Razgriz
2021-12-10 00:59:15 -07:00
committed by GitHub
parent 175bc573fe
commit f26f2f1880
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,12 +78,8 @@
EQUIPMENT("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000),
EQUIPMENT("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1200),
EQUIPMENT("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000),
<<<<<<< HEAD
EQUIPMENT("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000),
=======
EQUIPMENT("KA Temperature Modulator", /obj/item/borg/upgrade/modkit/heater, 1000),
EQUIPMENT("KA Off-Station Modulator", /obj/item/borg/upgrade/modkit/indoors/offsite, 1500),
>>>>>>> 39c4edb9cb... Merge pull request #11808 from Hatterhat/a-miner-upgrade
EQUIPMENT("KA Holster", /obj/item/clothing/accessory/holster/waist/kinetic_accelerator, 350),
EQUIPMENT("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 250),
EQUIPMENT("KA Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 300),