Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements

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

@@ -167,7 +167,7 @@
 				return
 
 		var/obj/effect/mob_spawn/MS = pick(GLOB.mob_spawners[href_list["JoinAsGhostRole"]])
-		if(istype(MS) && MS.attack_ghost(src, latejoinercalling = TRUE))
+		if(MS?.attack_ghost(src, latejoinercalling = TRUE))
 			SSticker.queued_players -= src
 			SSticker.queue_delay = 4
 			qdel(src)
@@ -486,7 +486,10 @@
 		dat += "<div class='clearBoth'>Currently open Ghost roles:</div><br>"
 		var/list/categorizedJobs = list("Ghost Role" = list(jobs = list(), titles = GLOB.mob_spawners, color = "#ffffff"))
 		for(var/spawner in GLOB.mob_spawners)
-			categorizedJobs["Ghost Role"]["jobs"] += spawner
+			var/obj/effect/mob_spawn/S = pick(GLOB.mob_spawners[spawner])
+			if(!istype(S) || !S.can_latejoin())
+				continue
+			categorizedJobs["Ghost Role"]["jobs"] += S
 
 		dat += "<table><tr><td valign='top'>"
 		for(var/jobcat in categorizedJobs)

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

@@ -11,6 +11,10 @@
 
 // please make sure they're sorted alphabetically and categorized
 
+/datum/sprite_accessory/socks/bee_knee
+	name = "Knee-high (Bee)"
+	icon_state = "bee_knee"
+
 /datum/sprite_accessory/socks/black_knee
 	name = "Knee-high (Black)"
 	icon_state = "black_knee"
@@ -63,6 +67,42 @@
 	name = "Short (White)"
 	icon_state = "white_short"
 
+/datum/sprite_accessory/socks/stockings_blue
+	name = "Stockings (Blue)"
+	icon_state = "stockings_blue"
+
+/datum/sprite_accessory/socks/stockings_cyan
+	name = "Stockings (Cyan)"
+	icon_state = "stockings_cyan"
+
+/datum/sprite_accessory/socks/stockings_dpink
+	name = "Stockings (Dark Pink)"
+	icon_state = "stockings_dpink"
+
+/datum/sprite_accessory/socks/stockings_green
+	name = "Stockings (Green)"
+	icon_state = "stockings_black"
+
+/datum/sprite_accessory/socks/stockings_orange
+	name = "Stockings (Orange)"
+	icon_state = "stockings_orange"
+
+/datum/sprite_accessory/socks/stockings_programmer
+	name = "Stockings (Programmer)"
+	icon_state = "stockings_lpink"
+
+/datum/sprite_accessory/socks/stockings_purple
+	name = "Stockings (Purple)"
+	icon_state = "stockings_purple"
+
+/datum/sprite_accessory/socks/stockings_yellow
+	name = "Stockings (Yellow)"
+	icon_state = "stockings_yellow"
+
+/datum/sprite_accessory/socks/bee_thigh
+	name = "Thigh-high (Bee)"
+	icon_state = "bee_thigh"
+
 /datum/sprite_accessory/socks/black_thigh
 	name = "Thigh-high (Black)"
 	icon_state = "black_thigh"
@@ -93,4 +133,4 @@
 
 /datum/sprite_accessory/socks/white_thigh
 	name = "Thigh-high (White)"
-	icon_state = "white_thigh"
+	icon_state = "white_thigh"

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

@@ -248,9 +248,13 @@
 	icon_state = "bra_commie"
 
 /datum/sprite_accessory/undershirt/female_babyblue
-	name = "Bra, Baby Blue"
+	name = "Bra - Baby Blue"
 	icon_state = "bra_babyblue"
 
+/datum/sprite_accessory/undershirt/female_beekini
+	name = "Bra - Bee-kini"
+	icon_state = "bra_bee-kini"
+
 /datum/sprite_accessory/undershirt/female_black
 	name = "Bra - Black"
 	icon_state = "bra_black"

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

@@ -90,6 +90,9 @@
 	name = "Boxer Briefs - Yellow"
 	icon_state = "boxer_briefs_yellow"
 
+/datum/sprite_accessory/underwear/female_beekini
+	name = "Panties - Bee-kini"
+	icon_state = "panties_bee-kini"
 
 /datum/sprite_accessory/underwear/female_black
 	name = "Panties - Black"