cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-10 14:45:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12579 from GhostActual/tg-port-5

Browse Source 
The Grand /TG Port - Part 5
This commit is contained in:
Casey
2022-04-02 23:30:27 -04:00
committed by GitHub
parent 73589bb510 801533a69f
commit 5d9f0462c1
20 changed files with 162 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/economy/vending_machines_vr.dm
+2
View File
@@ -2151,7 +2151,9 @@
/obj/item/weapon/storage/belt/utility/chief/full = 5,
/obj/item/weapon/storage/belt/utility/alien/full = 5,
/obj/item/weapon/storage/bible = 5,
/obj/item/weapon/pickaxe = 5,
/obj/item/weapon/pickaxe/drill = 5,
/obj/item/weapon/pickaxe/advdrill = 5,
/obj/item/weapon/pickaxe/diamonddrill = 5,
/obj/item/weapon/pickaxe/gold = 5,
/obj/item/weapon/pickaxe/diamond = 5,
code/modules/mining/abandonedcrates.dm
+1 -1
View File
@@ -27,7 +27,7 @@
new/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus(src)
new/obj/item/weapon/flame/lighter/zippo(src)
if(6 to 10)
new/obj/item/weapon/pickaxe/drill(src)
new/obj/item/weapon/pickaxe/advdrill(src)
new/obj/item/device/taperecorder(src)
new/obj/item/clothing/suit/space(src)
new/obj/item/clothing/head/helmet/space(src)
code/modules/mining/mine_items.dm
+66 -46
View File
@@ -10,22 +10,22 @@
/*****************************Pickaxe********************************/
/obj/item/weapon/pickaxe
name = "mining drill"
desc = "The most basic of mining drills, for short excavations and small mineral extractions."
name = "pickaxe"
desc = "A miner's best friend."
icon = 'icons/obj/items.dmi'
slot_flags = SLOT_BELT
force = 15.0
throwforce = 4.0
icon_state = "pickaxe"
item_state = "jackhammer"
item_state = "pickaxe"
w_class = ITEMSIZE_LARGE
matter = list(MAT_STEEL = 3750)
matter = list(MAT_STEEL = 2500)
var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
var/sand_dig = FALSE // does this thing dig sand?
origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
origin_tech = list(TECH_MATERIAL = 1)
attack_verb = list("hit", "pierced", "sliced", "attacked")
var/drill_sound = "pickaxe"
var/drill_verb = "drilling"
var/drill_verb = "picking"
sharp = TRUE
var/excavation_amount = 200
@@ -39,16 +39,59 @@
origin_tech = list(TECH_MATERIAL = 3)
desc = "This makes no metallurgic sense."
/obj/item/weapon/pickaxe/gold
name = "golden pickaxe"
icon_state = "gpickaxe"
item_state = "gpickaxe"
digspeed = 20
origin_tech = list(TECH_MATERIAL = 4)
desc = "This makes no metallurgic sense."
drill_verb = "picking"
/obj/item/weapon/pickaxe/diamond
name = "diamond pickaxe"
icon_state = "dpickaxe"
item_state = "dpickaxe"
digspeed = 10
origin_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 4)
desc = "A pickaxe with a diamond pick head."
drill_verb = "picking"
/*****************************Drill********************************/
/obj/item/weapon/pickaxe/drill
name = "mining drill" // Can dig sand as well!
icon_state = "drill"
item_state = "jackhammer"
digspeed = 35 //Only slighty better than a pickaxe
sand_dig = TRUE
origin_tech = list(TECH_MATERIAL = 1, TECH_POWER = 2, TECH_ENGINEERING = 1)
matter = list(MAT_STEEL = 3750)
desc = "The most basic of mining drills, for short excavations and small mineral extractions."
drill_verb = "drilling"
/obj/item/weapon/pickaxe/advdrill
name = "advanced mining drill" // Can dig sand as well!
icon_state = "handdrill"
icon_state = "advdrill"
item_state = "jackhammer"
digspeed = 30
sand_dig = TRUE
origin_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_ENGINEERING = 2)
matter = list(MAT_STEEL = 4000, MAT_PLASTEEL = 2500)
desc = "Yours is the drill that will pierce through the rock walls."
drill_verb = "drilling"
/obj/item/weapon/pickaxe/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME!
name = "diamond mining drill"
icon_state = "diamonddrill"
item_state = "jackhammer"
digspeed = 5 //Digs through walls, girders, and can dig up sand
sand_dig = TRUE
origin_tech = list(TECH_MATERIAL = 6, TECH_POWER = 4, TECH_ENGINEERING = 5)
matter = list(MAT_STEEL = 4500, MAT_PLASTEEL = 3000, MAT_DIAMONDS = 1000)
desc = "Yours is the drill that will pierce the heavens!"
drill_verb = "drilling"
/obj/item/weapon/pickaxe/jackhammer
name = "sonic jackhammer"
icon_state = "jackhammer"
@@ -58,56 +101,33 @@
desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
drill_verb = "hammering"
/obj/item/weapon/pickaxe/gold
name = "golden pickaxe"
icon_state = "gpickaxe"
item_state = "gpickaxe"
digspeed = 20
origin_tech = list(TECH_MATERIAL = 4)
desc = "This makes no metallurgic sense."
drill_verb = "picking"
/obj/item/weapon/pickaxe/borgdrill
name = "jackhammer"
icon_state = "borg_pick"
item_state = "jackhammer"
digspeed = 15
sand_dig = TRUE
desc = "Cracks rocks with a hardened pneumatic bit."
drill_verb = "hammering"
/obj/item/weapon/pickaxe/plasmacutter
name = "plasma cutter"
desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff."
icon_state = "plasmacutter"
item_state = "gun"
item_state = "plasmacutter"
w_class = ITEMSIZE_NORMAL //it is smaller than the pickaxe
damtype = "fire"
digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/ light thermite on fire
digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/light thermite on fire
origin_tech = list(TECH_MATERIAL = 4, TECH_PHORON = 3, TECH_ENGINEERING = 3)
desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff."
matter = list(MAT_STEEL = 3000, MAT_PLASTEEL = 1500, MAT_DIAMONDS = 500, MAT_PHORON = 500)
drill_verb = "cutting"
drill_sound = 'sound/items/Welder.ogg'
sharp = TRUE
edge = TRUE
/obj/item/weapon/pickaxe/diamond
name = "diamond pickaxe"
icon_state = "dpickaxe"
item_state = "dpickaxe"
digspeed = 10
origin_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 4)
desc = "A pickaxe with a diamond pick head."
drill_verb = "picking"
/obj/item/weapon/pickaxe/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME!
name = "diamond mining drill"
icon_state = "diamonddrill"
item_state = "jackhammer"
digspeed = 5 //Digs through walls, girders, and can dig up sand
sand_dig = TRUE
origin_tech = list(TECH_MATERIAL = 6, TECH_POWER = 4, TECH_ENGINEERING = 5)
desc = "Yours is the drill that will pierce the heavens!"
drill_verb = "drilling"
/obj/item/weapon/pickaxe/borgdrill
name = "enhanced sonic jackhammer"
icon_state = "jackhammer"
item_state = "jackhammer"
digspeed = 15
sand_dig = TRUE
desc = "Cracks rocks with sonic blasts. This one seems like an improved design."
drill_verb = "hammering"
/obj/item/weapon/pickaxe/plasmacutter/borg
name = "mounted plasma cutter"
icon_state = "pcutter_borg"
/*****************************Shovel********************************/
@@ -116,10 +136,10 @@
desc = "A large tool for digging and moving dirt."
icon = 'icons/obj/items.dmi'
icon_state = "shovel"
item_state = "shovel"
slot_flags = SLOT_BELT
force = 8.0
throwforce = 4.0
item_state = "shovel"
w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
matter = list(MAT_STEEL = 50)
code/modules/mining/mine_items_vr.dm
+14 -9
View File
@@ -1,30 +1,35 @@
//upgrades the speed of all drills and pickaxes.
//Pickaxes
/obj/item/weapon/pickaxe
digspeed = 36
/obj/item/weapon/pickaxe/silver
digspeed = 27
/obj/item/weapon/pickaxe/diamond
digspeed = 9
/obj/item/weapon/pickaxe/gold
digspeed = 18
//Drills
/obj/item/weapon/pickaxe/drill
digspeed = 30
/obj/item/weapon/pickaxe/advdrill
digspeed = 27
/obj/item/weapon/pickaxe/jackhammer
digspeed = 18
destroy_artefacts = TRUE
/obj/item/weapon/pickaxe/gold
digspeed = 18
/obj/item/weapon/pickaxe/plasmacutter
digspeed = 18
/obj/item/weapon/pickaxe/diamond
digspeed = 9
/obj/item/weapon/pickaxe/diamonddrill
digspeed = 4
/obj/item/weapon/pickaxe/borgdrill
digspeed = 13
destroy_artefacts = TRUE
/obj/item/weapon/pickaxe/plasmacutter
digspeed = 18
code/modules/mob/living/silicon/robot/robot_modules/station.dm
+4 -4
View File
@@ -422,7 +422,7 @@ var/global/list/robot_modules = list(
src.emag = new /obj/item/weapon/melee/baton/robot/arm(src)
src.modules += new /obj/item/device/geiger(src)
src.modules += new /obj/item/weapon/rcd/electric/mounted/borg(src)
src.modules += new /obj/item/weapon/pickaxe/plasmacutter(src)
src.modules += new /obj/item/weapon/pickaxe/plasmacutter/borg(src)
src.modules += new /obj/item/weapon/gripper/no_use/loader(src)
var/datum/matter_synth/metal = new /datum/matter_synth/metal(40000)
@@ -745,7 +745,7 @@ var/global/list/robot_modules = list(
src.emag = new /obj/item/weapon/kinetic_crusher/machete/dagger(src)
// No reason for these, upgrade modules replace them.
//src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src)
//src.emag = new /obj/item/weapon/pickaxe/plasmacutter/borg(src)
//src.emag = new /obj/item/weapon/pickaxe/diamonddrill(src)
/obj/item/weapon/robot_module/robot/research
@@ -840,7 +840,7 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/device/flash(src)
//src.modules += new /obj/item/borg/sight/thermal(src) // VOREStation Edit
src.modules += new /obj/item/weapon/gun/energy/laser/mounted(src)
src.modules += new /obj/item/weapon/pickaxe/plasmacutter(src)
src.modules += new /obj/item/weapon/pickaxe/plasmacutter/borg(src)
src.modules += new /obj/item/borg/combat/shield(src)
src.modules += new /obj/item/borg/combat/mobility(src)
src.emag = new /obj/item/weapon/gun/energy/lasercannon/mounted(src)
@@ -875,7 +875,7 @@ var/global/list/robot_modules = list(
robot.internals = new/obj/item/weapon/tank/jetpack/carbondioxide(src)
src.modules += robot.internals
src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src)
src.emag = new /obj/item/weapon/pickaxe/plasmacutter/borg(src)
src.emag.name = "Plasma Cutter"
var/datum/matter_synth/metal = new /datum/matter_synth/metal(25000)
code/modules/research/designs/mining_toys.dm
+13 -6
View File
@@ -6,38 +6,45 @@
/datum/design/item/weapon/mining/drill
id = "drill"
req_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_ENGINEERING = 2)
materials = list(MAT_STEEL = 6000, MAT_GLASS = 1000) //expensive, but no need for miners.
req_tech = list(TECH_MATERIAL = 1, TECH_POWER = 2, TECH_ENGINEERING = 1)
materials = list(MAT_STEEL = 4000, MAT_GLASS = 500) //expensive, but no need for miners.
build_path = /obj/item/weapon/pickaxe/drill
sort_string = "FAAAA"
/datum/design/item/weapon/mining/advdrill
id = "advanced_drill"
req_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_ENGINEERING = 2)
materials = list(MAT_STEEL = 6000, MAT_GLASS = 1000) //expensive, but no need for miners.
build_path = /obj/item/weapon/pickaxe/advdrill
sort_string = "FAAAB"
/datum/design/item/weapon/mining/jackhammer
id = "jackhammer"
req_tech = list(TECH_MATERIAL = 3, TECH_POWER = 2, TECH_ENGINEERING = 2)
materials = list(MAT_STEEL = 2000, MAT_GLASS = 500, MAT_SILVER = 500)
build_path = /obj/item/weapon/pickaxe/jackhammer
sort_string = "FAAAB"
sort_string = "FAAAC"
/datum/design/item/weapon/mining/plasmacutter
id = "plasmacutter"
req_tech = list(TECH_MATERIAL = 4, TECH_PHORON = 3, TECH_ENGINEERING = 3)
materials = list(MAT_STEEL = 1500, MAT_GLASS = 500, MAT_GOLD = 500, MAT_PHORON = 500)
build_path = /obj/item/weapon/pickaxe/plasmacutter
sort_string = "FAAAC"
sort_string = "FAAAD"
/datum/design/item/weapon/mining/pick_diamond
id = "pick_diamond"
req_tech = list(TECH_MATERIAL = 6)
materials = list(MAT_DIAMOND = 3000)
build_path = /obj/item/weapon/pickaxe/diamond
sort_string = "FAAAD"
sort_string = "FAAAE"
/datum/design/item/weapon/mining/drill_diamond
id = "drill_diamond"
req_tech = list(TECH_MATERIAL = 6, TECH_POWER = 4, TECH_ENGINEERING = 4)
materials = list(MAT_STEEL = 3000, MAT_GLASS = 1000, MAT_DIAMOND = 2000)
build_path = /obj/item/weapon/pickaxe/diamonddrill
sort_string = "FAAAE"
sort_string = "FAAAF"
// Mining other equipment