cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 20:11:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into map-development

Browse Source
This commit is contained in:
Lohikar
2017-03-21 18:28:39 -05:00
parent a2fbcaa18b 27d328f6fb
commit a13f3d9f7d
312 changed files with 5822 additions and 3118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/drilling/drill.dm
+4
View File
@@ -55,6 +55,10 @@
RefreshParts()
/obj/machinery/mining/drill/Destroy()
QDEL_NULL(spark_system)
return ..()
/obj/machinery/mining/drill/process()
if(need_player_check)
code/modules/mining/mine_turfs.dm
+9 -6
View File
@@ -33,11 +33,9 @@
has_resources = 1
/turf/simulated/mineral/New()
spawn(0)
MineralSpread()
spawn(2)
updateMineralOverlays(1)
/turf/simulated/mineral/initialize()
MineralSpread()
updateMineralOverlays(TRUE)
/turf/simulated/mineral/proc/updateMineralOverlays(var/update_neighbors)
var/list/step_overlays = list("s" = NORTH, "n" = SOUTH, "w" = EAST, "e" = WEST)
@@ -47,7 +45,9 @@
var/turf/simulated/floor/asteroid/T = turf_to_check
T.updateMineralOverlays()
else if(istype(turf_to_check,/turf/space) || istype(turf_to_check,/turf/simulated/floor))
turf_to_check.overlays += image('icons/turf/walls.dmi', "rock_side", dir = turn(step_overlays[direction], 180))
var/image/overlay = image('icons/turf/walls.dmi', "rock_side", dir = turn(step_overlays[direction], 180))
overlay.plane = 0
turf_to_check.overlays += overlay
/turf/simulated/mineral/ex_act(severity)
switch(severity)
@@ -437,6 +437,9 @@
if(prob(20))
overlay_detail = rand(0,9)
/turf/simulated/floor/asteroid/initialize()
updateMineralOverlays(1)
/turf/simulated/floor/asteroid/ex_act(severity)
switch(severity)
if(3.0)