diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm index 0d5628b517e..51501c2795c 100644 --- a/code/controllers/master_controller.dm +++ b/code/controllers/master_controller.dm @@ -42,9 +42,9 @@ datum/controller/game_controller/New() if(!job_master) job_master = new /datum/controller/occupations() - if(job_master.SetupOccupations()) - world << "\red \b Job setup complete" - job_master.LoadJobs("config/jobs.txt") + job_master.SetupOccupations() + job_master.LoadJobs("config/jobs.txt") + world << "\red \b Job setup complete" if(!syndicate_code_phrase) syndicate_code_phrase = generate_code_phrase() if(!syndicate_code_response) syndicate_code_response = generate_code_phrase() diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index dc92977e974..684e6428f59 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -9,12 +9,6 @@ var/global/datum/controller/occupations/job_master var/list/job_debug = list() - New() - spawn(1) - SetupOccupations() - return - - proc/SetupOccupations(var/faction = "Station") occupations = list() var/list/all_jobs = typesof(/datum/job) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index f39d5e0fe7d..7f35f93704e 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -263,12 +263,12 @@ if(M == assailant && state >= 2) if( ( ishuman(user) && (FAT in user.mutations) && ismonkey(affecting) ) || ( isalien(user) && iscarbon(affecting) ) ) var/mob/living/carbon/attacker = user - assailant.visible_message("\red [user] is attempting to devour [affecting]!") + user.visible_message("\red [user] is attempting to devour [affecting]!") if(istype(user, /mob/living/carbon/alien/humanoid/hunter)) if(!do_mob(user, affecting)||!do_after(user, 30)) return else if(!do_mob(user, affecting)||!do_after(user, 100)) return - assailant.visible_message("\red [user] devours [affecting]!") + user.visible_message("\red [user] devours [affecting]!") affecting.loc = user attacker.stomach_contents.Add(affecting) del(src) diff --git a/code/world.dm b/code/world.dm index bcfedec4b7e..c3fe1b73ec5 100644 --- a/code/world.dm +++ b/code/world.dm @@ -32,8 +32,6 @@ data_core = new /obj/effect/datacore() paiController = new /datum/paiController() - ..() - if(!setup_database_connection()) world.log << "Your server failed to establish a connection with the feedback database." else @@ -57,6 +55,7 @@ slmaster.mouse_opacity = 0 src.update_status() + make_datum_references_lists() //initialises global lists for referencing frequently used datums (so that we only ever do it once) master_controller = new /datum/controller/game_controller() spawn(-1) @@ -85,7 +84,6 @@ Starting up. [time2text(world.timeofday, "hh:mm.ss")] jobban_loadbanfile() jobban_updatelegacybans() LoadBans() - make_datum_references_lists() //initialises global lists for referencing frequently used datums (so that we only ever do it once) process_teleport_locs() //Sets up the wizard teleport locations process_ghost_teleport_locs() //Sets up ghost teleport locations. sleep_offline = 1 diff --git a/html/changelog.html b/html/changelog.html index 1716ff9dce6..ba15a172566 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -58,7 +58,7 @@ should be listed in the changelog upon commit tho. Thanks. -->

Zelacks updated: