cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 16:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finalisation PR for map-dev, prepares new map for merging. (#2144)

Browse Source 
* Commited

* The FINAL commit (probably not, tho)
This commit is contained in:
LordFowl
2017-04-30 15:04:54 -04:00
committed by GitHub
parent 5288898c78
commit c03666340a
24 changed files with 1281 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/machine_rigpress.dm
+3
View File
@@ -49,6 +49,9 @@
if(istype(W, /obj/item/weapon/gun/energy/vaurca/thermaldrill))
outcome_path = /obj/item/rig_module/mounted/thermalldrill
if(!outcome_path)
return
user << "<span class='notice'>You start feeding [W] into \the [src]</span>"
if(do_after(user,30))
src.visible_message("<span class='notice'>\The [src] begins to print out a modsuit.</span>")
code/modules/mining/machine_vending.dm
+6 -6
View File
@@ -15,7 +15,7 @@ var/global/list/minevendor_list = list( //keep in order of price
new /datum/data/mining_equipment("Meat Pizza", /obj/item/pizzabox/meat, 50),
new /datum/data/mining_equipment("Lantern", /obj/item/device/flashlight/lantern, 75),
new /datum/data/mining_equipment("Shovel", /obj/item/weapon/shovel, 100),
new /datum/data/mining_equipment("Stimpack", /obj/item/weapon/reagent_containers/hypospray/autoinjector/stimpack, 100),
//new /datum/data/mining_equipment("Stimpack", /obj/item/weapon/reagent_containers/hypospray/autoinjector/stimpack, 100),
new /datum/data/mining_equipment("Pickaxe", /obj/item/weapon/pickaxe, 100),
new /datum/data/mining_equipment("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 100),
new /datum/data/mining_equipment("Compressed rail cartridge", /obj/item/weapon/rrf_ammo, 100),
@@ -28,7 +28,7 @@ var/global/list/minevendor_list = list( //keep in order of price
new /datum/data/mining_equipment("Mining Drill", /obj/item/weapon/pickaxe/drill, 200),
new /datum/data/mining_equipment("Deep Ore Scanner", /obj/item/weapon/mining_scanner, 250),
new /datum/data/mining_equipment("Magboots", /obj/item/clothing/shoes/magboots, 300),
new /datum/data/mining_equipment("Stimpack Bundle", /obj/item/weapon/storage/box/stims, 300),
//new /datum/data/mining_equipment("Stimpack Bundle", /obj/item/weapon/storage/box/stims, 300),
new /datum/data/mining_equipment("Autochisel", /obj/item/weapon/autochisel, 400),
new /datum/data/mining_equipment("Jetpack", /obj/item/weapon/tank/jetpack, 400),
new /datum/data/mining_equipment("Drone Drill Upgrade", /obj/item/device/mine_bot_ugprade, 400),
@@ -40,7 +40,7 @@ var/global/list/minevendor_list = list( //keep in order of price
new /datum/data/mining_equipment("Item-Warp Pack", /obj/item/weapon/extraction_pack, 600),
new /datum/data/mining_equipment("Drone Health Upgrade", /obj/item/device/mine_bot_ugprade/health, 600),
new /datum/data/mining_equipment("Rapid-Railway-Fabricator", /obj/item/weapon/rrf, 600),
new /datum/data/mining_equipment("Survival Autoinjector", /obj/item/weapon/reagent_containers/hypospray/autoinjector/survival, 600),
//new /datum/data/mining_equipment("Survival Autoinjector", /obj/item/weapon/reagent_containers/hypospray/autoinjector/survival, 600),
new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/weapon/storage/firstaid/brute, 600),
new /datum/data/mining_equipment("Ore Magnet", /obj/item/weapon/oremagnet, 600),
new /datum/data/mining_equipment("Minecart", /obj/vehicle/train/cargo/trolley/mining, 600, 1),
@@ -51,12 +51,12 @@ var/global/list/minevendor_list = list( //keep in order of price
new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator, 750),
new /datum/data/mining_equipment("1000 credits", /obj/item/weapon/spacecash/c1000, 800),
new /datum/data/mining_equipment("Mass Driver", /obj/item/weapon/mass_driver_diy, 800),
new /datum/data/mining_equipment("Drone Plasma Cutter Upgrade", /obj/item/device/mine_bot_ugprade/plasma, 800),
//new /datum/data/mining_equipment("Drone Plasma Cutter Upgrade", /obj/item/device/mine_bot_ugprade/plasma, 800),
new /datum/data/mining_equipment("Mining Drone", /mob/living/silicon/robot/drone/mining, 800),
new /datum/data/mining_equipment("Minecart Engine", /obj/vehicle/train/cargo/engine/mining, 800, 1),
new /datum/data/mining_equipment("Ore Summoner", /obj/item/weapon/oreportal, 800),
new /datum/data/mining_equipment("Plasma Cutter", /obj/item/weapon/gun/energy/plasmacutter, 900),
new /datum/data/mining_equipment("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000),
//new /datum/data/mining_equipment("Plasma Cutter", /obj/item/weapon/gun/energy/plasmacutter, 900),
//new /datum/data/mining_equipment("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000),
new /datum/data/mining_equipment("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000),
new /datum/data/mining_equipment("Lazarus Injector", /obj/item/weapon/lazarus_injector, 1000),
new /datum/data/mining_equipment("Industrial Drill Head", /obj/machinery/mining/drill, 1000, 1),
code/modules/mining/mine_turfs.dm
+2 -16
View File
@@ -438,20 +438,6 @@
. = ..()
/turf/simulated/mineral/random/low_chance
name = "Mineral deposit"
mineralSpawnChanceList = list(
ORE_URANIUM = 0,
ORE_PLATINUM = 0,
ORE_IRON = 2,
ORE_COAL = 3,
ORE_DIAMOND = 0,
ORE_GOLD = 0,
ORE_SILVER = 0,
ORE_PHORON = 1
)
mineralChance = 5
/turf/simulated/mineral/random/high_chance
mineralSpawnChanceList = list(
ORE_URANIUM = 2,
@@ -463,7 +449,7 @@
ORE_SILVER = 2,
ORE_PHORON = 3
)
mineralChance = 50
mineralChance = 45
/turf/simulated/mineral/random/higher_chance
mineralSpawnChanceList = list(
@@ -476,7 +462,7 @@
ORE_SILVER = 3,
ORE_PHORON = 2
)
mineralChance = 45
mineralChance = 75
code/modules/mining/minebot.dm
+1
View File
@@ -9,6 +9,7 @@
req_access = list(access_mining, access_robotics)
idcard_type = /obj/item/weapon/card/id/synthetic/minedrone
speed = -1
range_limit = 0
var/health_upgrade
var/ranged_upgrade
var/melee_upgrade