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

Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7835

Browse Source
This commit is contained in:
Unknown
2021-03-09 16:03:42 -05:00
parent cb95050782 2595e9a49f
commit 9ff261efca
339 changed files with 488267 additions and 92239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/particle_accelerator/particle_smasher.dm
+1 -1
View File
@@ -25,7 +25,7 @@
var/list/recipes // The list containing the Particle Smasher's recipes.
/obj/machinery/particle_smasher/Initialize()
..()
. = ..()
storage = list()
update_icon()
prepare_recipes()
code/modules/power/turbine.dm
+1 -1
View File
@@ -318,7 +318,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/obj/machinery/computer/turbine_computer/Initialize()
. = ..()
..()
return INITIALIZE_HINT_LATELOAD
/obj/machinery/computer/turbine_computer/LateInitialize()