diff --git a/code/game/machinery/scanner_gate.dm b/code/game/machinery/scanner_gate.dm
index d9677e63adb..af097605bc3 100644
--- a/code/game/machinery/scanner_gate.dm
+++ b/code/game/machinery/scanner_gate.dm
@@ -5,7 +5,6 @@
#define SCANGATE_WANTED "Wanted"
#define SCANGATE_SPECIES "Species"
#define SCANGATE_NUTRITION "Nutrition"
-#define SCANGATE_CONTRABAND "Contraband"
/obj/machinery/scanner_gate
name = "scanner gate"
@@ -39,8 +38,6 @@
var/minus_false_beep = 0
///Base false positive/negative chance
var/base_false_beep = 5
- ///Is an n-spect scanner attached to the gate? Enables contraband scanning.
- var/obj/item/inspector/n_spect = null
///List of species that can be scanned by the gate. Supports adding more species' IDs during in-game.
var/list/available_species = list(
SPECIES_HUMAN,
@@ -76,12 +73,6 @@
for(var/datum/stock_part/scanning_module/scanning_module in component_parts)
minus_false_beep = scanning_module.tier //The better are scanninning modules - the lower is chance of False Positives
-/obj/machinery/scanner_gate/atom_deconstruct(disassembled)
- . = ..()
- if(n_spect)
- n_spect.forceMove(drop_location())
- n_spect = null
-
/obj/machinery/scanner_gate/examine(mob/user)
. = ..()
@@ -90,18 +81,6 @@
. += span_notice("The control panel is ID-locked. Swipe a valid ID to unlock it.")
else
. += span_notice("The control panel is unlocked. Swipe an ID to lock it.")
- if(n_spect)
- . += span_notice("The scanner is equipped with an N-Spect scanner. Use a [span_boldnotice("crowbar")] to uninstall.")
-
-/obj/machinery/scanner_gate/add_context(atom/source, list/context, obj/item/held_item, mob/user)
- . = ..()
- if(n_spect && held_item?.tool_behaviour == TOOL_CROWBAR)
- context[SCREENTIP_CONTEXT_LMB] = "Remove N-Spect scanner"
- return CONTEXTUAL_SCREENTIP_SET
- if(!n_spect && istype(held_item, /obj/item/inspector))
- context[SCREENTIP_CONTEXT_LMB] = "Install N-Spect scanner"
- return CONTEXTUAL_SCREENTIP_SET
-
/obj/machinery/scanner_gate/proc/on_entered(datum/source, atom/movable/thing)
SIGNAL_HANDLER
@@ -136,19 +115,6 @@
return
set_scanline("passive")
-/obj/machinery/scanner_gate/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
- if(istype(tool, /obj/item/inspector))
- if(n_spect)
- to_chat(user, span_warning("The scanner is already equipped with an N-Spect scanner."))
- return ITEM_INTERACT_BLOCKING
- else
- to_chat(user, span_notice("You install an N-Spect scanner on [src]."))
- n_spect = tool
- if(!user.transferItemToLoc(tool, src))
- return ITEM_INTERACT_BLOCKING
- return ITEM_INTERACT_SUCCESS
- return NONE
-
/obj/machinery/scanner_gate/attackby(obj/item/attacking_item, mob/user, params)
var/obj/item/card/id/card = attacking_item.GetID()
if(card)
@@ -171,24 +137,6 @@
wires.interact(user)
return ..()
-/obj/machinery/scanner_gate/crowbar_act(mob/living/user, obj/item/tool)
- . = ..()
- if(n_spect)
- if(locked)
- balloon_alert(user, "locked!")
- return ITEM_INTERACT_BLOCKING
-
- to_chat(user, span_notice("You uninstall [n_spect] from [src]."))
- n_spect.forceMove(drop_location())
- return ITEM_INTERACT_SUCCESS
-
-/obj/machinery/scanner_gate/Exited(atom/gone)
- . = ..()
- if(gone == n_spect)
- n_spect = null
- if(scangate_mode == SCANGATE_CONTRABAND)
- scangate_mode = SCANGATE_NONE
-
/obj/machinery/scanner_gate/emag_act(mob/user, obj/item/card/emag/emag_card)
if(obj_flags & EMAGGED)
return FALSE
@@ -268,14 +216,6 @@
if(scanned_human.nutrition >= detect_nutrition && detect_nutrition == NUTRITION_LEVEL_FAT)
beep = TRUE
detected_thing = "Obesity"
- if(SCANGATE_CONTRABAND)
- for(var/obj/item/content in thing.get_all_contents_skipping_traits(TRAIT_CONTRABAND_BLOCKER))
- detected_thing = "Contraband"
- if(content.is_contraband())
- beep = TRUE
- break
- if(!n_spect.scans_correctly)
- beep = !beep //We do a little trolling
if(reverse)
beep = !beep
@@ -341,7 +281,6 @@
data["disease_threshold"] = disease_threshold
data["target_species_id"] = detect_species_id
data["target_nutrition"] = detect_nutrition
- data["contraband_enabled"] = !!n_spect
data["target_zombie"] = (detect_species_id == SPECIES_ZOMBIE)
return data
@@ -398,4 +337,3 @@
#undef SCANGATE_WANTED
#undef SCANGATE_SPECIES
#undef SCANGATE_NUTRITION
-#undef SCANGATE_CONTRABAND
diff --git a/code/game/objects/items/inspector.dm b/code/game/objects/items/inspector.dm
index d4abe4c1d1a..7783dcff072 100644
--- a/code/game/objects/items/inspector.dm
+++ b/code/game/objects/items/inspector.dm
@@ -20,7 +20,6 @@
interaction_flags_click = NEED_DEXTERITY
throw_range = 1
throw_speed = 1
- COOLDOWN_DECLARE(scanning_person) //Cooldown for scanning a carbon
///How long it takes to print on time each mode, ordered NORMAL, FAST, HONK
var/list/time_list = list(5 SECONDS, 1 SECONDS, 0.1 SECONDS)
///Which print time mode we're on.
@@ -108,17 +107,8 @@
balloon_alert(user, "check cell!")
return ITEM_INTERACT_BLOCKING
- if(iscarbon(interacting_with)) //Prevents insta scanning people
- if(!COOLDOWN_FINISHED(src, scanning_person))
- return ITEM_INTERACT_BLOCKING
-
- visible_message(span_warning("[user] starts scanning [interacting_with] with [src]"))
- to_chat(interacting_with, span_userdanger("[user] is trying to scan you for contraband!"))
- balloon_alert_to_viewers("scanning...")
- playsound(src, SFX_INDUSTRIAL_SCAN, 20, TRUE, -2, TRUE, FALSE)
- COOLDOWN_START(src, scanning_person, 4 SECONDS)
- if(!do_after(user, 4 SECONDS, interacting_with))
- return ITEM_INTERACT_BLOCKING
+ if(iscarbon(interacting_with)) // Prevents scanning people
+ return
if(contraband_scan(interacting_with, user))
playsound(src, 'sound/machines/uplink/uplinkerror.ogg', 40)
diff --git a/tgui/packages/tgui/interfaces/ScannerGate.jsx b/tgui/packages/tgui/interfaces/ScannerGate.jsx
index 51e32cbdc6e..8eb61cea7f2 100644
--- a/tgui/packages/tgui/interfaces/ScannerGate.jsx
+++ b/tgui/packages/tgui/interfaces/ScannerGate.jsx
@@ -67,10 +67,6 @@ const SCANNER_GATE_ROUTES = {
title: 'Scanner Mode: Nutrition',
component: () => ScannerGateNutrition,
},
- Contraband: {
- title: 'Scanner Mode: Contraband',
- component: () => ScannerGateContraband,
- },
};
const ScannerGateControl = (props) => {
@@ -98,7 +94,6 @@ const ScannerGateControl = (props) => {
const ScannerGateOff = (props) => {
const { act, data } = useBackend();
- const { contraband_enabled } = data;
return (
<>
Select a scanning mode below.
@@ -127,11 +122,6 @@ const ScannerGateOff = (props) => {
content="Nutrition"
onClick={() => act('set_mode', { new_mode: 'Nutrition' })}
/>
-