cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51989 from ShizCalev/inducer-fix

Browse Source 
Fixes inducers not working on some stuff due to missing get_cell() checks
This commit is contained in:
skoglol
2020-07-06 23:05:19 +02:00
committed by GitHub
parent 9a246adc25 c9b87df67e
commit 7c6211dcc5
5 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/computers/item/computer_power.dm
+1 -2
View File
@@ -28,8 +28,7 @@
/obj/item/modular_computer/get_cell()
var/obj/item/computer_hardware/battery/battery_module = all_components[MC_CELL]
if(battery_module && battery_module.battery)
return battery_module.battery
return battery_module?.get_cell()
// Used in following function to reduce copypaste
/obj/item/modular_computer/proc/power_failure()
code/modules/modular_computers/hardware/battery_module.dm
+3
View File
@@ -7,6 +7,9 @@
var/obj/item/stock_parts/cell/battery = null
device_type = MC_CELL
/obj/item/computer_hardware/battery/get_cell()
return battery
/obj/item/computer_hardware/battery/New(loc, battery_type = null)
if(battery_type)
battery = new battery_type(src)