Merge remote-tracking branch 'upstream/master' into dev-freeze

code/game/machinery/autolathe_datums.dm

@@ -391,6 +391,12 @@
 	hidden = 1
 	category = "Devices and Components"
 
+/datum/autolathe/recipe/beartrap
+	name = "mechanical trap"
+	path = /obj/item/weapon/beartrap
+	hidden = 1
+	category = "Devices and Components"
+
 /datum/autolathe/recipe/welder_industrial
 	name = "industrial welding tool"
 	path = /obj/item/weapon/weldingtool/largetank

code/game/objects/items/weapons/traps.dm

@@ -9,6 +9,7 @@
 	throwforce = 0
 	w_class = 3
 	origin_tech = "materials=1"
+	matter = list(DEFAULT_WALL_MATERIAL = 18750)
 	var/deployed = 0
 
 /obj/item/weapon/beartrap/suicide_act(mob/user)

code/modules/events/viral_infection.dm

@@ -35,7 +35,7 @@ datum/event/viral_infection/start()
 
 	var/list/candidates = list()	//list of candidate keys
 	for(var/mob/living/carbon/human/G in player_list)
-		if(G.stat != DEAD && G.is_client_active(5))
+		if(G.mind && G.stat != DEAD && G.is_client_active(5) && !player_is_antag(G.mind))
 			var/turf/T = get_turf(G)
 			if(T.z in config.station_levels)
 				candidates += G

code/modules/mob/new_player/new_player.dm

@@ -420,7 +420,7 @@
 		var/datum/species/chosen_species
 		if(client.prefs.species)
 			chosen_species = all_species[client.prefs.species]
-			use_species_name = all_species[chosen_species.get_station_variant()] //Only used by pariahs atm.
+			use_species_name = chosen_species.get_station_variant() //Only used by pariahs atm.
 
 		if(chosen_species && use_species_name)
 			// Have to recheck admin due to no usr at roundstart. Latejoins are fine though.

code/world.dm

@@ -175,6 +175,40 @@ var/world_topic_spam_protect_time = world.timeofday
 
 		return list2params(s)
 
+	else if(T == "manifest")
+		var/list/positions = list()
+		var/list/set_names = list(
+				"heads" = command_positions,
+				"sec" = security_positions,
+				"eng" = engineering_positions,
+				"med" = medical_positions,
+				"sci" = science_positions,
+				"civ" = civilian_positions,
+				"bot" = nonhuman_positions
+			)
+
+		for(var/datum/data/record/t in data_core.general)
+			var/name = t.fields["name"]
+			var/rank = t.fields["rank"]
+			var/real_rank = make_list_rank(t.fields["real_rank"])
+
+			var/department = 0
+			for(var/k in set_names)
+				if(real_rank in set_names[k])
+					if(!positions[k])
+						positions[k] = list()
+					positions[k][name] = rank
+					department = 1
+			if(!department)
+				if(!positions["misc"])
+					positions["misc"] = list()
+				positions["misc"][name] = rank
+
+		for(var/k in positions)
+			positions[k] = list2params(positions[k]) // converts positions["heads"] = list("Bob"="Captain", "Bill"="CMO") into positions["heads"] = "Bob=Captain&Bill=CMO"
+
+		return list2params(positions)
+
 	else if(copytext(T,1,9) == "adminmsg")
 		/*
 			We got an adminmsg from IRC bot lets split the input then validate the input.

html/changelogs/HarpyEagle-traps.yml

@@ -0,0 +1,19 @@
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+
+author: HarpyEagle
+delete-after: True
+
+changes: 
+  - bugfix: "Mechanical traps no longer spawn in the janitor's locker."
+  - rscadd: "Mechanical traps can now be printed with a hacked autolathe."