cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 09:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Phoron Bore adjustment from Staff Meeting.

Browse Source
This commit is contained in:
Mechoid
2023-02-20 03:50:11 -08:00
parent 14a10960b7
commit 9aa0e10bc2
3 changed files with 7 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

@@ -39,13 +39,13 @@
new /datum/data/mining_equipment("Industrial Hardsuit - Maneuvering Jets", /obj/item/rig_module/maneuvering_jets, 1250), new /datum/data/mining_equipment("Industrial Hardsuit - Maneuvering Jets", /obj/item/rig_module/maneuvering_jets, 1250),
new /datum/data/mining_equipment("Hardsuit - Intelligence Storage", /obj/item/rig_module/ai_container, 2500), new /datum/data/mining_equipment("Hardsuit - Intelligence Storage", /obj/item/rig_module/ai_container, 2500),
new /datum/data/mining_equipment("Hardsuit - Smoke Bomb Deployer", /obj/item/rig_module/grenade_launcher/smoke, 2000), new /datum/data/mining_equipment("Hardsuit - Smoke Bomb Deployer", /obj/item/rig_module/grenade_launcher/smoke, 2000),
new /datum/data/mining_equipment("Industrial Equipment - Phoron Bore", /obj/item/gun/magnetic/matfed/phoronbore/loaded, 3000), new /datum/data/mining_equipment("Industrial Equipment - Phoron Bore", /obj/item/gun/magnetic/matfed/phoronbore/loaded, 5000),
new /datum/data/mining_equipment("Industrial Equipment - Sheet-Snatcher",/obj/item/storage/bag/sheetsnatcher, 500), new /datum/data/mining_equipment("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 500), new /datum/data/mining_equipment("Industrial Equipment - Sheet-Snatcher",/obj/item/storage/bag/sheetsnatcher, 500), new /datum/data/mining_equipment("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 500),
new /datum/data/mining_equipment("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 1000), new /datum/data/mining_equipment("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 1000),
new /datum/data/mining_equipment("Fine Excavation Kit - Chisels",/obj/item/storage/excavation, 500), new /datum/data/mining_equipment("Fine Excavation Kit - Chisels",/obj/item/storage/excavation, 500),
new /datum/data/mining_equipment("Fine Excavation Kit - Measuring Tape",/obj/item/measuring_tape, 125), new /datum/data/mining_equipment("Fine Excavation Kit - Measuring Tape",/obj/item/measuring_tape, 125),
new /datum/data/mining_equipment("Fine Excavation Kit - Hand Pick",/obj/item/pickaxe/hand, 375), new /datum/data/mining_equipment("Fine Excavation Kit - Hand Pick",/obj/item/pickaxe/hand, 375),
new /datum/data/mining_equipment("Explosive Excavation Kit - Plastic Charge",/obj/item/plastique/seismic, 1500), new /datum/data/mining_equipment("Explosive Excavation Kit - Plastic Charge",/obj/item/plastique/seismic, 2500),
new /datum/data/mining_equipment("Injector (L) - Glucose",/obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose, 500), new /datum/data/mining_equipment("Injector (L) - Glucose",/obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose, 500),
new /datum/data/mining_equipment("Injector (L) - Panacea",/obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity, 500), new /datum/data/mining_equipment("Injector (L) - Panacea",/obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity, 500),
new /datum/data/mining_equipment("Injector (L) - Trauma",/obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute, 500), new /datum/data/mining_equipment("Injector (L) - Trauma",/obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute, 500),

4
code/modules/projectiles/guns/magnetic/bore.dm
View File

@@ -82,7 +82,7 @@
return "<span class='notice'>It has [mat_storage] out of [max_mat_storage] units of [ammo_material] loaded.</span>" return "<span class='notice'>It has [mat_storage] out of [max_mat_storage] units of [ammo_material] loaded.</span>"
else else
return "<span class='warning'>It\'s out of [ammo_material]!</span>" return "<span class='warning'>It\'s out of [ammo_material]!</span>"
/obj/item/gun/magnetic/matfed/attackby(var/obj/item/thing, var/mob/user) /obj/item/gun/magnetic/matfed/attackby(var/obj/item/thing, var/mob/user)
if(removable_components) if(removable_components)
@@ -94,6 +94,7 @@
user.visible_message("<span class='notice'>\The [user] levers \the [manipulator] from \the [src].</span>") user.visible_message("<span class='notice'>\The [user] levers \the [manipulator] from \the [src].</span>")
playsound(src, thing.usesound, 50, 1) playsound(src, thing.usesound, 50, 1)
mat_cost = initial(mat_cost) mat_cost = initial(mat_cost)
power_cost = initial(power_cost)
manipulator = null manipulator = null
update_icon() update_icon()
update_rating_mod() update_rating_mod()
@@ -107,6 +108,7 @@
user.drop_from_inventory(manipulator, src) user.drop_from_inventory(manipulator, src)
playsound(src, 'sound/machines/click.ogg', 10,1) playsound(src, 'sound/machines/click.ogg', 10,1)
mat_cost = initial(mat_cost) / (2*manipulator.rating) mat_cost = initial(mat_cost) / (2*manipulator.rating)
power_cost = initial(power_cost) + 50 * manipulator.get_rating()
user.visible_message("<span class='notice'>\The [user] slots \the [manipulator] into \the [src].</span>") user.visible_message("<span class='notice'>\The [user] slots \the [manipulator] into \the [src].</span>")
update_icon() update_icon()
update_rating_mod() update_rating_mod()

3
code/modules/projectiles/projectile/magnetic.dm
View File

@@ -164,7 +164,8 @@
/obj/item/projectile/bullet/magnetic/bore /obj/item/projectile/bullet/magnetic/bore
name = "phorogenic blast" name = "phorogenic blast"
icon_state = "purpleemitter" icon_state = "purpleemitter"
damage = 20 damage = 15
damage_type = SEARING
incendiary = 1 incendiary = 1
armor_penetration = 20 armor_penetration = 20
penetrating = 0 penetrating = 0