Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants

code/modules/mob/dead/new_player/login.dm.rej

@@ -1,9 +0,0 @@
-diff a/code/modules/mob/dead/new_player/login.dm b/code/modules/mob/dead/new_player/login.dm	(rejected hunks)
-@@ -1,5 +1,6 @@
- /mob/dead/new_player/Login()
--	client.update_exp_client(0, 0)
-+	if(config.use_exp_tracking)
-+		client.update_exp_client(0, 0)
- 	if(!mind)
- 		mind = new /datum/mind(key)
- 		mind.active = 1

code/modules/mob/dead/new_player/new_player.dm

@@ -329,6 +329,9 @@
 		if(SSshuttle.arrivals.damaged && config.arrivals_shuttle_require_safe_latejoin)
 			src << alert("The arrivals shuttle is currently malfunctioning! You cannot join.")
 			return FALSE
+
+		if(config.arrivals_shuttle_require_undocked)
+			SSshuttle.arrivals.RequireUndocked(src)
 		arrivals_docked = SSshuttle.arrivals.mode != SHUTTLE_CALL
 
 	//Remove the player from the join queue if he was in one and reset the timer
@@ -394,12 +397,7 @@
 
 
 /mob/dead/new_player/proc/LateChoices()
-	var/mills = world.time - SSticker.round_start_time // 1/10 of a second, not real milliseconds but whatever
-	//var/secs = ((mills % 36000) % 600) / 10 //Not really needed, but I'll leave it here for refrence.. or something
-	var/mins = (mills % 36000) / 600
-	var/hours = mills / 36000
-
-	var/dat = "<div class='notice'>Round Duration: [round(hours)]h [round(mins)]m</div>"
+	var/dat = "<div class='notice'>Round Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]</div>"
 
 	if(SSshuttle.emergency)
 		switch(SSshuttle.emergency.mode)

code/modules/mob/dead/new_player/poll.dm

@@ -417,7 +417,7 @@
 		to_chat(src, "<span class='danger'>Invalid vote data</span>")
 		return 0
 
-	//lets add the vote, first we generate a insert statement.
+	//lets add the vote, first we generate an insert statement.
 
 	var/sqlrowlist = ""
 	for (var/vote in numberedvotelist)

code/modules/mob/dead/new_player/preferences_setup.dm

@@ -1,100 +1,84 @@
-
-	//The mob should have a gender you want before running this proc. Will run fine without H
-/datum/preferences/proc/random_character(gender_override)
-	if(gender_override)
-		gender = gender_override
-	else
-		gender = pick(MALE,FEMALE)
-	skin_tone = random_skin_tone()
-	hair_style = random_hair_style(gender)
-	facial_hair_style = random_facial_hair_style(gender)
-	hair_color = random_short_color()
-	facial_hair_color = hair_color
-	eye_color = random_eye_color()
-	if(!pref_species)
-		var/rando_race = pick(config.roundstart_races)
-		pref_species = new rando_race()
-	features = random_features()
-	age = rand(AGE_MIN,AGE_MAX)
-
-/datum/preferences/proc/update_preview_icon(nude = 0)
-	var/wide_icon = 0
-	var/stamp_x = 0
-	var/stamp_y = 1
-	if(features["taur"] != "None")
-		wide_icon = 1
-	// Silicons only need a very basic preview since there is no customization for them.
-	if(job_engsec_high)
-		switch(job_engsec_high)
-			if(AI_JF)
-				preview_icon = icon('icons/mob/AI.dmi', "AI", SOUTH)
-				preview_icon.Scale(64, 64)
-				return
-			if(CYBORG)
-				preview_icon = icon('icons/mob/robots.dmi', "robot", SOUTH)
-				preview_icon.Scale(64, 64)
-				return
-
-	// Set up the dummy for its photoshoot
-	var/mob/living/carbon/human/dummy/mannequin = new()
-	copy_to(mannequin)
-
-	// Determine what job is marked as 'High' priority, and dress them up as such.
-	var/datum/job/previewJob
-	var/highRankFlag = job_civilian_high | job_medsci_high | job_engsec_high
-
-	if(job_civilian_low & ASSISTANT)
-		previewJob = SSjob.GetJob("Assistant")
-	else if(highRankFlag)
-		var/highDeptFlag
-		if(job_civilian_high)
-			highDeptFlag = CIVILIAN
-		else if(job_medsci_high)
-			highDeptFlag = MEDSCI
-		else if(job_engsec_high)
-			highDeptFlag = ENGSEC
-
-		for(var/datum/job/job in SSjob.occupations)
-			if(job.flag == highRankFlag && job.department_flag == highDeptFlag)
-				previewJob = job
-				break
-
-	if(previewJob && !nude)
-		mannequin.job = previewJob.title
-		previewJob.equip(mannequin, TRUE)
-	mannequin.update_body()
-	CHECK_TICK
-	preview_icon = icon('icons/effects/effects.dmi', "nothing")
-	preview_icon.Scale((112), (32))
-	CHECK_TICK
-	mannequin.setDir(NORTH)
-
-	var/icon/stamp = getFlatIcon(mannequin)
-	CHECK_TICK
-	if(wide_icon)
-		stamp_x = 16
-	else
-		stamp_x = 32
-	preview_icon.Blend(stamp, ICON_OVERLAY, stamp_x, stamp_y)
-	CHECK_TICK
-	mannequin.setDir(WEST)
-	stamp = getFlatIcon(mannequin)
-	CHECK_TICK
-	if(wide_icon)
-		stamp_x = 48
-	else
-		stamp_x = 64
-	preview_icon.Blend(stamp, ICON_OVERLAY, stamp_x, stamp_y)
-	CHECK_TICK
-	mannequin.setDir(SOUTH)
-	stamp = getFlatIcon(mannequin)
-	CHECK_TICK
-	if(wide_icon)
-		stamp_x = -15
-	else
-		stamp_x = 1
-	preview_icon.Blend(stamp, ICON_OVERLAY, stamp_x, stamp_y)
-	CHECK_TICK
-	preview_icon.Scale(preview_icon.Width() * 2, preview_icon.Height() * 2) // Scaling here to prevent blurring in the browser.
-	CHECK_TICK
-	qdel(mannequin)
+//The mob should have a gender you want before running this proc. Will run fine without H
+/datum/preferences/proc/random_character(gender_override)
+	if(gender_override)
+		gender = gender_override
+	else
+		gender = pick(MALE,FEMALE)
+	underwear = random_underwear(gender)
+	undershirt = random_undershirt(gender)
+	socks = random_socks()
+	skin_tone = random_skin_tone()
+	hair_style = random_hair_style(gender)
+	facial_hair_style = random_facial_hair_style(gender)
+	hair_color = random_short_color()
+	facial_hair_color = hair_color
+	eye_color = random_eye_color()
+	if(!pref_species)
+		var/rando_race = pick(config.roundstart_races)
+		pref_species = new rando_race()
+	features = random_features()
+	age = rand(AGE_MIN,AGE_MAX)
+
+/datum/preferences/proc/update_preview_icon(nude = 0)
+	// Silicons only need a very basic preview since there is no customization for them.
+	if(job_engsec_high)
+		switch(job_engsec_high)
+			if(AI_JF)
+				preview_icon = icon('icons/mob/ai.dmi', "AI", SOUTH)
+				preview_icon.Scale(64, 64)
+				return
+			if(CYBORG)
+				preview_icon = icon('icons/mob/robots.dmi', "robot", SOUTH)
+				preview_icon.Scale(64, 64)
+				return
+
+	// Set up the dummy for its photoshoot
+	var/mob/living/carbon/human/dummy/mannequin = generate_or_wait_for_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES)
+	copy_to(mannequin)
+
+	// Determine what job is marked as 'High' priority, and dress them up as such.
+	var/datum/job/previewJob
+	var/highRankFlag = job_civilian_high | job_medsci_high | job_engsec_high
+
+	if(job_civilian_low & ASSISTANT)
+		previewJob = SSjob.GetJob("Assistant")
+	else if(highRankFlag)
+		var/highDeptFlag
+		if(job_civilian_high)
+			highDeptFlag = CIVILIAN
+		else if(job_medsci_high)
+			highDeptFlag = MEDSCI
+		else if(job_engsec_high)
+			highDeptFlag = ENGSEC
+
+		for(var/datum/job/job in SSjob.occupations)
+			if(job.flag == highRankFlag && job.department_flag == highDeptFlag)
+				previewJob = job
+				break
+
+	if(previewJob && !nude)
+		mannequin.job = previewJob.title
+		previewJob.equip(mannequin, TRUE)
+	CHECK_TICK
+	preview_icon = icon('icons/effects/effects.dmi', "nothing")
+	preview_icon.Scale(48+32, 16+32)
+	CHECK_TICK
+	mannequin.setDir(NORTH)
+
+	var/icon/stamp = getFlatIcon(mannequin)
+	CHECK_TICK
+	preview_icon.Blend(stamp, ICON_OVERLAY, 25, 17)
+	CHECK_TICK
+	mannequin.setDir(WEST)
+	stamp = getFlatIcon(mannequin)
+	CHECK_TICK
+	preview_icon.Blend(stamp, ICON_OVERLAY, 1, 9)
+	CHECK_TICK
+	mannequin.setDir(SOUTH)
+	stamp = getFlatIcon(mannequin)
+	CHECK_TICK
+	preview_icon.Blend(stamp, ICON_OVERLAY, 49, 1)
+	CHECK_TICK
+	preview_icon.Scale(preview_icon.Width() * 2, preview_icon.Height() * 2) // Scaling here to prevent blurring in the browser.
+	CHECK_TICK
+	unset_busy_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES)

code/modules/mob/dead/observer/observer.dm

@@ -711,9 +711,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	update_icon()
 
 /mob/dead/observer/canUseTopic(atom/movable/AM,be_close = FALSE)
-	if(check_rights(R_ADMIN, 0))
-		return 1
-	return
+	return IsAdminGhost(usr)
 
 /mob/dead/observer/is_literate()
 	return 1