Skip to content

Commit

Permalink
Merge pull request DaedalusDock#201 from pariahstation/upstream-merge…
Browse files Browse the repository at this point in the history
…-65697

[MIRROR] Lowers the Kheiral Cuff price to be more reasonable with their changed function
  • Loading branch information
OctusGit authored Apr 1, 2022
2 parents 6ad622f + e42e5d6 commit ef8429e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions code/modules/mining/equipment/kheiral_cuffs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
throw_range = 5
attack_verb_continuous = list("connects")
attack_verb_simple = list("connect")
resistance_flags = FIRE_PROOF
/// If we're in the glove slot
var/on_wrist = FALSE
/// If the GPS is already on
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mining/machine_vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining_conscript, 1500),
new /datum/data/mining_equipment("Space Cash", /obj/item/stack/spacecash/c1000, 2000),
new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/pickaxe/diamond, 2000),
new /datum/data/mining_equipment("Kheiral Cuffs", /obj/item/kheiral_cuffs, 2000),
new /datum/data/mining_equipment("Super Resonator", /obj/item/resonator/upgraded, 2500),
new /datum/data/mining_equipment("Jump Boots", /obj/item/clothing/shoes/bhop, 2500),
new /datum/data/mining_equipment("Ice Hiking Boots", /obj/item/clothing/shoes/winterboots/ice_boots, 2500),
new /datum/data/mining_equipment("Mining MODsuit", /obj/item/mod/control/pre_equipped/mining, 2500),
new /datum/data/mining_equipment("Kheiral Cuffs", /obj/item/kheiral_cuffs, 2750),
new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000),
new /datum/data/mining_equipment("Luxury Bar Capsule", /obj/item/survivalcapsule/luxuryelite, 10000),
new /datum/data/mining_equipment("Nanotrasen Minebot", /mob/living/simple_animal/hostile/mining_drone, 800),
Expand Down

0 comments on commit ef8429e

Please sign in to comment.