From 1b91ab24ce5bfe7a0c1936542ef2c2cdd8a1b0c4 Mon Sep 17 00:00:00 2001 From: paprka Date: Tue, 28 Oct 2014 15:42:55 -0700 Subject: [PATCH] Improves mining equipment locker and rewards system, and buffs kinetic accelerator --- code/game/objects/items/weapons/storage/boxes.dm | 13 +++++++++++++ code/modules/mining/equipment_locker.dm | 9 +++++---- code/modules/projectiles/projectile/special.dm | 2 +- .../reagents/reagent_containers/hypospray.dm | 15 ++++++++------- 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index f47d382fe15..9b630b102ea 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -134,6 +134,19 @@ new /obj/item/weapon/reagent_containers/hypospray/medipen( src ) new /obj/item/weapon/reagent_containers/hypospray/medipen( src ) +/obj/item/weapon/storage/box/medipens/utility + name = "medipens kit" + desc = "A box with several utility medipens for the economical miner." + icon_state = "syringe" + +/obj/item/weapon/storage/box/syringes/New() + ..() + new /obj/item/weapon/reagent_containers/hypospray/medipen/leporazine( src ) + new /obj/item/weapon/reagent_containers/hypospray/medipen/leporazine( src ) + new /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack( src ) + new /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack( src ) + new /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack( src ) + /obj/item/weapon/storage/box/beakers name = "box of beakers" icon_state = "beaker" diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index fbc21838808..9ee25e2f3db 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -232,17 +232,18 @@ var/list/prize_list = list( new /datum/data/mining_equipment("Stimpack MediPen", /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack, 50), new /datum/data/mining_equipment("Leporazine MediPen", /obj/item/weapon/reagent_containers/hypospray/medipen/leporazine, 50), + new /datum/data/mining_equipment("MediPen Bundle", /obj/item/weapon/storage/box/medipens/utility, 200), new /datum/data/mining_equipment("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 100), new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150), new /datum/data/mining_equipment("Soap", /obj/item/weapon/soap/nanotrasen, 200), new /datum/data/mining_equipment("Jaunter", /obj/item/device/wormhole_jaunter, 250), - new /datum/data/mining_equipment("Advanced Scanner", /obj/item/device/t_scanner/adv_mining_scanner, 400), + new /datum/data/mining_equipment("Advanced Scanner", /obj/item/device/t_scanner/adv_mining_scanner, 300), new /datum/data/mining_equipment("Laser Pointer", /obj/item/device/laser_pointer, 400), new /datum/data/mining_equipment("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 450), new /datum/data/mining_equipment("Mining Drone", /mob/living/simple_animal/hostile/mining_drone/, 500), + new /datum/data/mining_equipment("Resonator", /obj/item/weapon/resonator, 650), + new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator, 650), new /datum/data/mining_equipment("Sonic Jackhammer", /obj/item/weapon/pickaxe/jackhammer, 800), - new /datum/data/mining_equipment("Resonator", /obj/item/weapon/resonator, 1000), - new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator, 1000), new /datum/data/mining_equipment("Lazarus Injector", /obj/item/weapon/lazarus_injector, 1000), new /datum/data/mining_equipment("Jetpack", /obj/item/weapon/tank/jetpack/carbondioxide/mining, 2000), new /datum/data/mining_equipment("Space Cash", /obj/item/weapon/spacecash/c1000, 5000), @@ -470,7 +471,7 @@ icon = 'icons/obj/items.dmi' icon_state = "resonator" item_state = "resonator" - desc = "A handheld device that creates small fields of energy that resonate until they detonate, crushing rock. It can also be activated without a target to create a field at the user's location, to act as a delayed time trap. It's more effective in a vaccuum." + desc = "A handheld device that creates small fields of energy that resonate until they detonate, crushing rock. It can also be activated without a target to create a field at the user's location, to act as a delayed time trap. It's more effective in a vacuum." w_class = 3 force = 10 throwforce = 10 diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 516700e63ce..224ed9334c4 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -113,7 +113,7 @@ damage = 15 damage_type = BRUTE flag = "bomb" - var/range = 2 + var/range = 3 obj/item/projectile/kinetic/New() var/turf/proj_turf = get_turf(src) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 60fb6d1f946..96b69d1c9ff 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -96,27 +96,28 @@ usr << "It is spent." -/obj/item/weapon/reagent_containers/hypospray/medipen/leporazine +/obj/item/weapon/reagent_containers/hypospray/medipen/leporazine //basilisks name = "leporazine medipen" - desc = "A rapid and safe way to regulate your body's temperature." + desc = "A rapid way to regulate your body's temperature in the event of a hardsuit malfunction at the cost of some shortness of breath." icon_state = "lepopen" /obj/item/weapon/reagent_containers/hypospray/medipen/leporazine/New() ..() reagents.remove_reagent("inaprovaline", 10) - reagents.add_reagent("leporazine", 10) + reagents.add_reagent("leporazine", 9) + reagents.add_reagent("lexorin", 1) update_icon() return -/obj/item/weapon/reagent_containers/hypospray/medipen/stimpack +/obj/item/weapon/reagent_containers/hypospray/medipen/stimpack //goliath kiting name = "stimpack medipen" - desc = "A rapid way to stimulate your body's adrenaline, allowing for freer movement in bulky clothing at the cost of some muscle tissue tearing." + desc = "A rapid way to stimulate your body's adrenaline, allowing for freer movement in restrictive armor at the cost of some shortness of breath." icon_state = "stimpen" /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack/New() ..() reagents.remove_reagent("inaprovaline", 10) - reagents.add_reagent("hyperzine", 8) - reagents.add_reagent("lexorin", 2) + reagents.add_reagent("hyperzine", 9) + reagents.add_reagent("lexorin", 1) update_icon() return \ No newline at end of file