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

mining drill and recharger find their shiny new cells

Browse Source
This commit is contained in:
Atermonera
2020-06-13 03:56:13 -07:00
committed by VirgoBot
parent d52aefa12b
commit 69c3c8c98f
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/machinery/machinery.dm
View File

@@ -312,7 +312,11 @@ Class Procs:
qdel(C) qdel(C)
C = new /obj/item/weapon/cell/high(src) C = new /obj/item/weapon/cell/high(src)
component_parts += C component_parts += C
<<<<<<< HEAD
RefreshParts() RefreshParts()
=======
return C
>>>>>>> edd7803... mining drill and recharger find their shiny new cells (#7290)
/obj/machinery/proc/default_part_replacement(var/mob/user, var/obj/item/weapon/storage/part_replacer/R) /obj/machinery/proc/default_part_replacement(var/mob/user, var/obj/item/weapon/storage/part_replacer/R)
if(!istype(R)) if(!istype(R))

2
code/game/machinery/rechargestation.dm
View File

@@ -25,7 +25,7 @@
/obj/machinery/recharge_station/Initialize() /obj/machinery/recharge_station/Initialize()
. = ..() . = ..()
default_apply_parts() default_apply_parts()
default_use_hicell() cell = default_use_hicell()
update_icon() update_icon()
/obj/machinery/recharge_station/proc/has_cell_power() /obj/machinery/recharge_station/proc/has_cell_power()

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

@@ -57,7 +57,7 @@
if(ispath(cell)) if(ispath(cell))
cell = new cell(src) cell = new cell(src)
default_apply_parts() default_apply_parts()
default_use_hicell() cell = default_use_hicell()
/obj/machinery/mining/drill/loaded /obj/machinery/mining/drill/loaded
cell = /obj/item/weapon/cell/high cell = /obj/item/weapon/cell/high