Merge remote-tracking branch 'upstream/master' into TGUI-3.0

code/game/objects/items/devices/paicard.dm

@@ -99,7 +99,7 @@
 		if(href_list["reset_radio_short"])
 			pai.unshort_radio()
 		if(href_list["setlaws"])
-			var/newlaws = stripped_multiline_input("Enter any additional directives you would like your pAI personality to follow. Note that these directives will not override the personality's allegiance to its imprinted master. Conflicting directives will be ignored.", "pAI Directive Configuration", MAX_MESSAGE_LEN)
+			var/newlaws = stripped_multiline_input(usr, "Enter any additional directives you would like your pAI personality to follow. Note that these directives will not override the personality's allegiance to its imprinted master. Conflicting directives will be ignored.", "pAI Directive Configuration", "", MAX_MESSAGE_LEN)
 			if(newlaws && pai)
 				pai.add_supplied_law(0,newlaws)
 		if(href_list["toggle_holo"])

code/game/objects/items/devices/polycircuit.dm

@@ -0,0 +1,52 @@
+/obj/item/stack/circuit_stack
+	name = "polycircuit aggregate"
+	desc = "A dense, overdesigned cluster of electronics which attempted to function as a multipurpose circuit electronic. Circuits can be removed from it... if you don't bleed out in the process."
+	icon_state = "circuit_mess"
+	item_state = "rods"
+	w_class = WEIGHT_CLASS_TINY
+	max_amount = 8
+	var/circuit_type = /obj/item/electronics/airlock
+	var/chosen_circuit = "airlock"
+
+/obj/item/stack/circuit_stack/attack_self(mob/user)// Prevents the crafting menu, and tells you how to use it.
+	to_chat(user, "<span class='warning'>You can't use [src] by itself, you'll have to try and remove one of these circuits by hand... carefully.</span>")
+
+/obj/item/stack/circuit_stack/attack_hand(mob/user)
+	var/mob/living/carbon/human/H = user
+	if(!user.get_inactive_held_item() == src)
+		return ..()
+	else
+		if(zero_amount())
+			return
+		chosen_circuit = input("What type of circuit would you like to remove?", "Choose a Circuit Type", chosen_circuit) in list("airlock","firelock","fire alarm","air alarm","APC")
+		if(zero_amount())
+			return
+		switch(chosen_circuit)
+			if("airlock")
+				circuit_type = /obj/item/electronics/airlock
+			if("firelock")
+				circuit_type = /obj/item/electronics/firelock
+			if("fire alarm")
+				circuit_type = /obj/item/electronics/firealarm
+			if("air alarm")
+				circuit_type = /obj/item/electronics/airalarm
+			if("APC")
+				circuit_type = /obj/item/electronics/apc
+		to_chat(user, "<span class='notice'>You spot your circuit, and carefully attempt to remove it from [src], hold still!</span>")
+		if(do_after(user, 30, target = user))
+			if(!src || QDELETED(src))//Sanity Check.
+				return
+			var/returned_circuit = new circuit_type(src)
+			user.put_in_hands(returned_circuit)
+			use(1)
+			if(!amount)
+				to_chat(user, "<span class='notice'>You navigate the sharp edges of circuitry and remove the last board.</span>")
+			else
+				to_chat(user, "<span class='notice'>You navigate the sharp edges of circuitry and remove a single board from [src]</span>")
+		else
+			H.apply_damage(15, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
+			to_chat(user, "<span class='warning'>You give yourself a wicked cut on [src]'s many sharp corners and edges!</span>")
+		..()
+
+/obj/item/stack/circuit_stack/full
+	amount = 8

code/game/objects/items/devices/radio/radio.dm

@@ -98,7 +98,7 @@
 
 /obj/item/radio/ComponentInitialize()
 	. = ..()
-	AddComponent(/datum/component/empprotection, EMP_PROTECT_WIRES)
+	AddElement(/datum/element/empprotection, EMP_PROTECT_WIRES)
 
 /obj/item/radio/interact(mob/user)
 	if(unscrewed && !isAI(user))