cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 00:35:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/release'

Browse Source
This commit is contained in:
Hawk_v3
2019-05-04 21:03:48 +01:00
parent d4d45c172e 16337d532d
commit 27e73883fc
491 changed files with 60588 additions and 353777 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/mine_turfs.dm
+1 -1
View File
@@ -614,7 +614,7 @@ var/list/mining_overlay_cache = list()
new /obj/item/stack/material/uranium(src, rand(5,25))
/turf/simulated/mineral/proc/make_ore(var/rare_ore)
if(mineral || ignore_mapgen) //VOREStation Edit - Makes sense, doesn't it?
if(mineral || ignore_mapgen || ignore_oregen) //VOREStation Edit - Makes sense, doesn't it?
return
var/mineral_name
code/modules/mining/mine_turfs_vr.dm
+15
View File
@@ -0,0 +1,15 @@
/turf/simulated/mineral
var/ignore_oregen = FALSE
var/ignore_cavegen = FALSE
/turf/simulated/mineral/ignore_oregen
ignore_oregen = TRUE
/turf/simulated/mineral/floor/ignore_oregen
ignore_oregen = TRUE
/turf/simulated/mineral/ignore_cavegen
ignore_cavegen = TRUE
/turf/simulated/mineral/floor/ignore_cavegen
ignore_cavegen = TRUE
code/modules/mining/ore_redemption_machine/equipment_vendor.dm
+2 -1
View File
@@ -52,7 +52,8 @@
new /datum/data/mining_equipment("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000),
new /datum/data/mining_equipment("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000),
new /datum/data/mining_equipment("KA Efficiency Increase", /obj/item/borg/upgrade/modkit/efficiency, 1200),
new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000)
new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000),
new /datum/data/mining_equipment("KA Holster", /obj/item/clothing/accessory/holster/waist/kinetic_accelerator, 350)
)
//VOREStation Edit End