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

Merge remote-tracking branch 'upstream/master' into traymesons

Browse Source 
Conflicts:
	code/modules/research/designs.dm
	icons/mob/eyes.dmi
	icons/obj/clothing/glasses.dmi
This commit is contained in:
xxalpha
2015-02-27 21:15:01 +00:00
parent 0c095591de fbdb12e3fd
commit f9ebb2cff7
582 changed files with 9057 additions and 5474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/singularity.dm
+1 -1
View File
@@ -32,7 +32,7 @@
src.energy = starting_energy
..()
SSobj.processing.Add(src)
SSobj.processing |= src
for(var/obj/machinery/power/singularity_beacon/singubeacon in world)
if(singubeacon.active)
target = singubeacon