diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
index 56bc9a0548..e08776fd4a 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
@@ -54,7 +54,7 @@
/turf/open/floor/plating,
/area/ruin/powered/beach)
"an" = (
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/obj/machinery/light/small{
dir = 1
},
@@ -207,7 +207,7 @@
/area/ruin/powered/beach)
"aQ" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/wood,
/area/ruin/powered/beach)
"aR" = (
@@ -341,7 +341,7 @@
dir = 8
},
/obj/structure/window/reinforced,
-/obj/item/device/megaphone,
+/obj/item/megaphone,
/turf/open/floor/wood,
/area/ruin/powered/beach)
"bH" = (
@@ -382,7 +382,7 @@
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"bO" = (
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"bP" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
index 7890b3b258..c9712b6164 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
@@ -358,7 +358,7 @@
invisibility = 101
},
/obj/structure/table,
-/obj/item/device/flashlight/lamp/bananalamp,
+/obj/item/flashlight/lamp/bananalamp,
/turf/open/indestructible{
icon_state = "white"
},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
index b75d7c5233..73f7a7729a 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
@@ -37,12 +37,12 @@
/area/ruin/powered/animal_hospital)
"aj" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/cmo,
/area/ruin/powered/animal_hospital)
"ak" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/item/pen/blue,
/turf/open/floor/plasteel/cmo,
/area/ruin/powered/animal_hospital)
@@ -281,7 +281,7 @@
/area/ruin/powered/animal_hospital)
"bb" = (
/obj/structure/table/reinforced,
-/obj/item/device/laser_pointer,
+/obj/item/laser_pointer,
/obj/machinery/light{
dir = 4
},
@@ -335,9 +335,9 @@
/area/ruin/powered/animal_hospital)
"bk" = (
/obj/structure/reagent_dispensers/fueltank,
-/obj/item/device/flashlight/glowstick/blue,
-/obj/item/device/flashlight/glowstick/blue,
-/obj/item/device/flashlight/glowstick/blue,
+/obj/item/flashlight/glowstick/blue,
+/obj/item/flashlight/glowstick/blue,
+/obj/item/flashlight/glowstick/blue,
/turf/open/floor/plating,
/area/ruin/powered/animal_hospital)
"bl" = (
@@ -435,7 +435,7 @@
/area/ruin/powered/animal_hospital)
"by" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/blue/side{
dir = 8
},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
index ea7e87e385..0bcddfcbe7 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
@@ -107,7 +107,7 @@
/obj/structure/stone_tile/cracked{
dir = 1
},
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/turf/open/indestructible/boss/air,
/area/ruin/unpowered/ash_walkers)
"av" = (
@@ -152,7 +152,7 @@
/obj/structure/stone_tile/cracked{
dir = 8
},
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/turf/open/indestructible/boss/air,
/area/ruin/unpowered/ash_walkers)
"az" = (
@@ -165,7 +165,7 @@
/obj/structure/stone_tile/cracked{
dir = 8
},
-/obj/item/device/malf_upgrade,
+/obj/item/malf_upgrade,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"aB" = (
@@ -479,10 +479,10 @@
/area/ruin/unpowered/ash_walkers)
"bn" = (
/obj/structure/closet/crate/radiation,
-/obj/item/device/flashlight/lantern,
-/obj/item/device/flashlight/lantern,
-/obj/item/device/flashlight/lantern,
-/obj/item/device/flashlight/flare,
+/obj/item/flashlight/lantern,
+/obj/item/flashlight/lantern,
+/obj/item/flashlight/lantern,
+/obj/item/flashlight/flare,
/obj/structure/stone_tile/block/cracked{
dir = 8
},
@@ -510,7 +510,7 @@
/obj/structure/stone_tile{
dir = 4
},
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/turf/open/indestructible/boss/air,
/area/ruin/unpowered/ash_walkers)
"bq" = (
@@ -549,7 +549,7 @@
/obj/structure/stone_tile/cracked{
dir = 4
},
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/turf/open/indestructible/boss/air,
/area/ruin/unpowered/ash_walkers)
"bv" = (
@@ -557,9 +557,9 @@
dir = 8
},
/obj/structure/closet/crate,
-/obj/item/device/flashlight/lantern,
-/obj/item/device/flashlight/lantern,
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
+/obj/item/flashlight/lantern,
+/obj/item/flashlight/lantern,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"bw" = (
@@ -591,9 +591,9 @@
dir = 8
},
/obj/structure/stone_tile/cracked,
-/obj/item/device/flashlight/lantern,
-/obj/item/device/flashlight/lantern,
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
+/obj/item/flashlight/lantern,
+/obj/item/flashlight/lantern,
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"bz" = (
@@ -1015,7 +1015,7 @@
/obj/structure/stone_tile/block/cracked{
dir = 4
},
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"cE" = (
@@ -1329,7 +1329,7 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"dx" = (
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/obj/structure/stone_tile/center,
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
index eee442825e..7c166a1a56 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
@@ -60,7 +60,7 @@
color = "#ff0000";
used = 1
},
-/obj/item/device/cult_shift,
+/obj/item/cult_shift,
/obj/effect/decal/remains/human,
/obj/item/melee/cultblade/dagger,
/obj/effect/step_trigger/sound_effect{
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
index 7c1bda845e..a87bdf704b 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
@@ -15,8 +15,8 @@
/obj/item/pickaxe,
/obj/item/storage/bag/ore,
/obj/item/storage/bag/ore,
-/obj/item/device/mining_scanner,
-/obj/item/device/flashlight/lantern,
+/obj/item/mining_scanner,
+/obj/item/flashlight/lantern,
/obj/item/card/id/mining,
/turf/open/floor/plating,
/area/ruin/powered/golem_ship)
@@ -28,8 +28,8 @@
/obj/item/pickaxe,
/obj/item/storage/bag/ore,
/obj/item/storage/bag/ore,
-/obj/item/device/mining_scanner,
-/obj/item/device/flashlight/lantern,
+/obj/item/mining_scanner,
+/obj/item/flashlight/lantern,
/obj/item/card/id/mining,
/turf/open/floor/plating,
/area/ruin/powered/golem_ship)
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm
index 22f1de575e..7ea0145f94 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm
@@ -30,7 +30,7 @@
/turf/open/floor/pod/dark,
/area/ruin/powered)
"h" = (
-/obj/item/device/gps/computer,
+/obj/item/gps/computer,
/obj/structure/tubes,
/turf/open/floor/pod/dark,
/area/ruin/powered)
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index 8fbe0f7803..13ee4fa135 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -305,24 +305,24 @@
pixel_x = 1;
pixel_y = -1
},
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = -5;
pixel_y = 5
},
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = -2;
pixel_y = 2
},
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = -1
},
-/obj/item/device/radio/headset/syndicate/alt{
+/obj/item/radio/headset/syndicate/alt{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/device/radio/headset/syndicate/alt,
-/obj/item/device/radio/headset/syndicate/alt{
+/obj/item/radio/headset/syndicate/alt,
+/obj/item/radio/headset/syndicate/alt{
pixel_x = 3;
pixel_y = -3
},
@@ -512,11 +512,11 @@
/area/ruin/unpowered/syndicate_lava_base/cargo)
"ee" = (
/obj/structure/rack,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/brown{
dir = 1
@@ -649,27 +649,27 @@
/area/ruin/unpowered/syndicate_lava_base/testlab)
"eq" = (
/obj/structure/table/reinforced,
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/voice,
-/obj/item/device/assembly/voice,
-/obj/item/device/assembly/voice,
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/voice,
+/obj/item/assembly/voice,
+/obj/item/assembly/voice,
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
/obj/item/screwdriver/nuke,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -730,27 +730,27 @@
pixel_y = 3
},
/obj/item/stack/cable_coil/white,
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -3;
pixel_y = -3
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -3;
pixel_y = -3
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -3;
pixel_y = -3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
@@ -1018,7 +1018,7 @@
/obj/machinery/light/small,
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/box/monkeycubes{
pixel_x = 4;
@@ -1244,7 +1244,7 @@
pixel_y = 28
},
/obj/item/clothing/gloves/color/latex,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/clothing/glasses/hud/health,
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
@@ -1443,10 +1443,10 @@
/obj/item/clothing/head/soft{
pixel_x = -8
},
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = 5
},
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = 5
},
/turf/open/floor/plasteel/brown{
@@ -2480,7 +2480,7 @@
},
/obj/structure/closet/emcloset/anchored,
/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/obj/item/clothing/mask/gas,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -4910,7 +4910,7 @@
},
/obj/structure/closet/emcloset/anchored,
/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/obj/item/clothing/mask/gas,
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/arrivals)
@@ -5096,7 +5096,7 @@
"mR" = (
/obj/structure/table,
/obj/item/storage/toolbox/syndicate,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/machinery/button/door{
id = "lavalandsyndi_telecomms";
name = "Telecomms Blast Door Control";
@@ -5133,7 +5133,7 @@
pixel_x = 2;
pixel_y = -3
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/red/side{
dir = 8
@@ -5895,7 +5895,7 @@
/area/ruin/unpowered/syndicate_lava_base/telecomms)
"oj" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 1;
name = "Syndicate Radio Intercom"
},
@@ -5929,7 +5929,7 @@
/obj/item/clothing/suit/space/syndicate,
/obj/item/clothing/mask/gas/syndicate,
/obj/item/clothing/head/helmet/space/syndicate,
-/obj/item/device/mining_scanner,
+/obj/item/mining_scanner,
/obj/item/pickaxe,
/turf/open/floor/mineral/plastitanium,
/area/ruin/unpowered/syndicate_lava_base/arrivals)
diff --git a/_maps/RandomRuins/SpaceRuins/DJstation.dmm b/_maps/RandomRuins/SpaceRuins/DJstation.dmm
index d66c98156d..e1f451df09 100644
--- a/_maps/RandomRuins/SpaceRuins/DJstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/DJstation.dmm
@@ -39,7 +39,7 @@
/turf/open/floor/plating,
/area/ruin/space/djstation)
"ak" = (
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plating,
/area/ruin/space/djstation)
"al" = (
@@ -158,7 +158,7 @@
/area/ruin/space/djstation)
"aE" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/grimy,
/area/ruin/space/djstation)
"aF" = (
@@ -176,7 +176,7 @@
/area/ruin/space/djstation)
"aH" = (
/obj/structure/table,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
dir = 8;
freerange = 1;
@@ -226,7 +226,7 @@
/area/ruin/space/djstation)
"aQ" = (
/obj/structure/table,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
dir = 8;
freerange = 1;
diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
index 2f16ae49c5..2ccc6969bd 100644
--- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
+++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
@@ -561,7 +561,7 @@
/turf/open/floor/plasteel/airless,
/area/ruin/space/derelict/bridge/ai_upload)
"bQ" = (
-/obj/item/device/aicard,
+/obj/item/aicard,
/turf/open/floor/plasteel/airless{
icon_state = "damaged2"
},
@@ -1386,7 +1386,7 @@
/area/ruin/space/derelict/bridge/access)
"eC" = (
/obj/structure/table,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel,
/area/ruin/space/derelict/bridge)
"eD" = (
@@ -1677,7 +1677,7 @@
/area/ruin/space/derelict/bridge/access)
"fy" = (
/obj/structure/table,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/airless,
/area/ruin/space/derelict/bridge/access)
"fz" = (
@@ -3121,7 +3121,7 @@
/turf/open/floor/plasteel/airless,
/area/ruin/space/derelict/hallway/primary)
"kq" = (
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -3494,7 +3494,7 @@
/area/ruin/space/derelict/hallway/primary)
"lI" = (
/obj/structure/table,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/turf/open/floor/plasteel/airless,
/area/ruin/space/derelict/hallway/primary)
"lJ" = (
diff --git a/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm b/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm
index c8e9d3bb87..1681cf1e55 100644
--- a/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm
+++ b/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm
@@ -72,12 +72,12 @@
/area/ruin/space/abandoned_tele)
"q" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plating/airless,
/area/ruin/space/abandoned_tele)
"r" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plating/airless,
/area/ruin/space/abandoned_tele)
"s" = (
@@ -110,8 +110,8 @@
/area/ruin/space/abandoned_tele)
"z" = (
/obj/structure/closet/crate,
-/obj/item/device/aicard,
-/obj/item/device/multitool,
+/obj/item/aicard,
+/obj/item/multitool,
/obj/item/weldingtool,
/obj/item/wrench,
/obj/item/circuitboard/computer/teleporter,
diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
index 956664da1e..5348f3f385 100644
--- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
+++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
@@ -394,7 +394,7 @@
"aY" = (
/obj/structure/table/reinforced,
/obj/item/gun/energy/temperature{
- pin = /obj/item/device/firing_pin
+ pin = /obj/item/firing_pin
},
/turf/open/floor/plasteel{
icon_state = "dark"
diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
index 17f44e4dee..037b961591 100644
--- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
@@ -232,7 +232,7 @@
/obj/structure/closet/crate/radiation,
/obj/item/clothing/head/radiation,
/obj/item/clothing/suit/radiation,
-/obj/item/device/geiger_counter,
+/obj/item/geiger_counter,
/turf/open/floor/mineral/titanium/yellow,
/area/ruin/space/has_grav/derelictoutpost/dockedship)
"aR" = (
@@ -717,7 +717,7 @@
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
"bY" = (
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "Distress Signal"
},
/turf/open/floor/plasteel,
@@ -2045,14 +2045,14 @@
/obj/structure/closet/crate{
icon_state = "crateopen"
},
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/machinery/light,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"eC" = (
/obj/structure/closet/crate,
-/obj/item/device/pda/clear,
+/obj/item/pda/clear,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
@@ -2082,7 +2082,7 @@
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"eH" = (
/obj/structure/closet/crate/engineering,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm
index 43c6f283f3..be05a8d1d6 100644
--- a/_maps/RandomRuins/SpaceRuins/bus.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bus.dmm
@@ -128,7 +128,7 @@
/area/ruin/unpowered/no_grav)
"av" = (
/obj/structure/table,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"aw" = (
diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
index 750287f3a2..da34a5bf3b 100644
--- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
@@ -165,7 +165,7 @@
"aw" = (
/obj/structure/rack,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/darkblue/side{
dir = 4;
@@ -1351,7 +1351,7 @@
amount = 10
},
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 3;
pixel_y = 3
},
@@ -1840,7 +1840,7 @@
/obj/item/folder/yellow{
pixel_x = -6
},
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "Distress Signal"
},
/turf/open/floor/plasteel/darkblue/side{
@@ -1872,8 +1872,8 @@
/obj/item/storage/toolbox/electrical,
/obj/item/clothing/gloves/color/yellow,
/obj/item/clothing/gloves/color/yellow,
-/obj/item/device/multitool,
-/obj/item/device/multitool,
+/obj/item/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/airless/dark,
/area/shuttle/caravan/freighter3)
"gw" = (
@@ -2279,7 +2279,7 @@
/obj/structure/table,
/obj/item/stack/packageWrap,
/obj/item/crowbar,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
@@ -2305,7 +2305,7 @@
"hK" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/airless,
@@ -2318,7 +2318,7 @@
"hN" = (
/obj/structure/rack,
/obj/item/tank/internals/oxygen,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/item/clothing/mask/gas,
/turf/open/floor/plasteel/blue/corner{
dir = 4;
@@ -3171,7 +3171,7 @@
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt,
/obj/item/tank/internals/oxygen,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/item/clothing/mask/gas,
/turf/open/floor/plasteel/airless{
icon_state = "damaged5"
@@ -3869,7 +3869,7 @@
"lx" = (
/obj/structure/table/reinforced,
/obj/item/storage/firstaid/regular,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/darkred/side{
dir = 5
diff --git a/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm b/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm
index 87f890e0d5..285f4b3f98 100644
--- a/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm
+++ b/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm
@@ -24,7 +24,7 @@
/area/ruin/space/has_grav/powered/ancient_shuttle)
"g" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plasteel/whiteblue,
/area/ruin/space/has_grav/powered/ancient_shuttle)
@@ -225,7 +225,7 @@
"R" = (
/obj/structure/table/glass,
/obj/item/storage/firstaid/regular,
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
desc = "A prototype hand-held body scanner able to distinguish vital signs of the subject.";
name = "prototype health analyzer"
},
diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
index 788c925772..c6bda02835 100644
--- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
@@ -456,7 +456,7 @@
/area/awaymission/BMPship/Aft)
"bP" = (
/obj/structure/closet/crate,
-/obj/item/device/analyzer,
+/obj/item/analyzer,
/obj/item/stack/spacecash/c10,
/obj/effect/turf_decal/stripes/line{
dir = 2
@@ -905,7 +905,7 @@
/turf/open/floor/plasteel,
/area/awaymission/BMPship/Aft)
"dq" = (
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/engine,
/area/awaymission/BMPship/Aft)
"dr" = (
@@ -1803,7 +1803,7 @@
/turf/closed/mineral/random,
/area/awaymission/BMPship)
"gc" = (
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plating/airless{
icon_state = "platingdmg2"
},
diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
index 4ecd040eb3..e3317ad64e 100644
--- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -193,7 +193,7 @@
/obj/item/storage/box/zipties,
/obj/item/switchblade,
/obj/effect/turf_decal/delivery,
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "DEEP"
},
/turf/open/floor/plasteel/floorgrime,
@@ -282,15 +282,15 @@
/area/ruin/space/has_grav/deepstorage/hydroponics)
"aR" = (
/obj/structure/closet/cardboard,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
+/obj/item/flashlight/flare,
+/obj/item/flashlight/flare,
+/obj/item/flashlight/flare,
+/obj/item/flashlight/flare,
+/obj/item/flashlight/flare,
+/obj/item/flashlight/flare,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
/obj/item/shovel,
/obj/item/pickaxe/drill,
/obj/item/pickaxe/drill,
@@ -300,12 +300,12 @@
/area/ruin/space/has_grav/deepstorage/storage)
"aS" = (
/obj/structure/closet/cardboard,
-/obj/item/device/flashlight/lantern,
-/obj/item/device/flashlight/lantern,
-/obj/item/device/flashlight/lantern,
-/obj/item/device/tape/random,
-/obj/item/device/tape/random,
-/obj/item/device/tape/random,
+/obj/item/flashlight/lantern,
+/obj/item/flashlight/lantern,
+/obj/item/flashlight/lantern,
+/obj/item/tape/random,
+/obj/item/tape/random,
+/obj/item/tape/random,
/obj/item/storage/box/rxglasses,
/obj/item/extinguisher,
/obj/item/extinguisher,
@@ -1162,8 +1162,8 @@
/area/ruin/space/has_grav/deepstorage/armory)
"db" = (
/obj/structure/table,
-/obj/item/device/healthanalyzer,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/stack/medical/gauze,
/obj/item/stack/medical/gauze,
/turf/open/floor/plasteel/dark,
@@ -1475,11 +1475,11 @@
/area/ruin/space/has_grav/deepstorage/armory)
"dP" = (
/obj/structure/table,
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = -4
},
-/obj/item/device/radio,
-/obj/item/device/radio{
+/obj/item/radio,
+/obj/item/radio{
pixel_x = 4
},
/obj/machinery/airalarm{
@@ -1668,7 +1668,7 @@
/area/ruin/space/has_grav/deepstorage/dorm)
"ej" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
@@ -1971,18 +1971,18 @@
"eP" = (
/obj/structure/table,
/obj/item/storage/toolbox/drone,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare{
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight/flare,
+/obj/item/flashlight/flare,
+/obj/item/flashlight/flare,
+/obj/item/flashlight/flare{
pixel_y = 6
},
-/obj/item/device/flashlight/flare{
+/obj/item/flashlight/flare{
pixel_y = 6
},
-/obj/item/device/flashlight/flare{
+/obj/item/flashlight/flare{
pixel_y = 6
},
/turf/open/floor/plasteel/dark,
diff --git a/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm b/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm
index c2996c55e6..9bb394663a 100644
--- a/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm
@@ -42,7 +42,7 @@
/area/ruin/space/has_grav/powered/authorship)
"i" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/light{
dir = 1
},
diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
index 6850cc2515..b172e24f29 100644
--- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
@@ -55,7 +55,7 @@
/obj/machinery/newscaster{
pixel_y = 32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 1;
name = "Syndicate Radio Intercom";
pixel_x = -30
@@ -87,7 +87,7 @@
"al" = (
/obj/structure/table,
/obj/item/storage/toolbox/syndicate,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_y = -12
},
/obj/effect/decal/cleanable/dirt,
@@ -278,8 +278,8 @@
/obj/structure/rack{
dir = 8
},
-/obj/item/device/multitool,
-/obj/item/device/radio/headset/syndicate/alt,
+/obj/item/multitool,
+/obj/item/radio/headset/syndicate/alt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/listeningstation)
@@ -288,7 +288,7 @@
dir = 8;
layer = 2.9
},
-/obj/item/device/mining_scanner,
+/obj/item/mining_scanner,
/obj/item/pickaxe,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
index e59f36a033..4ed628e2b8 100644
--- a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
+++ b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
@@ -309,7 +309,7 @@
/area/ruin/space/has_grav/powered/cat_man)
"ba" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/carpet,
/area/ruin/space/has_grav/powered/cat_man)
"bb" = (
@@ -317,7 +317,7 @@
dir = 4
},
/obj/structure/closet/cabinet,
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "kitty"
},
/turf/open/floor/carpet,
diff --git a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
index eff006f061..299d1769b0 100644
--- a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
@@ -411,7 +411,7 @@
/area/template_noop)
"bt" = (
/obj/structure/table,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel/airless,
/area/tcommsat/chamber)
"bu" = (
@@ -556,7 +556,7 @@
/turf/open/floor/plasteel/airless,
/area/tcommsat/chamber)
"bR" = (
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel/airless/dark,
/area/tcommsat/chamber)
"bS" = (
@@ -580,7 +580,7 @@
/area/tcommsat/chamber)
"bV" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plating/airless,
/area/tcommsat/chamber)
"bW" = (
@@ -606,7 +606,7 @@
/area/tcommsat/chamber)
"ca" = (
/obj/effect/decal/cleanable/blood,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/signaler,
/turf/open/floor/plasteel/airless/dark,
/area/tcommsat/chamber)
"cb" = (
@@ -629,7 +629,7 @@
/area/tcommsat/chamber)
"ce" = (
/obj/structure/table,
-/obj/item/device/electropack,
+/obj/item/electropack,
/turf/open/floor/plating/airless,
/area/tcommsat/chamber)
"cf" = (
diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
index 4052676a3b..2690a58816 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -284,7 +284,7 @@
"aW" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/item/device/megaphone,
+/obj/item/megaphone,
/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/ancientstation/comm)
"aX" = (
@@ -1648,7 +1648,7 @@
"eV" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/red/side{
dir = 4
},
@@ -3191,7 +3191,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/gloves/color/fyellow/old,
/obj/item/clothing/gloves/color/fyellow/old,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/yellow/side{
dir = 10
},
@@ -3648,8 +3648,8 @@
dir = 4
},
/obj/structure/closet/crate,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/item/storage/box/firingpins,
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation/deltacorridor)
@@ -4039,7 +4039,7 @@
"kD" = (
/obj/structure/table,
/obj/item/crowbar,
-/obj/item/device/flashlight/glowstick,
+/obj/item/flashlight/glowstick,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/ancientstation)
@@ -4110,7 +4110,7 @@
"kN" = (
/obj/structure/table,
/obj/item/crowbar,
-/obj/item/device/flashlight/glowstick,
+/obj/item/flashlight/glowstick,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
dir = 8
@@ -4225,7 +4225,7 @@
/area/ruin/space/has_grav/ancientstation)
"kZ" = (
/obj/structure/table/reinforced,
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
desc = "A prototype hand-held body scanner able to distinguish vital signs of the subject.";
name = "prototype health analyzer"
},
diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
index b90f2e6780..f5439940ee 100644
--- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm
+++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
@@ -227,7 +227,7 @@
},
/obj/structure/closet/crate/medical,
/obj/item/clothing/neck/stethoscope,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/reagent_containers/blood/OMinus,
/obj/item/reagent_containers/blood/OMinus,
/obj/machinery/power/apc{
@@ -755,7 +755,7 @@
/area/ruin/space/has_grav/onehalf/bridge)
"ca" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/onehalf/bridge)
"cb" = (
@@ -990,7 +990,7 @@
/area/ruin/space/has_grav/onehalf/bridge)
"cH" = (
/obj/item/crowbar/red,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plating,
/area/ruin/space/has_grav/onehalf/bridge)
"cI" = (
@@ -1095,7 +1095,7 @@
/area/ruin/space/has_grav/onehalf/hallway)
"cY" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/onehalf/bridge)
"cZ" = (
diff --git a/_maps/RandomRuins/SpaceRuins/originalcontent.dmm b/_maps/RandomRuins/SpaceRuins/originalcontent.dmm
index eccc2efada..624aa03d7c 100644
--- a/_maps/RandomRuins/SpaceRuins/originalcontent.dmm
+++ b/_maps/RandomRuins/SpaceRuins/originalcontent.dmm
@@ -537,7 +537,7 @@
/turf/open/indestructible/paper,
/area/ruin/powered)
"bA" = (
-/obj/item/device/toner,
+/obj/item/toner,
/turf/open/indestructible/paper,
/area/ruin/powered)
"bB" = (
@@ -595,7 +595,7 @@
/obj/item/paper/crumpled/ruins/originalcontent,
/obj/item/paper/crumpled/ruins/originalcontent,
/obj/item/paper/crumpled/ruins/originalcontent,
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "Pulpy Signal"
},
/turf/open/indestructible/paper,
diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
index f6f090e807..b56ba3107f 100644
--- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
@@ -2081,7 +2081,7 @@
dir = 1;
layer = 2.9
},
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "Twin-Nexus Hotel Retreat";
name = "hotel gps"
},
@@ -2093,7 +2093,7 @@
"gx" = (
/obj/structure/table,
/obj/item/screwdriver,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/wirecutters,
/obj/machinery/light{
dir = 1
@@ -2375,7 +2375,7 @@
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/hotel/workroom)
"hr" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/hotel/dock)
"hs" = (
@@ -2606,7 +2606,7 @@
/area/ruin/space/has_grav/hotel/bar)
"hV" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/guitar,
+/obj/item/instrument/guitar,
/obj/structure/window/reinforced{
dir = 1
},
@@ -2687,7 +2687,7 @@
/area/ruin/space/has_grav/hotel/bar)
"ig" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/violin,
+/obj/item/instrument/violin,
/turf/open/floor/plasteel/grimy,
/area/ruin/space/has_grav/hotel/bar)
"ih" = (
@@ -4097,7 +4097,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/item/device/lightreplacer,
+/obj/item/lightreplacer,
/turf/open/floor/plasteel/neutral,
/area/ruin/space/has_grav/hotel/custodial)
"ml" = (
diff --git a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
index 3e729c6c4b..c9b6eb9e7c 100644
--- a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
+++ b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
@@ -53,7 +53,7 @@
"am" = (
/obj/structure/table/reinforced,
/obj/item/folder,
-/obj/item/device/radio,
+/obj/item/radio,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/turretedoutpost)
"an" = (
@@ -105,7 +105,7 @@
/area/ruin/space/has_grav/turretedoutpost)
"av" = (
/obj/structure/rack,
-/obj/item/device/firing_pin,
+/obj/item/firing_pin,
/turf/open/floor/plasteel/vault/side{
dir = 1
},
@@ -152,7 +152,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio,
+/obj/item/radio,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/turretedoutpost)
"aE" = (
@@ -236,7 +236,7 @@
"aS" = (
/obj/structure/table/reinforced,
/obj/machinery/light,
-/obj/item/device/camera_bug,
+/obj/item/camera_bug,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/turretedoutpost)
"aT" = (
diff --git a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm
index 502c677325..ab51f68741 100644
--- a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm
+++ b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm
@@ -52,7 +52,7 @@
/area/ruin/space/has_grav/powered/aesthetic)
"m" = (
/obj/structure/table/reinforced,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plasteel/vaporwave,
/area/ruin/space/has_grav/powered/aesthetic)
"n" = (
@@ -88,7 +88,7 @@
/turf/open/floor/plasteel/vaporwave,
/area/ruin/space/has_grav/powered/aesthetic)
"t" = (
-/obj/item/device/instrument/eguitar,
+/obj/item/instrument/eguitar,
/turf/open/floor/holofloor/beach,
/area/ruin/space/has_grav/powered/aesthetic)
"u" = (
@@ -104,7 +104,7 @@
/area/ruin/space/has_grav/powered/aesthetic)
"x" = (
/obj/structure/closet/crate/bin,
-/obj/item/device/tape/random,
+/obj/item/tape/random,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"y" = (
diff --git a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm
index 8660ae3dea..51f551fe51 100644
--- a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm
+++ b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm
@@ -20,7 +20,7 @@
/area/ruin/space/has_grav/whiteship/box)
"af" = (
/obj/structure/table,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/mineral/titanium,
/area/ruin/space/has_grav/whiteship/box)
"ag" = (
@@ -254,7 +254,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/whiteship/box)
"aU" = (
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/mineral/titanium,
/area/ruin/space/has_grav/whiteship/box)
"aV" = (
diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm
index e29fcb26cf..e83daecd38 100644
--- a/_maps/RandomZLevels/Academy.dmm
+++ b/_maps/RandomZLevels/Academy.dmm
@@ -194,7 +194,7 @@
/area/awaymission/academy/headmaster)
"aI" = (
/obj/structure/table/reinforced,
-/obj/item/device/laser_pointer/upgraded,
+/obj/item/laser_pointer/upgraded,
/turf/open/floor/carpet,
/area/awaymission/academy/headmaster)
"aJ" = (
@@ -2624,7 +2624,7 @@
/turf/open/floor/plating,
/area/awaymission/academy/academyaft)
"iK" = (
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/engine,
/area/awaymission/academy/academyaft)
"iL" = (
@@ -2729,7 +2729,7 @@
dir = 1
},
/obj/structure/table,
-/obj/item/device/soulstone,
+/obj/item/soulstone,
/turf/open/floor/plasteel/airless{
icon_state = "whitered";
dir = 4
@@ -2930,7 +2930,7 @@
"jA" = (
/obj/structure/table,
/obj/structure/window/reinforced,
-/obj/item/device/batterer,
+/obj/item/batterer,
/turf/open/floor/plasteel/airless{
icon_state = "whitered";
dir = 4
diff --git a/_maps/RandomZLevels/Cabin.dmm b/_maps/RandomZLevels/Cabin.dmm
index d95b84f299..f4a18fd87c 100644
--- a/_maps/RandomZLevels/Cabin.dmm
+++ b/_maps/RandomZLevels/Cabin.dmm
@@ -527,7 +527,7 @@
/area/awaymission/snowforest)
"bT" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/violin,
+/obj/item/instrument/violin,
/turf/open/floor/wood,
/area/awaymission/cabin)
"bU" = (
@@ -620,7 +620,7 @@
dir = 8
},
/obj/structure/table/wood,
-/obj/item/device/instrument/guitar,
+/obj/item/instrument/guitar,
/turf/open/floor/wood,
/area/awaymission/cabin)
"ci" = (
@@ -952,7 +952,7 @@
/area/awaymission/snowforest)
"du" = (
/obj/structure/closet/toolcloset,
-/obj/item/device/lightreplacer,
+/obj/item/lightreplacer,
/obj/item/storage/toolbox/mechanical,
/turf/open/floor/plating,
/area/awaymission/cabin)
diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index ddd441486b..a656e5cd0d 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -447,7 +447,7 @@
/area/awaymission/caves/BMP_asteroid/level_four)
"bo" = (
/obj/structure/flora/rock,
-/obj/item/device/soulstone/anybody,
+/obj/item/soulstone/anybody,
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14"
},
@@ -531,7 +531,7 @@
/area/awaymission/caves/BMP_asteroid/level_four)
"bA" = (
/obj/structure/destructible/cult/tome,
-/obj/item/device/necromantic_stone,
+/obj/item/necromantic_stone,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/engine/cult{
initial_gas_mix = "n2=23;o2=14"
@@ -1379,8 +1379,8 @@
/area/awaymission/caves/BMP_asteroid)
"eh" = (
/obj/structure/table,
-/obj/item/device/radio,
-/obj/item/device/radio,
+/obj/item/radio,
+/obj/item/radio,
/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"ei" = (
@@ -1464,8 +1464,8 @@
/area/awaymission/caves/BMP_asteroid)
"ew" = (
/obj/structure/table,
-/obj/item/device/mining_scanner,
-/obj/item/device/mining_scanner,
+/obj/item/mining_scanner,
+/obj/item/mining_scanner,
/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"ex" = (
@@ -1500,8 +1500,8 @@
/area/awaymission/caves/BMP_asteroid)
"eC" = (
/obj/structure/table,
-/obj/item/device/gps/mining,
-/obj/item/device/gps/mining,
+/obj/item/gps/mining,
+/obj/item/gps/mining,
/obj/item/clothing/glasses/meson,
/obj/item/clothing/glasses/meson,
/obj/item/clothing/glasses/meson,
@@ -1553,7 +1553,7 @@
},
/obj/structure/table,
/obj/item/storage/toolbox/electrical,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel,
/area/awaymission/caves/listeningpost)
"eN" = (
@@ -2076,7 +2076,7 @@
/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"gs" = (
-/obj/item/device/assembly/igniter,
+/obj/item/assembly/igniter,
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14"
},
diff --git a/_maps/RandomZLevels/centcomAway.dmm b/_maps/RandomZLevels/centcomAway.dmm
index 5f73f18c35..12861c3b9c 100644
--- a/_maps/RandomZLevels/centcomAway.dmm
+++ b/_maps/RandomZLevels/centcomAway.dmm
@@ -281,7 +281,7 @@
/turf/open/floor/plating,
/area/awaymission/centcomAway/cafe)
"bb" = (
-/obj/item/device/radio,
+/obj/item/radio,
/turf/open/floor/plating,
/area/awaymission/centcomAway/maint)
"bc" = (
@@ -743,7 +743,7 @@
/area/awaymission/centcomAway/maint)
"da" = (
/obj/structure/table,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/mineral/titanium/yellow,
/area/awaymission/centcomAway/hangar)
"db" = (
@@ -832,7 +832,7 @@
/area/awaymission/centcomAway/cafe)
"dr" = (
/obj/structure/table/reinforced,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
/turf/open/floor/plasteel/yellow/side,
/area/awaymission/centcomAway/general)
"ds" = (
@@ -1116,7 +1116,7 @@
/area/awaymission/centcomAway/maint)
"ez" = (
/obj/structure/table,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"eA" = (
@@ -1839,7 +1839,7 @@
/obj/structure/chair{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/turf/open/floor/mineral/titanium/blue,
@@ -2473,8 +2473,8 @@
/area/awaymission/centcomAway/hangar)
"js" = (
/obj/structure/table,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault,
/area/awaymission/centcomAway/hangar)
"jt" = (
@@ -2485,7 +2485,7 @@
/area/awaymission/centcomAway/hangar)
"ju" = (
/obj/structure/table,
-/obj/item/device/mmi,
+/obj/item/mmi,
/turf/open/floor/plasteel/vault,
/area/awaymission/centcomAway/hangar)
"jv" = (
@@ -2762,17 +2762,17 @@
/area/awaymission/centcomAway/general)
"kn" = (
/obj/structure/table,
-/obj/item/device/flashlight/flare,
+/obj/item/flashlight/flare,
/turf/open/floor/plasteel/dark,
/area/awaymission/centcomAway/hangar)
"ko" = (
/obj/structure/table,
-/obj/item/device/flashlight/flare,
+/obj/item/flashlight/flare,
/turf/open/floor/plating,
/area/awaymission/centcomAway/hangar)
"kp" = (
/obj/structure/table,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plating,
/area/awaymission/centcomAway/hangar)
"kq" = (
@@ -2863,7 +2863,7 @@
"kC" = (
/obj/item/clipboard,
/obj/structure/table,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/item/stamp,
/turf/open/floor/plasteel/vault{
dir = 1
@@ -2972,14 +2972,14 @@
/area/space/nearstation)
"kW" = (
/obj/structure/table,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/awaymission/centcomAway/thunderdome)
"kX" = (
/obj/structure/table,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -3088,7 +3088,7 @@
/area/awaymission/centcomAway/thunderdome)
"lq" = (
/obj/structure/table/wood,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel/redyellow{
dir = 5
},
@@ -3226,8 +3226,8 @@
/area/awaymission/centcomAway/thunderdome)
"lM" = (
/obj/structure/table/reinforced,
-/obj/item/device/taperecorder,
-/obj/item/device/tape/random,
+/obj/item/taperecorder,
+/obj/item/tape/random,
/turf/open/floor/plasteel{
icon_state = "floor"
},
diff --git a/_maps/RandomZLevels/challenge.dmm b/_maps/RandomZLevels/challenge.dmm
index 8f454aedc9..0ed12617b2 100644
--- a/_maps/RandomZLevels/challenge.dmm
+++ b/_maps/RandomZLevels/challenge.dmm
@@ -35,7 +35,7 @@
/turf/open/floor/plasteel/airless,
/area/awaymission/challenge/start)
"ai" = (
-/obj/item/device/flashlight{
+/obj/item/flashlight{
icon_state = "flashlight-on";
item_state = "flashlight";
on = 1
@@ -266,7 +266,7 @@
/turf/open/floor/plasteel,
/area/awaymission/challenge/main)
"bb" = (
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/airless,
/area/awaymission/challenge/main)
"bc" = (
@@ -655,7 +655,7 @@
/obj/structure/chair{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 28
@@ -680,7 +680,7 @@
/turf/open/floor/plating,
/area/awaymission/challenge/end)
"cg" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -747,7 +747,7 @@
/area/awaymission/challenge/end)
"cs" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index 4ec51aef62..49929e67f1 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -454,11 +454,11 @@
dir = 1
},
/obj/structure/table,
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_x = -4;
pixel_y = 4
},
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_x = 2
},
/obj/effect/turf_decal/stripes/line,
@@ -713,7 +713,7 @@
pixel_y = -1
},
/obj/item/clothing/gloves/color/yellow,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
@@ -1568,7 +1568,7 @@
/obj/structure/closet/crate,
/obj/item/storage/bag/ore,
/obj/structure/alien/weeds,
-/obj/item/device/mining_scanner,
+/obj/item/mining_scanner,
/obj/item/shovel,
/obj/item/pickaxe,
/turf/open/floor/plating{
@@ -1775,14 +1775,14 @@
dir = 8;
icon_state = "ltrails_1"
},
-/obj/item/device/mining_scanner,
+/obj/item/mining_scanner,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/main)
"dH" = (
-/obj/item/device/flashlight/lantern{
+/obj/item/flashlight/lantern{
icon_state = "lantern-on";
on = 1
},
@@ -2820,7 +2820,7 @@
},
/area/awaymission/moonoutpost19/research)
"fU" = (
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/item/screwdriver{
pixel_y = 10
},
@@ -3020,9 +3020,9 @@
/area/awaymission/moonoutpost19/research)
"gq" = (
/obj/structure/table,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
/obj/structure/alien/weeds,
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -3098,7 +3098,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plating{
heat_capacity = 1e+006
},
@@ -3245,7 +3245,7 @@
pixel_y = 9
},
/obj/item/pen,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -3661,11 +3661,11 @@
empty = 1;
name = "First-Aid (empty)"
},
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
pixel_x = 6;
pixel_y = -5
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -5;
pixel_y = -2
},
@@ -3952,7 +3952,7 @@
/area/awaymission/moonoutpost19/research)
"ic" = (
/obj/structure/rack,
-/obj/item/device/paicard{
+/obj/item/paicard{
pixel_x = 4
},
/obj/effect/turf_decal/stripes/line{
@@ -4283,8 +4283,8 @@
/area/awaymission/moonoutpost19/research)
"iJ" = (
/obj/structure/table,
-/obj/item/device/radio/off,
-/obj/item/device/laser_pointer,
+/obj/item/radio/off,
+/obj/item/laser_pointer,
/turf/open/floor/plasteel/cafeteria{
dir = 5
},
@@ -4312,7 +4312,7 @@
"iM" = (
/obj/structure/table,
/obj/item/storage/secure/briefcase,
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = -3
},
/obj/effect/turf_decal/stripes/line{
@@ -5358,7 +5358,7 @@
pixel_x = -2;
pixel_y = -1
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/blue/side{
dir = 0;
heat_capacity = 1e+006
@@ -5742,7 +5742,7 @@
/area/awaymission/moonoutpost19/arrivals)
"lX" = (
/obj/structure/table,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/mineral/titanium/yellow,
/area/awaymission/moonoutpost19/arrivals)
"lZ" = (
diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm
index fe9080c8d5..7be855dde9 100644
--- a/_maps/RandomZLevels/research.dmm
+++ b/_maps/RandomZLevels/research.dmm
@@ -827,8 +827,8 @@
/area/awaymission/research/interior)
"cD" = (
/obj/structure/table,
-/obj/item/device/radio,
-/obj/item/device/radio,
+/obj/item/radio,
+/obj/item/radio,
/turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/gateway)
"cE" = (
@@ -999,7 +999,7 @@
name = "encrypted genetic data disk";
read_only = 1
},
-/obj/item/device/firing_pin/dna,
+/obj/item/firing_pin/dna,
/turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/secure)
"de" = (
@@ -1223,7 +1223,7 @@
name = "encrypted genetic data disk";
read_only = 1
},
-/obj/item/device/firing_pin/dna,
+/obj/item/firing_pin/dna,
/obj/item/dnainjector/dwarf,
/obj/item/dnainjector/dwarf,
/turf/open/floor/plasteel/dark,
@@ -2599,7 +2599,7 @@
/obj/item/clothing/head/collectable/petehat{
name = "dusty hat"
},
-/obj/item/device/firing_pin/dna,
+/obj/item/firing_pin/dna,
/turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/secure)
"hT" = (
@@ -2614,7 +2614,7 @@
name = "encrypted genetic data disk";
read_only = 1
},
-/obj/item/device/firing_pin/dna,
+/obj/item/firing_pin/dna,
/obj/item/dnainjector/hulkmut,
/turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/secure)
@@ -2732,8 +2732,8 @@
name = "encrypted genetic data disk";
read_only = 1
},
-/obj/item/device/firing_pin/dna/dredd,
-/obj/item/device/firing_pin/dna/dredd,
+/obj/item/firing_pin/dna/dredd,
+/obj/item/firing_pin/dna/dredd,
/obj/item/dnainjector/lasereyesmut,
/obj/item/dnainjector/lasereyesmut,
/turf/open/floor/plasteel/dark,
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index 932b3f3060..63255686d8 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -102,7 +102,7 @@
/area/awaymission/snowdin/post/research)
"ay" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/post/research)
"az" = (
@@ -126,7 +126,7 @@
/area/awaymission/snowdin/post/research)
"aD" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/item/pen,
/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/post/research)
@@ -304,7 +304,7 @@
/area/awaymission/snowdin/post/research)
"bd" = (
/obj/structure/window,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/post/research)
"be" = (
@@ -2168,7 +2168,7 @@
/turf/open/floor/plasteel/cmo,
/area/awaymission/snowdin/post)
"fz" = (
-/obj/item/device/flashlight/pen,
+/obj/item/flashlight/pen,
/turf/open/floor/plasteel/cmo,
/area/awaymission/snowdin/post)
"fA" = (
@@ -5944,7 +5944,7 @@
req_access_txt = "201"
},
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash,
+/obj/item/assembly/flash,
/obj/item/storage/box/rubbershot,
/obj/structure/fireaxecabinet{
pixel_y = 32
@@ -6341,7 +6341,7 @@
/area/awaymission/snowdin/post/cavern2)
"pb" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp{
+/obj/item/flashlight/lamp{
pixel_x = -5;
pixel_y = 5
},
@@ -10483,7 +10483,7 @@
/area/awaymission/snowdin/post/minipost)
"AF" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/neutral/side{
dir = 4
},
@@ -11269,7 +11269,7 @@
},
/area/awaymission/snowdin/cave)
"CY" = (
-/obj/item/device/aicard,
+/obj/item/aicard,
/turf/open/floor/plasteel/vault{
dir = 5
},
diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm
index f5a2565677..845238dafd 100644
--- a/_maps/RandomZLevels/spacebattle.dmm
+++ b/_maps/RandomZLevels/spacebattle.dmm
@@ -1694,7 +1694,7 @@
/area/awaymission/spacebattle/cruiser)
"gL" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/turf/open/floor/wood,
/area/awaymission/spacebattle/cruiser)
"gM" = (
@@ -1925,7 +1925,7 @@
/area/awaymission/spacebattle/cruiser)
"hE" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/violin,
+/obj/item/instrument/violin,
/turf/open/floor/wood,
/area/awaymission/spacebattle/cruiser)
"hF" = (
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index c965a22a1f..2e1d6377ac 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -388,7 +388,7 @@
req_access_txt = "201"
},
/obj/item/storage/bag/plants/portaseeder,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/item/clothing/mask/bandana,
/obj/item/hatchet,
/turf/open/floor/plasteel/vault{
@@ -398,7 +398,7 @@
/area/awaymission/undergroundoutpost45/central)
"bf" = (
/obj/item/storage/belt/security,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/secure_closet{
icon_state = "sec";
@@ -467,7 +467,7 @@
/area/awaymission/undergroundoutpost45/central)
"bn" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -2166,7 +2166,7 @@
"eX" = (
/obj/structure/table,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/item/screwdriver{
pixel_y = 10
},
@@ -3927,8 +3927,8 @@
/area/awaymission/undergroundoutpost45/gateway)
"iO" = (
/obj/structure/table,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel{
dir = 8;
heat_capacity = 1e+006;
@@ -4787,7 +4787,7 @@
pixel_x = -2;
pixel_y = -1
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plating{
heat_capacity = 1e+006
},
@@ -4799,8 +4799,8 @@
/obj/structure/sign/warning/biohazard{
pixel_y = 32
},
-/obj/item/device/assembly/prox_sensor,
-/obj/item/device/assembly/prox_sensor,
+/obj/item/assembly/prox_sensor,
+/obj/item/assembly/prox_sensor,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -5230,7 +5230,7 @@
pixel_x = -2;
pixel_y = -1
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/structure/sign/warning/nosmoking{
pixel_x = -32
},
@@ -5308,7 +5308,7 @@
"lu" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/item/reagent_containers/spray/pepper,
/obj/structure/closet/secure_closet{
icon_state = "sec";
@@ -5989,9 +5989,9 @@
"mB" = (
/obj/structure/table,
/obj/item/hand_labeler,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
@@ -6653,8 +6653,8 @@
dir = 8
},
/obj/structure/table,
-/obj/item/device/radio/off,
-/obj/item/device/laser_pointer,
+/obj/item/radio/off,
+/obj/item/laser_pointer,
/turf/open/floor/plasteel/cafeteria{
dir = 5;
heat_capacity = 1e+006
@@ -6715,10 +6715,10 @@
dir = 1
},
/obj/structure/table/reinforced,
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = -3
},
-/obj/item/device/paicard{
+/obj/item/paicard{
pixel_x = 4
},
/turf/open/floor/plasteel/cafeteria{
@@ -6734,7 +6734,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/item/screwdriver{
pixel_y = 10
},
@@ -8324,7 +8324,7 @@
dir = 2;
pixel_y = 24
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/yellow/corner{
dir = 1;
heat_capacity = 1e+006
@@ -9987,7 +9987,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel/red/side{
dir = 4;
heat_capacity = 1e+006
@@ -12034,7 +12034,7 @@
"xv" = (
/obj/structure/table,
/obj/item/pickaxe,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel{
heat_capacity = 1e+006
diff --git a/_maps/RandomZLevels/wildwest.dmm b/_maps/RandomZLevels/wildwest.dmm
index 5eb0f5f2c8..896f874960 100644
--- a/_maps/RandomZLevels/wildwest.dmm
+++ b/_maps/RandomZLevels/wildwest.dmm
@@ -700,7 +700,7 @@
"cD" = (
/obj/structure/table/wood,
/obj/item/clothing/gloves/color/yellow,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/wood,
/area/awaymission/wildwest/gov)
"cE" = (
diff --git a/_maps/cit_map_files/BoxStation/BoxStation.dmm b/_maps/cit_map_files/BoxStation/BoxStation.dmm
index 1b9ee66537..1e179288f8 100644
--- a/_maps/cit_map_files/BoxStation/BoxStation.dmm
+++ b/_maps/cit_map_files/BoxStation/BoxStation.dmm
@@ -11,7 +11,7 @@
/obj/machinery/chem_dispenser/drinks/beer{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/turf/open/floor/plasteel/bar,
@@ -116,7 +116,7 @@
/area/security/prison)
"aaq" = (
/obj/machinery/hydroponics/soil,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/machinery/camera{
c_tag = "Prison Common Room";
network = list("ss13","prison")
@@ -375,8 +375,8 @@
pixel_y = 10
},
/obj/structure/table/wood,
-/obj/item/device/radio/off,
-/obj/item/device/taperecorder,
+/obj/item/radio/off,
+/obj/item/taperecorder,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
"abl" = (
@@ -598,7 +598,7 @@
name = "Head of Security RC";
pixel_y = 30
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = -31
@@ -854,7 +854,7 @@
c_tag = "Prison Cell 3";
network = list("ss13","prison")
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -885,7 +885,7 @@
c_tag = "Prison Cell 2";
network = list("ss13","prison")
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -907,7 +907,7 @@
c_tag = "Prison Cell 1";
network = list("ss13","prison")
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -1003,7 +1003,7 @@
/area/crew_quarters/heads/hos)
"acR" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
on = 0;
pixel_x = -3;
pixel_y = 8
@@ -1231,10 +1231,10 @@
/area/crew_quarters/heads/hos)
"adq" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/guitar{
+/obj/item/instrument/guitar{
pixel_x = -7
},
-/obj/item/device/instrument/eguitar{
+/obj/item/instrument/eguitar{
pixel_x = 5
},
/turf/open/floor/wood,
@@ -1364,10 +1364,10 @@
/obj/item/folder/red{
pixel_x = 3
},
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = -3
},
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/item/reagent_containers/spray/pepper,
/turf/open/floor/plasteel/dark,
/area/security/execution/transfer)
@@ -1552,7 +1552,7 @@
/area/security/execution/transfer)
"aeb" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/security/execution/transfer)
@@ -1871,7 +1871,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
@@ -2090,7 +2090,7 @@
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
"afd" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -2255,7 +2255,7 @@
/turf/closed/wall/r_wall,
/area/security/execution/transfer)
"afB" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -2282,7 +2282,7 @@
/area/security/prison)
"afD" = (
/obj/structure/table,
-/obj/item/device/electropack,
+/obj/item/electropack,
/turf/open/floor/plasteel/red/side,
/area/security/prison)
"afE" = (
@@ -2291,7 +2291,7 @@
/area/hallway/secondary/exit)
"afF" = (
/obj/structure/table,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/signaler,
/obj/item/clothing/suit/straight_jacket,
/turf/open/floor/plasteel/red/side,
/area/security/prison)
@@ -2383,7 +2383,7 @@
"afV" = (
/obj/structure/table,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/timer,
+/obj/item/assembly/timer,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/security/main)
@@ -2407,7 +2407,7 @@
/area/security/main)
"afZ" = (
/obj/structure/table,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/item/screwdriver{
pixel_y = 10
},
@@ -2456,11 +2456,11 @@
/area/security/execution/transfer)
"agh" = (
/obj/structure/table,
-/obj/item/device/electropack,
+/obj/item/electropack,
/obj/item/screwdriver,
/obj/item/wrench,
/obj/item/clothing/head/helmet,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/signaler,
/obj/machinery/light/small,
/obj/machinery/airalarm{
dir = 1;
@@ -2620,7 +2620,7 @@
/area/security/main)
"agB" = (
/obj/structure/table,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/security/main)
@@ -2949,7 +2949,7 @@
/area/security/prison)
"ahq" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/dark,
/area/security/prison)
"ahr" = (
@@ -2961,7 +2961,7 @@
},
/area/security/brig)
"ahs" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -3252,7 +3252,7 @@
"ahV" = (
/obj/structure/table,
/obj/item/folder/red,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plasteel/dark,
/area/security/prison)
"ahW" = (
@@ -3454,7 +3454,7 @@
/turf/open/floor/plasteel/red/side,
/area/security/main)
"ait" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -3773,7 +3773,7 @@
},
/area/security/courtroom)
"ajj" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -4004,7 +4004,7 @@
/area/security/brig)
"ajO" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
dir = 8;
listening = 1;
@@ -4604,7 +4604,7 @@
},
/area/ai_monitored/nuke_storage)
"alw" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -4626,7 +4626,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -4717,7 +4717,7 @@
},
/area/security/courtroom)
"alJ" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/neutral/side,
/area/security/courtroom)
"alK" = (
@@ -4898,7 +4898,7 @@
req_access_txt = "2"
},
/obj/item/restraints/handcuffs,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel/dark,
/area/security/brig)
"amn" = (
@@ -5467,7 +5467,7 @@
/obj/machinery/light_switch{
pixel_x = -20
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/turf/open/floor/wood,
@@ -5519,7 +5519,7 @@
/obj/structure/sign/warning/vacuum/external{
pixel_y = 32
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plating,
/area/maintenance/solars/starboard/fore)
"aoj" = (
@@ -5645,7 +5645,7 @@
/obj/structure/chair{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -6546,7 +6546,7 @@
/area/lawoffice)
"are" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -6794,7 +6794,7 @@
"arR" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plating,
/area/security/vacantoffice/b)
"arS" = (
@@ -7567,7 +7567,7 @@
/area/lawoffice)
"auh" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/item/cartridge/lawyer,
/turf/open/floor/wood,
/area/lawoffice)
@@ -8210,8 +8210,8 @@
pixel_x = 1;
pixel_y = -1
},
-/obj/item/device/multitool,
-/obj/item/device/radio/intercom{
+/obj/item/multitool,
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -8708,7 +8708,7 @@
dir = 8;
pixel_x = 24
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -8769,7 +8769,7 @@
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
-/obj/item/device/assault_pod/mining,
+/obj/item/assault_pod/mining,
/obj/machinery/computer/security/telescreen{
desc = "Used for the Auxillary Mining Base.";
dir = 8;
@@ -9044,7 +9044,7 @@
/area/crew_quarters/dorms)
"axM" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"axN" = (
@@ -9294,8 +9294,8 @@
/obj/machinery/airalarm{
pixel_y = 23
},
-/obj/item/device/radio/off,
-/obj/item/device/assembly/timer,
+/obj/item/radio/off,
+/obj/item/assembly/timer,
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"ayw" = (
@@ -9417,10 +9417,10 @@
dir = 1
},
/obj/item/hand_labeler,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/storage/eva)
"ayO" = (
@@ -9462,7 +9462,7 @@
pixel_x = -2;
pixel_y = -1
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"ayS" = (
@@ -9480,8 +9480,8 @@
dir = 1
},
/obj/structure/table,
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
/obj/item/stock_parts/cell/high/plus,
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
@@ -9601,7 +9601,7 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -9730,7 +9730,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"azC" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -9899,10 +9899,10 @@
/area/crew_quarters/toilet)
"azY" = (
/obj/structure/table,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
-/obj/item/device/assembly/prox_sensor,
-/obj/item/device/assembly/prox_sensor,
+/obj/item/radio/off,
+/obj/item/radio/off,
+/obj/item/assembly/prox_sensor,
+/obj/item/assembly/prox_sensor,
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"azZ" = (
@@ -9946,7 +9946,7 @@
/turf/open/floor/plasteel/neutral/side,
/area/crew_quarters/dorms)
"aAg" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -11085,7 +11085,7 @@
"aDb" = (
/obj/structure/table,
/obj/item/wirecutters,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
@@ -11100,7 +11100,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 20
@@ -11150,11 +11150,11 @@
/area/gateway)
"aDk" = (
/obj/structure/table,
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -8;
pixel_y = -4
},
-/obj/item/device/assembly/igniter,
+/obj/item/assembly/igniter,
/obj/item/screwdriver{
pixel_y = 16
},
@@ -11170,7 +11170,7 @@
/area/storage/primary)
"aDl" = (
/obj/structure/table,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
/obj/machinery/airalarm{
pixel_y = 23
},
@@ -11187,15 +11187,15 @@
/area/storage/primary)
"aDn" = (
/obj/structure/table,
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
-/obj/item/device/radio/intercom{
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
+/obj/item/radio/intercom{
broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 20
},
-/obj/item/device/multitool,
-/obj/item/device/multitool{
+/obj/item/multitool,
+/obj/item/multitool{
pixel_x = 4
},
/turf/open/floor/plasteel,
@@ -11829,18 +11829,18 @@
/area/gateway)
"aES" = (
/obj/structure/table,
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_y = 6
},
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_x = 6;
pixel_y = 4
},
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_x = -6;
pixel_y = 4
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel,
/area/gateway)
"aET" = (
@@ -12135,9 +12135,9 @@
/turf/open/floor/plasteel/red/side,
/area/security/checkpoint/auxiliary)
"aFL" = (
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/item/crowbar,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/structure/table,
/turf/open/floor/plasteel/red/side{
dir = 6
@@ -12155,7 +12155,7 @@
/obj/item/cultivator,
/obj/item/hatchet,
/obj/item/crowbar,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/item/reagent_containers/glass/bucket,
/turf/open/floor/plasteel/green/side{
dir = 4
@@ -12236,7 +12236,7 @@
/turf/open/floor/plasteel,
/area/gateway)
"aFX" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -12511,7 +12511,7 @@
/obj/structure/mirror{
pixel_x = -28
},
-/obj/item/device/flashlight/lamp/bananalamp{
+/obj/item/flashlight/lamp/bananalamp{
pixel_y = 3
},
/turf/open/floor/plasteel/redblue,
@@ -12765,7 +12765,7 @@
/area/storage/primary)
"aHf" = (
/obj/structure/closet/wardrobe/chaplain_black,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/turf/open/floor/plasteel/grimy,
@@ -13402,7 +13402,7 @@
"aIN" = (
/obj/structure/table,
/obj/item/wrench,
-/obj/item/device/analyzer,
+/obj/item/analyzer,
/turf/open/floor/plasteel,
/area/storage/primary)
"aIO" = (
@@ -13440,7 +13440,7 @@
/obj/item/cultivator,
/obj/item/crowbar,
/obj/item/reagent_containers/glass/bucket,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/machinery/firealarm{
dir = 8;
pixel_x = -24
@@ -13452,8 +13452,8 @@
"aIT" = (
/obj/item/storage/bag/plants/portaseeder,
/obj/structure/table/glass,
-/obj/item/device/plant_analyzer,
-/obj/item/device/radio/intercom{
+/obj/item/plant_analyzer,
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -13490,7 +13490,7 @@
"aIW" = (
/obj/structure/table,
/obj/item/crowbar,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -13827,7 +13827,7 @@
/area/hydroponics)
"aJM" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp{
+/obj/item/flashlight/lamp{
pixel_y = 10
},
/obj/structure/disposalpipe/segment,
@@ -14021,7 +14021,7 @@
/turf/open/floor/plating,
/area/storage/primary)
"aKq" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/obj/machinery/camera{
@@ -14473,7 +14473,7 @@
/area/hallway/secondary/entry)
"aLA" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -15171,8 +15171,8 @@
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/cable_coil,
-/obj/item/device/flashlight/lamp,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp,
+/obj/item/flashlight/lamp/green,
/turf/open/floor/wood,
/area/crew_quarters/bar)
"aNE" = (
@@ -15321,7 +15321,7 @@
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"aNX" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1480;
name = "Confessional Intercom";
@@ -15373,7 +15373,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"aOe" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/camera{
c_tag = "Arrivals Bay 1 South"
},
@@ -15795,9 +15795,9 @@
/area/library)
"aPi" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
-/obj/item/device/camera,
-/obj/item/device/radio/intercom{
+/obj/item/taperecorder,
+/obj/item/camera,
+/obj/item/radio/intercom{
pixel_y = 25
},
/turf/open/floor/engine/cult,
@@ -15839,7 +15839,7 @@
c_tag = "Escape Arm Holding Area";
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -15874,7 +15874,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"aPv" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 20
@@ -16103,7 +16103,7 @@
"aQb" = (
/obj/structure/window/reinforced,
/obj/structure/table/wood,
-/obj/item/device/instrument/violin,
+/obj/item/instrument/violin,
/turf/open/floor/wood,
/area/crew_quarters/theatre)
"aQc" = (
@@ -16240,7 +16240,7 @@
},
/area/chapel/main)
"aQz" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1480;
name = "Confessional Intercom";
@@ -16522,9 +16522,9 @@
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/emergency,
/obj/item/wrench,
-/obj/item/device/assembly/timer,
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/timer,
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
/turf/open/floor/plasteel,
/area/bridge)
"aRt" = (
@@ -16577,7 +16577,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"aRB" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/obj/machinery/camera{
@@ -16803,7 +16803,7 @@
/area/maintenance/port)
"aSh" = (
/obj/structure/closet/wardrobe/mixed,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -16876,8 +16876,8 @@
/area/bridge)
"aSv" = (
/obj/structure/table/reinforced,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel,
/area/bridge)
"aSw" = (
@@ -16915,8 +16915,8 @@
/area/bridge)
"aSz" = (
/obj/structure/table/reinforced,
-/obj/item/device/aicard,
-/obj/item/device/multitool,
+/obj/item/aicard,
+/obj/item/multitool,
/turf/open/floor/plasteel/blue/side{
dir = 8
},
@@ -17285,8 +17285,8 @@
"aTF" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/structure/table,
-/obj/item/device/camera_film,
-/obj/item/device/camera,
+/obj/item/camera_film,
+/obj/item/camera,
/turf/open/floor/plasteel,
/area/storage/art)
"aTG" = (
@@ -17340,7 +17340,7 @@
/obj/structure/rack,
/obj/item/clothing/gloves/color/fyellow,
/obj/item/clothing/suit/hazardvest,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel,
/area/storage/tools)
@@ -17573,7 +17573,7 @@
/area/hydroponics)
"aUA" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/wood,
/area/security/vacantoffice)
"aUB" = (
@@ -17587,7 +17587,7 @@
/area/library)
"aUD" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -17706,7 +17706,7 @@
/area/crew_quarters/locker)
"aUW" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/turf/open/floor/wood,
/area/security/vacantoffice)
"aUX" = (
@@ -17886,7 +17886,7 @@
/turf/open/floor/plasteel,
/area/bridge)
"aVp" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -18114,8 +18114,8 @@
/area/library)
"aVS" = (
/obj/structure/table/wood,
-/obj/item/device/camera_film,
-/obj/item/device/camera_film,
+/obj/item/camera_film,
+/obj/item/camera_film,
/turf/open/floor/wood,
/area/library)
"aVT" = (
@@ -18141,7 +18141,7 @@
/turf/open/floor/plasteel/dark,
/area/chapel/main)
"aVW" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = -25
},
/turf/open/floor/plasteel/escape{
@@ -19131,7 +19131,7 @@
/area/security/detectives_office)
"aYj" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/structure/disposalpipe/segment{
dir = 10
},
@@ -19188,7 +19188,7 @@
},
/area/bridge)
"aYr" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -19690,7 +19690,7 @@
/area/quartermaster/warehouse)
"aZJ" = (
/obj/structure/table/wood,
-/obj/item/device/camera/detective,
+/obj/item/camera/detective,
/turf/open/floor/carpet,
/area/security/detectives_office)
"aZK" = (
@@ -20040,7 +20040,7 @@
/turf/open/floor/carpet,
/area/bridge/meeting_room)
"baJ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -20467,7 +20467,7 @@
/area/quartermaster/warehouse)
"bbT" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/turf/open/floor/carpet,
/area/security/detectives_office)
"bbU" = (
@@ -20836,13 +20836,13 @@
/area/bridge/meeting_room)
"bcY" = (
/obj/item/hand_labeler,
-/obj/item/device/assembly/timer,
+/obj/item/assembly/timer,
/obj/structure/table,
/turf/open/floor/wood,
/area/bridge/meeting_room)
"bcZ" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Station Intercom (Command)"
@@ -21295,7 +21295,7 @@
/obj/machinery/computer/upload/borg{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -21570,7 +21570,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"beN" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -21885,7 +21885,7 @@
/area/crew_quarters/heads/captain)
"bfC" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
"bfD" = (
@@ -22006,7 +22006,7 @@
},
/area/hallway/primary/starboard)
"bfY" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -22365,7 +22365,7 @@
dir = 8;
pixel_x = 24
},
-/obj/item/device/camera,
+/obj/item/camera,
/obj/item/storage/photo_album{
pixel_y = -10
},
@@ -22829,7 +22829,7 @@
/obj/structure/disposalpipe/trunk{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -22890,7 +22890,7 @@
/turf/closed/wall/r_wall,
/area/engine/gravity_generator)
"bik" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Station Intercom (Command)";
@@ -22994,7 +22994,7 @@
/obj/machinery/computer/secure_data{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = 25
},
/turf/open/floor/plasteel/red/side{
@@ -23348,7 +23348,7 @@
"bjp" = (
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -23389,7 +23389,7 @@
/area/quartermaster/storage)
"bju" = (
/obj/machinery/photocopier,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -23903,7 +23903,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/red/side{
dir = 6
@@ -24076,7 +24076,7 @@
pixel_y = 4
},
/obj/item/clothing/glasses/science,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -24318,10 +24318,10 @@
empty = 1;
name = "First-Aid (empty)"
},
-/obj/item/device/healthanalyzer,
-/obj/item/device/healthanalyzer,
-/obj/item/device/healthanalyzer,
-/obj/item/device/radio/intercom{
+/obj/item/healthanalyzer,
+/obj/item/healthanalyzer,
+/obj/item/healthanalyzer,
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -24742,7 +24742,7 @@
},
/area/medical/chemistry)
"bmJ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -24932,7 +24932,7 @@
pixel_y = 5
},
/obj/item/clothing/glasses/welding,
-/obj/item/device/multitool{
+/obj/item/multitool{
pixel_x = 3
},
/turf/open/floor/plasteel,
@@ -24943,12 +24943,12 @@
amount = 10
},
/obj/item/stack/cable_coil,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
@@ -25322,7 +25322,7 @@
/area/crew_quarters/heads/captain)
"bnZ" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain)
"boa" = (
@@ -25359,7 +25359,7 @@
"bod" = (
/obj/structure/table,
/obj/item/folder/white,
-/obj/item/device/radio/headset/headset_med,
+/obj/item/radio/headset/headset_med,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"boe" = (
@@ -25486,19 +25486,19 @@
/area/science/robotics/lab)
"bov" = (
/obj/structure/table,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -25591,9 +25591,9 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/device/mmi,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
"boH" = (
@@ -26036,7 +26036,7 @@
"bpH" = (
/obj/structure/table/glass,
/obj/item/folder/white,
-/obj/item/device/radio/headset/headset_medsci,
+/obj/item/radio/headset/headset_medsci,
/obj/machinery/requests_console{
department = "Genetics";
departmentType = 0;
@@ -26303,8 +26303,8 @@
layer = 2.9
},
/obj/structure/table/reinforced,
-/obj/item/device/destTagger,
-/obj/item/device/destTagger,
+/obj/item/destTagger,
+/obj/item/destTagger,
/turf/open/floor/plasteel/brown{
dir = 1
},
@@ -26401,7 +26401,7 @@
layer = 3
},
/obj/item/pen/blue,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -35
},
@@ -26851,7 +26851,7 @@
/obj/machinery/airalarm{
pixel_y = 23
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel/white/side{
dir = 2
},
@@ -26946,7 +26946,7 @@
departmentType = 2;
pixel_x = -30
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/machinery/camera{
c_tag = "Cargo Office";
dir = 4
@@ -27115,7 +27115,7 @@
pixel_y = 1
},
/obj/structure/table,
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
@@ -27135,7 +27135,7 @@
/turf/open/floor/plasteel,
/area/teleporter)
"bsl" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -27185,7 +27185,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -27216,7 +27216,7 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bst" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -27431,7 +27431,7 @@
/area/quartermaster/office)
"bsW" = (
/obj/structure/closet/wardrobe/robotics_black,
-/obj/item/device/radio/headset/headset_sci{
+/obj/item/radio/headset/headset_sci{
pixel_x = -3
},
/turf/open/floor/plasteel/white,
@@ -27906,7 +27906,7 @@
/area/medical/genetics)
"bub" = (
/obj/machinery/light,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -35
},
@@ -28851,7 +28851,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bwi" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -29798,7 +29798,7 @@
/area/crew_quarters/heads/hor)
"bys" = (
/obj/structure/rack,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -29949,7 +29949,7 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/supply)
"byM" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -30195,7 +30195,7 @@
/area/medical/genetics)
"bzr" = (
/obj/structure/closet/wardrobe/genetics_white,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -30372,10 +30372,10 @@
/area/crew_quarters/heads/hor)
"bzM" = (
/obj/structure/rack,
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = -3
},
-/obj/item/device/paicard{
+/obj/item/paicard{
pixel_x = 4
},
/obj/effect/turf_decal/stripes/line{
@@ -30499,7 +30499,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel/red/side{
dir = 4
},
@@ -30799,14 +30799,14 @@
/area/maintenance/port/aft)
"bAL" = (
/obj/structure/table,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/item/stock_parts/cell/high/plus,
/turf/open/floor/plating,
/area/storage/tech)
"bAM" = (
/obj/structure/table,
-/obj/item/device/analyzer,
-/obj/item/device/healthanalyzer,
+/obj/item/analyzer,
+/obj/item/healthanalyzer,
/obj/machinery/light/small{
dir = 1
},
@@ -30849,7 +30849,7 @@
c_tag = "Quartermaster's Office";
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -35
},
@@ -31320,7 +31320,7 @@
/turf/open/floor/plasteel/dark,
/area/science/server)
"bBY" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = -25
},
/obj/structure/filingcabinet,
@@ -31332,7 +31332,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel/red/side,
/area/security/checkpoint/science)
"bCa" = (
@@ -31416,7 +31416,7 @@
dir = 1;
network = list("ss13","rd")
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -31730,7 +31730,7 @@
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bCU" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -31931,16 +31931,16 @@
/area/maintenance/aft)
"bDv" = (
/obj/structure/table,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/ai_status_display{
pixel_x = -32
},
@@ -32270,7 +32270,7 @@
/area/crew_quarters/heads/cmo)
"bEl" = (
/obj/structure/disposalpipe/segment,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = 25
},
/obj/machinery/camera{
@@ -32358,7 +32358,7 @@
/area/science/mixing)
"bEw" = (
/obj/machinery/portable_atmospherics/canister,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/obj/effect/turf_decal/stripes/line{
@@ -32599,7 +32599,7 @@
/area/storage/tech)
"bEX" = (
/obj/structure/table,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/item/aiModule/reset,
/turf/open/floor/plating,
/area/storage/tech)
@@ -33063,19 +33063,19 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bGl" = (
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -4;
pixel_y = 1
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 8;
pixel_y = 9
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 9;
pixel_y = -2
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_y = 2
},
/obj/structure/table/reinforced,
@@ -33150,7 +33150,7 @@
/obj/machinery/cell_charger{
pixel_y = 5
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plating,
/area/storage/tech)
"bGw" = (
@@ -33591,7 +33591,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/obj/machinery/light/small{
@@ -33626,7 +33626,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -33750,7 +33750,7 @@
pixel_x = 1;
pixel_y = -1
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/clothing/glasses/meson,
/obj/machinery/light/small,
/turf/open/floor/plating,
@@ -34334,7 +34334,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"bJa" = (
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -34741,18 +34741,18 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bJW" = (
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = -5
},
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = -5
},
-/obj/item/device/transfer_valve,
-/obj/item/device/transfer_valve,
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve,
+/obj/item/transfer_valve,
+/obj/item/transfer_valve{
pixel_x = 5
},
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = 5
},
/obj/machinery/requests_console{
@@ -34766,18 +34766,18 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bJX" = (
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_y = 8
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -8;
pixel_y = 5
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = 6;
pixel_y = 5
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -2;
pixel_y = -2
},
@@ -34789,19 +34789,19 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bJZ" = (
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 5;
pixel_y = 4
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -4;
pixel_y = 2
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 6;
pixel_y = -4
},
-/obj/item/device/assembly/timer,
+/obj/item/assembly/timer,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/white,
/area/science/mixing)
@@ -35399,7 +35399,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"bLp" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plating/airless,
/area/science/test_area)
"bLq" = (
@@ -35483,8 +35483,8 @@
pixel_y = -1
},
/obj/item/clothing/gloves/color/yellow,
-/obj/item/device/t_scanner,
-/obj/item/device/multitool,
+/obj/item/t_scanner,
+/obj/item/multitool,
/turf/open/floor/plating,
/area/storage/tech)
"bLB" = (
@@ -35712,7 +35712,7 @@
pixel_y = 5
},
/obj/item/stack/cable_coil,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/stock_parts/cell/high/plus,
/obj/structure/window/reinforced{
dir = 4
@@ -36310,7 +36310,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"bNF" = (
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/effect/turf_decal/stripes/line{
dir = 2
},
@@ -36322,7 +36322,7 @@
/area/science/test_area)
"bNH" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -26
},
@@ -36373,7 +36373,7 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -36553,7 +36553,7 @@
/turf/open/floor/plasteel/white,
/area/medical/virology)
"bOo" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Station Intercom (Telecomms)";
@@ -37175,7 +37175,7 @@
/area/science/xenobiology)
"bPE" = (
/obj/structure/table/reinforced,
-/obj/item/device/slime_scanner,
+/obj/item/slime_scanner,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
@@ -37198,7 +37198,7 @@
/area/science/circuit)
"bPG" = (
/obj/machinery/chem_master,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -37392,7 +37392,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/light_switch{
pixel_x = -27;
@@ -37482,7 +37482,7 @@
c_tag = "Security Post - Engineering";
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -37741,7 +37741,7 @@
network = list("rd");
pixel_y = 28
},
-/obj/item/device/integrated_circuit_printer,
+/obj/item/integrated_circuit_printer,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"bQZ" = (
@@ -38204,9 +38204,9 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/device/electropack,
-/obj/item/device/healthanalyzer,
-/obj/item/device/assembly/signaler,
+/obj/item/electropack,
+/obj/item/healthanalyzer,
+/obj/item/assembly/signaler,
/turf/open/floor/plasteel,
/area/science/misc_lab)
"bSf" = (
@@ -38398,7 +38398,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bSG" = (
@@ -38414,9 +38414,9 @@
/obj/structure/table,
/obj/item/stack/sheet/glass/fifty,
/obj/item/storage/belt/utility,
-/obj/item/device/t_scanner,
-/obj/item/device/t_scanner,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
+/obj/item/t_scanner,
+/obj/item/t_scanner,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bSI" = (
@@ -38680,38 +38680,38 @@
/area/science/misc_lab)
"bTn" = (
/obj/structure/table,
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 5;
pixel_y = -4
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 2;
pixel_y = 6
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 2;
pixel_y = -1
},
/obj/machinery/light{
dir = 4
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -3;
pixel_y = 3
},
@@ -39311,7 +39311,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bUN" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bUO" = (
@@ -39454,7 +39454,7 @@
},
/area/hallway/primary/aft)
"bVg" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 20
@@ -39803,7 +39803,7 @@
name = "Virology Requests Console";
pixel_x = -32
},
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/clothing/glasses/hud/health,
/turf/open/floor/plasteel/whitegreen/side{
dir = 8
@@ -39812,7 +39812,7 @@
"bWg" = (
/obj/structure/table,
/obj/item/hand_labeler,
-/obj/item/device/radio/headset/headset_med,
+/obj/item/radio/headset/headset_med,
/turf/open/floor/plasteel/whitegreen/side{
dir = 4
},
@@ -39883,7 +39883,7 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"bWo" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = -25
},
/turf/open/floor/plasteel/floorgrime,
@@ -40075,7 +40075,7 @@
/turf/closed/wall/r_wall,
/area/security/checkpoint/engineering)
"bWR" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -40132,7 +40132,7 @@
/area/medical/virology)
"bWX" = (
/obj/structure/table/glass,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = -25
},
/obj/machinery/light{
@@ -40243,7 +40243,7 @@
/obj/item/folder/white,
/obj/item/folder/white,
/obj/item/pen,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plasteel/floorgrime,
/area/science/misc_lab)
"bXj" = (
@@ -41351,7 +41351,7 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"bZY" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = -25
},
/turf/open/floor/engine,
@@ -41377,7 +41377,7 @@
/area/maintenance/starboard/aft)
"cad" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cae" = (
@@ -41790,7 +41790,7 @@
/turf/open/floor/engine,
/area/science/misc_lab)
"caY" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/engine,
/area/science/misc_lab)
"caZ" = (
@@ -41835,9 +41835,9 @@
/area/science/misc_lab)
"cbe" = (
/obj/structure/table/reinforced,
-/obj/item/device/integrated_electronics/analyzer,
-/obj/item/device/integrated_electronics/debugger,
-/obj/item/device/integrated_electronics/wirer,
+/obj/item/integrated_electronics/analyzer,
+/obj/item/integrated_electronics/debugger,
+/obj/item/integrated_electronics/wirer,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"cbf" = (
@@ -42225,7 +42225,7 @@
/area/science/misc_lab)
"cbY" = (
/obj/structure/table/reinforced,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/screwdriver,
/obj/machinery/requests_console{
department = "Science";
@@ -42245,7 +42245,7 @@
network = list("rd");
pixel_y = -28
},
-/obj/item/device/integrated_circuit_printer,
+/obj/item/integrated_circuit_printer,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"cca" = (
@@ -42313,7 +42313,7 @@
/area/tcommsat/server)
"cci" = (
/obj/structure/table,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/yellow/side{
dir = 9
},
@@ -43049,7 +43049,7 @@
/area/tcommsat/server)
"cee" = (
/obj/structure/table,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel/yellow/side{
dir = 10
},
@@ -44925,7 +44925,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -45664,7 +45664,7 @@
/turf/open/floor/plasteel/floorgrime,
/area/maintenance/disposal/incinerator)
"clg" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -47072,7 +47072,7 @@
icon_state = "1-2"
},
/obj/structure/table/glass,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plasteel,
/area/engine/engineering)
"cpx" = (
@@ -47179,7 +47179,7 @@
/area/engine/engine_smes)
"cpT" = (
/obj/structure/table,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -35
},
@@ -47565,7 +47565,7 @@
/area/solar/starboard/aft)
"crl" = (
/obj/structure/table,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"crm" = (
@@ -47987,7 +47987,7 @@
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat_interior)
"cth" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -48064,7 +48064,7 @@
pixel_y = 28
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_y = 4
},
/obj/item/screwdriver{
@@ -48310,7 +48310,7 @@
/turf/closed/wall,
/area/ai_monitored/turret_protected/aisat_interior)
"cub" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -48538,7 +48538,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_x = 28
},
@@ -48619,7 +48619,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_x = -28
},
@@ -48663,7 +48663,7 @@
pixel_y = 3
},
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -48849,7 +48849,7 @@
/obj/machinery/porta_turret/ai{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -48991,14 +48991,14 @@
/area/ai_monitored/turret_protected/aisat/hallway)
"cvx" = (
/obj/effect/landmark/start/ai/secondary,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = 28
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
@@ -49006,7 +49006,7 @@
pixel_x = -27;
pixel_y = 5
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -49030,14 +49030,14 @@
/area/ai_monitored/turret_protected/aisat/hallway)
"cvA" = (
/obj/effect/landmark/start/ai/secondary,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = 28
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
@@ -49045,7 +49045,7 @@
pixel_x = 27;
pixel_y = 5
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -49272,7 +49272,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -50252,7 +50252,7 @@
/area/ai_monitored/turret_protected/ai)
"cAS" = (
/obj/effect/landmark/start/ai,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
@@ -50260,14 +50260,14 @@
pixel_x = -27;
pixel_y = -9
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = -31
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -50602,7 +50602,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"cBK" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -35
},
@@ -50703,7 +50703,7 @@
/obj/item/stack/cable_coil{
amount = 5
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plating,
/area/construction)
"cCc" = (
@@ -51296,7 +51296,7 @@
pixel_y = 5
},
/obj/item/clothing/glasses/welding,
-/obj/item/device/multitool{
+/obj/item/multitool{
pixel_x = 3
},
/turf/open/floor/plasteel,
@@ -51699,7 +51699,7 @@
/area/crew_quarters/heads/chief)
"cSM" = (
/obj/machinery/computer/station_alert,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 20
@@ -52002,7 +52002,7 @@
"cZO" = (
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/blood/old,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/signaler,
/turf/open/floor/plating,
/area/maintenance/bar)
"dfh" = (
@@ -52073,7 +52073,7 @@
/area/maintenance/bar)
"eaI" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = -30
},
/turf/open/floor/plasteel/white,
@@ -52820,7 +52820,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"jZP" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -53058,7 +53058,7 @@
name = "2maintenance loot spawner"
},
/obj/item/crowbar,
-/obj/item/device/electropack/shockcollar,
+/obj/item/electropack/shockcollar,
/turf/open/floor/plating,
/area/maintenance/bar)
"lyP" = (
@@ -53496,7 +53496,7 @@
pixel_x = 6;
pixel_y = -3
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1485;
listening = 1;
@@ -53986,7 +53986,7 @@
/area/maintenance/disposal/incinerator)
"uoB" = (
/obj/structure/table/reinforced,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/screwdriver,
/obj/machinery/camera{
c_tag = "Circuitry Lab North";
@@ -54055,7 +54055,7 @@
/area/security/armory)
"uCa" = (
/obj/structure/chair/stool,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -35
},
diff --git a/_maps/cit_map_files/Deltastation/DeltaStation2.dmm b/_maps/cit_map_files/Deltastation/DeltaStation2.dmm
index 2b49472df3..848b11f0e3 100644
--- a/_maps/cit_map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/cit_map_files/Deltastation/DeltaStation2.dmm
@@ -422,7 +422,7 @@
/turf/open/floor/plating,
/area/maintenance/solars/starboard/fore)
"acv" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -782,7 +782,7 @@
/area/hallway/secondary/entry)
"adx" = (
/obj/structure/table/reinforced,
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
@@ -955,7 +955,7 @@
/obj/item/stack/cable_coil/white,
/obj/item/stock_parts/cell/high,
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -1054,7 +1054,7 @@
/obj/structure/table/reinforced,
/obj/item/clipboard,
/obj/item/folder/yellow,
-/obj/item/device/assault_pod/mining,
+/obj/item/assault_pod/mining,
/turf/open/floor/plasteel/yellow/side{
dir = 4
},
@@ -1164,7 +1164,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"afV" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
@@ -2038,7 +2038,7 @@
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -2135,7 +2135,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -2784,12 +2784,12 @@
/area/security/vacantoffice)
"alq" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/grimy,
/area/security/vacantoffice)
"alr" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/light/small{
dir = 1
},
@@ -2873,7 +2873,7 @@
"alB" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/structure/reagent_dispensers/peppertank{
pixel_x = 32
},
@@ -3195,7 +3195,7 @@
/area/hallway/secondary/entry)
"amo" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/camera{
c_tag = "Arrivals - Center";
dir = 2;
@@ -3325,7 +3325,7 @@
/obj/structure/closet/crate{
icon_state = "crateopen"
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/neutral/side{
dir = 6
@@ -3443,7 +3443,7 @@
"amS" = (
/obj/structure/table/wood,
/obj/item/storage/briefcase,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/wood{
icon_state = "wood-broken4"
},
@@ -3523,7 +3523,7 @@
/area/security/vacantoffice)
"ane" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel/grimy,
/area/security/vacantoffice)
"anf" = (
@@ -3870,7 +3870,7 @@
/area/security/vacantoffice)
"aoa" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/carpet,
/area/security/vacantoffice)
"aob" = (
@@ -3949,7 +3949,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -4072,7 +4072,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -4312,11 +4312,11 @@
/area/security/vacantoffice)
"apc" = (
/obj/structure/table/wood,
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/turf/open/floor/wood,
/area/security/vacantoffice)
"apd" = (
@@ -4783,7 +4783,7 @@
/area/security/vacantoffice)
"aqh" = (
/obj/structure/table/wood,
-/obj/item/device/camera,
+/obj/item/camera,
/obj/machinery/light/small,
/obj/structure/sign/nanotrasen{
pixel_y = -32
@@ -4792,7 +4792,7 @@
/area/security/vacantoffice)
"aqi" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/sign/warning/nosmoking{
pixel_x = 32
},
@@ -5624,7 +5624,7 @@
/area/hallway/secondary/entry)
"arP" = (
/obj/machinery/vending/snack/random,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -6476,7 +6476,7 @@
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt,
/obj/item/weldingtool,
-/obj/item/device/assembly/voice,
+/obj/item/assembly/voice,
/obj/item/clothing/head/welding,
/obj/effect/spawner/lootdrop/maintenance,
/obj/structure/disposalpipe/segment{
@@ -6598,7 +6598,7 @@
/area/space/nearstation)
"atK" = (
/obj/structure/table/reinforced,
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
@@ -6782,8 +6782,8 @@
/obj/item/tank/internals/emergency_oxygen/engi{
pixel_x = 5
},
-/obj/item/device/geiger_counter,
-/obj/item/device/geiger_counter,
+/obj/item/geiger_counter,
+/obj/item/geiger_counter,
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
@@ -7358,7 +7358,7 @@
/area/engine/atmospherics_engine)
"ave" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -7508,7 +7508,7 @@
/area/maintenance/port/fore)
"avx" = (
/obj/structure/table/wood,
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/machinery/airalarm{
pixel_y = 23
@@ -8113,7 +8113,7 @@
/area/crew_quarters/toilet/auxiliary)
"awN" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -8261,7 +8261,7 @@
"axh" = (
/obj/structure/table/reinforced,
/obj/item/storage/box/lights/mixed,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -8513,7 +8513,7 @@
/area/maintenance/port/fore)
"axO" = (
/obj/structure/table/wood,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/wood{
icon_state = "wood-broken3"
},
@@ -8567,7 +8567,7 @@
pixel_y = 3
},
/obj/item/storage/box/lights/mixed,
-/obj/item/device/lightreplacer,
+/obj/item/lightreplacer,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -9119,7 +9119,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/item/mop,
/obj/item/mop,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -11653,7 +11653,7 @@
"aEO" = (
/obj/structure/table/wood,
/obj/structure/reagent_dispensers/beerkeg,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -11779,7 +11779,7 @@
pixel_y = 3
},
/obj/item/storage/fancy/cigarettes/cigars/havana,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -11941,7 +11941,7 @@
/turf/open/floor/plasteel,
/area/engine/atmospherics_engine)
"aFv" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -28;
pixel_y = -28
@@ -12092,7 +12092,7 @@
/area/hydroponics/garden/abandoned)
"aFN" = (
/obj/structure/table,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/item/hatchet,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
@@ -12138,7 +12138,7 @@
/area/maintenance/port/fore)
"aFT" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/button/door{
id = "AuxCabinA";
name = "Dormitory Door Lock";
@@ -12151,7 +12151,7 @@
/area/hallway/secondary/service)
"aFU" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel/grimy,
/area/hallway/secondary/service)
"aFV" = (
@@ -12422,7 +12422,7 @@
},
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/button/door{
desc = "A remote control switch.";
id = "cardoor";
@@ -12441,7 +12441,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -12693,7 +12693,7 @@
/turf/open/floor/plating,
/area/security/prison)
"aGM" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -13761,7 +13761,7 @@
"aIN" = (
/obj/structure/table/wood,
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/wood,
/area/hallway/secondary/service)
"aIO" = (
@@ -14062,7 +14062,7 @@
/turf/open/floor/plasteel,
/area/security/prison)
"aJB" = (
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/neutral/corner,
@@ -14414,7 +14414,7 @@
/area/maintenance/port/fore)
"aKm" = (
/obj/structure/table/wood,
-/obj/item/device/camera,
+/obj/item/camera,
/obj/machinery/newscaster{
pixel_x = -32
},
@@ -14525,7 +14525,7 @@
/area/crew_quarters/bar/atrium)
"aKB" = (
/obj/structure/chair/stool/bar,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -14956,7 +14956,7 @@
/obj/structure/cable/white{
icon_state = "0-8"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -15633,11 +15633,11 @@
/obj/machinery/status_display{
pixel_x = -32
},
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -15711,7 +15711,7 @@
/area/crew_quarters/bar/atrium)
"aNk" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -15787,7 +15787,7 @@
dir = 8
},
/obj/structure/disposalpipe/segment,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -16148,7 +16148,7 @@
/turf/open/floor/plasteel/vault,
/area/engine/atmos)
"aOd" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -16305,7 +16305,7 @@
/area/crew_quarters/theatre)
"aOw" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/eguitar,
+/obj/item/instrument/eguitar,
/obj/item/toy/crayon/spraycan/lubecan{
charges = 5
},
@@ -16344,10 +16344,10 @@
},
/obj/item/storage/crayons,
/obj/item/storage/crayons,
-/obj/item/device/flashlight/lamp/bananalamp{
+/obj/item/flashlight/lamp/bananalamp{
pixel_y = 5
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -16376,7 +16376,7 @@
/area/crew_quarters/bar/atrium)
"aOD" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/guitar,
+/obj/item/instrument/guitar,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -17148,7 +17148,7 @@
dir = 8;
pixel_x = -24
},
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -17300,7 +17300,7 @@
"aQC" = (
/obj/structure/table,
/obj/item/folder/yellow,
-/obj/item/device/destTagger,
+/obj/item/destTagger,
/turf/open/floor/plasteel/brown,
/area/quartermaster/sorting)
"aQD" = (
@@ -17466,7 +17466,7 @@
"aQX" = (
/obj/structure/table/glass,
/obj/item/folder/blue,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/machinery/light{
dir = 1
},
@@ -17528,7 +17528,7 @@
/area/security/prison)
"aRf" = (
/obj/machinery/holopad,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom";
@@ -18269,7 +18269,7 @@
pixel_x = 26;
pixel_y = 32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = 28
@@ -18290,7 +18290,7 @@
/area/quartermaster/qm)
"aSA" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/brown{
dir = 5
},
@@ -18445,7 +18445,7 @@
pixel_x = 3
},
/obj/item/restraints/handcuffs,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
@@ -18931,7 +18931,7 @@
/area/crew_quarters/bar/atrium)
"aTI" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aTJ" = (
@@ -18994,7 +18994,7 @@
"aTQ" = (
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/pen/red,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
@@ -19220,7 +19220,7 @@
/area/quartermaster/qm)
"aUm" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -19405,8 +19405,8 @@
/obj/structure/reagent_dispensers/peppertank{
pixel_x = -32
},
-/obj/item/device/electropack,
-/obj/item/device/assembly/signaler,
+/obj/item/electropack,
+/obj/item/assembly/signaler,
/obj/machinery/light{
dir = 8
},
@@ -19750,7 +19750,7 @@
/area/hallway/secondary/service)
"aVn" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/violin,
+/obj/item/instrument/violin,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -20284,8 +20284,8 @@
pixel_x = -7;
pixel_y = -26
},
-/obj/item/device/flashlight/lamp,
-/obj/item/device/radio/intercom{
+/obj/item/flashlight/lamp,
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -20658,7 +20658,7 @@
},
/area/crew_quarters/bar/atrium)
"aXb" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26;
pixel_y = -26
@@ -20875,7 +20875,7 @@
/obj/item/cartridge/quartermaster{
pixel_y = 6
},
-/obj/item/device/gps/mining,
+/obj/item/gps/mining,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -20921,7 +20921,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -21139,7 +21139,7 @@
"aYf" = (
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
-/obj/item/device/lightreplacer,
+/obj/item/lightreplacer,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -22298,7 +22298,7 @@
/turf/closed/wall,
/area/hydroponics)
"baw" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -22461,7 +22461,7 @@
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = 28
@@ -22672,7 +22672,7 @@
/area/security/prison)
"bbl" = (
/obj/machinery/light,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -22968,7 +22968,7 @@
/area/hydroponics)
"bbX" = (
/obj/structure/closet/wardrobe/botanist,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -23189,7 +23189,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -23372,7 +23372,7 @@
/obj/item/restraints/handcuffs,
/obj/item/restraints/handcuffs,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault,
/area/security/prison)
"bcQ" = (
@@ -23853,7 +23853,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -24061,7 +24061,7 @@
/turf/open/floor/plasteel,
/area/security/prison)
"bes" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -24119,7 +24119,7 @@
/area/engine/atmos)
"beA" = (
/obj/structure/table/reinforced,
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
@@ -24338,7 +24338,7 @@
dir = 1;
pixel_y = -22
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26;
pixel_y = -26
@@ -25401,7 +25401,7 @@
/area/hydroponics)
"bhC" = (
/obj/structure/table/glass,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -25464,7 +25464,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -25505,7 +25505,7 @@
/turf/open/floor/plasteel/red,
/area/crew_quarters/kitchen)
"bhO" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -25760,7 +25760,7 @@
"bir" = (
/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/purple/side{
dir = 4
},
@@ -25959,7 +25959,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 26
@@ -26218,7 +26218,7 @@
/obj/structure/closet/crate{
icon_state = "crateopen"
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -26579,7 +26579,7 @@
icon_state = "4-8"
},
/obj/item/folder/yellow,
-/obj/item/device/gps/mining,
+/obj/item/gps/mining,
/turf/open/floor/plasteel/brown{
dir = 6
},
@@ -26622,7 +26622,7 @@
icon_state = "4-8"
},
/obj/item/clothing/gloves/color/latex,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/reagent_containers/spray/cleaner{
pixel_x = -3;
pixel_y = 2
@@ -26768,11 +26768,11 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = 3
},
/obj/item/storage/box/deputy,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -27421,7 +27421,7 @@
/obj/structure/closet/wardrobe/miner,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_y = -26
@@ -27485,7 +27485,7 @@
/area/security/brig)
"bmf" = (
/obj/structure/bed/roller,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -27622,7 +27622,7 @@
pixel_x = 32;
pixel_y = 32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 58
@@ -27685,7 +27685,7 @@
/obj/item/storage/secure/safe/HoS{
pixel_x = 32
},
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/heads/hos)
"bmD" = (
@@ -28272,7 +28272,7 @@
"bnN" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -28367,7 +28367,7 @@
/area/crew_quarters/heads/hos)
"bnX" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/white{
icon_state = "1-2"
@@ -28523,7 +28523,7 @@
"bop" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -28578,7 +28578,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
@@ -28923,7 +28923,7 @@
name = "Labor Camp Monitoring";
network = list("labor")
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -30069,7 +30069,7 @@
"brr" = (
/obj/structure/table/reinforced,
/obj/item/folder/red,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -30094,7 +30094,7 @@
"bru" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
@@ -30444,7 +30444,7 @@
"bse" = (
/obj/structure/table/reinforced,
/obj/item/storage/belt/utility,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 2
},
@@ -30791,7 +30791,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -31263,7 +31263,7 @@
/obj/machinery/ai_status_display{
pixel_y = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = -26
@@ -32561,7 +32561,7 @@
/turf/open/floor/plasteel/caution,
/area/engine/atmos)
"bwx" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -32794,7 +32794,7 @@
/area/hydroponics)
"bwO" = (
/obj/machinery/hydroponics/constructable,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -33272,7 +33272,7 @@
/obj/structure/table/reinforced,
/obj/item/crowbar/red,
/obj/item/wrench,
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
@@ -33437,7 +33437,7 @@
pixel_y = 32
},
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/dark,
/area/bridge)
"byk" = (
@@ -33854,7 +33854,7 @@
/area/ai_monitored/turret_protected/ai)
"bzc" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -34254,7 +34254,7 @@
dir = 4
},
/obj/structure/disposalpipe/segment,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -34329,8 +34329,8 @@
dir = 4
},
/obj/item/wrench,
-/obj/item/device/assembly/timer,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/timer,
+/obj/item/assembly/signaler,
/turf/open/floor/plasteel/darkyellow/corner{
dir = 4
},
@@ -34552,7 +34552,7 @@
/obj/structure/cable/white{
icon_state = "1-8"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -34742,7 +34742,7 @@
/obj/machinery/power/terminal{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -34981,25 +34981,25 @@
/area/hallway/primary/port)
"bBj" = (
/obj/structure/table/reinforced,
-/obj/item/device/plant_analyzer,
-/obj/item/device/plant_analyzer,
-/obj/item/device/radio,
+/obj/item/plant_analyzer,
+/obj/item/plant_analyzer,
+/obj/item/radio,
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/storage/tech)
"bBk" = (
/obj/structure/table/reinforced,
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/storage/tech)
@@ -35019,16 +35019,16 @@
"bBn" = (
/obj/structure/table/reinforced,
/obj/item/aiModule/reset,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/storage/tech)
"bBo" = (
/obj/structure/table/reinforced,
/obj/item/bodypart/chest/robot,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -35186,7 +35186,7 @@
/turf/open/floor/plasteel/dark,
/area/bridge)
"bBG" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26;
pixel_y = 26
@@ -35208,7 +35208,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -35229,7 +35229,7 @@
},
/area/bridge)
"bBL" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 26
@@ -35369,7 +35369,7 @@
/turf/open/floor/plasteel/neutral,
/area/security/execution/transfer)
"bCc" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -35407,7 +35407,7 @@
/turf/open/floor/plasteel,
/area/security/brig)
"bCg" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -35446,8 +35446,8 @@
/area/security/main)
"bCk" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
-/obj/item/device/radio/intercom{
+/obj/item/flashlight/lamp,
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 1;
freerange = 1;
@@ -35866,7 +35866,7 @@
/area/engine/break_room)
"bCY" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/caution{
dir = 10
},
@@ -35896,7 +35896,7 @@
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
/obj/item/pen,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -35932,13 +35932,13 @@
/area/hallway/primary/port)
"bDe" = (
/obj/structure/table/reinforced,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/stack/cable_coil/white{
pixel_x = 3;
pixel_y = 3
},
/obj/item/stack/cable_coil/white,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/machinery/light{
dir = 8
},
@@ -35972,7 +35972,7 @@
/area/storage/tech)
"bDk" = (
/obj/structure/table/reinforced,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/machinery/light{
dir = 4
},
@@ -35986,16 +35986,16 @@
/area/storage/primary)
"bDm" = (
/obj/structure/table/reinforced,
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
/obj/machinery/light{
dir = 8
},
@@ -36129,9 +36129,9 @@
/area/storage/primary)
"bDt" = (
/obj/structure/table/reinforced,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/light{
dir = 1
@@ -36641,7 +36641,7 @@
/turf/closed/wall,
/area/security/brig)
"bEf" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
@@ -36649,14 +36649,14 @@
pixel_x = -10;
pixel_y = 22
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
name = "Common Channel";
pixel_x = -27
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -36755,7 +36755,7 @@
/turf/open/floor/circuit/green,
/area/ai_monitored/turret_protected/ai)
"bEm" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
@@ -36763,14 +36763,14 @@
pixel_x = 10;
pixel_y = 22
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
name = "Common Channel";
pixel_x = 27
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -37279,7 +37279,7 @@
/obj/structure/table/reinforced,
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/gps,
+/obj/item/gps,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/storage/primary)
@@ -37446,7 +37446,7 @@
},
/obj/structure/table/wood,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -37482,7 +37482,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -37668,7 +37668,7 @@
/turf/open/floor/plating,
/area/security/warden)
"bFQ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -37692,7 +37692,7 @@
},
/area/ai_monitored/turret_protected/ai)
"bFT" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
@@ -37700,14 +37700,14 @@
pixel_x = -27;
pixel_y = -7
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = -27
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -38108,7 +38108,7 @@
},
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/micro_laser,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -38119,7 +38119,7 @@
"bGG" = (
/obj/structure/rack,
/obj/item/airlock_painter,
-/obj/item/device/toner,
+/obj/item/toner,
/obj/machinery/status_display{
pixel_x = -32
},
@@ -38269,7 +38269,7 @@
"bHb" = (
/obj/structure/rack,
/obj/machinery/light/small,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/item/storage/secure/briefcase,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -38280,7 +38280,7 @@
dir = 8
},
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
@@ -38618,7 +38618,7 @@
/obj/structure/table/reinforced,
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/mmi,
+/obj/item/mmi,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -38781,7 +38781,7 @@
"bIc" = (
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
-/obj/item/device/lightreplacer,
+/obj/item/lightreplacer,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -39033,7 +39033,7 @@
"bIA" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/storage/primary)
@@ -39194,7 +39194,7 @@
pixel_x = -7;
pixel_y = -26
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = -26
@@ -39353,7 +39353,7 @@
icon_state = "1-8"
},
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/camera/detective,
+/obj/item/camera/detective,
/turf/open/floor/plasteel/vault,
/area/security/detectives_office)
"bJj" = (
@@ -39367,7 +39367,7 @@
areastring = "/area/security/detectives_office";
pixel_y = 24
},
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/item/restraints/handcuffs,
/turf/open/floor/plasteel/vault,
/area/security/detectives_office)
@@ -39642,7 +39642,7 @@
"bJN" = (
/obj/structure/table/reinforced,
/obj/item/folder/blue,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -39700,7 +39700,7 @@
"bJT" = (
/obj/structure/table/reinforced,
/obj/item/clipboard,
-/obj/item/device/gps/engineering{
+/obj/item/gps/engineering{
gpstag = "CE0"
},
/obj/machinery/newscaster{
@@ -39959,7 +39959,7 @@
/area/storage/tech)
"bKs" = (
/obj/machinery/vending/tool,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -40005,7 +40005,7 @@
pixel_y = 32
},
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/wood,
/area/bridge/meeting_room/council)
"bKz" = (
@@ -40066,7 +40066,7 @@
/area/bridge/meeting_room/council)
"bKG" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/wood,
/area/bridge/meeting_room/council)
"bKH" = (
@@ -40165,7 +40165,7 @@
"bKV" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -41002,7 +41002,7 @@
/area/tcommsat/computer)
"bMy" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -41066,11 +41066,11 @@
/area/tcommsat/computer)
"bME" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
-/obj/item/device/radio{
+/obj/item/radio{
pixel_y = 5
},
/turf/open/floor/plasteel/grimy,
@@ -41080,7 +41080,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -41398,14 +41398,14 @@
pixel_x = 3;
pixel_y = -3
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
/obj/item/clothing/mask/gas/sechailer,
/obj/item/clothing/mask/gas/sechailer,
-/obj/item/device/flashlight/seclite,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
/turf/open/floor/plasteel/red/side{
dir = 5
},
@@ -41431,7 +41431,7 @@
pixel_y = -2
},
/obj/structure/table/reinforced,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -41717,7 +41717,7 @@
/area/crew_quarters/heads/chief)
"bNR" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/heads/chief)
"bNS" = (
@@ -41755,7 +41755,7 @@
/turf/open/floor/plasteel,
/area/engine/break_room)
"bNW" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -41867,7 +41867,7 @@
/obj/structure/table/reinforced,
/obj/item/clothing/gloves/color/yellow,
/obj/item/storage/toolbox/electrical,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/machinery/light{
dir = 8
},
@@ -42193,7 +42193,7 @@
/obj/structure/rack,
/obj/item/clothing/gloves/color/fyellow,
/obj/item/clothing/suit/hazardvest,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/structure/extinguisher_cabinet{
pixel_x = -26
},
@@ -42224,7 +42224,7 @@
/turf/open/floor/plasteel/neutral,
/area/storage/tools)
"bPb" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -42492,7 +42492,7 @@
id = "AI";
pixel_x = -26
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -42765,10 +42765,10 @@
/area/storage/tech)
"bQl" = (
/obj/structure/table/reinforced,
-/obj/item/device/assembly/timer,
-/obj/item/device/assembly/timer,
-/obj/item/device/assembly/voice,
-/obj/item/device/assembly/voice,
+/obj/item/assembly/timer,
+/obj/item/assembly/timer,
+/obj/item/assembly/voice,
+/obj/item/assembly/voice,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/storage/tech)
@@ -42794,7 +42794,7 @@
/obj/structure/table/reinforced,
/obj/item/wrench,
/obj/item/crowbar,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/machinery/newscaster{
pixel_y = -32
},
@@ -42804,18 +42804,18 @@
"bQp" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/storage/tech)
"bQq" = (
/obj/structure/table/reinforced,
-/obj/item/device/assembly/timer,
-/obj/item/device/assembly/timer,
-/obj/item/device/multitool,
-/obj/item/device/multitool,
+/obj/item/assembly/timer,
+/obj/item/assembly/timer,
+/obj/item/multitool,
+/obj/item/multitool,
/obj/machinery/light,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -42840,15 +42840,15 @@
/area/storage/primary)
"bQu" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = -5;
pixel_y = 5
},
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
@@ -43006,7 +43006,7 @@
pixel_x = -32;
pixel_y = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = -26
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -43203,7 +43203,7 @@
pixel_y = -26
},
/obj/structure/disposalpipe/segment,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/item/reagent_containers/food/drinks/flask/det,
/turf/open/floor/carpet,
/area/security/detectives_office)
@@ -43630,7 +43630,7 @@
/area/crew_quarters/heads/chief)
"bSe" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/ai_status_display{
pixel_y = 32
},
@@ -43850,7 +43850,7 @@
pixel_x = -26;
pixel_y = -26
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -43951,7 +43951,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Bridge - Captain's Office";
@@ -44012,7 +44012,7 @@
"bSQ" = (
/obj/structure/table/wood,
/obj/item/storage/photo_album,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
"bSR" = (
@@ -44754,7 +44754,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
@@ -44845,7 +44845,7 @@
pixel_x = 32;
pixel_y = 32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -45462,7 +45462,7 @@
/obj/item/screwdriver{
pixel_y = 5
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/red/side{
dir = 4
},
@@ -45630,7 +45630,7 @@
name = "MiniSat Antechamber";
req_access_txt = "16"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -45803,7 +45803,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -46126,7 +46126,7 @@
pixel_x = 24
},
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/radio,
+/obj/item/radio,
/turf/open/floor/plasteel/red/side{
dir = 4
},
@@ -46265,7 +46265,7 @@
pixel_x = -38;
pixel_y = 7
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -46391,7 +46391,7 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain)
"bXf" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = -26
},
/turf/open/floor/plasteel/grimy,
@@ -46587,7 +46587,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"bXz" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/structure/cable/white{
icon_state = "4-8"
},
@@ -48036,7 +48036,7 @@
dir = 1
},
/obj/machinery/light,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -48142,7 +48142,7 @@
/obj/item/clipboard,
/obj/item/toy/figure/borg,
/obj/machinery/light,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -48163,7 +48163,7 @@
/obj/machinery/ai_status_display{
pixel_y = -32
},
-/obj/item/device/aicard,
+/obj/item/aicard,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -48828,9 +48828,9 @@
pixel_x = 3;
pixel_y = -3
},
-/obj/item/device/flashlight/seclite,
-/obj/item/device/flashlight/seclite,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -49138,7 +49138,7 @@
/area/library)
"cco" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -49167,11 +49167,11 @@
/area/library)
"cct" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -49200,7 +49200,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -49343,7 +49343,7 @@
/obj/structure/table/wood,
/obj/item/pinpointer/nuke,
/obj/item/disk/nuclear,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -49374,7 +49374,7 @@
/area/crew_quarters/heads/captain/private)
"ccQ" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/obj/structure/window/reinforced{
dir = 8
},
@@ -49502,7 +49502,7 @@
/obj/structure/table/wood,
/obj/item/book/manual/wiki/security_space_law,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = 3
},
/obj/item/clothing/glasses/sunglasses,
@@ -49592,7 +49592,7 @@
/turf/open/floor/plasteel/neutral,
/area/security/brig)
"cdp" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = -7
@@ -50669,7 +50669,7 @@
},
/area/security/brig)
"cfn" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -50952,7 +50952,7 @@
/obj/structure/sign/warning/electricshock{
pixel_x = 32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = -26
@@ -51156,7 +51156,7 @@
/area/tcommsat/server)
"cgr" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Captain's Intercom";
@@ -51288,7 +51288,7 @@
/area/security/courtroom)
"cgE" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom"
},
/turf/open/floor/plasteel/neutral/side{
@@ -51511,7 +51511,7 @@
"cgZ" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -51980,7 +51980,7 @@
/area/library)
"chW" = (
/obj/structure/chair/comfy/brown,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -52354,15 +52354,15 @@
dir = 4;
pixel_x = -23
},
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = -5;
pixel_y = 5
},
-/obj/item/device/radio,
+/obj/item/radio,
/turf/open/floor/plasteel/red/side{
dir = 10
},
@@ -52633,7 +52633,7 @@
/area/maintenance/port)
"cjr" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/newscaster{
pixel_x = -32
},
@@ -52700,7 +52700,7 @@
/obj/machinery/keycard_auth{
pixel_x = -26
},
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -52887,7 +52887,7 @@
/turf/open/floor/plasteel,
/area/security/courtroom)
"cjY" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/neutral/side{
dir = 8
},
@@ -52906,7 +52906,7 @@
/area/security/courtroom)
"ckb" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -32
},
@@ -52941,8 +52941,8 @@
/area/security/courtroom)
"cke" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
-/obj/item/device/radio/intercom{
+/obj/item/flashlight/lamp,
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -53040,7 +53040,7 @@
"ckn" = (
/obj/structure/table/reinforced,
/obj/item/aiModule/reset,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -53089,7 +53089,7 @@
"ckt" = (
/obj/structure/table/reinforced,
/obj/item/aiModule/supplied/quarantine,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -53514,7 +53514,7 @@
icon_state = "crateopen"
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/starboard)
@@ -54186,7 +54186,7 @@
/area/security/courtroom)
"cmU" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom"
},
/turf/open/floor/plasteel/neutral/side,
@@ -54625,12 +54625,12 @@
"cnG" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -54701,7 +54701,7 @@
/area/library)
"cnR" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/window/reinforced{
dir = 8
},
@@ -54725,11 +54725,11 @@
/area/library)
"cnV" = (
/obj/structure/table/wood,
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
@@ -54799,7 +54799,7 @@
/area/crew_quarters/heads/hop)
"cod" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -54963,7 +54963,7 @@
/area/hallway/primary/central)
"cot" = (
/obj/item/twohanded/required/kirbyplants/random,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -55335,7 +55335,7 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 20
},
-/obj/item/device/gps/engineering{
+/obj/item/gps/engineering{
gpstag = "ENG0"
},
/obj/effect/turf_decal/bot,
@@ -55376,7 +55376,7 @@
"cpo" = (
/obj/structure/tank_dispenser,
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -55472,11 +55472,11 @@
/area/library)
"cpA" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/heads/hop)
"cpB" = (
@@ -55584,7 +55584,7 @@
"cpN" = (
/obj/structure/rack,
/obj/item/tank/internals/oxygen,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -26
@@ -56232,7 +56232,7 @@
/area/security/courtroom)
"crm" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom"
},
/turf/open/floor/plasteel/vault,
@@ -56684,7 +56684,7 @@
"csl" = (
/obj/structure/table/wood,
/obj/item/storage/bag/books,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/structure/noticeboard{
dir = 8;
pixel_x = 32
@@ -56840,7 +56840,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -57439,7 +57439,7 @@
dir = 8;
pixel_x = 24
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -57680,7 +57680,7 @@
/obj/structure/cable/white{
icon_state = "1-8"
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -57955,7 +57955,7 @@
icon_state = "crateopen"
},
/obj/item/clothing/shoes/jackboots,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/item/storage/secure/briefcase,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -58563,11 +58563,11 @@
/area/crew_quarters/locker)
"cvV" = (
/obj/structure/table,
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -58575,7 +58575,7 @@
/area/crew_quarters/locker)
"cvW" = (
/obj/structure/table,
-/obj/item/device/camera,
+/obj/item/camera,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
@@ -58810,7 +58810,7 @@
/area/hallway/primary/central)
"cwB" = (
/obj/item/stack/cable_coil,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -59022,7 +59022,7 @@
amount = 25
},
/obj/item/storage/toolbox/emergency,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/structure/extinguisher_cabinet{
pixel_x = 26
},
@@ -59336,7 +59336,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -60197,7 +60197,7 @@
/area/library)
"czE" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment{
dir = 4
@@ -60268,10 +60268,10 @@
/obj/machinery/light,
/obj/structure/table/wood,
/obj/item/folder,
-/obj/item/device/laser_pointer{
+/obj/item/laser_pointer{
pixel_x = 3
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -60279,8 +60279,8 @@
/area/library)
"czN" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
-/obj/item/device/camera,
+/obj/item/taperecorder,
+/obj/item/camera,
/obj/machinery/ai_status_display{
pixel_y = -32
},
@@ -60347,7 +60347,7 @@
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"czU" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/neutral,
/area/ai_monitored/storage/eva)
"czV" = (
@@ -60821,7 +60821,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/maintenance/port)
@@ -61087,7 +61087,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -61142,7 +61142,7 @@
/area/gateway)
"cBG" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -61330,7 +61330,7 @@
/area/crew_quarters/locker)
"cBW" = (
/obj/structure/table,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/structure/cable/white{
icon_state = "4-8"
},
@@ -61409,7 +61409,7 @@
/area/crew_quarters/dorms)
"cCe" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/sign/nanotrasen{
pixel_x = -32
},
@@ -61431,7 +61431,7 @@
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/suit/jacket/letterman_nanotrasen,
/obj/item/clothing/suit/toggle/lawyer,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 26
@@ -61466,7 +61466,7 @@
name = "trenchcoat"
},
/obj/item/clothing/suit/toggle/lawyer/purple,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 26
@@ -62177,7 +62177,7 @@
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"cDD" = (
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/turf/open/floor/wood{
icon_state = "wood-broken3"
},
@@ -62491,7 +62491,7 @@
/area/maintenance/port)
"cEp" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/dark,
/area/library)
"cEq" = (
@@ -62507,7 +62507,7 @@
/area/library)
"cEr" = (
/obj/item/twohanded/required/kirbyplants/random,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -62753,9 +62753,9 @@
"cES" = (
/obj/structure/table,
/obj/item/storage/belt,
-/obj/item/device/radio,
-/obj/item/device/radio,
-/obj/item/device/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
/obj/machinery/firealarm{
dir = 8;
pixel_x = -24
@@ -63122,7 +63122,7 @@
/area/crew_quarters/dorms)
"cFA" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/obj/machinery/newscaster{
pixel_x = -32
},
@@ -63414,8 +63414,8 @@
/obj/item/folder/yellow,
/obj/machinery/light,
/obj/structure/table/reinforced,
-/obj/item/device/gps,
-/obj/item/device/gps,
+/obj/item/gps,
+/obj/item/gps,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -63435,7 +63435,7 @@
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"cGh" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -63475,7 +63475,7 @@
/area/ai_monitored/storage/eva)
"cGn" = (
/obj/item/storage/belt,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/light,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/vault{
@@ -63558,7 +63558,7 @@
/area/bridge/showroom/corporate)
"cGv" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel/grimy,
/area/bridge/showroom/corporate)
"cGw" = (
@@ -63573,7 +63573,7 @@
desc = "A replica beret resembling that of a special operations officer under Nanotrasen.";
name = "replica officer's beret"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -64559,7 +64559,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -65234,7 +65234,7 @@
/obj/structure/closet/crate{
icon_state = "crateopen"
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -67006,7 +67006,7 @@
/obj/structure/closet/crate{
icon_state = "crateopen"
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port)
@@ -67225,7 +67225,7 @@
/area/medical/storage)
"cNN" = (
/obj/structure/closet/secure_closet/medical3,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -67589,7 +67589,7 @@
pixel_y = 3
},
/obj/item/stack/cable_coil/white,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/maintenance/department/electrical)
@@ -67800,7 +67800,7 @@
"cPa" = (
/obj/structure/table,
/obj/item/folder/white,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel/whitepurple/corner{
dir = 1
},
@@ -67817,8 +67817,8 @@
"cPc" = (
/obj/structure/table,
/obj/item/stack/cable_coil/white,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/timer{
+/obj/item/assembly/igniter,
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
@@ -67962,7 +67962,7 @@
"cPx" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = 28
@@ -68202,7 +68202,7 @@
/area/crew_quarters/dorms)
"cPR" = (
/obj/structure/dresser,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 26
@@ -68228,7 +68228,7 @@
/area/crew_quarters/dorms)
"cPT" = (
/obj/item/twohanded/required/kirbyplants/random,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 26
@@ -68260,8 +68260,8 @@
/area/crew_quarters/dorms)
"cPW" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
-/obj/item/device/radio/intercom{
+/obj/item/flashlight/lamp,
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 26
@@ -68564,7 +68564,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -68575,7 +68575,7 @@
"cQG" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/ai_status_display{
pixel_y = 32
},
@@ -68589,7 +68589,7 @@
"cQH" = (
/obj/structure/table,
/obj/item/folder/white,
-/obj/item/device/assembly/infra,
+/obj/item/assembly/infra,
/turf/open/floor/plasteel/whitepurple/corner{
dir = 1
},
@@ -69065,7 +69065,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -69471,7 +69471,7 @@
},
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/button/door{
desc = "A remote control switch for the medbay foyer.";
id = "MedbayFoyer";
@@ -69498,7 +69498,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -69547,7 +69547,7 @@
pixel_y = 3
},
/obj/item/storage/box/beakers,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -69780,7 +69780,7 @@
/area/maintenance/department/electrical)
"cTq" = (
/obj/structure/table/reinforced,
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
@@ -70038,7 +70038,7 @@
pixel_y = 3
},
/obj/item/storage/box/syringes,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 32
},
@@ -70587,7 +70587,7 @@
/obj/machinery/status_display{
pixel_y = -32
},
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"cUW" = (
@@ -70897,7 +70897,7 @@
pixel_y = -3;
req_access_txt = "55"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 5
},
@@ -71791,7 +71791,7 @@
/obj/item/clipboard,
/obj/item/electronics/airlock,
/obj/item/stack/sheet/glass,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/signaler,
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
@@ -71839,8 +71839,8 @@
/area/science/research)
"cXw" = (
/obj/structure/table,
-/obj/item/device/gps,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/gps,
+/obj/item/assembly/flash/handheld,
/obj/machinery/status_display{
pixel_y = -32
},
@@ -73783,11 +73783,11 @@
/area/crew_quarters/fitness/recreation)
"dbI" = (
/obj/structure/table,
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/fitness/recreation)
"dbJ" = (
@@ -74356,18 +74356,18 @@
/area/medical/chemistry)
"dcN" = (
/obj/structure/table/glass,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/timer{
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
@@ -74420,7 +74420,7 @@
/obj/machinery/computer/crew{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -74687,7 +74687,7 @@
/area/crew_quarters/fitness/recreation)
"ddA" = (
/obj/structure/table/wood,
-/obj/item/device/camera,
+/obj/item/camera,
/obj/structure/sign/nanotrasen{
pixel_x = 32;
pixel_y = -32
@@ -74860,7 +74860,7 @@
"ddV" = (
/obj/structure/table/reinforced,
/obj/item/clothing/gloves/color/latex,
-/obj/item/device/slime_scanner,
+/obj/item/slime_scanner,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/science/xenobiology)
@@ -74885,7 +74885,7 @@
/turf/open/floor/plating,
/area/security/checkpoint/science/research)
"ddY" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -32
},
@@ -74950,7 +74950,7 @@
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/manipulator,
/obj/item/stock_parts/manipulator,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -76053,7 +76053,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -76728,7 +76728,7 @@
/turf/open/floor/plasteel/neutral,
/area/science/research)
"dhZ" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -76964,7 +76964,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/whiteblue,
/area/medical/medbay/central)
@@ -77273,7 +77273,7 @@
/area/crew_quarters/abandoned_gambling_den)
"djn" = (
/obj/structure/table/reinforced,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/screwdriver,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the RD's goons from the safety of his office.";
@@ -77389,7 +77389,7 @@
"djB" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/turf_decal/bot,
/obj/structure/sign/poster/official/science{
pixel_x = -32
@@ -77731,7 +77731,7 @@
/obj/structure/cable/white{
icon_state = "1-4"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -78070,7 +78070,7 @@
"dkT" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/wood,
-/obj/item/device/modular_computer/tablet/preset/cheap,
+/obj/item/modular_computer/tablet/preset/cheap,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"dkU" = (
@@ -78289,7 +78289,7 @@
pixel_y = 3
},
/obj/item/stack/cable_coil/white,
-/obj/item/device/geiger_counter,
+/obj/item/geiger_counter,
/obj/effect/turf_decal/bot,
/obj/structure/sign/poster/official/cleanliness{
pixel_x = 32
@@ -78913,7 +78913,7 @@
"dmS" = (
/obj/structure/table/reinforced,
/obj/item/folder/white,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/machinery/airalarm{
dir = 4;
pixel_x = -23
@@ -78983,7 +78983,7 @@
dir = 4;
pixel_x = -23
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -79329,7 +79329,7 @@
"dnN" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/hallway/secondary/construction)
@@ -79474,7 +79474,7 @@
/area/crew_quarters/abandoned_gambling_den)
"dog" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -79666,7 +79666,7 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 5
},
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -79864,7 +79864,7 @@
/area/crew_quarters/heads/hor)
"doM" = (
/obj/structure/table/reinforced,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/item/circuitboard/aicore,
/obj/structure/disposalpipe/sorting/mail{
dir = 4;
@@ -80573,7 +80573,7 @@
"dqn" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/experimentor,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -80961,7 +80961,7 @@
/area/maintenance/department/medical)
"dqY" = (
/obj/structure/rack,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/clothing/glasses/eyepatch,
/turf/open/floor/plating{
icon_state = "panelscorched"
@@ -81172,7 +81172,7 @@
/area/crew_quarters/abandoned_gambling_den)
"drz" = (
/obj/structure/table/reinforced,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/screwdriver,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the RD's goons from the safety of his office.";
@@ -81553,7 +81553,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -82021,7 +82021,7 @@
"dtz" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -82350,9 +82350,9 @@
/area/crew_quarters/abandoned_gambling_den)
"duk" = (
/obj/structure/table/wood,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/timer{
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
@@ -82380,8 +82380,8 @@
/area/science/research/abandoned)
"duo" = (
/obj/structure/table/reinforced,
-/obj/item/device/mmi,
-/obj/item/device/assembly/prox_sensor,
+/obj/item/mmi,
+/obj/item/assembly/prox_sensor,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/science/research/abandoned)
@@ -82420,7 +82420,7 @@
/obj/structure/table/reinforced,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/science/research/abandoned)
@@ -82514,7 +82514,7 @@
/turf/open/floor/plasteel/neutral,
/area/science/mixing)
"duH" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 26
@@ -82771,7 +82771,7 @@
/area/medical/genetics)
"dvj" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -82897,7 +82897,7 @@
"dvu" = (
/obj/structure/table/glass,
/obj/item/folder/white,
-/obj/item/device/flashlight/pen,
+/obj/item/flashlight/pen,
/obj/item/clothing/neck/stethoscope,
/turf/open/floor/plasteel/cmo,
/area/crew_quarters/heads/cmo)
@@ -82910,7 +82910,7 @@
/obj/structure/table/glass,
/obj/item/folder/blue,
/obj/item/clothing/glasses/hud/health,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -83129,7 +83129,7 @@
/area/hallway/secondary/construction)
"dvO" = (
/obj/structure/table,
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
@@ -83149,7 +83149,7 @@
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt,
/obj/item/weldingtool,
-/obj/item/device/assembly/voice,
+/obj/item/assembly/voice,
/obj/item/clothing/head/welding,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/turf_decal/stripes/line{
@@ -83362,11 +83362,11 @@
icon_state = "4-8"
},
/obj/item/storage/secure/briefcase,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26;
pixel_y = -26
@@ -83927,7 +83927,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -84561,7 +84561,7 @@
/obj/machinery/computer/med_data{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -84686,7 +84686,7 @@
/area/hallway/secondary/construction)
"dyR" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -84731,7 +84731,7 @@
/area/crew_quarters/abandoned_gambling_den)
"dyY" = (
/obj/structure/table/wood/poker,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"dyZ" = (
@@ -85041,15 +85041,15 @@
/area/science/robotics/lab)
"dzG" = (
/obj/item/paper_bin,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 5;
pixel_y = 7
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 5;
pixel_y = 7
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 5;
pixel_y = 7
},
@@ -85182,7 +85182,7 @@
/obj/structure/table/reinforced,
/obj/item/storage/box/monkeycubes,
/obj/item/storage/box/monkeycubes,
-/obj/item/device/radio/headset/headset_medsci,
+/obj/item/radio/headset/headset_medsci,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -85236,7 +85236,7 @@
name = "medbay camera"
},
/obj/item/clipboard,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/structure/table,
/turf/open/floor/plasteel/whiteblue/corner,
/area/medical/medbay/central)
@@ -85299,7 +85299,7 @@
},
/area/crew_quarters/heads/cmo)
"dAg" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -85356,7 +85356,7 @@
/obj/structure/cable/white{
icon_state = "2-4"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -85684,7 +85684,7 @@
},
/area/medical/genetics)
"dAT" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -85930,7 +85930,7 @@
/area/medical/medbay/central)
"dBr" = (
/obj/item/folder/white,
-/obj/item/device/flashlight/pen,
+/obj/item/flashlight/pen,
/obj/item/clothing/neck/stethoscope,
/obj/structure/table,
/turf/open/floor/plasteel/vault,
@@ -86281,16 +86281,16 @@
/area/maintenance/port)
"dCa" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -32
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 6;
pixel_y = 6
},
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter{
pixel_x = -6;
pixel_y = -6
},
@@ -86389,11 +86389,11 @@
/area/crew_quarters/heads/hor)
"dCm" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -86421,8 +86421,8 @@
/obj/item/bodypart/l_arm/robot{
pixel_x = -3
},
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/structure/table/reinforced,
/obj/machinery/light_switch{
pixel_x = -38;
@@ -86431,10 +86431,10 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
@@ -86674,7 +86674,7 @@
/obj/structure/closet/crate{
icon_state = "crateopen"
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -86806,7 +86806,7 @@
amount = 23
},
/obj/item/stack/cable_coil/white,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/science/research/abandoned)
@@ -86858,19 +86858,19 @@
/turf/open/floor/plasteel/neutral,
/area/maintenance/port)
"dDn" = (
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -4;
pixel_y = 1
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 8;
pixel_y = 9
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 9;
pixel_y = -2
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_y = 2
},
/obj/structure/table/reinforced,
@@ -86883,19 +86883,19 @@
/turf/open/floor/plasteel,
/area/science/mixing)
"dDo" = (
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 5;
pixel_y = 4
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -4;
pixel_y = 2
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 6;
pixel_y = -4
},
-/obj/item/device/assembly/timer,
+/obj/item/assembly/timer,
/obj/structure/table/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/stripes/line{
@@ -86971,7 +86971,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -87294,7 +87294,7 @@
/area/medical/medbay/central)
"dEe" = (
/obj/item/twohanded/required/kirbyplants/random,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -87375,18 +87375,18 @@
},
/area/maintenance/port)
"dEq" = (
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = -5
},
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = -5
},
-/obj/item/device/transfer_valve,
-/obj/item/device/transfer_valve,
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve,
+/obj/item/transfer_valve,
+/obj/item/transfer_valve{
pixel_x = 5
},
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = 5
},
/obj/structure/table/reinforced,
@@ -87467,7 +87467,7 @@
/turf/open/floor/plasteel,
/area/science/storage)
"dEy" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -87550,9 +87550,9 @@
/obj/item/storage/firstaid,
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/bot,
-/obj/item/device/healthanalyzer,
-/obj/item/device/healthanalyzer,
-/obj/item/device/paicard,
+/obj/item/healthanalyzer,
+/obj/item/healthanalyzer,
+/obj/item/paicard,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"dEI" = (
@@ -87686,7 +87686,7 @@
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/backpack/duffelbag/med,
-/obj/item/device/flashlight/pen,
+/obj/item/flashlight/pen,
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
"dFe" = (
@@ -87805,7 +87805,7 @@
/area/crew_quarters/theatre/abandoned)
"dFs" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/guitar,
+/obj/item/instrument/guitar,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plasteel/vault{
dir = 5
@@ -87853,7 +87853,7 @@
pixel_y = 3
},
/obj/item/book/manual/detective,
-/obj/item/device/camera/detective,
+/obj/item/camera/detective,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -87872,7 +87872,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26;
pixel_y = 32
@@ -87963,18 +87963,18 @@
/turf/closed/wall,
/area/science/mixing)
"dFI" = (
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_y = 8
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -8;
pixel_y = 5
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = 6;
pixel_y = 5
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -2;
pixel_y = -2
},
@@ -88839,7 +88839,7 @@
/obj/item/screwdriver{
pixel_y = 5
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/clothing/head/welding,
/obj/machinery/light{
dir = 8
@@ -89269,7 +89269,7 @@
icon_state = "1-2"
},
/obj/effect/landmark/blobstart,
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -89524,7 +89524,7 @@
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/cell/high,
/obj/machinery/cell_charger,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -89559,9 +89559,9 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/item/device/mmi,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
/obj/structure/sign/departments/medbay/alt{
pixel_y = -32
},
@@ -89742,7 +89742,7 @@
/turf/open/floor/plasteel/cmo,
/area/crew_quarters/heads/cmo)
"dJj" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -89761,7 +89761,7 @@
/area/crew_quarters/heads/cmo)
"dJl" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/sign/nanotrasen{
pixel_x = 32
},
@@ -90102,7 +90102,7 @@
"dJW" = (
/obj/machinery/disposal/bin,
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -32
},
@@ -90326,7 +90326,7 @@
/area/crew_quarters/theatre/abandoned)
"dKs" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/airalarm{
dir = 4;
pixel_x = -23
@@ -90355,7 +90355,7 @@
/obj/structure/table/wood,
/obj/item/clothing/gloves/color/black,
/obj/item/storage/box/evidence,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
@@ -90959,7 +90959,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"dLF" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/airless,
/area/science/test_area)
@@ -91146,7 +91146,7 @@
/area/science/research)
"dMe" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -91708,7 +91708,7 @@
/turf/open/floor/plating,
/area/crew_quarters/theatre/abandoned)
"dNh" = (
-/obj/item/device/instrument/violin,
+/obj/item/instrument/violin,
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -92322,7 +92322,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -93087,7 +93087,7 @@
pixel_x = -32
},
/obj/item/paper_bin,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -93170,7 +93170,7 @@
"dQw" = (
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/carpet,
/area/library/abandoned)
"dQx" = (
@@ -93329,7 +93329,7 @@
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/aft)
"dQR" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/aft)
"dQU" = (
@@ -93580,7 +93580,7 @@
pixel_y = 32
},
/obj/structure/table/glass,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -93603,7 +93603,7 @@
dir = 8;
pixel_y = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -93885,7 +93885,7 @@
dir = 8
},
/obj/item/crowbar,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/structure/sign/poster/official/do_not_question{
pixel_y = -32
},
@@ -94550,7 +94550,7 @@
/obj/structure/table/wood,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plating,
/area/library/abandoned)
"dTv" = (
@@ -94884,7 +94884,7 @@
/area/chapel/main)
"dUq" = (
/obj/item/twohanded/required/kirbyplants/random,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -95092,7 +95092,7 @@
/obj/structure/closet/crate{
icon_state = "crateopen"
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
@@ -95205,7 +95205,7 @@
icon_state = "1-2"
},
/obj/item/clothing/gloves/color/latex,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/clothing/glasses/hud/health,
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel,
@@ -95262,7 +95262,7 @@
/area/medical/virology)
"dVz" = (
/obj/structure/closet/crate/freezer/blood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -95280,7 +95280,7 @@
},
/area/medical/virology)
"dVC" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -95369,7 +95369,7 @@
/obj/structure/table,
/obj/item/wrench,
/obj/item/crowbar,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -96351,7 +96351,7 @@
},
/obj/item/stack/packageWrap,
/obj/item/hand_labeler,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -96365,7 +96365,7 @@
"dYj" = (
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plating,
/area/library/abandoned)
"dYk" = (
@@ -96434,7 +96434,7 @@
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plasteel/dark,
/area/library/abandoned)
"dYu" = (
@@ -97325,7 +97325,7 @@
},
/area/chapel/office)
"eav" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -97460,7 +97460,7 @@
},
/area/medical/virology)
"eaR" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -97975,7 +97975,7 @@
/area/chapel/main)
"ebW" = (
/obj/structure/table/wood/fancy,
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/turf/open/floor/plasteel/grimy,
/area/chapel/main)
"ebX" = (
@@ -98105,7 +98105,7 @@
},
/obj/item/stack/cable_coil/white,
/obj/item/stack/cable_coil/white,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{
dir = 5
@@ -98313,7 +98313,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/item/tank/internals/oxygen,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/item/clothing/mask/breath,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -98530,7 +98530,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/item/tank/internals/oxygen,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/item/clothing/mask/breath,
/turf/open/floor/plating,
/area/maintenance/port/aft)
@@ -98883,11 +98883,11 @@
pixel_x = 26
},
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"edS" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -99128,8 +99128,8 @@
/area/maintenance/port/aft)
"eev" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
-/obj/item/device/radio/intercom{
+/obj/item/flashlight/lamp,
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -99169,11 +99169,11 @@
/area/chapel/office)
"eez" = (
/obj/structure/table/wood,
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
@@ -99213,7 +99213,7 @@
/area/chapel/office)
"eeD" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -99542,7 +99542,7 @@
},
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/radio,
+/obj/item/radio,
/turf/open/floor/plasteel/red/side{
dir = 8
},
@@ -99921,7 +99921,7 @@
},
/obj/item/restraints/handcuffs,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/red/side,
/area/security/checkpoint/escape)
"egq" = (
@@ -100074,7 +100074,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"ehG" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -100242,9 +100242,9 @@
/area/quartermaster/storage)
"hic" = (
/obj/structure/table/reinforced,
-/obj/item/device/integrated_electronics/analyzer,
-/obj/item/device/integrated_electronics/debugger,
-/obj/item/device/integrated_electronics/wirer,
+/obj/item/integrated_electronics/analyzer,
+/obj/item/integrated_electronics/debugger,
+/obj/item/integrated_electronics/wirer,
/turf/open/floor/plasteel/white/side{
dir = 10
},
@@ -100353,7 +100353,7 @@
pixel_y = 32;
receive_ore_updates = 1
},
-/obj/item/device/integrated_circuit_printer,
+/obj/item/integrated_circuit_printer,
/turf/open/floor/plasteel/white/side,
/area/science/circuit)
"jqM" = (
@@ -100539,7 +100539,7 @@
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/item/device/integrated_circuit_printer,
+/obj/item/integrated_circuit_printer,
/turf/open/floor/plasteel/white/side{
dir = 1
},
@@ -100569,9 +100569,9 @@
/area/science/research/abandoned)
"qhc" = (
/obj/structure/table/reinforced,
-/obj/item/device/integrated_electronics/analyzer,
-/obj/item/device/integrated_electronics/debugger,
-/obj/item/device/integrated_electronics/wirer,
+/obj/item/integrated_electronics/analyzer,
+/obj/item/integrated_electronics/debugger,
+/obj/item/integrated_electronics/wirer,
/turf/open/floor/plasteel/white/side{
dir = 9
},
diff --git a/_maps/cit_map_files/MetaStation/MetaStation.dmm b/_maps/cit_map_files/MetaStation/MetaStation.dmm
index 1a439712be..75a2b92364 100644
--- a/_maps/cit_map_files/MetaStation/MetaStation.dmm
+++ b/_maps/cit_map_files/MetaStation/MetaStation.dmm
@@ -287,7 +287,7 @@
/area/security/prison)
"aaT" = (
/obj/machinery/hydroponics/constructable,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
@@ -688,7 +688,7 @@
/obj/item/clothing/glasses/sunglasses/blindfold,
/obj/item/clothing/mask/muzzle,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/electropack,
+/obj/item/electropack,
/turf/open/floor/plasteel/dark,
/area/security/execution/education)
"abX" = (
@@ -1012,7 +1012,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -1181,7 +1181,7 @@
pixel_y = 26;
req_access_txt = "2"
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -3;
pixel_y = 2
},
@@ -1213,11 +1213,11 @@
/obj/item/folder/red{
pixel_x = 3
},
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = -3
},
/obj/item/storage/fancy/cigarettes,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/item/reagent_containers/spray/pepper,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -1358,7 +1358,7 @@
/area/crew_quarters/fitness/recreation)
"adm" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/reagent_dispensers/peppertank{
pixel_x = -29
},
@@ -1536,7 +1536,7 @@
/turf/open/space,
/area/space/nearstation)
"adJ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -1865,7 +1865,7 @@
"aer" = (
/obj/structure/rack,
/obj/item/gun/energy/ionrifle{
- pin = /obj/item/device/firing_pin
+ pin = /obj/item/firing_pin
},
/obj/machinery/light{
dir = 1
@@ -2383,7 +2383,7 @@
dir = 4;
pixel_x = -22
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -2661,7 +2661,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -2749,7 +2749,7 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"afZ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -2855,7 +2855,7 @@
/area/crew_quarters/heads/hos)
"agh" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
@@ -3073,7 +3073,7 @@
"agF" = (
/obj/structure/rack,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -3281,10 +3281,10 @@
/area/crew_quarters/heads/hos)
"ahb" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = -4
},
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_y = 3
},
/turf/open/floor/plasteel/dark,
@@ -3386,7 +3386,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -4748,7 +4748,7 @@
pixel_y = -2
},
/obj/item/dice/d8,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/fore)
@@ -4763,7 +4763,7 @@
/area/security/brig)
"aku" = (
/obj/structure/table,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -4779,7 +4779,7 @@
pixel_x = -4;
pixel_y = 2
},
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/turf/open/floor/plasteel/whitered/side{
dir = 1
},
@@ -4950,7 +4950,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -5239,7 +5239,7 @@
c_tag = "Holodeck";
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -6064,7 +6064,7 @@
name = "windoor"
},
/obj/item/book/manual/wiki/engineering_hacking,
-/obj/item/device/tape/random,
+/obj/item/tape/random,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/fore)
@@ -6655,7 +6655,7 @@
},
/obj/structure/rack,
/obj/item/storage/firstaid/regular,
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
pixel_y = -2
},
/obj/machinery/camera{
@@ -6784,7 +6784,7 @@
"aoC" = (
/obj/structure/table,
/obj/item/restraints/handcuffs,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel,
/area/security/main)
"aoD" = (
@@ -7294,7 +7294,7 @@
/area/maintenance/port/fore)
"apD" = (
/obj/item/storage/box/lights/mixed,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
@@ -7456,7 +7456,7 @@
"apW" = (
/obj/structure/table,
/obj/item/folder/red,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel,
/area/security/main)
"apY" = (
@@ -7549,7 +7549,7 @@
/area/crew_quarters/fitness/recreation)
"aqk" = (
/obj/machinery/vending/coffee,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -7597,7 +7597,7 @@
},
/area/maintenance/starboard)
"aqs" = (
-/obj/item/device/mmi{
+/obj/item/mmi{
name = "man-machine interface"
},
/obj/structure/rack,
@@ -7700,7 +7700,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -7861,7 +7861,7 @@
/obj/structure/closet/crate,
/obj/item/restraints/handcuffs,
/obj/item/bodybag,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 3;
name = "3maintenance loot spawner"
@@ -8623,7 +8623,7 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 29;
@@ -8819,7 +8819,7 @@
pixel_y = 7
},
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -9594,7 +9594,7 @@
/area/maintenance/starboard/fore)
"auy" = (
/obj/item/stack/sheet/cardboard,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
@@ -9841,7 +9841,7 @@
},
/area/security/brig)
"avd" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -10554,7 +10554,7 @@
/area/security/brig)
"awx" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/dark,
/area/security/brig)
"awy" = (
@@ -11026,8 +11026,8 @@
"axz" = (
/obj/structure/table,
/obj/item/folder/red,
-/obj/item/device/taperecorder,
-/obj/item/device/radio/intercom{
+/obj/item/taperecorder,
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 1;
freerange = 1;
@@ -11730,7 +11730,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -11752,11 +11752,11 @@
/area/quartermaster/miningoffice)
"azm" = (
/obj/structure/closet/crate,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
@@ -12093,7 +12093,7 @@
network = list("prison");
pixel_y = 30
},
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -12197,7 +12197,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -12348,7 +12348,7 @@
},
/area/engine/engineering)
"aAr" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -12395,7 +12395,7 @@
/area/engine/engineering)
"aAz" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -13093,7 +13093,7 @@
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"aBX" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -13339,11 +13339,11 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = 3
},
/obj/item/storage/box/evidence,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"aCt" = (
@@ -13508,7 +13508,7 @@
/area/maintenance/starboard/fore)
"aCN" = (
/obj/structure/reagent_dispensers/fueltank,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_x = -30
},
@@ -13878,7 +13878,7 @@
c_tag = "Brig - Desk";
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -13897,7 +13897,7 @@
dir = 8
},
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/camera/detective,
+/obj/item/camera/detective,
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"aDJ" = (
@@ -13917,7 +13917,7 @@
/area/security/detectives_office)
"aDL" = (
/obj/machinery/light/small,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -14502,7 +14502,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/door/poddoor/shutters/preopen{
id = "briglockdown";
name = "brig shutters"
@@ -15123,7 +15123,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -15187,7 +15187,7 @@
},
/area/hallway/primary/fore)
"aGo" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/red/corner{
dir = 2
},
@@ -16009,7 +16009,7 @@
/turf/open/floor/plating,
/area/quartermaster/storage)
"aIh" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = -28;
@@ -16245,7 +16245,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 2
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -16424,7 +16424,7 @@
/turf/open/floor/plasteel,
/area/security/courtroom)
"aIN" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -16480,7 +16480,7 @@
/area/security/courtroom)
"aIU" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -16867,7 +16867,7 @@
/area/security/courtroom)
"aJZ" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
dir = 8;
listening = 0;
@@ -16921,7 +16921,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -17042,7 +17042,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/item/reagent_containers/glass/bucket,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
@@ -17307,7 +17307,7 @@
"aLf" = (
/obj/structure/table,
/obj/item/clothing/gloves/color/fyellow,
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "AUX0"
},
/turf/open/floor/plasteel/brown{
@@ -17378,10 +17378,10 @@
/area/storage/primary)
"aLm" = (
/obj/structure/table,
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
-/obj/item/device/multitool,
-/obj/item/device/multitool{
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
+/obj/item/multitool,
+/obj/item/multitool{
pixel_x = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -17586,7 +17586,7 @@
"aLP" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/machinery/portable_atmospherics/scrubber,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -17915,7 +17915,7 @@
/area/ai_monitored/turret_protected/ai_upload)
"aMJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -18191,7 +18191,7 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 30
},
-/obj/item/device/gps,
+/obj/item/gps,
/turf/open/floor/plating,
/area/engine/engineering)
"aNq" = (
@@ -18486,11 +18486,11 @@
/area/storage/primary)
"aNY" = (
/obj/structure/table,
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -4;
pixel_y = -4
},
-/obj/item/device/assembly/igniter,
+/obj/item/assembly/igniter,
/obj/item/screwdriver{
pixel_y = 16
},
@@ -18589,7 +18589,7 @@
/turf/open/floor/plasteel/neutral/side,
/area/security/courtroom)
"aOj" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/neutral/side,
/area/security/courtroom)
"aOk" = (
@@ -18620,7 +18620,7 @@
/turf/open/floor/plasteel,
/area/security/courtroom)
"aOn" = (
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/item/cartridge/lawyer,
/obj/structure/table/wood,
/obj/machinery/button/door{
@@ -19128,7 +19128,7 @@
"aPr" = (
/obj/structure/table,
/obj/item/wirecutters,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
@@ -19365,7 +19365,7 @@
/turf/open/floor/grass,
/area/hydroponics/garden)
"aPR" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -19584,7 +19584,7 @@
pixel_x = -4;
pixel_y = 7
},
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "QM0"
},
/turf/open/floor/plasteel,
@@ -19625,13 +19625,13 @@
/area/storage/primary)
"aQy" = (
/obj/structure/table,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
},
/obj/item/clothing/gloves/color/yellow,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
/turf/open/floor/plasteel/brown{
dir = 4
},
@@ -19678,7 +19678,7 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload)
"aQC" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
name = "Private AI Channel";
@@ -19906,7 +19906,7 @@
/area/crew_quarters/locker)
"aQY" = (
/obj/structure/table,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -20157,7 +20157,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -20187,7 +20187,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -20393,7 +20393,7 @@
/obj/item/cultivator,
/obj/item/crowbar,
/obj/item/reagent_containers/glass/bucket,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -20429,7 +20429,7 @@
/obj/item/storage/bag/plants/portaseeder,
/obj/structure/table,
/obj/machinery/light,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -20566,7 +20566,7 @@
/obj/item/book/manual/wiki/engineering_construction,
/obj/item/clothing/gloves/color/yellow,
/obj/structure/table/glass,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plasteel,
/area/engine/engineering)
"aSB" = (
@@ -20874,7 +20874,7 @@
/turf/open/floor/plasteel/dark,
/area/security/courtroom)
"aTm" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -20971,7 +20971,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -21308,7 +21308,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/light{
dir = 1
},
@@ -21367,7 +21367,7 @@
"aUs" = (
/obj/structure/table,
/obj/item/crowbar,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -21416,7 +21416,7 @@
name = "AI Upload turret control";
pixel_y = 28
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
name = "Private AI Channel";
@@ -21854,7 +21854,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"aVv" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -22051,7 +22051,7 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/supply)
"aVQ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -22221,7 +22221,7 @@
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-16"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -22852,7 +22852,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -23152,8 +23152,8 @@
pixel_y = -1
},
/obj/item/clothing/gloves/color/yellow,
-/obj/item/device/t_scanner,
-/obj/item/device/multitool,
+/obj/item/t_scanner,
+/obj/item/multitool,
/turf/open/floor/plasteel/dark,
/area/storage/tech)
"aYj" = (
@@ -23201,20 +23201,20 @@
/area/storage/tech)
"aYm" = (
/obj/structure/table,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
/obj/machinery/light/small{
dir = 1
},
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/radio/intercom{
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -23224,12 +23224,12 @@
/area/storage/tech)
"aYn" = (
/obj/structure/table,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/item/aiModule/reset,
/turf/open/floor/plasteel/dark,
/area/storage/tech)
"aYo" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -23291,7 +23291,7 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"aYt" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -23830,7 +23830,7 @@
/area/crew_quarters/heads/chief)
"aZD" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/neutral/corner{
dir = 2
},
@@ -23923,7 +23923,7 @@
/area/security/checkpoint/engineering)
"aZM" = (
/obj/structure/table,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_y = 29
@@ -23958,7 +23958,7 @@
/area/library)
"aZQ" = (
/obj/effect/landmark/start/ai/secondary,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
@@ -23966,14 +23966,14 @@
pixel_x = -10;
pixel_y = 22
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
name = "Common Channel";
pixel_x = -27
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -24060,7 +24060,7 @@
/area/ai_monitored/turret_protected/ai)
"aZY" = (
/obj/effect/landmark/start/ai/secondary,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
@@ -24068,14 +24068,14 @@
pixel_x = 10;
pixel_y = 22
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
name = "Common Channel";
pixel_x = 27
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -24194,7 +24194,7 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"bal" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -24257,7 +24257,7 @@
},
/obj/item/stack/wrapping_paper,
/obj/item/stack/wrapping_paper,
-/obj/item/device/destTagger{
+/obj/item/destTagger{
pixel_x = 4;
pixel_y = 3
},
@@ -24654,7 +24654,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -24718,7 +24718,7 @@
/area/storage/tools)
"bbf" = (
/obj/structure/closet/toolcloset,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -24778,7 +24778,7 @@
c_tag = "Secure Tech Storage";
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -24973,7 +24973,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/computer/security/telescreen{
dir = 4;
name = "MiniSat Monitor";
@@ -25197,7 +25197,7 @@
/area/hallway/primary/port)
"bcb" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -25277,7 +25277,7 @@
},
/obj/item/clothing/gloves/color/fyellow,
/obj/item/clothing/suit/hazardvest,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/yellow/side{
dir = 8
@@ -25404,7 +25404,7 @@
pixel_y = 16
},
/obj/item/wirecutters,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -25599,7 +25599,7 @@
},
/area/security/checkpoint/customs)
"bcZ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 20
@@ -25892,11 +25892,11 @@
/area/maintenance/central)
"bdH" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -26058,7 +26058,7 @@
/area/storage/tech)
"bea" = (
/obj/structure/table,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
@@ -26067,8 +26067,8 @@
/area/storage/tech)
"beb" = (
/obj/structure/table,
-/obj/item/device/analyzer,
-/obj/item/device/healthanalyzer,
+/obj/item/analyzer,
+/obj/item/healthanalyzer,
/obj/machinery/camera/autoname{
dir = 1
},
@@ -26080,7 +26080,7 @@
pixel_x = 1;
pixel_y = -1
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/clothing/glasses/meson,
/obj/machinery/light_switch{
pixel_y = -28
@@ -26115,7 +26115,7 @@
/obj/structure/disposalpipe/trunk{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -26632,7 +26632,7 @@
/turf/open/floor/plating,
/area/maintenance/central)
"bfp" = (
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
@@ -27054,7 +27054,7 @@
pixel_x = 5;
pixel_y = -1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -27100,8 +27100,8 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/closet,
/obj/item/crowbar,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/radio,
+/obj/item/assembly/flash/handheld,
+/obj/item/radio,
/turf/open/floor/plasteel/red/side{
dir = 10
},
@@ -27622,10 +27622,10 @@
/obj/item/storage/photo_album{
pixel_y = -4
},
-/obj/item/device/camera{
+/obj/item/camera{
pixel_y = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Station Intercom (Captain)";
@@ -27962,7 +27962,7 @@
},
/area/engine/break_room)
"bia" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -28227,7 +28227,7 @@
/area/quartermaster/sorting)
"biJ" = (
/obj/structure/table,
-/obj/item/device/destTagger{
+/obj/item/destTagger{
pixel_x = 4;
pixel_y = 3
},
@@ -28243,7 +28243,7 @@
/obj/item/clipboard,
/obj/item/folder/yellow,
/obj/item/folder/yellow,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/pen/red,
/turf/open/floor/plasteel/brown{
dir = 8
@@ -28325,7 +28325,7 @@
dir = 1
},
/obj/machinery/light/small,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -28
@@ -28433,7 +28433,7 @@
/area/crew_quarters/heads/captain/private)
"bjh" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -28860,7 +28860,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -28959,7 +28959,7 @@
/area/quartermaster/sorting)
"bkk" = (
/obj/structure/filingcabinet/filingcabinet,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -29079,7 +29079,7 @@
/obj/machinery/newscaster{
pixel_x = 28
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -29152,8 +29152,8 @@
/area/hallway/primary/port)
"bkw" = (
/obj/structure/table,
-/obj/item/device/toner,
-/obj/item/device/radio/intercom{
+/obj/item/toner,
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -29203,7 +29203,7 @@
},
/area/bridge)
"bkD" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 29
@@ -29227,7 +29227,7 @@
},
/area/bridge)
"bkF" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -29420,7 +29420,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -29719,7 +29719,7 @@
pixel_x = -26;
pixel_y = 3
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -29982,7 +29982,7 @@
},
/area/hallway/primary/central)
"bmo" = (
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -30029,7 +30029,7 @@
/turf/open/floor/plating,
/area/maintenance/central)
"bmt" = (
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -30388,7 +30388,7 @@
/area/engine/break_room)
"bnd" = (
/obj/structure/table/glass,
-/obj/item/device/lightreplacer{
+/obj/item/lightreplacer{
pixel_y = 7
},
/obj/item/storage/belt/utility,
@@ -30427,7 +30427,7 @@
pixel_x = -3;
pixel_y = 5
},
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = -4
},
/turf/open/floor/plasteel,
@@ -30758,7 +30758,7 @@
/area/hallway/secondary/entry)
"bnN" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -30905,7 +30905,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -31000,7 +31000,7 @@
icon_state = "4-8"
},
/obj/structure/table/wood,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"bon" = (
@@ -31160,7 +31160,7 @@
/obj/machinery/computer/communications{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Station Intercom (Captain)";
@@ -31183,7 +31183,7 @@
/area/crew_quarters/heads/captain/private)
"boJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -31659,7 +31659,7 @@
icon_state = "4-8"
},
/obj/machinery/holopad,
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/foyer)
"bpL" = (
@@ -32134,7 +32134,7 @@
/obj/machinery/vending/cart{
req_access_txt = "57"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -32187,8 +32187,8 @@
/area/bridge)
"bqK" = (
/obj/structure/rack,
-/obj/item/device/aicard,
-/obj/item/device/radio/off,
+/obj/item/aicard,
+/obj/item/radio/off,
/obj/machinery/computer/security/telescreen{
dir = 1;
name = "MiniSat Monitor";
@@ -32234,16 +32234,16 @@
/turf/open/floor/plasteel/dark,
/area/bridge)
"bqP" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -29
},
/obj/structure/rack,
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/timer,
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
+/obj/item/assembly/timer,
/turf/open/floor/plasteel/darkblue/side{
dir = 1
},
@@ -32257,7 +32257,7 @@
pixel_y = -3
},
/obj/item/wrench,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/machinery/newscaster{
pixel_y = -30
},
@@ -32454,7 +32454,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -32549,7 +32549,7 @@
},
/area/maintenance/starboard)
"brs" = (
-/obj/item/device/assembly/prox_sensor,
+/obj/item/assembly/prox_sensor,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -32899,7 +32899,7 @@
/area/aisat)
"brW" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -33032,7 +33032,7 @@
/area/ai_monitored/storage/satellite)
"bsh" = (
/obj/structure/table,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -33060,7 +33060,7 @@
pixel_y = 3
},
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/storage/satellite)
"bsj" = (
@@ -33085,7 +33085,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bsm" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
@@ -33166,7 +33166,7 @@
},
/area/hallway/primary/port)
"bsw" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -33527,7 +33527,7 @@
/obj/structure/table/wood,
/obj/item/hand_tele,
/obj/structure/window/reinforced,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = 27
@@ -33607,12 +33607,12 @@
/area/storage/art)
"btm" = (
/obj/structure/table,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/plasteel,
/area/storage/art)
"btn" = (
/obj/structure/table,
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 28
@@ -33756,7 +33756,7 @@
/turf/open/floor/plasteel,
/area/engine/break_room)
"btE" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -34192,7 +34192,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -26
@@ -34411,7 +34411,7 @@
},
/area/maintenance/starboard)
"bvf" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
@@ -34419,14 +34419,14 @@
pixel_x = -27;
pixel_y = -7
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = -27
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -34521,7 +34521,7 @@
/obj/structure/table/glass,
/obj/item/wrench,
/obj/item/crowbar,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
@@ -34580,7 +34580,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_y = 4
},
/obj/item/screwdriver{
@@ -34628,14 +34628,14 @@
/obj/machinery/ai_status_display{
pixel_y = 31
},
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/grimy,
/area/tcommsat/computer)
"bvA" = (
/obj/machinery/light/small{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Station Intercom (Telecomms)";
@@ -34859,7 +34859,7 @@
pixel_x = -32
},
/obj/effect/decal/cleanable/cobweb,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -34885,7 +34885,7 @@
/area/library)
"bwf" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -35024,7 +35024,7 @@
/area/bridge)
"bws" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -35035,7 +35035,7 @@
/obj/item/book/manual/wiki/security_space_law{
pixel_y = 3
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 28
@@ -35323,7 +35323,7 @@
/turf/open/floor/wood,
/area/crew_quarters/bar)
"bwU" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -35632,7 +35632,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -35875,7 +35875,7 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -26
@@ -36180,7 +36180,7 @@
/area/ai_monitored/storage/satellite)
"byP" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/caution{
dir = 8
},
@@ -36191,7 +36191,7 @@
},
/area/hallway/primary/starboard)
"byR" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -36654,7 +36654,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bzM" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -36674,7 +36674,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bzO" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -36829,7 +36829,7 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain/private)
"bAf" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -26
@@ -37265,7 +37265,7 @@
/area/security/vacantoffice)
"bBi" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/wood,
/area/security/vacantoffice)
"bBj" = (
@@ -37276,10 +37276,10 @@
/area/maintenance/starboard)
"bBk" = (
/obj/structure/table/wood,
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_y = 9
},
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = -3;
pixel_y = 5
},
@@ -37329,7 +37329,7 @@
/area/crew_quarters/toilet/auxiliary)
"bBq" = (
/obj/structure/rack,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port)
@@ -37795,9 +37795,9 @@
"bCn" = (
/obj/structure/table,
/obj/item/storage/belt/utility,
-/obj/item/device/t_scanner,
-/obj/item/device/t_scanner,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
+/obj/item/t_scanner,
+/obj/item/t_scanner,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -38136,7 +38136,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -38258,7 +38258,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -39720,7 +39720,7 @@
/turf/open/floor/wood,
/area/library)
"bGv" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)"
},
@@ -40348,7 +40348,7 @@
/area/library)
"bHT" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -40430,7 +40430,7 @@
"bIe" = (
/obj/structure/table,
/obj/item/hand_tele,
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/airalarm{
dir = 4;
pixel_x = -23
@@ -40579,7 +40579,7 @@
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/rods/fifty,
/obj/item/storage/toolbox/emergency,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
name = "Gateway APC";
@@ -40633,7 +40633,7 @@
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
"bIu" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -41016,7 +41016,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -41113,11 +41113,11 @@
/obj/structure/table,
/obj/item/storage/belt/utility,
/obj/item/storage/belt/utility,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
-/obj/item/device/multitool,
+/obj/item/radio/off,
+/obj/item/radio/off,
+/obj/item/radio/off,
+/obj/item/radio/off,
+/obj/item/multitool,
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"bJG" = (
@@ -41185,7 +41185,7 @@
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/storage/toolbox/emergency,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/structure/window/reinforced,
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -41235,7 +41235,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/neutral/side{
dir = 2
},
@@ -41547,7 +41547,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bKy" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
@@ -42262,7 +42262,7 @@
/area/engine/atmos)
"bMe" = (
/obj/structure/reagent_dispensers/fueltank,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -42421,7 +42421,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -42586,8 +42586,8 @@
dir = 1
},
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
-/obj/item/device/tape,
+/obj/item/taperecorder,
+/obj/item/tape,
/turf/open/floor/wood,
/area/library)
"bMN" = (
@@ -42760,7 +42760,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -42870,7 +42870,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = 29
@@ -42918,7 +42918,7 @@
/area/maintenance/central)
"bNt" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -43980,7 +43980,7 @@
/area/library)
"bPT" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/wood,
/area/library)
"bPU" = (
@@ -44536,9 +44536,9 @@
/turf/open/floor/engine/cult,
/area/library)
"bRm" = (
-/obj/item/device/taperecorder,
-/obj/item/device/camera,
-/obj/item/device/radio/intercom{
+/obj/item/taperecorder,
+/obj/item/camera,
+/obj/item/radio/intercom{
pixel_y = -25
},
/obj/structure/table/wood,
@@ -44552,7 +44552,7 @@
/area/library)
"bRo" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -44811,9 +44811,9 @@
/area/gateway)
"bRK" = (
/obj/item/storage/belt/utility,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
+/obj/item/radio/off,
+/obj/item/radio/off,
/obj/structure/rack,
/obj/machinery/button/door{
id = "gateshutter";
@@ -44985,7 +44985,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -45272,7 +45272,7 @@
"bSC" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -45809,7 +45809,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -45936,7 +45936,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -46245,7 +46245,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bUC" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -46850,7 +46850,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -47643,7 +47643,7 @@
/area/maintenance/port)
"bXy" = (
/obj/structure/closet,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bXz" = (
@@ -47658,7 +47658,7 @@
/area/maintenance/port/aft)
"bXA" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bXB" = (
@@ -47701,7 +47701,7 @@
"bXH" = (
/obj/structure/closet/crate,
/obj/item/coin/silver,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port)
@@ -47979,9 +47979,9 @@
/obj/structure/rack,
/obj/item/tank/internals/oxygen,
/obj/item/tank/internals/oxygen,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
-/obj/item/device/radio/intercom{
+/obj/item/radio/off,
+/obj/item/radio/off,
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = 27
@@ -48243,7 +48243,7 @@
},
/area/medical/storage)
"bYV" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -48332,7 +48332,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel/red/side{
dir = 5
},
@@ -48487,7 +48487,7 @@
"bZs" = (
/obj/item/cultivator,
/obj/item/crowbar,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/item/reagent_containers/glass/bucket,
/obj/structure/table/glass,
/turf/open/floor/plasteel/hydrofloor,
@@ -48581,7 +48581,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 5
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -48969,14 +48969,14 @@
"caz" = (
/obj/structure/table,
/obj/item/stack/cable_coil,
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -4;
pixel_y = -4
},
/obj/item/screwdriver{
pixel_y = 16
},
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "RD0"
},
/turf/open/floor/plasteel/whitepurple/side{
@@ -48987,7 +48987,7 @@
/obj/structure/table,
/obj/item/stack/sheet/glass,
/obj/item/electronics/airlock,
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -4;
pixel_y = 2
},
@@ -49557,7 +49557,7 @@
"cbz" = (
/obj/structure/rack,
/obj/item/stack/sheet/cardboard,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/structure/light_construct{
dir = 1
},
@@ -49741,7 +49741,7 @@
network = list("medbay");
pixel_y = -29
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27;
@@ -49895,7 +49895,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
},
@@ -49935,7 +49935,7 @@
pixel_y = 12
},
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -49956,7 +49956,7 @@
c_tag = "Hydroponics - Foyer";
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = -25
},
/turf/open/floor/plasteel/vault,
@@ -49989,7 +49989,7 @@
/area/hydroponics)
"ccu" = (
/obj/machinery/hydroponics/constructable,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -50722,7 +50722,7 @@
},
/area/maintenance/starboard)
"cdW" = (
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/machinery/light/small{
dir = 4
},
@@ -50898,7 +50898,7 @@
pixel_y = -3
},
/obj/item/wrench,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/aft)
@@ -51054,7 +51054,7 @@
/area/medical/medbay/central)
"ceF" = (
/obj/structure/bed/roller,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -51162,7 +51162,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -51219,7 +51219,7 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/science/research)
"ceX" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -52320,7 +52320,7 @@
/obj/item/crowbar,
/obj/item/wrench,
/obj/item/clothing/mask/gas,
-/obj/item/device/multitool{
+/obj/item/multitool{
pixel_x = 3
},
/obj/effect/turf_decal/stripes/line{
@@ -52413,7 +52413,7 @@
pixel_y = 32
},
/obj/structure/table/glass,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel/cafeteria{
dir = 5
},
@@ -52462,7 +52462,7 @@
/turf/open/floor/plasteel/dark,
/area/aisat)
"chA" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/turf/open/floor/engine,
@@ -52505,7 +52505,7 @@
/area/maintenance/starboard)
"chF" = (
/obj/structure/closet,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -52515,7 +52515,7 @@
"chG" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/item/storage/toolbox/emergency,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -53097,7 +53097,7 @@
/turf/open/floor/engine,
/area/science/explab)
"ciT" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
@@ -53358,7 +53358,7 @@
/area/medical/surgery)
"cjE" = (
/obj/structure/bed/roller,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -53539,35 +53539,35 @@
},
/area/medical/chemistry)
"cjW" = (
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 3;
pixel_y = -7
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 3;
pixel_y = -7
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 3;
pixel_y = -7
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 3;
pixel_y = -7
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -3;
pixel_y = 3
},
@@ -53702,7 +53702,7 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
@@ -53748,7 +53748,7 @@
/area/science/research)
"ckq" = (
/obj/machinery/vending/coffee,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -53787,7 +53787,7 @@
"ckv" = (
/obj/structure/closet/crate,
/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/item/device/assembly/infra,
+/obj/item/assembly/infra,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
@@ -54119,7 +54119,7 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"clm" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -54225,7 +54225,7 @@
pixel_x = -2;
pixel_y = 6
},
-/obj/item/device/radio/headset/headset_med,
+/obj/item/radio/headset/headset_med,
/obj/structure/extinguisher_cabinet{
pixel_x = 24
},
@@ -54339,7 +54339,7 @@
/obj/machinery/shower{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_y = -28
@@ -54750,7 +54750,7 @@
},
/area/hallway/primary/aft)
"cmF" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -54894,7 +54894,7 @@
/obj/item/stack/packageWrap,
/obj/item/stack/packageWrap,
/obj/item/stack/packageWrap,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/stripes/line{
dir = 2
@@ -54941,7 +54941,7 @@
pixel_y = 6
},
/obj/item/stack/medical/ointment,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/effect/turf_decal/stripes/line{
dir = 2
},
@@ -55033,7 +55033,7 @@
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"cnh" = (
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/maintenance/port/aft)
@@ -55121,7 +55121,7 @@
/area/medical/surgery)
"cnt" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -55311,7 +55311,7 @@
pixel_y = 4
},
/obj/item/clothing/glasses/science,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -55554,7 +55554,7 @@
},
/area/science/research)
"cog" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -55640,7 +55640,7 @@
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/item/clothing/glasses/science,
-/obj/item/device/multitool{
+/obj/item/multitool{
pixel_x = 3
},
/turf/open/floor/plasteel/white,
@@ -57016,7 +57016,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -57227,7 +57227,7 @@
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -57363,7 +57363,7 @@
/area/maintenance/aft)
"crF" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -57660,7 +57660,7 @@
},
/area/medical/surgery)
"csn" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -57859,7 +57859,7 @@
network = list("medbay");
pixel_x = 29
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 1;
name = "Station Intercom (General)";
pixel_y = -29
@@ -58640,7 +58640,7 @@
/obj/structure/closet,
/obj/item/extinguisher,
/obj/effect/decal/cleanable/cobweb,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/aft)
@@ -58658,7 +58658,7 @@
/obj/structure/closet/crate,
/obj/item/stack/cable_coil,
/obj/item/grenade/chem_grenade,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 2;
name = "2maintenance loot spawner"
@@ -58781,7 +58781,7 @@
pixel_y = 3
},
/obj/item/storage/box/bodybags,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -58811,12 +58811,12 @@
dir = 1
},
/obj/item/storage/box/monkeycubes,
-/obj/item/device/radio/headset/headset_medsci,
-/obj/item/device/flashlight/pen{
+/obj/item/radio/headset/headset_medsci,
+/obj/item/flashlight/pen{
pixel_x = 4;
pixel_y = 3
},
-/obj/item/device/flashlight/pen{
+/obj/item/flashlight/pen{
pixel_x = 4;
pixel_y = 3
},
@@ -59020,7 +59020,7 @@
/area/crew_quarters/heads/hor)
"cuP" = (
/obj/structure/table,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/item/circuitboard/aicore{
pixel_x = -2;
pixel_y = 4
@@ -59036,10 +59036,10 @@
/area/crew_quarters/heads/hor)
"cuR" = (
/obj/structure/table,
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = -3
},
-/obj/item/device/paicard{
+/obj/item/paicard{
pixel_x = 4
},
/obj/item/storage/secure/briefcase,
@@ -59174,7 +59174,7 @@
/obj/structure/closet/crate,
/obj/item/crowbar/red,
/obj/item/pen,
-/obj/item/device/flashlight/pen{
+/obj/item/flashlight/pen{
pixel_x = 4;
pixel_y = 3
},
@@ -59276,7 +59276,7 @@
/obj/machinery/clonepod{
pixel_y = 2
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -59558,7 +59558,7 @@
/area/science/storage)
"cvY" = (
/obj/machinery/portable_atmospherics/canister/toxins,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -59649,7 +59649,7 @@
"cwn" = (
/obj/structure/rack,
/obj/item/clothing/glasses/sunglasses,
-/obj/item/device/flashlight/pen,
+/obj/item/flashlight/pen,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/aft)
@@ -59822,7 +59822,7 @@
pixel_x = 2;
pixel_y = 2
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -59888,7 +59888,7 @@
/area/science/robotics/mechbay)
"cwJ" = (
/obj/machinery/computer/mech_bay_power_console,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -60027,7 +60027,7 @@
dir = 8;
pixel_x = 24
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -60377,7 +60377,7 @@
/turf/open/floor/plating,
/area/science/misc_lab/range)
"cxJ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -60756,7 +60756,7 @@
/turf/open/floor/plasteel,
/area/science/mixing)
"cyC" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
@@ -61028,7 +61028,7 @@
/area/medical/genetics)
"czf" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -61924,7 +61924,7 @@
/area/science/test_area)
"cAS" = (
/obj/structure/chair/stool,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -61996,7 +61996,7 @@
"cBa" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -62059,7 +62059,7 @@
/area/science/robotics/mechbay)
"cBj" = (
/obj/structure/table,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -62167,19 +62167,19 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"cBt" = (
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -4;
pixel_y = 1
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 8;
pixel_y = 9
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 9;
pixel_y = -2
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_y = 2
},
/obj/structure/table/reinforced,
@@ -62362,7 +62362,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"cBO" = (
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -62533,7 +62533,7 @@
/area/hallway/primary/aft)
"cCm" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -62587,18 +62587,18 @@
/turf/open/floor/plasteel,
/area/science/mixing)
"cCu" = (
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_y = 8
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -8;
pixel_y = 5
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = 6;
pixel_y = 5
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -2;
pixel_y = -2
},
@@ -62609,18 +62609,18 @@
/turf/open/floor/plasteel,
/area/science/mixing)
"cCv" = (
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = -5
},
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = -5
},
-/obj/item/device/transfer_valve,
-/obj/item/device/transfer_valve,
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve,
+/obj/item/transfer_valve,
+/obj/item/transfer_valve{
pixel_x = 5
},
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = 5
},
/obj/machinery/requests_console{
@@ -62635,19 +62635,19 @@
/turf/open/floor/plasteel,
/area/science/mixing)
"cCw" = (
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 5;
pixel_y = 4
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -4;
pixel_y = 2
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 6;
pixel_y = -4
},
-/obj/item/device/assembly/timer,
+/obj/item/assembly/timer,
/obj/structure/table/reinforced,
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -62656,7 +62656,7 @@
/area/science/mixing)
"cCx" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -62710,19 +62710,19 @@
/area/science/mixing)
"cCC" = (
/obj/structure/table,
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 5;
pixel_y = -4
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 2;
pixel_y = 6
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 2;
pixel_y = -1
},
@@ -62921,7 +62921,7 @@
/obj/structure/table,
/obj/item/storage/box/bodybags,
/obj/item/pen,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -62968,7 +62968,7 @@
/obj/machinery/mecha_part_fabricator{
dir = 2
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -63021,11 +63021,11 @@
pixel_x = -2;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -63093,7 +63093,7 @@
/obj/structure/table,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/science,
-/obj/item/device/multitool{
+/obj/item/multitool{
pixel_x = 3
},
/obj/effect/turf_decal/stripes/corner{
@@ -63148,7 +63148,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"cDx" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plating/airless,
/area/science/test_area)
"cDy" = (
@@ -63269,7 +63269,7 @@
/area/medical/virology)
"cDJ" = (
/obj/item/clothing/gloves/color/latex,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/clothing/glasses/hud/health,
/obj/structure/reagent_dispensers/virusfood{
pixel_y = 30
@@ -63629,13 +63629,13 @@
/obj/item/stack/sheet/plasteel{
amount = 10
},
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/ai_status_display{
pixel_x = 32
},
@@ -63927,7 +63927,7 @@
},
/area/medical/medbay/aft)
"cES" = (
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
pixel_x = 1;
pixel_y = 4
},
@@ -64063,7 +64063,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/multitool{
+/obj/item/multitool{
pixel_x = 3
},
/obj/item/stack/cable_coil,
@@ -64155,11 +64155,11 @@
/area/science/mixing)
"cFu" = (
/obj/structure/closet,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 2;
pixel_y = -2
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -2;
pixel_y = 5
},
@@ -64175,7 +64175,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"cFw" = (
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/effect/turf_decal/stripes/line{
dir = 2
},
@@ -64191,12 +64191,12 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"cFy" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = -28
},
/obj/structure/table/glass,
/obj/item/hand_labeler,
-/obj/item/device/radio/headset/headset_med,
+/obj/item/radio/headset/headset_med,
/obj/machinery/airalarm{
pixel_y = 23
},
@@ -64308,7 +64308,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = 28
},
/turf/open/floor/plasteel/whitegreen/side{
@@ -64389,7 +64389,7 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -64969,7 +64969,7 @@
dir = 1
},
/obj/item/storage/backpack/duffelbag/med,
-/obj/item/device/flashlight/pen{
+/obj/item/flashlight/pen{
pixel_x = 4;
pixel_y = 3
},
@@ -64979,7 +64979,7 @@
/obj/structure/table,
/obj/item/retractor,
/obj/item/hemostat,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/clothing/glasses/eyepatch,
/obj/item/reagent_containers/food/drinks/bottle/vodka{
pixel_x = 3;
@@ -65056,19 +65056,19 @@
empty = 1;
name = "First-Aid (empty)"
},
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
pixel_x = 4;
pixel_y = -4
},
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
pixel_x = 4;
pixel_y = -4
},
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
pixel_x = 4;
pixel_y = -4
},
-/obj/item/device/radio/headset/headset_sci{
+/obj/item/radio/headset/headset_sci{
pixel_x = -3
},
/obj/effect/turf_decal/delivery,
@@ -65285,7 +65285,7 @@
/area/medical/virology)
"cHw" = (
/obj/structure/closet/emcloset,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = -28
},
/obj/effect/turf_decal/stripes/line{
@@ -65670,7 +65670,7 @@
"cIh" = (
/obj/structure/closet,
/obj/item/storage/box/lights/mixed,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
@@ -66000,7 +66000,7 @@
pixel_y = 5
},
/obj/item/clothing/glasses/welding,
-/obj/item/device/multitool{
+/obj/item/multitool{
pixel_x = 3
},
/obj/effect/turf_decal/delivery,
@@ -66029,7 +66029,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -66382,7 +66382,7 @@
/obj/structure/table,
/obj/item/retractor,
/obj/item/hemostat,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -66403,9 +66403,9 @@
/area/science/robotics/lab)
"cJK" = (
/obj/structure/table,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
/obj/structure/window/reinforced{
dir = 4
},
@@ -66448,11 +66448,11 @@
maxcharge = 15000
},
/obj/item/crowbar,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -66495,7 +66495,7 @@
/turf/open/floor/plasteel/dark,
/area/science/server)
"cJS" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -66676,7 +66676,7 @@
},
/area/medical/virology)
"cKm" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -66823,7 +66823,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/obj/effect/turf_decal/stripes/line{
@@ -67504,7 +67504,7 @@
/turf/open/floor/engine,
/area/science/explab)
"cLV" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/obj/machinery/firealarm{
@@ -67572,7 +67572,7 @@
pixel_x = 4
},
/obj/item/organ/heart,
-/obj/item/device/soulstone/anybody/chaplain,
+/obj/item/soulstone/anybody/chaplain,
/turf/open/floor/plasteel/cult{
dir = 2
},
@@ -67817,7 +67817,7 @@
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"cME" = (
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/newscaster{
pixel_x = -30
},
@@ -68111,7 +68111,7 @@
/area/maintenance/port/aft)
"cNg" = (
/obj/structure/rack,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/light/small,
/turf/open/floor/plating,
@@ -68155,7 +68155,7 @@
"cNk" = (
/obj/item/storage/bag/plants/portaseeder,
/obj/item/storage/bag/plants/portaseeder,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/item/cultivator,
/obj/item/reagent_containers/glass/bucket,
/obj/structure/rack,
@@ -68195,7 +68195,7 @@
/obj/machinery/hydroponics/soil{
pixel_y = 8
},
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
@@ -68254,7 +68254,7 @@
c_tag = "Chapel Office - Backroom";
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -68296,7 +68296,7 @@
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
"cNz" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1480;
name = "Confessional Intercom";
@@ -68463,7 +68463,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/requests_console{
department = "Security";
departmentType = 5;
@@ -68760,10 +68760,10 @@
pixel_x = -4;
pixel_y = 4
},
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -68855,7 +68855,7 @@
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"cOL" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1480;
name = "Confessional Intercom";
@@ -69148,7 +69148,7 @@
/area/maintenance/starboard/aft)
"cPz" = (
/obj/structure/closet,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 3;
name = "3maintenance loot spawner"
@@ -69340,7 +69340,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -69369,7 +69369,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -69444,7 +69444,7 @@
/turf/open/floor/plasteel/dark,
/area/chapel/main)
"cQc" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -69634,7 +69634,7 @@
/obj/machinery/doppler_array/research/science{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -69771,7 +69771,7 @@
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cQS" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -69790,7 +69790,7 @@
/turf/open/floor/plating,
/area/chapel/main)
"cQV" = (
-/obj/item/device/flashlight/lantern{
+/obj/item/flashlight/lantern{
pixel_y = 7
},
/obj/structure/table/wood,
@@ -69925,7 +69925,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/item/device/gps,
+/obj/item/gps,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
@@ -71082,14 +71082,14 @@
/area/science/xenobiology)
"cVb" = (
/obj/structure/table/wood,
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = -3;
pixel_y = 5
},
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_y = 9
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -71100,7 +71100,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 1;
frequency = 1459;
name = "Station Intercom (General)";
@@ -71340,7 +71340,7 @@
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cZc" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -71449,7 +71449,7 @@
/obj/item/stack/sheet/metal{
amount = 10
},
-/obj/item/device/electropack,
+/obj/item/electropack,
/turf/open/floor/engine,
/area/science/xenobiology)
"daF" = (
@@ -71466,7 +71466,7 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"daH" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/engine,
/area/science/xenobiology)
"daI" = (
@@ -71475,7 +71475,7 @@
pixel_y = 5
},
/obj/item/stack/cable_coil,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/stock_parts/cell/high{
charge = 100;
maxcharge = 15000
@@ -71500,26 +71500,26 @@
/area/science/xenobiology)
"daM" = (
/obj/structure/table,
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 5;
pixel_y = -4
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 2;
pixel_y = 6
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 2;
pixel_y = -1
},
/turf/open/floor/engine,
/area/science/xenobiology)
"daN" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = -25
},
/turf/open/floor/engine,
@@ -72030,7 +72030,7 @@
/obj/machinery/shower{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -72350,7 +72350,7 @@
/area/science/xenobiology)
"dcM" = (
/obj/machinery/chem_master,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -72618,7 +72618,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/general/visible,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -73398,7 +73398,7 @@
/area/maintenance/port/fore)
"dhL" = (
/obj/structure/table,
-/obj/item/device/analyzer,
+/obj/item/analyzer,
/obj/machinery/power/apc{
dir = 2;
name = "Tool Storage APC";
@@ -73415,7 +73415,7 @@
},
/area/storage/primary)
"dhM" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -73557,7 +73557,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/item/device/instrument/guitar,
+/obj/item/instrument/guitar,
/obj/structure/sign/poster/random{
pixel_x = 32
},
@@ -73622,9 +73622,9 @@
/turf/open/floor/carpet,
/area/crew_quarters/theatre)
"dij" = (
-/obj/item/device/instrument/violin,
+/obj/item/instrument/violin,
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -73692,7 +73692,7 @@
/obj/item/poster/random_official,
/obj/item/poster/random_official,
/obj/item/poster/random_official,
-/obj/item/device/paicard{
+/obj/item/paicard{
desc = "A real Nanotrasen success, these personal AIs provide all of the companionship of an AI without any law related red-tape.";
name = "Nanotrasen-brand personal AI device exhibit"
},
@@ -73924,7 +73924,7 @@
},
/obj/item/reagent_containers/food/drinks/ale,
/obj/structure/table/wood,
-/obj/item/device/instrument/eguitar,
+/obj/item/instrument/eguitar,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -75459,7 +75459,7 @@
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
-/obj/item/device/assault_pod/mining,
+/obj/item/assault_pod/mining,
/turf/open/floor/plasteel/yellow/side{
dir = 1
},
@@ -75647,7 +75647,7 @@
/turf/open/floor/plating/airless,
/area/engine/engineering)
"gnZ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = -30
},
/turf/open/floor/plasteel/white,
@@ -75695,8 +75695,8 @@
/area/maintenance/aft)
"gRS" = (
/obj/structure/table/reinforced,
-/obj/item/device/integrated_electronics/analyzer,
-/obj/item/device/integrated_circuit_printer,
+/obj/item/integrated_electronics/analyzer,
+/obj/item/integrated_circuit_printer,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"gXY" = (
@@ -75943,7 +75943,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"kOt" = (
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/screwdriver,
/obj/structure/table/reinforced,
/obj/structure/cable/yellow{
@@ -76000,7 +76000,7 @@
/area/engine/engineering)
"llb" = (
/obj/structure/table/reinforced,
-/obj/item/device/integrated_circuit_printer,
+/obj/item/integrated_circuit_printer,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"lsv" = (
@@ -76014,7 +76014,7 @@
icon_state = "0-8"
},
/obj/structure/table/reinforced,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"lwo" = (
@@ -76208,9 +76208,9 @@
/turf/open/floor/plasteel/white,
/area/science/circuit)
"ohj" = (
-/obj/item/device/integrated_electronics/analyzer,
-/obj/item/device/integrated_electronics/debugger,
-/obj/item/device/integrated_electronics/wirer,
+/obj/item/integrated_electronics/analyzer,
+/obj/item/integrated_electronics/debugger,
+/obj/item/integrated_electronics/wirer,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/white,
/area/science/circuit)
@@ -76246,7 +76246,7 @@
pixel_y = 30;
receive_ore_updates = 1
},
-/obj/item/device/integrated_electronics/debugger,
+/obj/item/integrated_electronics/debugger,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"oRL" = (
@@ -76394,7 +76394,7 @@
/area/engine/engineering)
"qBh" = (
/obj/structure/table,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel/whitepurple/side{
dir = 2
},
@@ -76753,7 +76753,7 @@
/turf/open/floor/plating,
/area/engine/engineering)
"xkG" = (
-/obj/item/device/integrated_electronics/wirer,
+/obj/item/integrated_electronics/wirer,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/white,
/area/science/circuit)
diff --git a/_maps/cit_map_files/Mining/Lavaland.dmm b/_maps/cit_map_files/Mining/Lavaland.dmm
index 18aa7d0f98..62f8080c28 100644
--- a/_maps/cit_map_files/Mining/Lavaland.dmm
+++ b/_maps/cit_map_files/Mining/Lavaland.dmm
@@ -106,18 +106,18 @@
/obj/structure/rack,
/obj/item/storage/bag/ore,
/obj/item/pickaxe,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/item/clothing/glasses/meson,
-/obj/item/device/mining_scanner,
+/obj/item/mining_scanner,
/turf/open/floor/plasteel,
/area/mine/laborcamp)
"av" = (
/obj/structure/rack,
/obj/item/storage/bag/ore,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/item/pickaxe,
/obj/item/clothing/glasses/meson,
-/obj/item/device/mining_scanner,
+/obj/item/mining_scanner,
/turf/open/floor/plasteel,
/area/mine/laborcamp)
"aw" = (
@@ -164,7 +164,7 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"aE" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -384,10 +384,10 @@
"bn" = (
/obj/structure/table,
/obj/item/pickaxe,
-/obj/item/device/gps/mining,
-/obj/item/device/gps/mining,
-/obj/item/device/gps/mining,
-/obj/item/device/gps/mining,
+/obj/item/gps/mining,
+/obj/item/gps/mining,
+/obj/item/gps/mining,
+/obj/item/gps/mining,
/turf/open/floor/plasteel/purple/side{
dir = 9
},
@@ -583,7 +583,7 @@
/turf/open/floor/plating,
/area/mine/production)
"bO" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/purple/corner{
dir = 8
},
@@ -926,7 +926,7 @@
/turf/closed/wall,
/area/mine/living_quarters)
"cO" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -1325,7 +1325,7 @@
dir = 8;
network = list("mine")
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = 28
@@ -1937,7 +1937,7 @@
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"fq" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = 28
@@ -2062,7 +2062,7 @@
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"fI" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
diff --git a/_maps/cit_map_files/OmegaStation/OmegaStation.dmm b/_maps/cit_map_files/OmegaStation/OmegaStation.dmm
index 853f932cab..278ab1d815 100644
--- a/_maps/cit_map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/cit_map_files/OmegaStation/OmegaStation.dmm
@@ -138,7 +138,7 @@
"aas" = (
/obj/item/storage/toolbox/mechanical,
/obj/item/wrench,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/structure/cable/white{
icon_state = "1-2"
},
@@ -262,7 +262,7 @@
"aaE" = (
/obj/item/folder/red,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/structure/cable/white{
icon_state = "1-2"
},
@@ -347,8 +347,8 @@
/obj/structure/table/reinforced,
/obj/machinery/recharger,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/radio/intercom{
+/obj/item/assembly/flash/handheld,
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -28
},
@@ -439,9 +439,9 @@
/area/bridge)
"aaU" = (
/obj/structure/table/reinforced,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/item/storage/secure/briefcase,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
@@ -526,7 +526,7 @@
/obj/machinery/chem_dispenser/drinks{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28;
pixel_y = 24
@@ -1117,7 +1117,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/carpet,
/area/bridge)
"ack" = (
@@ -1161,7 +1161,7 @@
/area/bridge)
"aco" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/newscaster{
pixel_x = -32
},
@@ -1868,7 +1868,7 @@
/area/crew_quarters/heads/captain/private)
"adN" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
@@ -1960,7 +1960,7 @@
/turf/closed/wall,
/area/crew_quarters/heads/hop)
"adZ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -28
},
@@ -2367,7 +2367,7 @@
pixel_x = 24;
pixel_y = 38
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28;
pixel_y = 24
@@ -2435,7 +2435,7 @@
/area/asteroid/nearstation)
"afd" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/item/restraints/handcuffs,
/turf/open/floor/plasteel/vault/side{
dir = 4
@@ -2535,7 +2535,7 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/captain/private)
"afo" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Captain's Intercom";
@@ -2844,8 +2844,8 @@
"afP" = (
/obj/structure/table/wood,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/camera/detective,
-/obj/item/device/radio/intercom{
+/obj/item/camera/detective,
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -2956,7 +2956,7 @@
/area/crew_quarters/heads/captain/private)
"aga" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/obj/item/toy/figure/captain,
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain/private)
@@ -3451,7 +3451,7 @@
"agX" = (
/obj/structure/table/reinforced,
/obj/item/aiModule/reset,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -3523,7 +3523,7 @@
"ahd" = (
/obj/structure/table/reinforced,
/obj/item/aiModule/supplied/quarantine,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -3838,7 +3838,7 @@
/area/security/detectives_office)
"ahF" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/item/storage/secure/safe{
pixel_x = 32
},
@@ -3975,7 +3975,7 @@
pixel_x = 9;
pixel_y = -24
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -4418,7 +4418,7 @@
"aiN" = (
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
-/obj/item/device/multitool{
+/obj/item/multitool{
pixel_x = 6
},
/obj/item/pen/red,
@@ -4506,7 +4506,7 @@
/area/security/brig)
"aiY" = (
/obj/structure/closet/crate/bin,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 24
@@ -4663,7 +4663,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -4799,7 +4799,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -4976,7 +4976,7 @@
pixel_x = 3;
pixel_y = -3
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -5048,8 +5048,8 @@
/obj/structure/table/reinforced,
/obj/item/folder/red,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/item/key/security,
/turf/open/floor/plasteel/red/side{
dir = 8
@@ -6446,7 +6446,7 @@
},
/obj/item/storage/toolbox/mechanical,
/obj/item/stack/cable_coil/white,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/machinery/button/door{
id = "evashutters";
name = "E.V.A. Shutters";
@@ -6462,7 +6462,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -6527,7 +6527,7 @@
pixel_x = 24;
pixel_y = -24
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
@@ -6557,7 +6557,7 @@
name = "protective hat";
pixel_y = 9
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plating,
/area/asteroid/nearstation)
"amH" = (
@@ -6724,9 +6724,9 @@
"amV" = (
/obj/structure/table/reinforced,
/obj/item/storage/belt/utility,
-/obj/item/device/radio,
-/obj/item/device/radio,
-/obj/item/device/gps,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/gps,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/teleporter)
@@ -6814,10 +6814,10 @@
"anh" = (
/obj/structure/table/reinforced,
/obj/item/storage/belt/utility,
-/obj/item/device/radio,
-/obj/item/device/radio,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/flashlight/flare,
+/obj/item/flashlight/flare,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
@@ -6906,7 +6906,7 @@
/area/quartermaster/miningdock)
"anq" = (
/obj/structure/closet/secure_closet/miner,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -7140,7 +7140,7 @@
"anN" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot,
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel,
/area/teleporter)
"anP" = (
@@ -7243,7 +7243,7 @@
"anW" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot,
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"anX" = (
@@ -8196,7 +8196,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -8259,7 +8259,7 @@
/area/teleporter)
"apO" = (
/obj/machinery/shieldwallgen,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
@@ -8405,10 +8405,10 @@
/obj/item/storage/toolbox/emergency,
/obj/item/tank/internals/oxygen,
/obj/item/tank/internals/oxygen,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight/flare,
+/obj/item/flashlight/flare,
/turf/open/floor/plasteel,
/area/maintenance/starboard/central)
"aqc" = (
@@ -8419,7 +8419,7 @@
},
/obj/item/tank/jetpack/carbondioxide,
/obj/item/wrench,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -28
},
@@ -8612,10 +8612,10 @@
"aqv" = (
/obj/effect/decal/cleanable/oil,
/obj/structure/closet/crate,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight/flare,
+/obj/item/flashlight/flare,
/obj/item/stock_parts/cell/high,
/obj/item/crowbar/red,
/obj/effect/turf_decal/bot,
@@ -8657,7 +8657,7 @@
/area/maintenance/port/fore)
"aqI" = (
/obj/structure/closet/secure_closet/security/sec,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -8793,23 +8793,23 @@
/area/storage/primary)
"aqU" = (
/obj/structure/table/reinforced,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/status_display{
pixel_y = 32
},
/obj/effect/turf_decal/bot,
-/obj/item/device/multitool,
-/obj/item/device/multitool,
+/obj/item/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel,
/area/storage/primary)
"aqV" = (
/obj/structure/table/reinforced,
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/gps,
+/obj/item/gps,
/obj/machinery/light{
dir = 1
},
@@ -9045,7 +9045,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -9317,7 +9317,7 @@
/area/storage/primary)
"arU" = (
/obj/machinery/holopad,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -9676,7 +9676,7 @@
"asO" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -26
@@ -9691,15 +9691,15 @@
/area/security/brig)
"asP" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = -5;
pixel_y = 5
},
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/newscaster/security_unit{
pixel_y = -32
},
@@ -9713,11 +9713,11 @@
"asQ" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/status_display{
pixel_y = -32
},
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -9828,7 +9828,7 @@
"asX" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/white{
icon_state = "4-8"
@@ -10107,7 +10107,7 @@
"atQ" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -10242,11 +10242,11 @@
/area/maintenance/port/central)
"atX" = (
/obj/structure/table/wood,
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -10365,7 +10365,7 @@
},
/obj/item/stack/cable_coil/random,
/obj/item/stack/cable_coil/random,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -10692,7 +10692,7 @@
/area/crew_quarters/theatre)
"ava" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/guitar,
+/obj/item/instrument/guitar,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -10745,7 +10745,7 @@
/area/crew_quarters/bar/atrium)
"avg" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -11027,7 +11027,7 @@
icon_state = "crateopen"
},
/obj/item/clothing/shoes/jackboots,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/item/storage/secure/briefcase,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 2;
@@ -11192,7 +11192,7 @@
/area/maintenance/port/central)
"awf" = (
/obj/structure/table/wood,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -11384,7 +11384,7 @@
/area/maintenance/starboard/central)
"awy" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -11771,7 +11771,7 @@
/obj/machinery/newscaster{
pixel_y = 32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -11802,7 +11802,7 @@
},
/area/hallway/primary/port)
"axD" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -12082,7 +12082,7 @@
"ayr" = (
/obj/structure/table/reinforced,
/obj/item/storage/belt/utility,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
/obj/structure/cable/white{
icon_state = "2-4"
},
@@ -12167,7 +12167,7 @@
/area/crew_quarters/dorms)
"ayE" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/violin,
+/obj/item/instrument/violin,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -12330,7 +12330,7 @@
},
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/airalarm{
pixel_y = 23
},
@@ -12344,7 +12344,7 @@
"ayX" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/status_display{
pixel_y = 32
},
@@ -12360,7 +12360,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -12527,12 +12527,12 @@
/area/engine/atmos)
"azA" = (
/obj/structure/table,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/dorms)
"azB" = (
/obj/structure/table,
-/obj/item/device/camera,
+/obj/item/camera,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/dorms)
@@ -13329,7 +13329,7 @@
/area/engine/atmos)
"aBJ" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/requests_console{
department = "Atmospherics Office";
departmentType = 0;
@@ -13609,7 +13609,7 @@
icon_state = "4-8"
},
/obj/item/folder/red,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/effect/turf_decal/stripes/line{
dir = 2
},
@@ -13862,7 +13862,7 @@
/area/crew_quarters/dorms)
"aCP" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/eguitar,
+/obj/item/instrument/eguitar,
/obj/item/toy/crayon/spraycan/lubecan{
charges = 5
},
@@ -14355,7 +14355,7 @@
/turf/open/floor/plasteel/white,
/area/crew_quarters/kitchen)
"aDX" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
@@ -14427,7 +14427,7 @@
/obj/structure/sign/warning/nosmoking{
pixel_y = 32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -14511,7 +14511,7 @@
/obj/machinery/power/smes{
charge = 5e+006
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -14746,10 +14746,10 @@
"aET" = (
/obj/structure/table/wood,
/obj/item/storage/crayons,
-/obj/item/device/flashlight/lamp/bananalamp{
+/obj/item/flashlight/lamp/bananalamp{
pixel_y = 5
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -14981,7 +14981,7 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 20
},
-/obj/item/device/gps/engineering{
+/obj/item/gps/engineering{
gpstag = "ENG0"
},
/obj/machinery/light/small,
@@ -15301,7 +15301,7 @@
/area/crew_quarters/kitchen)
"aFX" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -15322,7 +15322,7 @@
/area/hallway/primary/starboard)
"aGa" = (
/obj/effect/landmark/event_spawn,
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/neutral,
/area/hallway/secondary/exit)
"aGb" = (
@@ -15726,7 +15726,7 @@
/area/crew_quarters/bar/atrium)
"aGQ" = (
/obj/machinery/holopad,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
@@ -16597,7 +16597,7 @@
/area/engine/engineering)
"aIy" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/requests_console{
department = "Engineering";
departmentType = 0;
@@ -16710,7 +16710,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -16961,7 +16961,7 @@
/obj/machinery/power/terminal{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -17234,7 +17234,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/bot,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -17691,7 +17691,7 @@
/area/engine/engineering)
"aKM" = (
/obj/structure/table/reinforced,
-/obj/item/device/lightreplacer,
+/obj/item/lightreplacer,
/obj/structure/cable/white{
icon_state = "1-8"
},
@@ -18221,7 +18221,7 @@
pixel_y = 3
},
/obj/item/storage/box/lights/mixed,
-/obj/item/device/lightreplacer,
+/obj/item/lightreplacer,
/obj/machinery/airalarm{
dir = 4;
pixel_x = -23
@@ -18539,7 +18539,7 @@
/area/engine/engineering)
"aNa" = (
/obj/machinery/suit_storage_unit/engine,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -18624,7 +18624,7 @@
/area/engine/engineering)
"aNh" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -18672,7 +18672,7 @@
/obj/machinery/light_switch{
pixel_y = -24
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -18882,7 +18882,7 @@
/area/hallway/secondary/exit)
"aNI" = (
/obj/structure/closet/crate,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -18943,7 +18943,7 @@
/obj/machinery/computer/telecomms/monitor{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -19438,7 +19438,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -19718,7 +19718,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -20291,7 +20291,7 @@
pixel_y = 3
},
/obj/item/book/manual/detective,
-/obj/item/device/camera/detective,
+/obj/item/camera/detective,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -20677,7 +20677,7 @@
/obj/structure/cable/white{
icon_state = "1-4"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -28
},
@@ -20808,7 +20808,7 @@
/area/maintenance/port)
"aRT" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = -32
},
@@ -20837,7 +20837,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -20847,7 +20847,7 @@
/area/library)
"aRX" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/machinery/newscaster{
pixel_y = 32
},
@@ -20893,7 +20893,7 @@
/area/library)
"aSd" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/newscaster{
pixel_x = 32
},
@@ -20935,7 +20935,7 @@
dir = 4;
pixel_x = -22
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26;
pixel_y = 24
@@ -21229,7 +21229,7 @@
"aST" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
@@ -21284,8 +21284,8 @@
/obj/item/tank/internals/emergency_oxygen/engi{
pixel_x = 5
},
-/obj/item/device/geiger_counter,
-/obj/item/device/geiger_counter,
+/obj/item/geiger_counter,
+/obj/item/geiger_counter,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
@@ -21415,7 +21415,7 @@
dir = 1
},
/obj/machinery/door/window/southright,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -21481,7 +21481,7 @@
/area/hallway/primary/aft)
"aTy" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/lounge)
"aTz" = (
@@ -21810,7 +21810,7 @@
/area/library)
"aUk" = (
/obj/structure/bodycontainer/morgue,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -21964,14 +21964,14 @@
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/manipulator,
/obj/item/stock_parts/manipulator,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/vault/side,
/area/science/lab)
"aUF" = (
@@ -22165,7 +22165,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -22360,10 +22360,10 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/item/device/integrated_circuit_printer,
-/obj/item/device/integrated_electronics/analyzer,
-/obj/item/device/integrated_electronics/debugger,
-/obj/item/device/integrated_electronics/wirer,
+/obj/item/integrated_circuit_printer,
+/obj/item/integrated_electronics/analyzer,
+/obj/item/integrated_electronics/debugger,
+/obj/item/integrated_electronics/wirer,
/turf/open/floor/plasteel/vault/side,
/area/science/lab)
"aVy" = (
@@ -22491,7 +22491,7 @@
"aVN" = (
/obj/structure/table/wood,
/obj/item/storage/bag/books,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/status_display{
pixel_x = -32
},
@@ -22505,7 +22505,7 @@
/area/library)
"aVP" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/library)
@@ -22653,18 +22653,18 @@
/area/medical/chemistry)
"aWg" = (
/obj/structure/table/glass,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/timer{
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
@@ -22837,7 +22837,7 @@
"aWy" = (
/obj/structure/table/wood,
/obj/item/storage/briefcase,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"aWz" = (
@@ -22864,11 +22864,11 @@
/area/library)
"aWC" = (
/obj/structure/table/wood,
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/vault{
dir = 5
@@ -23525,7 +23525,7 @@
/area/medical/medbay/zone3)
"aXQ" = (
/obj/structure/closet/secure_closet/medical3,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -23725,7 +23725,7 @@
/area/science/research)
"aYm" = (
/obj/machinery/light,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -23788,7 +23788,7 @@
dir = 4
},
/obj/structure/cable/white,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -24213,7 +24213,7 @@
"aZq" = (
/obj/structure/table/wood,
/obj/item/clothing/gloves/color/black,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/light/small{
dir = 1
},
@@ -24256,10 +24256,10 @@
"aZv" = (
/obj/structure/table/wood,
/obj/item/folder,
-/obj/item/device/laser_pointer{
+/obj/item/laser_pointer{
pixel_x = 3
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -24269,8 +24269,8 @@
/area/library)
"aZw" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
-/obj/item/device/camera,
+/obj/item/taperecorder,
+/obj/item/camera,
/obj/machinery/ai_status_display{
pixel_y = -32
},
@@ -24599,7 +24599,7 @@
/obj/item/screwdriver{
pixel_y = 5
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/clothing/head/welding,
/obj/machinery/firealarm{
pixel_y = 24
@@ -24639,12 +24639,12 @@
/obj/structure/table/reinforced,
/obj/item/stack/cable_coil/white,
/obj/item/stack/cable_coil/white,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/newscaster{
pixel_y = 32
},
@@ -24653,15 +24653,15 @@
/area/science/robotics/lab)
"bag" = (
/obj/item/paper_bin,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 5;
pixel_y = 7
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 5;
pixel_y = 7
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 5;
pixel_y = 7
},
@@ -24947,7 +24947,7 @@
"baK" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/structure/reagent_dispensers/peppertank{
pixel_x = 32
},
@@ -25137,7 +25137,7 @@
/area/science/robotics/lab)
"bbc" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plating,
/area/maintenance/port)
"bbd" = (
@@ -25610,7 +25610,7 @@
"bce" = (
/obj/structure/table/optable,
/obj/effect/decal/cleanable/blood/old,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -25824,7 +25824,7 @@
"bcD" = (
/obj/structure/rack,
/obj/item/weldingtool,
-/obj/item/device/assembly/voice,
+/obj/item/assembly/voice,
/obj/item/clothing/head/welding,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/turf_decal/stripes/line{
@@ -25898,7 +25898,7 @@
/area/maintenance/port)
"bcR" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/guitar,
+/obj/item/instrument/guitar,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plating,
/area/maintenance/port)
@@ -26538,7 +26538,7 @@
/obj/structure/chair/office/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -26605,7 +26605,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"beg" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -26665,7 +26665,7 @@
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/cell/high,
/obj/machinery/cell_charger,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -26690,9 +26690,9 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/item/device/mmi,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
/obj/structure/sign/departments/medbay/alt{
pixel_y = -32
},
@@ -26880,7 +26880,7 @@
/obj/machinery/newscaster{
pixel_x = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -27544,7 +27544,7 @@
},
/area/chapel/main)
"bfX" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -27625,7 +27625,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -27791,7 +27791,7 @@
pixel_x = -26;
req_access_txt = "27"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -27830,7 +27830,7 @@
/area/chapel/main)
"bgH" = (
/obj/structure/table/wood/fancy,
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
@@ -28535,7 +28535,7 @@
/area/chapel/main)
"bii" = (
/obj/structure/table/wood/fancy,
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -29293,7 +29293,7 @@
/obj/structure/extinguisher_cabinet{
pixel_y = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -29328,7 +29328,7 @@
/area/chapel/main)
"bjM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -29429,7 +29429,7 @@
pixel_x = 24;
pixel_y = -24
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -29566,7 +29566,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bkC" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
@@ -32121,7 +32121,7 @@
/area/hydroponics)
"lAs" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -33266,9 +33266,9 @@
/obj/structure/table,
/obj/item/clipboard,
/obj/item/crowbar/red,
-/obj/item/device/aicard,
-/obj/item/device/analyzer,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/aicard,
+/obj/item/analyzer,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault/side{
dir = 8
},
@@ -34241,7 +34241,7 @@
/turf/open/floor/circuit/green,
/area/ai_monitored/turret_protected/ai)
"sLV" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
@@ -34249,14 +34249,14 @@
pixel_x = -27;
pixel_y = -7
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = -27
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -34428,7 +34428,7 @@
"sMv" = (
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/mmi,
+/obj/item/mmi,
/obj/structure/table,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/vault{
@@ -34441,7 +34441,7 @@
/area/ai_monitored/turret_protected/ai)
"sMx" = (
/obj/item/folder/blue,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/structure/table,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -34496,7 +34496,7 @@
id = "AI";
pixel_x = -26
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -34602,7 +34602,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -34654,7 +34654,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/vault/side{
dir = 5
},
@@ -34892,7 +34892,7 @@
/turf/open/floor/plasteel/vault,
/area/ai_monitored/turret_protected/aisat_interior)
"sNz" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/carpet,
/area/crew_quarters/lounge)
"sNA" = (
@@ -35043,10 +35043,10 @@
/obj/item/stack/sheet/glass{
amount = 20
},
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/mmi,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/mmi,
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
diff --git a/_maps/cit_map_files/PubbyStation/PubbyStation.dmm b/_maps/cit_map_files/PubbyStation/PubbyStation.dmm
index af527e89c3..3659a50ff3 100644
--- a/_maps/cit_map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/cit_map_files/PubbyStation/PubbyStation.dmm
@@ -97,7 +97,7 @@
icon_state = "2-4"
},
/obj/effect/landmark/start/ai/secondary,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -145,7 +145,7 @@
pixel_y = 24
},
/obj/effect/landmark/start/ai/secondary,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -269,7 +269,7 @@
/area/ai_monitored/turret_protected/ai)
"acy" = (
/obj/effect/landmark/start/ai,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
@@ -277,14 +277,14 @@
pixel_x = -27;
pixel_y = -9
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = -31
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -346,7 +346,7 @@
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
"acE" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -518,10 +518,10 @@
pixel_x = 3;
pixel_y = -4
},
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/mmi,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/mmi,
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -673,7 +673,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -1077,7 +1077,7 @@
/turf/open/floor/plasteel/dark,
/area/security/prison)
"aeD" = (
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/turf/open/floor/plasteel/dark,
/area/security/prison)
"aeE" = (
@@ -1395,7 +1395,7 @@
/area/security/prison)
"afq" = (
/obj/structure/table,
-/obj/item/device/instrument/harmonica,
+/obj/item/instrument/harmonica,
/turf/open/floor/plasteel/dark,
/area/security/prison)
"afr" = (
@@ -1444,7 +1444,7 @@
/area/ai_monitored/turret_protected/aisat_interior)
"afy" = (
/obj/effect/landmark/start/cyborg,
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"afz" = (
@@ -1582,7 +1582,7 @@
pixel_y = 3
},
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/multitool{
+/obj/item/multitool{
layer = 5
},
/obj/item/extinguisher{
@@ -1656,7 +1656,7 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"agg" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -1872,7 +1872,7 @@
c_tag = "Permabrig Cell 2";
network = list("ss13","prison")
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -1913,7 +1913,7 @@
c_tag = "Permabrig Cell 1";
network = list("ss13","prison")
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -2076,7 +2076,7 @@
/turf/open/space,
/area/space/nearstation)
"ahj" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -2087,7 +2087,7 @@
pixel_y = 5
},
/obj/item/clothing/mask/balaclava,
-/obj/item/device/mmi,
+/obj/item/mmi,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/dark,
/area/security/execution/transfer)
@@ -2096,7 +2096,7 @@
/obj/item/folder/red{
pixel_x = 3
},
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = -3
},
/turf/open/floor/plasteel/dark,
@@ -2203,7 +2203,7 @@
/area/security/execution/transfer)
"ahx" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/dark,
/area/security/execution/transfer)
@@ -2568,7 +2568,7 @@
/obj/item/razor{
pixel_x = -6
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = 4
},
/obj/structure/extinguisher_cabinet{
@@ -2757,7 +2757,7 @@
/area/security/prison)
"aiK" = (
/obj/structure/table,
-/obj/item/device/electropack,
+/obj/item/electropack,
/turf/open/floor/plasteel/red/side,
/area/security/prison)
"aiL" = (
@@ -2853,7 +2853,7 @@
/area/maintenance/department/security/brig)
"aiY" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
"aiZ" = (
@@ -3526,7 +3526,7 @@
/area/maintenance/department/crew_quarters/dorms)
"akr" = (
/obj/machinery/washing_machine,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = -31
@@ -3571,7 +3571,7 @@
/area/maintenance/department/security/brig)
"akx" = (
/obj/structure/bodycontainer/crematorium,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -3629,7 +3629,7 @@
},
/area/security/brig)
"akD" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -4034,7 +4034,7 @@
/area/security/main)
"alC" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = -4;
pixel_y = 12
},
@@ -4321,7 +4321,7 @@
/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = -31
@@ -4646,7 +4646,7 @@
c_tag = "Brig Control Room";
dir = 2
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_y = 24
@@ -5038,7 +5038,7 @@
c_tag = "Head of Security's Office";
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_y = -27
@@ -5087,7 +5087,7 @@
/area/maintenance/department/crew_quarters/dorms)
"aob" = (
/obj/structure/closet/emcloset,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
"aod" = (
@@ -5436,7 +5436,7 @@
/obj/structure/rack,
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/laser_pointer/red,
+/obj/item/laser_pointer/red,
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"aoY" = (
@@ -5663,7 +5663,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/turf/open/floor/plating{
icon_state = "platingdmg1"
},
@@ -5986,7 +5986,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = 29
},
@@ -6355,7 +6355,7 @@
/turf/open/floor/plasteel/dark,
/area/security/brig)
"arx" = (
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/table/glass,
/turf/open/floor/plasteel/dark,
/area/security/brig)
@@ -6603,11 +6603,11 @@
desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
name = "emergency lifejacket"
},
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plasteel,
/area/gateway)
"arZ" = (
@@ -6619,22 +6619,22 @@
/area/gateway)
"asa" = (
/obj/structure/table,
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_y = 6
},
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_x = 6;
pixel_y = 4
},
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_x = -6;
pixel_y = 4
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/structure/sign/warning/biohazard{
pixel_x = 32
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel,
/area/gateway)
"asb" = (
@@ -6887,7 +6887,7 @@
/area/security/brig)
"asJ" = (
/obj/item/folder/red,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
@@ -7397,7 +7397,7 @@
},
/area/bridge)
"atU" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/darkblue/side{
dir = 1
},
@@ -7488,7 +7488,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -7614,7 +7614,7 @@
/turf/open/floor/plasteel,
/area/maintenance/department/security/brig)
"aux" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -8181,7 +8181,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -28
@@ -8254,14 +8254,14 @@
/area/bridge)
"avY" = (
/obj/structure/table/glass,
-/obj/item/device/aicard,
+/obj/item/aicard,
/turf/open/floor/plasteel/dark,
/area/bridge)
"avZ" = (
/obj/structure/table/glass,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/laser_pointer/blue,
+/obj/item/assembly/flash/handheld,
+/obj/item/laser_pointer/blue,
/turf/open/floor/plasteel/dark,
/area/bridge)
"awa" = (
@@ -8654,7 +8654,7 @@
id = "Secure Gate";
name = "brig shutters"
},
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/dark,
/area/security/brig)
@@ -9051,7 +9051,7 @@
/area/crew_quarters/heads/captain)
"axU" = (
/obj/machinery/computer/card,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -9409,7 +9409,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"ayQ" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"ayR" = (
@@ -9526,7 +9526,7 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -28
@@ -9623,7 +9623,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -28
@@ -9718,7 +9718,7 @@
/area/crew_quarters/dorms)
"azx" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -10053,7 +10053,7 @@
/area/hallway/primary/fore)
"aAp" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/obj/machinery/light_switch{
dir = 9;
pixel_x = -22
@@ -10095,7 +10095,7 @@
/area/crew_quarters/heads/captain)
"aAv" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain)
"aAw" = (
@@ -10279,7 +10279,7 @@
"aAW" = (
/obj/structure/rack,
/obj/item/clothing/mask/gas,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plating,
/area/maintenance/solars/port)
"aAX" = (
@@ -10489,7 +10489,7 @@
/area/bridge)
"aBz" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/obj/item/storage/secure/safe{
pixel_x = -22;
pixel_y = 4
@@ -10702,7 +10702,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = 28
@@ -10872,7 +10872,7 @@
"aCt" = (
/obj/structure/table,
/obj/item/wrench,
-/obj/item/device/analyzer,
+/obj/item/analyzer,
/obj/machinery/requests_console{
department = "Tool Storage";
departmentType = 0;
@@ -10886,7 +10886,7 @@
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high/plus,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -10900,15 +10900,15 @@
/area/storage/primary)
"aCv" = (
/obj/structure/table,
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -8;
pixel_y = -4
},
-/obj/item/device/assembly/igniter,
+/obj/item/assembly/igniter,
/obj/machinery/camera{
c_tag = "Primary Tool Storage"
},
-/obj/item/device/assembly/voice,
+/obj/item/assembly/voice,
/obj/structure/noticeboard{
pixel_y = 32
},
@@ -10918,14 +10918,14 @@
/area/storage/primary)
"aCw" = (
/obj/structure/table,
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
-/obj/item/device/multitool,
-/obj/item/device/multitool,
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
+/obj/item/multitool,
+/obj/item/multitool,
/obj/machinery/airalarm{
pixel_y = 22
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/item/electronics/airlock,
/turf/open/floor/plasteel/neutral/side{
dir = 1
@@ -11274,7 +11274,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -26
@@ -11530,7 +11530,7 @@
c_tag = "AI Upload Center";
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -11761,11 +11761,11 @@
/area/maintenance/department/cargo)
"aEm" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp{
+/obj/item/flashlight/lamp{
pixel_x = 3;
pixel_y = 6
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -12088,7 +12088,7 @@
pixel_x = -4;
pixel_y = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = 27
@@ -12104,7 +12104,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -12235,7 +12235,7 @@
/obj/structure/table/wood,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/carpet,
/area/security/detectives_office)
"aFq" = (
@@ -12261,7 +12261,7 @@
pixel_y = -7
},
/obj/item/electronics/apc,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
/turf/open/floor/plasteel/neutral/side{
dir = 8;
heat_capacity = 1e+006
@@ -12290,7 +12290,7 @@
/area/storage/primary)
"aFw" = (
/obj/structure/table/wood,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain)
"aFx" = (
@@ -12348,7 +12348,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aFE" = (
@@ -12550,8 +12550,8 @@
"aGe" = (
/obj/structure/rack,
/obj/item/wirecutters,
-/obj/item/device/flashlight,
-/obj/item/device/gps,
+/obj/item/flashlight,
+/obj/item/gps,
/turf/open/floor/plasteel/neutral/side{
dir = 10
},
@@ -12563,14 +12563,14 @@
"aGg" = (
/obj/structure/table,
/obj/item/crowbar,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
/obj/item/clothing/gloves/color/fyellow,
/obj/item/clothing/gloves/color/fyellow,
-/obj/item/device/assembly/timer,
-/obj/item/device/radio,
+/obj/item/assembly/timer,
+/obj/item/radio,
/turf/open/floor/plasteel/neutral/side,
/area/storage/primary)
"aGh" = (
@@ -14802,7 +14802,7 @@
/area/security/checkpoint/supply)
"aMf" = (
/obj/machinery/computer/secure_data,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -15244,7 +15244,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -15341,7 +15341,7 @@
pixel_y = 3
},
/obj/item/clothing/shoes/magboots,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -15391,7 +15391,7 @@
"aNu" = (
/obj/structure/closet/crate,
/obj/item/melee/flyswatter,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -15515,7 +15515,7 @@
/area/quartermaster/sorting)
"aNK" = (
/obj/structure/table,
-/obj/item/device/destTagger,
+/obj/item/destTagger,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -15749,7 +15749,7 @@
/area/hallway/secondary/exit/departure_lounge)
"aOt" = (
/obj/structure/table,
-/obj/item/device/instrument/glockenspiel{
+/obj/item/instrument/glockenspiel{
pixel_y = 3
},
/turf/open/floor/plasteel/redblue,
@@ -16347,7 +16347,7 @@
/area/storage/eva)
"aPM" = (
/obj/structure/table,
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel/darkblue/side{
dir = 10
@@ -16467,7 +16467,7 @@
/turf/open/floor/plasteel/floorgrime,
/area/quartermaster/warehouse)
"aQd" = (
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/floorgrime,
/area/quartermaster/warehouse)
@@ -17610,7 +17610,7 @@
},
/area/maintenance/department/crew_quarters/bar)
"aSN" = (
-/obj/item/device/assembly/mousetrap,
+/obj/item/assembly/mousetrap,
/turf/open/floor/wood{
icon_state = "wood-broken6"
},
@@ -18129,7 +18129,7 @@
/area/hydroponics)
"aTX" = (
/obj/structure/kitchenspike,
-/obj/item/device/assembly/mousetrap,
+/obj/item/assembly/mousetrap,
/obj/item/reagent_containers/food/snacks/deadmouse,
/turf/open/floor/plasteel/showroomfloor,
/area/crew_quarters/kitchen)
@@ -18674,7 +18674,7 @@
pixel_x = 28;
req_access_txt = "28"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -19096,7 +19096,7 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -19164,7 +19164,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -19327,7 +19327,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -19770,7 +19770,7 @@
/area/hydroponics)
"aXX" = (
/obj/machinery/hydroponics/constructable,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -19850,7 +19850,7 @@
"aYh" = (
/obj/structure/table/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/instrument/guitar,
+/obj/item/instrument/guitar,
/turf/open/floor/plasteel/darkred/side{
dir = 1
},
@@ -20045,8 +20045,8 @@
/area/maintenance/department/cargo)
"aYE" = (
/obj/structure/table,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/department/cargo)
@@ -20097,7 +20097,7 @@
/area/security/checkpoint/customs)
"aYK" = (
/obj/structure/closet/secure_closet/security,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -20166,7 +20166,7 @@
/area/crew_quarters/kitchen)
"aYU" = (
/obj/machinery/processor,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -20467,7 +20467,7 @@
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -20726,7 +20726,7 @@
/area/crew_quarters/bar)
"bao" = (
/obj/machinery/computer/slot_machine,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -20765,7 +20765,7 @@
"bas" = (
/obj/structure/table,
/obj/item/pen,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -26
@@ -20875,7 +20875,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -26
@@ -21340,7 +21340,7 @@
"bbN" = (
/obj/structure/rack,
/obj/item/clothing/mask/gas,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plating,
/area/maintenance/solars/starboard)
"bbO" = (
@@ -21531,7 +21531,7 @@
/area/crew_quarters/bar)
"bcq" = (
/obj/item/clothing/glasses/monocle,
-/obj/item/device/instrument/recorder,
+/obj/item/instrument/recorder,
/obj/structure/table/wood/fancy,
/turf/open/floor/carpet{
icon_state = "carpetsymbol"
@@ -22367,7 +22367,7 @@
/area/crew_quarters/bar)
"bez" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/trombone,
+/obj/item/instrument/trombone,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -22797,7 +22797,7 @@
/obj/machinery/computer/security/mining{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -35
},
@@ -22974,7 +22974,7 @@
/obj/structure/chair{
name = "Throne of Custodia"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -23250,7 +23250,7 @@
/area/space)
"bgU" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -23276,7 +23276,7 @@
/area/crew_quarters/lounge)
"bgY" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -23999,7 +23999,7 @@
/area/crew_quarters/lounge)
"biK" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -24026,7 +24026,7 @@
/area/crew_quarters/lounge)
"biN" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -24041,7 +24041,7 @@
/area/crew_quarters/lounge)
"biO" = (
/obj/structure/table/glass,
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
layer = 3.1
},
/obj/item/pen{
@@ -24420,7 +24420,7 @@
pixel_y = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -24541,10 +24541,10 @@
/area/science/research/lobby)
"bkq" = (
/obj/structure/table,
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "RD0"
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -4;
pixel_y = -4
},
@@ -24923,7 +24923,7 @@
"blr" = (
/obj/structure/table,
/obj/item/folder/white,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/turf/open/floor/plasteel/whiteblue/side{
dir = 1
},
@@ -24944,7 +24944,7 @@
/area/hallway/primary/aft)
"blv" = (
/obj/structure/table,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/item/clothing/glasses/science,
/turf/open/floor/plasteel/green/side{
dir = 9
@@ -25128,7 +25128,7 @@
/area/science/server)
"blP" = (
/obj/effect/landmark/event_spawn,
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/light{
dir = 8
},
@@ -25697,7 +25697,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bnq" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
@@ -25914,13 +25914,13 @@
/obj/item/stack/sheet/plasteel{
amount = 10
},
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/airalarm{
dir = 8;
pixel_x = 23
@@ -26005,7 +26005,7 @@
"boe" = (
/obj/structure/table,
/obj/machinery/reagentgrinder,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -28
@@ -26215,7 +26215,7 @@
name = "Medbay RC";
pixel_x = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -26558,7 +26558,7 @@
/area/medical/genetics)
"bpy" = (
/obj/machinery/clonepod,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -26873,7 +26873,7 @@
},
/obj/item/storage/belt/utility,
/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -26983,8 +26983,8 @@
pixel_y = 3
},
/obj/item/stack/sheet/metal/fifty,
-/obj/item/device/assembly/timer,
-/obj/item/device/assembly/timer,
+/obj/item/assembly/timer,
+/obj/item/assembly/timer,
/turf/open/floor/plasteel/white,
/area/science/explab)
"bqv" = (
@@ -27522,7 +27522,7 @@
/area/science/research/lobby)
"brw" = (
/obj/structure/closet/wardrobe/robotics_black,
-/obj/item/device/radio/headset/headset_sci{
+/obj/item/radio/headset/headset_sci{
pixel_x = -3
},
/turf/open/floor/plasteel/vault{
@@ -27538,19 +27538,19 @@
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"bry" = (
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -28039,7 +28039,7 @@
"bsE" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -28121,7 +28121,7 @@
/obj/machinery/chem_dispenser{
layer = 2.7
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = 29
@@ -28224,9 +28224,9 @@
empty = 1;
name = "First-Aid (empty)"
},
-/obj/item/device/healthanalyzer,
-/obj/item/device/healthanalyzer,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
+/obj/item/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/stack/cable_coil,
/obj/item/stack/cable_coil,
/obj/structure/table,
@@ -28264,9 +28264,9 @@
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
"btd" = (
-/obj/item/device/mmi,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
/obj/structure/table,
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
@@ -28316,11 +28316,11 @@
/area/science/explab)
"btl" = (
/obj/structure/table,
-/obj/item/device/electropack,
-/obj/item/device/healthanalyzer,
-/obj/item/device/assembly/signaler,
+/obj/item/electropack,
+/obj/item/healthanalyzer,
+/obj/item/assembly/signaler,
/obj/machinery/light,
-/obj/item/device/assembly/voice,
+/obj/item/assembly/voice,
/obj/machinery/camera{
c_tag = "Experimentation Lab";
dir = 1;
@@ -28334,7 +28334,7 @@
pixel_y = 5
},
/obj/item/stack/cable_coil,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/screwdriver,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
@@ -28881,7 +28881,7 @@
/turf/open/floor/plasteel,
/area/science/explab)
"buB" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -28
@@ -29279,7 +29279,7 @@
},
/area/hallway/primary/aft)
"bvv" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -28;
@@ -29981,7 +29981,7 @@
/obj/structure/rack,
/obj/item/stack/packageWrap,
/obj/item/hand_labeler,
-/obj/item/device/radio/headset/headset_med,
+/obj/item/radio/headset/headset_med,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
@@ -30679,8 +30679,8 @@
"byf" = (
/obj/structure/table,
/obj/item/storage/box/disks,
-/obj/item/device/flashlight/pen,
-/obj/item/device/flashlight/pen,
+/obj/item/flashlight/pen,
+/obj/item/flashlight/pen,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -30948,7 +30948,7 @@
/obj/item/stock_parts/manipulator,
/obj/item/stock_parts/scanning_module,
/obj/item/stock_parts/scanning_module,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/whitepurple/side,
/area/science/lab)
"byI" = (
@@ -32304,7 +32304,7 @@
dir = 8;
pixel_x = 23
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Station Intercom (Telecomms)";
@@ -32420,7 +32420,7 @@
/turf/open/floor/plasteel/dark,
/area/science/mixing)
"bBN" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -32518,7 +32518,7 @@
"bBZ" = (
/obj/structure/table,
/obj/item/pen,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -32641,7 +32641,7 @@
"bCm" = (
/obj/structure/table/glass,
/obj/item/clothing/neck/stethoscope,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/turf/open/floor/plasteel/blue,
/area/medical/sleeper)
"bCn" = (
@@ -33830,7 +33830,7 @@
/obj/machinery/computer/mecha{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -26
@@ -33844,7 +33844,7 @@
},
/area/crew_quarters/heads/hor)
"bES" = (
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/item/circuitboard/aicore,
/obj/machinery/requests_console{
announcementConsole = 1;
@@ -33996,19 +33996,19 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bFi" = (
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -4;
pixel_y = 1
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 8;
pixel_y = 9
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 9;
pixel_y = -2
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_y = 2
},
/obj/structure/table/reinforced,
@@ -34028,7 +34028,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/analyzer,
+/obj/item/analyzer,
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bFl" = (
@@ -34416,7 +34416,7 @@
/area/medical/surgery)
"bFV" = (
/obj/structure/table/glass,
-/obj/item/device/flashlight/pen,
+/obj/item/flashlight/pen,
/obj/item/clothing/neck/stethoscope,
/obj/item/lipstick/black,
/obj/machinery/power/apc{
@@ -34568,18 +34568,18 @@
/turf/open/floor/plasteel/whitepurple/side,
/area/science/mixing)
"bGo" = (
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_y = 8
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -8;
pixel_y = 5
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = 6;
pixel_y = 5
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -2;
pixel_y = -2
},
@@ -34587,37 +34587,37 @@
/turf/open/floor/plasteel/whitepurple/side,
/area/science/mixing)
"bGp" = (
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = -5
},
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = -5
},
-/obj/item/device/transfer_valve,
-/obj/item/device/transfer_valve,
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve,
+/obj/item/transfer_valve,
+/obj/item/transfer_valve{
pixel_x = 5
},
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = 5
},
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/whitepurple/side,
/area/science/mixing)
"bGq" = (
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 5;
pixel_y = 4
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -4;
pixel_y = 2
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 6;
pixel_y = -4
},
-/obj/item/device/assembly/timer,
+/obj/item/assembly/timer,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/whitepurple/side,
/area/science/mixing)
@@ -34834,7 +34834,7 @@
icon_state = "shower";
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -34971,10 +34971,10 @@
},
/area/science/research/lobby)
"bHk" = (
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "RD0"
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -35228,7 +35228,7 @@
/area/maintenance/department/engine)
"bHS" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/effect/decal/cleanable/cobweb{
icon_state = "cobweb2"
},
@@ -35268,7 +35268,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -35297,7 +35297,7 @@
/area/medical/virology)
"bIb" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -35397,7 +35397,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -35800,7 +35800,7 @@
/obj/structure/table/glass,
/obj/item/book/manual/wiki/infections,
/obj/item/hand_labeler,
-/obj/item/device/radio/headset/headset_med,
+/obj/item/radio/headset/headset_med,
/obj/machinery/light{
dir = 8
},
@@ -36377,7 +36377,7 @@
dir = 4
},
/obj/effect/landmark/event_spawn,
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bKA" = (
@@ -36545,7 +36545,7 @@
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -37322,7 +37322,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Station Intercom (Telecomms)";
@@ -37525,7 +37525,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = 27
@@ -38086,7 +38086,7 @@
pixel_x = -5;
pixel_y = 3
},
-/obj/item/device/multitool{
+/obj/item/multitool{
layer = 4
},
/turf/open/floor/plasteel/yellow/side,
@@ -38095,9 +38095,9 @@
/obj/structure/table,
/obj/item/stack/sheet/glass/fifty,
/obj/item/storage/belt/utility,
-/obj/item/device/t_scanner,
-/obj/item/device/t_scanner,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
+/obj/item/t_scanner,
+/obj/item/t_scanner,
/turf/open/floor/plasteel/yellow/side,
/area/engine/atmos)
"bOX" = (
@@ -38469,7 +38469,7 @@
/turf/open/floor/plating/asteroid,
/area/chapel/asteroid/monastery)
"bQe" = (
-/obj/item/device/flashlight/lantern{
+/obj/item/flashlight/lantern{
on = 1
},
/turf/open/floor/plating/asteroid,
@@ -38560,16 +38560,16 @@
/area/storage/tech)
"bQs" = (
/obj/structure/table,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/effect/decal/cleanable/cobweb,
/obj/structure/extinguisher_cabinet{
pixel_x = -26
@@ -38578,7 +38578,7 @@
/area/storage/tech)
"bQt" = (
/obj/structure/table,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/item/aiModule/reset,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/airalarm{
@@ -38923,7 +38923,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -39566,7 +39566,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/dark,
/area/storage/tech)
"bSG" = (
@@ -39681,7 +39681,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bSS" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bST" = (
@@ -39935,7 +39935,7 @@
pixel_y = 4
},
/obj/item/clothing/gloves/color/yellow,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
/turf/open/floor/plasteel/darkgreen,
/area/storage/tech)
"bTA" = (
@@ -39944,7 +39944,7 @@
pixel_x = 2;
pixel_y = 4
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/machinery/requests_console{
department = "Tech storage";
pixel_y = -32
@@ -40067,7 +40067,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = 30;
@@ -40262,7 +40262,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 24
@@ -40773,7 +40773,7 @@
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
-/obj/item/device/assault_pod/mining,
+/obj/item/assault_pod/mining,
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
@@ -41500,7 +41500,7 @@
/turf/open/floor/plating,
/area/maintenance/department/engine)
"bXc" = (
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plating,
/area/maintenance/department/engine)
"bXd" = (
@@ -42282,7 +42282,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -43034,11 +43034,11 @@
/area/chapel/main/monastery)
"caV" = (
/obj/machinery/holopad,
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/turf/open/floor/plasteel/chapel,
/area/chapel/main/monastery)
"caW" = (
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/turf/open/floor/plasteel/chapel{
dir = 8
},
@@ -43070,7 +43070,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -43108,7 +43108,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/table/glass,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plasteel,
/area/engine/engineering)
"cbg" = (
@@ -43580,7 +43580,7 @@
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
"ccL" = (
-/obj/item/device/flashlight/lantern{
+/obj/item/flashlight/lantern{
on = 1
},
/turf/open/floor/plasteel/asteroid{
@@ -43618,7 +43618,7 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 30
},
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "ENG0"
},
/turf/open/floor/plating,
@@ -44771,7 +44771,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/turf/open/floor/plasteel/grimy,
/area/chapel/main/monastery)
"cgO" = (
@@ -45015,7 +45015,7 @@
dir = 1
},
/obj/effect/decal/cleanable/cobweb,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -45053,7 +45053,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/item/device/instrument/violin,
+/obj/item/instrument/violin,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -45556,7 +45556,7 @@
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-22"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -45843,7 +45843,7 @@
/turf/closed/mineral/random/low_chance,
/area/asteroid/nearstation/bomb_site)
"ckL" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plating/airless,
/area/asteroid/nearstation/bomb_site)
"ckM" = (
@@ -45960,7 +45960,7 @@
/turf/open/floor/plasteel/dark,
/area/library)
"clj" = (
-/obj/item/device/flashlight/lantern{
+/obj/item/flashlight/lantern{
on = 1
},
/turf/open/floor/plating/asteroid/airless,
@@ -46119,7 +46119,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"clS" = (
@@ -46215,7 +46215,7 @@
"cmf" = (
/obj/structure/rack,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/airalarm{
dir = 4;
pixel_x = -22
@@ -46253,7 +46253,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = 26
},
@@ -46749,7 +46749,7 @@
c_tag = "Brig Equipment Room";
dir = 2
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = 29
},
@@ -46981,7 +46981,7 @@
/turf/open/floor/plasteel/neutral/corner,
/area/hallway/secondary/exit/departure_lounge)
"coT" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"coV" = (
@@ -47135,7 +47135,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"cpt" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -47801,7 +47801,7 @@
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
"csn" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -48977,7 +48977,7 @@
/turf/open/space,
/area/space/nearstation)
"cwO" = (
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
"cwR" = (
@@ -49281,7 +49281,7 @@
/area/library)
"czo" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -49337,7 +49337,7 @@
/area/library)
"czC" = (
/obj/structure/table/wood/fancy,
-/obj/item/device/flashlight/lantern{
+/obj/item/flashlight/lantern{
on = 1;
pixel_y = 8
},
@@ -49381,7 +49381,7 @@
/area/library)
"czO" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/saxophone,
+/obj/item/instrument/saxophone,
/turf/open/floor/plasteel/dark,
/area/library)
"czP" = (
@@ -49476,7 +49476,7 @@
/area/library)
"cAt" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lantern{
+/obj/item/flashlight/lantern{
pixel_y = 8
},
/turf/open/floor/plasteel/vault{
@@ -49493,7 +49493,7 @@
/area/library)
"cAv" = (
/obj/structure/table/wood,
-/obj/item/device/camera,
+/obj/item/camera,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/vault{
dir = 5
@@ -49954,8 +49954,8 @@
/area/quartermaster/office)
"ejp" = (
/obj/structure/table/reinforced,
-/obj/item/device/integrated_circuit_printer,
-/obj/item/device/integrated_electronics/wirer,
+/obj/item/integrated_circuit_printer,
+/obj/item/integrated_electronics/wirer,
/turf/open/floor/plasteel/whitepurple/side{
dir = 1
},
@@ -50145,7 +50145,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/integrated_electronics/debugger,
+/obj/item/integrated_electronics/debugger,
/turf/open/floor/plasteel/whitepurple/side{
dir = 1
},
@@ -50440,8 +50440,8 @@
pixel_x = 10
},
/obj/structure/rack,
-/obj/item/device/multitool,
-/obj/item/device/multitool,
+/obj/item/multitool,
+/obj/item/multitool,
/obj/item/screwdriver,
/obj/item/screwdriver,
/turf/open/floor/plasteel/white,
@@ -50518,7 +50518,7 @@
/area/engine/break_room)
"ptq" = (
/obj/structure/table/reinforced,
-/obj/item/device/integrated_electronics/analyzer,
+/obj/item/integrated_electronics/analyzer,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"pWF" = (
@@ -50559,7 +50559,7 @@
pixel_x = 20;
pixel_y = -6
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27;
@@ -50717,7 +50717,7 @@
dir = 4
},
/obj/structure/table/reinforced,
-/obj/item/device/integrated_electronics/analyzer,
+/obj/item/integrated_electronics/analyzer,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"ukn" = (
@@ -50775,8 +50775,8 @@
network = list("rd");
pixel_y = 32
},
-/obj/item/device/integrated_circuit_printer,
-/obj/item/device/integrated_electronics/debugger,
+/obj/item/integrated_circuit_printer,
+/obj/item/integrated_electronics/debugger,
/turf/open/floor/plasteel/whitepurple/side{
dir = 1
},
@@ -50793,7 +50793,7 @@
/area/crew_quarters/fitness/recreation)
"vJd" = (
/obj/structure/table/reinforced,
-/obj/item/device/integrated_electronics/wirer,
+/obj/item/integrated_electronics/wirer,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"vMX" = (
diff --git a/_maps/cit_map_files/generic/CentCom.dmm b/_maps/cit_map_files/generic/CentCom.dmm
index 4804bc4534..1b5d94d8c1 100644
--- a/_maps/cit_map_files/generic/CentCom.dmm
+++ b/_maps/cit_map_files/generic/CentCom.dmm
@@ -82,7 +82,7 @@
/area/holodeck/rec_center/lounge)
"ao" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
layer = 3.3
},
/turf/open/floor/holofloor{
@@ -312,7 +312,7 @@
/area/holodeck/rec_center/court)
"aY" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_y = 4
},
/turf/open/floor/holofloor/carpet,
@@ -341,7 +341,7 @@
/area/holodeck/rec_center/bunker)
"bd" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/violin,
+/obj/item/instrument/violin,
/turf/open/floor/holofloor/carpet,
/area/holodeck/rec_center/lounge)
"be" = (
@@ -754,7 +754,7 @@
/area/holodeck/rec_center/medical)
"ct" = (
/obj/structure/table/glass,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/turf/open/floor/holofloor{
icon_state = "white"
},
@@ -2751,15 +2751,15 @@
/area/centcom/control)
"iv" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = -5;
pixel_y = 5
},
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/airalarm{
pixel_y = 23
},
@@ -2795,7 +2795,7 @@
"iy" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs/cable/zipties,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/centcom/control)
@@ -3429,7 +3429,7 @@
/area/centcom/control)
"kc" = (
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/structure/table/wood,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -3438,7 +3438,7 @@
"kd" = (
/obj/item/wrench,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/structure/table/wood,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -3821,7 +3821,7 @@
"lb" = (
/obj/structure/table/wood,
/obj/machinery/door/window,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk smack through this.";
syndie = 1
},
@@ -3839,7 +3839,7 @@
/area/centcom/control)
"ld" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk smack through this.";
syndie = 1
},
@@ -3857,7 +3857,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/device/megaphone,
+/obj/item/megaphone,
/obj/structure/window/reinforced,
/turf/open/floor/plasteel/grimy,
/area/centcom/control)
@@ -3944,7 +3944,7 @@
/obj/structure/table/reinforced,
/obj/item/wrench,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -3953,7 +3953,7 @@
"lv" = (
/obj/structure/table/reinforced,
/obj/item/gun/ballistic/automatic/wt550,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -4137,7 +4137,7 @@
/obj/structure/chair{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk smack through this.";
pixel_x = -32;
syndie = 1
@@ -4277,7 +4277,7 @@
/area/centcom/control)
"mn" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk smack through this.";
syndie = 1
},
@@ -4526,7 +4526,7 @@
"mX" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs/cable/zipties,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -4672,7 +4672,7 @@
"nt" = (
/obj/structure/table/wood,
/obj/item/storage/photo_album,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -4972,9 +4972,9 @@
/area/centcom/ferry)
"of" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/item/storage/box/handcuffs,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/obj/structure/noticeboard{
pixel_y = 28
},
@@ -4985,7 +4985,7 @@
"og" = (
/obj/structure/table/wood,
/obj/item/storage/photo_album,
-/obj/item/device/camera,
+/obj/item/camera,
/obj/structure/reagent_dispensers/peppertank{
pixel_y = 32
},
@@ -5026,7 +5026,7 @@
/area/centcom/ferry)
"ol" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/requests_console{
announcementConsole = 1;
department = "Captain's Desk";
@@ -5663,7 +5663,7 @@
/obj/item/cartridge/quartermaster{
pixel_y = 6
},
-/obj/item/device/gps/mining,
+/obj/item/gps/mining,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -5720,7 +5720,7 @@
/obj/item/folder/red,
/obj/item/book/manual/wiki/security_space_law,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
@@ -5789,7 +5789,7 @@
/area/centcom/ferry)
"qj" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/vault,
/area/centcom/ferry)
"qk" = (
@@ -6137,7 +6137,7 @@
"rk" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -6148,7 +6148,7 @@
},
/obj/structure/table/reinforced,
/obj/item/clipboard,
-/obj/item/device/radio/headset/headset_cent,
+/obj/item/radio/headset/headset_cent,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -6246,7 +6246,7 @@
/turf/open/floor/wood,
/area/centcom/ferry)
"rw" = (
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -6440,7 +6440,7 @@
/obj/structure/table/reinforced,
/obj/item/wrench,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -6514,7 +6514,7 @@
/area/syndicate_mothership/control)
"sf" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel/bar{
dir = 2
},
@@ -6671,7 +6671,7 @@
"sA" = (
/obj/item/clipboard,
/obj/structure/table/reinforced,
-/obj/item/device/detective_scanner,
+/obj/item/detective_scanner,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -7034,7 +7034,7 @@
/obj/structure/table/reinforced,
/obj/item/folder/red,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -7133,7 +7133,7 @@
/area/centcom/ferry)
"tH" = (
/obj/item/gun/energy/pulse/carbine/loyalpin,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/obj/structure/table/reinforced,
/obj/machinery/airalarm{
dir = 1;
@@ -7453,7 +7453,7 @@
/area/wizard_station)
"uD" = (
/obj/structure/table/wood/fancy,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk smack through this.";
syndie = 1
},
@@ -7707,7 +7707,7 @@
/area/syndicate_mothership/control)
"vw" = (
/obj/structure/table/wood,
-/obj/item/device/syndicatedetonator{
+/obj/item/syndicatedetonator{
desc = "This gaudy button can be used to instantly detonate syndicate bombs that have been activated on the station. It is also fun to press."
},
/turf/open/floor/wood,
@@ -7844,7 +7844,7 @@
},
/area/centcom/control)
"vL" = (
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -8197,7 +8197,7 @@
/area/wizard_station)
"wP" = (
/obj/structure/table/wood/fancy,
-/obj/item/device/camera/spooky,
+/obj/item/camera/spooky,
/turf/open/floor/carpet,
/area/wizard_station)
"wQ" = (
@@ -8868,7 +8868,7 @@
"zg" = (
/obj/structure/table/reinforced,
/obj/item/gun/ballistic/automatic/wt550,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/obj/structure/noticeboard{
pixel_y = 28
},
@@ -8966,7 +8966,7 @@
"zy" = (
/obj/structure/table,
/obj/item/gun/energy/ionrifle{
- pin = /obj/item/device/firing_pin
+ pin = /obj/item/firing_pin
},
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -9155,7 +9155,7 @@
"Aj" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
@@ -9281,7 +9281,7 @@
/area/centcom/ferry)
"AL" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -9450,7 +9450,7 @@
"Bw" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plasteel/grimy,
/area/centcom/ferry)
"Bx" = (
@@ -9481,7 +9481,7 @@
"BA" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs/cable/zipties,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -9684,7 +9684,7 @@
"BZ" = (
/obj/structure/table/wood,
/obj/item/clipboard,
-/obj/item/device/radio/headset/headset_cent,
+/obj/item/radio/headset/headset_cent,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -9722,7 +9722,7 @@
"Ce" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs/cable/zipties,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -9773,7 +9773,7 @@
/obj/item/folder/red,
/obj/item/book/manual/wiki/security_space_law,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -9861,15 +9861,15 @@
},
/area/centcom/ferry)
"CA" = (
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = -5;
pixel_y = 5
},
-/obj/item/device/radio,
+/obj/item/radio,
/obj/structure/table/wood,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -9943,7 +9943,7 @@
"CH" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
@@ -10220,7 +10220,7 @@
"DA" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -10817,7 +10817,7 @@
/area/centcom/holding)
"Fe" = (
/obj/structure/rack,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/plasteel/cafeteria,
/area/centcom/holding)
"Ff" = (
@@ -10966,7 +10966,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/centcom/holding)
"FC" = (
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/plating/beach/sand,
/area/centcom/holding)
"FD" = (
@@ -12542,15 +12542,15 @@
},
/area/tdome/tdomeadmin)
"JP" = (
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = -5;
pixel_y = 5
},
-/obj/item/device/radio,
+/obj/item/radio,
/obj/structure/table/wood,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -12724,7 +12724,7 @@
/obj/item/folder/red,
/obj/item/book/manual/wiki/security_space_law,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -12732,7 +12732,7 @@
"Kq" = (
/obj/structure/table/wood,
/obj/item/clipboard,
-/obj/item/device/radio/headset/headset_cent,
+/obj/item/radio/headset/headset_cent,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -13072,7 +13072,7 @@
/area/centcom/evac)
"Ln" = (
/obj/structure/table,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/mineral/plastitanium,
/area/centcom/evac)
"Lo" = (
@@ -13174,7 +13174,7 @@
/area/centcom/evac)
"LE" = (
/obj/structure/table,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/mineral/titanium/blue,
/area/centcom/evac)
"LF" = (
@@ -13202,7 +13202,7 @@
/area/centcom/evac)
"LJ" = (
/obj/structure/table,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/light{
dir = 4
},
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 1b9ee66537..1e179288f8 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -11,7 +11,7 @@
/obj/machinery/chem_dispenser/drinks/beer{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/turf/open/floor/plasteel/bar,
@@ -116,7 +116,7 @@
/area/security/prison)
"aaq" = (
/obj/machinery/hydroponics/soil,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/machinery/camera{
c_tag = "Prison Common Room";
network = list("ss13","prison")
@@ -375,8 +375,8 @@
pixel_y = 10
},
/obj/structure/table/wood,
-/obj/item/device/radio/off,
-/obj/item/device/taperecorder,
+/obj/item/radio/off,
+/obj/item/taperecorder,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
"abl" = (
@@ -598,7 +598,7 @@
name = "Head of Security RC";
pixel_y = 30
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = -31
@@ -854,7 +854,7 @@
c_tag = "Prison Cell 3";
network = list("ss13","prison")
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -885,7 +885,7 @@
c_tag = "Prison Cell 2";
network = list("ss13","prison")
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -907,7 +907,7 @@
c_tag = "Prison Cell 1";
network = list("ss13","prison")
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -1003,7 +1003,7 @@
/area/crew_quarters/heads/hos)
"acR" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
on = 0;
pixel_x = -3;
pixel_y = 8
@@ -1231,10 +1231,10 @@
/area/crew_quarters/heads/hos)
"adq" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/guitar{
+/obj/item/instrument/guitar{
pixel_x = -7
},
-/obj/item/device/instrument/eguitar{
+/obj/item/instrument/eguitar{
pixel_x = 5
},
/turf/open/floor/wood,
@@ -1364,10 +1364,10 @@
/obj/item/folder/red{
pixel_x = 3
},
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = -3
},
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/item/reagent_containers/spray/pepper,
/turf/open/floor/plasteel/dark,
/area/security/execution/transfer)
@@ -1552,7 +1552,7 @@
/area/security/execution/transfer)
"aeb" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/security/execution/transfer)
@@ -1871,7 +1871,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
@@ -2090,7 +2090,7 @@
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
"afd" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -2255,7 +2255,7 @@
/turf/closed/wall/r_wall,
/area/security/execution/transfer)
"afB" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -2282,7 +2282,7 @@
/area/security/prison)
"afD" = (
/obj/structure/table,
-/obj/item/device/electropack,
+/obj/item/electropack,
/turf/open/floor/plasteel/red/side,
/area/security/prison)
"afE" = (
@@ -2291,7 +2291,7 @@
/area/hallway/secondary/exit)
"afF" = (
/obj/structure/table,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/signaler,
/obj/item/clothing/suit/straight_jacket,
/turf/open/floor/plasteel/red/side,
/area/security/prison)
@@ -2383,7 +2383,7 @@
"afV" = (
/obj/structure/table,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/timer,
+/obj/item/assembly/timer,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/security/main)
@@ -2407,7 +2407,7 @@
/area/security/main)
"afZ" = (
/obj/structure/table,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/item/screwdriver{
pixel_y = 10
},
@@ -2456,11 +2456,11 @@
/area/security/execution/transfer)
"agh" = (
/obj/structure/table,
-/obj/item/device/electropack,
+/obj/item/electropack,
/obj/item/screwdriver,
/obj/item/wrench,
/obj/item/clothing/head/helmet,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/signaler,
/obj/machinery/light/small,
/obj/machinery/airalarm{
dir = 1;
@@ -2620,7 +2620,7 @@
/area/security/main)
"agB" = (
/obj/structure/table,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/security/main)
@@ -2949,7 +2949,7 @@
/area/security/prison)
"ahq" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/dark,
/area/security/prison)
"ahr" = (
@@ -2961,7 +2961,7 @@
},
/area/security/brig)
"ahs" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -3252,7 +3252,7 @@
"ahV" = (
/obj/structure/table,
/obj/item/folder/red,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plasteel/dark,
/area/security/prison)
"ahW" = (
@@ -3454,7 +3454,7 @@
/turf/open/floor/plasteel/red/side,
/area/security/main)
"ait" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -3773,7 +3773,7 @@
},
/area/security/courtroom)
"ajj" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -4004,7 +4004,7 @@
/area/security/brig)
"ajO" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
dir = 8;
listening = 1;
@@ -4604,7 +4604,7 @@
},
/area/ai_monitored/nuke_storage)
"alw" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -4626,7 +4626,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -4717,7 +4717,7 @@
},
/area/security/courtroom)
"alJ" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/neutral/side,
/area/security/courtroom)
"alK" = (
@@ -4898,7 +4898,7 @@
req_access_txt = "2"
},
/obj/item/restraints/handcuffs,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel/dark,
/area/security/brig)
"amn" = (
@@ -5467,7 +5467,7 @@
/obj/machinery/light_switch{
pixel_x = -20
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/turf/open/floor/wood,
@@ -5519,7 +5519,7 @@
/obj/structure/sign/warning/vacuum/external{
pixel_y = 32
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plating,
/area/maintenance/solars/starboard/fore)
"aoj" = (
@@ -5645,7 +5645,7 @@
/obj/structure/chair{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -6546,7 +6546,7 @@
/area/lawoffice)
"are" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -6794,7 +6794,7 @@
"arR" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plating,
/area/security/vacantoffice/b)
"arS" = (
@@ -7567,7 +7567,7 @@
/area/lawoffice)
"auh" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/item/cartridge/lawyer,
/turf/open/floor/wood,
/area/lawoffice)
@@ -8210,8 +8210,8 @@
pixel_x = 1;
pixel_y = -1
},
-/obj/item/device/multitool,
-/obj/item/device/radio/intercom{
+/obj/item/multitool,
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -8708,7 +8708,7 @@
dir = 8;
pixel_x = 24
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -8769,7 +8769,7 @@
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
-/obj/item/device/assault_pod/mining,
+/obj/item/assault_pod/mining,
/obj/machinery/computer/security/telescreen{
desc = "Used for the Auxillary Mining Base.";
dir = 8;
@@ -9044,7 +9044,7 @@
/area/crew_quarters/dorms)
"axM" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"axN" = (
@@ -9294,8 +9294,8 @@
/obj/machinery/airalarm{
pixel_y = 23
},
-/obj/item/device/radio/off,
-/obj/item/device/assembly/timer,
+/obj/item/radio/off,
+/obj/item/assembly/timer,
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"ayw" = (
@@ -9417,10 +9417,10 @@
dir = 1
},
/obj/item/hand_labeler,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/storage/eva)
"ayO" = (
@@ -9462,7 +9462,7 @@
pixel_x = -2;
pixel_y = -1
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"ayS" = (
@@ -9480,8 +9480,8 @@
dir = 1
},
/obj/structure/table,
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
/obj/item/stock_parts/cell/high/plus,
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
@@ -9601,7 +9601,7 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -9730,7 +9730,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"azC" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -9899,10 +9899,10 @@
/area/crew_quarters/toilet)
"azY" = (
/obj/structure/table,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
-/obj/item/device/assembly/prox_sensor,
-/obj/item/device/assembly/prox_sensor,
+/obj/item/radio/off,
+/obj/item/radio/off,
+/obj/item/assembly/prox_sensor,
+/obj/item/assembly/prox_sensor,
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"azZ" = (
@@ -9946,7 +9946,7 @@
/turf/open/floor/plasteel/neutral/side,
/area/crew_quarters/dorms)
"aAg" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -11085,7 +11085,7 @@
"aDb" = (
/obj/structure/table,
/obj/item/wirecutters,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
@@ -11100,7 +11100,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 20
@@ -11150,11 +11150,11 @@
/area/gateway)
"aDk" = (
/obj/structure/table,
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -8;
pixel_y = -4
},
-/obj/item/device/assembly/igniter,
+/obj/item/assembly/igniter,
/obj/item/screwdriver{
pixel_y = 16
},
@@ -11170,7 +11170,7 @@
/area/storage/primary)
"aDl" = (
/obj/structure/table,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
/obj/machinery/airalarm{
pixel_y = 23
},
@@ -11187,15 +11187,15 @@
/area/storage/primary)
"aDn" = (
/obj/structure/table,
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
-/obj/item/device/radio/intercom{
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
+/obj/item/radio/intercom{
broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 20
},
-/obj/item/device/multitool,
-/obj/item/device/multitool{
+/obj/item/multitool,
+/obj/item/multitool{
pixel_x = 4
},
/turf/open/floor/plasteel,
@@ -11829,18 +11829,18 @@
/area/gateway)
"aES" = (
/obj/structure/table,
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_y = 6
},
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_x = 6;
pixel_y = 4
},
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_x = -6;
pixel_y = 4
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel,
/area/gateway)
"aET" = (
@@ -12135,9 +12135,9 @@
/turf/open/floor/plasteel/red/side,
/area/security/checkpoint/auxiliary)
"aFL" = (
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/item/crowbar,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/structure/table,
/turf/open/floor/plasteel/red/side{
dir = 6
@@ -12155,7 +12155,7 @@
/obj/item/cultivator,
/obj/item/hatchet,
/obj/item/crowbar,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/item/reagent_containers/glass/bucket,
/turf/open/floor/plasteel/green/side{
dir = 4
@@ -12236,7 +12236,7 @@
/turf/open/floor/plasteel,
/area/gateway)
"aFX" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -12511,7 +12511,7 @@
/obj/structure/mirror{
pixel_x = -28
},
-/obj/item/device/flashlight/lamp/bananalamp{
+/obj/item/flashlight/lamp/bananalamp{
pixel_y = 3
},
/turf/open/floor/plasteel/redblue,
@@ -12765,7 +12765,7 @@
/area/storage/primary)
"aHf" = (
/obj/structure/closet/wardrobe/chaplain_black,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/turf/open/floor/plasteel/grimy,
@@ -13402,7 +13402,7 @@
"aIN" = (
/obj/structure/table,
/obj/item/wrench,
-/obj/item/device/analyzer,
+/obj/item/analyzer,
/turf/open/floor/plasteel,
/area/storage/primary)
"aIO" = (
@@ -13440,7 +13440,7 @@
/obj/item/cultivator,
/obj/item/crowbar,
/obj/item/reagent_containers/glass/bucket,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/machinery/firealarm{
dir = 8;
pixel_x = -24
@@ -13452,8 +13452,8 @@
"aIT" = (
/obj/item/storage/bag/plants/portaseeder,
/obj/structure/table/glass,
-/obj/item/device/plant_analyzer,
-/obj/item/device/radio/intercom{
+/obj/item/plant_analyzer,
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -13490,7 +13490,7 @@
"aIW" = (
/obj/structure/table,
/obj/item/crowbar,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -13827,7 +13827,7 @@
/area/hydroponics)
"aJM" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp{
+/obj/item/flashlight/lamp{
pixel_y = 10
},
/obj/structure/disposalpipe/segment,
@@ -14021,7 +14021,7 @@
/turf/open/floor/plating,
/area/storage/primary)
"aKq" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/obj/machinery/camera{
@@ -14473,7 +14473,7 @@
/area/hallway/secondary/entry)
"aLA" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -15171,8 +15171,8 @@
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/cable_coil,
-/obj/item/device/flashlight/lamp,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp,
+/obj/item/flashlight/lamp/green,
/turf/open/floor/wood,
/area/crew_quarters/bar)
"aNE" = (
@@ -15321,7 +15321,7 @@
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"aNX" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1480;
name = "Confessional Intercom";
@@ -15373,7 +15373,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"aOe" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/camera{
c_tag = "Arrivals Bay 1 South"
},
@@ -15795,9 +15795,9 @@
/area/library)
"aPi" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
-/obj/item/device/camera,
-/obj/item/device/radio/intercom{
+/obj/item/taperecorder,
+/obj/item/camera,
+/obj/item/radio/intercom{
pixel_y = 25
},
/turf/open/floor/engine/cult,
@@ -15839,7 +15839,7 @@
c_tag = "Escape Arm Holding Area";
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -15874,7 +15874,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"aPv" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 20
@@ -16103,7 +16103,7 @@
"aQb" = (
/obj/structure/window/reinforced,
/obj/structure/table/wood,
-/obj/item/device/instrument/violin,
+/obj/item/instrument/violin,
/turf/open/floor/wood,
/area/crew_quarters/theatre)
"aQc" = (
@@ -16240,7 +16240,7 @@
},
/area/chapel/main)
"aQz" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1480;
name = "Confessional Intercom";
@@ -16522,9 +16522,9 @@
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/emergency,
/obj/item/wrench,
-/obj/item/device/assembly/timer,
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/timer,
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
/turf/open/floor/plasteel,
/area/bridge)
"aRt" = (
@@ -16577,7 +16577,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"aRB" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/obj/machinery/camera{
@@ -16803,7 +16803,7 @@
/area/maintenance/port)
"aSh" = (
/obj/structure/closet/wardrobe/mixed,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -16876,8 +16876,8 @@
/area/bridge)
"aSv" = (
/obj/structure/table/reinforced,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel,
/area/bridge)
"aSw" = (
@@ -16915,8 +16915,8 @@
/area/bridge)
"aSz" = (
/obj/structure/table/reinforced,
-/obj/item/device/aicard,
-/obj/item/device/multitool,
+/obj/item/aicard,
+/obj/item/multitool,
/turf/open/floor/plasteel/blue/side{
dir = 8
},
@@ -17285,8 +17285,8 @@
"aTF" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/structure/table,
-/obj/item/device/camera_film,
-/obj/item/device/camera,
+/obj/item/camera_film,
+/obj/item/camera,
/turf/open/floor/plasteel,
/area/storage/art)
"aTG" = (
@@ -17340,7 +17340,7 @@
/obj/structure/rack,
/obj/item/clothing/gloves/color/fyellow,
/obj/item/clothing/suit/hazardvest,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel,
/area/storage/tools)
@@ -17573,7 +17573,7 @@
/area/hydroponics)
"aUA" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/wood,
/area/security/vacantoffice)
"aUB" = (
@@ -17587,7 +17587,7 @@
/area/library)
"aUD" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -17706,7 +17706,7 @@
/area/crew_quarters/locker)
"aUW" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/turf/open/floor/wood,
/area/security/vacantoffice)
"aUX" = (
@@ -17886,7 +17886,7 @@
/turf/open/floor/plasteel,
/area/bridge)
"aVp" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -18114,8 +18114,8 @@
/area/library)
"aVS" = (
/obj/structure/table/wood,
-/obj/item/device/camera_film,
-/obj/item/device/camera_film,
+/obj/item/camera_film,
+/obj/item/camera_film,
/turf/open/floor/wood,
/area/library)
"aVT" = (
@@ -18141,7 +18141,7 @@
/turf/open/floor/plasteel/dark,
/area/chapel/main)
"aVW" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = -25
},
/turf/open/floor/plasteel/escape{
@@ -19131,7 +19131,7 @@
/area/security/detectives_office)
"aYj" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/structure/disposalpipe/segment{
dir = 10
},
@@ -19188,7 +19188,7 @@
},
/area/bridge)
"aYr" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -19690,7 +19690,7 @@
/area/quartermaster/warehouse)
"aZJ" = (
/obj/structure/table/wood,
-/obj/item/device/camera/detective,
+/obj/item/camera/detective,
/turf/open/floor/carpet,
/area/security/detectives_office)
"aZK" = (
@@ -20040,7 +20040,7 @@
/turf/open/floor/carpet,
/area/bridge/meeting_room)
"baJ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -20467,7 +20467,7 @@
/area/quartermaster/warehouse)
"bbT" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/turf/open/floor/carpet,
/area/security/detectives_office)
"bbU" = (
@@ -20836,13 +20836,13 @@
/area/bridge/meeting_room)
"bcY" = (
/obj/item/hand_labeler,
-/obj/item/device/assembly/timer,
+/obj/item/assembly/timer,
/obj/structure/table,
/turf/open/floor/wood,
/area/bridge/meeting_room)
"bcZ" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Station Intercom (Command)"
@@ -21295,7 +21295,7 @@
/obj/machinery/computer/upload/borg{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -21570,7 +21570,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"beN" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -21885,7 +21885,7 @@
/area/crew_quarters/heads/captain)
"bfC" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
"bfD" = (
@@ -22006,7 +22006,7 @@
},
/area/hallway/primary/starboard)
"bfY" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -22365,7 +22365,7 @@
dir = 8;
pixel_x = 24
},
-/obj/item/device/camera,
+/obj/item/camera,
/obj/item/storage/photo_album{
pixel_y = -10
},
@@ -22829,7 +22829,7 @@
/obj/structure/disposalpipe/trunk{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -22890,7 +22890,7 @@
/turf/closed/wall/r_wall,
/area/engine/gravity_generator)
"bik" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Station Intercom (Command)";
@@ -22994,7 +22994,7 @@
/obj/machinery/computer/secure_data{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = 25
},
/turf/open/floor/plasteel/red/side{
@@ -23348,7 +23348,7 @@
"bjp" = (
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -23389,7 +23389,7 @@
/area/quartermaster/storage)
"bju" = (
/obj/machinery/photocopier,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -23903,7 +23903,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/red/side{
dir = 6
@@ -24076,7 +24076,7 @@
pixel_y = 4
},
/obj/item/clothing/glasses/science,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -24318,10 +24318,10 @@
empty = 1;
name = "First-Aid (empty)"
},
-/obj/item/device/healthanalyzer,
-/obj/item/device/healthanalyzer,
-/obj/item/device/healthanalyzer,
-/obj/item/device/radio/intercom{
+/obj/item/healthanalyzer,
+/obj/item/healthanalyzer,
+/obj/item/healthanalyzer,
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -24742,7 +24742,7 @@
},
/area/medical/chemistry)
"bmJ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -24932,7 +24932,7 @@
pixel_y = 5
},
/obj/item/clothing/glasses/welding,
-/obj/item/device/multitool{
+/obj/item/multitool{
pixel_x = 3
},
/turf/open/floor/plasteel,
@@ -24943,12 +24943,12 @@
amount = 10
},
/obj/item/stack/cable_coil,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
@@ -25322,7 +25322,7 @@
/area/crew_quarters/heads/captain)
"bnZ" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain)
"boa" = (
@@ -25359,7 +25359,7 @@
"bod" = (
/obj/structure/table,
/obj/item/folder/white,
-/obj/item/device/radio/headset/headset_med,
+/obj/item/radio/headset/headset_med,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"boe" = (
@@ -25486,19 +25486,19 @@
/area/science/robotics/lab)
"bov" = (
/obj/structure/table,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -25591,9 +25591,9 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/device/mmi,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
"boH" = (
@@ -26036,7 +26036,7 @@
"bpH" = (
/obj/structure/table/glass,
/obj/item/folder/white,
-/obj/item/device/radio/headset/headset_medsci,
+/obj/item/radio/headset/headset_medsci,
/obj/machinery/requests_console{
department = "Genetics";
departmentType = 0;
@@ -26303,8 +26303,8 @@
layer = 2.9
},
/obj/structure/table/reinforced,
-/obj/item/device/destTagger,
-/obj/item/device/destTagger,
+/obj/item/destTagger,
+/obj/item/destTagger,
/turf/open/floor/plasteel/brown{
dir = 1
},
@@ -26401,7 +26401,7 @@
layer = 3
},
/obj/item/pen/blue,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -35
},
@@ -26851,7 +26851,7 @@
/obj/machinery/airalarm{
pixel_y = 23
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel/white/side{
dir = 2
},
@@ -26946,7 +26946,7 @@
departmentType = 2;
pixel_x = -30
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/machinery/camera{
c_tag = "Cargo Office";
dir = 4
@@ -27115,7 +27115,7 @@
pixel_y = 1
},
/obj/structure/table,
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
@@ -27135,7 +27135,7 @@
/turf/open/floor/plasteel,
/area/teleporter)
"bsl" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -27185,7 +27185,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -27216,7 +27216,7 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bst" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -27431,7 +27431,7 @@
/area/quartermaster/office)
"bsW" = (
/obj/structure/closet/wardrobe/robotics_black,
-/obj/item/device/radio/headset/headset_sci{
+/obj/item/radio/headset/headset_sci{
pixel_x = -3
},
/turf/open/floor/plasteel/white,
@@ -27906,7 +27906,7 @@
/area/medical/genetics)
"bub" = (
/obj/machinery/light,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -35
},
@@ -28851,7 +28851,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bwi" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -29798,7 +29798,7 @@
/area/crew_quarters/heads/hor)
"bys" = (
/obj/structure/rack,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -29949,7 +29949,7 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/supply)
"byM" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -30195,7 +30195,7 @@
/area/medical/genetics)
"bzr" = (
/obj/structure/closet/wardrobe/genetics_white,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -30372,10 +30372,10 @@
/area/crew_quarters/heads/hor)
"bzM" = (
/obj/structure/rack,
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = -3
},
-/obj/item/device/paicard{
+/obj/item/paicard{
pixel_x = 4
},
/obj/effect/turf_decal/stripes/line{
@@ -30499,7 +30499,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel/red/side{
dir = 4
},
@@ -30799,14 +30799,14 @@
/area/maintenance/port/aft)
"bAL" = (
/obj/structure/table,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/item/stock_parts/cell/high/plus,
/turf/open/floor/plating,
/area/storage/tech)
"bAM" = (
/obj/structure/table,
-/obj/item/device/analyzer,
-/obj/item/device/healthanalyzer,
+/obj/item/analyzer,
+/obj/item/healthanalyzer,
/obj/machinery/light/small{
dir = 1
},
@@ -30849,7 +30849,7 @@
c_tag = "Quartermaster's Office";
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -35
},
@@ -31320,7 +31320,7 @@
/turf/open/floor/plasteel/dark,
/area/science/server)
"bBY" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = -25
},
/obj/structure/filingcabinet,
@@ -31332,7 +31332,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel/red/side,
/area/security/checkpoint/science)
"bCa" = (
@@ -31416,7 +31416,7 @@
dir = 1;
network = list("ss13","rd")
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -31730,7 +31730,7 @@
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bCU" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -31931,16 +31931,16 @@
/area/maintenance/aft)
"bDv" = (
/obj/structure/table,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/ai_status_display{
pixel_x = -32
},
@@ -32270,7 +32270,7 @@
/area/crew_quarters/heads/cmo)
"bEl" = (
/obj/structure/disposalpipe/segment,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = 25
},
/obj/machinery/camera{
@@ -32358,7 +32358,7 @@
/area/science/mixing)
"bEw" = (
/obj/machinery/portable_atmospherics/canister,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/obj/effect/turf_decal/stripes/line{
@@ -32599,7 +32599,7 @@
/area/storage/tech)
"bEX" = (
/obj/structure/table,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/item/aiModule/reset,
/turf/open/floor/plating,
/area/storage/tech)
@@ -33063,19 +33063,19 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bGl" = (
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -4;
pixel_y = 1
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 8;
pixel_y = 9
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 9;
pixel_y = -2
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_y = 2
},
/obj/structure/table/reinforced,
@@ -33150,7 +33150,7 @@
/obj/machinery/cell_charger{
pixel_y = 5
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plating,
/area/storage/tech)
"bGw" = (
@@ -33591,7 +33591,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/obj/machinery/light/small{
@@ -33626,7 +33626,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -33750,7 +33750,7 @@
pixel_x = 1;
pixel_y = -1
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/clothing/glasses/meson,
/obj/machinery/light/small,
/turf/open/floor/plating,
@@ -34334,7 +34334,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"bJa" = (
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -34741,18 +34741,18 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bJW" = (
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = -5
},
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = -5
},
-/obj/item/device/transfer_valve,
-/obj/item/device/transfer_valve,
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve,
+/obj/item/transfer_valve,
+/obj/item/transfer_valve{
pixel_x = 5
},
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = 5
},
/obj/machinery/requests_console{
@@ -34766,18 +34766,18 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bJX" = (
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_y = 8
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -8;
pixel_y = 5
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = 6;
pixel_y = 5
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -2;
pixel_y = -2
},
@@ -34789,19 +34789,19 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bJZ" = (
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 5;
pixel_y = 4
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -4;
pixel_y = 2
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 6;
pixel_y = -4
},
-/obj/item/device/assembly/timer,
+/obj/item/assembly/timer,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/white,
/area/science/mixing)
@@ -35399,7 +35399,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"bLp" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plating/airless,
/area/science/test_area)
"bLq" = (
@@ -35483,8 +35483,8 @@
pixel_y = -1
},
/obj/item/clothing/gloves/color/yellow,
-/obj/item/device/t_scanner,
-/obj/item/device/multitool,
+/obj/item/t_scanner,
+/obj/item/multitool,
/turf/open/floor/plating,
/area/storage/tech)
"bLB" = (
@@ -35712,7 +35712,7 @@
pixel_y = 5
},
/obj/item/stack/cable_coil,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/stock_parts/cell/high/plus,
/obj/structure/window/reinforced{
dir = 4
@@ -36310,7 +36310,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"bNF" = (
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/effect/turf_decal/stripes/line{
dir = 2
},
@@ -36322,7 +36322,7 @@
/area/science/test_area)
"bNH" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -26
},
@@ -36373,7 +36373,7 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -36553,7 +36553,7 @@
/turf/open/floor/plasteel/white,
/area/medical/virology)
"bOo" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Station Intercom (Telecomms)";
@@ -37175,7 +37175,7 @@
/area/science/xenobiology)
"bPE" = (
/obj/structure/table/reinforced,
-/obj/item/device/slime_scanner,
+/obj/item/slime_scanner,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
@@ -37198,7 +37198,7 @@
/area/science/circuit)
"bPG" = (
/obj/machinery/chem_master,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -37392,7 +37392,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/light_switch{
pixel_x = -27;
@@ -37482,7 +37482,7 @@
c_tag = "Security Post - Engineering";
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -37741,7 +37741,7 @@
network = list("rd");
pixel_y = 28
},
-/obj/item/device/integrated_circuit_printer,
+/obj/item/integrated_circuit_printer,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"bQZ" = (
@@ -38204,9 +38204,9 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/device/electropack,
-/obj/item/device/healthanalyzer,
-/obj/item/device/assembly/signaler,
+/obj/item/electropack,
+/obj/item/healthanalyzer,
+/obj/item/assembly/signaler,
/turf/open/floor/plasteel,
/area/science/misc_lab)
"bSf" = (
@@ -38398,7 +38398,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bSG" = (
@@ -38414,9 +38414,9 @@
/obj/structure/table,
/obj/item/stack/sheet/glass/fifty,
/obj/item/storage/belt/utility,
-/obj/item/device/t_scanner,
-/obj/item/device/t_scanner,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
+/obj/item/t_scanner,
+/obj/item/t_scanner,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bSI" = (
@@ -38680,38 +38680,38 @@
/area/science/misc_lab)
"bTn" = (
/obj/structure/table,
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 5;
pixel_y = -4
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 2;
pixel_y = 6
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 2;
pixel_y = -1
},
/obj/machinery/light{
dir = 4
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -3;
pixel_y = 3
},
@@ -39311,7 +39311,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bUN" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bUO" = (
@@ -39454,7 +39454,7 @@
},
/area/hallway/primary/aft)
"bVg" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 20
@@ -39803,7 +39803,7 @@
name = "Virology Requests Console";
pixel_x = -32
},
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/clothing/glasses/hud/health,
/turf/open/floor/plasteel/whitegreen/side{
dir = 8
@@ -39812,7 +39812,7 @@
"bWg" = (
/obj/structure/table,
/obj/item/hand_labeler,
-/obj/item/device/radio/headset/headset_med,
+/obj/item/radio/headset/headset_med,
/turf/open/floor/plasteel/whitegreen/side{
dir = 4
},
@@ -39883,7 +39883,7 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"bWo" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = -25
},
/turf/open/floor/plasteel/floorgrime,
@@ -40075,7 +40075,7 @@
/turf/closed/wall/r_wall,
/area/security/checkpoint/engineering)
"bWR" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -40132,7 +40132,7 @@
/area/medical/virology)
"bWX" = (
/obj/structure/table/glass,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = -25
},
/obj/machinery/light{
@@ -40243,7 +40243,7 @@
/obj/item/folder/white,
/obj/item/folder/white,
/obj/item/pen,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plasteel/floorgrime,
/area/science/misc_lab)
"bXj" = (
@@ -41351,7 +41351,7 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"bZY" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = -25
},
/turf/open/floor/engine,
@@ -41377,7 +41377,7 @@
/area/maintenance/starboard/aft)
"cad" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cae" = (
@@ -41790,7 +41790,7 @@
/turf/open/floor/engine,
/area/science/misc_lab)
"caY" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/engine,
/area/science/misc_lab)
"caZ" = (
@@ -41835,9 +41835,9 @@
/area/science/misc_lab)
"cbe" = (
/obj/structure/table/reinforced,
-/obj/item/device/integrated_electronics/analyzer,
-/obj/item/device/integrated_electronics/debugger,
-/obj/item/device/integrated_electronics/wirer,
+/obj/item/integrated_electronics/analyzer,
+/obj/item/integrated_electronics/debugger,
+/obj/item/integrated_electronics/wirer,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"cbf" = (
@@ -42225,7 +42225,7 @@
/area/science/misc_lab)
"cbY" = (
/obj/structure/table/reinforced,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/screwdriver,
/obj/machinery/requests_console{
department = "Science";
@@ -42245,7 +42245,7 @@
network = list("rd");
pixel_y = -28
},
-/obj/item/device/integrated_circuit_printer,
+/obj/item/integrated_circuit_printer,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"cca" = (
@@ -42313,7 +42313,7 @@
/area/tcommsat/server)
"cci" = (
/obj/structure/table,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/yellow/side{
dir = 9
},
@@ -43049,7 +43049,7 @@
/area/tcommsat/server)
"cee" = (
/obj/structure/table,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel/yellow/side{
dir = 10
},
@@ -44925,7 +44925,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -45664,7 +45664,7 @@
/turf/open/floor/plasteel/floorgrime,
/area/maintenance/disposal/incinerator)
"clg" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -47072,7 +47072,7 @@
icon_state = "1-2"
},
/obj/structure/table/glass,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plasteel,
/area/engine/engineering)
"cpx" = (
@@ -47179,7 +47179,7 @@
/area/engine/engine_smes)
"cpT" = (
/obj/structure/table,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -35
},
@@ -47565,7 +47565,7 @@
/area/solar/starboard/aft)
"crl" = (
/obj/structure/table,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"crm" = (
@@ -47987,7 +47987,7 @@
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat_interior)
"cth" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -48064,7 +48064,7 @@
pixel_y = 28
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_y = 4
},
/obj/item/screwdriver{
@@ -48310,7 +48310,7 @@
/turf/closed/wall,
/area/ai_monitored/turret_protected/aisat_interior)
"cub" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -48538,7 +48538,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_x = 28
},
@@ -48619,7 +48619,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_x = -28
},
@@ -48663,7 +48663,7 @@
pixel_y = 3
},
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -48849,7 +48849,7 @@
/obj/machinery/porta_turret/ai{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -48991,14 +48991,14 @@
/area/ai_monitored/turret_protected/aisat/hallway)
"cvx" = (
/obj/effect/landmark/start/ai/secondary,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = 28
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
@@ -49006,7 +49006,7 @@
pixel_x = -27;
pixel_y = 5
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -49030,14 +49030,14 @@
/area/ai_monitored/turret_protected/aisat/hallway)
"cvA" = (
/obj/effect/landmark/start/ai/secondary,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = 28
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
@@ -49045,7 +49045,7 @@
pixel_x = 27;
pixel_y = 5
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -49272,7 +49272,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -50252,7 +50252,7 @@
/area/ai_monitored/turret_protected/ai)
"cAS" = (
/obj/effect/landmark/start/ai,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
@@ -50260,14 +50260,14 @@
pixel_x = -27;
pixel_y = -9
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = -31
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -50602,7 +50602,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"cBK" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -35
},
@@ -50703,7 +50703,7 @@
/obj/item/stack/cable_coil{
amount = 5
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plating,
/area/construction)
"cCc" = (
@@ -51296,7 +51296,7 @@
pixel_y = 5
},
/obj/item/clothing/glasses/welding,
-/obj/item/device/multitool{
+/obj/item/multitool{
pixel_x = 3
},
/turf/open/floor/plasteel,
@@ -51699,7 +51699,7 @@
/area/crew_quarters/heads/chief)
"cSM" = (
/obj/machinery/computer/station_alert,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 20
@@ -52002,7 +52002,7 @@
"cZO" = (
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/blood/old,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/signaler,
/turf/open/floor/plating,
/area/maintenance/bar)
"dfh" = (
@@ -52073,7 +52073,7 @@
/area/maintenance/bar)
"eaI" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = -30
},
/turf/open/floor/plasteel/white,
@@ -52820,7 +52820,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"jZP" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -53058,7 +53058,7 @@
name = "2maintenance loot spawner"
},
/obj/item/crowbar,
-/obj/item/device/electropack/shockcollar,
+/obj/item/electropack/shockcollar,
/turf/open/floor/plating,
/area/maintenance/bar)
"lyP" = (
@@ -53496,7 +53496,7 @@
pixel_x = 6;
pixel_y = -3
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1485;
listening = 1;
@@ -53986,7 +53986,7 @@
/area/maintenance/disposal/incinerator)
"uoB" = (
/obj/structure/table/reinforced,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/screwdriver,
/obj/machinery/camera{
c_tag = "Circuitry Lab North";
@@ -54055,7 +54055,7 @@
/area/security/armory)
"uCa" = (
/obj/structure/chair/stool,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -35
},
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index f802d8d636..a926877111 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -422,7 +422,7 @@
/turf/open/floor/plating,
/area/maintenance/solars/starboard/fore)
"acv" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -782,7 +782,7 @@
/area/hallway/secondary/entry)
"adx" = (
/obj/structure/table/reinforced,
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
@@ -955,7 +955,7 @@
/obj/item/stack/cable_coil/white,
/obj/item/stock_parts/cell/high,
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -1054,7 +1054,7 @@
/obj/structure/table/reinforced,
/obj/item/clipboard,
/obj/item/folder/yellow,
-/obj/item/device/assault_pod/mining,
+/obj/item/assault_pod/mining,
/turf/open/floor/plasteel/yellow/side{
dir = 4
},
@@ -1164,7 +1164,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"afV" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
@@ -2038,7 +2038,7 @@
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -2135,7 +2135,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -2784,12 +2784,12 @@
/area/security/vacantoffice)
"alq" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/grimy,
/area/security/vacantoffice)
"alr" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/light/small{
dir = 1
},
@@ -2873,7 +2873,7 @@
"alB" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/structure/reagent_dispensers/peppertank{
pixel_x = 32
},
@@ -3195,7 +3195,7 @@
/area/hallway/secondary/entry)
"amo" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/camera{
c_tag = "Arrivals - Center";
dir = 2;
@@ -3325,7 +3325,7 @@
/obj/structure/closet/crate{
icon_state = "crateopen"
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/neutral/side{
dir = 6
@@ -3443,7 +3443,7 @@
"amS" = (
/obj/structure/table/wood,
/obj/item/storage/briefcase,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/wood{
icon_state = "wood-broken4"
},
@@ -3523,7 +3523,7 @@
/area/security/vacantoffice)
"ane" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel/grimy,
/area/security/vacantoffice)
"anf" = (
@@ -3870,7 +3870,7 @@
/area/security/vacantoffice)
"aoa" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/carpet,
/area/security/vacantoffice)
"aob" = (
@@ -3949,7 +3949,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -4072,7 +4072,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -4312,11 +4312,11 @@
/area/security/vacantoffice)
"apc" = (
/obj/structure/table/wood,
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/turf/open/floor/wood,
/area/security/vacantoffice)
"apd" = (
@@ -4783,7 +4783,7 @@
/area/security/vacantoffice)
"aqh" = (
/obj/structure/table/wood,
-/obj/item/device/camera,
+/obj/item/camera,
/obj/machinery/light/small,
/obj/structure/sign/nanotrasen{
pixel_y = -32
@@ -4792,7 +4792,7 @@
/area/security/vacantoffice)
"aqi" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/sign/warning/nosmoking{
pixel_x = 32
},
@@ -5624,7 +5624,7 @@
/area/hallway/secondary/entry)
"arP" = (
/obj/machinery/vending/snack/random,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -6476,7 +6476,7 @@
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt,
/obj/item/weldingtool,
-/obj/item/device/assembly/voice,
+/obj/item/assembly/voice,
/obj/item/clothing/head/welding,
/obj/effect/spawner/lootdrop/maintenance,
/obj/structure/disposalpipe/segment{
@@ -6598,7 +6598,7 @@
/area/space/nearstation)
"atK" = (
/obj/structure/table/reinforced,
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
@@ -6782,8 +6782,8 @@
/obj/item/tank/internals/emergency_oxygen/engi{
pixel_x = 5
},
-/obj/item/device/geiger_counter,
-/obj/item/device/geiger_counter,
+/obj/item/geiger_counter,
+/obj/item/geiger_counter,
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
@@ -7358,7 +7358,7 @@
/area/engine/atmospherics_engine)
"ave" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -7508,7 +7508,7 @@
/area/maintenance/port/fore)
"avx" = (
/obj/structure/table/wood,
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/machinery/airalarm{
pixel_y = 23
@@ -8113,7 +8113,7 @@
/area/crew_quarters/toilet/auxiliary)
"awN" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -8261,7 +8261,7 @@
"axh" = (
/obj/structure/table/reinforced,
/obj/item/storage/box/lights/mixed,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -8513,7 +8513,7 @@
/area/maintenance/port/fore)
"axO" = (
/obj/structure/table/wood,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/wood{
icon_state = "wood-broken3"
},
@@ -8567,7 +8567,7 @@
pixel_y = 3
},
/obj/item/storage/box/lights/mixed,
-/obj/item/device/lightreplacer,
+/obj/item/lightreplacer,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -9119,7 +9119,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/item/mop,
/obj/item/mop,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -11653,7 +11653,7 @@
"aEO" = (
/obj/structure/table/wood,
/obj/structure/reagent_dispensers/beerkeg,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -11779,7 +11779,7 @@
pixel_y = 3
},
/obj/item/storage/fancy/cigarettes/cigars/havana,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -11941,7 +11941,7 @@
/turf/open/floor/plasteel,
/area/engine/atmospherics_engine)
"aFv" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -28;
pixel_y = -28
@@ -12092,7 +12092,7 @@
/area/hydroponics/garden/abandoned)
"aFN" = (
/obj/structure/table,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/item/hatchet,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
@@ -12138,7 +12138,7 @@
/area/maintenance/port/fore)
"aFT" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/button/door{
id = "AuxCabinA";
name = "Dormitory Door Lock";
@@ -12151,7 +12151,7 @@
/area/hallway/secondary/service)
"aFU" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel/grimy,
/area/hallway/secondary/service)
"aFV" = (
@@ -12422,7 +12422,7 @@
},
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/button/door{
desc = "A remote control switch.";
id = "cardoor";
@@ -12441,7 +12441,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -12693,7 +12693,7 @@
/turf/open/floor/plating,
/area/security/prison)
"aGM" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -13761,7 +13761,7 @@
"aIN" = (
/obj/structure/table/wood,
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/wood,
/area/hallway/secondary/service)
"aIO" = (
@@ -14062,7 +14062,7 @@
/turf/open/floor/plasteel,
/area/security/prison)
"aJB" = (
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/neutral/corner,
@@ -14414,7 +14414,7 @@
/area/maintenance/port/fore)
"aKm" = (
/obj/structure/table/wood,
-/obj/item/device/camera,
+/obj/item/camera,
/obj/machinery/newscaster{
pixel_x = -32
},
@@ -14525,7 +14525,7 @@
/area/crew_quarters/bar/atrium)
"aKB" = (
/obj/structure/chair/stool/bar,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -14956,7 +14956,7 @@
/obj/structure/cable/white{
icon_state = "0-8"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -15633,11 +15633,11 @@
/obj/machinery/status_display{
pixel_x = -32
},
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -15711,7 +15711,7 @@
/area/crew_quarters/bar/atrium)
"aNk" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -15787,7 +15787,7 @@
dir = 8
},
/obj/structure/disposalpipe/segment,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -16148,7 +16148,7 @@
/turf/open/floor/plasteel/vault,
/area/engine/atmos)
"aOd" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -16305,7 +16305,7 @@
/area/crew_quarters/theatre)
"aOw" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/eguitar,
+/obj/item/instrument/eguitar,
/obj/item/toy/crayon/spraycan/lubecan{
charges = 5
},
@@ -16344,10 +16344,10 @@
},
/obj/item/storage/crayons,
/obj/item/storage/crayons,
-/obj/item/device/flashlight/lamp/bananalamp{
+/obj/item/flashlight/lamp/bananalamp{
pixel_y = 5
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -16376,7 +16376,7 @@
/area/crew_quarters/bar/atrium)
"aOD" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/guitar,
+/obj/item/instrument/guitar,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -17148,7 +17148,7 @@
dir = 8;
pixel_x = -24
},
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -17300,7 +17300,7 @@
"aQC" = (
/obj/structure/table,
/obj/item/folder/yellow,
-/obj/item/device/destTagger,
+/obj/item/destTagger,
/turf/open/floor/plasteel/brown,
/area/quartermaster/sorting)
"aQD" = (
@@ -17466,7 +17466,7 @@
"aQX" = (
/obj/structure/table/glass,
/obj/item/folder/blue,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/machinery/light{
dir = 1
},
@@ -17528,7 +17528,7 @@
/area/security/prison)
"aRf" = (
/obj/machinery/holopad,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom";
@@ -18269,7 +18269,7 @@
pixel_x = 26;
pixel_y = 32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = 28
@@ -18290,7 +18290,7 @@
/area/quartermaster/qm)
"aSA" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/brown{
dir = 5
},
@@ -18445,7 +18445,7 @@
pixel_x = 3
},
/obj/item/restraints/handcuffs,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
@@ -18931,7 +18931,7 @@
/area/crew_quarters/bar/atrium)
"aTI" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aTJ" = (
@@ -18994,7 +18994,7 @@
"aTQ" = (
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/pen/red,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
@@ -19220,7 +19220,7 @@
/area/quartermaster/qm)
"aUm" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -19405,8 +19405,8 @@
/obj/structure/reagent_dispensers/peppertank{
pixel_x = -32
},
-/obj/item/device/electropack,
-/obj/item/device/assembly/signaler,
+/obj/item/electropack,
+/obj/item/assembly/signaler,
/obj/machinery/light{
dir = 8
},
@@ -19750,7 +19750,7 @@
/area/hallway/secondary/service)
"aVn" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/violin,
+/obj/item/instrument/violin,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -20284,8 +20284,8 @@
pixel_x = -7;
pixel_y = -26
},
-/obj/item/device/flashlight/lamp,
-/obj/item/device/radio/intercom{
+/obj/item/flashlight/lamp,
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -20658,7 +20658,7 @@
},
/area/crew_quarters/bar/atrium)
"aXb" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26;
pixel_y = -26
@@ -20875,7 +20875,7 @@
/obj/item/cartridge/quartermaster{
pixel_y = 6
},
-/obj/item/device/gps/mining,
+/obj/item/gps/mining,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -20921,7 +20921,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -21139,7 +21139,7 @@
"aYf" = (
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
-/obj/item/device/lightreplacer,
+/obj/item/lightreplacer,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -22298,7 +22298,7 @@
/turf/closed/wall,
/area/hydroponics)
"baw" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -22461,7 +22461,7 @@
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = 28
@@ -22672,7 +22672,7 @@
/area/security/prison)
"bbl" = (
/obj/machinery/light,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -22968,7 +22968,7 @@
/area/hydroponics)
"bbX" = (
/obj/structure/closet/wardrobe/botanist,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -23189,7 +23189,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -23372,7 +23372,7 @@
/obj/item/restraints/handcuffs,
/obj/item/restraints/handcuffs,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault,
/area/security/prison)
"bcQ" = (
@@ -23853,7 +23853,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -24061,7 +24061,7 @@
/turf/open/floor/plasteel,
/area/security/prison)
"bes" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -24119,7 +24119,7 @@
/area/engine/atmos)
"beA" = (
/obj/structure/table/reinforced,
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
@@ -24338,7 +24338,7 @@
dir = 1;
pixel_y = -22
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26;
pixel_y = -26
@@ -25401,7 +25401,7 @@
/area/hydroponics)
"bhC" = (
/obj/structure/table/glass,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -25464,7 +25464,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -25505,7 +25505,7 @@
/turf/open/floor/plasteel/red,
/area/crew_quarters/kitchen)
"bhO" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -25760,7 +25760,7 @@
"bir" = (
/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/purple/side{
dir = 4
},
@@ -25959,7 +25959,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 26
@@ -26218,7 +26218,7 @@
/obj/structure/closet/crate{
icon_state = "crateopen"
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -26579,7 +26579,7 @@
icon_state = "4-8"
},
/obj/item/folder/yellow,
-/obj/item/device/gps/mining,
+/obj/item/gps/mining,
/turf/open/floor/plasteel/brown{
dir = 6
},
@@ -26622,7 +26622,7 @@
icon_state = "4-8"
},
/obj/item/clothing/gloves/color/latex,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/reagent_containers/spray/cleaner{
pixel_x = -3;
pixel_y = 2
@@ -26768,11 +26768,11 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = 3
},
/obj/item/storage/box/deputy,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -27421,7 +27421,7 @@
/obj/structure/closet/wardrobe/miner,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_y = -26
@@ -27485,7 +27485,7 @@
/area/security/brig)
"bmf" = (
/obj/structure/bed/roller,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -27622,7 +27622,7 @@
pixel_x = 32;
pixel_y = 32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 58
@@ -27685,7 +27685,7 @@
/obj/item/storage/secure/safe/HoS{
pixel_x = 32
},
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/heads/hos)
"bmD" = (
@@ -28272,7 +28272,7 @@
"bnN" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -28367,7 +28367,7 @@
/area/crew_quarters/heads/hos)
"bnX" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/white{
icon_state = "1-2"
@@ -28523,7 +28523,7 @@
"bop" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -28578,7 +28578,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
@@ -28923,7 +28923,7 @@
name = "Labor Camp Monitoring";
network = list("labor")
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -30069,7 +30069,7 @@
"brr" = (
/obj/structure/table/reinforced,
/obj/item/folder/red,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -30094,7 +30094,7 @@
"bru" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
@@ -30444,7 +30444,7 @@
"bse" = (
/obj/structure/table/reinforced,
/obj/item/storage/belt/utility,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 2
},
@@ -30791,7 +30791,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -31263,7 +31263,7 @@
/obj/machinery/ai_status_display{
pixel_y = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = -26
@@ -32561,7 +32561,7 @@
/turf/open/floor/plasteel/caution,
/area/engine/atmos)
"bwx" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -32794,7 +32794,7 @@
/area/hydroponics)
"bwO" = (
/obj/machinery/hydroponics/constructable,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -33272,7 +33272,7 @@
/obj/structure/table/reinforced,
/obj/item/crowbar/red,
/obj/item/wrench,
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
@@ -33437,7 +33437,7 @@
pixel_y = 32
},
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/dark,
/area/bridge)
"byk" = (
@@ -33854,7 +33854,7 @@
/area/ai_monitored/turret_protected/ai)
"bzc" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -34254,7 +34254,7 @@
dir = 4
},
/obj/structure/disposalpipe/segment,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -34329,8 +34329,8 @@
dir = 4
},
/obj/item/wrench,
-/obj/item/device/assembly/timer,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/timer,
+/obj/item/assembly/signaler,
/turf/open/floor/plasteel/darkyellow/corner{
dir = 4
},
@@ -34552,7 +34552,7 @@
/obj/structure/cable/white{
icon_state = "1-8"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -34742,7 +34742,7 @@
/obj/machinery/power/terminal{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -34981,25 +34981,25 @@
/area/hallway/primary/port)
"bBj" = (
/obj/structure/table/reinforced,
-/obj/item/device/plant_analyzer,
-/obj/item/device/plant_analyzer,
-/obj/item/device/radio,
+/obj/item/plant_analyzer,
+/obj/item/plant_analyzer,
+/obj/item/radio,
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/storage/tech)
"bBk" = (
/obj/structure/table/reinforced,
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/storage/tech)
@@ -35019,16 +35019,16 @@
"bBn" = (
/obj/structure/table/reinforced,
/obj/item/aiModule/reset,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/storage/tech)
"bBo" = (
/obj/structure/table/reinforced,
/obj/item/bodypart/chest/robot,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -35186,7 +35186,7 @@
/turf/open/floor/plasteel/dark,
/area/bridge)
"bBG" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26;
pixel_y = 26
@@ -35208,7 +35208,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -35229,7 +35229,7 @@
},
/area/bridge)
"bBL" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 26
@@ -35369,7 +35369,7 @@
/turf/open/floor/plasteel/neutral,
/area/security/execution/transfer)
"bCc" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -35407,7 +35407,7 @@
/turf/open/floor/plasteel,
/area/security/brig)
"bCg" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -35446,8 +35446,8 @@
/area/security/main)
"bCk" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
-/obj/item/device/radio/intercom{
+/obj/item/flashlight/lamp,
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 1;
freerange = 1;
@@ -35866,7 +35866,7 @@
/area/engine/break_room)
"bCY" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/caution{
dir = 10
},
@@ -35896,7 +35896,7 @@
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
/obj/item/pen,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -35932,13 +35932,13 @@
/area/hallway/primary/port)
"bDe" = (
/obj/structure/table/reinforced,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/stack/cable_coil/white{
pixel_x = 3;
pixel_y = 3
},
/obj/item/stack/cable_coil/white,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/machinery/light{
dir = 8
},
@@ -35972,7 +35972,7 @@
/area/storage/tech)
"bDk" = (
/obj/structure/table/reinforced,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/machinery/light{
dir = 4
},
@@ -35986,16 +35986,16 @@
/area/storage/primary)
"bDm" = (
/obj/structure/table/reinforced,
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
/obj/machinery/light{
dir = 8
},
@@ -36129,9 +36129,9 @@
/area/storage/primary)
"bDt" = (
/obj/structure/table/reinforced,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/light{
dir = 1
@@ -36641,7 +36641,7 @@
/turf/closed/wall,
/area/security/brig)
"bEf" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
@@ -36649,14 +36649,14 @@
pixel_x = -10;
pixel_y = 22
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
name = "Common Channel";
pixel_x = -27
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -36755,7 +36755,7 @@
/turf/open/floor/circuit/green,
/area/ai_monitored/turret_protected/ai)
"bEm" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
@@ -36763,14 +36763,14 @@
pixel_x = 10;
pixel_y = 22
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
name = "Common Channel";
pixel_x = 27
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -37279,7 +37279,7 @@
/obj/structure/table/reinforced,
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/gps,
+/obj/item/gps,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/storage/primary)
@@ -37446,7 +37446,7 @@
},
/obj/structure/table/wood,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -37482,7 +37482,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -37668,7 +37668,7 @@
/turf/open/floor/plating,
/area/security/warden)
"bFQ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -37692,7 +37692,7 @@
},
/area/ai_monitored/turret_protected/ai)
"bFT" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
@@ -37700,14 +37700,14 @@
pixel_x = -27;
pixel_y = -7
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = -27
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -38108,7 +38108,7 @@
},
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/micro_laser,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -38119,7 +38119,7 @@
"bGG" = (
/obj/structure/rack,
/obj/item/airlock_painter,
-/obj/item/device/toner,
+/obj/item/toner,
/obj/machinery/status_display{
pixel_x = -32
},
@@ -38269,7 +38269,7 @@
"bHb" = (
/obj/structure/rack,
/obj/machinery/light/small,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/item/storage/secure/briefcase,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -38280,7 +38280,7 @@
dir = 8
},
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
@@ -38618,7 +38618,7 @@
/obj/structure/table/reinforced,
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/mmi,
+/obj/item/mmi,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -38781,7 +38781,7 @@
"bIc" = (
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
-/obj/item/device/lightreplacer,
+/obj/item/lightreplacer,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -39033,7 +39033,7 @@
"bIA" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/storage/primary)
@@ -39194,7 +39194,7 @@
pixel_x = -7;
pixel_y = -26
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = -26
@@ -39353,7 +39353,7 @@
icon_state = "1-8"
},
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/camera/detective,
+/obj/item/camera/detective,
/turf/open/floor/plasteel/vault,
/area/security/detectives_office)
"bJj" = (
@@ -39367,7 +39367,7 @@
areastring = "/area/security/detectives_office";
pixel_y = 24
},
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/item/restraints/handcuffs,
/turf/open/floor/plasteel/vault,
/area/security/detectives_office)
@@ -39642,7 +39642,7 @@
"bJN" = (
/obj/structure/table/reinforced,
/obj/item/folder/blue,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -39700,7 +39700,7 @@
"bJT" = (
/obj/structure/table/reinforced,
/obj/item/clipboard,
-/obj/item/device/gps/engineering{
+/obj/item/gps/engineering{
gpstag = "CE0"
},
/obj/machinery/newscaster{
@@ -39959,7 +39959,7 @@
/area/storage/tech)
"bKs" = (
/obj/machinery/vending/tool,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -40005,7 +40005,7 @@
pixel_y = 32
},
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/wood,
/area/bridge/meeting_room/council)
"bKz" = (
@@ -40066,7 +40066,7 @@
/area/bridge/meeting_room/council)
"bKG" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/wood,
/area/bridge/meeting_room/council)
"bKH" = (
@@ -40165,7 +40165,7 @@
"bKV" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -41002,7 +41002,7 @@
/area/tcommsat/computer)
"bMy" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -41066,11 +41066,11 @@
/area/tcommsat/computer)
"bME" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
-/obj/item/device/radio{
+/obj/item/radio{
pixel_y = 5
},
/turf/open/floor/plasteel/grimy,
@@ -41080,7 +41080,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -41398,14 +41398,14 @@
pixel_x = 3;
pixel_y = -3
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
/obj/item/clothing/mask/gas/sechailer,
/obj/item/clothing/mask/gas/sechailer,
-/obj/item/device/flashlight/seclite,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
/turf/open/floor/plasteel/red/side{
dir = 5
},
@@ -41431,7 +41431,7 @@
pixel_y = -2
},
/obj/structure/table/reinforced,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -41717,7 +41717,7 @@
/area/crew_quarters/heads/chief)
"bNR" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/heads/chief)
"bNS" = (
@@ -41755,7 +41755,7 @@
/turf/open/floor/plasteel,
/area/engine/break_room)
"bNW" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -41867,7 +41867,7 @@
/obj/structure/table/reinforced,
/obj/item/clothing/gloves/color/yellow,
/obj/item/storage/toolbox/electrical,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/machinery/light{
dir = 8
},
@@ -42193,7 +42193,7 @@
/obj/structure/rack,
/obj/item/clothing/gloves/color/fyellow,
/obj/item/clothing/suit/hazardvest,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/structure/extinguisher_cabinet{
pixel_x = -26
},
@@ -42224,7 +42224,7 @@
/turf/open/floor/plasteel/neutral,
/area/storage/tools)
"bPb" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -42492,7 +42492,7 @@
id = "AI";
pixel_x = -26
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -42765,10 +42765,10 @@
/area/storage/tech)
"bQl" = (
/obj/structure/table/reinforced,
-/obj/item/device/assembly/timer,
-/obj/item/device/assembly/timer,
-/obj/item/device/assembly/voice,
-/obj/item/device/assembly/voice,
+/obj/item/assembly/timer,
+/obj/item/assembly/timer,
+/obj/item/assembly/voice,
+/obj/item/assembly/voice,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/storage/tech)
@@ -42794,7 +42794,7 @@
/obj/structure/table/reinforced,
/obj/item/wrench,
/obj/item/crowbar,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/machinery/newscaster{
pixel_y = -32
},
@@ -42804,18 +42804,18 @@
"bQp" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/storage/tech)
"bQq" = (
/obj/structure/table/reinforced,
-/obj/item/device/assembly/timer,
-/obj/item/device/assembly/timer,
-/obj/item/device/multitool,
-/obj/item/device/multitool,
+/obj/item/assembly/timer,
+/obj/item/assembly/timer,
+/obj/item/multitool,
+/obj/item/multitool,
/obj/machinery/light,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -42840,15 +42840,15 @@
/area/storage/primary)
"bQu" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = -5;
pixel_y = 5
},
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
@@ -43006,7 +43006,7 @@
pixel_x = -32;
pixel_y = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = -26
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -43203,7 +43203,7 @@
pixel_y = -26
},
/obj/structure/disposalpipe/segment,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/item/reagent_containers/food/drinks/flask/det,
/turf/open/floor/carpet,
/area/security/detectives_office)
@@ -43630,7 +43630,7 @@
/area/crew_quarters/heads/chief)
"bSe" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/ai_status_display{
pixel_y = 32
},
@@ -43850,7 +43850,7 @@
pixel_x = -26;
pixel_y = -26
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -43951,7 +43951,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Bridge - Captain's Office";
@@ -44012,7 +44012,7 @@
"bSQ" = (
/obj/structure/table/wood,
/obj/item/storage/photo_album,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
"bSR" = (
@@ -44754,7 +44754,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
@@ -44845,7 +44845,7 @@
pixel_x = 32;
pixel_y = 32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -45462,7 +45462,7 @@
/obj/item/screwdriver{
pixel_y = 5
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/red/side{
dir = 4
},
@@ -45630,7 +45630,7 @@
name = "MiniSat Antechamber";
req_access_txt = "16"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -45803,7 +45803,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -46126,7 +46126,7 @@
pixel_x = 24
},
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/radio,
+/obj/item/radio,
/turf/open/floor/plasteel/red/side{
dir = 4
},
@@ -46265,7 +46265,7 @@
pixel_x = -38;
pixel_y = 7
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -46391,7 +46391,7 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain)
"bXf" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = -26
},
/turf/open/floor/plasteel/grimy,
@@ -46587,7 +46587,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"bXz" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/structure/cable/white{
icon_state = "4-8"
},
@@ -48036,7 +48036,7 @@
dir = 1
},
/obj/machinery/light,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -48142,7 +48142,7 @@
/obj/item/clipboard,
/obj/item/toy/figure/borg,
/obj/machinery/light,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -48163,7 +48163,7 @@
/obj/machinery/ai_status_display{
pixel_y = -32
},
-/obj/item/device/aicard,
+/obj/item/aicard,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -48828,9 +48828,9 @@
pixel_x = 3;
pixel_y = -3
},
-/obj/item/device/flashlight/seclite,
-/obj/item/device/flashlight/seclite,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -49138,7 +49138,7 @@
/area/library)
"cco" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -49167,11 +49167,11 @@
/area/library)
"cct" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -49200,7 +49200,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -49343,7 +49343,7 @@
/obj/structure/table/wood,
/obj/item/pinpointer/nuke,
/obj/item/disk/nuclear,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -49374,7 +49374,7 @@
/area/crew_quarters/heads/captain/private)
"ccQ" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/obj/structure/window/reinforced{
dir = 8
},
@@ -49502,7 +49502,7 @@
/obj/structure/table/wood,
/obj/item/book/manual/wiki/security_space_law,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = 3
},
/obj/item/clothing/glasses/sunglasses,
@@ -49592,7 +49592,7 @@
/turf/open/floor/plasteel/neutral,
/area/security/brig)
"cdp" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = -7
@@ -50669,7 +50669,7 @@
},
/area/security/brig)
"cfn" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -50952,7 +50952,7 @@
/obj/structure/sign/warning/electricshock{
pixel_x = 32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = -26
@@ -51156,7 +51156,7 @@
/area/tcommsat/server)
"cgr" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Captain's Intercom";
@@ -51288,7 +51288,7 @@
/area/security/courtroom)
"cgE" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom"
},
/turf/open/floor/plasteel/neutral/side{
@@ -51511,7 +51511,7 @@
"cgZ" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -51980,7 +51980,7 @@
/area/library)
"chW" = (
/obj/structure/chair/comfy/brown,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -52354,15 +52354,15 @@
dir = 4;
pixel_x = -23
},
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = -5;
pixel_y = 5
},
-/obj/item/device/radio,
+/obj/item/radio,
/turf/open/floor/plasteel/red/side{
dir = 10
},
@@ -52633,7 +52633,7 @@
/area/maintenance/port)
"cjr" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/newscaster{
pixel_x = -32
},
@@ -52700,7 +52700,7 @@
/obj/machinery/keycard_auth{
pixel_x = -26
},
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -52887,7 +52887,7 @@
/turf/open/floor/plasteel,
/area/security/courtroom)
"cjY" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/neutral/side{
dir = 8
},
@@ -52906,7 +52906,7 @@
/area/security/courtroom)
"ckb" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -32
},
@@ -52941,8 +52941,8 @@
/area/security/courtroom)
"cke" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
-/obj/item/device/radio/intercom{
+/obj/item/flashlight/lamp,
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -53040,7 +53040,7 @@
"ckn" = (
/obj/structure/table/reinforced,
/obj/item/aiModule/reset,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -53089,7 +53089,7 @@
"ckt" = (
/obj/structure/table/reinforced,
/obj/item/aiModule/supplied/quarantine,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -53514,7 +53514,7 @@
icon_state = "crateopen"
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/starboard)
@@ -54186,7 +54186,7 @@
/area/security/courtroom)
"cmU" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom"
},
/turf/open/floor/plasteel/neutral/side,
@@ -54625,12 +54625,12 @@
"cnG" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -54701,7 +54701,7 @@
/area/library)
"cnR" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/window/reinforced{
dir = 8
},
@@ -54725,11 +54725,11 @@
/area/library)
"cnV" = (
/obj/structure/table/wood,
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
@@ -54799,7 +54799,7 @@
/area/crew_quarters/heads/hop)
"cod" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -54963,7 +54963,7 @@
/area/hallway/primary/central)
"cot" = (
/obj/item/twohanded/required/kirbyplants/random,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -55335,7 +55335,7 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 20
},
-/obj/item/device/gps/engineering{
+/obj/item/gps/engineering{
gpstag = "ENG0"
},
/obj/effect/turf_decal/bot,
@@ -55376,7 +55376,7 @@
"cpo" = (
/obj/structure/tank_dispenser,
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -55472,11 +55472,11 @@
/area/library)
"cpA" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/heads/hop)
"cpB" = (
@@ -55584,7 +55584,7 @@
"cpN" = (
/obj/structure/rack,
/obj/item/tank/internals/oxygen,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -26
@@ -56232,7 +56232,7 @@
/area/security/courtroom)
"crm" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom"
},
/turf/open/floor/plasteel/vault,
@@ -56684,7 +56684,7 @@
"csl" = (
/obj/structure/table/wood,
/obj/item/storage/bag/books,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/structure/noticeboard{
dir = 8;
pixel_x = 32
@@ -56840,7 +56840,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -57439,7 +57439,7 @@
dir = 8;
pixel_x = 24
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -57680,7 +57680,7 @@
/obj/structure/cable/white{
icon_state = "1-8"
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -57955,7 +57955,7 @@
icon_state = "crateopen"
},
/obj/item/clothing/shoes/jackboots,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/item/storage/secure/briefcase,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -58563,11 +58563,11 @@
/area/crew_quarters/locker)
"cvV" = (
/obj/structure/table,
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -58575,7 +58575,7 @@
/area/crew_quarters/locker)
"cvW" = (
/obj/structure/table,
-/obj/item/device/camera,
+/obj/item/camera,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
@@ -58810,7 +58810,7 @@
/area/hallway/primary/central)
"cwB" = (
/obj/item/stack/cable_coil,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -59022,7 +59022,7 @@
amount = 25
},
/obj/item/storage/toolbox/emergency,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/structure/extinguisher_cabinet{
pixel_x = 26
},
@@ -59336,7 +59336,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -60197,7 +60197,7 @@
/area/library)
"czE" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment{
dir = 4
@@ -60268,10 +60268,10 @@
/obj/machinery/light,
/obj/structure/table/wood,
/obj/item/folder,
-/obj/item/device/laser_pointer{
+/obj/item/laser_pointer{
pixel_x = 3
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -60279,8 +60279,8 @@
/area/library)
"czN" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
-/obj/item/device/camera,
+/obj/item/taperecorder,
+/obj/item/camera,
/obj/machinery/ai_status_display{
pixel_y = -32
},
@@ -60347,7 +60347,7 @@
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"czU" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/neutral,
/area/ai_monitored/storage/eva)
"czV" = (
@@ -60821,7 +60821,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/maintenance/port)
@@ -61087,7 +61087,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -61142,7 +61142,7 @@
/area/gateway)
"cBG" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -61330,7 +61330,7 @@
/area/crew_quarters/locker)
"cBW" = (
/obj/structure/table,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/structure/cable/white{
icon_state = "4-8"
},
@@ -61409,7 +61409,7 @@
/area/crew_quarters/dorms)
"cCe" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/sign/nanotrasen{
pixel_x = -32
},
@@ -61431,7 +61431,7 @@
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/suit/jacket/letterman_nanotrasen,
/obj/item/clothing/suit/toggle/lawyer,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 26
@@ -61466,7 +61466,7 @@
name = "trenchcoat"
},
/obj/item/clothing/suit/toggle/lawyer/purple,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 26
@@ -62177,7 +62177,7 @@
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"cDD" = (
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/turf/open/floor/wood{
icon_state = "wood-broken3"
},
@@ -62491,7 +62491,7 @@
/area/maintenance/port)
"cEp" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/dark,
/area/library)
"cEq" = (
@@ -62507,7 +62507,7 @@
/area/library)
"cEr" = (
/obj/item/twohanded/required/kirbyplants/random,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -62753,9 +62753,9 @@
"cES" = (
/obj/structure/table,
/obj/item/storage/belt,
-/obj/item/device/radio,
-/obj/item/device/radio,
-/obj/item/device/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
/obj/machinery/firealarm{
dir = 8;
pixel_x = -24
@@ -63122,7 +63122,7 @@
/area/crew_quarters/dorms)
"cFA" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/obj/machinery/newscaster{
pixel_x = -32
},
@@ -63414,8 +63414,8 @@
/obj/item/folder/yellow,
/obj/machinery/light,
/obj/structure/table/reinforced,
-/obj/item/device/gps,
-/obj/item/device/gps,
+/obj/item/gps,
+/obj/item/gps,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -63435,7 +63435,7 @@
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"cGh" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -63475,7 +63475,7 @@
/area/ai_monitored/storage/eva)
"cGn" = (
/obj/item/storage/belt,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/light,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/vault{
@@ -63558,7 +63558,7 @@
/area/bridge/showroom/corporate)
"cGv" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel/grimy,
/area/bridge/showroom/corporate)
"cGw" = (
@@ -63573,7 +63573,7 @@
desc = "A replica beret resembling that of a special operations officer under Nanotrasen.";
name = "replica officer's beret"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -64559,7 +64559,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -65234,7 +65234,7 @@
/obj/structure/closet/crate{
icon_state = "crateopen"
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -67006,7 +67006,7 @@
/obj/structure/closet/crate{
icon_state = "crateopen"
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port)
@@ -67225,7 +67225,7 @@
/area/medical/storage)
"cNN" = (
/obj/structure/closet/secure_closet/medical3,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -67589,7 +67589,7 @@
pixel_y = 3
},
/obj/item/stack/cable_coil/white,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/maintenance/department/electrical)
@@ -67800,7 +67800,7 @@
"cPa" = (
/obj/structure/table,
/obj/item/folder/white,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel/whitepurple/corner{
dir = 1
},
@@ -67817,8 +67817,8 @@
"cPc" = (
/obj/structure/table,
/obj/item/stack/cable_coil/white,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/timer{
+/obj/item/assembly/igniter,
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
@@ -67962,7 +67962,7 @@
"cPx" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = 28
@@ -68202,7 +68202,7 @@
/area/crew_quarters/dorms)
"cPR" = (
/obj/structure/dresser,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 26
@@ -68228,7 +68228,7 @@
/area/crew_quarters/dorms)
"cPT" = (
/obj/item/twohanded/required/kirbyplants/random,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 26
@@ -68260,8 +68260,8 @@
/area/crew_quarters/dorms)
"cPW" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
-/obj/item/device/radio/intercom{
+/obj/item/flashlight/lamp,
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 26
@@ -68564,7 +68564,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -68575,7 +68575,7 @@
"cQG" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/ai_status_display{
pixel_y = 32
},
@@ -68589,7 +68589,7 @@
"cQH" = (
/obj/structure/table,
/obj/item/folder/white,
-/obj/item/device/assembly/infra,
+/obj/item/assembly/infra,
/turf/open/floor/plasteel/whitepurple/corner{
dir = 1
},
@@ -69065,7 +69065,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -69471,7 +69471,7 @@
},
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/button/door{
desc = "A remote control switch for the medbay foyer.";
id = "MedbayFoyer";
@@ -69498,7 +69498,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -69547,7 +69547,7 @@
pixel_y = 3
},
/obj/item/storage/box/beakers,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -69780,7 +69780,7 @@
/area/maintenance/department/electrical)
"cTq" = (
/obj/structure/table/reinforced,
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
@@ -70038,7 +70038,7 @@
pixel_y = 3
},
/obj/item/storage/box/syringes,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 32
},
@@ -70587,7 +70587,7 @@
/obj/machinery/status_display{
pixel_y = -32
},
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"cUW" = (
@@ -70897,7 +70897,7 @@
pixel_y = -3;
req_access_txt = "55"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 5
},
@@ -71791,7 +71791,7 @@
/obj/item/clipboard,
/obj/item/electronics/airlock,
/obj/item/stack/sheet/glass,
-/obj/item/device/assembly/signaler,
+/obj/item/assembly/signaler,
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
@@ -71839,8 +71839,8 @@
/area/science/research)
"cXw" = (
/obj/structure/table,
-/obj/item/device/gps,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/gps,
+/obj/item/assembly/flash/handheld,
/obj/machinery/status_display{
pixel_y = -32
},
@@ -73783,11 +73783,11 @@
/area/crew_quarters/fitness/recreation)
"dbI" = (
/obj/structure/table,
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/fitness/recreation)
"dbJ" = (
@@ -74356,18 +74356,18 @@
/area/medical/chemistry)
"dcN" = (
/obj/structure/table/glass,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/timer{
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
@@ -74420,7 +74420,7 @@
/obj/machinery/computer/crew{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -74687,7 +74687,7 @@
/area/crew_quarters/fitness/recreation)
"ddA" = (
/obj/structure/table/wood,
-/obj/item/device/camera,
+/obj/item/camera,
/obj/structure/sign/nanotrasen{
pixel_x = 32;
pixel_y = -32
@@ -74860,7 +74860,7 @@
"ddV" = (
/obj/structure/table/reinforced,
/obj/item/clothing/gloves/color/latex,
-/obj/item/device/slime_scanner,
+/obj/item/slime_scanner,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/science/xenobiology)
@@ -74885,7 +74885,7 @@
/turf/open/floor/plating,
/area/security/checkpoint/science/research)
"ddY" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -32
},
@@ -74950,7 +74950,7 @@
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/manipulator,
/obj/item/stock_parts/manipulator,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -76053,7 +76053,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -76728,7 +76728,7 @@
/turf/open/floor/plasteel/neutral,
/area/science/research)
"dhZ" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -76964,7 +76964,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/whiteblue,
/area/medical/medbay/central)
@@ -77273,7 +77273,7 @@
/area/crew_quarters/abandoned_gambling_den)
"djn" = (
/obj/structure/table/reinforced,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/screwdriver,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the RD's goons from the safety of his office.";
@@ -77389,7 +77389,7 @@
"djB" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/turf_decal/bot,
/obj/structure/sign/poster/official/science{
pixel_x = -32
@@ -77731,7 +77731,7 @@
/obj/structure/cable/white{
icon_state = "1-4"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -78070,7 +78070,7 @@
"dkT" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/wood,
-/obj/item/device/modular_computer/tablet/preset/cheap,
+/obj/item/modular_computer/tablet/preset/cheap,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"dkU" = (
@@ -78289,7 +78289,7 @@
pixel_y = 3
},
/obj/item/stack/cable_coil/white,
-/obj/item/device/geiger_counter,
+/obj/item/geiger_counter,
/obj/effect/turf_decal/bot,
/obj/structure/sign/poster/official/cleanliness{
pixel_x = 32
@@ -78913,7 +78913,7 @@
"dmS" = (
/obj/structure/table/reinforced,
/obj/item/folder/white,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/machinery/airalarm{
dir = 4;
pixel_x = -23
@@ -78983,7 +78983,7 @@
dir = 4;
pixel_x = -23
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -79329,7 +79329,7 @@
"dnN" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/hallway/secondary/construction)
@@ -79474,7 +79474,7 @@
/area/crew_quarters/abandoned_gambling_den)
"dog" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -79666,7 +79666,7 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 5
},
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -79864,7 +79864,7 @@
/area/crew_quarters/heads/hor)
"doM" = (
/obj/structure/table/reinforced,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/item/circuitboard/aicore,
/obj/structure/disposalpipe/sorting/mail{
dir = 4;
@@ -80573,7 +80573,7 @@
"dqn" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/experimentor,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -80961,7 +80961,7 @@
/area/maintenance/department/medical)
"dqY" = (
/obj/structure/rack,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/clothing/glasses/eyepatch,
/turf/open/floor/plating{
icon_state = "panelscorched"
@@ -81172,7 +81172,7 @@
/area/crew_quarters/abandoned_gambling_den)
"drz" = (
/obj/structure/table/reinforced,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/screwdriver,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the RD's goons from the safety of his office.";
@@ -81553,7 +81553,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -82021,7 +82021,7 @@
"dtz" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -82350,9 +82350,9 @@
/area/crew_quarters/abandoned_gambling_den)
"duk" = (
/obj/structure/table/wood,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/timer{
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
@@ -82380,8 +82380,8 @@
/area/science/research/abandoned)
"duo" = (
/obj/structure/table/reinforced,
-/obj/item/device/mmi,
-/obj/item/device/assembly/prox_sensor,
+/obj/item/mmi,
+/obj/item/assembly/prox_sensor,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/science/research/abandoned)
@@ -82420,7 +82420,7 @@
/obj/structure/table/reinforced,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/science/research/abandoned)
@@ -82514,7 +82514,7 @@
/turf/open/floor/plasteel/neutral,
/area/science/mixing)
"duH" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 26
@@ -82771,7 +82771,7 @@
/area/medical/genetics)
"dvj" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -82897,7 +82897,7 @@
"dvu" = (
/obj/structure/table/glass,
/obj/item/folder/white,
-/obj/item/device/flashlight/pen,
+/obj/item/flashlight/pen,
/obj/item/clothing/neck/stethoscope,
/turf/open/floor/plasteel/cmo,
/area/crew_quarters/heads/cmo)
@@ -82910,7 +82910,7 @@
/obj/structure/table/glass,
/obj/item/folder/blue,
/obj/item/clothing/glasses/hud/health,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -83129,7 +83129,7 @@
/area/hallway/secondary/construction)
"dvO" = (
/obj/structure/table,
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
@@ -83149,7 +83149,7 @@
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt,
/obj/item/weldingtool,
-/obj/item/device/assembly/voice,
+/obj/item/assembly/voice,
/obj/item/clothing/head/welding,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/turf_decal/stripes/line{
@@ -83362,11 +83362,11 @@
icon_state = "4-8"
},
/obj/item/storage/secure/briefcase,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26;
pixel_y = -26
@@ -83927,7 +83927,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -84561,7 +84561,7 @@
/obj/machinery/computer/med_data{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -84686,7 +84686,7 @@
/area/hallway/secondary/construction)
"dyR" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -84731,7 +84731,7 @@
/area/crew_quarters/abandoned_gambling_den)
"dyY" = (
/obj/structure/table/wood/poker,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"dyZ" = (
@@ -85041,15 +85041,15 @@
/area/science/robotics/lab)
"dzG" = (
/obj/item/paper_bin,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 5;
pixel_y = 7
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 5;
pixel_y = 7
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 5;
pixel_y = 7
},
@@ -85182,7 +85182,7 @@
/obj/structure/table/reinforced,
/obj/item/storage/box/monkeycubes,
/obj/item/storage/box/monkeycubes,
-/obj/item/device/radio/headset/headset_medsci,
+/obj/item/radio/headset/headset_medsci,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -85236,7 +85236,7 @@
name = "medbay camera"
},
/obj/item/clipboard,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/structure/table,
/turf/open/floor/plasteel/whiteblue/corner,
/area/medical/medbay/central)
@@ -85299,7 +85299,7 @@
},
/area/crew_quarters/heads/cmo)
"dAg" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -85356,7 +85356,7 @@
/obj/structure/cable/white{
icon_state = "2-4"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -85684,7 +85684,7 @@
},
/area/medical/genetics)
"dAT" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -85930,7 +85930,7 @@
/area/medical/medbay/central)
"dBr" = (
/obj/item/folder/white,
-/obj/item/device/flashlight/pen,
+/obj/item/flashlight/pen,
/obj/item/clothing/neck/stethoscope,
/obj/structure/table,
/turf/open/floor/plasteel/vault,
@@ -86281,16 +86281,16 @@
/area/maintenance/port)
"dCa" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -32
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 6;
pixel_y = 6
},
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter{
pixel_x = -6;
pixel_y = -6
},
@@ -86389,11 +86389,11 @@
/area/crew_quarters/heads/hor)
"dCm" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -86421,8 +86421,8 @@
/obj/item/bodypart/l_arm/robot{
pixel_x = -3
},
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/structure/table/reinforced,
/obj/machinery/light_switch{
pixel_x = -38;
@@ -86431,10 +86431,10 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
@@ -86674,7 +86674,7 @@
/obj/structure/closet/crate{
icon_state = "crateopen"
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -86806,7 +86806,7 @@
amount = 23
},
/obj/item/stack/cable_coil/white,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/science/research/abandoned)
@@ -86858,19 +86858,19 @@
/turf/open/floor/plasteel/neutral,
/area/maintenance/port)
"dDn" = (
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -4;
pixel_y = 1
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 8;
pixel_y = 9
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 9;
pixel_y = -2
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_y = 2
},
/obj/structure/table/reinforced,
@@ -86883,19 +86883,19 @@
/turf/open/floor/plasteel,
/area/science/mixing)
"dDo" = (
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 5;
pixel_y = 4
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -4;
pixel_y = 2
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 6;
pixel_y = -4
},
-/obj/item/device/assembly/timer,
+/obj/item/assembly/timer,
/obj/structure/table/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/stripes/line{
@@ -86971,7 +86971,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -87294,7 +87294,7 @@
/area/medical/medbay/central)
"dEe" = (
/obj/item/twohanded/required/kirbyplants/random,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -87375,18 +87375,18 @@
},
/area/maintenance/port)
"dEq" = (
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = -5
},
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = -5
},
-/obj/item/device/transfer_valve,
-/obj/item/device/transfer_valve,
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve,
+/obj/item/transfer_valve,
+/obj/item/transfer_valve{
pixel_x = 5
},
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = 5
},
/obj/structure/table/reinforced,
@@ -87467,7 +87467,7 @@
/turf/open/floor/plasteel,
/area/science/storage)
"dEy" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -87550,9 +87550,9 @@
/obj/item/storage/firstaid,
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/bot,
-/obj/item/device/healthanalyzer,
-/obj/item/device/healthanalyzer,
-/obj/item/device/paicard,
+/obj/item/healthanalyzer,
+/obj/item/healthanalyzer,
+/obj/item/paicard,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"dEI" = (
@@ -87686,7 +87686,7 @@
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/backpack/duffelbag/med,
-/obj/item/device/flashlight/pen,
+/obj/item/flashlight/pen,
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
"dFe" = (
@@ -87805,7 +87805,7 @@
/area/crew_quarters/theatre/abandoned)
"dFs" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/guitar,
+/obj/item/instrument/guitar,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plasteel/vault{
dir = 5
@@ -87853,7 +87853,7 @@
pixel_y = 3
},
/obj/item/book/manual/detective,
-/obj/item/device/camera/detective,
+/obj/item/camera/detective,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -87872,7 +87872,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26;
pixel_y = 32
@@ -87963,18 +87963,18 @@
/turf/closed/wall,
/area/science/mixing)
"dFI" = (
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_y = 8
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -8;
pixel_y = 5
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = 6;
pixel_y = 5
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -2;
pixel_y = -2
},
@@ -88839,7 +88839,7 @@
/obj/item/screwdriver{
pixel_y = 5
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/clothing/head/welding,
/obj/machinery/light{
dir = 8
@@ -89269,7 +89269,7 @@
icon_state = "1-2"
},
/obj/effect/landmark/blobstart,
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -89524,7 +89524,7 @@
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/cell/high,
/obj/machinery/cell_charger,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -89559,9 +89559,9 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/item/device/mmi,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
/obj/structure/sign/departments/medbay/alt{
pixel_y = -32
},
@@ -89742,7 +89742,7 @@
/turf/open/floor/plasteel/cmo,
/area/crew_quarters/heads/cmo)
"dJj" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -89761,7 +89761,7 @@
/area/crew_quarters/heads/cmo)
"dJl" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/sign/nanotrasen{
pixel_x = 32
},
@@ -90102,7 +90102,7 @@
"dJW" = (
/obj/machinery/disposal/bin,
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -32
},
@@ -90326,7 +90326,7 @@
/area/crew_quarters/theatre/abandoned)
"dKs" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/airalarm{
dir = 4;
pixel_x = -23
@@ -90355,7 +90355,7 @@
/obj/structure/table/wood,
/obj/item/clothing/gloves/color/black,
/obj/item/storage/box/evidence,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
@@ -90959,7 +90959,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"dLF" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/airless,
/area/science/test_area)
@@ -91146,7 +91146,7 @@
/area/science/research)
"dMe" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -91708,7 +91708,7 @@
/turf/open/floor/plating,
/area/crew_quarters/theatre/abandoned)
"dNh" = (
-/obj/item/device/instrument/violin,
+/obj/item/instrument/violin,
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -92322,7 +92322,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -93087,7 +93087,7 @@
pixel_x = -32
},
/obj/item/paper_bin,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -93170,7 +93170,7 @@
"dQw" = (
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/carpet,
/area/library/abandoned)
"dQx" = (
@@ -93329,7 +93329,7 @@
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/aft)
"dQR" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/aft)
"dQU" = (
@@ -93580,7 +93580,7 @@
pixel_y = 32
},
/obj/structure/table/glass,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -93603,7 +93603,7 @@
dir = 8;
pixel_y = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -93885,7 +93885,7 @@
dir = 8
},
/obj/item/crowbar,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/structure/sign/poster/official/do_not_question{
pixel_y = -32
},
@@ -94550,7 +94550,7 @@
/obj/structure/table/wood,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plating,
/area/library/abandoned)
"dTv" = (
@@ -94884,7 +94884,7 @@
/area/chapel/main)
"dUq" = (
/obj/item/twohanded/required/kirbyplants/random,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -95092,7 +95092,7 @@
/obj/structure/closet/crate{
icon_state = "crateopen"
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
@@ -95205,7 +95205,7 @@
icon_state = "1-2"
},
/obj/item/clothing/gloves/color/latex,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/clothing/glasses/hud/health,
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel,
@@ -95262,7 +95262,7 @@
/area/medical/virology)
"dVz" = (
/obj/structure/closet/crate/freezer/blood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -95280,7 +95280,7 @@
},
/area/medical/virology)
"dVC" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -95369,7 +95369,7 @@
/obj/structure/table,
/obj/item/wrench,
/obj/item/crowbar,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -96351,7 +96351,7 @@
},
/obj/item/stack/packageWrap,
/obj/item/hand_labeler,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -96365,7 +96365,7 @@
"dYj" = (
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plating,
/area/library/abandoned)
"dYk" = (
@@ -96434,7 +96434,7 @@
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plasteel/dark,
/area/library/abandoned)
"dYu" = (
@@ -97325,7 +97325,7 @@
},
/area/chapel/office)
"eav" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -97460,7 +97460,7 @@
},
/area/medical/virology)
"eaR" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -97975,7 +97975,7 @@
/area/chapel/main)
"ebW" = (
/obj/structure/table/wood/fancy,
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/turf/open/floor/plasteel/grimy,
/area/chapel/main)
"ebX" = (
@@ -98105,7 +98105,7 @@
},
/obj/item/stack/cable_coil/white,
/obj/item/stack/cable_coil/white,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{
dir = 5
@@ -98313,7 +98313,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/item/tank/internals/oxygen,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/item/clothing/mask/breath,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -98530,7 +98530,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/item/tank/internals/oxygen,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/item/clothing/mask/breath,
/turf/open/floor/plating,
/area/maintenance/port/aft)
@@ -98883,11 +98883,11 @@
pixel_x = 26
},
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"edS" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -99128,8 +99128,8 @@
/area/maintenance/port/aft)
"eev" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
-/obj/item/device/radio/intercom{
+/obj/item/flashlight/lamp,
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -99169,11 +99169,11 @@
/area/chapel/office)
"eez" = (
/obj/structure/table/wood,
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
@@ -99213,7 +99213,7 @@
/area/chapel/office)
"eeD" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -99542,7 +99542,7 @@
},
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/radio,
+/obj/item/radio,
/turf/open/floor/plasteel/red/side{
dir = 8
},
@@ -99921,7 +99921,7 @@
},
/obj/item/restraints/handcuffs,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/red/side,
/area/security/checkpoint/escape)
"egq" = (
@@ -100074,7 +100074,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"ehG" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -100242,9 +100242,9 @@
/area/quartermaster/storage)
"hic" = (
/obj/structure/table/reinforced,
-/obj/item/device/integrated_electronics/analyzer,
-/obj/item/device/integrated_electronics/debugger,
-/obj/item/device/integrated_electronics/wirer,
+/obj/item/integrated_electronics/analyzer,
+/obj/item/integrated_electronics/debugger,
+/obj/item/integrated_electronics/wirer,
/turf/open/floor/plasteel/white/side{
dir = 10
},
@@ -100352,7 +100352,7 @@
pixel_y = 32;
receive_ore_updates = 1
},
-/obj/item/device/integrated_circuit_printer,
+/obj/item/integrated_circuit_printer,
/turf/open/floor/plasteel/white/side,
/area/science/circuit)
"jqM" = (
@@ -100522,7 +100522,7 @@
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/item/device/integrated_circuit_printer,
+/obj/item/integrated_circuit_printer,
/turf/open/floor/plasteel/white/side{
dir = 1
},
@@ -100556,9 +100556,9 @@
/area/science/research/abandoned)
"qhc" = (
/obj/structure/table/reinforced,
-/obj/item/device/integrated_electronics/analyzer,
-/obj/item/device/integrated_electronics/debugger,
-/obj/item/device/integrated_electronics/wirer,
+/obj/item/integrated_electronics/analyzer,
+/obj/item/integrated_electronics/debugger,
+/obj/item/integrated_electronics/wirer,
/turf/open/floor/plasteel/white/side{
dir = 9
},
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index fd874256f7..c0d2c985b3 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -287,7 +287,7 @@
/area/security/prison)
"aaT" = (
/obj/machinery/hydroponics/constructable,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
@@ -688,7 +688,7 @@
/obj/item/clothing/glasses/sunglasses/blindfold,
/obj/item/clothing/mask/muzzle,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/electropack,
+/obj/item/electropack,
/turf/open/floor/plasteel/dark,
/area/security/execution/education)
"abX" = (
@@ -1012,7 +1012,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -1181,7 +1181,7 @@
pixel_y = 26;
req_access_txt = "2"
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -3;
pixel_y = 2
},
@@ -1213,11 +1213,11 @@
/obj/item/folder/red{
pixel_x = 3
},
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = -3
},
/obj/item/storage/fancy/cigarettes,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/item/reagent_containers/spray/pepper,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -1358,7 +1358,7 @@
/area/crew_quarters/fitness/recreation)
"adm" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/reagent_dispensers/peppertank{
pixel_x = -29
},
@@ -1536,7 +1536,7 @@
/turf/open/space,
/area/space/nearstation)
"adJ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -1865,7 +1865,7 @@
"aer" = (
/obj/structure/rack,
/obj/item/gun/energy/ionrifle{
- pin = /obj/item/device/firing_pin
+ pin = /obj/item/firing_pin
},
/obj/machinery/light{
dir = 1
@@ -2383,7 +2383,7 @@
dir = 4;
pixel_x = -22
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -2661,7 +2661,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -2749,7 +2749,7 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"afZ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -2855,7 +2855,7 @@
/area/crew_quarters/heads/hos)
"agh" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
@@ -3073,7 +3073,7 @@
"agF" = (
/obj/structure/rack,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -3281,10 +3281,10 @@
/area/crew_quarters/heads/hos)
"ahb" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = -4
},
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_y = 3
},
/turf/open/floor/plasteel/dark,
@@ -3386,7 +3386,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -4748,7 +4748,7 @@
pixel_y = -2
},
/obj/item/dice/d8,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/fore)
@@ -4763,7 +4763,7 @@
/area/security/brig)
"aku" = (
/obj/structure/table,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -4779,7 +4779,7 @@
pixel_x = -4;
pixel_y = 2
},
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/turf/open/floor/plasteel/whitered/side{
dir = 1
},
@@ -4950,7 +4950,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -5239,7 +5239,7 @@
c_tag = "Holodeck";
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -6064,7 +6064,7 @@
name = "windoor"
},
/obj/item/book/manual/wiki/engineering_hacking,
-/obj/item/device/tape/random,
+/obj/item/tape/random,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/fore)
@@ -6655,7 +6655,7 @@
},
/obj/structure/rack,
/obj/item/storage/firstaid/regular,
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
pixel_y = -2
},
/obj/machinery/camera{
@@ -6784,7 +6784,7 @@
"aoC" = (
/obj/structure/table,
/obj/item/restraints/handcuffs,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel,
/area/security/main)
"aoD" = (
@@ -7294,7 +7294,7 @@
/area/maintenance/port/fore)
"apD" = (
/obj/item/storage/box/lights/mixed,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
@@ -7456,7 +7456,7 @@
"apW" = (
/obj/structure/table,
/obj/item/folder/red,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel,
/area/security/main)
"apY" = (
@@ -7549,7 +7549,7 @@
/area/crew_quarters/fitness/recreation)
"aqk" = (
/obj/machinery/vending/coffee,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -7597,7 +7597,7 @@
},
/area/maintenance/starboard)
"aqs" = (
-/obj/item/device/mmi{
+/obj/item/mmi{
name = "man-machine interface"
},
/obj/structure/rack,
@@ -7700,7 +7700,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -7861,7 +7861,7 @@
/obj/structure/closet/crate,
/obj/item/restraints/handcuffs,
/obj/item/bodybag,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 3;
name = "3maintenance loot spawner"
@@ -8623,7 +8623,7 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 29;
@@ -8819,7 +8819,7 @@
pixel_y = 7
},
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -9594,7 +9594,7 @@
/area/maintenance/starboard/fore)
"auy" = (
/obj/item/stack/sheet/cardboard,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
@@ -9841,7 +9841,7 @@
},
/area/security/brig)
"avd" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -10554,7 +10554,7 @@
/area/security/brig)
"awx" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/dark,
/area/security/brig)
"awy" = (
@@ -11026,8 +11026,8 @@
"axz" = (
/obj/structure/table,
/obj/item/folder/red,
-/obj/item/device/taperecorder,
-/obj/item/device/radio/intercom{
+/obj/item/taperecorder,
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 1;
freerange = 1;
@@ -11730,7 +11730,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -11752,11 +11752,11 @@
/area/quartermaster/miningoffice)
"azm" = (
/obj/structure/closet/crate,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
@@ -12093,7 +12093,7 @@
network = list("prison");
pixel_y = 30
},
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -12197,7 +12197,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -12348,7 +12348,7 @@
},
/area/engine/engineering)
"aAr" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -12395,7 +12395,7 @@
/area/engine/engineering)
"aAz" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -13093,7 +13093,7 @@
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"aBX" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -13339,11 +13339,11 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = 3
},
/obj/item/storage/box/evidence,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"aCt" = (
@@ -13508,7 +13508,7 @@
/area/maintenance/starboard/fore)
"aCN" = (
/obj/structure/reagent_dispensers/fueltank,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_x = -30
},
@@ -13878,7 +13878,7 @@
c_tag = "Brig - Desk";
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -13897,7 +13897,7 @@
dir = 8
},
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/camera/detective,
+/obj/item/camera/detective,
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"aDJ" = (
@@ -13917,7 +13917,7 @@
/area/security/detectives_office)
"aDL" = (
/obj/machinery/light/small,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -14502,7 +14502,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/door/poddoor/shutters/preopen{
id = "briglockdown";
name = "brig shutters"
@@ -15123,7 +15123,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -15187,7 +15187,7 @@
},
/area/hallway/primary/fore)
"aGo" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/red/corner{
dir = 2
},
@@ -16009,7 +16009,7 @@
/turf/open/floor/plating,
/area/quartermaster/storage)
"aIh" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = -28;
@@ -16245,7 +16245,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 2
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -16424,7 +16424,7 @@
/turf/open/floor/plasteel,
/area/security/courtroom)
"aIN" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -16480,7 +16480,7 @@
/area/security/courtroom)
"aIU" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -16867,7 +16867,7 @@
/area/security/courtroom)
"aJZ" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
dir = 8;
listening = 0;
@@ -16921,7 +16921,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -17042,7 +17042,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/item/reagent_containers/glass/bucket,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
@@ -17307,7 +17307,7 @@
"aLf" = (
/obj/structure/table,
/obj/item/clothing/gloves/color/fyellow,
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "AUX0"
},
/turf/open/floor/plasteel/brown{
@@ -17378,10 +17378,10 @@
/area/storage/primary)
"aLm" = (
/obj/structure/table,
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
-/obj/item/device/multitool,
-/obj/item/device/multitool{
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
+/obj/item/multitool,
+/obj/item/multitool{
pixel_x = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -17586,7 +17586,7 @@
"aLP" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/machinery/portable_atmospherics/scrubber,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -17915,7 +17915,7 @@
/area/ai_monitored/turret_protected/ai_upload)
"aMJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -18191,7 +18191,7 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 30
},
-/obj/item/device/gps,
+/obj/item/gps,
/turf/open/floor/plating,
/area/engine/engineering)
"aNq" = (
@@ -18486,11 +18486,11 @@
/area/storage/primary)
"aNY" = (
/obj/structure/table,
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -4;
pixel_y = -4
},
-/obj/item/device/assembly/igniter,
+/obj/item/assembly/igniter,
/obj/item/screwdriver{
pixel_y = 16
},
@@ -18589,7 +18589,7 @@
/turf/open/floor/plasteel/neutral/side,
/area/security/courtroom)
"aOj" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/neutral/side,
/area/security/courtroom)
"aOk" = (
@@ -18620,7 +18620,7 @@
/turf/open/floor/plasteel,
/area/security/courtroom)
"aOn" = (
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/item/cartridge/lawyer,
/obj/structure/table/wood,
/obj/machinery/button/door{
@@ -19128,7 +19128,7 @@
"aPr" = (
/obj/structure/table,
/obj/item/wirecutters,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
@@ -19365,7 +19365,7 @@
/turf/open/floor/grass,
/area/hydroponics/garden)
"aPR" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -19584,7 +19584,7 @@
pixel_x = -4;
pixel_y = 7
},
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "QM0"
},
/turf/open/floor/plasteel,
@@ -19625,13 +19625,13 @@
/area/storage/primary)
"aQy" = (
/obj/structure/table,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
},
/obj/item/clothing/gloves/color/yellow,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
/turf/open/floor/plasteel/brown{
dir = 4
},
@@ -19678,7 +19678,7 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload)
"aQC" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
name = "Private AI Channel";
@@ -19906,7 +19906,7 @@
/area/crew_quarters/locker)
"aQY" = (
/obj/structure/table,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -20157,7 +20157,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -20187,7 +20187,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -20393,7 +20393,7 @@
/obj/item/cultivator,
/obj/item/crowbar,
/obj/item/reagent_containers/glass/bucket,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -20429,7 +20429,7 @@
/obj/item/storage/bag/plants/portaseeder,
/obj/structure/table,
/obj/machinery/light,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -20566,7 +20566,7 @@
/obj/item/book/manual/wiki/engineering_construction,
/obj/item/clothing/gloves/color/yellow,
/obj/structure/table/glass,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plasteel,
/area/engine/engineering)
"aSB" = (
@@ -20874,7 +20874,7 @@
/turf/open/floor/plasteel/dark,
/area/security/courtroom)
"aTm" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -20971,7 +20971,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -21308,7 +21308,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/light{
dir = 1
},
@@ -21367,7 +21367,7 @@
"aUs" = (
/obj/structure/table,
/obj/item/crowbar,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -21416,7 +21416,7 @@
name = "AI Upload turret control";
pixel_y = 28
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
name = "Private AI Channel";
@@ -21854,7 +21854,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"aVv" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -22051,7 +22051,7 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/supply)
"aVQ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -22221,7 +22221,7 @@
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-16"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -22852,7 +22852,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -23152,8 +23152,8 @@
pixel_y = -1
},
/obj/item/clothing/gloves/color/yellow,
-/obj/item/device/t_scanner,
-/obj/item/device/multitool,
+/obj/item/t_scanner,
+/obj/item/multitool,
/turf/open/floor/plasteel/dark,
/area/storage/tech)
"aYj" = (
@@ -23201,20 +23201,20 @@
/area/storage/tech)
"aYm" = (
/obj/structure/table,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
/obj/machinery/light/small{
dir = 1
},
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/radio/intercom{
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -23224,12 +23224,12 @@
/area/storage/tech)
"aYn" = (
/obj/structure/table,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/item/aiModule/reset,
/turf/open/floor/plasteel/dark,
/area/storage/tech)
"aYo" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -23291,7 +23291,7 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"aYt" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -23830,7 +23830,7 @@
/area/crew_quarters/heads/chief)
"aZD" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/neutral/corner{
dir = 2
},
@@ -23923,7 +23923,7 @@
/area/security/checkpoint/engineering)
"aZM" = (
/obj/structure/table,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_y = 29
@@ -23958,7 +23958,7 @@
/area/library)
"aZQ" = (
/obj/effect/landmark/start/ai/secondary,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
@@ -23966,14 +23966,14 @@
pixel_x = -10;
pixel_y = 22
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
name = "Common Channel";
pixel_x = -27
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -24060,7 +24060,7 @@
/area/ai_monitored/turret_protected/ai)
"aZY" = (
/obj/effect/landmark/start/ai/secondary,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
@@ -24068,14 +24068,14 @@
pixel_x = 10;
pixel_y = 22
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
name = "Common Channel";
pixel_x = 27
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -24194,7 +24194,7 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"bal" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -24257,7 +24257,7 @@
},
/obj/item/stack/wrapping_paper,
/obj/item/stack/wrapping_paper,
-/obj/item/device/destTagger{
+/obj/item/destTagger{
pixel_x = 4;
pixel_y = 3
},
@@ -24654,7 +24654,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -24718,7 +24718,7 @@
/area/storage/tools)
"bbf" = (
/obj/structure/closet/toolcloset,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -24778,7 +24778,7 @@
c_tag = "Secure Tech Storage";
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -24973,7 +24973,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/computer/security/telescreen{
dir = 4;
name = "MiniSat Monitor";
@@ -25197,7 +25197,7 @@
/area/hallway/primary/port)
"bcb" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -25277,7 +25277,7 @@
},
/obj/item/clothing/gloves/color/fyellow,
/obj/item/clothing/suit/hazardvest,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/yellow/side{
dir = 8
@@ -25404,7 +25404,7 @@
pixel_y = 16
},
/obj/item/wirecutters,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -25599,7 +25599,7 @@
},
/area/security/checkpoint/customs)
"bcZ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 20
@@ -25892,11 +25892,11 @@
/area/maintenance/central)
"bdH" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -26058,7 +26058,7 @@
/area/storage/tech)
"bea" = (
/obj/structure/table,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
@@ -26067,8 +26067,8 @@
/area/storage/tech)
"beb" = (
/obj/structure/table,
-/obj/item/device/analyzer,
-/obj/item/device/healthanalyzer,
+/obj/item/analyzer,
+/obj/item/healthanalyzer,
/obj/machinery/camera/autoname{
dir = 1
},
@@ -26080,7 +26080,7 @@
pixel_x = 1;
pixel_y = -1
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/clothing/glasses/meson,
/obj/machinery/light_switch{
pixel_y = -28
@@ -26115,7 +26115,7 @@
/obj/structure/disposalpipe/trunk{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -26632,7 +26632,7 @@
/turf/open/floor/plating,
/area/maintenance/central)
"bfp" = (
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
@@ -27054,7 +27054,7 @@
pixel_x = 5;
pixel_y = -1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -27100,8 +27100,8 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/closet,
/obj/item/crowbar,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/radio,
+/obj/item/assembly/flash/handheld,
+/obj/item/radio,
/turf/open/floor/plasteel/red/side{
dir = 10
},
@@ -27622,10 +27622,10 @@
/obj/item/storage/photo_album{
pixel_y = -4
},
-/obj/item/device/camera{
+/obj/item/camera{
pixel_y = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Station Intercom (Captain)";
@@ -27962,7 +27962,7 @@
},
/area/engine/break_room)
"bia" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -28227,7 +28227,7 @@
/area/quartermaster/sorting)
"biJ" = (
/obj/structure/table,
-/obj/item/device/destTagger{
+/obj/item/destTagger{
pixel_x = 4;
pixel_y = 3
},
@@ -28243,7 +28243,7 @@
/obj/item/clipboard,
/obj/item/folder/yellow,
/obj/item/folder/yellow,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/pen/red,
/turf/open/floor/plasteel/brown{
dir = 8
@@ -28325,7 +28325,7 @@
dir = 1
},
/obj/machinery/light/small,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -28
@@ -28433,7 +28433,7 @@
/area/crew_quarters/heads/captain/private)
"bjh" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -28860,7 +28860,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -28959,7 +28959,7 @@
/area/quartermaster/sorting)
"bkk" = (
/obj/structure/filingcabinet/filingcabinet,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -29079,7 +29079,7 @@
/obj/machinery/newscaster{
pixel_x = 28
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -29152,8 +29152,8 @@
/area/hallway/primary/port)
"bkw" = (
/obj/structure/table,
-/obj/item/device/toner,
-/obj/item/device/radio/intercom{
+/obj/item/toner,
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -29203,7 +29203,7 @@
},
/area/bridge)
"bkD" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 29
@@ -29227,7 +29227,7 @@
},
/area/bridge)
"bkF" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -29420,7 +29420,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -29719,7 +29719,7 @@
pixel_x = -26;
pixel_y = 3
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -29982,7 +29982,7 @@
},
/area/hallway/primary/central)
"bmo" = (
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -30029,7 +30029,7 @@
/turf/open/floor/plating,
/area/maintenance/central)
"bmt" = (
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -30388,7 +30388,7 @@
/area/engine/break_room)
"bnd" = (
/obj/structure/table/glass,
-/obj/item/device/lightreplacer{
+/obj/item/lightreplacer{
pixel_y = 7
},
/obj/item/storage/belt/utility,
@@ -30427,7 +30427,7 @@
pixel_x = -3;
pixel_y = 5
},
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = -4
},
/turf/open/floor/plasteel,
@@ -30758,7 +30758,7 @@
/area/hallway/secondary/entry)
"bnN" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -30905,7 +30905,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -31000,7 +31000,7 @@
icon_state = "4-8"
},
/obj/structure/table/wood,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"bon" = (
@@ -31160,7 +31160,7 @@
/obj/machinery/computer/communications{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Station Intercom (Captain)";
@@ -31183,7 +31183,7 @@
/area/crew_quarters/heads/captain/private)
"boJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -31659,7 +31659,7 @@
icon_state = "4-8"
},
/obj/machinery/holopad,
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/foyer)
"bpL" = (
@@ -32134,7 +32134,7 @@
/obj/machinery/vending/cart{
req_access_txt = "57"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -32187,8 +32187,8 @@
/area/bridge)
"bqK" = (
/obj/structure/rack,
-/obj/item/device/aicard,
-/obj/item/device/radio/off,
+/obj/item/aicard,
+/obj/item/radio/off,
/obj/machinery/computer/security/telescreen{
dir = 1;
name = "MiniSat Monitor";
@@ -32234,16 +32234,16 @@
/turf/open/floor/plasteel/dark,
/area/bridge)
"bqP" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -29
},
/obj/structure/rack,
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/timer,
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
+/obj/item/assembly/timer,
/turf/open/floor/plasteel/darkblue/side{
dir = 1
},
@@ -32257,7 +32257,7 @@
pixel_y = -3
},
/obj/item/wrench,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/machinery/newscaster{
pixel_y = -30
},
@@ -32454,7 +32454,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -32549,7 +32549,7 @@
},
/area/maintenance/starboard)
"brs" = (
-/obj/item/device/assembly/prox_sensor,
+/obj/item/assembly/prox_sensor,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -32899,7 +32899,7 @@
/area/aisat)
"brW" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -33032,7 +33032,7 @@
/area/ai_monitored/storage/satellite)
"bsh" = (
/obj/structure/table,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -33060,7 +33060,7 @@
pixel_y = 3
},
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/storage/satellite)
"bsj" = (
@@ -33085,7 +33085,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bsm" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
@@ -33166,7 +33166,7 @@
},
/area/hallway/primary/port)
"bsw" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -33527,7 +33527,7 @@
/obj/structure/table/wood,
/obj/item/hand_tele,
/obj/structure/window/reinforced,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = 27
@@ -33607,12 +33607,12 @@
/area/storage/art)
"btm" = (
/obj/structure/table,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/plasteel,
/area/storage/art)
"btn" = (
/obj/structure/table,
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 28
@@ -33756,7 +33756,7 @@
/turf/open/floor/plasteel,
/area/engine/break_room)
"btE" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -34192,7 +34192,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -26
@@ -34411,7 +34411,7 @@
},
/area/maintenance/starboard)
"bvf" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
@@ -34419,14 +34419,14 @@
pixel_x = -27;
pixel_y = -7
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = -27
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -34521,7 +34521,7 @@
/obj/structure/table/glass,
/obj/item/wrench,
/obj/item/crowbar,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
@@ -34580,7 +34580,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_y = 4
},
/obj/item/screwdriver{
@@ -34628,14 +34628,14 @@
/obj/machinery/ai_status_display{
pixel_y = 31
},
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/grimy,
/area/tcommsat/computer)
"bvA" = (
/obj/machinery/light/small{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Station Intercom (Telecomms)";
@@ -34859,7 +34859,7 @@
pixel_x = -32
},
/obj/effect/decal/cleanable/cobweb,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -34885,7 +34885,7 @@
/area/library)
"bwf" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -35024,7 +35024,7 @@
/area/bridge)
"bws" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -35035,7 +35035,7 @@
/obj/item/book/manual/wiki/security_space_law{
pixel_y = 3
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 28
@@ -35323,7 +35323,7 @@
/turf/open/floor/wood,
/area/crew_quarters/bar)
"bwU" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -35632,7 +35632,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -35875,7 +35875,7 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -26
@@ -36180,7 +36180,7 @@
/area/ai_monitored/storage/satellite)
"byP" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/caution{
dir = 8
},
@@ -36191,7 +36191,7 @@
},
/area/hallway/primary/starboard)
"byR" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -36654,7 +36654,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bzM" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -36674,7 +36674,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bzO" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -36829,7 +36829,7 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain/private)
"bAf" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -26
@@ -37265,7 +37265,7 @@
/area/security/vacantoffice)
"bBi" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/wood,
/area/security/vacantoffice)
"bBj" = (
@@ -37276,10 +37276,10 @@
/area/maintenance/starboard)
"bBk" = (
/obj/structure/table/wood,
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_y = 9
},
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = -3;
pixel_y = 5
},
@@ -37329,7 +37329,7 @@
/area/crew_quarters/toilet/auxiliary)
"bBq" = (
/obj/structure/rack,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port)
@@ -37795,9 +37795,9 @@
"bCn" = (
/obj/structure/table,
/obj/item/storage/belt/utility,
-/obj/item/device/t_scanner,
-/obj/item/device/t_scanner,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
+/obj/item/t_scanner,
+/obj/item/t_scanner,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -38136,7 +38136,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -38258,7 +38258,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -39720,7 +39720,7 @@
/turf/open/floor/wood,
/area/library)
"bGv" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)"
},
@@ -40348,7 +40348,7 @@
/area/library)
"bHT" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -40430,7 +40430,7 @@
"bIe" = (
/obj/structure/table,
/obj/item/hand_tele,
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/airalarm{
dir = 4;
pixel_x = -23
@@ -40579,7 +40579,7 @@
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/rods/fifty,
/obj/item/storage/toolbox/emergency,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/machinery/power/apc/highcap/five_k{
dir = 4;
name = "Gateway APC";
@@ -40633,7 +40633,7 @@
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
"bIu" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -41016,7 +41016,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -41113,11 +41113,11 @@
/obj/structure/table,
/obj/item/storage/belt/utility,
/obj/item/storage/belt/utility,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
-/obj/item/device/multitool,
+/obj/item/radio/off,
+/obj/item/radio/off,
+/obj/item/radio/off,
+/obj/item/radio/off,
+/obj/item/multitool,
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"bJG" = (
@@ -41185,7 +41185,7 @@
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/storage/toolbox/emergency,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/structure/window/reinforced,
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -41235,7 +41235,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/neutral/side{
dir = 2
},
@@ -41547,7 +41547,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bKy" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
@@ -42262,7 +42262,7 @@
/area/engine/atmos)
"bMe" = (
/obj/structure/reagent_dispensers/fueltank,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -42421,7 +42421,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -42586,8 +42586,8 @@
dir = 1
},
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
-/obj/item/device/tape,
+/obj/item/taperecorder,
+/obj/item/tape,
/turf/open/floor/wood,
/area/library)
"bMN" = (
@@ -42760,7 +42760,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -42870,7 +42870,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = 29
@@ -42918,7 +42918,7 @@
/area/maintenance/central)
"bNt" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -43980,7 +43980,7 @@
/area/library)
"bPT" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/wood,
/area/library)
"bPU" = (
@@ -44536,9 +44536,9 @@
/turf/open/floor/engine/cult,
/area/library)
"bRm" = (
-/obj/item/device/taperecorder,
-/obj/item/device/camera,
-/obj/item/device/radio/intercom{
+/obj/item/taperecorder,
+/obj/item/camera,
+/obj/item/radio/intercom{
pixel_y = -25
},
/obj/structure/table/wood,
@@ -44552,7 +44552,7 @@
/area/library)
"bRo" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -44811,9 +44811,9 @@
/area/gateway)
"bRK" = (
/obj/item/storage/belt/utility,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
+/obj/item/radio/off,
+/obj/item/radio/off,
/obj/structure/rack,
/obj/machinery/button/door{
id = "gateshutter";
@@ -44985,7 +44985,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -45272,7 +45272,7 @@
"bSC" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -45809,7 +45809,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -45936,7 +45936,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -46245,7 +46245,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bUC" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -46850,7 +46850,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -47643,7 +47643,7 @@
/area/maintenance/port)
"bXy" = (
/obj/structure/closet,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bXz" = (
@@ -47658,7 +47658,7 @@
/area/maintenance/port/aft)
"bXA" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bXB" = (
@@ -47701,7 +47701,7 @@
"bXH" = (
/obj/structure/closet/crate,
/obj/item/coin/silver,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port)
@@ -47979,9 +47979,9 @@
/obj/structure/rack,
/obj/item/tank/internals/oxygen,
/obj/item/tank/internals/oxygen,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
-/obj/item/device/radio/intercom{
+/obj/item/radio/off,
+/obj/item/radio/off,
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = 27
@@ -48243,7 +48243,7 @@
},
/area/medical/storage)
"bYV" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -48332,7 +48332,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel/red/side{
dir = 5
},
@@ -48487,7 +48487,7 @@
"bZs" = (
/obj/item/cultivator,
/obj/item/crowbar,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/item/reagent_containers/glass/bucket,
/obj/structure/table/glass,
/turf/open/floor/plasteel/hydrofloor,
@@ -48581,7 +48581,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 5
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -48969,14 +48969,14 @@
"caz" = (
/obj/structure/table,
/obj/item/stack/cable_coil,
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -4;
pixel_y = -4
},
/obj/item/screwdriver{
pixel_y = 16
},
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "RD0"
},
/turf/open/floor/plasteel/whitepurple/side{
@@ -48987,7 +48987,7 @@
/obj/structure/table,
/obj/item/stack/sheet/glass,
/obj/item/electronics/airlock,
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -4;
pixel_y = 2
},
@@ -49557,7 +49557,7 @@
"cbz" = (
/obj/structure/rack,
/obj/item/stack/sheet/cardboard,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/structure/light_construct{
dir = 1
},
@@ -49741,7 +49741,7 @@
network = list("medbay");
pixel_y = -29
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27;
@@ -49895,7 +49895,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
},
@@ -49935,7 +49935,7 @@
pixel_y = 12
},
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -49956,7 +49956,7 @@
c_tag = "Hydroponics - Foyer";
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = -25
},
/turf/open/floor/plasteel/vault,
@@ -49989,7 +49989,7 @@
/area/hydroponics)
"ccu" = (
/obj/machinery/hydroponics/constructable,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -50722,7 +50722,7 @@
},
/area/maintenance/starboard)
"cdW" = (
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/machinery/light/small{
dir = 4
},
@@ -50898,7 +50898,7 @@
pixel_y = -3
},
/obj/item/wrench,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/aft)
@@ -51054,7 +51054,7 @@
/area/medical/medbay/central)
"ceF" = (
/obj/structure/bed/roller,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -51162,7 +51162,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -51219,7 +51219,7 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/science/research)
"ceX" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -52320,7 +52320,7 @@
/obj/item/crowbar,
/obj/item/wrench,
/obj/item/clothing/mask/gas,
-/obj/item/device/multitool{
+/obj/item/multitool{
pixel_x = 3
},
/obj/effect/turf_decal/stripes/line{
@@ -52413,7 +52413,7 @@
pixel_y = 32
},
/obj/structure/table/glass,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel/cafeteria{
dir = 5
},
@@ -52462,7 +52462,7 @@
/turf/open/floor/plasteel/dark,
/area/aisat)
"chA" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/turf/open/floor/engine,
@@ -52505,7 +52505,7 @@
/area/maintenance/starboard)
"chF" = (
/obj/structure/closet,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -52515,7 +52515,7 @@
"chG" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/item/storage/toolbox/emergency,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -53097,7 +53097,7 @@
/turf/open/floor/engine,
/area/science/explab)
"ciT" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
@@ -53358,7 +53358,7 @@
/area/medical/surgery)
"cjE" = (
/obj/structure/bed/roller,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -53539,35 +53539,35 @@
},
/area/medical/chemistry)
"cjW" = (
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 3;
pixel_y = -7
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 3;
pixel_y = -7
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 3;
pixel_y = -7
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 3;
pixel_y = -7
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -3;
pixel_y = 3
},
@@ -53702,7 +53702,7 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
@@ -53748,7 +53748,7 @@
/area/science/research)
"ckq" = (
/obj/machinery/vending/coffee,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -53787,7 +53787,7 @@
"ckv" = (
/obj/structure/closet/crate,
/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/item/device/assembly/infra,
+/obj/item/assembly/infra,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
@@ -54119,7 +54119,7 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"clm" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -54225,7 +54225,7 @@
pixel_x = -2;
pixel_y = 6
},
-/obj/item/device/radio/headset/headset_med,
+/obj/item/radio/headset/headset_med,
/obj/structure/extinguisher_cabinet{
pixel_x = 24
},
@@ -54339,7 +54339,7 @@
/obj/machinery/shower{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_y = -28
@@ -54750,7 +54750,7 @@
},
/area/hallway/primary/aft)
"cmF" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -54894,7 +54894,7 @@
/obj/item/stack/packageWrap,
/obj/item/stack/packageWrap,
/obj/item/stack/packageWrap,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/stripes/line{
dir = 2
@@ -54941,7 +54941,7 @@
pixel_y = 6
},
/obj/item/stack/medical/ointment,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/effect/turf_decal/stripes/line{
dir = 2
},
@@ -55033,7 +55033,7 @@
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"cnh" = (
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/maintenance/port/aft)
@@ -55121,7 +55121,7 @@
/area/medical/surgery)
"cnt" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -55311,7 +55311,7 @@
pixel_y = 4
},
/obj/item/clothing/glasses/science,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -55554,7 +55554,7 @@
},
/area/science/research)
"cog" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -55640,7 +55640,7 @@
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/item/clothing/glasses/science,
-/obj/item/device/multitool{
+/obj/item/multitool{
pixel_x = 3
},
/turf/open/floor/plasteel/white,
@@ -57016,7 +57016,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -57227,7 +57227,7 @@
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -57363,7 +57363,7 @@
/area/maintenance/aft)
"crF" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -57660,7 +57660,7 @@
},
/area/medical/surgery)
"csn" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -57859,7 +57859,7 @@
network = list("medbay");
pixel_x = 29
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 1;
name = "Station Intercom (General)";
pixel_y = -29
@@ -58640,7 +58640,7 @@
/obj/structure/closet,
/obj/item/extinguisher,
/obj/effect/decal/cleanable/cobweb,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/aft)
@@ -58658,7 +58658,7 @@
/obj/structure/closet/crate,
/obj/item/stack/cable_coil,
/obj/item/grenade/chem_grenade,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 2;
name = "2maintenance loot spawner"
@@ -58781,7 +58781,7 @@
pixel_y = 3
},
/obj/item/storage/box/bodybags,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -58811,12 +58811,12 @@
dir = 1
},
/obj/item/storage/box/monkeycubes,
-/obj/item/device/radio/headset/headset_medsci,
-/obj/item/device/flashlight/pen{
+/obj/item/radio/headset/headset_medsci,
+/obj/item/flashlight/pen{
pixel_x = 4;
pixel_y = 3
},
-/obj/item/device/flashlight/pen{
+/obj/item/flashlight/pen{
pixel_x = 4;
pixel_y = 3
},
@@ -59020,7 +59020,7 @@
/area/crew_quarters/heads/hor)
"cuP" = (
/obj/structure/table,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/item/circuitboard/aicore{
pixel_x = -2;
pixel_y = 4
@@ -59036,10 +59036,10 @@
/area/crew_quarters/heads/hor)
"cuR" = (
/obj/structure/table,
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = -3
},
-/obj/item/device/paicard{
+/obj/item/paicard{
pixel_x = 4
},
/obj/item/storage/secure/briefcase,
@@ -59174,7 +59174,7 @@
/obj/structure/closet/crate,
/obj/item/crowbar/red,
/obj/item/pen,
-/obj/item/device/flashlight/pen{
+/obj/item/flashlight/pen{
pixel_x = 4;
pixel_y = 3
},
@@ -59276,7 +59276,7 @@
/obj/machinery/clonepod{
pixel_y = 2
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -59558,7 +59558,7 @@
/area/science/storage)
"cvY" = (
/obj/machinery/portable_atmospherics/canister/toxins,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -59649,7 +59649,7 @@
"cwn" = (
/obj/structure/rack,
/obj/item/clothing/glasses/sunglasses,
-/obj/item/device/flashlight/pen,
+/obj/item/flashlight/pen,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/aft)
@@ -59822,7 +59822,7 @@
pixel_x = 2;
pixel_y = 2
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -59888,7 +59888,7 @@
/area/science/robotics/mechbay)
"cwJ" = (
/obj/machinery/computer/mech_bay_power_console,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -60027,7 +60027,7 @@
dir = 8;
pixel_x = 24
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -60377,7 +60377,7 @@
/turf/open/floor/plating,
/area/science/misc_lab/range)
"cxJ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -60756,7 +60756,7 @@
/turf/open/floor/plasteel,
/area/science/mixing)
"cyC" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
@@ -61028,7 +61028,7 @@
/area/medical/genetics)
"czf" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -61924,7 +61924,7 @@
/area/science/test_area)
"cAS" = (
/obj/structure/chair/stool,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -61996,7 +61996,7 @@
"cBa" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -62059,7 +62059,7 @@
/area/science/robotics/mechbay)
"cBj" = (
/obj/structure/table,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -62167,19 +62167,19 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"cBt" = (
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -4;
pixel_y = 1
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 8;
pixel_y = 9
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 9;
pixel_y = -2
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_y = 2
},
/obj/structure/table/reinforced,
@@ -62362,7 +62362,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"cBO" = (
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -62533,7 +62533,7 @@
/area/hallway/primary/aft)
"cCm" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -62587,18 +62587,18 @@
/turf/open/floor/plasteel,
/area/science/mixing)
"cCu" = (
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_y = 8
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -8;
pixel_y = 5
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = 6;
pixel_y = 5
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -2;
pixel_y = -2
},
@@ -62609,18 +62609,18 @@
/turf/open/floor/plasteel,
/area/science/mixing)
"cCv" = (
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = -5
},
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = -5
},
-/obj/item/device/transfer_valve,
-/obj/item/device/transfer_valve,
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve,
+/obj/item/transfer_valve,
+/obj/item/transfer_valve{
pixel_x = 5
},
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = 5
},
/obj/machinery/requests_console{
@@ -62635,19 +62635,19 @@
/turf/open/floor/plasteel,
/area/science/mixing)
"cCw" = (
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 5;
pixel_y = 4
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -4;
pixel_y = 2
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 6;
pixel_y = -4
},
-/obj/item/device/assembly/timer,
+/obj/item/assembly/timer,
/obj/structure/table/reinforced,
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -62656,7 +62656,7 @@
/area/science/mixing)
"cCx" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -62710,19 +62710,19 @@
/area/science/mixing)
"cCC" = (
/obj/structure/table,
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 5;
pixel_y = -4
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 2;
pixel_y = 6
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 2;
pixel_y = -1
},
@@ -62921,7 +62921,7 @@
/obj/structure/table,
/obj/item/storage/box/bodybags,
/obj/item/pen,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -62968,7 +62968,7 @@
/obj/machinery/mecha_part_fabricator{
dir = 2
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -63021,11 +63021,11 @@
pixel_x = -2;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -63093,7 +63093,7 @@
/obj/structure/table,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/science,
-/obj/item/device/multitool{
+/obj/item/multitool{
pixel_x = 3
},
/obj/effect/turf_decal/stripes/corner{
@@ -63148,7 +63148,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"cDx" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plating/airless,
/area/science/test_area)
"cDy" = (
@@ -63269,7 +63269,7 @@
/area/medical/virology)
"cDJ" = (
/obj/item/clothing/gloves/color/latex,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/clothing/glasses/hud/health,
/obj/structure/reagent_dispensers/virusfood{
pixel_y = 30
@@ -63629,13 +63629,13 @@
/obj/item/stack/sheet/plasteel{
amount = 10
},
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/ai_status_display{
pixel_x = 32
},
@@ -63927,7 +63927,7 @@
},
/area/medical/medbay/aft)
"cES" = (
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
pixel_x = 1;
pixel_y = 4
},
@@ -64063,7 +64063,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/multitool{
+/obj/item/multitool{
pixel_x = 3
},
/obj/item/stack/cable_coil,
@@ -64155,11 +64155,11 @@
/area/science/mixing)
"cFu" = (
/obj/structure/closet,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 2;
pixel_y = -2
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -2;
pixel_y = 5
},
@@ -64175,7 +64175,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"cFw" = (
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/effect/turf_decal/stripes/line{
dir = 2
},
@@ -64191,12 +64191,12 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"cFy" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = -28
},
/obj/structure/table/glass,
/obj/item/hand_labeler,
-/obj/item/device/radio/headset/headset_med,
+/obj/item/radio/headset/headset_med,
/obj/machinery/airalarm{
pixel_y = 23
},
@@ -64308,7 +64308,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = 28
},
/turf/open/floor/plasteel/whitegreen/side{
@@ -64389,7 +64389,7 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -64969,7 +64969,7 @@
dir = 1
},
/obj/item/storage/backpack/duffelbag/med,
-/obj/item/device/flashlight/pen{
+/obj/item/flashlight/pen{
pixel_x = 4;
pixel_y = 3
},
@@ -64979,7 +64979,7 @@
/obj/structure/table,
/obj/item/retractor,
/obj/item/hemostat,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/clothing/glasses/eyepatch,
/obj/item/reagent_containers/food/drinks/bottle/vodka{
pixel_x = 3;
@@ -65056,19 +65056,19 @@
empty = 1;
name = "First-Aid (empty)"
},
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
pixel_x = 4;
pixel_y = -4
},
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
pixel_x = 4;
pixel_y = -4
},
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
pixel_x = 4;
pixel_y = -4
},
-/obj/item/device/radio/headset/headset_sci{
+/obj/item/radio/headset/headset_sci{
pixel_x = -3
},
/obj/effect/turf_decal/delivery,
@@ -65285,7 +65285,7 @@
/area/medical/virology)
"cHw" = (
/obj/structure/closet/emcloset,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = -28
},
/obj/effect/turf_decal/stripes/line{
@@ -65670,7 +65670,7 @@
"cIh" = (
/obj/structure/closet,
/obj/item/storage/box/lights/mixed,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
@@ -66000,7 +66000,7 @@
pixel_y = 5
},
/obj/item/clothing/glasses/welding,
-/obj/item/device/multitool{
+/obj/item/multitool{
pixel_x = 3
},
/obj/effect/turf_decal/delivery,
@@ -66029,7 +66029,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -66382,7 +66382,7 @@
/obj/structure/table,
/obj/item/retractor,
/obj/item/hemostat,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -66403,9 +66403,9 @@
/area/science/robotics/lab)
"cJK" = (
/obj/structure/table,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
/obj/structure/window/reinforced{
dir = 4
},
@@ -66448,11 +66448,11 @@
maxcharge = 15000
},
/obj/item/crowbar,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -66495,7 +66495,7 @@
/turf/open/floor/plasteel/dark,
/area/science/server)
"cJS" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -66676,7 +66676,7 @@
},
/area/medical/virology)
"cKm" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -66823,7 +66823,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/obj/effect/turf_decal/stripes/line{
@@ -67504,7 +67504,7 @@
/turf/open/floor/engine,
/area/science/explab)
"cLV" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 25
},
/obj/machinery/firealarm{
@@ -67572,7 +67572,7 @@
pixel_x = 4
},
/obj/item/organ/heart,
-/obj/item/device/soulstone/anybody/chaplain,
+/obj/item/soulstone/anybody/chaplain,
/turf/open/floor/plasteel/cult{
dir = 2
},
@@ -67817,7 +67817,7 @@
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"cME" = (
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/newscaster{
pixel_x = -30
},
@@ -68111,7 +68111,7 @@
/area/maintenance/port/aft)
"cNg" = (
/obj/structure/rack,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/light/small,
/turf/open/floor/plating,
@@ -68155,7 +68155,7 @@
"cNk" = (
/obj/item/storage/bag/plants/portaseeder,
/obj/item/storage/bag/plants/portaseeder,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/item/cultivator,
/obj/item/reagent_containers/glass/bucket,
/obj/structure/rack,
@@ -68195,7 +68195,7 @@
/obj/machinery/hydroponics/soil{
pixel_y = 8
},
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
@@ -68254,7 +68254,7 @@
c_tag = "Chapel Office - Backroom";
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -68296,7 +68296,7 @@
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
"cNz" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1480;
name = "Confessional Intercom";
@@ -68463,7 +68463,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/requests_console{
department = "Security";
departmentType = 5;
@@ -68760,10 +68760,10 @@
pixel_x = -4;
pixel_y = 4
},
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -68855,7 +68855,7 @@
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"cOL" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1480;
name = "Confessional Intercom";
@@ -69148,7 +69148,7 @@
/area/maintenance/starboard/aft)
"cPz" = (
/obj/structure/closet,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 3;
name = "3maintenance loot spawner"
@@ -69340,7 +69340,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -69369,7 +69369,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -69444,7 +69444,7 @@
/turf/open/floor/plasteel/dark,
/area/chapel/main)
"cQc" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -69634,7 +69634,7 @@
/obj/machinery/doppler_array/research/science{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -69771,7 +69771,7 @@
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cQS" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -69790,7 +69790,7 @@
/turf/open/floor/plating,
/area/chapel/main)
"cQV" = (
-/obj/item/device/flashlight/lantern{
+/obj/item/flashlight/lantern{
pixel_y = 7
},
/obj/structure/table/wood,
@@ -69925,7 +69925,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/item/device/gps,
+/obj/item/gps,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
@@ -71082,14 +71082,14 @@
/area/science/xenobiology)
"cVb" = (
/obj/structure/table/wood,
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = -3;
pixel_y = 5
},
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_y = 9
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -71100,7 +71100,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 1;
frequency = 1459;
name = "Station Intercom (General)";
@@ -71340,7 +71340,7 @@
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cZc" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -71449,7 +71449,7 @@
/obj/item/stack/sheet/metal{
amount = 10
},
-/obj/item/device/electropack,
+/obj/item/electropack,
/turf/open/floor/engine,
/area/science/xenobiology)
"daF" = (
@@ -71466,7 +71466,7 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"daH" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/engine,
/area/science/xenobiology)
"daI" = (
@@ -71475,7 +71475,7 @@
pixel_y = 5
},
/obj/item/stack/cable_coil,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/stock_parts/cell/high{
charge = 100;
maxcharge = 15000
@@ -71500,26 +71500,26 @@
/area/science/xenobiology)
"daM" = (
/obj/structure/table,
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 5;
pixel_y = -4
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 2;
pixel_y = 6
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = 2;
pixel_y = -1
},
/turf/open/floor/engine,
/area/science/xenobiology)
"daN" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = -25
},
/turf/open/floor/engine,
@@ -72030,7 +72030,7 @@
/obj/machinery/shower{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -72350,7 +72350,7 @@
/area/science/xenobiology)
"dcM" = (
/obj/machinery/chem_master,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -72618,7 +72618,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/general/visible,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -73398,7 +73398,7 @@
/area/maintenance/port/fore)
"dhL" = (
/obj/structure/table,
-/obj/item/device/analyzer,
+/obj/item/analyzer,
/obj/machinery/power/apc{
dir = 2;
name = "Tool Storage APC";
@@ -73415,7 +73415,7 @@
},
/area/storage/primary)
"dhM" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -73557,7 +73557,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/item/device/instrument/guitar,
+/obj/item/instrument/guitar,
/obj/structure/sign/poster/random{
pixel_x = 32
},
@@ -73622,9 +73622,9 @@
/turf/open/floor/carpet,
/area/crew_quarters/theatre)
"dij" = (
-/obj/item/device/instrument/violin,
+/obj/item/instrument/violin,
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -73692,7 +73692,7 @@
/obj/item/poster/random_official,
/obj/item/poster/random_official,
/obj/item/poster/random_official,
-/obj/item/device/paicard{
+/obj/item/paicard{
desc = "A real Nanotrasen success, these personal AIs provide all of the companionship of an AI without any law related red-tape.";
name = "Nanotrasen-brand personal AI device exhibit"
},
@@ -73924,7 +73924,7 @@
},
/obj/item/reagent_containers/food/drinks/ale,
/obj/structure/table/wood,
-/obj/item/device/instrument/eguitar,
+/obj/item/instrument/eguitar,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -75459,7 +75459,7 @@
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
-/obj/item/device/assault_pod/mining,
+/obj/item/assault_pod/mining,
/turf/open/floor/plasteel/yellow/side{
dir = 1
},
@@ -75647,7 +75647,7 @@
/turf/open/floor/plating/airless,
/area/engine/engineering)
"gnZ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = -30
},
/turf/open/floor/plasteel/white,
@@ -75695,8 +75695,8 @@
/area/maintenance/aft)
"gRS" = (
/obj/structure/table/reinforced,
-/obj/item/device/integrated_electronics/analyzer,
-/obj/item/device/integrated_circuit_printer,
+/obj/item/integrated_electronics/analyzer,
+/obj/item/integrated_circuit_printer,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"gXY" = (
@@ -75943,7 +75943,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"kOt" = (
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/screwdriver,
/obj/structure/table/reinforced,
/obj/structure/cable/yellow{
@@ -76000,7 +76000,7 @@
/area/engine/engineering)
"llb" = (
/obj/structure/table/reinforced,
-/obj/item/device/integrated_circuit_printer,
+/obj/item/integrated_circuit_printer,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"lsv" = (
@@ -76014,7 +76014,7 @@
icon_state = "0-8"
},
/obj/structure/table/reinforced,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"lwo" = (
@@ -76208,9 +76208,9 @@
/turf/open/floor/plasteel/white,
/area/science/circuit)
"ohj" = (
-/obj/item/device/integrated_electronics/analyzer,
-/obj/item/device/integrated_electronics/debugger,
-/obj/item/device/integrated_electronics/wirer,
+/obj/item/integrated_electronics/analyzer,
+/obj/item/integrated_electronics/debugger,
+/obj/item/integrated_electronics/wirer,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/white,
/area/science/circuit)
@@ -76246,7 +76246,7 @@
pixel_y = 30;
receive_ore_updates = 1
},
-/obj/item/device/integrated_electronics/debugger,
+/obj/item/integrated_electronics/debugger,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"oRL" = (
@@ -76386,7 +76386,7 @@
/area/engine/engineering)
"qBh" = (
/obj/structure/table,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel/whitepurple/side{
dir = 2
},
@@ -76753,7 +76753,7 @@
/turf/open/floor/plating,
/area/engine/engineering)
"xkG" = (
-/obj/item/device/integrated_electronics/wirer,
+/obj/item/integrated_electronics/wirer,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/white,
/area/science/circuit)
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 18aa7d0f98..62f8080c28 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -106,18 +106,18 @@
/obj/structure/rack,
/obj/item/storage/bag/ore,
/obj/item/pickaxe,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/item/clothing/glasses/meson,
-/obj/item/device/mining_scanner,
+/obj/item/mining_scanner,
/turf/open/floor/plasteel,
/area/mine/laborcamp)
"av" = (
/obj/structure/rack,
/obj/item/storage/bag/ore,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/item/pickaxe,
/obj/item/clothing/glasses/meson,
-/obj/item/device/mining_scanner,
+/obj/item/mining_scanner,
/turf/open/floor/plasteel,
/area/mine/laborcamp)
"aw" = (
@@ -164,7 +164,7 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"aE" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -384,10 +384,10 @@
"bn" = (
/obj/structure/table,
/obj/item/pickaxe,
-/obj/item/device/gps/mining,
-/obj/item/device/gps/mining,
-/obj/item/device/gps/mining,
-/obj/item/device/gps/mining,
+/obj/item/gps/mining,
+/obj/item/gps/mining,
+/obj/item/gps/mining,
+/obj/item/gps/mining,
/turf/open/floor/plasteel/purple/side{
dir = 9
},
@@ -583,7 +583,7 @@
/turf/open/floor/plating,
/area/mine/production)
"bO" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/purple/corner{
dir = 8
},
@@ -926,7 +926,7 @@
/turf/closed/wall,
/area/mine/living_quarters)
"cO" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -1325,7 +1325,7 @@
dir = 8;
network = list("mine")
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = 28
@@ -1937,7 +1937,7 @@
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"fq" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = 28
@@ -2062,7 +2062,7 @@
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"fI" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index 0a6961f445..d77172737b 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -138,7 +138,7 @@
"aas" = (
/obj/item/storage/toolbox/mechanical,
/obj/item/wrench,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/structure/cable/white{
icon_state = "1-2"
},
@@ -262,7 +262,7 @@
"aaE" = (
/obj/item/folder/red,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/structure/cable/white{
icon_state = "1-2"
},
@@ -347,8 +347,8 @@
/obj/structure/table/reinforced,
/obj/machinery/recharger,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/radio/intercom{
+/obj/item/assembly/flash/handheld,
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -28
},
@@ -439,9 +439,9 @@
/area/bridge)
"aaU" = (
/obj/structure/table/reinforced,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/item/storage/secure/briefcase,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
@@ -526,7 +526,7 @@
/obj/machinery/chem_dispenser/drinks{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28;
pixel_y = 24
@@ -1117,7 +1117,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/carpet,
/area/bridge)
"ack" = (
@@ -1161,7 +1161,7 @@
/area/bridge)
"aco" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/newscaster{
pixel_x = -32
},
@@ -1868,7 +1868,7 @@
/area/crew_quarters/heads/captain/private)
"adN" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
@@ -1960,7 +1960,7 @@
/turf/closed/wall,
/area/crew_quarters/heads/hop)
"adZ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -28
},
@@ -2367,7 +2367,7 @@
pixel_x = 24;
pixel_y = 38
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28;
pixel_y = 24
@@ -2435,7 +2435,7 @@
/area/asteroid/nearstation)
"afd" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/item/restraints/handcuffs,
/turf/open/floor/plasteel/vault/side{
dir = 4
@@ -2535,7 +2535,7 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/captain/private)
"afo" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Captain's Intercom";
@@ -2844,8 +2844,8 @@
"afP" = (
/obj/structure/table/wood,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/camera/detective,
-/obj/item/device/radio/intercom{
+/obj/item/camera/detective,
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -2956,7 +2956,7 @@
/area/crew_quarters/heads/captain/private)
"aga" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/obj/item/toy/figure/captain,
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain/private)
@@ -3451,7 +3451,7 @@
"agX" = (
/obj/structure/table/reinforced,
/obj/item/aiModule/reset,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -3523,7 +3523,7 @@
"ahd" = (
/obj/structure/table/reinforced,
/obj/item/aiModule/supplied/quarantine,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -3838,7 +3838,7 @@
/area/security/detectives_office)
"ahF" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/item/storage/secure/safe{
pixel_x = 32
},
@@ -3975,7 +3975,7 @@
pixel_x = 9;
pixel_y = -24
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -4418,7 +4418,7 @@
"aiN" = (
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
-/obj/item/device/multitool{
+/obj/item/multitool{
pixel_x = 6
},
/obj/item/pen/red,
@@ -4506,7 +4506,7 @@
/area/security/brig)
"aiY" = (
/obj/structure/closet/crate/bin,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 24
@@ -4663,7 +4663,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -4799,7 +4799,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -4976,7 +4976,7 @@
pixel_x = 3;
pixel_y = -3
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -5048,8 +5048,8 @@
/obj/structure/table/reinforced,
/obj/item/folder/red,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/item/key/security,
/turf/open/floor/plasteel/red/side{
dir = 8
@@ -6446,7 +6446,7 @@
},
/obj/item/storage/toolbox/mechanical,
/obj/item/stack/cable_coil/white,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/machinery/button/door{
id = "evashutters";
name = "E.V.A. Shutters";
@@ -6462,7 +6462,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -6527,7 +6527,7 @@
pixel_x = 24;
pixel_y = -24
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
@@ -6557,7 +6557,7 @@
name = "protective hat";
pixel_y = 9
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plating,
/area/asteroid/nearstation)
"amH" = (
@@ -6724,9 +6724,9 @@
"amV" = (
/obj/structure/table/reinforced,
/obj/item/storage/belt/utility,
-/obj/item/device/radio,
-/obj/item/device/radio,
-/obj/item/device/gps,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/gps,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/teleporter)
@@ -6814,10 +6814,10 @@
"anh" = (
/obj/structure/table/reinforced,
/obj/item/storage/belt/utility,
-/obj/item/device/radio,
-/obj/item/device/radio,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/flashlight/flare,
+/obj/item/flashlight/flare,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
@@ -6906,7 +6906,7 @@
/area/quartermaster/miningdock)
"anq" = (
/obj/structure/closet/secure_closet/miner,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -7140,7 +7140,7 @@
"anN" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot,
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel,
/area/teleporter)
"anP" = (
@@ -7243,7 +7243,7 @@
"anW" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot,
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"anX" = (
@@ -8196,7 +8196,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -8259,7 +8259,7 @@
/area/teleporter)
"apO" = (
/obj/machinery/shieldwallgen,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
@@ -8405,10 +8405,10 @@
/obj/item/storage/toolbox/emergency,
/obj/item/tank/internals/oxygen,
/obj/item/tank/internals/oxygen,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight/flare,
+/obj/item/flashlight/flare,
/turf/open/floor/plasteel,
/area/maintenance/starboard/central)
"aqc" = (
@@ -8419,7 +8419,7 @@
},
/obj/item/tank/jetpack/carbondioxide,
/obj/item/wrench,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -28
},
@@ -8612,10 +8612,10 @@
"aqv" = (
/obj/effect/decal/cleanable/oil,
/obj/structure/closet/crate,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight/flare,
+/obj/item/flashlight/flare,
/obj/item/stock_parts/cell/high,
/obj/item/crowbar/red,
/obj/effect/turf_decal/bot,
@@ -8657,7 +8657,7 @@
/area/maintenance/port/fore)
"aqI" = (
/obj/structure/closet/secure_closet/security/sec,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -8793,23 +8793,23 @@
/area/storage/primary)
"aqU" = (
/obj/structure/table/reinforced,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/status_display{
pixel_y = 32
},
/obj/effect/turf_decal/bot,
-/obj/item/device/multitool,
-/obj/item/device/multitool,
+/obj/item/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel,
/area/storage/primary)
"aqV" = (
/obj/structure/table/reinforced,
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/gps,
+/obj/item/gps,
/obj/machinery/light{
dir = 1
},
@@ -9045,7 +9045,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -9317,7 +9317,7 @@
/area/storage/primary)
"arU" = (
/obj/machinery/holopad,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -9676,7 +9676,7 @@
"asO" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -26
@@ -9691,15 +9691,15 @@
/area/security/brig)
"asP" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = -5;
pixel_y = 5
},
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/newscaster/security_unit{
pixel_y = -32
},
@@ -9713,11 +9713,11 @@
"asQ" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/status_display{
pixel_y = -32
},
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -9828,7 +9828,7 @@
"asX" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/white{
icon_state = "4-8"
@@ -10107,7 +10107,7 @@
"atQ" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -10242,11 +10242,11 @@
/area/maintenance/port/central)
"atX" = (
/obj/structure/table/wood,
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -10365,7 +10365,7 @@
},
/obj/item/stack/cable_coil/random,
/obj/item/stack/cable_coil/random,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -10692,7 +10692,7 @@
/area/crew_quarters/theatre)
"ava" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/guitar,
+/obj/item/instrument/guitar,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -10745,7 +10745,7 @@
/area/crew_quarters/bar/atrium)
"avg" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -11027,7 +11027,7 @@
icon_state = "crateopen"
},
/obj/item/clothing/shoes/jackboots,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/item/storage/secure/briefcase,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 2;
@@ -11192,7 +11192,7 @@
/area/maintenance/port/central)
"awf" = (
/obj/structure/table/wood,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -11384,7 +11384,7 @@
/area/maintenance/starboard/central)
"awy" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -11771,7 +11771,7 @@
/obj/machinery/newscaster{
pixel_y = 32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -11802,7 +11802,7 @@
},
/area/hallway/primary/port)
"axD" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -12082,7 +12082,7 @@
"ayr" = (
/obj/structure/table/reinforced,
/obj/item/storage/belt/utility,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
/obj/structure/cable/white{
icon_state = "2-4"
},
@@ -12167,7 +12167,7 @@
/area/crew_quarters/dorms)
"ayE" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/violin,
+/obj/item/instrument/violin,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -12330,7 +12330,7 @@
},
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/airalarm{
pixel_y = 23
},
@@ -12344,7 +12344,7 @@
"ayX" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/status_display{
pixel_y = 32
},
@@ -12360,7 +12360,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -12527,12 +12527,12 @@
/area/engine/atmos)
"azA" = (
/obj/structure/table,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/dorms)
"azB" = (
/obj/structure/table,
-/obj/item/device/camera,
+/obj/item/camera,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/dorms)
@@ -13329,7 +13329,7 @@
/area/engine/atmos)
"aBJ" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/requests_console{
department = "Atmospherics Office";
departmentType = 0;
@@ -13609,7 +13609,7 @@
icon_state = "4-8"
},
/obj/item/folder/red,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/effect/turf_decal/stripes/line{
dir = 2
},
@@ -13862,7 +13862,7 @@
/area/crew_quarters/dorms)
"aCP" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/eguitar,
+/obj/item/instrument/eguitar,
/obj/item/toy/crayon/spraycan/lubecan{
charges = 5
},
@@ -14355,7 +14355,7 @@
/turf/open/floor/plasteel/white,
/area/crew_quarters/kitchen)
"aDX" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
@@ -14427,7 +14427,7 @@
/obj/structure/sign/warning/nosmoking{
pixel_y = 32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -14511,7 +14511,7 @@
/obj/machinery/power/smes{
charge = 5e+006
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -14746,10 +14746,10 @@
"aET" = (
/obj/structure/table/wood,
/obj/item/storage/crayons,
-/obj/item/device/flashlight/lamp/bananalamp{
+/obj/item/flashlight/lamp/bananalamp{
pixel_y = 5
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -14981,7 +14981,7 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 20
},
-/obj/item/device/gps/engineering{
+/obj/item/gps/engineering{
gpstag = "ENG0"
},
/obj/machinery/light/small,
@@ -15301,7 +15301,7 @@
/area/crew_quarters/kitchen)
"aFX" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -15322,7 +15322,7 @@
/area/hallway/primary/starboard)
"aGa" = (
/obj/effect/landmark/event_spawn,
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/neutral,
/area/hallway/secondary/exit)
"aGb" = (
@@ -15726,7 +15726,7 @@
/area/crew_quarters/bar/atrium)
"aGQ" = (
/obj/machinery/holopad,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
@@ -16597,7 +16597,7 @@
/area/engine/engineering)
"aIy" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/requests_console{
department = "Engineering";
departmentType = 0;
@@ -16710,7 +16710,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -16961,7 +16961,7 @@
/obj/machinery/power/terminal{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -17234,7 +17234,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/bot,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -17691,7 +17691,7 @@
/area/engine/engineering)
"aKM" = (
/obj/structure/table/reinforced,
-/obj/item/device/lightreplacer,
+/obj/item/lightreplacer,
/obj/structure/cable/white{
icon_state = "1-8"
},
@@ -18221,7 +18221,7 @@
pixel_y = 3
},
/obj/item/storage/box/lights/mixed,
-/obj/item/device/lightreplacer,
+/obj/item/lightreplacer,
/obj/machinery/airalarm{
dir = 4;
pixel_x = -23
@@ -18539,7 +18539,7 @@
/area/engine/engineering)
"aNa" = (
/obj/machinery/suit_storage_unit/engine,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -18624,7 +18624,7 @@
/area/engine/engineering)
"aNh" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -18672,7 +18672,7 @@
/obj/machinery/light_switch{
pixel_y = -24
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -18882,7 +18882,7 @@
/area/hallway/secondary/exit)
"aNI" = (
/obj/structure/closet/crate,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -18943,7 +18943,7 @@
/obj/machinery/computer/telecomms/monitor{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -19438,7 +19438,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -19718,7 +19718,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -20287,7 +20287,7 @@
pixel_y = 3
},
/obj/item/book/manual/detective,
-/obj/item/device/camera/detective,
+/obj/item/camera/detective,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -20673,7 +20673,7 @@
/obj/structure/cable/white{
icon_state = "1-4"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -28
},
@@ -20804,7 +20804,7 @@
/area/maintenance/port)
"aRT" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = -32
},
@@ -20833,7 +20833,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -20843,7 +20843,7 @@
/area/library)
"aRX" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/machinery/newscaster{
pixel_y = 32
},
@@ -20889,7 +20889,7 @@
/area/library)
"aSd" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/newscaster{
pixel_x = 32
},
@@ -20931,7 +20931,7 @@
dir = 4;
pixel_x = -22
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26;
pixel_y = 24
@@ -21225,7 +21225,7 @@
"aST" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
@@ -21280,8 +21280,8 @@
/obj/item/tank/internals/emergency_oxygen/engi{
pixel_x = 5
},
-/obj/item/device/geiger_counter,
-/obj/item/device/geiger_counter,
+/obj/item/geiger_counter,
+/obj/item/geiger_counter,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
@@ -21411,7 +21411,7 @@
dir = 1
},
/obj/machinery/door/window/southright,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -21477,7 +21477,7 @@
/area/hallway/primary/aft)
"aTy" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/lounge)
"aTz" = (
@@ -21806,7 +21806,7 @@
/area/library)
"aUk" = (
/obj/structure/bodycontainer/morgue,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -21960,14 +21960,14 @@
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/manipulator,
/obj/item/stock_parts/manipulator,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/vault/side,
/area/science/lab)
"aUF" = (
@@ -22161,7 +22161,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -22356,10 +22356,10 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/item/device/integrated_circuit_printer,
-/obj/item/device/integrated_electronics/analyzer,
-/obj/item/device/integrated_electronics/debugger,
-/obj/item/device/integrated_electronics/wirer,
+/obj/item/integrated_circuit_printer,
+/obj/item/integrated_electronics/analyzer,
+/obj/item/integrated_electronics/debugger,
+/obj/item/integrated_electronics/wirer,
/turf/open/floor/plasteel/vault/side,
/area/science/lab)
"aVy" = (
@@ -22487,7 +22487,7 @@
"aVN" = (
/obj/structure/table/wood,
/obj/item/storage/bag/books,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/status_display{
pixel_x = -32
},
@@ -22501,7 +22501,7 @@
/area/library)
"aVP" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/library)
@@ -22649,18 +22649,18 @@
/area/medical/chemistry)
"aWg" = (
/obj/structure/table/glass,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/timer{
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
@@ -22833,7 +22833,7 @@
"aWy" = (
/obj/structure/table/wood,
/obj/item/storage/briefcase,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"aWz" = (
@@ -22860,11 +22860,11 @@
/area/library)
"aWC" = (
/obj/structure/table/wood,
-/obj/item/device/camera_film{
+/obj/item/camera_film{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/vault{
dir = 5
@@ -23521,7 +23521,7 @@
/area/medical/medbay/zone3)
"aXQ" = (
/obj/structure/closet/secure_closet/medical3,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -23721,7 +23721,7 @@
/area/science/research)
"aYm" = (
/obj/machinery/light,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -23784,7 +23784,7 @@
dir = 4
},
/obj/structure/cable/white,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -24209,7 +24209,7 @@
"aZq" = (
/obj/structure/table/wood,
/obj/item/clothing/gloves/color/black,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/light/small{
dir = 1
},
@@ -24252,10 +24252,10 @@
"aZv" = (
/obj/structure/table/wood,
/obj/item/folder,
-/obj/item/device/laser_pointer{
+/obj/item/laser_pointer{
pixel_x = 3
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -24265,8 +24265,8 @@
/area/library)
"aZw" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
-/obj/item/device/camera,
+/obj/item/taperecorder,
+/obj/item/camera,
/obj/machinery/ai_status_display{
pixel_y = -32
},
@@ -24595,7 +24595,7 @@
/obj/item/screwdriver{
pixel_y = 5
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/clothing/head/welding,
/obj/machinery/firealarm{
pixel_y = 24
@@ -24635,12 +24635,12 @@
/obj/structure/table/reinforced,
/obj/item/stack/cable_coil/white,
/obj/item/stack/cable_coil/white,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/newscaster{
pixel_y = 32
},
@@ -24649,15 +24649,15 @@
/area/science/robotics/lab)
"bag" = (
/obj/item/paper_bin,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 5;
pixel_y = 7
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 5;
pixel_y = 7
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 5;
pixel_y = 7
},
@@ -24943,7 +24943,7 @@
"baK" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/structure/reagent_dispensers/peppertank{
pixel_x = 32
},
@@ -25133,7 +25133,7 @@
/area/science/robotics/lab)
"bbc" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plating,
/area/maintenance/port)
"bbd" = (
@@ -25606,7 +25606,7 @@
"bce" = (
/obj/structure/table/optable,
/obj/effect/decal/cleanable/blood/old,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -25820,7 +25820,7 @@
"bcD" = (
/obj/structure/rack,
/obj/item/weldingtool,
-/obj/item/device/assembly/voice,
+/obj/item/assembly/voice,
/obj/item/clothing/head/welding,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/turf_decal/stripes/line{
@@ -25894,7 +25894,7 @@
/area/maintenance/port)
"bcR" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/guitar,
+/obj/item/instrument/guitar,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plating,
/area/maintenance/port)
@@ -26534,7 +26534,7 @@
/obj/structure/chair/office/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -26601,7 +26601,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"beg" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -26661,7 +26661,7 @@
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/cell/high,
/obj/machinery/cell_charger,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -26686,9 +26686,9 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/item/device/mmi,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
/obj/structure/sign/departments/medbay/alt{
pixel_y = -32
},
@@ -26876,7 +26876,7 @@
/obj/machinery/newscaster{
pixel_x = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -27540,7 +27540,7 @@
},
/area/chapel/main)
"bfX" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -27621,7 +27621,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -27787,7 +27787,7 @@
pixel_x = -26;
req_access_txt = "27"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -27826,7 +27826,7 @@
/area/chapel/main)
"bgH" = (
/obj/structure/table/wood/fancy,
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
@@ -28531,7 +28531,7 @@
/area/chapel/main)
"bii" = (
/obj/structure/table/wood/fancy,
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -29289,7 +29289,7 @@
/obj/structure/extinguisher_cabinet{
pixel_y = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -29324,7 +29324,7 @@
/area/chapel/main)
"bjM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -29425,7 +29425,7 @@
pixel_x = 24;
pixel_y = -24
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -29562,7 +29562,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bkC" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
@@ -32130,7 +32130,7 @@
/area/hydroponics)
"lAs" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -33275,9 +33275,9 @@
/obj/structure/table,
/obj/item/clipboard,
/obj/item/crowbar/red,
-/obj/item/device/aicard,
-/obj/item/device/analyzer,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/aicard,
+/obj/item/analyzer,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault/side{
dir = 8
},
@@ -34250,7 +34250,7 @@
/turf/open/floor/circuit/green,
/area/ai_monitored/turret_protected/ai)
"sLV" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
@@ -34258,14 +34258,14 @@
pixel_x = -27;
pixel_y = -7
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = -27
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -34437,7 +34437,7 @@
"sMv" = (
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/mmi,
+/obj/item/mmi,
/obj/structure/table,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/vault{
@@ -34450,7 +34450,7 @@
/area/ai_monitored/turret_protected/ai)
"sMx" = (
/obj/item/folder/blue,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/structure/table,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -34505,7 +34505,7 @@
id = "AI";
pixel_x = -26
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -34611,7 +34611,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -34663,7 +34663,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/vault/side{
dir = 5
},
@@ -34901,7 +34901,7 @@
/turf/open/floor/plasteel/vault,
/area/ai_monitored/turret_protected/aisat_interior)
"sNz" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/carpet,
/area/crew_quarters/lounge)
"sNA" = (
@@ -35052,10 +35052,10 @@
/obj/item/stack/sheet/glass{
amount = 20
},
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/mmi,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/mmi,
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 27dc4f85e5..21c6116935 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -97,7 +97,7 @@
icon_state = "2-4"
},
/obj/effect/landmark/start/ai/secondary,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -145,7 +145,7 @@
pixel_y = 24
},
/obj/effect/landmark/start/ai/secondary,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -269,7 +269,7 @@
/area/ai_monitored/turret_protected/ai)
"acy" = (
/obj/effect/landmark/start/ai,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
@@ -277,14 +277,14 @@
pixel_x = -27;
pixel_y = -9
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = -31
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -346,7 +346,7 @@
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
"acE" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -518,10 +518,10 @@
pixel_x = 3;
pixel_y = -4
},
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/mmi,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/mmi,
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -673,7 +673,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -1077,7 +1077,7 @@
/turf/open/floor/plasteel/dark,
/area/security/prison)
"aeD" = (
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/turf/open/floor/plasteel/dark,
/area/security/prison)
"aeE" = (
@@ -1395,7 +1395,7 @@
/area/security/prison)
"afq" = (
/obj/structure/table,
-/obj/item/device/instrument/harmonica,
+/obj/item/instrument/harmonica,
/turf/open/floor/plasteel/dark,
/area/security/prison)
"afr" = (
@@ -1444,7 +1444,7 @@
/area/ai_monitored/turret_protected/aisat_interior)
"afy" = (
/obj/effect/landmark/start/cyborg,
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"afz" = (
@@ -1582,7 +1582,7 @@
pixel_y = 3
},
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/multitool{
+/obj/item/multitool{
layer = 5
},
/obj/item/extinguisher{
@@ -1656,7 +1656,7 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"agg" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -1872,7 +1872,7 @@
c_tag = "Permabrig Cell 2";
network = list("ss13","prison")
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -1913,7 +1913,7 @@
c_tag = "Permabrig Cell 1";
network = list("ss13","prison")
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -2076,7 +2076,7 @@
/turf/open/space,
/area/space/nearstation)
"ahj" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -2087,7 +2087,7 @@
pixel_y = 5
},
/obj/item/clothing/mask/balaclava,
-/obj/item/device/mmi,
+/obj/item/mmi,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/dark,
/area/security/execution/transfer)
@@ -2096,7 +2096,7 @@
/obj/item/folder/red{
pixel_x = 3
},
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = -3
},
/turf/open/floor/plasteel/dark,
@@ -2203,7 +2203,7 @@
/area/security/execution/transfer)
"ahx" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/dark,
/area/security/execution/transfer)
@@ -2568,7 +2568,7 @@
/obj/item/razor{
pixel_x = -6
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = 4
},
/obj/structure/extinguisher_cabinet{
@@ -2757,7 +2757,7 @@
/area/security/prison)
"aiK" = (
/obj/structure/table,
-/obj/item/device/electropack,
+/obj/item/electropack,
/turf/open/floor/plasteel/red/side,
/area/security/prison)
"aiL" = (
@@ -2853,7 +2853,7 @@
/area/maintenance/department/security/brig)
"aiY" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
"aiZ" = (
@@ -3526,7 +3526,7 @@
/area/maintenance/department/crew_quarters/dorms)
"akr" = (
/obj/machinery/washing_machine,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = -31
@@ -3571,7 +3571,7 @@
/area/maintenance/department/security/brig)
"akx" = (
/obj/structure/bodycontainer/crematorium,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -3629,7 +3629,7 @@
},
/area/security/brig)
"akD" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -4034,7 +4034,7 @@
/area/security/main)
"alC" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = -4;
pixel_y = 12
},
@@ -4321,7 +4321,7 @@
/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = -31
@@ -4646,7 +4646,7 @@
c_tag = "Brig Control Room";
dir = 2
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_y = 24
@@ -5038,7 +5038,7 @@
c_tag = "Head of Security's Office";
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_y = -27
@@ -5087,7 +5087,7 @@
/area/maintenance/department/crew_quarters/dorms)
"aob" = (
/obj/structure/closet/emcloset,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
"aod" = (
@@ -5436,7 +5436,7 @@
/obj/structure/rack,
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/laser_pointer/red,
+/obj/item/laser_pointer/red,
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"aoY" = (
@@ -5663,7 +5663,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
-/obj/item/device/camera_film,
+/obj/item/camera_film,
/turf/open/floor/plating{
icon_state = "platingdmg1"
},
@@ -5986,7 +5986,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = 29
},
@@ -6355,7 +6355,7 @@
/turf/open/floor/plasteel/dark,
/area/security/brig)
"arx" = (
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/table/glass,
/turf/open/floor/plasteel/dark,
/area/security/brig)
@@ -6603,11 +6603,11 @@
desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
name = "emergency lifejacket"
},
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plasteel,
/area/gateway)
"arZ" = (
@@ -6619,22 +6619,22 @@
/area/gateway)
"asa" = (
/obj/structure/table,
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_y = 6
},
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_x = 6;
pixel_y = 4
},
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_x = -6;
pixel_y = 4
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/structure/sign/warning/biohazard{
pixel_x = 32
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel,
/area/gateway)
"asb" = (
@@ -6887,7 +6887,7 @@
/area/security/brig)
"asJ" = (
/obj/item/folder/red,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
@@ -7397,7 +7397,7 @@
},
/area/bridge)
"atU" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/darkblue/side{
dir = 1
},
@@ -7488,7 +7488,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -7614,7 +7614,7 @@
/turf/open/floor/plasteel,
/area/maintenance/department/security/brig)
"aux" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
dir = 2;
name = "Prison Intercom (General)";
@@ -8181,7 +8181,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -28
@@ -8254,14 +8254,14 @@
/area/bridge)
"avY" = (
/obj/structure/table/glass,
-/obj/item/device/aicard,
+/obj/item/aicard,
/turf/open/floor/plasteel/dark,
/area/bridge)
"avZ" = (
/obj/structure/table/glass,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/laser_pointer/blue,
+/obj/item/assembly/flash/handheld,
+/obj/item/laser_pointer/blue,
/turf/open/floor/plasteel/dark,
/area/bridge)
"awa" = (
@@ -8654,7 +8654,7 @@
id = "Secure Gate";
name = "brig shutters"
},
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/dark,
/area/security/brig)
@@ -9051,7 +9051,7 @@
/area/crew_quarters/heads/captain)
"axU" = (
/obj/machinery/computer/card,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -9409,7 +9409,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"ayQ" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"ayR" = (
@@ -9526,7 +9526,7 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -28
@@ -9623,7 +9623,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -28
@@ -9718,7 +9718,7 @@
/area/crew_quarters/dorms)
"azx" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -10053,7 +10053,7 @@
/area/hallway/primary/fore)
"aAp" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/obj/machinery/light_switch{
dir = 9;
pixel_x = -22
@@ -10095,7 +10095,7 @@
/area/crew_quarters/heads/captain)
"aAv" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain)
"aAw" = (
@@ -10279,7 +10279,7 @@
"aAW" = (
/obj/structure/rack,
/obj/item/clothing/mask/gas,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plating,
/area/maintenance/solars/port)
"aAX" = (
@@ -10489,7 +10489,7 @@
/area/bridge)
"aBz" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/obj/item/storage/secure/safe{
pixel_x = -22;
pixel_y = 4
@@ -10702,7 +10702,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = 28
@@ -10872,7 +10872,7 @@
"aCt" = (
/obj/structure/table,
/obj/item/wrench,
-/obj/item/device/analyzer,
+/obj/item/analyzer,
/obj/machinery/requests_console{
department = "Tool Storage";
departmentType = 0;
@@ -10886,7 +10886,7 @@
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high/plus,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -10900,15 +10900,15 @@
/area/storage/primary)
"aCv" = (
/obj/structure/table,
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -8;
pixel_y = -4
},
-/obj/item/device/assembly/igniter,
+/obj/item/assembly/igniter,
/obj/machinery/camera{
c_tag = "Primary Tool Storage"
},
-/obj/item/device/assembly/voice,
+/obj/item/assembly/voice,
/obj/structure/noticeboard{
pixel_y = 32
},
@@ -10918,14 +10918,14 @@
/area/storage/primary)
"aCw" = (
/obj/structure/table,
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
-/obj/item/device/multitool,
-/obj/item/device/multitool,
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
+/obj/item/multitool,
+/obj/item/multitool,
/obj/machinery/airalarm{
pixel_y = 22
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/item/electronics/airlock,
/turf/open/floor/plasteel/neutral/side{
dir = 1
@@ -11274,7 +11274,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -26
@@ -11530,7 +11530,7 @@
c_tag = "AI Upload Center";
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -11761,11 +11761,11 @@
/area/maintenance/department/cargo)
"aEm" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp{
+/obj/item/flashlight/lamp{
pixel_x = 3;
pixel_y = 6
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -12088,7 +12088,7 @@
pixel_x = -4;
pixel_y = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = 27
@@ -12104,7 +12104,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -12235,7 +12235,7 @@
/obj/structure/table/wood,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/carpet,
/area/security/detectives_office)
"aFq" = (
@@ -12261,7 +12261,7 @@
pixel_y = -7
},
/obj/item/electronics/apc,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
/turf/open/floor/plasteel/neutral/side{
dir = 8;
heat_capacity = 1e+006
@@ -12290,7 +12290,7 @@
/area/storage/primary)
"aFw" = (
/obj/structure/table/wood,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain)
"aFx" = (
@@ -12348,7 +12348,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aFE" = (
@@ -12550,8 +12550,8 @@
"aGe" = (
/obj/structure/rack,
/obj/item/wirecutters,
-/obj/item/device/flashlight,
-/obj/item/device/gps,
+/obj/item/flashlight,
+/obj/item/gps,
/turf/open/floor/plasteel/neutral/side{
dir = 10
},
@@ -12563,14 +12563,14 @@
"aGg" = (
/obj/structure/table,
/obj/item/crowbar,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
/obj/item/clothing/gloves/color/fyellow,
/obj/item/clothing/gloves/color/fyellow,
-/obj/item/device/assembly/timer,
-/obj/item/device/radio,
+/obj/item/assembly/timer,
+/obj/item/radio,
/turf/open/floor/plasteel/neutral/side,
/area/storage/primary)
"aGh" = (
@@ -14802,7 +14802,7 @@
/area/security/checkpoint/supply)
"aMf" = (
/obj/machinery/computer/secure_data,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -15244,7 +15244,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -15341,7 +15341,7 @@
pixel_y = 3
},
/obj/item/clothing/shoes/magboots,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -15391,7 +15391,7 @@
"aNu" = (
/obj/structure/closet/crate,
/obj/item/melee/flyswatter,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -15515,7 +15515,7 @@
/area/quartermaster/sorting)
"aNK" = (
/obj/structure/table,
-/obj/item/device/destTagger,
+/obj/item/destTagger,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -15749,7 +15749,7 @@
/area/hallway/secondary/exit/departure_lounge)
"aOt" = (
/obj/structure/table,
-/obj/item/device/instrument/glockenspiel{
+/obj/item/instrument/glockenspiel{
pixel_y = 3
},
/turf/open/floor/plasteel/redblue,
@@ -16347,7 +16347,7 @@
/area/storage/eva)
"aPM" = (
/obj/structure/table,
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel/darkblue/side{
dir = 10
@@ -16467,7 +16467,7 @@
/turf/open/floor/plasteel/floorgrime,
/area/quartermaster/warehouse)
"aQd" = (
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/floorgrime,
/area/quartermaster/warehouse)
@@ -17610,7 +17610,7 @@
},
/area/maintenance/department/crew_quarters/bar)
"aSN" = (
-/obj/item/device/assembly/mousetrap,
+/obj/item/assembly/mousetrap,
/turf/open/floor/wood{
icon_state = "wood-broken6"
},
@@ -18129,7 +18129,7 @@
/area/hydroponics)
"aTX" = (
/obj/structure/kitchenspike,
-/obj/item/device/assembly/mousetrap,
+/obj/item/assembly/mousetrap,
/obj/item/reagent_containers/food/snacks/deadmouse,
/turf/open/floor/plasteel/showroomfloor,
/area/crew_quarters/kitchen)
@@ -18674,7 +18674,7 @@
pixel_x = 28;
req_access_txt = "28"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -19096,7 +19096,7 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -19164,7 +19164,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -19327,7 +19327,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -19770,7 +19770,7 @@
/area/hydroponics)
"aXX" = (
/obj/machinery/hydroponics/constructable,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -19850,7 +19850,7 @@
"aYh" = (
/obj/structure/table/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/instrument/guitar,
+/obj/item/instrument/guitar,
/turf/open/floor/plasteel/darkred/side{
dir = 1
},
@@ -20045,8 +20045,8 @@
/area/maintenance/department/cargo)
"aYE" = (
/obj/structure/table,
-/obj/item/device/assembly/igniter,
-/obj/item/device/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/department/cargo)
@@ -20097,7 +20097,7 @@
/area/security/checkpoint/customs)
"aYK" = (
/obj/structure/closet/secure_closet/security,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -20166,7 +20166,7 @@
/area/crew_quarters/kitchen)
"aYU" = (
/obj/machinery/processor,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -20467,7 +20467,7 @@
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -20726,7 +20726,7 @@
/area/crew_quarters/bar)
"bao" = (
/obj/machinery/computer/slot_machine,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -20765,7 +20765,7 @@
"bas" = (
/obj/structure/table,
/obj/item/pen,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -26
@@ -20875,7 +20875,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -26
@@ -21340,7 +21340,7 @@
"bbN" = (
/obj/structure/rack,
/obj/item/clothing/mask/gas,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plating,
/area/maintenance/solars/starboard)
"bbO" = (
@@ -21531,7 +21531,7 @@
/area/crew_quarters/bar)
"bcq" = (
/obj/item/clothing/glasses/monocle,
-/obj/item/device/instrument/recorder,
+/obj/item/instrument/recorder,
/obj/structure/table/wood/fancy,
/turf/open/floor/carpet{
icon_state = "carpetsymbol"
@@ -22367,7 +22367,7 @@
/area/crew_quarters/bar)
"bez" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/trombone,
+/obj/item/instrument/trombone,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -22797,7 +22797,7 @@
/obj/machinery/computer/security/mining{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -35
},
@@ -22974,7 +22974,7 @@
/obj/structure/chair{
name = "Throne of Custodia"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -23250,7 +23250,7 @@
/area/space)
"bgU" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -23276,7 +23276,7 @@
/area/crew_quarters/lounge)
"bgY" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -23999,7 +23999,7 @@
/area/crew_quarters/lounge)
"biK" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -24026,7 +24026,7 @@
/area/crew_quarters/lounge)
"biN" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -24041,7 +24041,7 @@
/area/crew_quarters/lounge)
"biO" = (
/obj/structure/table/glass,
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
layer = 3.1
},
/obj/item/pen{
@@ -24420,7 +24420,7 @@
pixel_y = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -24541,10 +24541,10 @@
/area/science/research/lobby)
"bkq" = (
/obj/structure/table,
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "RD0"
},
-/obj/item/device/assembly/igniter{
+/obj/item/assembly/igniter{
pixel_x = -4;
pixel_y = -4
},
@@ -24923,7 +24923,7 @@
"blr" = (
/obj/structure/table,
/obj/item/folder/white,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/turf/open/floor/plasteel/whiteblue/side{
dir = 1
},
@@ -24944,7 +24944,7 @@
/area/hallway/primary/aft)
"blv" = (
/obj/structure/table,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/item/clothing/glasses/science,
/turf/open/floor/plasteel/green/side{
dir = 9
@@ -25128,7 +25128,7 @@
/area/science/server)
"blP" = (
/obj/effect/landmark/event_spawn,
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/light{
dir = 8
},
@@ -25697,7 +25697,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bnq" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
@@ -25914,13 +25914,13 @@
/obj/item/stack/sheet/plasteel{
amount = 10
},
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/airalarm{
dir = 8;
pixel_x = 23
@@ -26005,7 +26005,7 @@
"boe" = (
/obj/structure/table,
/obj/machinery/reagentgrinder,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -28
@@ -26215,7 +26215,7 @@
name = "Medbay RC";
pixel_x = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -26558,7 +26558,7 @@
/area/medical/genetics)
"bpy" = (
/obj/machinery/clonepod,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -26873,7 +26873,7 @@
},
/obj/item/storage/belt/utility,
/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -26983,8 +26983,8 @@
pixel_y = 3
},
/obj/item/stack/sheet/metal/fifty,
-/obj/item/device/assembly/timer,
-/obj/item/device/assembly/timer,
+/obj/item/assembly/timer,
+/obj/item/assembly/timer,
/turf/open/floor/plasteel/white,
/area/science/explab)
"bqv" = (
@@ -27522,7 +27522,7 @@
/area/science/research/lobby)
"brw" = (
/obj/structure/closet/wardrobe/robotics_black,
-/obj/item/device/radio/headset/headset_sci{
+/obj/item/radio/headset/headset_sci{
pixel_x = -3
},
/turf/open/floor/plasteel/vault{
@@ -27538,19 +27538,19 @@
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"bry" = (
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -28039,7 +28039,7 @@
"bsE" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -28121,7 +28121,7 @@
/obj/machinery/chem_dispenser{
layer = 2.7
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = 29
@@ -28224,9 +28224,9 @@
empty = 1;
name = "First-Aid (empty)"
},
-/obj/item/device/healthanalyzer,
-/obj/item/device/healthanalyzer,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
+/obj/item/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/item/stack/cable_coil,
/obj/item/stack/cable_coil,
/obj/structure/table,
@@ -28264,9 +28264,9 @@
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
"btd" = (
-/obj/item/device/mmi,
-/obj/item/device/mmi,
-/obj/item/device/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
/obj/structure/table,
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
@@ -28316,11 +28316,11 @@
/area/science/explab)
"btl" = (
/obj/structure/table,
-/obj/item/device/electropack,
-/obj/item/device/healthanalyzer,
-/obj/item/device/assembly/signaler,
+/obj/item/electropack,
+/obj/item/healthanalyzer,
+/obj/item/assembly/signaler,
/obj/machinery/light,
-/obj/item/device/assembly/voice,
+/obj/item/assembly/voice,
/obj/machinery/camera{
c_tag = "Experimentation Lab";
dir = 1;
@@ -28334,7 +28334,7 @@
pixel_y = 5
},
/obj/item/stack/cable_coil,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/screwdriver,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
@@ -28881,7 +28881,7 @@
/turf/open/floor/plasteel,
/area/science/explab)
"buB" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -28
@@ -29279,7 +29279,7 @@
},
/area/hallway/primary/aft)
"bvv" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -28;
@@ -29981,7 +29981,7 @@
/obj/structure/rack,
/obj/item/stack/packageWrap,
/obj/item/hand_labeler,
-/obj/item/device/radio/headset/headset_med,
+/obj/item/radio/headset/headset_med,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
@@ -30679,8 +30679,8 @@
"byf" = (
/obj/structure/table,
/obj/item/storage/box/disks,
-/obj/item/device/flashlight/pen,
-/obj/item/device/flashlight/pen,
+/obj/item/flashlight/pen,
+/obj/item/flashlight/pen,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -30948,7 +30948,7 @@
/obj/item/stock_parts/manipulator,
/obj/item/stock_parts/scanning_module,
/obj/item/stock_parts/scanning_module,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/whitepurple/side,
/area/science/lab)
"byI" = (
@@ -32304,7 +32304,7 @@
dir = 8;
pixel_x = 23
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Station Intercom (Telecomms)";
@@ -32420,7 +32420,7 @@
/turf/open/floor/plasteel/dark,
/area/science/mixing)
"bBN" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -32518,7 +32518,7 @@
"bBZ" = (
/obj/structure/table,
/obj/item/pen,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -32641,7 +32641,7 @@
"bCm" = (
/obj/structure/table/glass,
/obj/item/clothing/neck/stethoscope,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/turf/open/floor/plasteel/blue,
/area/medical/sleeper)
"bCn" = (
@@ -33830,7 +33830,7 @@
/obj/machinery/computer/mecha{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = -26
@@ -33844,7 +33844,7 @@
},
/area/crew_quarters/heads/hor)
"bES" = (
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/item/circuitboard/aicore,
/obj/machinery/requests_console{
announcementConsole = 1;
@@ -33996,19 +33996,19 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bFi" = (
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -4;
pixel_y = 1
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 8;
pixel_y = 9
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = 9;
pixel_y = -2
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_y = 2
},
/obj/structure/table/reinforced,
@@ -34028,7 +34028,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/analyzer,
+/obj/item/analyzer,
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bFl" = (
@@ -34416,7 +34416,7 @@
/area/medical/surgery)
"bFV" = (
/obj/structure/table/glass,
-/obj/item/device/flashlight/pen,
+/obj/item/flashlight/pen,
/obj/item/clothing/neck/stethoscope,
/obj/item/lipstick/black,
/obj/machinery/power/apc{
@@ -34568,18 +34568,18 @@
/turf/open/floor/plasteel/whitepurple/side,
/area/science/mixing)
"bGo" = (
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_y = 8
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -8;
pixel_y = 5
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = 6;
pixel_y = 5
},
-/obj/item/device/assembly/signaler{
+/obj/item/assembly/signaler{
pixel_x = -2;
pixel_y = -2
},
@@ -34587,37 +34587,37 @@
/turf/open/floor/plasteel/whitepurple/side,
/area/science/mixing)
"bGp" = (
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = -5
},
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = -5
},
-/obj/item/device/transfer_valve,
-/obj/item/device/transfer_valve,
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve,
+/obj/item/transfer_valve,
+/obj/item/transfer_valve{
pixel_x = 5
},
-/obj/item/device/transfer_valve{
+/obj/item/transfer_valve{
pixel_x = 5
},
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/whitepurple/side,
/area/science/mixing)
"bGq" = (
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 5;
pixel_y = 4
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = -4;
pixel_y = 2
},
-/obj/item/device/assembly/timer{
+/obj/item/assembly/timer{
pixel_x = 6;
pixel_y = -4
},
-/obj/item/device/assembly/timer,
+/obj/item/assembly/timer,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/whitepurple/side,
/area/science/mixing)
@@ -34834,7 +34834,7 @@
icon_state = "shower";
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -34971,10 +34971,10 @@
},
/area/science/research/lobby)
"bHk" = (
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "RD0"
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -35228,7 +35228,7 @@
/area/maintenance/department/engine)
"bHS" = (
/obj/structure/table,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/effect/decal/cleanable/cobweb{
icon_state = "cobweb2"
},
@@ -35268,7 +35268,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -35297,7 +35297,7 @@
/area/medical/virology)
"bIb" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -35397,7 +35397,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -35800,7 +35800,7 @@
/obj/structure/table/glass,
/obj/item/book/manual/wiki/infections,
/obj/item/hand_labeler,
-/obj/item/device/radio/headset/headset_med,
+/obj/item/radio/headset/headset_med,
/obj/machinery/light{
dir = 8
},
@@ -36377,7 +36377,7 @@
dir = 4
},
/obj/effect/landmark/event_spawn,
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bKA" = (
@@ -36545,7 +36545,7 @@
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -37322,7 +37322,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
freerange = 1;
name = "Station Intercom (Telecomms)";
@@ -37525,7 +37525,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = 27
@@ -38086,7 +38086,7 @@
pixel_x = -5;
pixel_y = 3
},
-/obj/item/device/multitool{
+/obj/item/multitool{
layer = 4
},
/turf/open/floor/plasteel/yellow/side,
@@ -38095,9 +38095,9 @@
/obj/structure/table,
/obj/item/stack/sheet/glass/fifty,
/obj/item/storage/belt/utility,
-/obj/item/device/t_scanner,
-/obj/item/device/t_scanner,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
+/obj/item/t_scanner,
+/obj/item/t_scanner,
/turf/open/floor/plasteel/yellow/side,
/area/engine/atmos)
"bOX" = (
@@ -38469,7 +38469,7 @@
/turf/open/floor/plating/asteroid,
/area/chapel/asteroid/monastery)
"bQe" = (
-/obj/item/device/flashlight/lantern{
+/obj/item/flashlight/lantern{
on = 1
},
/turf/open/floor/plating/asteroid,
@@ -38560,16 +38560,16 @@
/area/storage/tech)
"bQs" = (
/obj/structure/table,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
-/obj/item/device/assembly/flash/handheld,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/effect/decal/cleanable/cobweb,
/obj/structure/extinguisher_cabinet{
pixel_x = -26
@@ -38578,7 +38578,7 @@
/area/storage/tech)
"bQt" = (
/obj/structure/table,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/item/aiModule/reset,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/airalarm{
@@ -38923,7 +38923,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -39566,7 +39566,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/dark,
/area/storage/tech)
"bSG" = (
@@ -39681,7 +39681,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bSS" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bST" = (
@@ -39935,7 +39935,7 @@
pixel_y = 4
},
/obj/item/clothing/gloves/color/yellow,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
/turf/open/floor/plasteel/darkgreen,
/area/storage/tech)
"bTA" = (
@@ -39944,7 +39944,7 @@
pixel_x = 2;
pixel_y = 4
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/machinery/requests_console{
department = "Tech storage";
pixel_y = -32
@@ -40067,7 +40067,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = 30;
@@ -40262,7 +40262,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 24
@@ -40773,7 +40773,7 @@
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
-/obj/item/device/assault_pod/mining,
+/obj/item/assault_pod/mining,
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
@@ -41500,7 +41500,7 @@
/turf/open/floor/plating,
/area/maintenance/department/engine)
"bXc" = (
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plating,
/area/maintenance/department/engine)
"bXd" = (
@@ -42282,7 +42282,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -43034,11 +43034,11 @@
/area/chapel/main/monastery)
"caV" = (
/obj/machinery/holopad,
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/turf/open/floor/plasteel/chapel,
/area/chapel/main/monastery)
"caW" = (
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/turf/open/floor/plasteel/chapel{
dir = 8
},
@@ -43070,7 +43070,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_x = -27
@@ -43108,7 +43108,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/table/glass,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plasteel,
/area/engine/engineering)
"cbg" = (
@@ -43580,7 +43580,7 @@
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
"ccL" = (
-/obj/item/device/flashlight/lantern{
+/obj/item/flashlight/lantern{
on = 1
},
/turf/open/floor/plasteel/asteroid{
@@ -43618,7 +43618,7 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 30
},
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "ENG0"
},
/turf/open/floor/plating,
@@ -44771,7 +44771,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/turf/open/floor/plasteel/grimy,
/area/chapel/main/monastery)
"cgO" = (
@@ -45015,7 +45015,7 @@
dir = 1
},
/obj/effect/decal/cleanable/cobweb,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -45053,7 +45053,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/item/device/instrument/violin,
+/obj/item/instrument/violin,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -45556,7 +45556,7 @@
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-22"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -45843,7 +45843,7 @@
/turf/closed/mineral/random/low_chance,
/area/asteroid/nearstation/bomb_site)
"ckL" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plating/airless,
/area/asteroid/nearstation/bomb_site)
"ckM" = (
@@ -45960,7 +45960,7 @@
/turf/open/floor/plasteel/dark,
/area/library)
"clj" = (
-/obj/item/device/flashlight/lantern{
+/obj/item/flashlight/lantern{
on = 1
},
/turf/open/floor/plating/asteroid/airless,
@@ -46119,7 +46119,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"clS" = (
@@ -46215,7 +46215,7 @@
"cmf" = (
/obj/structure/rack,
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/airalarm{
dir = 4;
pixel_x = -22
@@ -46253,7 +46253,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = 26
},
@@ -46749,7 +46749,7 @@
c_tag = "Brig Equipment Room";
dir = 2
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = 29
},
@@ -46981,7 +46981,7 @@
/turf/open/floor/plasteel/neutral/corner,
/area/hallway/secondary/exit/departure_lounge)
"coT" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"coV" = (
@@ -47135,7 +47135,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"cpt" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -47801,7 +47801,7 @@
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
"csn" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 26
@@ -48977,7 +48977,7 @@
/turf/open/space,
/area/space/nearstation)
"cwO" = (
-/obj/item/device/flashlight/lantern,
+/obj/item/flashlight/lantern,
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
"cwR" = (
@@ -49281,7 +49281,7 @@
/area/library)
"czo" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
@@ -49337,7 +49337,7 @@
/area/library)
"czC" = (
/obj/structure/table/wood/fancy,
-/obj/item/device/flashlight/lantern{
+/obj/item/flashlight/lantern{
on = 1;
pixel_y = 8
},
@@ -49381,7 +49381,7 @@
/area/library)
"czO" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/saxophone,
+/obj/item/instrument/saxophone,
/turf/open/floor/plasteel/dark,
/area/library)
"czP" = (
@@ -49476,7 +49476,7 @@
/area/library)
"cAt" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lantern{
+/obj/item/flashlight/lantern{
pixel_y = 8
},
/turf/open/floor/plasteel/vault{
@@ -49493,7 +49493,7 @@
/area/library)
"cAv" = (
/obj/structure/table/wood,
-/obj/item/device/camera,
+/obj/item/camera,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/vault{
dir = 5
@@ -49942,8 +49942,8 @@
/area/quartermaster/office)
"ejp" = (
/obj/structure/table/reinforced,
-/obj/item/device/integrated_circuit_printer,
-/obj/item/device/integrated_electronics/wirer,
+/obj/item/integrated_circuit_printer,
+/obj/item/integrated_electronics/wirer,
/turf/open/floor/plasteel/whitepurple/side{
dir = 1
},
@@ -50118,7 +50118,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/integrated_electronics/debugger,
+/obj/item/integrated_electronics/debugger,
/turf/open/floor/plasteel/whitepurple/side{
dir = 1
},
@@ -50425,8 +50425,8 @@
pixel_x = 10
},
/obj/structure/rack,
-/obj/item/device/multitool,
-/obj/item/device/multitool,
+/obj/item/multitool,
+/obj/item/multitool,
/obj/item/screwdriver,
/obj/item/screwdriver,
/turf/open/floor/plasteel/white,
@@ -50511,7 +50511,7 @@
/area/engine/break_room)
"ptq" = (
/obj/structure/table/reinforced,
-/obj/item/device/integrated_electronics/analyzer,
+/obj/item/integrated_electronics/analyzer,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"pRP" = (
@@ -50564,7 +50564,7 @@
pixel_x = 20;
pixel_y = -6
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27;
@@ -50737,7 +50737,7 @@
dir = 4
},
/obj/structure/table/reinforced,
-/obj/item/device/integrated_electronics/analyzer,
+/obj/item/integrated_electronics/analyzer,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"ukn" = (
@@ -50804,8 +50804,8 @@
network = list("rd");
pixel_y = 32
},
-/obj/item/device/integrated_circuit_printer,
-/obj/item/device/integrated_electronics/debugger,
+/obj/item/integrated_circuit_printer,
+/obj/item/integrated_electronics/debugger,
/turf/open/floor/plasteel/whitepurple/side{
dir = 1
},
@@ -50822,7 +50822,7 @@
/area/crew_quarters/fitness/recreation)
"vJd" = (
/obj/structure/table/reinforced,
-/obj/item/device/integrated_electronics/wirer,
+/obj/item/integrated_electronics/wirer,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"vMX" = (
diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm
index 88b702e401..73a6d6fca8 100644
--- a/_maps/map_files/debug/runtimestation.dmm
+++ b/_maps/map_files/debug/runtimestation.dmm
@@ -287,7 +287,7 @@
/area/space/nearstation)
"aS" = (
/obj/structure/table,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_y = 5
},
/obj/item/storage/toolbox/syndicate,
@@ -422,7 +422,7 @@
},
/obj/machinery/light,
/obj/structure/table,
-/obj/item/device/analyzer,
+/obj/item/analyzer,
/obj/item/wrench,
/turf/open/floor/plating,
/area/engine/atmos)
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 4804bc4534..1b5d94d8c1 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -82,7 +82,7 @@
/area/holodeck/rec_center/lounge)
"ao" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
layer = 3.3
},
/turf/open/floor/holofloor{
@@ -312,7 +312,7 @@
/area/holodeck/rec_center/court)
"aY" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green{
+/obj/item/flashlight/lamp/green{
pixel_y = 4
},
/turf/open/floor/holofloor/carpet,
@@ -341,7 +341,7 @@
/area/holodeck/rec_center/bunker)
"bd" = (
/obj/structure/table/wood,
-/obj/item/device/instrument/violin,
+/obj/item/instrument/violin,
/turf/open/floor/holofloor/carpet,
/area/holodeck/rec_center/lounge)
"be" = (
@@ -754,7 +754,7 @@
/area/holodeck/rec_center/medical)
"ct" = (
/obj/structure/table/glass,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/turf/open/floor/holofloor{
icon_state = "white"
},
@@ -2751,15 +2751,15 @@
/area/centcom/control)
"iv" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = -5;
pixel_y = 5
},
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/airalarm{
pixel_y = 23
},
@@ -2795,7 +2795,7 @@
"iy" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs/cable/zipties,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/centcom/control)
@@ -3429,7 +3429,7 @@
/area/centcom/control)
"kc" = (
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/structure/table/wood,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -3438,7 +3438,7 @@
"kd" = (
/obj/item/wrench,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/structure/table/wood,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -3821,7 +3821,7 @@
"lb" = (
/obj/structure/table/wood,
/obj/machinery/door/window,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk smack through this.";
syndie = 1
},
@@ -3839,7 +3839,7 @@
/area/centcom/control)
"ld" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk smack through this.";
syndie = 1
},
@@ -3857,7 +3857,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/device/megaphone,
+/obj/item/megaphone,
/obj/structure/window/reinforced,
/turf/open/floor/plasteel/grimy,
/area/centcom/control)
@@ -3944,7 +3944,7 @@
/obj/structure/table/reinforced,
/obj/item/wrench,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -3953,7 +3953,7 @@
"lv" = (
/obj/structure/table/reinforced,
/obj/item/gun/ballistic/automatic/wt550,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -4137,7 +4137,7 @@
/obj/structure/chair{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk smack through this.";
pixel_x = -32;
syndie = 1
@@ -4277,7 +4277,7 @@
/area/centcom/control)
"mn" = (
/obj/structure/table/wood,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk smack through this.";
syndie = 1
},
@@ -4526,7 +4526,7 @@
"mX" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs/cable/zipties,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -4672,7 +4672,7 @@
"nt" = (
/obj/structure/table/wood,
/obj/item/storage/photo_album,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -4972,9 +4972,9 @@
/area/centcom/ferry)
"of" = (
/obj/structure/table/wood,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/item/storage/box/handcuffs,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/obj/structure/noticeboard{
pixel_y = 28
},
@@ -4985,7 +4985,7 @@
"og" = (
/obj/structure/table/wood,
/obj/item/storage/photo_album,
-/obj/item/device/camera,
+/obj/item/camera,
/obj/structure/reagent_dispensers/peppertank{
pixel_y = 32
},
@@ -5026,7 +5026,7 @@
/area/centcom/ferry)
"ol" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/machinery/requests_console{
announcementConsole = 1;
department = "Captain's Desk";
@@ -5663,7 +5663,7 @@
/obj/item/cartridge/quartermaster{
pixel_y = 6
},
-/obj/item/device/gps/mining,
+/obj/item/gps/mining,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -5720,7 +5720,7 @@
/obj/item/folder/red,
/obj/item/book/manual/wiki/security_space_law,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
@@ -5789,7 +5789,7 @@
/area/centcom/ferry)
"qj" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/vault,
/area/centcom/ferry)
"qk" = (
@@ -6137,7 +6137,7 @@
"rk" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -6148,7 +6148,7 @@
},
/obj/structure/table/reinforced,
/obj/item/clipboard,
-/obj/item/device/radio/headset/headset_cent,
+/obj/item/radio/headset/headset_cent,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -6246,7 +6246,7 @@
/turf/open/floor/wood,
/area/centcom/ferry)
"rw" = (
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -6440,7 +6440,7 @@
/obj/structure/table/reinforced,
/obj/item/wrench,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -6514,7 +6514,7 @@
/area/syndicate_mothership/control)
"sf" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/plasteel/bar{
dir = 2
},
@@ -6671,7 +6671,7 @@
"sA" = (
/obj/item/clipboard,
/obj/structure/table/reinforced,
-/obj/item/device/detective_scanner,
+/obj/item/detective_scanner,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -7034,7 +7034,7 @@
/obj/structure/table/reinforced,
/obj/item/folder/red,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -7133,7 +7133,7 @@
/area/centcom/ferry)
"tH" = (
/obj/item/gun/energy/pulse/carbine/loyalpin,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/obj/structure/table/reinforced,
/obj/machinery/airalarm{
dir = 1;
@@ -7453,7 +7453,7 @@
/area/wizard_station)
"uD" = (
/obj/structure/table/wood/fancy,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
desc = "Talk smack through this.";
syndie = 1
},
@@ -7707,7 +7707,7 @@
/area/syndicate_mothership/control)
"vw" = (
/obj/structure/table/wood,
-/obj/item/device/syndicatedetonator{
+/obj/item/syndicatedetonator{
desc = "This gaudy button can be used to instantly detonate syndicate bombs that have been activated on the station. It is also fun to press."
},
/turf/open/floor/wood,
@@ -7844,7 +7844,7 @@
},
/area/centcom/control)
"vL" = (
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -8197,7 +8197,7 @@
/area/wizard_station)
"wP" = (
/obj/structure/table/wood/fancy,
-/obj/item/device/camera/spooky,
+/obj/item/camera/spooky,
/turf/open/floor/carpet,
/area/wizard_station)
"wQ" = (
@@ -8868,7 +8868,7 @@
"zg" = (
/obj/structure/table/reinforced,
/obj/item/gun/ballistic/automatic/wt550,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/obj/structure/noticeboard{
pixel_y = 28
},
@@ -8966,7 +8966,7 @@
"zy" = (
/obj/structure/table,
/obj/item/gun/energy/ionrifle{
- pin = /obj/item/device/firing_pin
+ pin = /obj/item/firing_pin
},
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -9155,7 +9155,7 @@
"Aj" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
@@ -9281,7 +9281,7 @@
/area/centcom/ferry)
"AL" = (
/obj/structure/table/reinforced,
-/obj/item/device/flashlight/seclite,
+/obj/item/flashlight/seclite,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -9450,7 +9450,7 @@
"Bw" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plasteel/grimy,
/area/centcom/ferry)
"Bx" = (
@@ -9481,7 +9481,7 @@
"BA" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs/cable/zipties,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -9684,7 +9684,7 @@
"BZ" = (
/obj/structure/table/wood,
/obj/item/clipboard,
-/obj/item/device/radio/headset/headset_cent,
+/obj/item/radio/headset/headset_cent,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -9722,7 +9722,7 @@
"Ce" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs/cable/zipties,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -9773,7 +9773,7 @@
/obj/item/folder/red,
/obj/item/book/manual/wiki/security_space_law,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -9861,15 +9861,15 @@
},
/area/centcom/ferry)
"CA" = (
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = -5;
pixel_y = 5
},
-/obj/item/device/radio,
+/obj/item/radio,
/obj/structure/table/wood,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -9943,7 +9943,7 @@
"CH" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
@@ -10220,7 +10220,7 @@
"DA" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -10817,7 +10817,7 @@
/area/centcom/holding)
"Fe" = (
/obj/structure/rack,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/plasteel/cafeteria,
/area/centcom/holding)
"Ff" = (
@@ -10966,7 +10966,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/centcom/holding)
"FC" = (
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/plating/beach/sand,
/area/centcom/holding)
"FD" = (
@@ -12542,15 +12542,15 @@
},
/area/tdome/tdomeadmin)
"JP" = (
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/device/radio{
+/obj/item/radio{
pixel_x = -5;
pixel_y = 5
},
-/obj/item/device/radio,
+/obj/item/radio,
/obj/structure/table/wood,
/turf/open/floor/plasteel/vault{
dir = 8
@@ -12724,7 +12724,7 @@
/obj/item/folder/red,
/obj/item/book/manual/wiki/security_space_law,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -12732,7 +12732,7 @@
"Kq" = (
/obj/structure/table/wood,
/obj/item/clipboard,
-/obj/item/device/radio/headset/headset_cent,
+/obj/item/radio/headset/headset_cent,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -13072,7 +13072,7 @@
/area/centcom/evac)
"Ln" = (
/obj/structure/table,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/mineral/plastitanium,
/area/centcom/evac)
"Lo" = (
@@ -13174,7 +13174,7 @@
/area/centcom/evac)
"LE" = (
/obj/structure/table,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/mineral/titanium/blue,
/area/centcom/evac)
"LF" = (
@@ -13202,7 +13202,7 @@
/area/centcom/evac)
"LJ" = (
/obj/structure/table,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/light{
dir = 4
},
diff --git a/_maps/map_files/generic/City_of_Cogs.dmm b/_maps/map_files/generic/City_of_Cogs.dmm
index 421d03cf9d..e67a829221 100644
--- a/_maps/map_files/generic/City_of_Cogs.dmm
+++ b/_maps/map_files/generic/City_of_Cogs.dmm
@@ -95,7 +95,7 @@
/area/reebe/city_of_cogs)
"au" = (
/obj/structure/table/reinforced/brass,
-/obj/item/device/radio/intercom/ratvar,
+/obj/item/radio/intercom/ratvar,
/turf/open/floor/clockwork/reebe,
/area/reebe/city_of_cogs)
"av" = (
diff --git a/_maps/shuttles/arrival_box.dmm b/_maps/shuttles/arrival_box.dmm
index 1bd1c69d39..c3586bd12a 100644
--- a/_maps/shuttles/arrival_box.dmm
+++ b/_maps/shuttles/arrival_box.dmm
@@ -137,7 +137,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"z" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
diff --git a/_maps/shuttles/arrival_delta.dmm b/_maps/shuttles/arrival_delta.dmm
index ab6ce0f08a..523b243801 100644
--- a/_maps/shuttles/arrival_delta.dmm
+++ b/_maps/shuttles/arrival_delta.dmm
@@ -300,7 +300,7 @@
/obj/item/paper_bin,
/obj/item/pen,
/obj/effect/turf_decal/bot,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = -30
},
/turf/open/floor/plasteel,
diff --git a/_maps/shuttles/arrival_omega.dmm b/_maps/shuttles/arrival_omega.dmm
index 36808ab760..06dc4b7a1e 100644
--- a/_maps/shuttles/arrival_omega.dmm
+++ b/_maps/shuttles/arrival_omega.dmm
@@ -139,7 +139,7 @@
/area/shuttle/arrival)
"s" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = -30
},
/obj/item/paper_bin,
diff --git a/_maps/shuttles/arrival_pubby.dmm b/_maps/shuttles/arrival_pubby.dmm
index 7912a7a5ef..12718ff8ff 100644
--- a/_maps/shuttles/arrival_pubby.dmm
+++ b/_maps/shuttles/arrival_pubby.dmm
@@ -126,7 +126,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"u" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm
index ef408d147f..a94fd27655 100644
--- a/_maps/shuttles/emergency_asteroid.dmm
+++ b/_maps/shuttles/emergency_asteroid.dmm
@@ -97,7 +97,7 @@
/obj/structure/chair{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
@@ -145,7 +145,7 @@
/area/shuttle/escape)
"aM" = (
/obj/structure/closet/emcloset,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 23
@@ -198,7 +198,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aW" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 23
@@ -348,7 +348,7 @@
/obj/structure/chair{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -377,7 +377,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"bC" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -28
diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm
index ef347ed61d..eaa525739f 100644
--- a/_maps/shuttles/emergency_bar.dmm
+++ b/_maps/shuttles/emergency_bar.dmm
@@ -21,7 +21,7 @@
/area/shuttle/escape)
"af" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/turf/open/floor/carpet,
/area/shuttle/escape)
"ag" = (
@@ -102,7 +102,7 @@
/turf/open/floor/carpet,
/area/shuttle/escape)
"as" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -434,7 +434,7 @@
/area/shuttle/escape)
"bI" = (
/obj/structure/table/wood/bar,
-/obj/item/device/instrument/guitar,
+/obj/item/instrument/guitar,
/turf/open/floor/plasteel/bar,
/area/shuttle/escape)
"bJ" = (
diff --git a/_maps/shuttles/emergency_box.dmm b/_maps/shuttles/emergency_box.dmm
index 1b675f0538..d385cf1d18 100644
--- a/_maps/shuttles/emergency_box.dmm
+++ b/_maps/shuttles/emergency_box.dmm
@@ -80,7 +80,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"as" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm
index 3d6550bdca..ea9dcd46ea 100644
--- a/_maps/shuttles/emergency_cere.dmm
+++ b/_maps/shuttles/emergency_cere.dmm
@@ -208,7 +208,7 @@
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-22"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -230,7 +230,7 @@
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-22"
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -562,7 +562,7 @@
"bG" = (
/obj/structure/table,
/obj/item/storage/box/cups,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_y = 27
@@ -639,7 +639,7 @@
/turf/open/floor/plasteel/neutral/side,
/area/shuttle/escape)
"bU" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_y = 27
@@ -960,7 +960,7 @@
/turf/open/floor/plasteel/whiteblue/side,
/area/shuttle/escape)
"cM" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -1134,7 +1134,7 @@
/turf/open/floor/plasteel/yellow/side,
/area/shuttle/escape)
"dm" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
diff --git a/_maps/shuttles/emergency_clown.dmm b/_maps/shuttles/emergency_clown.dmm
index 83aacc5cb2..6f31726964 100644
--- a/_maps/shuttles/emergency_clown.dmm
+++ b/_maps/shuttles/emergency_clown.dmm
@@ -80,7 +80,7 @@
/turf/open/floor/bluespace,
/area/shuttle/escape)
"ap" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -165,7 +165,7 @@
/area/shuttle/escape)
"aE" = (
/obj/structure/table,
-/obj/item/device/multitool/ai_detect,
+/obj/item/multitool/ai_detect,
/turf/open/floor/noslip,
/area/shuttle/escape)
"aF" = (
diff --git a/_maps/shuttles/emergency_cramped.dmm b/_maps/shuttles/emergency_cramped.dmm
index 6b5893ebd2..6bf3ba0f9e 100644
--- a/_maps/shuttles/emergency_cramped.dmm
+++ b/_maps/shuttles/emergency_cramped.dmm
@@ -45,7 +45,7 @@
"i" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced,
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "STV5"
},
/turf/open/floor/plasteel/dark,
diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm
index ab1e589fa9..926d079549 100644
--- a/_maps/shuttles/emergency_delta.dmm
+++ b/_maps/shuttles/emergency_delta.dmm
@@ -225,7 +225,7 @@
/turf/open/floor/plasteel/cmo,
/area/shuttle/escape)
"at" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 58
@@ -329,7 +329,7 @@
/obj/structure/chair{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -479,7 +479,7 @@
/area/shuttle/escape)
"ba" = (
/obj/structure/reagent_dispensers/fueltank,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -511,7 +511,7 @@
pixel_x = -4;
pixel_y = 3
},
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
pixel_x = 3;
pixel_y = 3
},
@@ -555,17 +555,17 @@
},
/obj/item/storage/toolbox/emergency,
/obj/item/storage/toolbox/emergency,
-/obj/item/device/flashlight/flare{
+/obj/item/flashlight/flare{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/flashlight/flare{
+/obj/item/flashlight/flare{
pixel_x = -6;
pixel_y = -2
},
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/escape)
@@ -750,7 +750,7 @@
/turf/open/floor/plasteel/neutral/corner,
/area/shuttle/escape)
"bJ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 58
},
@@ -831,7 +831,7 @@
"bV" = (
/obj/structure/table/reinforced,
/obj/item/storage/box/zipties,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -912,7 +912,7 @@
},
/area/shuttle/escape)
"cg" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 58
@@ -992,7 +992,7 @@
/obj/structure/table/reinforced,
/obj/item/folder/red,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
/turf/open/floor/plasteel/vault,
/area/shuttle/escape)
"cs" = (
diff --git a/_maps/shuttles/emergency_discoinferno.dmm b/_maps/shuttles/emergency_discoinferno.dmm
index d1dfd5752e..025a7cf743 100644
--- a/_maps/shuttles/emergency_discoinferno.dmm
+++ b/_maps/shuttles/emergency_discoinferno.dmm
@@ -11,7 +11,7 @@
/area/shuttle/escape)
"d" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/turf/open/floor/mineral/gold,
/area/shuttle/escape)
"e" = (
diff --git a/_maps/shuttles/emergency_goon.dmm b/_maps/shuttles/emergency_goon.dmm
index a9f9a5b307..24f2a4179c 100644
--- a/_maps/shuttles/emergency_goon.dmm
+++ b/_maps/shuttles/emergency_goon.dmm
@@ -108,7 +108,7 @@
/area/shuttle/escape)
"z" = (
/obj/structure/table/reinforced,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
diff --git a/_maps/shuttles/emergency_imfedupwiththisworld.dmm b/_maps/shuttles/emergency_imfedupwiththisworld.dmm
index 8a33387a9d..fe7addf784 100644
--- a/_maps/shuttles/emergency_imfedupwiththisworld.dmm
+++ b/_maps/shuttles/emergency_imfedupwiththisworld.dmm
@@ -33,7 +33,7 @@
/area/shuttle/escape)
"g" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/carpet,
/area/shuttle/escape)
"h" = (
diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm
index ede77a1499..3776887e2a 100644
--- a/_maps/shuttles/emergency_meta.dmm
+++ b/_maps/shuttles/emergency_meta.dmm
@@ -69,7 +69,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"as" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_y = 27
@@ -292,7 +292,7 @@
pixel_x = -2;
pixel_y = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 2;
name = "Station Intercom (General)";
pixel_y = -31
@@ -309,7 +309,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aS" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 2;
name = "Station Intercom (General)";
pixel_y = -31
@@ -532,7 +532,7 @@
pixel_x = -4;
pixel_y = 2
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 2;
name = "Station Intercom (General)";
pixel_y = -31
@@ -581,7 +581,7 @@
},
/obj/item/clothing/gloves/color/latex,
/obj/item/clothing/mask/surgical,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 2;
name = "Station Intercom (General)";
pixel_x = -27
@@ -640,17 +640,17 @@
},
/obj/item/storage/toolbox/emergency,
/obj/item/storage/toolbox/emergency,
-/obj/item/device/flashlight/flare{
+/obj/item/flashlight/flare{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/flashlight/flare{
+/obj/item/flashlight/flare{
pixel_x = -6;
pixel_y = -2
},
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/escape)
@@ -667,7 +667,7 @@
pixel_x = -4;
pixel_y = 3
},
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
pixel_x = 3;
pixel_y = 3
},
@@ -681,7 +681,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bQ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 2;
name = "Station Intercom (General)";
pixel_y = -31
diff --git a/_maps/shuttles/emergency_mini.dmm b/_maps/shuttles/emergency_mini.dmm
index 706b2b9a23..f8f27ce57e 100644
--- a/_maps/shuttles/emergency_mini.dmm
+++ b/_maps/shuttles/emergency_mini.dmm
@@ -224,7 +224,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"L" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = 24
},
diff --git a/_maps/shuttles/emergency_narnar.dmm b/_maps/shuttles/emergency_narnar.dmm
index 0f24d118ed..509a5bfa6b 100644
--- a/_maps/shuttles/emergency_narnar.dmm
+++ b/_maps/shuttles/emergency_narnar.dmm
@@ -76,7 +76,7 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"o" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency_omega.dmm
index a1f061e307..36e68e1119 100644
--- a/_maps/shuttles/emergency_omega.dmm
+++ b/_maps/shuttles/emergency_omega.dmm
@@ -31,7 +31,7 @@
/obj/structure/chair{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -232,7 +232,7 @@
pixel_x = -3;
pixel_y = 3
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -485,7 +485,7 @@
pixel_x = -4;
pixel_y = 3
},
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
pixel_x = 3;
pixel_y = 3
},
@@ -520,7 +520,7 @@
/obj/machinery/sleeper{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -557,17 +557,17 @@
},
/obj/item/storage/toolbox/emergency,
/obj/item/storage/toolbox/emergency,
-/obj/item/device/flashlight/flare{
+/obj/item/flashlight/flare{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/flashlight/flare{
+/obj/item/flashlight/flare{
pixel_x = -6;
pixel_y = -2
},
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -606,7 +606,7 @@
/obj/structure/sign/warning/nosmoking/circle{
pixel_x = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm
index ea8bb30f86..60f81677db 100644
--- a/_maps/shuttles/emergency_raven.dmm
+++ b/_maps/shuttles/emergency_raven.dmm
@@ -50,7 +50,7 @@
"ak" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs,
-/obj/item/device/assembly/flash,
+/obj/item/assembly/flash,
/turf/open/floor/plasteel/vault,
/area/shuttle/escape)
"al" = (
diff --git a/_maps/shuttles/emergency_russiafightpit.dmm b/_maps/shuttles/emergency_russiafightpit.dmm
index 85e0e00dbe..795e8ff141 100644
--- a/_maps/shuttles/emergency_russiafightpit.dmm
+++ b/_maps/shuttles/emergency_russiafightpit.dmm
@@ -82,7 +82,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ap" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
diff --git a/_maps/shuttles/emergency_scrapheap.dmm b/_maps/shuttles/emergency_scrapheap.dmm
index 251b1f6720..09603df29a 100644
--- a/_maps/shuttles/emergency_scrapheap.dmm
+++ b/_maps/shuttles/emergency_scrapheap.dmm
@@ -65,7 +65,7 @@
/turf/open/floor/carpet,
/area/shuttle/escape)
"an" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -200,7 +200,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = 23
},
diff --git a/_maps/shuttles/escape_pod_default.dmm b/_maps/shuttles/escape_pod_default.dmm
index ec761e75cb..14b87a3fa2 100644
--- a/_maps/shuttles/escape_pod_default.dmm
+++ b/_maps/shuttles/escape_pod_default.dmm
@@ -35,7 +35,7 @@
/obj/structure/chair{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = 25
},
/obj/item/storage/pod{
diff --git a/_maps/shuttles/escape_pod_large.dmm b/_maps/shuttles/escape_pod_large.dmm
index 260f7ed0c6..4900045801 100644
--- a/_maps/shuttles/escape_pod_large.dmm
+++ b/_maps/shuttles/escape_pod_large.dmm
@@ -20,7 +20,7 @@
/obj/structure/chair{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_x = 30
},
/turf/open/floor/mineral/titanium/blue,
diff --git a/_maps/shuttles/ferry_lighthouse.dmm b/_maps/shuttles/ferry_lighthouse.dmm
index 1f9520077d..793b793531 100644
--- a/_maps/shuttles/ferry_lighthouse.dmm
+++ b/_maps/shuttles/ferry_lighthouse.dmm
@@ -142,7 +142,7 @@
/area/shuttle/transport)
"aK" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lamp/green,
+/obj/item/flashlight/lamp/green,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"aL" = (
diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm
index 0367ef9352..5d21fad7f8 100644
--- a/_maps/shuttles/infiltrator_basic.dmm
+++ b/_maps/shuttles/infiltrator_basic.dmm
@@ -527,7 +527,7 @@
/obj/item/screwdriver{
pixel_y = 9
},
-/obj/item/device/assembly/voice{
+/obj/item/assembly/voice{
pixel_y = 3
},
/obj/structure/table/reinforced,
@@ -535,7 +535,7 @@
/area/shuttle/syndicate/armory)
"bz" = (
/obj/item/wrench,
-/obj/item/device/assembly/infra,
+/obj/item/assembly/infra,
/obj/structure/table/reinforced,
/obj/machinery/light{
dir = 1
@@ -543,13 +543,13 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/armory)
"bA" = (
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/signaler,
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/signaler,
+/obj/item/assembly/signaler,
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/device/assembly/prox_sensor{
+/obj/item/assembly/prox_sensor{
pixel_x = -8;
pixel_y = 4
},
@@ -560,7 +560,7 @@
/obj/item/weldingtool/largetank{
pixel_y = 3
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/armory)
@@ -746,10 +746,10 @@
/turf/open/floor/plasteel/vault,
/area/shuttle/syndicate/hallway)
"ce" = (
-/obj/item/device/sbeacondrop/bomb{
+/obj/item/sbeacondrop/bomb{
pixel_y = 5
},
-/obj/item/device/sbeacondrop/bomb,
+/obj/item/sbeacondrop/bomb,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/vault/side,
/area/shuttle/syndicate/armory)
@@ -791,7 +791,7 @@
dir = 1
},
/obj/structure/table/reinforced,
-/obj/item/device/aicard,
+/obj/item/aicard,
/turf/open/floor/plasteel/vault/side,
/area/shuttle/syndicate/armory)
"cj" = (
diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm
index a635cac326..3c9ee504eb 100644
--- a/_maps/shuttles/pirate_default.dmm
+++ b/_maps/shuttles/pirate_default.dmm
@@ -29,7 +29,7 @@
pixel_y = -5
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 5
},
/turf/open/floor/plasteel/dark,
@@ -564,8 +564,8 @@
layer = 2.9
},
/obj/item/storage/belt/utility,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel,
/area/shuttle/pirate)
"bx" = (
@@ -615,8 +615,8 @@
layer = 2.9
},
/obj/item/storage/belt/utility,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
+/obj/item/radio/off,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/floorgrime,
/area/shuttle/pirate)
@@ -717,7 +717,7 @@
layer = 2.9
},
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/floorgrime,
/area/shuttle/pirate)
"bL" = (
@@ -1077,7 +1077,7 @@
/obj/item/storage/belt/utility{
pixel_x = 4
},
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 3;
pixel_y = 2
},
@@ -1614,7 +1614,7 @@
pixel_x = 4;
pixel_y = 4
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/machinery/light/small,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/yellow/corner,
diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm
index 2daa647497..400b8f219a 100644
--- a/_maps/shuttles/whiteship_box.dmm
+++ b/_maps/shuttles/whiteship_box.dmm
@@ -38,7 +38,7 @@
/area/shuttle/abandoned)
"ak" = (
/obj/structure/table,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"al" = (
@@ -228,7 +228,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"bc" = (
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"bd" = (
diff --git a/_maps/shuttles/whiteship_cere.dmm b/_maps/shuttles/whiteship_cere.dmm
index f189ba7478..f640e014a9 100644
--- a/_maps/shuttles/whiteship_cere.dmm
+++ b/_maps/shuttles/whiteship_cere.dmm
@@ -478,7 +478,7 @@
/area/shuttle/abandoned)
"aP" = (
/obj/structure/table,
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "NTCONST1";
pixel_x = -1;
pixel_y = 2
diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm
index ccf2a544d4..bb17806a6b 100644
--- a/_maps/shuttles/whiteship_delta.dmm
+++ b/_maps/shuttles/whiteship_delta.dmm
@@ -167,11 +167,11 @@
},
/obj/item/storage/toolbox/emergency,
/obj/item/storage/toolbox/emergency,
-/obj/item/device/flashlight/flare{
+/obj/item/flashlight/flare{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/flashlight/flare{
+/obj/item/flashlight/flare{
pixel_x = -6;
pixel_y = -2
},
@@ -272,7 +272,7 @@
},
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/relic,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 3;
name = "3maintenance loot spawner"
@@ -452,7 +452,7 @@
/obj/item/clothing/suit/apron,
/obj/item/shovel/spade,
/obj/item/cultivator,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
name = "dust"
@@ -651,7 +651,7 @@
desc = "A thin layer of dust coating the floor.";
name = "dust"
},
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "ITVSAC";
pixel_x = -1;
pixel_y = 2
@@ -1654,7 +1654,7 @@
desc = "A thin layer of dust coating the floor.";
name = "dust"
},
-/obj/item/device/megaphone,
+/obj/item/megaphone,
/turf/open/floor/plasteel/blue/corner{
dir = 4
},
@@ -1688,7 +1688,7 @@
name = "dust"
},
/obj/structure/table,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/plasteel/blue/side{
dir = 5
},
@@ -1815,7 +1815,7 @@
name = "dust"
},
/obj/structure/table,
-/obj/item/device/pda/clear,
+/obj/item/pda/clear,
/turf/open/floor/plasteel/blue/side,
/area/shuttle/abandoned)
"dv" = (
@@ -1834,7 +1834,7 @@
name = "dust"
},
/obj/structure/table,
-/obj/item/device/radio,
+/obj/item/radio,
/turf/open/floor/plasteel/blue/side,
/area/shuttle/abandoned)
"dx" = (
diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm
index 02586562dd..3118d4e0ce 100644
--- a/_maps/shuttles/whiteship_meta.dmm
+++ b/_maps/shuttles/whiteship_meta.dmm
@@ -182,7 +182,7 @@
/obj/item/roller{
pixel_y = 4
},
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
name = "dust"
@@ -199,7 +199,7 @@
},
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/relic,
-/obj/item/device/t_scanner,
+/obj/item/t_scanner,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 3;
name = "3maintenance loot spawner"
@@ -239,11 +239,11 @@
},
/obj/item/storage/toolbox/emergency,
/obj/item/storage/toolbox/emergency,
-/obj/item/device/flashlight/flare{
+/obj/item/flashlight/flare{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/device/flashlight/flare{
+/obj/item/flashlight/flare{
pixel_x = -6;
pixel_y = -2
},
@@ -316,10 +316,10 @@
/obj/structure/table,
/obj/item/storage/belt/utility,
/obj/item/storage/belt/utility,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
+/obj/item/radio/off,
+/obj/item/radio/off,
+/obj/item/radio/off,
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
name = "dust"
@@ -690,7 +690,7 @@
name = "dust"
},
/obj/structure/table,
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"bi" = (
@@ -806,7 +806,7 @@
desc = "A thin layer of dust coating the floor.";
name = "dust"
},
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "NTREC1";
pixel_x = -1;
pixel_y = 2
@@ -1110,7 +1110,7 @@
name = "dust"
},
/obj/structure/table,
-/obj/item/device/megaphone,
+/obj/item/megaphone,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"bU" = (
@@ -1140,7 +1140,7 @@
/area/shuttle/abandoned)
"bW" = (
/obj/structure/table,
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_y = 6
},
/obj/effect/decal/cleanable/dirt{
@@ -1332,7 +1332,7 @@
name = "dust"
},
/obj/item/wirecutters,
-/obj/item/device/plant_analyzer,
+/obj/item/plant_analyzer,
/obj/item/reagent_containers/glass/bucket,
/obj/machinery/light/small/built{
dir = 8
diff --git a/_maps/templates/pirate_ship.dmm b/_maps/templates/pirate_ship.dmm
index a635cac326..3c9ee504eb 100644
--- a/_maps/templates/pirate_ship.dmm
+++ b/_maps/templates/pirate_ship.dmm
@@ -29,7 +29,7 @@
pixel_y = -5
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
pixel_y = 5
},
/turf/open/floor/plasteel/dark,
@@ -564,8 +564,8 @@
layer = 2.9
},
/obj/item/storage/belt/utility,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
+/obj/item/radio/off,
/turf/open/floor/plasteel,
/area/shuttle/pirate)
"bx" = (
@@ -615,8 +615,8 @@
layer = 2.9
},
/obj/item/storage/belt/utility,
-/obj/item/device/radio/off,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
+/obj/item/radio/off,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/floorgrime,
/area/shuttle/pirate)
@@ -717,7 +717,7 @@
layer = 2.9
},
/obj/item/storage/toolbox/mechanical,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/floorgrime,
/area/shuttle/pirate)
"bL" = (
@@ -1077,7 +1077,7 @@
/obj/item/storage/belt/utility{
pixel_x = 4
},
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 3;
pixel_y = 2
},
@@ -1614,7 +1614,7 @@
pixel_x = 4;
pixel_y = 4
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/machinery/light/small,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/yellow/corner,
diff --git a/_maps/templates/shelter_1.dmm b/_maps/templates/shelter_1.dmm
index fff5f4c2cd..f5b2e141f4 100644
--- a/_maps/templates/shelter_1.dmm
+++ b/_maps/templates/shelter_1.dmm
@@ -17,7 +17,7 @@
/turf/open/floor/pod,
/area/survivalpod)
"e" = (
-/obj/item/device/gps/computer,
+/obj/item/gps/computer,
/turf/open/floor/pod,
/area/survivalpod)
"f" = (
diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm
index 85de29e8c7..8951db3d37 100644
--- a/_maps/templates/shelter_2.dmm
+++ b/_maps/templates/shelter_2.dmm
@@ -23,7 +23,7 @@
/turf/open/floor/pod,
/area/survivalpod)
"g" = (
-/obj/item/device/gps/computer,
+/obj/item/gps/computer,
/turf/open/floor/pod,
/area/survivalpod)
"h" = (
diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm
index 4e2b591ea9..beea132890 100644
--- a/code/__DEFINES/inventory.dm
+++ b/code/__DEFINES/inventory.dm
@@ -151,7 +151,7 @@
GLOBAL_LIST_INIT(advanced_hardsuit_allowed, typecacheof(list(
/obj/item/ammo_box,
/obj/item/ammo_casing,
- /obj/item/device/flashlight,
+ /obj/item/flashlight,
/obj/item/gun,
/obj/item/melee/baton,
/obj/item/reagent_containers/spray/pepper,
@@ -161,7 +161,7 @@ GLOBAL_LIST_INIT(advanced_hardsuit_allowed, typecacheof(list(
GLOBAL_LIST_INIT(security_hardsuit_allowed, typecacheof(list(
/obj/item/ammo_box,
/obj/item/ammo_casing,
- /obj/item/device/flashlight,
+ /obj/item/flashlight,
/obj/item/gun/ballistic,
/obj/item/gun/energy,
/obj/item/melee/baton,
@@ -172,9 +172,9 @@ GLOBAL_LIST_INIT(security_hardsuit_allowed, typecacheof(list(
GLOBAL_LIST_INIT(detective_vest_allowed, typecacheof(list(
/obj/item/ammo_box,
/obj/item/ammo_casing,
- /obj/item/device/detective_scanner,
- /obj/item/device/flashlight,
- /obj/item/device/taperecorder,
+ /obj/item/detective_scanner,
+ /obj/item/flashlight,
+ /obj/item/taperecorder,
/obj/item/gun/ballistic,
/obj/item/gun/energy,
/obj/item/lighter,
@@ -189,7 +189,7 @@ GLOBAL_LIST_INIT(detective_vest_allowed, typecacheof(list(
GLOBAL_LIST_INIT(security_vest_allowed, typecacheof(list(
/obj/item/ammo_box,
/obj/item/ammo_casing,
- /obj/item/device/flashlight,
+ /obj/item/flashlight,
/obj/item/gun/ballistic,
/obj/item/gun/energy,
/obj/item/kitchen/knife/combat,
@@ -203,7 +203,7 @@ GLOBAL_LIST_INIT(security_vest_allowed, typecacheof(list(
GLOBAL_LIST_INIT(security_wintercoat_allowed, typecacheof(list(
/obj/item/ammo_box,
/obj/item/ammo_casing,
- /obj/item/device/flashlight,
+ /obj/item/flashlight,
/obj/item/storage/fancy/cigarettes,
/obj/item/gun/ballistic,
/obj/item/gun/energy,
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index 6d514d6d9b..772987185b 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -163,13 +163,13 @@ GLOBAL_LIST_INIT(pointed_types, typecacheof(list(
#define isbodypart(A) (istype(A, /obj/item/bodypart))
//Assemblies
-#define isassembly(O) (istype(O, /obj/item/device/assembly))
+#define isassembly(O) (istype(O, /obj/item/assembly))
-#define isigniter(O) (istype(O, /obj/item/device/assembly/igniter))
+#define isigniter(O) (istype(O, /obj/item/assembly/igniter))
-#define isprox(O) (istype(O, /obj/item/device/assembly/prox_sensor))
+#define isprox(O) (istype(O, /obj/item/assembly/prox_sensor))
-#define issignaler(O) (istype(O, /obj/item/device/assembly/signaler))
+#define issignaler(O) (istype(O, /obj/item/assembly/signaler))
GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list(
/obj/item/stack/sheet/glass,
diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index c18784690c..e75e1ed88a 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -188,7 +188,7 @@
if(sight_check && !isInSight(A_tmp, O))
passed=0
- else if(include_radio && istype(A, /obj/item/device/radio))
+ else if(include_radio && istype(A, /obj/item/radio))
passed=1
if(sight_check && !isInSight(A, O))
@@ -234,10 +234,10 @@
processing_list.Cut(1, 2)
processing_list += A.contents
-/proc/get_mobs_in_radio_ranges(list/obj/item/device/radio/radios)
+/proc/get_mobs_in_radio_ranges(list/obj/item/radio/radios)
. = list()
// Returns a list of mobs who can hear any of the radios given in @radios
- for(var/obj/item/device/radio/R in radios)
+ for(var/obj/item/radio/R in radios)
if(R)
. |= get_hearers_in_view(R.canhear_range, R)
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 6417ad8ed0..4230138cf6 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -831,7 +831,7 @@ GLOBAL_LIST_INIT(can_embed_types, typecacheof(list(
Checks if that loc and dir has an item on the wall
*/
GLOBAL_LIST_INIT(WALLITEMS, typecacheof(list(
- /obj/machinery/power/apc, /obj/machinery/airalarm, /obj/item/device/radio/intercom,
+ /obj/machinery/power/apc, /obj/machinery/airalarm, /obj/item/radio/intercom,
/obj/structure/extinguisher_cabinet, /obj/structure/reagent_dispensers/peppertank,
/obj/machinery/status_display, /obj/machinery/requests_console, /obj/machinery/light_switch, /obj/structure/sign,
/obj/machinery/newscaster, /obj/machinery/firealarm, /obj/structure/noticeboard, /obj/machinery/button,
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index 100407d777..92cd02f6aa 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -37,14 +37,14 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
/obj/item/clothing/mask/gas = 15,
/obj/item/clothing/suit/hazardvest = 1,
/obj/item/clothing/under/rank/vice = 1,
- /obj/item/device/assembly/prox_sensor = 4,
- /obj/item/device/assembly/timer = 3,
- /obj/item/device/flashlight = 4,
- /obj/item/device/flashlight/pen = 1,
- /obj/item/device/flashlight/glowstick/random = 4,
- /obj/item/device/multitool = 2,
- /obj/item/device/radio/off = 2,
- /obj/item/device/t_scanner = 5,
+ /obj/item/assembly/prox_sensor = 4,
+ /obj/item/assembly/timer = 3,
+ /obj/item/flashlight = 4,
+ /obj/item/flashlight/pen = 1,
+ /obj/item/flashlight/glowstick/random = 4,
+ /obj/item/multitool = 2,
+ /obj/item/radio/off = 2,
+ /obj/item/t_scanner = 5,
/obj/item/airlock_painter = 1,
/obj/item/stack/cable_coil/random = 4,
/obj/item/stack/cable_coil/random/five = 6,
@@ -91,13 +91,13 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
/obj/item/weaponcrafting/receiver = 2,
/obj/item/clothing/head/cone = 2,
/obj/item/grenade/smokebomb = 2,
- /obj/item/device/geiger_counter = 3,
+ /obj/item/geiger_counter = 3,
/obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1,
- /obj/item/device/radio/headset = 1,
- /obj/item/device/assembly/infra = 1,
- /obj/item/device/assembly/igniter = 2,
- /obj/item/device/assembly/signaler = 2,
- /obj/item/device/assembly/mousetrap = 2,
+ /obj/item/radio/headset = 1,
+ /obj/item/assembly/infra = 1,
+ /obj/item/assembly/igniter = 2,
+ /obj/item/assembly/signaler = 2,
+ /obj/item/assembly/mousetrap = 2,
/obj/item/reagent_containers/syringe = 2,
/obj/item/clothing/gloves/color/random = 8,
/obj/item/clothing/shoes/laceup = 1,
diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm
index 0eafc9f099..2e2f7edd99 100644
--- a/code/controllers/subsystem/pai.dm
+++ b/code/controllers/subsystem/pai.dm
@@ -11,10 +11,10 @@ SUBSYSTEM_DEF(pai)
/datum/controller/subsystem/pai/Topic(href, href_list[])
if(href_list["download"])
var/datum/paiCandidate/candidate = locate(href_list["candidate"]) in candidates
- var/obj/item/device/paicard/card = locate(href_list["device"]) in pai_card_list
+ var/obj/item/paicard/card = locate(href_list["device"]) in pai_card_list
if(card.pai)
return
- if(istype(card, /obj/item/device/paicard) && istype(candidate, /datum/paiCandidate))
+ if(istype(card, /obj/item/paicard) && istype(candidate, /datum/paiCandidate))
if(check_ready(candidate) != candidate)
return FALSE
var/mob/living/silicon/pai/pai = new(card)
@@ -71,7 +71,7 @@ SUBSYSTEM_DEF(pai)
if("submit")
if(candidate)
candidate.ready = 1
- for(var/obj/item/device/paicard/p in pai_card_list)
+ for(var/obj/item/paicard/p in pai_card_list)
if(!p.pai)
p.alertUpdate()
usr << browse(null, "window=paiRecruit")
@@ -140,7 +140,7 @@ SUBSYSTEM_DEF(pai)
return C
return FALSE
-/datum/controller/subsystem/pai/proc/findPAI(obj/item/device/paicard/p, mob/user)
+/datum/controller/subsystem/pai/proc/findPAI(obj/item/paicard/p, mob/user)
if(!ghost_spam)
ghost_spam = TRUE
for(var/mob/dead/observer/G in GLOB.player_list)
diff --git a/code/controllers/subsystem/processing/circuit.dm b/code/controllers/subsystem/processing/circuit.dm
index e5b4791907..db1bf1ff5f 100644
--- a/code/controllers/subsystem/processing/circuit.dm
+++ b/code/controllers/subsystem/processing/circuit.dm
@@ -36,47 +36,47 @@ PROCESSING_SUBSYSTEM_DEF(circuit)
var/list/category_list = circuit_fabricator_recipe_list[category]
category_list += IC // Populating the fabricator categories
- for(var/path in typesof(/obj/item/device/electronic_assembly))
- var/obj/item/device/electronic_assembly/A = path
+ for(var/path in typesof(/obj/item/electronic_assembly))
+ var/obj/item/electronic_assembly/A = path
var/name = initial(A.name)
all_assemblies[name] = path
cached_assemblies[A] = new path
circuit_fabricator_recipe_list["Assemblies"] = list(
- /obj/item/device/electronic_assembly/default,
- /obj/item/device/electronic_assembly/calc,
- /obj/item/device/electronic_assembly/clam,
- /obj/item/device/electronic_assembly/simple,
- /obj/item/device/electronic_assembly/hook,
- /obj/item/device/electronic_assembly/pda,
- /obj/item/device/electronic_assembly/medium/default,
- /obj/item/device/electronic_assembly/medium/box,
- /obj/item/device/electronic_assembly/medium/clam,
- /obj/item/device/electronic_assembly/medium/medical,
- /obj/item/device/electronic_assembly/medium/gun,
- /obj/item/device/electronic_assembly/medium/radio,
- /obj/item/device/electronic_assembly/large/default,
- /obj/item/device/electronic_assembly/large/scope,
- /obj/item/device/electronic_assembly/large/terminal,
- /obj/item/device/electronic_assembly/large/arm,
- /obj/item/device/electronic_assembly/large/tall,
- /obj/item/device/electronic_assembly/large/industrial,
- /obj/item/device/electronic_assembly/drone/default,
- /obj/item/device/electronic_assembly/drone/arms,
- /obj/item/device/electronic_assembly/drone/secbot,
- /obj/item/device/electronic_assembly/drone/medbot,
- /obj/item/device/electronic_assembly/drone/genbot,
- /obj/item/device/electronic_assembly/drone/android,
- /obj/item/device/electronic_assembly/wallmount/light,
- /obj/item/device/electronic_assembly/wallmount,
- /obj/item/device/electronic_assembly/wallmount/heavy
+ /obj/item/electronic_assembly/default,
+ /obj/item/electronic_assembly/calc,
+ /obj/item/electronic_assembly/clam,
+ /obj/item/electronic_assembly/simple,
+ /obj/item/electronic_assembly/hook,
+ /obj/item/electronic_assembly/pda,
+ /obj/item/electronic_assembly/medium/default,
+ /obj/item/electronic_assembly/medium/box,
+ /obj/item/electronic_assembly/medium/clam,
+ /obj/item/electronic_assembly/medium/medical,
+ /obj/item/electronic_assembly/medium/gun,
+ /obj/item/electronic_assembly/medium/radio,
+ /obj/item/electronic_assembly/large/default,
+ /obj/item/electronic_assembly/large/scope,
+ /obj/item/electronic_assembly/large/terminal,
+ /obj/item/electronic_assembly/large/arm,
+ /obj/item/electronic_assembly/large/tall,
+ /obj/item/electronic_assembly/large/industrial,
+ /obj/item/electronic_assembly/drone/default,
+ /obj/item/electronic_assembly/drone/arms,
+ /obj/item/electronic_assembly/drone/secbot,
+ /obj/item/electronic_assembly/drone/medbot,
+ /obj/item/electronic_assembly/drone/genbot,
+ /obj/item/electronic_assembly/drone/android,
+ /obj/item/electronic_assembly/wallmount/light,
+ /obj/item/electronic_assembly/wallmount,
+ /obj/item/electronic_assembly/wallmount/heavy
///obj/item/weapon/implant/integrated_circuit
)
circuit_fabricator_recipe_list["Tools"] = list(
- /obj/item/device/integrated_electronics/wirer,
- /obj/item/device/integrated_electronics/debugger,
- /obj/item/device/integrated_electronics/analyzer,
- /obj/item/device/integrated_electronics/detailer
+ /obj/item/integrated_electronics/wirer,
+ /obj/item/integrated_electronics/debugger,
+ /obj/item/integrated_electronics/analyzer,
+ /obj/item/integrated_electronics/detailer
)
diff --git a/code/controllers/subsystem/processing/flightpacks.dm b/code/controllers/subsystem/processing/flightpacks.dm
index 2981789338..a462e2b645 100644
--- a/code/controllers/subsystem/processing/flightpacks.dm
+++ b/code/controllers/subsystem/processing/flightpacks.dm
@@ -17,7 +17,7 @@ PROCESSING_SUBSYSTEM_DEF(flightpacks)
sync_flightsuit_processing()
/datum/controller/subsystem/processing/flightpacks/proc/sync_flightsuit_processing()
- for(var/obj/item/device/flightpack/FP in processing)
+ for(var/obj/item/flightpack/FP in processing)
FP.sync_processing(src)
if(flightsuit_processing == FLIGHTSUIT_PROCESSING_NONE) //Don't even bother firing.
can_fire = FALSE
diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm
index 16bcbebc70..fb92fc37ab 100644
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -63,8 +63,8 @@ SUBSYSTEM_DEF(traumas)
/obj/machinery/door/airlock/security)),
"clowns" = typecacheof(list(/obj/item/clothing/under/rank/clown, /obj/item/clothing/shoes/clown_shoes,
- /obj/item/clothing/mask/gas/clown_hat, /obj/item/device/instrument/bikehorn,
- /obj/item/device/pda/clown, /obj/item/grown/bananapeel)),
+ /obj/item/clothing/mask/gas/clown_hat, /obj/item/instrument/bikehorn,
+ /obj/item/pda/clown, /obj/item/grown/bananapeel)),
"greytide" = typecacheof(list(/obj/item/clothing/under/color/grey, /obj/item/melee/baton/cattleprod,
/obj/item/twohanded/spear, /obj/item/clothing/mask/gas)),
@@ -82,19 +82,19 @@ SUBSYSTEM_DEF(traumas)
/obj/item/clothing/under/rank/research_director/alt, /obj/item/clothing/under/rank/research_director/turtleneck,
/obj/item/clothing/under/captainparade, /obj/item/clothing/under/hosparademale, /obj/item/clothing/under/hosparadefem,
/obj/item/clothing/head/helmet/abductor, /obj/item/clothing/suit/armor/abductor/vest, /obj/item/abductor_baton,
- /obj/item/storage/belt/military/abductor, /obj/item/gun/energy/alien, /obj/item/device/abductor/silencer,
- /obj/item/device/abductor/gizmo, /obj/item/clothing/under/rank/centcom_officer,
+ /obj/item/storage/belt/military/abductor, /obj/item/gun/energy/alien, /obj/item/abductor/silencer,
+ /obj/item/abductor/gizmo, /obj/item/clothing/under/rank/centcom_officer,
/obj/item/clothing/suit/space/hardsuit/ert, /obj/item/clothing/suit/space/hardsuit/ert/sec,
/obj/item/clothing/suit/space/hardsuit/ert/engi, /obj/item/clothing/suit/space/hardsuit/ert/med,
/obj/item/clothing/suit/space/hardsuit/deathsquad, /obj/item/clothing/head/helmet/space/hardsuit/deathsquad,
/obj/machinery/door/airlock/centcom)),
"robots" = typecacheof(list(/obj/machinery/computer/upload, /obj/item/aiModule/, /obj/machinery/recharge_station,
- /obj/item/device/aicard, /obj/item/device/deactivated_swarmer, /obj/effect/mob_spawn/swarmer)),
+ /obj/item/aicard, /obj/item/deactivated_swarmer, /obj/effect/mob_spawn/swarmer)),
"doctors" = typecacheof(list(/obj/item/clothing/under/rank/medical, /obj/item/clothing/under/rank/chemist,
/obj/item/clothing/under/rank/nursesuit, /obj/item/clothing/under/rank/chief_medical_officer,
/obj/item/reagent_containers/syringe, /obj/item/reagent_containers/pill/, /obj/item/reagent_containers/hypospray,
- /obj/item/storage/firstaid, /obj/item/storage/pill_bottle, /obj/item/device/healthanalyzer,
+ /obj/item/storage/firstaid, /obj/item/storage/pill_bottle, /obj/item/healthanalyzer,
/obj/structure/sign/departments/medbay, /obj/machinery/door/airlock/medical, /obj/machinery/sleeper,
/obj/machinery/dna_scannernew, /obj/machinery/atmospherics/components/unary/cryo_cell, /obj/item/surgical_drapes,
/obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw,
@@ -112,7 +112,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/clothing/suit/cultrobes, /obj/item/clothing/suit/space/hardsuit/cult,
/obj/item/clothing/suit/hooded/cultrobes, /obj/item/clothing/head/hooded/cult_hoodie, /obj/effect/rune,
/obj/item/stack/sheet/runed_metal, /obj/machinery/door/airlock/cult, /obj/singularity/narsie,
- /obj/item/device/soulstone,
+ /obj/item/soulstone,
/obj/structure/destructible/clockwork, /obj/item/clockwork, /obj/item/clothing/suit/armor/clockwork,
/obj/item/clothing/glasses/judicial_visor, /obj/effect/clockwork/sigil/, /obj/item/stack/tile/brass,
/obj/machinery/door/airlock/clockwork,
@@ -123,8 +123,8 @@ SUBSYSTEM_DEF(traumas)
"aliens" = typecacheof(list(/obj/item/clothing/mask/facehugger, /obj/item/organ/body_egg/alien_embryo,
/obj/structure/alien, /obj/item/toy/toy_xeno,
- /obj/item/clothing/suit/armor/abductor, /obj/item/device/abductor, /obj/item/gun/energy/alien,
- /obj/item/abductor_baton, /obj/item/device/radio/headset/abductor, /obj/item/scalpel/alien, /obj/item/hemostat/alien,
+ /obj/item/clothing/suit/armor/abductor, /obj/item/abductor, /obj/item/gun/energy/alien,
+ /obj/item/abductor_baton, /obj/item/radio/headset/abductor, /obj/item/scalpel/alien, /obj/item/hemostat/alien,
/obj/item/retractor/alien, /obj/item/circular_saw/alien, /obj/item/surgicaldrill/alien, /obj/item/cautery/alien,
/obj/item/clothing/head/helmet/abductor, /obj/structure/bed/abductor, /obj/structure/table_frame/abductor,
/obj/structure/table/abductor, /obj/structure/table/optable/abductor, /obj/structure/closet/abductor, /obj/item/organ/heart/gland,
diff --git a/code/datums/action.dm b/code/datums/action.dm
index c5563e9a34..f7b1d6b258 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -273,8 +273,8 @@
desc = "Change the type of instrument your synthesizer is playing as."
/datum/action/item_action/synthswitch/Trigger()
- if(istype(target, /obj/item/device/instrument/piano_synth))
- var/obj/item/device/instrument/piano_synth/synth = target
+ if(istype(target, /obj/item/instrument/piano_synth))
+ var/obj/item/instrument/piano_synth/synth = target
var/chosen = input("Choose the type of instrument you want to use", "Instrument Selection", "piano") as null|anything in synth.insTypes
if(!synth.insTypes[chosen])
return
@@ -433,8 +433,8 @@
desc = "Use the instrument specified"
/datum/action/item_action/instrument/Trigger()
- if(istype(target, /obj/item/device/instrument))
- var/obj/item/device/instrument/I = target
+ if(istype(target, /obj/item/instrument))
+ var/obj/item/instrument/I = target
I.interact(usr)
return
return ..()
diff --git a/code/datums/actions/flightsuit.dm b/code/datums/actions/flightsuit.dm
index cf249fed31..85bd2ae72a 100644
--- a/code/datums/actions/flightsuit.dm
+++ b/code/datums/actions/flightsuit.dm
@@ -54,7 +54,7 @@
background_icon_state = "bg_tech_blue"
/datum/action/item_action/flightpack/toggle_flight/Trigger()
- var/obj/item/device/flightpack/F = target
+ var/obj/item/flightpack/F = target
if(istype(F))
F.flight? F.disable_flight() : F.enable_flight()
return ..()
@@ -65,7 +65,7 @@
background_icon_state = "bg_tech_blue"
/datum/action/item_action/flightpack/engage_boosters/Trigger()
- var/obj/item/device/flightpack/F = target
+ var/obj/item/flightpack/F = target
if(istype(F))
F.boost? F.deactivate_booster() : F.activate_booster()
return ..()
@@ -76,7 +76,7 @@
background_icon_state = "bg_tech_blue"
/datum/action/item_action/flightpack/toggle_stabilizers/Trigger()
- var/obj/item/device/flightpack/F = target
+ var/obj/item/flightpack/F = target
if(istype(F))
F.stabilizer? F.disable_stabilizers() : F.enable_stabilizers()
return ..()
@@ -87,7 +87,7 @@
background_icon_state = "bg_tech_blue"
/datum/action/item_action/flightpack/change_power/Trigger()
- var/obj/item/device/flightpack/F = target
+ var/obj/item/flightpack/F = target
if(istype(F))
F.cycle_power()
return ..()
@@ -98,7 +98,7 @@
background_icon_state = "bg_tech_blue"
/datum/action/item_action/flightpack/toggle_airbrake/Trigger()
- var/obj/item/device/flightpack/F = target
+ var/obj/item/flightpack/F = target
if(istype(F))
F.brake? F.disable_airbrake() : F.enable_airbrake()
return ..()
diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm
index 87a71e466e..49cb97774c 100644
--- a/code/datums/components/chasm.dm
+++ b/code/datums/components/chasm.dm
@@ -70,8 +70,8 @@
return FALSE
if(ishuman(AM))
var/mob/living/carbon/human/H = AM
- if(istype(H.belt, /obj/item/device/wormhole_jaunter))
- var/obj/item/device/wormhole_jaunter/J = H.belt
+ if(istype(H.belt, /obj/item/wormhole_jaunter))
+ var/obj/item/wormhole_jaunter/J = H.belt
//To freak out any bystanders
H.visible_message("[H] falls into [parent]!")
J.chasm_react(H)
diff --git a/code/datums/components/spooky.dm b/code/datums/components/spooky.dm
index a62b7dcaab..0de27f30f0 100644
--- a/code/datums/components/spooky.dm
+++ b/code/datums/components/spooky.dm
@@ -42,11 +42,11 @@
var/T = get_turf(H)
if(too_spooky)
if(prob(30))
- new/obj/item/device/instrument/saxophone/spectral(T)
+ new/obj/item/instrument/saxophone/spectral(T)
else if(prob(30))
- new/obj/item/device/instrument/trumpet/spectral(T)
+ new/obj/item/instrument/trumpet/spectral(T)
else if(prob(30))
- new/obj/item/device/instrument/trombone/spectral(T)
+ new/obj/item/instrument/trombone/spectral(T)
else
to_chat(H, "The spooky gods forgot to ship your instrument. Better luck next unlife.")
to_chat(H, "You are the spooky skeleton!")
diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm
index 124102a6bd..e415e73df9 100644
--- a/code/datums/components/storage/concrete/pockets.dm
+++ b/code/datums/components/storage/concrete/pockets.dm
@@ -39,7 +39,7 @@
/obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector,
/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper,
/obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini,
- /obj/item/device/firing_pin
+ /obj/item/firing_pin
))
/datum/component/storage/concrete/pockets/shoes/clown/Initialize()
@@ -49,7 +49,7 @@
/obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector,
/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper,
/obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini,
- /obj/item/device/firing_pin, /obj/item/bikehorn))
+ /obj/item/firing_pin, /obj/item/bikehorn))
/datum/component/storage/concrete/pockets/pocketprotector
max_items = 3
@@ -61,5 +61,5 @@
/obj/item/pen,
/obj/item/toy/crayon,
/obj/item/lipstick,
- /obj/item/device/flashlight/pen,
+ /obj/item/flashlight/pen,
/obj/item/clothing/mask/cigarette))
\ No newline at end of file
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 0b502d4fe6..6c744b3d84 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -237,12 +237,12 @@
/datum/mind/proc/remove_antag_equip()
var/list/Mob_Contents = current.get_contents()
for(var/obj/item/I in Mob_Contents)
- if(istype(I, /obj/item/device/pda))
- var/obj/item/device/pda/P = I
+ if(istype(I, /obj/item/pda))
+ var/obj/item/pda/P = I
P.lock_code = ""
- else if(istype(I, /obj/item/device/radio))
- var/obj/item/device/radio/R = I
+ else if(istype(I, /obj/item/radio))
+ var/obj/item/radio/R = I
R.traitor_frequency = 0
/datum/mind/proc/remove_all_antag() //For the Lazy amongst us.
@@ -264,8 +264,8 @@
. = TRUE
var/list/all_contents = traitor_mob.GetAllContents()
- var/obj/item/device/pda/PDA = locate() in all_contents
- var/obj/item/device/radio/R = locate() in all_contents
+ var/obj/item/pda/PDA = locate() in all_contents
+ var/obj/item/radio/R = locate() in all_contents
var/obj/item/pen/P
if (PDA) // Prioritize PDA pen, otherwise the pocket protector pens will be chosen, which causes numerous ahelps about missing uplink
diff --git a/code/datums/wires/_wires.dm b/code/datums/wires/_wires.dm
index 1fd50e9776..0e38475c85 100644
--- a/code/datums/wires/_wires.dm
+++ b/code/datums/wires/_wires.dm
@@ -6,8 +6,8 @@
if(I.tool_behaviour == TOOL_WIRECUTTER || I.tool_behaviour == TOOL_MULTITOOL)
return TRUE
- if(istype(I, /obj/item/device/assembly))
- var/obj/item/device/assembly/A = I
+ if(istype(I, /obj/item/assembly))
+ var/obj/item/assembly/A = I
if(A.attachable)
return TRUE
@@ -149,13 +149,13 @@
/datum/wires/proc/pulse_color(color, mob/living/user)
pulse(get_wire(color), user)
-/datum/wires/proc/pulse_assembly(obj/item/device/assembly/S)
+/datum/wires/proc/pulse_assembly(obj/item/assembly/S)
for(var/color in assemblies)
if(S == assemblies[color])
pulse_color(color)
return TRUE
-/datum/wires/proc/attach_assembly(color, obj/item/device/assembly/S)
+/datum/wires/proc/attach_assembly(color, obj/item/assembly/S)
if(S && istype(S) && S.attachable && !is_attached(color))
assemblies[color] = S
S.forceMove(holder)
@@ -163,7 +163,7 @@
return S
/datum/wires/proc/detach_assembly(color)
- var/obj/item/device/assembly/S = get_attached(color)
+ var/obj/item/assembly/S = get_attached(color)
if(S && istype(S))
assemblies -= color
S.connected = null
@@ -229,7 +229,7 @@
reveal_wires = TRUE
// Same for anyone with an abductor multitool.
- else if(user.is_holding_item_of_type(/obj/item/device/multitool/abductor))
+ else if(user.is_holding_item_of_type(/obj/item/multitool/abductor))
reveal_wires = TRUE
// Station blueprints do that too, but only if the wires are not randomized.
@@ -280,8 +280,8 @@
. = TRUE
else
I = L.get_active_held_item()
- if(istype(I, /obj/item/device/assembly))
- var/obj/item/device/assembly/A = I
+ if(istype(I, /obj/item/assembly))
+ var/obj/item/assembly/A = I
if(A.attachable)
if(!L.temporarilyRemoveItemFromInventory(A))
return
diff --git a/code/datums/wires/radio.dm b/code/datums/wires/radio.dm
index 37d44a1bb0..a1118da6d7 100644
--- a/code/datums/wires/radio.dm
+++ b/code/datums/wires/radio.dm
@@ -1,5 +1,5 @@
/datum/wires/radio
- holder_type = /obj/item/device/radio
+ holder_type = /obj/item/radio
proper_name = "Radio"
/datum/wires/radio/New(atom/holder)
@@ -10,11 +10,11 @@
..()
/datum/wires/radio/interactable(mob/user)
- var/obj/item/device/radio/R = holder
+ var/obj/item/radio/R = holder
return R.unscrewed
/datum/wires/radio/on_pulse(index)
- var/obj/item/device/radio/R = holder
+ var/obj/item/radio/R = holder
switch(index)
if(WIRE_SIGNAL)
R.listening = !R.listening
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index 100a0d7dd2..e682960e2e 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -421,7 +421,7 @@
/*~~~~~~~~~~~~
Circutry!
~~~~~~~~~~~~~*/
-/obj/item/device/electronic_assembly/proc/diag_hud_set_circuithealth(hide = FALSE)
+/obj/item/electronic_assembly/proc/diag_hud_set_circuithealth(hide = FALSE)
var/image/holder = hud_list[DIAG_CIRCUIT_HUD]
var/icon/I = icon(icon, icon_state, dir)
holder.pixel_y = I.Height() - world.icon_size
@@ -430,7 +430,7 @@
else
holder.icon_state = "huddiag[RoundDiagBar(obj_integrity/max_integrity)]"
-/obj/item/device/electronic_assembly/proc/diag_hud_set_circuitcell(hide = FALSE)
+/obj/item/electronic_assembly/proc/diag_hud_set_circuitcell(hide = FALSE)
var/image/holder = hud_list[DIAG_BATT_HUD]
var/icon/I = icon(icon, icon_state, dir)
holder.pixel_y = I.Height() - world.icon_size
@@ -442,7 +442,7 @@
else
holder.icon_state = "hudnobatt"
-/obj/item/device/electronic_assembly/proc/diag_hud_set_circuitstat(hide = FALSE) //On, On and dangerous, or Off
+/obj/item/electronic_assembly/proc/diag_hud_set_circuitstat(hide = FALSE) //On, On and dangerous, or Off
var/image/holder = hud_list[DIAG_STAT_HUD]
var/icon/I = icon(icon, icon_state, dir)
holder.pixel_y = I.Height() - world.icon_size
@@ -457,7 +457,7 @@
else //Bot is on and not dangerous
holder.icon_state = prefered_hud_icon
-/obj/item/device/electronic_assembly/proc/diag_hud_set_circuittracking(hide = FALSE)
+/obj/item/electronic_assembly/proc/diag_hud_set_circuittracking(hide = FALSE)
var/image/holder = hud_list[DIAG_TRACK_HUD]
var/icon/I = icon(icon, icon_state, dir)
holder.pixel_y = I.Height() - world.icon_size
diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm
index f403908f67..03de28e0ff 100644
--- a/code/game/gamemodes/clock_cult/clock_cult.dm
+++ b/code/game/gamemodes/clock_cult/clock_cult.dm
@@ -258,12 +258,12 @@ Credit where due:
uniform = /obj/item/clothing/under/chameleon/ratvar
shoes = /obj/item/clothing/shoes/sneakers/black
back = /obj/item/storage/backpack
- ears = /obj/item/device/radio/headset
+ ears = /obj/item/radio/headset
gloves = /obj/item/clothing/gloves/color/yellow
belt = /obj/item/storage/belt/utility/servant
backpack_contents = list(/obj/item/storage/box/engineer = 1, \
/obj/item/clockwork/replica_fabricator = 1, /obj/item/stack/tile/brass/fifty = 1, /obj/item/paper/servant_primer = 1)
- id = /obj/item/device/pda
+ id = /obj/item/pda
var/plasmaman //We use this to determine if we should activate internals in post_equip()
/datum/outfit/servant_of_ratvar/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -276,7 +276,7 @@ Credit where due:
/datum/outfit/servant_of_ratvar/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
var/obj/item/card/id/W = new(H)
- var/obj/item/device/pda/PDA = H.wear_id
+ var/obj/item/pda/PDA = H.wear_id
W.assignment = "Assistant"
W.access += ACCESS_MAINT_TUNNELS
W.registered_name = H.real_name
diff --git a/code/game/gamemodes/clown_ops/clown_ops.dm b/code/game/gamemodes/clown_ops/clown_ops.dm
index 6b96cefa13..75df27ffca 100644
--- a/code/game/gamemodes/clown_ops/clown_ops.dm
+++ b/code/game/gamemodes/clown_ops/clown_ops.dm
@@ -39,7 +39,7 @@
mask = /obj/item/clothing/mask/gas/clown_hat
gloves = /obj/item/clothing/gloves/combat
back = /obj/item/storage/backpack/clown
- ears = /obj/item/device/radio/headset/syndicate/alt
+ ears = /obj/item/radio/headset/syndicate/alt
l_pocket = /obj/item/pinpointer/nuke/syndicate
r_pocket = /obj/item/bikehorn
id = /obj/item/card/id/syndicate
@@ -48,7 +48,7 @@
/obj/item/reagent_containers/spray/waterflower/lube)
implants = list(/obj/item/implant/sad_trombone)
- uplink_type = /obj/item/device/radio/uplink/clownop
+ uplink_type = /obj/item/radio/uplink/clownop
/datum/outfit/syndicate/clownop/no_crystals
tc = 0
@@ -62,5 +62,5 @@
/datum/outfit/syndicate/clownop/leader
name = "Clown Operative Leader - Basic"
id = /obj/item/card/id/syndicate/nuke_leader
- r_hand = /obj/item/device/nuclear_challenge/clownops
+ r_hand = /obj/item/nuclear_challenge/clownops
command_radio = TRUE
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 11e4815722..b6ea8c5234 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -125,7 +125,7 @@
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
back = /obj/item/storage/backpack
- ears = /obj/item/device/radio/headset/syndicate/alt
+ ears = /obj/item/radio/headset/syndicate/alt
l_pocket = /obj/item/pinpointer/nuke/syndicate
id = /obj/item/card/id/syndicate
belt = /obj/item/gun/ballistic/automatic/pistol
@@ -134,27 +134,27 @@
var/tc = 25
var/command_radio = FALSE
- var/uplink_type = /obj/item/device/radio/uplink/nuclear
+ var/uplink_type = /obj/item/radio/uplink/nuclear
/datum/outfit/syndicate/leader
name = "Syndicate Leader - Basic"
id = /obj/item/card/id/syndicate/nuke_leader
- r_hand = /obj/item/device/nuclear_challenge
+ r_hand = /obj/item/nuclear_challenge
command_radio = TRUE
/datum/outfit/syndicate/no_crystals
tc = 0
/datum/outfit/syndicate/post_equip(mob/living/carbon/human/H)
- var/obj/item/device/radio/R = H.ears
+ var/obj/item/radio/R = H.ears
R.set_frequency(FREQ_SYNDICATE)
R.freqlock = TRUE
if(command_radio)
R.command = TRUE
if(tc)
- var/obj/item/device/radio/uplink/U = new uplink_type(H, H.key, tc)
+ var/obj/item/radio/uplink/U = new uplink_type(H, H.key, tc)
H.equip_to_slot_or_del(U, slot_in_backpack)
var/obj/item/implant/weapons_auth/W = new/obj/item/implant/weapons_auth(H)
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 8c162c600e..04753e3d50 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -687,7 +687,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
/datum/objective/steal_five_of_type/summon_magic
explanation_text = "Steal at least five magical artefacts!"
- wanted_items = list(/obj/item/spellbook, /obj/item/gun/magic, /obj/item/clothing/suit/space/hardsuit/wizard, /obj/item/scrying, /obj/item/antag_spawner/contract, /obj/item/device/necromantic_stone)
+ wanted_items = list(/obj/item/spellbook, /obj/item/gun/magic, /obj/item/clothing/suit/space/hardsuit/wizard, /obj/item/scrying, /obj/item/antag_spawner/contract, /obj/item/necromantic_stone)
/datum/objective/steal_five_of_type/check_completion()
var/list/datum/mind/owners = get_owners()
diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm
index 15e07527b9..64fda883b9 100644
--- a/code/game/gamemodes/objective_items.dm
+++ b/code/game/gamemodes/objective_items.dm
@@ -130,10 +130,10 @@
/datum/objective_item/steal/functionalai
name = "a functional AI."
- targetitem = /obj/item/device/aicard
+ targetitem = /obj/item/aicard
difficulty = 20 //beyond the impossible
-/datum/objective_item/steal/functionalai/check_special_completion(obj/item/device/aicard/C)
+/datum/objective_item/steal/functionalai/check_special_completion(obj/item/aicard/C)
for(var/mob/living/silicon/ai/A in C)
if(isAI(A) && A.stat != DEAD) //See if any AI's are alive inside that card.
return 1
@@ -216,7 +216,7 @@
/datum/objective_item/special/laserpointer
name = "a laser pointer."
- targetitem = /obj/item/device/laser_pointer
+ targetitem = /obj/item/laser_pointer
difficulty = 5
/datum/objective_item/special/corgimeat
diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm
index 13b4234622..64aaeebacd 100644
--- a/code/game/gamemodes/sandbox/h_sandbox.dm
+++ b/code/game/gamemodes/sandbox/h_sandbox.dm
@@ -27,7 +27,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE)
//items that shouldn't spawn on the floor because they would bug or act weird
var/global/list/spawn_forbidden = list(
/obj/item/tk_grab, /obj/item/implant, // not implanter, the actual thing that is inside you
- /obj/item/assembly, /obj/item/device/onetankbomb, /obj/item/device/pda/ai,
+ /obj/item/assembly, /obj/item/onetankbomb, /obj/item/pda/ai,
/obj/item/smallDelivery, /obj/item/projectile,
/obj/item/borg/sight, /obj/item/borg/stun, /obj/item/robot_module)
@@ -39,9 +39,9 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE)
"Spawn Emergency Air Tank" = "hsbspawn&path=[/obj/item/tank/internals/emergency_oxygen/double]",
"Standard Tools",
- "Spawn Flashlight" = "hsbspawn&path=[/obj/item/device/flashlight]",
+ "Spawn Flashlight" = "hsbspawn&path=[/obj/item/flashlight]",
"Spawn Toolbox" = "hsbspawn&path=[/obj/item/storage/toolbox/mechanical]",
- "Spawn Light Replacer" = "hsbspawn&path=[/obj/item/device/lightreplacer]",
+ "Spawn Light Replacer" = "hsbspawn&path=[/obj/item/lightreplacer]",
"Spawn Medical Kit" = "hsbspawn&path=[/obj/item/storage/firstaid/regular]",
"Spawn All-Access ID" = "hsbaaid",
diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm
index 3e121ad9ed..61e862452f 100644
--- a/code/game/machinery/Beacon.dm
+++ b/code/game/machinery/Beacon.dm
@@ -9,7 +9,7 @@
anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 0
- var/obj/item/device/beacon/Beacon
+ var/obj/item/beacon/Beacon
/obj/machinery/bluespace_beacon/Initialize()
. = ..()
diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm
index 24cfc86f85..e38775b749 100644
--- a/code/game/machinery/PDApainter.dm
+++ b/code/game/machinery/PDApainter.dm
@@ -5,7 +5,7 @@
icon_state = "pdapainter"
density = TRUE
anchored = TRUE
- var/obj/item/device/pda/storedpda = null
+ var/obj/item/pda/storedpda = null
var/list/colorlist = list()
max_integrity = 200
@@ -30,16 +30,16 @@
/obj/machinery/pdapainter/Initialize()
. = ..()
var/list/blocked = list(
- /obj/item/device/pda/ai/pai,
- /obj/item/device/pda/ai,
- /obj/item/device/pda/heads,
- /obj/item/device/pda/clear,
- /obj/item/device/pda/syndicate,
- /obj/item/device/pda/chameleon,
- /obj/item/device/pda/chameleon/broken)
+ /obj/item/pda/ai/pai,
+ /obj/item/pda/ai,
+ /obj/item/pda/heads,
+ /obj/item/pda/clear,
+ /obj/item/pda/syndicate,
+ /obj/item/pda/chameleon,
+ /obj/item/pda/chameleon/broken)
- for(var/P in typesof(/obj/item/device/pda) - blocked)
- var/obj/item/device/pda/D = new P
+ for(var/P in typesof(/obj/item/pda) - blocked)
+ var/obj/item/pda/D = new P
//D.name = "PDA Style [colorlist.len+1]" //Gotta set the name, otherwise it all comes up as "PDA"
D.name = D.icon_state //PDAs don't have unique names, but using the sprite names works.
@@ -69,7 +69,7 @@
power_change()
return
- else if(istype(O, /obj/item/device/pda))
+ else if(istype(O, /obj/item/pda))
if(storedpda)
to_chat(user, "There is already a PDA inside!")
return
@@ -110,7 +110,7 @@
return
if(storedpda)
- var/obj/item/device/pda/P
+ var/obj/item/pda/P
P = input(user, "Select your color!", "PDA Painting") as null|anything in colorlist
if(!P)
return
diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm
index 63737f9542..78b43e2ee2 100644
--- a/code/game/machinery/announcement_system.dm
+++ b/code/game/machinery/announcement_system.dm
@@ -17,7 +17,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
circuit = /obj/item/circuitboard/machine/announcement_system
- var/obj/item/device/radio/headset/radio
+ var/obj/item/radio/headset/radio
var/arrival = "%PERSON has signed up as %RANK"
var/arrivalToggle = 1
var/newhead = "%PERSON, %RANK, is the department head."
@@ -30,7 +30,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
/obj/machinery/announcement_system/Initialize()
. = ..()
GLOB.announcement_systems += src
- radio = new /obj/item/device/radio/headset/ai(src)
+ radio = new /obj/item/radio/headset/ai(src)
update_icon()
/obj/machinery/announcement_system/update_icon()
@@ -67,7 +67,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
update_icon()
else if(default_deconstruction_crowbar(P))
return
- else if(istype(P, /obj/item/device/multitool) && panel_open && (stat & BROKEN))
+ else if(istype(P, /obj/item/multitool) && panel_open && (stat & BROKEN))
to_chat(user, "You reset [src]'s firmware.")
stat &= ~BROKEN
update_icon()
diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm
index dc79cf1406..c751ba007a 100644
--- a/code/game/machinery/bank_machine.dm
+++ b/code/game/machinery/bank_machine.dm
@@ -5,7 +5,7 @@
idle_power_usage = 100
var/siphoning = FALSE
var/next_warning = 0
- var/obj/item/device/radio/radio
+ var/obj/item/radio/radio
var/radio_channel = "Common"
var/minimum_time_between_warnings = 400
diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
index 84ed3d457c..9511e8d0d4 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -5,7 +5,7 @@
icon_state = "doorctrl"
var/skin = "doorctrl"
power_channel = ENVIRON
- var/obj/item/device/assembly/device
+ var/obj/item/assembly/device
var/obj/item/electronics/airlock/board
var/device_type = null
var/id = null
@@ -66,7 +66,7 @@
return
if(panel_open)
- if(!device && istype(W, /obj/item/device/assembly))
+ if(!device && istype(W, /obj/item/assembly))
if(!user.transferItemToLoc(W, src))
to_chat(user, "\The [W] is stuck to you!")
return
@@ -117,8 +117,8 @@
return attack_ai(user)
/obj/machinery/button/proc/setup_device()
- if(id && istype(device, /obj/item/device/assembly/control))
- var/obj/item/device/assembly/control/A = device
+ if(id && istype(device, /obj/item/assembly/control))
+ var/obj/item/assembly/control/A = device
A.id = id
initialized_button = 1
@@ -183,11 +183,11 @@
/obj/machinery/button/door/setup_device()
if(!device)
if(normaldoorcontrol)
- var/obj/item/device/assembly/control/airlock/A = new(src)
+ var/obj/item/assembly/control/airlock/A = new(src)
device = A
A.specialfunctions = specialfunctions
else
- device = new /obj/item/device/assembly/control(src)
+ device = new /obj/item/assembly/control(src)
..()
/obj/machinery/button/massdriver
@@ -195,28 +195,28 @@
desc = "A remote control switch for a mass driver."
icon_state = "launcher"
skin = "launcher"
- device_type = /obj/item/device/assembly/control/massdriver
+ device_type = /obj/item/assembly/control/massdriver
/obj/machinery/button/ignition
name = "ignition switch"
desc = "A remote control switch for a mounted igniter."
icon_state = "launcher"
skin = "launcher"
- device_type = /obj/item/device/assembly/control/igniter
+ device_type = /obj/item/assembly/control/igniter
/obj/machinery/button/flasher
name = "flasher button"
desc = "A remote control switch for a mounted flasher."
icon_state = "launcher"
skin = "launcher"
- device_type = /obj/item/device/assembly/control/flasher
+ device_type = /obj/item/assembly/control/flasher
/obj/machinery/button/crematorium
name = "crematorium igniter"
desc = "Burn baby burn!"
icon_state = "launcher"
skin = "launcher"
- device_type = /obj/item/device/assembly/control/crematorium
+ device_type = /obj/item/assembly/control/crematorium
req_access = list()
id = 1
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index e0178d8885..d19270f04e 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -24,7 +24,7 @@
anchored = TRUE
var/start_active = FALSE //If it ignores the random chance to start broken on round start
var/invuln = null
- var/obj/item/device/camera_bug/bug = null
+ var/obj/item/camera_bug/bug = null
var/obj/structure/camera_assembly/assembly = null
var/area/myarea = null
@@ -175,7 +175,7 @@
/obj/machinery/camera/attackby(obj/item/I, mob/living/user, params)
// UPGRADES
if(panel_open)
- if(istype(I, /obj/item/device/analyzer))
+ if(istype(I, /obj/item/analyzer))
if(!isXRay())
if(!user.temporarilyRemoveItemFromInventory(I))
return
@@ -195,7 +195,7 @@
to_chat(user, "[src] already has that upgrade!")
return
- else if(istype(I, /obj/item/device/assembly/prox_sensor))
+ else if(istype(I, /obj/item/assembly/prox_sensor))
if(!isMotion())
if(!user.temporarilyRemoveItemFromInventory(I))
return
@@ -207,10 +207,10 @@
return
// OTHER
- if((istype(I, /obj/item/paper) || istype(I, /obj/item/device/pda)) && isliving(user))
+ if((istype(I, /obj/item/paper) || istype(I, /obj/item/pda)) && isliving(user))
var/mob/living/U = user
var/obj/item/paper/X = null
- var/obj/item/device/pda/P = null
+ var/obj/item/pda/P = null
var/itemname = ""
var/info = ""
@@ -239,7 +239,7 @@
O << browse(text("[][]", itemname, info), text("window=[]", itemname))
return
- else if(istype(I, /obj/item/device/camera_bug))
+ else if(istype(I, /obj/item/camera_bug))
if(!can_use())
to_chat(user, "Camera non-functional.")
return
diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
index d8dab302d8..7eac36dc96 100644
--- a/code/game/machinery/camera/camera_assembly.dm
+++ b/code/game/machinery/camera/camera_assembly.dm
@@ -14,7 +14,7 @@
icon_state = "camera1"
max_integrity = 150
// Motion, EMP-Proof, X-Ray
- var/static/list/possible_upgrades = typecacheof(list(/obj/item/device/assembly/prox_sensor, /obj/item/stack/sheet/mineral/plasma, /obj/item/device/analyzer))
+ var/static/list/possible_upgrades = typecacheof(list(/obj/item/assembly/prox_sensor, /obj/item/stack/sheet/mineral/plasma, /obj/item/analyzer))
var/list/upgrades
var/state = 1
diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
index ba72d9676d..e330d015df 100644
--- a/code/game/machinery/camera/presets.dm
+++ b/code/game/machinery/camera/presets.dm
@@ -79,10 +79,10 @@
upgrades |= CAMERA_UPGRADE_EMP_PROOF
/obj/machinery/camera/proc/upgradeXRay()
- assembly.upgrades.Add(new /obj/item/device/analyzer(assembly))
+ assembly.upgrades.Add(new /obj/item/analyzer(assembly))
upgrades |= CAMERA_UPGRADE_XRAY
// If you are upgrading Motion, and it isn't in the camera's Initialize(), add it to the machines list.
/obj/machinery/camera/proc/upgradeMotion()
- assembly.upgrades.Add(new /obj/item/device/assembly/prox_sensor(assembly))
+ assembly.upgrades.Add(new /obj/item/assembly/prox_sensor(assembly))
upgrades |= CAMERA_UPGRADE_MOTION
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 3482cc2ec7..54fcbc722f 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -30,8 +30,8 @@
var/grab_ghost_when = CLONER_MATURE_CLONE
var/internal_radio = TRUE
- var/obj/item/device/radio/radio
- var/radio_key = /obj/item/device/encryptionkey/headset_med
+ var/obj/item/radio/radio
+ var/radio_key = /obj/item/encryptionkey/headset_med
var/radio_channel = "Medical"
var/obj/effect/countdown/clonepod/countdown
@@ -285,8 +285,8 @@
if(default_deconstruction_crowbar(W))
return
- if(istype(W, /obj/item/device/multitool))
- var/obj/item/device/multitool/P = W
+ if(istype(W, /obj/item/multitool))
+ var/obj/item/multitool/P = W
if(istype(P.buffer, /obj/machinery/computer/cloning))
if(get_area(P.buffer) != get_area(src))
diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm
index c6d15bf726..43e736b6ef 100644
--- a/code/game/machinery/computer/aifixer.dm
+++ b/code/game/machinery/computer/aifixer.dm
@@ -119,7 +119,7 @@
else
add_overlay("ai-fixer-empty")
-/obj/machinery/computer/aifixer/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card)
+/obj/machinery/computer/aifixer/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card)
if(!..())
return
//Downloading AI from card to terminal.
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index db8938b5cf..b43ffdfec8 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -123,8 +123,8 @@
to_chat(user, "You insert [W].")
playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
src.updateUsrDialog()
- else if(istype(W, /obj/item/device/multitool))
- var/obj/item/device/multitool/P = W
+ else if(istype(W, /obj/item/multitool))
+ var/obj/item/multitool/P = W
if(istype(P.buffer, /obj/machinery/clonepod))
if(get_area(P.buffer) != get_area(src))
@@ -330,7 +330,7 @@
else if (src.menu == 4)
var/obj/item/card/id/C = usr.get_active_held_item()
- if (istype(C)||istype(C, /obj/item/device/pda))
+ if (istype(C)||istype(C, /obj/item/pda))
if(src.check_access(C))
src.temp = "[src.active_record.fields["name"]] => Record deleted."
src.records.Remove(active_record)
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 5bd5dc1271..9f50afdfee 100755
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -97,8 +97,8 @@
if("swipeidseclevel")
var/mob/M = usr
var/obj/item/card/id/I = M.get_active_held_item()
- if (istype(I, /obj/item/device/pda))
- var/obj/item/device/pda/pda = I
+ if (istype(I, /obj/item/pda))
+ var/obj/item/pda/pda = I
I = pda.id
if (I && istype(I))
if(ACCESS_CAPTAIN in I.access)
diff --git a/code/game/machinery/computer/launchpad_control.dm b/code/game/machinery/computer/launchpad_control.dm
index a811fa7601..fd785e5bc6 100644
--- a/code/game/machinery/computer/launchpad_control.dm
+++ b/code/game/machinery/computer/launchpad_control.dm
@@ -18,8 +18,8 @@
return
/obj/machinery/computer/launchpad/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/device/multitool))
- var/obj/item/device/multitool/M = W
+ if(istype(W, /obj/item/multitool))
+ var/obj/item/multitool/M = W
if(M.buffer && istype(M.buffer, /obj/machinery/launchpad))
if(LAZYLEN(launchpads) < maximum_pads)
launchpads |= M.buffer
diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm
index 786b86605c..978f7adcf0 100644
--- a/code/game/machinery/computer/teleporter.dm
+++ b/code/game/machinery/computer/teleporter.dm
@@ -5,7 +5,7 @@
icon_keyboard = "teleport_key"
light_color = LIGHT_COLOR_BLUE
circuit = /obj/item/circuitboard/computer/teleporter
- var/obj/item/device/gps/locked
+ var/obj/item/gps/locked
var/regime_set = "Teleporter"
var/id
var/obj/machinery/teleport/station/power_station
@@ -34,8 +34,8 @@
return power_station
/obj/machinery/computer/teleporter/attackby(obj/I, mob/living/user, params)
- if(istype(I, /obj/item/device/gps))
- var/obj/item/device/gps/L = I
+ if(istype(I, /obj/item/gps))
+ var/obj/item/gps/L = I
if(L.locked_location && !(stat & (NOPOWER|BROKEN)))
if(!user.transferItemToLoc(L, src))
to_chat(user, "\the [I] is stuck to your hand, you cannot put it in \the [src]!")
@@ -153,7 +153,7 @@
var/list/L = list()
var/list/areaindex = list()
if(regime_set == "Teleporter")
- for(var/obj/item/device/beacon/R in GLOB.teleportbeacons)
+ for(var/obj/item/beacon/R in GLOB.teleportbeacons)
if(is_eligible(R))
var/area/A = get_area(R)
L[avoid_assoc_duplicate_keys(A.name, areaindex)] = R
diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm
index ed7912119c..0ac97f597b 100644
--- a/code/game/machinery/dance_machine.dm
+++ b/code/game/machinery/dance_machine.dm
@@ -156,56 +156,56 @@
var/turf/cen = get_turf(src)
FOR_DVIEW(var/turf/t, 3, get_turf(src),INVISIBILITY_LIGHTING)
if(t.x == cen.x && t.y > cen.y)
- var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t)
+ var/obj/item/flashlight/spotlight/L = new /obj/item/flashlight/spotlight(t)
L.light_color = LIGHT_COLOR_RED
L.light_power = 30-(get_dist(src,L)*8)
L.range = 1+get_dist(src, L)
spotlights+=L
continue
if(t.x == cen.x && t.y < cen.y)
- var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t)
+ var/obj/item/flashlight/spotlight/L = new /obj/item/flashlight/spotlight(t)
L.light_color = LIGHT_COLOR_PURPLE
L.light_power = 30-(get_dist(src,L)*8)
L.range = 1+get_dist(src, L)
spotlights+=L
continue
if(t.x > cen.x && t.y == cen.y)
- var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t)
+ var/obj/item/flashlight/spotlight/L = new /obj/item/flashlight/spotlight(t)
L.light_color = LIGHT_COLOR_YELLOW
L.light_power = 30-(get_dist(src,L)*8)
L.range = 1+get_dist(src, L)
spotlights+=L
continue
if(t.x < cen.x && t.y == cen.y)
- var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t)
+ var/obj/item/flashlight/spotlight/L = new /obj/item/flashlight/spotlight(t)
L.light_color = LIGHT_COLOR_GREEN
L.light_power = 30-(get_dist(src,L)*8)
L.range = 1+get_dist(src, L)
spotlights+=L
continue
if((t.x+1 == cen.x && t.y+1 == cen.y) || (t.x+2==cen.x && t.y+2 == cen.y))
- var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t)
+ var/obj/item/flashlight/spotlight/L = new /obj/item/flashlight/spotlight(t)
L.light_color = LIGHT_COLOR_ORANGE
L.light_power = 30-(get_dist(src,L)*8)
L.range = 1.4+get_dist(src, L)
spotlights+=L
continue
if((t.x-1 == cen.x && t.y-1 == cen.y) || (t.x-2==cen.x && t.y-2 == cen.y))
- var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t)
+ var/obj/item/flashlight/spotlight/L = new /obj/item/flashlight/spotlight(t)
L.light_color = LIGHT_COLOR_CYAN
L.light_power = 30-(get_dist(src,L)*8)
L.range = 1.4+get_dist(src, L)
spotlights+=L
continue
if((t.x-1 == cen.x && t.y+1 == cen.y) || (t.x-2==cen.x && t.y+2 == cen.y))
- var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t)
+ var/obj/item/flashlight/spotlight/L = new /obj/item/flashlight/spotlight(t)
L.light_color = LIGHT_COLOR_BLUEGREEN
L.light_power = 30-(get_dist(src,L)*8)
L.range = 1.4+get_dist(src, L)
spotlights+=L
continue
if((t.x+1 == cen.x && t.y-1 == cen.y) || (t.x+2==cen.x && t.y-2 == cen.y))
- var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t)
+ var/obj/item/flashlight/spotlight/L = new /obj/item/flashlight/spotlight(t)
L.light_color = LIGHT_COLOR_BLUE
L.light_power = 30-(get_dist(src,L)*8)
L.range = 1.4+get_dist(src, L)
@@ -244,7 +244,7 @@
for(var/obj/reveal in sparkles)
reveal.alpha = 255
while(active)
- for(var/obj/item/device/flashlight/spotlight/glow in spotlights) // The multiples reflects custom adjustments to each colors after dozens of tests
+ for(var/obj/item/flashlight/spotlight/glow in spotlights) // The multiples reflects custom adjustments to each colors after dozens of tests
if(QDELETED(src) || !active || QDELETED(glow))
return
if(glow.light_color == LIGHT_COLOR_RED)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 5c4f485cfa..c45866af4c 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -72,7 +72,7 @@
var/justzap = FALSE
var/obj/item/electronics/airlock/electronics
var/shockCooldown = FALSE //Prevents multiple shocks from happening
- var/obj/item/device/doorCharge/charge //If applied, causes an explosion upon opening the door
+ var/obj/item/doorCharge/charge //If applied, causes an explosion upon opening the door
var/obj/item/note //Any papers pinned to the airlock
var/detonated = FALSE
var/abandoned = FALSE
@@ -939,7 +939,7 @@
cable.plugin(src, user)
else if(istype(C, /obj/item/airlock_painter))
change_paintjob(C, user)
- else if(istype(C, /obj/item/device/doorCharge))
+ else if(istype(C, /obj/item/doorCharge))
if(!panel_open || security_level)
to_chat(user, "The maintenance panel must be open to apply [C]!")
return
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index 3f0d28705a..3ab819f275 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -33,7 +33,7 @@
var/timing = FALSE // boolean, true/1 timer is on, false/0 means it's not timing
var/list/obj/machinery/targets = list()
- var/obj/item/device/radio/Radio //needed to send messages to sec radio
+ var/obj/item/radio/Radio //needed to send messages to sec radio
maptext_height = 26
maptext_width = 32
@@ -41,7 +41,7 @@
/obj/machinery/door_timer/Initialize()
. = ..()
- Radio = new/obj/item/device/radio(src)
+ Radio = new/obj/item/radio(src)
Radio.listening = 0
/obj/machinery/door_timer/Initialize()
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 3754d52130..ace99a5385 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -447,8 +447,8 @@
constructionStep = CONSTRUCTION_GUTTED
update_icon()
return
- if(istype(C, /obj/item/device/electroadaptive_pseudocircuit))
- var/obj/item/device/electroadaptive_pseudocircuit/P = C
+ if(istype(C, /obj/item/electroadaptive_pseudocircuit))
+ var/obj/item/electroadaptive_pseudocircuit/P = C
if(!P.adapt_circuit(user, 30))
return
user.visible_message("[user] fabricates a circuit and places it into [src].", \
diff --git a/code/game/machinery/exp_cloner.dm b/code/game/machinery/exp_cloner.dm
index 41d317a30f..d2960de159 100644
--- a/code/game/machinery/exp_cloner.dm
+++ b/code/game/machinery/exp_cloner.dm
@@ -141,8 +141,8 @@
LAZYREMOVE(pods, pod)
/obj/machinery/computer/prototype_cloning/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/device/multitool))
- var/obj/item/device/multitool/P = W
+ if(istype(W, /obj/item/multitool))
+ var/obj/item/multitool/P = W
if(istype(P.buffer, /obj/machinery/clonepod/experimental))
if(get_area(P.buffer) != get_area(src))
diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
index bb05111f19..0bdbd8976a 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -172,7 +172,7 @@
switch(buildstage)
if(2)
- if(istype(W, /obj/item/device/multitool))
+ if(istype(W, /obj/item/multitool))
detecting = !detecting
if (src.detecting)
user.visible_message("[user] has reconnected [src]'s detecting unit!", "You reconnect [src]'s detecting unit.")
@@ -221,8 +221,8 @@
update_icon()
return
- else if(istype(W, /obj/item/device/electroadaptive_pseudocircuit))
- var/obj/item/device/electroadaptive_pseudocircuit/P = W
+ else if(istype(W, /obj/item/electroadaptive_pseudocircuit))
+ var/obj/item/electroadaptive_pseudocircuit/P = W
if(!P.adapt_circuit(user, 15))
return
user.visible_message("[user] fabricates a circuit and places it into [src].", \
diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm
index 9bed526992..157553da0c 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -8,7 +8,7 @@
max_integrity = 250
integrity_failure = 100
anchored = TRUE
- var/obj/item/device/assembly/flash/handheld/bulb
+ var/obj/item/assembly/flash/handheld/bulb
var/id = null
var/range = 2 //this is roughly the size of brig cell
var/last_flash = 0 //Don't want it getting spammed like regular flashes
@@ -60,7 +60,7 @@
bulb = null
power_change()
- else if (istype(W, /obj/item/device/assembly/flash/handheld))
+ else if (istype(W, /obj/item/assembly/flash/handheld))
if (!bulb)
if(!user.transferItemToLoc(W, src))
return
diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm
index 83ffadd8b9..93a6cfca62 100644
--- a/code/game/machinery/launch_pad.dm
+++ b/code/game/machinery/launch_pad.dm
@@ -31,8 +31,8 @@
return
if(panel_open)
- if(istype(I, /obj/item/device/multitool))
- var/obj/item/device/multitool/M = I
+ if(istype(I, /obj/item/multitool))
+ var/obj/item/multitool/M = I
M.buffer = src
to_chat(user, "You save the data in the [I.name]'s buffer.")
return 1
@@ -182,8 +182,8 @@
closed = TRUE
/obj/machinery/launchpad/briefcase/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/device/launchpad_remote))
- var/obj/item/device/launchpad_remote/L = I
+ if(istype(I, /obj/item/launchpad_remote))
+ var/obj/item/launchpad_remote/L = I
L.pad = src
to_chat(user, "You link [src] to [L].")
else
@@ -229,14 +229,14 @@
user.transferItemToLoc(src, pad, TRUE)
/obj/item/briefcase_launchpad/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/device/launchpad_remote))
- var/obj/item/device/launchpad_remote/L = I
+ if(istype(I, /obj/item/launchpad_remote))
+ var/obj/item/launchpad_remote/L = I
L.pad = src.pad
to_chat(user, "You link [pad] to [L].")
else
return ..()
-/obj/item/device/launchpad_remote
+/obj/item/launchpad_remote
name = "\improper Launchpad Control Remote"
desc = "Used to teleport objects to and from a portable launchpad."
icon = 'icons/obj/telescience.dmi'
@@ -246,7 +246,7 @@
var/sending = TRUE
var/obj/machinery/launchpad/briefcase/pad
-/obj/item/device/launchpad_remote/ui_interact(mob/user, ui_key = "launchpad_remote", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/obj/item/launchpad_remote/ui_interact(mob/user, ui_key = "launchpad_remote", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "launchpad_remote", "Briefcase Launchpad Remote", 550, 400, master_ui, state) //width, height
@@ -255,7 +255,7 @@
ui.set_autoupdate(TRUE)
-/obj/item/device/launchpad_remote/ui_data(mob/user)
+/obj/item/launchpad_remote/ui_data(mob/user)
var/list/data = list()
data["has_pad"] = pad ? TRUE : FALSE
if(pad)
@@ -270,7 +270,7 @@
data["east_west"] = pad.x_offset > 0 ? "E":"W"
return data
-/obj/item/device/launchpad_remote/proc/teleport(mob/user, obj/machinery/launchpad/pad)
+/obj/item/launchpad_remote/proc/teleport(mob/user, obj/machinery/launchpad/pad)
if(QDELETED(pad))
to_chat(user, "ERROR: Launchpad not responding. Check launchpad integrity.")
return
@@ -279,7 +279,7 @@
return
pad.doteleport(user, sending)
-/obj/item/device/launchpad_remote/ui_act(action, params)
+/obj/item/launchpad_remote/ui_act(action, params)
if(..())
return
switch(action)
diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm
index cec5479641..6c0a5ddd7e 100644
--- a/code/game/machinery/navbeacon.dm
+++ b/code/game/machinery/navbeacon.dm
@@ -89,7 +89,7 @@
updateicon()
- else if (istype(I, /obj/item/card/id)||istype(I, /obj/item/device/pda))
+ else if (istype(I, /obj/item/card/id)||istype(I, /obj/item/pda))
if(open)
if (src.allowed(user))
src.locked = !src.locked
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index ecdb7873e0..e2b06b333c 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -798,7 +798,7 @@ GLOBAL_LIST_EMPTY(allCasters)
var/list/nametemp = list()
var/find
var/datum/picture/selection
- var/obj/item/device/camera/siliconcam/targetcam = null
+ var/obj/item/camera/siliconcam/targetcam = null
if(isAI(user))
var/mob/living/silicon/ai/R = user
targetcam = R.aicamera
@@ -830,8 +830,8 @@ GLOBAL_LIST_EMPTY(allCasters)
if(ishuman(user))
var/mob/living/carbon/human/human_user = user
if(human_user.wear_id)
- if(istype(human_user.wear_id, /obj/item/device/pda))
- var/obj/item/device/pda/P = human_user.wear_id
+ if(istype(human_user.wear_id, /obj/item/pda))
+ var/obj/item/pda/P = human_user.wear_id
if(P.id)
scanned_user = "[P.id.registered_name] ([P.id.assignment])"
else
diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm
index 615141869d..f80532acaa 100644
--- a/code/game/machinery/porta_turret/portable_turret.dm
+++ b/code/game/machinery/porta_turret/portable_turret.dm
@@ -254,7 +254,7 @@
if(prob(50))
new /obj/item/stack/sheet/metal(loc, rand(1,4))
if(prob(50))
- new /obj/item/device/assembly/prox_sensor(loc)
+ new /obj/item/assembly/prox_sensor(loc)
else
to_chat(user, "You remove the turret but did not manage to salvage anything.")
qdel(src)
@@ -286,8 +286,8 @@
to_chat(user, "Controls are now [locked ? "locked" : "unlocked"].")
else
to_chat(user, "Access denied.")
- else if(istype(I, /obj/item/device/multitool) && !locked)
- var/obj/item/device/multitool/M = I
+ else if(istype(I, /obj/item/multitool) && !locked)
+ var/obj/item/multitool/M = I
M.buffer = src
to_chat(user, "You add [src] to multitool buffer.")
else
@@ -795,8 +795,8 @@
if(stat & BROKEN)
return
- if (istype(I, /obj/item/device/multitool))
- var/obj/item/device/multitool/M = I
+ if (istype(I, /obj/item/multitool))
+ var/obj/item/multitool/M = I
if(M.buffer && istype(M.buffer, /obj/machinery/porta_turret))
turrets |= M.buffer
to_chat(user, "You link \the [M.buffer] with \the [src]")
diff --git a/code/game/machinery/porta_turret/portable_turret_construct.dm b/code/game/machinery/porta_turret/portable_turret_construct.dm
index ca17490e03..4bc5db4d5e 100644
--- a/code/game/machinery/porta_turret/portable_turret_construct.dm
+++ b/code/game/machinery/porta_turret/portable_turret_construct.dm
@@ -181,7 +181,7 @@
if(PTURRET_SENSORS_ON)
to_chat(user, "You remove the prox sensor from the turret frame.")
- new /obj/item/device/assembly/prox_sensor(loc)
+ new /obj/item/assembly/prox_sensor(loc)
build_step = PTURRET_GUN_EQUIPPED
/obj/machinery/porta_turret_construct/attack_ai()
diff --git a/code/game/machinery/porta_turret/portable_turret_cover.dm b/code/game/machinery/porta_turret/portable_turret_cover.dm
index d455bec173..8abb5c3fb7 100644
--- a/code/game/machinery/porta_turret/portable_turret_cover.dm
+++ b/code/game/machinery/porta_turret/portable_turret_cover.dm
@@ -64,8 +64,8 @@
updateUsrDialog()
else
to_chat(user, "Access denied.")
- else if(istype(I, /obj/item/device/multitool) && !parent_turret.locked)
- var/obj/item/device/multitool/M = I
+ else if(istype(I, /obj/item/multitool) && !parent_turret.locked)
+ var/obj/item/multitool/M = I
M.buffer = parent_turret
to_chat(user, "You add [parent_turret] to multitool buffer.")
else
diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm
index ff605bad7b..7236e683a5 100644
--- a/code/game/machinery/quantum_pad.dm
+++ b/code/game/machinery/quantum_pad.dm
@@ -48,13 +48,13 @@
return
if(panel_open)
- if(istype(I, /obj/item/device/multitool))
- var/obj/item/device/multitool/M = I
+ if(istype(I, /obj/item/multitool))
+ var/obj/item/multitool/M = I
M.buffer = src
to_chat(user, "You save the data in [I]'s buffer.")
return 1
- else if(istype(I, /obj/item/device/multitool))
- var/obj/item/device/multitool/M = I
+ else if(istype(I, /obj/item/multitool))
+ var/obj/item/multitool/M = I
if(istype(M.buffer, /obj/machinery/quantumpad))
linked_pad = M.buffer
to_chat(user, "You link [src] to the one in [I]'s buffer.")
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 5c6a6d5ade..ea317b74e5 100755
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -15,7 +15,7 @@
/obj/item/gun/energy,
/obj/item/melee/baton,
/obj/item/ammo_box/magazine/recharge,
- /obj/item/device/modular_computer))
+ /obj/item/modular_computer))
/obj/machinery/recharger/RefreshParts()
for(var/obj/item/stock_parts/capacitor/C in component_parts)
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index ec2e19258f..ec20efbf84 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -107,7 +107,7 @@
for(var/i in to_eat)
var/atom/movable/AM = i
var/obj/item/bodypart/head/as_head = AM
- var/obj/item/device/mmi/as_mmi = AM
+ var/obj/item/mmi/as_mmi = AM
var/brain_holder = istype(AM, /obj/item/organ/brain) || (istype(as_head) && as_head.brain) || (istype(as_mmi) && as_mmi.brain) || istype(AM, /mob/living/brain)
if(brain_holder)
emergency_stop(AM)
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 0d77157392..36793900bf 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -51,7 +51,7 @@ GLOBAL_LIST_EMPTY(allConsoles)
var/message = "";
var/dpt = ""; //the department which will be receiving the message
var/priority = -1 ; //Priority of the message being sent
- var/obj/item/device/radio/Radio
+ var/obj/item/radio/Radio
var/emergency //If an emergency has been called by this device. Acts as both a cooldown and lets the responder know where it the emergency was triggered from
var/receive_ore_updates = FALSE //If ore redemption machines will send an update when it receives new ores.
max_integrity = 300
@@ -121,7 +121,7 @@ GLOBAL_LIST_EMPTY(allConsoles)
if(!("[department]" in GLOB.req_console_information))
GLOB.req_console_information += department
- Radio = new /obj/item/device/radio(src)
+ Radio = new /obj/item/radio(src)
Radio.listening = 0
/obj/machinery/requests_console/Destroy()
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index f041cf3d28..b0a2112f2b 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -107,7 +107,7 @@
name = "radiation suit storage unit"
suit_type = /obj/item/clothing/suit/radiation
helmet_type = /obj/item/clothing/head/radiation
- storage_type = /obj/item/device/geiger_counter
+ storage_type = /obj/item/geiger_counter
/obj/machinery/suit_storage_unit/open
state_open = TRUE
diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm
index 1d2276a119..7d7d010b2c 100644
--- a/code/game/machinery/syndicatebeacon.dm
+++ b/code/game/machinery/syndicatebeacon.dm
@@ -103,7 +103,7 @@
icon_state = "beaconsynd0"
// SINGULO BEACON SPAWNER
-/obj/item/device/sbeacondrop
+/obj/item/sbeacondrop
name = "suspicious beacon"
icon = 'icons/obj/device.dmi'
icon_state = "beacon"
@@ -114,7 +114,7 @@
var/droptype = /obj/machinery/power/singularity_beacon/syndicate
-/obj/item/device/sbeacondrop/attack_self(mob/user)
+/obj/item/sbeacondrop/attack_self(mob/user)
if(user)
to_chat(user, "Locked In.")
new droptype( user.loc )
@@ -122,14 +122,14 @@
qdel(src)
return
-/obj/item/device/sbeacondrop/bomb
+/obj/item/sbeacondrop/bomb
desc = "A label on it reads: Warning: Activating this device will send a high-ordinance explosive to your location."
droptype = /obj/machinery/syndicatebomb
-/obj/item/device/sbeacondrop/powersink
+/obj/item/sbeacondrop/powersink
desc = "A label on it reads: Warning: Activating this device will send a power draining device to your location."
- droptype = /obj/item/device/powersink
+ droptype = /obj/item/powersink
-/obj/item/device/sbeacondrop/clownbomb
+/obj/item/sbeacondrop/clownbomb
desc = "A label on it reads: Warning: Activating this device will send a silly explosive to your location."
droptype = /obj/machinery/syndicatebomb/badmin/clown
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index b0e0b4f8fc..605676fc27 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -499,7 +499,7 @@
///Syndicate Detonator (aka the big red button)///
-/obj/item/device/syndicatedetonator
+/obj/item/syndicatedetonator
name = "big red button"
desc = "Your standard issue bomb synchronizing button. Five second safety delay to prevent 'accidents'."
icon = 'icons/obj/assemblies.dmi'
@@ -512,7 +512,7 @@
var/detonated = 0
var/existant = 0
-/obj/item/device/syndicatedetonator/attack_self(mob/user)
+/obj/item/syndicatedetonator/attack_self(mob/user)
if(timer < world.time)
for(var/obj/machinery/syndicatebomb/B in GLOB.machines)
if(B.active)
diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm
index 7d795c9ce2..0873ad2df6 100644
--- a/code/game/machinery/telecomms/broadcasting.dm
+++ b/code/game/machinery/telecomms/broadcasting.dm
@@ -144,25 +144,25 @@
switch (transmission_method)
if (TRANSMISSION_SUBSPACE)
// Reaches any radios on the levels
- for(var/obj/item/device/radio/R in GLOB.all_radios["[frequency]"])
+ for(var/obj/item/radio/R in GLOB.all_radios["[frequency]"])
if(R.can_receive(frequency, levels))
radios += R
// Syndicate radios can hear all well-known radio channels
if (num2text(frequency) in GLOB.reverseradiochannels)
- for(var/obj/item/device/radio/R in GLOB.all_radios["[FREQ_SYNDICATE]"])
+ for(var/obj/item/radio/R in GLOB.all_radios["[FREQ_SYNDICATE]"])
if(R.can_receive(FREQ_SYNDICATE, list(R.z)))
radios |= R
if (TRANSMISSION_RADIO)
// Only radios not currently in subspace mode
- for(var/obj/item/device/radio/R in GLOB.all_radios["[frequency]"])
+ for(var/obj/item/radio/R in GLOB.all_radios["[frequency]"])
if(!R.subspace_transmission && R.can_receive(frequency, levels))
radios += R
if (TRANSMISSION_SUPERSPACE)
// Only radios which are independent
- for(var/obj/item/device/radio/R in GLOB.all_radios["[frequency]"])
+ for(var/obj/item/radio/R in GLOB.all_radios["[frequency]"])
if(R.independent && R.can_receive(frequency, levels))
radios += R
diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm
index 4408a653d4..74881cb064 100644
--- a/code/game/machinery/telecomms/computers/message.dm
+++ b/code/game/machinery/telecomms/computers/message.dm
@@ -28,7 +28,7 @@
var/optioncount = 7
// Custom Message Properties
var/customsender = "System Administrator"
- var/obj/item/device/pda/customrecepient = null
+ var/obj/item/pda/customrecepient = null
var/customjob = "Admin"
var/custommessage = "This is a test, please ignore."
@@ -388,7 +388,7 @@
//Select Receiver
if("Recepient")
//Get out list of viable PDAs
- var/list/obj/item/device/pda/sendPDAs = get_viewable_pdas()
+ var/list/obj/item/pda/sendPDAs = get_viewable_pdas()
if(GLOB.PDAs && GLOB.PDAs.len > 0)
customrecepient = input(usr, "Select a PDA from the list.") as null|anything in sortNames(sendPDAs)
else
diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index 62d88cadf3..1ad80ccbed 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -19,7 +19,7 @@
if(default_deconstruction_screwdriver(user, icon_open, icon_closed, P))
return
// Using a multitool lets you access the receiver's interface
- else if(istype(P, /obj/item/device/multitool))
+ else if(istype(P, /obj/item/multitool))
attack_hand(user)
else if(default_deconstruction_crowbar(P))
@@ -32,9 +32,9 @@
// You need a multitool to use this, or be silicon
if(!issilicon(user))
// istype returns false if the value is null
- if(!istype(user.get_active_held_item(), /obj/item/device/multitool))
+ if(!istype(user.get_active_held_item(), /obj/item/multitool))
return
- var/obj/item/device/multitool/P = get_multitool(user)
+ var/obj/item/multitool/P = get_multitool(user)
var/dat
dat = "[name][name] Access
"
dat += "
[temp]
"
@@ -95,15 +95,15 @@
/obj/machinery/telecomms/proc/get_multitool(mob/user)
- var/obj/item/device/multitool/P = null
+ var/obj/item/multitool/P = null
// Let's double check
- if(!issilicon(user) && istype(user.get_active_held_item(), /obj/item/device/multitool))
+ if(!issilicon(user) && istype(user.get_active_held_item(), /obj/item/multitool))
P = user.get_active_held_item()
else if(isAI(user))
var/mob/living/silicon/ai/U = user
P = U.aiMulti
else if(iscyborg(user) && in_range(user, src))
- if(istype(user.get_active_held_item(), /obj/item/device/multitool))
+ if(istype(user.get_active_held_item(), /obj/item/multitool))
P = user.get_active_held_item()
return P
@@ -163,10 +163,10 @@
return
if(!issilicon(usr))
- if(!istype(usr.get_active_held_item(), /obj/item/device/multitool))
+ if(!istype(usr.get_active_held_item(), /obj/item/multitool))
return
- var/obj/item/device/multitool/P = get_multitool(usr)
+ var/obj/item/multitool/P = get_multitool(usr)
if(href_list["input"])
switch(href_list["input"])
diff --git a/code/game/machinery/telecomms/machines/allinone.dm b/code/game/machinery/telecomms/machines/allinone.dm
index fbdc385f85..01b07c4b4f 100644
--- a/code/game/machinery/telecomms/machines/allinone.dm
+++ b/code/game/machinery/telecomms/machines/allinone.dm
@@ -37,5 +37,5 @@
signal.broadcast()
/obj/machinery/telecomms/allinone/attackby(obj/item/P, mob/user, params)
- if(istype(P, /obj/item/device/multitool))
+ if(istype(P, /obj/item/multitool))
return attack_hand(user)
diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm
index 1846eea322..d3d4b871b0 100644
--- a/code/game/machinery/telecomms/machines/message_server.dm
+++ b/code/game/machinery/telecomms/machines/message_server.dm
@@ -116,7 +116,7 @@
/datum/signal/subspace/pda/broadcast()
if (!logged) // Can only go through if a message server logs it
return
- for (var/obj/item/device/pda/P in GLOB.PDAs)
+ for (var/obj/item/pda/P in GLOB.PDAs)
if ("[P.owner] ([P.ownjob])" in data["targets"])
P.receive_message(src)
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index 6f72da823c..7b66a57f59 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -149,8 +149,8 @@
return ..()
/obj/machinery/teleport/station/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/device/multitool))
- var/obj/item/device/multitool/M = W
+ if(istype(W, /obj/item/multitool))
+ var/obj/item/multitool/M = W
if(panel_open)
M.buffer = src
to_chat(user, "You download the data to the [W.name]'s buffer.")
diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm
index 99837d2beb..c516571e2a 100644
--- a/code/game/mecha/combat/combat.dm
+++ b/code/game/mecha/combat/combat.dm
@@ -11,7 +11,7 @@
else
return 0
-/obj/mecha/combat/mmi_moved_inside(obj/item/device/mmi/mmi_as_oc,mob/user)
+/obj/mecha/combat/mmi_moved_inside(obj/item/mmi/mmi_as_oc,mob/user)
if(..())
if(occupant.client && occupant.client.mouse_pointer_icon == initial(occupant.client.mouse_pointer_icon))
occupant.client.mouse_pointer_icon = 'icons/mecha/mecha_mouse.dmi'
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index 2b7855ea33..50d1f0be0d 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -369,7 +369,7 @@
name = "mousetrap mortar"
desc = "Equipment for clown exosuits. Launches armed mousetraps."
icon_state = "mecha_mousetrapmrtr"
- projectile = /obj/item/device/assembly/mousetrap/armed
+ projectile = /obj/item/assembly/mousetrap/armed
fire_sound = 'sound/items/bikehorn.ogg'
projectiles = 15
missile_speed = 1.5
@@ -382,7 +382,7 @@
return 1
return 0
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/mousetrap_mortar/proj_init(var/obj/item/device/assembly/mousetrap/armed/M)
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/mousetrap_mortar/proj_init(var/obj/item/assembly/mousetrap/armed/M)
M.secured = 1
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 78ee151581..616cd27a2d 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -57,7 +57,7 @@
var/datum/gas_mixture/cabin_air
var/obj/machinery/atmospherics/components/unary/portables_connector/connected_port = null
- var/obj/item/device/radio/mech/radio
+ var/obj/item/radio/mech/radio
var/list/trackers = list()
var/max_temperature = 25000
@@ -118,7 +118,7 @@
hud_possible = list (DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_TRACK_HUD)
-/obj/item/device/radio/mech //this has to go somewhere
+/obj/item/radio/mech //this has to go somewhere
/obj/mecha/Initialize()
. = ..()
@@ -672,7 +672,7 @@
return
to_chat(user, "Take control of exosuit?
")
-/obj/mecha/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card)
+/obj/mecha/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card)
if(!..())
return
@@ -866,7 +866,7 @@
else
return 0
-/obj/mecha/proc/mmi_move_inside(obj/item/device/mmi/mmi_as_oc, mob/user)
+/obj/mecha/proc/mmi_move_inside(obj/item/mmi/mmi_as_oc, mob/user)
if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client)
to_chat(user, "Consciousness matrix not detected!")
return FALSE
@@ -891,7 +891,7 @@
to_chat(user, "You stop inserting the MMI.")
return FALSE
-/obj/mecha/proc/mmi_moved_inside(obj/item/device/mmi/mmi_as_oc, mob/user)
+/obj/mecha/proc/mmi_moved_inside(obj/item/mmi/mmi_as_oc, mob/user)
if(!(Adjacent(mmi_as_oc) && Adjacent(user)))
return FALSE
if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client)
@@ -967,8 +967,8 @@
log_message("[mob_container] moved out.")
L << browse(null, "window=exosuit")
- if(istype(mob_container, /obj/item/device/mmi))
- var/obj/item/device/mmi/mmi = mob_container
+ if(istype(mob_container, /obj/item/mmi))
+ var/obj/item/mmi/mmi = mob_container
if(mmi.brainmob)
L.forceMove(mmi)
L.reset_perspective()
diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
index 6218326c8d..c6ab4ce2f4 100644
--- a/code/game/mecha/mecha_construction_paths.dm
+++ b/code/game/mecha/mecha_construction_paths.dm
@@ -1409,7 +1409,7 @@
//26
list(
- "key" = /obj/item/device/assembly/signaler/anomaly,
+ "key" = /obj/item/assembly/signaler/anomaly,
"action" = ITEM_DELETE,
"back_key" = TOOL_WELDER,
"desc" = "Anomaly core socket is open.",
diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm
index e1e401e116..0fbfafeb59 100644
--- a/code/game/mecha/mecha_defense.dm
+++ b/code/game/mecha/mecha_defense.dm
@@ -155,7 +155,7 @@
/obj/mecha/attackby(obj/item/W as obj, mob/user as mob, params)
- if(istype(W, /obj/item/device/mmi))
+ if(istype(W, /obj/item/mmi))
if(mmi_move_inside(W,user))
to_chat(user, "[src]-[W] interface initialized successfully.")
else
@@ -180,7 +180,7 @@
if(istype(W, /obj/item/card/id))
id_card = W
else
- var/obj/item/device/pda/pda = W
+ var/obj/item/pda/pda = W
id_card = pda.id
output_maintenance_dialog(id_card, user)
return
diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm
index dc909d90d1..1f789281df 100644
--- a/code/game/mecha/mecha_wreckage.dm
+++ b/code/game/mecha/mecha_wreckage.dm
@@ -79,7 +79,7 @@
to_chat(user, "You don't see anything that can be pried with [I]!")
-/obj/structure/mecha_wreckage/transfer_ai(interaction, mob/user, null, obj/item/device/aicard/card)
+/obj/structure/mecha_wreckage/transfer_ai(interaction, mob/user, null, obj/item/aicard/card)
if(!..())
return
diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm
index e5e9f578b2..b3cb0ff9c4 100644
--- a/code/game/objects/effects/anomalies.dm
+++ b/code/game/objects/effects/anomalies.dm
@@ -8,7 +8,7 @@
anchored = TRUE
light_range = 3
var/movechance = 70
- var/obj/item/device/assembly/signaler/anomaly/aSignal = null
+ var/obj/item/assembly/signaler/anomaly/aSignal = null
var/area/impact_area
var/lifespan = 990
@@ -73,7 +73,7 @@
/obj/effect/anomaly/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/device/analyzer))
+ if(istype(I, /obj/item/analyzer))
to_chat(user, "Analyzing... [src]'s unstable field is fluctuating along frequency [format_frequency(aSignal.frequency)], code [aSignal.code].")
///////////////////////
@@ -193,9 +193,9 @@
var/turf/T = safepick(get_area_turfs(impact_area))
if(T)
// Calculate new position (searches through beacons in world)
- var/obj/item/device/beacon/chosen
+ var/obj/item/beacon/chosen
var/list/possible = list()
- for(var/obj/item/device/beacon/W in GLOB.teleportbeacons)
+ for(var/obj/item/beacon/W in GLOB.teleportbeacons)
possible += W
if(possible.len > 0)
@@ -218,7 +218,7 @@
var/y_distance = TO.y - FROM.y
var/x_distance = TO.x - FROM.x
for (var/atom/movable/A in urange(12, FROM )) // iterate thru list of mobs in the area
- if(istype(A, /obj/item/device/beacon))
+ if(istype(A, /obj/item/beacon))
continue // don't teleport beacons because that's just insanely stupid
if(A.anchored)
continue
diff --git a/code/game/objects/effects/effect_system/effects_other.dm b/code/game/objects/effects/effect_system/effects_other.dm
index 983c30da75..373ebc7667 100644
--- a/code/game/objects/effects/effect_system/effects_other.dm
+++ b/code/game/objects/effects/effect_system/effects_other.dm
@@ -88,8 +88,8 @@
auto_process = FALSE
/datum/effect_system/trail_follow/ion/flight/set_dir(obj/effect/particle_effect/ion_trails/I)
- if(istype(holder, /obj/item/device/flightpack))
- var/obj/item/device/flightpack/F = holder
+ if(istype(holder, /obj/item/flightpack))
+ var/obj/item/flightpack/F = holder
if(istype(F.wearer))
I.setDir(F.wearer.dir)
diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm
index e376795704..2de7770b72 100644
--- a/code/game/objects/effects/spawners/bombspawner.dm
+++ b/code/game/objects/effects/spawners/bombspawner.dm
@@ -8,7 +8,7 @@
/obj/effect/spawner/newbomb/Initialize()
. = ..()
- var/obj/item/device/transfer_valve/V = new(src.loc)
+ var/obj/item/transfer_valve/V = new(src.loc)
var/obj/item/tank/internals/plasma/full/PT = new(V)
var/obj/item/tank/internals/oxygen/OT = new(V)
@@ -21,7 +21,7 @@
OT.master = V
if(assembly_type)
- var/obj/item/device/assembly/A = new assembly_type(V)
+ var/obj/item/assembly/A = new assembly_type(V)
V.attached_device = A
A.holder = V
A.toggle_secure()
@@ -31,16 +31,16 @@
return INITIALIZE_HINT_QDEL
/obj/effect/spawner/newbomb/timer
- assembly_type = /obj/item/device/assembly/timer
+ assembly_type = /obj/item/assembly/timer
/obj/effect/spawner/newbomb/timer/syndicate
btemp1 = 150
btemp2 = 20
/obj/effect/spawner/newbomb/proximity
- assembly_type = /obj/item/device/assembly/prox_sensor
+ assembly_type = /obj/item/assembly/prox_sensor
/obj/effect/spawner/newbomb/radio
- assembly_type = /obj/item/device/assembly/signaler
+ assembly_type = /obj/item/assembly/signaler
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 46a6d961d4..112e2a98f9 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -100,7 +100,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/force_string //string form of an item's force. Edit this var only to set a custom force string
var/last_force_string_check = 0
var/tip_timer
-
+
var/icon_override //CIT CHANGE - adds icon_override var. Will be removed with #4322
var/trigger_guard = TRIGGER_GUARD_NONE
@@ -146,9 +146,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
QDEL_NULL(rpg_loot)
return ..()
-/obj/item/device
- icon = 'icons/obj/device.dmi'
-
/obj/item/proc/check_allowed_items(atom/target, not_inside, target_self)
if(((src in target) && !target_self) || (!isturf(target.loc) && !isturf(target) && not_inside))
return 0
@@ -449,17 +446,17 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
if(isbrain(M))
to_chat(user, "You cannot locate any organic eyes on this brain!")
return
-
+
if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)//CIT CHANGE - makes eyestabbing impossible if you're in stamina softcrit
to_chat(user, "You're too exhausted for that.")//CIT CHANGE - ditto
return //CIT CHANGE - ditto
-
+
src.add_fingerprint(user)
playsound(loc, src.hitsound, 30, 1, -1)
user.do_attack_animation(M)
-
+
user.adjustStaminaLossBuffered(10)//CIT CHANGE - makes eyestabbing cost stamina
if(M != user)
diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm
index 12360ec353..7c54acbca9 100644
--- a/code/game/objects/items/RCD.dm
+++ b/code/game/objects/items/RCD.dm
@@ -636,7 +636,7 @@ RLD
if(useResource(launchcost, user))
activate()
to_chat(user, "You fire a glowstick!")
- var/obj/item/device/flashlight/glowstick/G = new /obj/item/device/flashlight/glowstick(start)
+ var/obj/item/flashlight/glowstick/G = new /obj/item/flashlight/glowstick(start)
G.color = color_choice
G.light_color = G.color
G.throw_at(A, 9, 3, user)
diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm
index 36d2c068c6..365c96233a 100644
--- a/code/game/objects/items/airlock_painter.dm
+++ b/code/game/objects/items/airlock_painter.dm
@@ -13,11 +13,11 @@
slot_flags = SLOT_BELT
usesound = 'sound/effects/spray2.ogg'
- var/obj/item/device/toner/ink = null
+ var/obj/item/toner/ink = null
/obj/item/airlock_painter/New()
..()
- ink = new /obj/item/device/toner(src)
+ ink = new /obj/item/toner(src)
//This proc doesn't just check if the painter can be used, but also uses it.
//Only call this if you are certain that the painter will be used right after this check!
@@ -105,7 +105,7 @@
/obj/item/airlock_painter/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/device/toner))
+ if(istype(W, /obj/item/toner))
if(ink)
to_chat(user, "[src] already contains \a [ink].")
return
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 9ecafd7a8a..9bb1880c97 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -706,7 +706,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
to_chat(user, "You close the cap on [src].")
cut_overlays()
- if(istype(O, /obj/item/device/multitool))
+ if(istype(O, /obj/item/multitool))
if(screw && !(obj_flags & EMAGGED))//also kinky
if(!super)
cut_overlays()
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 0f10c46097..2efc952c8b 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -449,7 +449,7 @@
/obj/item/stock_parts/matter_bin = 1,
/obj/item/stock_parts/micro_laser = 1,
/obj/item/stock_parts/manipulator = 1,
- /obj/item/device/assembly/igniter = 1)
+ /obj/item/assembly/igniter = 1)
needs_anchored = FALSE
/obj/item/circuitboard/machine/mining_equipment_vendor
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index c6065cdd8c..88565dff40 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -10,7 +10,7 @@ GLOBAL_LIST_EMPTY(PDAs)
#define PDA_SCANNER_HALOGEN 4
#define PDA_SCANNER_GAS 5
-/obj/item/device/pda
+/obj/item/pda
name = "\improper PDA"
desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge."
icon = 'icons/obj/pda.dmi'
@@ -68,17 +68,17 @@ GLOBAL_LIST_EMPTY(PDAs)
var/obj/item/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both.
var/ownjob = null //related to above
- var/obj/item/device/paicard/pai = null // A slot for a personal AI device
+ var/obj/item/paicard/pai = null // A slot for a personal AI device
var/icon/photo //Scanned photo
- var/list/contained_item = list(/obj/item/pen, /obj/item/toy/crayon, /obj/item/lipstick, /obj/item/device/flashlight/pen, /obj/item/clothing/mask/cigarette)
+ var/list/contained_item = list(/obj/item/pen, /obj/item/toy/crayon, /obj/item/lipstick, /obj/item/flashlight/pen, /obj/item/clothing/mask/cigarette)
var/obj/item/inserted_item //Used for pen, crayon, and lipstick insertion or removal. Same as above.
var/overlays_x_offset = 0 //x offset to use for certain overlays
var/underline_flag = TRUE //flag for underline
-/obj/item/device/pda/suicide_act(mob/living/carbon/user)
+/obj/item/pda/suicide_act(mob/living/carbon/user)
var/deathMessage = msg_input(user)
if (!deathMessage)
deathMessage = "i ded"
@@ -86,14 +86,14 @@ GLOBAL_LIST_EMPTY(PDAs)
tnote += "→ To The Grim Reaper:
[deathMessage]
"//records a message in their PDA as being sent to the grim reaper
return BRUTELOSS
-/obj/item/device/pda/examine(mob/user)
+/obj/item/pda/examine(mob/user)
..()
if(!id && !inserted_item)
return
else
to_chat(user, "Alt-click to remove contents.")
-/obj/item/device/pda/Initialize()
+/obj/item/pda/Initialize()
. = ..()
if(fon)
set_light(f_lum)
@@ -107,7 +107,7 @@ GLOBAL_LIST_EMPTY(PDAs)
inserted_item = new /obj/item/pen(src)
update_icon()
-/obj/item/device/pda/equipped(mob/user, slot)
+/obj/item/pda/equipped(mob/user, slot)
. = ..()
if(!equipped)
if(user.client)
@@ -130,19 +130,19 @@ GLOBAL_LIST_EMPTY(PDAs)
font_mode = FONT_MONO
equipped = TRUE
-/obj/item/device/pda/proc/update_label()
+/obj/item/pda/proc/update_label()
name = "PDA-[owner] ([ownjob])" //Name generalisation
-/obj/item/device/pda/GetAccess()
+/obj/item/pda/GetAccess()
if(id)
return id.GetAccess()
else
return ..()
-/obj/item/device/pda/GetID()
+/obj/item/pda/GetID()
return id
-/obj/item/device/pda/update_icon()
+/obj/item/pda/update_icon()
cut_overlays()
var/mutable_appearance/overlay = new()
overlay.pixel_x = overlays_x_offset
@@ -163,13 +163,13 @@ GLOBAL_LIST_EMPTY(PDAs)
overlay.icon_state = "pai_off_overlay"
add_overlay(new /mutable_appearance(overlay))
-/obj/item/device/pda/MouseDrop(obj/over_object, src_location, over_location)
+/obj/item/pda/MouseDrop(obj/over_object, src_location, over_location)
var/mob/M = usr
if((!istype(over_object, /obj/screen)) && usr.canUseTopic(src))
return attack_self(M)
return ..()
-/obj/item/device/pda/attack_self(mob/user)
+/obj/item/pda/attack_self(mob/user)
if(!user.IsAdvancedToolUser())
to_chat(user, "You don't have the dexterity to do this!")
return
@@ -309,7 +309,7 @@ GLOBAL_LIST_EMPTY(PDAs)
var/count = 0
if (!toff)
- for (var/obj/item/device/pda/P in sortNames(get_viewable_pdas()))
+ for (var/obj/item/pda/P in sortNames(get_viewable_pdas()))
if (P == src)
continue
dat += "[P]"
@@ -368,7 +368,7 @@ GLOBAL_LIST_EMPTY(PDAs)
user << browse(dat, "window=pda;size=400x450;border=1;can_resize=1;can_minimize=0")
onclose(user, "pda", src)
-/obj/item/device/pda/Topic(href, href_list)
+/obj/item/pda/Topic(href, href_list)
..()
var/mob/living/U = usr
//Looking for master was kind of pointless since PDAs don't appear to have one.
@@ -586,7 +586,7 @@ GLOBAL_LIST_EMPTY(PDAs)
U << browse(null, "window=pda")
return
-/obj/item/device/pda/proc/remove_id()
+/obj/item/pda/proc/remove_id()
if (id)
if (ismob(loc))
var/mob/M = loc
@@ -597,7 +597,7 @@ GLOBAL_LIST_EMPTY(PDAs)
id = null
update_icon()
-/obj/item/device/pda/proc/msg_input(mob/living/U = usr)
+/obj/item/pda/proc/msg_input(mob/living/U = usr)
var/t = stripped_input(U, "Please enter message", name)
if (!t || toff)
return
@@ -609,7 +609,7 @@ GLOBAL_LIST_EMPTY(PDAs)
t = Gibberish(t, 100)
return t
-/obj/item/device/pda/proc/send_message(mob/living/user, list/obj/item/device/pda/targets)
+/obj/item/pda/proc/send_message(mob/living/user, list/obj/item/pda/targets)
var/message = msg_input(user)
if(!message || !targets.len)
return
@@ -618,7 +618,7 @@ GLOBAL_LIST_EMPTY(PDAs)
// Send the signal
var/list/string_targets = list()
- for (var/obj/item/device/pda/P in targets)
+ for (var/obj/item/pda/P in targets)
if (P.owner && P.ownjob) // != src is checked by the UI
string_targets += "[P.owner] ([P.ownjob])"
for (var/obj/machinery/computer/message_monitor/M in targets)
@@ -659,7 +659,7 @@ GLOBAL_LIST_EMPTY(PDAs)
// Reset the photo
photo = null
-/obj/item/device/pda/proc/receive_message(datum/signal/subspace/pda/signal)
+/obj/item/pda/proc/receive_message(datum/signal/subspace/pda/signal)
tnote += "← From [signal.data["name"]] ([signal.data["job"]]):
[signal.format_message()]
"
if (!silent)
@@ -685,13 +685,13 @@ GLOBAL_LIST_EMPTY(PDAs)
update_icon()
add_overlay(icon_alert)
-/obj/item/device/pda/proc/send_to_all(mob/living/U)
+/obj/item/pda/proc/send_to_all(mob/living/U)
send_message(U,get_viewable_pdas())
-/obj/item/device/pda/proc/create_message(mob/living/U, obj/item/device/pda/P)
+/obj/item/pda/proc/create_message(mob/living/U, obj/item/pda/P)
send_message(U,list(P))
-/obj/item/device/pda/AltClick()
+/obj/item/pda/AltClick()
..()
if(issilicon(usr))
@@ -703,7 +703,7 @@ GLOBAL_LIST_EMPTY(PDAs)
else
remove_pen()
-/obj/item/device/pda/verb/verb_remove_id()
+/obj/item/pda/verb/verb_remove_id()
set category = "Object"
set name = "Eject ID"
set src in usr
@@ -717,7 +717,7 @@ GLOBAL_LIST_EMPTY(PDAs)
else
to_chat(usr, "This PDA does not have an ID in it!")
-/obj/item/device/pda/verb/verb_remove_pen()
+/obj/item/pda/verb/verb_remove_pen()
set category = "Object"
set name = "Remove Pen"
set src in usr
@@ -728,7 +728,7 @@ GLOBAL_LIST_EMPTY(PDAs)
if (usr.canUseTopic(src))
remove_pen()
-/obj/item/device/pda/proc/remove_pen()
+/obj/item/pda/proc/remove_pen()
if(inserted_item)
if(ismob(loc))
var/mob/M = loc
@@ -742,7 +742,7 @@ GLOBAL_LIST_EMPTY(PDAs)
to_chat(usr, "This PDA does not have a pen in it!")
//trying to insert or remove an id
-/obj/item/device/pda/proc/id_check(mob/user, obj/item/card/id/I)
+/obj/item/pda/proc/id_check(mob/user, obj/item/card/id/I)
if(!I)
if(id)
remove_id()
@@ -763,7 +763,7 @@ GLOBAL_LIST_EMPTY(PDAs)
return 1
// access to status display signals
-/obj/item/device/pda/attackby(obj/item/C, mob/user, params)
+/obj/item/pda/attackby(obj/item/C, mob/user, params)
if(istype(C, /obj/item/cartridge) && !cartridge)
if(!user.transferItemToLoc(C, src))
return
@@ -791,7 +791,7 @@ GLOBAL_LIST_EMPTY(PDAs)
updateSelfDialog()//Update self dialog on success.
return //Return in case of failed check or when successful.
updateSelfDialog()//For the non-input related code.
- else if(istype(C, /obj/item/device/paicard) && !src.pai)
+ else if(istype(C, /obj/item/paicard) && !src.pai)
if(!user.transferItemToLoc(C, src))
return
pai = C
@@ -814,7 +814,7 @@ GLOBAL_LIST_EMPTY(PDAs)
else
return ..()
-/obj/item/device/pda/attack(mob/living/carbon/C, mob/living/user)
+/obj/item/pda/attack(mob/living/carbon/C, mob/living/user)
if(istype(C))
switch(scanmode)
@@ -832,7 +832,7 @@ GLOBAL_LIST_EMPTY(PDAs)
else
user.show_message("No radiation detected.")
-/obj/item/device/pda/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity)
+/obj/item/pda/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity)
if(!proximity)
return
switch(scanmode)
@@ -886,7 +886,7 @@ GLOBAL_LIST_EMPTY(PDAs)
to_chat(user, "Paper scanned. Saved to PDA's notekeeper." )
-/obj/item/device/pda/proc/explode() //This needs tuning.
+/obj/item/pda/proc/explode() //This needs tuning.
if(!detonatable)
return
var/turf/T = get_turf(src)
@@ -906,7 +906,7 @@ GLOBAL_LIST_EMPTY(PDAs)
qdel(src)
return
-/obj/item/device/pda/Destroy()
+/obj/item/pda/Destroy()
GLOB.PDAs -= src
if(istype(id))
QDEL_NULL(id)
@@ -928,7 +928,7 @@ GLOBAL_LIST_EMPTY(PDAs)
to_chat(user, "Turn on your receiver in order to send messages.")
return
- for (var/obj/item/device/pda/P in get_viewable_pdas())
+ for (var/obj/item/pda/P in get_viewable_pdas())
if (P == src)
continue
else if (P == src.aiPDA)
@@ -989,7 +989,7 @@ GLOBAL_LIST_EMPTY(PDAs)
// Pass along the pulse to atoms in contents, largely added so pAIs are vulnerable to EMP
-/obj/item/device/pda/emp_act(severity)
+/obj/item/pda/emp_act(severity)
for(var/atom/A in src)
A.emp_act(severity)
emped += 1
@@ -999,7 +999,7 @@ GLOBAL_LIST_EMPTY(PDAs)
/proc/get_viewable_pdas()
. = list()
// Returns a list of PDAs which can be viewed from another PDA/message monitor.
- for(var/obj/item/device/pda/P in GLOB.PDAs)
+ for(var/obj/item/pda/P in GLOB.PDAs)
if(!P.owner || P.toff || P.hidden)
continue
. += P
diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm
index 093b6c1e51..c1cc5d69a3 100644
--- a/code/game/objects/items/devices/PDA/PDA_types.dm
+++ b/code/game/objects/items/devices/PDA/PDA_types.dm
@@ -1,5 +1,5 @@
//Clown PDA is slippery.
-/obj/item/device/pda/clown
+/obj/item/pda/clown
name = "clown PDA"
default_cartridge = /obj/item/cartridge/virus/clown
inserted_item = /obj/item/toy/crayon/rainbow
@@ -8,11 +8,11 @@
ttone = "honk"
var/slipvictims = list() //CIT CHANGE - makes clown PDAs track unique people slipped
-/obj/item/device/pda/clown/Initialize()
+/obj/item/pda/clown/Initialize()
. = ..()
AddComponent(/datum/component/slippery, 120, NO_SLIP_WHEN_WALKING, CALLBACK(src, .proc/AfterSlip))
-/obj/item/device/pda/clown/proc/AfterSlip(mob/living/carbon/human/M)
+/obj/item/pda/clown/proc/AfterSlip(mob/living/carbon/human/M)
if (istype(M) && (M.real_name != owner))
slipvictims |= M //CIT CHANGE - makes clown PDAs track unique people slipped
var/obj/item/cartridge/virus/clown/cart = cartridge
@@ -20,66 +20,66 @@
cart.charges++
// Special AI/pAI PDAs that cannot explode.
-/obj/item/device/pda/ai
+/obj/item/pda/ai
icon_state = "NONE"
ttone = "data"
fon = FALSE
detonatable = FALSE
-/obj/item/device/pda/ai/attack_self(mob/user)
+/obj/item/pda/ai/attack_self(mob/user)
if ((honkamt > 0) && (prob(60)))//For clown virus.
honkamt--
playsound(loc, 'sound/items/bikehorn.ogg', 30, 1)
return
-/obj/item/device/pda/ai/pai
+/obj/item/pda/ai/pai
ttone = "assist"
-/obj/item/device/pda/medical
+/obj/item/pda/medical
name = "medical PDA"
default_cartridge = /obj/item/cartridge/medical
icon_state = "pda-medical"
-/obj/item/device/pda/viro
+/obj/item/pda/viro
name = "virology PDA"
default_cartridge = /obj/item/cartridge/medical
icon_state = "pda-virology"
-/obj/item/device/pda/engineering
+/obj/item/pda/engineering
name = "engineering PDA"
default_cartridge = /obj/item/cartridge/engineering
icon_state = "pda-engineer"
-/obj/item/device/pda/security
+/obj/item/pda/security
name = "security PDA"
default_cartridge = /obj/item/cartridge/security
icon_state = "pda-security"
-/obj/item/device/pda/detective
+/obj/item/pda/detective
name = "detective PDA"
default_cartridge = /obj/item/cartridge/detective
icon_state = "pda-detective"
-/obj/item/device/pda/warden
+/obj/item/pda/warden
name = "warden PDA"
default_cartridge = /obj/item/cartridge/security
icon_state = "pda-warden"
-/obj/item/device/pda/janitor
+/obj/item/pda/janitor
name = "janitor PDA"
default_cartridge = /obj/item/cartridge/janitor
icon_state = "pda-janitor"
ttone = "slip"
-/obj/item/device/pda/toxins
+/obj/item/pda/toxins
name = "scientist PDA"
default_cartridge = /obj/item/cartridge/signal/toxins
icon_state = "pda-science"
ttone = "boom"
-/obj/item/device/pda/mime
+/obj/item/pda/mime
name = "mime PDA"
default_cartridge = /obj/item/cartridge/virus/mime
inserted_item = /obj/item/toy/crayon/mime
@@ -87,88 +87,88 @@
silent = TRUE
ttone = "silence"
-/obj/item/device/pda/heads
+/obj/item/pda/heads
default_cartridge = /obj/item/cartridge/head
icon_state = "pda-hop"
-/obj/item/device/pda/heads/hop
+/obj/item/pda/heads/hop
name = "head of personnel PDA"
default_cartridge = /obj/item/cartridge/hop
icon_state = "pda-hop"
-/obj/item/device/pda/heads/hos
+/obj/item/pda/heads/hos
name = "head of security PDA"
default_cartridge = /obj/item/cartridge/hos
icon_state = "pda-hos"
-/obj/item/device/pda/heads/ce
+/obj/item/pda/heads/ce
name = "chief engineer PDA"
default_cartridge = /obj/item/cartridge/ce
icon_state = "pda-ce"
-/obj/item/device/pda/heads/cmo
+/obj/item/pda/heads/cmo
name = "chief medical officer PDA"
default_cartridge = /obj/item/cartridge/cmo
icon_state = "pda-cmo"
-/obj/item/device/pda/heads/rd
+/obj/item/pda/heads/rd
name = "research director PDA"
default_cartridge = /obj/item/cartridge/rd
inserted_item = /obj/item/pen/fountain
icon_state = "pda-rd"
-/obj/item/device/pda/captain
+/obj/item/pda/captain
name = "captain PDA"
default_cartridge = /obj/item/cartridge/captain
inserted_item = /obj/item/pen/fountain/captain
icon_state = "pda-captain"
detonatable = FALSE
-/obj/item/device/pda/cargo
+/obj/item/pda/cargo
name = "cargo technician PDA"
default_cartridge = /obj/item/cartridge/quartermaster
icon_state = "pda-cargo"
-/obj/item/device/pda/quartermaster
+/obj/item/pda/quartermaster
name = "quartermaster PDA"
default_cartridge = /obj/item/cartridge/quartermaster
inserted_item = /obj/item/pen/fountain
icon_state = "pda-qm"
-/obj/item/device/pda/shaftminer
+/obj/item/pda/shaftminer
name = "shaft miner PDA"
icon_state = "pda-miner"
-/obj/item/device/pda/syndicate
+/obj/item/pda/syndicate
default_cartridge = /obj/item/cartridge/virus/syndicate
icon_state = "pda-syndi"
name = "military PDA"
owner = "John Doe"
hidden = 1
-/obj/item/device/pda/chaplain
+/obj/item/pda/chaplain
name = "chaplain PDA"
icon_state = "pda-chaplain"
ttone = "holy"
-/obj/item/device/pda/lawyer
+/obj/item/pda/lawyer
name = "lawyer PDA"
default_cartridge = /obj/item/cartridge/lawyer
inserted_item = /obj/item/pen/fountain
icon_state = "pda-lawyer"
ttone = "objection"
-/obj/item/device/pda/botanist
+/obj/item/pda/botanist
name = "botanist PDA"
//default_cartridge = /obj/item/cartridge/botanist
icon_state = "pda-hydro"
-/obj/item/device/pda/roboticist
+/obj/item/pda/roboticist
name = "roboticist PDA"
icon_state = "pda-roboticist"
default_cartridge = /obj/item/cartridge/roboticist
-/obj/item/device/pda/curator
+/obj/item/pda/curator
name = "curator PDA"
icon_state = "pda-library"
icon_alert = "pda-r-library"
@@ -179,32 +179,32 @@
silent = TRUE //Quiet in the library!
overlays_x_offset = -3
-/obj/item/device/pda/clear
+/obj/item/pda/clear
name = "clear PDA"
icon_state = "pda-clear"
desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a special edition with a transparent case."
note = "Congratulations, you have chosen the Thinktronic 5230 Personal Data Assistant Deluxe Special Max Turbo Limited Edition!"
-/obj/item/device/pda/cook
+/obj/item/pda/cook
name = "cook PDA"
icon_state = "pda-cook"
-/obj/item/device/pda/bar
+/obj/item/pda/bar
name = "bartender PDA"
icon_state = "pda-bartender"
inserted_item = /obj/item/pen/fountain
-/obj/item/device/pda/atmos
+/obj/item/pda/atmos
name = "atmospherics PDA"
default_cartridge = /obj/item/cartridge/atmos
icon_state = "pda-atmos"
-/obj/item/device/pda/chemist
+/obj/item/pda/chemist
name = "chemist PDA"
default_cartridge = /obj/item/cartridge/chemistry
icon_state = "pda-chemistry"
-/obj/item/device/pda/geneticist
+/obj/item/pda/geneticist
name = "geneticist PDA"
default_cartridge = /obj/item/cartridge/medical
icon_state = "pda-genetics"
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index e7d9750a3b..2737f24cbe 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -34,7 +34,7 @@
var/bot_access_flags = 0 //Bit flags. Selection: SEC_BOT | MULE_BOT | FLOOR_BOT | CLEAN_BOT | MED_BOT
var/spam_enabled = 0 //Enables "Send to All" Option
- var/obj/item/device/pda/host_pda = null
+ var/obj/item/pda/host_pda = null
var/menu
var/datum/data/record/active1 = null //General
var/datum/data/record/active2 = null //Medical
@@ -51,7 +51,7 @@
/obj/item/cartridge/Initialize()
. = ..()
- var/obj/item/device/pda/pda = loc
+ var/obj/item/pda/pda = loc
if(istype(pda))
host_pda = pda
@@ -710,7 +710,7 @@ Code:
return ""
//If the cartridge adds something to each potetial messaging target
-/obj/item/cartridge/proc/message_special(obj/item/device/pda/target)
+/obj/item/cartridge/proc/message_special(obj/item/pda/target)
return ""
//This is called for special abilities of cartridges
diff --git a/code/game/objects/items/devices/PDA/virus_cart.dm b/code/game/objects/items/devices/PDA/virus_cart.dm
index a5ce076620..dfbf6db88c 100644
--- a/code/game/objects/items/devices/PDA/virus_cart.dm
+++ b/code/game/objects/items/devices/PDA/virus_cart.dm
@@ -2,19 +2,19 @@
name = "Generic Virus PDA cart"
var/charges = 5
-/obj/item/cartridge/virus/proc/send_virus(obj/item/device/pda/target, mob/living/U)
+/obj/item/cartridge/virus/proc/send_virus(obj/item/pda/target, mob/living/U)
return
/obj/item/cartridge/virus/message_header()
return "[charges] viral files left.
"
-/obj/item/cartridge/virus/message_special(obj/item/device/pda/target)
- if (!istype(loc, /obj/item/device/pda))
+/obj/item/cartridge/virus/message_special(obj/item/pda/target)
+ if (!istype(loc, /obj/item/pda))
return "" //Sanity check, this shouldn't be possible.
return " (*Send Virus*)"
/obj/item/cartridge/virus/special(mob/living/user, list/params)
- var/obj/item/device/pda/P = locate(params["target"])//Leaving it alone in case it may do something useful, I guess.
+ var/obj/item/pda/P = locate(params["target"])//Leaving it alone in case it may do something useful, I guess.
send_virus(P,user)
/obj/item/cartridge/virus/clown
@@ -23,7 +23,7 @@
desc = "A data cartridge for portable microcomputers. It smells vaguely of bananas."
access = CART_CLOWN
-/obj/item/cartridge/virus/clown/send_virus(obj/item/device/pda/target, mob/living/U)
+/obj/item/cartridge/virus/clown/send_virus(obj/item/pda/target, mob/living/U)
if(charges <= 0)
to_chat(U, "Out of charges.")
return
@@ -39,7 +39,7 @@
icon_state = "cart-mi"
access = CART_MIME
-/obj/item/cartridge/virus/mime/send_virus(obj/item/device/pda/target, mob/living/U)
+/obj/item/cartridge/virus/mime/send_virus(obj/item/pda/target, mob/living/U)
if(charges <= 0)
to_chat(U, "Out of charges.")
return
@@ -58,7 +58,7 @@
remote_door_id = "smindicate" //Make sure this matches the syndicate shuttle's shield/door id!! //don't ask about the name, testing.
charges = 4
-/obj/item/cartridge/virus/syndicate/send_virus(obj/item/device/pda/target, mob/living/U)
+/obj/item/cartridge/virus/syndicate/send_virus(obj/item/pda/target, mob/living/U)
if(charges <= 0)
to_chat(U, "Out of charges.")
return
@@ -92,7 +92,7 @@
icon_state = "cart"
var/telecrystals = 0
-/obj/item/cartridge/virus/frame/send_virus(obj/item/device/pda/target, mob/living/U)
+/obj/item/cartridge/virus/frame/send_virus(obj/item/pda/target, mob/living/U)
if(charges <= 0)
to_chat(U, "Out of charges.")
return
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index f9e510bbea..8947009974 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -1,4 +1,4 @@
-/obj/item/device/aicard
+/obj/item/aicard
name = "intelliCard"
desc = "A storage device for AIs. Patent pending."
icon = 'icons/obj/aicards.dmi'
@@ -12,11 +12,11 @@
var/flush = FALSE
var/mob/living/silicon/ai/AI
-/obj/item/device/aicard/suicide_act(mob/living/user)
+/obj/item/aicard/suicide_act(mob/living/user)
user.visible_message("[user] is trying to upload themselves into [src]! That's not going to work out well!")
return BRUTELOSS
-/obj/item/device/aicard/afterattack(atom/target, mob/user, proximity)
+/obj/item/aicard/afterattack(atom/target, mob/user, proximity)
..()
if(!proximity || !target)
return
@@ -27,7 +27,7 @@
target.transfer_ai(AI_TRANS_TO_CARD, user, null, src)
update_icon() //Whatever happened, update the card's state (icon, name) to match.
-/obj/item/device/aicard/update_icon()
+/obj/item/aicard/update_icon()
cut_overlays()
if(AI)
name = "[initial(name)]- [AI.name]"
@@ -42,14 +42,14 @@
name = initial(name)
icon_state = initial(icon_state)
-/obj/item/device/aicard/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+/obj/item/aicard/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "intellicard", name, 500, 500, master_ui, state)
ui.open()
-/obj/item/device/aicard/ui_data()
+/obj/item/aicard/ui_data()
var/list/data = list()
if(AI)
data["name"] = AI.name
@@ -62,7 +62,7 @@
data["wiping"] = flush
return data
-/obj/item/device/aicard/ui_act(action,params)
+/obj/item/aicard/ui_act(action,params)
if(..())
return
switch(action)
diff --git a/code/game/objects/items/devices/beacon.dm b/code/game/objects/items/devices/beacon.dm
index 5611784f8c..e868ec07b6 100644
--- a/code/game/objects/items/devices/beacon.dm
+++ b/code/game/objects/items/devices/beacon.dm
@@ -1,4 +1,4 @@
-/obj/item/device/beacon
+/obj/item/beacon
name = "\improper tracking beacon"
desc = "A beacon used by a teleporter."
icon = 'icons/obj/device.dmi'
@@ -9,18 +9,18 @@
var/enabled = TRUE
var/renamed = FALSE
-/obj/item/device/beacon/Initialize()
+/obj/item/beacon/Initialize()
. = ..()
if (enabled)
GLOB.teleportbeacons += src
else
icon_state = "beacon-off"
-/obj/item/device/beacon/Destroy()
+/obj/item/beacon/Destroy()
GLOB.teleportbeacons.Remove(src)
return ..()
-/obj/item/device/beacon/attack_self(mob/user)
+/obj/item/beacon/attack_self(mob/user)
enabled = !enabled
if (enabled)
icon_state = "beacon"
@@ -31,7 +31,7 @@
to_chat(user, "You [enabled ? "enable" : "disable"] the beacon.")
return
-/obj/item/device/beacon/attackby(obj/item/W, mob/user)
+/obj/item/beacon/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/pen)) // needed for things that use custom names like the locator
var/new_name = stripped_input(user, "What would you like the name to be?")
if(!user.canUseTopic(src, BE_CLOSE))
diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm
index 770c72ac54..d140c234ce 100644
--- a/code/game/objects/items/devices/camera_bug.dm
+++ b/code/game/objects/items/devices/camera_bug.dm
@@ -5,7 +5,7 @@
-/obj/item/device/camera_bug
+/obj/item/camera_bug
name = "camera bug"
desc = "For illicit snooping through the camera network."
icon = 'icons/obj/device.dmi'
@@ -31,11 +31,11 @@
var/last_found = null
var/last_seen = null
-/obj/item/device/camera_bug/New()
+/obj/item/camera_bug/New()
..()
START_PROCESSING(SSobj, src)
-/obj/item/device/camera_bug/Destroy()
+/obj/item/camera_bug/Destroy()
get_cameras()
for(var/cam_tag in bugged_cameras)
var/obj/machinery/camera/camera = bugged_cameras[cam_tag]
@@ -46,20 +46,20 @@
tracking = null
return ..()
-/obj/item/device/camera_bug/interact(mob/user)
+/obj/item/camera_bug/interact(mob/user)
ui_interact(user)
-/obj/item/device/camera_bug/ui_interact(mob/user = usr)
+/obj/item/camera_bug/ui_interact(mob/user = usr)
. = ..()
var/datum/browser/popup = new(user, "camerabug","Camera Bug",nref=src)
popup.set_content(menu(get_cameras()))
popup.open()
-/obj/item/device/camera_bug/attack_self(mob/user)
+/obj/item/camera_bug/attack_self(mob/user)
user.set_machine(src)
interact(user)
-/obj/item/device/camera_bug/check_eye(mob/user)
+/obj/item/camera_bug/check_eye(mob/user)
if ( loc != user || user.incapacitated() || user.eye_blind || !current )
user.unset_machine()
return 0
@@ -70,10 +70,10 @@
user.unset_machine()
return 0
return 1
-/obj/item/device/camera_bug/on_unset_machine(mob/user)
+/obj/item/camera_bug/on_unset_machine(mob/user)
user.reset_perspective(null)
-/obj/item/device/camera_bug/proc/get_cameras()
+/obj/item/camera_bug/proc/get_cameras()
if( world.time > (last_net_update + 100))
bugged_cameras = list()
for(var/obj/machinery/camera/camera in GLOB.cameranet.cameras)
@@ -85,7 +85,7 @@
return bugged_cameras
-/obj/item/device/camera_bug/proc/menu(list/cameras)
+/obj/item/camera_bug/proc/menu(list/cameras)
if(!cameras || !cameras.len)
return "No bugged cameras found."
@@ -139,12 +139,12 @@
return .(cameras)
return html
-/obj/item/device/camera_bug/proc/get_seens()
+/obj/item/camera_bug/proc/get_seens()
if(current && current.can_use())
var/list/seen = current.can_see()
return seen
-/obj/item/device/camera_bug/proc/camera_report()
+/obj/item/camera_bug/proc/camera_report()
// this should only be called if current exists
var/dat = ""
var/list/seen = get_seens()
@@ -189,7 +189,7 @@
else
return "Camera Offline
"
-/obj/item/device/camera_bug/Topic(href,list/href_list)
+/obj/item/camera_bug/Topic(href,list/href_list)
if(usr != loc)
usr.unset_machine()
usr << browse(null, "window=camerabug")
@@ -256,7 +256,7 @@
interact()
-/obj/item/device/camera_bug/process()
+/obj/item/camera_bug/process()
if(track_mode == BUGMODE_LIST || (world.time < (last_tracked + refresh_interval)))
return
last_tracked = world.time
diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
index c759eecc82..181ae9eb41 100644
--- a/code/game/objects/items/devices/chameleonproj.dm
+++ b/code/game/objects/items/devices/chameleonproj.dm
@@ -1,5 +1,6 @@
-/obj/item/device/chameleon
+/obj/item/chameleon
name = "chameleon-projector"
+ icon = 'icons/obj/device.dmi'
icon_state = "shield0"
flags_1 = CONDUCT_1 | NOBLUDGEON_1
slot_flags = SLOT_BELT
@@ -14,26 +15,26 @@
var/obj/effect/dummy/chameleon/active_dummy = null
var/saved_appearance = null
-/obj/item/device/chameleon/New()
+/obj/item/chameleon/New()
..()
var/obj/item/cigbutt/butt = /obj/item/cigbutt
saved_appearance = initial(butt.appearance)
-/obj/item/device/chameleon/dropped()
+/obj/item/chameleon/dropped()
..()
disrupt()
-/obj/item/device/chameleon/equipped()
+/obj/item/chameleon/equipped()
..()
disrupt()
-/obj/item/device/chameleon/attack_self(mob/user)
+/obj/item/chameleon/attack_self(mob/user)
if (isturf(user.loc) || istype(user.loc, /obj/structure) || active_dummy)
toggle(user)
else
to_chat(user, "You can't use [src] while inside something!")
-/obj/item/device/chameleon/afterattack(atom/target, mob/user , proximity)
+/obj/item/chameleon/afterattack(atom/target, mob/user , proximity)
if(!proximity)
return
if(!check_sprite(target))
@@ -48,12 +49,12 @@
temp.plane = initial(target.plane)
saved_appearance = temp.appearance
-/obj/item/device/chameleon/proc/check_sprite(atom/target)
+/obj/item/chameleon/proc/check_sprite(atom/target)
if(target.icon_state in icon_states(target.icon))
return TRUE
return FALSE
-/obj/item/device/chameleon/proc/toggle(mob/user)
+/obj/item/chameleon/proc/toggle(mob/user)
if(!can_use || !saved_appearance)
return
if(active_dummy)
@@ -71,7 +72,7 @@
new /obj/effect/temp_visual/emp/pulse(get_turf(src))
user.cancel_camera()
-/obj/item/device/chameleon/proc/disrupt(delete_dummy = 1)
+/obj/item/chameleon/proc/disrupt(delete_dummy = 1)
if(active_dummy)
for(var/mob/M in active_dummy)
to_chat(M, "Your chameleon-projector deactivates.")
@@ -86,7 +87,7 @@
can_use = 0
spawn(50) can_use = 1
-/obj/item/device/chameleon/proc/eject_all()
+/obj/item/chameleon/proc/eject_all()
for(var/atom/movable/A in active_dummy)
A.forceMove(active_dummy.loc)
if(ismob(A))
@@ -98,9 +99,9 @@
desc = ""
density = FALSE
var/can_move = 0
- var/obj/item/device/chameleon/master = null
+ var/obj/item/chameleon/master = null
-/obj/effect/dummy/chameleon/proc/activate(mob/M, saved_appearance, obj/item/device/chameleon/C)
+/obj/effect/dummy/chameleon/proc/activate(mob/M, saved_appearance, obj/item/chameleon/C)
appearance = saved_appearance
if(istype(M.buckled, /obj/vehicle))
var/obj/vehicle/V = M.buckled
diff --git a/code/game/objects/items/devices/dogborg_sleeper.dm b/code/game/objects/items/devices/dogborg_sleeper.dm
index 23d569c5f3..b21ba58380 100644
--- a/code/game/objects/items/devices/dogborg_sleeper.dm
+++ b/code/game/objects/items/devices/dogborg_sleeper.dm
@@ -1,6 +1,6 @@
// Dogborg Sleeper units
-/obj/item/device/dogborg/sleeper
+/obj/item/dogborg/sleeper
name = "hound sleeper"
desc = "nothing should see this."
icon = 'icons/mob/dogborg.dmi'
@@ -22,7 +22,7 @@
var/static/list/important_items = typecacheof(list(
/obj/item/hand_tele,
/obj/item/card/id,
- /obj/item/device/aicard,
+ /obj/item/aicard,
/obj/item/gun,
/obj/item/pinpointer,
/obj/item/clothing/shoes/magboots,
@@ -45,15 +45,15 @@
// Bags are prohibited from this due to the potential explotation of objects, same with brought
-/obj/item/device/dogborg/sleeper/New()
+/obj/item/dogborg/sleeper/New()
..()
update_icon()
flags_1 |= NOBLUDGEON_1 //No more attack messages
-/obj/item/device/dogborg/sleeper/Exit(atom/movable/O)
+/obj/item/dogborg/sleeper/Exit(atom/movable/O)
return 0
-/obj/item/device/dogborg/sleeper/afterattack(mob/living/carbon/target, mob/living/silicon/user, proximity)
+/obj/item/dogborg/sleeper/afterattack(mob/living/carbon/target, mob/living/silicon/user, proximity)
hound = loc
if(!proximity)
return
@@ -91,7 +91,7 @@
message_admins("[key_name(hound)] has sleeper'd [key_name(patient)] as a dogborg. [ADMIN_JMP(src)]")
playsound(hound, 'sound/effects/bin_close.ogg', 100, 1)
-/obj/item/device/dogborg/sleeper/container_resist(mob/living/user)
+/obj/item/dogborg/sleeper/container_resist(mob/living/user)
hound = loc
user.changeNext_move(CLICK_CD_BREAKOUT)
user.last_special = world.time + CLICK_CD_BREAKOUT
@@ -107,7 +107,7 @@
"You successfully break out of [hound.name]!")
go_out()
-/obj/item/device/dogborg/sleeper/proc/go_out(var/target)
+/obj/item/dogborg/sleeper/proc/go_out(var/target)
hound = loc
hound.setClickCooldown(50)
if(length(contents) > 0)
@@ -139,12 +139,12 @@
cleaning = FALSE
update_gut()
-/obj/item/device/dogborg/sleeper/attack_self(mob/user)
+/obj/item/dogborg/sleeper/attack_self(mob/user)
if(..())
return
ui_interact(user)
-/obj/item/device/dogborg/sleeper/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+/obj/item/dogborg/sleeper/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
@@ -152,7 +152,7 @@
ui = new(user, src, ui_key, "dogborg_sleeper", name, 375, 550, master_ui, state)
ui.open()
-/obj/item/device/dogborg/sleeper/ui_data()
+/obj/item/dogborg/sleeper/ui_data()
var/list/data = list()
data["occupied"] = patient ? 1 : 0
@@ -197,7 +197,7 @@
data["occupant"]["reagents"] += list(list("name" = R.name, "volume" = R.volume))
return data
-/obj/item/device/dogborg/sleeper/ui_act(action, params)
+/obj/item/dogborg/sleeper/ui_act(action, params)
if(..())
return
@@ -221,7 +221,7 @@
clean_cycle()
. = TRUE
-/obj/item/device/dogborg/sleeper/proc/update_gut()
+/obj/item/dogborg/sleeper/proc/update_gut()
//Well, we HAD one, what happened to them?
if(patient in contents)
if(patient_laststat != patient.stat)
@@ -268,7 +268,7 @@
return
//Gurgleborg process
-/obj/item/device/dogborg/sleeper/proc/clean_cycle()
+/obj/item/dogborg/sleeper/proc/clean_cycle()
//Sanity
for(var/I in items_preserved)
if(!(I in contents))
@@ -341,10 +341,10 @@
if(cleaning)
addtimer(CALLBACK(src, .proc/clean_cycle), 50)
-/obj/item/device/dogborg/sleeper/proc/CheckAccepted(obj/item/I)
+/obj/item/dogborg/sleeper/proc/CheckAccepted(obj/item/I)
return is_type_in_typecache(I, important_items)
-/obj/item/device/dogborg/sleeper/proc/inject_chem(chem)
+/obj/item/dogborg/sleeper/proc/inject_chem(chem)
if(hound.cell.charge <= 800) //This is so borgs don't kill themselves with it. Remember, 750 charge used every injection.
to_chat(hound, "You don't have enough power to synthesize fluids.")
return
@@ -356,13 +356,13 @@
var/units = round(patient.reagents.get_reagent_amount(chem))
to_chat(hound, "Injecting [units] unit\s of [chem] into occupant.") //If they were immersed, the reagents wouldn't leave with them.
-/obj/item/device/dogborg/sleeper/medihound //Medihound sleeper
+/obj/item/dogborg/sleeper/medihound //Medihound sleeper
name = "Mobile Sleeper"
desc = "Equipment for medical hound. A mounted sleeper that stabilizes patients and can inject reagents in the borg's reserves."
icon = 'icons/mob/dogborg.dmi'
icon_state = "sleeper"
-/obj/item/device/dogborg/sleeper/K9 //The K9 portabrig
+/obj/item/dogborg/sleeper/K9 //The K9 portabrig
name = "Mobile Brig"
desc = "Equipment for a K9 unit. A mounted portable-brig that holds criminals."
icon = 'icons/mob/dogborg.dmi'
@@ -371,13 +371,13 @@
min_health = -100
injection_chems = null //So they don't have all the same chems as the medihound!
-/obj/item/storage/attackby(obj/item/device/dogborg/sleeper/K9, mob/user, proximity)
+/obj/item/storage/attackby(obj/item/dogborg/sleeper/K9, mob/user, proximity)
if(istype(K9))
K9.afterattack(src, user ,1)
else
. = ..()
-/obj/item/device/dogborg/sleeper/K9/afterattack(var/atom/movable/target, mob/living/silicon/user, proximity)
+/obj/item/dogborg/sleeper/K9/afterattack(var/atom/movable/target, mob/living/silicon/user, proximity)
hound = loc
if(!istype(target))
@@ -413,7 +413,7 @@
return
return
-/obj/item/device/dogborg/sleeper/compactor //Janihound gut.
+/obj/item/dogborg/sleeper/compactor //Janihound gut.
name = "garbage processor"
desc = "A mounted garbage compactor unit with fuel processor."
icon = 'icons/mob/dogborg.dmi'
@@ -423,13 +423,13 @@
injection_chems = null //So they don't have all the same chems as the medihound!
var/max_item_count = 30
-/obj/item/storage/attackby(obj/item/device/dogborg/sleeper/compactor, mob/user, proximity) //GIT CIRCUMVENTED YO!
+/obj/item/storage/attackby(obj/item/dogborg/sleeper/compactor, mob/user, proximity) //GIT CIRCUMVENTED YO!
if(istype(compactor))
compactor.afterattack(src, user ,1)
else
. = ..()
-/obj/item/device/dogborg/sleeper/compactor/afterattack(var/atom/movable/target, mob/living/silicon/user, proximity)//GARBO NOMS
+/obj/item/dogborg/sleeper/compactor/afterattack(var/atom/movable/target, mob/living/silicon/user, proximity)//GARBO NOMS
hound = loc
var/obj/item/target_obj = target
if(!istype(target))
diff --git a/code/game/objects/items/devices/doorCharge.dm b/code/game/objects/items/devices/doorCharge.dm
index 2fc3770f1c..6fa1b9d742 100644
--- a/code/game/objects/items/devices/doorCharge.dm
+++ b/code/game/objects/items/devices/doorCharge.dm
@@ -1,6 +1,7 @@
-/obj/item/device/doorCharge
+/obj/item/doorCharge
name = "airlock charge"
desc = null //Different examine for traitors
+ icon = 'icons/obj/device.dmi'
item_state = "electronic"
icon_state = "doorCharge"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
@@ -13,7 +14,7 @@
attack_verb = list("blown up", "exploded", "detonated")
materials = list(MAT_METAL=50, MAT_GLASS=30)
-/obj/item/device/doorCharge/ex_act(severity, target)
+/obj/item/doorCharge/ex_act(severity, target)
switch(severity)
if(1)
visible_message("[src] detonates!")
@@ -26,14 +27,14 @@
if(prob(25))
ex_act(EXPLODE_DEVASTATE)
-/obj/item/device/doorCharge/Destroy()
+/obj/item/doorCharge/Destroy()
if(istype(loc, /obj/machinery/door/airlock))
var/obj/machinery/door/airlock/A = loc
if(A.charge == src)
A.charge = null
return ..()
-/obj/item/device/doorCharge/examine(mob/user)
+/obj/item/doorCharge/examine(mob/user)
..()
if(user.mind && user.mind.has_antag_datum(/datum/antagonist/traitor)) //No nuke ops because the device is excluded from nuclear
to_chat(user, "A small explosive device that can be used to sabotage airlocks to cause an explosion upon opening. To apply, remove the airlock's maintenance panel and place it within.")
diff --git a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm
index 6b465d71e1..2341a78bba 100644
--- a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm
+++ b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm
@@ -1,5 +1,5 @@
//Used by engineering cyborgs in place of generic circuits.
-/obj/item/device/electroadaptive_pseudocircuit
+/obj/item/electroadaptive_pseudocircuit
name = "electroadaptive pseudocircuit"
desc = "An all-in-one circuit imprinter, designer, synthesizer, outfitter, creator, and chef. It can be used in place of any generic circuit board during construction."
icon = 'icons/obj/module.dmi'
@@ -11,18 +11,18 @@
var/static/recycleable_circuits = typecacheof(list(/obj/item/electronics/firelock, /obj/item/electronics/airalarm, /obj/item/electronics/firealarm, \
/obj/item/electronics/apc))//A typecache of circuits consumable for material
-/obj/item/device/electroadaptive_pseudocircuit/Initialize()
+/obj/item/electroadaptive_pseudocircuit/Initialize()
. = ..()
maptext = "[circuits]"
-/obj/item/device/electroadaptive_pseudocircuit/examine(mob/user)
+/obj/item/electroadaptive_pseudocircuit/examine(mob/user)
..()
if(iscyborg(user))
to_chat(user, "It has material for [circuits] circuit[circuits == 1 ? "" : "s"]. Use the pseudocircuit on existing circuits to gain material.")
to_chat(user, "Serves as a substitute for fire/air alarm, firelock, and APC electronics.")
to_chat(user, "It can also be used on an APC with no power cell to fabricate a low-capacity cell at a high power cost.")
-/obj/item/device/electroadaptive_pseudocircuit/proc/adapt_circuit(mob/living/silicon/robot/R, circuit_cost = 0)
+/obj/item/electroadaptive_pseudocircuit/proc/adapt_circuit(mob/living/silicon/robot/R, circuit_cost = 0)
if(QDELETED(R) || !istype(R))
return
if(!R.cell)
@@ -46,7 +46,7 @@
addtimer(CALLBACK(src, .proc/recharge), recharge_time)
return TRUE //The actual circuit magic itself is done on a per-object basis
-/obj/item/device/electroadaptive_pseudocircuit/afterattack(atom/target, mob/living/user, proximity)
+/obj/item/electroadaptive_pseudocircuit/afterattack(atom/target, mob/living/user, proximity)
if(!proximity)
return
if(!is_type_in_typecache(target, recycleable_circuits))
@@ -58,7 +58,7 @@
playsound(user, 'sound/items/deconstruct.ogg', 50, TRUE)
qdel(target)
-/obj/item/device/electroadaptive_pseudocircuit/proc/recharge()
+/obj/item/electroadaptive_pseudocircuit/proc/recharge()
playsound(src, 'sound/machines/chime.ogg', 25, TRUE)
recharging = FALSE
icon_state = initial(icon_state)
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 13ceeaedeb..8ba7a55d93 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -1,4 +1,4 @@
-/obj/item/device/flashlight
+/obj/item/flashlight
name = "flashlight"
desc = "A hand-held emergency light."
icon = 'icons/obj/lighting.dmi'
@@ -15,11 +15,11 @@
var/brightness_on = 4 //range of light when on
var/flashlight_power = 1 //strength of the light when on
-/obj/item/device/flashlight/Initialize()
+/obj/item/flashlight/Initialize()
. = ..()
update_brightness()
-/obj/item/device/flashlight/proc/update_brightness(mob/user = null)
+/obj/item/flashlight/proc/update_brightness(mob/user = null)
if(on)
icon_state = "[initial(icon_state)]-on"
if(flashlight_power)
@@ -30,7 +30,7 @@
icon_state = initial(icon_state)
set_light(0)
-/obj/item/device/flashlight/attack_self(mob/user)
+/obj/item/flashlight/attack_self(mob/user)
on = !on
update_brightness(user)
for(var/X in actions)
@@ -38,14 +38,14 @@
A.UpdateButtonIcon()
return 1
-/obj/item/device/flashlight/suicide_act(mob/living/carbon/human/user)
+/obj/item/flashlight/suicide_act(mob/living/carbon/human/user)
if (user.eye_blind)
user.visible_message("[user] is putting [src] close to [user.p_their()] eyes and turning it on ... but [user.p_theyre()] blind!")
return SHAME
user.visible_message("[user] is putting [src] close to [user.p_their()] eyes and turning it on! It looks like [user.p_theyre()] trying to commit suicide!")
return (FIRELOSS)
-/obj/item/device/flashlight/attack(mob/living/carbon/M, mob/living/carbon/human/user)
+/obj/item/flashlight/attack(mob/living/carbon/M, mob/living/carbon/human/user)
add_fingerprint(user)
if(istype(M) && on && user.zone_selected in list(BODY_ZONE_PRECISE_EYES, BODY_ZONE_PRECISE_MOUTH))
@@ -158,7 +158,7 @@
else
return ..()
-/obj/item/device/flashlight/pen
+/obj/item/flashlight/pen
name = "penlight"
desc = "A pen-sized light, used by medical staff. It can also be used to create a hologram to alert people of incoming medical assistance."
icon_state = "penlight"
@@ -167,7 +167,7 @@
brightness_on = 2
var/holo_cooldown = 0
-/obj/item/device/flashlight/pen/afterattack(atom/target, mob/user, proximity_flag)
+/obj/item/flashlight/pen/afterattack(atom/target, mob/user, proximity_flag)
if(!proximity_flag)
if(holo_cooldown > world.time)
to_chat(user, "[src] is not ready yet!")
@@ -192,7 +192,7 @@
visible_message("[creator] created a medical hologram!")
-/obj/item/device/flashlight/seclite
+/obj/item/flashlight/seclite
name = "seclite"
desc = "A robust flashlight used by security."
icon_state = "seclite"
@@ -204,7 +204,7 @@
hitsound = 'sound/weapons/genhit1.ogg'
// the desk lamps are a bit special
-/obj/item/device/flashlight/lamp
+/obj/item/flashlight/lamp
name = "desk lamp"
desc = "A desk lamp with an adjustable mount."
icon_state = "lamp"
@@ -220,14 +220,14 @@
// green-shaded desk lamp
-/obj/item/device/flashlight/lamp/green
+/obj/item/flashlight/lamp/green
desc = "A classic green-shaded desk lamp."
icon_state = "lampgreen"
item_state = "lampgreen"
-/obj/item/device/flashlight/lamp/verb/toggle_light()
+/obj/item/flashlight/lamp/verb/toggle_light()
set name = "Toggle light"
set category = "Object"
set src in oview(1)
@@ -236,7 +236,7 @@
attack_self(usr)
//Bananalamp
-/obj/item/device/flashlight/lamp/bananalamp
+/obj/item/flashlight/lamp/bananalamp
name = "banana lamp"
desc = "Only a clown would think to make a ghetto banana-shaped lamp. Even has a goofy pullstring."
icon_state = "bananalamp"
@@ -244,7 +244,7 @@
// FLARES
-/obj/item/device/flashlight/flare
+/obj/item/flashlight/flare
name = "flare"
desc = "A red Nanotrasen issued flare. There are instructions on the side, it reads 'pull cord, make light'."
w_class = WEIGHT_CLASS_SMALL
@@ -259,11 +259,11 @@
light_color = LIGHT_COLOR_FLARE
grind_results = list("sulfur" = 15)
-/obj/item/device/flashlight/flare/New()
+/obj/item/flashlight/flare/New()
fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds.
..()
-/obj/item/device/flashlight/flare/process()
+/obj/item/flashlight/flare/process()
open_flame(heat)
fuel = max(fuel - 1, 0)
if(!fuel || !on)
@@ -272,14 +272,14 @@
icon_state = "[initial(icon_state)]-empty"
STOP_PROCESSING(SSobj, src)
-/obj/item/device/flashlight/flare/ignition_effect(atom/A, mob/user)
+/obj/item/flashlight/flare/ignition_effect(atom/A, mob/user)
if(fuel && on)
. = "[user] lights [A] with [src] like a real \
badass."
else
. = ""
-/obj/item/device/flashlight/flare/proc/turn_off()
+/obj/item/flashlight/flare/proc/turn_off()
on = FALSE
force = initial(src.force)
damtype = initial(src.damtype)
@@ -289,14 +289,14 @@
else
update_brightness(null)
-/obj/item/device/flashlight/flare/update_brightness(mob/user = null)
+/obj/item/flashlight/flare/update_brightness(mob/user = null)
..()
if(on)
item_state = "[initial(item_state)]-on"
else
item_state = "[initial(item_state)]"
-/obj/item/device/flashlight/flare/attack_self(mob/user)
+/obj/item/flashlight/flare/attack_self(mob/user)
// Usual checks
if(!fuel)
@@ -314,10 +314,10 @@
damtype = "fire"
START_PROCESSING(SSobj, src)
-/obj/item/device/flashlight/flare/is_hot()
+/obj/item/flashlight/flare/is_hot()
return on * heat
-/obj/item/device/flashlight/flare/torch
+/obj/item/flashlight/flare/torch
name = "torch"
desc = "A torch fashioned from some leaves and a log."
w_class = WEIGHT_CLASS_BULKY
@@ -330,7 +330,7 @@
on_damage = 10
slot_flags = null
-/obj/item/device/flashlight/lantern
+/obj/item/flashlight/lantern
name = "lantern"
icon_state = "lantern"
item_state = "lantern"
@@ -340,7 +340,7 @@
brightness_on = 6 // luminosity when on
-/obj/item/device/flashlight/slime
+/obj/item/flashlight/slime
gender = PLURAL
name = "glowing slime extract"
desc = "Extract from a yellow slime. It emits a strong light when squeezed."
@@ -352,21 +352,21 @@
materials = list()
brightness_on = 6 //luminosity when on
-/obj/item/device/flashlight/emp
+/obj/item/flashlight/emp
var/emp_max_charges = 4
var/emp_cur_charges = 4
var/charge_tick = 0
-/obj/item/device/flashlight/emp/New()
+/obj/item/flashlight/emp/New()
..()
START_PROCESSING(SSobj, src)
-/obj/item/device/flashlight/emp/Destroy()
+/obj/item/flashlight/emp/Destroy()
STOP_PROCESSING(SSobj, src)
. = ..()
-/obj/item/device/flashlight/emp/process()
+/obj/item/flashlight/emp/process()
charge_tick++
if(charge_tick < 10)
return FALSE
@@ -374,12 +374,12 @@
emp_cur_charges = min(emp_cur_charges+1, emp_max_charges)
return TRUE
-/obj/item/device/flashlight/emp/attack(mob/living/M, mob/living/user)
+/obj/item/flashlight/emp/attack(mob/living/M, mob/living/user)
if(on && user.zone_selected in list(BODY_ZONE_PRECISE_EYES, BODY_ZONE_PRECISE_MOUTH)) // call original attack when examining organs
..()
return
-/obj/item/device/flashlight/emp/afterattack(atom/movable/A, mob/user, proximity)
+/obj/item/flashlight/emp/afterattack(atom/movable/A, mob/user, proximity)
if(!proximity)
return
@@ -401,7 +401,7 @@
// Glowsticks, in the uncomfortable range of similar to flares,
// but not similar enough to make it worth a refactor
-/obj/item/device/flashlight/glowstick
+/obj/item/flashlight/glowstick
name = "glowstick"
desc = "A military-grade glowstick."
w_class = WEIGHT_CLASS_SMALL
@@ -412,27 +412,27 @@
grind_results = list("phenol" = 15, "hydrogen" = 10, "oxygen" = 5) //Meth-in-a-stick
var/fuel = 0
-/obj/item/device/flashlight/glowstick/Initialize()
+/obj/item/flashlight/glowstick/Initialize()
fuel = rand(1600, 2000)
light_color = color
. = ..()
-/obj/item/device/flashlight/glowstick/Destroy()
+/obj/item/flashlight/glowstick/Destroy()
STOP_PROCESSING(SSobj, src)
. = ..()
-/obj/item/device/flashlight/glowstick/process()
+/obj/item/flashlight/glowstick/process()
fuel = max(fuel - 1, 0)
if(!fuel)
turn_off()
STOP_PROCESSING(SSobj, src)
update_icon()
-/obj/item/device/flashlight/glowstick/proc/turn_off()
+/obj/item/flashlight/glowstick/proc/turn_off()
on = FALSE
update_icon()
-/obj/item/device/flashlight/glowstick/update_icon()
+/obj/item/flashlight/glowstick/update_icon()
item_state = "glowstick"
cut_overlays()
if(!fuel)
@@ -449,7 +449,7 @@
icon_state = "glowstick"
cut_overlays()
-/obj/item/device/flashlight/glowstick/attack_self(mob/user)
+/obj/item/flashlight/glowstick/attack_self(mob/user)
if(!fuel)
to_chat(user, "[src] is spent.")
return
@@ -462,47 +462,47 @@
user.visible_message("[user] cracks and shakes [src].", "You crack and shake [src], turning it on!")
activate()
-/obj/item/device/flashlight/glowstick/proc/activate()
+/obj/item/flashlight/glowstick/proc/activate()
if(!on)
on = TRUE
START_PROCESSING(SSobj, src)
-/obj/item/device/flashlight/glowstick/red
+/obj/item/flashlight/glowstick/red
name = "red glowstick"
color = LIGHT_COLOR_RED
-/obj/item/device/flashlight/glowstick/blue
+/obj/item/flashlight/glowstick/blue
name = "blue glowstick"
color = LIGHT_COLOR_BLUE
-/obj/item/device/flashlight/glowstick/cyan
+/obj/item/flashlight/glowstick/cyan
name = "cyan glowstick"
color = LIGHT_COLOR_CYAN
-/obj/item/device/flashlight/glowstick/orange
+/obj/item/flashlight/glowstick/orange
name = "orange glowstick"
color = LIGHT_COLOR_ORANGE
-/obj/item/device/flashlight/glowstick/yellow
+/obj/item/flashlight/glowstick/yellow
name = "yellow glowstick"
color = LIGHT_COLOR_YELLOW
-/obj/item/device/flashlight/glowstick/pink
+/obj/item/flashlight/glowstick/pink
name = "pink glowstick"
color = LIGHT_COLOR_PINK
-/obj/item/device/flashlight/glowstick/random
+/obj/item/flashlight/glowstick/random
name = "random colored glowstick"
icon_state = "random_glowstick"
color = null
-/obj/item/device/flashlight/glowstick/random/Initialize()
+/obj/item/flashlight/glowstick/random/Initialize()
..()
- var/T = pick(typesof(/obj/item/device/flashlight/glowstick) - /obj/item/device/flashlight/glowstick/random)
+ var/T = pick(typesof(/obj/item/flashlight/glowstick) - /obj/item/flashlight/glowstick/random)
new T(loc)
return INITIALIZE_HINT_QDEL
-/obj/item/device/flashlight/spotlight //invisible lighting source
+/obj/item/flashlight/spotlight //invisible lighting source
name = "disco light"
desc = "Groovy..."
icon_state = null
@@ -517,7 +517,7 @@
var/range = null
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
-/obj/item/device/flashlight/flashdark
+/obj/item/flashlight/flashdark
name = "flashdark"
desc = "A strange device manufactured with mysterious elements that somehow emits darkness. Or maybe it just sucks in light? Nobody knows for sure."
icon_state = "flashdark"
@@ -525,7 +525,7 @@
brightness_on = 2.5
flashlight_power = -3
-/obj/item/device/flashlight/eyelight
+/obj/item/flashlight/eyelight
name = "eyelight"
desc = "This shouldn't exist outside of someone's head, how are you seeing this?"
brightness_on = 15
diff --git a/code/game/objects/items/devices/forcefieldprojector.dm b/code/game/objects/items/devices/forcefieldprojector.dm
index c0b32883e8..f9c8084ea5 100644
--- a/code/game/objects/items/devices/forcefieldprojector.dm
+++ b/code/game/objects/items/devices/forcefieldprojector.dm
@@ -1,6 +1,7 @@
-/obj/item/device/forcefield
+/obj/item/forcefield
name = "forcefield projector"
desc = "An experimental device that can create several forcefields at a distance."
+ icon = 'icons/obj/device.dmi'
icon_state = "signmaker_engi"
slot_flags = SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
@@ -15,7 +16,7 @@
var/list/current_fields
var/field_distance_limit = 7
-/obj/item/device/forcefield/afterattack(atom/target, mob/user, proximity_flag)
+/obj/item/forcefield/afterattack(atom/target, mob/user, proximity_flag)
if(!check_allowed_items(target, 1))
return
if(istype(target, /obj/structure/projected_forcefield))
@@ -39,27 +40,27 @@
current_fields += F
user.changeNext_move(CLICK_CD_MELEE)
-/obj/item/device/forcefield/attack_self(mob/user)
+/obj/item/forcefield/attack_self(mob/user)
if(LAZYLEN(current_fields))
to_chat(user, "You deactivate [src], disabling all active forcefields.")
for(var/obj/structure/projected_forcefield/F in current_fields)
qdel(F)
-/obj/item/device/forcefield/examine(mob/user)
+/obj/item/forcefield/examine(mob/user)
..()
var/percent_charge = round((shield_integrity/max_shield_integrity)*100)
to_chat(user, "It is currently sustaining [LAZYLEN(current_fields)]/[max_fields] fields, and it's [percent_charge]% charged.")
-/obj/item/device/forcefield/Initialize(mapload)
+/obj/item/forcefield/Initialize(mapload)
..()
current_fields = list()
START_PROCESSING(SSobj, src)
-/obj/item/device/forcefield/Destroy()
+/obj/item/forcefield/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
-/obj/item/device/forcefield/process()
+/obj/item/forcefield/process()
if(!LAZYLEN(current_fields))
shield_integrity = min(shield_integrity + 4, max_shield_integrity)
else
@@ -80,9 +81,9 @@
resistance_flags = INDESTRUCTIBLE
CanAtmosPass = ATMOS_PASS_DENSITY
armor = list("melee" = 0, "bullet" = 25, "laser" = 50, "energy" = 50, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
- var/obj/item/device/forcefield/generator
+ var/obj/item/forcefield/generator
-/obj/structure/projected_forcefield/Initialize(mapload, obj/item/device/forcefield/origin)
+/obj/structure/projected_forcefield/Initialize(mapload, obj/item/forcefield/origin)
. = ..()
generator = origin
diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm
index 83cec3c258..364f85fbc4 100644
--- a/code/game/objects/items/devices/geiger_counter.dm
+++ b/code/game/objects/items/devices/geiger_counter.dm
@@ -8,9 +8,10 @@
#define RAD_GRACE_PERIOD 2
-/obj/item/device/geiger_counter //DISCLAIMER: I know nothing about how real-life Geiger counters work. This will not be realistic. ~Xhuis
+/obj/item/geiger_counter //DISCLAIMER: I know nothing about how real-life Geiger counters work. This will not be realistic. ~Xhuis
name = "geiger counter"
desc = "A handheld device used for detecting and measuring radiation pulses."
+ icon = 'icons/obj/device.dmi'
icon_state = "geiger_off"
item_state = "multitool"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
@@ -29,17 +30,17 @@
var/fail_to_receive = 0
var/current_warning = 1
-/obj/item/device/geiger_counter/Initialize()
+/obj/item/geiger_counter/Initialize()
. = ..()
START_PROCESSING(SSobj, src)
soundloop = new(list(src), FALSE)
-/obj/item/device/geiger_counter/Destroy()
+/obj/item/geiger_counter/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
-/obj/item/device/geiger_counter/process()
+/obj/item/geiger_counter/process()
update_icon()
update_sound()
@@ -61,7 +62,7 @@
current_tick_amount = 0
-/obj/item/device/geiger_counter/examine(mob/user)
+/obj/item/geiger_counter/examine(mob/user)
..()
if(!scanning)
return 1
@@ -85,7 +86,7 @@
to_chat(user, "The last radiation amount detected was [last_tick_amount]")
-/obj/item/device/geiger_counter/update_icon()
+/obj/item/geiger_counter/update_icon()
if(!scanning)
icon_state = "geiger_off"
return 1
@@ -107,7 +108,7 @@
icon_state = "geiger_on_5"
..()
-/obj/item/device/geiger_counter/proc/update_sound()
+/obj/item/geiger_counter/proc/update_sound()
var/datum/looping_sound/geiger/loop = soundloop
if(!scanning)
loop.stop()
@@ -118,19 +119,19 @@
loop.last_radiation = radiation_count
loop.start()
-/obj/item/device/geiger_counter/rad_act(amount)
+/obj/item/geiger_counter/rad_act(amount)
. = ..()
if(amount <= RAD_BACKGROUND_RADIATION || !scanning)
return
current_tick_amount += amount
update_icon()
-/obj/item/device/geiger_counter/attack_self(mob/user)
+/obj/item/geiger_counter/attack_self(mob/user)
scanning = !scanning
update_icon()
to_chat(user, "[icon2html(src, user)] You switch [scanning ? "on" : "off"] [src].")
-/obj/item/device/geiger_counter/attack(mob/living/M, mob/user)
+/obj/item/geiger_counter/attack(mob/living/M, mob/user)
if(user.a_intent == INTENT_HELP)
if(!(obj_flags & EMAGGED))
user.visible_message("[user] scans [M] with [src].", "You scan [M]'s radiation levels with [src]...")
@@ -142,7 +143,7 @@
return 1
..()
-/obj/item/device/geiger_counter/proc/scan(atom/A, mob/user)
+/obj/item/geiger_counter/proc/scan(atom/A, mob/user)
var/rad_strength = 0
for(var/i in get_rad_contents(A)) // Yes it's intentional that you can't detect radioactive things under rad protection. Gives traitors a way to hide their glowing green rocks.
var/atom/thing = i
@@ -164,7 +165,7 @@
else
to_chat(user, "[icon2html(src, user)] Subject is free of radioactive contamination.")
-/obj/item/device/geiger_counter/attackby(obj/item/I, mob/user, params)
+/obj/item/geiger_counter/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/screwdriver) && (obj_flags & EMAGGED))
if(scanning)
to_chat(user, "Turn off [src] before you perform this action!")
@@ -180,7 +181,7 @@
else
return ..()
-/obj/item/device/geiger_counter/AltClick(mob/living/user)
+/obj/item/geiger_counter/AltClick(mob/living/user)
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE))
return ..()
if(!scanning)
@@ -190,7 +191,7 @@
to_chat(usr, "You flush [src]'s radiation counts, resetting it to normal.")
update_icon()
-/obj/item/device/geiger_counter/emag_act(mob/user)
+/obj/item/geiger_counter/emag_act(mob/user)
if(obj_flags & EMAGGED)
return
if(scanning)
@@ -199,17 +200,17 @@
to_chat(user, "You override [src]'s radiation storing protocols. It will now generate small doses of radiation, and stored rads are now projected into creatures you scan.")
obj_flags |= EMAGGED
-/obj/item/device/geiger_counter/cyborg
+/obj/item/geiger_counter/cyborg
var/datum/component/mobhook
-/obj/item/device/geiger_counter/cyborg/equipped(mob/user)
+/obj/item/geiger_counter/cyborg/equipped(mob/user)
. = ..()
if (mobhook && mobhook.parent != user)
QDEL_NULL(mobhook)
if (!mobhook)
mobhook = user.AddComponent(/datum/component/redirect, list(COMSIG_ATOM_RAD_ACT), CALLBACK(src, /atom.proc/rad_act))
-/obj/item/device/geiger_counter/cyborg/dropped()
+/obj/item/geiger_counter/cyborg/dropped()
. = ..()
QDEL_NULL(mobhook)
diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm
index b3e33ec8ba..f07a95ef20 100644
--- a/code/game/objects/items/devices/gps.dm
+++ b/code/game/objects/items/devices/gps.dm
@@ -1,5 +1,5 @@
GLOBAL_LIST_EMPTY(GPS_list)
-/obj/item/device/gps
+/obj/item/gps
name = "global positioning system"
desc = "Helping lost spacemen find their way through the planets since 2016."
icon = 'icons/obj/telescience.dmi'
@@ -14,38 +14,38 @@ GLOBAL_LIST_EMPTY(GPS_list)
var/updating = TRUE //Automatic updating of GPS list. Can be set to manual by user.
var/global_mode = TRUE //If disabled, only GPS signals of the same Z level are shown
-/obj/item/device/gps/examine(mob/user)
+/obj/item/gps/examine(mob/user)
..()
to_chat(user, "Alt-click to switch it [tracking ? "off":"on"].")
-/obj/item/device/gps/Initialize()
+/obj/item/gps/Initialize()
. = ..()
GLOB.GPS_list += src
name = "global positioning system ([gpstag])"
add_overlay("working")
-/obj/item/device/gps/Destroy()
+/obj/item/gps/Destroy()
GLOB.GPS_list -= src
return ..()
-/obj/item/device/gps/emp_act(severity)
+/obj/item/gps/emp_act(severity)
emped = TRUE
cut_overlay("working")
add_overlay("emp")
addtimer(CALLBACK(src, .proc/reboot), 300, TIMER_OVERRIDE) //if a new EMP happens, remove the old timer so it doesn't reactivate early
SStgui.close_uis(src) //Close the UI control if it is open.
-/obj/item/device/gps/proc/reboot()
+/obj/item/gps/proc/reboot()
emped = FALSE
cut_overlay("emp")
add_overlay("working")
-/obj/item/device/gps/AltClick(mob/user)
+/obj/item/gps/AltClick(mob/user)
if(!user.canUseTopic(src, BE_CLOSE))
return
toggletracking(user)
-/obj/item/device/gps/proc/toggletracking(mob/user)
+/obj/item/gps/proc/toggletracking(mob/user)
if(!user.canUseTopic(src, BE_CLOSE))
return //user not valid to use gps
if(emped)
@@ -61,7 +61,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
tracking = TRUE
-/obj/item/device/gps/ui_interact(mob/user, ui_key = "gps", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) // Remember to use the appropriate state.
+/obj/item/gps/ui_interact(mob/user, ui_key = "gps", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) // Remember to use the appropriate state.
if(emped)
to_chat(user, "[src] fizzles weakly.")
return
@@ -74,7 +74,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
ui.set_autoupdate(state = updating)
-/obj/item/device/gps/ui_data(mob/user)
+/obj/item/gps/ui_data(mob/user)
var/list/data = list()
data["power"] = tracking
data["tag"] = gpstag
@@ -90,7 +90,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
data["signals"] = list()
for(var/gps in GLOB.GPS_list)
- var/obj/item/device/gps/G = gps
+ var/obj/item/gps/G = gps
if(G.emped || !G.tracking || G == src)
continue
var/turf/pos = get_turf(G)
@@ -115,7 +115,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
-/obj/item/device/gps/ui_act(action, params)
+/obj/item/gps/ui_act(action, params)
if(..())
return
switch(action)
@@ -137,42 +137,42 @@ GLOBAL_LIST_EMPTY(GPS_list)
. = TRUE
-/obj/item/device/gps/science
+/obj/item/gps/science
icon_state = "gps-s"
gpstag = "SCI0"
-/obj/item/device/gps/engineering
+/obj/item/gps/engineering
icon_state = "gps-e"
gpstag = "ENG0"
-/obj/item/device/gps/mining
+/obj/item/gps/mining
icon_state = "gps-m"
gpstag = "MINE0"
desc = "A positioning system helpful for rescuing trapped or injured miners, keeping one on you at all times while mining might just save your life."
-/obj/item/device/gps/cyborg
+/obj/item/gps/cyborg
icon_state = "gps-b"
gpstag = "BORG0"
desc = "A mining cyborg internal positioning system. Used as a recovery beacon for damaged cyborg assets, or a collaboration tool for mining teams."
flags_1 = NODROP_1
-/obj/item/device/gps/internal
+/obj/item/gps/internal
icon_state = null
flags_1 = ABSTRACT_1
gpstag = "Eerie Signal"
desc = "Report to a coder immediately."
invisibility = INVISIBILITY_MAXIMUM
-/obj/item/device/gps/mining/internal
+/obj/item/gps/mining/internal
icon_state = "gps-m"
gpstag = "MINER"
desc = "A positioning system helpful for rescuing trapped or injured miners, keeping one on you at all times while mining might just save your life."
-/obj/item/device/gps/internal/base
+/obj/item/gps/internal/base
gpstag = "NT_AUX"
desc = "A homing signal from Nanotrasen's mining base."
-/obj/item/device/gps/visible_debug
+/obj/item/gps/visible_debug
name = "visible GPS"
gpstag = "ADMIN"
desc = "This admin-spawn GPS unit leaves the coordinates visible \
@@ -180,12 +180,12 @@ GLOBAL_LIST_EMPTY(GPS_list)
for marking the area around the transition edges."
var/list/turf/tagged
-/obj/item/device/gps/visible_debug/Initialize()
+/obj/item/gps/visible_debug/Initialize()
. = ..()
tagged = list()
START_PROCESSING(SSfastprocess, src)
-/obj/item/device/gps/visible_debug/process()
+/obj/item/gps/visible_debug/process()
var/turf/T = get_turf(src)
if(T)
// I assume it's faster to color,tag and OR the turf in, rather
@@ -194,13 +194,13 @@ GLOBAL_LIST_EMPTY(GPS_list)
T.maptext = "[T.x],[T.y],[T.z]"
tagged |= T
-/obj/item/device/gps/visible_debug/proc/clear()
+/obj/item/gps/visible_debug/proc/clear()
while(tagged.len)
var/turf/T = pop(tagged)
T.color = initial(T.color)
T.maptext = initial(T.maptext)
-/obj/item/device/gps/visible_debug/Destroy()
+/obj/item/gps/visible_debug/Destroy()
if(tagged)
clear()
tagged = null
diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm
index 4124f77aeb..7274531420 100644
--- a/code/game/objects/items/devices/instruments.dm
+++ b/code/game/objects/items/devices/instruments.dm
@@ -1,5 +1,5 @@
//copy pasta of the space piano, don't hurt me -Pete
-/obj/item/device/instrument
+/obj/item/instrument
name = "generic instrument"
resistance_flags = FLAMMABLE
force = 10
@@ -11,34 +11,34 @@
var/instrumentId = "generic"
var/instrumentExt = "mid"
-/obj/item/device/instrument/Initialize()
+/obj/item/instrument/Initialize()
. = ..()
song = new(instrumentId, src, instrumentExt)
-/obj/item/device/instrument/Destroy()
+/obj/item/instrument/Destroy()
qdel(song)
song = null
return ..()
-/obj/item/device/instrument/suicide_act(mob/user)
+/obj/item/instrument/suicide_act(mob/user)
user.visible_message("[user] begins to play 'Gloomy Sunday'! It looks like [user.p_theyre()] trying to commit suicide!")
return (BRUTELOSS)
-/obj/item/device/instrument/Initialize(mapload)
+/obj/item/instrument/Initialize(mapload)
. = ..()
if(mapload)
song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded
-/obj/item/device/instrument/attack_self(mob/user)
+/obj/item/instrument/attack_self(mob/user)
if(!user.IsAdvancedToolUser())
to_chat(user, "You don't have the dexterity to do this!")
return 1
interact(user)
-/obj/item/device/instrument/interact(mob/user)
+/obj/item/instrument/interact(mob/user)
ui_interact(user)
-/obj/item/device/instrument/ui_interact(mob/user)
+/obj/item/instrument/ui_interact(mob/user)
if(!user)
return
@@ -48,7 +48,7 @@
user.set_machine(src)
song.interact(user)
-/obj/item/device/instrument/violin
+/obj/item/instrument/violin
name = "space violin"
desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
icon_state = "violin"
@@ -56,14 +56,14 @@
hitsound = "swing_hit"
instrumentId = "violin"
-/obj/item/device/instrument/violin/golden
+/obj/item/instrument/violin/golden
name = "golden violin"
desc = "A golden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
icon_state = "golden_violin"
item_state = "golden_violin"
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-/obj/item/device/instrument/piano_synth
+/obj/item/instrument/piano_synth
name = "synthesizer"
desc = "An advanced electronic synthesizer that can be used as various instruments."
icon_state = "synth"
@@ -73,11 +73,11 @@
var/static/list/insTypes = list("accordion" = "mid", "bikehorn" = "ogg", "glockenspiel" = "mid", "guitar" = "ogg", "harmonica" = "mid", "piano" = "ogg", "recorder" = "mid", "saxophone" = "mid", "trombone" = "mid", "violin" = "mid", "xylophone" = "mid") //No eguitar you ear-rapey fuckers.
actions_types = list(/datum/action/item_action/synthswitch)
-/obj/item/device/instrument/piano_synth/proc/changeInstrument(name = "piano")
+/obj/item/instrument/piano_synth/proc/changeInstrument(name = "piano")
song.instrumentDir = name
song.instrumentExt = insTypes[name]
-/obj/item/device/instrument/guitar
+/obj/item/instrument/guitar
name = "guitar"
desc = "It's made of wood and has bronze strings."
icon_state = "guitar"
@@ -87,7 +87,7 @@
hitsound = 'sound/weapons/stringsmash.ogg'
instrumentId = "guitar"
-/obj/item/device/instrument/eguitar
+/obj/item/instrument/eguitar
name = "electric guitar"
desc = "Makes all your shredding needs possible."
icon_state = "eguitar"
@@ -98,28 +98,28 @@
instrumentId = "eguitar"
instrumentExt = "ogg"
-/obj/item/device/instrument/glockenspiel
+/obj/item/instrument/glockenspiel
name = "glockenspiel"
desc = "Smooth metal bars perfect for any marching band."
icon_state = "glockenspiel"
item_state = "glockenspiel"
instrumentId = "glockenspiel"
-/obj/item/device/instrument/accordion
+/obj/item/instrument/accordion
name = "accordion"
desc = "Pun-Pun not included."
icon_state = "accordion"
item_state = "accordion"
instrumentId = "accordion"
-/obj/item/device/instrument/trumpet
+/obj/item/instrument/trumpet
name = "trumpet"
desc = "To announce the arrival of the king!"
icon_state = "trumpet"
item_state = "trombone"
instrumentId = "trombone"
-/obj/item/device/instrument/trumpet/spectral
+/obj/item/instrument/trumpet/spectral
name = "spectral trumpet"
desc = "Things are about to get spooky!"
icon_state = "trumpet"
@@ -128,22 +128,22 @@
instrumentId = "trombone"
attack_verb = list("played","jazzed","trumpeted","mourned","dooted","spooked")
-/obj/item/device/instrument/trumpet/spectral/Initialize()
+/obj/item/instrument/trumpet/spectral/Initialize()
. = ..()
AddComponent(/datum/component/spooky)
-/obj/item/device/instrument/trumpet/spectral/attack(mob/living/carbon/C, mob/user)
+/obj/item/instrument/trumpet/spectral/attack(mob/living/carbon/C, mob/user)
playsound (loc, 'sound/instruments/trombone/En4.mid', 100,1,-1)
..()
-/obj/item/device/instrument/saxophone
+/obj/item/instrument/saxophone
name = "saxophone"
desc = "This soothing sound will be sure to leave your audience in tears."
icon_state = "saxophone"
item_state = "saxophone"
instrumentId = "saxophone"
-/obj/item/device/instrument/saxophone/spectral
+/obj/item/instrument/saxophone/spectral
name = "spectral saxophone"
desc = "This spooky sound will be sure to leave mortals in bones."
icon_state = "saxophone"
@@ -152,22 +152,22 @@
force = 0
attack_verb = list("played","jazzed","saxxed","mourned","dooted","spooked")
-/obj/item/device/instrument/saxophone/spectral/Initialize()
+/obj/item/instrument/saxophone/spectral/Initialize()
. = ..()
AddComponent(/datum/component/spooky)
-/obj/item/device/instrument/saxophone/spectral/attack(mob/living/carbon/C, mob/user)
+/obj/item/instrument/saxophone/spectral/attack(mob/living/carbon/C, mob/user)
playsound (loc, 'sound/instruments/saxophone/En4.mid', 100,1,-1)
..()
-/obj/item/device/instrument/trombone
+/obj/item/instrument/trombone
name = "trombone"
desc = "How can any pool table ever hope to compete?"
icon_state = "trombone"
item_state = "trombone"
instrumentId = "trombone"
-/obj/item/device/instrument/trombone/spectral
+/obj/item/instrument/trombone/spectral
name = "spectral trombone"
desc = "A skeleton's favorite instrument. Apply directly on the mortals."
instrumentId = "trombone"
@@ -176,15 +176,15 @@
force = 0
attack_verb = list("played","jazzed","tromboned","mourned","dooted","spooked")
-/obj/item/device/instrument/trombone/spectral/Initialize()
+/obj/item/instrument/trombone/spectral/Initialize()
. = ..()
AddComponent(/datum/component/spooky)
-/obj/item/device/instrument/trombone/spectral/attack(mob/living/carbon/C, mob/user)
+/obj/item/instrument/trombone/spectral/attack(mob/living/carbon/C, mob/user)
playsound (loc, 'sound/instruments/trombone/Cn4.mid', 100,1,-1)
..()
-/obj/item/device/instrument/recorder
+/obj/item/instrument/recorder
name = "recorder"
desc = "Just like in school, playing ability and all."
force = 5
@@ -192,7 +192,7 @@
item_state = "recorder"
instrumentId = "recorder"
-/obj/item/device/instrument/harmonica
+/obj/item/instrument/harmonica
name = "harmonica"
desc = "For when you get a bad case of the space blues."
icon_state = "harmonica"
@@ -203,13 +203,13 @@
w_class = WEIGHT_CLASS_SMALL
actions_types = list(/datum/action/item_action/instrument)
-/obj/item/device/instrument/harmonica/speechModification(message)
+/obj/item/instrument/harmonica/speechModification(message)
if(song.playing && ismob(loc))
to_chat(loc, "You stop playing the harmonica to talk...")
song.playing = FALSE
return message
-/obj/item/device/instrument/bikehorn
+/obj/item/instrument/bikehorn
name = "gilded bike horn"
desc = "An exquisitely decorated bike horn, capable of honking in a variety of notes."
icon_state = "bike_horn"
diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index 098643e87f..116b5982ee 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -1,4 +1,4 @@
-/obj/item/device/laser_pointer
+/obj/item/laser_pointer
name = "laser pointer"
desc = "Don't shine it in your eyes!"
icon = 'icons/obj/device.dmi'
@@ -18,26 +18,26 @@
var/obj/item/stock_parts/micro_laser/diode //used for upgrading!
-/obj/item/device/laser_pointer/red
+/obj/item/laser_pointer/red
pointer_icon_state = "red_laser"
-/obj/item/device/laser_pointer/green
+/obj/item/laser_pointer/green
pointer_icon_state = "green_laser"
-/obj/item/device/laser_pointer/blue
+/obj/item/laser_pointer/blue
pointer_icon_state = "blue_laser"
-/obj/item/device/laser_pointer/purple
+/obj/item/laser_pointer/purple
pointer_icon_state = "purple_laser"
-/obj/item/device/laser_pointer/New()
+/obj/item/laser_pointer/New()
..()
diode = new(src)
if(!pointer_icon_state)
pointer_icon_state = pick("red_laser","green_laser","blue_laser","purple_laser")
-/obj/item/device/laser_pointer/upgraded/New()
+/obj/item/laser_pointer/upgraded/New()
..()
diode = new /obj/item/stock_parts/micro_laser/ultra
-/obj/item/device/laser_pointer/attackby(obj/item/W, mob/user, params)
+/obj/item/laser_pointer/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/stock_parts/micro_laser))
if(!diode)
if(!user.transferItemToLoc(W, src))
@@ -55,10 +55,10 @@
else
return ..()
-/obj/item/device/laser_pointer/afterattack(atom/target, mob/living/user, flag, params)
+/obj/item/laser_pointer/afterattack(atom/target, mob/living/user, flag, params)
laser_act(target, user, params)
-/obj/item/device/laser_pointer/proc/laser_act(atom/target, mob/living/user, params)
+/obj/item/laser_pointer/proc/laser_act(atom/target, mob/living/user, params)
if( !(user in (viewers(7,target))) )
return
if (!diode)
@@ -182,7 +182,7 @@
flick_overlay_view(I, targloc, 10)
icon_state = "pointer"
-/obj/item/device/laser_pointer/process()
+/obj/item/laser_pointer/process()
if(prob(20 - recharge_locked*5))
energy += 1
if(energy >= max_energy)
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index a1cdfe4a9b..3fde35383f 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -38,7 +38,7 @@
#define LIGHT_BURNED 3
-/obj/item/device/lightreplacer
+/obj/item/lightreplacer
name = "light replacer"
desc = "A device to automatically replace lights. Refill with broken or working lightbulbs, or sheets of glass."
@@ -67,16 +67,16 @@
// when we get this many shards, we get a free bulb.
var/shards_required = 4
-/obj/item/device/lightreplacer/New()
+/obj/item/lightreplacer/New()
uses = max_uses / 2
failmsg = "The [name]'s refill light blinks red."
..()
-/obj/item/device/lightreplacer/examine(mob/user)
+/obj/item/lightreplacer/examine(mob/user)
..()
to_chat(user, status_string())
-/obj/item/device/lightreplacer/attackby(obj/item/W, mob/user, params)
+/obj/item/lightreplacer/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/stack/sheet/glass))
var/obj/item/stack/sheet/glass/G = W
@@ -148,30 +148,30 @@
to_chat(user, "You fill \the [src] with lights from \the [S]. " + status_string() + "")
-/obj/item/device/lightreplacer/emag_act()
+/obj/item/lightreplacer/emag_act()
if(obj_flags & EMAGGED)
return
Emag()
-/obj/item/device/lightreplacer/attack_self(mob/user)
+/obj/item/lightreplacer/attack_self(mob/user)
to_chat(user, status_string())
-/obj/item/device/lightreplacer/update_icon()
+/obj/item/lightreplacer/update_icon()
icon_state = "lightreplacer[(obj_flags & EMAGGED ? 1 : 0)]"
-/obj/item/device/lightreplacer/proc/status_string()
+/obj/item/lightreplacer/proc/status_string()
return "It has [uses] light\s remaining (plus [bulb_shards] fragment\s)."
-/obj/item/device/lightreplacer/proc/Use(mob/user)
+/obj/item/lightreplacer/proc/Use(mob/user)
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
AddUses(-1)
return 1
// Negative numbers will subtract
-/obj/item/device/lightreplacer/proc/AddUses(amount = 1)
+/obj/item/lightreplacer/proc/AddUses(amount = 1)
uses = CLAMP(uses + amount, 0, max_uses)
-/obj/item/device/lightreplacer/proc/AddShards(amount = 1, user)
+/obj/item/lightreplacer/proc/AddShards(amount = 1, user)
bulb_shards += amount
var/new_bulbs = round(bulb_shards / shards_required)
if(new_bulbs > 0)
@@ -182,13 +182,13 @@
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
return new_bulbs
-/obj/item/device/lightreplacer/proc/Charge(var/mob/user)
+/obj/item/lightreplacer/proc/Charge(var/mob/user)
charge += 1
if(charge > 3)
AddUses(1)
charge = 1
-/obj/item/device/lightreplacer/proc/ReplaceLight(obj/machinery/light/target, mob/living/U)
+/obj/item/lightreplacer/proc/ReplaceLight(obj/machinery/light/target, mob/living/U)
if(target.status != LIGHT_OK)
if(CanUse(U))
@@ -222,7 +222,7 @@
to_chat(U, "There is a working [target.fitting] already inserted!")
return
-/obj/item/device/lightreplacer/proc/Emag()
+/obj/item/lightreplacer/proc/Emag()
obj_flags ^= EMAGGED
playsound(src.loc, "sparks", 100, 1)
if(obj_flags & EMAGGED)
@@ -231,14 +231,14 @@
name = initial(name)
update_icon()
-/obj/item/device/lightreplacer/proc/CanUse(mob/living/user)
+/obj/item/lightreplacer/proc/CanUse(mob/living/user)
src.add_fingerprint(user)
if(uses > 0)
return 1
else
return 0
-/obj/item/device/lightreplacer/afterattack(atom/T, mob/U, proximity)
+/obj/item/lightreplacer/afterattack(atom/T, mob/U, proximity)
if(!proximity)
return
if(!isturf(T))
@@ -255,12 +255,12 @@
if(!used)
to_chat(U, failmsg)
-/obj/item/device/lightreplacer/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J)
+/obj/item/lightreplacer/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J)
J.put_in_cart(src, user)
J.myreplacer = src
J.update_icon()
-/obj/item/device/lightreplacer/cyborg/janicart_insert(mob/user, obj/structure/janitorialcart/J)
+/obj/item/lightreplacer/cyborg/janicart_insert(mob/user, obj/structure/janitorialcart/J)
return
#undef LIGHT_OK
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index 4b47a0373f..5fa089a012 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -1,6 +1,7 @@
-/obj/item/device/megaphone
+/obj/item/megaphone
name = "megaphone"
desc = "A device used to project your voice. Loudly."
+ icon = 'icons/obj/device.dmi'
icon_state = "megaphone"
item_state = "radio"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
@@ -10,13 +11,13 @@
var/spamcheck = 0
var/list/voicespan = list(SPAN_COMMAND)
-/obj/item/device/megaphone/suicide_act(mob/living/carbon/user)
+/obj/item/megaphone/suicide_act(mob/living/carbon/user)
user.visible_message("[user] is uttering [user.p_their()] last words into \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")
spamcheck = 0//so they dont have to worry about recharging
user.say("AAAAAAAAAAAARGHHHHH")//he must have died while coding this
return OXYLOSS
-/obj/item/device/megaphone/get_held_item_speechspans(mob/living/carbon/user)
+/obj/item/megaphone/get_held_item_speechspans(mob/living/carbon/user)
if(spamcheck > world.time)
to_chat(user, "\The [src] needs to recharge!")
else
@@ -24,26 +25,26 @@
spamcheck = world.time + 50
return voicespan
-/obj/item/device/megaphone/emag_act(mob/user)
+/obj/item/megaphone/emag_act(mob/user)
if(obj_flags & EMAGGED)
return
to_chat(user, "You overload \the [src]'s voice synthesizer.")
obj_flags |= EMAGGED
voicespan = list(SPAN_REALLYBIG, "userdanger")
-/obj/item/device/megaphone/sec
+/obj/item/megaphone/sec
name = "security megaphone"
icon_state = "megaphone-sec"
-/obj/item/device/megaphone/command
+/obj/item/megaphone/command
name = "command megaphone"
icon_state = "megaphone-command"
-/obj/item/device/megaphone/cargo
+/obj/item/megaphone/cargo
name = "supply megaphone"
icon_state = "megaphone-cargo"
-/obj/item/device/megaphone/clown
+/obj/item/megaphone/clown
name = "clown's megaphone"
desc = "Something that should not exist."
icon_state = "megaphone-clown"
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index 69de7025c0..063676ea62 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -10,9 +10,10 @@
-/obj/item/device/multitool
+/obj/item/multitool
name = "multitool"
desc = "Used for pulsing wires to test which to cut. Not recommended by doctors."
+ icon = 'icons/obj/device.dmi'
icon_state = "multitool"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
@@ -31,11 +32,11 @@
var/datum/integrated_io/selected_io = null //functional for integrated circuits.
var/mode = 0
-/obj/item/device/multitool/suicide_act(mob/living/carbon/user)
+/obj/item/multitool/suicide_act(mob/living/carbon/user)
user.visible_message("[user] puts the [src] to [user.p_their()] chest. It looks like [user.p_theyre()] trying to pulse [user.p_their()] heart off!")
return OXYLOSS//theres a reason it wasnt recommended by doctors
-/obj/item/device/multitool/attack_self(mob/user)
+/obj/item/multitool/attack_self(mob/user)
if(selected_io)
selected_io = null
to_chat(user, "You clear the wired connection from the multitool.")
@@ -43,13 +44,13 @@
..()
update_icon()
-/obj/item/device/multitool/update_icon()
+/obj/item/multitool/update_icon()
if(selected_io)
icon_state = "multitool_red"
else
icon_state = "multitool"
-/obj/item/device/multitool/proc/wire(var/datum/integrated_io/io, mob/user)
+/obj/item/multitool/proc/wire(var/datum/integrated_io/io, mob/user)
if(!io.holder.assembly)
to_chat(user, "\The [io.holder] needs to be secured inside an assembly first.")
return
@@ -78,7 +79,7 @@
update_icon()
-/obj/item/device/multitool/proc/unwire(var/datum/integrated_io/io1, var/datum/integrated_io/io2, mob/user)
+/obj/item/multitool/proc/unwire(var/datum/integrated_io/io1, var/datum/integrated_io/io2, mob/user)
if(!io1.linked.len || !io2.linked.len)
to_chat(user, "There is nothing connected to the data channel.")
return
@@ -98,22 +99,22 @@
// Syndicate device disguised as a multitool; it will turn red when an AI camera is nearby.
-/obj/item/device/multitool/ai_detect
+/obj/item/multitool/ai_detect
var/track_cooldown = 0
var/track_delay = 10 //How often it checks for proximity
var/detect_state = PROXIMITY_NONE
var/rangealert = 8 //Glows red when inside
var/rangewarning = 20 //Glows yellow when inside
-/obj/item/device/multitool/ai_detect/New()
+/obj/item/multitool/ai_detect/New()
..()
START_PROCESSING(SSobj, src)
-/obj/item/device/multitool/ai_detect/Destroy()
+/obj/item/multitool/ai_detect/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
-/obj/item/device/multitool/ai_detect/process()
+/obj/item/multitool/ai_detect/process()
if(track_cooldown > world.time)
return
detect_state = PROXIMITY_NONE
@@ -121,7 +122,7 @@
icon_state = "[initial(icon_state)][detect_state]"
track_cooldown = world.time + track_delay
-/obj/item/device/multitool/ai_detect/proc/multitool_detect()
+/obj/item/multitool/ai_detect/proc/multitool_detect()
var/turf/our_turf = get_turf(src)
for(var/mob/living/silicon/ai/AI in GLOB.ai_list)
if(AI.cameraFollow == src)
@@ -141,11 +142,11 @@
detect_state = PROXIMITY_NEAR
break
-/obj/item/device/multitool/ai_detect/admin
+/obj/item/multitool/ai_detect/admin
desc = "Used for pulsing wires to test which to cut. Not recommended by doctors. Has a strange tag that says 'Grief in Safety'." //What else should I say for a meme item?
track_delay = 5
-/obj/item/device/multitool/ai_detect/admin/multitool_detect()
+/obj/item/multitool/ai_detect/admin/multitool_detect()
var/turf/our_turf = get_turf(src)
for(var/mob/J in urange(rangewarning,our_turf))
if(GLOB.admin_datums[J.ckey])
@@ -155,12 +156,12 @@
detect_state = PROXIMITY_ON_SCREEN
break
-/obj/item/device/multitool/cyborg
+/obj/item/multitool/cyborg
name = "multitool"
desc = "Optimised and stripped-down version of a regular multitool."
toolspeed = 0.5
-/obj/item/device/multitool/abductor
+/obj/item/multitool/abductor
name = "alien multitool"
desc = "An omni-technological interface."
icon = 'icons/obj/abductor.dmi'
diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index b96c32f53f..25f3070d9e 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -1,4 +1,4 @@
-/obj/item/device/paicard
+/obj/item/paicard
name = "personal AI device"
icon = 'icons/obj/aicards.dmi'
icon_state = "pai"
@@ -10,22 +10,22 @@
var/mob/living/silicon/pai/pai
resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE
-/obj/item/device/paicard/suicide_act(mob/living/user)
+/obj/item/paicard/suicide_act(mob/living/user)
user.visible_message("[user] is staring sadly at [src]! [user.p_they()] can't keep living without real human intimacy!")
return OXYLOSS
-/obj/item/device/paicard/Initialize()
+/obj/item/paicard/Initialize()
SSpai.pai_card_list += src
add_overlay("pai-off")
return ..()
-/obj/item/device/paicard/Destroy()
+/obj/item/paicard/Destroy()
//Will stop people throwing friend pAIs into the singularity so they can respawn
SSpai.pai_card_list -= src
QDEL_NULL(pai)
return ..()
-/obj/item/device/paicard/attack_self(mob/user)
+/obj/item/paicard/attack_self(mob/user)
if (!in_range(src, user))
return
user.set_machine(src)
@@ -60,7 +60,7 @@
onclose(user, "paicard")
return
-/obj/item/device/paicard/Topic(href, href_list)
+/obj/item/paicard/Topic(href, href_list)
if(!usr || usr.stat)
return
@@ -115,19 +115,19 @@
// WIRE_RECEIVE = 2
// WIRE_TRANSMIT = 4
-/obj/item/device/paicard/proc/setPersonality(mob/living/silicon/pai/personality)
+/obj/item/paicard/proc/setPersonality(mob/living/silicon/pai/personality)
src.pai = personality
src.add_overlay("pai-null")
playsound(loc, 'sound/effects/pai_boot.ogg', 50, 1, -1)
audible_message("\The [src] plays a cheerful startup noise!")
-/obj/item/device/paicard/proc/removePersonality()
+/obj/item/paicard/proc/removePersonality()
QDEL_NULL(pai)
cut_overlays()
add_overlay("pai-off")
-/obj/item/device/paicard/proc/setEmotion(emotion)
+/obj/item/paicard/proc/setEmotion(emotion)
if(pai)
src.cut_overlays()
switch(emotion)
@@ -152,10 +152,10 @@
if(10)
src.add_overlay("pai-null")
-/obj/item/device/paicard/proc/alertUpdate()
+/obj/item/paicard/proc/alertUpdate()
visible_message("[src] flashes a message across its screen, \"Additional personalities available for download.\"", "[src] bleeps electronically.")
-/obj/item/device/paicard/emp_act(severity)
+/obj/item/paicard/emp_act(severity)
if(pai)
pai.emp_act(severity)
..()
diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm
index d76b7174da..a13de183a0 100644
--- a/code/game/objects/items/devices/pipe_painter.dm
+++ b/code/game/objects/items/devices/pipe_painter.dm
@@ -1,4 +1,4 @@
-/obj/item/device/pipe_painter
+/obj/item/pipe_painter
name = "pipe painter"
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "labeler1"
@@ -8,7 +8,7 @@
materials = list(MAT_METAL=5000, MAT_GLASS=2000)
-/obj/item/device/pipe_painter/afterattack(atom/A, mob/user, proximity_flag)
+/obj/item/pipe_painter/afterattack(atom/A, mob/user, proximity_flag)
//Make sure we only paint adjacent items
if(!proximity_flag)
return
@@ -21,9 +21,9 @@
playsound(src, 'sound/machines/click.ogg', 50, 1)
user.visible_message("[user] paints \the [P] [paint_color].","You paint \the [P] [paint_color].")
-/obj/item/device/pipe_painter/attack_self(mob/user)
+/obj/item/pipe_painter/attack_self(mob/user)
paint_color = input("Which colour do you want to use?","Pipe painter") in GLOB.pipe_paint_colors
-/obj/item/device/pipe_painter/examine(mob/user)
+/obj/item/pipe_painter/examine(mob/user)
..()
to_chat(user, "It is set to [paint_color].")
diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm
index ea4236b823..8d36fd9986 100644
--- a/code/game/objects/items/devices/powersink.dm
+++ b/code/game/objects/items/devices/powersink.dm
@@ -1,8 +1,9 @@
// Powersink - used to drain station power
-/obj/item/device/powersink
+/obj/item/powersink
desc = "A nulling power sink which drains energy from electrical systems."
name = "power sink"
+ icon = 'icons/obj/device.dmi'
icon_state = "powersink0"
item_state = "electronic"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
@@ -25,10 +26,10 @@
var/obj/structure/cable/attached // the attached cable
-/obj/item/device/powersink/update_icon()
+/obj/item/powersink/update_icon()
icon_state = "powersink[mode == OPERATING]"
-/obj/item/device/powersink/proc/set_mode(value)
+/obj/item/powersink/proc/set_mode(value)
if(value == mode)
return
switch(value)
@@ -55,7 +56,7 @@
update_icon()
set_light(0)
-/obj/item/device/powersink/attackby(obj/item/I, mob/user, params)
+/obj/item/powersink/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/screwdriver))
if(mode == DISCONNECTED)
var/turf/T = loc
@@ -80,13 +81,13 @@
else
return ..()
-/obj/item/device/powersink/attack_paw()
+/obj/item/powersink/attack_paw()
return
-/obj/item/device/powersink/attack_ai()
+/obj/item/powersink/attack_ai()
return
-/obj/item/device/powersink/attack_hand(mob/user)
+/obj/item/powersink/attack_hand(mob/user)
. = ..()
if(.)
return
@@ -110,7 +111,7 @@
"You hear a click.")
set_mode(CLAMPED_OFF)
-/obj/item/device/powersink/process()
+/obj/item/powersink/process()
if(!attached)
set_mode(DISCONNECTED)
return
diff --git a/code/game/objects/items/devices/pressureplates.dm b/code/game/objects/items/devices/pressureplates.dm
index d1ecf9ee28..8520571d22 100644
--- a/code/game/objects/items/devices/pressureplates.dm
+++ b/code/game/objects/items/devices/pressureplates.dm
@@ -1,7 +1,8 @@
-/obj/item/device/pressure_plate
+/obj/item/pressure_plate
name = "pressure plate"
desc = "An electronic device that triggers when stepped on."
+ icon = 'icons/obj/device.dmi'
item_state = "flash"
icon_state = "pressureplate"
level = 1
@@ -9,7 +10,7 @@
var/trigger_item = FALSE
var/trigger_silent = FALSE
var/sound/trigger_sound = 'sound/effects/pressureplate.ogg'
- var/obj/item/device/assembly/signaler/sigdev = null
+ var/obj/item/assembly/signaler/sigdev = null
var/roundstart_signaller = FALSE
var/roundstart_signaller_freq = FREQ_PRESSURE_PLATE
var/roundstart_signaller_code = 30
@@ -20,7 +21,7 @@
var/can_trigger = TRUE
var/trigger_delay = 10
-/obj/item/device/pressure_plate/Initialize()
+/obj/item/pressure_plate/Initialize()
. = ..()
tile_overlay = image(icon = 'icons/turf/floors.dmi', icon_state = "pp_overlay")
if(roundstart_signaller)
@@ -30,7 +31,7 @@
if(isopenturf(loc))
hide(TRUE)
-/obj/item/device/pressure_plate/Crossed(atom/movable/AM)
+/obj/item/pressure_plate/Crossed(atom/movable/AM)
. = ..()
if(!can_trigger || !active)
return
@@ -42,18 +43,18 @@
can_trigger = FALSE
addtimer(CALLBACK(src, .proc/trigger), trigger_delay)
-/obj/item/device/pressure_plate/proc/trigger()
+/obj/item/pressure_plate/proc/trigger()
can_trigger = TRUE
if(istype(sigdev))
sigdev.signal()
-/obj/item/device/pressure_plate/attackby(obj/item/I, mob/living/L)
- if(istype(I, /obj/item/device/assembly/signaler) && !istype(sigdev) && removable_signaller && L.transferItemToLoc(I, src))
+/obj/item/pressure_plate/attackby(obj/item/I, mob/living/L)
+ if(istype(I, /obj/item/assembly/signaler) && !istype(sigdev) && removable_signaller && L.transferItemToLoc(I, src))
sigdev = I
to_chat(L, "You attach [I] to [src]!")
return ..()
-/obj/item/device/pressure_plate/attack_self(mob/living/L)
+/obj/item/pressure_plate/attack_self(mob/living/L)
if(removable_signaller && istype(sigdev))
to_chat(L, "You remove [sigdev] from [src]")
if(!L.put_in_hands(sigdev))
@@ -61,7 +62,7 @@
sigdev = null
return ..()
-/obj/item/device/pressure_plate/hide(yes)
+/obj/item/pressure_plate/hide(yes)
if(yes)
invisibility = INVISIBILITY_MAXIMUM
anchored = TRUE
diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index 3e3a760fb3..7e2c5234fb 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -1,4 +1,4 @@
-/obj/item/device/electropack
+/obj/item/electropack
name = "electropack"
desc = "Dance my monkeys! DANCE!!!"
icon = 'icons/obj/radio.dmi'
@@ -15,20 +15,20 @@
var/frequency = FREQ_ELECTROPACK
var/shock_cooldown = 0
-/obj/item/device/electropack/suicide_act(mob/user)
+/obj/item/electropack/suicide_act(mob/user)
user.visible_message("[user] hooks [user.p_them()]self to the electropack and spams the trigger! It looks like [user.p_theyre()] trying to commit suicide!")
return (FIRELOSS)
-/obj/item/device/electropack/Initialize()
+/obj/item/electropack/Initialize()
. = ..()
SSradio.add_object(src, frequency, RADIO_SIGNALER)
-/obj/item/device/electropack/Destroy()
+/obj/item/electropack/Destroy()
SSradio.remove_object(src, frequency)
return ..()
//ATTACK HAND IGNORING PARENT RETURN VALUE
-/obj/item/device/electropack/attack_hand(mob/user)
+/obj/item/electropack/attack_hand(mob/user)
if(iscarbon(user))
var/mob/living/carbon/C = user
if(src == C.back)
@@ -36,7 +36,7 @@
return
return ..()
-/obj/item/device/electropack/attackby(obj/item/W, mob/user, params)
+/obj/item/electropack/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/clothing/head/helmet))
var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user )
A.icon = 'icons/obj/assemblies.dmi'
@@ -58,7 +58,7 @@
else
return ..()
-/obj/item/device/electropack/Topic(href, href_list)
+/obj/item/electropack/Topic(href, href_list)
//..()
var/mob/living/carbon/C = usr
if(usr.stat || usr.restrained() || C.back == src)
@@ -98,7 +98,7 @@
return
return
-/obj/item/device/electropack/receive_signal(datum/signal/signal)
+/obj/item/electropack/receive_signal(datum/signal/signal)
if(!signal || signal.data["code"] != code)
return
@@ -122,7 +122,7 @@
master.receive_signal()
return
-/obj/item/device/electropack/attack_self(mob/user)
+/obj/item/electropack/attack_self(mob/user)
if(!ishuman(user))
return
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index 2d3d869676..dd7489d6b1 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -1,4 +1,4 @@
-/obj/item/device/encryptionkey
+/obj/item/encryptionkey
name = "standard encryption key"
desc = "An encryption key for a radio headset. Has no special codes in it. WHY DOES IT EXIST? ASK NANOTRASEN."
icon = 'icons/obj/radio.dmi'
@@ -9,124 +9,124 @@
var/independent = FALSE
var/list/channels = list()
-/obj/item/device/encryptionkey/syndicate
+/obj/item/encryptionkey/syndicate
name = "syndicate encryption key"
desc = "An encryption key for a radio headset. To access the syndicate channel, use :t."
icon_state = "syn_cypherkey"
channels = list("Syndicate" = 1)
syndie = 1//Signifies that it de-crypts Syndicate transmissions
-/obj/item/device/encryptionkey/binary
+/obj/item/encryptionkey/binary
name = "binary translator key"
desc = "An encryption key for a radio headset. To access the binary channel, use :b."
icon_state = "bin_cypherkey"
translate_binary = TRUE
-/obj/item/device/encryptionkey/headset_sec
+/obj/item/encryptionkey/headset_sec
name = "security radio encryption key"
desc = "An encryption key for a radio headset. To access the security channel, use :s."
icon_state = "sec_cypherkey"
channels = list("Security" = 1)
-/obj/item/device/encryptionkey/headset_eng
+/obj/item/encryptionkey/headset_eng
name = "engineering radio encryption key"
desc = "An encryption key for a radio headset. To access the engineering channel, use :e."
icon_state = "eng_cypherkey"
channels = list("Engineering" = 1)
-/obj/item/device/encryptionkey/headset_rob
+/obj/item/encryptionkey/headset_rob
name = "robotics radio encryption key"
desc = "An encryption key for a radio headset. To access the engineering channel, use :e. For research, use :n."
icon_state = "rob_cypherkey"
channels = list("Science" = 1, "Engineering" = 1)
-/obj/item/device/encryptionkey/headset_med
+/obj/item/encryptionkey/headset_med
name = "medical radio encryption key"
desc = "An encryption key for a radio headset. To access the medical channel, use :m."
icon_state = "med_cypherkey"
channels = list("Medical" = 1)
-/obj/item/device/encryptionkey/headset_sci
+/obj/item/encryptionkey/headset_sci
name = "science radio encryption key"
desc = "An encryption key for a radio headset. To access the science channel, use :n."
icon_state = "sci_cypherkey"
channels = list("Science" = 1)
-/obj/item/device/encryptionkey/headset_medsci
+/obj/item/encryptionkey/headset_medsci
name = "medical research radio encryption key"
desc = "An encryption key for a radio headset. To access the medical channel, use :m. For science, use :n."
icon_state = "medsci_cypherkey"
channels = list("Science" = 1, "Medical" = 1)
-/obj/item/device/encryptionkey/headset_com
+/obj/item/encryptionkey/headset_com
name = "command radio encryption key"
desc = "An encryption key for a radio headset. To access the command channel, use :c."
icon_state = "com_cypherkey"
channels = list("Command" = 1)
-/obj/item/device/encryptionkey/heads/captain
+/obj/item/encryptionkey/heads/captain
name = "\proper the captain's encryption key"
desc = "An encryption key for a radio headset. Channels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :v - service, :m - medical, :n - science."
icon_state = "cap_cypherkey"
channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0, "Service" = 0)
-/obj/item/device/encryptionkey/heads/rd
+/obj/item/encryptionkey/heads/rd
name = "\proper the research director's encryption key"
desc = "An encryption key for a radio headset. To access the science channel, use :n. For command, use :c."
icon_state = "rd_cypherkey"
channels = list("Science" = 1, "Command" = 1)
-/obj/item/device/encryptionkey/heads/hos
+/obj/item/encryptionkey/heads/hos
name = "\proper the head of security's encryption key"
desc = "An encryption key for a radio headset. To access the security channel, use :s. For command, use :c."
icon_state = "hos_cypherkey"
channels = list("Security" = 1, "Command" = 1)
-/obj/item/device/encryptionkey/heads/ce
+/obj/item/encryptionkey/heads/ce
name = "\proper the chief engineer's encryption key"
desc = "An encryption key for a radio headset. To access the engineering channel, use :e. For command, use :c."
icon_state = "ce_cypherkey"
channels = list("Engineering" = 1, "Command" = 1)
-/obj/item/device/encryptionkey/heads/cmo
+/obj/item/encryptionkey/heads/cmo
name = "\proper the chief medical officer's encryption key"
desc = "An encryption key for a radio headset. To access the medical channel, use :m. For command, use :c."
icon_state = "cmo_cypherkey"
channels = list("Medical" = 1, "Command" = 1)
-/obj/item/device/encryptionkey/heads/hop
+/obj/item/encryptionkey/heads/hop
name = "\proper the head of personnel's encryption key"
desc = "An encryption key for a radio headset. Channels are as follows: :u - supply, :v - service, :c - command."
icon_state = "hop_cypherkey"
channels = list("Supply" = 1, "Service" = 1, "Command" = 1)
-/obj/item/device/encryptionkey/headset_cargo
+/obj/item/encryptionkey/headset_cargo
name = "supply radio encryption key"
desc = "An encryption key for a radio headset. To access the supply channel, use :u."
icon_state = "cargo_cypherkey"
channels = list("Supply" = 1)
-/obj/item/device/encryptionkey/headset_mining
+/obj/item/encryptionkey/headset_mining
name = "mining radio encryption key"
desc = "An encryption key for a radio headset. To access the supply channel, use :u. For science, use :n."
icon_state = "cargo_cypherkey"
channels = list("Supply" = 1, "Science" = 1)
-/obj/item/device/encryptionkey/headset_service
+/obj/item/encryptionkey/headset_service
name = "service radio encryption key"
desc = "An encryption key for a radio headset. To access the service channel, use :v."
icon_state = "srv_cypherkey"
channels = list("Service" = 1)
-/obj/item/device/encryptionkey/headset_cent
+/obj/item/encryptionkey/headset_cent
name = "\improper CentCom radio encryption key"
desc = "An encryption key for a radio headset. To access the CentCom channel, use :y."
icon_state = "cent_cypherkey"
independent = TRUE
channels = list("CentCom" = 1)
-/obj/item/device/encryptionkey/ai //ported from NT, this goes 'inside' the AI.
+/obj/item/encryptionkey/ai //ported from NT, this goes 'inside' the AI.
channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1)
-/obj/item/device/encryptionkey/secbot
+/obj/item/encryptionkey/secbot
channels = list("AI Private"=1,"Security"=1)
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 1362721e1d..d16ac424b6 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -1,4 +1,4 @@
-/obj/item/device/radio/headset
+/obj/item/radio/headset
name = "radio headset"
desc = "An updated, modular intercom that fits over the head. Takes encryption keys."
icon_state = "headset"
@@ -8,33 +8,33 @@
canhear_range = 0 // can't hear headsets from very far away
slot_flags = SLOT_EARS
- var/obj/item/device/encryptionkey/keyslot2 = null
+ var/obj/item/encryptionkey/keyslot2 = null
dog_fashion = null
-/obj/item/device/radio/headset/suicide_act(mob/living/carbon/user)
+/obj/item/radio/headset/suicide_act(mob/living/carbon/user)
user.visible_message("[user] begins putting \the [src]'s antenna up [user.p_their()] nose! It looks like [user.p_theyre()] trying to give [user.p_them()]self cancer!")
return TOXLOSS
-/obj/item/device/radio/headset/examine(mob/user)
+/obj/item/radio/headset/examine(mob/user)
..()
to_chat(user, "To speak on the general radio frequency, use ; before speaking.")
if (command)
to_chat(user, "Alt-click to toggle the high-volume mode.")
-/obj/item/device/radio/headset/Initialize()
+/obj/item/radio/headset/Initialize()
. = ..()
recalculateChannels()
-/obj/item/device/radio/headset/Destroy()
+/obj/item/radio/headset/Destroy()
QDEL_NULL(keyslot2)
return ..()
-/obj/item/device/radio/headset/talk_into(mob/living/M, message, channel, list/spans,datum/language/language)
+/obj/item/radio/headset/talk_into(mob/living/M, message, channel, list/spans,datum/language/language)
if (!listening)
return ITALICS | REDUCE_RANGE
return ..()
-/obj/item/device/radio/headset/can_receive(freq, level, AIuser)
+/obj/item/radio/headset/can_receive(freq, level, AIuser)
if(ishuman(src.loc))
var/mob/living/carbon/human/H = src.loc
if(H.ears == src)
@@ -43,165 +43,165 @@
return ..(freq, level)
return FALSE
-/obj/item/device/radio/headset/syndicate //disguised to look like a normal headset for stealth ops
+/obj/item/radio/headset/syndicate //disguised to look like a normal headset for stealth ops
-/obj/item/device/radio/headset/syndicate/alt //undisguised bowman with flash protection
+/obj/item/radio/headset/syndicate/alt //undisguised bowman with flash protection
name = "syndicate headset"
desc = "A syndicate headset that can be used to hear all radio frequencies. Protects ears from flashbangs. \nTo access the syndicate channel, use ; before speaking."
icon_state = "syndie_headset"
item_state = "syndie_headset"
flags_2 = BANG_PROTECT_2 | NO_EMP_WIRES_2
-/obj/item/device/radio/headset/syndicate/alt/leader
+/obj/item/radio/headset/syndicate/alt/leader
name = "team leader headset"
command = TRUE
-/obj/item/device/radio/headset/syndicate/Initialize()
+/obj/item/radio/headset/syndicate/Initialize()
. = ..()
make_syndie()
-/obj/item/device/radio/headset/binary
-/obj/item/device/radio/headset/binary/Initialize()
+/obj/item/radio/headset/binary
+/obj/item/radio/headset/binary/Initialize()
. = ..()
qdel(keyslot)
- keyslot = new /obj/item/device/encryptionkey/binary
+ keyslot = new /obj/item/encryptionkey/binary
recalculateChannels()
-/obj/item/device/radio/headset/headset_sec
+/obj/item/radio/headset/headset_sec
name = "security radio headset"
desc = "This is used by your elite security force.\nTo access the security channel, use :s."
icon_state = "sec_headset"
- keyslot = new /obj/item/device/encryptionkey/headset_sec
+ keyslot = new /obj/item/encryptionkey/headset_sec
-/obj/item/device/radio/headset/headset_sec/alt
+/obj/item/radio/headset/headset_sec/alt
name = "security bowman headset"
desc = "This is used by your elite security force. Protects ears from flashbangs.\nTo access the security channel, use :s."
icon_state = "sec_headset_alt"
item_state = "sec_headset_alt"
flags_2 = BANG_PROTECT_2 | NO_EMP_WIRES_2
-/obj/item/device/radio/headset/headset_eng
+/obj/item/radio/headset/headset_eng
name = "engineering radio headset"
desc = "When the engineers wish to chat like girls.\nTo access the engineering channel, use :e."
icon_state = "eng_headset"
- keyslot = new /obj/item/device/encryptionkey/headset_eng
+ keyslot = new /obj/item/encryptionkey/headset_eng
-/obj/item/device/radio/headset/headset_rob
+/obj/item/radio/headset/headset_rob
name = "robotics radio headset"
desc = "Made specifically for the roboticists, who cannot decide between departments.\nTo access the engineering channel, use :e. For research, use :n."
icon_state = "rob_headset"
- keyslot = new /obj/item/device/encryptionkey/headset_rob
+ keyslot = new /obj/item/encryptionkey/headset_rob
-/obj/item/device/radio/headset/headset_med
+/obj/item/radio/headset/headset_med
name = "medical radio headset"
desc = "A headset for the trained staff of the medbay.\nTo access the medical channel, use :m."
icon_state = "med_headset"
- keyslot = new /obj/item/device/encryptionkey/headset_med
+ keyslot = new /obj/item/encryptionkey/headset_med
-/obj/item/device/radio/headset/headset_sci
+/obj/item/radio/headset/headset_sci
name = "science radio headset"
desc = "A sciency headset. Like usual.\nTo access the science channel, use :n."
icon_state = "sci_headset"
- keyslot = new /obj/item/device/encryptionkey/headset_sci
+ keyslot = new /obj/item/encryptionkey/headset_sci
-/obj/item/device/radio/headset/headset_medsci
+/obj/item/radio/headset/headset_medsci
name = "medical research radio headset"
desc = "A headset that is a result of the mating between medical and science.\nTo access the medical channel, use :m. For science, use :n."
icon_state = "medsci_headset"
- keyslot = new /obj/item/device/encryptionkey/headset_medsci
+ keyslot = new /obj/item/encryptionkey/headset_medsci
-/obj/item/device/radio/headset/headset_com
+/obj/item/radio/headset/headset_com
name = "command radio headset"
desc = "A headset with a commanding channel.\nTo access the command channel, use :c."
icon_state = "com_headset"
- keyslot = new /obj/item/device/encryptionkey/headset_com
+ keyslot = new /obj/item/encryptionkey/headset_com
-/obj/item/device/radio/headset/heads
+/obj/item/radio/headset/heads
command = TRUE
-/obj/item/device/radio/headset/heads/captain
+/obj/item/radio/headset/heads/captain
name = "\proper the captain's headset"
desc = "The headset of the king.\nChannels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :v - service, :m - medical, :n - science."
icon_state = "com_headset"
- keyslot = new /obj/item/device/encryptionkey/heads/captain
+ keyslot = new /obj/item/encryptionkey/heads/captain
-/obj/item/device/radio/headset/heads/captain/alt
+/obj/item/radio/headset/heads/captain/alt
name = "\proper the captain's bowman headset"
desc = "The headset of the boss. Protects ears from flashbangs.\nChannels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :v - service, :m - medical, :n - science."
icon_state = "com_headset_alt"
item_state = "com_headset_alt"
flags_2 = BANG_PROTECT_2 | NO_EMP_WIRES_2
-/obj/item/device/radio/headset/heads/rd
+/obj/item/radio/headset/heads/rd
name = "\proper the research director's headset"
desc = "Headset of the fellow who keeps society marching towards technological singularity.\nTo access the science channel, use :n. For command, use :c."
icon_state = "com_headset"
- keyslot = new /obj/item/device/encryptionkey/heads/rd
+ keyslot = new /obj/item/encryptionkey/heads/rd
-/obj/item/device/radio/headset/heads/hos
+/obj/item/radio/headset/heads/hos
name = "\proper the head of security's headset"
desc = "The headset of the man in charge of keeping order and protecting the station.\nTo access the security channel, use :s. For command, use :c."
icon_state = "com_headset"
- keyslot = new /obj/item/device/encryptionkey/heads/hos
+ keyslot = new /obj/item/encryptionkey/heads/hos
-/obj/item/device/radio/headset/heads/hos/alt
+/obj/item/radio/headset/heads/hos/alt
name = "\proper the head of security's bowman headset"
desc = "The headset of the man in charge of keeping order and protecting the station. Protects ears from flashbangs.\nTo access the security channel, use :s. For command, use :c."
icon_state = "com_headset_alt"
item_state = "com_headset_alt"
flags_2 = BANG_PROTECT_2 | NO_EMP_WIRES_2
-/obj/item/device/radio/headset/heads/ce
+/obj/item/radio/headset/heads/ce
name = "\proper the chief engineer's headset"
desc = "The headset of the guy in charge of keeping the station powered and undamaged.\nTo access the engineering channel, use :e. For command, use :c."
icon_state = "com_headset"
- keyslot = new /obj/item/device/encryptionkey/heads/ce
+ keyslot = new /obj/item/encryptionkey/heads/ce
-/obj/item/device/radio/headset/heads/cmo
+/obj/item/radio/headset/heads/cmo
name = "\proper the chief medical officer's headset"
desc = "The headset of the highly trained medical chief.\nTo access the medical channel, use :m. For command, use :c."
icon_state = "com_headset"
- keyslot = new /obj/item/device/encryptionkey/heads/cmo
+ keyslot = new /obj/item/encryptionkey/heads/cmo
-/obj/item/device/radio/headset/heads/hop
+/obj/item/radio/headset/heads/hop
name = "\proper the head of personnel's headset"
desc = "The headset of the guy who will one day be captain.\nChannels are as follows: :u - supply, :v - service, :c - command."
icon_state = "com_headset"
- keyslot = new /obj/item/device/encryptionkey/heads/hop
+ keyslot = new /obj/item/encryptionkey/heads/hop
-/obj/item/device/radio/headset/headset_cargo
+/obj/item/radio/headset/headset_cargo
name = "supply radio headset"
desc = "A headset used by the QM and his slaves.\nTo access the supply channel, use :u."
icon_state = "cargo_headset"
- keyslot = new /obj/item/device/encryptionkey/headset_cargo
+ keyslot = new /obj/item/encryptionkey/headset_cargo
-/obj/item/device/radio/headset/headset_cargo/mining
+/obj/item/radio/headset/headset_cargo/mining
name = "mining radio headset"
desc = "Headset used by shaft miners.\nTo access the supply channel, use :u. For science, use :n."
icon_state = "mine_headset"
- keyslot = new /obj/item/device/encryptionkey/headset_mining
+ keyslot = new /obj/item/encryptionkey/headset_mining
-/obj/item/device/radio/headset/headset_srv
+/obj/item/radio/headset/headset_srv
name = "service radio headset"
desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean.\nTo access the service channel, use :v."
icon_state = "srv_headset"
- keyslot = new /obj/item/device/encryptionkey/headset_service
+ keyslot = new /obj/item/encryptionkey/headset_service
-/obj/item/device/radio/headset/headset_cent
+/obj/item/radio/headset/headset_cent
name = "\improper CentCom headset"
desc = "A headset used by the upper echelons of Nanotrasen.\nTo access the CentCom channel, use :y."
icon_state = "cent_headset"
- keyslot = new /obj/item/device/encryptionkey/headset_com
- keyslot2 = new /obj/item/device/encryptionkey/headset_cent
+ keyslot = new /obj/item/encryptionkey/headset_com
+ keyslot2 = new /obj/item/encryptionkey/headset_cent
-/obj/item/device/radio/headset/headset_cent/empty
+/obj/item/radio/headset/headset_cent/empty
keyslot = null
keyslot2 = null
-/obj/item/device/radio/headset/headset_cent/commander
- keyslot = new /obj/item/device/encryptionkey/heads/captain
+/obj/item/radio/headset/headset_cent/commander
+ keyslot = new /obj/item/encryptionkey/heads/captain
-/obj/item/device/radio/headset/headset_cent/alt
+/obj/item/radio/headset/headset_cent/alt
name = "\improper CentCom bowman headset"
desc = "A headset especially for emergency response personnel. Protects ears from flashbangs.\nTo access the CentCom channel, use :y."
icon_state = "cent_headset_alt"
@@ -209,15 +209,15 @@
keyslot = null
flags_2 = BANG_PROTECT_2 | NO_EMP_WIRES_2
-/obj/item/device/radio/headset/ai
+/obj/item/radio/headset/ai
name = "\proper Integrated Subspace Transceiver "
- keyslot2 = new /obj/item/device/encryptionkey/ai
+ keyslot2 = new /obj/item/encryptionkey/ai
command = TRUE
-/obj/item/device/radio/headset/ai/can_receive(freq, level)
+/obj/item/radio/headset/ai/can_receive(freq, level)
return ..(freq, level, TRUE)
-/obj/item/device/radio/headset/attackby(obj/item/W, mob/user, params)
+/obj/item/radio/headset/attackby(obj/item/W, mob/user, params)
user.set_machine(src)
if(istype(W, /obj/item/screwdriver))
@@ -241,7 +241,7 @@
else
to_chat(user, "This headset doesn't have any unique encryption keys! How useless...")
- else if(istype(W, /obj/item/device/encryptionkey))
+ else if(istype(W, /obj/item/encryptionkey))
if(keyslot && keyslot2)
to_chat(user, "The headset can't hold another key!")
return
@@ -262,7 +262,7 @@
return ..()
-/obj/item/device/radio/headset/recalculateChannels()
+/obj/item/radio/headset/recalculateChannels()
..()
if(keyslot2)
for(var/ch_name in keyslot2.channels)
@@ -279,7 +279,7 @@
for(var/ch_name in channels)
secure_radio_connections[ch_name] = add_radio(src, GLOB.radiochannels[ch_name])
-/obj/item/device/radio/headset/AltClick(mob/living/user)
+/obj/item/radio/headset/AltClick(mob/living/user)
if(!istype(user) || !Adjacent(user) || user.incapacitated())
return
if (command)
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index 0ac123566f..02f549956a 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -1,4 +1,4 @@
-/obj/item/device/radio/intercom
+/obj/item/radio/intercom
name = "station intercom"
desc = "Talk through this."
icon_state = "intercom"
@@ -12,22 +12,22 @@
dog_fashion = null
var/unfastened = FALSE
-/obj/item/device/radio/intercom/unscrewed
+/obj/item/radio/intercom/unscrewed
unfastened = TRUE
-/obj/item/device/radio/intercom/ratvar
+/obj/item/radio/intercom/ratvar
name = "hierophant intercom"
desc = "A modified intercom that uses the Hierophant network instead of subspace tech. Can listen to and broadcast on any frequency."
icon_state = "intercom_ratvar"
freerange = TRUE
-/obj/item/device/radio/intercom/ratvar/attackby(obj/item/I, mob/living/user, params)
+/obj/item/radio/intercom/ratvar/attackby(obj/item/I, mob/living/user, params)
if(istype(I, /obj/item/screwdriver))
to_chat(user, "[src] is fastened to the wall with [is_servant_of_ratvar(user) ? "replicant alloy" : "some material you've never seen"], and can't be removed.")
return //no unfastening!
. = ..()
-/obj/item/device/radio/intercom/ratvar/process()
+/obj/item/radio/intercom/ratvar/process()
if(!istype(SSticker.mode, /datum/game_mode/clockwork_cult))
invisibility = INVISIBILITY_OBSERVER
alpha = 125
@@ -38,24 +38,24 @@
emped = FALSE
..()
-/obj/item/device/radio/intercom/Initialize(mapload, ndir, building)
+/obj/item/radio/intercom/Initialize(mapload, ndir, building)
. = ..()
if(building)
setDir(ndir)
START_PROCESSING(SSobj, src)
-/obj/item/device/radio/intercom/Destroy()
+/obj/item/radio/intercom/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
-/obj/item/device/radio/intercom/examine(mob/user)
+/obj/item/radio/intercom/examine(mob/user)
..()
if(!unfastened)
to_chat(user, "It's screwed and secured to the wall.")
else
to_chat(user, "It's unscrewed from the wall, and can be detached.")
-/obj/item/device/radio/intercom/attackby(obj/item/I, mob/living/user, params)
+/obj/item/radio/intercom/attackby(obj/item/I, mob/living/user, params)
if(istype(I, /obj/item/screwdriver))
if(unfastened)
user.visible_message("[user] starts tightening [src]'s screws...", "You start screwing in [src]...")
@@ -82,20 +82,20 @@
return
return ..()
-/obj/item/device/radio/intercom/attack_ai(mob/user)
+/obj/item/radio/intercom/attack_ai(mob/user)
interact(user)
-/obj/item/device/radio/intercom/attack_hand(mob/user)
+/obj/item/radio/intercom/attack_hand(mob/user)
. = ..()
if(.)
return
interact(user)
-/obj/item/device/radio/intercom/interact(mob/user)
+/obj/item/radio/intercom/interact(mob/user)
..()
ui_interact(user, state = GLOB.default_state)
-/obj/item/device/radio/intercom/can_receive(freq, level)
+/obj/item/radio/intercom/can_receive(freq, level)
if(!on)
return FALSE
if(wires.is_cut(WIRE_RX))
@@ -113,14 +113,14 @@
return TRUE
-/obj/item/device/radio/intercom/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans, message_mode)
+/obj/item/radio/intercom/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans, message_mode)
if (message_mode == MODE_INTERCOM)
return // Avoid hearing the same thing twice
if(!anyai && !(speaker in ai))
return
..()
-/obj/item/device/radio/intercom/process()
+/obj/item/radio/intercom/process()
if(((world.timeofday - last_tick) > 30) || ((world.timeofday - last_tick) < 0))
last_tick = world.timeofday
@@ -135,7 +135,7 @@
else
icon_state = initial(icon_state)
-/obj/item/device/radio/intercom/add_blood_DNA(list/blood_dna)
+/obj/item/radio/intercom/add_blood_DNA(list/blood_dna)
return FALSE
//Created through the autolathe or through deconstructing intercoms. Can be applied to wall to make a new intercom on it!
@@ -143,7 +143,7 @@
name = "intercom frame"
desc = "A ready-to-go intercom. Just slap it on a wall and screw it in!"
icon_state = "intercom"
- result_path = /obj/item/device/radio/intercom/unscrewed
+ result_path = /obj/item/radio/intercom/unscrewed
pixel_shift = 29
inverse = TRUE
materials = list(MAT_METAL = 75, MAT_GLASS = 25)
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 1f6f97284b..9b5ce58867 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -1,4 +1,4 @@
-/obj/item/device/radio
+/obj/item/radio
icon = 'icons/obj/radio.dmi'
name = "station bounced radio"
icon_state = "walkietalkie"
@@ -33,7 +33,7 @@
var/command = FALSE // If true, use_command can be toggled at will.
// Encryption key handling
- var/obj/item/device/encryptionkey/keyslot
+ var/obj/item/encryptionkey/keyslot
var/translate_binary = FALSE // If true, can hear the special binary channel.
var/independent = FALSE // If true, can say/hear on the special CentCom channel.
var/syndie = FALSE // If true, hears all well-known channels automatically, and can say/hear on the Syndicate channel.
@@ -43,15 +43,15 @@
var/const/FREQ_LISTENING = 1
//FREQ_BROADCASTING = 2
-/obj/item/device/radio/suicide_act(mob/living/user)
+/obj/item/radio/suicide_act(mob/living/user)
user.visible_message("[user] starts bouncing [src] off their head! It looks like [user.p_theyre()] trying to commit suicide!")
return BRUTELOSS
-/obj/item/device/radio/proc/set_frequency(new_frequency)
+/obj/item/radio/proc/set_frequency(new_frequency)
remove_radio(src, frequency)
frequency = add_radio(src, new_frequency)
-/obj/item/device/radio/proc/recalculateChannels()
+/obj/item/radio/proc/recalculateChannels()
channels = list()
translate_binary = FALSE
syndie = FALSE
@@ -72,19 +72,19 @@
for(var/ch_name in channels)
secure_radio_connections[ch_name] = add_radio(src, GLOB.radiochannels[ch_name])
-/obj/item/device/radio/proc/make_syndie() // Turns normal radios into Syndicate radios!
+/obj/item/radio/proc/make_syndie() // Turns normal radios into Syndicate radios!
qdel(keyslot)
- keyslot = new /obj/item/device/encryptionkey/syndicate
+ keyslot = new /obj/item/encryptionkey/syndicate
syndie = 1
recalculateChannels()
-/obj/item/device/radio/Destroy()
+/obj/item/radio/Destroy()
remove_radio_all(src) //Just to be sure
QDEL_NULL(wires)
QDEL_NULL(keyslot)
return ..()
-/obj/item/device/radio/Initialize()
+/obj/item/radio/Initialize()
wires = new /datum/wires/radio(src)
if(prison_radio)
wires.cut(WIRE_TX) // OH GOD WHY
@@ -96,7 +96,7 @@
for(var/ch_name in channels)
secure_radio_connections[ch_name] = add_radio(src, GLOB.radiochannels[ch_name])
-/obj/item/device/radio/interact(mob/user)
+/obj/item/radio/interact(mob/user)
if (..())
return
if(unscrewed && !isAI(user))
@@ -104,7 +104,7 @@
else
ui_interact(user)
-/obj/item/device/radio/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+/obj/item/radio/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
. = ..()
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
@@ -112,7 +112,7 @@
ui = new(user, src, ui_key, "radio", name, 370, 220 + channels.len * 22, master_ui, state)
ui.open()
-/obj/item/device/radio/ui_data(mob/user)
+/obj/item/radio/ui_data(mob/user)
var/list/data = list()
data["broadcasting"] = broadcasting
@@ -128,11 +128,11 @@
data["useCommand"] = use_command
data["subspace"] = subspace_transmission
data["subspaceSwitchable"] = subspace_switchable
- data["headset"] = istype(src, /obj/item/device/radio/headset)
+ data["headset"] = istype(src, /obj/item/radio/headset)
return data
-/obj/item/device/radio/ui_act(action, params, datum/tgui/ui)
+/obj/item/radio/ui_act(action, params, datum/tgui/ui)
if(..())
return
switch(action)
@@ -191,7 +191,7 @@
recalculateChannels()
. = TRUE
-/obj/item/device/radio/talk_into(atom/movable/M, message, channel, list/spans, datum/language/language)
+/obj/item/radio/talk_into(atom/movable/M, message, channel, list/spans, datum/language/language)
if(!spans)
spans = M.get_spans()
if(!language)
@@ -199,7 +199,7 @@
INVOKE_ASYNC(src, .proc/talk_into_impl, M, message, channel, spans.Copy(), language)
return ITALICS | REDUCE_RANGE
-/obj/item/device/radio/proc/talk_into_impl(atom/movable/M, message, channel, list/spans, datum/language/language)
+/obj/item/radio/proc/talk_into_impl(atom/movable/M, message, channel, list/spans, datum/language/language)
if(!on)
return // the device has to be on
if(!M || !message)
@@ -236,7 +236,7 @@
// Nearby active jammers severely gibberish the message
var/turf/position = get_turf(src)
- for(var/obj/item/device/jammer/jammer in GLOB.active_jammers)
+ for(var/obj/item/jammer/jammer in GLOB.active_jammers)
var/turf/jammer_turf = get_turf(jammer)
if(position.z == jammer_turf.z && (get_dist(position, jammer_turf) < jammer.range))
message = Gibberish(message,100)
@@ -267,7 +267,7 @@
// was never received, send a mundane broadcast (no headsets).
addtimer(CALLBACK(src, .proc/backup_transmission, signal), 20)
-/obj/item/device/radio/proc/backup_transmission(datum/signal/subspace/vocal/signal)
+/obj/item/radio/proc/backup_transmission(datum/signal/subspace/vocal/signal)
var/turf/T = get_turf(src)
if (signal.data["done"] && (T.z in signal.levels))
return
@@ -278,7 +278,7 @@
signal.levels = list(T.z)
signal.broadcast()
-/obj/item/device/radio/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode)
+/obj/item/radio/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode)
if(radio_freq || !broadcasting || get_dist(src, speaker) > canhear_range)
return
@@ -297,7 +297,7 @@
talk_into(speaker, raw_message, , spans, language=message_language)
// Checks if this radio can receive on the given frequency.
-/obj/item/device/radio/proc/can_receive(freq, level)
+/obj/item/radio/proc/can_receive(freq, level)
// deny checks
if (!on || !listening || wires.is_cut(WIRE_RX))
return FALSE
@@ -321,14 +321,14 @@
return FALSE
-/obj/item/device/radio/examine(mob/user)
+/obj/item/radio/examine(mob/user)
..()
if (unscrewed)
to_chat(user, "It can be attached and modified.")
else
to_chat(user, "It cannot be modified or attached.")
-/obj/item/device/radio/attackby(obj/item/W, mob/user, params)
+/obj/item/radio/attackby(obj/item/W, mob/user, params)
add_fingerprint(user)
if(istype(W, /obj/item/screwdriver))
unscrewed = !unscrewed
@@ -339,7 +339,7 @@
else
return ..()
-/obj/item/device/radio/emp_act(severity)
+/obj/item/radio/emp_act(severity)
emped++ //There's been an EMP; better count it
var/curremp = emped //Remember which EMP this was
if (listening && ismob(loc)) // if the radio is turned on and on someone's person they notice
@@ -352,7 +352,7 @@
spawn(200)
if(emped == curremp) //Don't fix it if it's been EMP'd again
emped = 0
- if (!istype(src, /obj/item/device/radio/intercom)) // intercoms will turn back on on their own
+ if (!istype(src, /obj/item/radio/intercom)) // intercoms will turn back on on their own
on = TRUE
..()
@@ -361,24 +361,24 @@
///////////////////////////////
//Giving borgs their own radio to have some more room to work with -Sieve
-/obj/item/device/radio/borg
+/obj/item/radio/borg
name = "cyborg radio"
subspace_switchable = TRUE
dog_fashion = null
flags_2 = NO_EMP_WIRES_2
-/obj/item/device/radio/borg/Initialize(mapload)
+/obj/item/radio/borg/Initialize(mapload)
. = ..()
-/obj/item/device/radio/borg/syndicate
+/obj/item/radio/borg/syndicate
syndie = 1
- keyslot = new /obj/item/device/encryptionkey/syndicate
+ keyslot = new /obj/item/encryptionkey/syndicate
-/obj/item/device/radio/borg/syndicate/Initialize()
+/obj/item/radio/borg/syndicate/Initialize()
. = ..()
set_frequency(FREQ_SYNDICATE)
-/obj/item/device/radio/borg/attackby(obj/item/W, mob/user, params)
+/obj/item/radio/borg/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/screwdriver))
if(keyslot)
@@ -399,7 +399,7 @@
else
to_chat(user, "This radio doesn't have any encryption keys!")
- else if(istype(W, /obj/item/device/encryptionkey/))
+ else if(istype(W, /obj/item/encryptionkey/))
if(keyslot)
to_chat(user, "The radio can't hold another key!")
return
@@ -412,6 +412,6 @@
recalculateChannels()
-/obj/item/device/radio/off // Station bounced radios, their only difference is spawning with the speakers off, this was made to help the lag.
+/obj/item/radio/off // Station bounced radios, their only difference is spawning with the speakers off, this was made to help the lag.
listening = 0 // And it's nice to have a subtype too for future features.
dog_fashion = /datum/dog_fashion/back
diff --git a/code/game/objects/items/devices/reverse_bear_trap.dm b/code/game/objects/items/devices/reverse_bear_trap.dm
index 0d41b12ccd..7631937de0 100644
--- a/code/game/objects/items/devices/reverse_bear_trap.dm
+++ b/code/game/objects/items/devices/reverse_bear_trap.dm
@@ -1,6 +1,7 @@
-/obj/item/device/reverse_bear_trap
+/obj/item/reverse_bear_trap
name = "reverse bear trap"
desc = "A horrifying set of shut metal jaws, rigged to a kitchen timer and secured by padlock to a head-mounted clamp. To apply, hit someone with it."
+ icon = 'icons/obj/device.dmi'
icon_state = "reverse_bear_trap"
slot_flags = SLOT_HEAD
flags_1 = CONDUCT_1
@@ -21,18 +22,18 @@
var/datum/looping_sound/reverse_bear_trap/soundloop
var/datum/looping_sound/reverse_bear_trap_beep/soundloop2
-/obj/item/device/reverse_bear_trap/Initialize()
+/obj/item/reverse_bear_trap/Initialize()
. = ..()
soundloop = new(list(src))
soundloop2 = new(list(src))
-/obj/item/device/reverse_bear_trap/Destroy()
+/obj/item/reverse_bear_trap/Destroy()
QDEL_NULL(soundloop)
QDEL_NULL(soundloop2)
STOP_PROCESSING(SSprocessing, src)
return ..()
-/obj/item/device/reverse_bear_trap/process()
+/obj/item/reverse_bear_trap/process()
if(!ticking)
return
time_left--
@@ -44,7 +45,7 @@
to_chat(loc, "*ding*")
addtimer(CALLBACK(src, .proc/snap), 2)
-/obj/item/device/reverse_bear_trap/attack_hand(mob/user)
+/obj/item/reverse_bear_trap/attack_hand(mob/user)
if(iscarbon(user))
var/mob/living/carbon/C = user
if(C.get_item_by_slot(slot_head) == src)
@@ -80,7 +81,7 @@
return
..()
-/obj/item/device/reverse_bear_trap/attack(mob/living/target, mob/living/user)
+/obj/item/reverse_bear_trap/attack(mob/living/target, mob/living/user)
if(target.get_item_by_slot(slot_head))
to_chat(user, "Remove their headgear first!")
return
@@ -97,7 +98,7 @@
arm()
notify_ghosts("[user] put a reverse bear trap on [target]!", source = src, action = NOTIFY_ORBIT, ghost_sound = 'sound/machines/beep.ogg')
-/obj/item/device/reverse_bear_trap/proc/snap()
+/obj/item/reverse_bear_trap/proc/snap()
reset()
var/mob/living/carbon/human/H = loc
if(!istype(H) || H.get_item_by_slot(slot_head) != src)
@@ -113,14 +114,14 @@
jill.death() //just in case, for some reason, they're still alive
flash_color(jill, flash_color = "#FF0000", flash_time = 100)
-/obj/item/device/reverse_bear_trap/proc/reset()
+/obj/item/reverse_bear_trap/proc/reset()
ticking = FALSE
flags_1 &= ~NODROP_1
soundloop.stop()
soundloop2.stop()
STOP_PROCESSING(SSprocessing, src)
-/obj/item/device/reverse_bear_trap/proc/arm() //hulen
+/obj/item/reverse_bear_trap/proc/arm() //hulen
ticking = TRUE
escape_chance = initial(escape_chance) //we keep these vars until re-arm, for tracking purposes
time_left = initial(time_left)
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 2a954302a0..b574d0c622 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -6,9 +6,10 @@ HEALTH ANALYZER
GAS ANALYZER
*/
-/obj/item/device/t_scanner
+/obj/item/t_scanner
name = "\improper T-ray scanner"
desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
+ icon = 'icons/obj/device.dmi'
icon_state = "t-ray0"
var/on = FALSE
slot_flags = SLOT_BELT
@@ -18,11 +19,11 @@ GAS ANALYZER
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
materials = list(MAT_METAL=150)
-/obj/item/device/t_scanner/suicide_act(mob/living/carbon/user)
+/obj/item/t_scanner/suicide_act(mob/living/carbon/user)
user.visible_message("[user] begins to emit terahertz-rays into [user.p_their()] brain with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
return TOXLOSS
-/obj/item/device/t_scanner/attack_self(mob/user)
+/obj/item/t_scanner/attack_self(mob/user)
on = !on
icon_state = copytext(icon_state, 1, length(icon_state))+"[on]"
@@ -30,13 +31,13 @@ GAS ANALYZER
if(on)
START_PROCESSING(SSobj, src)
-/obj/item/device/t_scanner/process()
+/obj/item/t_scanner/process()
if(!on)
STOP_PROCESSING(SSobj, src)
return null
scan()
-/obj/item/device/t_scanner/proc/scan()
+/obj/item/t_scanner/proc/scan()
t_ray_scan(loc)
/proc/t_ray_scan(mob/viewer, flick_time = 8, distance = 2)
@@ -57,8 +58,9 @@ GAS ANALYZER
if(t_ray_images.len)
flick_overlay(t_ray_images, list(viewer.client), flick_time)
-/obj/item/device/healthanalyzer
+/obj/item/healthanalyzer
name = "health analyzer"
+ icon = 'icons/obj/device.dmi'
icon_state = "health"
item_state = "healthanalyzer"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
@@ -75,11 +77,11 @@ GAS ANALYZER
var/scanmode = 0
var/advanced = FALSE
-/obj/item/device/healthanalyzer/suicide_act(mob/living/carbon/user)
+/obj/item/healthanalyzer/suicide_act(mob/living/carbon/user)
user.visible_message("[user] begins to analyze [user.p_them()]self with [src]! The display shows that [user.p_theyre()] dead!")
return BRUTELOSS
-/obj/item/device/healthanalyzer/attack_self(mob/user)
+/obj/item/healthanalyzer/attack_self(mob/user)
if(!scanmode)
to_chat(user, "You switch the health analyzer to scan chemical contents.")
scanmode = 1
@@ -87,7 +89,7 @@ GAS ANALYZER
to_chat(user, "You switch the health analyzer to check physical health.")
scanmode = 0
-/obj/item/device/healthanalyzer/attack(mob/living/M, mob/living/carbon/human/user)
+/obj/item/healthanalyzer/attack(mob/living/M, mob/living/carbon/human/user)
// Clumsiness/brain damage check
if ((user.has_trait(TRAIT_CLUMSY) || user.has_trait(TRAIT_DUMB)) && prob(50))
@@ -315,7 +317,7 @@ GAS ANALYZER
else
to_chat(user, "Subject is not addicted to any reagents.")
-/obj/item/device/healthanalyzer/verb/toggle_mode()
+/obj/item/healthanalyzer/verb/toggle_mode()
set name = "Switch Verbosity"
set category = "Object"
@@ -329,15 +331,16 @@ GAS ANALYZER
if(0)
to_chat(usr, "The scanner no longer shows limb damage.")
-/obj/item/device/healthanalyzer/advanced
+/obj/item/healthanalyzer/advanced
name = "advanced health analyzer"
icon_state = "health_adv"
desc = "A hand-held body scanner able to distinguish vital signs of the subject with high accuracy."
advanced = TRUE
-/obj/item/device/analyzer
+/obj/item/analyzer
desc = "A hand-held environmental scanner which reports current gas levels. Alt-Click to use the built in barometer function."
name = "analyzer"
+ icon = 'icons/obj/device.dmi'
icon_state = "atmos"
item_state = "analyzer"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
@@ -354,11 +357,11 @@ GAS ANALYZER
var/cooldown_time = 250
var/accuracy // 0 is the best accuracy.
-/obj/item/device/analyzer/suicide_act(mob/living/carbon/user)
+/obj/item/analyzer/suicide_act(mob/living/carbon/user)
user.visible_message("[user] begins to analyze [user.p_them()]self with [src]! The display shows that [user.p_theyre()] dead!")
return BRUTELOSS
-/obj/item/device/analyzer/attack_self(mob/user)
+/obj/item/analyzer/attack_self(mob/user)
add_fingerprint(user)
@@ -417,7 +420,7 @@ GAS ANALYZER
to_chat(user, "[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] %")
to_chat(user, "Temperature: [round(environment.temperature-T0C)] °C ([round(environment.temperature)]K)")
-/obj/item/device/analyzer/AltClick(mob/user) //Barometer output for measuring when the next storm happens
+/obj/item/analyzer/AltClick(mob/user) //Barometer output for measuring when the next storm happens
..()
if(user.canUseTopic(src))
@@ -460,17 +463,17 @@ GAS ANALYZER
else
to_chat(user, "[src]'s barometer function says a storm will land in approximately [butchertime(fixed)].")
cooldown = TRUE
- addtimer(CALLBACK(src,/obj/item/device/analyzer/proc/ping), cooldown_time)
+ addtimer(CALLBACK(src,/obj/item/analyzer/proc/ping), cooldown_time)
-/obj/item/device/analyzer/proc/ping()
+/obj/item/analyzer/proc/ping()
if(isliving(loc))
var/mob/living/L = loc
to_chat(L, "[src]'s barometer function is ready!")
playsound(src, 'sound/machines/click.ogg', 100)
cooldown = FALSE
-/obj/item/device/analyzer/proc/butchertime(amount)
+/obj/item/analyzer/proc/butchertime(amount)
if(!amount)
return
if(accuracy)
@@ -481,9 +484,10 @@ GAS ANALYZER
amount += inaccurate
return DisplayTimeText(max(1,amount))
-/obj/item/device/slime_scanner
+/obj/item/slime_scanner
name = "slime scanner"
desc = "A device that analyzes a slime's internal composition and measures its stats."
+ icon = 'icons/obj/device.dmi'
icon_state = "adv_spectrometer"
item_state = "analyzer"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
@@ -495,7 +499,7 @@ GAS ANALYZER
throw_range = 7
materials = list(MAT_METAL=30, MAT_GLASS=20)
-/obj/item/device/slime_scanner/attack(mob/living/M, mob/living/user)
+/obj/item/slime_scanner/attack(mob/living/M, mob/living/user)
if(user.stat || user.eye_blind)
return
if (!isslime(M))
diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm
index edfd4368ff..8aa2ec7d4e 100644
--- a/code/game/objects/items/devices/sensor_device.dm
+++ b/code/game/objects/items/devices/sensor_device.dm
@@ -1,4 +1,4 @@
-/obj/item/device/sensor_device
+/obj/item/sensor_device
name = "handheld crew monitor" //Thanks to Gun Hog for the name!
desc = "A miniature machine that tracks suit sensors across the station."
icon = 'icons/obj/device.dmi'
@@ -6,5 +6,5 @@
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
-/obj/item/device/sensor_device/attack_self(mob/user)
+/obj/item/sensor_device/attack_self(mob/user)
GLOB.crewmonitor.show(user,src) //Proc already exists, just had to call it
diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index bf7a0b8ee8..7dea76bcb0 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -1,6 +1,7 @@
-/obj/item/device/taperecorder
+/obj/item/taperecorder
name = "universal recorder"
desc = "A device that can record to cassette tapes, and play them. It automatically translates the content in playback."
+ icon = 'icons/obj/device.dmi'
icon_state = "taperecorder_empty"
item_state = "analyzer"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
@@ -14,26 +15,26 @@
var/recording = 0
var/playing = 0
var/playsleepseconds = 0
- var/obj/item/device/tape/mytape
- var/starting_tape_type = /obj/item/device/tape/random
+ var/obj/item/tape/mytape
+ var/starting_tape_type = /obj/item/tape/random
var/open_panel = 0
var/canprint = 1
-/obj/item/device/taperecorder/Initialize(mapload)
+/obj/item/taperecorder/Initialize(mapload)
. = ..()
if(starting_tape_type)
mytape = new starting_tape_type(src)
update_icon()
-/obj/item/device/taperecorder/examine(mob/user)
+/obj/item/taperecorder/examine(mob/user)
..()
to_chat(user, "The wire panel is [open_panel ? "opened" : "closed"].")
-/obj/item/device/taperecorder/attackby(obj/item/I, mob/user, params)
- if(!mytape && istype(I, /obj/item/device/tape))
+/obj/item/taperecorder/attackby(obj/item/I, mob/user, params)
+ if(!mytape && istype(I, /obj/item/tape))
if(!user.transferItemToLoc(I,src))
return
mytape = I
@@ -41,7 +42,7 @@
update_icon()
-/obj/item/device/taperecorder/proc/eject(mob/user)
+/obj/item/taperecorder/proc/eject(mob/user)
if(mytape)
to_chat(user, "You remove [mytape] from [src].")
stop()
@@ -49,12 +50,12 @@
mytape = null
update_icon()
-/obj/item/device/taperecorder/fire_act(exposed_temperature, exposed_volume)
+/obj/item/taperecorder/fire_act(exposed_temperature, exposed_volume)
mytape.ruin() //Fires destroy the tape
..()
//ATTACK HAND IGNORING PARENT RETURN VALUE
-/obj/item/device/taperecorder/attack_hand(mob/user)
+/obj/item/taperecorder/attack_hand(mob/user)
if(loc == user)
if(mytape)
if(!user.is_holding(src))
@@ -63,14 +64,14 @@
else
return ..()
-/obj/item/device/taperecorder/proc/can_use(mob/user)
+/obj/item/taperecorder/proc/can_use(mob/user)
if(user && ismob(user))
if(!user.incapacitated())
return TRUE
return FALSE
-/obj/item/device/taperecorder/verb/ejectverb()
+/obj/item/taperecorder/verb/ejectverb()
set name = "Eject Tape"
set category = "Object"
@@ -82,7 +83,7 @@
eject(usr)
-/obj/item/device/taperecorder/update_icon()
+/obj/item/taperecorder/update_icon()
if(!mytape)
icon_state = "taperecorder_empty"
else if(recording)
@@ -93,12 +94,12 @@
icon_state = "taperecorder_idle"
-/obj/item/device/taperecorder/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans, message_mode)
+/obj/item/taperecorder/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans, message_mode)
if(mytape && recording)
mytape.timestamp += mytape.used_capacity
mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] [message]"
-/obj/item/device/taperecorder/verb/record()
+/obj/item/taperecorder/verb/record()
set name = "Start Recording"
set category = "Object"
@@ -131,7 +132,7 @@
to_chat(usr, "The tape is full.")
-/obj/item/device/taperecorder/verb/stop()
+/obj/item/taperecorder/verb/stop()
set name = "Stop"
set category = "Object"
@@ -151,7 +152,7 @@
update_icon()
-/obj/item/device/taperecorder/verb/play()
+/obj/item/taperecorder/verb/play()
set name = "Play Tape"
set category = "Object"
@@ -193,7 +194,7 @@
update_icon()
-/obj/item/device/taperecorder/attack_self(mob/user)
+/obj/item/taperecorder/attack_self(mob/user)
if(!mytape || mytape.ruined)
return
if(recording)
@@ -202,7 +203,7 @@
record()
-/obj/item/device/taperecorder/verb/print_transcript()
+/obj/item/taperecorder/verb/print_transcript()
set name = "Print Transcript"
set category = "Object"
@@ -230,11 +231,11 @@
//empty tape recorders
-/obj/item/device/taperecorder/empty
+/obj/item/taperecorder/empty
starting_tape_type = null
-/obj/item/device/tape
+/obj/item/tape
name = "tape"
desc = "A magnetic tape that can hold up to ten minutes of content."
icon_state = "tape_white"
@@ -251,17 +252,17 @@
var/list/timestamp = list()
var/ruined = 0
-/obj/item/device/tape/fire_act(exposed_temperature, exposed_volume)
+/obj/item/tape/fire_act(exposed_temperature, exposed_volume)
ruin()
..()
-/obj/item/device/tape/attack_self(mob/user)
+/obj/item/tape/attack_self(mob/user)
if(!ruined)
to_chat(user, "You pull out all the tape!")
ruin()
-/obj/item/device/tape/proc/ruin()
+/obj/item/tape/proc/ruin()
//Lets not add infinite amounts of overlays when our fireact is called
//repeatedly
if(!ruined)
@@ -269,12 +270,12 @@
ruined = 1
-/obj/item/device/tape/proc/fix()
+/obj/item/tape/proc/fix()
cut_overlay("ribbonoverlay")
ruined = 0
-/obj/item/device/tape/attackby(obj/item/I, mob/user, params)
+/obj/item/tape/attackby(obj/item/I, mob/user, params)
if(ruined && istype(I, /obj/item/screwdriver) || istype(I, /obj/item/pen))
to_chat(user, "You start winding the tape back in...")
if(I.use_tool(src, user, 120))
@@ -282,9 +283,9 @@
fix()
//Random colour tapes
-/obj/item/device/tape/random
+/obj/item/tape/random
icon_state = "random_tape"
-/obj/item/device/tape/random/New()
+/obj/item/tape/random/New()
icon_state = "tape_[pick("white", "blue", "red", "yellow", "purple")]"
..()
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index 2c0e7bd7c4..9dd6ae5622 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -15,9 +15,10 @@ effective or pretty fucking useless.
*/
-/obj/item/device/batterer
+/obj/item/batterer
name = "mind batterer"
desc = "A strange device with twin antennas."
+ icon = 'icons/obj/device.dmi'
icon_state = "batterer"
throwforce = 5
w_class = WEIGHT_CLASS_TINY
@@ -32,7 +33,7 @@ effective or pretty fucking useless.
var/max_uses = 2
-/obj/item/device/batterer/attack_self(mob/living/carbon/user, flag = 0, emp = 0)
+/obj/item/batterer/attack_self(mob/living/carbon/user, flag = 0, emp = 0)
if(!user) return
if(times_used >= max_uses)
to_chat(user, "The mind batterer has been burnt out!")
@@ -67,7 +68,7 @@ effective or pretty fucking useless.
Wavelength is also slightly increased by the intensity as well.
*/
-/obj/item/device/healthanalyzer/rad_laser
+/obj/item/healthanalyzer/rad_laser
materials = list(MAT_METAL=400)
var/irradiate = 1
var/intensity = 10 // how much damage the radiation does
@@ -75,7 +76,7 @@ effective or pretty fucking useless.
var/used = 0 // is it cooling down?
var/stealth = FALSE
-/obj/item/device/healthanalyzer/rad_laser/attack(mob/living/M, mob/living/user)
+/obj/item/healthanalyzer/rad_laser/attack(mob/living/M, mob/living/user)
if(!stealth || !irradiate)
..()
if(!irradiate)
@@ -95,21 +96,21 @@ effective or pretty fucking useless.
else
to_chat(user, "The radioactive microlaser is still recharging.")
-/obj/item/device/healthanalyzer/rad_laser/proc/handle_cooldown(cooldown)
+/obj/item/healthanalyzer/rad_laser/proc/handle_cooldown(cooldown)
spawn(cooldown)
used = 0
icon_state = "health"
-/obj/item/device/healthanalyzer/rad_laser/attack_self(mob/user)
+/obj/item/healthanalyzer/rad_laser/attack_self(mob/user)
interact(user)
-/obj/item/device/healthanalyzer/rad_laser/proc/GetCooldown()
+/obj/item/healthanalyzer/rad_laser/proc/GetCooldown()
return round(max(10, (stealth*30 + intensity*5 - wavelength/4)))
-/obj/item/device/healthanalyzer/rad_laser/interact(mob/user)
+/obj/item/healthanalyzer/rad_laser/interact(mob/user)
ui_interact(user)
-/obj/item/device/healthanalyzer/rad_laser/ui_interact(mob/user)
+/obj/item/healthanalyzer/rad_laser/ui_interact(mob/user)
. = ..()
var/dat = "Irradiation: [irradiate ? "On" : "Off"]
"
@@ -140,7 +141,7 @@ effective or pretty fucking useless.
popup.set_content(dat)
popup.open()
-/obj/item/device/healthanalyzer/rad_laser/Topic(href, href_list)
+/obj/item/healthanalyzer/rad_laser/Topic(href, href_list)
if(!usr.canUseTopic(src))
return 1
@@ -170,7 +171,7 @@ effective or pretty fucking useless.
add_fingerprint(usr)
return
-/obj/item/device/shadowcloak
+/obj/item/shadowcloak
name = "cloaker belt"
desc = "Makes you invisible for short periods of time. Recharges in darkness."
icon = 'icons/obj/clothing/belts.dmi'
@@ -186,7 +187,7 @@ effective or pretty fucking useless.
var/old_alpha = 0
actions_types = list(/datum/action/item_action/toggle)
-/obj/item/device/shadowcloak/ui_action_click(mob/user)
+/obj/item/shadowcloak/ui_action_click(mob/user)
if(user.get_item_by_slot(slot_belt) == src)
if(!on)
Activate(usr)
@@ -194,11 +195,11 @@ effective or pretty fucking useless.
Deactivate()
return
-/obj/item/device/shadowcloak/item_action_slot_check(slot, mob/user)
+/obj/item/shadowcloak/item_action_slot_check(slot, mob/user)
if(slot == slot_belt)
return 1
-/obj/item/device/shadowcloak/proc/Activate(mob/living/carbon/human/user)
+/obj/item/shadowcloak/proc/Activate(mob/living/carbon/human/user)
if(!user)
return
to_chat(user, "You activate [src].")
@@ -207,7 +208,7 @@ effective or pretty fucking useless.
old_alpha = user.alpha
on = TRUE
-/obj/item/device/shadowcloak/proc/Deactivate()
+/obj/item/shadowcloak/proc/Deactivate()
to_chat(user, "You deactivate [src].")
STOP_PROCESSING(SSobj, src)
if(user)
@@ -215,12 +216,12 @@ effective or pretty fucking useless.
on = FALSE
user = null
-/obj/item/device/shadowcloak/dropped(mob/user)
+/obj/item/shadowcloak/dropped(mob/user)
..()
if(user && user.get_item_by_slot(slot_belt) != src)
Deactivate()
-/obj/item/device/shadowcloak/process()
+/obj/item/shadowcloak/process()
if(user.get_item_by_slot(slot_belt) != src)
Deactivate()
return
@@ -234,14 +235,15 @@ effective or pretty fucking useless.
animate(user,alpha = CLAMP(255 - charge,0,255),time = 10)
-/obj/item/device/jammer
+/obj/item/jammer
name = "radio jammer"
desc = "Device used to disrupt nearby radio communication."
+ icon = 'icons/obj/device.dmi'
icon_state = "jammer"
var/active = FALSE
var/range = 12
-/obj/item/device/jammer/attack_self(mob/user)
+/obj/item/jammer/attack_self(mob/user)
to_chat(user,"You [active ? "deactivate" : "activate"] [src].")
active = !active
if(active)
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index 720535f79a..35994d09f5 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -1,6 +1,7 @@
-/obj/item/device/transfer_valve
+/obj/item/transfer_valve
icon = 'icons/obj/assemblies.dmi'
name = "tank transfer valve"
+ icon = 'icons/obj/device.dmi'
icon_state = "valve_1"
item_state = "ttv"
lefthand_file = 'icons/mob/inhands/weapons/bombs_lefthand.dmi'
@@ -9,15 +10,15 @@
w_class = WEIGHT_CLASS_BULKY
var/obj/item/tank/tank_one
var/obj/item/tank/tank_two
- var/obj/item/device/assembly/attached_device
+ var/obj/item/assembly/attached_device
var/mob/attacher = null
var/valve_open = FALSE
var/toggle = 1
-/obj/item/device/transfer_valve/IsAssemblyHolder()
+/obj/item/transfer_valve/IsAssemblyHolder()
return TRUE
-/obj/item/device/transfer_valve/attackby(obj/item/item, mob/user, params)
+/obj/item/transfer_valve/attackby(obj/item/item, mob/user, params)
if(istype(item, /obj/item/tank))
if(tank_one && tank_two)
to_chat(user, "There are already two tanks attached, remove one first!")
@@ -37,7 +38,7 @@
update_icon()
//TODO: Have this take an assemblyholder
else if(isassembly(item))
- var/obj/item/device/assembly/A = item
+ var/obj/item/assembly/A = item
if(A.secured)
to_chat(user, "The device is secured.")
return
@@ -57,7 +58,7 @@
attacher = user
return
-/obj/item/device/transfer_valve/attack_self(mob/user)
+/obj/item/transfer_valve/attack_self(mob/user)
user.set_machine(src)
var/dat = {" Valve properties:
Attachment one: [tank_one] [tank_one ? "Remove" : ""]
@@ -70,7 +71,7 @@
popup.open()
return
-/obj/item/device/transfer_valve/Topic(href, href_list)
+/obj/item/transfer_valve/Topic(href, href_list)
..()
if(!usr.canUseTopic(src))
return
@@ -100,16 +101,16 @@
attack_self(usr)
add_fingerprint(usr)
-/obj/item/device/transfer_valve/proc/process_activation(obj/item/device/D)
+/obj/item/transfer_valve/proc/process_activation(obj/item/D)
if(toggle)
toggle = FALSE
toggle_valve()
addtimer(CALLBACK(src, .proc/toggle_off), 5) //To stop a signal being spammed from a proxy sensor constantly going off or whatever
-/obj/item/device/transfer_valve/proc/toggle_off()
+/obj/item/transfer_valve/proc/toggle_off()
toggle = TRUE
-/obj/item/device/transfer_valve/update_icon()
+/obj/item/transfer_valve/update_icon()
cut_overlays()
underlays = null
@@ -127,13 +128,13 @@
if(attached_device)
add_overlay("device")
-/obj/item/device/transfer_valve/proc/merge_gases()
+/obj/item/transfer_valve/proc/merge_gases()
tank_two.air_contents.volume += tank_one.air_contents.volume
var/datum/gas_mixture/temp
temp = tank_one.air_contents.remove_ratio(1)
tank_two.air_contents.merge(temp)
-/obj/item/device/transfer_valve/proc/split_gases()
+/obj/item/transfer_valve/proc/split_gases()
if (!valve_open || !tank_one || !tank_two)
return
var/ratio1 = tank_one.air_contents.volume/tank_two.air_contents.volume
@@ -147,7 +148,7 @@
it explodes properly when it gets a signal (and it does).
*/
-/obj/item/device/transfer_valve/proc/toggle_valve()
+/obj/item/transfer_valve/proc/toggle_valve()
if(!valve_open && tank_one && tank_two)
valve_open = TRUE
var/turf/bombturf = get_turf(src)
@@ -155,7 +156,7 @@
var/attachment = "no device"
if(attached_device)
- if(istype(attached_device, /obj/item/device/assembly/signaler))
+ if(istype(attached_device, /obj/item/assembly/signaler))
attachment = "[attached_device]"
else
attachment = attached_device
@@ -197,5 +198,5 @@
// this doesn't do anything but the timer etc. expects it to be here
// eventually maybe have it update icon to show state (timer, prox etc.) like old bombs
-/obj/item/device/transfer_valve/proc/c_state()
+/obj/item/transfer_valve/proc/c_state()
return
diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm
index d9b963e416..a3d2e519a0 100644
--- a/code/game/objects/items/flamethrower.dm
+++ b/code/game/objects/items/flamethrower.dm
@@ -18,13 +18,13 @@
var/lit = FALSE //on or off
var/operating = FALSE//cooldown
var/obj/item/weldingtool/weldtool = null
- var/obj/item/device/assembly/igniter/igniter = null
+ var/obj/item/assembly/igniter/igniter = null
var/obj/item/tank/internals/plasma/ptank = null
var/warned_admins = FALSE //for the message_admins() when lit
//variables for prebuilt flamethrowers
var/create_full = FALSE
var/create_with_tank = FALSE
- var/igniter_type = /obj/item/device/assembly/igniter
+ var/igniter_type = /obj/item/assembly/igniter
trigger_guard = TRIGGER_GUARD_NORMAL
/obj/item/flamethrower/Destroy()
@@ -101,7 +101,7 @@
return
else if(isigniter(W))
- var/obj/item/device/assembly/igniter/I = W
+ var/obj/item/assembly/igniter/I = W
if(I.secured)
return
if(igniter)
@@ -125,7 +125,7 @@
update_icon()
return
- else if(istype(W, /obj/item/device/analyzer) && ptank)
+ else if(istype(W, /obj/item/analyzer) && ptank)
atmosanalyzer_scan(ptank.air_contents, user)
else
return ..()
@@ -167,7 +167,7 @@
/obj/item/flamethrower/CheckParts(list/parts_list)
..()
weldtool = locate(/obj/item/weldingtool) in contents
- igniter = locate(/obj/item/device/assembly/igniter) in contents
+ igniter = locate(/obj/item/assembly/igniter) in contents
weldtool.status = FALSE
igniter.secured = FALSE
status = TRUE
@@ -240,11 +240,11 @@
return 1 //It hit the flamethrower, not them
-/obj/item/device/assembly/igniter/proc/flamethrower_process(turf/open/location)
+/obj/item/assembly/igniter/proc/flamethrower_process(turf/open/location)
location.hotspot_expose(700,2)
-/obj/item/device/assembly/igniter/cold/flamethrower_process(turf/open/location)
+/obj/item/assembly/igniter/cold/flamethrower_process(turf/open/location)
return
-/obj/item/device/assembly/igniter/proc/ignite_turf(obj/item/flamethrower/F,turf/open/location,release_amount = 0.05)
+/obj/item/assembly/igniter/proc/ignite_turf(obj/item/flamethrower/F,turf/open/location,release_amount = 0.05)
F.default_ignite(location,release_amount)
diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm
index 0fe53f293c..a09d39072d 100644
--- a/code/game/objects/items/gift.dm
+++ b/code/game/objects/items/gift.dm
@@ -64,9 +64,9 @@ GLOBAL_LIST_EMPTY(possible_gifts)
/obj/item/banhammer,
/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus,
/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
- /obj/item/device/paicard,
- /obj/item/device/instrument/violin,
- /obj/item/device/instrument/guitar,
+ /obj/item/paicard,
+ /obj/item/instrument/violin,
+ /obj/item/instrument/guitar,
/obj/item/storage/belt/utility/full,
/obj/item/clothing/neck/tie/horrible,
/obj/item/clothing/suit/jacket/leather,
diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm
index 4a9e136182..9d3df9cf7a 100644
--- a/code/game/objects/items/grenades/chem_grenade.dm
+++ b/code/game/objects/items/grenades/chem_grenade.dm
@@ -13,7 +13,7 @@
var/list/beakers = list()
var/list/allowed_containers = list(/obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle)
var/affected_area = 3
- var/obj/item/device/assembly_holder/nadeassembly = null
+ var/obj/item/assembly_holder/nadeassembly = null
var/assemblyattacher
var/ignition_temp = 10 // The amount of heat added to the reagents when this grenade goes off.
var/threatscale = 1 // Used by advanced grenades to make them slightly more worthy.
@@ -78,9 +78,9 @@
else
to_chat(user, "[I] is empty!")
- else if(stage == EMPTY && istype(I, /obj/item/device/assembly_holder))
+ else if(stage == EMPTY && istype(I, /obj/item/assembly_holder))
. = 1 // no afterattack
- var/obj/item/device/assembly_holder/A = I
+ var/obj/item/assembly_holder/A = I
if(isigniter(A.a_left) == isigniter(A.a_right)) //Check if either part of the assembly has an igniter, but if both parts are igniters, then fuck it
return
if(!user.transferItemToLoc(I, src))
@@ -254,7 +254,7 @@
var/unit_spread = 10 // Amount of units per repeat. Can be altered with a multitool.
/obj/item/grenade/chem_grenade/adv_release/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/device/multitool))
+ if(istype(I, /obj/item/multitool))
switch(unit_spread)
if(0 to 24)
unit_spread += 5
diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm
index 6d15992d24..967d1ce372 100644
--- a/code/game/objects/items/grenades/plastic.dm
+++ b/code/game/objects/items/grenades/plastic.dm
@@ -12,7 +12,7 @@
w_class = WEIGHT_CLASS_SMALL
var/atom/target = null
var/mutable_appearance/plastic_overlay
- var/obj/item/device/assembly_holder/nadeassembly = null
+ var/obj/item/assembly_holder/nadeassembly = null
var/assemblyattacher
var/directional = FALSE
var/aim_dir = NORTH
@@ -31,8 +31,8 @@
..()
/obj/item/grenade/plastic/attackby(obj/item/I, mob/user, params)
- if(!nadeassembly && istype(I, /obj/item/device/assembly_holder))
- var/obj/item/device/assembly_holder/A = I
+ if(!nadeassembly && istype(I, /obj/item/assembly_holder))
+ var/obj/item/assembly_holder/A = I
if(!user.transferItemToLoc(I, src))
return ..()
nadeassembly = A
diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm
index 63df308024..f17be453f4 100644
--- a/code/game/objects/items/implants/implant_misc.dm
+++ b/code/game/objects/items/implants/implant_misc.dm
@@ -81,7 +81,7 @@
/obj/item/implant/radio
name = "internal radio implant"
activated = TRUE
- var/obj/item/device/radio/radio
+ var/obj/item/radio/radio
var/radio_key
var/subspace_transmission = FALSE
icon = 'icons/obj/radio.dmi'
@@ -105,18 +105,18 @@
radio.recalculateChannels()
/obj/item/implant/radio/mining
- radio_key = /obj/item/device/encryptionkey/headset_cargo
+ radio_key = /obj/item/encryptionkey/headset_cargo
/obj/item/implant/radio/syndicate
desc = "Are you there God? It's me, Syndicate Comms Agent."
- radio_key = /obj/item/device/encryptionkey/syndicate
+ radio_key = /obj/item/encryptionkey/syndicate
subspace_transmission = TRUE
/obj/item/implant/radio/slime
name = "slime radio"
icon = 'icons/obj/surgery.dmi'
icon_state = "adamantine_resonator"
- radio_key = /obj/item/device/encryptionkey/headset_sci
+ radio_key = /obj/item/encryptionkey/headset_sci
subspace_transmission = TRUE
/obj/item/implant/radio/get_data()
diff --git a/code/game/objects/items/implants/implant_track.dm b/code/game/objects/items/implants/implant_track.dm
index 6692a6bd6f..913c577f2c 100644
--- a/code/game/objects/items/implants/implant_track.dm
+++ b/code/game/objects/items/implants/implant_track.dm
@@ -15,7 +15,7 @@
imp_type = /obj/item/implant/tracking
/obj/item/implanter/tracking/gps
- imp_type = /obj/item/device/gps/mining/internal
+ imp_type = /obj/item/gps/mining/internal
/obj/item/implant/tracking/get_data()
var/dat = {"Implant Specifications:
diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
index 27db9a7e0a..59ec24e22c 100644
--- a/code/game/objects/items/melee/energy.dm
+++ b/code/game/objects/items/melee/energy.dm
@@ -173,7 +173,7 @@
possible_colors = list("purple" = LIGHT_COLOR_LAVENDER)
/obj/item/melee/transforming/energy/sword/saber/attackby(obj/item/W, mob/living/user, params)
- if(istype(W, /obj/item/device/multitool))
+ if(istype(W, /obj/item/multitool))
if(!hacked)
hacked = TRUE
item_color = "rainbow"
diff --git a/code/game/objects/items/robot/ai_upgrades.dm b/code/game/objects/items/robot/ai_upgrades.dm
index dad3db6b1d..63906ff5ba 100644
--- a/code/game/objects/items/robot/ai_upgrades.dm
+++ b/code/game/objects/items/robot/ai_upgrades.dm
@@ -2,14 +2,14 @@
//Malf Picker
-/obj/item/device/malf_upgrade
+/obj/item/malf_upgrade
name = "combat software upgrade"
desc = "A highly illegal, highly dangerous upgrade for artificial intelligence units, granting them a variety of powers as well as the ability to hack APCs."
icon = 'icons/obj/module.dmi'
icon_state = "datadisk3"
-/obj/item/device/malf_upgrade/afterattack(mob/living/silicon/ai/AI, mob/user)
+/obj/item/malf_upgrade/afterattack(mob/living/silicon/ai/AI, mob/user)
if(!istype(AI))
return
if(AI.malf_picker)
@@ -23,13 +23,13 @@
//Lipreading
-/obj/item/device/surveillance_upgrade
+/obj/item/surveillance_upgrade
name = "surveillance software upgrade"
desc = "A software package that will allow an artificial intelligence to 'hear' from its cameras via lip reading."
icon = 'icons/obj/module.dmi'
icon_state = "datadisk3"
-/obj/item/device/surveillance_upgrade/afterattack(mob/living/silicon/ai/AI, mob/user)
+/obj/item/surveillance_upgrade/afterattack(mob/living/silicon/ai/AI, mob/user)
if(!istype(AI))
return
if(AI.eyeobj)
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 2a465aec69..5d70cbd8e7 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -273,20 +273,20 @@
to_chat(user, "You stop charging [target].")
-/obj/item/device/harmalarm
+/obj/item/harmalarm
name = "\improper Sonic Harm Prevention Tool"
desc = "Releases a harmless blast that confuses most organics. For when the harm is JUST TOO MUCH."
icon_state = "megaphone"
var/cooldown = 0
-/obj/item/device/harmalarm/emag_act(mob/user)
+/obj/item/harmalarm/emag_act(mob/user)
obj_flags ^= EMAGGED
if(obj_flags & EMAGGED)
to_chat(user, "You short out the safeties on [src]!")
else
to_chat(user, "You reset the safeties on [src]!")
-/obj/item/device/harmalarm/attack_self(mob/user)
+/obj/item/harmalarm/attack_self(mob/user)
var/safety = !(obj_flags & EMAGGED)
if(cooldown > world.time)
to_chat(user, "The device is still recharging!")
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index 9a1730488f..9999a054f6 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -152,14 +152,14 @@
else
to_chat(user, "You need to attach a flash to it first!")
- else if (istype(W, /obj/item/device/multitool))
+ else if (istype(W, /obj/item/multitool))
if(check_completion())
Interact(user)
else
to_chat(user, "The endoskeleton must be assembled before debugging can begin!")
- else if(istype(W, /obj/item/device/mmi))
- var/obj/item/device/mmi/M = W
+ else if(istype(W, /obj/item/mmi))
+ var/obj/item/mmi/M = W
if(check_completion())
if(!isturf(loc))
to_chat(user, "You can't put [M] in, the frame has to be standing on the ground to be perfectly precise!")
@@ -304,7 +304,7 @@
var/mob/living/living_user = usr
var/obj/item/item_in_hand = living_user.get_active_held_item()
- if(!istype(item_in_hand, /obj/item/device/multitool))
+ if(!istype(item_in_hand, /obj/item/multitool))
to_chat(living_user, "You need a multitool!")
return
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index fba0c1b1a2..9d32504c19 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -285,7 +285,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
/obj/item/shard/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/device/lightreplacer))
+ if(istype(I, /obj/item/lightreplacer))
I.attackby(src, user)
else
return ..()
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index a236ebeff6..89ce133fcc 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -379,7 +379,7 @@
new /obj/item/crowbar(src)
new /obj/item/stack/cable_coil/random(src)
new /obj/item/wirecutters(src)
- new /obj/item/device/multitool(src)
+ new /obj/item/multitool(src)
/obj/item/storage/backpack/duffelbag/clown
name = "clown's duffel bag"
@@ -439,7 +439,7 @@
new /obj/item/surgical_drapes(src)
new /obj/item/clothing/suit/straight_jacket(src)
new /obj/item/clothing/mask/muzzle(src)
- new /obj/item/device/mmi/syndie(src)
+ new /obj/item/mmi/syndie(src)
/obj/item/storage/backpack/duffelbag/syndie/ammo
name = "ammunition duffel bag"
@@ -542,7 +542,7 @@
STR.silent = TRUE
/obj/item/storage/backpack/duffelbag/clown/syndie/PopulateContents()
- new /obj/item/device/pda/clown(src)
+ new /obj/item/pda/clown(src)
new /obj/item/clothing/under/rank/clown(src)
new /obj/item/clothing/shoes/clown_shoes(src)
new /obj/item/clothing/mask/gas/clown_hat(src)
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index a4cd9cc739..d3781f4c94 100755
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -43,17 +43,17 @@
/obj/item/weldingtool,
/obj/item/wirecutters,
/obj/item/wrench,
- /obj/item/device/multitool,
- /obj/item/device/flashlight,
+ /obj/item/multitool,
+ /obj/item/flashlight,
/obj/item/stack/cable_coil,
- /obj/item/device/t_scanner,
- /obj/item/device/analyzer,
- /obj/item/device/geiger_counter,
+ /obj/item/t_scanner,
+ /obj/item/analyzer,
+ /obj/item/geiger_counter,
/obj/item/extinguisher/mini,
- /obj/item/device/radio,
+ /obj/item/radio,
/obj/item/clothing/gloves,
/obj/item/holosign_creator,
- /obj/item/device/assembly/signaler
+ /obj/item/assembly/signaler
))
/obj/item/storage/belt/utility/chief
@@ -66,10 +66,10 @@
new /obj/item/screwdriver/power(src)
new /obj/item/crowbar/power(src)
new /obj/item/weldingtool/experimental(src)//This can be changed if this is too much
- new /obj/item/device/multitool(src)
+ new /obj/item/multitool(src)
new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
new /obj/item/extinguisher/mini(src)
- new /obj/item/device/analyzer(src)
+ new /obj/item/analyzer(src)
//much roomier now that we've managed to remove two tools
/obj/item/storage/belt/utility/full/PopulateContents()
@@ -78,7 +78,7 @@
new /obj/item/weldingtool(src)
new /obj/item/crowbar(src)
new /obj/item/wirecutters(src)
- new /obj/item/device/multitool(src)
+ new /obj/item/multitool(src)
new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
/obj/item/storage/belt/utility/full/engi/PopulateContents()
@@ -87,7 +87,7 @@
new /obj/item/weldingtool/largetank(src)
new /obj/item/crowbar(src)
new /obj/item/wirecutters(src)
- new /obj/item/device/multitool(src)
+ new /obj/item/multitool(src)
new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
@@ -97,7 +97,7 @@
new /obj/item/weldingtool(src)
new /obj/item/crowbar(src)
new /obj/item/wirecutters(src)
- new /obj/item/device/t_scanner(src)
+ new /obj/item/t_scanner(src)
new /obj/item/extinguisher/mini(src)
/obj/item/storage/belt/utility/servant/PopulateContents()
@@ -106,7 +106,7 @@
new /obj/item/wrench/brass(src)
new /obj/item/crowbar/brass(src)
new /obj/item/weldingtool/experimental/brass(src)
- new /obj/item/device/multitool(src)
+ new /obj/item/multitool(src)
new /obj/item/stack/cable_coil(src, 30, "yellow")
/obj/item/storage/belt/medical
@@ -120,7 +120,7 @@
GET_COMPONENT(STR, /datum/component/storage)
STR.max_w_class = WEIGHT_CLASS_BULKY
STR.can_hold = typecacheof(list(
- /obj/item/device/healthanalyzer,
+ /obj/item/healthanalyzer,
/obj/item/dnainjector,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/glass/beaker,
@@ -132,11 +132,11 @@
/obj/item/storage/fancy/cigarettes,
/obj/item/storage/pill_bottle,
/obj/item/stack/medical,
- /obj/item/device/flashlight/pen,
+ /obj/item/flashlight/pen,
/obj/item/extinguisher/mini,
/obj/item/reagent_containers/hypospray,
- /obj/item/device/sensor_device,
- /obj/item/device/radio,
+ /obj/item/sensor_device,
+ /obj/item/radio,
/obj/item/clothing/gloves/,
/obj/item/lazarus_injector,
/obj/item/bikehorn/rubberducky,
@@ -150,7 +150,7 @@
/obj/item/retractor,
/obj/item/cautery,
/obj/item/hemostat,
- /obj/item/device/geiger_counter,
+ /obj/item/geiger_counter,
/obj/item/clothing/neck/stethoscope,
/obj/item/stamp,
/obj/item/clothing/glasses,
@@ -185,15 +185,15 @@
/obj/item/grenade,
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
- /obj/item/device/assembly/flash/handheld,
+ /obj/item/assembly/flash/handheld,
/obj/item/clothing/glasses,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_box,
/obj/item/reagent_containers/food/snacks/donut,
/obj/item/kitchen/knife/combat,
- /obj/item/device/flashlight/seclite,
+ /obj/item/flashlight/seclite,
/obj/item/melee/classic_baton/telescopic,
- /obj/item/device/radio,
+ /obj/item/radio,
/obj/item/clothing/gloves,
/obj/item/restraints/legcuffs/bola
))
@@ -202,7 +202,7 @@
new /obj/item/reagent_containers/spray/pepper(src)
new /obj/item/restraints/handcuffs(src)
new /obj/item/grenade/flashbang(src)
- new /obj/item/device/assembly/flash/handheld(src)
+ new /obj/item/assembly/flash/handheld(src)
new /obj/item/melee/baton/loaded(src)
update_icon()
@@ -225,15 +225,15 @@
/obj/item/weldingtool,
/obj/item/wirecutters,
/obj/item/wrench,
- /obj/item/device/multitool,
- /obj/item/device/flashlight,
+ /obj/item/multitool,
+ /obj/item/flashlight,
/obj/item/stack/cable_coil,
- /obj/item/device/analyzer,
+ /obj/item/analyzer,
/obj/item/extinguisher/mini,
- /obj/item/device/radio,
+ /obj/item/radio,
/obj/item/clothing/gloves,
/obj/item/resonator,
- /obj/item/device/mining_scanner,
+ /obj/item/mining_scanner,
/obj/item/pickaxe,
/obj/item/stack/sheet/animalhide,
/obj/item/stack/sheet/sinew,
@@ -244,16 +244,16 @@
/obj/item/stack/medical,
/obj/item/kitchen/knife,
/obj/item/reagent_containers/hypospray,
- /obj/item/device/gps,
+ /obj/item/gps,
/obj/item/storage/bag/ore,
/obj/item/survivalcapsule,
- /obj/item/device/t_scanner/adv_mining_scanner,
+ /obj/item/t_scanner/adv_mining_scanner,
/obj/item/reagent_containers/pill,
/obj/item/storage/pill_bottle,
/obj/item/stack/ore,
/obj/item/reagent_containers/food/drinks,
/obj/item/organ/regenerative_core,
- /obj/item/device/wormhole_jaunter,
+ /obj/item/wormhole_jaunter,
/obj/item/storage/bag/plants,
/obj/item/stack/marker_beacon
))
@@ -288,16 +288,16 @@
GET_COMPONENT(STR, /datum/component/storage)
STR.max_items = 6
STR.can_hold = typecacheof(list(
- /obj/item/device/soulstone
+ /obj/item/soulstone
))
/obj/item/storage/belt/soulstone/full/PopulateContents()
for(var/i in 1 to 6)
- new /obj/item/device/soulstone(src)
+ new /obj/item/soulstone(src)
/obj/item/storage/belt/soulstone/full/chappy/PopulateContents()
for(var/i in 1 to 6)
- new /obj/item/device/soulstone/anybody/chaplain(src)
+ new /obj/item/soulstone/anybody/chaplain(src)
/obj/item/storage/belt/champion
name = "championship belt"
@@ -338,7 +338,7 @@
new /obj/item/weldingtool/abductor(src)
new /obj/item/crowbar/abductor(src)
new /obj/item/wirecutters/abductor(src)
- new /obj/item/device/multitool/abductor(src)
+ new /obj/item/multitool/abductor(src)
new /obj/item/stack/cable_coil(src,30,"white")
/obj/item/storage/belt/military/army
@@ -375,7 +375,7 @@
/obj/item/grenade,
/obj/item/screwdriver,
/obj/item/lighter,
- /obj/item/device/multitool,
+ /obj/item/multitool,
/obj/item/reagent_containers/food/drinks/bottle/molotov,
/obj/item/grenade/plastic/c4,
))
@@ -408,7 +408,7 @@
new /obj/item/grenade/syndieminibomb(src)
new /obj/item/grenade/syndieminibomb(src)
new /obj/item/screwdriver(src)
- new /obj/item/device/multitool(src)
+ new /obj/item/multitool(src)
/obj/item/storage/belt/wands
name = "wand belt"
@@ -449,15 +449,15 @@
STR.max_w_class = WEIGHT_CLASS_BULKY // Set to this so the light replacer can fit.
STR.can_hold = typecacheof(list(
/obj/item/grenade/chem_grenade,
- /obj/item/device/lightreplacer,
- /obj/item/device/flashlight,
+ /obj/item/lightreplacer,
+ /obj/item/flashlight,
/obj/item/reagent_containers/spray,
/obj/item/soap,
/obj/item/holosign_creator,
/obj/item/key/janitor,
/obj/item/clothing/gloves,
/obj/item/melee/flyswatter,
- /obj/item/device/assembly/mousetrap
+ /obj/item/assembly/mousetrap
))
/obj/item/storage/belt/bandolier
diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm
index 41f2a4bf47..44c41e419b 100644
--- a/code/game/objects/items/storage/book.dm
+++ b/code/game/objects/items/storage/book.dm
@@ -177,7 +177,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,1)
if(do_after(user, 40, target = sword))
playsound(src,'sound/effects/pray_chaplain.ogg',60,1)
- for(var/obj/item/device/soulstone/SS in sword.contents)
+ for(var/obj/item/soulstone/SS in sword.contents)
SS.usability = TRUE
for(var/mob/living/simple_animal/shade/EX in SS)
SSticker.mode.remove_cultist(EX.mind, 1, 0)
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index d244e512c3..f892bc50f4 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -101,7 +101,7 @@
/obj/item/storage/box/survival/radio/PopulateContents()
..() // we want the survival stuff too.
- new /obj/item/device/radio/off(src)
+ new /obj/item/radio/off(src)
/obj/item/storage/box/survival_mining/PopulateContents()
new /obj/item/clothing/mask/gas/explorer(src)
@@ -118,7 +118,7 @@
/obj/item/storage/box/engineer/radio/PopulateContents()
..() // we want the regular items too.
- new /obj/item/device/radio/off(src)
+ new /obj/item/radio/off(src)
// Syndie survival box
/obj/item/storage/box/syndie/PopulateContents()
@@ -133,7 +133,7 @@
/obj/item/storage/box/security/radio/PopulateContents()
..() // we want the regular stuff too
- new /obj/item/device/radio/off(src)
+ new /obj/item/radio/off(src)
/obj/item/storage/box/gloves
name = "box of latex gloves"
@@ -225,7 +225,7 @@
/obj/item/storage/box/flashes/PopulateContents()
for(var/i in 1 to 6)
- new /obj/item/device/assembly/flash/handheld(src)
+ new /obj/item/assembly/flash/handheld(src)
/obj/item/storage/box/wall_flash
name = "wall-mounted flash kit"
@@ -238,11 +238,11 @@
new /obj/item/wallframe/button(src)
new /obj/item/electronics/airlock(src)
- var/obj/item/device/assembly/control/flasher/remote = new(src)
+ var/obj/item/assembly/control/flasher/remote = new(src)
remote.id = id
var/obj/item/wallframe/flasher/frame = new(src)
frame.id = id
- new /obj/item/device/assembly/flash/handheld(src)
+ new /obj/item/assembly/flash/handheld(src)
new /obj/item/screwdriver(src)
@@ -399,10 +399,10 @@
illustration = "pda"
/obj/item/storage/box/PDAs/PopulateContents()
- new /obj/item/device/pda(src)
- new /obj/item/device/pda(src)
- new /obj/item/device/pda(src)
- new /obj/item/device/pda(src)
+ new /obj/item/pda(src)
+ new /obj/item/pda(src)
+ new /obj/item/pda(src)
+ new /obj/item/pda(src)
new /obj/item/cartridge/head(src)
var/newcart = pick( /obj/item/cartridge/engineering,
@@ -453,7 +453,7 @@
/obj/item/storage/box/firingpins/PopulateContents()
for(var/i in 1 to 5)
- new /obj/item/device/firing_pin(src)
+ new /obj/item/firing_pin(src)
/obj/item/storage/box/lasertagpins
name = "box of laser tag firing pins"
@@ -462,8 +462,8 @@
/obj/item/storage/box/lasertagpins/PopulateContents()
for(var/i in 1 to 3)
- new /obj/item/device/firing_pin/tag/red(src)
- new /obj/item/device/firing_pin/tag/blue(src)
+ new /obj/item/firing_pin/tag/red(src)
+ new /obj/item/firing_pin/tag/blue(src)
/obj/item/storage/box/handcuffs
name = "box of spare handcuffs"
@@ -511,7 +511,7 @@
/obj/item/storage/box/mousetraps/PopulateContents()
for(var/i in 1 to 6)
- new /obj/item/device/assembly/mousetrap(src)
+ new /obj/item/assembly/mousetrap(src)
/obj/item/storage/box/pillbottles
name = "box of pill bottles"
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index d5548ee95c..fe46141614 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -35,7 +35,7 @@
new /obj/item/stack/medical/ointment(src)
new /obj/item/stack/medical/ointment(src)
new /obj/item/reagent_containers/hypospray/medipen(src)
- new /obj/item/device/healthanalyzer(src)
+ new /obj/item/healthanalyzer(src)
/obj/item/storage/firstaid/ancient
icon_state = "firstaid"
@@ -74,7 +74,7 @@
new /obj/item/reagent_containers/pill/oxandrolone(src)
new /obj/item/reagent_containers/pill/oxandrolone(src)
new /obj/item/reagent_containers/hypospray/medipen(src)
- new /obj/item/device/healthanalyzer(src)
+ new /obj/item/healthanalyzer(src)
/obj/item/storage/firstaid/toxin
name = "toxin treatment kit"
@@ -97,7 +97,7 @@
new /obj/item/reagent_containers/syringe/charcoal(src)
for(var/i in 1 to 2)
new /obj/item/storage/pill_bottle/charcoal(src)
- new /obj/item/device/healthanalyzer(src)
+ new /obj/item/healthanalyzer(src)
/obj/item/storage/firstaid/o2
name = "oxygen deprivation treatment kit"
@@ -116,7 +116,7 @@
new /obj/item/reagent_containers/pill/salbutamol(src)
new /obj/item/reagent_containers/hypospray/medipen(src)
new /obj/item/reagent_containers/hypospray/medipen(src)
- new /obj/item/device/healthanalyzer(src)
+ new /obj/item/healthanalyzer(src)
/obj/item/storage/firstaid/brute
name = "brute trauma treatment kit"
@@ -135,7 +135,7 @@
new /obj/item/reagent_containers/pill/patch/styptic(src)
new /obj/item/stack/medical/gauze(src)
new /obj/item/stack/medical/gauze(src)
- new /obj/item/device/healthanalyzer(src)
+ new /obj/item/healthanalyzer(src)
/obj/item/storage/firstaid/tactical
name = "combat medical kit"
diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm
index 73e178af3f..806f22a2dc 100644
--- a/code/game/objects/items/storage/secure.dm
+++ b/code/game/objects/items/storage/secure.dm
@@ -43,7 +43,7 @@
return
if (istype(W, /obj/item/wirecutters))
to_chat(user, "[src] is protected from this sort of tampering, yet it appears the internal memory wires can still be pulsed.")
- if ((istype(W, /obj/item/device/multitool)) && (!l_hacking))
+ if ((istype(W, /obj/item/multitool)) && (!l_hacking))
if(open == 1)
to_chat(user, "Now attempting to reset internal memory, please hold.")
l_hacking = 1
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index bea6b6de47..c78a20a0ef 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -48,12 +48,12 @@
new /obj/item/extinguisher/mini(src)
switch(rand(1,3))
if(1)
- new /obj/item/device/flashlight(src)
+ new /obj/item/flashlight(src)
if(2)
- new /obj/item/device/flashlight/glowstick(src)
+ new /obj/item/flashlight/glowstick(src)
if(3)
- new /obj/item/device/flashlight/flare(src)
- new /obj/item/device/radio/off(src)
+ new /obj/item/flashlight/flare(src)
+ new /obj/item/radio/off(src)
/obj/item/storage/toolbox/emergency/old
name = "rusty red toolbox"
@@ -70,7 +70,7 @@
new /obj/item/wrench(src)
new /obj/item/weldingtool(src)
new /obj/item/crowbar(src)
- new /obj/item/device/analyzer(src)
+ new /obj/item/analyzer(src)
new /obj/item/wirecutters(src)
/obj/item/storage/toolbox/mechanical/old
@@ -96,7 +96,7 @@
var/pickedcolor = pick("red","yellow","green","blue","pink","orange","cyan","white")
new /obj/item/screwdriver(src)
new /obj/item/wirecutters(src)
- new /obj/item/device/t_scanner(src)
+ new /obj/item/t_scanner(src)
new /obj/item/crowbar(src)
new /obj/item/stack/cable_coil(src,30,pickedcolor)
new /obj/item/stack/cable_coil(src,30,pickedcolor)
@@ -123,7 +123,7 @@
new /obj/item/weldingtool/largetank(src)
new /obj/item/crowbar/red(src)
new /obj/item/wirecutters(src, "red")
- new /obj/item/device/multitool(src)
+ new /obj/item/multitool(src)
new /obj/item/clothing/gloves/combat(src)
/obj/item/storage/toolbox/drone
@@ -139,7 +139,7 @@
new /obj/item/crowbar(src)
new /obj/item/stack/cable_coil(src,30,pickedcolor)
new /obj/item/wirecutters(src)
- new /obj/item/device/multitool(src)
+ new /obj/item/multitool(src)
/obj/item/storage/toolbox/brass
name = "brass box"
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index 6c4d16f994..ec92961387 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -7,20 +7,20 @@
new /obj/item/clothing/mask/chameleon(src) // Goes with above
new /obj/item/card/id/syndicate(src) // 2 tc
new /obj/item/clothing/shoes/chameleon/noslip(src) // 2 tc
- new /obj/item/device/camera_bug(src) // 1 tc
- new /obj/item/device/multitool/ai_detect(src) // 1 tc
- new /obj/item/device/encryptionkey/syndicate(src) // 2 tc
+ new /obj/item/camera_bug(src) // 1 tc
+ new /obj/item/multitool/ai_detect(src) // 1 tc
+ new /obj/item/encryptionkey/syndicate(src) // 2 tc
new /obj/item/reagent_containers/syringe/mulligan(src) // 4 tc
new /obj/item/switchblade(src) //I'll count this as 2 tc
new /obj/item/storage/fancy/cigarettes/cigpack_syndicate (src) // 2 tc this shit heals
- new /obj/item/device/flashlight/emp(src) // 2 tc
- new /obj/item/device/chameleon(src) // 7 tc
+ new /obj/item/flashlight/emp(src) // 2 tc
+ new /obj/item/chameleon(src) // 7 tc
if("stealth") // 31 tc
new /obj/item/gun/energy/kinetic_accelerator/crossbow(src)
new /obj/item/pen/sleepy(src)
- new /obj/item/device/healthanalyzer/rad_laser(src)
- new /obj/item/device/chameleon(src)
+ new /obj/item/healthanalyzer/rad_laser(src)
+ new /obj/item/chameleon(src)
new /obj/item/soap/syndie(src)
new /obj/item/clothing/glasses/thermal/syndi(src)
@@ -34,12 +34,12 @@
new /obj/item/reagent_containers/syringe/stimulants(src)
if("screwed") // 29 tc
- new /obj/item/device/sbeacondrop/bomb(src)
+ new /obj/item/sbeacondrop/bomb(src)
new /obj/item/grenade/syndieminibomb(src)
- new /obj/item/device/sbeacondrop/powersink(src)
+ new /obj/item/sbeacondrop/powersink(src)
new /obj/item/clothing/suit/space/syndicate/black/red(src)
new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
- new /obj/item/device/encryptionkey/syndicate(src)
+ new /obj/item/encryptionkey/syndicate(src)
if("guns") // 28 tc now
new /obj/item/gun/ballistic/revolver(src)
@@ -56,7 +56,7 @@
new /obj/item/clothing/glasses/thermal/syndi(src)
new /obj/item/card/emag(src)
new /obj/item/clothing/shoes/chameleon/noslip(src)
- new /obj/item/device/encryptionkey/syndicate(src)
+ new /obj/item/encryptionkey/syndicate(src)
new /obj/item/grenade/syndieminibomb(src)
if("implant") // 55+ tc holy shit what the fuck this is a lottery disguised as fun boxes isn't it?
@@ -70,12 +70,12 @@
if("hacker") // 26 tc
new /obj/item/aiModule/syndicate(src)
new /obj/item/card/emag(src)
- new /obj/item/device/encryptionkey/binary(src)
+ new /obj/item/encryptionkey/binary(src)
new /obj/item/aiModule/toyAI(src)
- new /obj/item/device/multitool/ai_detect(src)
+ new /obj/item/multitool/ai_detect(src)
if("lordsingulo") // 24 tc
- new /obj/item/device/sbeacondrop(src)
+ new /obj/item/sbeacondrop(src)
new /obj/item/clothing/suit/space/syndicate/black/red(src)
new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
new /obj/item/card/emag(src)
@@ -83,10 +83,10 @@
if("sabotage") // 26 tc now
new /obj/item/grenade/plastic/c4 (src)
new /obj/item/grenade/plastic/c4 (src)
- new /obj/item/device/doorCharge(src)
- new /obj/item/device/doorCharge(src)
- new /obj/item/device/camera_bug(src)
- new /obj/item/device/sbeacondrop/powersink(src)
+ new /obj/item/doorCharge(src)
+ new /obj/item/doorCharge(src)
+ new /obj/item/camera_bug(src)
+ new /obj/item/sbeacondrop/powersink(src)
new /obj/item/cartridge/virus/syndicate(src)
new /obj/item/storage/toolbox/syndicate(src) //To actually get to those places
new /obj/item/pizzabox/bomb
@@ -128,7 +128,7 @@
new /obj/item/throwing_star(src)
new /obj/item/storage/belt/chameleon(src) // Unique but worth at least 2 tc
new /obj/item/card/id/syndicate(src) // 2 tc
- new /obj/item/device/chameleon(src) // 7 tc
+ new /obj/item/chameleon(src) // 7 tc
/obj/item/storage/box/syndie_kit
name = "box"
@@ -277,9 +277,9 @@
new /obj/item/clothing/head/chameleon(src)
new /obj/item/clothing/mask/chameleon(src)
new /obj/item/storage/backpack/chameleon(src)
- new /obj/item/device/radio/headset/chameleon(src)
+ new /obj/item/radio/headset/chameleon(src)
new /obj/item/stamp/chameleon(src)
- new /obj/item/device/pda/chameleon(src)
+ new /obj/item/pda/chameleon(src)
new /obj/item/gun/energy/laser/chameleon(src)
//5*(2*4) = 5*8 = 45, 45 damage if you hit one person with all 5 stars.
@@ -321,10 +321,10 @@
new /obj/item/clothing/under/rank/centcom_officer(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/gloves/color/black(src)
- new /obj/item/device/radio/headset/headset_cent/empty(src)
+ new /obj/item/radio/headset/headset_cent/empty(src)
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/storage/backpack/satchel(src)
- new /obj/item/device/pda/heads(src)
+ new /obj/item/pda/heads(src)
new /obj/item/clipboard(src)
/obj/item/storage/box/syndie_kit/chameleon/broken/PopulateContents()
@@ -336,7 +336,7 @@
new /obj/item/clothing/head/chameleon/broken(src)
new /obj/item/clothing/mask/chameleon/broken(src)
new /obj/item/storage/backpack/chameleon/broken(src)
- new /obj/item/device/radio/headset/chameleon/broken(src)
+ new /obj/item/radio/headset/chameleon/broken(src)
new /obj/item/stamp/chameleon/broken(src)
- new /obj/item/device/pda/chameleon/broken(src)
+ new /obj/item/pda/chameleon/broken(src)
// No chameleon laser, they can't randomise for //REASONS//
diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm
index fa649fddc6..6acf72518f 100644
--- a/code/game/objects/items/storage/wallets.dm
+++ b/code/game/objects/items/storage/wallets.dm
@@ -17,7 +17,7 @@
/obj/item/stack/spacecash,
/obj/item/card,
/obj/item/clothing/mask/cigarette,
- /obj/item/device/flashlight/pen,
+ /obj/item/flashlight/pen,
/obj/item/seeds,
/obj/item/stack/medical,
/obj/item/toy/crayon,
diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index 95c68109bb..1bd31e978e 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -196,7 +196,7 @@
hitcost = 2000
throw_hit_chance = 10
slot_flags = SLOT_BACK
- var/obj/item/device/assembly/igniter/sparkler = 0
+ var/obj/item/assembly/igniter/sparkler = 0
/obj/item/melee/baton/cattleprod/Initialize()
. = ..()
diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm
index 3f97a8222b..f841822f21 100644
--- a/code/game/objects/items/tanks/tanks.dm
+++ b/code/game/objects/items/tanks/tanks.dm
@@ -138,10 +138,10 @@
/obj/item/tank/attackby(obj/item/W, mob/user, params)
add_fingerprint(user)
- if((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
+ if((istype(W, /obj/item/analyzer)) && get_dist(user, src) <= 1)
atmosanalyzer_scan(air_contents, user)
- else if(istype(W, /obj/item/device/assembly_holder))
+ else if(istype(W, /obj/item/assembly_holder))
bomb_assemble(W,user)
else
. = ..()
@@ -237,7 +237,7 @@
var/temperature = air_contents.return_pressure()
if(pressure > TANK_FRAGMENT_PRESSURE)
- if(!istype(src.loc, /obj/item/device/transfer_valve))
+ if(!istype(src.loc, /obj/item/transfer_valve))
message_admins("Explosive tank rupture! Last key to touch the tank was [src.fingerprintslast].")
log_game("Explosive tank rupture! Last key to touch the tank was [src.fingerprintslast].")
//Give the gas a chance to build up more pressure through reacting
@@ -250,7 +250,7 @@
explosion(epicenter, round(range*0.25), round(range*0.5), round(range), round(range*1.5))
- if(istype(src.loc, /obj/item/device/transfer_valve))
+ if(istype(src.loc, /obj/item/transfer_valve))
qdel(src.loc)
else
qdel(src)
diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm
index b2464ca3ce..cc7e3249d4 100644
--- a/code/game/objects/items/teleportation.dm
+++ b/code/game/objects/items/teleportation.dm
@@ -55,7 +55,7 @@
if (sr)
temp += "Beacon Signals:
"
- for(var/obj/item/device/beacon/W in GLOB.teleportbeacons)
+ for(var/obj/item/beacon/W in GLOB.teleportbeacons)
if (!W.renamed)
continue
var/turf/tr = get_turf(W)
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 4554441cf0..52e98e4a9e 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -258,7 +258,7 @@
newSaber.item_color = "rainbow"
qdel(W)
qdel(src)
- else if(istype(W, /obj/item/device/multitool))
+ else if(istype(W, /obj/item/multitool))
if(!hacked)
hacked = TRUE
item_color = "rainbow"
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index 34a40b32a8..fdbea343e3 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -438,7 +438,7 @@
possible_colors = list("purple")
/obj/item/twohanded/dualsaber/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/device/multitool))
+ if(istype(W, /obj/item/multitool))
if(!hacked)
hacked = TRUE
to_chat(user, "2XRNBW_ENGAGE")
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index bf67efa6c7..6459cb5188 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -248,7 +248,7 @@
user.put_in_hands(S)
to_chat(user, "You fasten the glass shard to the top of the rod with the cable.")
- else if(istype(I, /obj/item/device/assembly/igniter) && !(I.flags_1 & NODROP_1))
+ else if(istype(I, /obj/item/assembly/igniter) && !(I.flags_1 & NODROP_1))
var/obj/item/melee/baton/cattleprod/P = new /obj/item/melee/baton/cattleprod
remove_item_from_storage(user)
diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm
index a8061f6c2a..0a6dfaa1cf 100644
--- a/code/game/objects/structures/ai_core.dm
+++ b/code/game/objects/structures/ai_core.dm
@@ -9,7 +9,7 @@
var/state = 0
var/datum/ai_laws/laws
var/obj/item/circuitboard/circuit = null
- var/obj/item/device/mmi/brain = null
+ var/obj/item/mmi/brain = null
var/can_deconstruct = TRUE
/obj/structure/AIcore/Initialize()
@@ -61,7 +61,7 @@
return TRUE
/obj/structure/AIcore/latejoin_inactive/attackby(obj/item/P, mob/user, params)
- if(istype(P, /obj/item/device/multitool))
+ if(istype(P, /obj/item/multitool))
active = !active
to_chat(user, "You [active? "activate" : "deactivate"] [src]'s transimtters.")
return
@@ -172,8 +172,8 @@
module.install(laws, user)
return
- if(istype(P, /obj/item/device/mmi) && !brain)
- var/obj/item/device/mmi/M = P
+ if(istype(P, /obj/item/mmi) && !brain)
+ var/obj/item/mmi/M = P
if(!M.brainmob)
to_chat(user, "Sticking an empty [M.name] into the frame would sort of defeat the purpose!")
return
@@ -243,7 +243,7 @@
return
if(AI_READY_CORE)
- if(istype(P, /obj/item/device/aicard))
+ if(istype(P, /obj/item/aicard))
P.transfer_ai("INACTIVE", "AICARD", src, user)
return
@@ -303,14 +303,14 @@ That prevents a few funky behaviors.
//The type of interaction, the player performing the operation, the AI itself, and the card object, if any.
-/atom/proc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card)
+/atom/proc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card)
if(istype(card))
if(card.flush)
to_chat(user, "ERROR: AI flush is in progress, cannot execute transfer protocol.")
return 0
return 1
-/obj/structure/AIcore/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card)
+/obj/structure/AIcore/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card)
if(state != AI_READY_CORE || !..())
return
//Transferring a carded AI to a core.
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index c56a0c5008..7ae18a481e 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -104,4 +104,4 @@
new /obj/item/clothing/suit/space/nasavoid(src)
new /obj/item/crowbar(src)
new /obj/item/stock_parts/cell(src)
- new /obj/item/device/multitool(src)
+ new /obj/item/multitool(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 9d10ba36ba..eb7e7a3f93 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -8,8 +8,8 @@
/obj/structure/closet/gmcloset/PopulateContents()
..()
new /obj/item/clothing/head/that(src)
- new /obj/item/device/radio/headset/headset_srv(src)
- new /obj/item/device/radio/headset/headset_srv(src)
+ new /obj/item/radio/headset/headset_srv(src)
+ new /obj/item/radio/headset/headset_srv(src)
new /obj/item/clothing/head/that(src)
new /obj/item/clothing/under/sl_suit(src)
new /obj/item/clothing/under/sl_suit(src)
@@ -39,8 +39,8 @@
..()
new /obj/item/clothing/under/waiter(src)
new /obj/item/clothing/under/waiter(src)
- new /obj/item/device/radio/headset/headset_srv(src)
- new /obj/item/device/radio/headset/headset_srv(src)
+ new /obj/item/radio/headset/headset_srv(src)
+ new /obj/item/radio/headset/headset_srv(src)
new /obj/item/clothing/accessory/waistcoat(src)
new /obj/item/clothing/accessory/waistcoat(src)
for(var/i in 1 to 3)
@@ -68,11 +68,11 @@
new /obj/item/clothing/head/soft/purple(src)
new /obj/item/paint/paint_remover(src)
new /obj/item/melee/flyswatter(src)
- new /obj/item/device/flashlight(src)
+ new /obj/item/flashlight(src)
for(var/i in 1 to 3)
new /obj/item/caution(src)
new /obj/item/holosign_creator(src)
- new /obj/item/device/lightreplacer(src)
+ new /obj/item/lightreplacer(src)
new /obj/item/soap(src)
new /obj/item/storage/bag/trash(src)
new /obj/item/clothing/shoes/galoshes(src)
@@ -173,7 +173,7 @@
new /obj/item/clothing/gloves/fingerless(src)
for(var/i in 1 to 3)
new /obj/item/clothing/head/soft(src)
- new /obj/item/device/radio/headset/headset_cargo(src)
+ new /obj/item/radio/headset/headset_cargo(src)
/obj/structure/closet/wardrobe/atmospherics_yellow
name = "atmospherics wardrobe"
@@ -336,8 +336,8 @@
new /obj/item/clothing/suit/toggle/labcoat/science(src)
for(var/i in 1 to 3)
new /obj/item/clothing/shoes/sneakers/white(src)
- new /obj/item/device/radio/headset/headset_sci(src)
- new /obj/item/device/radio/headset/headset_sci(src)
+ new /obj/item/radio/headset/headset_sci(src)
+ new /obj/item/radio/headset/headset_sci(src)
for(var/i in 1 to 3)
new /obj/item/clothing/mask/gas(src)
return
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
index 03afb77b9e..7a79b7d2de 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -9,13 +9,13 @@
new /obj/item/storage/lockbox/medal/cargo(src)
new /obj/item/clothing/under/rank/cargo(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
- new /obj/item/device/radio/headset/headset_cargo(src)
+ new /obj/item/radio/headset/headset_cargo(src)
new /obj/item/clothing/suit/fire/firefighter(src)
new /obj/item/clothing/gloves/fingerless(src)
- new /obj/item/device/megaphone/cargo(src)
+ new /obj/item/megaphone/cargo(src)
new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/head/soft(src)
- new /obj/item/device/export_scanner(src)
+ new /obj/item/export_scanner(src)
new /obj/item/door_remote/quartermaster(src)
new /obj/item/circuitboard/machine/techfab/department/cargo(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index 8f7da91465..9cc4598697 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -13,16 +13,16 @@
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/tank/jetpack/suit(src)
new /obj/item/cartridge/ce(src)
- new /obj/item/device/radio/headset/heads/ce(src)
+ new /obj/item/radio/headset/heads/ce(src)
new /obj/item/storage/toolbox/mechanical(src)
new /obj/item/clothing/suit/hazardvest(src)
- new /obj/item/device/megaphone/command(src)
+ new /obj/item/megaphone/command(src)
new /obj/item/areaeditor/blueprints(src)
new /obj/item/airlock_painter(src)
new /obj/item/holosign_creator/engineering(src)
new /obj/item/clothing/mask/gas(src)
- new /obj/item/device/multitool(src)
- new /obj/item/device/assembly/flash/handheld(src)
+ new /obj/item/multitool(src)
+ new /obj/item/assembly/flash/handheld(src)
new /obj/item/clothing/glasses/meson/engine(src)
new /obj/item/door_remote/chief_engineer(src)
new /obj/item/pipe_dispenser(src)
@@ -46,7 +46,7 @@
for(var/i in 1 to 3)
new /obj/item/electronics/apc(src)
for(var/i in 1 to 3)
- new /obj/item/device/multitool(src)
+ new /obj/item/multitool(src)
/obj/structure/closet/secure_closet/engineering_welding
name = "welding supplies locker"
@@ -68,7 +68,7 @@
/obj/structure/closet/secure_closet/engineering_personal/PopulateContents()
..()
- new /obj/item/device/radio/headset/headset_eng(src)
+ new /obj/item/radio/headset/headset_eng(src)
new /obj/item/storage/toolbox/mechanical(src)
new /obj/item/tank/internals/emergency_oxygen/engi(src)
new /obj/item/holosign_creator/engineering(src)
@@ -84,11 +84,11 @@
/obj/structure/closet/secure_closet/atmospherics/PopulateContents()
..()
- new /obj/item/device/radio/headset/headset_eng(src)
+ new /obj/item/radio/headset/headset_eng(src)
new /obj/item/pipe_dispenser(src)
new /obj/item/storage/toolbox/mechanical(src)
new /obj/item/tank/internals/emergency_oxygen/engi(src)
- new /obj/item/device/analyzer(src)
+ new /obj/item/analyzer(src)
new /obj/item/holosign_creator/atmos(src)
new /obj/item/watertank/atmos(src)
new /obj/item/clothing/suit/fire/atmos(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
index 37fe71a3f5..ac246d5053 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
@@ -6,8 +6,8 @@
/obj/structure/closet/secure_closet/hydroponics/PopulateContents()
..()
new /obj/item/storage/bag/plants/portaseeder(src)
- new /obj/item/device/plant_analyzer(src)
- new /obj/item/device/radio/headset/headset_srv(src)
+ new /obj/item/plant_analyzer(src)
+ new /obj/item/radio/headset/headset_srv(src)
new /obj/item/cultivator(src)
new /obj/item/hatchet(src)
new /obj/item/storage/box/disks_plantgene(src)
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index 778ce38fe1..e2f0fb5f88 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -40,7 +40,7 @@
/obj/structure/closet/secure_closet/medical3/PopulateContents()
..()
- new /obj/item/device/radio/headset/headset_med(src)
+ new /obj/item/radio/headset/headset_med(src)
new /obj/item/defibrillator/loaded(src)
new /obj/item/clothing/gloves/color/latex/nitrile(src)
new /obj/item/storage/belt/medical(src)
@@ -62,15 +62,15 @@
new /obj/item/clothing/under/rank/chief_medical_officer(src)
new /obj/item/clothing/shoes/sneakers/brown (src)
new /obj/item/cartridge/cmo(src)
- new /obj/item/device/radio/headset/heads/cmo(src)
- new /obj/item/device/megaphone/command(src)
+ new /obj/item/radio/headset/heads/cmo(src)
+ new /obj/item/megaphone/command(src)
new /obj/item/defibrillator/compact/loaded(src)
new /obj/item/clothing/gloves/color/latex/nitrile(src)
new /obj/item/storage/belt/medical(src)
- new /obj/item/device/healthanalyzer/advanced(src)
- new /obj/item/device/assembly/flash/handheld(src)
+ new /obj/item/healthanalyzer/advanced(src)
+ new /obj/item/assembly/flash/handheld(src)
// new /obj/item/reagent_containers/hypospray/CMO(src) // CITADEL EDIT comments out the hypospray mk I. the MK II kit is modularized
- new /obj/item/device/autosurgeon/cmo(src)
+ new /obj/item/autosurgeon/cmo(src)
new /obj/item/door_remote/chief_medical_officer(src)
new /obj/item/clothing/neck/petcollar(src)
new /obj/item/pet_carrier(src)
@@ -83,9 +83,9 @@
/obj/structure/closet/secure_closet/animal/PopulateContents()
..()
- new /obj/item/device/assembly/signaler(src)
+ new /obj/item/assembly/signaler(src)
for(var/i in 1 to 3)
- new /obj/item/device/electropack(src)
+ new /obj/item/electropack(src)
/obj/structure/closet/secure_closet/chemical
name = "chemical closet"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/misc.dm b/code/game/objects/structures/crates_lockers/closets/secure/misc.dm
index 80f68d10eb..0fad404a2a 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/misc.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/misc.dm
@@ -8,8 +8,8 @@
..()
new /obj/item/storage/firstaid/regular(src)
new /obj/item/storage/box/handcuffs(src)
- new /obj/item/device/aicard(src)
- new /obj/item/device/assembly/flash/handheld(src)
+ new /obj/item/aicard(src)
+ new /obj/item/assembly/flash/handheld(src)
if(prob(50))
new /obj/item/ammo_box/magazine/m50(src)
new /obj/item/ammo_box/magazine/m50(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index 51f2c96c3a..eb764fc230 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -12,7 +12,7 @@
new /obj/item/storage/backpack(src)
else
new /obj/item/storage/backpack/satchel(src)
- new /obj/item/device/radio/headset( src )
+ new /obj/item/radio/headset( src )
/obj/structure/closet/secure_closet/personal/patient
name = "patient's closet"
@@ -28,8 +28,8 @@
/obj/structure/closet/secure_closet/personal/cabinet/PopulateContents()
new /obj/item/storage/backpack/satchel/leather/withwallet( src )
- new /obj/item/device/instrument/piano_synth(src)
- new /obj/item/device/radio/headset( src )
+ new /obj/item/instrument/piano_synth(src)
+ new /obj/item/radio/headset( src )
/obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params)
var/obj/item/card/id/I = W.GetID()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
index a88fe3d450..5de453beb0 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
@@ -15,14 +15,14 @@
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/cartridge/rd(src)
new /obj/item/clothing/gloves/color/latex(src)
- new /obj/item/device/radio/headset/heads/rd(src)
+ new /obj/item/radio/headset/heads/rd(src)
new /obj/item/tank/internals/air(src)
new /obj/item/clothing/mask/gas(src)
- new /obj/item/device/megaphone/command(src)
+ new /obj/item/megaphone/command(src)
new /obj/item/storage/lockbox/medal/sci(src)
new /obj/item/clothing/suit/armor/reactive/teleport(src)
- new /obj/item/device/assembly/flash/handheld(src)
- new /obj/item/device/laser_pointer(src)
+ new /obj/item/assembly/flash/handheld(src)
+ new /obj/item/laser_pointer(src)
new /obj/item/door_remote/research_director(src)
new /obj/item/storage/box/firingpins(src)
new /obj/item/circuitboard/machine/techfab/department/science(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 660526d3d3..4ce98bec52 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -23,8 +23,8 @@
new /obj/item/clothing/head/crown/fancy(src)
new /obj/item/cartridge/captain(src)
new /obj/item/storage/box/silver_ids(src)
- new /obj/item/device/radio/headset/heads/captain/alt(src)
- new /obj/item/device/radio/headset/heads/captain(src)
+ new /obj/item/radio/headset/heads/captain/alt(src)
+ new /obj/item/radio/headset/heads/captain(src)
new /obj/item/clothing/glasses/sunglasses/gar/supergar(src)
new /obj/item/clothing/gloves/color/captain(src)
new /obj/item/restraints/handcuffs/cable/zipties(src)
@@ -44,13 +44,13 @@
new /obj/item/clothing/under/rank/head_of_personnel(src)
new /obj/item/clothing/head/hopcap(src)
new /obj/item/cartridge/hop(src)
- new /obj/item/device/radio/headset/heads/hop(src)
+ new /obj/item/radio/headset/heads/hop(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/storage/box/ids(src)
new /obj/item/storage/box/ids(src)
- new /obj/item/device/megaphone/command(src)
+ new /obj/item/megaphone/command(src)
new /obj/item/clothing/suit/armor/vest/alt(src)
- new /obj/item/device/assembly/flash/handheld(src)
+ new /obj/item/assembly/flash/handheld(src)
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/restraints/handcuffs/cable/zipties(src)
new /obj/item/gun/energy/e_gun(src)
@@ -68,7 +68,7 @@
..()
new /obj/item/clothing/neck/cloak/hos(src)
new /obj/item/cartridge/hos(src)
- new /obj/item/device/radio/headset/heads/hos(src)
+ new /obj/item/radio/headset/heads/hos(src)
new /obj/item/clothing/under/hosparadefem(src)
new /obj/item/clothing/under/hosparademale(src)
new /obj/item/clothing/suit/armor/vest/leather(src)
@@ -79,7 +79,7 @@
new /obj/item/clothing/glasses/hud/security/sunglasses/gars/supergars(src)
new /obj/item/clothing/under/rank/head_of_security/grey(src)
new /obj/item/storage/lockbox/medal/sec(src)
- new /obj/item/device/megaphone/sec(src)
+ new /obj/item/megaphone/sec(src)
new /obj/item/holosign_creator/security(src)
new /obj/item/storage/lockbox/loyalty(src)
new /obj/item/clothing/mask/gas/sechailer/swat(src)
@@ -87,7 +87,7 @@
new /obj/item/shield/riot/tele(src)
new /obj/item/storage/belt/security/full(src)
new /obj/item/gun/energy/e_gun/hos(src)
- new /obj/item/device/flashlight/seclite(src)
+ new /obj/item/flashlight/seclite(src)
new /obj/item/pinpointer/nuke(src)
new /obj/item/circuitboard/machine/techfab/department/security(src)
@@ -98,7 +98,7 @@
/obj/structure/closet/secure_closet/warden/PopulateContents()
..()
- new /obj/item/device/radio/headset/headset_sec(src)
+ new /obj/item/radio/headset/headset_sec(src)
new /obj/item/clothing/suit/armor/vest/warden(src)
new /obj/item/clothing/head/warden(src)
new /obj/item/clothing/head/beret/sec/navywarden(src)
@@ -110,7 +110,7 @@
new /obj/item/storage/box/zipties(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/belt/security/full(src)
- new /obj/item/device/flashlight/seclite(src)
+ new /obj/item/flashlight/seclite(src)
new /obj/item/clothing/gloves/krav_maga/sec(src)
new /obj/item/door_remote/head_of_security(src)
new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src)
@@ -124,10 +124,10 @@
..()
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/head/helmet/sec(src)
- new /obj/item/device/radio/headset/headset_sec(src)
- new /obj/item/device/radio/headset/headset_sec/alt(src)
+ new /obj/item/radio/headset/headset_sec(src)
+ new /obj/item/radio/headset/headset_sec/alt(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
- new /obj/item/device/flashlight/seclite(src)
+ new /obj/item/flashlight/seclite(src)
/obj/structure/closet/secure_closet/security/sec
@@ -140,28 +140,28 @@
/obj/structure/closet/secure_closet/security/cargo/PopulateContents()
..()
new /obj/item/clothing/accessory/armband/cargo(src)
- new /obj/item/device/encryptionkey/headset_cargo(src)
+ new /obj/item/encryptionkey/headset_cargo(src)
/obj/structure/closet/secure_closet/security/engine
/obj/structure/closet/secure_closet/security/engine/PopulateContents()
..()
new /obj/item/clothing/accessory/armband/engine(src)
- new /obj/item/device/encryptionkey/headset_eng(src)
+ new /obj/item/encryptionkey/headset_eng(src)
/obj/structure/closet/secure_closet/security/science
/obj/structure/closet/secure_closet/security/science/PopulateContents()
..()
new /obj/item/clothing/accessory/armband/science(src)
- new /obj/item/device/encryptionkey/headset_sci(src)
+ new /obj/item/encryptionkey/headset_sci(src)
/obj/structure/closet/secure_closet/security/med
/obj/structure/closet/secure_closet/security/med/PopulateContents()
..()
new /obj/item/clothing/accessory/armband/medblue(src)
- new /obj/item/device/encryptionkey/headset_med(src)
+ new /obj/item/encryptionkey/headset_med(src)
/obj/structure/closet/secure_closet/detective
name = "\proper detective's cabinet"
@@ -182,9 +182,9 @@
new /obj/item/clothing/head/fedora(src)
new /obj/item/clothing/shoes/laceup(src)
new /obj/item/storage/box/evidence(src)
- new /obj/item/device/radio/headset/headset_sec(src)
- new /obj/item/device/detective_scanner(src)
- new /obj/item/device/flashlight/seclite(src)
+ new /obj/item/radio/headset/headset_sec(src)
+ new /obj/item/detective_scanner(src)
+ new /obj/item/flashlight/seclite(src)
new /obj/item/holosign_creator/security(src)
new /obj/item/reagent_containers/spray/pepper(src)
new /obj/item/clothing/suit/armor/vest/det_suit(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index 14805dd506..2214869098 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -10,7 +10,7 @@
..()
new /obj/item/clothing/under/syndicate(src)
new /obj/item/clothing/shoes/sneakers/black(src)
- new /obj/item/device/radio/headset/syndicate(src)
+ new /obj/item/radio/headset/syndicate(src)
new /obj/item/ammo_box/magazine/m10mm(src)
new /obj/item/storage/belt/military(src)
new /obj/item/crowbar/red(src)
@@ -25,7 +25,7 @@
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/box/teargas(src)
new /obj/item/storage/backpack/duffelbag/syndie/med(src)
- new /obj/item/device/pda/syndicate(src)
+ new /obj/item/pda/syndicate(src)
/obj/structure/closet/syndicate/resources
desc = "An old, dusty locker."
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index 49a9621fba..7ee0f4dc24 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -73,7 +73,7 @@
/obj/structure/closet/firecloset/full/PopulateContents()
new /obj/item/clothing/suit/fire/firefighter(src)
new /obj/item/clothing/mask/gas(src)
- new /obj/item/device/flashlight(src)
+ new /obj/item/flashlight(src)
new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/extinguisher(src)
new /obj/item/clothing/head/hardhat/red(src)
@@ -92,7 +92,7 @@
if(prob(40))
new /obj/item/clothing/suit/hazardvest(src)
if(prob(70))
- new /obj/item/device/flashlight(src)
+ new /obj/item/flashlight(src)
if(prob(70))
new /obj/item/screwdriver(src)
if(prob(70))
@@ -104,7 +104,7 @@
if(prob(70))
new /obj/item/wirecutters(src)
if(prob(70))
- new /obj/item/device/t_scanner(src)
+ new /obj/item/t_scanner(src)
if(prob(20))
new /obj/item/storage/belt/utility(src)
if(prob(30))
@@ -114,7 +114,7 @@
if(prob(30))
new /obj/item/stack/cable_coil/random(src)
if(prob(20))
- new /obj/item/device/multitool(src)
+ new /obj/item/multitool(src)
if(prob(5))
new /obj/item/clothing/gloves/color/yellow(src)
if(prob(40))
@@ -132,7 +132,7 @@
/obj/structure/closet/radiation/PopulateContents()
..()
- new /obj/item/device/geiger_counter(src)
+ new /obj/item/geiger_counter(src)
new /obj/item/clothing/suit/radiation(src)
new /obj/item/clothing/head/radiation(src)
diff --git a/code/game/objects/structures/crates_lockers/crates/wooden.dm b/code/game/objects/structures/crates_lockers/crates/wooden.dm
index e5b950d65f..09d176783a 100644
--- a/code/game/objects/structures/crates_lockers/crates/wooden.dm
+++ b/code/game/objects/structures/crates_lockers/crates/wooden.dm
@@ -11,7 +11,7 @@
/obj/structure/closet/crate/wooden/toy/PopulateContents()
. = ..()
- new /obj/item/device/megaphone/clown(src)
+ new /obj/item/megaphone/clown(src)
new /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter(src)
new /obj/item/pneumatic_cannon/pie(src)
new /obj/item/reagent_containers/food/snacks/pie/cream(src)
diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm
index 07341d89e3..0c84c4cf63 100644
--- a/code/game/objects/structures/fireaxe.dm
+++ b/code/game/objects/structures/fireaxe.dm
@@ -22,7 +22,7 @@
return ..()
/obj/structure/fireaxecabinet/attackby(obj/item/I, mob/user, params)
- if(iscyborg(user) || istype(I, /obj/item/device/multitool))
+ if(iscyborg(user) || istype(I, /obj/item/multitool))
toggle_lock(user)
else if(istype(I, /obj/item/weldingtool) && user.a_intent == INTENT_HELP && !broken)
if(obj_integrity < max_integrity)
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 2a396f583e..7fbc9ee078 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -314,7 +314,7 @@
name = "Hotel Staff"
uniform = /obj/item/clothing/under/assistantformal
shoes = /obj/item/clothing/shoes/laceup
- r_pocket = /obj/item/device/radio/off
+ r_pocket = /obj/item/radio/off
back = /obj/item/storage/backpack
implants = list(/obj/item/implant/mindshield)
@@ -387,7 +387,7 @@
name = "Demonic Friend"
uniform = /obj/item/clothing/under/assistantformal
shoes = /obj/item/clothing/shoes/laceup
- r_pocket = /obj/item/device/radio/off
+ r_pocket = /obj/item/radio/off
back = /obj/item/storage/backpack
implants = list(/obj/item/implant/mindshield) //No revolutionaries, he's MY friend.
id = /obj/item/card/id
@@ -406,7 +406,7 @@
uniform = /obj/item/clothing/under/syndicate
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
- ears = /obj/item/device/radio/headset/syndicate/alt
+ ears = /obj/item/radio/headset/syndicate/alt
back = /obj/item/storage/backpack
implants = list(/obj/item/implant/weapons_auth)
id = /obj/item/card/id/syndicate
@@ -482,7 +482,7 @@
shoes = /obj/item/clothing/shoes/jackboots
id = /obj/item/card/id/away/old/sec
r_pocket = /obj/item/restraints/handcuffs
- l_pocket = /obj/item/device/assembly/flash/handheld
+ l_pocket = /obj/item/assembly/flash/handheld
assignedrole = "Ancient Crew"
/obj/effect/mob_spawn/human/oldsec/Destroy()
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index 63f4578187..4c588395df 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -11,7 +11,7 @@
var/obj/item/storage/bag/trash/mybag = null
var/obj/item/mop/mymop = null
var/obj/item/reagent_containers/spray/cleaner/myspray = null
- var/obj/item/device/lightreplacer/myreplacer = null
+ var/obj/item/lightreplacer/myreplacer = null
var/signs = 0
var/const/max_signs = 4
@@ -64,9 +64,9 @@
update_icon()
else
to_chat(user, fail_msg)
- else if(istype(I, /obj/item/device/lightreplacer))
+ else if(istype(I, /obj/item/lightreplacer))
if(!myreplacer)
- var/obj/item/device/lightreplacer/l=I
+ var/obj/item/lightreplacer/l=I
l.janicart_insert(user,src)
else
to_chat(user, fail_msg)
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 8a90bfe2ad..749717b358 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -255,7 +255,7 @@
tile.MakeSlippery(TURF_WET_WATER, min_wet_time = 5 SECONDS, wet_time_to_add = 1 SECONDS)
/obj/machinery/shower/attackby(obj/item/I, mob/user, params)
- if(I.type == /obj/item/device/analyzer)
+ if(I.type == /obj/item/analyzer)
to_chat(user, "The water temperature seems to be [watertemp].")
else
return ..()
diff --git a/code/game/say.dm b/code/game/say.dm
index 817238f427..4fb67cb7c6 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -166,7 +166,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
/atom/movable/virtualspeaker
var/job
var/atom/movable/source
- var/obj/item/device/radio/radio
+ var/obj/item/radio/radio
INITIALIZE_IMMEDIATE(/atom/movable/virtualspeaker)
/atom/movable/virtualspeaker/Initialize(mapload, atom/movable/M, radio)
diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm
index 09710e30a2..9928f9cdc5 100644
--- a/code/game/turfs/simulated/minerals.dm
+++ b/code/game/turfs/simulated/minerals.dm
@@ -437,7 +437,7 @@
. = ..()
/turf/closed/mineral/gibtonite/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner) && stage == 1)
+ if(istype(I, /obj/item/mining_scanner) || istype(I, /obj/item/t_scanner/adv_mining_scanner) && stage == 1)
user.visible_message("[user] holds [I] to [src]...", "You use [I] to locate where to cut off the chain reaction and attempt to stop it...")
defuse()
..()
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 2dc99a5a59..f559c420c6 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -209,8 +209,8 @@
place_poster(W,user)
return TRUE
//wall mounted IC assembly stuff
- else if(istype(W, /obj/item/device/electronic_assembly/wallmount))
- var/obj/item/device/electronic_assembly/wallmount/A = W
+ else if(istype(W, /obj/item/electronic_assembly/wallmount))
+ var/obj/item/electronic_assembly/wallmount/A = W
A.mount_assembly(src, user)
return TRUE
diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm
index 51ffa539dc..ff49944dc4 100644
--- a/code/modules/admin/create_object.dm
+++ b/code/modules/admin/create_object.dm
@@ -16,7 +16,7 @@
/datum/admins/proc/quick_create_object(mob/user)
var/static/list/create_object_forms = list(
/obj, /obj/structure, /obj/machinery, /obj/effect,
- /obj/item, /obj/item/clothing, /obj/item/stack, /obj/item/device,
+ /obj/item, /obj/item/clothing, /obj/item/stack, /obj/item,
/obj/item/reagent_containers, /obj/item/gun)
var/path = input("Select the path of the object you wish to create.", "Path", /obj) in create_object_forms
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index a9b1b10606..95dae05c09 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1804,7 +1804,7 @@
if(!istype(H))
to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
return
- if(!istype(H.ears, /obj/item/device/radio/headset))
+ if(!istype(H.ears, /obj/item/radio/headset))
to_chat(usr, "The person you are trying to contact is not wearing a headset.")
return
@@ -1823,7 +1823,7 @@
if(!istype(H))
to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human.")
return
- if(!istype(H.ears, /obj/item/device/radio/headset))
+ if(!istype(H.ears, /obj/item/radio/headset))
to_chat(usr, "The person you are trying to contact is not wearing a headset.")
return
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 9460e71ea0..7d4d5fa05e 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -308,7 +308,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
var/confirm = input("[choice.key] isn't ghosting right now. Are you sure you want to yank him out of them out of their body and place them in this pAI?", "Spawn pAI Confirmation", "No") in list("Yes", "No")
if(confirm != "Yes")
return 0
- var/obj/item/device/paicard/card = new(T)
+ var/obj/item/paicard/card = new(T)
var/mob/living/silicon/pai/pai = new(card)
pai.name = input(choice, "Enter your pAI name:", "pAI Name", "Personal AI") as text
pai.real_name = pai.name
@@ -357,7 +357,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
var/typename = "[type]"
var/static/list/TYPES_SHORTCUTS = list(
/obj/effect/decal/cleanable = "CLEANABLE",
- /obj/item/device/radio/headset = "HEADSET",
+ /obj/item/radio/headset = "HEADSET",
/obj/item/clothing/head/helmet/space = "SPESSHELMET",
/obj/item/book/manual = "MANUAL",
/obj/item/reagent_containers/food/drinks = "DRINK", //longest paths comes first
@@ -466,8 +466,8 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
id.update_label()
if(worn)
- if(istype(worn, /obj/item/device/pda))
- var/obj/item/device/pda/PDA = worn
+ if(istype(worn, /obj/item/pda))
+ var/obj/item/pda/PDA = worn
PDA.id = id
id.forceMove(PDA)
else if(istype(worn, /obj/item/storage/wallet))
@@ -626,7 +626,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
areas_with_LS.Add(A.type)
CHECK_TICK
- for(var/obj/item/device/radio/intercom/I in GLOB.machines)
+ for(var/obj/item/radio/intercom/I in GLOB.machines)
var/area/A = get_area(I)
if(!A)
dat += "Skipped over [I] in invalid location, [I.loc].
"
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index 745dd05749..c62ee34dac 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -136,7 +136,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
qdel(M)
if(intercom_range_display_status)
- for(var/obj/item/device/radio/intercom/I in world)
+ for(var/obj/item/radio/intercom/I in world)
for(var/turf/T in orange(7,I))
var/obj/effect/debugging/marker/F = new/obj/effect/debugging/marker(T)
if (!(F in view(7,I.loc)))
diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
index 72049ad7d1..d14c749992 100644
--- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm
+++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
@@ -16,7 +16,7 @@
armor = list("melee" = 15, "bullet" = 15, "laser" = 15, "energy" = 15, "bomb" = 15, "bio" = 15, "rad" = 15, "fire" = 70, "acid" = 70)
actions_types = list(/datum/action/item_action/hands_free/activate)
allowed = list(
- /obj/item/device/abductor,
+ /obj/item/abductor,
/obj/item/abductor_baton,
/obj/item/melee/baton,
/obj/item/gun/energy,
@@ -129,16 +129,16 @@
. = ..()
-/obj/item/device/abductor
+/obj/item/abductor
icon = 'icons/obj/abductor.dmi'
-/obj/item/device/abductor/proc/AbductorCheck(user)
+/obj/item/abductor/proc/AbductorCheck(user)
if(isabductor(user))
return TRUE
to_chat(user, "You can't figure how this works!")
return FALSE
-/obj/item/device/abductor/proc/ScientistCheck(user)
+/obj/item/abductor/proc/ScientistCheck(user)
if(!AbductorCheck(user))
return FALSE
@@ -149,7 +149,7 @@
to_chat(user, "You're not trained to use this!")
return FALSE
-/obj/item/device/abductor/gizmo
+/obj/item/abductor/gizmo
name = "science tool"
desc = "A dual-mode tool for retrieving specimens and scanning appearances. Scanning can be done through cameras."
icon_state = "gizmo_scan"
@@ -160,7 +160,7 @@
var/mob/living/marked = null
var/obj/machinery/abductor/console/console
-/obj/item/device/abductor/gizmo/attack_self(mob/user)
+/obj/item/abductor/gizmo/attack_self(mob/user)
if(!ScientistCheck(user))
return
if(!console)
@@ -175,7 +175,7 @@
icon_state = "gizmo_scan"
to_chat(user, "You switch the device to [mode==GIZMO_SCAN? "SCAN": "MARK"] MODE")
-/obj/item/device/abductor/gizmo/attack(mob/living/M, mob/user)
+/obj/item/abductor/gizmo/attack(mob/living/M, mob/user)
if(!ScientistCheck(user))
return
if(!console)
@@ -189,7 +189,7 @@
mark(M, user)
-/obj/item/device/abductor/gizmo/afterattack(atom/target, mob/living/user, flag, params)
+/obj/item/abductor/gizmo/afterattack(atom/target, mob/living/user, flag, params)
if(flag)
return
if(!ScientistCheck(user))
@@ -204,12 +204,12 @@
if(GIZMO_MARK)
mark(target, user)
-/obj/item/device/abductor/gizmo/proc/scan(atom/target, mob/living/user)
+/obj/item/abductor/gizmo/proc/scan(atom/target, mob/living/user)
if(ishuman(target))
console.AddSnapshot(target)
to_chat(user, "You scan [target] and add them to the database.")
-/obj/item/device/abductor/gizmo/proc/mark(atom/target, mob/living/user)
+/obj/item/abductor/gizmo/proc/mark(atom/target, mob/living/user)
if(marked == target)
to_chat(user, "This specimen is already marked!")
return
@@ -222,7 +222,7 @@
else
prepare(target,user)
-/obj/item/device/abductor/gizmo/proc/prepare(atom/target, mob/living/user)
+/obj/item/abductor/gizmo/proc/prepare(atom/target, mob/living/user)
if(get_dist(target,user)>1)
to_chat(user, "You need to be next to the specimen to prepare it for transport!")
return
@@ -231,13 +231,13 @@
marked = target
to_chat(user, "You finish preparing [target] for transport.")
-/obj/item/device/abductor/gizmo/Destroy()
+/obj/item/abductor/gizmo/Destroy()
if(console)
console.gizmo = null
. = ..()
-/obj/item/device/abductor/silencer
+/obj/item/abductor/silencer
name = "abductor silencer"
desc = "A compact device used to shut down communications equipment."
icon_state = "silencer"
@@ -245,19 +245,19 @@
lefthand_file = 'icons/mob/inhands/antag/abductor_lefthand.dmi'
righthand_file = 'icons/mob/inhands/antag/abductor_righthand.dmi'
-/obj/item/device/abductor/silencer/attack(mob/living/M, mob/user)
+/obj/item/abductor/silencer/attack(mob/living/M, mob/user)
if(!AbductorCheck(user))
return
radio_off(M, user)
-/obj/item/device/abductor/silencer/afterattack(atom/target, mob/living/user, flag, params)
+/obj/item/abductor/silencer/afterattack(atom/target, mob/living/user, flag, params)
if(flag)
return
if(!AbductorCheck(user))
return
radio_off(target, user)
-/obj/item/device/abductor/silencer/proc/radio_off(atom/target, mob/living/user)
+/obj/item/abductor/silencer/proc/radio_off(atom/target, mob/living/user)
if( !(user in (viewers(7,target))) )
return
@@ -270,17 +270,17 @@
to_chat(user, "You silence [M]'s radio devices.")
radio_off_mob(M)
-/obj/item/device/abductor/silencer/proc/radio_off_mob(mob/living/carbon/human/M)
+/obj/item/abductor/silencer/proc/radio_off_mob(mob/living/carbon/human/M)
var/list/all_items = M.GetAllContents()
for(var/obj/I in all_items)
- if(istype(I, /obj/item/device/radio/))
- var/obj/item/device/radio/r = I
+ if(istype(I, /obj/item/radio/))
+ var/obj/item/radio/r = I
r.listening = 0
- if(!istype(I, /obj/item/device/radio/headset))
+ if(!istype(I, /obj/item/radio/headset))
r.broadcasting = 0 //goddamned headset hacks
-/obj/item/device/abductor/mind_device
+/obj/item/abductor/mind_device
name = "mental interface device"
desc = "A dual-mode tool for directly communicating with sentient brains. It can be used to send a direct message to a target, \
or to send a command to a test subject with a charged gland."
@@ -290,7 +290,7 @@
righthand_file = 'icons/mob/inhands/antag/abductor_righthand.dmi'
var/mode = MIND_DEVICE_MESSAGE
-/obj/item/device/abductor/mind_device/attack_self(mob/user)
+/obj/item/abductor/mind_device/attack_self(mob/user)
if(!ScientistCheck(user))
return
@@ -302,7 +302,7 @@
icon_state = "mind_device_message"
to_chat(user, "You switch the device to [mode==MIND_DEVICE_MESSAGE? "TRANSMISSION": "COMMAND"] MODE")
-/obj/item/device/abductor/mind_device/afterattack(atom/target, mob/living/user, flag, params)
+/obj/item/abductor/mind_device/afterattack(atom/target, mob/living/user, flag, params)
if(!ScientistCheck(user))
return
@@ -312,7 +312,7 @@
if(MIND_DEVICE_MESSAGE)
mind_message(target, user)
-/obj/item/device/abductor/mind_device/proc/mind_control(atom/target, mob/living/user)
+/obj/item/abductor/mind_device/proc/mind_control(atom/target, mob/living/user)
if(iscarbon(target))
var/mob/living/carbon/C = target
var/obj/item/organ/heart/gland/G = C.getorganslot("heart")
@@ -345,7 +345,7 @@
G.mind_control(command, user)
to_chat(user, "You send the command to your target.")
-/obj/item/device/abductor/mind_device/proc/mind_message(atom/target, mob/living/user)
+/obj/item/abductor/mind_device/proc/mind_message(atom/target, mob/living/user)
if(isliving(target))
var/mob/living/L = target
if(L.stat == DEAD)
@@ -362,7 +362,7 @@
log_talk(user,"[key_name(user)] sent an abductor mind message to [L]/[L.ckey]: '[message]'", LOGSAY)
-/obj/item/device/firing_pin/abductor
+/obj/item/firing_pin/abductor
name = "alien firing pin"
icon_state = "firing_pin_ayy"
desc = "This firing pin is slimy and warm; you can swear you feel it \
@@ -370,14 +370,14 @@
fail_message = "\
Firing error, please contact Command."
-/obj/item/device/firing_pin/abductor/pin_auth(mob/living/user)
+/obj/item/firing_pin/abductor/pin_auth(mob/living/user)
. = isabductor(user)
/obj/item/gun/energy/alien
name = "alien pistol"
desc = "A complicated gun that fires bursts of high-intensity radiation."
ammo_type = list(/obj/item/ammo_casing/energy/declone)
- pin = /obj/item/device/firing_pin/abductor
+ pin = /obj/item/firing_pin/abductor
icon_state = "alienpistol"
item_state = "alienpistol"
trigger_guard = TRIGGER_GUARD_ALLOW_ALL
@@ -613,20 +613,20 @@ Congratulations! You are now trained for invasive xenobiology research!"}
if(BATON_PROBE)
to_chat(user, "The baton is in probing mode.")
-/obj/item/device/radio/headset/abductor
+/obj/item/radio/headset/abductor
name = "alien headset"
desc = "An advanced alien headset designed to monitor communications of human space stations. Why does it have a microphone? No one knows."
icon = 'icons/obj/abductor.dmi'
icon_state = "abductor_headset"
item_state = "abductor_headset"
- keyslot2 = new /obj/item/device/encryptionkey/heads/captain
+ keyslot2 = new /obj/item/encryptionkey/heads/captain
flags_2 = BANG_PROTECT_2
-/obj/item/device/radio/headset/abductor/Initialize(mapload)
+/obj/item/radio/headset/abductor/Initialize(mapload)
. = ..()
make_syndie()
-/obj/item/device/radio/headset/abductor/attackby(obj/item/W, mob/user, params)
+/obj/item/radio/headset/abductor/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/screwdriver))
return // Stops humans from disassembling abductor headsets.
return ..()
diff --git a/code/modules/antagonists/abductor/equipment/abduction_outfits.dm b/code/modules/antagonists/abductor/equipment/abduction_outfits.dm
index e01afccc5b..8b8851ec18 100644
--- a/code/modules/antagonists/abductor/equipment/abduction_outfits.dm
+++ b/code/modules/antagonists/abductor/equipment/abduction_outfits.dm
@@ -3,7 +3,7 @@
uniform = /obj/item/clothing/under/color/grey //they're greys gettit
shoes = /obj/item/clothing/shoes/combat
back = /obj/item/storage/backpack
- ears = /obj/item/device/radio/headset/abductor
+ ears = /obj/item/radio/headset/abductor
/datum/outfit/abductor/proc/link_to_console(mob/living/carbon/human/H, team_number)
var/datum/antagonist/abductor/A = H.mind.has_antag_datum(/datum/antagonist/abductor)
@@ -21,7 +21,7 @@
var/obj/item/storage/backpack/B = locate() in H
if(B)
- for(var/obj/item/device/abductor/gizmo/G in B.contents)
+ for(var/obj/item/abductor/gizmo/G in B.contents)
console.AddGizmo(G)
/datum/outfit/abductor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -39,14 +39,14 @@
backpack_contents = list(
/obj/item/gun/energy/alien = 1,
- /obj/item/device/abductor/silencer = 1
+ /obj/item/abductor/silencer = 1
)
/datum/outfit/abductor/scientist
name = "Abductor Scientist"
backpack_contents = list(
- /obj/item/device/abductor/gizmo = 1
+ /obj/item/abductor/gizmo = 1
)
/datum/outfit/abductor/scientist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
diff --git a/code/modules/antagonists/abductor/machinery/console.dm b/code/modules/antagonists/abductor/machinery/console.dm
index 1b11094d43..08776318c8 100644
--- a/code/modules/antagonists/abductor/machinery/console.dm
+++ b/code/modules/antagonists/abductor/machinery/console.dm
@@ -18,7 +18,7 @@
icon_state = "console"
density = TRUE
anchored = TRUE
- var/obj/item/device/abductor/gizmo/gizmo
+ var/obj/item/abductor/gizmo/gizmo
var/obj/item/clothing/suit/armor/abductor/vest/vest
var/obj/machinery/abductor/experiment/experiment
var/obj/machinery/abductor/pad/pad
@@ -106,13 +106,13 @@
if("helmet")
Dispense(/obj/item/clothing/head/helmet/abductor)
if("silencer")
- Dispense(/obj/item/device/abductor/silencer)
+ Dispense(/obj/item/abductor/silencer)
if("tool")
- Dispense(/obj/item/device/abductor/gizmo)
+ Dispense(/obj/item/abductor/gizmo)
if("vest")
Dispense(/obj/item/clothing/suit/armor/abductor/vest)
if("mind_device")
- Dispense(/obj/item/device/abductor/mind_device,cost=2)
+ Dispense(/obj/item/abductor/mind_device,cost=2)
updateUsrDialog()
/obj/machinery/abductor/console/proc/TeleporterRetrieve()
@@ -181,7 +181,7 @@
return
disguises[entry.name] = entry
-/obj/machinery/abductor/console/proc/AddGizmo(obj/item/device/abductor/gizmo/G)
+/obj/machinery/abductor/console/proc/AddGizmo(obj/item/abductor/gizmo/G)
if(G == gizmo && G.console == src)
return FALSE
@@ -205,7 +205,7 @@
return TRUE
/obj/machinery/abductor/console/attackby(obj/O, mob/user, params)
- if(istype(O, /obj/item/device/abductor/gizmo) && AddGizmo(O))
+ if(istype(O, /obj/item/abductor/gizmo) && AddGizmo(O))
to_chat(user, "You link the tool to the console.")
else if(istype(O, /obj/item/clothing/suit/armor/abductor/vest) && AddVest(O))
to_chat(user, "You link the vest to the console.")
diff --git a/code/modules/antagonists/blob/blob/theblob.dm b/code/modules/antagonists/blob/blob/theblob.dm
index e57ce9d1d9..6fda7df130 100644
--- a/code/modules/antagonists/blob/blob/theblob.dm
+++ b/code/modules/antagonists/blob/blob/theblob.dm
@@ -227,7 +227,7 @@
return 15
/obj/structure/blob/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/device/analyzer))
+ if(istype(I, /obj/item/analyzer))
user.changeNext_move(CLICK_CD_MELEE)
to_chat(user, "The analyzer beeps once, then reports:
")
SEND_SOUND(user, sound('sound/machines/ping.ogg'))
diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm
index e3fb55fa42..fc98d3182d 100644
--- a/code/modules/antagonists/changeling/powers/mutations.dm
+++ b/code/modules/antagonists/changeling/powers/mutations.dm
@@ -446,7 +446,7 @@
icon_state = "lingspacesuit"
desc = "A huge, bulky mass of pressure and temperature-resistant organic tissue, evolved to facilitate space travel."
flags_1 = STOPSPRESSUREDMAGE_1 | NODROP_1 | DROPDEL_1 //Not THICKMATERIAL_1 because it's organic tissue, so if somebody tries to inject something into it, it still ends up in your blood. (also balance but muh fluff)
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/oxygen)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/oxygen)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90) //No armor at all.
/obj/item/clothing/suit/space/changeling/Initialize()
diff --git a/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm b/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm
index 44c86c7b78..e318126caf 100644
--- a/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm
+++ b/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm
@@ -72,6 +72,6 @@
var/mob/living/L = AM
L.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/static)
L.clear_fullscreen("flash", 5)
- var/obj/item/device/transfer_valve/TTV = locate() in L.GetAllContents()
+ var/obj/item/transfer_valve/TTV = locate() in L.GetAllContents()
if(TTV)
to_chat(L, "The air resonates with the Ark's presence; your explosives will be significantly dampened here!")
diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm
index 8b018fa6d3..77bfbf4f3b 100644
--- a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm
+++ b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm
@@ -68,7 +68,7 @@
heat_protection = CHEST|GROIN|LEGS
resistance_flags = FIRE_PROOF | ACID_PROOF
armor = list("melee" = 60, "bullet" = 70, "laser" = -25, "energy" = 0, "bomb" = 60, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
- allowed = list(/obj/item/clockwork, /obj/item/clothing/glasses/wraith_spectacles, /obj/item/clothing/glasses/judicial_visor, /obj/item/device/mmi/posibrain/soul_vessel)
+ allowed = list(/obj/item/clockwork, /obj/item/clothing/glasses/wraith_spectacles, /obj/item/clothing/glasses/judicial_visor, /obj/item/mmi/posibrain/soul_vessel)
/obj/item/clothing/suit/armor/clockwork/Initialize()
. = ..()
diff --git a/code/modules/antagonists/clockcult/clock_items/soul_vessel.dm b/code/modules/antagonists/clockcult/clock_items/soul_vessel.dm
index 48466238a7..55eb0f568a 100644
--- a/code/modules/antagonists/clockcult/clock_items/soul_vessel.dm
+++ b/code/modules/antagonists/clockcult/clock_items/soul_vessel.dm
@@ -1,5 +1,5 @@
//Soul vessel: An ancient positronic brain that serves only Ratvar.
-/obj/item/device/mmi/posibrain/soul_vessel
+/obj/item/mmi/posibrain/soul_vessel
name = "soul vessel"
desc = "A heavy brass cube, three inches to a side, with a single protruding cogwheel."
var/clockwork_desc = "A soul vessel, an ancient relic that can attract the souls of the damned or simply rip a mind from an unconscious or dead human.\n\
@@ -25,35 +25,35 @@
force_replace_ai_name = TRUE
overrides_aicore_laws = TRUE
-/obj/item/device/mmi/posibrain/soul_vessel/Initialize()
+/obj/item/mmi/posibrain/soul_vessel/Initialize()
. = ..()
radio.on = FALSE
laws = new /datum/ai_laws/ratvar()
braintype = picked_name
GLOB.all_clockwork_objects += src
-/obj/item/device/mmi/posibrain/soul_vessel/Destroy()
+/obj/item/mmi/posibrain/soul_vessel/Destroy()
GLOB.all_clockwork_objects -= src
return ..()
-/obj/item/device/mmi/posibrain/soul_vessel/examine(mob/user)
+/obj/item/mmi/posibrain/soul_vessel/examine(mob/user)
if((is_servant_of_ratvar(user) || isobserver(user)) && clockwork_desc)
desc = clockwork_desc
..()
desc = initial(desc)
-/obj/item/device/mmi/posibrain/soul_vessel/transfer_personality(mob/candidate)
+/obj/item/mmi/posibrain/soul_vessel/transfer_personality(mob/candidate)
. = ..()
if(.)
add_servant_of_ratvar(brainmob, TRUE)
-/obj/item/device/mmi/posibrain/soul_vessel/attack_self(mob/living/user)
+/obj/item/mmi/posibrain/soul_vessel/attack_self(mob/living/user)
if(!is_servant_of_ratvar(user))
to_chat(user, "You fiddle around with [src], to no avail.")
return FALSE
..()
-/obj/item/device/mmi/posibrain/soul_vessel/attack(mob/living/target, mob/living/carbon/human/user)
+/obj/item/mmi/posibrain/soul_vessel/attack(mob/living/target, mob/living/carbon/human/user)
if(!is_servant_of_ratvar(user) || !ishuman(target))
..()
return
diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm
index 308cd38c80..e929efab2a 100644
--- a/code/modules/antagonists/cult/cult_comms.dm
+++ b/code/modules/antagonists/cult/cult_comms.dm
@@ -178,8 +178,8 @@
playsound(mobloc, 'sound/magic/exit_blood.ogg', 100, 1)
if(B.current != owner)
var/turf/final = pick(destinations)
- if(istype(B.current.loc, /obj/item/device/soulstone))
- var/obj/item/device/soulstone/S = B.current.loc
+ if(istype(B.current.loc, /obj/item/soulstone))
+ var/obj/item/soulstone/S = B.current.loc
S.release_shades(owner)
B.current.setDir(SOUTH)
new /obj/effect/temp_visual/cult/blood(final)
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index 30d150e3ee..a1c16aa078 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -189,12 +189,12 @@
if(ishuman(target))
var/mob/living/carbon/human/H = target
if(H.stat != CONSCIOUS)
- var/obj/item/device/soulstone/SS = new /obj/item/device/soulstone(src)
+ var/obj/item/soulstone/SS = new /obj/item/soulstone(src)
SS.attack(H, user)
if(!LAZYLEN(SS.contents))
qdel(SS)
if(istype(target, /obj/structure/constructshell) && contents.len)
- var/obj/item/device/soulstone/SS = contents[1]
+ var/obj/item/soulstone/SS = contents[1]
if(istype(SS))
SS.transfer_soul("CONSTRUCT",target,user)
qdel(SS)
@@ -484,14 +484,14 @@
color = "#333333"
list_reagents = list("unholywater" = 50)
-/obj/item/device/shuttle_curse
+/obj/item/shuttle_curse
name = "cursed orb"
desc = "You peer within this smokey orb and glimpse terrible fates befalling the escape shuttle."
icon = 'icons/obj/cult.dmi'
icon_state ="shuttlecurse"
var/global/curselimit = 0
-/obj/item/device/shuttle_curse/attack_self(mob/living/user)
+/obj/item/shuttle_curse/attack_self(mob/living/user)
if(!iscultist(user))
user.dropItemToGround(src, TRUE)
user.Knockdown(100)
@@ -538,28 +538,28 @@
priority_announce("[message]", "System Failure", 'sound/misc/notice1.ogg')
curselimit++
-/obj/item/device/cult_shift
+/obj/item/cult_shift
name = "veil shifter"
desc = "This relic instantly teleports you, and anything you're pulling, forward by a moderate distance."
icon = 'icons/obj/cult.dmi'
icon_state ="shifter"
var/uses = 4
-/obj/item/device/cult_shift/examine(mob/user)
+/obj/item/cult_shift/examine(mob/user)
..()
if(uses)
to_chat(user, "It has [uses] use\s remaining.")
else
to_chat(user, "It seems drained.")
-/obj/item/device/cult_shift/proc/handle_teleport_grab(turf/T, mob/user)
+/obj/item/cult_shift/proc/handle_teleport_grab(turf/T, mob/user)
var/mob/living/carbon/C = user
if(C.pulling)
var/atom/movable/pulled = C.pulling
pulled.forceMove(T)
. = pulled
-/obj/item/device/cult_shift/attack_self(mob/user)
+/obj/item/cult_shift/attack_self(mob/user)
if(!uses || !iscarbon(user))
to_chat(user, "\The [src] is dull and unmoving in your hands.")
return
@@ -592,7 +592,7 @@
else
to_chat(C, "The veil cannot be torn here!")
-/obj/item/device/flashlight/flare/culttorch
+/obj/item/flashlight/flare/culttorch
name = "void torch"
desc = "Used by veteran cultists to instantly transport items to their needful bretheren."
w_class = WEIGHT_CLASS_SMALL
@@ -605,7 +605,7 @@
on = TRUE
var/charges = 5
-/obj/item/device/flashlight/flare/culttorch/afterattack(atom/movable/A, mob/user, proximity)
+/obj/item/flashlight/flare/culttorch/afterattack(atom/movable/A, mob/user, proximity)
if(!proximity)
return
if(!iscultist(user))
diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm
index 3e8fda9d45..ed7213f6e4 100644
--- a/code/modules/antagonists/cult/cult_structures.dm
+++ b/code/modules/antagonists/cult/cult_structures.dm
@@ -258,10 +258,10 @@
if("Zealot's Blindfold")
pickedtype += /obj/item/clothing/glasses/hud/health/night/cultblind
if("Shuttle Curse")
- pickedtype += /obj/item/device/shuttle_curse
+ pickedtype += /obj/item/shuttle_curse
if("Veil Walker Set")
- pickedtype += /obj/item/device/cult_shift
- pickedtype += /obj/item/device/flashlight/flare/culttorch
+ pickedtype += /obj/item/cult_shift
+ pickedtype += /obj/item/flashlight/flare/culttorch
if(src && !QDELETED(src) && anchored && pickedtype.len && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time)
cooldowntime = world.time + 2400
for(var/N in pickedtype)
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index 763d9adaa8..4307f65a28 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -299,7 +299,7 @@ structure_check() searches for nearby cultist structures required for the invoca
else
to_chat(M, "\"I accept this meager sacrifice.\"")
- var/obj/item/device/soulstone/stone = new /obj/item/device/soulstone(get_turf(src))
+ var/obj/item/soulstone/stone = new /obj/item/soulstone(get_turf(src))
if(sacrificial.mind && !sacrificial.suiciding)
stone.invisibility = INVISIBILITY_MAXIMUM //so it's not picked up during transfer_soul()
stone.transfer_soul("FORCE", sacrificial, usr)
diff --git a/code/modules/antagonists/highlander/highlander.dm b/code/modules/antagonists/highlander/highlander.dm
index 012527ff7b..84faf34387 100644
--- a/code/modules/antagonists/highlander/highlander.dm
+++ b/code/modules/antagonists/highlander/highlander.dm
@@ -47,7 +47,7 @@
for(var/obj/item/I in H.held_items)
qdel(I)
H.equip_to_slot_or_del(new /obj/item/clothing/under/kilt/highlander(H), slot_w_uniform)
- H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_ears)
+ H.equip_to_slot_or_del(new /obj/item/radio/headset/heads/captain(H), slot_ears)
H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/highlander(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/pinpointer/nuke(H), slot_l_store)
diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
index 931c38d7b9..acf90fb256 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
@@ -5,7 +5,7 @@
GLOBAL_LIST_EMPTY(jam_on_wardec)
-/obj/item/device/nuclear_challenge
+/obj/item/nuclear_challenge
name = "Declaration of War (Challenge Mode)"
icon_state = "gangtool-red"
item_state = "radio"
@@ -15,9 +15,9 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
Such a brazen move will attract the attention of powerful benefactors within the Syndicate, who will supply your team with a massive amount of bonus telecrystals. \
Must be used within five minutes, or your benefactors will lose interest."
var/declaring_war = FALSE
- var/uplink_type = /obj/item/device/radio/uplink/nuclear
+ var/uplink_type = /obj/item/radio/uplink/nuclear
-/obj/item/device/nuclear_challenge/attack_self(mob/living/user)
+/obj/item/nuclear_challenge/attack_self(mob/living/user)
if(!check_allowed(user))
return
@@ -66,7 +66,7 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
qdel(src)
-/obj/item/device/nuclear_challenge/proc/check_allowed(mob/living/user)
+/obj/item/nuclear_challenge/proc/check_allowed(mob/living/user)
if(declaring_war)
to_chat(user, "You are already in the process of declaring war! Make your mind up.")
return FALSE
@@ -86,8 +86,8 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
return FALSE
return TRUE
-/obj/item/device/nuclear_challenge/clownops
- uplink_type = /obj/item/device/radio/uplink/clownop
+/obj/item/nuclear_challenge/clownops
+ uplink_type = /obj/item/radio/uplink/clownop
#undef CHALLENGE_TELECRYSTALS
#undef CHALLENGE_TIME_LIMIT
diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm
index dae760933e..1f77866d76 100644
--- a/code/modules/antagonists/revolution/revolution.dm
+++ b/code/modules/antagonists/revolution/revolution.dm
@@ -112,7 +112,7 @@
/datum/antagonist/rev/head/proc/admin_take_flash(mob/admin)
var/list/L = owner.current.get_contents()
- var/obj/item/device/assembly/flash/flash = locate() in L
+ var/obj/item/assembly/flash/flash = locate() in L
if (!flash)
to_chat(admin, "Deleting flash failed!")
return
@@ -133,7 +133,7 @@
/datum/antagonist/rev/head/proc/admin_repair_flash(mob/admin)
var/list/L = owner.current.get_contents()
- var/obj/item/device/assembly/flash/flash = locate() in L
+ var/obj/item/assembly/flash/flash = locate() in L
if (!flash)
to_chat(admin, "Repairing flash failed!")
else
@@ -232,7 +232,7 @@
H.dna.remove_mutation(CLOWNMUT)
if(give_flash)
- var/obj/item/device/assembly/flash/T = new(H)
+ var/obj/item/assembly/flash/T = new(H)
var/list/slots = list (
"backpack" = slot_in_backpack,
"left pocket" = slot_l_store,
diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm
index 817cbf75c0..8a87191c0d 100644
--- a/code/modules/antagonists/swarmer/swarmer.dm
+++ b/code/modules/antagonists/swarmer/swarmer.dm
@@ -1,5 +1,5 @@
////Deactivated swarmer shell////
-/obj/item/device/deactivated_swarmer
+/obj/item/deactivated_swarmer
name = "deactivated swarmer"
desc = "A shell of swarmer that was completely powered down. It can no longer activate itself."
icon = 'icons/mob/swarmer.dmi'
@@ -45,7 +45,7 @@
user.visible_message("[usr.name] deactivates [src].",
"After some fiddling, you find a way to disable [src]'s power source.",
"You hear clicking.")
- new /obj/item/device/deactivated_swarmer(get_turf(src))
+ new /obj/item/deactivated_swarmer(get_turf(src))
qdel(src)
else
..()
@@ -399,7 +399,7 @@
to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.")
return FALSE
-/obj/item/device/deactivated_swarmer/IntegrateAmount()
+/obj/item/deactivated_swarmer/IntegrateAmount()
return 50
/obj/machinery/hydroponics/soil/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index a2b885f777..e0db2e5905 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -138,7 +138,7 @@
/////////////////////////////////////////Necromantic Stone///////////////////
-/obj/item/device/necromantic_stone
+/obj/item/necromantic_stone
name = "necromantic stone"
desc = "A shard capable of resurrecting humans as skeleton thralls."
icon = 'icons/obj/wizard.dmi'
@@ -150,10 +150,10 @@
var/list/spooky_scaries = list()
var/unlimited = 0
-/obj/item/device/necromantic_stone/unlimited
+/obj/item/necromantic_stone/unlimited
unlimited = 1
-/obj/item/device/necromantic_stone/attack(mob/living/carbon/human/M, mob/living/carbon/human/user)
+/obj/item/necromantic_stone/attack(mob/living/carbon/human/M, mob/living/carbon/human/user)
if(!istype(M))
return ..()
@@ -183,7 +183,7 @@
desc = "A shard capable of resurrecting humans as skeleton thralls[unlimited ? "." : ", [spooky_scaries.len]/3 active thralls."]"
-/obj/item/device/necromantic_stone/proc/check_spooky()
+/obj/item/necromantic_stone/proc/check_spooky()
if(unlimited) //no point, the list isn't used.
return
@@ -199,7 +199,7 @@
listclearnulls(spooky_scaries)
//Funny gimmick, skeletons always seem to wear roman/ancient armour
-/obj/item/device/necromantic_stone/proc/equip_roman_skeleton(mob/living/carbon/human/H)
+/obj/item/necromantic_stone/proc/equip_roman_skeleton(mob/living/carbon/human/H)
for(var/obj/item/I in H)
H.dropItemToGround(I)
diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm
index bea6d41685..c0a328b3ae 100644
--- a/code/modules/antagonists/wizard/equipment/soulstone.dm
+++ b/code/modules/antagonists/wizard/equipment/soulstone.dm
@@ -1,4 +1,4 @@
-/obj/item/device/soulstone
+/obj/item/soulstone
name = "soulstone shard"
icon = 'icons/obj/wizard.dmi'
icon_state = "soulstone"
@@ -14,7 +14,7 @@
var/old_shard = FALSE
var/spent = FALSE
-/obj/item/device/soulstone/proc/was_used()
+/obj/item/soulstone/proc/was_used()
if(old_shard)
spent = TRUE
name = "dull [name]"
@@ -22,20 +22,20 @@
the 'Soul Stone'. The shard lies still, dull and lifeless; \
whatever spark it once held long extinguished."
-/obj/item/device/soulstone/anybody
+/obj/item/soulstone/anybody
usability = 1
-/obj/item/device/soulstone/anybody/chaplain
+/obj/item/soulstone/anybody/chaplain
name = "mysterious old shard"
old_shard = TRUE
-/obj/item/device/soulstone/pickup(mob/living/user)
+/obj/item/soulstone/pickup(mob/living/user)
..()
if(!iscultist(user) && !iswizard(user) && !usability)
to_chat(user, "An overwhelming feeling of dread comes over you as you pick up the soulstone. It would be wise to be rid of this quickly.")
user.Dizzy(120)
-/obj/item/device/soulstone/examine(mob/user)
+/obj/item/soulstone/examine(mob/user)
..()
if(usability || iscultist(user) || iswizard(user) || isobserver(user))
if (old_shard)
@@ -46,14 +46,14 @@
if(spent)
to_chat(user, "This shard is spent; it is now just a creepy rock.")
-/obj/item/device/soulstone/Destroy() //Stops the shade from being qdel'd immediately and their ghost being sent back to the arrival shuttle.
+/obj/item/soulstone/Destroy() //Stops the shade from being qdel'd immediately and their ghost being sent back to the arrival shuttle.
for(var/mob/living/simple_animal/shade/A in src)
A.death()
return ..()
//////////////////////////////Capturing////////////////////////////////////////////////////////
-/obj/item/device/soulstone/attack(mob/living/carbon/human/M, mob/living/user)
+/obj/item/soulstone/attack(mob/living/carbon/human/M, mob/living/user)
if(!iscultist(user) && !iswizard(user) && !usability)
user.Unconscious(100)
to_chat(user, "Your body is wracked with debilitating pain!")
@@ -71,7 +71,7 @@
///////////////////Options for using captured souls///////////////////////////////////////
-/obj/item/device/soulstone/attack_self(mob/living/user)
+/obj/item/soulstone/attack_self(mob/living/user)
if(!in_range(src, user))
return
if(!iscultist(user) && !iswizard(user) && !usability)
@@ -80,7 +80,7 @@
return
release_shades(user)
-/obj/item/device/soulstone/proc/release_shades(mob/user)
+/obj/item/soulstone/proc/release_shades(mob/user)
for(var/mob/living/simple_animal/shade/A in src)
A.status_flags &= ~GODMODE
A.canmove = 1
@@ -111,8 +111,8 @@
to_chat(user, "A Juggernaut, which is very hard to kill and can produce temporary walls, but is slow.")
/obj/structure/constructshell/attackby(obj/item/O, mob/user, params)
- if(istype(O, /obj/item/device/soulstone))
- var/obj/item/device/soulstone/SS = O
+ if(istype(O, /obj/item/soulstone))
+ var/obj/item/soulstone/SS = O
if(!iscultist(user) && !iswizard(user) && !SS.usability)
to_chat(user, "An overwhelming feeling of dread comes over you as you attempt to place the soulstone into the shell. It would be wise to be rid of this quickly.")
user.Dizzy(120)
@@ -125,7 +125,7 @@
////////////////////////////Proc for moving soul in and out off stone//////////////////////////////////////
-/obj/item/device/soulstone/proc/transfer_soul(choice as text, target, mob/user)
+/obj/item/soulstone/proc/transfer_soul(choice as text, target, mob/user)
switch(choice)
if("FORCE")
if(!iscarbon(target)) //TODO: Add sacrifice stoning for non-organics, just because you have no body doesnt mean you dont have a soul
@@ -233,7 +233,7 @@
newstruct.cancel_camera()
-/obj/item/device/soulstone/proc/init_shade(mob/living/carbon/human/T, mob/U, vic = 0)
+/obj/item/soulstone/proc/init_shade(mob/living/carbon/human/T, mob/U, vic = 0)
new /obj/effect/decal/remains/human(T.loc) //Spawns a skeleton
T.stop_sound_channel(CHANNEL_HEARTBEAT)
T.invisibility = INVISIBILITY_ABSTRACT
@@ -260,7 +260,7 @@
to_chat(U, "Capture successful!: [T.real_name]'s soul has been ripped from their body and stored within the soul stone.")
-/obj/item/device/soulstone/proc/getCultGhost(mob/living/carbon/human/T, mob/U)
+/obj/item/soulstone/proc/getCultGhost(mob/living/carbon/human/T, mob/U)
var/mob/dead/observer/chosen_ghost
for(var/mob/dead/observer/ghost in GLOB.player_list) //We put them back in their body
diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm
index 5dc32efd3b..a042b3d08c 100644
--- a/code/modules/antagonists/wizard/equipment/spellbook.dm
+++ b/code/modules/antagonists/wizard/equipment/spellbook.dm
@@ -337,7 +337,7 @@
/datum/spellbook_entry/item/necrostone
name = "A Necromantic Stone"
desc = "A Necromantic stone is able to resurrect three dead individuals as skeletal thralls for you to command."
- item_path = /obj/item/device/necromantic_stone
+ item_path = /obj/item/necromantic_stone
category = "Assistance"
/datum/spellbook_entry/item/wands
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index 1e6fdc2fd4..85d45bd40b 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -4,7 +4,7 @@
#define WIRE_RADIO_RECEIVE (1<<3)
#define WIRE_RADIO_PULSE (1<<4)
-/obj/item/device/assembly
+/obj/item/assembly
name = "assembly"
desc = "A small electronic device that should never exist."
icon = 'icons/obj/assemblies/new_assemblies.dmi'
@@ -18,28 +18,28 @@
var/secured = TRUE
var/list/attached_overlays = null
- var/obj/item/device/assembly_holder/holder = null
+ var/obj/item/assembly_holder/holder = null
var/wire_type = WIRE_RECEIVE | WIRE_PULSE
var/attachable = FALSE // can this be attached to wires
var/datum/wires/connected = null
var/next_activate = 0 //When we're next allowed to activate - for spam control
-/obj/item/device/assembly/get_part_rating()
+/obj/item/assembly/get_part_rating()
return 1
-/obj/item/device/assembly/proc/on_attach()
+/obj/item/assembly/proc/on_attach()
-/obj/item/device/assembly/proc/on_detach()
+/obj/item/assembly/proc/on_detach()
-/obj/item/device/assembly/proc/holder_movement() //Called when the holder is moved
+/obj/item/assembly/proc/holder_movement() //Called when the holder is moved
return
-/obj/item/device/assembly/proc/describe() // Called by grenades to describe the state of the trigger (time left, etc)
+/obj/item/assembly/proc/describe() // Called by grenades to describe the state of the trigger (time left, etc)
return "The trigger assembly looks broken!"
-/obj/item/device/assembly/proc/is_secured(mob/user)
+/obj/item/assembly/proc/is_secured(mob/user)
if(!secured)
to_chat(user, "The [name] is unsecured!")
return FALSE
@@ -47,7 +47,7 @@
//Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs
-/obj/item/device/assembly/proc/pulsed(radio = 0)
+/obj/item/assembly/proc/pulsed(radio = 0)
if(wire_type & WIRE_RECEIVE)
INVOKE_ASYNC(src, .proc/activate)
if(radio && (wire_type & WIRE_RADIO_RECEIVE))
@@ -56,7 +56,7 @@
//Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct
-/obj/item/device/assembly/proc/pulse(radio = 0)
+/obj/item/assembly/proc/pulse(radio = 0)
if(connected && wire_type)
connected.pulse_assembly(src)
return TRUE
@@ -68,24 +68,24 @@
// What the device does when turned on
-/obj/item/device/assembly/proc/activate()
+/obj/item/assembly/proc/activate()
if(QDELETED(src) || !secured || (next_activate > world.time))
return FALSE
next_activate = world.time + 30
return TRUE
-/obj/item/device/assembly/proc/toggle_secure()
+/obj/item/assembly/proc/toggle_secure()
secured = !secured
update_icon()
return secured
-/obj/item/device/assembly/attackby(obj/item/W, mob/user, params)
+/obj/item/assembly/attackby(obj/item/W, mob/user, params)
if(isassembly(W))
- var/obj/item/device/assembly/A = W
+ var/obj/item/assembly/A = W
if((!A.secured) && (!secured))
- holder = new/obj/item/device/assembly_holder(get_turf(src))
+ holder = new/obj/item/assembly_holder(get_turf(src))
holder.assemble(src,A,user)
to_chat(user, "You attach and secure \the [A] to \the [src]!")
else
@@ -100,7 +100,7 @@
..()
-/obj/item/device/assembly/examine(mob/user)
+/obj/item/assembly/examine(mob/user)
..()
if(secured)
to_chat(user, "\The [src] is secured and ready to be used.")
@@ -108,12 +108,12 @@
to_chat(user, "\The [src] can be attached to other things.")
-/obj/item/device/assembly/attack_self(mob/user)
+/obj/item/assembly/attack_self(mob/user)
if(!user)
return FALSE
user.set_machine(src)
interact(user)
return TRUE
-/obj/item/device/assembly/interact(mob/user)
+/obj/item/assembly/interact(mob/user)
return ui_interact(user)
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index 18fda04a1b..daca7a5435 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -1,4 +1,4 @@
-/obj/item/device/onetankbomb
+/obj/item/onetankbomb
name = "bomb"
icon = 'icons/obj/tank.dmi'
item_state = "assembly"
@@ -10,14 +10,14 @@
throw_range = 4
flags_1 = CONDUCT_1
var/status = FALSE //0 - not readied //1 - bomb finished with welder
- var/obj/item/device/assembly_holder/bombassembly = null //The first part of the bomb is an assembly holder, holding an igniter+some device
+ var/obj/item/assembly_holder/bombassembly = null //The first part of the bomb is an assembly holder, holding an igniter+some device
var/obj/item/tank/bombtank = null //the second part of the bomb is a plasma tank
-/obj/item/device/onetankbomb/examine(mob/user)
+/obj/item/onetankbomb/examine(mob/user)
bombtank.examine(user)
-/obj/item/device/onetankbomb/update_icon()
+/obj/item/onetankbomb/update_icon()
if(bombtank)
icon = bombtank.icon
icon_state = bombtank.icon_state
@@ -26,8 +26,8 @@
copy_overlays(bombassembly)
add_overlay("bomb_assembly")
-/obj/item/device/onetankbomb/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/device/analyzer))
+/obj/item/onetankbomb/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/analyzer))
bombtank.attackby(W, user)
return
if(istype(W, /obj/item/wrench) && !status) //This is basically bomb assembly code inverted. apparently it works.
@@ -54,12 +54,12 @@
add_fingerprint(user)
..()
-/obj/item/device/onetankbomb/attack_self(mob/user) //pressing the bomb accesses its assembly
+/obj/item/onetankbomb/attack_self(mob/user) //pressing the bomb accesses its assembly
bombassembly.attack_self(user, TRUE)
add_fingerprint(user)
return
-/obj/item/device/onetankbomb/receive_signal() //This is mainly called by the sensor through sense() to the holder, and from the holder to here.
+/obj/item/onetankbomb/receive_signal() //This is mainly called by the sensor through sense() to the holder, and from the holder to here.
visible_message("[icon2html(src, viewers(src))] *beep* *beep*", "*beep* *beep*")
sleep(10)
if(!src)
@@ -69,11 +69,11 @@
else
bombtank.release()
-/obj/item/device/onetankbomb/Crossed(atom/movable/AM as mob|obj) //for mousetraps
+/obj/item/onetankbomb/Crossed(atom/movable/AM as mob|obj) //for mousetraps
if(bombassembly)
bombassembly.Crossed(AM)
-/obj/item/device/onetankbomb/on_found(mob/finder) //for mousetraps
+/obj/item/onetankbomb/on_found(mob/finder) //for mousetraps
if(bombassembly)
bombassembly.on_found(finder)
@@ -81,7 +81,7 @@
// ---------- Procs below are for tanks that are used exclusively in 1-tank bombs ----------
//Bomb assembly proc. This turns assembly+tank into a bomb
-/obj/item/tank/proc/bomb_assemble(obj/item/device/assembly_holder/assembly, mob/living/user)
+/obj/item/tank/proc/bomb_assemble(obj/item/assembly_holder/assembly, mob/living/user)
//Check if either part of the assembly has an igniter, but if both parts are igniters, then fuck it
if(isigniter(assembly.a_left) == isigniter(assembly.a_right))
return
@@ -94,7 +94,7 @@
to_chat(user, "[assembly] is stuck to your hand!")
return
- var/obj/item/device/onetankbomb/bomb = new
+ var/obj/item/onetankbomb/bomb = new
user.transferItemToLoc(src, bomb)
user.transferItemToLoc(assembly, bomb)
diff --git a/code/modules/assembly/doorcontrol.dm b/code/modules/assembly/doorcontrol.dm
index 47d3d9e436..c3475b1839 100644
--- a/code/modules/assembly/doorcontrol.dm
+++ b/code/modules/assembly/doorcontrol.dm
@@ -1,4 +1,4 @@
-/obj/item/device/assembly/control
+/obj/item/assembly/control
name = "blast door controller"
desc = "A small electronic device able to control a blast door remotely."
icon_state = "control"
@@ -7,12 +7,12 @@
var/can_change_id = 0
var/cooldown = 0//Door cooldowns
-/obj/item/device/assembly/control/examine(mob/user)
+/obj/item/assembly/control/examine(mob/user)
..()
if(id)
to_chat(user, "Its channel ID is '[id]'.")
-/obj/item/device/assembly/control/activate()
+/obj/item/assembly/control/activate()
cooldown = 1
var/openclose
for(var/obj/machinery/door/poddoor/M in GLOB.machines)
@@ -24,7 +24,7 @@
cooldown = 0
-/obj/item/device/assembly/control/airlock
+/obj/item/assembly/control/airlock
name = "airlock controller"
desc = "A small electronic device able to control an airlock remotely."
id = "badmin" // Set it to null for MEGAFUN.
@@ -37,7 +37,7 @@
16= door safties (SAFE)
*/
-/obj/item/device/assembly/control/airlock/activate()
+/obj/item/assembly/control/airlock/activate()
cooldown = 1
var/doors_need_closing = FALSE
var/list/obj/machinery/door/airlock/open_or_close = list()
@@ -70,11 +70,11 @@
cooldown = 0
-/obj/item/device/assembly/control/massdriver
+/obj/item/assembly/control/massdriver
name = "mass driver controller"
desc = "A small electronic device able to control a mass driver."
-/obj/item/device/assembly/control/massdriver/activate()
+/obj/item/assembly/control/massdriver/activate()
cooldown = 1
for(var/obj/machinery/door/poddoor/M in GLOB.machines)
if (M.id == src.id)
@@ -96,11 +96,11 @@
cooldown = 0
-/obj/item/device/assembly/control/igniter
+/obj/item/assembly/control/igniter
name = "ignition controller"
desc = "A remote controller for a mounted igniter."
-/obj/item/device/assembly/control/igniter/activate()
+/obj/item/assembly/control/igniter/activate()
cooldown = 1
for(var/obj/machinery/sparker/M in GLOB.machines)
if (M.id == src.id)
@@ -116,11 +116,11 @@
cooldown = 0
-/obj/item/device/assembly/control/flasher
+/obj/item/assembly/control/flasher
name = "flasher controller"
desc = "A remote controller for a mounted flasher."
-/obj/item/device/assembly/control/flasher/activate()
+/obj/item/assembly/control/flasher/activate()
cooldown = 1
for(var/obj/machinery/flasher/M in GLOB.machines)
if(M.id == src.id)
@@ -130,11 +130,11 @@
cooldown = 0
-/obj/item/device/assembly/control/crematorium
+/obj/item/assembly/control/crematorium
name = "crematorium controller"
desc = "An evil-looking remote controller for a crematorium."
-/obj/item/device/assembly/control/crematorium/activate()
+/obj/item/assembly/control/crematorium/activate()
cooldown = 1
for (var/obj/structure/bodycontainer/crematorium/C in GLOB.crematoriums)
if (C.id == id)
diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm
index 2b0e3af514..cbfdb860f9 100644
--- a/code/modules/assembly/flash.dm
+++ b/code/modules/assembly/flash.dm
@@ -1,6 +1,7 @@
-/obj/item/device/assembly/flash
+/obj/item/assembly/flash
name = "flash"
desc = "A powerful and versatile flashbulb device, with applications ranging from disorienting attackers to acting as visual receptors in robot production."
+ icon = 'icons/obj/device.dmi'
icon_state = "flash"
item_state = "flashtool"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
@@ -15,7 +16,7 @@
var/cooldown = 0
var/last_trigger = 0 //Last time it was successfully triggered.
-/obj/item/device/assembly/flash/suicide_act(mob/living/user)
+/obj/item/assembly/flash/suicide_act(mob/living/user)
if (crit_fail)
user.visible_message("[user] raises \the [src] up to [user.p_their()] eyes and activates it ... but its burnt out!")
return SHAME
@@ -26,7 +27,7 @@
attack(user,user)
return FIRELOSS
-/obj/item/device/assembly/flash/update_icon(flash = FALSE)
+/obj/item/assembly/flash/update_icon(flash = FALSE)
cut_overlays()
attached_overlays = list()
if(crit_fail)
@@ -39,13 +40,13 @@
if(holder)
holder.update_icon()
-/obj/item/device/assembly/flash/proc/clown_check(mob/living/carbon/human/user)
+/obj/item/assembly/flash/proc/clown_check(mob/living/carbon/human/user)
if(user.has_trait(TRAIT_CLUMSY) && prob(50))
flash_carbon(user, user, 15, 0)
return FALSE
return TRUE
-/obj/item/device/assembly/flash/proc/burn_out() //Made so you can override it if you want to have an invincible flash from R&D or something.
+/obj/item/assembly/flash/proc/burn_out() //Made so you can override it if you want to have an invincible flash from R&D or something.
if(!crit_fail)
crit_fail = TRUE
update_icon()
@@ -56,7 +57,7 @@
var/turf/T = get_turf(src)
T.visible_message("[src] burns out!")
-/obj/item/device/assembly/flash/proc/flash_recharge(interval = 10)
+/obj/item/assembly/flash/proc/flash_recharge(interval = 10)
var/deciseconds_passed = world.time - last_used
for(var/seconds = deciseconds_passed / 10, seconds >= interval, seconds -= interval) //get 1 charge every interval
times_used--
@@ -68,7 +69,7 @@
return TRUE
//BYPASS CHECKS ALSO PREVENTS BURNOUT!
-/obj/item/device/assembly/flash/proc/AOE_flash(bypass_checks = FALSE, range = 3, power = 5, targeted = FALSE, mob/user)
+/obj/item/assembly/flash/proc/AOE_flash(bypass_checks = FALSE, range = 3, power = 5, targeted = FALSE, mob/user)
if(!bypass_checks && !try_use_flash())
return FALSE
var/list/mob/targets = get_flash_targets(get_turf(src), range, FALSE)
@@ -78,7 +79,7 @@
flash_carbon(C, user, power, targeted, TRUE)
return TRUE
-/obj/item/device/assembly/flash/proc/get_flash_targets(atom/target_loc, range = 3, override_vision_checks = FALSE)
+/obj/item/assembly/flash/proc/get_flash_targets(atom/target_loc, range = 3, override_vision_checks = FALSE)
if(!target_loc)
target_loc = loc
if(override_vision_checks)
@@ -88,7 +89,7 @@
else
return typecache_filter_list(target_loc.GetAllContents(), typecacheof(list(/mob/living)))
-/obj/item/device/assembly/flash/proc/try_use_flash(mob/user = null)
+/obj/item/assembly/flash/proc/try_use_flash(mob/user = null)
if(crit_fail || (world.time < last_trigger + cooldown))
return FALSE
last_trigger = world.time
@@ -100,7 +101,7 @@
return FALSE
return TRUE
-/obj/item/device/assembly/flash/proc/flash_carbon(mob/living/carbon/M, mob/user, power = 15, targeted = TRUE, generic_message = FALSE)
+/obj/item/assembly/flash/proc/flash_carbon(mob/living/carbon/M, mob/user, power = 15, targeted = TRUE, generic_message = FALSE)
if(!istype(M))
return
add_logs(user, M, "[targeted? "flashed(targeted)" : "flashed(AOE)"]", src)
@@ -127,7 +128,7 @@
if(M.flash_act())
M.confused += power
-/obj/item/device/assembly/flash/attack(mob/living/M, mob/user)
+/obj/item/assembly/flash/attack(mob/living/M, mob/user)
if(!try_use_flash(user))
return FALSE
if(iscarbon(M))
@@ -145,26 +146,26 @@
user.visible_message("[user] fails to blind [M] with the flash!", "You fail to blind [M] with the flash!")
-/obj/item/device/assembly/flash/attack_self(mob/living/carbon/user, flag = 0, emp = 0)
+/obj/item/assembly/flash/attack_self(mob/living/carbon/user, flag = 0, emp = 0)
if(holder)
return FALSE
if(!AOE_flash(FALSE, 3, 5, FALSE, user))
return FALSE
to_chat(user, "[src] emits a blinding light!")
-/obj/item/device/assembly/flash/emp_act(severity)
+/obj/item/assembly/flash/emp_act(severity)
if(!try_use_flash())
return FALSE
AOE_flash()
burn_out()
. = ..()
-/obj/item/device/assembly/flash/activate()//AOE flash on signal recieved
+/obj/item/assembly/flash/activate()//AOE flash on signal recieved
if(!..())
return
AOE_flash()
-/obj/item/device/assembly/flash/proc/terrible_conversion_proc(mob/living/carbon/human/H, mob/user)
+/obj/item/assembly/flash/proc/terrible_conversion_proc(mob/living/carbon/human/H, mob/user)
if(istype(H) && ishuman(user) && H.stat != DEAD)
if(user.mind)
var/datum/antagonist/rev/head/converter = user.mind.has_antag_datum(/datum/antagonist/rev/head)
@@ -182,43 +183,43 @@
to_chat(user, "This mind seems resistant to the flash!")
-/obj/item/device/assembly/flash/cyborg
+/obj/item/assembly/flash/cyborg
-/obj/item/device/assembly/flash/cyborg/attack(mob/living/M, mob/user)
+/obj/item/assembly/flash/cyborg/attack(mob/living/M, mob/user)
..()
new /obj/effect/temp_visual/borgflash(get_turf(src))
-/obj/item/device/assembly/flash/cyborg/attack_self(mob/user)
+/obj/item/assembly/flash/cyborg/attack_self(mob/user)
..()
new /obj/effect/temp_visual/borgflash(get_turf(src))
-/obj/item/device/assembly/flash/cyborg/attackby(obj/item/W, mob/user, params)
+/obj/item/assembly/flash/cyborg/attackby(obj/item/W, mob/user, params)
return
-/obj/item/device/assembly/flash/memorizer
+/obj/item/assembly/flash/memorizer
name = "memorizer"
desc = "If you see this, you're not likely to remember it any time soon."
icon = 'icons/obj/device.dmi'
icon_state = "memorizer"
item_state = "nullrod"
-/obj/item/device/assembly/flash/handheld //this is now the regular pocket flashes
+/obj/item/assembly/flash/handheld //this is now the regular pocket flashes
-/obj/item/device/assembly/flash/armimplant
+/obj/item/assembly/flash/armimplant
name = "photon projector"
desc = "A high-powered photon projector implant normally used for lighting purposes, but also doubles as a flashbulb weapon. Self-repair protocals fix the flashbulb if it ever burns out."
var/flashcd = 20
var/overheat = 0
var/obj/item/organ/cyberimp/arm/flash/I = null
-/obj/item/device/assembly/flash/armimplant/burn_out()
+/obj/item/assembly/flash/armimplant/burn_out()
if(I && I.owner)
to_chat(I.owner, "Your photon projector implant overheats and deactivates!")
I.Retract()
overheat = TRUE
addtimer(CALLBACK(src, .proc/cooldown), flashcd * 2)
-/obj/item/device/assembly/flash/armimplant/try_use_flash(mob/user = null)
+/obj/item/assembly/flash/armimplant/try_use_flash(mob/user = null)
if(overheat)
if(I && I.owner)
to_chat(I.owner, "Your photon projector is running too hot to be used again so quickly!")
@@ -230,10 +231,10 @@
return TRUE
-/obj/item/device/assembly/flash/armimplant/proc/cooldown()
+/obj/item/assembly/flash/armimplant/proc/cooldown()
overheat = FALSE
-/obj/item/device/assembly/flash/shield
+/obj/item/assembly/flash/shield
name = "strobe shield"
desc = "A shield with a built in, high intensity light capable of blinding and disorienting suspects. Takes regular handheld flashes as bulbs."
icon = 'icons/obj/items_and_weapons.dmi'
@@ -252,15 +253,15 @@
block_chance = 50
armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
-/obj/item/device/assembly/flash/shield/flash_recharge(interval=10)
+/obj/item/assembly/flash/shield/flash_recharge(interval=10)
if(times_used >= 4)
burn_out()
return FALSE
return TRUE
-/obj/item/device/assembly/flash/shield/attackby(obj/item/W, mob/user)
- if(istype(W, /obj/item/device/assembly/flash/handheld))
- var/obj/item/device/assembly/flash/handheld/flash = W
+/obj/item/assembly/flash/shield/attackby(obj/item/W, mob/user)
+ if(istype(W, /obj/item/assembly/flash/handheld))
+ var/obj/item/assembly/flash/handheld/flash = W
if(flash.crit_fail)
to_chat(user, "No sense replacing it with a broken bulb.")
return
@@ -278,7 +279,7 @@
return
..()
-/obj/item/device/assembly/flash/shield/update_icon(flash = FALSE)
+/obj/item/assembly/flash/shield/update_icon(flash = FALSE)
icon_state = "flashshield"
item_state = "flashshield"
@@ -293,6 +294,6 @@
if(holder)
holder.update_icon()
-/obj/item/device/assembly/flash/shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+/obj/item/assembly/flash/shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
activate()
return ..()
diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm
index 25271c4d9b..633db327bf 100644
--- a/code/modules/assembly/health.dm
+++ b/code/modules/assembly/health.dm
@@ -1,4 +1,4 @@
-/obj/item/device/assembly/health
+/obj/item/assembly/health
name = "health sensor"
desc = "Used for scanning and monitoring health."
icon_state = "health"
@@ -10,17 +10,17 @@
var/health_scan
var/alarm_health = 0
-/obj/item/device/assembly/health/examine(mob/user)
+/obj/item/assembly/health/examine(mob/user)
..()
to_chat(user, "Use a multitool to swap between \"detect death\" mode and \"detect critical state\" mode.")
-/obj/item/device/assembly/health/activate()
+/obj/item/assembly/health/activate()
if(!..())
return 0//Cooldown check
toggle_scan()
return 0
-/obj/item/device/assembly/health/toggle_secure()
+/obj/item/assembly/health/toggle_secure()
secured = !secured
if(secured && scanning)
START_PROCESSING(SSobj, src)
@@ -30,8 +30,8 @@
update_icon()
return secured
-/obj/item/device/assembly/health/attackby(obj/item/W as obj, mob/user as mob)
- if(istype(W, /obj/item/device/multitool))
+/obj/item/assembly/health/attackby(obj/item/W as obj, mob/user as mob)
+ if(istype(W, /obj/item/multitool))
if(alarm_health == 0)
alarm_health = -90
user.show_message("You toggle [src] to \"detect death\" mode.")
@@ -42,7 +42,7 @@
else
return ..()
-/obj/item/device/assembly/health/process()
+/obj/item/assembly/health/process()
if(!scanning || !secured)
return
@@ -63,7 +63,7 @@
return
return
-/obj/item/device/assembly/health/proc/toggle_scan()
+/obj/item/assembly/health/proc/toggle_scan()
if(!secured)
return 0
scanning = !scanning
@@ -73,7 +73,7 @@
STOP_PROCESSING(SSobj, src)
return
-/obj/item/device/assembly/health/ui_interact(mob/user as mob)//TODO: Change this to the wires thingy
+/obj/item/assembly/health/ui_interact(mob/user as mob)//TODO: Change this to the wires thingy
. = ..()
if(!secured)
user.show_message("The [name] is unsecured!")
@@ -84,7 +84,7 @@
user << browse(dat, "window=hscan")
onclose(user, "hscan")
-/obj/item/device/assembly/health/Topic(href, href_list)
+/obj/item/assembly/health/Topic(href, href_list)
..()
if(!ismob(usr))
return
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index 79a92af527..c830935132 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -1,4 +1,4 @@
-/obj/item/device/assembly_holder
+/obj/item/assembly_holder
name = "Assembly"
icon = 'icons/obj/assemblies/new_assemblies.dmi'
icon_state = "holder"
@@ -11,21 +11,21 @@
throw_speed = 2
throw_range = 7
- var/obj/item/device/assembly/a_left = null
- var/obj/item/device/assembly/a_right = null
+ var/obj/item/assembly/a_left = null
+ var/obj/item/assembly/a_right = null
-/obj/item/device/assembly_holder/IsAssemblyHolder()
+/obj/item/assembly_holder/IsAssemblyHolder()
return 1
-/obj/item/device/assembly_holder/proc/assemble(obj/item/device/assembly/A, obj/item/device/assembly/A2, mob/user)
+/obj/item/assembly_holder/proc/assemble(obj/item/assembly/A, obj/item/assembly/A2, mob/user)
attach(A,user)
attach(A2,user)
name = "[A.name]-[A2.name] assembly"
update_icon()
SSblackbox.record_feedback("tally", "assembly_made", 1, "[initial(A.name)]-[initial(A2.name)]")
-/obj/item/device/assembly_holder/proc/attach(obj/item/device/assembly/A, mob/user)
+/obj/item/assembly_holder/proc/attach(obj/item/assembly/A, mob/user)
if(!A.remove_item_from_storage(src))
if(user)
user.transferItemToLoc(A, src)
@@ -38,7 +38,7 @@
else
a_right = A
-/obj/item/device/assembly_holder/update_icon()
+/obj/item/assembly_holder/update_icon()
cut_overlays()
if(a_left)
add_overlay("[a_left.icon_state]_left")
@@ -55,25 +55,25 @@
if(master)
master.update_icon()
-/obj/item/device/assembly_holder/Crossed(atom/movable/AM as mob|obj)
+/obj/item/assembly_holder/Crossed(atom/movable/AM as mob|obj)
if(a_left)
a_left.Crossed(AM)
if(a_right)
a_right.Crossed(AM)
-/obj/item/device/assembly_holder/on_found(mob/finder)
+/obj/item/assembly_holder/on_found(mob/finder)
if(a_left)
a_left.on_found(finder)
if(a_right)
a_right.on_found(finder)
-/obj/item/device/assembly_holder/Move()
+/obj/item/assembly_holder/Move()
. = ..()
if(a_left && a_right)
a_left.holder_movement()
a_right.holder_movement()
-/obj/item/device/assembly_holder/attack_hand()//Perhapse this should be a holder_pickup proc instead, can add if needbe I guess
+/obj/item/assembly_holder/attack_hand()//Perhapse this should be a holder_pickup proc instead, can add if needbe I guess
. = ..()
if(.)
return
@@ -81,7 +81,7 @@
a_left.holder_movement()
a_right.holder_movement()
-/obj/item/device/assembly_holder/attackby(obj/item/W, mob/user, params)
+/obj/item/assembly_holder/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/screwdriver))
var/turf/T = get_turf(src)
if(!T)
@@ -96,7 +96,7 @@
else
..()
-/obj/item/device/assembly_holder/attack_self(mob/user)
+/obj/item/assembly_holder/attack_self(mob/user)
src.add_fingerprint(user)
if(!a_left || !a_right)
to_chat(user, "Assembly part missing!")
@@ -113,7 +113,7 @@
a_right.attack_self(user)
-/obj/item/device/assembly_holder/proc/process_activation(obj/D, normal = 1, special = 1)
+/obj/item/assembly_holder/proc/process_activation(obj/D, normal = 1, special = 1)
if(!D)
return 0
if((normal) && (a_right) && (a_left))
diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm
index 1a0f439820..ef0949481a 100644
--- a/code/modules/assembly/igniter.dm
+++ b/code/modules/assembly/igniter.dm
@@ -1,4 +1,4 @@
-/obj/item/device/assembly/igniter
+/obj/item/assembly/igniter
name = "igniter"
desc = "A small electronic device able to ignite combustible substances."
icon_state = "igniter"
@@ -6,22 +6,22 @@
var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
heat = 1000
-/obj/item/device/assembly/igniter/suicide_act(mob/living/carbon/user)
+/obj/item/assembly/igniter/suicide_act(mob/living/carbon/user)
user.visible_message("[user] is trying to ignite [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")
user.IgniteMob()
return FIRELOSS
-/obj/item/device/assembly/igniter/New()
+/obj/item/assembly/igniter/New()
..()
sparks.set_up(2, 0, src)
sparks.attach(src)
-/obj/item/device/assembly/igniter/Destroy()
+/obj/item/assembly/igniter/Destroy()
qdel(sparks)
sparks = null
. = ..()
-/obj/item/device/assembly/igniter/activate()
+/obj/item/assembly/igniter/activate()
if(!..())
return 0//Cooldown check
var/turf/location = get_turf(loc)
@@ -30,11 +30,11 @@
sparks.start()
return 1
-/obj/item/device/assembly/igniter/attack_self(mob/user)
+/obj/item/assembly/igniter/attack_self(mob/user)
activate()
add_fingerprint(user)
-/obj/item/device/assembly/igniter/ignition_effect(atom/A, mob/user)
+/obj/item/assembly/igniter/ignition_effect(atom/A, mob/user)
. = "[user] fiddles with [src], and manages to \
light [A]."
activate()
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index d18b41c68b..374c7762d4 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -1,4 +1,4 @@
-/obj/item/device/assembly/infra
+/obj/item/assembly/infra
name = "infrared emitter"
desc = "Emits a visible or invisible beam and is triggered when the beam is interrupted.\nAlt-click to rotate it clockwise."
icon_state = "infrared"
@@ -11,26 +11,26 @@
var/olddir = 0
var/datum/component/redirect/listener
-/obj/item/device/assembly/infra/Initialize()
+/obj/item/assembly/infra/Initialize()
. = ..()
beams = list()
START_PROCESSING(SSobj, src)
-/obj/item/device/assembly/infra/Destroy()
+/obj/item/assembly/infra/Destroy()
QDEL_LIST(beams)
return ..()
-/obj/item/device/assembly/infra/describe()
+/obj/item/assembly/infra/describe()
return "The infrared trigger is [on?"on":"off"]."
-/obj/item/device/assembly/infra/activate()
+/obj/item/assembly/infra/activate()
if(!..())
return 0//Cooldown check
on = !on
update_icon()
return 1
-/obj/item/device/assembly/infra/toggle_secure()
+/obj/item/assembly/infra/toggle_secure()
secured = !secured
if(secured)
START_PROCESSING(SSobj, src)
@@ -40,7 +40,7 @@
update_icon()
return secured
-/obj/item/device/assembly/infra/update_icon()
+/obj/item/assembly/infra/update_icon()
cut_overlays()
attached_overlays = list()
if(on)
@@ -51,15 +51,15 @@
holder.update_icon()
return
-/obj/item/device/assembly/infra/dropped()
+/obj/item/assembly/infra/dropped()
refreshBeam()
-/obj/item/device/assembly/infra/process()
+/obj/item/assembly/infra/process()
if(!on || !secured)
refreshBeam()
return
-/obj/item/device/assembly/infra/proc/refreshBeam()
+/obj/item/assembly/infra/proc/refreshBeam()
QDEL_LIST(beams)
if(throwing || !on || !secured || !(isturf(loc) || holder && isturf(holder.loc)))
return
@@ -83,33 +83,33 @@
_T = get_step(_T, _dir)
CHECK_TICK
-/obj/item/device/assembly/infra/attack_hand()
+/obj/item/assembly/infra/attack_hand()
. = ..()
refreshBeam()
-/obj/item/device/assembly/infra/Moved()
+/obj/item/assembly/infra/Moved()
var/t = dir
. = ..()
setDir(t)
-/obj/item/device/assembly/infra/throw_at()
+/obj/item/assembly/infra/throw_at()
. = ..()
olddir = dir
-/obj/item/device/assembly/infra/throw_impact()
+/obj/item/assembly/infra/throw_impact()
. = ..()
if(!olddir)
return
setDir(olddir)
olddir = null
-/obj/item/device/assembly/infra/holder_movement()
+/obj/item/assembly/infra/holder_movement()
if(!holder)
return 0
refreshBeam()
return 1
-/obj/item/device/assembly/infra/proc/trigger_beam(atom/movable/AM, turf/location)
+/obj/item/assembly/infra/proc/trigger_beam(atom/movable/AM, turf/location)
refreshBeam()
switchListener(location)
if(!secured || !on || next_activate > world.time)
@@ -118,16 +118,16 @@
audible_message("[icon2html(src, hearers(src))] *beep* *beep*", null, 3)
next_activate = world.time + 30
-/obj/item/device/assembly/infra/proc/switchListener(turf/newloc)
+/obj/item/assembly/infra/proc/switchListener(turf/newloc)
QDEL_NULL(listener)
listener = newloc.AddComponent(/datum/component/redirect, COMSIG_ATOM_EXITED, CALLBACK(src, .proc/check_exit))
-/obj/item/device/assembly/infra/proc/check_exit(atom/movable/offender)
+/obj/item/assembly/infra/proc/check_exit(atom/movable/offender)
if(offender && ((offender.flags_1 & ABSTRACT_1) || offender == src))
return
return refreshBeam()
-/obj/item/device/assembly/infra/ui_interact(mob/user)//TODO: change this this to the wire control panel
+/obj/item/assembly/infra/ui_interact(mob/user)//TODO: change this this to the wire control panel
. = ..()
if(is_secured(user))
user.set_machine(src)
@@ -138,7 +138,7 @@
onclose(user, "infra")
return
-/obj/item/device/assembly/infra/Topic(href, href_list)
+/obj/item/assembly/infra/Topic(href, href_list)
..()
if(usr.incapacitated() || !in_range(loc, usr))
usr << browse(null, "window=infra")
@@ -157,7 +157,7 @@
if(usr)
attack_self(usr)
-/obj/item/device/assembly/infra/verb/rotate()//This could likely be better
+/obj/item/assembly/infra/verb/rotate()//This could likely be better
set name = "Rotate Infrared Laser"
set category = "Object"
set src in usr
@@ -167,14 +167,14 @@
setDir(turn(dir, -90))
-/obj/item/device/assembly/infra/AltClick(mob/user)
+/obj/item/assembly/infra/AltClick(mob/user)
..()
if(!user.canUseTopic(src, BE_CLOSE, NO_DEXTERY))
return
else
rotate()
-/obj/item/device/assembly/infra/setDir()
+/obj/item/assembly/infra/setDir()
. = ..()
refreshBeam()
@@ -184,7 +184,7 @@
name = "infrared beam"
icon = 'icons/obj/projectiles.dmi'
icon_state = "ibeam"
- var/obj/item/device/assembly/infra/master
+ var/obj/item/assembly/infra/master
anchored = TRUE
density = FALSE
flags_1 = ABSTRACT_1
diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm
index 97d03aa12d..d0d27ebe11 100644
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -1,4 +1,4 @@
-/obj/item/device/assembly/mousetrap
+/obj/item/assembly/mousetrap
name = "mousetrap"
desc = "A handy little spring-loaded trap for catching pesty rodents."
icon_state = "mousetrap"
@@ -7,14 +7,14 @@
var/armed = 0
-/obj/item/device/assembly/mousetrap/examine(mob/user)
+/obj/item/assembly/mousetrap/examine(mob/user)
..()
if(armed)
to_chat(user, "The mousetrap is armed!")
else
to_chat(user, "The mousetrap is not armed.")
-/obj/item/device/assembly/mousetrap/activate()
+/obj/item/assembly/mousetrap/activate()
if(..())
armed = !armed
if(!armed)
@@ -27,10 +27,10 @@
if(usr)
playsound(usr.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3)
-/obj/item/device/assembly/mousetrap/describe()
+/obj/item/assembly/mousetrap/describe()
return "The pressure switch is [armed?"primed":"safe"]."
-/obj/item/device/assembly/mousetrap/update_icon()
+/obj/item/assembly/mousetrap/update_icon()
if(armed)
icon_state = "mousetraparmed"
else
@@ -38,7 +38,7 @@
if(holder)
holder.update_icon()
-/obj/item/device/assembly/mousetrap/proc/triggered(mob/target, type = "feet")
+/obj/item/assembly/mousetrap/proc/triggered(mob/target, type = "feet")
if(!armed)
return
var/obj/item/bodypart/affecting = null
@@ -72,7 +72,7 @@
pulse(0)
-/obj/item/device/assembly/mousetrap/attack_self(mob/living/carbon/human/user)
+/obj/item/assembly/mousetrap/attack_self(mob/living/carbon/human/user)
if(!armed)
to_chat(user, "You arm [src].")
else
@@ -91,7 +91,7 @@
//ATTACK HAND IGNORING PARENT RETURN VALUE
-/obj/item/device/assembly/mousetrap/attack_hand(mob/living/carbon/human/user)
+/obj/item/assembly/mousetrap/attack_hand(mob/living/carbon/human/user)
if(armed)
if((user.has_trait(TRAIT_DUMB) || user.has_trait(TRAIT_CLUMSY)) && prob(50))
var/which_hand = BODY_ZONE_PRECISE_L_HAND
@@ -104,7 +104,7 @@
return ..()
-/obj/item/device/assembly/mousetrap/Crossed(atom/movable/AM as mob|obj)
+/obj/item/assembly/mousetrap/Crossed(atom/movable/AM as mob|obj)
if(armed)
if(ismob(AM))
var/mob/MM = AM
@@ -122,7 +122,7 @@
..()
-/obj/item/device/assembly/mousetrap/on_found(mob/finder)
+/obj/item/assembly/mousetrap/on_found(mob/finder)
if(armed)
finder.visible_message("[finder] accidentally sets off [src], breaking their fingers.", \
"You accidentally trigger [src]!")
@@ -131,13 +131,13 @@
return 0
-/obj/item/device/assembly/mousetrap/hitby(A as mob|obj)
+/obj/item/assembly/mousetrap/hitby(A as mob|obj)
if(!armed)
return ..()
visible_message("[src] is triggered by [A].")
triggered(null)
-/obj/item/device/assembly/mousetrap/armed
+/obj/item/assembly/mousetrap/armed
icon_state = "mousetraparmed"
armed = 1
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index df852fc135..d79b4786c6 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -1,4 +1,4 @@
-/obj/item/device/assembly/prox_sensor
+/obj/item/assembly/prox_sensor
name = "proximity sensor"
desc = "Used for scanning and alerting when someone enters a certain proximity."
icon_state = "prox"
@@ -10,29 +10,29 @@
var/time = 10
var/sensitivity = 1
-/obj/item/device/assembly/prox_sensor/proc/toggle_scan()
+/obj/item/assembly/prox_sensor/proc/toggle_scan()
-/obj/item/device/assembly/prox_sensor/proc/sense()
+/obj/item/assembly/prox_sensor/proc/sense()
-/obj/item/device/assembly/prox_sensor/Initialize()
+/obj/item/assembly/prox_sensor/Initialize()
. = ..()
proximity_monitor = new(src, 0)
-/obj/item/device/assembly/prox_sensor/describe()
+/obj/item/assembly/prox_sensor/describe()
if(timing)
return "The proximity sensor is arming."
return "The proximity sensor is [scanning?"armed":"disarmed"]."
-/obj/item/device/assembly/prox_sensor/activate()
+/obj/item/assembly/prox_sensor/activate()
if(!..())
return 0//Cooldown check
timing = !timing
update_icon()
return 1
-/obj/item/device/assembly/prox_sensor/toggle_secure()
+/obj/item/assembly/prox_sensor/toggle_secure()
secured = !secured
if(!secured)
if(scanning)
@@ -45,13 +45,13 @@
return secured
-/obj/item/device/assembly/prox_sensor/HasProximity(atom/movable/AM as mob|obj)
+/obj/item/assembly/prox_sensor/HasProximity(atom/movable/AM as mob|obj)
if (istype(AM, /obj/effect/beam))
return
sense()
-/obj/item/device/assembly/prox_sensor/sense()
+/obj/item/assembly/prox_sensor/sense()
if(!scanning || !secured || next_activate > world.time)
return 0
pulse(0)
@@ -59,7 +59,7 @@
next_activate = world.time + 30
-/obj/item/device/assembly/prox_sensor/process()
+/obj/item/assembly/prox_sensor/process()
if(timing)
time--
if(time <= 0)
@@ -67,20 +67,20 @@
toggle_scan(1)
time = initial(time)
-/obj/item/device/assembly/prox_sensor/toggle_scan(scan)
+/obj/item/assembly/prox_sensor/toggle_scan(scan)
if(!secured)
return 0
scanning = scan
proximity_monitor.SetRange(scanning ? sensitivity : 0)
update_icon()
-/obj/item/device/assembly/prox_sensor/proc/sensitivity_change(value)
+/obj/item/assembly/prox_sensor/proc/sensitivity_change(value)
var/sense = min(max(sensitivity + value, 0), 5)
sensitivity = sense
if(scanning && proximity_monitor.SetRange(sense))
sense()
-/obj/item/device/assembly/prox_sensor/update_icon()
+/obj/item/assembly/prox_sensor/update_icon()
cut_overlays()
attached_overlays = list()
if(timing)
@@ -93,7 +93,7 @@
holder.update_icon()
return
-/obj/item/device/assembly/prox_sensor/ui_interact(mob/user)//TODO: Change this to the wires thingy
+/obj/item/assembly/prox_sensor/ui_interact(mob/user)//TODO: Change this to the wires thingy
. = ..()
if(is_secured(user))
var/second = time % 60
@@ -108,7 +108,7 @@
return
-/obj/item/device/assembly/prox_sensor/Topic(href, href_list)
+/obj/item/assembly/prox_sensor/Topic(href, href_list)
..()
if(usr.incapacitated() || !in_range(loc, usr))
usr << browse(null, "window=prox")
diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm
index 174312df1e..38f2acb45f 100644
--- a/code/modules/assembly/shock_kit.dm
+++ b/code/modules/assembly/shock_kit.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/assemblies.dmi'
icon_state = "shock_kit"
var/obj/item/clothing/head/helmet/part1 = null
- var/obj/item/device/electropack/part2 = null
+ var/obj/item/electropack/part2 = null
w_class = WEIGHT_CLASS_HUGE
flags_1 = CONDUCT_1
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index e7a21ad1cd..4b44397713 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -1,4 +1,4 @@
-/obj/item/device/assembly/signaler
+/obj/item/assembly/signaler
name = "remote signaling device"
desc = "Used to remotely activate devices. Allows for syncing when using a secure signaler on another."
icon_state = "signaller"
@@ -15,40 +15,40 @@
var/datum/radio_frequency/radio_connection
var/suicider = null
-/obj/item/device/assembly/signaler/suicide_act(mob/living/carbon/user)
+/obj/item/assembly/signaler/suicide_act(mob/living/carbon/user)
user.visible_message("[user] eats \the [src]! If it is signaled, [user.p_they()] will die!")
playsound(src, 'sound/items/eatfood.ogg', 50, 1)
user.transferItemToLoc(src, user, TRUE)
suicider = user
return MANUAL_SUICIDE
-/obj/item/device/assembly/signaler/proc/manual_suicide(mob/living/carbon/user)
+/obj/item/assembly/signaler/proc/manual_suicide(mob/living/carbon/user)
user.visible_message("[user]'s \the [src] recieves a signal, killing them instantly!")
user.adjustOxyLoss(200)//it sends an electrical pulse to their heart, killing them. or something.
user.death(0)
-/obj/item/device/assembly/signaler/New()
+/obj/item/assembly/signaler/New()
..()
spawn(40)
set_frequency(frequency)
-/obj/item/device/assembly/signaler/Destroy()
+/obj/item/assembly/signaler/Destroy()
SSradio.remove_object(src,frequency)
return ..()
-/obj/item/device/assembly/signaler/activate()
+/obj/item/assembly/signaler/activate()
if(!..())//cooldown processing
return FALSE
signal()
return TRUE
-/obj/item/device/assembly/signaler/update_icon()
+/obj/item/assembly/signaler/update_icon()
if(holder)
holder.update_icon()
return
-/obj/item/device/assembly/signaler/ui_interact(mob/user, flag1)
+/obj/item/assembly/signaler/ui_interact(mob/user, flag1)
. = ..()
if(is_secured(user))
var/t1 = "-------"
@@ -77,7 +77,7 @@ Code:
return
-/obj/item/device/assembly/signaler/Topic(href, href_list)
+/obj/item/assembly/signaler/Topic(href, href_list)
..()
if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
@@ -106,16 +106,16 @@ Code:
return
-/obj/item/device/assembly/signaler/attackby(obj/item/W, mob/user, params)
+/obj/item/assembly/signaler/attackby(obj/item/W, mob/user, params)
if(issignaler(W))
- var/obj/item/device/assembly/signaler/signaler2 = W
+ var/obj/item/assembly/signaler/signaler2 = W
if(secured && signaler2.secured)
code = signaler2.code
frequency = signaler2.frequency
to_chat(user, "You transfer the frequency and code of \the [signaler2.name] to \the [name]")
..()
-/obj/item/device/assembly/signaler/proc/signal()
+/obj/item/assembly/signaler/proc/signal()
if(!radio_connection)
return
@@ -130,7 +130,7 @@ Code:
return
-/obj/item/device/assembly/signaler/receive_signal(datum/signal/signal)
+/obj/item/assembly/signaler/receive_signal(datum/signal/signal)
if(!signal)
return 0
if(signal.data["code"] != code)
@@ -144,7 +144,7 @@ Code:
return
-/obj/item/device/assembly/signaler/proc/set_frequency(new_frequency)
+/obj/item/assembly/signaler/proc/set_frequency(new_frequency)
SSradio.remove_object(src, frequency)
frequency = new_frequency
radio_connection = SSradio.add_object(src, frequency, RADIO_SIGNALER)
@@ -153,27 +153,27 @@ Code:
// Embedded signaller used in grenade construction.
// It's necessary because the signaler doens't have an off state.
// Generated during grenade construction. -Sayu
-/obj/item/device/assembly/signaler/reciever
+/obj/item/assembly/signaler/reciever
var/on = FALSE
-/obj/item/device/assembly/signaler/reciever/proc/toggle_safety()
+/obj/item/assembly/signaler/reciever/proc/toggle_safety()
on = !on
-/obj/item/device/assembly/signaler/reciever/activate()
+/obj/item/assembly/signaler/reciever/activate()
toggle_safety()
return 1
-/obj/item/device/assembly/signaler/reciever/describe()
+/obj/item/assembly/signaler/reciever/describe()
return "The radio receiver is [on?"on":"off"]."
-/obj/item/device/assembly/signaler/reciever/receive_signal(datum/signal/signal)
+/obj/item/assembly/signaler/reciever/receive_signal(datum/signal/signal)
if(!on)
return
return ..(signal)
// Embedded signaller used in anomalies.
-/obj/item/device/assembly/signaler/anomaly
+/obj/item/assembly/signaler/anomaly
name = "anomaly core"
desc = "The neutralized core of an anomaly. It'd probably be valuable for research."
icon_state = "anomaly core"
@@ -181,7 +181,7 @@ Code:
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-/obj/item/device/assembly/signaler/anomaly/receive_signal(datum/signal/signal)
+/obj/item/assembly/signaler/anomaly/receive_signal(datum/signal/signal)
if(!signal)
return 0
if(signal.data["code"] != code)
@@ -189,10 +189,10 @@ Code:
for(var/obj/effect/anomaly/A in get_turf(src))
A.anomalyNeutralize()
-/obj/item/device/assembly/signaler/anomaly/attack_self()
+/obj/item/assembly/signaler/anomaly/attack_self()
return
-/obj/item/device/assembly/signaler/cyborg
+/obj/item/assembly/signaler/cyborg
-/obj/item/device/assembly/signaler/cyborg/attackby(obj/item/W, mob/user, params)
+/obj/item/assembly/signaler/cyborg/attackby(obj/item/W, mob/user, params)
return
diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm
index 3d9d782a16..7c74c1ca77 100644
--- a/code/modules/assembly/timer.dm
+++ b/code/modules/assembly/timer.dm
@@ -1,4 +1,4 @@
-/obj/item/device/assembly/timer
+/obj/item/assembly/timer
name = "timer"
desc = "Used to time things. Works well with contraptions which has to count down. Tick tock."
icon_state = "timer"
@@ -10,28 +10,28 @@
var/saved_time = 5
var/loop = 0
-/obj/item/device/assembly/timer/suicide_act(mob/living/user)
+/obj/item/assembly/timer/suicide_act(mob/living/user)
user.visible_message("[user] looks at the timer and decides [user.p_their()] fate! It looks like [user.p_theyre()] going to commit suicide!")
activate()//doesnt rely on timer_end to prevent weird metas where one person can control the timer and therefore someone's life. (maybe that should be how it works...)
addtimer(CALLBACK(src, .proc/manual_suicide, user), time*10)//kill yourself once the time runs out
return MANUAL_SUICIDE
-/obj/item/device/assembly/timer/proc/manual_suicide(mob/living/user)
+/obj/item/assembly/timer/proc/manual_suicide(mob/living/user)
user.visible_message("[user]'s time is up!")
user.adjustOxyLoss(200)
user.death(0)
-/obj/item/device/assembly/timer/New()
+/obj/item/assembly/timer/New()
..()
START_PROCESSING(SSobj, src)
-/obj/item/device/assembly/timer/describe()
+/obj/item/assembly/timer/describe()
if(timing)
return "The timer is counting down from [time]!"
return "The timer is set for [time] seconds."
-/obj/item/device/assembly/timer/activate()
+/obj/item/assembly/timer/activate()
if(!..())
return 0//Cooldown check
timing = !timing
@@ -39,7 +39,7 @@
return 1
-/obj/item/device/assembly/timer/toggle_secure()
+/obj/item/assembly/timer/toggle_secure()
secured = !secured
if(secured)
START_PROCESSING(SSobj, src)
@@ -50,7 +50,7 @@
return secured
-/obj/item/device/assembly/timer/proc/timer_end()
+/obj/item/assembly/timer/proc/timer_end()
if(!secured || next_activate > world.time)
return FALSE
pulse(0)
@@ -60,7 +60,7 @@
update_icon()
-/obj/item/device/assembly/timer/process()
+/obj/item/assembly/timer/process()
if(timing)
time--
if(time <= 0)
@@ -69,7 +69,7 @@
time = saved_time
-/obj/item/device/assembly/timer/update_icon()
+/obj/item/assembly/timer/update_icon()
cut_overlays()
attached_overlays = list()
if(timing)
@@ -79,7 +79,7 @@
holder.update_icon()
-/obj/item/device/assembly/timer/ui_interact(mob/user)//TODO: Have this use the wires
+/obj/item/assembly/timer/ui_interact(mob/user)//TODO: Have this use the wires
. = ..()
if(is_secured(user))
var/second = time % 60
@@ -93,7 +93,7 @@
popup.open()
-/obj/item/device/assembly/timer/Topic(href, href_list)
+/obj/item/assembly/timer/Topic(href, href_list)
..()
if(usr.incapacitated() || !in_range(loc, usr))
usr << browse(null, "window=timer")
@@ -102,7 +102,7 @@
if(href_list["time"])
timing = text2num(href_list["time"])
- if(timing && istype(holder, /obj/item/device/transfer_valve))
+ if(timing && istype(holder, /obj/item/transfer_valve))
var/timer_message = "[ADMIN_LOOKUPFLW(usr)] activated [src] attachment on [holder]."
message_admins(timer_message)
GLOB.bombers += timer_message
diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm
index 913176b662..71f51aaaf9 100644
--- a/code/modules/assembly/voice.dm
+++ b/code/modules/assembly/voice.dm
@@ -1,4 +1,4 @@
-/obj/item/device/assembly/voice
+/obj/item/assembly/voice
name = "voice analyzer"
desc = "A small electronic device able to record a voice sample, and send a signal when that sample is repeated."
icon_state = "voice"
@@ -16,11 +16,11 @@
"recognizer",
"voice sensor")
-/obj/item/device/assembly/voice/examine(mob/user)
+/obj/item/assembly/voice/examine(mob/user)
..()
to_chat(user, "Use a multitool to swap between \"inclusive\", \"exclusive\", \"recognizer\", and \"voice sensor\" mode.")
-/obj/item/device/assembly/voice/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode)
+/obj/item/assembly/voice/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode)
if(speaker == src)
return
@@ -30,7 +30,7 @@
if(check_activation(speaker, raw_message))
addtimer(CALLBACK(src, .proc/pulse, 0), 10)
-/obj/item/device/assembly/voice/proc/record_speech(atom/movable/speaker, raw_message, datum/language/message_language)
+/obj/item/assembly/voice/proc/record_speech(atom/movable/speaker, raw_message, datum/language/message_language)
switch(mode)
if(1)
recorded = raw_message
@@ -48,7 +48,7 @@
if(length(raw_message))
addtimer(CALLBACK(src, .proc/pulse, 0), 10)
-/obj/item/device/assembly/voice/proc/check_activation(atom/movable/speaker, raw_message)
+/obj/item/assembly/voice/proc/check_activation(atom/movable/speaker, raw_message)
. = 0
switch(mode)
if(1)
@@ -64,8 +64,8 @@
if(length(raw_message))
. = 1
-/obj/item/device/assembly/voice/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/device/multitool))
+/obj/item/assembly/voice/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/multitool))
mode %= modes.len
mode++
to_chat(user, "You set [src] into a [modes[mode]] mode.")
@@ -74,18 +74,18 @@
else
return ..()
-/obj/item/device/assembly/voice/activate()
+/obj/item/assembly/voice/activate()
if(secured)
if(!holder)
listening = !listening
say("[listening ? "Now" : "No longer"] recording input.")
-/obj/item/device/assembly/voice/attack_self(mob/user)
+/obj/item/assembly/voice/attack_self(mob/user)
if(!user)
return 0
activate()
return 1
-/obj/item/device/assembly/voice/toggle_secure()
+/obj/item/assembly/voice/toggle_secure()
. = ..()
listening = 0
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index a62a448a70..381eccb3d8 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -667,7 +667,7 @@
to_chat(user, "The wires have been [panel_open ? "exposed" : "unexposed"].")
update_icon()
return
- else if(istype(W, /obj/item/card/id) || istype(W, /obj/item/device/pda))// trying to unlock the interface with an ID card
+ else if(istype(W, /obj/item/card/id) || istype(W, /obj/item/pda))// trying to unlock the interface with an ID card
togglelock(user)
else if(panel_open && is_wire_tool(W))
wires.interact(user)
@@ -715,8 +715,8 @@
qdel(W)
return
- if(istype(W, /obj/item/device/electroadaptive_pseudocircuit))
- var/obj/item/device/electroadaptive_pseudocircuit/P = W
+ if(istype(W, /obj/item/electroadaptive_pseudocircuit))
+ var/obj/item/electroadaptive_pseudocircuit/P = W
if(!P.adapt_circuit(user, 25))
return
user.visible_message("[user] fabricates a circuit and places it into [src].", \
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 345b4e1ddd..90c5641002 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -27,8 +27,8 @@
var/obj/item/reagent_containers/glass/beaker = null
var/reagent_transfer = 0
- var/obj/item/device/radio/radio
- var/radio_key = /obj/item/device/encryptionkey/headset_med
+ var/obj/item/radio/radio
+ var/radio_key = /obj/item/encryptionkey/headset_med
var/radio_channel = "Medical"
var/running_anim = FALSE
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm b/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm
index 129f615ffd..b4af871f76 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm
@@ -20,7 +20,7 @@
..(intact)
/obj/machinery/atmospherics/components/unary/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/device/analyzer))
+ if(istype(W, /obj/item/analyzer))
atmosanalyzer_scan(airs[1], user)
else
return ..()
diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm
index 477cbbc76d..73317c05ef 100644
--- a/code/modules/atmospherics/machinery/pipes/pipes.dm
+++ b/code/modules/atmospherics/machinery/pipes/pipes.dm
@@ -63,7 +63,7 @@
return parent.air.remove(amount)
/obj/machinery/atmospherics/pipe/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/device/analyzer))
+ if(istype(W, /obj/item/analyzer))
atmosanalyzer_scan(parent.air, user)
if(istype(W, /obj/item/pipe_meter))
var/obj/item/pipe_meter/meter = W
diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
index 75cf52a677..5bf9f5b8c0 100644
--- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
+++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
@@ -138,7 +138,7 @@
"You fasten [src] to the port.", \
"You hear a ratchet.")
update_icon()
- else if(istype(W, /obj/item/device/analyzer) && Adjacent(user))
+ else if(istype(W, /obj/item/analyzer) && Adjacent(user))
atmosanalyzer_scan(air_contents, user)
else
return ..()
diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index c864469783..8e602577ac 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -474,7 +474,7 @@
/datum/outfit/ctf
name = "CTF"
- ears = /obj/item/device/radio/headset
+ ears = /obj/item/radio/headset
uniform = /obj/item/clothing/under/syndicate
suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf
toggle_helmet = FALSE // see the whites of their eyes
@@ -530,7 +530,7 @@
/datum/outfit/ctf/red/post_equip(mob/living/carbon/human/H)
..()
- var/obj/item/device/radio/R = H.ears
+ var/obj/item/radio/R = H.ears
R.set_frequency(FREQ_CTF_RED)
R.freqlock = TRUE
R.independent = TRUE
@@ -538,7 +538,7 @@
/datum/outfit/ctf/blue/post_equip(mob/living/carbon/human/H)
..()
- var/obj/item/device/radio/R = H.ears
+ var/obj/item/radio/R = H.ears
R.set_frequency(FREQ_CTF_BLUE)
R.freqlock = TRUE
R.independent = TRUE
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 21a613845d..e780e323c6 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -182,7 +182,7 @@
H.equipOutfit(outfit)
if(disable_pda)
// We don't want corpse PDAs to show up in the messenger list.
- var/obj/item/device/pda/PDA = locate(/obj/item/device/pda) in H
+ var/obj/item/pda/PDA = locate(/obj/item/pda) in H
if(PDA)
PDA.toff = TRUE
if(disable_sensors)
@@ -312,7 +312,7 @@
/obj/effect/mob_spawn/human/doctor/alive/equip(mob/living/carbon/human/H)
..()
// Remove radio and PDA so they wouldn't annoy station crew.
- var/list/del_types = list(/obj/item/device/pda, /obj/item/device/radio/headset)
+ var/list/del_types = list(/obj/item/pda, /obj/item/radio/headset)
for(var/del_type in del_types)
var/obj/item/I = locate(del_type) in H
qdel(I)
@@ -410,7 +410,7 @@
/datum/outfit/nanotrasenbridgeofficercorpse
name = "Bridge Officer Corpse"
- ears = /obj/item/device/radio/headset/heads/hop
+ ears = /obj/item/radio/headset/heads/hop
uniform = /obj/item/clothing/under/rank/centcom_officer
suit = /obj/item/clothing/suit/armor/bulletproof
shoes = /obj/item/clothing/shoes/sneakers/black
@@ -428,7 +428,7 @@
name = "Nanotrasen Private Security Commander"
uniform = /obj/item/clothing/under/rank/centcom_commander
suit = /obj/item/clothing/suit/armor/bulletproof
- ears = /obj/item/device/radio/headset/heads/captain
+ ears = /obj/item/radio/headset/heads/captain
glasses = /obj/item/clothing/glasses/eyepatch
mask = /obj/item/clothing/mask/cigarette/cigar/cohiba
head = /obj/item/clothing/head/centhat
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index bba2b0558c..2293ac8098 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -159,8 +159,8 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
use_power(5000)
return
-/obj/machinery/gateway/centeraway/attackby(obj/item/device/W, mob/user, params)
- if(istype(W, /obj/item/device/multitool))
+/obj/machinery/gateway/centeraway/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/multitool))
if(calibrated)
to_chat(user, "\black The gate is already calibrated, there is no work for you to do here.")
return
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index 52fa9454ff..e19382b1ec 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -529,7 +529,7 @@
/obj/item/gun/ballistic/automatic/c20r/unrestricted = 16,
/obj/item/gun/magic/wand/resurrection/inert = 15,
/obj/item/gun/magic/wand/resurrection = 10,
- /obj/item/device/radio/uplink/old = 2,
+ /obj/item/radio/uplink/old = 2,
/obj/item/book/granter/spell/charge = 12,
/obj/item/grenade/clusterbuster/spawner_manhacks = 15,
/obj/item/book/granter/spell/fireball = 10,
@@ -601,7 +601,7 @@
name = "Syndicate Snow Operative"
uniform = /obj/item/clothing/under/syndicate/coldres
shoes = /obj/item/clothing/shoes/combat/coldres
- ears = /obj/item/device/radio/headset/syndicate/alt
+ ears = /obj/item/radio/headset/syndicate/alt
r_pocket = /obj/item/gun/ballistic/automatic/pistol
id = /obj/item/card/id/syndicate
implants = list(/obj/item/implant/exile)
diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm
index 3b865492ef..e9c2b993fa 100644
--- a/code/modules/awaymissions/mission_code/stationCollision.dm
+++ b/code/modules/awaymissions/mission_code/stationCollision.dm
@@ -128,7 +128,7 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
l_code = "[GLOB.sc_safecode1][GLOB.sc_safecode2][GLOB.sc_safecode3][GLOB.sc_safecode4][GLOB.sc_safecode5]"
l_set = 1
new /obj/item/gun/energy/mindflayer(src)
- new /obj/item/device/soulstone(src)
+ new /obj/item/soulstone(src)
new /obj/item/clothing/suit/space/hardsuit/cult(src)
//new /obj/item/teleportation_scroll(src)
new /obj/item/stack/ore/diamond(src)
diff --git a/code/modules/cargo/export_scanner.dm b/code/modules/cargo/export_scanner.dm
index f98bf355f4..37c2915bea 100644
--- a/code/modules/cargo/export_scanner.dm
+++ b/code/modules/cargo/export_scanner.dm
@@ -1,4 +1,4 @@
-/obj/item/device/export_scanner
+/obj/item/export_scanner
name = "export scanner"
desc = "A device used to check objects against Nanotrasen exports database."
icon = 'icons/obj/device.dmi'
@@ -11,12 +11,12 @@
siemens_coefficient = 1
var/obj/machinery/computer/cargo/cargo_console = null
-/obj/item/device/export_scanner/examine(user)
+/obj/item/export_scanner/examine(user)
..()
if(!cargo_console)
to_chat(user, "[src] is not currently linked to a cargo console.")
-/obj/item/device/export_scanner/afterattack(obj/O, mob/user, proximity)
+/obj/item/export_scanner/afterattack(obj/O, mob/user, proximity)
if(!istype(O) || !proximity)
return
diff --git a/code/modules/cargo/exports/parts.dm b/code/modules/cargo/exports/parts.dm
index f56f1e5b81..e6fda5f6b1 100644
--- a/code/modules/cargo/exports/parts.dm
+++ b/code/modules/cargo/exports/parts.dm
@@ -18,4 +18,4 @@
/datum/export/swarmer
cost = 2000
unit_name = "deactivated alien deconstruction drone"
- export_types = list(/obj/item/device/deactivated_swarmer)
+ export_types = list(/obj/item/deactivated_swarmer)
diff --git a/code/modules/cargo/exports/tools.dm b/code/modules/cargo/exports/tools.dm
index c1a0c2fe8d..72514a6a89 100644
--- a/code/modules/cargo/exports/tools.dm
+++ b/code/modules/cargo/exports/tools.dm
@@ -69,37 +69,37 @@
/datum/export/flashlight
cost = 5
unit_name = "flashlight"
- export_types = list(/obj/item/device/flashlight)
+ export_types = list(/obj/item/flashlight)
include_subtypes = FALSE
/datum/export/flashlight/flare
cost = 2
unit_name = "flare"
- export_types = list(/obj/item/device/flashlight/flare)
+ export_types = list(/obj/item/flashlight/flare)
/datum/export/flashlight/seclite
cost = 10
unit_name = "seclite"
- export_types = list(/obj/item/device/flashlight/seclite)
+ export_types = list(/obj/item/flashlight/seclite)
// Analyzers and Scanners
/datum/export/analyzer
cost = 5
unit_name = "analyzer"
- export_types = list(/obj/item/device/analyzer)
+ export_types = list(/obj/item/analyzer)
/datum/export/analyzer/t_scanner
cost = 10
unit_name = "t-ray scanner"
- export_types = list(/obj/item/device/t_scanner)
+ export_types = list(/obj/item/t_scanner)
/datum/export/radio
cost = 5
unit_name = "radio"
- export_types = list(/obj/item/device/radio)
- exclude_types = list(/obj/item/device/radio/mech)
+ export_types = list(/obj/item/radio)
+ exclude_types = list(/obj/item/radio/mech)
// High-tech tools.
diff --git a/code/modules/cargo/exports/weapons.dm b/code/modules/cargo/exports/weapons.dm
index 9bd8c0a6e7..ea326beacf 100644
--- a/code/modules/cargo/exports/weapons.dm
+++ b/code/modules/cargo/exports/weapons.dm
@@ -62,7 +62,7 @@
/datum/export/weapon/flash
cost = 10
unit_name = "handheld flash"
- export_types = list(/obj/item/device/assembly/flash)
+ export_types = list(/obj/item/assembly/flash)
include_subtypes = TRUE
/datum/export/weapon/handcuffs
@@ -103,7 +103,7 @@
/datum/export/weapon/immortality_talisman
cost = 10000
unit_name = "Immortality Talisman"
- export_types = list(/obj/item/device/immortality_talisman)
+ export_types = list(/obj/item/immortality_talisman)
/datum/export/weapon/babel
cost = 10000
@@ -128,17 +128,17 @@
/datum/export/weapon/red //second half of telecube
cost = 5000
unit_name = "Red Cube"
- export_types = list(/obj/item/device/warp_cube/red)
+ export_types = list(/obj/item/warp_cube/red)
/datum/export/weapon/blue //first half of telecube
cost = 5000
unit_name = "Blue Cube"
- export_types = list(/obj/item/device/warp_cube)
+ export_types = list(/obj/item/warp_cube)
/datum/export/weapon/wisplantern //thermals on lavaland
cost = 10000
unit_name = "Wisp Lantern"
- export_types = list(/obj/item/device/wisp_lantern)
+ export_types = list(/obj/item/wisp_lantern)
/datum/export/weapon/flight //if xenobiology ever reaches the point to get these without shuttle being called they deserve it
cost = 10000
diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm
index 00e35458d3..c2cf51ede6 100644
--- a/code/modules/cargo/expressconsole.dm
+++ b/code/modules/cargo/expressconsole.dm
@@ -20,7 +20,7 @@
/obj/machinery/computer/cargo/express/attackby(obj/item/W, mob/living/user, params)
- if((istype(W, /obj/item/card/id) || istype(W, /obj/item/device/pda)) && allowed(user))
+ if((istype(W, /obj/item/card/id) || istype(W, /obj/item/pda)) && allowed(user))
locked = !locked
to_chat(user, "You [locked ? "lock" : "unlock"] the interface.")
return
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index 8ba650241f..d986b625c0 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -97,8 +97,8 @@
/obj/item/clothing/suit/fire/firefighter,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
- /obj/item/device/flashlight,
- /obj/item/device/flashlight,
+ /obj/item/flashlight,
+ /obj/item/flashlight,
/obj/item/tank/internals/oxygen/red,
/obj/item/tank/internals/oxygen/red,
/obj/item/extinguisher,
@@ -186,8 +186,8 @@
/obj/item/clothing/head/radiation,
/obj/item/clothing/suit/radiation,
/obj/item/clothing/suit/radiation,
- /obj/item/device/geiger_counter,
- /obj/item/device/geiger_counter,
+ /obj/item/geiger_counter,
+ /obj/item/geiger_counter,
/obj/item/reagent_containers/food/drinks/bottle/vodka,
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass)
@@ -265,10 +265,10 @@
name = "Forensics Crate"
desc = "Stay hot on the criminal's heels with Nanotrasen's Detective Essentials(tm). Contains a forensics scanner, six evidence bags, camera, tape recorder, white crayon, and of course, a fedora. Requires Security access to open."
cost = 2000
- contains = list(/obj/item/device/detective_scanner,
+ contains = list(/obj/item/detective_scanner,
/obj/item/storage/box/evidence,
- /obj/item/device/camera,
- /obj/item/device/taperecorder,
+ /obj/item/camera,
+ /obj/item/taperecorder,
/obj/item/toy/crayon/white,
/obj/item/clothing/head/fedora/det_hat)
crate_name = "forensics crate"
@@ -654,16 +654,16 @@
name = "Antimatter Shielding Crate"
desc = "Contains ten Antimatter shields, somehow crammed into a crate."
cost = 2000
- contains = list(/obj/item/device/am_shielding_container,
- /obj/item/device/am_shielding_container,
- /obj/item/device/am_shielding_container,
- /obj/item/device/am_shielding_container,
- /obj/item/device/am_shielding_container,
- /obj/item/device/am_shielding_container,
- /obj/item/device/am_shielding_container,
- /obj/item/device/am_shielding_container,
- /obj/item/device/am_shielding_container,
- /obj/item/device/am_shielding_container) //10 shields: 3x3 containment and a core
+ contains = list(/obj/item/am_shielding_container,
+ /obj/item/am_shielding_container,
+ /obj/item/am_shielding_container,
+ /obj/item/am_shielding_container,
+ /obj/item/am_shielding_container,
+ /obj/item/am_shielding_container,
+ /obj/item/am_shielding_container,
+ /obj/item/am_shielding_container,
+ /obj/item/am_shielding_container,
+ /obj/item/am_shielding_container) //10 shields: 3x3 containment and a core
crate_name = "antimatter shielding crate"
/datum/supply_pack/engineering/engine
@@ -803,11 +803,11 @@
special = TRUE
contains = list(
/obj/item/circuitboard/machine/dna_vault,
- /obj/item/device/dna_probe,
- /obj/item/device/dna_probe,
- /obj/item/device/dna_probe,
- /obj/item/device/dna_probe,
- /obj/item/device/dna_probe
+ /obj/item/dna_probe,
+ /obj/item/dna_probe,
+ /obj/item/dna_probe,
+ /obj/item/dna_probe,
+ /obj/item/dna_probe
)
crate_name= "dna vault parts crate"
@@ -816,11 +816,11 @@
desc = "Contains five DNA probes for use in the DNA vault."
cost = 3000
special = TRUE
- contains = list(/obj/item/device/dna_probe,
- /obj/item/device/dna_probe,
- /obj/item/device/dna_probe,
- /obj/item/device/dna_probe,
- /obj/item/device/dna_probe
+ contains = list(/obj/item/dna_probe,
+ /obj/item/dna_probe,
+ /obj/item/dna_probe,
+ /obj/item/dna_probe,
+ /obj/item/dna_probe
)
crate_name= "dna samplers crate"
@@ -1166,15 +1166,15 @@
contains = list(/obj/item/tank/internals/plasma,
/obj/item/tank/internals/plasma,
/obj/item/tank/internals/plasma,
- /obj/item/device/assembly/igniter,
- /obj/item/device/assembly/igniter,
- /obj/item/device/assembly/igniter,
- /obj/item/device/assembly/prox_sensor,
- /obj/item/device/assembly/prox_sensor,
- /obj/item/device/assembly/prox_sensor,
- /obj/item/device/assembly/timer,
- /obj/item/device/assembly/timer,
- /obj/item/device/assembly/timer)
+ /obj/item/assembly/igniter,
+ /obj/item/assembly/igniter,
+ /obj/item/assembly/igniter,
+ /obj/item/assembly/prox_sensor,
+ /obj/item/assembly/prox_sensor,
+ /obj/item/assembly/prox_sensor,
+ /obj/item/assembly/timer,
+ /obj/item/assembly/timer,
+ /obj/item/assembly/timer)
crate_name = "plasma assembly crate"
crate_type = /obj/structure/closet/crate/secure/plasma
@@ -1183,9 +1183,9 @@
desc = "The tools you need to replace those finicky humans with a loyal robot army! Contains three proximity sensors, two high-powered cells, six flashes, and an electrical toolbox. Requires Robotics access to open."
cost = 1000
access = ACCESS_ROBOTICS
- contains = list(/obj/item/device/assembly/prox_sensor,
- /obj/item/device/assembly/prox_sensor,
- /obj/item/device/assembly/prox_sensor,
+ contains = list(/obj/item/assembly/prox_sensor,
+ /obj/item/assembly/prox_sensor,
+ /obj/item/assembly/prox_sensor,
/obj/item/storage/toolbox/electrical,
/obj/item/storage/box/flashes,
/obj/item/stock_parts/cell/high,
@@ -1209,11 +1209,11 @@
name = "Tablet Crate"
desc = "What's a computer? Contains five cargo tablets."
cost = 5000
- contains = list(/obj/item/device/modular_computer/tablet/preset/cargo,
- /obj/item/device/modular_computer/tablet/preset/cargo,
- /obj/item/device/modular_computer/tablet/preset/cargo,
- /obj/item/device/modular_computer/tablet/preset/cargo,
- /obj/item/device/modular_computer/tablet/preset/cargo)
+ contains = list(/obj/item/modular_computer/tablet/preset/cargo,
+ /obj/item/modular_computer/tablet/preset/cargo,
+ /obj/item/modular_computer/tablet/preset/cargo,
+ /obj/item/modular_computer/tablet/preset/cargo,
+ /obj/item/modular_computer/tablet/preset/cargo)
crate_name = "tablet crate"
/datum/supply_pack/science/transfer_valves
@@ -1221,8 +1221,8 @@
desc = "The key ingredient for making a lot of people very angry very fast. Contains two tank transfer valves. Requires RD access to open."
cost = 6000
access = ACCESS_RD
- contains = list(/obj/item/device/transfer_valve,
- /obj/item/device/transfer_valve)
+ contains = list(/obj/item/transfer_valve,
+ /obj/item/transfer_valve)
crate_name = "tank transfer valves crate"
crate_type = /obj/structure/closet/crate/secure/science
dangerous = TRUE
@@ -1298,7 +1298,7 @@
/obj/item/reagent_containers/glass/bottle/ammonia,
/obj/item/hatchet,
/obj/item/cultivator,
- /obj/item/device/plant_analyzer,
+ /obj/item/plant_analyzer,
/obj/item/clothing/gloves/botanic_leather,
/obj/item/clothing/suit/apron)
crate_name = "hydroponics crate"
@@ -1334,13 +1334,13 @@
/obj/item/reagent_containers/food/drinks/beer,
/obj/item/reagent_containers/food/drinks/beer,
/obj/item/reagent_containers/food/drinks/beer,
- /obj/item/device/flashlight/glowstick,
- /obj/item/device/flashlight/glowstick/red,
- /obj/item/device/flashlight/glowstick/blue,
- /obj/item/device/flashlight/glowstick/cyan,
- /obj/item/device/flashlight/glowstick/orange,
- /obj/item/device/flashlight/glowstick/yellow,
- /obj/item/device/flashlight/glowstick/pink)
+ /obj/item/flashlight/glowstick,
+ /obj/item/flashlight/glowstick/red,
+ /obj/item/flashlight/glowstick/blue,
+ /obj/item/flashlight/glowstick/cyan,
+ /obj/item/flashlight/glowstick/orange,
+ /obj/item/flashlight/glowstick/yellow,
+ /obj/item/flashlight/glowstick/pink)
crate_name = "party equipment crate"
/datum/supply_pack/organic/pizza
@@ -1617,14 +1617,14 @@
desc = "Get your sad station movin' and groovin' with this fine collection! Contains nine different instruments!"
cost = 5000
crate_name = "Big band musical instruments collection"
- contains = list(/obj/item/device/instrument/violin,
- /obj/item/device/instrument/guitar,
- /obj/item/device/instrument/glockenspiel,
- /obj/item/device/instrument/accordion,
- /obj/item/device/instrument/saxophone,
- /obj/item/device/instrument/trombone,
- /obj/item/device/instrument/recorder,
- /obj/item/device/instrument/harmonica,
+ contains = list(/obj/item/instrument/violin,
+ /obj/item/instrument/guitar,
+ /obj/item/instrument/glockenspiel,
+ /obj/item/instrument/accordion,
+ /obj/item/instrument/saxophone,
+ /obj/item/instrument/trombone,
+ /obj/item/instrument/recorder,
+ /obj/item/instrument/harmonica,
/obj/structure/piano/unanchored)
/datum/supply_pack/misc/book_crate
@@ -1642,7 +1642,7 @@
desc = "High stacks of papers on your desk Are a big problem - make it Pea-sized with these bureacratic supplies! Contains six pens, some camera film, hand labeler supplies, a paper bin, three folders, two clipboards and two stamps."//that was too forced
cost = 1500
contains = list(/obj/structure/filingcabinet/chestdrawer/wheeled,
- /obj/item/device/camera_film,
+ /obj/item/camera_film,
/obj/item/hand_labeler,
/obj/item/hand_labeler_refill,
/obj/item/hand_labeler_refill,
@@ -1733,7 +1733,7 @@
desc = "i uh... im not really sure what this does. wanna buy it?"
cost = 5000
contraband = TRUE
- contains = list(/obj/item/device/firing_pin/clown)
+ contains = list(/obj/item/firing_pin/clown)
// It's /technically/ a toy. For the clown, at least.
crate_name = "toy crate"
@@ -1844,8 +1844,8 @@
access = ACCESS_QM
contains = list(/obj/item/pickaxe/mini,
/obj/item/clothing/glasses/meson,
- /obj/item/device/t_scanner/adv_mining_scanner/lesser,
- /obj/item/device/radio/headset/headset_cargo/mining,
+ /obj/item/t_scanner/adv_mining_scanner/lesser,
+ /obj/item/radio/headset/headset_cargo/mining,
/obj/item/storage/bag/ore,
/obj/item/clothing/suit/hooded/explorer,
/obj/item/clothing/mask/gas/explorer)
@@ -1856,12 +1856,12 @@
name = "Toner Crate"
desc = "Spent too much ink printing butt pictures? Fret not, with these six toner refills, you'll be printing butts 'till the cows come home!'"
cost = 1000
- contains = list(/obj/item/device/toner,
- /obj/item/device/toner,
- /obj/item/device/toner,
- /obj/item/device/toner,
- /obj/item/device/toner,
- /obj/item/device/toner)
+ contains = list(/obj/item/toner,
+ /obj/item/toner,
+ /obj/item/toner,
+ /obj/item/toner,
+ /obj/item/toner,
+ /obj/item/toner)
crate_name = "toner crate"
/datum/supply_pack/misc/autodrobe
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index 03bb1eeb13..80562a5c80 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -420,7 +420,7 @@
ammo_type = list(/obj/item/ammo_casing/energy/chameleon)
clumsy_check = 0
item_flags = NONE
- pin = /obj/item/device/firing_pin
+ pin = /obj/item/firing_pin
cell_type = /obj/item/stock_parts/cell/bluespace
var/datum/action/item_action/chameleon/change/chameleon_action
@@ -601,40 +601,40 @@
. = ..()
chameleon_action.emp_randomise(INFINITY)
-/obj/item/device/radio/headset/chameleon
+/obj/item/radio/headset/chameleon
name = "radio headset"
var/datum/action/item_action/chameleon/change/chameleon_action
-/obj/item/device/radio/headset/chameleon/Initialize()
+/obj/item/radio/headset/chameleon/Initialize()
. = ..()
chameleon_action = new(src)
- chameleon_action.chameleon_type = /obj/item/device/radio/headset
+ chameleon_action.chameleon_type = /obj/item/radio/headset
chameleon_action.chameleon_name = "Headset"
chameleon_action.initialize_disguises()
-/obj/item/device/radio/headset/chameleon/emp_act(severity)
+/obj/item/radio/headset/chameleon/emp_act(severity)
chameleon_action.emp_randomise()
-/obj/item/device/radio/headset/chameleon/broken/Initialize()
+/obj/item/radio/headset/chameleon/broken/Initialize()
. = ..()
chameleon_action.emp_randomise(INFINITY)
-/obj/item/device/pda/chameleon
+/obj/item/pda/chameleon
name = "PDA"
var/datum/action/item_action/chameleon/change/chameleon_action
-/obj/item/device/pda/chameleon/Initialize()
+/obj/item/pda/chameleon/Initialize()
. = ..()
chameleon_action = new(src)
- chameleon_action.chameleon_type = /obj/item/device/pda
+ chameleon_action.chameleon_type = /obj/item/pda
chameleon_action.chameleon_name = "PDA"
- chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/device/pda/heads, /obj/item/device/pda/ai, /obj/item/device/pda/ai/pai), only_root_path = TRUE)
+ chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/pda/heads, /obj/item/pda/ai, /obj/item/pda/ai/pai), only_root_path = TRUE)
chameleon_action.initialize_disguises()
-/obj/item/device/pda/chameleon/emp_act(severity)
+/obj/item/pda/chameleon/emp_act(severity)
chameleon_action.emp_randomise()
-/obj/item/device/pda/chameleon/broken/Initialize()
+/obj/item/pda/chameleon/broken/Initialize()
. = ..()
chameleon_action.emp_randomise(INFINITY)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 9c7a86cfc2..b15109bcb1 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -20,7 +20,7 @@
var/active_sound = null
var/toggle_cooldown = null
var/cooldown = 0
- var/obj/item/device/flashlight/F = null
+ var/obj/item/flashlight/F = null
var/can_flashlight = 0
var/scan_reagents = 0 //Can the wearer see reagents while it's equipped?
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index b231ac9df6..2e9b7f83f2 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -22,7 +22,7 @@
/obj/item/clothing/head/helmet/sec/attackby(obj/item/I, mob/user, params)
if(issignaler(I))
- var/obj/item/device/assembly/signaler/S = I
+ var/obj/item/assembly/signaler/S = I
if(F) //Has a flashlight. Player must remove it, else it will be lost forever.
to_chat(user, "The mounted flashlight is in the way, remove it first!")
return
@@ -260,8 +260,8 @@
..()
/obj/item/clothing/head/helmet/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/device/flashlight/seclite))
- var/obj/item/device/flashlight/seclite/S = I
+ if(istype(I, /obj/item/flashlight/seclite))
+ var/obj/item/flashlight/seclite/S = I
if(can_flashlight)
if(!F)
if(!user.transferItemToLoc(S, src))
@@ -280,7 +280,7 @@
if(istype(I, /obj/item/screwdriver))
if(F)
- for(var/obj/item/device/flashlight/seclite/S in src)
+ for(var/obj/item/flashlight/seclite/S in src)
to_chat(user, "You unscrew the seclite from [src].")
F = null
S.forceMove(user.drop_location())
diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm
index 97d4632130..c6d657b271 100644
--- a/code/modules/clothing/outfits/ert.dm
+++ b/code/modules/clothing/outfits/ert.dm
@@ -4,7 +4,7 @@
uniform = /obj/item/clothing/under/rank/centcom_officer
shoes = /obj/item/clothing/shoes/combat/swat
gloves = /obj/item/clothing/gloves/combat
- ears = /obj/item/device/radio/headset/headset_cent/alt
+ ears = /obj/item/radio/headset/headset_cent/alt
/datum/outfit/ert/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
@@ -13,7 +13,7 @@
var/obj/item/implant/mindshield/L = new/obj/item/implant/mindshield(H)
L.implant(H, null, 1)
- var/obj/item/device/radio/R = H.ears
+ var/obj/item/radio/R = H.ears
R.set_frequency(FREQ_CENTCOM)
R.freqlock = TRUE
@@ -40,8 +40,8 @@
if(visualsOnly)
return
- var/obj/item/device/radio/R = H.ears
- R.keyslot = new /obj/item/device/encryptionkey/heads/captain
+ var/obj/item/radio/R = H.ears
+ R.keyslot = new /obj/item/encryptionkey/heads/captain
R.recalculateChannels()
/datum/outfit/ert/commander/alert
@@ -74,8 +74,8 @@
if(visualsOnly)
return
- var/obj/item/device/radio/R = H.ears
- R.keyslot = new /obj/item/device/encryptionkey/heads/hos
+ var/obj/item/radio/R = H.ears
+ R.keyslot = new /obj/item/encryptionkey/heads/hos
R.recalculateChannels()
/datum/outfit/ert/security/alert
@@ -110,8 +110,8 @@
if(visualsOnly)
return
- var/obj/item/device/radio/R = H.ears
- R.keyslot = new /obj/item/device/encryptionkey/heads/cmo
+ var/obj/item/radio/R = H.ears
+ R.keyslot = new /obj/item/encryptionkey/heads/cmo
R.recalculateChannels()
/datum/outfit/ert/medic/alert
@@ -146,8 +146,8 @@
if(visualsOnly)
return
- var/obj/item/device/radio/R = H.ears
- R.keyslot = new /obj/item/device/encryptionkey/heads/ce
+ var/obj/item/radio/R = H.ears
+ R.keyslot = new /obj/item/encryptionkey/heads/ce
R.recalculateChannels()
/datum/outfit/ert/engineer/alert
@@ -166,12 +166,12 @@
uniform = /obj/item/clothing/under/rank/centcom_officer
shoes = /obj/item/clothing/shoes/sneakers/black
gloves = /obj/item/clothing/gloves/color/black
- ears = /obj/item/device/radio/headset/headset_cent
+ ears = /obj/item/radio/headset/headset_cent
glasses = /obj/item/clothing/glasses/sunglasses
belt = /obj/item/gun/energy/e_gun
l_pocket = /obj/item/pen
back = /obj/item/storage/backpack/satchel
- r_pocket = /obj/item/device/pda/heads
+ r_pocket = /obj/item/pda/heads
l_hand = /obj/item/clipboard
id = /obj/item/card/id
@@ -179,7 +179,7 @@
if(visualsOnly)
return
- var/obj/item/device/pda/heads/pda = H.r_store
+ var/obj/item/pda/heads/pda = H.r_store
pda.owner = H.real_name
pda.ownjob = "CentCom Official"
pda.update_label()
@@ -231,8 +231,8 @@
if(visualsOnly)
return
- var/obj/item/device/radio/R = H.ears
- R.keyslot = new /obj/item/device/encryptionkey/heads/hop
+ var/obj/item/radio/R = H.ears
+ R.keyslot = new /obj/item/encryptionkey/heads/hop
R.recalculateChannels()
/datum/outfit/ert/chaplain
diff --git a/code/modules/clothing/outfits/event.dm b/code/modules/clothing/outfits/event.dm
index caa473f6dc..37a06046b5 100644
--- a/code/modules/clothing/outfits/event.dm
+++ b/code/modules/clothing/outfits/event.dm
@@ -7,7 +7,7 @@
head = /obj/item/clothing/head/santa
back = /obj/item/storage/backpack/santabag
mask = /obj/item/clothing/mask/breath
- r_pocket = /obj/item/device/flashlight
+ r_pocket = /obj/item/flashlight
gloves = /obj/item/clothing/gloves/color/red
belt = /obj/item/tank/internals/emergency_oxygen/double
id = /obj/item/card/id/gold
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 6fdbb183a3..6375f7986f 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -62,7 +62,7 @@
shoes = /obj/item/clothing/shoes/sneakers/red
head = /obj/item/clothing/head/helmet/redtaghelm
gloves = /obj/item/clothing/gloves/color/red
- ears = /obj/item/device/radio/headset
+ ears = /obj/item/radio/headset
suit = /obj/item/clothing/suit/redtag
back = /obj/item/storage/backpack
suit_store = /obj/item/gun/energy/laser/redtag
@@ -91,7 +91,7 @@
head = /obj/item/clothing/head/helmet/space/pirate/bandana
mask = /obj/item/clothing/mask/breath
suit_store = /obj/item/tank/internals/oxygen
- ears = /obj/item/device/radio/headset/syndicate
+ ears = /obj/item/radio/headset/syndicate
id = /obj/item/card/id
/datum/outfit/pirate/space/captain
@@ -100,7 +100,7 @@
/datum/outfit/pirate/post_equip(mob/living/carbon/human/H)
H.faction |= "pirate"
- var/obj/item/device/radio/R = H.ears
+ var/obj/item/radio/R = H.ears
if(R)
R.set_frequency(FREQ_SYNDICATE)
R.freqlock = TRUE
@@ -117,7 +117,7 @@
shoes = /obj/item/clothing/shoes/clown_shoes
gloves = /obj/item/clothing/gloves/color/black
mask = /obj/item/clothing/mask/gas/clown_hat
- ears = /obj/item/device/radio/headset
+ ears = /obj/item/radio/headset
glasses = /obj/item/clothing/glasses/thermal/monocle
suit = /obj/item/clothing/suit/hooded/chaplain_hoodie
l_pocket = /obj/item/reagent_containers/food/snacks/grown/banana
@@ -143,7 +143,7 @@
gloves = /obj/item/clothing/gloves/color/latex
mask = /obj/item/clothing/mask/surgical
head = /obj/item/clothing/head/welding
- ears = /obj/item/device/radio/headset
+ ears = /obj/item/radio/headset
glasses = /obj/item/clothing/glasses/thermal/monocle
suit = /obj/item/clothing/suit/apron
l_pocket = /obj/item/kitchen/knife
@@ -163,12 +163,12 @@
uniform = /obj/item/clothing/under/suit_jacket
shoes = /obj/item/clothing/shoes/sneakers/black
gloves = /obj/item/clothing/gloves/color/black
- ears = /obj/item/device/radio/headset
+ ears = /obj/item/radio/headset
glasses = /obj/item/clothing/glasses/sunglasses
l_pocket = /obj/item/melee/transforming/energy/sword/saber
l_hand = /obj/item/storage/secure/briefcase
id = /obj/item/card/id/syndicate
- belt = /obj/item/device/pda/heads
+ belt = /obj/item/pda/heads
/datum/outfit/assassin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
var/obj/item/clothing/under/U = H.w_uniform
@@ -188,7 +188,7 @@
sec_briefcase.SendSignal(COMSIG_TRY_STORAGE_INSERT, new /obj/item/ammo_box/a357, null, TRUE, TRUE)
sec_briefcase.SendSignal(COMSIG_TRY_STORAGE_INSERT, new /obj/item/grenade/plastic/x4, null, TRUE, TRUE)
- var/obj/item/device/pda/heads/pda = H.belt
+ var/obj/item/pda/heads/pda = H.belt
pda.owner = H.real_name
pda.ownjob = "Reaper"
pda.update_label()
@@ -206,7 +206,7 @@
suit = /obj/item/clothing/suit/armor/bulletproof
shoes = /obj/item/clothing/shoes/combat/swat
gloves = /obj/item/clothing/gloves/combat
- ears = /obj/item/device/radio/headset/headset_cent/commander
+ ears = /obj/item/radio/headset/headset_cent/commander
glasses = /obj/item/clothing/glasses/eyepatch
mask = /obj/item/clothing/mask/cigarette/cigar/cohiba
head = /obj/item/clothing/head/centhat
@@ -236,7 +236,7 @@
shoes = /obj/item/clothing/shoes/combat/swat
gloves = /obj/item/clothing/gloves/combat
glasses = /obj/item/clothing/glasses/thermal/eyepatch
- ears = /obj/item/device/radio/headset/headset_cent/commander
+ ears = /obj/item/radio/headset/headset_cent/commander
mask = /obj/item/clothing/mask/cigarette/cigar/havana
head = /obj/item/clothing/head/helmet/space/beret
belt = /obj/item/gun/energy/pulse/pistol/m1911
@@ -256,7 +256,7 @@
W.registered_name = H.real_name
W.update_label()
- var/obj/item/device/radio/headset/R = H.ears
+ var/obj/item/radio/headset/R = H.ears
R.set_frequency(FREQ_CENTCOM)
R.freqlock = TRUE
@@ -275,7 +275,7 @@
uniform = /obj/item/clothing/under/color/lightpurple
suit = /obj/item/clothing/suit/wizrobe
shoes = /obj/item/clothing/shoes/sandal/magic
- ears = /obj/item/device/radio/headset
+ ears = /obj/item/radio/headset
head = /obj/item/clothing/head/wizard
r_pocket = /obj/item/teleportation_scroll
r_hand = /obj/item/spellbook
@@ -317,7 +317,7 @@
head = /obj/item/clothing/head/pirate/captain
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
- ears = /obj/item/device/radio/headset/headset_cent
+ ears = /obj/item/radio/headset/headset_cent
glasses = /obj/item/clothing/glasses/thermal/eyepatch
suit = /obj/item/clothing/suit/pirate/captain
back = /obj/item/storage/backpack/satchel/leather
@@ -344,7 +344,7 @@
head = /obj/item/clothing/head/fedora
shoes = /obj/item/clothing/shoes/laceup
gloves = /obj/item/clothing/gloves/color/black
- ears = /obj/item/device/radio/headset
+ ears = /obj/item/radio/headset
glasses = /obj/item/clothing/glasses/sunglasses
r_hand = /obj/item/gun/ballistic/automatic/tommygun
id = /obj/item/card/id
@@ -382,20 +382,20 @@
belt = /obj/item/gun/ballistic/revolver/mateba
r_hand = /obj/item/gun/energy/pulse/loyalpin
id = /obj/item/card/id
- ears = /obj/item/device/radio/headset/headset_cent/alt
+ ears = /obj/item/radio/headset/headset_cent/alt
backpack_contents = list(/obj/item/storage/box=1,\
/obj/item/ammo_box/a357=1,\
/obj/item/storage/firstaid/regular=1,\
/obj/item/storage/box/flashbangs=1,\
- /obj/item/device/flashlight=1,\
+ /obj/item/flashlight=1,\
/obj/item/grenade/plastic/x4=1)
/datum/outfit/death_commando/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
return
- var/obj/item/device/radio/R = H.ears
+ var/obj/item/radio/R = H.ears
R.set_frequency(FREQ_CENTCOM)
R.freqlock = TRUE
diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm
index a2cd5bce75..8630d9a3bc 100644
--- a/code/modules/clothing/spacesuits/_spacesuits.dm
+++ b/code/modules/clothing/spacesuits/_spacesuits.dm
@@ -32,7 +32,7 @@
permeability_coefficient = 0.02
flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals)
slowdown = 1
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 50, "fire" = 80, "acid" = 70)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
diff --git a/code/modules/clothing/spacesuits/flightsuit.dm b/code/modules/clothing/spacesuits/flightsuit.dm
index 3a5198080f..01a95506b4 100644
--- a/code/modules/clothing/spacesuits/flightsuit.dm
+++ b/code/modules/clothing/spacesuits/flightsuit.dm
@@ -13,9 +13,10 @@
//Also, I should probably add in some kind of limiting mechanic but I really don't like having to refill this all the time, expecially as it will be NODROP_1.
//Apparently due to code limitations you have to detect mob movement with.. shoes.
//The object that handles the flying itself - FLIGHT PACK --------------------------------------------------------------------------------------
-/obj/item/device/flightpack
+/obj/item/flightpack
name = "flight pack"
desc = "An advanced back-worn system that has dual ion engines powerful enough to grant a humanoid flight. Contains an internal self-recharging high-current capacitor for short, powerful boosts."
+ icon = 'icons/obj/device.dmi'
icon_state = FLIGHTPACK_SPRITE_BASE
item_state = FLIGHTPACK_SPRITE_BASE
actions_types = list(/datum/action/item_action/flightpack/toggle_flight, /datum/action/item_action/flightpack/engage_boosters, /datum/action/item_action/flightpack/toggle_stabilizers, /datum/action/item_action/flightpack/change_power, /datum/action/item_action/flightpack/toggle_airbrake)
@@ -99,7 +100,7 @@
var/afterForceMove = FALSE
var/datum/component/mobhook
-/obj/item/device/flightpack/proc/changeWearer(mob/changeto)
+/obj/item/flightpack/proc/changeWearer(mob/changeto)
if(wearer)
LAZYREMOVE(wearer.user_movement_hooks, src)
wearer = null
@@ -111,7 +112,7 @@
cached_pull = changeto.pulling
mobhook = changeto.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED), CALLBACK(src, .proc/on_mob_move, changeto))
-/obj/item/device/flightpack/Initialize()
+/obj/item/flightpack/Initialize()
ion_trail = new
ion_trail.set_up(src)
START_PROCESSING(SSflightpacks, src)
@@ -120,7 +121,7 @@
update_icon()
..()
-/obj/item/device/flightpack/full/Initialize()
+/obj/item/flightpack/full/Initialize()
part_manip = new /obj/item/stock_parts/manipulator/pico(src)
part_scan = new /obj/item/stock_parts/scanning_module/phasic(src)
part_cap = new /obj/item/stock_parts/capacitor/super(src)
@@ -128,7 +129,7 @@
part_bin = new /obj/item/stock_parts/matter_bin/super(src)
..()
-/obj/item/device/flightpack/proc/usermessage(message, span = "boldnotice", mob/mob_override = null)
+/obj/item/flightpack/proc/usermessage(message, span = "boldnotice", mob/mob_override = null)
var/mob/targ = wearer
if(ismob(loc))
targ = loc
@@ -138,7 +139,7 @@
return
to_chat(targ, "[icon2html(src, targ)]|[message]")
-/obj/item/device/flightpack/proc/sync_processing(datum/controller/subsystem/processing/flightpacks/FPS)
+/obj/item/flightpack/proc/sync_processing(datum/controller/subsystem/processing/flightpacks/FPS)
processing_mode = FPS.flightsuit_processing
if(processing_mode == FLIGHTSUIT_PROCESSING_NONE)
momentum_x = 0
@@ -150,7 +151,7 @@
boost = FALSE
update_slowdown()
-/obj/item/device/flightpack/proc/update_parts()
+/obj/item/flightpack/proc/update_parts()
boost_chargerate = initial(boost_chargerate)
boost_drain = initial(boost_drain)
powersetting_high = initial(powersetting_high)
@@ -172,7 +173,7 @@
stabilizer_decay_amount = scan*3.5
airbrake_decay_amount = manip*8
-/obj/item/device/flightpack/Destroy()
+/obj/item/flightpack/Destroy()
if(suit)
delink_suit()
changeWearer()
@@ -187,7 +188,7 @@
STOP_PROCESSING(SSflightpacks, src)
. = ..()
-/obj/item/device/flightpack/emp_act(severity)
+/obj/item/flightpack/emp_act(severity)
var/damage = severity == 1 ? emp_strong_damage : emp_weak_damage
if(emp_damage <= (emp_disable_threshold * 1.5))
emp_damage += damage
@@ -195,7 +196,7 @@
return ..()
//Proc to change amount of momentum the wearer has, or dampen all momentum by a certain amount.
-/obj/item/device/flightpack/proc/adjust_momentum(amountx, amounty, reduce_amount_total = 0)
+/obj/item/flightpack/proc/adjust_momentum(amountx, amounty, reduce_amount_total = 0)
if(reduce_amount_total != 0)
if(momentum_x > 0)
momentum_x = CLAMP(momentum_x - reduce_amount_total, 0, momentum_max)
@@ -210,7 +211,7 @@
calculate_momentum_speed()
//The wearer has momentum left. Move them and take some away, while negating the momentum that moving the wearer would gain. Or force the wearer to lose control if they are incapacitated.
-/obj/item/device/flightpack/proc/momentum_drift()
+/obj/item/flightpack/proc/momentum_drift()
if(!flight || !wearer || (momentum_speed == 0))
return FALSE
else if(!wearer.canmove)
@@ -235,7 +236,7 @@
if(prob(emp_damage * 15))
step(wearer, pick(GLOB.alldirs))
-/obj/item/device/flightpack/proc/on_mob_move(mob/mob, turf/oldLoc, dir, forced)
+/obj/item/flightpack/proc/on_mob_move(mob/mob, turf/oldLoc, dir, forced)
if(forced)
if(cached_pull && istype(oldLoc) && (get_dist(oldLoc, loc) <= 1) && !oldLoc.density)
cached_pull.forceMove(oldLoc)
@@ -254,7 +255,7 @@
if(flight)
ion_trail.generate_effect()
-/obj/item/device/flightpack/intercept_user_move(dir, mob, newLoc, oldLoc)
+/obj/item/flightpack/intercept_user_move(dir, mob, newLoc, oldLoc)
if(!flight)
return
var/momentum_increment = momentum_gain
@@ -275,7 +276,7 @@
adjust_momentum(-momentum_increment, 0)
//Make the wearer lose some momentum.
-/obj/item/device/flightpack/proc/momentum_decay()
+/obj/item/flightpack/proc/momentum_decay()
var/amt = momentum_passive_loss
brake? (amt += airbrake_decay_amount) : 0
gravity? (amt += gravity_decay_amount) : 0
@@ -284,7 +285,7 @@
adjust_momentum(0, 0, amt)
//Check for gravity, air pressure, and whether this is still linked to a suit. Also, resync the flightpack/flight suit every minute.
-/obj/item/device/flightpack/proc/check_conditions()
+/obj/item/flightpack/proc/check_conditions()
if(flight && (!assembled || !wearer || (!suit && requires_suit)))
disable_flight(TRUE)
var/turf/T = get_turf(src)
@@ -302,7 +303,7 @@
usermessage("Warning: Sensor data is not being recieved from flight shoes. Stabilizers and airbrake modules deactivated!", "boldwarning")
-/obj/item/device/flightpack/process()
+/obj/item/flightpack/process()
if(processing_mode == FLIGHTSUIT_PROCESSING_NONE)
return FALSE
check_conditions()
@@ -311,10 +312,10 @@
handle_boost()
handle_damage()
-/obj/item/device/flightpack/proc/update_slowdown()
+/obj/item/flightpack/proc/update_slowdown()
flight? (slowdown = slowdown_air) : (slowdown = slowdown_ground)
-/obj/item/device/flightpack/proc/handle_damage()
+/obj/item/flightpack/proc/handle_damage()
if(emp_damage)
emp_damage = CLAMP(emp_damage-emp_heal_amount, 0, emp_disable_threshold * 10)
if(emp_damage >= emp_disable_threshold)
@@ -332,7 +333,7 @@
if(flight)
disable_flight(TRUE)
-/obj/item/device/flightpack/update_icon()
+/obj/item/flightpack/update_icon()
if(!flight)
icon_state = "[FLIGHTPACK_SPRITE_BASE][FLIGHTPACK_SPRITE_OFF_APPEND]"
item_state = "[FLIGHTPACK_SPRITE_BASE][FLIGHTPACK_SPRITE_OFF_APPEND]"
@@ -347,7 +348,7 @@
wearer.update_inv_wear_suit()
wearer.update_inv_back()
-/obj/item/device/flightpack/proc/handle_boost()
+/obj/item/flightpack/proc/handle_boost()
if(boost)
boost_charge = CLAMP(boost_charge-boost_drain, 0, boost_maxcharge)
if(boost_charge < 1)
@@ -355,13 +356,13 @@
if(boost_charge < boost_maxcharge)
boost_charge = CLAMP(boost_charge+boost_chargerate, 0, boost_maxcharge)
-/obj/item/device/flightpack/proc/cycle_power()
+/obj/item/flightpack/proc/cycle_power()
powersetting < powersetting_high? (powersetting++) : (powersetting = 1)
momentum_gain = powersetting * 10
usermessage("Engine output set to [momentum_gain].")
momentum_drift_coeff = ((momentum_gain)*(drift_tolerance*1.1))/momentum_max
-/obj/item/device/flightpack/proc/crash_damage(density, anchored, speed, victim_name)
+/obj/item/flightpack/proc/crash_damage(density, anchored, speed, victim_name)
var/crashmessagesrc = "[wearer] violently crashes into [victim_name], "
var/userdamage = 10 - stabilizer * 3 - part_bin.rating - part_scan.rating * part_manip.rating + anchored * 2 + boost * 2 + speed * 2
if(userdamage > 0)
@@ -371,13 +372,13 @@
crashmessagesrc += "but luckily [wearer]'s impact was absorbed by their suit's stabilizers!"
wearer.visible_message(crashmessagesrc)
-/obj/item/device/flightpack/proc/userknockback(density, anchored, speed, dir)
+/obj/item/flightpack/proc/userknockback(density, anchored, speed, dir)
dir = turn(dir, 180)
var/turf/target = get_edge_target_turf(get_turf(wearer), dir)
wearer.visible_message("[wearer] is knocked flying by the impact!")
wearer.throw_at(target, speed * 2 + density * 2 + anchored * 2, 2, wearer)
-/obj/item/device/flightpack/proc/flight_impact(atom/impacted_atom, crashdir) //Yes, victim.
+/obj/item/flightpack/proc/flight_impact(atom/impacted_atom, crashdir) //Yes, victim.
if(!flight || (impacted_atom == wearer) || crashing || (processing_mode == FLIGHTSUIT_PROCESSING_NONE))
return FALSE
crashing = TRUE
@@ -421,19 +422,19 @@
losecontrol(knockdown = FALSE, move = FALSE)
crashing = FALSE
-/obj/item/device/flightpack/proc/door_pass(obj/structure/mineral_door/door)
+/obj/item/flightpack/proc/door_pass(obj/structure/mineral_door/door)
INVOKE_ASYNC(door, /obj/structure/mineral_door.proc/Open)
var/turf/T = get_turf(door)
wearer.forceMove(T)
wearer.visible_message("[wearer] rolls to their sides and slips past [door]!")
-/obj/item/device/flightpack/proc/crash_grille(obj/structure/grille/target)
+/obj/item/flightpack/proc/crash_grille(obj/structure/grille/target)
target.hitby(wearer)
target.take_damage(60, BRUTE, "melee", 1)
if(wearer.Move(target.loc))
wearer.visible_message("[wearer] smashes straight past [target]!")
-/obj/item/device/flightpack/proc/airlock_pass(obj/machinery/door/A)
+/obj/item/flightpack/proc/airlock_pass(obj/machinery/door/A)
var/nopass = FALSE
if(!A.density)
return TRUE
@@ -450,7 +451,7 @@
wearer.forceMove(target)
return !nopass
-/obj/item/device/flightpack/proc/atom_impact(atom/movable/victim, power, direction)
+/obj/item/flightpack/proc/atom_impact(atom/movable/victim, power, direction)
if(!victim)
return FALSE
if(!victim.anchored)
@@ -466,7 +467,7 @@
var/obj/O = victim
O.take_damage(power * 14)
-/obj/item/device/flightpack/proc/losecontrol(knockdown = FALSE, move = TRUE)
+/obj/item/flightpack/proc/losecontrol(knockdown = FALSE, move = TRUE)
usermessage("Warning: Control system not responding. Deactivating!", "boldwarning")
if(wearer)
wearer.visible_message("[wearer]'s flight suit abruptly shuts off and they lose control!")
@@ -485,7 +486,7 @@
if(flight)
disable_flight(FALSE)
-/obj/item/device/flightpack/proc/enable_flight(forced = FALSE)
+/obj/item/flightpack/proc/enable_flight(forced = FALSE)
if(!forced)
if(disabled)
usermessage("Internal systems recalibrating. Unable to safely proceed.", "boldwarning")
@@ -505,7 +506,7 @@
update_icon()
ion_trail.start()
-/obj/item/device/flightpack/proc/disable_flight(forced = FALSE)
+/obj/item/flightpack/proc/disable_flight(forced = FALSE)
if(forced)
losecontrol(knockdown = TRUE)
return TRUE
@@ -536,23 +537,23 @@
addtimer(CALLBACK(src, .proc/enable_safe), 50)
return FALSE
-/obj/item/device/flightpack/proc/enable_safe()
+/obj/item/flightpack/proc/enable_safe()
if(override_safe)
override_safe = FALSE
-/obj/item/device/flightpack/dropped(mob/wearer)
+/obj/item/flightpack/dropped(mob/wearer)
changeWearer()
..()
-/obj/item/device/flightpack/item_action_slot_check(slot)
+/obj/item/flightpack/item_action_slot_check(slot)
if(slot == SLOT_BACK)
return TRUE
-/obj/item/device/flightpack/equipped(mob/user, slot)
+/obj/item/flightpack/equipped(mob/user, slot)
changeWearer(user)
..()
-/obj/item/device/flightpack/proc/calculate_momentum_speed()
+/obj/item/flightpack/proc/calculate_momentum_speed()
if(abs(momentum_x) >= (momentum_crash_coeff*momentum_max)) //Calculate X
momentum_speed_x = 3
else if(abs(momentum_x) >= (momentum_impact_coeff*momentum_max))
@@ -571,10 +572,10 @@
momentum_speed_y = 0
momentum_speed = max(momentum_speed_x, momentum_speed_y)
-/obj/item/device/flightpack/item_action_slot_check(slot)
+/obj/item/flightpack/item_action_slot_check(slot)
return slot == slot_back
-/obj/item/device/flightpack/proc/enable_stabilizers()
+/obj/item/flightpack/proc/enable_stabilizers()
if(requires_suit && suit && !suit.deployedshoes)
usermessage("Stabilizers requires flight shoes to be attached and deployed!", "boldwarning")
return FALSE
@@ -582,14 +583,14 @@
stabilizer = TRUE
return TRUE
-/obj/item/device/flightpack/proc/disable_stabilizers()
+/obj/item/flightpack/proc/disable_stabilizers()
if(wearer)
if(brake)
disable_airbrake()
usermessage("Deactivating stabilization controllers!", "boldwarning")
stabilizer = FALSE
-/obj/item/device/flightpack/proc/activate_booster()
+/obj/item/flightpack/proc/activate_booster()
if(!flight)
usermessage("Error: Engines offline!", "boldwarning")
return FALSE
@@ -601,13 +602,13 @@
update_slowdown()
update_icon()
-/obj/item/device/flightpack/proc/deactivate_booster()
+/obj/item/flightpack/proc/deactivate_booster()
usermessage("Boosters disengaged!")
boost = FALSE
update_slowdown()
update_icon()
-/obj/item/device/flightpack/proc/enable_airbrake()
+/obj/item/flightpack/proc/enable_airbrake()
if(wearer)
if(!stabilizer && !enable_stabilizers())
usermessage("Airbrake deployment: Stabilizer Errored.", "boldwarning")
@@ -616,13 +617,13 @@
brake = TRUE
update_slowdown()
-/obj/item/device/flightpack/proc/disable_airbrake()
+/obj/item/flightpack/proc/disable_airbrake()
if(wearer)
usermessage("Airbrakes retracted!", "boldwarning")
brake = FALSE
update_slowdown()
-/obj/item/device/flightpack/proc/relink_suit(obj/item/clothing/suit/space/hardsuit/flightsuit/F)
+/obj/item/flightpack/proc/relink_suit(obj/item/clothing/suit/space/hardsuit/flightsuit/F)
if(suit && suit == F)
return FALSE
else
@@ -633,13 +634,13 @@
else
suit = null
-/obj/item/device/flightpack/proc/delink_suit()
+/obj/item/flightpack/proc/delink_suit()
if(suit)
if(suit.pack && suit.pack == src)
suit.pack = null
suit = null
-/obj/item/device/flightpack/attackby(obj/item/I, mob/user, params)
+/obj/item/flightpack/attackby(obj/item/I, mob/user, params)
var/const/SuccessMessage = " has been successfully installed into systems."
var/changed = FALSE
if(istype(I, /obj/item/stock_parts))
@@ -689,13 +690,13 @@
return
/mob/living/carbon/get_flightpack()
- var/obj/item/device/flightpack/F = back
+ var/obj/item/flightpack/F = back
if(istype(F))
return F
else
return FALSE
-/obj/item/device/flightpack/proc/allow_thrust(amount)
+/obj/item/flightpack/proc/allow_thrust(amount)
if(flight)
return TRUE
@@ -707,7 +708,7 @@
icon_state = "flightshoes"
item_state = "flightshoes_mob"
var/obj/item/clothing/suit/space/hardsuit/flightsuit/suit = null
- var/obj/item/device/flightpack/pack = null
+ var/obj/item/flightpack/pack = null
var/mob/living/carbon/human/wearer = null
var/active = FALSE
permeability_coefficient = 0.01
@@ -764,7 +765,7 @@
armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 10, "bomb" = 30, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 100)
max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
var/locked_strip_delay = 80
- var/obj/item/device/flightpack/pack = null
+ var/obj/item/flightpack/pack = null
var/obj/item/clothing/shoes/flightshoes/shoes = null
var/mob/living/carbon/human/user = null
var/deployedpack = FALSE
@@ -950,7 +951,7 @@
/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/makepack()
if(!pack)
- pack = new /obj/item/device/flightpack/full(src)
+ pack = new /obj/item/flightpack/full(src)
pack.relink_suit(src)
/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/makeshoes()
@@ -977,7 +978,7 @@
pack = null
usermessage("You detach the flightpack.")
-/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/attach_pack(obj/item/device/flightpack/F)
+/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/attach_pack(obj/item/flightpack/F)
F.forceMove(src)
pack = F
pack.relink_suit(src)
@@ -1037,8 +1038,8 @@
return FALSE
detach_shoes()
return TRUE
- else if(istype(I, /obj/item/device/flightpack))
- var/obj/item/device/flightpack/F = I
+ else if(istype(I, /obj/item/flightpack))
+ var/obj/item/flightpack/F = I
if(pack)
usermessage("[src] already has a flightpack installed!", "boldwarning")
return FALSE
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 41b2334f94..68d7073612 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -97,7 +97,7 @@
item_state = "eng_hardsuit"
max_integrity = 300
armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 50, "acid" = 75)
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals, /obj/item/device/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser)
siemens_coefficient = 0
var/obj/item/clothing/head/helmet/space/hardsuit/helmet
actions_types = list(/datum/action/item_action/toggle_helmet)
@@ -235,7 +235,7 @@
heat_protection = HEAD
armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 75)
brightness_on = 7
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/device/mining_scanner, /obj/item/device/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator)
/obj/item/clothing/suit/space/hardsuit/mining
@@ -246,7 +246,7 @@
max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF
armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 75)
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals, /obj/item/storage/bag/ore, /obj/item/pickaxe)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/bag/ore, /obj/item/pickaxe)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/mining
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
@@ -437,7 +437,7 @@
name = "medical hardsuit"
desc = "A special suit that protects against hazardous, low pressure environments. Built with lightweight materials for easier movement."
item_state = "medical_hardsuit"
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals, /obj/item/storage/firstaid, /obj/item/device/healthanalyzer, /obj/item/stack/medical)
+ 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
@@ -477,8 +477,8 @@
item_state = "hardsuit-rd"
resistance_flags = ACID_PROOF | FIRE_PROOF
max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT //Same as an emergency firesuit. Not ideal for extended exposure.
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals, /obj/item/gun/energy/wormhole_projector,
- /obj/item/hand_tele, /obj/item/device/aicard)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/gun/energy/wormhole_projector,
+ /obj/item/hand_tele, /obj/item/aicard)
armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 100, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 80)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/rd
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 738d298f72..c2dad1a8f3 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -93,7 +93,7 @@ Contains:
icon_state = "void"
item_state = "void"
desc = "An old, NASA CentCom branch designed, dark red space suit."
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals, /obj/item/device/multitool)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/multitool)
/obj/item/clothing/head/helmet/space/nasavoid/old
name = "Engineering Void Helmet"
@@ -107,7 +107,7 @@ Contains:
item_state = "void"
desc = "A CentCom engineering dark red space suit. Age has degraded the suit making is difficult to move around in."
slowdown = 4
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals, /obj/item/device/multitool)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/multitool)
//Space santa outfit suit
/obj/item/clothing/head/helmet/space/santahat
diff --git a/code/modules/clothing/spacesuits/vg_spess.dm b/code/modules/clothing/spacesuits/vg_spess.dm
index 237e5ebfa6..9970cfc5bd 100644
--- a/code/modules/clothing/spacesuits/vg_spess.dm
+++ b/code/modules/clothing/spacesuits/vg_spess.dm
@@ -16,7 +16,7 @@
icon_state = "hardsuit-nazi"
slowdown = 1
armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20)
- allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/melee/)
+ allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/melee/)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/nazi
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
@@ -36,7 +36,7 @@
icon_state = "hardsuit-soviet"
slowdown = 1
armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20)
- allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/melee/)
+ allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/melee/)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/soviet
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index bb6a6ca070..bffba4a36f 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -21,7 +21,7 @@
flags_1 = THICKMATERIAL_1
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
slowdown = 1
- allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/pen, /obj/item/device/flashlight/pen, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray)
+ allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/pen, /obj/item/flashlight/pen, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 80, "fire" = 30, "acid" = 100)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
strip_delay = 70
diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm
index 03f549fbe8..8b87cf6f6e 100644
--- a/code/modules/clothing/suits/cloaks.dm
+++ b/code/modules/clothing/suits/cloaks.dm
@@ -60,7 +60,7 @@
name = "goliath cloak"
icon_state = "goliath_cloak"
desc = "A staunch, practical cape made out of numerous monster materials, it is coveted amongst exiles & hermits."
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/twohanded/spear, /obj/item/twohanded/bonespear, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife/combat/bone, /obj/item/kitchen/knife/combat/survival)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/twohanded/spear, /obj/item/twohanded/bonespear, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife/combat/bone, /obj/item/kitchen/knife/combat/survival)
armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) //a fair alternative to bone armor, requiring alternative materials and gaining a suit slot
hoodtype = /obj/item/clothing/head/hooded/cloakhood/goliath
body_parts_covered = CHEST|GROIN|ARMS
@@ -76,7 +76,7 @@
name = "drake armour"
icon_state = "dragon"
desc = "A suit of armour fashioned from the remains of an ash drake."
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/device/mining_scanner, /obj/item/device/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/twohanded/spear)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/twohanded/spear)
armor = list("melee" = 70, "bullet" = 30, "laser" = 50, "energy" = 40, "bomb" = 70, "bio" = 60, "rad" = 50, "fire" = 100, "acid" = 100)
hoodtype = /obj/item/clothing/head/hooded/cloakhood/drake
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 08338d1e7c..6c10782334 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -10,7 +10,7 @@
item_state = "apron"
blood_overlay_type = "armor"
body_parts_covered = CHEST|GROIN
- allowed = list(/obj/item/reagent_containers/spray/plantbgone, /obj/item/device/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants)
+ allowed = list(/obj/item/reagent_containers/spray/plantbgone, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants)
//Captain
/obj/item/clothing/suit/captunic
@@ -20,7 +20,7 @@
item_state = "bio_suit"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDEJUMPSUIT
- allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/device/assembly/flash/handheld, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+ allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/assembly/flash/handheld, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
//Chaplain
/obj/item/clothing/suit/hooded/chaplain_hoodie
@@ -115,7 +115,7 @@
icon_state = "hazard"
item_state = "hazard"
blood_overlay_type = "armor"
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/device/t_scanner, /obj/item/device/radio)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/t_scanner, /obj/item/radio)
resistance_flags = NONE
//Lawyer
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 11540f9932..634ec5f631 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -5,7 +5,7 @@
item_state = "labcoat"
blood_overlay_type = "coat"
body_parts_covered = CHEST|ARMS
- allowed = list(/obj/item/device/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/device/healthanalyzer, /obj/item/device/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/device/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman,/obj/item/hypospray) //CITADEL ADD, Hyposprays to laboats
+ 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/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman,/obj/item/hypospray) //CITADEL ADD, Hyposprays to laboats
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
togglename = "buttons"
species_exception = list(/datum/species/golem)
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 90ae827957..1022ae4e4f 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -93,7 +93,7 @@
item_state = "syndicate-black-red"
desc = "A plastic replica of the Syndicate space suit. You'll look just like a real murderous Syndicate agent in this! This is a toy, it is not made for use in space!"
w_class = WEIGHT_CLASS_NORMAL
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
resistance_flags = NONE
@@ -355,7 +355,7 @@
desc = "Aviators not included."
icon_state = "bomberjacket"
item_state = "brownjsuit"
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/device/radio)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/radio)
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
@@ -367,7 +367,7 @@
item_state = "hostrench"
resistance_flags = NONE
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/gun/ballistic/revolver/detective, /obj/item/device/radio)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/gun/ballistic/revolver/detective, /obj/item/radio)
/obj/item/clothing/suit/jacket/leather/overcoat
name = "leather overcoat"
@@ -397,7 +397,7 @@
desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable."
icon_state = "militaryjacket"
item_state = "militaryjacket"
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/gun/ballistic/revolver/detective, /obj/item/device/radio)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/gun/ballistic/revolver/detective, /obj/item/radio)
/obj/item/clothing/suit/jacket/letterman
name = "letterman jacket"
@@ -470,7 +470,7 @@
cold_protection = CHEST|GROIN|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
/obj/item/clothing/head/hooded/winterhood
name = "winter hood"
@@ -513,7 +513,7 @@
name = "medical winter coat"
icon_state = "coatmedical"
item_state = "coatmedical"
- allowed = list(/obj/item/device/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/device/healthanalyzer, /obj/item/device/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+ 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/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 0, "acid" = 45)
hoodtype = /obj/item/clothing/head/hooded/winterhood/medical
@@ -524,7 +524,7 @@
name = "science winter coat"
icon_state = "coatscience"
item_state = "coatscience"
- allowed = list(/obj/item/device/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/device/healthanalyzer, /obj/item/device/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+ 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/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
hoodtype = /obj/item/clothing/head/hooded/winterhood/science
@@ -536,7 +536,7 @@
icon_state = "coatengineer"
item_state = "coatengineer"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 20, "fire" = 30, "acid" = 45)
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/device/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
hoodtype = /obj/item/clothing/head/hooded/winterhood/engineering
/obj/item/clothing/head/hooded/winterhood/engineering
@@ -555,7 +555,7 @@
name = "hydroponics winter coat"
icon_state = "coathydro"
item_state = "coathydro"
- allowed = list(/obj/item/reagent_containers/spray/plantbgone, /obj/item/device/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants, /obj/item/toy, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
+ allowed = list(/obj/item/reagent_containers/spray/plantbgone, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants, /obj/item/toy, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
hoodtype = /obj/item/clothing/head/hooded/winterhood/hydro
/obj/item/clothing/head/hooded/winterhood/hydro
@@ -574,7 +574,7 @@
name = "mining winter coat"
icon_state = "coatminer"
item_state = "coatminer"
- allowed = list(/obj/item/pickaxe, /obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
+ allowed = list(/obj/item/pickaxe, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
hoodtype = /obj/item/clothing/head/hooded/winterhood/miner
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 9fce4145b7..28b82a1c43 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -18,7 +18,7 @@
gas_transfer_coefficient = 0.9
permeability_coefficient = 0.5
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/extinguisher, /obj/item/crowbar)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/extinguisher, /obj/item/crowbar)
slowdown = 1
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
@@ -141,7 +141,7 @@
permeability_coefficient = 0.5
flags_1 = THICKMATERIAL_1
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/device/geiger_counter)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/geiger_counter)
slowdown = 1.5
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 60, "rad" = 100, "fire" = 30, "acid" = 30)
strip_delay = 60
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 18ec26a9a5..f6b9b46f2f 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -614,6 +614,7 @@
/obj/item/clothing/under/plasmaman
name = "plasma envirosuit"
desc = "A special containment suit that allows plasma-based lifeforms to exist safely in an oxygenated environment, and automatically extinguishes them in a crisis. Despite being airtight, it's not spaceworthy."
+ icon = 'icons/obj/device.dmi'
icon_state = "plasmaman"
item_state = "plasmaman"
item_color = "plasmaman"
@@ -648,7 +649,7 @@
/obj/item/clothing/under/plasmaman/attackby(obj/item/E, mob/user, params)
..()
- if (istype(E, /obj/item/device/extinguisher_refill))
+ if (istype(E, /obj/item/extinguisher_refill))
if (extinguishes_left == 5)
to_chat(user, "The inbuilt extinguisher is full.")
return
@@ -660,7 +661,7 @@
return
return
-/obj/item/device/extinguisher_refill
+/obj/item/extinguisher_refill
name = "envirosuit extinguisher cartridge"
desc = "A cartridge loaded with a compressed extinguisher mix, used to refill the automatic extinguisher on plasma envirosuits."
icon_state = "plasmarefill"
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index 72d138da25..a2862fe582 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -26,7 +26,7 @@
result = /obj/item/grenade/iedcasing
reqs = list(/datum/reagent/fuel = 50,
/obj/item/stack/cable_coil = 1,
- /obj/item/device/assembly/igniter = 1,
+ /obj/item/assembly/igniter = 1,
/obj/item/reagent_containers/food/drinks/soda_cans = 1)
parts = list(/obj/item/reagent_containers/food/drinks/soda_cans = 1)
time = 15
@@ -46,9 +46,9 @@
/datum/crafting_recipe/strobeshield
name = "Strobe Shield"
- result = /obj/item/device/assembly/flash/shield
+ result = /obj/item/assembly/flash/shield
reqs = list(/obj/item/wallframe/flasher = 1,
- /obj/item/device/assembly/flash/handheld = 1,
+ /obj/item/assembly/flash/handheld = 1,
/obj/item/shield/riot = 1)
time = 40
category = CAT_WEAPONRY
@@ -69,7 +69,7 @@
result = /obj/item/melee/baton/cattleprod
reqs = list(/obj/item/restraints/handcuffs/cable = 1,
/obj/item/stack/rods = 1,
- /obj/item/device/assembly/igniter = 1)
+ /obj/item/assembly/igniter = 1)
time = 40
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
@@ -79,7 +79,7 @@
result = /obj/item/melee/baton/cattleprod/teleprod
reqs = list(/obj/item/restraints/handcuffs/cable = 1,
/obj/item/stack/rods = 1,
- /obj/item/device/assembly/igniter = 1,
+ /obj/item/assembly/igniter = 1,
/obj/item/stack/ore/bluespace_crystal = 1)
time = 40
category = CAT_WEAPONRY
@@ -133,7 +133,7 @@
/obj/item/stack/cable_coil = 1,
/obj/item/gun/energy/e_gun/advtaser = 1,
/obj/item/stock_parts/cell = 1,
- /obj/item/device/assembly/prox_sensor = 1)
+ /obj/item/assembly/prox_sensor = 1)
tools = list(TOOL_WELDER, TOOL_SCREWDRIVER)
time = 60
category = CAT_ROBOT
@@ -141,10 +141,10 @@
/datum/crafting_recipe/secbot
name = "Secbot"
result = /mob/living/simple_animal/bot/secbot
- reqs = list(/obj/item/device/assembly/signaler = 1,
+ reqs = list(/obj/item/assembly/signaler = 1,
/obj/item/clothing/head/helmet/sec = 1,
/obj/item/melee/baton = 1,
- /obj/item/device/assembly/prox_sensor = 1,
+ /obj/item/assembly/prox_sensor = 1,
/obj/item/bodypart/r_arm/robot = 1)
tools = list(TOOL_WELDER)
time = 60
@@ -154,7 +154,7 @@
name = "Cleanbot"
result = /mob/living/simple_animal/bot/cleanbot
reqs = list(/obj/item/reagent_containers/glass/bucket = 1,
- /obj/item/device/assembly/prox_sensor = 1,
+ /obj/item/assembly/prox_sensor = 1,
/obj/item/bodypart/r_arm/robot = 1)
time = 40
category = CAT_ROBOT
@@ -164,7 +164,7 @@
result = /mob/living/simple_animal/bot/floorbot
reqs = list(/obj/item/storage/toolbox/mechanical = 1,
/obj/item/stack/tile/plasteel = 1,
- /obj/item/device/assembly/prox_sensor = 1,
+ /obj/item/assembly/prox_sensor = 1,
/obj/item/bodypart/r_arm/robot = 1)
time = 40
category = CAT_ROBOT
@@ -172,9 +172,9 @@
/datum/crafting_recipe/medbot
name = "Medbot"
result = /mob/living/simple_animal/bot/medbot
- reqs = list(/obj/item/device/healthanalyzer = 1,
+ reqs = list(/obj/item/healthanalyzer = 1,
/obj/item/storage/firstaid = 1,
- /obj/item/device/assembly/prox_sensor = 1,
+ /obj/item/assembly/prox_sensor = 1,
/obj/item/bodypart/r_arm/robot = 1)
time = 40
category = CAT_ROBOT
@@ -184,7 +184,7 @@
result = /mob/living/simple_animal/bot/honkbot
reqs = list(/obj/item/storage/box/clown = 1,
/obj/item/bodypart/r_arm/robot = 1,
- /obj/item/device/assembly/prox_sensor = 1,
+ /obj/item/assembly/prox_sensor = 1,
/obj/item/bikehorn/ = 1)
time = 40
category = CAT_ROBOT
@@ -204,9 +204,9 @@
name = "Flamethrower"
result = /obj/item/flamethrower
reqs = list(/obj/item/weldingtool = 1,
- /obj/item/device/assembly/igniter = 1,
+ /obj/item/assembly/igniter = 1,
/obj/item/stack/rods = 1)
- parts = list(/obj/item/device/assembly/igniter = 1,
+ parts = list(/obj/item/assembly/igniter = 1,
/obj/item/weldingtool = 1)
tools = list(TOOL_SCREWDRIVER)
time = 10
@@ -325,11 +325,11 @@
/datum/crafting_recipe/spooky_camera
name = "Camera Obscura"
- result = /obj/item/device/camera/spooky
+ result = /obj/item/camera/spooky
time = 15
- reqs = list(/obj/item/device/camera = 1,
+ reqs = list(/obj/item/camera = 1,
/datum/reagent/water/holywater = 10)
- parts = list(/obj/item/device/camera = 1)
+ parts = list(/obj/item/camera = 1)
category = CAT_MISC
/datum/crafting_recipe/lizardhat
@@ -383,7 +383,7 @@
result = /obj/item/organ/eyes/robotic/flashlight
time = 10
reqs = list(
- /obj/item/device/flashlight = 2,
+ /obj/item/flashlight = 2,
/obj/item/restraints/handcuffs/cable = 1
)
category = CAT_MISC
@@ -576,12 +576,12 @@
/datum/crafting_recipe/pressureplate
name = "Pressure Plate"
- result = /obj/item/device/pressure_plate
+ result = /obj/item/pressure_plate
time = 5
reqs = list(/obj/item/stack/sheet/metal = 1,
/obj/item/stack/tile/plasteel = 1,
/obj/item/stack/cable_coil = 2,
- /obj/item/device/assembly/igniter = 1)
+ /obj/item/assembly/igniter = 1)
category = CAT_MISC
diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm
index e7589aa15f..5623b082a4 100644
--- a/code/modules/detectivework/scanner.dm
+++ b/code/modules/detectivework/scanner.dm
@@ -2,9 +2,10 @@
// TODO: Split everything into easy to manage procs.
-/obj/item/device/detective_scanner
+/obj/item/detective_scanner
name = "forensic scanner"
desc = "Used to remotely scan objects and biomass for DNA and fingerprints. Can print a report of the findings."
+ icon = 'icons/obj/device.dmi'
icon_state = "forensicnew"
w_class = WEIGHT_CLASS_SMALL
item_state = "electronic"
@@ -22,11 +23,11 @@
name = "Display Forensic Scanner Results"
/datum/action/item_action/displayDetectiveScanResults/Trigger()
- var/obj/item/device/detective_scanner/scanner = target
+ var/obj/item/detective_scanner/scanner = target
if(istype(scanner))
scanner.displayDetectiveScanResults(usr)
-/obj/item/device/detective_scanner/attack_self(mob/user)
+/obj/item/detective_scanner/attack_self(mob/user)
if(log.len && !scanning)
scanning = 1
to_chat(user, "Printing report, please wait...")
@@ -34,10 +35,10 @@
else
to_chat(user, "The scanner has no logs or is in use.")
-/obj/item/device/detective_scanner/attack(mob/living/M, mob/user)
+/obj/item/detective_scanner/attack(mob/living/M, mob/user)
return
-/obj/item/device/detective_scanner/proc/PrintReport()
+/obj/item/detective_scanner/proc/PrintReport()
// Create our paper
var/obj/item/paper/P = new(get_turf(src))
P.name = "paper- 'Scanner Report'"
@@ -56,11 +57,11 @@
log = list()
scanning = 0
-/obj/item/device/detective_scanner/afterattack(atom/A, mob/user, params)
+/obj/item/detective_scanner/afterattack(atom/A, mob/user, params)
scan(A, user)
return FALSE
-/obj/item/device/detective_scanner/proc/scan(atom/A, mob/user)
+/obj/item/detective_scanner/proc/scan(atom/A, mob/user)
set waitfor = 0
if(!scanning)
// Can remotely scan objects and mobs.
@@ -164,7 +165,7 @@
scanning = 0
return
-/obj/item/device/detective_scanner/proc/add_log(msg, broadcast = 1)
+/obj/item/detective_scanner/proc/add_log(msg, broadcast = 1)
if(scanning)
if(broadcast && ismob(loc))
var/mob/M = loc
@@ -175,8 +176,8 @@
/proc/get_timestamp()
return time2text(world.time + 432000, ":ss")
-
-/obj/item/device/detective_scanner/AltClick(mob/living/user)
+
+/obj/item/detective_scanner/AltClick(mob/living/user)
// Best way for checking if a player can use while not incapacitated, etc
if(!user.canUseTopic(src, be_close=TRUE))
return
@@ -189,7 +190,7 @@
to_chat(user, "The scanner logs are cleared.")
log = list()
-/obj/item/device/detective_scanner/proc/displayDetectiveScanResults(mob/living/user)
+/obj/item/detective_scanner/proc/displayDetectiveScanResults(mob/living/user)
// No need for can-use checks since the action button should do proper checks
if(!LAZYLEN(log))
to_chat(user, "Cannot display logs, the scanner has no logs.")
diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm
index 09ae59503e..47dafc11db 100644
--- a/code/modules/events/pirates.dm
+++ b/code/modules/events/pirates.dm
@@ -94,13 +94,13 @@
density = TRUE
anchored = TRUE
var/active = FALSE
- var/obj/item/device/gps/gps
+ var/obj/item/gps/gps
var/credits_stored = 0
var/siphon_per_tick = 5
/obj/machinery/shuttle_scrambler/Initialize(mapload)
. = ..()
- gps = new/obj/item/device/gps/internal/pirate(src)
+ gps = new/obj/item/gps/internal/pirate(src)
gps.tracking = FALSE
update_icon()
@@ -174,7 +174,7 @@
QDEL_NULL(gps)
return ..()
-/obj/item/device/gps/internal/pirate
+/obj/item/gps/internal/pirate
gpstag = "Nautical Signal"
desc = "You can hear shanties over the static."
diff --git a/code/modules/fields/fields.dm b/code/modules/fields/fields.dm
index e07844c4b4..0fdd2699d6 100644
--- a/code/modules/fields/fields.dm
+++ b/code/modules/fields/fields.dm
@@ -276,7 +276,7 @@
..()
//DEBUG FIELD ITEM
-/obj/item/device/multitool/field_debug
+/obj/item/multitool/field_debug
name = "strange multitool"
desc = "Seems to project a colored field!"
var/list/field_params = list("field_shape" = FIELD_SHAPE_RADIUS_SQUARE, "current_range" = 5, "set_fieldturf_color" = "#aaffff", "set_edgeturf_color" = "#ffaaff")
@@ -285,22 +285,22 @@
var/datum/proximity_monitor/advanced/current = null
var/datum/component/mobhook
-/obj/item/device/multitool/field_debug/Initialize()
+/obj/item/multitool/field_debug/Initialize()
. = ..()
START_PROCESSING(SSobj, src)
-/obj/item/device/multitool/field_debug/Destroy()
+/obj/item/multitool/field_debug/Destroy()
STOP_PROCESSING(SSobj, src)
QDEL_NULL(current)
QDEL_NULL(mobhook)
return ..()
-/obj/item/device/multitool/field_debug/proc/setup_debug_field()
+/obj/item/multitool/field_debug/proc/setup_debug_field()
var/list/new_params = field_params.Copy()
new_params["host"] = src
current = make_field(field_type, new_params)
-/obj/item/device/multitool/field_debug/attack_self(mob/user)
+/obj/item/multitool/field_debug/attack_self(mob/user)
operating = !operating
to_chat(user, "You turn [src] [operating? "on":"off"].")
QDEL_NULL(mobhook)
@@ -310,15 +310,15 @@
else if(!operating)
QDEL_NULL(current)
-/obj/item/device/multitool/field_debug/dropped()
+/obj/item/multitool/field_debug/dropped()
. = ..()
QDEL_NULL(mobhook)
-/obj/item/device/multitool/field_debug/proc/on_mob_move()
+/obj/item/multitool/field_debug/proc/on_mob_move()
check_turf(get_turf(src))
-/obj/item/device/multitool/field_debug/process()
+/obj/item/multitool/field_debug/process()
check_turf(get_turf(src))
-/obj/item/device/multitool/field_debug/proc/check_turf(turf/T)
+/obj/item/multitool/field_debug/proc/check_turf(turf/T)
current.HandleMove()
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 621bca26ff..4006bb50b7 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -578,13 +578,13 @@ GLOBAL_LIST_INIT(hallucinations_major, list(
/obj/item/cartridge/virus/syndicate, /obj/item/clothing/under/chameleon,\
/obj/item/clothing/shoes/chameleon/noslip, /obj/item/card/id/syndicate,\
/obj/item/clothing/mask/chameleon, /obj/item/clothing/glasses/thermal,\
- /obj/item/device/chameleon, /obj/item/card/emag, /obj/item/grenade/plastic/x4,\
+ /obj/item/chameleon, /obj/item/card/emag, /obj/item/grenade/plastic/x4,\
/obj/item/storage/toolbox/syndicate, /obj/item/aiModule,\
- /obj/item/device/radio/headset/syndicate, /obj/item/grenade/plastic/c4,\
- /obj/item/device/powersink, /obj/item/storage/box/syndie_kit,\
+ /obj/item/radio/headset/syndicate, /obj/item/grenade/plastic/c4,\
+ /obj/item/powersink, /obj/item/storage/box/syndie_kit,\
/obj/item/toy/syndicateballoon, /obj/item/gun/energy/laser/captain,\
/obj/item/hand_tele, /obj/item/construction/rcd, /obj/item/tank/jetpack,\
- /obj/item/clothing/under/rank/captain, /obj/item/device/aicard,\
+ /obj/item/clothing/under/rank/captain, /obj/item/aicard,\
/obj/item/clothing/shoes/magboots, /obj/item/areaeditor/blueprints, /obj/item/disk/nuclear,\
/obj/item/clothing/suit/space/nasavoid, /obj/item/tank)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
index fe2f5b986c..ebea393397 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
@@ -41,7 +41,7 @@ God bless America.
/obj/item/crowbar,
/obj/item/wrench,
/obj/item/wirecutters,
- /obj/item/device/multitool,
+ /obj/item/multitool,
/obj/item/weldingtool,
/obj/item/reagent_containers/glass,
/obj/item/reagent_containers/syringe,
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 2f7356820b..2522ec9cf2 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -344,12 +344,12 @@
/obj/machinery/smartfridge/extract/accept_check(obj/item/O)
if(istype(O, /obj/item/slime_extract))
return TRUE
- if(istype(O, /obj/item/device/slime_scanner))
+ if(istype(O, /obj/item/slime_scanner))
return TRUE
return FALSE
/obj/machinery/smartfridge/extract/preloaded
- initial_contents = list(/obj/item/device/slime_scanner = 2)
+ initial_contents = list(/obj/item/slime_scanner = 2)
// -----------------------------
// Chemistry Medical Smartfridge
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index c102c03873..5b9c1f4e70 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -60,7 +60,7 @@
/obj/item/reagent_containers/food/snacks/grown/attackby(obj/item/O, mob/user, params)
..()
- if (istype(O, /obj/item/device/plant_analyzer))
+ if (istype(O, /obj/item/plant_analyzer))
var/msg = "*---------*\n This is \a [src].\n"
if(seed)
msg += seed.get_analyzer_text()
diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm
index 73a2ba14f3..89206342b1 100644
--- a/code/modules/hydroponics/grown/towercap.dm
+++ b/code/modules/hydroponics/grown/towercap.dm
@@ -68,7 +68,7 @@
var/obj/item/reagent_containers/food/snacks/grown/leaf = W
if(leaf.dry)
user.show_message("You wrap \the [W] around the log, turning it into a torch!")
- var/obj/item/device/flashlight/flare/torch/T = new /obj/item/device/flashlight/flare/torch(user.loc)
+ var/obj/item/flashlight/flare/torch/T = new /obj/item/flashlight/flare/torch(user.loc)
usr.dropItemToGround(W)
usr.put_in_active_hand(T)
qdel(leaf)
diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm
index 76e42c722b..5aeef19b1a 100644
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -34,7 +34,7 @@
/obj/item/grown/attackby(obj/item/O, mob/user, params)
..()
- if (istype(O, /obj/item/device/plant_analyzer))
+ if (istype(O, /obj/item/plant_analyzer))
var/msg = "*---------*\n This is \a [src]\n"
if(seed)
msg += seed.get_analyzer_text()
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index 1c3509fa4e..31e888fdad 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -1,5 +1,5 @@
// Plant analyzer
-/obj/item/device/plant_analyzer
+/obj/item/plant_analyzer
name = "plant analyzer"
desc = "A scanner used to evaluate a plant's various areas of growth."
icon = 'icons/obj/device.dmi'
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 409af32f15..3890c8e317 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -758,7 +758,7 @@
else
to_chat(user, "[src] already has seeds in it!")
- else if(istype(O, /obj/item/device/plant_analyzer))
+ else if(istype(O, /obj/item/plant_analyzer))
if(myseed)
to_chat(user, "*** [myseed.plantname] ***" )
to_chat(user, "- Plant Age: [age]")
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index f0c3e18cd9..4ba1aa0c33 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -311,7 +311,7 @@
return
/obj/item/seeds/attackby(obj/item/O, mob/user, params)
- if (istype(O, /obj/item/device/plant_analyzer))
+ if (istype(O, /obj/item/plant_analyzer))
to_chat(user, "*---------*\n This is \a [src].")
var/text = get_analyzer_text()
if(text)
diff --git a/code/modules/integrated_electronics/core/analyzer.dm b/code/modules/integrated_electronics/core/analyzer.dm
index bd7804bf45..89b990f352 100644
--- a/code/modules/integrated_electronics/core/analyzer.dm
+++ b/code/modules/integrated_electronics/core/analyzer.dm
@@ -1,4 +1,4 @@
-/obj/item/device/integrated_electronics/analyzer
+/obj/item/integrated_electronics/analyzer
name = "circuit analyzer"
desc = "This tool can scan an assembly and generate code necessary to recreate it in a circuit printer."
icon = 'icons/obj/assemblies/electronic_tools.dmi'
@@ -6,8 +6,8 @@
flags_1 = CONDUCT_1
w_class = WEIGHT_CLASS_SMALL
-/obj/item/device/integrated_electronics/analyzer/afterattack(var/atom/A, var/mob/living/user)
- if(istype(A, /obj/item/device/electronic_assembly))
+/obj/item/integrated_electronics/analyzer/afterattack(var/atom/A, var/mob/living/user)
+ if(istype(A, /obj/item/electronic_assembly))
var/saved = "[A.name] analyzed! On circuit printers with cloning enabled, you may use the code below to clone the circuit:
[SScircuit.save_electronic_assembly(A)]"
if(saved)
to_chat(user, "You scan [A].")
diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm
index df1ea857ac..d44682991a 100644
--- a/code/modules/integrated_electronics/core/assemblies.dm
+++ b/code/modules/integrated_electronics/core/assemblies.dm
@@ -1,7 +1,7 @@
#define IC_MAX_SIZE_BASE 25
#define IC_COMPLEXITY_BASE 75
-/obj/item/device/electronic_assembly
+/obj/item/electronic_assembly
name = "electronic assembly"
obj_flags = CAN_BE_HIT
desc = "It's a case, for building small electronics with."
@@ -54,17 +54,17 @@
COLOR_ASSEMBLY_PURPLE
)
-/obj/item/device/electronic_assembly/examine(mob/user)
+/obj/item/electronic_assembly/examine(mob/user)
. = ..()
if(can_anchor)
to_chat(user, "The anchoring bolts [anchored ? "are" : "can be"] wrenched in place and the maintainence panel [opened ? "can be" : "is"] screwed in place.")
else
to_chat(user, "The maintainence panel [opened ? "can be" : "is"] screwed in place.")
-/obj/item/device/electronic_assembly/proc/check_interactivity(mob/user)
+/obj/item/electronic_assembly/proc/check_interactivity(mob/user)
return user.canUseTopic(src, BE_CLOSE)
-/obj/item/device/electronic_assembly/Collide(atom/AM)
+/obj/item/electronic_assembly/Collide(atom/AM)
collw = AM
.=..()
if((istype(collw, /obj/machinery/door/airlock) || istype(collw, /obj/machinery/door/window)) && (!isnull(access_card)))
@@ -72,7 +72,7 @@
if(D.check_access(access_card))
D.open()
-/obj/item/device/electronic_assembly/Initialize()
+/obj/item/electronic_assembly/Initialize()
.=..()
START_PROCESSING(SScircuit, src)
materials[MAT_METAL] = round((max_complexity + max_components) / 4) * SScircuit.cost_multiplier
@@ -88,14 +88,14 @@
access_card = new /obj/item/card/id(src)
-/obj/item/device/electronic_assembly/Destroy()
+/obj/item/electronic_assembly/Destroy()
STOP_PROCESSING(SScircuit, src)
for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
diag_hud.remove_from_hud(src)
QDEL_NULL(access_card)
return ..()
-/obj/item/device/electronic_assembly/process()
+/obj/item/electronic_assembly/process()
handle_idle_power()
check_pulling()
@@ -103,7 +103,7 @@
diag_hud_set_circuithealth()
diag_hud_set_circuitcell()
-/obj/item/device/electronic_assembly/proc/handle_idle_power()
+/obj/item/electronic_assembly/proc/handle_idle_power()
// First we generate power.
for(var/obj/item/integrated_circuit/passive/power/P in assembly_components)
P.make_energy()
@@ -115,10 +115,10 @@
if(!draw_power(IC.power_draw_idle))
IC.power_fail()
-/obj/item/device/electronic_assembly/interact(mob/user)
+/obj/item/electronic_assembly/interact(mob/user)
ui_interact(user)
-/obj/item/device/electronic_assembly/ui_interact(mob/user)
+/obj/item/electronic_assembly/ui_interact(mob/user)
. = ..()
if(!check_interactivity(user))
return
@@ -176,7 +176,7 @@
HTML += "