diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index 274cd901cba..1feb6455960 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -281,16 +281,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
job = list("Janitor")
surplus = 0
-//Medical
-
-/datum/uplink_item/jobspecific/rad_laser
- name = "Radiation Laser"
- desc = "A radiation laser concealed inside of a Health Analyzer. After a moderate delay, causes temporary collapse and radiation. Has adjustable controls, but will not function as a regular health analyzer, only appears like one. May not function correctly on radiation resistant humanoids!"
- reference = "RL"
- item = /obj/item/rad_laser
- cost = 5
- job = list("Chief Medical Officer", "Medical Doctor", "Geneticist", "Psychiatrist", "Chemist", "Paramedic", "Coroner", "Virologist")
-
//Virology
/datum/uplink_item/jobspecific/viral_injector
diff --git a/code/game/objects/effects/spawners/random_spawners.dm b/code/game/objects/effects/spawners/random_spawners.dm
index 0d5234b4748..69831545397 100644
--- a/code/game/objects/effects/spawners/random_spawners.dm
+++ b/code/game/objects/effects/spawners/random_spawners.dm
@@ -298,7 +298,6 @@
/obj/item/ammo_box/magazine/m10mm/ap = 1,
/obj/item/ammo_box/magazine/m10mm/fire = 1,
/obj/item/ammo_box/magazine/m10mm/hp = 1,
- /obj/item/rad_laser = 1,
/obj/item/storage/box/syndie_kit/emp = 1,
/obj/item/toy/carpplushie/dehy_carp = 1,
/obj/item/clothing/glasses/hud/security/chameleon = 1)
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index 6bd186aac1e..f0b4e8f351f 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -1,93 +1,3 @@
-/*
- The radioactive microlaser, a device disguised as a health analyzer used to irradiate people.
-
- The strength of the radiation is determined by the 'intensity' setting, while the delay between
- the scan and the irradiation kicking in is determined by the wavelength.
-
- Each scan will cause the microlaser to have a brief cooldown period. Higher intensity will increase
- the cooldown, while higher wavelength will decrease it.
-
- Wavelength is also slightly increased by the intensity as well.
-*/
-
-/obj/item/rad_laser
- name = "health analyzer"
- icon = 'icons/obj/device.dmi'
- icon_state = "health2"
- item_state = "healthanalyzer"
- belt_icon = "health_analyzer"
- desc = "A hand-held body scanner able to distinguish vital signs of the subject. A strange microlaser is hooked on to the scanning end."
- flags = CONDUCT | NOBLUDGEON
- slot_flags = SLOT_BELT
- throwforce = 3
- w_class = WEIGHT_CLASS_TINY
- throw_speed = 3
- throw_range = 7
- materials = list(MAT_METAL=400)
- origin_tech = "magnets=3;biotech=5;syndicate=3"
- var/intensity = 5 // how much damage the radiation does
- var/wavelength = 10 // time it takes for the radiation to kick in, in seconds
- var/used = FALSE // is it cooling down?
-
-/obj/item/rad_laser/attack(mob/living/M, mob/living/user)
- if(!used)
- add_attack_logs(user, M, "Irradiated by [src]")
- user.visible_message("[user] analyzes [M]'s vitals.")
- var/cooldown = round(max(100,(((intensity*8)-(wavelength/2))+(intensity*2))*10))
- used = TRUE
- icon_state = "health1"
- handle_cooldown(cooldown) // splits off to handle the cooldown while handling wavelength
- spawn((wavelength+(intensity*4))*10)
- if(M)
- if(intensity >= 5)
- M.Paralyse(intensity * 40/3)
- M.rad_act(intensity * 10)
- else
- to_chat(user, "The radioactive microlaser is still recharging.")
-
-/obj/item/rad_laser/proc/handle_cooldown(cooldown)
- spawn(cooldown)
- used = FALSE
- icon_state = "health2"
-
-/obj/item/rad_laser/attack_self(mob/user)
- ..()
- interact(user)
-
-/obj/item/rad_laser/interact(mob/user)
- user.set_machine(src)
-
- var/cooldown = round(max(10,((intensity*8)-(wavelength/2))+(intensity*2)))
- var/dat = {"
- Radiation Intensity: -- [intensity] ++
- Radiation Wavelength: -- [(wavelength+(intensity*4))] ++
- Laser Cooldown: [cooldown] Seconds
- "}
-
- var/datum/browser/popup = new(user, "radlaser", "Radioactive Microlaser Interface", 400, 240)
- popup.set_content(dat)
- popup.open()
-
-/obj/item/rad_laser/Topic(href, href_list)
- if(..())
- return 1
-
- usr.set_machine(src)
-
- if(href_list["radint"])
- var/amount = text2num(href_list["radint"])
- amount += intensity
- intensity = max(1,(min(10,amount)))
-
- else if(href_list["radwav"])
- var/amount = text2num(href_list["radwav"])
- amount += wavelength
- wavelength = max(1,(min(120,amount)))
-
- attack_self(usr)
- add_fingerprint(usr)
- return
-
/obj/item/jammer
name = "radio jammer"
desc = "Device used to disrupt nearby radio communication."
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 9e3f30a73e0..a060f397eda 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -134,7 +134,6 @@
/obj/item/reagent_containers/hypospray/autoinjector,
/obj/item/reagent_containers/hypospray/CMO,
/obj/item/reagent_containers/hypospray/safety,
- /obj/item/rad_laser,
/obj/item/sensor_device,
/obj/item/wrench/medical,
/obj/item/handheld_defibrillator,
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 3e3c3ad0ae2..90be8634b67 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -513,7 +513,7 @@
desc = "A special helmet designed for work in a hazardous, low pressure environment. Built with lightweight materials for extra comfort."
icon_state = "hardsuit-medical"
item_state = "medical_hardsuit"
- allowed = list(/obj/item/flashlight,/obj/item/tank/internals,/obj/item/storage/firstaid,/obj/item/healthanalyzer,/obj/item/stack/medical,/obj/item/rad_laser)
+ allowed = list(/obj/item/flashlight,/obj/item/tank/internals,/obj/item/storage/firstaid,/obj/item/healthanalyzer,/obj/item/stack/medical)
armor = list(MELEE = 30, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 10, BIO = 100, RAD = 60, FIRE = 60, ACID = 75)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/medical
slowdown = 0.5
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 9fb8a437eba..6a955d9399e 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -8,7 +8,7 @@
icon_state = "paramedic-vest"
item_state = "paramedic-vest"
allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/reagent_containers/syringe,
- /obj/item/healthanalyzer, /obj/item/flashlight, /obj/item/radio, /obj/item/tank/internals/emergency_oxygen,/obj/item/rad_laser)
+ /obj/item/healthanalyzer, /obj/item/flashlight, /obj/item/radio, /obj/item/tank/internals/emergency_oxygen)
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 10, fire = 50, acid = 50)
sprite_sheets = list(
@@ -324,7 +324,7 @@
item_state = "fr_jacket_open"
blood_overlay_type = "armor"
allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/reagent_containers/syringe,
- /obj/item/healthanalyzer, /obj/item/flashlight, /obj/item/radio, /obj/item/tank/internals/emergency_oxygen,/obj/item/rad_laser)
+ /obj/item/healthanalyzer, /obj/item/flashlight, /obj/item/radio, /obj/item/tank/internals/emergency_oxygen)
ignore_suitadjust = 0
suit_adjusted = 1
actions_types = list(/datum/action/item_action/button)
@@ -363,5 +363,5 @@
desc = "A tweed mantle, worn by the Research Director. Smells like science."
icon_state = "rdmantle"
item_state = "rdmantle"
- allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/food/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/rad_laser)
+ allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/food/pill, /obj/item/storage/pill_bottle, /obj/item/paper)
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 50, rad = 0, fire = 50, acid = 50)
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index e931c36977b..b08a97b3bf5 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -7,7 +7,7 @@
suit_adjusted = 1
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
- allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/food/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/rad_laser, /obj/item/robotanalyzer)
+ allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/food/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/robotanalyzer)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 50, RAD = 0, FIRE = 50, ACID = 50)
species_exception = list(/datum/species/golem)
sprite_sheets = list(