Merge branch 'master' into upstream-merge-32206

code/datums/components/spooky.dm

@@ -0,0 +1,60 @@
+/datum/component/spooky
+	var/too_spooky = TRUE //will it spawn a new instrument?
+
+/datum/component/spooky/Initialize()
+	RegisterSignal(COMSIG_ITEM_ATTACK, .proc/spectral_attack)
+
+/datum/component/spooky/proc/spectral_attack(mob/living/carbon/C, mob/user)
+	if(ishuman(user)) //this weapon wasn't meant for mortals.
+		var/mob/living/carbon/human/U = user
+		if(!istype(U.dna.species, /datum/species/skeleton))
+			U.adjustStaminaLoss(35) //Extra Damage
+			U.Jitter(35)
+			U.stuttering = 20
+			if(U.getStaminaLoss() > 95)
+				to_chat(U, "<font color ='red', size ='4'><B>Your ears weren't meant for this spectral sound.</B></font>")
+				spectral_change(U)
+			return
+
+	if(ishuman(C))
+		var/mob/living/carbon/human/H = C
+		if(istype(H.dna.species, /datum/species/skeleton))
+			return ..() //undeads are unaffected by the spook-pocalypse.
+		if(istype(H.dna.species, /datum/species/zombie))
+			H.adjustStaminaLoss(25)
+			H.Knockdown(15) //zombies can't resist the doot
+		C.Jitter(35)
+		C.stuttering = 20
+		if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
+			C.adjustStaminaLoss(25) //boneless humanoids don't lose the will to live
+		to_chat(C, "<font color='red' size='4'><B>DOOT</B></span>")
+		spectral_change(H)
+
+	else //the sound will spook monkeys.
+		C.Jitter(15)
+		C.stuttering = 20
+
+/datum/component/spooky/proc/spectral_change(mob/living/carbon/human/H, mob/user)
+	if((H.getStaminaLoss() > 95) && (!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
+		H.Knockdown(20)
+		H.set_species(/datum/species/skeleton)
+		H.visible_message("<span class='warning'>[H] has given up on life as a mortal.</span>")
+		var/T = get_turf(H)
+		if(too_spooky)
+			if(prob(30))
+				new/obj/item/device/instrument/saxophone/spectral(T)
+			else if(prob(30))
+				new/obj/item/device/instrument/trumpet/spectral(T)
+			else if(prob(30))
+				new/obj/item/device/instrument/trombone/spectral(T)
+			else
+				to_chat(H, "The spooky gods forgot to ship your instrument. Better luck next unlife.")
+		to_chat(H, "<B>You are the spooky skeleton!</B>")
+		to_chat(H, "A new life and identity has begun. Help your fellow skeletons into bringing out the spooky-pocalypse. You haven't forgotten your past life, and are still beholden to  past loyalties.")
+		change_name(H)	//time for a new name!
+
+/datum/component/spooky/proc/change_name(mob/living/carbon/human/H)
+	var/t = stripped_input(H, "Enter your new skeleton name", H.real_name, null, MAX_NAME_LEN)
+	if(!t)
+		t = "spooky skeleton"
+	H.fully_replace_character_name(H.real_name, t)

code/datums/map_config.dm

@@ -13,7 +13,6 @@
 
 	//Order matters here.
 	var/list/transition_config = list(CENTCOM = SELFLOOPING,
-									CITY_OF_COGS = SELFLOOPING,
 									MAIN_STATION = CROSSLINKED,
 									EMPTY_AREA_1 = CROSSLINKED,
 									EMPTY_AREA_2 = CROSSLINKED,
@@ -69,12 +68,11 @@
 	map_path = json["map_path"]
 	map_file = json["map_file"]
 
-	minetype = json["minetype"]
-	allow_custom_shuttles = json["allow_custom_shuttles"]
+	minetype = json["minetype"] || minetype
+	allow_custom_shuttles = json["allow_custom_shuttles"] == TRUE
 
-	var/list/jtcl = json["transition_config"]
-
-	if(jtcl != "default")
+	var/jtcl = json["transition_config"]
+	if(jtcl && jtcl != "default")
 		transition_config.Cut()
 
 		for(var/I in jtcl)
@@ -87,9 +85,6 @@
 	CHECK_EXISTS("map_name")
 	CHECK_EXISTS("map_path")
 	CHECK_EXISTS("map_file")
-	CHECK_EXISTS("minetype")
-	CHECK_EXISTS("transition_config")
-	CHECK_EXISTS("allow_custom_shuttles")
 
 	var/path = GetFullMapPath(json["map_path"], json["map_file"])
 	if(!fexists(path))
@@ -102,11 +97,10 @@
 			log_world("transition_config is not a list!")
 			return
 
-		var/list/jtcl = json["transition_config"]
-		for(var/I in jtcl)
+		for(var/I in tc)
 			if(isnull(TransitionStringToEnum(I)))
 				log_world("Invalid transition_config option: [I]!")
-			if(isnull(TransitionStringToEnum(jtcl[I])))
+			if(isnull(TransitionStringToEnum(tc[I])))
 				log_world("Invalid transition_config option: [I]!")
 
 	return TRUE

code/datums/profiling.dm

@@ -0,0 +1,18 @@
+//these are real globals so you can use profiling to profile early world init stuff.
+GLOBAL_REAL_VAR(list/PROFILE_STORE)
+GLOBAL_REAL_VAR(PROFILE_LINE)
+GLOBAL_REAL_VAR(PROFILE_FILE)
+GLOBAL_REAL_VAR(PROFILE_SLEEPCHECK)
+GLOBAL_REAL_VAR(PROFILE_TIME)
+
+
+/proc/profile_show(user, sort = /proc/cmp_profile_avg_time_dsc)
+	sortTim(PROFILE_STORE, sort, TRUE)
+
+	var/list/lines = list()
+
+	for (var/entry in PROFILE_STORE)
+		var/list/data = PROFILE_STORE[entry]
+		lines += "[entry] => [num2text(data[PROFILE_ITEM_TIME], 10)]ms ([data[PROFILE_ITEM_COUNT]]) (avg:[num2text(data[PROFILE_ITEM_TIME]/(data[PROFILE_ITEM_COUNT] || 1), 99)])"
+
+	user << browse("<ol><li>[lines.Join("</li><li>")]</li></ol>", "window=[url_encode(GUID())]")