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

code/game/gamemodes/calamity/calamity.dm

@@ -91,7 +91,7 @@
 
 	// Add the cortical borer event
 	var/list/moderate_event_list = EModerate.available_events
-	var/event = new /datum/event_meta(EVENT_LEVEL_MODERATE, "Borer Infestation", /datum/event/borer_infestation, 400, one_shot = 1)
+	var/event = new /datum/event_meta(EVENT_LEVEL_MODERATE, "Borer Infestation", /datum/event/borer_infestation, 400, is_one_shot = 1)
 	moderate_event_list.Add(event)
 
 	if(chosen_atypes)

code/game/machinery/atmoalter/canister.dm

@@ -108,6 +108,7 @@ update_flag
 	if (src.destroyed)
 		src.overlays = 0
 		src.icon_state = text("[]-1", src.canister_color)
+		return
 
 	if(icon_state != "[canister_color]")
 		icon_state = "[canister_color]"

code/game/machinery/computer/crew.dm

@@ -75,6 +75,8 @@
 			if(istype(C.loc, /mob/living/carbon/human))
 
 				var/mob/living/carbon/human/H = C.loc
+				if(H.w_uniform != C)
+					continue
 
 				var/list/crewmemberData = list()
 

code/game/mecha/mech_fabricator.dm

@@ -453,10 +453,10 @@
 	for(var/datum/design/D in files.known_designs)
 		if(D.build_type&16)
 			if(D.category in part_sets)//Checks if it's a valid category
-				if(add_part_to_set(D.category, text2path(D.build_path)))//Adds it to said category
+				if(add_part_to_set(D.category, D.build_path))//Adds it to said category
 					i++
 			else
-				if(add_part_to_set("Misc", text2path(D.build_path)))//If in doubt, chunk it into the Misc
+				if(add_part_to_set("Misc", D.build_path))//If in doubt, chunk it into the Misc
 					i++
 	return i
 

code/modules/clothing/spacesuits/alien.dm

@@ -17,7 +17,7 @@
 	item_color = "skrell_helmet_black"
 
 /obj/item/clothing/suit/space/skrell
-	name = "Skrellian hardsuit"
+	name = "Skrellian voidsuit"
 	desc = "Seems like a wetsuit with reinforced plating seamlessly attached to it. Very chic."
 	armor = list(melee = 20, bullet = 20, laser = 50,energy = 50, bomb = 50, bio = 100, rad = 100)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)

code/modules/events/event_manager.dm

@@ -106,7 +106,7 @@
 		html += "<td><A align='right' href='?src=\ref[src];set_name=\ref[new_event]'>[new_event.name ? new_event.name : "Enter Event"]</A></td>"
 		html += "<td><A align='right' href='?src=\ref[src];set_type=\ref[new_event]'>[new_event.event_type ? new_event.event_type : "Select Type"]</A></td>"
 		html += "<td><A align='right' href='?src=\ref[src];set_weight=\ref[new_event]'>[new_event.weight ? new_event.weight : 0]</A></td>"
-		html += "<td><A align='right' href='?src=\ref[src];set_oneshot=\ref[new_event]'>[new_event.one_shot]</A></td>"
+		html += "<td><A align='right' href='?src=\ref[src];toggle_oneshot=\ref[new_event]'>[new_event.one_shot]</A></td>"
 		html += "</tr>"
 		html += "</table>"
 		html += "<A align='right' href='?src=\ref[src];add=\ref[selected_event_container]'>Add</A><br>"

code/modules/mob/hear_say.dm

@@ -11,7 +11,7 @@
 
 	//make sure the air can transmit speech - hearer's side
 	var/turf/T = get_turf(src)
-	if (T)
+	if ((T) && (!(istype(src, /mob/dead/observer)))) //Ghosts can hear even in vacuum.
 		var/datum/gas_mixture/environment = T.return_air()
 		var/pressure = (environment)? environment.return_pressure() : 0
 		if(pressure < SOUND_MINIMUM_PRESSURE && get_dist(speaker, src) > 1)

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

@@ -1031,10 +1031,10 @@ var/list/robot_verbs_default = list(
 
 
 /mob/living/silicon/robot/Topic(href, href_list)
-	if(usr != src)
-		return
 	if(..())
 		return
+	if(usr != src)
+		return
 
 	if (href_list["showalerts"])
 		robot_alerts()