diff --git a/code/citadel/custom_loadout/read_from_file.dm b/code/citadel/custom_loadout/read_from_file.dm index a65fd04252..a4d363bd06 100644 --- a/code/citadel/custom_loadout/read_from_file.dm +++ b/code/citadel/custom_loadout/read_from_file.dm @@ -71,8 +71,10 @@ GLOBAL_LIST(custom_item_list) if((j == job) || (j == "ALL") || (job == "ALL")) //job matches or is all jobs or we want everything. for(var/i in list[j]) //for item in job-item list if(!ret[i]) + world << "DEBUG: [i] initialized to return list" ret[i] = list[j][i] //add to return with return value if not there else + world << "DEBUG: [i] added to return list" ret[i] += list[j][i] //else, add to that item in return value! return ret //If done properly, you'll have a list of item typepaths with how many to spawn. diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 4d9c819ef9..4c95463247 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -127,7 +127,7 @@ var/forbid_peaceborg = 0 var/panic_bunker = 0 // prevents new people it hasn't seen before from connecting var/notify_new_player_age = 0 // how long do we notify admins of a new player - var/notify_new_player_account_age = 0 // how long do we notify admins of a new byond account + var/notify_new_player_account_age = 0 // how long do we notify admins of a new byond account var/irc_first_connection_alert = 0 // do we notify the irc channel when somebody is connecting for the first time? var/traitor_scaling_coeff = 6 //how much does the amount of players get divided by to determine traitors @@ -278,6 +278,7 @@ votable_modes += "secret" Reload() + reload_custom_roundstart_items_list() /datum/configuration/proc/Reload() load("config/config.txt") @@ -473,8 +474,8 @@ panic_bunker = 1 if("notify_new_player_age") notify_new_player_age = text2num(value) - if("notify_new_player_account_age") - notify_new_player_account_age = text2num(value) + if("notify_new_player_account_age") + notify_new_player_account_age = text2num(value) if("irc_first_connection_alert") irc_first_connection_alert = 1 if("check_randomizer") diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 4effac371d..c22418cbd6 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -371,6 +371,7 @@ if(SHUTTLE_CALL) if(SSshuttle.emergency.timeLeft(1) > initial(SSshuttle.emergencyCallTime)*0.5) SSticker.mode.make_antag_chance(humanc) + handle_roundstart_items(character) qdel(src) /mob/dead/new_player/proc/AddEmploymentContract(mob/living/carbon/human/employee)