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

Update drill.dm

Browse Source
This commit is contained in:
Novacat
2020-06-28 12:38:46 -04:00
committed by GitHub
parent 0625e2d6b1
commit b611dcfac7
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,21 +59,12 @@
default_apply_parts()
cell = default_use_hicell()
<<<<<<< HEAD
/obj/machinery/mining/drill/loaded
cell = /obj/item/weapon/cell/high
/obj/machinery/mining/drill/get_cell()
return cell
=======
/obj/machinery/mining/drill/get_cell()
return cell
/obj/machinery/mining/drill/loaded
cell = /obj/item/weapon/cell/high
>>>>>>> 9d5f32d... Adds get_cell to drill heads so you can use an inducer on them (#7274)
/obj/machinery/mining/drill/process()
if(need_player_check)
@@ -406,4 +397,4 @@
return 0
src.set_dir(turn(src.dir, 270))
return 1
return 1