Merge pull request #5840 from Poojawa/reverts-crybaby-inducer

Reverts crybaby inducer also does the sync things

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

@@ -379,9 +379,8 @@
 					if(SSshuttle.emergency.timeLeft(1) > initial(SSshuttle.emergencyCallTime)*0.5)
 						SSticker.mode.make_antag_chance(humanc)
 
-	for(var/V in character.roundstart_traits)
-		var/datum/trait/T = V
-		T.on_spawn() //so latejoins still get their correct traits
+	if(CONFIG_GET(flag/roundstart_traits))
+		SStraits.AssignTraits(humanc, humanc.client, TRUE)
 
 	log_manifest(character.mind.key,character.mind,character,latejoin = TRUE)
 

code/modules/mob/living/blood.dm

@@ -191,6 +191,10 @@
 		blood_data["real_name"] = real_name
 		blood_data["features"] = dna.features
 		blood_data["factions"] = faction
+		blood_data["traits"] = list()
+		for(var/V in roundstart_traits)
+			var/datum/trait/T = V
+			blood_data["traits"] += T.type
 		return blood_data
 
 //get the id of the substance this mob use as blood.

code/modules/mob/living/carbon/human/species_types/corporate.dm

@@ -17,4 +17,4 @@
 	use_skintones = 0
 	species_traits = list(SPECIES_ORGANIC,NOBLOOD,EYECOLOR)
 	inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_NOHUNGER)
-	sexes = 0
+	sexes = 0

code/modules/mob/living/carbon/human/species_types/jellypeople.dm

@@ -384,6 +384,7 @@
 		around.</span>",
 		"<span class='notice'>...and move this one instead.</span>")
 
+
 ///////////////////////////////////LUMINESCENTS//////////////////////////////////////////
 
 //Luminescents are able to consume and use slime extracts, without them decaying.
@@ -542,7 +543,6 @@
 
 	if(species.current_extract)
 		species.extract_cooldown = world.time + 100
-
 		var/cooldown = species.current_extract.activate(H, species, activation_type)
 		species.extract_cooldown = world.time + cooldown
 
@@ -555,8 +555,6 @@
 ///////////////////////////////////STARGAZERS//////////////////////////////////////////
 
 //Stargazers are the telepathic branch of jellypeople, able to project psychic messages and to link minds with willing participants.
-//Admin spawn only
-
 
 /datum/species/jelly/stargazer
 	name = "Stargazer"
@@ -725,5 +723,4 @@
 			to_chat(H, "<span class='notice'>You connect [target]'s mind to your slime link!</span>")
 		else
 			to_chat(H, "<span class='warning'>You can't seem to link [target]'s mind...</span>")
-			to_chat(target, "<span class='warning'>The foreign presence leaves your mind.</span>")
-
+			to_chat(target, "<span class='warning'>The foreign presence leaves your mind.</span>")

code/modules/mob/living/carbon/human/species_types/mothmen.dm

@@ -54,7 +54,7 @@
 
 /datum/species/moth/space_move(mob/living/carbon/human/H)
 	. = ..()
-	if(H.loc && !isspaceturf(H.loc) && H.dna.features["moth_wings"] != "Burnt Off" || "None")
+	if(H.loc && !isspaceturf(H.loc) && H.dna.features["moth_wings"] != "Burnt Off")
 		var/datum/gas_mixture/current = H.loc.return_air()
 		if(current && (current.return_pressure() >= ONE_ATMOSPHERE*0.85)) //as long as there's reasonable pressure and no gravity, flight is possible
 			return TRUE

code/modules/mob/living/silicon/robot/laws.dm

@@ -66,4 +66,4 @@
 			temp = master.supplied[index]
 			if (length(temp) > 0)
 				laws.supplied[index] = temp
-	return
+	return

code/modules/mob/living/silicon/robot/robot.dm

@@ -159,8 +159,6 @@
 	toner = tonermax
 	diag_hud_set_borgcell()
 
-	verbs += /mob/living/proc/lay_down //CITADEL EDIT borgs have rest verb now for snowflake reasons
-
 //If there's an MMI in the robot, have it ejected when the mob goes away. --NEO
 /mob/living/silicon/robot/Destroy()
 	if(mmi && mind)//Safety for when a cyborg gets dust()ed. Or there is no MMI inside.
@@ -629,7 +627,6 @@
 	if(module.cyborg_base_icon == "robot")
 		icon = 'icons/mob/robots.dmi'
 		pixel_x = initial(pixel_x)
-
 	if(stat != DEAD && !(IsUnconscious() || IsStun() || IsKnockdown() || low_power_mode)) //Not dead, not stunned.
 		if(!eye_lights)
 			eye_lights = new()

code/modules/mob/living/simple_animal/hostile/headcrab.dm

@@ -22,7 +22,7 @@
 	ventcrawler = VENTCRAWLER_ALWAYS
 	var/datum/mind/origin
 	var/egg_lain = 0
-	//gold_core_spawnable = HOSTILE_SPAWN //are you sure about this??
+	gold_core_spawnable = NO_SPAWN //are you sure about this?? // CITADEL CHANGE, Yes.
 
 /mob/living/simple_animal/hostile/headcrab/proc/Infect(mob/living/carbon/victim)
 	var/obj/item/organ/body_egg/changeling_egg/egg = new(victim)

code/modules/mob/living/status_procs.dm

@@ -146,13 +146,13 @@
 	else
 		status_traits[trait] |= list(source)
 
-/mob/living/proc/add_trait_datum(trait) //separate proc due to the way these ones are handled
+/mob/living/proc/add_trait_datum(trait, spawn_effects) //separate proc due to the way these ones are handled
 	if(has_trait(trait))
 		return
 	if(!SStraits || !SStraits.traits[trait])
 		return
 	var/datum/trait/T = SStraits.traits[trait]
-	new T (src)
+	new T (src, spawn_effects)
 	return TRUE
 
 /mob/living/proc/remove_trait(trait, list/sources, force)
@@ -192,13 +192,14 @@
 
 	. = FALSE
 
+	if(sources && !islist(sources))
+		sources = list(sources)
 	if(LAZYLEN(sources))
 		for(var/S in sources)
 			if(S in status_traits[trait])
 				return TRUE
-	else
-		if(LAZYLEN(status_traits[trait]))
-			return TRUE
+	else if(LAZYLEN(status_traits[trait]))
+		return TRUE
 
 /mob/living/proc/has_trait_datum(trait)
 	return roundstart_traits[trait]