diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 52b28e7def2..49bd6c0bb2f 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -244,13 +244,11 @@ humanc = character //Let's retypecast the var to be human, if(humanc) //These procs all expect humans - // BEGIN NOVA EDIT CHANGE - ALTERNATIVE_JOB_TITLES - var/chosen_rank = humanc.client?.prefs.alt_job_titles?[rank] || rank - GLOB.manifest.inject(humanc, humanc.client) + var/chosen_rank = humanc.client?.prefs.alt_job_titles?[rank] || rank // NOVA EDIT ADDITION - ALTERNATIVE_JOB_TITLES if(SSshuttle.arrivals) - SSshuttle.arrivals.QueueAnnounce(humanc, chosen_rank) + SSshuttle.arrivals.QueueAnnounce(humanc, chosen_rank) // NOVA EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: SSshuttle.arrivals.QueueAnnounce(humanc, rank) else - announce_arrival(humanc, chosen_rank) + announce_arrival(humanc, chosen_rank) // NOVA EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: announce_arrival(humanc, rank) // END NOVA EDIT CHANGE - customization AddEmploymentContract(humanc) @@ -275,6 +273,9 @@ if((job.job_flags & JOB_ASSIGN_QUIRKS) && humanc && CONFIG_GET(flag/roundstart_traits)) SSquirks.AssignQuirks(humanc, humanc.client) + if(humanc) // Quirks may change manifest datapoints, so inject only after assigning quirks + GLOB.manifest.inject(humanc) + var/area/station/arrivals = GLOB.areas_by_type[/area/station/hallway/secondary/entry] if(humanc && arrivals && !arrivals.power_environ) //arrivals depowered humanc.put_in_hands(new /obj/item/crowbar/large/emergency(get_turf(humanc))) //if hands full then just drops on the floor