cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/modules/hydroponics/trays/tray.dm
	code/modules/hydroponics/vines.dm
This commit is contained in:
Tigercat2000
2015-05-10 13:56:28 -07:00
parent 4642f76d33 68d4b98af4
commit 625dbb5295
77 changed files with 4656 additions and 3305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/master_controller.dm
+1 -1
View File
@@ -120,7 +120,7 @@ datum/controller/game_controller/proc/setup_objects()
//Set up roundstart seed list.
populate_seed_list()
//populate_seed_list()
world << "\red \b Initializations complete."
sleep(-1)