Merge pull request #4729 from Citadel-Station-13/upstream-merge-33436

[MIRROR] [READY]Cargo Update: Nanotrasen Supply Drop Pods!

code/game/objects/items/circuitboards/computer_circuitboards.dm

@@ -188,21 +188,33 @@
 	build_path = /obj/machinery/computer/cargo
 	var/contraband = FALSE
 
-/obj/item/circuitboard/computer/cargo/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/device/multitool))
-		if(!emagged)
-			contraband = !contraband
-			to_chat(user, "<span class='notice'>Receiver spectrum set to [contraband ? "Broad" : "Standard"].</span>")
-		else
-			to_chat(user, "<span class='notice'>The spectrum chip is unresponsive.</span>")
-	else if(istype(I, /obj/item/card/emag))
-		if(!emagged)
-			contraband = TRUE
-			emagged = TRUE
-			to_chat(user, "<span class='notice'>You adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.</span>")
+/obj/item/circuitboard/computer/cargo/multitool_act(mob/living/user)
+	if(!emagged)
+		contraband = !contraband
+		to_chat(user, "<span class='notice'>Receiver spectrum set to [contraband ? "Broad" : "Standard"].</span>")
 	else
-		return ..()
+		to_chat(user, "<span class='notice'>The spectrum chip is unresponsive.</span>")
 
+/obj/item/circuitboard/computer/cargo/emag_act(mob/living/user)
+	if(!emagged)
+		contraband = TRUE
+		emagged = TRUE
+		to_chat(user, "<span class='notice'>You adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.</span>")
+
+/obj/item/circuitboard/computer/cargo/express
+	name = "Express Supply Console (Computer Board)"
+	build_path = /obj/machinery/computer/cargo/express
+
+/obj/item/circuitboard/computer/cargo/express/multitool_act(mob/living/user)
+	if (!emagged) 
+		to_chat(user, "<span class='notice'>Routing protocols are already set to: \"factory defaults\".</span>")
+	else 
+		to_chat(user, "<span class='notice'>You reset the routing protocols to: \"factory defaults\".</span>")
+		emagged = FALSE
+
+/obj/item/circuitboard/computer/cargo/express/emag_act(mob/living/user)
+		to_chat(user, "<span class='notice'>You change the routing protocols, allowing the Drop Pod to land anywhere on the station.</span>")
+		emagged = TRUE
 
 /obj/item/circuitboard/computer/cargo/request
 	name = "Supply Request Console (Computer Board)"

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

@@ -18,6 +18,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
 	force = 5
 	w_class = WEIGHT_CLASS_SMALL
+	tool_behaviour = TOOL_MULTITOOL
 	throwforce = 0
 	throw_range = 7
 	throw_speed = 3