cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge

Browse Source 
Conflicts:
	code/ATMOSPHERICS/pipe/pipe_dispenser.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/embedded_controller/embedded_controller_base.dm
	code/modules/mining/money_bag.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/rdconsole.dm
	code/modules/research/xenoarchaeology/machinery/analysis_base.dm
	code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
	code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
This commit is contained in:
D3athrow
2015-04-12 16:40:59 -05:00
parent 9f2e2bb4e3
commit 01d2471fc9
534 changed files with 3273 additions and 3268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/controllers/master_controller.dm
View File

@@ -55,7 +55,7 @@ datum/controller/game_controller/New()
job_master = new /datum/controller/occupations()
job_master.SetupOccupations()
job_master.LoadJobs("config/jobs.txt")
world << "\red \b Job setup complete"
world << "<span class='warning'><B>Job setup complete</span></B>"
if(!syndicate_code_phrase) syndicate_code_phrase = generate_code_phrase()
if(!syndicate_code_response) syndicate_code_response = generate_code_phrase()
@@ -90,9 +90,9 @@ datum/controller/game_controller/proc/setup()
setup_economy()
SetupXenoarch()
cachedamageicons()
world << "\red \b Caching Jukebox playlists..."
world << "<span class='warning'><B>Caching Jukebox playlists...</span></B>"
load_juke_playlists()
world << "\red \b Caching Jukebox playlists complete."
world << "<span class='warning'><B>Caching Jukebox playlists complete.</span></B>"
//if(map && map.dorf)
//mining_surprises = typesof(/mining_surprise/dorf) - /mining_surprise/dorf
//max_secret_rooms += 2
@@ -133,7 +133,7 @@ datum/controller/game_controller/proc/cachedamageicons()
del(H)
datum/controller/game_controller/proc/setup_objects()
world << "\red \b Initializing objects"
world << "<span class='warning'><B>Initializing objects</span></B>"
sleep(-1)
//var/last_init_type = null
for(var/atom/movable/object in world)
@@ -143,12 +143,12 @@ datum/controller/game_controller/proc/setup_objects()
object.initialize()
world << "\red \b Initializing pipe networks"
world << "<span class='warning'><B>Initializing pipe networks</span></B>"
sleep(-1)
for(var/obj/machinery/atmospherics/machine in machines)
machine.build_network()
world << "\red \b Initializing atmos machinery."
world << "<span class='warning'><B>Initializing atmos machinery.</span></B>"
sleep(-1)
for(var/obj/machinery/atmospherics/unary/U in machines)
if(istype(U, /obj/machinery/atmospherics/unary/vent_pump))
@@ -158,7 +158,7 @@ datum/controller/game_controller/proc/setup_objects()
var/obj/machinery/atmospherics/unary/vent_scrubber/T = U
T.broadcast_status()
world << "\red \b Initializations complete."
world << "<span class='warning'><B>Initializations complete.</span></B>"
sleep(-1)