cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate

Browse Source
This commit is contained in:
izac112
2020-05-11 18:20:43 +02:00
parent 133a5f61d1 478c792de9
commit 2b3fc9a740
295 changed files with 6398 additions and 3317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/mining/drilling/drill.dm
View File

@@ -52,16 +52,9 @@
var/need_update_field = 0
var/need_player_check = 0
/obj/machinery/mining/drill/New()
..()
component_parts = list()
component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
component_parts += new /obj/item/weapon/stock_parts/capacitor(src)
component_parts += new /obj/item/weapon/stock_parts/micro_laser(src)
component_parts += new /obj/item/weapon/cell/high(src)
RefreshParts()
/obj/machinery/mining/drill/Initialize()
. = ..()
default_apply_parts()
/obj/machinery/mining/drill/process()

2
code/modules/mining/mine_turfs.dm
View File

@@ -163,6 +163,8 @@ turf/simulated/mineral/floor/light_corner
if(random_icon)
dir = pick(alldirs)
. = INITIALIZE_HINT_LATELOAD
var/decl/flooring/F = get_flooring_data(/decl/flooring/sand)
footstep_sounds = F?.footstep_sounds
/turf/simulated/mineral/LateInitialize()
if(density && mineral)