cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 14:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into computer_tweaks

Browse Source 
# Conflicts:
#	code/game/jobs/job/ship_crew.dm
This commit is contained in:
alberyk
2021-10-10 13:18:14 -03:00
parent 99cb9a0ea2 6298a41f58
commit 805ffc2f85
229 changed files with 3237 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/smes_construction.dm
+4 -17
View File
@@ -63,25 +63,12 @@
component_parts += new /obj/item/smes_coil(src)
/obj/machinery/power/smes/buildable/main_engine
cur_coils = 0
cur_coils = 4
input_attempt = TRUE
input_level = 500000
output_attempt = TRUE
output_level = 1300000 // calibrated to the NSS Aurora map
/obj/machinery/power/smes/buildable/main_engine/Initialize()
. = ..()
component_parts += new /obj/item/smes_coil/super_capacity(src)
component_parts += new /obj/item/smes_coil/super_capacity(src)
component_parts += new /obj/item/smes_coil/super_capacity(src)
component_parts += new /obj/item/smes_coil/super_capacity(src)
component_parts += new /obj/item/smes_coil/super_io(src)
component_parts += new /obj/item/smes_coil/super_io(src)
/obj/machinery/power/smes/buildable/main_engine/LateInitialize()
cur_coils = 6
. = ..()
charge = capacity
input_level = input_level_max
output_level = 500000
charge =1.5e+7
// END SMES SUBTYPES