Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update

code/modules/research/designs/bluespace_designs.dm

@@ -65,6 +65,16 @@
 	category = list("Bluespace Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO
 
+/datum/design/desynchronizer
+	name = "Desynchronizer"
+	desc = "A device that can desynchronize the user from spacetime."
+	id = "desynchronizer"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 1000, MAT_GLASS = 500, MAT_SILVER = 1500, MAT_BLUESPACE = 1000)
+	build_path = /obj/item/desynchronizer
+	category = list("Bluespace Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
 /datum/design/miningsatchel_holding
 	name = "Mining Satchel of Holding"
 	desc = "A mining satchel that can hold an infinite amount of ores."

code/modules/research/designs/machine_desings/machine_designs_service.dm

@@ -41,6 +41,14 @@
 	category = list ("Misc. Machinery")
 	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
 
+/datum/design/board/ayyplantgenes
+	name = "Machine Design (Alien Plant DNA Manipulator Board)"
+	desc = "The circuit board for an advanced plant DNA manipulator, utilizing alien technologies."
+	id = "ayyplantgenes"
+	build_path = /obj/item/circuitboard/machine/plantgenes/vault
+	category = list ("Misc. Machinery")
+	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
 /datum/design/board/deepfryer
 	name = "Machine Design (Deep Fryer)"
 	desc = "The circuit board for a Deep Fryer."

code/modules/research/machinery/_production.dm

@@ -84,8 +84,9 @@
 		investigate_log("[key_name(user)] built [amount] of [path] at [src]([type]).", INVESTIGATE_RESEARCH)
 		message_admins("[ADMIN_LOOKUPFLW(user)] has built [amount] of [path] at a [src]([type]).")
 	for(var/i in 1 to amount)
-		var/obj/item/I = new path(get_turf(src))
-		if(efficient_with(I.type))
+		var/obj/O = new path(get_turf(src))
+		if(efficient_with(O.type) && isitem(O))
+			var/obj/item/I = O
 			I.materials = matlist.Copy()
 	SSblackbox.record_feedback("nested tally", "item_printed", amount, list("[type]", "[path]"))
 

code/modules/research/nanites/nanite_hijacker.dm

@@ -18,7 +18,7 @@
 /obj/item/nanite_hijacker/examine(mob/user)
 	. = ..()
 	if(disk)
-		to_chat(user, "<span class='notice'>Alt-click [src] to eject the disk.</span>")
+		. += "<span class='notice'>Alt-click [src] to eject the disk.</span>"
 
 /obj/item/nanite_hijacker/attackby(obj/item/I, mob/user)
 	if(istype(I, /obj/item/disk/nanite_program))

code/modules/research/nanites/nanite_programs.dm

@@ -208,9 +208,6 @@ datum/nanite_program/proc/on_mob_remove()
 /datum/nanite_program/proc/on_death()
 	return
 
-/datum/nanite_program/proc/on_hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode)
-	return
-
 /datum/nanite_program/proc/software_error(type)
 	if(!type)
 		type = rand(1,5)

code/modules/research/nanites/nanite_programs/sensor.dm

@@ -345,6 +345,14 @@
 	var/sentence = ""
 	var/inclusive = TRUE
 
+
+/datum/nanite_program/sensor/voice/on_mob_add()
+	. = ..()
+	RegisterSignal(host_mob, COMSIG_MOVABLE_HEAR, .proc/on_hear)
+
+/datum/nanite_program/sensor/voice/on_mob_remove()
+	UnregisterSignal(host_mob, COMSIG_MOVABLE_HEAR, .proc/on_hear)
+
 /datum/nanite_program/sensor/voice/set_extra_setting(user, setting)
 	if(setting == "Sent Code")
 		var/new_code = input(user, "Set the sent code (1-9999):", name, null) as null|num
@@ -378,15 +386,12 @@
 	target.sentence = sentence
 	target.inclusive = inclusive
 
-/datum/nanite_program/sensor/voice/on_hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode)
+/datum/nanite_program/sensor/voice/proc/on_hear(datum/source, list/hearing_args)
 	if(!sentence)
 		return
-	//To make it not case sensitive
-	var/low_message = lowertext(raw_message)
-	var/low_sentence = lowertext(sentence)
 	if(inclusive)
-		if(findtext(low_message, low_sentence))
+		if(findtextEx(hearing_args[HEARING_RAW_MESSAGE], sentence))
 			send_code()
 	else
-		if(low_message == low_sentence)
+		if(hearing_args[HEARING_RAW_MESSAGE] == sentence)
 			send_code()

code/modules/research/nanites/nanite_remote.dm

@@ -22,7 +22,7 @@
 /obj/item/nanite_remote/examine(mob/user)
 	. = ..()
 	if(locked)
-		to_chat(user, "<span class='notice'>Alt-click to unlock.</span>")
+		. += "<span class='notice'>Alt-click to unlock.</span>"
 
 /obj/item/nanite_remote/AltClick(mob/user)
 	. = ..()

code/modules/research/techweb/all_nodes.dm

@@ -322,6 +322,15 @@
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
 	export_price = 5000
 
+/datum/techweb_node/unregulated_bluespace
+	id = "unregulated_bluespace"
+	display_name = "Unregulated Bluespace Research"
+	description = "Bluespace technology using unstable or unbalanced procedures, prone to damaging the fabric of bluespace. Outlawed by galactic conventions."
+	prereq_ids = list("bluespace_warping", "syndicate_basic")
+	design_ids = list("desynchronizer")
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
+	export_price = 2500
+
 /////////////////////////plasma tech/////////////////////////
 /datum/techweb_node/basic_plasma
 	id = "basic_plasma"
@@ -616,7 +625,7 @@
 /datum/techweb_node/botany
 	id = "botany"
 	display_name = "Botanical Engineering"
-	description = "Botanical tools"
+	description = "Botanical tools."
 	prereq_ids = list("adv_engi", "biotech")
 	design_ids = list("diskplantgene", "portaseeder", "plantgenes", "flora_gun", "hydro_tray", "biogenerator", "seed_extractor")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2750)
@@ -1047,14 +1056,14 @@
 	display_name = "Alien Biological Tools"
 	description = "Advanced biological tools."
 	prereq_ids = list("alientech", "advance_surgerytools")
-	design_ids = list("alien_scalpel", "alien_hemostat", "alien_retractor", "alien_saw", "alien_drill", "alien_cautery")
+	design_ids = list("alien_scalpel", "alien_hemostat", "alien_retractor", "alien_saw", "alien_drill", "alien_cautery", "ayyplantgenes")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
 	export_price = 10000
 
 /datum/techweb_node/alien_engi
 	id = "alien_engi"
 	display_name = "Alien Engineering"
-	description = "Alien engineering tools"
+	description = "Alien engineering tools."
 	prereq_ids = list("alientech", "exp_tools")
 	design_ids = list("alien_wrench", "alien_wirecutters", "alien_screwdriver", "alien_crowbar", "alien_welder", "alien_multitool")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)

code/modules/research/xenobiology/crossbreeding/industrial.dm

@@ -13,8 +13,8 @@ Industrial extracts:
 	var/itemamount = 1 //How many items to spawn
 
 /obj/item/slimecross/industrial/examine(mob/user)
-	..()
-	to_chat(user, "It currently has [plasmaabsorbed] units of plasma floating inside the outer shell, out of [plasmarequired] units.")
+	. = ..()
+	. += "It currently has [plasmaabsorbed] units of plasma floating inside the outer shell, out of [plasmarequired] units."
 
 /obj/item/slimecross/industrial/proc/do_after_spawn(obj/item/spawned)
 	return

code/modules/research/xenobiology/crossbreeding/selfsustaining.dm

@@ -24,12 +24,9 @@ Self-sustaining extracts:
 		A.icon = icon
 		A.icon_state = icon_state
 		A.color = color
+		A.name = "self-sustaining " + colour + " extract"
 	return INITIALIZE_HINT_QDEL
 
-/obj/item/autoslime/Initialize()
-	name = "self-sustaining " + extract.name
-	return ..()
-
 /obj/item/autoslime/attack_self(mob/user)
 	var/reagentselect = input(user, "Choose the reagent the extract will produce.", "Self-sustaining Reaction") as null|anything in extract.activate_reagents
 	var/amount = 5

code/modules/research/xenobiology/xenobiology.dm

@@ -18,9 +18,9 @@
 	var/recurring = FALSE
 
 /obj/item/slime_extract/examine(mob/user)
-	..()
+	. = ..()
 	if(Uses > 1)
-		to_chat(user,"It has [Uses] uses remaining.")
+		. += "It has [Uses] uses remaining."
 
 /obj/item/slime_extract/attackby(obj/item/O, mob/user)
 	if(istype(O, /obj/item/slimepotion/enhancer))