more cruft behavior

shiptest-ss13 · May 15, 2024 · 5f39bc8 · 5f39bc8
1 parent 6ff0ac3
commit 5f39bc8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 19 deletions.
diff --git a/_maps/shuttles/independent/independent_bubble.dmm b/_maps/shuttles/independent/independent_bubble.dmm
@@ -1164,7 +1164,7 @@
 	},
 /obj/item/circuitboard/computer/selling_pad_control,
 /obj/item/circuitboard/machine/selling_pad,
-/obj/item/circuitboard/computer/cargo/express,
+/obj/item/circuitboard/computer/cargo,
 /obj/structure/closet/crate/engineering,
 /turf/open/floor/plasteel,
 /area/ship/cargo)

diff --git a/_maps/shuttles/independent/independent_junker.dmm b/_maps/shuttles/independent/independent_junker.dmm
@@ -2277,7 +2277,7 @@
 	},
 /obj/effect/decal/cleanable/glass,
 /obj/structure/safe/floor,
-/obj/item/circuitboard/computer/cargo/express,
+/obj/item/circuitboard/computer/cargo,
 /turf/open/floor/pod/dark,
 /area/ship/crew/office)
 "Rj" = (

diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -362,7 +362,7 @@
 	build_path = /obj/machinery/computer/bounty
 
 /obj/item/circuitboard/computer/cargo
-	name = "Supply Console (Computer Board)"
+	name = "Outpost Comms Console (Computer Board)"
 	icon_state = "supply"
 	build_path = /obj/machinery/computer/cargo
 	var/contraband = FALSE
@@ -381,16 +381,6 @@
 		obj_flags |= EMAGGED
 		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 = "Outpost Comms Console (Computer Board)"
-	build_path = /obj/machinery/computer/cargo
-
-/obj/item/circuitboard/computer/cargo/express/multitool_act(mob/living/user)
-	return
-
-/obj/item/circuitboard/computer/cargo/express/emag_act(mob/living/user)
-	return
-
 /obj/item/circuitboard/computer/mining
 	name = "Outpost Status Display (Computer Board)"
 	icon_state = "supply"

diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm
@@ -10,16 +10,14 @@
 	desc = "This console allows the user to communicate with a nearby outpost to \
 			purchase supplies and manage missions. Purchases are delivered near-instantly."
 	icon_screen = "supply_express"
-	circuit = /obj/item/circuitboard/computer/cargo/express
+	circuit = /obj/item/circuitboard/computer/cargo
 	light_color = COLOR_BRIGHT_ORANGE
 
 	var/contraband = FALSE
 	var/self_paid = FALSE
 	var/safety_warning = "For safety reasons, the automated supply shuttle \
 		cannot transport live organisms, human remains, classified nuclear weaponry, \
 		homing beacons or machinery housing any form of artificial intelligence."
-	/// radio used by the console to send messages on supply channel
-	var/obj/item/radio/headset/radio
 	/// var that tracks message cooldown
 	var/message_cooldown
 
@@ -43,7 +41,6 @@
 
 /obj/machinery/computer/cargo/Initialize()
 	. = ..()
-	radio = new /obj/item/radio/headset/headset_cargo(src)
 	var/obj/item/circuitboard/computer/cargo/board = circuit
 	contraband = board.contraband
 	if (board.obj_flags & EMAGGED)
@@ -55,7 +52,6 @@
 /obj/machinery/computer/cargo/Destroy()
 	if(beacon)
 		beacon.unlink_console()
-	QDEL_NULL(radio)
 	return ..()
 
 /obj/machinery/computer/cargo/proc/get_export_categories()

diff --git a/code/modules/research/designs/mining_designs.dm b/code/modules/research/designs/mining_designs.dm
@@ -8,7 +8,7 @@
 	id = "cargoexpress"//the coder reading this
 	build_type = IMPRINTER
 	materials = list(/datum/material/glass = 1000)
-	build_path = /obj/item/circuitboard/computer/cargo/express
+	build_path = /obj/item/circuitboard/computer/cargo
 	category = list("Mining Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_CARGO