cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet

Browse Source 
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
This commit is contained in:
Markolie
2015-09-22 00:17:30 +02:00
parent d70e266974 78ad7adafa
commit 3c7413dc65
242 changed files with 15339 additions and 19006 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/protolathe.dm
+1
View File
@@ -62,6 +62,7 @@ Note: Must be placed west/left of and R&D console to function.
/obj/machinery/r_n_d/protolathe/Destroy()
qdel(materials)
materials = null
return ..()
/obj/machinery/r_n_d/protolathe/RefreshParts()