This commit is contained in:
KorPhaeron
2016-03-10 22:41:27 -06:00
parent 0d0df8b1e1
commit 05c3b2d07b
20 changed files with 1760 additions and 1574 deletions
+1
View File
@@ -285,6 +285,7 @@
new /datum/data/mining_equipment("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 300),
new /datum/data/mining_equipment("Advanced Scanner", /obj/item/device/t_scanner/adv_mining_scanner, 400),
new /datum/data/mining_equipment("Hivelord Stabilizer", /obj/item/weapon/hivelordstabilizer , 400),
new /datum/data/mining_equipment("Shelter Capsule", /obj/item/weapon/survivalcapsule , 400),
new /datum/data/mining_equipment("Mining Drone", /mob/living/simple_animal/hostile/mining_drone, 500),
new /datum/data/mining_equipment("GAR mesons", /obj/item/clothing/glasses/meson/gar, 500),
new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/weapon/storage/firstaid/brute, 600),
@@ -64,8 +64,8 @@
name = "ash storm"
start_up_time = 300 //30 seconds
start_up_message = "The wind begins to pick up. Seek shelter."
duration_lower = 90 //1.5 minutes
duration_upper = 360 //3 minutes
duration_lower = 60 //1.5 minutes
duration_upper = 180 //3 minutes
duration_message = "An ash storm has started! Get inside!"
wind_down = 300 // 30 seconds
wind_down_message = "The storm begins to fade. Should be safe to go outside again."
@@ -85,6 +85,8 @@
wind_down_message = "The ash fall starts to trail off."
/datum/weather/ash_storm/storm_act(mob/living/L)
if("mining" in L.faction)
return
if(ishuman(L))
var/mob/living/carbon/human/H = L
var/thermal_protection = H.get_thermal_protection()
+1
View File
@@ -42,6 +42,7 @@
new /obj/item/weapon/shovel(src)
new /obj/item/weapon/pickaxe(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/weapon/survivalcapsule(src)
/**********************Shuttle Computer**************************/
+22 -4
View File
@@ -18,8 +18,8 @@ var/global/list/rockTurfEdgeCache
blocks_air = 1
layer = TURF_LAYER + 0.05
temperature = TCMB
var/environment_type = "asteroid"
var/turf/simulated/floor/plating/asteroid/turf_type = /turf/simulated/floor/plating/asteroid //For basalt vs normal asteroid
var/environment_type = "basalt"
var/turf/simulated/floor/plating/asteroid/turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface //For basalt vs normal asteroid
var/mineralType = null
var/mineralAmt = 3
var/spread = 0 //will the seam spread?
@@ -126,6 +126,8 @@ var/global/list/rockTurfEdgeCache
M = new/turf/simulated/mineral/plasma(src)
if("Cave")
new/turf/simulated/floor/plating/asteroid/airless/cave(src)
if("Cave2")
new/turf/simulated/floor/plating/asteroid/airless/cave/volcanic(src)
if("Gibtonite")
M = new/turf/simulated/mineral/gibtonite(src)
if("Bananium")
@@ -331,8 +333,13 @@ var/global/list/rockTurfEdgeCache
var/sanity = 1
turf_type = /turf/simulated/floor/plating/asteroid/airless
/turf/simulated/floor/plating/asteroid/airless/cave/New(loc, var/length, var/go_backwards = 1, var/exclude_dir = -1)
/turf/simulated/floor/plating/asteroid/airless/cave/volcanic
turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface
oxygen = 14
nitrogen = 23
temperature = 300
/turf/simulated/floor/plating/asteroid/airless/cave/New(loc, length, go_backwards = 1, exclude_dir = -1)
// If length (arg2) isn't defined, get a random length; otherwise assign our length to the length arg.
if(!length)
src.length = rand(25, 50)
@@ -712,7 +719,7 @@ var/global/list/rockTurfEdgeCache
oxygen = 14
nitrogen = 23
temperature = 300
baseturf = /turf/simulated/chasm/straight_down/lava_land_surface
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface
/turf/simulated/chasm/straight_down/lava_land_surface
oxygen = 14
@@ -725,6 +732,17 @@ var/global/list/rockTurfEdgeCache
turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface
baseturf = /turf/simulated/chasm/straight_down/lava_land_surface
/turf/simulated/mineral/random/volcanic
environment_type = "basalt"
turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface
mineralChance = 4
mineralSpawnChanceList = list(
"Uranium" = 5, "Diamond" = 1, "Gold" = 10,
"Silver" = 12, "Plasma" = 20, "Iron" = 40,
"Gibtonite" = 4, "Cave2" = 1, "BScrystal" = 1,
/*, "Adamantine" =5*/)
/turf/simulated/floor/plating/lava/smooth/lava_land_surface
oxygen = 14
nitrogen = 23