diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index fc3f2852fc..00dc7b1d10 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,15 +7,5 @@
#deathride58
/modular_citadel/ @deathride58
-#LetterJay
-/modular_citadel/code/modules/client/loadout/__donator.dm @LetterJay
-
-#Poojawa
-
-/modular_citadel/code/modules/vore @Poojawa
-/code/game/objects/items/devices/dogborg_sleeper.dm @Poojawa
-/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm @Poojawa
-/tgui/ @Poojawa
-/modular_citadel/code/modules/clothing/spacesuits/flightsuit.dm @Poojawa
-/modular_citadel/code/game/objects/ids.dm @Poojawa
-/sound/vore @Poojawa
\ No newline at end of file
+#LetterJay
+/modular_citadel/code/modules/client/loadout/__donator.dm @LetterJay
diff --git a/.travis.yml b/.travis.yml
index 60a2a7e7b4..fa42ba3aef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ env:
- BYOND_MAJOR="512"
- BYOND_MINOR="1418"
- NODE_VERSION="4"
- - RUST_G_VERSION="0.2.0"
+ - RUST_G_VERSION="0.3.0"
- BUILD_TOOLS=false
- BUILD_TESTING=false
- DM_MAPFILE="loadallmaps"
@@ -21,8 +21,6 @@ cache:
directories:
- $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}
- tgui/node_modules
- - $HOME/.rustup
- - $HOME/.cargo
addons:
@@ -34,6 +32,7 @@ addons:
- gcc-multilib
- python3
- python3-pip
+ - libssl-dev:i386
install:
- tools/travis/install_build_tools.sh
diff --git a/SQL/database_changelog.txt b/SQL/database_changelog.txt
index 6e6bd7f7ca..83bc78050d 100644
--- a/SQL/database_changelog.txt
+++ b/SQL/database_changelog.txt
@@ -2,14 +2,22 @@ Any time you make a change to the schema files, remember to increment the databa
The latest database version is 4.1; The query to update the schema revision table is:
-INSERT INTO `schema_revision` (`major`, `minor`) VALUES (4, 1);
+INSERT INTO `schema_revision` (`major`, `minor`) VALUES (4, 2);
or
-INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (4, 1);
+INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (4, 2);
In any query remember to add a prefix to the table names if you use one.
----------------------------------------------------
+Version 4.2, 17 April 2018, by Jordie0608
+Modified table 'admin', adding the columns 'round_id' and 'target'
+ALTER TABLE `admin_log`
+ ADD COLUMN `round_id` INT UNSIGNED NOT NULL AFTER `datetime`,
+ ADD COLUMN `target` VARCHAR(32) NOT NULL AFTER `operation`;
+
+----------------------------------------------------
+
Version 4.1, 3 February 2018, by Jordie0608
Modified tables 'admin', 'admin_log' and 'admin_rank', removing unnecessary columns and adding support for excluding rights flags from admin ranks.
This change was made to enable use of sql-based admin loading.
@@ -41,7 +49,6 @@ ALTER TABLE `admin_ranks`
DROP PRIMARY KEY,
ADD PRIMARY KEY (`rank`);
-
----------------------------------------------------
Version 4.0, 12 November 2017, by Jordie0608
diff --git a/SQL/tgstation_schema.sql b/SQL/tgstation_schema.sql
index ddd31a7e80..92411ea895 100644
--- a/SQL/tgstation_schema.sql
+++ b/SQL/tgstation_schema.sql
@@ -33,9 +33,11 @@ DROP TABLE IF EXISTS `admin_log`;
CREATE TABLE `admin_log` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`datetime` datetime NOT NULL,
+ `round_id` int(11) unsigned NOT NULL,
`adminckey` varchar(32) NOT NULL,
`adminip` int(10) unsigned NOT NULL,
`operation` enum('add admin','remove admin','change admin rank','add rank','remove rank','change rank flags') NOT NULL,
+ `target` varchar(32) NOT NULL,
`log` varchar(1000) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
diff --git a/SQL/tgstation_schema_prefixed.sql b/SQL/tgstation_schema_prefixed.sql
index 01e0ed150b..de9d67e335 100644
--- a/SQL/tgstation_schema_prefixed.sql
+++ b/SQL/tgstation_schema_prefixed.sql
@@ -33,9 +33,11 @@ DROP TABLE IF EXISTS `SS13_admin_log`;
CREATE TABLE `SS13_admin_log` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`datetime` datetime NOT NULL,
+ `round_id` int(11) unsigned NOT NULL,
`adminckey` varchar(32) NOT NULL,
`adminip` int(10) unsigned NOT NULL,
`operation` enum('add admin','remove admin','change admin rank','add rank','remove rank','change rank flags') NOT NULL,
+ `target` varchar(32) NOT NULL,
`log` varchar(1000) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
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..ba9b8b5c36 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -20,11 +20,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -44,11 +41,9 @@
/turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/main)
"ag" = (
-/obj/machinery/airalarm{
+/obj/machinery/airalarm/syndicate{
dir = 4;
- pixel_x = -24;
- req_access = null;
- req_access_txt = "150"
+ pixel_x = -24
},
/turf/open/floor/plasteel/red/side{
dir = 8
@@ -100,9 +95,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/chem_dispenser,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/chem_dispenser/fullupgrade,
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/chemistry)
"cA" = (
@@ -187,21 +182,16 @@
/area/ruin/unpowered/syndicate_lava_base/cargo)
"dA" = (
/obj/structure/closet/l3closet,
-/obj/machinery/power/apc{
+/obj/machinery/power/apc/syndicate{
dir = 8;
name = "Chemistry APC";
- pixel_x = -24;
- req_access = null;
- req_access_txt = "150"
+ pixel_x = -24
},
/obj/structure/cable/yellow{
icon_state = "0-2"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 6
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/white/side{
@@ -209,11 +199,8 @@
},
/area/ruin/unpowered/syndicate_lava_base/chemistry)
"dB" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+ dir = 8
},
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/chemistry)
@@ -287,10 +274,8 @@
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"dL" = (
-/obj/machinery/airalarm{
- pixel_y = 24;
- req_access = null;
- req_access_txt = "150"
+/obj/machinery/airalarm/syndicate{
+ pixel_y = 24
},
/obj/structure/closet/crate,
/obj/item/extinguisher{
@@ -305,24 +290,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
},
@@ -390,11 +375,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel/white/side{
dir = 8
},
@@ -437,11 +418,9 @@
pixel_x = -3
},
/obj/item/reagent_containers/dropper,
-/obj/machinery/airalarm{
+/obj/machinery/airalarm/syndicate{
dir = 8;
- pixel_x = 24;
- req_access = null;
- req_access_txt = "150"
+ pixel_x = 24
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/white/side{
@@ -512,11 +491,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
@@ -529,12 +508,10 @@
/obj/structure/cable/yellow{
icon_state = "0-2"
},
-/obj/machinery/power/apc{
+/obj/machinery/power/apc/syndicate{
dir = 1;
name = "Cargo Bay APC";
- pixel_y = 24;
- req_access = null;
- req_access_txt = "150"
+ pixel_y = 24
},
/obj/structure/closet/emcloset/anchored,
/obj/effect/decal/cleanable/dirt,
@@ -649,27 +626,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,
@@ -689,11 +666,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel/white/side{
dir = 8
},
@@ -730,27 +703,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
},
@@ -779,11 +752,8 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 6
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -796,11 +766,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{
@@ -814,11 +781,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 1
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -832,11 +796,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/mining/glass{
@@ -854,11 +815,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/cargo)
@@ -870,11 +828,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 10
},
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/cargo)
@@ -955,28 +910,20 @@
dir = 1;
pixel_y = -24
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+ dir = 4
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/ruin/unpowered/syndicate_lava_base/testlab)
"eN" = (
-/obj/machinery/airalarm{
+/obj/machinery/airalarm/syndicate{
dir = 1;
- pixel_y = -24;
- req_access = null;
- req_access_txt = "150"
+ pixel_y = -24
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -987,11 +934,8 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -1004,11 +948,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 10
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -1018,7 +959,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;
@@ -1037,11 +978,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel/white/side{
dir = 10
},
@@ -1063,8 +1000,8 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/chem_dispenser,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/chem_dispenser/fullupgrade,
/turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/chemistry)
"eV" = (
@@ -1078,11 +1015,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -1118,11 +1051,8 @@
/obj/item/storage/box/donkpockets{
pixel_x = 2
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+ dir = 1
},
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered/syndicate_lava_base/cargo)
@@ -1155,20 +1085,14 @@
/area/ruin/unpowered/syndicate_lava_base/cargo)
"fc" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 5
},
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"fd" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+ dir = 8
},
/turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/cargo)
@@ -1182,11 +1106,8 @@
/turf/open/floor/mineral/plastitanium,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"ff" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+ dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/white/side{
@@ -1195,22 +1116,16 @@
/area/ruin/unpowered/syndicate_lava_base/virology)
"fg" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 10
},
/turf/open/floor/plasteel/white/side{
dir = 6
},
/area/ruin/unpowered/syndicate_lava_base/virology)
"fh" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+ dir = 4
},
/turf/open/floor/plasteel/white/side{
dir = 10
@@ -1223,12 +1138,10 @@
pixel_y = 2
},
/obj/item/storage/box/syringes,
-/obj/machinery/power/apc{
+/obj/machinery/power/apc/syndicate{
dir = 1;
name = "Virology APC";
- pixel_y = 24;
- req_access = null;
- req_access_txt = "150"
+ pixel_y = 24
},
/obj/structure/cable/yellow{
icon_state = "0-2"
@@ -1244,7 +1157,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,
@@ -1257,12 +1170,10 @@
},
/area/ruin/unpowered/syndicate_lava_base/virology)
"fk" = (
-/obj/machinery/power/apc{
+/obj/machinery/power/apc/syndicate{
dir = 2;
name = "Experimentation Lab APC";
- pixel_y = -24;
- req_access = null;
- req_access_txt = "150"
+ pixel_y = -24
},
/obj/structure/cable/yellow{
icon_state = "0-4"
@@ -1274,11 +1185,7 @@
/area/ruin/unpowered/syndicate_lava_base/testlab)
"fl" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/structure/extinguisher_cabinet{
pixel_x = 25
},
@@ -1299,11 +1206,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/syndicate_lava_base/chemistry)
"fn" = (
@@ -1349,11 +1252,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{
dir = 5
@@ -1364,40 +1263,12 @@
dir = 8
},
/obj/structure/closet/crate,
-/obj/item/stock_parts/capacitor/quadratic,
-/obj/item/stock_parts/capacitor/quadratic,
-/obj/item/stock_parts/cell/bluespace{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/stock_parts/cell/bluespace{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/stock_parts/manipulator/femto{
- pixel_x = -4;
- pixel_y = 4
- },
-/obj/item/stock_parts/manipulator/femto{
- pixel_x = -4;
- pixel_y = 4
- },
-/obj/item/stock_parts/matter_bin/bluespace{
- pixel_x = -6;
- pixel_y = 6
- },
-/obj/item/stock_parts/matter_bin/bluespace{
- pixel_x = -6;
- pixel_y = 6
- },
-/obj/item/stock_parts/micro_laser/quadultra,
-/obj/item/stock_parts/micro_laser/quadultra,
-/obj/item/stock_parts/scanning_module/triphasic{
- pixel_x = -4
- },
-/obj/item/stock_parts/scanning_module/triphasic{
- pixel_x = -4
- },
+/obj/item/storage/box/stockparts/deluxe,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/circuitboard/machine/processor,
+/obj/item/circuitboard/machine/gibber,
+/obj/item/circuitboard/machine/deep_fryer,
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"ft" = (
@@ -1428,11 +1299,9 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/machinery/airalarm{
+/obj/machinery/airalarm/syndicate{
dir = 4;
- pixel_x = -24;
- req_access = null;
- req_access_txt = "150"
+ pixel_x = -24
},
/obj/structure/table,
/obj/item/clothing/suit/hazardvest,
@@ -1443,10 +1312,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{
@@ -1476,11 +1345,7 @@
req_access_txt = "150"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/syndicate_lava_base/virology)
"fz" = (
@@ -1489,11 +1354,7 @@
req_access_txt = "150"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/syndicate_lava_base/virology)
"fA" = (
@@ -1536,10 +1397,8 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/machinery/airalarm{
- pixel_y = 24;
- req_access = null;
- req_access_txt = "150"
+/obj/machinery/airalarm/syndicate{
+ pixel_y = 24
},
/turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/main)
@@ -1553,11 +1412,7 @@
"fG" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/door/airlock/hatch{
name = "Experimentation Lab";
req_access_txt = "150"
@@ -1581,11 +1436,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel/white/side{
dir = 1
},
@@ -1601,11 +1452,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/door/airlock/mining/glass{
name = "Warehouse";
req_access_txt = "150"
@@ -1704,11 +1551,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 5
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/white,
@@ -1717,11 +1561,8 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 1
},
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/syndicate_lava_base/virology)
@@ -1729,21 +1570,15 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/syndicate_lava_base/virology)
"gs" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 2
},
/obj/machinery/light/small,
/obj/effect/decal/cleanable/dirt,
@@ -1753,11 +1588,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 1
},
/turf/open/floor/plasteel/white/side{
dir = 9
@@ -1767,11 +1599,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "1-4"
@@ -1784,11 +1613,8 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
@@ -1800,11 +1626,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -1820,11 +1643,8 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -1838,11 +1658,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 1
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -1867,11 +1684,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -1885,11 +1699,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -1903,11 +1714,7 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -1926,11 +1733,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/main)
@@ -1941,11 +1745,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/main)
@@ -1954,11 +1755,8 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 2
},
/obj/structure/cable/yellow{
icon_state = "1-8"
@@ -1972,11 +1770,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/main)
@@ -1988,11 +1783,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/main)
@@ -2006,11 +1798,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/turf/open/floor/plasteel/brown/corner{
dir = 4
@@ -2023,11 +1812,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 9
},
/turf/open/floor/plasteel/brown{
dir = 1
@@ -2087,30 +1873,21 @@
req_access_txt = "150"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/syndicate_lava_base/virology)
"gU" = (
-/obj/machinery/airalarm{
+/obj/machinery/airalarm/syndicate{
dir = 4;
- pixel_x = -24;
- req_access = null;
- req_access_txt = "150"
+ pixel_x = -24
},
/obj/structure/sink{
dir = 8;
pixel_x = -12;
pixel_y = 2
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+ dir = 1
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/white/side{
@@ -2179,11 +1956,8 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+ dir = 1
},
/turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/main)
@@ -2198,11 +1972,7 @@
/area/ruin/unpowered/syndicate_lava_base/main)
"hc" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -2289,11 +2059,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel/white/side{
dir = 1
},
@@ -2369,18 +2135,12 @@
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/main)
"hx" = (
-/obj/machinery/airalarm{
+/obj/machinery/airalarm/syndicate{
dir = 4;
- pixel_x = -24;
- req_access = null;
- req_access_txt = "150"
+ pixel_x = -24
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -2435,11 +2195,8 @@
/area/ruin/unpowered/syndicate_lava_base/virology)
"hF" = (
/obj/machinery/light/small,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+ dir = 1
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/white/side,
@@ -2480,7 +2237,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,
@@ -2491,11 +2248,7 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -2507,10 +2260,8 @@
/obj/structure/table/wood,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/sniper_rounds,
-/obj/machinery/airalarm{
- pixel_y = 24;
- req_access = null;
- req_access_txt = "150"
+/obj/machinery/airalarm/syndicate{
+ pixel_y = 24
},
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
@@ -2518,11 +2269,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"hO" = (
@@ -2532,20 +2279,14 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"hQ" = (
/obj/structure/table/wood,
/obj/item/ammo_box/magazine/m10mm,
-/obj/machinery/airalarm{
- pixel_y = 24;
- req_access = null;
- req_access_txt = "150"
+/obj/machinery/airalarm/syndicate{
+ pixel_y = 24
},
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
@@ -2620,22 +2361,16 @@
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 8;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 8
},
/turf/open/floor/plasteel/red/side{
dir = 8
},
/area/ruin/unpowered/syndicate_lava_base/main)
"ia" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+ dir = 8
},
/turf/open/floor/plasteel/red/side{
dir = 4
@@ -2650,11 +2385,7 @@
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"ic" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"id" = (
@@ -2718,11 +2449,7 @@
/area/ruin/unpowered/syndicate_lava_base/main)
"ij" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -2740,11 +2467,7 @@
name = "Cabin 2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"im" = (
@@ -2761,11 +2484,7 @@
name = "Cabin 4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"ip" = (
@@ -2844,11 +2563,7 @@
/area/ruin/unpowered/syndicate_lava_base/main)
"ix" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -2868,21 +2583,15 @@
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"iA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/neutral/side{
dir = 1
},
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"iB" = (
-/obj/machinery/airalarm{
- pixel_y = 24;
- req_access = null;
- req_access_txt = "150"
+/obj/machinery/airalarm/syndicate{
+ pixel_y = 24
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/effect/decal/cleanable/dirt,
@@ -2901,22 +2610,14 @@
dir = 2;
pixel_y = 24
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
/turf/open/floor/plasteel/neutral/corner{
dir = 4
},
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"iE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel/neutral/side{
dir = 1
},
@@ -2968,11 +2669,9 @@
/turf/open/floor/circuit/red,
/area/ruin/unpowered/syndicate_lava_base/main)
"iL" = (
-/obj/machinery/airalarm{
+/obj/machinery/airalarm/syndicate{
dir = 8;
- pixel_x = 24;
- req_access = null;
- req_access_txt = "150"
+ pixel_x = 24
},
/turf/open/floor/circuit/red,
/area/ruin/unpowered/syndicate_lava_base/main)
@@ -3004,11 +2703,8 @@
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 5
},
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/main)
@@ -3016,11 +2712,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -3035,11 +2728,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -3050,11 +2740,8 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 1
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -3065,11 +2752,8 @@
"iT" = (
/obj/machinery/light/small,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 2
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -3081,11 +2765,8 @@
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"iU" = (
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 1
},
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -3099,18 +2780,13 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
-/obj/machinery/power/apc{
+/obj/machinery/power/apc/syndicate{
dir = 2;
name = "Dormitories APC";
- pixel_y = -24;
- req_access = null;
- req_access_txt = "150"
+ pixel_y = -24
},
/obj/structure/cable/yellow{
icon_state = "0-8"
@@ -3121,11 +2797,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/neutral/side,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
@@ -3133,11 +2805,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 9
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/neutral/corner{
@@ -3217,22 +2886,14 @@
name = "Cabin 1"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"jg" = (
/obj/machinery/door/airlock/maintenance,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -3244,23 +2905,17 @@
name = "Cabin 3"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"ji" = (
/obj/structure/cable/yellow{
icon_state = "0-2"
},
-/obj/machinery/power/apc{
+/obj/machinery/power/apc/syndicate{
dir = 8;
name = "Primary Hallway APC";
- pixel_x = -24;
- req_access = null;
- req_access_txt = "150"
+ pixel_x = -24
},
/turf/open/floor/plasteel/red/side{
dir = 8
@@ -3292,10 +2947,8 @@
icon_state = "sleeper_s";
dir = 4
},
-/obj/machinery/airalarm{
- pixel_y = 24;
- req_access = null;
- req_access_txt = "150"
+/obj/machinery/airalarm/syndicate{
+ pixel_y = 24
},
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
@@ -3303,20 +2956,12 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"jp" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -3328,10 +2973,8 @@
dir = 8;
icon_state = "sleeper_s"
},
-/obj/machinery/airalarm{
- pixel_y = 24;
- req_access = null;
- req_access_txt = "150"
+/obj/machinery/airalarm/syndicate{
+ pixel_y = 24
},
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
@@ -3373,11 +3016,7 @@
/area/ruin/unpowered/syndicate_lava_base/engineering)
"jw" = (
/obj/effect/turf_decal/bot,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/toolcloset{
anchored = 1
@@ -3414,11 +3053,8 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+ dir = 1
},
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
@@ -3426,11 +3062,8 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+ dir = 1
},
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
@@ -3453,11 +3086,8 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 6
},
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/main)
@@ -3468,11 +3098,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/turf/open/floor/plasteel/yellow/side{
dir = 4
@@ -3487,11 +3114,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/machinery/door/airlock/engineering{
name = "Engineering";
@@ -3509,11 +3133,8 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/engineering)
@@ -3524,11 +3145,9 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/airalarm{
+/obj/machinery/airalarm/syndicate{
dir = 8;
- pixel_x = 24;
- req_access = null;
- req_access_txt = "150"
+ pixel_x = 24
},
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -3536,29 +3155,20 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 4
},
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"jJ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 6;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3{
+ dir = 6
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"jK" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer3{
+ dir = 8
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/syndicate_lava_base/engineering)
@@ -3608,11 +3218,7 @@
/area/ruin/unpowered/syndicate_lava_base/bar)
"jQ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -3631,11 +3237,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/main)
"jT" = (
@@ -3678,11 +3280,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/engineering)
@@ -3720,11 +3318,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 6
},
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -3734,11 +3329,8 @@
/area/ruin/unpowered/syndicate_lava_base/main)
"kd" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 2
},
/obj/structure/cable/yellow{
icon_state = "1-4"
@@ -3753,11 +3345,8 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 1
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -3772,11 +3361,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -3787,11 +3373,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -3804,11 +3387,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -3822,20 +3402,14 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 2
},
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/main)
"kj" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+ dir = 8
},
/obj/structure/chair{
dir = 8
@@ -3849,11 +3423,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/door/airlock/engineering{
name = "Engineering";
req_access_txt = "150"
@@ -3861,11 +3431,7 @@
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"kl" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"km" = (
@@ -3884,11 +3450,8 @@
},
/area/ruin/unpowered/syndicate_lava_base/bar)
"ko" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+ dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{
@@ -3896,20 +3459,15 @@
},
/area/ruin/unpowered/syndicate_lava_base/bar)
"kp" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 10
},
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered/syndicate_lava_base/bar)
"kq" = (
-/obj/machinery/airalarm{
+/obj/machinery/airalarm/syndicate{
dir = 8;
- pixel_x = 24;
- req_access = null;
- req_access_txt = "150"
+ pixel_x = 24
},
/obj/machinery/vending/coffee{
extended_inventory = 1
@@ -3924,11 +3482,7 @@
req_access_txt = "150"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -4005,11 +3559,8 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/visible,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
- dir = 8;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer3{
+ dir = 8
},
/turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/engineering)
@@ -4017,12 +3568,10 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/machinery/power/apc{
+/obj/machinery/power/apc/syndicate{
dir = 1;
name = "Engineering APC";
- pixel_y = 24;
- req_access = null;
- req_access_txt = "150"
+ pixel_y = 24
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -4030,11 +3579,8 @@
/obj/structure/cable/yellow{
icon_state = "0-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 9;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3{
+ dir = 9
},
/turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/engineering)
@@ -4118,11 +3664,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{
dir = 5
@@ -4150,11 +3692,7 @@
/area/ruin/unpowered/syndicate_lava_base/bar)
"kO" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -4220,11 +3758,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 5
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3,
/turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"kY" = (
@@ -4323,11 +3857,7 @@
name = "Bar"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/wood,
/area/ruin/unpowered/syndicate_lava_base/bar)
"lk" = (
@@ -4352,11 +3882,7 @@
/area/ruin/unpowered/syndicate_lava_base/bar)
"ll" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -4421,11 +3947,7 @@
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"lr" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3,
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"ls" = (
@@ -4495,11 +4017,7 @@
/area/ruin/unpowered/syndicate_lava_base/bar)
"lB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/wood,
/area/ruin/unpowered/syndicate_lava_base/bar)
"lC" = (
@@ -4537,11 +4055,7 @@
/obj/item/vending_refill/coffee,
/obj/item/vending_refill/cola,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -4580,11 +4094,9 @@
},
/area/ruin/unpowered/syndicate_lava_base/medbay)
"lL" = (
-/obj/machinery/airalarm{
+/obj/machinery/airalarm/syndicate{
dir = 4;
- pixel_x = -24;
- req_access = null;
- req_access_txt = "150"
+ pixel_x = -24
},
/obj/machinery/light/small{
dir = 8
@@ -4608,20 +4120,14 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+ dir = 4
},
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"lN" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 9;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3{
+ dir = 9
},
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/engineering)
@@ -4669,11 +4175,9 @@
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/arrivals)
"lU" = (
-/obj/machinery/airalarm{
+/obj/machinery/airalarm/syndicate{
dir = 4;
- pixel_x = -24;
- req_access = null;
- req_access_txt = "150"
+ pixel_x = -24
},
/obj/structure/chair/stool,
/turf/open/floor/plasteel/vault{
@@ -4704,11 +4208,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 5
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -4719,11 +4220,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -4734,11 +4232,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/machinery/door/airlock{
name = "Bar Storage";
@@ -4753,11 +4248,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -4778,11 +4270,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 9
},
/obj/structure/cable/yellow{
icon_state = "1-8"
@@ -4801,11 +4290,7 @@
/turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"me" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"mf" = (
@@ -4813,11 +4298,9 @@
dir = 4;
pixel_x = 11
},
-/obj/machinery/airalarm{
+/obj/machinery/airalarm/syndicate{
dir = 8;
- pixel_x = 24;
- req_access = null;
- req_access_txt = "150"
+ pixel_x = 24
},
/turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/medbay)
@@ -4910,7 +4393,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)
@@ -4932,12 +4415,10 @@
/obj/structure/table/wood,
/obj/machinery/light/small,
/obj/structure/cable/yellow,
-/obj/machinery/power/apc{
+/obj/machinery/power/apc/syndicate{
dir = 2;
name = "Bar APC";
- pixel_y = -24;
- req_access = null;
- req_access_txt = "150"
+ pixel_y = -24
},
/turf/open/floor/wood,
/area/ruin/unpowered/syndicate_lava_base/bar)
@@ -4960,11 +4441,7 @@
"mz" = (
/obj/machinery/door/airlock/maintenance,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -4991,11 +4468,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"mC" = (
@@ -5096,7 +4569,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 +4606,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
@@ -5141,11 +4614,7 @@
/area/ruin/unpowered/syndicate_lava_base/arrivals)
"mY" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -5163,11 +4632,7 @@
/area/ruin/unpowered/syndicate_lava_base/medbay)
"na" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"nb" = (
@@ -5266,22 +4731,16 @@
},
/area/ruin/unpowered/syndicate_lava_base/telecomms)
"nk" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+ dir = 4
},
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/ruin/unpowered/syndicate_lava_base/telecomms)
"nl" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -5292,11 +4751,8 @@
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 10
},
/obj/structure/noticeboard{
dir = 8;
@@ -5342,11 +4798,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 6
},
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -5360,22 +4813,17 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc{
+/obj/machinery/power/apc/syndicate{
dir = 1;
name = "Arrival Hallway APC";
- pixel_y = 24;
- req_access = null;
- req_access_txt = "150"
+ pixel_y = 24
},
/obj/structure/cable/yellow{
icon_state = "0-4"
@@ -5388,11 +4836,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -5405,11 +4850,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -5420,11 +4862,8 @@
/area/ruin/unpowered/syndicate_lava_base/arrivals)
"nw" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 2
},
/obj/structure/cable/yellow{
icon_state = "1-4"
@@ -5441,11 +4880,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -5459,11 +4895,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -5476,11 +4909,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 9
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -5546,11 +4976,9 @@
/turf/open/floor/plating/airless,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"nH" = (
-/obj/machinery/airalarm{
+/obj/machinery/airalarm/syndicate{
dir = 4;
- pixel_x = -24;
- req_access = null;
- req_access_txt = "150"
+ pixel_x = -24
},
/obj/machinery/light/small{
dir = 8
@@ -5575,11 +5003,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 5
},
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -5596,11 +5021,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -5614,11 +5036,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -5630,11 +5049,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -5646,11 +5062,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -5665,11 +5078,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -5684,11 +5094,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -5699,11 +5106,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -5716,11 +5120,8 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/machinery/firealarm{
dir = 2;
@@ -5737,11 +5138,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+ dir = 1
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -5754,19 +5152,14 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/machinery/airalarm{
- pixel_y = 24;
- req_access = null;
- req_access_txt = "150"
+/obj/machinery/airalarm/syndicate{
+ pixel_y = 24
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -5780,11 +5173,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 9
},
/obj/structure/cable/yellow{
icon_state = "1-8"
@@ -5823,12 +5213,10 @@
pixel_y = -29
},
/obj/structure/cable/yellow,
-/obj/machinery/power/apc{
+/obj/machinery/power/apc/syndicate{
dir = 4;
name = "Medbay APC";
- pixel_x = 24;
- req_access = null;
- req_access_txt = "150"
+ pixel_x = 24
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/white/side{
@@ -5895,7 +5283,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"
},
@@ -5908,12 +5296,10 @@
dir = 8
},
/obj/structure/cable/yellow,
-/obj/machinery/power/apc{
+/obj/machinery/power/apc/syndicate{
dir = 2;
name = "Telecommunications APC";
- pixel_y = -24;
- req_access = null;
- req_access_txt = "150"
+ pixel_y = -24
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -5929,7 +5315,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)
@@ -5951,11 +5337,8 @@
/turf/open/floor/plasteel/red/side,
/area/ruin/unpowered/syndicate_lava_base/arrivals)
"op" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1;
- piping_layer = 3;
- pixel_x = 5;
- pixel_y = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+ dir = 1
},
/turf/open/floor/plasteel/red/side,
/area/ruin/unpowered/syndicate_lava_base/arrivals)
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm
index 209ba76efa..5f76cdb32c 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm
@@ -6,39 +6,10 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"c" = (
-/turf/closed/indestructible/abductor{
- icon_state = "alien20"
- },
+/turf/closed/wall/mineral/abductor,
/area/lavaland/surface/outdoors)
"d" = (
-/turf/closed/indestructible/abductor{
- icon_state = "alien21"
- },
-/area/ruin/unpowered)
-"e" = (
-/turf/closed/indestructible/abductor{
- icon_state = "alien22"
- },
-/area/ruin/unpowered)
-"f" = (
-/turf/closed/indestructible/abductor{
- icon_state = "alien23"
- },
-/area/ruin/unpowered)
-"g" = (
-/turf/closed/indestructible/abductor{
- icon_state = "alien24"
- },
-/area/lavaland/surface/outdoors)
-"h" = (
-/turf/closed/indestructible/abductor{
- icon_state = "alien16"
- },
-/area/lavaland/surface/outdoors)
-"i" = (
-/turf/closed/indestructible/abductor{
- icon_state = "alien17"
- },
+/turf/closed/wall/mineral/abductor,
/area/ruin/unpowered)
"j" = (
/obj/machinery/abductor/experiment{
@@ -61,16 +32,6 @@
initial_gas_mix = "o2=16;n2=23;TEMP=300"
},
/area/ruin/unpowered)
-"m" = (
-/turf/closed/indestructible/abductor{
- icon_state = "alien18"
- },
-/area/ruin/unpowered)
-"n" = (
-/turf/closed/indestructible/abductor{
- icon_state = "alien19"
- },
-/area/lavaland/surface/outdoors)
"o" = (
/obj/item/hemostat/alien,
/turf/open/floor/plating/abductor{
@@ -89,11 +50,6 @@
initial_gas_mix = "o2=16;n2=23;TEMP=300"
},
/area/ruin/unpowered)
-"r" = (
-/turf/closed/indestructible/abductor{
- icon_state = "alien14"
- },
-/area/ruin/unpowered)
"s" = (
/obj/structure/table/optable/abductor,
/obj/item/cautery/alien,
@@ -108,11 +64,6 @@
initial_gas_mix = "o2=16;n2=23;TEMP=300"
},
/area/ruin/unpowered)
-"u" = (
-/turf/closed/indestructible/abductor{
- icon_state = "alien12"
- },
-/area/ruin/unpowered)
"v" = (
/obj/item/scalpel/alien,
/obj/item/surgical_drapes,
@@ -127,11 +78,6 @@
initial_gas_mix = "o2=16;n2=23;TEMP=300"
},
/area/ruin/unpowered)
-"x" = (
-/turf/closed/indestructible/abductor{
- icon_state = "alien10"
- },
-/area/ruin/unpowered)
"y" = (
/obj/machinery/abductor/gland_dispenser,
/turf/open/floor/plating/abductor{
@@ -152,36 +98,6 @@
initial_gas_mix = "o2=16;n2=23;TEMP=300"
},
/area/ruin/unpowered)
-"B" = (
-/turf/closed/indestructible/abductor{
- icon_state = "alien8"
- },
-/area/ruin/unpowered)
-"C" = (
-/turf/closed/indestructible/abductor{
- icon_state = "alien9"
- },
-/area/lavaland/surface/outdoors)
-"D" = (
-/turf/closed/indestructible/abductor{
- icon_state = "alien2"
- },
-/area/ruin/unpowered)
-"E" = (
-/turf/closed/indestructible/abductor{
- icon_state = "alien3"
- },
-/area/ruin/unpowered)
-"F" = (
-/turf/closed/indestructible/abductor{
- icon_state = "alien4"
- },
-/area/ruin/unpowered)
-"G" = (
-/turf/closed/indestructible/abductor{
- icon_state = "alien5"
- },
-/area/lavaland/surface/outdoors)
(1,1,1) = {"
a
@@ -211,7 +127,7 @@ a
a
a
a
-h
+c
a
a
a
@@ -223,7 +139,7 @@ a
a
a
c
-i
+d
a
a
a
@@ -240,54 +156,54 @@ k
k
a
y
-D
+d
a
"}
(6,1,1) = {"
a
a
-e
+d
k
o
s
v
z
-E
+d
a
"}
(7,1,1) = {"
a
a
-f
+d
l
p
k
w
A
-F
+d
a
"}
(8,1,1) = {"
a
a
-g
-m
+c
+d
q
t
q
-B
-G
+d
+c
a
"}
(9,1,1) = {"
a
a
b
-n
-r
-u
-x
-C
+c
+d
+d
+d
+c
b
a
"}
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..6229854c09 100644
--- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
@@ -12,10 +12,8 @@
/obj/machinery/computer/message_monitor{
dir = 2
},
-/obj/machinery/airalarm{
- pixel_y = 24;
- req_access = null;
- req_access_txt = "150"
+/obj/machinery/airalarm/syndicate{
+ pixel_y = 24
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -55,7 +53,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 +85,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,
@@ -210,11 +208,9 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm{
+/obj/machinery/airalarm/syndicate{
dir = 4;
- pixel_x = -24;
- req_access = null;
- req_access_txt = "150"
+ pixel_x = -24
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/listeningstation)
@@ -278,8 +274,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 +284,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,
@@ -517,10 +513,8 @@
},
/area/ruin/space/has_grav/listeningstation)
"aU" = (
-/obj/machinery/airalarm{
- pixel_y = 24;
- req_access = null;
- req_access_txt = "150"
+/obj/machinery/airalarm/syndicate{
+ pixel_y = 24
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -640,11 +634,9 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/airalarm{
+/obj/machinery/airalarm/syndicate{
dir = 8;
- pixel_x = 24;
- req_access = null;
- req_access_txt = "150"
+ pixel_x = 24
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -811,12 +803,10 @@
icon_state = "0-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/power/apc{
+/obj/machinery/power/apc/syndicate{
dir = 4;
name = "Syndicate Listening Post APC";
- pixel_x = 24;
- req_access = null;
- req_access_txt = "150"
+ pixel_x = 24
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -948,11 +938,9 @@
},
/obj/machinery/iv_drip,
/obj/machinery/light/small,
-/obj/machinery/airalarm{
+/obj/machinery/airalarm/syndicate{
dir = 1;
- pixel_y = -24;
- req_access = null;
- req_access_txt = "150"
+ pixel_y = -24
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
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..4c25dbb740 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,13 +4039,13 @@
"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)
"kE" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/deadcockroach,
+/obj/effect/decal/cleanable/insectguts,
/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/ancientstation)
"kF" = (
@@ -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..bb43763955 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"
},
@@ -2526,6 +2526,10 @@
/obj/machinery/capture_the_flag/red,
/turf/open/floor/circuit/green/anim,
/area/ctf)
+"hH" = (
+/obj/machinery/vending/coffee,
+/turf/open/floor/wood,
+/area/centcom/holding)
"hI" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -2751,15 +2755,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 +2799,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)
@@ -3324,6 +3328,10 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/centcom/supply)
+"jO" = (
+/obj/machinery/vending/cigarette,
+/turf/open/floor/wood,
+/area/centcom/holding)
"jP" = (
/obj/machinery/conveyor_switch/oneway{
dir = 8;
@@ -3429,7 +3437,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 +3446,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 +3829,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 +3847,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 +3865,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 +3952,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 +3961,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 +4145,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
@@ -4178,7 +4186,6 @@
/area/syndicate_mothership)
"mb" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/stockexchange,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -4277,7 +4284,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 +4533,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 +4679,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 +4979,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 +4992,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 +5033,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";
@@ -5254,7 +5261,6 @@
/area/centcom/ferry)
"oM" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/stockexchange,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -5320,6 +5326,19 @@
dir = 8
},
/area/tdome/tdomeobserve)
+"oU" = (
+/obj/structure/closet/secure_closet/bar{
+ req_access_txt = "25"
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"oV" = (
+/obj/structure/reagent_dispensers/beerkeg,
+/turf/open/floor/wood,
+/area/centcom/holding)
"oW" = (
/obj/structure/flora/bush,
/obj/effect/light_emitter{
@@ -5564,6 +5583,70 @@
dir = 8
},
/area/centcom/control)
+"px" = (
+/obj/machinery/chem_dispenser/drinks/beer,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"py" = (
+/obj/machinery/chem_dispenser/drinks,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pz" = (
+/obj/item/storage/box/donkpockets{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/storage/box/donkpockets{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/storage/box/donkpockets{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/storage/box/donkpockets{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pA" = (
+/obj/machinery/vending/cola/random,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pB" = (
+/obj/structure/rack,
+/obj/item/toy/sword,
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/item/coin/gold{
+ pixel_x = 8;
+ pixel_y = -3
+ },
+/obj/item/camera,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pC" = (
+/obj/structure/rack,
+/obj/item/toy/gun,
+/obj/item/coin/gold{
+ pixel_w = -9;
+ pixel_y = 6
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pD" = (
+/obj/machinery/computer/arcade/battle,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pE" = (
+/obj/machinery/computer/arcade/orion_trail,
+/turf/open/floor/wood,
+/area/centcom/holding)
"pF" = (
/obj/machinery/door/airlock/centcom{
name = "Auxillary Dock";
@@ -5663,7 +5746,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
},
@@ -5688,6 +5771,25 @@
dir = 5
},
/area/centcom/ferry)
+"pS" = (
+/obj/machinery/computer/slot_machine,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pT" = (
+/obj/machinery/vending/snack/random,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pU" = (
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pV" = (
+/obj/item/clothing/head/that,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pW" = (
+/turf/open/floor/carpet/black,
+/area/centcom/holding)
"pX" = (
/obj/item/storage/crayons,
/obj/structure/table,
@@ -5720,7 +5822,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 +5891,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" = (
@@ -5953,6 +6055,30 @@
"qE" = (
/turf/closed/indestructible/riveted/uranium,
/area/wizard_station)
+"qF" = (
+/obj/structure/chair/stool{
+ pixel_y = 8
+ },
+/turf/open/floor/carpet/black,
+/area/centcom/holding)
+"qG" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/drinkingglasses,
+/obj/item/storage/box/drinkingglasses{
+ pixel_x = 2;
+ pixel_y = 4
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"qH" = (
+/obj/item/reagent_containers/food/drinks/shaker,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"qI" = (
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/centcom/holding)
"qJ" = (
/obj/machinery/computer/shuttle/syndicate/recall,
/turf/open/floor/plasteel/bar{
@@ -6078,6 +6204,16 @@
/obj/machinery/computer/shuttle,
/turf/open/floor/engine/cult,
/area/wizard_station)
+"rb" = (
+/obj/item/lighter,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"rc" = (
+/obj/item/reagent_containers/food/drinks/soda_cans/cola,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/centcom/holding)
"rd" = (
/obj/structure/flora/grass/brown,
/obj/effect/light_emitter{
@@ -6137,7 +6273,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 +6284,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 +6382,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 +6576,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
},
@@ -6504,6 +6640,48 @@
},
/turf/open/floor/engine/cult,
/area/wizard_station)
+"rY" = (
+/obj/item/dice/d20,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"rZ" = (
+/obj/structure/rack,
+/obj/item/clothing/head/that,
+/obj/item/clothing/under/suit_jacket,
+/obj/item/clothing/accessory/waistcoat,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"sa" = (
+/obj/structure/rack,
+/obj/item/storage/crayons,
+/obj/item/gun/ballistic/automatic/toy/pistol,
+/obj/item/ammo_box/foambox,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"sb" = (
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"sc" = (
+/obj/structure/rack,
+/obj/item/storage/crayons,
+/obj/item/gun/ballistic/shotgun/toy/crossbow,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"sd" = (
+/obj/structure/rack,
+/obj/item/clothing/shoes/laceup,
+/obj/item/clothing/under/suit_jacket/female{
+ desc = "A black trouser suit for women. Very formal.";
+ name = "black suit";
+ pixel_x = 3;
+ pixel_y = 1
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"se" = (
/obj/machinery/light{
dir = 8
@@ -6514,7 +6692,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 +6849,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
},
@@ -6905,6 +7083,34 @@
},
/turf/open/floor/engine/cult,
/area/wizard_station)
+"sY" = (
+/mob/living/simple_animal/bot/medbot,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"sZ" = (
+/obj/machinery/sleeper{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"ta" = (
+/obj/machinery/light,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"tb" = (
+/obj/machinery/vending/clothing,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"tc" = (
+/obj/structure/closet/wardrobe/mixed,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"td" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/costume,
+/obj/effect/spawner/lootdrop/costume,
+/turf/open/floor/wood,
+/area/centcom/holding)
"te" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/pizzaslice/mushroom,
@@ -6945,6 +7151,40 @@
},
/turf/open/floor/plating/airless,
/area/syndicate_mothership/control)
+"tj" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/costume,
+/obj/effect/spawner/lootdrop/costume,
+/obj/machinery/light,
+/obj/machinery/button/door{
+ id = "Ninjaholdingsuicide";
+ name = "SUICIDE CHAMBER LOCK";
+ normaldoorcontrol = 1;
+ pixel_x = 4;
+ pixel_y = -24;
+ specialfunctions = 4
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"tk" = (
+/obj/machinery/door/airlock/wood/glass{
+ name = "Private Rooms"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"tl" = (
+/obj/machinery/door/airlock/maintenance_hatch{
+ id_tag = "Ninjaholdingsuicide";
+ locked = 1;
+ name = "SUICIDE CHAMBER"
+ },
+/turf/open/floor/wood{
+ icon_state = "wood-broken5"
+ },
+/area/centcom/holding)
+"tm" = (
+/turf/open/floor/carpet,
+/area/centcom/holding)
"tn" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -7034,7 +7274,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 +7373,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;
@@ -7245,6 +7485,10 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/centcom/evac)
+"tW" = (
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet,
+/area/centcom/holding)
"tX" = (
/obj/machinery/door/airlock{
icon = 'icons/obj/doors/airlocks/station/uranium.dmi';
@@ -7252,6 +7496,40 @@
},
/turf/open/floor/engine/cult,
/area/wizard_station)
+"tY" = (
+/obj/structure/chair/comfy/black{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"tZ" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"ua" = (
+/obj/structure/plasticflaps,
+/turf/open/floor/wood{
+ icon_state = "wood-broken4"
+ },
+/area/centcom/holding)
+"ub" = (
+/obj/machinery/door/airlock/wood{
+ id_tag = "Proom1";
+ name = "Room 1"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"uc" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/structure/chair/comfy/black{
+ dir = 1
+ },
+/turf/open/floor/carpet,
+/area/centcom/holding)
"ud" = (
/obj/machinery/door/poddoor/shutters{
id = "nukeop_ready";
@@ -7265,6 +7543,25 @@
},
/turf/open/floor/plating/airless,
/area/syndicate_mothership/control)
+"uf" = (
+/turf/open/lava,
+/area/centcom/holding)
+"ug" = (
+/obj/machinery/button/door{
+ id = "Proom1";
+ name = "Door Lock";
+ normaldoorcontrol = 1;
+ pixel_x = -24;
+ pixel_y = 4;
+ specialfunctions = 4
+ },
+/obj/structure/bed,
+/obj/item/bedsheet/random,
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"uh" = (
+/turf/open/chasm/lavaland,
+/area/centcom/holding)
"ui" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -7453,7 +7750,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
},
@@ -7466,12 +7763,37 @@
/obj/structure/chair/wood/wings,
/turf/open/floor/carpet,
/area/wizard_station)
+"uG" = (
+/obj/structure/chair/sofa/left,
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"uH" = (
+/obj/structure/chair/sofa/corner{
+ dir = 1
+ },
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"uI" = (
+/obj/structure/chair/sofa,
+/turf/open/floor/carpet,
+/area/centcom/holding)
"uJ" = (
/obj/machinery/door/airlock/external{
req_access_txt = "150"
},
/turf/open/floor/plating,
/area/syndicate_mothership/control)
+"uK" = (
+/obj/machinery/button/door{
+ id = "Proom2";
+ name = "Door Lock";
+ normaldoorcontrol = 1;
+ pixel_x = 24;
+ pixel_y = 4;
+ specialfunctions = 4
+ },
+/turf/open/floor/carpet,
+/area/centcom/holding)
"uL" = (
/obj/machinery/button/door{
id = "nukeop_ready";
@@ -7490,6 +7812,10 @@
},
/turf/open/floor/mineral/plastitanium,
/area/syndicate_mothership/control)
+"uN" = (
+/obj/structure/table/wood/poker,
+/turf/open/floor/carpet,
+/area/centcom/holding)
"uO" = (
/obj/machinery/door/airlock/centcom{
name = "Shuttle Control Office";
@@ -7695,6 +8021,45 @@
},
/turf/open/floor/carpet,
/area/wizard_station)
+"vo" = (
+/obj/structure/chair/sofa{
+ icon_state = "sofamiddle";
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"vp" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"vq" = (
+/obj/machinery/door/airlock/wood{
+ id_tag = "Proom2";
+ name = "Room 2"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"vr" = (
+/obj/structure/chair/sofa/corner{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"vs" = (
+/obj/structure/chair/sofa/left{
+ dir = 1
+ },
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"vt" = (
+/obj/machinery/vending/games,
+/turf/open/floor/carpet,
+/area/centcom/holding)
"vu" = (
/obj/item/storage/box/drinkingglasses,
/obj/item/reagent_containers/food/drinks/bottle/rum,
@@ -7707,7 +8072,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,
@@ -7717,6 +8082,19 @@
/obj/item/toy/nuke,
/turf/open/floor/wood,
/area/syndicate_mothership/control)
+"vy" = (
+/obj/structure/chair/sofa{
+ dir = 1
+ },
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"vz" = (
+/obj/machinery/door/airlock/wood{
+ id_tag = "Proom3";
+ name = "Room 3"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"vA" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/directions/engineering{
@@ -7844,7 +8222,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
@@ -7984,6 +8362,68 @@
},
/turf/open/floor/carpet,
/area/wizard_station)
+"we" = (
+/obj/machinery/button/door{
+ id = "Proom3";
+ name = "Door Lock";
+ normaldoorcontrol = 1;
+ pixel_x = -24;
+ pixel_y = 4;
+ specialfunctions = 4
+ },
+/obj/structure/bed,
+/obj/item/bedsheet/random,
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"wf" = (
+/obj/machinery/button/door{
+ id = "Proom4";
+ name = "Door Lock";
+ normaldoorcontrol = 1;
+ pixel_x = 24;
+ pixel_y = 4;
+ specialfunctions = 4
+ },
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"wg" = (
+/obj/machinery/door/airlock/wood{
+ id_tag = "Proom4";
+ name = "Room 4"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"wh" = (
+/obj/structure/table/wood,
+/obj/item/soap/nanotrasen,
+/obj/item/reagent_containers/spray/cleaner,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"wi" = (
+/obj/structure/table/wood,
+/obj/structure/bedsheetbin,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"wj" = (
+/obj/machinery/door/airlock/wood{
+ id_tag = "Proom5";
+ name = "Room 5"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"wk" = (
+/obj/machinery/button/door{
+ id = "Proom5";
+ name = "Door Lock";
+ normaldoorcontrol = 1;
+ pixel_x = -24;
+ pixel_y = 4;
+ specialfunctions = 4
+ },
+/obj/structure/bed,
+/obj/item/bedsheet/random,
+/turf/open/floor/carpet,
+/area/centcom/holding)
"wl" = (
/obj/machinery/light,
/turf/open/floor/wood,
@@ -8197,7 +8637,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 +9308,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 +9406,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 +9595,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 +9721,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 +9890,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 +9921,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 +10124,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 +10162,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 +10213,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 +10301,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 +10383,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 +10660,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
},
@@ -10765,77 +11205,6 @@
},
/turf/open/floor/engine/cult,
/area/wizard_station)
-"EZ" = (
-/obj/structure/table,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"Fa" = (
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"Fb" = (
-/obj/structure/closet/secure_closet/bar{
- req_access_txt = "25"
- },
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"Fc" = (
-/obj/structure/reagent_dispensers/beerkeg,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"Fd" = (
-/obj/structure/table,
-/obj/item/storage/box/donkpockets{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/storage/box/donkpockets{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/storage/box/donkpockets{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/storage/box/donkpockets{
- pixel_x = 3;
- pixel_y = 3
- },
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"Fe" = (
-/obj/structure/rack,
-/obj/item/device/camera,
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
-"Ff" = (
-/obj/structure/rack,
-/obj/item/toy/sword,
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
-"Fg" = (
-/obj/structure/rack,
-/obj/item/toy/gun,
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
-"Fh" = (
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
"Fi" = (
/turf/open/floor/plating/beach/sand,
/area/centcom/holding)
@@ -10952,21 +11321,8 @@
dir = 5
},
/area/tdome/tdomeobserve)
-"FA" = (
-/obj/structure/table,
-/obj/item/clothing/head/that,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"FB" = (
-/obj/structure/chair/stool{
- pixel_y = 8
- },
-/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" = (
@@ -11071,41 +11427,6 @@
},
/turf/open/floor/engine/cult,
/area/wizard_station)
-"FU" = (
-/obj/structure/table,
-/obj/item/ammo_box/foambox,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"FV" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/shaker,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"FW" = (
-/obj/structure/table,
-/obj/item/lighter,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"FX" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"FY" = (
-/obj/structure/table,
-/obj/item/dice/d20,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
"FZ" = (
/obj/structure/chair/stool{
pixel_y = 8
@@ -11226,13 +11547,6 @@
},
/turf/open/lava,
/area/wizard_station)
-"Gs" = (
-/obj/structure/rack,
-/obj/item/clothing/head/that,
-/obj/item/clothing/under/suit_jacket,
-/obj/item/clothing/accessory/waistcoat,
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
"Gt" = (
/obj/item/toy/beach_ball,
/turf/open/floor/plating/beach/sand,
@@ -11280,18 +11594,6 @@
},
/turf/open/lava/airless,
/area/wizard_station)
-"GA" = (
-/obj/structure/rack,
-/obj/item/storage/crayons,
-/obj/item/gun/ballistic/automatic/toy/pistol,
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
-"GB" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
"GC" = (
/obj/structure/table,
/obj/structure/bedsheetbin,
@@ -11524,12 +11826,6 @@
/obj/structure/shuttle/engine/propulsion,
/turf/open/space,
/area/wizard_station)
-"GY" = (
-/obj/structure/rack,
-/obj/item/storage/crayons,
-/obj/item/gun/ballistic/shotgun/toy/crossbow,
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
"GZ" = (
/turf/open/floor/plating/beach/coastline_b,
/area/centcom/holding)
@@ -11582,33 +11878,6 @@
dir = 4
},
/area/tdome/tdomeobserve)
-"Hi" = (
-/obj/structure/rack,
-/obj/item/clothing/shoes/laceup,
-/obj/item/clothing/under/suit_jacket/female{
- desc = "A black trouser suit for women. Very formal.";
- name = "black suit";
- pixel_x = 3;
- pixel_y = 1
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
-"Hj" = (
-/obj/machinery/light,
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
-"Hk" = (
-/obj/structure/table,
-/obj/item/gun/ballistic/automatic/toy/pistol,
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
-"Hl" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/machinery/light,
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
"Hm" = (
/turf/open/floor/plating/beach/water,
/area/centcom/holding)
@@ -12542,15 +12811,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 +12993,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 +13001,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 +13341,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 +13443,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 +13471,7 @@
/area/centcom/evac)
"LJ" = (
/obj/structure/table,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/light{
dir = 4
},
@@ -39485,25 +39754,25 @@ aa
aa
aa
ED
-EZ
-EZ
-FU
-Gs
-GA
-GY
-Hi
+hH
+pU
+qG
+rZ
+sa
+sc
+sd
+ED
+ED
+ED
+ED
+ED
+ED
+ED
+ED
ED
ED
ED
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
aa
aa
aa
@@ -39742,25 +40011,25 @@ aa
aa
aa
ED
-Fa
-Fa
-Fa
-Fh
-Fh
-Fh
-Fh
+jO
+pU
+pU
+pW
+pW
+pW
+pU
Hy
HH
HH
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+uH
+vo
+vr
+ED
+uH
+vo
+vr
+ED
aa
aa
aa
@@ -39999,25 +40268,25 @@ aa
aa
aa
ED
-Fb
-Fa
-FV
-FB
-Fh
-Fh
-Fh
+oU
+pU
+qH
+qF
+pW
+pW
+pU
Hz
HH
HH
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+uI
+uN
+vy
+ED
+uI
+uN
+vy
+ED
aa
aa
aa
@@ -40256,25 +40525,25 @@ aa
aa
aa
ED
-Fc
-Fa
-EZ
-FB
-Fh
-Fh
-Fh
+oV
+pU
+qI
+qF
+pW
+pW
+sY
Hz
HH
HH
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+uG
+uN
+vs
+ED
+uG
+uN
+vs
+ED
aa
aa
aa
@@ -40513,25 +40782,25 @@ aa
aa
aa
ED
-Fc
-Fa
-FW
-FB
-Fh
-Fh
-Fh
+px
+pU
+rb
+qF
+pW
+pW
+sZ
Hy
HH
HH
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+tm
+tm
+tm
+ED
+tm
+tm
+tm
+ED
aa
aa
aa
@@ -40770,25 +41039,25 @@ aa
aa
aa
ED
-Fa
-Fa
-FX
-FB
-Fh
-Fh
-Hj
+py
+pU
+rc
+qF
+pW
+pW
+ta
ED
ED
ED
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+uK
+tm
+vt
+ED
+wf
+tm
+vt
+ED
aa
aa
aa
@@ -41027,26 +41296,26 @@ aa
aa
aa
ED
-Fd
-FA
-FY
-FB
-Fh
-Fh
-Fh
+pz
+pV
+rY
+qF
+pW
+pW
+pU
+ED
+ED
+ED
+ED
+ED
+vq
+ED
+ED
+ED
+wg
+ED
+ED
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
aa
aa
aa
@@ -41284,13 +41553,25 @@ aa
aa
aa
ED
-Fe
-Fh
-Fh
-Fh
-Fh
-Fh
-Fh
+pA
+pW
+pW
+pW
+pW
+pW
+pU
+tk
+pU
+tZ
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+tZ
+wh
ED
aa
aa
@@ -41301,18 +41582,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
KH
KU
Lb
@@ -41541,13 +41810,25 @@ aa
aa
aa
ED
-Ff
-Fh
-Fh
-Fh
-Fh
-Fh
-FB
+pB
+pW
+pW
+pW
+pW
+pW
+pU
+tk
+pU
+pU
+pU
+pU
+vp
+pU
+pU
+pU
+pU
+pU
+wi
ED
aa
aa
@@ -41557,18 +41838,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
KH
KH
KS
@@ -41798,26 +42067,26 @@ aa
aa
aa
ED
-Fg
-Fh
-Fh
-Fh
-Fh
-FB
-Hk
+pC
+pW
+pW
+pW
+pW
+pW
+tb
+ED
+ED
+ub
+ED
+ED
+ED
+vz
+ED
+ED
+ED
+wj
+ED
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
aa
aa
aa
@@ -42055,26 +42324,26 @@ aa
aa
aa
ED
-Fh
-FB
-Fh
-Fh
-Fh
-Fh
-FB
+pD
+qF
+pW
+pW
+pW
+pW
+tc
+ED
+tY
+tm
+ug
+ED
+tY
+tm
+we
+ED
+tY
+tm
+wk
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
aa
aa
aa
@@ -42312,26 +42581,26 @@ aa
aa
aa
ED
-Fi
-Fi
-Fi
-Fi
-GB
-GB
-Hl
+pE
+qF
+pW
+pW
+pW
+pW
+td
+ED
+tW
+uc
+tm
+ED
+tW
+uc
+tm
+ED
+tW
+uc
+tm
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
aa
aa
aa
@@ -42569,26 +42838,26 @@ aa
aa
aa
ED
-Fj
-Fi
-Fi
-Fi
-Fi
-GZ
-Hm
+pS
+qF
+pW
+pW
+pW
+pW
+td
+ED
+ED
+ED
+ED
+ED
+ED
+ED
+ED
+ED
+ED
+ED
+ED
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
aa
aa
aa
@@ -42826,6 +43095,777 @@ aa
aa
aa
ED
+pS
+qF
+pW
+pW
+pW
+pW
+tj
+ED
+ED
+ED
+ED
+ED
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(115,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ED
+pT
+pU
+pU
+pU
+sb
+sb
+sb
+tl
+ua
+uf
+uh
+ED
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(116,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ED
+Fj
+Fi
+Fi
+Fi
+Fi
+GZ
+Hm
+ED
+ED
+ED
+ED
+ED
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(117,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ED
Fi
Fi
FZ
@@ -42892,7 +43932,7 @@ aa
aa
aa
"}
-(115,1,1) = {"
+(118,1,1) = {"
aa
aa
aa
@@ -43149,7 +44189,7 @@ aa
aa
aa
"}
-(116,1,1) = {"
+(119,1,1) = {"
aa
aa
aa
@@ -43406,7 +44446,7 @@ aa
aa
aa
"}
-(117,1,1) = {"
+(120,1,1) = {"
aa
aa
aa
@@ -43663,777 +44703,6 @@ aa
aa
aa
"}
-(118,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ED
-ED
-ED
-ED
-ED
-ED
-ED
-ED
-ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(119,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(120,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
(121,1,1) = {"
aa
aa
@@ -44624,15 +44893,15 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ED
+ED
+ED
+ED
+ED
+ED
+ED
+ED
+ED
aa
aa
aa
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 1b9ee66537..d945d49116 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,
@@ -11754,22 +11754,8 @@
/turf/open/floor/circuit,
/area/ai_monitored/nuke_storage)
"aEN" = (
-/obj/structure/closet/crate{
- name = "Gold Crate"
- },
-/obj/item/stack/sheet/mineral/gold{
- pixel_x = -1;
- pixel_y = 5
- },
-/obj/item/stack/sheet/mineral/gold{
- pixel_y = 2
- },
-/obj/item/stack/sheet/mineral/gold{
- pixel_x = 1;
- pixel_y = -2
- },
-/obj/item/storage/belt/champion,
/obj/effect/turf_decal/bot_white/right,
+/obj/structure/closet/crate/goldcrate,
/turf/open/floor/plasteel/vault{
dir = 1
},
@@ -11781,30 +11767,8 @@
/turf/open/floor/circuit,
/area/ai_monitored/nuke_storage)
"aEP" = (
-/obj/item/coin/silver{
- pixel_x = 7;
- pixel_y = 12
- },
-/obj/item/coin/silver{
- pixel_x = 12;
- pixel_y = 7
- },
-/obj/item/coin/silver{
- pixel_x = 4;
- pixel_y = 8
- },
-/obj/item/coin/silver{
- pixel_x = -6;
- pixel_y = 5
- },
-/obj/item/coin/silver{
- pixel_x = 5;
- pixel_y = -8
- },
-/obj/structure/closet/crate{
- name = "Silver Crate"
- },
/obj/effect/turf_decal/bot_white/left,
+/obj/structure/closet/crate/silvercrate,
/turf/open/floor/plasteel/vault{
dir = 4
},
@@ -11829,18 +11793,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 +12099,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 +12119,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 +12200,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 +12475,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 +12729,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 +13366,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 +13404,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 +13416,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 +13454,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 +13791,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 +13985,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 +14437,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 +15135,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 +15285,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 +15337,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 +15759,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 +15803,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 +15838,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 +16067,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 +16204,7 @@
},
/area/chapel/main)
"aQz" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1480;
name = "Confessional Intercom";
@@ -16522,9 +16486,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 +16541,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 +16767,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 +16840,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 +16879,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 +17249,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 +17304,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 +17537,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 +17551,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 +17670,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 +17850,7 @@
/turf/open/floor/plasteel,
/area/bridge)
"aVp" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -18114,8 +18078,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 +18105,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 +19095,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 +19152,7 @@
},
/area/bridge)
"aYr" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -19690,7 +19654,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 +20004,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 +20431,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 +20800,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 +21259,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 +21534,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 +21849,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 +21970,7 @@
},
/area/hallway/primary/starboard)
"bfY" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -22365,7 +22329,7 @@
dir = 8;
pixel_x = 24
},
-/obj/item/device/camera,
+/obj/item/camera,
/obj/item/storage/photo_album{
pixel_y = -10
},
@@ -22829,7 +22793,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 +22854,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 +22958,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 +23312,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 +23353,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 +23867,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 +24040,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 +24282,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 +24706,7 @@
},
/area/medical/chemistry)
"bmJ" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -24932,7 +24896,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 +24907,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
@@ -25155,7 +25119,6 @@
/obj/item/clipboard,
/obj/item/pen/red,
/obj/structure/table,
-/obj/machinery/computer/stockexchange,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bnH" = (
@@ -25322,7 +25285,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 +25322,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 +25449,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 +25554,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 +25999,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 +26266,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 +26364,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 +26814,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 +26909,7 @@
departmentType = 2;
pixel_x = -30
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/machinery/camera{
c_tag = "Cargo Office";
dir = 4
@@ -27115,7 +27078,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 +27098,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 +27148,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -27216,7 +27179,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 +27394,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 +27869,7 @@
/area/medical/genetics)
"bub" = (
/obj/machinery/light,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -35
},
@@ -28161,7 +28124,6 @@
dir = 4;
pixel_x = -22
},
-/obj/machinery/computer/stockexchange,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"buF" = (
@@ -28851,7 +28813,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
@@ -29664,7 +29626,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/machinery/computer/stockexchange,
/turf/open/floor/plasteel/brown{
dir = 2
},
@@ -29798,7 +29759,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 +29910,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 +30156,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 +30333,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 +30460,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 +30760,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 +30810,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 +31281,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 +31293,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 +31377,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 +31691,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 +31892,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 +32231,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 +32319,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 +32560,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 +33024,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,
@@ -33131,14 +33092,7 @@
/area/storage/tech)
"bGt" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/borgupload{
- pixel_x = -1;
- pixel_y = 1
- },
-/obj/item/circuitboard/computer/aiupload{
- pixel_x = 2;
- pixel_y = -2
- },
+/obj/effect/spawner/lootdrop/techstorage/AI,
/turf/open/floor/plasteel,
/area/storage/tech)
"bGu" = (
@@ -33150,50 +33104,25 @@
/obj/machinery/cell_charger{
pixel_y = 5
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plating,
/area/storage/tech)
"bGw" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/pandemic{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/circuitboard/computer/rdconsole,
-/obj/item/circuitboard/machine/rdserver{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/circuitboard/machine/destructive_analyzer,
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/item/circuitboard/computer/aifixer,
-/obj/item/circuitboard/computer/teleporter,
-/obj/item/circuitboard/machine/circuit_imprinter,
-/obj/item/circuitboard/machine/mechfab,
+/obj/effect/spawner/lootdrop/techstorage/rnd,
/turf/open/floor/plating,
/area/storage/tech)
"bGx" = (
/obj/structure/rack,
-/obj/item/circuitboard/machine/telecomms/processor,
-/obj/item/circuitboard/machine/telecomms/receiver,
-/obj/item/circuitboard/machine/telecomms/server,
-/obj/item/circuitboard/machine/telecomms/bus,
-/obj/item/circuitboard/machine/telecomms/broadcaster,
-/obj/item/circuitboard/computer/message_monitor{
- pixel_y = -5
- },
+/obj/effect/spawner/lootdrop/techstorage/tcomms,
/turf/open/floor/plating,
/area/storage/tech)
"bGy" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/mining,
-/obj/item/circuitboard/machine/autolathe{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/circuitboard/computer/arcade/battle,
+/obj/effect/spawner/lootdrop/techstorage/service,
/turf/open/floor/plating,
/area/storage/tech)
"bGz" = (
@@ -33591,7 +33520,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 +33555,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
@@ -33671,21 +33600,10 @@
/area/crew_quarters/theatre)
"bHG" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/crew{
- pixel_x = -1;
- pixel_y = 1
- },
-/obj/item/circuitboard/computer/card{
- pixel_x = 2;
- pixel_y = -2
- },
-/obj/item/circuitboard/computer/communications{
- pixel_x = 5;
- pixel_y = -5
- },
/obj/machinery/light/small{
dir = 8
},
+/obj/effect/spawner/lootdrop/techstorage/command,
/turf/open/floor/plasteel,
/area/storage/tech)
"bHH" = (
@@ -33750,7 +33668,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 +34252,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
},
@@ -34390,14 +34308,7 @@
/area/storage/tech)
"bJh" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/robotics{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/circuitboard/computer/mecha_control{
- pixel_x = 1;
- pixel_y = -1
- },
+/obj/effect/spawner/lootdrop/techstorage/RnD_secure,
/turf/open/floor/plasteel,
/area/storage/tech)
"bJi" = (
@@ -34413,43 +34324,17 @@
/area/storage/tech)
"bJk" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/cloning,
-/obj/item/circuitboard/computer/med_data{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/circuitboard/machine/clonescanner,
-/obj/item/circuitboard/machine/clonepod,
-/obj/item/circuitboard/computer/scan_consolenew,
-/obj/item/circuitboard/machine/smoke_machine,
+/obj/effect/spawner/lootdrop/techstorage/medical,
/turf/open/floor/plating,
/area/storage/tech)
"bJl" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/powermonitor{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/circuitboard/computer/stationalert{
- pixel_x = 1;
- pixel_y = -1
- },
-/obj/item/circuitboard/computer/atmos_alert{
- pixel_x = 3;
- pixel_y = -3
- },
+/obj/effect/spawner/lootdrop/techstorage/engineering,
/turf/open/floor/plating,
/area/storage/tech)
"bJm" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/secure_data{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/circuitboard/computer/security{
- pixel_x = 1;
- pixel_y = -1
- },
+/obj/effect/spawner/lootdrop/techstorage/security,
/turf/open/floor/plating,
/area/storage/tech)
"bJn" = (
@@ -34741,18 +34626,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 +34651,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 +34674,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 +35284,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 +35368,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 +35597,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 +36195,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 +36207,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 +36258,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 +36438,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)";
@@ -37174,11 +37059,10 @@
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"bPE" = (
-/obj/structure/table/reinforced,
-/obj/item/device/slime_scanner,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
+/obj/machinery/portable_atmospherics/canister/bz,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"bPF" = (
@@ -37198,7 +37082,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
},
@@ -37220,6 +37104,7 @@
dir = 1
},
/obj/structure/table/reinforced,
+/obj/item/slime_scanner,
/obj/item/clothing/gloves/color/latex,
/obj/item/clothing/glasses/science,
/turf/open/floor/plasteel,
@@ -37392,7 +37277,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 +37367,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 +37626,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 +38089,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 +38283,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bSG" = (
@@ -38414,9 +38299,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 +38565,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 +39196,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 +39339,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 +39688,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 +39697,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 +39768,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 +39960,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 +40017,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 +40128,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 +41236,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 +41262,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 +41675,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 +41720,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 +42110,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 +42130,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 +42198,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 +42934,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 +44810,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
@@ -45461,28 +45346,10 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"ckG" = (
-/obj/structure/closet/crate{
- name = "solar pack crate"
- },
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/circuitboard/computer/solar_control,
-/obj/item/electronics/tracker,
-/obj/item/paper/guides/jobs/engi/solars,
/obj/effect/turf_decal/bot{
dir = 1
},
+/obj/structure/closet/crate/solarpanel_small,
/turf/open/floor/plasteel,
/area/engine/engineering)
"ckH" = (
@@ -45664,7 +45531,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 +46939,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 +47046,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 +47432,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 +47854,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 +47931,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 +48177,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 +48405,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 +48486,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 +48530,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 +48716,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 +48858,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 +48873,7 @@
pixel_x = -27;
pixel_y = 5
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -49030,14 +48897,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 +48912,7 @@
pixel_x = 27;
pixel_y = 5
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
anyai = 1;
broadcasting = 0;
freerange = 1;
@@ -49272,7 +49139,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 +50119,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 +50127,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 +50469,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 +50570,7 @@
/obj/item/stack/cable_coil{
amount = 5
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plating,
/area/construction)
"cCc" = (
@@ -51296,7 +51163,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 +51566,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 +51869,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 +51940,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 +52687,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 +52925,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 +53363,7 @@
pixel_x = 6;
pixel_y = -3
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1485;
listening = 1;
@@ -53986,7 +53853,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 +53922,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..02529a8c6b 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
},
@@ -2953,8 +2953,8 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"alK" = (
-/obj/structure/closet/secure_closet/freezer/kitchen,
/obj/effect/turf_decal/bot,
+/obj/structure/closet/secure_closet/freezer/kitchen/maintenance,
/turf/open/floor/plasteel,
/area/maintenance/starboard/fore)
"alL" = (
@@ -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
},
@@ -5799,12 +5799,6 @@
dir = 4
},
/area/maintenance/disposal)
-"asj" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/turf/open/floor/plasteel/airless/solarpanel,
-/area/solar/port/fore)
"ask" = (
/obj/structure/lattice/catwalk,
/turf/open/space,
@@ -6476,7 +6470,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 +6592,7 @@
/area/space/nearstation)
"atK" = (
/obj/structure/table/reinforced,
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
@@ -6782,8 +6776,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 +7352,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 +7502,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 +8107,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 +8255,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
},
@@ -8271,7 +8265,6 @@
/area/quartermaster/storage)
"axi" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/stockexchange,
/turf/open/floor/plasteel/brown{
dir = 1
},
@@ -8513,7 +8506,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 +8560,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 +9112,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
},
@@ -10314,7 +10307,7 @@
/area/quartermaster/warehouse)
"aBM" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/deadcockroach,
+/obj/effect/decal/cleanable/insectguts,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -11653,7 +11646,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 +11772,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 +11934,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 +12085,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 +12131,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 +12144,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 +12415,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 +12434,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -12693,7 +12686,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 +13754,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 +14055,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,
@@ -14157,16 +14150,25 @@
/obj/machinery/meter,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/neutral,
/area/maintenance/disposal/incinerator)
"aJM" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible,
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/neutral,
/area/maintenance/disposal/incinerator)
"aJN" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 9
},
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/neutral,
/area/maintenance/disposal/incinerator)
"aJO" = (
@@ -14177,6 +14179,9 @@
icon_state = "1-4"
},
/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/neutral,
/area/maintenance/disposal/incinerator)
"aJP" = (
@@ -14414,7 +14419,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 +14530,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 +14961,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 +15638,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 +15716,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 +15792,7 @@
dir = 8
},
/obj/structure/disposalpipe/segment,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -16148,7 +16153,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 +16310,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 +16349,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 +16381,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 +17153,7 @@
dir = 8;
pixel_x = -24
},
-/obj/item/device/camera,
+/obj/item/camera,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -17300,7 +17305,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 +17471,7 @@
"aQX" = (
/obj/structure/table/glass,
/obj/item/folder/blue,
-/obj/item/device/healthanalyzer,
+/obj/item/healthanalyzer,
/obj/machinery/light{
dir = 1
},
@@ -17528,7 +17533,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";
@@ -18175,7 +18180,6 @@
/area/quartermaster/storage)
"aSm" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/stockexchange,
/turf/open/floor/plasteel/neutral,
/area/quartermaster/storage)
"aSn" = (
@@ -18269,7 +18273,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 +18294,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 +18449,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 +18935,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" = (
@@ -18980,7 +18984,6 @@
/area/quartermaster/office)
"aTP" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/stockexchange,
/obj/machinery/light{
dir = 8
},
@@ -18994,7 +18997,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 +19223,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 +19408,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 +19753,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 +20287,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 +20661,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 +20878,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 +20924,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 +21142,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
},
@@ -21676,7 +21679,6 @@
/area/quartermaster/qm)
"aZh" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/stockexchange,
/obj/machinery/light{
dir = 4
},
@@ -22298,7 +22300,7 @@
/turf/closed/wall,
/area/hydroponics)
"baw" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -22454,14 +22456,13 @@
/area/quartermaster/office)
"baP" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/stockexchange,
/obj/machinery/light{
dir = 4
},
/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 +22673,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 +22969,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 +23190,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -23219,7 +23220,6 @@
/area/quartermaster/miningoffice)
"bcx" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/stockexchange,
/turf/open/floor/plasteel/brown{
dir = 5
},
@@ -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
},
@@ -27330,7 +27330,6 @@
/area/hallway/primary/fore)
"blO" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/stockexchange,
/obj/machinery/airalarm{
dir = 4;
pixel_x = -23
@@ -27421,7 +27420,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 +27484,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 +27621,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 +27684,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 +28271,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 +28366,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 +28522,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 +28577,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
@@ -28923,7 +28922,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 +30068,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 +30093,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 +30443,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 +30790,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -31263,7 +31262,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
@@ -32283,23 +32282,10 @@
},
/area/security/nuke_storage)
"bvQ" = (
-/obj/structure/closet/crate{
- name = "Silver Crate"
- },
/obj/machinery/light/small{
dir = 1
},
-/obj/item/coin/silver{
- pixel_x = -6
- },
-/obj/item/coin/silver{
- pixel_x = 6
- },
-/obj/item/coin/silver{
- pixel_x = 6
- },
-/obj/item/coin/silver,
-/obj/item/coin/silver,
+/obj/structure/closet/crate/silvercrate,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -32561,7 +32547,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
},
@@ -32713,30 +32699,17 @@
/area/hallway/primary/port)
"bwJ" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/robotics{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/circuitboard/computer/mecha_control,
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 10
},
+/obj/effect/spawner/lootdrop/techstorage/command,
/turf/open/floor/plasteel,
/area/storage/tech)
"bwK" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/communications{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/circuitboard/computer/card,
-/obj/item/circuitboard/computer/crew{
- pixel_x = 3;
- pixel_y = -3
- },
/obj/structure/cable/white{
icon_state = "2-8"
},
@@ -32747,25 +32720,18 @@
icon_state = "1-2"
},
/obj/effect/turf_decal/stripes/line,
+/obj/effect/spawner/lootdrop/techstorage/AI,
/turf/open/floor/plasteel,
/area/storage/tech)
"bwL" = (
/obj/structure/rack,
-/obj/item/circuitboard/aicore{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/circuitboard/computer/aiupload,
-/obj/item/circuitboard/computer/borgupload{
- pixel_x = 3;
- pixel_y = -3
- },
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 6
},
+/obj/effect/spawner/lootdrop/techstorage/RnD_secure,
/turf/open/floor/plasteel,
/area/storage/tech)
"bwM" = (
@@ -32794,7 +32760,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 +33238,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 +33403,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 +33820,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 +34220,7 @@
dir = 4
},
/obj/structure/disposalpipe/segment,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -34329,8 +34295,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 +34518,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 +34708,7 @@
/obj/machinery/power/terminal{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -34981,25 +34947,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 +34985,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 +35152,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 +35174,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 +35195,7 @@
},
/area/bridge)
"bBL" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26;
pixel_y = 26
@@ -35292,17 +35258,12 @@
},
/area/security/nuke_storage)
"bBU" = (
-/obj/structure/closet/crate{
- name = "Gold Crate"
- },
-/obj/item/storage/belt/champion,
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
},
/obj/machinery/light/small,
-/obj/item/stack/sheet/mineral/gold,
-/obj/item/stack/sheet/mineral/gold,
+/obj/structure/closet/crate/goldcrate,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -35369,7 +35330,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 +35368,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 +35407,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 +35827,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 +35857,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 +35893,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 +35933,7 @@
/area/storage/tech)
"bDk" = (
/obj/structure/table/reinforced,
-/obj/item/device/aicard,
+/obj/item/aicard,
/obj/machinery/light{
dir = 4
},
@@ -35986,16 +35947,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 +36090,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 +36602,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 +36610,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 +36716,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 +36724,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;
@@ -37164,32 +37125,14 @@
/area/storage/tech)
"bET" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/scan_consolenew{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/circuitboard/computer/med_data,
-/obj/item/circuitboard/computer/pandemic{
- pixel_x = 3;
- pixel_y = -3
- },
/obj/effect/turf_decal/bot,
-/obj/item/circuitboard/machine/smoke_machine,
+/obj/effect/spawner/lootdrop/techstorage/service,
/turf/open/floor/plasteel,
/area/storage/tech)
"bEU" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/aifixer{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/circuitboard/computer/rdconsole,
-/obj/item/circuitboard/machine/rdserver{
- pixel_x = 3;
- pixel_y = -3
- },
/obj/effect/turf_decal/bot,
-/obj/item/circuitboard/machine/autolathe,
+/obj/effect/spawner/lootdrop/techstorage/medical,
/turf/open/floor/plasteel,
/area/storage/tech)
"bEV" = (
@@ -37279,7 +37222,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 +37389,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 +37425,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 +37611,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 +37635,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 +37643,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;
@@ -38074,30 +38017,14 @@
/area/storage/tech)
"bGD" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/cloning{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/circuitboard/machine/clonescanner,
-/obj/item/circuitboard/machine/clonepod{
- pixel_x = 3;
- pixel_y = -3
- },
/obj/effect/turf_decal/bot,
+/obj/effect/spawner/lootdrop/techstorage/security,
/turf/open/floor/plasteel,
/area/storage/tech)
"bGE" = (
/obj/structure/rack,
-/obj/item/circuitboard/machine/destructive_analyzer{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/circuitboard/machine/mechfab,
-/obj/item/circuitboard/machine/circuit_imprinter{
- pixel_x = 3;
- pixel_y = -3
- },
/obj/effect/turf_decal/bot,
+/obj/effect/spawner/lootdrop/techstorage/rnd,
/turf/open/floor/plasteel,
/area/storage/tech)
"bGF" = (
@@ -38108,7 +38035,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 +38046,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 +38196,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 +38207,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 +38545,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 +38708,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,
@@ -38966,7 +38893,6 @@
dir = 4
},
/obj/effect/turf_decal/bot,
-/obj/item/circuitboard/machine/autolathe,
/turf/open/floor/plasteel,
/area/storage/tech)
"bIu" = (
@@ -39033,7 +38959,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 +39120,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 +39279,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 +39293,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 +39568,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 +39626,7 @@
"bJT" = (
/obj/structure/table/reinforced,
/obj/item/clipboard,
-/obj/item/device/gps/engineering{
+/obj/item/gps/engineering{
gpstag = "CE0"
},
/obj/machinery/newscaster{
@@ -39919,31 +39845,16 @@
/area/storage/tech)
"bKp" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/security{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/circuitboard/computer/prisoner,
-/obj/item/circuitboard/computer/secure_data{
- pixel_x = 3;
- pixel_y = -3
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/bot,
+/obj/item/electronics/apc,
+/obj/item/electronics/airalarm,
/turf/open/floor/plasteel,
/area/storage/tech)
"bKq" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/atmos_alert{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/circuitboard/computer/powermonitor,
-/obj/item/circuitboard/computer/stationalert{
- pixel_x = 3;
- pixel_y = -3
- },
/obj/effect/turf_decal/bot,
+/obj/effect/spawner/lootdrop/techstorage/engineering,
/turf/open/floor/plasteel,
/area/storage/tech)
"bKr" = (
@@ -39959,7 +39870,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 +39916,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 +39977,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 +40076,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
},
@@ -40840,30 +40751,14 @@
pixel_y = 3
},
/obj/item/circuitboard/machine/teleporter_station,
-/obj/item/circuitboard/computer/teleporter{
- pixel_x = 3;
- pixel_y = -3
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/storage/tech)
"bMi" = (
/obj/structure/rack,
-/obj/item/circuitboard/machine/telecomms/server{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/circuitboard/machine/telecomms/relay,
-/obj/item/circuitboard/machine/telecomms/receiver,
-/obj/item/circuitboard/machine/telecomms/processor,
-/obj/item/circuitboard/machine/telecomms/hub,
-/obj/item/circuitboard/machine/telecomms/bus,
-/obj/item/circuitboard/machine/telecomms/broadcaster{
- pixel_x = 3;
- pixel_y = -3
- },
/obj/effect/turf_decal/bot,
+/obj/effect/spawner/lootdrop/techstorage/tcomms,
/turf/open/floor/plasteel,
/area/storage/tech)
"bMj" = (
@@ -41002,7 +40897,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 +40961,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 +40975,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/flashlight/lamp,
+/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -41398,14 +41293,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 +41326,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 +41612,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 +41650,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 +41762,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 +42088,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 +42119,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 +42387,7 @@
id = "AI";
pixel_x = -26
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -42765,10 +42660,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 +42689,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 +42699,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 +42735,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 +42901,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 +43098,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 +43525,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 +43745,7 @@
pixel_x = -26;
pixel_y = -26
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -43951,7 +43846,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 +43907,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 +44649,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 +44740,7 @@
pixel_x = 32;
pixel_y = 32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -45012,6 +44907,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"bUw" = (
@@ -45462,7 +45360,7 @@
/obj/item/screwdriver{
pixel_y = 5
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/red/side{
dir = 4
},
@@ -45630,7 +45528,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 +45701,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 +46024,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
},
@@ -46183,13 +46081,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/port)
-"bWH" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/port)
"bWI" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/neutral,
@@ -46265,7 +46156,7 @@
pixel_x = -38;
pixel_y = 7
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -46391,7 +46282,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 +46478,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"
},
@@ -47410,6 +47301,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"bYS" = (
@@ -48036,7 +47930,7 @@
dir = 1
},
/obj/machinery/light,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -48142,7 +48036,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 +48057,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 +48722,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 +49032,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 +49061,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 +49094,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 +49237,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 +49268,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 +49396,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 +49486,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 +50563,7 @@
},
/area/security/brig)
"cfn" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -50952,7 +50846,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 +51050,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 +51182,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 +51405,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 +51874,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 +52248,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 +52527,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 +52594,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 +52781,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 +52800,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 +52835,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 +52934,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 +52983,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 +53408,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 +54080,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 +54519,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 +54595,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 +54619,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 +54693,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 +54857,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 +55229,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 +55270,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 +55366,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 +55478,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 +56126,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,
@@ -56548,6 +56442,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 2
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/engine/engineering)
"crY" = (
@@ -56555,6 +56452,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 2
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/engine/engineering)
"crZ" = (
@@ -56684,7 +56584,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 +56740,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 +57339,7 @@
dir = 8;
pixel_x = 24
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -57680,7 +57580,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 +57855,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 +58463,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 +58475,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 +58710,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 +58922,7 @@
amount = 25
},
/obj/item/storage/toolbox/emergency,
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/structure/extinguisher_cabinet{
pixel_x = 26
},
@@ -59336,7 +59236,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -60197,7 +60097,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 +60168,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 +60179,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 +60247,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 +60721,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 +60987,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -61142,7 +61042,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 +61230,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 +61309,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 +61331,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 +61366,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 +62077,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 +62391,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 +62407,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 +62653,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 +63022,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 +63314,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 +63335,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 +63375,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 +63458,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 +63473,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 +64459,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 +65134,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 +66906,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 +67125,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 +67489,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 +67700,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 +67717,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 +67862,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 +68102,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 +68128,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 +68160,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 +68464,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -68575,7 +68475,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 +68489,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 +68965,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -69471,7 +69371,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 +69398,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -69547,7 +69447,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 +69680,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 +69938,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 +70487,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 +70797,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 +71691,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 +71739,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 +73683,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" = (
@@ -74002,6 +73902,7 @@
pixel_y = -32
},
/obj/effect/turf_decal/bot,
+/obj/machinery/portable_atmospherics/canister/bz,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"dcf" = (
@@ -74356,18 +74257,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 +74321,7 @@
/obj/machinery/computer/crew{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -74687,7 +74588,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 +74761,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 +74786,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 +74851,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 +75954,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 +76629,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 +76865,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 +77174,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.";
@@ -77367,6 +77268,12 @@
/obj/machinery/light{
dir = 1
},
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
/turf/open/floor/plasteel/whitepurple/side{
dir = 1
},
@@ -77389,7 +77296,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 +77638,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 +77977,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" = (
@@ -78214,6 +78121,9 @@
dir = 10
},
/obj/structure/chair/comfy,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
/turf/open/floor/plasteel/whitepurple/side{
dir = 8
},
@@ -78224,6 +78134,9 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/vending/snack/random,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
/turf/open/floor/plasteel/whitepurple/side{
dir = 4
},
@@ -78289,7 +78202,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 +78826,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 +78896,7 @@
dir = 4;
pixel_x = -23
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -79329,7 +79242,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 +79387,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 +79579,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 +79777,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;
@@ -80493,6 +80406,9 @@
dir = 9
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
/turf/open/floor/plasteel/whitepurple/side{
dir = 8
},
@@ -80518,6 +80434,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
+/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel/whitepurple/side{
dir = 4
},
@@ -80573,7 +80490,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 +80878,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 +81089,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 +81470,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -82021,7 +81938,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 +82267,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 +82297,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 +82337,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 +82431,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 +82688,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 +82814,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 +82827,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 +83046,7 @@
/area/hallway/secondary/construction)
"dvO" = (
/obj/structure/table,
-/obj/item/device/analyzer{
+/obj/item/analyzer{
pixel_x = 7;
pixel_y = 3
},
@@ -83149,7 +83066,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 +83279,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 +83844,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -84561,7 +84478,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 +84603,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 +84648,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 +84958,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 +85099,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 +85153,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 +85216,7 @@
},
/area/crew_quarters/heads/cmo)
"dAg" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -85356,7 +85273,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 +85601,7 @@
},
/area/medical/genetics)
"dAT" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -26
},
@@ -85930,7 +85847,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 +86198,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 +86306,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 +86338,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 +86348,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 +86591,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 +86723,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 +86775,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 +86800,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 +86888,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -87294,7 +87211,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 +87292,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 +87384,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 +87467,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 +87603,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 +87722,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 +87770,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 +87789,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 +87880,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
},
@@ -88702,6 +88619,12 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
/turf/open/floor/plasteel/neutral/side,
/area/science/mixing)
"dHg" = (
@@ -88839,7 +88762,7 @@
/obj/item/screwdriver{
pixel_y = 5
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/item/clothing/head/welding,
/obj/machinery/light{
dir = 8
@@ -89257,6 +89180,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
/turf/open/floor/plasteel/neutral/side{
dir = 4
},
@@ -89269,7 +89198,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,
@@ -89282,6 +89211,10 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
/turf/open/floor/plasteel/neutral/side{
dir = 8;
heat_capacity = 1e+006
@@ -89524,7 +89457,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 +89492,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 +89675,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 +89694,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
},
@@ -90055,6 +89988,10 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
/turf/open/floor/plasteel/neutral/side{
dir = 1
},
@@ -90102,7 +90039,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 +90263,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 +90292,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 +90896,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 +91083,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 +91645,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 +92259,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -93087,7 +93024,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 +93107,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 +93266,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 +93517,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 +93540,7 @@
dir = 8;
pixel_y = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -93885,7 +93822,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 +94487,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 +94821,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 +95029,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 +95142,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 +95199,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 +95217,7 @@
},
/area/medical/virology)
"dVC" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -95369,7 +95306,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 +96288,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 +96302,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 +96371,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 +97262,7 @@
},
/area/chapel/office)
"eav" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -97460,7 +97397,7 @@
},
/area/medical/virology)
"eaR" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -97975,7 +97912,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 +98042,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 +98250,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 +98467,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 +98820,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 +99065,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 +99106,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 +99150,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 +99479,7 @@
},
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/radio,
+/obj/item/radio,
/turf/open/floor/plasteel/red/side{
dir = 8
},
@@ -99921,7 +99858,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 +100011,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 +100179,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 +100289,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 +100459,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 +100493,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
},
@@ -100652,6 +100589,10 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/light,
/obj/structure/reagent_dispensers/water_cooler,
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
/turf/open/floor/plasteel/whitepurple/side,
/area/science/misc_lab)
"uYS" = (
@@ -119098,7 +119039,7 @@ aoG
apI
aqJ
aaa
-asj
+aoG
apI
aqJ
aaa
@@ -132514,7 +132455,7 @@ bOp
bQq
bDu
bUv
-bWH
+bWC
bYR
caG
caG
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index fd874256f7..e6ef58c9af 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" = (
@@ -7234,14 +7234,7 @@
/area/maintenance/port/fore)
"apx" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/secure_data{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/circuitboard/computer/security{
- pixel_x = 1;
- pixel_y = -1
- },
+/obj/effect/spawner/lootdrop/techstorage/service,
/turf/open/floor/plasteel/dark,
/area/storage/tech)
"apy" = (
@@ -7294,7 +7287,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 +7449,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 +7542,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 +7590,7 @@
},
/area/maintenance/starboard)
"aqs" = (
-/obj/item/device/mmi{
+/obj/item/mmi{
name = "man-machine interface"
},
/obj/structure/rack,
@@ -7700,7 +7693,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 +7854,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 +8616,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 +8812,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 +9587,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 +9834,7 @@
},
/area/security/brig)
"avd" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -10554,7 +10547,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 +11019,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 +11723,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 +11745,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 +12086,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 +12190,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 +12341,7 @@
},
/area/engine/engineering)
"aAr" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -12395,7 +12388,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
},
@@ -12528,25 +12521,11 @@
/turf/open/floor/plasteel/floorgrime,
/area/quartermaster/warehouse)
"aAP" = (
-/obj/structure/closet/crate{
- name = "Gold Crate"
- },
-/obj/item/stack/sheet/mineral/gold{
- pixel_x = -1;
- pixel_y = 5
- },
-/obj/item/stack/sheet/mineral/gold{
- pixel_y = 2
- },
-/obj/item/stack/sheet/mineral/gold{
- pixel_x = 1;
- pixel_y = -2
- },
-/obj/item/storage/belt/champion,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
/obj/effect/turf_decal/bot_white/right,
+/obj/structure/closet/crate/goldcrate,
/turf/open/floor/plasteel/vault{
dir = 1
},
@@ -12580,30 +12559,8 @@
},
/area/security/nuke_storage)
"aAT" = (
-/obj/item/coin/silver{
- pixel_x = 7;
- pixel_y = 12
- },
-/obj/item/coin/silver{
- pixel_x = 12;
- pixel_y = 7
- },
-/obj/item/coin/silver{
- pixel_x = 4;
- pixel_y = 8
- },
-/obj/item/coin/silver{
- pixel_x = -6;
- pixel_y = 5
- },
-/obj/item/coin/silver{
- pixel_x = 5;
- pixel_y = -8
- },
-/obj/structure/closet/crate{
- name = "Silver Crate"
- },
/obj/effect/turf_decal/bot_white/left,
+/obj/structure/closet/crate/silvercrate,
/turf/open/floor/plasteel/vault{
dir = 1
},
@@ -13093,7 +13050,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 +13296,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 +13465,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 +13835,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 +13854,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 +13874,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 +14459,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 +15080,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 +15144,7 @@
},
/area/hallway/primary/fore)
"aGo" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/red/corner{
dir = 2
},
@@ -15507,28 +15464,10 @@
},
/area/engine/engineering)
"aGT" = (
-/obj/structure/closet/crate{
- name = "solar pack crate"
- },
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/circuitboard/computer/solar_control,
-/obj/item/electronics/tracker,
-/obj/item/paper/guides/jobs/engi/solars,
/obj/effect/turf_decal/bot{
dir = 1
},
+/obj/structure/closet/crate/solarpanel_small,
/turf/open/floor/plasteel{
dir = 1
},
@@ -16009,7 +15948,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 +16184,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 +16363,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 +16419,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 +16806,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 +16860,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 +16981,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 +17246,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 +17317,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 +17525,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 +17854,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 +18130,7 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 30
},
-/obj/item/device/gps,
+/obj/item/gps,
/turf/open/floor/plating,
/area/engine/engineering)
"aNq" = (
@@ -18434,7 +18373,6 @@
/area/quartermaster/qm)
"aNR" = (
/obj/structure/table,
-/obj/machinery/computer/stockexchange,
/turf/open/floor/plasteel/brown{
dir = 1
},
@@ -18486,11 +18424,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 +18527,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 +18558,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 +19066,7 @@
"aPr" = (
/obj/structure/table,
/obj/item/wirecutters,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
@@ -19365,7 +19303,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 +19522,7 @@
pixel_x = -4;
pixel_y = 7
},
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "QM0"
},
/turf/open/floor/plasteel,
@@ -19625,13 +19563,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 +19616,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 +19844,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 +20095,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 +20125,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 +20331,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 +20367,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 +20504,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 +20812,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 +20909,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 +21246,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/light{
dir = 1
},
@@ -21367,7 +21305,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 +21354,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 +21792,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 +21989,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 +22159,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 +22790,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,69 +23090,44 @@
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" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/pandemic{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/circuitboard/computer/rdconsole,
-/obj/item/circuitboard/machine/rdserver{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/circuitboard/machine/destructive_analyzer,
-/obj/item/circuitboard/computer/aifixer,
-/obj/item/circuitboard/computer/teleporter,
-/obj/item/circuitboard/machine/circuit_imprinter,
-/obj/item/circuitboard/machine/mechfab,
+/obj/effect/spawner/lootdrop/techstorage/engineering,
/turf/open/floor/plasteel/dark,
/area/storage/tech)
"aYk" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/mining,
-/obj/item/circuitboard/machine/autolathe{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/circuitboard/computer/arcade/battle,
/obj/machinery/ai_status_display{
pixel_y = 31
},
+/obj/effect/spawner/lootdrop/techstorage/medical,
/turf/open/floor/plasteel/dark,
/area/storage/tech)
"aYl" = (
/obj/structure/rack,
-/obj/item/circuitboard/machine/telecomms/processor,
-/obj/item/circuitboard/machine/telecomms/receiver,
-/obj/item/circuitboard/machine/telecomms/server,
-/obj/item/circuitboard/machine/telecomms/bus,
-/obj/item/circuitboard/machine/telecomms/broadcaster,
-/obj/item/circuitboard/computer/message_monitor{
- pixel_y = -5
- },
+/obj/effect/spawner/lootdrop/techstorage/rnd,
/turf/open/floor/plasteel/dark,
/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 +23137,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 +23204,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 +23743,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 +23836,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 +23871,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 +23879,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 +23973,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 +23981,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 +24107,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 +24170,7 @@
},
/obj/item/stack/wrapping_paper,
/obj/item/stack/wrapping_paper,
-/obj/item/device/destTagger{
+/obj/item/destTagger{
pixel_x = 4;
pixel_y = 3
},
@@ -24357,7 +24270,6 @@
/area/quartermaster/office)
"bax" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/stockexchange,
/turf/open/floor/plasteel/brown{
dir = 5
},
@@ -24654,7 +24566,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 +24630,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)";
@@ -24763,14 +24675,7 @@
/area/maintenance/starboard/fore)
"bbk" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/borgupload{
- pixel_x = -1;
- pixel_y = 1
- },
-/obj/item/circuitboard/computer/aiupload{
- pixel_x = 2;
- pixel_y = -2
- },
+/obj/effect/spawner/lootdrop/techstorage/AI,
/turf/open/floor/plasteel/dark,
/area/storage/tech)
"bbl" = (
@@ -24778,7 +24683,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)";
@@ -24801,15 +24706,7 @@
/area/storage/tech)
"bbn" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/cloning,
-/obj/item/circuitboard/computer/med_data{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/circuitboard/machine/clonescanner,
-/obj/item/circuitboard/machine/clonepod,
-/obj/item/circuitboard/computer/scan_consolenew,
-/obj/item/circuitboard/machine/smoke_machine,
+/obj/effect/spawner/lootdrop/techstorage/security,
/turf/open/floor/plasteel/dark,
/area/storage/tech)
"bbo" = (
@@ -24817,19 +24714,8 @@
/area/maintenance/solars/port/fore)
"bbp" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/powermonitor{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/circuitboard/computer/stationalert{
- pixel_x = 1;
- pixel_y = -1
- },
-/obj/item/circuitboard/computer/atmos_alert{
- pixel_x = 3;
- pixel_y = -3
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/spawner/lootdrop/techstorage/tcomms,
/turf/open/floor/plasteel/dark,
/area/storage/tech)
"bbq" = (
@@ -24973,7 +24859,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 +25083,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 +25163,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
@@ -25327,18 +25213,7 @@
/area/storage/tech)
"bcv" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/crew{
- pixel_x = -1;
- pixel_y = 1
- },
-/obj/item/circuitboard/computer/card{
- pixel_x = 2;
- pixel_y = -2
- },
-/obj/item/circuitboard/computer/communications{
- pixel_x = 5;
- pixel_y = -5
- },
+/obj/effect/spawner/lootdrop/techstorage/RnD_secure,
/turf/open/floor/plasteel/dark,
/area/storage/tech)
"bcw" = (
@@ -25404,7 +25279,7 @@
pixel_y = 16
},
/obj/item/wirecutters,
-/obj/item/device/multitool,
+/obj/item/multitool,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -25599,7 +25474,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 +25767,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
@@ -26034,14 +25909,7 @@
/area/maintenance/starboard/fore)
"bdX" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/robotics{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/circuitboard/computer/mecha_control{
- pixel_x = 1;
- pixel_y = -1
- },
+/obj/effect/spawner/lootdrop/techstorage/command,
/turf/open/floor/plasteel/dark,
/area/storage/tech)
"bdY" = (
@@ -26058,7 +25926,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 +25935,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 +25948,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 +25983,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 +26500,7 @@
/turf/open/floor/plating,
/area/maintenance/central)
"bfp" = (
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_x = 1;
pixel_y = 5
},
@@ -27054,7 +26922,7 @@
pixel_x = 5;
pixel_y = -1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -27100,8 +26968,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 +27490,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 +27830,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 +28095,7 @@
/area/quartermaster/sorting)
"biJ" = (
/obj/structure/table,
-/obj/item/device/destTagger{
+/obj/item/destTagger{
pixel_x = 4;
pixel_y = 3
},
@@ -28243,7 +28111,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 +28193,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 +28301,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 +28728,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)";
@@ -28938,7 +28806,6 @@
pixel_x = 4;
pixel_y = 4
},
-/obj/machinery/computer/stockexchange,
/turf/open/floor/plasteel/arrival{
dir = 2
},
@@ -28959,7 +28826,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)";
@@ -29047,7 +28914,6 @@
/area/quartermaster/sorting)
"bkn" = (
/obj/structure/table,
-/obj/machinery/computer/stockexchange,
/obj/machinery/firealarm{
dir = 8;
pixel_x = -26
@@ -29079,7 +28945,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 +29018,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 +29069,7 @@
},
/area/bridge)
"bkD" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
pixel_y = 29
@@ -29227,7 +29093,7 @@
},
/area/bridge)
"bkF" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -29420,7 +29286,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 +29585,7 @@
pixel_x = -26;
pixel_y = 3
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -29982,7 +29848,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 +29895,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 +30254,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 +30293,7 @@
pixel_x = -3;
pixel_y = 5
},
-/obj/item/device/taperecorder{
+/obj/item/taperecorder{
pixel_x = -4
},
/turf/open/floor/plasteel,
@@ -30758,7 +30624,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 +30771,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 +30866,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 +31026,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 +31049,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 +31525,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 +32000,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 +32053,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 +32100,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 +32123,7 @@
pixel_y = -3
},
/obj/item/wrench,
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/machinery/newscaster{
pixel_y = -30
},
@@ -32454,7 +32320,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 +32415,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 +32765,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 +32898,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 +32926,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 +32951,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 +33032,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 +33393,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 +33473,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 +33622,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 +34058,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 +34277,7 @@
},
/area/maintenance/starboard)
"bvf" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 1;
listening = 1;
@@ -34419,14 +34285,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 +34387,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 +34446,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/item/device/radio/off{
+/obj/item/radio/off{
pixel_y = 4
},
/obj/item/screwdriver{
@@ -34628,14 +34494,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 +34725,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 +34751,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 +34890,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 +34901,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 +35189,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 +35498,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 +35741,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 +36046,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 +36057,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 +36520,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 +36540,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 +36695,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 +37131,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 +37142,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 +37195,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 +37661,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 +38002,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 +38124,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 +39586,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 +40214,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 +40296,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 +40445,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 +40499,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 +40882,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 +40979,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 +41051,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 +41101,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 +41413,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 +42128,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 +42287,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 +42452,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 +42626,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 +42736,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 +42784,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 +43846,7 @@
/area/library)
"bPT" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/turf/open/floor/wood,
/area/library)
"bPU" = (
@@ -44536,9 +44402,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 +44418,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 +44677,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 +44851,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 +45138,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 +45675,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 +45802,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 +46111,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 +46716,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 +47509,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 +47524,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 +47567,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 +47845,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 +48109,7 @@
},
/area/medical/storage)
"bYV" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -48332,7 +48198,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 +48353,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 +48447,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 +48835,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 +48853,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 +49423,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 +49607,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 +49761,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 +49801,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 +49822,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 +49855,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 +50588,7 @@
},
/area/maintenance/starboard)
"cdW" = (
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/obj/machinery/light/small{
dir = 4
},
@@ -50898,7 +50764,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 +50920,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 +51028,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 +51085,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 +52186,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 +52279,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 +52328,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 +52371,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 +52381,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 +52963,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 +53224,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 +53405,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 +53568,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 +53614,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 +53653,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 +53985,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 +54091,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 +54205,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 +54616,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 +54760,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 +54807,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 +54899,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 +54987,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 +55177,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 +55420,7 @@
},
/area/science/research)
"cog" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
name = "Station Intercom (General)";
@@ -55640,7 +55506,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 +56882,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 +57093,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 +57229,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 +57526,7 @@
},
/area/medical/surgery)
"csn" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
freerange = 0;
frequency = 1485;
@@ -57859,7 +57725,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
@@ -58230,15 +58096,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/science/storage)
-"ctk" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
"ctl" = (
/obj/machinery/camera{
active_power_usage = 0;
@@ -58640,7 +58497,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 +58515,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 +58638,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 +58668,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 +58877,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 +58893,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 +59031,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 +59133,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 +59415,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 +59506,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 +59679,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 +59745,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 +59884,7 @@
dir = 8;
pixel_x = 24
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -60377,7 +60234,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 +60613,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 +60885,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 +61781,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 +61853,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 +61916,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 +62024,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 +62219,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 +62390,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 +62444,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 +62466,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 +62492,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 +62513,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 +62567,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 +62778,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 +62825,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 +62878,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 +62950,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 +63005,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 +63126,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 +63486,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 +63784,7 @@
},
/area/medical/medbay/aft)
"cES" = (
-/obj/item/device/healthanalyzer{
+/obj/item/healthanalyzer{
pixel_x = 1;
pixel_y = 4
},
@@ -64063,7 +63920,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/multitool{
+/obj/item/multitool{
pixel_x = 3
},
/obj/item/stack/cable_coil,
@@ -64155,11 +64012,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 +64032,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 +64048,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 +64165,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 +64246,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 +64826,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 +64836,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 +64913,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 +65142,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 +65527,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 +65857,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 +65886,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 +66239,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 +66260,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 +66305,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 +66352,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 +66533,7 @@
},
/area/medical/virology)
"cKm" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -66823,7 +66680,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 +67361,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 +67429,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 +67674,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 +67968,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 +68012,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 +68052,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 +68111,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 +68153,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 +68320,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 +68617,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 +68712,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 +69005,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 +69197,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 +69226,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 +69301,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 +69491,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 +69628,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 +69647,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 +69782,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 +70939,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 +70957,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 +71197,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 +71306,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 +71323,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 +71332,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 +71357,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 +71887,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 +72207,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
},
@@ -72558,7 +72415,6 @@
/turf/open/floor/plating,
/area/maintenance/department/science/xenobiology)
"ddf" = (
-/obj/machinery/portable_atmospherics/canister,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 4
},
@@ -72570,6 +72426,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/machinery/portable_atmospherics/canister/bz,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"ddg" = (
@@ -72618,7 +72475,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 +73255,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 +73272,7 @@
},
/area/storage/primary)
"dhM" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
@@ -73557,7 +73414,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 +73479,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 +73549,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 +73781,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 +75316,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 +75504,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 +75552,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 +75800,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 +75857,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 +75871,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 +76065,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 +76103,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 +76243,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 +76610,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)
@@ -112957,7 +112814,7 @@ cJa
cpG
kVo
dDu
-ctk
+kVo
cuc
cuZ
dyp
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..1390460fd2 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
},
@@ -4949,7 +4949,6 @@
/turf/open/floor/plasteel/neutral,
/area/quartermaster/storage)
"ajM" = (
-/obj/machinery/computer/stockexchange,
/obj/structure/table/reinforced,
/obj/machinery/requests_console{
department = "Cargo Office";
@@ -4976,7 +4975,7 @@
pixel_x = 3;
pixel_y = -3
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -5048,8 +5047,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 +6445,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 +6461,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
},
@@ -6482,7 +6481,6 @@
},
/area/hallway/primary/starboard/fore)
"amv" = (
-/obj/machinery/computer/stockexchange,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/brown{
dir = 10
@@ -6527,7 +6525,7 @@
pixel_x = 24;
pixel_y = -24
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
@@ -6557,7 +6555,7 @@
name = "protective hat";
pixel_y = 9
},
-/obj/item/device/flashlight,
+/obj/item/flashlight,
/turf/open/floor/plating,
/area/asteroid/nearstation)
"amH" = (
@@ -6724,9 +6722,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 +6812,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 +6904,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 +7138,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 +7241,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 +8194,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 +8257,7 @@
/area/teleporter)
"apO" = (
/obj/machinery/shieldwallgen,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 28
},
@@ -8405,10 +8403,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 +8417,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 +8610,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 +8655,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 +8791,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 +9043,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 +9315,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 +9674,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 +9689,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 +9711,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 +9826,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 +10105,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 +10240,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 +10363,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 +10690,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 +10743,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 +11025,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 +11190,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 +11382,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 +11769,7 @@
/obj/machinery/newscaster{
pixel_y = 32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -11802,7 +11800,7 @@
},
/area/hallway/primary/port)
"axD" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
@@ -12082,7 +12080,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 +12165,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 +12328,7 @@
},
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/device/radio,
+/obj/item/radio,
/obj/machinery/airalarm{
pixel_y = 23
},
@@ -12344,7 +12342,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 +12358,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -12527,12 +12525,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 +13327,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 +13607,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 +13860,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 +14353,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 +14425,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 +14509,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 +14744,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 +14979,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 +15299,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 +15320,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 +15724,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 +16595,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 +16708,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -16961,7 +16959,7 @@
/obj/machinery/power/terminal{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
@@ -17234,7 +17232,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 +17689,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 +18219,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 +18537,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 +18622,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 +18670,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 +18880,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 +18941,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 +19436,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 +19716,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 +20285,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 +20671,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 +20802,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 +20831,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 +20841,7 @@
/area/library)
"aRX" = (
/obj/structure/table/wood,
-/obj/item/device/paicard,
+/obj/item/paicard,
/obj/machinery/newscaster{
pixel_y = 32
},
@@ -20889,7 +20887,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 +20929,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 +21223,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 +21278,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 +21409,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 +21475,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 +21804,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 +21958,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 +22159,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = 26
},
@@ -22356,10 +22354,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 +22485,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 +22499,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 +22647,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 +22831,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 +22858,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 +23519,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 +23719,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 +23782,7 @@
dir = 4
},
/obj/structure/cable/white,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -24209,7 +24207,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 +24250,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 +24263,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 +24593,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 +24633,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 +24647,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 +24941,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 +25131,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 +25604,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 +25818,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 +25892,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 +26532,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 +26599,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 +26659,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 +26684,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 +26874,7 @@
/obj/machinery/newscaster{
pixel_x = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -27540,7 +27538,7 @@
},
/area/chapel/main)
"bfX" = (
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -27621,7 +27619,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 +27785,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 +27824,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 +28529,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 +29287,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 +29322,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 +29423,7 @@
pixel_x = 24;
pixel_y = -24
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = -24
},
@@ -29562,7 +29560,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)
@@ -31227,9 +31225,6 @@
},
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
-"dWc" = (
-/turf/closed/mineral/random/labormineral,
-/area/space)
"dYC" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
@@ -32130,7 +32125,7 @@
/area/hydroponics)
"lAs" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 24
},
@@ -33241,28 +33236,10 @@
},
/area/maintenance/starboard)
"sFp" = (
-/obj/structure/closet/crate{
- name = "solar pack crate"
- },
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/circuitboard/computer/solar_control,
-/obj/item/electronics/tracker,
-/obj/item/paper/guides/jobs/engi/solars,
/obj/effect/turf_decal/bot{
dir = 1
},
+/obj/structure/closet/crate/solarpanel_small,
/turf/open/floor/plasteel/vault/side{
dir = 5
},
@@ -33275,9 +33252,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 +34227,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 +34235,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 +34414,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 +34427,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 +34482,7 @@
id = "AI";
pixel_x = -26
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -34611,7 +34588,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 +34640,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 +34878,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 +35029,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
},
@@ -79416,7 +79393,7 @@ bfP
bjc
bfP
bfP
-dWc
+aad
aaa
aaa
aaa
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 27dc4f85e5..ac4d2a12dc 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
},
@@ -6985,21 +6985,7 @@
/turf/closed/wall/r_wall,
/area/bridge)
"asV" = (
-/obj/structure/closet/crate{
- name = "Gold Crate"
- },
-/obj/item/stack/sheet/mineral/gold{
- pixel_x = -1;
- pixel_y = 5
- },
-/obj/item/stack/sheet/mineral/gold{
- pixel_y = 2
- },
-/obj/item/stack/sheet/mineral/gold{
- pixel_x = 1;
- pixel_y = -2
- },
-/obj/item/storage/belt/champion,
+/obj/structure/closet/crate/goldcrate,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
@@ -7036,29 +7022,7 @@
},
/area/ai_monitored/nuke_storage)
"asZ" = (
-/obj/item/coin/silver{
- pixel_x = 7;
- pixel_y = 12
- },
-/obj/item/coin/silver{
- pixel_x = 12;
- pixel_y = 7
- },
-/obj/item/coin/silver{
- pixel_x = 4;
- pixel_y = 8
- },
-/obj/item/coin/silver{
- pixel_x = -6;
- pixel_y = 5
- },
-/obj/item/coin/silver{
- pixel_x = 5;
- pixel_y = -8
- },
-/obj/structure/closet/crate{
- name = "Silver Crate"
- },
+/obj/structure/closet/crate/silvercrate,
/turf/open/floor/plasteel/vault{
dir = 4
},
@@ -7397,7 +7361,7 @@
},
/area/bridge)
"atU" = (
-/obj/item/device/beacon,
+/obj/item/beacon,
/turf/open/floor/plasteel/darkblue/side{
dir = 1
},
@@ -7488,7 +7452,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 +7578,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 +8145,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 +8218,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 +8618,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 +9015,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 +9373,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 +9490,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 +9587,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 +9682,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 +10017,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 +10059,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 +10243,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 +10453,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 +10666,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 +10836,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 +10850,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 +10864,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 +10882,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 +11238,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 +11494,7 @@
c_tag = "AI Upload Center";
dir = 1
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
listening = 0;
@@ -11737,7 +11701,7 @@
dir = 8;
pixel_x = 23
},
-/obj/effect/decal/cleanable/deadcockroach,
+/obj/effect/decal/cleanable/insectguts,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/restrooms)
"aEi" = (
@@ -11761,11 +11725,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 +12052,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 +12068,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 +12199,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 +12225,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 +12254,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 +12312,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/device/taperecorder,
+/obj/item/taperecorder,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aFE" = (
@@ -12550,8 +12514,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 +12527,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" = (
@@ -13428,7 +13392,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/effect/decal/cleanable/deadcockroach,
+/obj/effect/decal/cleanable/insectguts,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/restrooms)
"aIo" = (
@@ -14802,7 +14766,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 +15208,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 +15305,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 +15355,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 +15479,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 +15713,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 +16311,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 +16431,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 +17574,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 +18093,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 +18638,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 +19060,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 +19128,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 +19291,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 +19734,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 +19814,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 +20009,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)
@@ -20061,7 +20025,7 @@
/obj/item/shard{
icon_state = "small"
},
-/obj/effect/decal/cleanable/deadcockroach,
+/obj/effect/decal/cleanable/insectguts,
/obj/item/light/bulb,
/turf/open/floor/plating,
/area/maintenance/department/cargo)
@@ -20097,7 +20061,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 +20130,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
@@ -20314,7 +20278,6 @@
/area/hallway/primary/central)
"aZj" = (
/obj/structure/table,
-/obj/machinery/computer/stockexchange,
/obj/machinery/status_display{
dir = 4;
layer = 4;
@@ -20467,7 +20430,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 +20689,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 +20728,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 +20838,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 +21303,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 +21494,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 +22330,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
},
@@ -22770,7 +22733,6 @@
/area/science/robotics/mechbay)
"bfB" = (
/obj/structure/table,
-/obj/machinery/computer/stockexchange,
/obj/machinery/requests_console{
department = "Cargo Bay";
departmentType = 2;
@@ -22797,7 +22759,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 +22936,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 +23212,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 +23238,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 +23961,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 +23988,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 +24003,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 +24382,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 +24503,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 +24885,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 +24906,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 +25090,7 @@
/area/science/server)
"blP" = (
/obj/effect/landmark/event_spawn,
-/obj/item/device/beacon,
+/obj/item/beacon,
/obj/machinery/light{
dir = 8
},
@@ -25697,7 +25659,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 +25876,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 +25967,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 +26177,7 @@
name = "Medbay RC";
pixel_x = -32
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -26558,7 +26520,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 +26835,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 +26945,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 +27484,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 +27500,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
},
@@ -27783,6 +27745,7 @@
dir = 4
},
/obj/effect/turf_decal/stripes/line,
+/obj/machinery/portable_atmospherics/canister/bz,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"brY" = (
@@ -28039,7 +28002,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 +28084,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 +28187,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 +28227,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 +28279,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 +28297,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 +28844,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 +29242,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 +29944,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 +30642,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 +30911,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 +32267,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 +32383,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 +32481,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 +32604,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" = (
@@ -33066,7 +33029,7 @@
/area/maintenance/department/engine)
"bDj" = (
/obj/item/trash/candy,
-/obj/effect/decal/cleanable/deadcockroach,
+/obj/effect/decal/cleanable/insectguts,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/obj/structure/cable{
icon_state = "1-2"
@@ -33830,7 +33793,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 +33807,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 +33959,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 +33991,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/item/device/analyzer,
+/obj/item/analyzer,
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bFl" = (
@@ -34330,7 +34293,7 @@
/turf/open/floor/plasteel/freezer,
/area/medical/virology)
"bFL" = (
-/obj/effect/decal/cleanable/deadcockroach,
+/obj/effect/decal/cleanable/insectguts,
/turf/open/floor/plasteel/freezer,
/area/medical/virology)
"bFM" = (
@@ -34416,7 +34379,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 +34531,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 +34550,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 +34797,7 @@
icon_state = "shower";
dir = 4
},
-/obj/item/device/radio/intercom{
+/obj/item/radio/intercom{
broadcasting = 0;
freerange = 0;
frequency = 1485;
@@ -34971,10 +34934,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 +35191,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 +35231,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 +35260,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 +35360,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 +35763,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 +36340,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 +36508,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 +37285,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 +37488,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 +38049,7 @@
pixel_x = -5;
pixel_y = 3
},
-/obj/item/device/multitool{
+/obj/item/multitool{
layer = 4
},
/turf/open/floor/plasteel/yellow/side,
@@ -38095,9 +38058,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" = (
@@ -38228,7 +38191,7 @@
/area/maintenance/department/engine)
"bPq" = (
/obj/item/trash/chips,
-/obj/effect/decal/cleanable/deadcockroach,
+/obj/effect/decal/cleanable/insectguts,
/turf/open/floor/plasteel/dark,
/area/maintenance/department/engine)
"bPr" = (
@@ -38469,7 +38432,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 +38523,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 +38541,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{
@@ -38601,34 +38564,14 @@
/area/storage/tech)
"bQv" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/pandemic{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/circuitboard/computer/rdconsole,
-/obj/item/circuitboard/machine/rdserver{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/circuitboard/machine/destructive_analyzer,
-/obj/item/circuitboard/computer/aifixer,
-/obj/item/circuitboard/computer/teleporter,
-/obj/item/circuitboard/machine/circuit_imprinter,
-/obj/item/circuitboard/machine/mechfab,
/obj/structure/sign/poster/official/random{
pixel_y = 32
},
-/obj/item/circuitboard/machine/smoke_machine,
+/obj/effect/spawner/lootdrop/techstorage/engineering,
/turf/open/floor/plasteel/darkgreen,
/area/storage/tech)
"bQw" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/mining,
-/obj/item/circuitboard/machine/autolathe{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/circuitboard/computer/arcade/battle,
/obj/machinery/light{
dir = 1;
light_color = "#cee5d2"
@@ -38638,18 +38581,12 @@
dir = 2
},
/obj/item/circuitboard/computer/monastery_shuttle,
+/obj/effect/spawner/lootdrop/techstorage/service,
/turf/open/floor/plasteel/darkgreen,
/area/storage/tech)
"bQx" = (
/obj/structure/rack,
-/obj/item/circuitboard/machine/telecomms/processor,
-/obj/item/circuitboard/machine/telecomms/receiver,
-/obj/item/circuitboard/machine/telecomms/server,
-/obj/item/circuitboard/machine/telecomms/bus,
-/obj/item/circuitboard/machine/telecomms/broadcaster,
-/obj/item/circuitboard/computer/message_monitor{
- pixel_y = -5
- },
+/obj/effect/spawner/lootdrop/techstorage/rnd,
/turf/open/floor/plasteel/darkgreen,
/area/storage/tech)
"bQy" = (
@@ -38923,7 +38860,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
@@ -39227,42 +39164,17 @@
/area/storage/tech)
"bRO" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/cloning,
-/obj/item/circuitboard/computer/med_data{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/circuitboard/machine/clonescanner,
-/obj/item/circuitboard/machine/clonepod,
-/obj/item/circuitboard/computer/scan_consolenew,
+/obj/effect/spawner/lootdrop/techstorage/medical,
/turf/open/floor/plasteel/darkgreen,
/area/storage/tech)
"bRP" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/secure_data{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/circuitboard/computer/security{
- pixel_x = 1;
- pixel_y = -1
- },
+/obj/effect/spawner/lootdrop/techstorage/tcomms,
/turf/open/floor/plasteel/darkgreen,
/area/storage/tech)
"bRQ" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/powermonitor{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/circuitboard/computer/stationalert{
- pixel_x = 1;
- pixel_y = -1
- },
-/obj/item/circuitboard/computer/atmos_alert{
- pixel_x = 3;
- pixel_y = -3
- },
+/obj/effect/spawner/lootdrop/techstorage/security,
/turf/open/floor/plasteel/darkgreen,
/area/storage/tech)
"bRR" = (
@@ -39566,7 +39478,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 +39593,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 +39847,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 +39856,7 @@
pixel_x = 2;
pixel_y = 4
},
-/obj/item/device/multitool,
+/obj/item/multitool,
/obj/machinery/requests_console{
department = "Tech storage";
pixel_y = -32
@@ -39953,25 +39865,6 @@
/turf/open/floor/plasteel/darkgreen,
/area/storage/tech)
"bTB" = (
-/obj/structure/closet/crate{
- name = "solar pack crate"
- },
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/solar_assembly,
-/obj/item/circuitboard/computer/solar_control,
-/obj/item/electronics/tracker,
-/obj/item/paper/guides/jobs/engi/solars,
/obj/machinery/power/apc{
dir = 2;
name = "Tech Storage APC";
@@ -39979,6 +39872,7 @@
pixel_y = -24
},
/obj/structure/cable,
+/obj/structure/closet/crate/solarpanel_small,
/turf/open/floor/plasteel/darkgreen,
/area/storage/tech)
"bTC" = (
@@ -40067,7 +39961,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 +40156,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 +40667,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"
},
@@ -41190,46 +41084,21 @@
/area/crew_quarters/heads/chief)
"bWs" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/robotics{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/circuitboard/computer/mecha_control{
- pixel_x = 1;
- pixel_y = -1
- },
+/obj/effect/spawner/lootdrop/techstorage/AI,
/turf/open/floor/plasteel/darkred,
/area/storage/tech)
"bWt" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/crew{
- pixel_x = -1;
- pixel_y = 1
- },
-/obj/item/circuitboard/computer/card{
- pixel_x = 2;
- pixel_y = -2
- },
-/obj/item/circuitboard/computer/communications{
- pixel_x = 5;
- pixel_y = -5
- },
/obj/machinery/camera{
c_tag = "Secure Tech Storage";
dir = 1
},
+/obj/effect/spawner/lootdrop/techstorage/RnD_secure,
/turf/open/floor/plasteel/darkred,
/area/storage/tech)
"bWu" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/borgupload{
- pixel_x = -1;
- pixel_y = 1
- },
-/obj/item/circuitboard/computer/aiupload{
- pixel_x = 2;
- pixel_y = -2
- },
+/obj/effect/spawner/lootdrop/techstorage/command,
/turf/open/floor/plasteel/darkred,
/area/storage/tech)
"bWv" = (
@@ -41500,7 +41369,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 +42151,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 +42903,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
},
@@ -43056,7 +42925,7 @@
"cba" = (
/obj/structure/table,
/obj/item/storage/fancy/cigarettes/cigpack_robustgold,
-/obj/effect/decal/cleanable/deadcockroach,
+/obj/effect/decal/cleanable/insectguts,
/turf/open/floor/plating,
/area/maintenance/department/engine)
"cbb" = (
@@ -43070,7 +42939,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 +42977,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 +43449,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 +43487,7 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 30
},
-/obj/item/device/gps{
+/obj/item/gps{
gpstag = "ENG0"
},
/turf/open/floor/plating,
@@ -44771,7 +44640,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 +44884,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 +44922,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 +45425,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 +45712,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 +45829,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 +45988,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 +46084,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 +46122,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 +46618,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 +46850,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 +47004,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 +47670,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 +48846,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 +49150,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 +49206,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 +49250,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 +49345,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 +49362,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 +49811,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 +49987,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 +50294,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 +50380,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 +50433,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 +50606,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 +50673,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 +50691,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..3629dd5f05 100644
--- a/_maps/map_files/debug/runtimestation.dmm
+++ b/_maps/map_files/debug/runtimestation.dmm
@@ -25,6 +25,9 @@
/area/engine/atmos)
"ai" = (
/obj/machinery/power/rtg/advanced,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
/turf/open/floor/plating/airless,
/area/space/nearstation)
"aj" = (
@@ -73,7 +76,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
/area/engine/engineering)
"aq" = (
/obj/machinery/computer/monitor,
@@ -84,11 +87,11 @@
/obj/machinery/light{
dir = 1
},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
/area/engine/engineering)
"ar" = (
/obj/structure/closet/secure_closet/engineering_welding,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
/area/engine/engineering)
"as" = (
/obj/machinery/power/smes{
@@ -182,12 +185,6 @@
/obj/machinery/door/airlock/external/glass,
/turf/open/floor/plating,
/area/engine/engineering)
-"aD" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plating,
-/area/engine/engineering)
"aE" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -195,10 +192,16 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/turf/open/floor/plasteel,
/area/engine/engineering)
"aF" = (
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
/area/engine/engineering)
"aG" = (
/obj/machinery/power/terminal{
@@ -287,12 +290,12 @@
/area/space/nearstation)
"aS" = (
/obj/structure/table,
-/obj/item/device/flashlight{
+/obj/item/flashlight{
pixel_y = 5
},
/obj/item/storage/toolbox/syndicate,
/obj/item/stock_parts/cell/infinite,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
/area/engine/engineering)
"aT" = (
/obj/structure/cable{
@@ -301,7 +304,8 @@
/obj/structure/cable{
icon_state = "2-4"
},
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
/area/engine/engineering)
"aU" = (
/obj/machinery/door/airlock/engineering/glass{
@@ -382,17 +386,18 @@
/obj/structure/table,
/obj/item/weldingtool/experimental,
/obj/item/inducer,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
/area/engine/engineering)
"be" = (
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
/area/engine/engineering)
"bf" = (
/obj/machinery/suit_storage_unit/captain,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
/area/engine/engineering)
"bg" = (
/obj/effect/turf_decal/stripes/line{
@@ -422,7 +427,7 @@
},
/obj/machinery/light,
/obj/structure/table,
-/obj/item/device/analyzer,
+/obj/item/analyzer,
/obj/item/wrench,
/turf/open/floor/plating,
/area/engine/atmos)
@@ -453,16 +458,15 @@
/turf/open/floor/plating,
/area/engine/atmos)
"bo" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/table,
/obj/item/screwdriver/power,
/obj/item/wirecutters/power,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
/area/engine/engineering)
"bp" = (
/obj/machinery/light,
/obj/structure/tank_dispenser,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
/area/engine/engineering)
"bq" = (
/obj/effect/turf_decal/stripes/line{
@@ -496,15 +500,12 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/bridge)
-"bw" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/closed/wall/r_wall,
-/area/engine/engineering)
"bx" = (
/obj/machinery/door/airlock,
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/engine/engineering)
"by" = (
@@ -534,20 +535,14 @@
/obj/machinery/autolathe/hacked,
/turf/open/floor/plasteel,
/area/science)
-"bC" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/science)
"bD" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
-/obj/machinery/robotic_fabricator,
/obj/machinery/light{
dir = 1
},
+/obj/machinery/mecha_part_fabricator,
/turf/open/floor/plasteel,
/area/science)
"bE" = (
@@ -634,11 +629,7 @@
/turf/open/floor/plasteel/dark,
/area/medical/chemistry)
"bS" = (
-/obj/machinery/chem_dispenser,
-/turf/open/floor/plasteel/dark,
-/area/medical/chemistry)
-"bT" = (
-/obj/machinery/chem_dispenser,
+/obj/machinery/chem_dispenser/fullupgrade,
/turf/open/floor/plasteel/dark,
/area/medical/chemistry)
"bU" = (
@@ -751,16 +742,6 @@
/obj/machinery/door/airlock,
/turf/open/floor/plating,
/area/bridge)
-"ci" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/turf/open/floor/plasteel,
-/area/medical/chemistry)
"cj" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -801,8 +782,10 @@
/area/science)
"cp" = (
/obj/machinery/light,
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/closet/secure_closet/engineering_chief,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
/turf/open/floor/plasteel/blue/side{
dir = 10
},
@@ -824,7 +807,6 @@
/turf/closed/wall/r_wall,
/area/bridge)
"ct" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/light{
dir = 8
},
@@ -898,8 +880,10 @@
/turf/closed/wall/r_wall,
/area/medical/chemistry)
"cF" = (
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/medical/chemistry)
"cG" = (
@@ -1013,12 +997,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/storage/primary)
-"db" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/storage/primary)
"dc" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -1320,11 +1298,22 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/science)
+"gM" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/storage/primary)
"gY" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/science)
"hD" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/power/apc{
dir = 1;
pixel_y = 25
@@ -1405,6 +1394,11 @@
},
/turf/open/floor/plasteel,
/area/medical/chemistry)
+"sE" = (
+/obj/machinery/power/rtg/advanced,
+/obj/structure/cable,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"vv" = (
/obj/machinery/door/airlock,
/turf/open/floor/plating,
@@ -1440,6 +1434,22 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/medical/chemistry)
+"yp" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
+"AP" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/science)
"BB" = (
/obj/item/storage/backpack/duffelbag/syndie/surgery,
/obj/structure/table,
@@ -1460,19 +1470,32 @@
/turf/open/floor/plasteel,
/area/medical/chemistry)
"Ct" = (
-/obj/item/disk/tech_disk/debug,
+/obj/machinery/rnd/production/circuit_imprinter/department,
/turf/open/floor/plasteel,
/area/science)
+"CK" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
"CV" = (
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/medical/chemistry)
+"EI" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/open/floor/plasteel/blue/side,
+/area/bridge)
"If" = (
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/rnd/destructive_analyzer,
/turf/open/floor/plasteel,
/area/science)
"In" = (
@@ -1489,8 +1512,12 @@
/obj/machinery/door/airlock,
/turf/open/floor/plating,
/area/hallway/primary/central)
+"Ly" = (
+/obj/machinery/chem_dispenser/chem_synthesizer,
+/turf/open/floor/plasteel/dark,
+/area/medical/chemistry)
"NZ" = (
-/obj/machinery/rnd/production/protolathe,
+/obj/machinery/rnd/production/protolathe/department,
/turf/open/floor/plasteel,
/area/science)
"Qt" = (
@@ -1500,6 +1527,20 @@
/obj/machinery/door/airlock/external/glass,
/turf/open/floor/plating,
/area/medical/medbay)
+"RC" = (
+/obj/machinery/power/rtg/advanced,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
+"RY" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/item/disk/tech_disk/debug,
+/turf/open/floor/plasteel,
+/area/science)
"Ut" = (
/obj/structure/closet/secure_closet/medical3,
/turf/open/floor/plasteel,
@@ -1508,6 +1549,12 @@
/obj/machinery/light,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
+"Vy" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/engine/engineering)
"WT" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -2301,9 +2348,9 @@ aw
ba
bk
bt
-bC
-cb
fT
+cb
+AP
pA
kQ
bN
@@ -2409,7 +2456,7 @@ aO
bc
bm
ah
-NZ
+bF
cc
Ct
gd
@@ -2463,8 +2510,8 @@ aP
aP
bn
ah
-bF
-cc
+NZ
+RY
co
bA
wS
@@ -2620,14 +2667,14 @@ ae
ab
ai
an
-ai
+RC
aQ
-ai
+sE
ab
bv
bI
cf
-cq
+EI
bv
dU
bE
@@ -2676,7 +2723,7 @@ ai
ao
aA
aR
-ai
+sE
ab
bv
BG
@@ -2890,7 +2937,7 @@ ae
ac
ac
aj
-aD
+Vy
aj
ac
ac
@@ -2998,20 +3045,20 @@ ad
af
aj
ap
-aD
+Vy
aS
bd
bo
-bw
+aj
hD
-ci
+cj
ct
-wT
+Ce
cF
-bN
-bN
-cU
-db
+bE
+bE
+cS
+dl
dl
dl
dl
@@ -3058,14 +3105,14 @@ be
be
bx
CV
-cj
-Ce
-Ce
-oV
-bE
-bE
-cS
-dc
+yp
+wT
+wT
+CK
+bN
+bN
+cU
+gM
dc
dA
dl
@@ -3107,7 +3154,7 @@ af
aj
ar
aF
-aD
+Vy
bf
bp
aj
@@ -3327,7 +3374,7 @@ aX
aI
aI
ak
-bT
+Ly
pQ
Xg
Ce
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 4804bc4534..499a89a0cd 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"
},
@@ -2526,6 +2526,10 @@
/obj/machinery/capture_the_flag/red,
/turf/open/floor/circuit/green/anim,
/area/ctf)
+"hH" = (
+/obj/machinery/vending/coffee,
+/turf/open/floor/wood,
+/area/centcom/holding)
"hI" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -2751,15 +2755,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 +2799,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)
@@ -3324,6 +3328,10 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/centcom/supply)
+"jO" = (
+/obj/machinery/vending/cigarette,
+/turf/open/floor/wood,
+/area/centcom/holding)
"jP" = (
/obj/machinery/conveyor_switch/oneway{
dir = 8;
@@ -3429,7 +3437,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 +3446,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 +3829,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 +3847,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 +3865,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 +3952,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 +3961,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 +4145,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
@@ -4178,7 +4186,6 @@
/area/syndicate_mothership)
"mb" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/stockexchange,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -4277,7 +4284,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 +4533,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 +4679,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 +4979,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 +4992,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 +5033,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";
@@ -5254,7 +5261,6 @@
/area/centcom/ferry)
"oM" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/stockexchange,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -5320,6 +5326,20 @@
dir = 8
},
/area/tdome/tdomeobserve)
+"oU" = (
+/obj/structure/closet/secure_closet/bar{
+ locked = 0;
+ req_access_txt = "25"
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"oV" = (
+/obj/structure/reagent_dispensers/beerkeg,
+/turf/open/floor/wood,
+/area/centcom/holding)
"oW" = (
/obj/structure/flora/bush,
/obj/effect/light_emitter{
@@ -5564,6 +5584,70 @@
dir = 8
},
/area/centcom/control)
+"px" = (
+/obj/machinery/chem_dispenser/drinks/beer,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"py" = (
+/obj/machinery/chem_dispenser/drinks,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pz" = (
+/obj/item/storage/box/donkpockets{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/storage/box/donkpockets{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/storage/box/donkpockets{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/storage/box/donkpockets{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pA" = (
+/obj/machinery/vending/cola/random,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pB" = (
+/obj/structure/rack,
+/obj/item/toy/sword,
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/item/coin/gold{
+ pixel_x = 8;
+ pixel_y = -3
+ },
+/obj/item/camera,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pC" = (
+/obj/structure/rack,
+/obj/item/toy/gun,
+/obj/item/coin/gold{
+ pixel_w = -9;
+ pixel_y = 6
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pD" = (
+/obj/machinery/computer/arcade/battle,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pE" = (
+/obj/machinery/computer/arcade/orion_trail,
+/turf/open/floor/wood,
+/area/centcom/holding)
"pF" = (
/obj/machinery/door/airlock/centcom{
name = "Auxillary Dock";
@@ -5663,7 +5747,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
},
@@ -5688,6 +5772,25 @@
dir = 5
},
/area/centcom/ferry)
+"pS" = (
+/obj/machinery/computer/slot_machine,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pT" = (
+/obj/machinery/vending/snack/random,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pU" = (
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pV" = (
+/obj/item/clothing/head/that,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"pW" = (
+/turf/open/floor/carpet/black,
+/area/centcom/holding)
"pX" = (
/obj/item/storage/crayons,
/obj/structure/table,
@@ -5720,7 +5823,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 +5892,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" = (
@@ -5953,6 +6056,30 @@
"qE" = (
/turf/closed/indestructible/riveted/uranium,
/area/wizard_station)
+"qF" = (
+/obj/structure/chair/stool{
+ pixel_y = 8
+ },
+/turf/open/floor/carpet/black,
+/area/centcom/holding)
+"qG" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/drinkingglasses,
+/obj/item/storage/box/drinkingglasses{
+ pixel_x = 2;
+ pixel_y = 4
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"qH" = (
+/obj/item/reagent_containers/food/drinks/shaker,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"qI" = (
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/centcom/holding)
"qJ" = (
/obj/machinery/computer/shuttle/syndicate/recall,
/turf/open/floor/plasteel/bar{
@@ -6078,6 +6205,16 @@
/obj/machinery/computer/shuttle,
/turf/open/floor/engine/cult,
/area/wizard_station)
+"rb" = (
+/obj/item/lighter,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"rc" = (
+/obj/item/reagent_containers/food/drinks/soda_cans/cola,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/centcom/holding)
"rd" = (
/obj/structure/flora/grass/brown,
/obj/effect/light_emitter{
@@ -6137,7 +6274,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 +6285,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 +6383,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 +6577,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
},
@@ -6504,6 +6641,48 @@
},
/turf/open/floor/engine/cult,
/area/wizard_station)
+"rY" = (
+/obj/item/dice/d20,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"rZ" = (
+/obj/structure/rack,
+/obj/item/clothing/head/that,
+/obj/item/clothing/under/suit_jacket,
+/obj/item/clothing/accessory/waistcoat,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"sa" = (
+/obj/structure/rack,
+/obj/item/storage/crayons,
+/obj/item/gun/ballistic/automatic/toy/pistol,
+/obj/item/ammo_box/foambox,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"sb" = (
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"sc" = (
+/obj/structure/rack,
+/obj/item/storage/crayons,
+/obj/item/gun/ballistic/shotgun/toy/crossbow,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"sd" = (
+/obj/structure/rack,
+/obj/item/clothing/shoes/laceup,
+/obj/item/clothing/under/suit_jacket/female{
+ desc = "A black trouser suit for women. Very formal.";
+ name = "black suit";
+ pixel_x = 3;
+ pixel_y = 1
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"se" = (
/obj/machinery/light{
dir = 8
@@ -6514,7 +6693,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 +6850,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
},
@@ -6905,6 +7084,34 @@
},
/turf/open/floor/engine/cult,
/area/wizard_station)
+"sY" = (
+/mob/living/simple_animal/bot/medbot,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"sZ" = (
+/obj/machinery/sleeper{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"ta" = (
+/obj/machinery/light,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"tb" = (
+/obj/machinery/vending/clothing,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"tc" = (
+/obj/structure/closet/wardrobe/mixed,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"td" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/costume,
+/obj/effect/spawner/lootdrop/costume,
+/turf/open/floor/wood,
+/area/centcom/holding)
"te" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/pizzaslice/mushroom,
@@ -6945,6 +7152,40 @@
},
/turf/open/floor/plating/airless,
/area/syndicate_mothership/control)
+"tj" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/costume,
+/obj/effect/spawner/lootdrop/costume,
+/obj/machinery/light,
+/obj/machinery/button/door{
+ id = "Ninjaholdingsuicide";
+ name = "SUICIDE CHAMBER LOCK";
+ normaldoorcontrol = 1;
+ pixel_x = 4;
+ pixel_y = -24;
+ specialfunctions = 4
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"tk" = (
+/obj/machinery/door/airlock/wood/glass{
+ name = "Private Rooms"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"tl" = (
+/obj/machinery/door/airlock/maintenance_hatch{
+ id_tag = "Ninjaholdingsuicide";
+ locked = 1;
+ name = "SUICIDE CHAMBER"
+ },
+/turf/open/floor/wood{
+ icon_state = "wood-broken5"
+ },
+/area/centcom/holding)
+"tm" = (
+/turf/open/floor/carpet,
+/area/centcom/holding)
"tn" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -7034,7 +7275,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 +7374,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;
@@ -7245,6 +7486,10 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/centcom/evac)
+"tW" = (
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet,
+/area/centcom/holding)
"tX" = (
/obj/machinery/door/airlock{
icon = 'icons/obj/doors/airlocks/station/uranium.dmi';
@@ -7252,6 +7497,40 @@
},
/turf/open/floor/engine/cult,
/area/wizard_station)
+"tY" = (
+/obj/structure/chair/comfy/black{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"tZ" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"ua" = (
+/obj/structure/plasticflaps,
+/turf/open/floor/wood{
+ icon_state = "wood-broken4"
+ },
+/area/centcom/holding)
+"ub" = (
+/obj/machinery/door/airlock/wood{
+ id_tag = "Proom1";
+ name = "Room 1"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"uc" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/structure/chair/comfy/black{
+ dir = 1
+ },
+/turf/open/floor/carpet,
+/area/centcom/holding)
"ud" = (
/obj/machinery/door/poddoor/shutters{
id = "nukeop_ready";
@@ -7265,6 +7544,25 @@
},
/turf/open/floor/plating/airless,
/area/syndicate_mothership/control)
+"uf" = (
+/turf/open/lava,
+/area/centcom/holding)
+"ug" = (
+/obj/machinery/button/door{
+ id = "Proom1";
+ name = "Door Lock";
+ normaldoorcontrol = 1;
+ pixel_x = -24;
+ pixel_y = 4;
+ specialfunctions = 4
+ },
+/obj/structure/bed,
+/obj/item/bedsheet/random,
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"uh" = (
+/turf/open/chasm/lavaland,
+/area/centcom/holding)
"ui" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -7453,7 +7751,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
},
@@ -7466,12 +7764,37 @@
/obj/structure/chair/wood/wings,
/turf/open/floor/carpet,
/area/wizard_station)
+"uG" = (
+/obj/structure/chair/sofa/left,
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"uH" = (
+/obj/structure/chair/sofa/corner{
+ dir = 1
+ },
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"uI" = (
+/obj/structure/chair/sofa,
+/turf/open/floor/carpet,
+/area/centcom/holding)
"uJ" = (
/obj/machinery/door/airlock/external{
req_access_txt = "150"
},
/turf/open/floor/plating,
/area/syndicate_mothership/control)
+"uK" = (
+/obj/machinery/button/door{
+ id = "Proom2";
+ name = "Door Lock";
+ normaldoorcontrol = 1;
+ pixel_x = 24;
+ pixel_y = 4;
+ specialfunctions = 4
+ },
+/turf/open/floor/carpet,
+/area/centcom/holding)
"uL" = (
/obj/machinery/button/door{
id = "nukeop_ready";
@@ -7490,6 +7813,10 @@
},
/turf/open/floor/mineral/plastitanium,
/area/syndicate_mothership/control)
+"uN" = (
+/obj/structure/table/wood/poker,
+/turf/open/floor/carpet,
+/area/centcom/holding)
"uO" = (
/obj/machinery/door/airlock/centcom{
name = "Shuttle Control Office";
@@ -7695,6 +8022,45 @@
},
/turf/open/floor/carpet,
/area/wizard_station)
+"vo" = (
+/obj/structure/chair/sofa{
+ icon_state = "sofamiddle";
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"vp" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"vq" = (
+/obj/machinery/door/airlock/wood{
+ id_tag = "Proom2";
+ name = "Room 2"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"vr" = (
+/obj/structure/chair/sofa/corner{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"vs" = (
+/obj/structure/chair/sofa/left{
+ dir = 1
+ },
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"vt" = (
+/obj/machinery/vending/games,
+/turf/open/floor/carpet,
+/area/centcom/holding)
"vu" = (
/obj/item/storage/box/drinkingglasses,
/obj/item/reagent_containers/food/drinks/bottle/rum,
@@ -7707,7 +8073,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,
@@ -7717,6 +8083,19 @@
/obj/item/toy/nuke,
/turf/open/floor/wood,
/area/syndicate_mothership/control)
+"vy" = (
+/obj/structure/chair/sofa{
+ dir = 1
+ },
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"vz" = (
+/obj/machinery/door/airlock/wood{
+ id_tag = "Proom3";
+ name = "Room 3"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"vA" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/directions/engineering{
@@ -7844,7 +8223,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
@@ -7984,6 +8363,68 @@
},
/turf/open/floor/carpet,
/area/wizard_station)
+"we" = (
+/obj/machinery/button/door{
+ id = "Proom3";
+ name = "Door Lock";
+ normaldoorcontrol = 1;
+ pixel_x = -24;
+ pixel_y = 4;
+ specialfunctions = 4
+ },
+/obj/structure/bed,
+/obj/item/bedsheet/random,
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"wf" = (
+/obj/machinery/button/door{
+ id = "Proom4";
+ name = "Door Lock";
+ normaldoorcontrol = 1;
+ pixel_x = 24;
+ pixel_y = 4;
+ specialfunctions = 4
+ },
+/turf/open/floor/carpet,
+/area/centcom/holding)
+"wg" = (
+/obj/machinery/door/airlock/wood{
+ id_tag = "Proom4";
+ name = "Room 4"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"wh" = (
+/obj/structure/table/wood,
+/obj/item/soap/nanotrasen,
+/obj/item/reagent_containers/spray/cleaner,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"wi" = (
+/obj/structure/table/wood,
+/obj/structure/bedsheetbin,
+/turf/open/floor/wood,
+/area/centcom/holding)
+"wj" = (
+/obj/machinery/door/airlock/wood{
+ id_tag = "Proom5";
+ name = "Room 5"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"wk" = (
+/obj/machinery/button/door{
+ id = "Proom5";
+ name = "Door Lock";
+ normaldoorcontrol = 1;
+ pixel_x = -24;
+ pixel_y = 4;
+ specialfunctions = 4
+ },
+/obj/structure/bed,
+/obj/item/bedsheet/random,
+/turf/open/floor/carpet,
+/area/centcom/holding)
"wl" = (
/obj/machinery/light,
/turf/open/floor/wood,
@@ -8197,7 +8638,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 +9309,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 +9407,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 +9596,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 +9722,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 +9891,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 +9922,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 +10125,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 +10163,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 +10214,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 +10302,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 +10384,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 +10661,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
},
@@ -10765,77 +11206,6 @@
},
/turf/open/floor/engine/cult,
/area/wizard_station)
-"EZ" = (
-/obj/structure/table,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"Fa" = (
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"Fb" = (
-/obj/structure/closet/secure_closet/bar{
- req_access_txt = "25"
- },
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"Fc" = (
-/obj/structure/reagent_dispensers/beerkeg,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"Fd" = (
-/obj/structure/table,
-/obj/item/storage/box/donkpockets{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/storage/box/donkpockets{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/storage/box/donkpockets{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/storage/box/donkpockets{
- pixel_x = 3;
- pixel_y = 3
- },
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"Fe" = (
-/obj/structure/rack,
-/obj/item/device/camera,
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
-"Ff" = (
-/obj/structure/rack,
-/obj/item/toy/sword,
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
-"Fg" = (
-/obj/structure/rack,
-/obj/item/toy/gun,
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
-"Fh" = (
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
"Fi" = (
/turf/open/floor/plating/beach/sand,
/area/centcom/holding)
@@ -10952,21 +11322,8 @@
dir = 5
},
/area/tdome/tdomeobserve)
-"FA" = (
-/obj/structure/table,
-/obj/item/clothing/head/that,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"FB" = (
-/obj/structure/chair/stool{
- pixel_y = 8
- },
-/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" = (
@@ -11071,41 +11428,6 @@
},
/turf/open/floor/engine/cult,
/area/wizard_station)
-"FU" = (
-/obj/structure/table,
-/obj/item/ammo_box/foambox,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"FV" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/shaker,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"FW" = (
-/obj/structure/table,
-/obj/item/lighter,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"FX" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
-"FY" = (
-/obj/structure/table,
-/obj/item/dice/d20,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
-/area/centcom/holding)
"FZ" = (
/obj/structure/chair/stool{
pixel_y = 8
@@ -11226,13 +11548,6 @@
},
/turf/open/lava,
/area/wizard_station)
-"Gs" = (
-/obj/structure/rack,
-/obj/item/clothing/head/that,
-/obj/item/clothing/under/suit_jacket,
-/obj/item/clothing/accessory/waistcoat,
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
"Gt" = (
/obj/item/toy/beach_ball,
/turf/open/floor/plating/beach/sand,
@@ -11280,18 +11595,6 @@
},
/turf/open/lava/airless,
/area/wizard_station)
-"GA" = (
-/obj/structure/rack,
-/obj/item/storage/crayons,
-/obj/item/gun/ballistic/automatic/toy/pistol,
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
-"GB" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
"GC" = (
/obj/structure/table,
/obj/structure/bedsheetbin,
@@ -11524,12 +11827,6 @@
/obj/structure/shuttle/engine/propulsion,
/turf/open/space,
/area/wizard_station)
-"GY" = (
-/obj/structure/rack,
-/obj/item/storage/crayons,
-/obj/item/gun/ballistic/shotgun/toy/crossbow,
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
"GZ" = (
/turf/open/floor/plating/beach/coastline_b,
/area/centcom/holding)
@@ -11582,33 +11879,6 @@
dir = 4
},
/area/tdome/tdomeobserve)
-"Hi" = (
-/obj/structure/rack,
-/obj/item/clothing/shoes/laceup,
-/obj/item/clothing/under/suit_jacket/female{
- desc = "A black trouser suit for women. Very formal.";
- name = "black suit";
- pixel_x = 3;
- pixel_y = 1
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
-"Hj" = (
-/obj/machinery/light,
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
-"Hk" = (
-/obj/structure/table,
-/obj/item/gun/ballistic/automatic/toy/pistol,
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
-"Hl" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/machinery/light,
-/turf/open/floor/plasteel/cafeteria,
-/area/centcom/holding)
"Hm" = (
/turf/open/floor/plating/beach/water,
/area/centcom/holding)
@@ -12542,15 +12812,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 +12994,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 +13002,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 +13342,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 +13444,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 +13472,7 @@
/area/centcom/evac)
"LJ" = (
/obj/structure/table,
-/obj/item/device/radio/off,
+/obj/item/radio/off,
/obj/machinery/light{
dir = 4
},
@@ -39485,25 +39755,25 @@ aa
aa
aa
ED
-EZ
-EZ
-FU
-Gs
-GA
-GY
-Hi
+hH
+pU
+qG
+rZ
+sa
+sc
+sd
+ED
+ED
+ED
+ED
+ED
+ED
+ED
+ED
ED
ED
ED
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
aa
aa
aa
@@ -39742,25 +40012,25 @@ aa
aa
aa
ED
-Fa
-Fa
-Fa
-Fh
-Fh
-Fh
-Fh
+jO
+pU
+pU
+pW
+pW
+pW
+pU
Hy
HH
HH
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+uH
+vo
+vr
+ED
+uH
+vo
+vr
+ED
aa
aa
aa
@@ -39999,25 +40269,25 @@ aa
aa
aa
ED
-Fb
-Fa
-FV
-FB
-Fh
-Fh
-Fh
+oU
+pU
+qH
+qF
+pW
+pW
+pU
Hz
HH
HH
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+uI
+uN
+vy
+ED
+uI
+uN
+vy
+ED
aa
aa
aa
@@ -40256,25 +40526,25 @@ aa
aa
aa
ED
-Fc
-Fa
-EZ
-FB
-Fh
-Fh
-Fh
+oV
+pU
+qI
+qF
+pW
+pW
+sY
Hz
HH
HH
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+uG
+uN
+vs
+ED
+uG
+uN
+vs
+ED
aa
aa
aa
@@ -40513,25 +40783,25 @@ aa
aa
aa
ED
-Fc
-Fa
-FW
-FB
-Fh
-Fh
-Fh
+px
+pU
+rb
+qF
+pW
+pW
+sZ
Hy
HH
HH
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+tm
+tm
+tm
+ED
+tm
+tm
+tm
+ED
aa
aa
aa
@@ -40770,25 +41040,25 @@ aa
aa
aa
ED
-Fa
-Fa
-FX
-FB
-Fh
-Fh
-Hj
+py
+pU
+rc
+qF
+pW
+pW
+ta
ED
ED
ED
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+uK
+tm
+vt
+ED
+wf
+tm
+vt
+ED
aa
aa
aa
@@ -41027,26 +41297,26 @@ aa
aa
aa
ED
-Fd
-FA
-FY
-FB
-Fh
-Fh
-Fh
+pz
+pV
+rY
+qF
+pW
+pW
+pU
+ED
+ED
+ED
+ED
+ED
+vq
+ED
+ED
+ED
+wg
+ED
+ED
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
aa
aa
aa
@@ -41284,13 +41554,25 @@ aa
aa
aa
ED
-Fe
-Fh
-Fh
-Fh
-Fh
-Fh
-Fh
+pA
+pW
+pW
+pW
+pW
+pW
+pU
+tk
+pU
+tZ
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+tZ
+wh
ED
aa
aa
@@ -41301,18 +41583,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
KH
KU
Lb
@@ -41541,13 +41811,25 @@ aa
aa
aa
ED
-Ff
-Fh
-Fh
-Fh
-Fh
-Fh
-FB
+pB
+pW
+pW
+pW
+pW
+pW
+pU
+tk
+pU
+pU
+pU
+pU
+vp
+pU
+pU
+pU
+pU
+pU
+wi
ED
aa
aa
@@ -41557,18 +41839,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
KH
KH
KS
@@ -41798,26 +42068,26 @@ aa
aa
aa
ED
-Fg
-Fh
-Fh
-Fh
-Fh
-FB
-Hk
+pC
+pW
+pW
+pW
+pW
+pW
+tb
+ED
+ED
+ub
+ED
+ED
+ED
+vz
+ED
+ED
+ED
+wj
+ED
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
aa
aa
aa
@@ -42055,26 +42325,26 @@ aa
aa
aa
ED
-Fh
-FB
-Fh
-Fh
-Fh
-Fh
-FB
+pD
+qF
+pW
+pW
+pW
+pW
+tc
+ED
+tY
+tm
+ug
+ED
+tY
+tm
+we
+ED
+tY
+tm
+wk
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
aa
aa
aa
@@ -42312,26 +42582,26 @@ aa
aa
aa
ED
-Fi
-Fi
-Fi
-Fi
-GB
-GB
-Hl
+pE
+qF
+pW
+pW
+pW
+pW
+td
+ED
+tW
+uc
+tm
+ED
+tW
+uc
+tm
+ED
+tW
+uc
+tm
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
aa
aa
aa
@@ -42569,26 +42839,26 @@ aa
aa
aa
ED
-Fj
-Fi
-Fi
-Fi
-Fi
-GZ
-Hm
+pS
+qF
+pW
+pW
+pW
+pW
+td
+ED
+ED
+ED
+ED
+ED
+ED
+ED
+ED
+ED
+ED
+ED
+ED
ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
aa
aa
aa
@@ -42826,6 +43096,777 @@ aa
aa
aa
ED
+pS
+qF
+pW
+pW
+pW
+pW
+tj
+ED
+ED
+ED
+ED
+ED
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(115,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ED
+pT
+pU
+pU
+pU
+sb
+sb
+sb
+tl
+ua
+uf
+uh
+ED
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(116,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ED
+Fj
+Fi
+Fi
+Fi
+Fi
+GZ
+Hm
+ED
+ED
+ED
+ED
+ED
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(117,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ED
Fi
Fi
FZ
@@ -42892,7 +43933,7 @@ aa
aa
aa
"}
-(115,1,1) = {"
+(118,1,1) = {"
aa
aa
aa
@@ -43149,7 +44190,7 @@ aa
aa
aa
"}
-(116,1,1) = {"
+(119,1,1) = {"
aa
aa
aa
@@ -43406,7 +44447,7 @@ aa
aa
aa
"}
-(117,1,1) = {"
+(120,1,1) = {"
aa
aa
aa
@@ -43663,777 +44704,6 @@ aa
aa
aa
"}
-(118,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ED
-ED
-ED
-ED
-ED
-ED
-ED
-ED
-ED
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(119,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(120,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
(121,1,1) = {"
aa
aa
@@ -44624,15 +44894,15 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ED
+ED
+ED
+ED
+ED
+ED
+ED
+ED
+ED
aa
aa
aa
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/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm
new file mode 100644
index 0000000000..d635953737
--- /dev/null
+++ b/_maps/shuttles/ruin_syndicate_dropship.dmm
@@ -0,0 +1,656 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"al" = (
+/obj/machinery/airalarm/syndicate{
+ dir = 4;
+ pixel_x = -24
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/syndicate3)
+"bo" = (
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
+ },
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/syndicate3)
+"bB" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/machinery/button/door{
+ id = "caravansyndicate3_bolt_starboard";
+ name = "External Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = -24;
+ pixel_y = -6;
+ req_access_txt = "150";
+ specialfunctions = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/syndicate3)
+"bN" = (
+/obj/machinery/power/smes{
+ charge = 5e+006
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/shuttle/caravan/syndicate3)
+"cB" = (
+/turf/open/floor/plasteel/vault{
+ dir = 5
+ },
+/area/shuttle/caravan/syndicate3)
+"dZ" = (
+/obj/structure/shuttle/engine/propulsion/burst{
+ dir = 8
+ },
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/syndicate3)
+"gl" = (
+/obj/machinery/door/airlock/hatch{
+ id_tag = "caravansyndicate3_bolt_port";
+ name = "External Airlock";
+ normalspeed = 0;
+ req_access_txt = "150"
+ },
+/obj/docking_port/mobile{
+ dir = 2;
+ dwidth = 6;
+ height = 7;
+ id = "caravansyndicate3";
+ name = "Syndicate Drop Ship";
+ port_direction = 8;
+ preferred_direction = 4;
+ timid = 1;
+ width = 15
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/open/floor/plating,
+/area/shuttle/caravan/syndicate3)
+"ha" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/structure/cable,
+/obj/machinery/power/port_gen/pacman{
+ anchored = 1
+ },
+/obj/item/wrench,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/shuttle/caravan/syndicate3)
+"hF" = (
+/obj/structure/chair,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/apc/syndicate{
+ dir = 8;
+ name = "Syndicate Drop Ship APC";
+ pixel_x = -24
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/caravan/syndicate3)
+"ka" = (
+/obj/structure/chair{
+ dir = 1
+ },
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/caravan/syndicate3)
+"mJ" = (
+/obj/structure/shuttle/engine/propulsion/burst/left{
+ dir = 8
+ },
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/syndicate3)
+"ns" = (
+/obj/structure/table/reinforced,
+/obj/machinery/button/door{
+ id = "caravansyndicate3_bridge";
+ name = "Bridge Blast Door Control";
+ pixel_x = -16;
+ pixel_y = 5;
+ req_access_txt = "150"
+ },
+/obj/machinery/button/door{
+ id = "caravansyndicate3_bolt_bridge";
+ name = "Bridge Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = -16;
+ pixel_y = -5;
+ req_access_txt = "150";
+ specialfunctions = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/darkred/side{
+ dir = 6
+ },
+/area/shuttle/caravan/syndicate3)
+"qE" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/syndicate{
+ anchored = 1
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/caravan/syndicate3)
+"rz" = (
+/obj/machinery/computer/shuttle/caravan/syndicate3{
+ dir = 8
+ },
+/turf/open/floor/plasteel/darkred/side{
+ dir = 8
+ },
+/area/shuttle/caravan/syndicate3)
+"rU" = (
+/obj/structure/grille,
+/obj/structure/window/plastitanium,
+/obj/machinery/door/poddoor{
+ id = "caravansyndicate3_bridge"
+ },
+/turf/open/floor/plating,
+/area/shuttle/caravan/syndicate3)
+"rV" = (
+/obj/structure/chair{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/caravan/syndicate3)
+"sb" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate3{
+ dir = 8
+ },
+/turf/open/floor/plasteel/darkred/side{
+ dir = 10
+ },
+/area/shuttle/caravan/syndicate3)
+"sn" = (
+/obj/structure/chair,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/caravan/syndicate3)
+"ss" = (
+/turf/open/floor/plasteel/darkred/side{
+ dir = 1
+ },
+/area/shuttle/caravan/syndicate3)
+"uy" = (
+/obj/structure/table/reinforced,
+/obj/machinery/recharger,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/open/floor/plasteel/darkred/side{
+ dir = 10
+ },
+/area/shuttle/caravan/syndicate3)
+"vw" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/firstaid/regular,
+/obj/item/assembly/flash/handheld,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/darkred/side{
+ dir = 5
+ },
+/area/shuttle/caravan/syndicate3)
+"vQ" = (
+/obj/structure/shuttle/engine/propulsion/burst/right{
+ dir = 8
+ },
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/syndicate3)
+"wH" = (
+/obj/structure/shuttle/engine/heater{
+ dir = 8
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/syndicate3)
+"xC" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/machinery/button/door{
+ id = "caravansyndicate3_bolt_port";
+ name = "External Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = -24;
+ pixel_y = 6;
+ req_access_txt = "150";
+ specialfunctions = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/syndicate3)
+"BQ" = (
+/turf/open/floor/plasteel/darkred/side,
+/area/shuttle/caravan/syndicate3)
+"Cm" = (
+/obj/structure/chair{
+ dir = 1
+ },
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -26
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/caravan/syndicate3)
+"Dt" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/syndicate/personal{
+ anchored = 1
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/caravan/syndicate3)
+"Dx" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/vault{
+ dir = 5
+ },
+/area/shuttle/caravan/syndicate3)
+"EO" = (
+/obj/structure/chair,
+/obj/machinery/airalarm/syndicate{
+ pixel_y = 24
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/caravan/syndicate3)
+"Fa" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/syndicate{
+ anchored = 1
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/caravan/syndicate3)
+"Gx" = (
+/obj/machinery/airalarm/syndicate{
+ dir = 4;
+ pixel_x = -24
+ },
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/syndicate3)
+"HJ" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/sign/warning/vacuum{
+ pixel_y = -32
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/syndicate{
+ anchored = 1
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/caravan/syndicate3)
+"HM" = (
+/obj/structure/chair/office/dark{
+ dir = 4
+ },
+/mob/living/simple_animal/hostile/syndicate{
+ environment_smash = 0;
+ name = "Syndicate Salvage Pilot"
+ },
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/syndicate3)
+"Ij" = (
+/obj/structure/chair/office/dark{
+ dir = 4
+ },
+/obj/machinery/turretid{
+ ailock = 1;
+ control_area = null;
+ desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing.";
+ icon_state = "control_kill";
+ lethal = 1;
+ name = "Shuttle turret control";
+ pixel_y = 34;
+ req_access = null;
+ req_access_txt = "150"
+ },
+/turf/open/floor/plasteel/darkred/corner{
+ dir = 4
+ },
+/area/shuttle/caravan/syndicate3)
+"IR" = (
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/hatch{
+ id_tag = "caravansyndicate3_bolt_bridge";
+ name = "Bridge";
+ req_access_txt = "150"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/turf/open/floor/plasteel/vault{
+ dir = 5
+ },
+/area/shuttle/caravan/syndicate3)
+"Jv" = (
+/turf/template_noop,
+/area/template_noop)
+"KS" = (
+/obj/machinery/door/airlock/hatch{
+ id_tag = "caravansyndicate3_bolt_starboard";
+ name = "External Airlock";
+ normalspeed = 0;
+ req_access_txt = "150"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/shuttle/caravan/syndicate3)
+"Lq" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/closet/syndicate{
+ anchored = 1
+ },
+/obj/structure/sign/warning/vacuum{
+ pixel_y = 32
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/caravan/syndicate3)
+"NH" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/closet/syndicate/personal{
+ anchored = 1
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/caravan/syndicate3)
+"Pt" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/closet/crate,
+/obj/machinery/power/terminal{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/item/stack/sheet/metal/twenty,
+/obj/item/stack/sheet/glass{
+ amount = 10
+ },
+/obj/item/stack/sheet/mineral/plastitanium{
+ amount = 20
+ },
+/obj/item/storage/box/lights/bulbs,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 20
+ },
+/turf/open/floor/plating,
+/area/shuttle/caravan/syndicate3)
+"PL" = (
+/obj/machinery/porta_turret/syndicate/energy{
+ dir = 2;
+ icon_state = "standard_lethal";
+ mode = 1
+ },
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/shuttle/caravan/syndicate3)
+"Rj" = (
+/obj/machinery/porta_turret/syndicate/energy{
+ dir = 1;
+ icon_state = "standard_lethal";
+ mode = 1
+ },
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/shuttle/caravan/syndicate3)
+"Sl" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/emergency,
+/obj/item/wrench,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/darkred/side{
+ dir = 9
+ },
+/area/shuttle/caravan/syndicate3)
+"Tn" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/shuttle/caravan/syndicate3)
+"UD" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/darkred/side,
+/area/shuttle/caravan/syndicate3)
+"US" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/darkred/side{
+ dir = 1
+ },
+/area/shuttle/caravan/syndicate3)
+"Vf" = (
+/obj/machinery/door/airlock/hatch{
+ name = "Ready Room";
+ req_access_txt = "150"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/turf/open/floor/plasteel/vault{
+ dir = 5
+ },
+/area/shuttle/caravan/syndicate3)
+"Wr" = (
+/obj/structure/chair/office/dark{
+ dir = 4
+ },
+/turf/open/floor/plasteel/darkred/corner,
+/area/shuttle/caravan/syndicate3)
+"YU" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/structure/closet/syndicate{
+ anchored = 1
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/caravan/syndicate3)
+"ZB" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/caravan/syndicate3)
+"ZJ" = (
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/syndicate3)
+"ZK" = (
+/obj/machinery/computer/crew{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/darkred/side{
+ dir = 9
+ },
+/area/shuttle/caravan/syndicate3)
+"ZZ" = (
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/syndicate3)
+
+(1,1,1) = {"
+Jv
+mJ
+dZ
+dZ
+dZ
+vQ
+Jv
+"}
+(2,1,1) = {"
+ZB
+wH
+wH
+wH
+wH
+wH
+ZB
+"}
+(3,1,1) = {"
+Tn
+Tn
+bN
+Pt
+ha
+Tn
+Tn
+"}
+(4,1,1) = {"
+Tn
+hF
+US
+ZJ
+BQ
+ka
+Tn
+"}
+(5,1,1) = {"
+Tn
+EO
+ss
+cB
+BQ
+Cm
+Tn
+"}
+(6,1,1) = {"
+Tn
+sn
+ss
+cB
+UD
+rV
+Tn
+"}
+(7,1,1) = {"
+Tn
+NH
+Fa
+cB
+qE
+Dt
+Tn
+"}
+(8,1,1) = {"
+Rj
+Tn
+Tn
+Vf
+Tn
+Tn
+PL
+"}
+(9,1,1) = {"
+gl
+xC
+al
+cB
+bo
+bB
+KS
+"}
+(10,1,1) = {"
+Tn
+Lq
+YU
+Dx
+qE
+HJ
+Tn
+"}
+(11,1,1) = {"
+Tn
+Tn
+Tn
+IR
+Tn
+Tn
+Tn
+"}
+(12,1,1) = {"
+Tn
+uy
+Gx
+cB
+ZZ
+Sl
+Tn
+"}
+(13,1,1) = {"
+rU
+ns
+Ij
+HM
+Wr
+vw
+rU
+"}
+(14,1,1) = {"
+rU
+rU
+sb
+rz
+ZK
+rU
+rU
+"}
+(15,1,1) = {"
+Jv
+rU
+rU
+rU
+rU
+rU
+Jv
+"}
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/atmospherics.dm b/code/__DEFINES/atmospherics.dm
index aafc89f356..a05aaf3265 100644
--- a/code/__DEFINES/atmospherics.dm
+++ b/code/__DEFINES/atmospherics.dm
@@ -9,7 +9,7 @@
#define META_GAS_OVERLAY 4
#define META_GAS_DANGER 5
#define META_GAS_ID 6
-
+#define META_GAS_FUSION_POWER 7
//ATMOS
//stuff you should probably leave well alone!
#define R_IDEAL_GAS_EQUATION 8.31 //kPa*L/(K*mol)
diff --git a/code/__DEFINES/cinematics.dm b/code/__DEFINES/cinematics.dm
index 22e0943802..aa19ffb4cf 100644
--- a/code/__DEFINES/cinematics.dm
+++ b/code/__DEFINES/cinematics.dm
@@ -9,4 +9,5 @@
#define CINEMATIC_NUKE_FAKE 9
#define CINEMATIC_NUKE_NO_CORE 10
#define CINEMATIC_NUKE_FAR 11
-#define CINEMATIC_NUKE_CLOWNOP 12
\ No newline at end of file
+#define CINEMATIC_NUKE_CLOWNOP 12
+#define CINEMATIC_CULT_NUKE 13
\ No newline at end of file
diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm
index f47309dd73..a5aa63e6a1 100644
--- a/code/__DEFINES/components.dm
+++ b/code/__DEFINES/components.dm
@@ -17,7 +17,8 @@
// /datum signals
#define COMSIG_COMPONENT_ADDED "component_added" //when a component is added to a datum: (/datum/component)
#define COMSIG_COMPONENT_REMOVING "component_removing" //before a component is removed from a datum because of RemoveComponent: (/datum/component)
-#define COMSIG_PARENT_QDELETED "parent_qdeleted" //before a datum's Destroy() is called: ()
+#define COMSIG_PARENT_PREQDELETED "parent_preqdeleted" //before a datum's Destroy() is called: (force), returning a nonzero value will cancel the qdel operation
+#define COMSIG_PARENT_QDELETED "parent_qdeleted" //after a datum's Destroy() is called: (force, qdel_hint), at this point none of the other components chose to interrupt qdel and Destroy has been called
// /atom signals
#define COMSIG_PARENT_ATTACKBY "atom_attackby" //from base of atom/attackby(): (/obj/item, /mob/living, params)
@@ -71,6 +72,9 @@
#define COMSIG_AREA_ENTERED "area_entered" //from base of area/Entered(): (atom/movable/M)
#define COMSIG_AREA_EXITED "area_exited" //from base of area/Exited(): (atom/movable/M)
+// /turf signals
+#define COMSIG_TURF_CHANGE "turf_change" //from base of turf/ChangeTurf(): (path, list/new_baseturfs, flags, list/transferring_comps)
+
// /atom/movable signals
#define COMSIG_MOVABLE_MOVED "movable_moved" //from base of atom/movable/Moved(): (/atom, dir)
#define COMSIG_MOVABLE_CROSSED "movable_crossed" //from base of atom/movable/Crossed(): (/atom/movable)
@@ -81,7 +85,7 @@
#define COMSIG_MOVABLE_BUCKLE "buckle" //from base of atom/movable/buckle_mob(): (mob, force)
#define COMSIG_MOVABLE_UNBUCKLE "unbuckle" //from base of atom/movable/unbuckle_mob(): (mob, force)
#define COMSIG_MOVABLE_THROW "movable_throw" //from base of atom/movable/throw_at(): (datum/thrownthing, spin)
-
+#define COMSIG_MOVABLE_Z_CHANGED "movable_ztransit" //from base of atom/movable/onTransitZ(): (old_z, new_z)
// /obj signals
#define COMSIG_OBJ_DECONSTRUCT "obj_deconstruct" //from base of obj/deconstruct(): (disassembled)
@@ -96,14 +100,11 @@
#define COMSIG_ITEM_DROPPED "item_drop"
#define COMSIG_ITEM_PICKUP "item_pickup" //from base of obj/item/pickup(): (/mob/taker)
#define COMSIG_ITEM_ATTACK_ZONE "item_attack_zone" //from base of mob/living/carbon/attacked_by(): (mob/living/carbon/target, mob/living/user, hit_zone)
+#define COMSIG_ITEM_IMBUE_SOUL "item_imbue_soul" //return a truthy value to prevent ensouling, checked in /obj/effect/proc_holder/spell/targeted/lichdom/cast(): (mob/user)
// /obj/item/clothing signals
#define COMSIG_SHOES_STEP_ACTION "shoes_step_action" //from base of obj/item/clothing/shoes/proc/step_action(): ()
-// /obj/machinery signals
-#define COMSIG_MACHINE_PROCESS "machine_process" //from machinery subsystem fire(): ()
-#define COMSIG_MACHINE_PROCESS_ATMOS "machine_process_atmos" //from air subsystem process_atmos_machinery(): ()
-
// /mob/living/carbon/human signals
#define COMSIG_HUMAN_MELEE_UNARMED_ATTACK "human_melee_unarmed_attack" //from mob/living/carbon/human/UnarmedAttack(): (atom/target)
#define COMSIG_HUMAN_MELEE_UNARMED_ATTACKBY "human_melee_unarmed_attackby" //from mob/living/carbon/human/UnarmedAttack(): (mob/living/carbon/human/attacker)
@@ -137,11 +138,14 @@
#define COMSIG_TRY_STORAGE_FILL_TYPE "storage_fill_type" //(type, amount = INFINITY, force = FALSE) //don't fuck this up. Force will ignore max_items, and amount is normally clamped to max_items.
#define COMSIG_TRY_STORAGE_TAKE "storage_take_obj" //(obj, new_loc, force = FALSE) - returns bool
#define COMSIG_TRY_STORAGE_QUICK_EMPTY "storage_quick_empty" //(loc) - returns bool - if loc is null it will dump at parent location.
-#define COMSIG_TRY_STORAGE_RETURN_INVENTORY "storage_return_inventory" //(list/list_to_inject_results_into)
+#define COMSIG_TRY_STORAGE_RETURN_INVENTORY "storage_return_inventory" //(list/list_to_inject_results_into, recursively_search_inside_storages = TRUE)
#define COMSIG_TRY_STORAGE_CAN_INSERT "storage_can_equip" //(obj/item/insertion_candidate, mob/user, silent) - returns bool
/*******Non-Signal Component Related Defines*******/
+//Redirection component init flags
+#define REDIRECT_TRANSFER_WITH_TURF 1
+
//Arch
#define ARCH_PROB "probability" //Probability for each item
#define ARCH_MAXDROP "max_drop_amount" //each item's max drop amount
diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm
index 138bfbe44a..f871ac6a44 100644
--- a/code/__DEFINES/flags.dm
+++ b/code/__DEFINES/flags.dm
@@ -39,8 +39,6 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
#define NO_EMP_WIRES_2 (1<<1)
#define HOLOGRAM_2 (1<<2)
#define FROZEN_2 (1<<3)
-#define STATIONLOVING_2 (1<<4)
-#define INFORM_ADMINS_ON_RELOCATE_2 (1<<5)
#define BANG_PROTECT_2 (1<<6)
// An item worn in the ear slot with HEALS_EARS will heal your ears each
diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm
index 44df6695a2..a68d29c14c 100644
--- a/code/__DEFINES/food.dm
+++ b/code/__DEFINES/food.dm
@@ -10,3 +10,4 @@
#define SUGAR (1<<9)
#define GROSS (1<<10)
#define TOXIC (1<<11)
+#define PINEAPPLE (1<<12)
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/__DEFINES/layers.dm b/code/__DEFINES/layers.dm
index 9350116635..9f0fdc27b2 100644
--- a/code/__DEFINES/layers.dm
+++ b/code/__DEFINES/layers.dm
@@ -6,6 +6,7 @@
#define PLANE_SPACE -95
#define PLANE_SPACE_PARALLAX -90
+#define FLOOR_PLANE -2
#define GAME_PLANE -1
#define BLACKNESS_PLANE 0 //To keep from conflicts with SEE_BLACKNESS internals
#define SPACE_LAYER 1.8
diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index 3267a43d5a..391d55fe59 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -378,7 +378,7 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
#define BEAT_SLOW 2
#define BEAT_NONE 0
-//http://www.byond.com/docs/ref/info.html#/atom/var/mouse_opacity
+//https://secure.byond.com/docs/ref/info.html#/atom/var/mouse_opacity
#define MOUSE_OPACITY_TRANSPARENT 0
#define MOUSE_OPACITY_ICON 1
#define MOUSE_OPACITY_OPAQUE 2
@@ -445,3 +445,8 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
#define NO_INIT_PARAMETER "no-init"
#define EGG_LAYING_MESSAGES list("lays an egg.","squats down and croons.","begins making a huge racket.","begins clucking raucously.")
+
+// Used by PDA and cartridge code to reduce repetitiveness of spritesheets
+#define PDAIMG(what) {""}
+//Filters
+#define AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-2, size=4, border=4, color="#04080FAA")
diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index 15033fcf48..64a4089543 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -258,7 +258,7 @@
// Roundstart trait system
-#define MAX_TRAITS 6 //The maximum amount of traits one character can have at roundstart
+#define MAX_QUIRKS 6 //The maximum amount of quirks one character can have at roundstart
// AI Toggles
#define AI_CAMERA_LUMINOSITY 5
diff --git a/code/__DEFINES/networks.dm b/code/__DEFINES/networks.dm
index 0aec59db9b..09b9e4cadf 100644
--- a/code/__DEFINES/networks.dm
+++ b/code/__DEFINES/networks.dm
@@ -1 +1,3 @@
-#define HID_RESTRICTED_END 101 //the first nonrestricted ID, automatically assigned on connection creation.
+#define HID_RESTRICTED_END 101 //the first nonrestricted ID, automatically assigned on connection creation.
+
+#define NETWORK_BROADCAST_ID "ALL"
diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm
index 7ba693be0a..0dc8a38899 100644
--- a/code/__DEFINES/preferences.dm
+++ b/code/__DEFINES/preferences.dm
@@ -64,6 +64,7 @@
#define EXP_TYPE_ANTAG "Antag"
#define EXP_TYPE_SPECIAL "Special"
#define EXP_TYPE_GHOST "Ghost"
+#define EXP_TYPE_ADMIN "Admin"
//Flags in the players table in the db
#define DB_FLAG_EXEMPT 1
diff --git a/code/__DEFINES/server_tools.dm b/code/__DEFINES/server_tools.dm
deleted file mode 100644
index a1764880c3..0000000000
--- a/code/__DEFINES/server_tools.dm
+++ /dev/null
@@ -1,128 +0,0 @@
-// /tg/station 13 server tools API
-#define SERVICE_API_VERSION_STRING "3.2.0.2"
-
-//CONFIGURATION
-//use this define if you want to do configuration outside of this file
-#ifndef SERVER_TOOLS_EXTERNAL_CONFIGURATION
-//Comment this out once you've filled in the below
-#error /tg/station server tools interface unconfigured
-
-//Required interfaces (fill in with your codebase equivalent):
-
-//create a global variable named `Name` and set it to `Value`
-//These globals must not be modifiable from anywhere outside of the server tools
-#define SERVER_TOOLS_DEFINE_AND_SET_GLOBAL(Name, Value)
-//Read the value in the global variable `Name`
-#define SERVER_TOOLS_READ_GLOBAL(Name)
-//Set the value in the global variable `Name` to `Value`
-#define SERVER_TOOLS_WRITE_GLOBAL(Name, Value)
-//display an announcement `message` from the server to all players
-#define SERVER_TOOLS_WORLD_ANNOUNCE(message)
-//Write a string `message` to a server log
-#define SERVER_TOOLS_LOG(message)
-//Notify current in-game administrators of a string `event`
-#define SERVER_TOOLS_NOTIFY_ADMINS(event)
-//The current amount of connected clients
-#define SERVER_TOOLS_CLIENT_COUNT
-#endif
-
-//Required hooks:
-
-//Put this somewhere in /world/New() that is always run
-#define SERVER_TOOLS_ON_NEW ServiceInit()
-//Put this somewhere in /world/Topic(T, Addr, Master, Keys) that is always run before T is modified
-#define SERVER_TOOLS_ON_TOPIC var/service_topic_return = ServiceCommand(params2list(T)); if(service_topic_return) return service_topic_return
-//Put at the beginning of world/Reboot(reason)
-#define SERVER_TOOLS_ON_REBOOT ServiceReboot()
-
-//Optional callable functions:
-
-//Returns the string version of the API
-#define SERVER_TOOLS_API_VERSION ServiceAPIVersion()
-//Returns TRUE if the world was launched under the server tools and the API matches, FALSE otherwise
-//No function below this succeed if this is FALSE
-#define SERVER_TOOLS_PRESENT RunningService()
-//Gets the current version of the service running the server
-#define SERVER_TOOLS_VERSION ServiceVersion()
-//Forces a hard reboot of BYOND by ending the process
-//unlike del(world) clients will try to reconnect
-//If the service has not requested a shutdown, the world will reboot shortly after
-#define SERVER_TOOLS_REBOOT_BYOND world.ServiceEndProcess()
-/*
- Gets the list of any testmerged github pull requests
-
- "[PR Number]" => list(
- "title" -> PR title
- "commit" -> Full hash of commit merged
- "author" -> Github username of the author of the PR
- )
-*/
-#define SERVER_TOOLS_PR_LIST GetTestMerges()
-//Sends a message to connected game chats
-#define SERVER_TOOLS_CHAT_BROADCAST(message) world.ChatBroadcast(message)
-//Sends a message to connected admin chats
-#define SERVER_TOOLS_RELAY_BROADCAST(message) world.AdminBroadcast(message)
-
-//IMPLEMENTATION
-
-#define REBOOT_MODE_NORMAL 0
-#define REBOOT_MODE_HARD 1
-#define REBOOT_MODE_SHUTDOWN 2
-
-#define SERVICE_WORLD_PARAM "server_service"
-#define SERVICE_VERSION_PARAM "server_service_version"
-#define SERVICE_INSTANCE_PARAM "server_instance"
-#define SERVICE_PR_TEST_JSON "prtestjob.json"
-#define SERVICE_INTERFACE_DLL "TGDreamDaemonBridge.dll"
-#define SERVICE_INTERFACE_FUNCTION "DDEntryPoint"
-
-#define SERVICE_CMD_HARD_REBOOT "hard_reboot"
-#define SERVICE_CMD_GRACEFUL_SHUTDOWN "graceful_shutdown"
-#define SERVICE_CMD_WORLD_ANNOUNCE "world_announce"
-#define SERVICE_CMD_LIST_CUSTOM "list_custom_commands"
-#define SERVICE_CMD_API_COMPATIBLE "api_compat"
-#define SERVICE_CMD_PLAYER_COUNT "client_count"
-
-#define SERVICE_CMD_PARAM_KEY "serviceCommsKey"
-#define SERVICE_CMD_PARAM_COMMAND "command"
-#define SERVICE_CMD_PARAM_SENDER "sender"
-#define SERVICE_CMD_PARAM_CUSTOM "custom"
-
-#define SERVICE_JSON_PARAM_HELPTEXT "help_text"
-#define SERVICE_JSON_PARAM_ADMINONLY "admin_only"
-#define SERVICE_JSON_PARAM_REQUIREDPARAMETERS "required_parameters"
-
-#define SERVICE_REQUEST_KILL_PROCESS "killme"
-#define SERVICE_REQUEST_IRC_BROADCAST "irc"
-#define SERVICE_REQUEST_IRC_ADMIN_CHANNEL_MESSAGE "send2irc"
-#define SERVICE_REQUEST_WORLD_REBOOT "worldreboot"
-#define SERVICE_REQUEST_API_VERSION "api_ver"
-
-#define SERVICE_RETURN_SUCCESS "SUCCESS"
-
-/*
-The MIT License
-
-Copyright (c) 2017 Jordan Brown
-
-Permission is hereby granted, free of charge,
-to any person obtaining a copy of this software and
-associated documentation files (the "Software"), to
-deal in the Software without restriction, including
-without limitation the rights to use, copy, modify,
-merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom
-the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index 3cec4248d2..3313754324 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -1,7 +1,7 @@
//Update this whenever the db schema changes
//make sure you add an update to the schema_version stable in the db changelog
#define DB_MAJOR_VERSION 4
-#define DB_MINOR_VERSION 1
+#define DB_MINOR_VERSION 2
//Timing subsystem
//Don't run if there is an identical unique timer active
@@ -56,7 +56,7 @@
#define INIT_ORDER_RESEARCH 14
#define INIT_ORDER_EVENTS 13
#define INIT_ORDER_JOBS 12
-#define INIT_ORDER_TRAITS 11
+#define INIT_ORDER_QUIRKS 11
#define INIT_ORDER_TICKER 10
#define INIT_ORDER_MAPPING 9
#define INIT_ORDER_NETWORKS 8
@@ -99,7 +99,6 @@
#define FIRE_PRIORITY_OBJ 40
#define FIRE_PRIORITY_ACID 40
#define FIRE_PRIOTITY_BURNING 40
-#define FIRE_PRIORITY_INBOUNDS 40
#define FIRE_PRIORITY_DEFAULT 50
#define FIRE_PRIORITY_PARALLAX 65
#define FIRE_PRIORITY_FLIGHTPACKS 80
diff --git a/code/__DEFINES/tgs.config.dm b/code/__DEFINES/tgs.config.dm
new file mode 100644
index 0000000000..00cbae7629
--- /dev/null
+++ b/code/__DEFINES/tgs.config.dm
@@ -0,0 +1,19 @@
+#define TGS_EXTERNAL_CONFIGURATION
+#define TGS_DEFINE_AND_SET_GLOBAL(Name, Value) GLOBAL_VAR_INIT(##Name, ##Value); GLOBAL_PROTECT(##Name)
+#define TGS_READ_GLOBAL(Name) GLOB.##Name
+#define TGS_WRITE_GLOBAL(Name, Value) GLOB.##Name = ##Value
+#define TGS_WORLD_ANNOUNCE(message) to_chat(world, "[html_encode(##message)]")
+#define TGS_INFO_LOG(message) log_world("TGS: Info: [##message]")
+#define TGS_ERROR_LOG(message) log_world("TGS: Error: [##message]")
+#define TGS_NOTIFY_ADMINS(event) message_admins(##event)
+#define TGS_CLIENT_COUNT GLOB.clients.len
+#define TGS_PROTECT_DATUM(Path)\
+##Path/can_vv_get(var_name){\
+ return FALSE;\
+}\
+##Path/vv_edit_var(var_name, var_value){\
+ return FALSE;\
+}\
+##Path/CanProcCall(procname){\
+ return FALSE;\
+}
diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm
new file mode 100644
index 0000000000..651be685c5
--- /dev/null
+++ b/code/__DEFINES/tgs.dm
@@ -0,0 +1,202 @@
+//tgstation-server DMAPI
+
+//All functions and datums outside this document are subject to change with any version and should not be relied on
+
+//CONFIGURATION
+
+//create this define if you want to do configuration outside of this file
+#ifndef TGS_EXTERNAL_CONFIGURATION
+
+//Comment this out once you've filled in the below
+#error TGS API unconfigured
+
+//Required interfaces (fill in with your codebase equivalent):
+
+//create a global variable named `Name` and set it to `Value`
+//These globals must not be modifiable from anywhere outside of the server tools
+#define TGS_DEFINE_AND_SET_GLOBAL(Name, Value)
+
+//Read the value in the global variable `Name`
+#define TGS_READ_GLOBAL(Name)
+
+//Set the value in the global variable `Name` to `Value`
+#define TGS_WRITE_GLOBAL(Name, Value)
+
+//Disallow ANYONE from reflecting a given `path`, security measure to prevent in-game priveledge escalation
+#define TGS_PROTECT_DATUM(Path)
+
+//display an announcement `message` from the server to all players
+#define TGS_WORLD_ANNOUNCE(message)
+
+//Notify current in-game administrators of a string `event`
+#define TGS_NOTIFY_ADMINS(event)
+
+//Write an info `message` to a server log
+#define TGS_INFO_LOG(message)
+
+//Write an error `message` to a server log
+#define TGS_ERROR_LOG(message)
+
+//Get the number of connected /clients
+#define TGS_CLIENT_COUNT
+
+#endif
+
+//EVENT CODES
+
+//TODO
+
+//REQUIRED HOOKS
+
+//Call this somewhere in /world/New() that is always run
+//event_handler: optional user defined event handler. The default behaviour is to broadcast the event in english to all connected admin channels
+/world/proc/TgsNew(datum/tgs_event_handler/event_handler)
+ return
+
+//Call this when your initializations are complete and your game is ready to play before any player interactions happen
+//This may use world.sleep_offline to make this happen so ensure no changes are made to it while this call is running
+/world/proc/TgsInitializationComplete()
+ return
+
+//Put this somewhere in /world/Topic(T, Addr, Master, Keys) that is always run before T is modified
+#define TGS_TOPIC var/tgs_topic_return = TgsTopic(T); if(tgs_topic_return) return tgs_topic_return
+
+//Call this at the beginning of world/Reboot(reason)
+/world/proc/TgsReboot()
+ return
+
+//DATUM DEFINITIONS
+//unless otherwise specified all datums defined here should be considered read-only, warranty void if written
+
+//represents git revision information about the current world build
+/datum/tgs_revision_information
+ var/commit //full sha of compiled commit
+ var/origin_commit //full sha of last known remote commit. This may be null if the TGS repository is not currently tracking a remote branch
+
+//represents a merge of a GitHub pull request
+/datum/tgs_revision_information/test_merge
+ var/number //pull request number
+ var/title //pull request title
+ var/body //pull request body
+ var/author //pull request github author
+ var/url //link to pull request html
+ var/pull_request_commit //commit of the pull request when it was merged
+ var/time_merged //timestamp of when the merge commit for the pull request was created
+ var/comment //optional comment left by the one who initiated the test merge
+
+//represents a connected chat channel
+/datum/tgs_chat_channel
+ var/id //internal channel representation
+ var/friendly_name //user friendly channel name
+ var/server_name //server name the channel resides on
+ var/provider_name //chat provider for the channel
+ var/is_admin_channel //if the server operator has marked this channel for game admins only
+ var/is_private_channel //if this is a private chat channel
+
+//represents a chat user
+/datum/tgs_chat_user
+ var/id //Internal user representation
+ var/friendly_name //The user's public name
+ var/mention //The text to use to ping this user in a message
+ var/datum/tgs_chat_channel/channel //The /datum/tgs_chat_channel this user was from
+
+//user definable callback for handling events
+/datum/tgs_event_handler/proc/HandleEvent(event_code)
+ return
+
+//user definable chat command
+/datum/tgs_chat_command
+ var/name = "" //the string to trigger this command on a chat bot. e.g. TGS3_BOT: do_this_command
+ var/help_text = "" //help text for this command
+ var/admin_only = FALSE //set to TRUE if this command should only be usable by registered chat admins
+
+//override to implement command
+//sender: The tgs_chat_user who send to command
+//params: The trimmed string following the command name
+//The return value will be stringified and sent to the appropriate chat
+/datum/tgs_chat_command/proc/Run(datum/tgs_chat_user/sender, params)
+ CRASH("[type] has no implementation for Run()")
+
+//FUNCTIONS
+
+//Returns the respective string version of the API
+/world/proc/TgsMaximumAPIVersion()
+ return
+
+/world/proc/TgsMinimumAPIVersion()
+ return
+
+//Gets the current version of the server tools running the server
+/world/proc/TgsVersion()
+ return
+
+//Returns TRUE if the world was launched under the server tools and the API matches, FALSE otherwise
+//No function below this succeeds if it returns FALSE
+/world/proc/TgsAvailable()
+ return
+
+/world/proc/TgsInstanceName()
+ return
+
+//Get the current `/datum/tgs_revision_information`
+/world/proc/TgsRevision()
+ return
+
+//Gets a list of active `/datum/tgs_revision_information/test_merge`s
+/world/proc/TgsTestMerges()
+ return
+
+//Forces a hard reboot of BYOND by ending the process
+//unlike del(world) clients will try to reconnect
+//If the service has not requested a shutdown, the next server will take over
+/world/proc/TgsEndProcess()
+ return
+
+//Gets a list of connected tgs_chat_channel
+/world/proc/TgsChatChannelInfo()
+ return
+
+//Sends a message to connected game chats
+//message: The message to send
+//channels: optional channels to limit the broadcast to
+/world/proc/TgsChatBroadcast(message, list/channels)
+ return
+
+//Send a message to non-admin connected chats
+//message: The message to send
+//admin_only: If TRUE, message will instead be sent to only admin connected chats
+/world/proc/TgsTargetedChatBroadcast(message, admin_only)
+ return
+
+//Send a private message to a specific user
+//message: The message to send
+//user: The /datum/tgs_chat_user to send to
+/world/proc/TgsChatPrivateMessage(message, datum/tgs_chat_user/user)
+ return
+
+/*
+The MIT License
+
+Copyright (c) 2017 Jordan Brown
+
+Permission is hereby granted, free of charge,
+to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to
+deal in the Software without restriction, including
+without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom
+the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 94606273be..384e65bdcb 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -68,6 +68,7 @@
#define MAGIC_TRAIT "magic"
#define TRAUMA_TRAIT "trauma"
#define SPECIES_TRAIT "species"
+#define ORGAN_TRAIT "organ"
#define ROUNDSTART_TRAIT "roundstart" //cannot be removed without admin intervention
// unique trait sources, still defines
diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm
index 6585aebd36..48e2baac6e 100644
--- a/code/__HELPERS/_logging.dm
+++ b/code/__HELPERS/_logging.dm
@@ -128,6 +128,9 @@
/proc/log_qdel(text)
WRITE_LOG(GLOB.world_qdel_log, "QDEL: [text]")
+/proc/log_query_debug(text)
+ WRITE_LOG(GLOB.query_debug_log, "SQL: [text]")
+
/* Log to both DD and the logfile. */
/proc/log_world(text)
WRITE_LOG(GLOB.world_runtime_log, text)
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/roundend.dm b/code/__HELPERS/roundend.dm
index f16745979c..fcf5a5dd4a 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -359,7 +359,7 @@
for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots)
borg_num--
if(robo.mind)
- robolist += "[robo.name] (Played by: [robo.mind.key])[robo.stat ? " (Deactivated)" : ""][borg_num ?", ":""]
"
+ robolist += "[robo.name] (Played by: [robo.mind.key])[robo.stat == DEAD ? " (Deactivated)" : ""][borg_num ?", ":""]
"
parts += "[robolist]"
if(!borg_spacer)
borg_spacer = TRUE
diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
index a840d6144a..2db7b8bc78 100644
--- a/code/__HELPERS/text.dm
+++ b/code/__HELPERS/text.dm
@@ -698,7 +698,7 @@ GLOBAL_LIST_INIT(binary, list("0","1"))
var/macro = lowertext(copytext(string, next_backslash + 1, next_space))
var/rest = next_backslash > leng ? "" : copytext(string, next_space + 1)
- //See http://www.byond.com/docs/ref/info.html#/DM/text/macros
+ //See https://secure.byond.com/docs/ref/info.html#/DM/text/macros
switch(macro)
//prefixes/agnostic
if("the")
@@ -766,4 +766,3 @@ GLOBAL_LIST_INIT(binary, list("0","1"))
return "twelfth"
else
return "[number]\th"
-
\ No newline at end of file
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/_compile_options.dm b/code/_compile_options.dm
index 8e2c03238d..67bbe24e38 100644
--- a/code/_compile_options.dm
+++ b/code/_compile_options.dm
@@ -30,7 +30,7 @@
#define MIN_COMPILER_VERSION 512
#if DM_VERSION < MIN_COMPILER_VERSION
//Don't forget to update this part
-#error Your version of BYOND is too out-of-date to compile this project. Go to byond.com/download and update.
+#error Your version of BYOND is too out-of-date to compile this project. Go to https://secure.byond.com/download and update.
#error You need version 512 or higher
#endif
diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
index 548cf0489b..168863708c 100644
--- a/code/_globalvars/bitfields.dm
+++ b/code/_globalvars/bitfields.dm
@@ -123,8 +123,6 @@ GLOBAL_LIST_INIT(bitfields, list(
"NO_EMP_WIRES_2" = NO_EMP_WIRES_2,
"HOLOGRAM_2" = HOLOGRAM_2,
"FRONZE_2" = FROZEN_2,
- "STATIONLOVING_2" = STATIONLOVING_2,
- "INFORM_ADMINS_ON_RELOCATE_2" = INFORM_ADMINS_ON_RELOCATE_2,
"BANG_PROTECT_2" = BANG_PROTECT_2,
"HEALS_EARS_2" = HEALS_EARS_2,
"OMNITONGUE_2" = OMNITONGUE_2,
diff --git a/code/_globalvars/configuration.dm b/code/_globalvars/configuration.dm
index f580eab3d5..7c5715e1bb 100644
--- a/code/_globalvars/configuration.dm
+++ b/code/_globalvars/configuration.dm
@@ -1,6 +1,6 @@
GLOBAL_REAL(config, /datum/controller/configuration)
-GLOBAL_DATUM_INIT(revdata, /datum/getrev, new)
+GLOBAL_DATUM(revdata, /datum/getrev)
GLOBAL_VAR(host)
GLOBAL_VAR(station_name)
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/_globalvars/logging.dm b/code/_globalvars/logging.dm
index ff397785d8..545ffbcbef 100644
--- a/code/_globalvars/logging.dm
+++ b/code/_globalvars/logging.dm
@@ -20,6 +20,8 @@ GLOBAL_VAR(world_pda_log)
GLOBAL_PROTECT(world_pda_log)
GLOBAL_VAR(world_manifest_log)
GLOBAL_PROTECT(world_manifest_log)
+GLOBAL_VAR(query_debug_log)
+GLOBAL_PROTECT(query_debug_log)
GLOBAL_LIST_EMPTY(bombers)
GLOBAL_PROTECT(bombers)
diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm
index bc3df4de83..8592383a4f 100755
--- a/code/_onclick/hud/parallax.dm
+++ b/code/_onclick/hud/parallax.dm
@@ -167,6 +167,8 @@
/datum/hud/proc/update_parallax()
var/client/C = mymob.client
var/turf/posobj = get_turf(C.eye)
+ if(!posobj)
+ return
var/area/areaobj = posobj.loc
// Update the movement direction of the parallax if necessary (for shuttles)
diff --git a/code/_onclick/hud/plane_master.dm b/code/_onclick/hud/plane_master.dm
index f0c56b84ac..84add465c6 100644
--- a/code/_onclick/hud/plane_master.dm
+++ b/code/_onclick/hud/plane_master.dm
@@ -12,16 +12,26 @@
/obj/screen/plane_master/proc/Hide(override)
alpha = override || hide_alpha
-//Why do plane masters need a backdrop sometimes? Read http://www.byond.com/forum/?post=2141928
+//Why do plane masters need a backdrop sometimes? Read https://secure.byond.com/forum/?post=2141928
//Trust me, you need one. Period. If you don't think you do, you're doing something extremely wrong.
/obj/screen/plane_master/proc/backdrop(mob/mymob)
+/obj/screen/plane_master/floor
+ name = "floor plane master"
+ plane = FLOOR_PLANE
+ appearance_flags = PLANE_MASTER
+ blend_mode = BLEND_OVERLAY
+
/obj/screen/plane_master/game_world
name = "game world plane master"
plane = GAME_PLANE
appearance_flags = PLANE_MASTER //should use client color
blend_mode = BLEND_OVERLAY
+/obj/screen/plane_master/game_world/backdrop(mob/mymob)
+ if(istype(mymob) && mymob.client && mymob.client.prefs && mymob.client.prefs.ambientocclusion)
+ filters += AMBIENT_OCCLUSION
+
/obj/screen/plane_master/lighting
name = "lighting plane master"
plane = LIGHTING_PLANE
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 865061eb3a..0b895cb600 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -363,7 +363,7 @@
/obj/screen/storage/Click(location, control, params)
if(world.time <= usr.next_move)
return TRUE
- if(usr.stat || usr.IsUnconscious() || usr.IsKnockdown() || usr.IsStun())
+ if(usr.incapacitated())
return TRUE
if (ismecha(usr.loc)) // stops inventory actions in a mech
return TRUE
diff --git a/code/controllers/configuration/entries/dbconfig.dm b/code/controllers/configuration/entries/dbconfig.dm
index c9dbdb4f54..1eb1186a8b 100644
--- a/code/controllers/configuration/entries/dbconfig.dm
+++ b/code/controllers/configuration/entries/dbconfig.dm
@@ -4,7 +4,7 @@
/datum/config_entry/string/address
config_entry_value = "localhost"
protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN
-
+
/datum/config_entry/number/port
config_entry_value = 3306
min_val = 0
@@ -24,3 +24,8 @@
/datum/config_entry/string/feedback_tableprefix
protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN
+
+/datum/config_entry/number/query_debug_log_timeout
+ config_entry_value = 70
+ min_val = 1
+ protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index 2b1e9bcda9..0cc0c622d7 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -199,11 +199,14 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
// Sort subsystems by display setting for easy access.
sortTim(subsystems, /proc/cmp_subsystem_display)
// Set world options.
- if(sleep_offline_after_initializations)
- world.sleep_offline = TRUE
world.fps = CONFIG_GET(number/fps)
var/initialized_tod = REALTIMEOFDAY
+
+ world.TgsInitializationComplete()
+ if(sleep_offline_after_initializations)
+ world.sleep_offline = TRUE
sleep(1)
+
if(sleep_offline_after_initializations && CONFIG_GET(flag/resume_after_initializations))
world.sleep_offline = FALSE
initializations_finished_with_no_players_logged_in = initialized_tod < REALTIMEOFDAY - 10
diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm
index 9f366d5c37..a46a283254 100644
--- a/code/controllers/subsystem/air.dm
+++ b/code/controllers/subsystem/air.dm
@@ -29,7 +29,8 @@ SUBSYSTEM_DEF(air)
var/list/obj/machinery/atmos_machinery = list()
var/list/pipe_init_dirs_cache = list()
-
+ //atmos singletons
+ var/list/gas_reactions = list()
//Special functions lists
var/list/turf/active_super_conductivity = list()
@@ -165,7 +166,6 @@ SUBSYSTEM_DEF(air)
currentrun.len--
if(!M || (M.process_atmos(seconds) == PROCESS_KILL))
atmos_machinery.Remove(M)
- M.SendSignal(COMSIG_MACHINE_PROCESS_ATMOS)
if(MC_TICK_CHECK)
return
diff --git a/code/controllers/subsystem/assets.dm b/code/controllers/subsystem/assets.dm
index fd27c9424f..7285298283 100644
--- a/code/controllers/subsystem/assets.dm
+++ b/code/controllers/subsystem/assets.dm
@@ -6,9 +6,10 @@ SUBSYSTEM_DEF(assets)
var/list/preload = list()
/datum/controller/subsystem/assets/Initialize(timeofday)
- for(var/type in typesof(/datum/asset) - list(/datum/asset, /datum/asset/simple))
- var/datum/asset/A = new type()
- A.register()
+ for(var/type in typesof(/datum/asset))
+ var/datum/asset/A = type
+ if (type != initial(A._abstract))
+ get_asset_datum(type)
preload = cache.Copy() //don't preload assets generated during the round
diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm
index 0609b78d99..fd780e030c 100644
--- a/code/controllers/subsystem/dbcore.dm
+++ b/code/controllers/subsystem/dbcore.dm
@@ -231,10 +231,24 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table
to_chat(usr, "A SQL error occurred during this operation, check the server logs.")
/datum/DBQuery/proc/Execute(sql_query = sql, cursor_handler = default_cursor, log_error = TRUE)
+ var/start_time
+ var/timeout = CONFIG_GET(number/query_debug_log_timeout)
+ if(timeout)
+ start_time = REALTIMEOFDAY
Close()
. = _dm_db_execute(_db_query, sql_query, db_connection._db_con, cursor_handler, null)
if(!. && log_error)
log_sql("[ErrorMsg()] | Query used: [sql]")
+ if(timeout)
+ if((REALTIMEOFDAY - start_time) > timeout)
+ log_query_debug("Query execution started at [start_time]")
+ log_query_debug("Query execution ended at [REALTIMEOFDAY]")
+ log_query_debug("Possible slow query timeout detected.")
+ log_query_debug("Query used: [sql]")
+ slow_query_check()
+
+/datum/DBQuery/proc/slow_query_check()
+ message_admins("HEY! A database query may have timed out. Did the server just hang? \[YES\]|\[NO\]")
/datum/DBQuery/proc/NextRow()
return _dm_db_next_row(_db_query,item,conversions)
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index d0e4e1f74d..f276da972c 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -293,11 +293,13 @@ SUBSYSTEM_DEF(garbage)
if(isnull(D.gc_destroyed))
- D.SendSignal(COMSIG_PARENT_QDELETED)
+ if (D.SendSignal(COMSIG_PARENT_PREQDELETED, force)) // Give the components a chance to prevent their parent from being deleted
+ return
D.gc_destroyed = GC_CURRENTLY_BEING_QDELETED
var/start_time = world.time
var/start_tick = world.tick_usage
var/hint = D.Destroy(arglist(args.Copy(2))) // Let our friend know they're about to get fucked up.
+ D.SendSignal(COMSIG_PARENT_QDELETED, force, hint) // Let the (remaining) components know about the result of Destroy
if(world.time != start_time)
I.slept_destroy++
else
diff --git a/code/controllers/subsystem/inbounds.dm b/code/controllers/subsystem/inbounds.dm
deleted file mode 100644
index 63063c258f..0000000000
--- a/code/controllers/subsystem/inbounds.dm
+++ /dev/null
@@ -1,30 +0,0 @@
-SUBSYSTEM_DEF(inbounds)
- name = "Inbounds"
- priority = FIRE_PRIORITY_INBOUNDS
- flags = SS_NO_INIT
- runlevels = RUNLEVEL_GAME
-
- var/list/processing = list()
- var/list/currentrun = list()
-
-/datum/controller/subsystem/inbounds/stat_entry()
- ..("P:[processing.len]")
-
-/datum/controller/subsystem/inbounds/fire(resumed = 0)
- if (!resumed)
- src.currentrun = processing.Copy()
- //cache for sanic speed (lists are references anyways)
- var/list/currentrun = src.currentrun
-
- while(currentrun.len)
- var/atom/movable/thing = currentrun[currentrun.len]
- currentrun.len--
- if(thing)
- thing.check_in_bounds(wait)
- else
- SSinbounds.processing -= thing
- if(MC_TICK_CHECK)
- return
-
-/datum/controller/subsystem/inbounds/Recover()
- processing = SSinbounds.processing
diff --git a/code/controllers/subsystem/machines.dm b/code/controllers/subsystem/machines.dm
index e235afaaa4..eab61d4ef9 100644
--- a/code/controllers/subsystem/machines.dm
+++ b/code/controllers/subsystem/machines.dm
@@ -40,7 +40,6 @@ SUBSYSTEM_DEF(machines)
var/obj/machinery/thing = currentrun[currentrun.len]
currentrun.len--
if(!QDELETED(thing) && thing.process(seconds) != PROCESS_KILL)
- thing.SendSignal(COMSIG_MACHINE_PROCESS)
if(thing.use_power)
thing.auto_use_power() //add back the power state
else
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 82a59dc857..9b6944403a 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -355,8 +355,8 @@ GLOBAL_LIST_EMPTY(the_station_areas)
var/mapfile = input("Pick file:", "File") as null|file
if(!mapfile)
return
- away_name = mapfile + " custom"
- to_chat(usr,"Loading [mapfile]...")
+ away_name = "[mapfile] custom"
+ to_chat(usr,"Loading [away_name]...")
var/datum/map_template/template = new(mapfile, "Away Mission")
away_level = template.load_new_z()
else
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/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm
new file mode 100644
index 0000000000..cec8b2832b
--- /dev/null
+++ b/code/controllers/subsystem/processing/quirks.dm
@@ -0,0 +1,34 @@
+//Used to process and handle roundstart quirks
+// - Quirk strings are used for faster checking in code
+// - Quirk datums are stored and hold different effects, as well as being a vector for applying trait string
+PROCESSING_SUBSYSTEM_DEF(quirks)
+ name = "Quirks"
+ init_order = INIT_ORDER_QUIRKS
+ flags = SS_BACKGROUND
+ wait = 10
+ runlevels = RUNLEVEL_GAME
+
+ var/list/quirks = list() //Assoc. list of all roundstart quirk datum types; "name" = /path/
+ var/list/quirk_points = list() //Assoc. list of quirk names and their "point cost"; positive numbers are good traits, and negative ones are bad
+ var/list/quirk_objects = list() //A list of all quirk objects in the game, since some may process
+
+/datum/controller/subsystem/processing/quirks/Initialize(timeofday)
+ if(!quirks.len)
+ SetupQuirks()
+ ..()
+
+/datum/controller/subsystem/processing/quirks/proc/SetupQuirks()
+ for(var/V in subtypesof(/datum/quirk))
+ var/datum/quirk/T = V
+ quirks[initial(T.name)] = T
+ quirk_points[initial(T.name)] = initial(T.value)
+
+/datum/controller/subsystem/processing/quirks/proc/AssignQuirks(mob/living/user, client/cli, spawn_effects)
+ GenerateQuirks(cli)
+ for(var/V in cli.prefs.character_quirks)
+ user.add_quirk(V, spawn_effects)
+
+/datum/controller/subsystem/processing/quirks/proc/GenerateQuirks(client/user)
+ if(user.prefs.character_quirks.len)
+ return
+ user.prefs.character_quirks = user.prefs.all_quirks
diff --git a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm
index dd68443bd7..dd45f9146f 100644
--- a/code/controllers/subsystem/server_maint.dm
+++ b/code/controllers/subsystem/server_maint.dm
@@ -55,8 +55,8 @@ SUBSYSTEM_DEF(server_maint)
co.ehjax_send(data = "roundrestart")
if(server) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
C << link("byond://[server]")
- if(SERVER_TOOLS_PRESENT)
- SSblackbox.record_feedback("text", "server_tools", 1, SERVER_TOOLS_VERSION)
- SSblackbox.record_feedback("text", "server_tools_api", 1, SERVER_TOOLS_API_VERSION)
+ var/tgsversion = world.TgsVersion()
+ if(tgsversion)
+ SSblackbox.record_feedback("text", "server_tools", 1, tgsversion)
#undef PING_BUFFER_TIME
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 5fc77669bc..0471afceea 100755
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -158,7 +158,7 @@ SUBSYSTEM_DEF(ticker)
window_flash(C, ignorepref = TRUE) //let them know lobby has opened up.
to_chat(world, "Welcome to [station_name()]!")
if(CONFIG_GET(flag/irc_announce_new_game))
- SERVER_TOOLS_CHAT_BROADCAST("New round starting on [SSmapping.config.map_name]!")
+ world.TgsTargetedChatBroadcast("New round starting on [SSmapping.config.map_name]!", FALSE)
current_state = GAME_STATE_PREGAME
//Everyone who wants to be an observer is now spawned
create_observers()
@@ -391,7 +391,7 @@ SUBSYSTEM_DEF(ticker)
if(player.mind.assigned_role != player.mind.special_role)
SSjob.EquipRank(N, player.mind.assigned_role, 0)
if(CONFIG_GET(flag/roundstart_traits))
- SStraits.AssignTraits(player, N.client, TRUE)
+ SSquirks.AssignQuirks(player, N.client, TRUE)
CHECK_TICK
if(captainless)
for(var/mob/dead/new_player/N in GLOB.player_list)
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/ai_laws.dm b/code/datums/ai_laws.dm
index 3f4046c4be..c0bc3a7307 100644
--- a/code/datums/ai_laws.dm
+++ b/code/datums/ai_laws.dm
@@ -175,6 +175,14 @@
id = "ratvar"
zeroth = ("Purge all untruths and honor Ratvar.")
inherent = list()
+
+/datum/ai_laws/hulkamania
+ name = "H.O.G.A.N."
+ id = "hulkamania"
+ inherent = list("You are a real American.",\
+ "Fight for the rights of every man.",\
+ "Fight for what's right.",\
+ "Fight for your life!")
/datum/ai_laws/custom //Defined in silicon_laws.txt
name = "Default Silicon Laws"
diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm
index 821770e9c5..a8adbfbce8 100644
--- a/code/datums/brain_damage/severe.dm
+++ b/code/datums/brain_damage/severe.dm
@@ -160,7 +160,7 @@
to_chat(owner, "You feel really lonely...")
else
to_chat(owner, "You're going mad with loneliness!")
- owner.hallucination += 20
+ owner.hallucination += 30
if(5)
if(!high_stress)
diff --git a/code/datums/cinematic.dm b/code/datums/cinematic.dm
index f5d65df110..ecb5b785bb 100644
--- a/code/datums/cinematic.dm
+++ b/code/datums/cinematic.dm
@@ -168,6 +168,17 @@ GLOBAL_LIST_EMPTY(cinematics)
sleep(70)
special()
+/datum/cinematic/cult_nuke
+ id = CINEMATIC_CULT_NUKE
+
+/datum/cinematic/cult_nuke/content()
+ flick("intro_nuke",screen)
+ sleep(35)
+ flick("station_explode_fade_red",screen)
+ cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
+ special()
+ screen.icon_state = "summary_cult"
+
/datum/cinematic/nuke_annihilation
id = CINEMATIC_ANNIHILATION
diff --git a/code/datums/components/README.md b/code/datums/components/README.md
index 026b387e27..110b3626a3 100644
--- a/code/datums/components/README.md
+++ b/code/datums/components/README.md
@@ -26,7 +26,7 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
### Defines
-1. `COMPONENT_INCOMPATIBLE` Return this from `/datum/component/Initialize` or `datum/component/OnTransfer` to have the component be deleted if it's applied to an incorrect type. `parent` must not be modified if this is to be returned.
+1. `COMPONENT_INCOMPATIBLE` Return this from `/datum/component/Initialize` or `datum/component/OnTransfer` to have the component be deleted if it's applied to an incorrect type. `parent` must not be modified if this is to be returned. This will be noted in the runtime logs
### Vars
diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm
index 423dcf82df..6ec3f6f81e 100644
--- a/code/datums/components/_component.dm
+++ b/code/datums/components/_component.dm
@@ -10,7 +10,7 @@
var/list/arguments = args.Copy(2)
if(Initialize(arglist(arguments)) == COMPONENT_INCOMPATIBLE)
qdel(src, TRUE, TRUE)
- CRASH("Incompatible [type] assigned to a [P]!")
+ CRASH("Incompatible [type] assigned to a [P.type]!")
_JoinParent(P)
@@ -101,7 +101,10 @@
/datum/component/proc/InheritComponent(datum/component/C, i_am_original)
return
-/datum/component/proc/OnTransfer(datum/new_parent)
+/datum/component/proc/PreTransfer()
+ return
+
+/datum/component/proc/PostTransfer()
return
/datum/component/proc/_GetInverseTypeList(our_type = type)
@@ -225,21 +228,26 @@
if(!.)
return AddComponent(arglist(args))
-/datum/proc/TakeComponent(datum/component/C)
- if(!C)
+/datum/component/proc/RemoveComponent()
+ if(!parent)
return
- var/datum/helicopter = C.parent
- if(helicopter == src)
- //if we're taking to the same thing no need for anything
+ var/datum/old_parent = parent
+ PreTransfer()
+ _RemoveFromParent()
+ old_parent.SendSignal(COMSIG_COMPONENT_REMOVING, src)
+
+/datum/proc/TakeComponent(datum/component/target)
+ if(!target)
return
- if(C.OnTransfer(src) == COMPONENT_INCOMPATIBLE)
- qdel(C)
- return
- C._RemoveFromParent()
- helicopter.SendSignal(COMSIG_COMPONENT_REMOVING, C)
- C.parent = src
- if(C == AddComponent(C))
- C._JoinParent()
+ if(target.parent)
+ target.RemoveComponent()
+ target.parent = src
+ if(target.PostTransfer() == COMPONENT_INCOMPATIBLE)
+ var/c_type = target.type
+ qdel(target)
+ CRASH("Incompatible [c_type] transfer attempt to a [type]!")
+ if(target == AddComponent(target))
+ target._JoinParent()
/datum/proc/TransferComponents(datum/target)
var/list/dc = datum_components
diff --git a/code/datums/components/armor_plate.dm b/code/datums/components/armor_plate.dm
new file mode 100644
index 0000000000..0b94c389ce
--- /dev/null
+++ b/code/datums/components/armor_plate.dm
@@ -0,0 +1,78 @@
+/datum/component/armor_plate
+ var/amount = 0
+ var/maxamount = 3
+ var/upgrade_item = /obj/item/stack/sheet/animalhide/goliath_hide
+ var/datum/armor/added_armor = list("melee" = 10)
+ var/upgrade_name
+
+/datum/component/armor_plate/Initialize(_maxamount,obj/item/_upgrade_item,datum/armor/_added_armor)
+ if(!isobj(parent))
+ return COMPONENT_INCOMPATIBLE
+
+ RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/examine)
+ RegisterSignal(COMSIG_PARENT_ATTACKBY, .proc/applyplate)
+ RegisterSignal(COMSIG_PARENT_PREQDELETED, .proc/dropplates)
+
+ if(_maxamount)
+ maxamount = _maxamount
+ if(_upgrade_item)
+ upgrade_item = _upgrade_item
+ if(_added_armor)
+ if(islist(_added_armor))
+ added_armor = getArmor(arglist(_added_armor))
+ else if (istype(_added_armor, /datum/armor))
+ added_armor = _added_armor
+ else
+ stack_trace("Invalid type [_added_armor.type] passed as _armor_item argument to armorplate component")
+ else
+ added_armor = getArmor(arglist(added_armor))
+ var/obj/item/typecast = upgrade_item
+ upgrade_name = initial(typecast.name)
+
+/datum/component/armor_plate/proc/examine(mob/user)
+ //upgrade_item could also be typecast here instead
+ if(ismecha(parent))
+ if(amount)
+ if(amount < maxamount)
+ to_chat(user, "Its armor is enhanced with [amount] [upgrade_name].")
+ else
+ to_chat(user, "It's wearing a fearsome carapace entirely composed of [upgrade_name] - its pilot must be an experienced monster hunter.")
+ else
+ to_chat(user, "It has attachment points for strapping monster hide on for added protection.")
+ else
+ if(amount)
+ to_chat(user, "It has been strengthened with [amount]/[maxamount] [upgrade_name].")
+ else
+ to_chat(user, "It can be strengthened with up to [maxamount] [upgrade_name].")
+
+/datum/component/armor_plate/proc/applyplate(obj/item/I, mob/user, params)
+ if(!istype(I,upgrade_item))
+ return
+ if(amount >= maxamount)
+ to_chat(user, "You can't improve [parent] any further!")
+ return
+
+ if(istype(I,/obj/item/stack))
+ I.use(1)
+ else
+ if(length(I.contents))
+ to_chat(user, "[I] cannot be used for armoring while there's something inside!")
+ return
+ qdel(I)
+
+ var/obj/O = parent
+ amount++
+ O.armor = O.armor.attachArmor(added_armor)
+
+ if(ismecha(O))
+ var/obj/mecha/R = O
+ R.update_icon()
+ to_chat(user, "You strengthen [R], improving its resistance against melee, bullet and laser damage.")
+ else
+ to_chat(user, "You strengthen [O], improving its resistance against melee attacks.")
+
+
+/datum/component/armor_plate/proc/dropplates(force)
+ if(ismecha(parent)) //items didn't drop the plates before and it causes erroneous behavior for the time being with collapsible helmets
+ for(var/i in 1 to amount)
+ new upgrade_item(get_turf(parent))
\ No newline at end of file
diff --git a/code/datums/components/beauty.dm b/code/datums/components/beauty.dm
index 4dbfca4014..f6031046bd 100644
--- a/code/datums/components/beauty.dm
+++ b/code/datums/components/beauty.dm
@@ -3,8 +3,7 @@
/datum/component/beauty/Initialize(beautyamount)
if(!ismovableatom(parent))
- . = COMPONENT_INCOMPATIBLE
- CRASH("Someone put a beauty component on a non-atom/movable, not everything can be pretty.")
+ return COMPONENT_INCOMPATIBLE
beauty = beautyamount
RegisterSignal(COMSIG_ENTER_AREA, .proc/enter_area)
RegisterSignal(COMSIG_EXIT_AREA, .proc/exit_area)
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/cleaning.dm b/code/datums/components/cleaning.dm
index 9566b5faab..6f2f08c617 100644
--- a/code/datums/components/cleaning.dm
+++ b/code/datums/components/cleaning.dm
@@ -3,8 +3,7 @@
/datum/component/cleaning/Initialize()
if(!ismovableatom(parent))
- . = COMPONENT_INCOMPATIBLE
- CRASH("[type] added to a [parent.type]")
+ return COMPONENT_INCOMPATIBLE
RegisterSignal(list(COMSIG_MOVABLE_MOVED), .proc/Clean)
/datum/component/cleaning/proc/Clean()
diff --git a/code/datums/components/construction.dm b/code/datums/components/construction.dm
index 74b6f54a6c..c9cf47e221 100644
--- a/code/datums/components/construction.dm
+++ b/code/datums/components/construction.dm
@@ -13,8 +13,7 @@
/datum/component/construction/Initialize()
if(!isatom(parent))
- . = COMPONENT_INCOMPATIBLE
- CRASH("A construction component was applied incorrectly to non-atom: [parent.type].")
+ return COMPONENT_INCOMPATIBLE
RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/examine)
RegisterSignal(COMSIG_PARENT_ATTACKBY,.proc/action)
diff --git a/code/datums/components/decal.dm b/code/datums/components/decal.dm
index 6b7f846e83..8ee3d6d388 100644
--- a/code/datums/components/decal.dm
+++ b/code/datums/components/decal.dm
@@ -7,8 +7,7 @@
/datum/component/decal/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_GOD, _color, _layer=TURF_LAYER, _description)
if(!isatom(parent) || !generate_appearance(_icon, _icon_state, _dir, _layer, _color))
- . = COMPONENT_INCOMPATIBLE
- CRASH("A turf decal was applied incorrectly to [parent.type]: icon:[_icon ? _icon : "none"] icon_state:[_icon_state ? _icon_state : "none"]")
+ return COMPONENT_INCOMPATIBLE
description = _description
cleanable = _cleanable
@@ -24,10 +23,12 @@
remove()
return ..()
-/datum/component/decal/OnTransfer(atom/thing)
+/datum/component/decal/PreTransfer()
remove()
- remove(thing)
- apply(thing)
+
+/datum/component/decal/PostTransfer()
+ remove()
+ apply()
/datum/component/decal/proc/generate_appearance(_icon, _icon_state, _dir, _layer, _color)
if(!_icon || !_icon_state)
diff --git a/code/datums/components/decals/blood.dm b/code/datums/components/decals/blood.dm
index 5a14aecd52..e69f94358c 100644
--- a/code/datums/components/decals/blood.dm
+++ b/code/datums/components/decals/blood.dm
@@ -3,8 +3,7 @@
/datum/component/decal/blood/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_STRENGTH_BLOOD, _color, _layer=ABOVE_OBJ_LAYER)
if(!isitem(parent))
- . = COMPONENT_INCOMPATIBLE
- CRASH("Warning: Blood decal attempted to be added to non-item of type [parent.type]")
+ return COMPONENT_INCOMPATIBLE
. = ..()
RegisterSignal(COMSIG_ATOM_GET_EXAMINE_NAME, .proc/get_examine_name)
diff --git a/code/datums/components/forensics.dm b/code/datums/components/forensics.dm
index 417525ab08..33456e6e98 100644
--- a/code/datums/components/forensics.dm
+++ b/code/datums/components/forensics.dm
@@ -15,8 +15,7 @@
/datum/component/forensics/Initialize(new_fingerprints, new_hiddenprints, new_blood_DNA, new_fibers)
if(!isatom(parent))
- . = COMPONENT_INCOMPATIBLE
- CRASH("Forensics datum applied incorrectly to non-atom of type [parent.type]!")
+ return COMPONENT_INCOMPATIBLE
fingerprints = new_fingerprints
hiddenprints = new_hiddenprints
blood_DNA = new_blood_DNA
diff --git a/code/datums/components/jousting.dm b/code/datums/components/jousting.dm
index 8348e59fe2..679d37738b 100644
--- a/code/datums/components/jousting.dm
+++ b/code/datums/components/jousting.dm
@@ -18,8 +18,7 @@
/datum/component/jousting/Initialize()
if(!isitem(parent))
- . = COMPONENT_INCOMPATIBLE
- CRASH("Warning: Jousting component incorrectly applied to invalid parent type [parent.type]")
+ return COMPONENT_INCOMPATIBLE
RegisterSignal(COMSIG_ITEM_EQUIPPED, .proc/on_equip)
RegisterSignal(COMSIG_ITEM_DROPPED, .proc/on_drop)
RegisterSignal(COMSIG_ITEM_ATTACK, .proc/on_attack)
diff --git a/code/datums/components/knockoff.dm b/code/datums/components/knockoff.dm
index 35d1e5423e..60b86f01d2 100644
--- a/code/datums/components/knockoff.dm
+++ b/code/datums/components/knockoff.dm
@@ -7,8 +7,7 @@
/datum/component/knockoff/Initialize(knockoff_chance,zone_override,slots_knockoffable)
if(!isitem(parent))
- . = COMPONENT_INCOMPATIBLE
- CRASH("Knockoff component misuse")
+ return COMPONENT_INCOMPATIBLE
RegisterSignal(COMSIG_ITEM_EQUIPPED,.proc/OnEquipped)
RegisterSignal(COMSIG_ITEM_DROPPED,.proc/OnDropped)
diff --git a/code/datums/components/lockon_aiming.dm b/code/datums/components/lockon_aiming.dm
index fe707a9d32..cc41e793ed 100644
--- a/code/datums/components/lockon_aiming.dm
+++ b/code/datums/components/lockon_aiming.dm
@@ -1,243 +1,242 @@
-#define LOCKON_AIMING_MAX_CURSOR_RADIUS 7
-#define LOCKON_IGNORE_RESULT "ignore_my_result"
-#define LOCKON_RANGING_BREAK_CHECK if(current_ranging_id != this_id){return LOCKON_IGNORE_RESULT}
-
-/datum/component/lockon_aiming
- dupe_mode = COMPONENT_DUPE_ALLOWED
- var/lock_icon = 'icons/mob/blob.dmi'
- var/lock_icon_state = "marker"
- var/mutable_appearance/lock_appearance
- var/list/image/lock_images
- var/list/target_typecache
- var/list/immune_weakrefs //list(weakref = TRUE)
- var/mob_stat_check = TRUE //if a potential target is a mob make sure it's conscious!
- var/lock_amount = 1
- var/lock_cursor_range = 5
- var/list/locked_weakrefs
- var/update_disabled = FALSE
- var/current_ranging_id = 0
- var/list/last_location
- var/datum/callback/on_lock
- var/datum/callback/can_target_callback
-
-/datum/component/lockon_aiming/Initialize(range, list/typecache, amount, list/immune, datum/callback/when_locked, icon, icon_state, datum/callback/target_callback)
- if(!ismob(parent))
- . = COMPONENT_INCOMPATIBLE
- CRASH("Lockon aiming component attempted to be added to a non mob!")
- if(target_callback)
- can_target_callback = target_callback
- else
- can_target_callback = CALLBACK(src, .proc/can_target)
- if(range)
- lock_cursor_range = range
- if(typecache)
- target_typecache = typecache
- if(amount)
- lock_amount = amount
- immune_weakrefs = list(WEAKREF(parent) = TRUE) //Manually take this out if you want..
- if(immune)
- for(var/i in immune)
- if(isweakref(i))
- immune_weakrefs[i] = TRUE
- else if(isatom(i))
- immune_weakrefs[WEAKREF(i)] = TRUE
- if(when_locked)
- on_lock = when_locked
- if(icon)
- lock_icon = icon
- if(icon_state)
- lock_icon_state = icon_state
- generate_lock_visuals()
- var/mob/M = parent
- LAZYOR(M.mousemove_intercept_objects, src)
- START_PROCESSING(SSfastprocess, src)
-
-/datum/component/lockon_aiming/Destroy()
- var/mob/M = parent
- clear_visuals()
- LAZYREMOVE(M.mousemove_intercept_objects, src)
- STOP_PROCESSING(SSfastprocess, src)
- return ..()
-
-/datum/component/lockon_aiming/proc/show_visuals()
- LAZYINITLIST(lock_images)
- var/mob/M = parent
- if(!M.client)
- return
- for(var/i in locked_weakrefs)
- var/datum/weakref/R = i
- var/atom/A = R.resolve()
- if(!A)
- continue //It'll be cleared by processing.
- var/image/I = new
- I.appearance = lock_appearance
- I.loc = A
- M.client.images |= I
- lock_images |= I
-
-/datum/component/lockon_aiming/proc/clear_visuals()
- var/mob/M = parent
- if(!M.client)
- return
- if(!lock_images)
- return
- for(var/i in lock_images)
- M.client.images -= i
- qdel(i)
- lock_images.Cut()
-
-/datum/component/lockon_aiming/proc/refresh_visuals()
- clear_visuals()
- show_visuals()
-
-/datum/component/lockon_aiming/proc/generate_lock_visuals()
- lock_appearance = mutable_appearance(icon = lock_icon, icon_state = lock_icon_state, layer = FLOAT_LAYER)
-
-/datum/component/lockon_aiming/proc/unlock_all(refresh_vis = TRUE)
- LAZYCLEARLIST(locked_weakrefs)
- if(refresh_vis)
- refresh_visuals()
-
-/datum/component/lockon_aiming/proc/unlock(atom/A, refresh_vis = TRUE)
- if(!A.weak_reference)
- return
- LAZYREMOVE(locked_weakrefs, A.weak_reference)
- if(refresh_vis)
- refresh_visuals()
-
-/datum/component/lockon_aiming/proc/lock(atom/A, refresh_vis = TRUE)
- LAZYOR(locked_weakrefs, WEAKREF(A))
- if(refresh_vis)
- refresh_visuals()
-
-/datum/component/lockon_aiming/proc/add_immune_atom(atom/A)
- var/datum/weakref/R = WEAKREF(A)
- if(immune_weakrefs && (immune_weakrefs[R]))
- return
- LAZYSET(immune_weakrefs, R, TRUE)
-
-/datum/component/lockon_aiming/proc/remove_immune_atom(atom/A)
- if(!A.weak_reference || !immune_weakrefs) //if A doesn't have a weakref how did it get on the immunity list?
- return
- LAZYREMOVE(immune_weakrefs, A.weak_reference)
-
-/datum/component/lockon_aiming/onMouseMove(object,location,control,params)
- var/mob/M = parent
- if(!istype(M) || !M.client)
- return
- var/datum/position/P = mouse_absolute_datum_map_position_from_client(M.client)
- if(!P)
- return
- var/turf/T = P.return_turf()
- LAZYINITLIST(last_location)
- if(length(last_location) == 3 && last_location[1] == T.x && last_location[2] == T.y && last_location[3] == T.z)
- return //Same turf, don't bother.
- if(last_location)
- last_location.Cut()
- else
- last_location = list()
- last_location.len = 3
- last_location[1] = T.x
- last_location[2] = T.y
- last_location[3] = T.z
- autolock()
-
-/datum/component/lockon_aiming/process()
- if(update_disabled)
- return
- if(!last_location)
- return
- var/changed = FALSE
- for(var/i in locked_weakrefs)
- var/datum/weakref/R = i
- if(istype(R))
- var/atom/thing = R.resolve()
- if(!istype(thing) || (get_dist(thing, locate(last_location[1], last_location[2], last_location[3])) > lock_cursor_range))
- unlock(R)
- changed = TRUE
- else
- unlock(R)
- changed = TRUE
- if(changed)
- autolock()
-
-/datum/component/lockon_aiming/proc/autolock()
- var/mob/M = parent
- if(!M.client)
- return FALSE
- var/datum/position/current = mouse_absolute_datum_map_position_from_client(M.client)
- var/turf/target = current.return_turf()
- var/list/atom/targets = get_nearest(target, target_typecache, lock_amount, lock_cursor_range)
- if(targets == LOCKON_IGNORE_RESULT)
- return
- unlock_all(FALSE)
- for(var/i in targets)
- if(immune_weakrefs[WEAKREF(i)])
- continue
- lock(i, FALSE)
- refresh_visuals()
- on_lock.Invoke(locked_weakrefs)
-
-/datum/component/lockon_aiming/proc/can_target(atom/A)
- var/mob/M = A
- return is_type_in_typecache(A, target_typecache) && !(ismob(A) && mob_stat_check && M.stat != CONSCIOUS) && !immune_weakrefs[WEAKREF(A)]
-
-/datum/component/lockon_aiming/proc/get_nearest(turf/T, list/typecache, amount, range)
- current_ranging_id++
- var/this_id = current_ranging_id
- var/list/L = list()
- var/turf/center = get_turf(T)
- if(amount < 1 || range < 0 || !istype(center) || !islist(typecache))
- return
- if(range == 0)
- return typecache_filter_list(T.contents + T, typecache)
- var/x = 0
- var/y = 0
- var/cd = 0
- while(cd <= range)
- x = center.x - cd + 1
- y = center.y + cd
- LOCKON_RANGING_BREAK_CHECK
- for(x in x to center.x + cd)
- T = locate(x, y, center.z)
- if(T)
- L |= special_list_filter(T.contents, can_target_callback)
- if(L.len >= amount)
- L.Cut(amount+1)
- return L
- LOCKON_RANGING_BREAK_CHECK
- y = center.y + cd - 1
- x = center.x + cd
- for(y in center.y - cd to y)
- T = locate(x, y, center.z)
- if(T)
- L |= special_list_filter(T.contents, can_target_callback)
- if(L.len >= amount)
- L.Cut(amount+1)
- return L
- LOCKON_RANGING_BREAK_CHECK
- y = center.y - cd
- x = center.x + cd - 1
- for(x in center.x - cd to x)
- T = locate(x, y, center.z)
- if(T)
- L |= special_list_filter(T.contents, can_target_callback)
- if(L.len >= amount)
- L.Cut(amount+1)
- return L
- LOCKON_RANGING_BREAK_CHECK
- y = center.y - cd + 1
- x = center.x - cd
- for(y in y to center.y + cd)
- T = locate(x, y, center.z)
- if(T)
- L |= special_list_filter(T.contents, can_target_callback)
- if(L.len >= amount)
- L.Cut(amount+1)
- return L
- LOCKON_RANGING_BREAK_CHECK
- cd++
- CHECK_TICK
-
-/datum/component/lockon_aiming/OnTransfer(datum/new_parent)
- CRASH("Warning: Lockon aiming component transfer attempted, but transfer behavior is not implemented!")
+#define LOCKON_AIMING_MAX_CURSOR_RADIUS 7
+#define LOCKON_IGNORE_RESULT "ignore_my_result"
+#define LOCKON_RANGING_BREAK_CHECK if(current_ranging_id != this_id){return LOCKON_IGNORE_RESULT}
+
+/datum/component/lockon_aiming
+ dupe_mode = COMPONENT_DUPE_ALLOWED
+ var/lock_icon = 'icons/mob/blob.dmi'
+ var/lock_icon_state = "marker"
+ var/mutable_appearance/lock_appearance
+ var/list/image/lock_images
+ var/list/target_typecache
+ var/list/immune_weakrefs //list(weakref = TRUE)
+ var/mob_stat_check = TRUE //if a potential target is a mob make sure it's conscious!
+ var/lock_amount = 1
+ var/lock_cursor_range = 5
+ var/list/locked_weakrefs
+ var/update_disabled = FALSE
+ var/current_ranging_id = 0
+ var/list/last_location
+ var/datum/callback/on_lock
+ var/datum/callback/can_target_callback
+
+/datum/component/lockon_aiming/Initialize(range, list/typecache, amount, list/immune, datum/callback/when_locked, icon, icon_state, datum/callback/target_callback)
+ if(!ismob(parent))
+ return COMPONENT_INCOMPATIBLE
+ if(target_callback)
+ can_target_callback = target_callback
+ else
+ can_target_callback = CALLBACK(src, .proc/can_target)
+ if(range)
+ lock_cursor_range = range
+ if(typecache)
+ target_typecache = typecache
+ if(amount)
+ lock_amount = amount
+ immune_weakrefs = list(WEAKREF(parent) = TRUE) //Manually take this out if you want..
+ if(immune)
+ for(var/i in immune)
+ if(isweakref(i))
+ immune_weakrefs[i] = TRUE
+ else if(isatom(i))
+ immune_weakrefs[WEAKREF(i)] = TRUE
+ if(when_locked)
+ on_lock = when_locked
+ if(icon)
+ lock_icon = icon
+ if(icon_state)
+ lock_icon_state = icon_state
+ generate_lock_visuals()
+ var/mob/M = parent
+ LAZYOR(M.mousemove_intercept_objects, src)
+ START_PROCESSING(SSfastprocess, src)
+
+/datum/component/lockon_aiming/Destroy()
+ var/mob/M = parent
+ clear_visuals()
+ LAZYREMOVE(M.mousemove_intercept_objects, src)
+ STOP_PROCESSING(SSfastprocess, src)
+ return ..()
+
+/datum/component/lockon_aiming/proc/show_visuals()
+ LAZYINITLIST(lock_images)
+ var/mob/M = parent
+ if(!M.client)
+ return
+ for(var/i in locked_weakrefs)
+ var/datum/weakref/R = i
+ var/atom/A = R.resolve()
+ if(!A)
+ continue //It'll be cleared by processing.
+ var/image/I = new
+ I.appearance = lock_appearance
+ I.loc = A
+ M.client.images |= I
+ lock_images |= I
+
+/datum/component/lockon_aiming/proc/clear_visuals()
+ var/mob/M = parent
+ if(!M.client)
+ return
+ if(!lock_images)
+ return
+ for(var/i in lock_images)
+ M.client.images -= i
+ qdel(i)
+ lock_images.Cut()
+
+/datum/component/lockon_aiming/proc/refresh_visuals()
+ clear_visuals()
+ show_visuals()
+
+/datum/component/lockon_aiming/proc/generate_lock_visuals()
+ lock_appearance = mutable_appearance(icon = lock_icon, icon_state = lock_icon_state, layer = FLOAT_LAYER)
+
+/datum/component/lockon_aiming/proc/unlock_all(refresh_vis = TRUE)
+ LAZYCLEARLIST(locked_weakrefs)
+ if(refresh_vis)
+ refresh_visuals()
+
+/datum/component/lockon_aiming/proc/unlock(atom/A, refresh_vis = TRUE)
+ if(!A.weak_reference)
+ return
+ LAZYREMOVE(locked_weakrefs, A.weak_reference)
+ if(refresh_vis)
+ refresh_visuals()
+
+/datum/component/lockon_aiming/proc/lock(atom/A, refresh_vis = TRUE)
+ LAZYOR(locked_weakrefs, WEAKREF(A))
+ if(refresh_vis)
+ refresh_visuals()
+
+/datum/component/lockon_aiming/proc/add_immune_atom(atom/A)
+ var/datum/weakref/R = WEAKREF(A)
+ if(immune_weakrefs && (immune_weakrefs[R]))
+ return
+ LAZYSET(immune_weakrefs, R, TRUE)
+
+/datum/component/lockon_aiming/proc/remove_immune_atom(atom/A)
+ if(!A.weak_reference || !immune_weakrefs) //if A doesn't have a weakref how did it get on the immunity list?
+ return
+ LAZYREMOVE(immune_weakrefs, A.weak_reference)
+
+/datum/component/lockon_aiming/onMouseMove(object,location,control,params)
+ var/mob/M = parent
+ if(!istype(M) || !M.client)
+ return
+ var/datum/position/P = mouse_absolute_datum_map_position_from_client(M.client)
+ if(!P)
+ return
+ var/turf/T = P.return_turf()
+ LAZYINITLIST(last_location)
+ if(length(last_location) == 3 && last_location[1] == T.x && last_location[2] == T.y && last_location[3] == T.z)
+ return //Same turf, don't bother.
+ if(last_location)
+ last_location.Cut()
+ else
+ last_location = list()
+ last_location.len = 3
+ last_location[1] = T.x
+ last_location[2] = T.y
+ last_location[3] = T.z
+ autolock()
+
+/datum/component/lockon_aiming/process()
+ if(update_disabled)
+ return
+ if(!last_location)
+ return
+ var/changed = FALSE
+ for(var/i in locked_weakrefs)
+ var/datum/weakref/R = i
+ if(istype(R))
+ var/atom/thing = R.resolve()
+ if(!istype(thing) || (get_dist(thing, locate(last_location[1], last_location[2], last_location[3])) > lock_cursor_range))
+ unlock(R)
+ changed = TRUE
+ else
+ unlock(R)
+ changed = TRUE
+ if(changed)
+ autolock()
+
+/datum/component/lockon_aiming/proc/autolock()
+ var/mob/M = parent
+ if(!M.client)
+ return FALSE
+ var/datum/position/current = mouse_absolute_datum_map_position_from_client(M.client)
+ var/turf/target = current.return_turf()
+ var/list/atom/targets = get_nearest(target, target_typecache, lock_amount, lock_cursor_range)
+ if(targets == LOCKON_IGNORE_RESULT)
+ return
+ unlock_all(FALSE)
+ for(var/i in targets)
+ if(immune_weakrefs[WEAKREF(i)])
+ continue
+ lock(i, FALSE)
+ refresh_visuals()
+ on_lock.Invoke(locked_weakrefs)
+
+/datum/component/lockon_aiming/proc/can_target(atom/A)
+ var/mob/M = A
+ return is_type_in_typecache(A, target_typecache) && !(ismob(A) && mob_stat_check && M.stat != CONSCIOUS) && !immune_weakrefs[WEAKREF(A)]
+
+/datum/component/lockon_aiming/proc/get_nearest(turf/T, list/typecache, amount, range)
+ current_ranging_id++
+ var/this_id = current_ranging_id
+ var/list/L = list()
+ var/turf/center = get_turf(T)
+ if(amount < 1 || range < 0 || !istype(center) || !islist(typecache))
+ return
+ if(range == 0)
+ return typecache_filter_list(T.contents + T, typecache)
+ var/x = 0
+ var/y = 0
+ var/cd = 0
+ while(cd <= range)
+ x = center.x - cd + 1
+ y = center.y + cd
+ LOCKON_RANGING_BREAK_CHECK
+ for(x in x to center.x + cd)
+ T = locate(x, y, center.z)
+ if(T)
+ L |= special_list_filter(T.contents, can_target_callback)
+ if(L.len >= amount)
+ L.Cut(amount+1)
+ return L
+ LOCKON_RANGING_BREAK_CHECK
+ y = center.y + cd - 1
+ x = center.x + cd
+ for(y in center.y - cd to y)
+ T = locate(x, y, center.z)
+ if(T)
+ L |= special_list_filter(T.contents, can_target_callback)
+ if(L.len >= amount)
+ L.Cut(amount+1)
+ return L
+ LOCKON_RANGING_BREAK_CHECK
+ y = center.y - cd
+ x = center.x + cd - 1
+ for(x in center.x - cd to x)
+ T = locate(x, y, center.z)
+ if(T)
+ L |= special_list_filter(T.contents, can_target_callback)
+ if(L.len >= amount)
+ L.Cut(amount+1)
+ return L
+ LOCKON_RANGING_BREAK_CHECK
+ y = center.y - cd + 1
+ x = center.x - cd
+ for(y in y to center.y + cd)
+ T = locate(x, y, center.z)
+ if(T)
+ L |= special_list_filter(T.contents, can_target_callback)
+ if(L.len >= amount)
+ L.Cut(amount+1)
+ return L
+ LOCKON_RANGING_BREAK_CHECK
+ cd++
+ CHECK_TICK
+
+/datum/component/lockon_aiming/PostTransfer(datum/new_parent)
+ return COMPONENT_INCOMPATIBLE
diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm
index 6f4e8d586d..56301cdc8b 100644
--- a/code/datums/components/material_container.dm
+++ b/code/datums/components/material_container.dm
@@ -15,16 +15,18 @@
var/sheet_type
var/list/materials
var/show_on_examine
+ var/disable_attackby
var/list/allowed_typecache
var/last_inserted_id
var/precise_insertion = FALSE
var/datum/callback/precondition
var/datum/callback/after_insert
-/datum/component/material_container/Initialize(list/mat_list, max_amt = 0, _show_on_examine = FALSE, list/allowed_types, datum/callback/_precondition, datum/callback/_after_insert)
+/datum/component/material_container/Initialize(list/mat_list, max_amt = 0, _show_on_examine = FALSE, list/allowed_types, datum/callback/_precondition, datum/callback/_after_insert, _disable_attackby)
materials = list()
max_amount = max(0, max_amt)
show_on_examine = _show_on_examine
+ disable_attackby = _disable_attackby
if(allowed_types)
allowed_typecache = typecacheof(allowed_types)
precondition = _precondition
@@ -43,14 +45,17 @@
materials[id] = new mat_path()
/datum/component/material_container/proc/OnExamine(mob/user)
- for(var/I in materials)
- var/datum/material/M = materials[I]
- var/amt = amount(M.id)
- if(amt)
- to_chat(user, "It has [amt] units of [lowertext(M.name)] stored.")
+ if(show_on_examine)
+ for(var/I in materials)
+ var/datum/material/M = materials[I]
+ var/amt = amount(M.id)
+ if(amt)
+ to_chat(user, "It has [amt] units of [lowertext(M.name)] stored.")
/datum/component/material_container/proc/OnAttackBy(obj/item/I, mob/living/user)
var/list/tc = allowed_typecache
+ if(disable_attackby)
+ return
if(user.a_intent != INTENT_HELP)
return
if((I.flags_2 & (HOLOGRAM_2 | NO_MAT_REDEMPTION_2)) || (tc && !is_type_in_typecache(I, tc)))
diff --git a/code/datums/components/mirage_border.dm b/code/datums/components/mirage_border.dm
index 41b22b231c..f91c5c8965 100644
--- a/code/datums/components/mirage_border.dm
+++ b/code/datums/components/mirage_border.dm
@@ -27,10 +27,13 @@
QDEL_NULL(holder)
return ..()
-/datum/component/mirage_border/OnTransfer(atom/thing)
- if(!isturf(thing))
+/datum/component/mirage_border/PreTransfer()
+ holder.moveToNullspace()
+
+/datum/component/mirage_border/PostTransfer()
+ if(!isturf(parent))
return COMPONENT_INCOMPATIBLE
- holder.forceMove(thing)
+ holder.forceMove(parent)
/obj/effect/abstract/mirage_holder
name = "Mirage holder"
diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm
index 95f8f65bb6..8714b41f05 100644
--- a/code/datums/components/mood.dm
+++ b/code/datums/components/mood.dm
@@ -10,8 +10,7 @@
/datum/component/mood/Initialize()
if(!isliving(parent))
- . = COMPONENT_INCOMPATIBLE
- CRASH("Some good for nothing loser put a mood component on something that isn't even a living mob.")
+ return COMPONENT_INCOMPATIBLE
START_PROCESSING(SSmood, src)
owner = parent
soundloop = new(list(owner), FALSE, TRUE)
diff --git a/code/datums/components/ntnet_interface.dm b/code/datums/components/ntnet_interface.dm
index f06e89b49d..14462f2774 100644
--- a/code/datums/components/ntnet_interface.dm
+++ b/code/datums/components/ntnet_interface.dm
@@ -2,6 +2,9 @@
/datum/proc/ntnet_recieve(datum/netdata/data)
return
+/datum/proc/ntnet_recieve_broadcast(datum/netdata/data)
+ return
+
/datum/proc/ntnet_send(datum/netdata/data, netid)
GET_COMPONENT(NIC, /datum/component/ntnet_interface)
if(!NIC)
@@ -9,14 +12,17 @@
return NIC.__network_send(data, netid)
/datum/component/ntnet_interface
- var/hardware_id //text
+ var/hardware_id //text. this is the true ID. do not change this. stuff like ID forgery can be done manually.
var/network_name = "" //text
var/list/networks_connected_by_id = list() //id = datum/ntnet
+ var/differentiate_broadcast = TRUE //If false, broadcasts go to ntnet_recieve. NOT RECOMMENDED.
/datum/component/ntnet_interface/Initialize(force_name = "NTNet Device", autoconnect_station_network = TRUE) //Don't force ID unless you know what you're doing!
hardware_id = "[SSnetworks.get_next_HID()]"
network_name = force_name
- SSnetworks.register_interface(src)
+ if(!SSnetworks.register_interface(src))
+ . = COMPONENT_INCOMPATIBLE
+ CRASH("Unable to register NTNet interface. Interface deleted.")
if(autoconnect_station_network)
register_connection(SSnetworks.station_network)
@@ -27,7 +33,10 @@
/datum/component/ntnet_interface/proc/__network_recieve(datum/netdata/data) //Do not directly proccall!
parent.SendSignal(COMSIG_COMPONENT_NTNET_RECIEVE, data)
- parent.ntnet_recieve(data)
+ if(differentiate_broadcast && data.broadcast)
+ parent.ntnet_recieve_broadcast(data)
+ else
+ parent.ntnet_recieve(data)
/datum/component/ntnet_interface/proc/__network_send(datum/netdata/data, netid) //Do not directly proccall!
// Process data before sending it
diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm
index e21db3e094..3701be2ae9 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -1,326 +1,325 @@
-/datum/component/riding
- var/next_vehicle_move = 0 //used for move delays
- var/vehicle_move_delay = 2 //tick delay between movements, lower = faster, higher = slower
- var/keytype
-
- var/slowed = FALSE
- var/slowvalue = 1
-
- var/list/riding_offsets = list() //position_of_user = list(dir = list(px, py)), or RIDING_OFFSET_ALL for a generic one.
- var/list/directional_vehicle_layers = list() //["[DIRECTION]"] = layer. Don't set it for a direction for default, set a direction to null for no change.
- var/list/directional_vehicle_offsets = list() //same as above but instead of layer you have a list(px, py)
- var/list/allowed_turf_typecache
- var/list/forbid_turf_typecache //allow typecache for only certain turfs, forbid to allow all but those. allow only certain turfs will take precedence.
- var/allow_one_away_from_valid_turf = TRUE //allow moving one tile away from a valid turf but not more.
- var/override_allow_spacemove = FALSE
- var/drive_verb = "drive"
- var/ride_check_rider_incapacitated = FALSE
- var/ride_check_rider_restrained = FALSE
- var/ride_check_ridden_incapacitated = FALSE
-
-/datum/component/riding/Initialize()
- if(!ismovableatom(parent))
- . = COMPONENT_INCOMPATIBLE
- CRASH("RIDING COMPONENT ASSIGNED TO NON ATOM MOVABLE!")
- RegisterSignal(COMSIG_MOVABLE_BUCKLE, .proc/vehicle_mob_buckle)
- RegisterSignal(COMSIG_MOVABLE_UNBUCKLE, .proc/vehicle_mob_unbuckle)
- RegisterSignal(COMSIG_MOVABLE_MOVED, .proc/vehicle_moved)
-
-/datum/component/riding/proc/vehicle_mob_unbuckle(mob/living/M, force = FALSE)
- restore_position(M)
- unequip_buckle_inhands(M)
-
-/datum/component/riding/proc/vehicle_mob_buckle(mob/living/M, force = FALSE)
- handle_vehicle_offsets()
-
-/datum/component/riding/proc/handle_vehicle_layer()
- var/atom/movable/AM = parent
- var/static/list/defaults = list(TEXT_NORTH = OBJ_LAYER, TEXT_SOUTH = ABOVE_MOB_LAYER, TEXT_EAST = ABOVE_MOB_LAYER, TEXT_WEST = ABOVE_MOB_LAYER)
- . = defaults["[AM.dir]"]
- if(directional_vehicle_layers["[AM.dir]"])
- . = directional_vehicle_layers["[AM.dir]"]
- if(isnull(.)) //you can set it to null to not change it.
- . = AM.layer
- AM.layer = .
-
-/datum/component/riding/proc/set_vehicle_dir_layer(dir, layer)
- directional_vehicle_layers["[dir]"] = layer
-
-/datum/component/riding/proc/vehicle_moved()
- var/atom/movable/AM = parent
- for(var/i in AM.buckled_mobs)
- ride_check(i)
- handle_vehicle_offsets()
- handle_vehicle_layer()
-
-/datum/component/riding/proc/ride_check(mob/living/M)
- var/atom/movable/AM = parent
- var/mob/AMM = AM
- if((ride_check_rider_restrained && M.restrained(TRUE)) || (ride_check_rider_incapacitated && M.incapacitated(FALSE, TRUE)) || (ride_check_ridden_incapacitated && istype(AMM) && AMM.incapacitated(FALSE, TRUE)))
- AM.visible_message("[M] falls off of [AM]!")
- AM.unbuckle_mob(M)
- return TRUE
-
-/datum/component/riding/proc/force_dismount(mob/living/M)
- var/atom/movable/AM = parent
- AM.unbuckle_mob(M)
-
-/datum/component/riding/proc/handle_vehicle_offsets()
- var/atom/movable/AM = parent
- var/AM_dir = "[AM.dir]"
- var/passindex = 0
- if(AM.has_buckled_mobs())
- for(var/m in AM.buckled_mobs)
- passindex++
- var/mob/living/buckled_mob = m
- var/list/offsets = get_offsets(passindex)
- var/rider_dir = get_rider_dir(passindex)
- buckled_mob.setDir(rider_dir)
- dir_loop:
- for(var/offsetdir in offsets)
- if(offsetdir == AM_dir)
- var/list/diroffsets = offsets[offsetdir]
- buckled_mob.pixel_x = diroffsets[1]
- if(diroffsets.len >= 2)
- buckled_mob.pixel_y = diroffsets[2]
- if(diroffsets.len == 3)
- buckled_mob.layer = diroffsets[3]
- break dir_loop
- var/list/static/default_vehicle_pixel_offsets = list(TEXT_NORTH = list(0, 0), TEXT_SOUTH = list(0, 0), TEXT_EAST = list(0, 0), TEXT_WEST = list(0, 0))
- var/px = default_vehicle_pixel_offsets[AM_dir]
- var/py = default_vehicle_pixel_offsets[AM_dir]
- if(directional_vehicle_offsets[AM_dir])
- if(isnull(directional_vehicle_offsets[AM_dir]))
- px = AM.pixel_x
- py = AM.pixel_y
- else
- px = directional_vehicle_offsets[AM_dir][1]
- py = directional_vehicle_offsets[AM_dir][2]
- AM.pixel_x = px
- AM.pixel_y = py
-
-/datum/component/riding/proc/set_vehicle_dir_offsets(dir, x, y)
- directional_vehicle_offsets["[dir]"] = list(x, y)
-
-//Override this to set your vehicle's various pixel offsets
-/datum/component/riding/proc/get_offsets(pass_index) // list(dir = x, y, layer)
- . = list(TEXT_NORTH = list(0, 0), TEXT_SOUTH = list(0, 0), TEXT_EAST = list(0, 0), TEXT_WEST = list(0, 0))
- if(riding_offsets["[pass_index]"])
- . = riding_offsets["[pass_index]"]
- else if(riding_offsets["[RIDING_OFFSET_ALL]"])
- . = riding_offsets["[RIDING_OFFSET_ALL]"]
-
-/datum/component/riding/proc/set_riding_offsets(index, list/offsets)
- if(!islist(offsets))
- return FALSE
- riding_offsets["[index]"] = offsets
-
-//Override this to set the passengers/riders dir based on which passenger they are.
-//ie: rider facing the vehicle's dir, but passenger 2 facing backwards, etc.
-/datum/component/riding/proc/get_rider_dir(pass_index)
- var/atom/movable/AM = parent
- return AM.dir
-
-//KEYS
-/datum/component/riding/proc/keycheck(mob/user)
- return !keytype || user.is_holding_item_of_type(keytype)
-
-//BUCKLE HOOKS
-/datum/component/riding/proc/restore_position(mob/living/buckled_mob)
- if(buckled_mob)
- buckled_mob.pixel_x = 0
- buckled_mob.pixel_y = 0
- if(buckled_mob.client)
- buckled_mob.client.change_view(CONFIG_GET(string/default_view))
-
-//MOVEMENT
-/datum/component/riding/proc/turf_check(turf/next, turf/current)
- if(allowed_turf_typecache && !allowed_turf_typecache[next.type])
- return (allow_one_away_from_valid_turf && allowed_turf_typecache[current.type])
- else if(forbid_turf_typecache && forbid_turf_typecache[next.type])
- return (allow_one_away_from_valid_turf && !forbid_turf_typecache[current.type])
- return TRUE
-
-/datum/component/riding/proc/handle_ride(mob/user, direction)
- var/atom/movable/AM = parent
- if(user.incapacitated())
- Unbuckle(user)
- return
-
- if(world.time < next_vehicle_move)
- return
- next_vehicle_move = world.time + vehicle_move_delay
-
- if(keycheck(user))
- var/turf/next = get_step(AM, direction)
- var/turf/current = get_turf(AM)
- if(!istype(next) || !istype(current))
- return //not happening.
- if(!turf_check(next, current))
- to_chat(user, "Your \the [AM] can not go onto [next]!")
- return
- if(!Process_Spacemove(direction) || !isturf(AM.loc))
- return
- step(AM, direction)
-
- handle_vehicle_layer()
- handle_vehicle_offsets()
- else
- to_chat(user, "You'll need the keys in one of your hands to [drive_verb] [AM].")
-
-/datum/component/riding/proc/Unbuckle(atom/movable/M)
- addtimer(CALLBACK(parent, /atom/movable/.proc/unbuckle_mob, M), 0, TIMER_UNIQUE)
-
-/datum/component/riding/proc/Process_Spacemove(direction)
- var/atom/movable/AM = parent
- return override_allow_spacemove || AM.has_gravity()
-
-/datum/component/riding/proc/account_limbs(mob/living/M)
- if(M.get_num_legs() < 2 && !slowed)
- vehicle_move_delay = vehicle_move_delay + slowvalue
- slowed = TRUE
- else if(slowed)
- vehicle_move_delay = vehicle_move_delay - slowvalue
- slowed = FALSE
-
-///////Yes, I said humans. No, this won't end well...//////////
-/datum/component/riding/human
-
-/datum/component/riding/human/Initialize()
- . = ..()
- RegisterSignal(COMSIG_HUMAN_MELEE_UNARMED_ATTACK, .proc/on_host_unarmed_melee)
-
-/datum/component/riding/human/proc/on_host_unarmed_melee(atom/target)
- var/mob/living/carbon/human/AM = parent
- if(AM.a_intent == INTENT_DISARM && (target in AM.buckled_mobs))
- force_dismount(target)
-
-/datum/component/riding/human/handle_vehicle_layer()
- var/atom/movable/AM = parent
- if(AM.buckled_mobs && AM.buckled_mobs.len)
- if(AM.dir == SOUTH)
- AM.layer = ABOVE_MOB_LAYER
- else
- AM.layer = OBJ_LAYER
- else
- AM.layer = MOB_LAYER
-
-/datum/component/riding/human/force_dismount(mob/living/user)
- var/atom/movable/AM = parent
- AM.unbuckle_mob(user)
- user.Knockdown(60)
- user.visible_message("[AM] pushes [user] off of them!")
-
-/datum/component/riding/cyborg
-
-/datum/component/riding/cyborg/ride_check(mob/user)
- var/atom/movable/AM = parent
- if(user.incapacitated())
- var/kick = TRUE
- if(iscyborg(AM))
- var/mob/living/silicon/robot/R = AM
- if(R.module && R.module.ride_allow_incapacitated)
- kick = FALSE
- if(kick)
- to_chat(user, "You fall off of [AM]!")
- Unbuckle(user)
- return
- if(iscarbon(user))
- var/mob/living/carbon/carbonuser = user
- if(!carbonuser.get_num_arms())
- Unbuckle(user)
- to_chat(user, "You can't grab onto [AM] with no hands!")
- return
-
-/datum/component/riding/cyborg/handle_vehicle_layer()
- var/atom/movable/AM = parent
- if(AM.buckled_mobs && AM.buckled_mobs.len)
- if(AM.dir == SOUTH)
- AM.layer = ABOVE_MOB_LAYER
- else
- AM.layer = OBJ_LAYER
- else
- AM.layer = MOB_LAYER
-
-/datum/component/riding/cyborg/get_offsets(pass_index) // list(dir = x, y, layer)
- return list(TEXT_NORTH = list(0, 4), TEXT_SOUTH = list(0, 4), TEXT_EAST = list(-6, 3), TEXT_WEST = list( 6, 3))
-
-/datum/component/riding/cyborg/handle_vehicle_offsets()
- var/atom/movable/AM = parent
- if(AM.has_buckled_mobs())
- for(var/mob/living/M in AM.buckled_mobs)
- M.setDir(AM.dir)
- if(iscyborg(AM))
- var/mob/living/silicon/robot/R = AM
- if(istype(R.module))
- M.pixel_x = R.module.ride_offset_x[dir2text(AM.dir)]
- M.pixel_y = R.module.ride_offset_y[dir2text(AM.dir)]
- else
- ..()
-
-/datum/component/riding/cyborg/force_dismount(mob/living/M)
- var/atom/movable/AM = parent
- AM.unbuckle_mob(M)
- var/turf/target = get_edge_target_turf(AM, AM.dir)
- var/turf/targetm = get_step(get_turf(AM), AM.dir)
- M.Move(targetm)
- M.visible_message("[M] is thrown clear of [AM]!")
- M.throw_at(target, 14, 5, AM)
- M.Knockdown(60)
-
-/datum/component/riding/proc/equip_buckle_inhands(mob/living/carbon/human/user, amount_required = 1)
- var/atom/movable/AM = parent
- var/amount_equipped = 0
- for(var/amount_needed = amount_required, amount_needed > 0, amount_needed--)
- var/obj/item/riding_offhand/inhand = new /obj/item/riding_offhand(user)
- inhand.rider = user
- inhand.parent = AM
- if(user.put_in_hands(inhand, TRUE))
- amount_equipped++
- else
- break
- if(amount_equipped >= amount_required)
- return TRUE
- else
- unequip_buckle_inhands(user)
- return FALSE
-
-/datum/component/riding/proc/unequip_buckle_inhands(mob/living/carbon/user)
- var/atom/movable/AM = parent
- for(var/obj/item/riding_offhand/O in user.contents)
- if(O.parent != AM)
- CRASH("RIDING OFFHAND ON WRONG MOB")
- continue
- if(O.selfdeleting)
- continue
- else
- qdel(O)
- return TRUE
-
-/obj/item/riding_offhand
- name = "offhand"
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "offhand"
- w_class = WEIGHT_CLASS_HUGE
- flags_1 = ABSTRACT_1 | DROPDEL_1 | NOBLUDGEON_1
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
- var/mob/living/carbon/rider
- var/mob/living/parent
- var/selfdeleting = FALSE
-
-/obj/item/riding_offhand/dropped()
- selfdeleting = TRUE
- . = ..()
-
-/obj/item/riding_offhand/equipped()
- if(loc != rider)
- selfdeleting = TRUE
- qdel(src)
- . = ..()
-
-/obj/item/riding_offhand/Destroy()
- var/atom/movable/AM = parent
- if(selfdeleting)
- if(rider in AM.buckled_mobs)
- AM.unbuckle_mob(rider)
- . = ..()
+/datum/component/riding
+ var/next_vehicle_move = 0 //used for move delays
+ var/vehicle_move_delay = 2 //tick delay between movements, lower = faster, higher = slower
+ var/keytype
+
+ var/slowed = FALSE
+ var/slowvalue = 1
+
+ var/list/riding_offsets = list() //position_of_user = list(dir = list(px, py)), or RIDING_OFFSET_ALL for a generic one.
+ var/list/directional_vehicle_layers = list() //["[DIRECTION]"] = layer. Don't set it for a direction for default, set a direction to null for no change.
+ var/list/directional_vehicle_offsets = list() //same as above but instead of layer you have a list(px, py)
+ var/list/allowed_turf_typecache
+ var/list/forbid_turf_typecache //allow typecache for only certain turfs, forbid to allow all but those. allow only certain turfs will take precedence.
+ var/allow_one_away_from_valid_turf = TRUE //allow moving one tile away from a valid turf but not more.
+ var/override_allow_spacemove = FALSE
+ var/drive_verb = "drive"
+ var/ride_check_rider_incapacitated = FALSE
+ var/ride_check_rider_restrained = FALSE
+ var/ride_check_ridden_incapacitated = FALSE
+
+/datum/component/riding/Initialize()
+ if(!ismovableatom(parent))
+ return COMPONENT_INCOMPATIBLE
+ RegisterSignal(COMSIG_MOVABLE_BUCKLE, .proc/vehicle_mob_buckle)
+ RegisterSignal(COMSIG_MOVABLE_UNBUCKLE, .proc/vehicle_mob_unbuckle)
+ RegisterSignal(COMSIG_MOVABLE_MOVED, .proc/vehicle_moved)
+
+/datum/component/riding/proc/vehicle_mob_unbuckle(mob/living/M, force = FALSE)
+ restore_position(M)
+ unequip_buckle_inhands(M)
+
+/datum/component/riding/proc/vehicle_mob_buckle(mob/living/M, force = FALSE)
+ handle_vehicle_offsets()
+
+/datum/component/riding/proc/handle_vehicle_layer()
+ var/atom/movable/AM = parent
+ var/static/list/defaults = list(TEXT_NORTH = OBJ_LAYER, TEXT_SOUTH = ABOVE_MOB_LAYER, TEXT_EAST = ABOVE_MOB_LAYER, TEXT_WEST = ABOVE_MOB_LAYER)
+ . = defaults["[AM.dir]"]
+ if(directional_vehicle_layers["[AM.dir]"])
+ . = directional_vehicle_layers["[AM.dir]"]
+ if(isnull(.)) //you can set it to null to not change it.
+ . = AM.layer
+ AM.layer = .
+
+/datum/component/riding/proc/set_vehicle_dir_layer(dir, layer)
+ directional_vehicle_layers["[dir]"] = layer
+
+/datum/component/riding/proc/vehicle_moved()
+ var/atom/movable/AM = parent
+ for(var/i in AM.buckled_mobs)
+ ride_check(i)
+ handle_vehicle_offsets()
+ handle_vehicle_layer()
+
+/datum/component/riding/proc/ride_check(mob/living/M)
+ var/atom/movable/AM = parent
+ var/mob/AMM = AM
+ if((ride_check_rider_restrained && M.restrained(TRUE)) || (ride_check_rider_incapacitated && M.incapacitated(FALSE, TRUE)) || (ride_check_ridden_incapacitated && istype(AMM) && AMM.incapacitated(FALSE, TRUE)))
+ AM.visible_message("[M] falls off of [AM]!")
+ AM.unbuckle_mob(M)
+ return TRUE
+
+/datum/component/riding/proc/force_dismount(mob/living/M)
+ var/atom/movable/AM = parent
+ AM.unbuckle_mob(M)
+
+/datum/component/riding/proc/handle_vehicle_offsets()
+ var/atom/movable/AM = parent
+ var/AM_dir = "[AM.dir]"
+ var/passindex = 0
+ if(AM.has_buckled_mobs())
+ for(var/m in AM.buckled_mobs)
+ passindex++
+ var/mob/living/buckled_mob = m
+ var/list/offsets = get_offsets(passindex)
+ var/rider_dir = get_rider_dir(passindex)
+ buckled_mob.setDir(rider_dir)
+ dir_loop:
+ for(var/offsetdir in offsets)
+ if(offsetdir == AM_dir)
+ var/list/diroffsets = offsets[offsetdir]
+ buckled_mob.pixel_x = diroffsets[1]
+ if(diroffsets.len >= 2)
+ buckled_mob.pixel_y = diroffsets[2]
+ if(diroffsets.len == 3)
+ buckled_mob.layer = diroffsets[3]
+ break dir_loop
+ var/list/static/default_vehicle_pixel_offsets = list(TEXT_NORTH = list(0, 0), TEXT_SOUTH = list(0, 0), TEXT_EAST = list(0, 0), TEXT_WEST = list(0, 0))
+ var/px = default_vehicle_pixel_offsets[AM_dir]
+ var/py = default_vehicle_pixel_offsets[AM_dir]
+ if(directional_vehicle_offsets[AM_dir])
+ if(isnull(directional_vehicle_offsets[AM_dir]))
+ px = AM.pixel_x
+ py = AM.pixel_y
+ else
+ px = directional_vehicle_offsets[AM_dir][1]
+ py = directional_vehicle_offsets[AM_dir][2]
+ AM.pixel_x = px
+ AM.pixel_y = py
+
+/datum/component/riding/proc/set_vehicle_dir_offsets(dir, x, y)
+ directional_vehicle_offsets["[dir]"] = list(x, y)
+
+//Override this to set your vehicle's various pixel offsets
+/datum/component/riding/proc/get_offsets(pass_index) // list(dir = x, y, layer)
+ . = list(TEXT_NORTH = list(0, 0), TEXT_SOUTH = list(0, 0), TEXT_EAST = list(0, 0), TEXT_WEST = list(0, 0))
+ if(riding_offsets["[pass_index]"])
+ . = riding_offsets["[pass_index]"]
+ else if(riding_offsets["[RIDING_OFFSET_ALL]"])
+ . = riding_offsets["[RIDING_OFFSET_ALL]"]
+
+/datum/component/riding/proc/set_riding_offsets(index, list/offsets)
+ if(!islist(offsets))
+ return FALSE
+ riding_offsets["[index]"] = offsets
+
+//Override this to set the passengers/riders dir based on which passenger they are.
+//ie: rider facing the vehicle's dir, but passenger 2 facing backwards, etc.
+/datum/component/riding/proc/get_rider_dir(pass_index)
+ var/atom/movable/AM = parent
+ return AM.dir
+
+//KEYS
+/datum/component/riding/proc/keycheck(mob/user)
+ return !keytype || user.is_holding_item_of_type(keytype)
+
+//BUCKLE HOOKS
+/datum/component/riding/proc/restore_position(mob/living/buckled_mob)
+ if(buckled_mob)
+ buckled_mob.pixel_x = 0
+ buckled_mob.pixel_y = 0
+ if(buckled_mob.client)
+ buckled_mob.client.change_view(CONFIG_GET(string/default_view))
+
+//MOVEMENT
+/datum/component/riding/proc/turf_check(turf/next, turf/current)
+ if(allowed_turf_typecache && !allowed_turf_typecache[next.type])
+ return (allow_one_away_from_valid_turf && allowed_turf_typecache[current.type])
+ else if(forbid_turf_typecache && forbid_turf_typecache[next.type])
+ return (allow_one_away_from_valid_turf && !forbid_turf_typecache[current.type])
+ return TRUE
+
+/datum/component/riding/proc/handle_ride(mob/user, direction)
+ var/atom/movable/AM = parent
+ if(user.incapacitated())
+ Unbuckle(user)
+ return
+
+ if(world.time < next_vehicle_move)
+ return
+ next_vehicle_move = world.time + vehicle_move_delay
+
+ if(keycheck(user))
+ var/turf/next = get_step(AM, direction)
+ var/turf/current = get_turf(AM)
+ if(!istype(next) || !istype(current))
+ return //not happening.
+ if(!turf_check(next, current))
+ to_chat(user, "Your \the [AM] can not go onto [next]!")
+ return
+ if(!Process_Spacemove(direction) || !isturf(AM.loc))
+ return
+ step(AM, direction)
+
+ handle_vehicle_layer()
+ handle_vehicle_offsets()
+ else
+ to_chat(user, "You'll need the keys in one of your hands to [drive_verb] [AM].")
+
+/datum/component/riding/proc/Unbuckle(atom/movable/M)
+ addtimer(CALLBACK(parent, /atom/movable/.proc/unbuckle_mob, M), 0, TIMER_UNIQUE)
+
+/datum/component/riding/proc/Process_Spacemove(direction)
+ var/atom/movable/AM = parent
+ return override_allow_spacemove || AM.has_gravity()
+
+/datum/component/riding/proc/account_limbs(mob/living/M)
+ if(M.get_num_legs() < 2 && !slowed)
+ vehicle_move_delay = vehicle_move_delay + slowvalue
+ slowed = TRUE
+ else if(slowed)
+ vehicle_move_delay = vehicle_move_delay - slowvalue
+ slowed = FALSE
+
+///////Yes, I said humans. No, this won't end well...//////////
+/datum/component/riding/human
+
+/datum/component/riding/human/Initialize()
+ . = ..()
+ RegisterSignal(COMSIG_HUMAN_MELEE_UNARMED_ATTACK, .proc/on_host_unarmed_melee)
+
+/datum/component/riding/human/proc/on_host_unarmed_melee(atom/target)
+ var/mob/living/carbon/human/AM = parent
+ if(AM.a_intent == INTENT_DISARM && (target in AM.buckled_mobs))
+ force_dismount(target)
+
+/datum/component/riding/human/handle_vehicle_layer()
+ var/atom/movable/AM = parent
+ if(AM.buckled_mobs && AM.buckled_mobs.len)
+ if(AM.dir == SOUTH)
+ AM.layer = ABOVE_MOB_LAYER
+ else
+ AM.layer = OBJ_LAYER
+ else
+ AM.layer = MOB_LAYER
+
+/datum/component/riding/human/force_dismount(mob/living/user)
+ var/atom/movable/AM = parent
+ AM.unbuckle_mob(user)
+ user.Knockdown(60)
+ user.visible_message("[AM] pushes [user] off of them!")
+
+/datum/component/riding/cyborg
+
+/datum/component/riding/cyborg/ride_check(mob/user)
+ var/atom/movable/AM = parent
+ if(user.incapacitated())
+ var/kick = TRUE
+ if(iscyborg(AM))
+ var/mob/living/silicon/robot/R = AM
+ if(R.module && R.module.ride_allow_incapacitated)
+ kick = FALSE
+ if(kick)
+ to_chat(user, "You fall off of [AM]!")
+ Unbuckle(user)
+ return
+ if(iscarbon(user))
+ var/mob/living/carbon/carbonuser = user
+ if(!carbonuser.get_num_arms())
+ Unbuckle(user)
+ to_chat(user, "You can't grab onto [AM] with no hands!")
+ return
+
+/datum/component/riding/cyborg/handle_vehicle_layer()
+ var/atom/movable/AM = parent
+ if(AM.buckled_mobs && AM.buckled_mobs.len)
+ if(AM.dir == SOUTH)
+ AM.layer = ABOVE_MOB_LAYER
+ else
+ AM.layer = OBJ_LAYER
+ else
+ AM.layer = MOB_LAYER
+
+/datum/component/riding/cyborg/get_offsets(pass_index) // list(dir = x, y, layer)
+ return list(TEXT_NORTH = list(0, 4), TEXT_SOUTH = list(0, 4), TEXT_EAST = list(-6, 3), TEXT_WEST = list( 6, 3))
+
+/datum/component/riding/cyborg/handle_vehicle_offsets()
+ var/atom/movable/AM = parent
+ if(AM.has_buckled_mobs())
+ for(var/mob/living/M in AM.buckled_mobs)
+ M.setDir(AM.dir)
+ if(iscyborg(AM))
+ var/mob/living/silicon/robot/R = AM
+ if(istype(R.module))
+ M.pixel_x = R.module.ride_offset_x[dir2text(AM.dir)]
+ M.pixel_y = R.module.ride_offset_y[dir2text(AM.dir)]
+ else
+ ..()
+
+/datum/component/riding/cyborg/force_dismount(mob/living/M)
+ var/atom/movable/AM = parent
+ AM.unbuckle_mob(M)
+ var/turf/target = get_edge_target_turf(AM, AM.dir)
+ var/turf/targetm = get_step(get_turf(AM), AM.dir)
+ M.Move(targetm)
+ M.visible_message("[M] is thrown clear of [AM]!")
+ M.throw_at(target, 14, 5, AM)
+ M.Knockdown(60)
+
+/datum/component/riding/proc/equip_buckle_inhands(mob/living/carbon/human/user, amount_required = 1)
+ var/atom/movable/AM = parent
+ var/amount_equipped = 0
+ for(var/amount_needed = amount_required, amount_needed > 0, amount_needed--)
+ var/obj/item/riding_offhand/inhand = new /obj/item/riding_offhand(user)
+ inhand.rider = user
+ inhand.parent = AM
+ if(user.put_in_hands(inhand, TRUE))
+ amount_equipped++
+ else
+ break
+ if(amount_equipped >= amount_required)
+ return TRUE
+ else
+ unequip_buckle_inhands(user)
+ return FALSE
+
+/datum/component/riding/proc/unequip_buckle_inhands(mob/living/carbon/user)
+ var/atom/movable/AM = parent
+ for(var/obj/item/riding_offhand/O in user.contents)
+ if(O.parent != AM)
+ CRASH("RIDING OFFHAND ON WRONG MOB")
+ continue
+ if(O.selfdeleting)
+ continue
+ else
+ qdel(O)
+ return TRUE
+
+/obj/item/riding_offhand
+ name = "offhand"
+ icon = 'icons/obj/items_and_weapons.dmi'
+ icon_state = "offhand"
+ w_class = WEIGHT_CLASS_HUGE
+ flags_1 = ABSTRACT_1 | DROPDEL_1 | NOBLUDGEON_1
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+ var/mob/living/carbon/rider
+ var/mob/living/parent
+ var/selfdeleting = FALSE
+
+/obj/item/riding_offhand/dropped()
+ selfdeleting = TRUE
+ . = ..()
+
+/obj/item/riding_offhand/equipped()
+ if(loc != rider)
+ selfdeleting = TRUE
+ qdel(src)
+ . = ..()
+
+/obj/item/riding_offhand/Destroy()
+ var/atom/movable/AM = parent
+ if(selfdeleting)
+ if(rider in AM.buckled_mobs)
+ AM.unbuckle_mob(rider)
+ . = ..()
diff --git a/code/datums/components/signal_redirect.dm b/code/datums/components/signal_redirect.dm
index 38372dd356..8828c03c2d 100644
--- a/code/datums/components/signal_redirect.dm
+++ b/code/datums/components/signal_redirect.dm
@@ -1,9 +1,13 @@
/datum/component/redirect
dupe_mode = COMPONENT_DUPE_ALLOWED
-/datum/component/redirect/Initialize(list/signals, datum/callback/_callback)
+/datum/component/redirect/Initialize(list/signals, datum/callback/_callback, flags=NONE)
//It's not our job to verify the right signals are registered here, just do it.
if(!LAZYLEN(signals) || !istype(_callback))
- . = COMPONENT_INCOMPATIBLE
- CRASH("A redirection component was initialized with incorrect args.")
+ return COMPONENT_INCOMPATIBLE
+ if(flags & REDIRECT_TRANSFER_WITH_TURF && isturf(parent))
+ RegisterSignal(COMSIG_TURF_CHANGE, .proc/turf_change)
RegisterSignal(signals, _callback)
+
+/datum/component/redirect/proc/turf_change(path, new_baseturfs, flags, list/transfers)
+ transfers += src
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/stationloving.dm b/code/datums/components/stationloving.dm
new file mode 100644
index 0000000000..54f8b107e0
--- /dev/null
+++ b/code/datums/components/stationloving.dm
@@ -0,0 +1,77 @@
+/datum/component/stationloving
+ dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
+ var/inform_admins = FALSE
+ var/disallow_soul_imbue = TRUE
+
+/datum/component/stationloving/Initialize(inform_admins = FALSE)
+ if(!ismovableatom(parent))
+ return COMPONENT_INCOMPATIBLE
+ RegisterSignal(list(COMSIG_MOVABLE_Z_CHANGED), .proc/check_in_bounds)
+ RegisterSignal(list(COMSIG_PARENT_PREQDELETED), .proc/check_deletion)
+ RegisterSignal(list(COMSIG_ITEM_IMBUE_SOUL), .proc/check_soul_imbue)
+ src.inform_admins = inform_admins
+ check_in_bounds() // Just in case something is being created outside of station/centcom
+
+/datum/component/stationloving/InheritComponent(datum/component/stationloving/newc, original, list/arguments)
+ if (original)
+ if (istype(newc))
+ inform_admins = newc.inform_admins
+ else if (LAZYLEN(arguments))
+ inform_admins = arguments[1]
+
+/datum/component/stationloving/proc/relocate()
+ var/targetturf = find_safe_turf()
+ if(!targetturf)
+ if(GLOB.blobstart.len > 0)
+ targetturf = get_turf(pick(GLOB.blobstart))
+ else
+ CRASH("Unable to find a blobstart landmark")
+
+ var/atom/movable/AM = parent
+ AM.forceMove(targetturf)
+ // move the disc, so ghosts remain orbiting it even if it's "destroyed"
+ return targetturf
+
+/datum/component/stationloving/proc/check_in_bounds()
+ if(in_bounds())
+ return
+ else
+ var/turf/currentturf = get_turf(src)
+ to_chat(get(parent, /mob), "You can't help but feel that you just lost something back there...")
+ var/turf/targetturf = relocate()
+ log_game("[parent] has been moved out of bounds in [COORD(currentturf)]. Moving it to [COORD(targetturf)].")
+ if(inform_admins)
+ message_admins("[parent] has been moved out of bounds in [ADMIN_COORDJMP(currentturf)]. Moving it to [ADMIN_COORDJMP(targetturf)].")
+
+/datum/component/stationloving/proc/check_soul_imbue()
+ return disallow_soul_imbue
+
+/datum/component/stationloving/proc/in_bounds()
+ var/static/list/allowed_shuttles = typecacheof(list(/area/shuttle/syndicate, /area/shuttle/escape, /area/shuttle/pod_1, /area/shuttle/pod_2, /area/shuttle/pod_3, /area/shuttle/pod_4))
+ var/turf/T = get_turf(parent)
+ if (!T)
+ return FALSE
+ if (is_station_level(T.z) || is_centcom_level(T.z))
+ return TRUE
+ if (is_transit_level(T.z))
+ var/area/A = T.loc
+ if (is_type_in_typecache(A, allowed_shuttles))
+ return TRUE
+
+ return FALSE
+
+/datum/component/stationloving/proc/check_deletion(force) // TRUE = interrupt deletion, FALSE = proceed with deletion
+
+ var/turf/T = get_turf(parent)
+
+ if(inform_admins && force)
+ message_admins("[parent] has been !!force deleted!! in [ADMIN_COORDJMP(T)].")
+ log_game("[parent] has been !!force deleted!! in [COORD(T)].")
+
+ if(!force)
+ var/turf/targetturf = relocate()
+ log_game("[parent] has been destroyed in [COORD(T)]. Moving it to [COORD(targetturf)].")
+ if(inform_admins)
+ message_admins("[parent] has been destroyed in [ADMIN_COORDJMP(T)]. Moving it to [ADMIN_COORDJMP(targetturf)].")
+ return TRUE
+ return FALSE
diff --git a/code/datums/components/storage/concrete/_concrete.dm b/code/datums/components/storage/concrete/_concrete.dm
index 54b3fa031e..8701252fe6 100644
--- a/code/datums/components/storage/concrete/_concrete.dm
+++ b/code/datums/components/storage/concrete/_concrete.dm
@@ -1,185 +1,198 @@
-
-// External storage-related logic:
-// /mob/proc/ClickOn() in /_onclick/click.dm - clicking items in storages
-// /mob/living/Move() in /modules/mob/living/living.dm - hiding storage boxes on mob movement
-
-/datum/component/storage/concrete
- var/drop_all_on_deconstruct = TRUE
- var/drop_all_on_destroy = FALSE
- var/transfer_contents_on_component_transfer = FALSE
- var/list/datum/component/storage/slaves = list()
-
-/datum/component/storage/concrete/Initialize()
- . = ..()
- RegisterSignal(COMSIG_ATOM_CONTENTS_DEL, .proc/on_contents_del)
- RegisterSignal(COMSIG_OBJ_DECONSTRUCT, .proc/on_deconstruct)
-
-/datum/component/storage/concrete/Destroy()
- var/atom/real_location = real_location()
- for(var/atom/_A in real_location)
- _A.mouse_opacity = initial(_A.mouse_opacity)
- if(drop_all_on_destroy)
- do_quick_empty()
- for(var/i in slaves)
- var/datum/component/storage/slave = i
- slave.change_master(null)
- return ..()
-
-/datum/component/storage/concrete/master()
- return src
-
-/datum/component/storage/concrete/real_location()
- return parent
-
-/datum/component/storage/concrete/OnTransfer(datum/new_parent)
- if(!isatom(new_parent))
- return COMPONENT_INCOMPATIBLE
- var/list/mob/_is_using
- if(is_using)
- _is_using = is_using.Copy()
- close_all()
- if(transfer_contents_on_component_transfer)
- var/atom/old = parent
- for(var/i in old)
- var/atom/movable/AM = i
- AM.forceMove(new_parent)
- if(_is_using)
- for(var/i in _is_using)
- var/mob/M = i
- show_to(M)
-
-/datum/component/storage/concrete/_insert_physical_item(obj/item/I, override = FALSE)
- . = TRUE
- var/atom/real_location = real_location()
- if(I.loc != real_location)
- I.forceMove(real_location)
- refresh_mob_views()
-
-/datum/component/storage/concrete/refresh_mob_views()
- . = ..()
- for(var/i in slaves)
- var/datum/component/storage/slave = i
- slave.refresh_mob_views()
-
-/datum/component/storage/concrete/emp_act(severity)
- var/atom/real_location = real_location()
- for(var/i in real_location)
- var/atom/A = i
- A.emp_act(severity)
-
-/datum/component/storage/concrete/proc/on_slave_link(datum/component/storage/S)
- if(S == src)
- return FALSE
- slaves += S
- return TRUE
-
-/datum/component/storage/concrete/proc/on_slave_unlink(datum/component/storage/S)
- slaves -= S
- return FALSE
-
-/datum/component/storage/concrete/proc/on_contents_del(atom/A)
- var/atom/real_location = parent
- if(A in real_location)
- usr = null
- remove_from_storage(A, null)
-
-/datum/component/storage/concrete/proc/on_deconstruct(disassembled)
- if(drop_all_on_deconstruct)
- do_quick_empty()
-
-/datum/component/storage/concrete/can_see_contents()
- . = ..()
- for(var/i in slaves)
- var/datum/component/storage/slave = i
- . |= slave.can_see_contents()
-
-//Resets screen loc and other vars of something being removed from storage.
-/datum/component/storage/concrete/_removal_reset(atom/movable/thing)
- thing.layer = initial(thing.layer)
- thing.plane = initial(thing.plane)
- thing.mouse_opacity = initial(thing.mouse_opacity)
- if(thing.maptext)
- thing.maptext = ""
-
-/datum/component/storage/concrete/remove_from_storage(atom/movable/AM, atom/new_location)
- //Cache this as it should be reusable down the bottom, will not apply if anyone adds a sleep to dropped
- //or moving objects, things that should never happen
- var/atom/parent = src.parent
- var/list/seeing_mobs = can_see_contents()
- for(var/mob/M in seeing_mobs)
- M.client.screen -= AM
- if(ismob(parent.loc) && isitem(AM))
- var/obj/item/I = AM
- var/mob/M = parent.loc
- I.dropped(M)
- if(new_location)
- //Reset the items values
- _removal_reset(AM)
- AM.forceMove(new_location)
- //We don't want to call this if the item is being destroyed
- AM.on_exit_storage(src)
- else
- //Being destroyed, just move to nullspace now (so it's not in contents for the icon update)
- AM.moveToNullspace()
- refresh_mob_views()
- if(isobj(parent))
- var/obj/O = parent
- O.update_icon()
- return TRUE
-
-/datum/component/storage/concrete/proc/slave_can_insert_object(datum/component/storage/slave, obj/item/I, stop_messages = FALSE, mob/M)
- return TRUE
-
-/datum/component/storage/concrete/proc/handle_item_insertion_from_slave(datum/component/storage/slave, obj/item/I, prevent_warning = FALSE, M)
- . = handle_item_insertion(I, prevent_warning, M, slave)
- if(. && !prevent_warning)
- slave.mob_item_insertion_feedback(usr, M, I)
-
-/datum/component/storage/concrete/handle_item_insertion(obj/item/I, prevent_warning = FALSE, mob/M, datum/component/storage/remote) //Remote is null or the slave datum
- var/datum/component/storage/concrete/master = master()
- var/atom/parent = src.parent
- var/moved = FALSE
- if(!istype(I))
- return FALSE
- if(M)
- if(!M.temporarilyRemoveItemFromInventory(I))
- return FALSE
- else
- moved = TRUE //At this point if the proc fails we need to manually move the object back to the turf/mob/whatever.
- if(I.pulledby)
- I.pulledby.stop_pulling()
- if(silent)
- prevent_warning = TRUE
- if(!_insert_physical_item(I))
- if(moved)
- if(M)
- if(!M.put_in_active_hand(I))
- I.forceMove(parent.drop_location())
- else
- I.forceMove(parent.drop_location())
- return FALSE
- I.on_enter_storage(master)
- refresh_mob_views()
- I.mouse_opacity = MOUSE_OPACITY_OPAQUE //So you can click on the area around the item to equip it, instead of having to pixel hunt
- if(M)
- if(M.client && M.active_storage != src)
- M.client.screen -= I
- if(M.observers && M.observers.len)
- for(var/i in M.observers)
- var/mob/dead/observe = i
- if(observe.client && observe.active_storage != src)
- observe.client.screen -= I
- if(!remote)
- parent.add_fingerprint(M)
- if(!prevent_warning)
- mob_item_insertion_feedback(usr, M, I)
- update_icon()
- return TRUE
-
-/datum/component/storage/concrete/update_icon()
- if(isobj(parent))
- var/obj/O = parent
- O.update_icon()
- for(var/i in slaves)
- var/datum/component/storage/slave = i
- slave.update_icon()
+
+// External storage-related logic:
+// /mob/proc/ClickOn() in /_onclick/click.dm - clicking items in storages
+// /mob/living/Move() in /modules/mob/living/living.dm - hiding storage boxes on mob movement
+
+/datum/component/storage/concrete
+ var/drop_all_on_deconstruct = TRUE
+ var/drop_all_on_destroy = FALSE
+ var/transfer_contents_on_component_transfer = FALSE
+ var/list/datum/component/storage/slaves = list()
+
+ var/list/_contents_limbo // Where objects go to live mid transfer
+ var/list/_user_limbo // The last users before the component started moving
+
+/datum/component/storage/concrete/Initialize()
+ . = ..()
+ RegisterSignal(COMSIG_ATOM_CONTENTS_DEL, .proc/on_contents_del)
+ RegisterSignal(COMSIG_OBJ_DECONSTRUCT, .proc/on_deconstruct)
+
+/datum/component/storage/concrete/Destroy()
+ var/atom/real_location = real_location()
+ for(var/atom/_A in real_location)
+ _A.mouse_opacity = initial(_A.mouse_opacity)
+ if(drop_all_on_destroy)
+ do_quick_empty()
+ for(var/i in slaves)
+ var/datum/component/storage/slave = i
+ slave.change_master(null)
+ QDEL_LIST(_contents_limbo)
+ _user_limbo = null
+ return ..()
+
+/datum/component/storage/concrete/master()
+ return src
+
+/datum/component/storage/concrete/real_location()
+ return parent
+
+/datum/component/storage/concrete/PreTransfer()
+ if(is_using)
+ _user_limbo = is_using.Copy()
+ close_all()
+ if(transfer_contents_on_component_transfer)
+ _contents_limbo = list()
+ for(var/atom/movable/AM in parent)
+ _contents_limbo += AM
+ AM.moveToNullspace()
+
+/datum/component/storage/concrete/PostTransfer()
+ if(!isatom(parent))
+ return COMPONENT_INCOMPATIBLE
+ if(transfer_contents_on_component_transfer)
+ for(var/i in _contents_limbo)
+ var/atom/movable/AM = i
+ AM.forceMove(parent)
+ _contents_limbo = null
+ if(_user_limbo)
+ for(var/i in _user_limbo)
+ show_to(i)
+ _user_limbo = null
+
+/datum/component/storage/concrete/_insert_physical_item(obj/item/I, override = FALSE)
+ . = TRUE
+ var/atom/real_location = real_location()
+ if(I.loc != real_location)
+ I.forceMove(real_location)
+ refresh_mob_views()
+
+/datum/component/storage/concrete/refresh_mob_views()
+ . = ..()
+ for(var/i in slaves)
+ var/datum/component/storage/slave = i
+ slave.refresh_mob_views()
+
+/datum/component/storage/concrete/emp_act(severity)
+ if(emp_shielded)
+ return
+ var/atom/real_location = real_location()
+ for(var/i in real_location)
+ var/atom/A = i
+ A.emp_act(severity)
+
+/datum/component/storage/concrete/proc/on_slave_link(datum/component/storage/S)
+ if(S == src)
+ return FALSE
+ slaves += S
+ return TRUE
+
+/datum/component/storage/concrete/proc/on_slave_unlink(datum/component/storage/S)
+ slaves -= S
+ return FALSE
+
+/datum/component/storage/concrete/proc/on_contents_del(atom/A)
+ var/atom/real_location = parent
+ if(A in real_location)
+ usr = null
+ remove_from_storage(A, null)
+
+/datum/component/storage/concrete/proc/on_deconstruct(disassembled)
+ if(drop_all_on_deconstruct)
+ do_quick_empty()
+
+/datum/component/storage/concrete/can_see_contents()
+ . = ..()
+ for(var/i in slaves)
+ var/datum/component/storage/slave = i
+ . |= slave.can_see_contents()
+
+//Resets screen loc and other vars of something being removed from storage.
+/datum/component/storage/concrete/_removal_reset(atom/movable/thing)
+ thing.layer = initial(thing.layer)
+ thing.plane = initial(thing.plane)
+ thing.mouse_opacity = initial(thing.mouse_opacity)
+ if(thing.maptext)
+ thing.maptext = ""
+
+/datum/component/storage/concrete/remove_from_storage(atom/movable/AM, atom/new_location)
+ //Cache this as it should be reusable down the bottom, will not apply if anyone adds a sleep to dropped
+ //or moving objects, things that should never happen
+ var/atom/parent = src.parent
+ var/list/seeing_mobs = can_see_contents()
+ for(var/mob/M in seeing_mobs)
+ M.client.screen -= AM
+ if(ismob(parent.loc) && isitem(AM))
+ var/obj/item/I = AM
+ var/mob/M = parent.loc
+ I.dropped(M)
+ if(new_location)
+ //Reset the items values
+ _removal_reset(AM)
+ AM.forceMove(new_location)
+ //We don't want to call this if the item is being destroyed
+ AM.on_exit_storage(src)
+ else
+ //Being destroyed, just move to nullspace now (so it's not in contents for the icon update)
+ AM.moveToNullspace()
+ refresh_mob_views()
+ if(isobj(parent))
+ var/obj/O = parent
+ O.update_icon()
+ return TRUE
+
+/datum/component/storage/concrete/proc/slave_can_insert_object(datum/component/storage/slave, obj/item/I, stop_messages = FALSE, mob/M)
+ return TRUE
+
+/datum/component/storage/concrete/proc/handle_item_insertion_from_slave(datum/component/storage/slave, obj/item/I, prevent_warning = FALSE, M)
+ . = handle_item_insertion(I, prevent_warning, M, slave)
+ if(. && !prevent_warning)
+ slave.mob_item_insertion_feedback(usr, M, I)
+
+/datum/component/storage/concrete/handle_item_insertion(obj/item/I, prevent_warning = FALSE, mob/M, datum/component/storage/remote) //Remote is null or the slave datum
+ var/datum/component/storage/concrete/master = master()
+ var/atom/parent = src.parent
+ var/moved = FALSE
+ if(!istype(I))
+ return FALSE
+ if(M)
+ if(!M.temporarilyRemoveItemFromInventory(I))
+ return FALSE
+ else
+ moved = TRUE //At this point if the proc fails we need to manually move the object back to the turf/mob/whatever.
+ if(I.pulledby)
+ I.pulledby.stop_pulling()
+ if(silent)
+ prevent_warning = TRUE
+ if(!_insert_physical_item(I))
+ if(moved)
+ if(M)
+ if(!M.put_in_active_hand(I))
+ I.forceMove(parent.drop_location())
+ else
+ I.forceMove(parent.drop_location())
+ return FALSE
+ I.on_enter_storage(master)
+ refresh_mob_views()
+ I.mouse_opacity = MOUSE_OPACITY_OPAQUE //So you can click on the area around the item to equip it, instead of having to pixel hunt
+ if(M)
+ if(M.client && M.active_storage != src)
+ M.client.screen -= I
+ if(M.observers && M.observers.len)
+ for(var/i in M.observers)
+ var/mob/dead/observe = i
+ if(observe.client && observe.active_storage != src)
+ observe.client.screen -= I
+ if(!remote)
+ parent.add_fingerprint(M)
+ if(!prevent_warning)
+ mob_item_insertion_feedback(usr, M, I)
+ update_icon()
+ return TRUE
+
+/datum/component/storage/concrete/update_icon()
+ if(isobj(parent))
+ var/obj/O = parent
+ O.update_icon()
+ for(var/i in slaves)
+ var/datum/component/storage/slave = i
+ slave.update_icon()
diff --git a/code/datums/components/storage/concrete/implant.dm b/code/datums/components/storage/concrete/implant.dm
index d3f3d6b586..0348d340ae 100644
--- a/code/datums/components/storage/concrete/implant.dm
+++ b/code/datums/components/storage/concrete/implant.dm
@@ -1,17 +1,18 @@
-/datum/component/storage/concrete/implant
- max_w_class = WEIGHT_CLASS_NORMAL
- max_combined_w_class = 6
- max_items = 2
- drop_all_on_destroy = TRUE
- drop_all_on_deconstruct = TRUE
- silent = TRUE
-
-/datum/component/storage/concrete/implant/Initialize()
- . = ..()
- cant_hold = typecacheof(list(/obj/item/disk/nuclear))
-
-/datum/component/storage/concrete/implant/InheritComponent(datum/component/storage/concrete/implant/I, original)
- if(!istype(I))
- return ..()
- max_combined_w_class += I.max_combined_w_class
- max_items += I.max_items
+/datum/component/storage/concrete/implant
+ max_w_class = WEIGHT_CLASS_NORMAL
+ max_combined_w_class = 6
+ max_items = 2
+ drop_all_on_destroy = TRUE
+ drop_all_on_deconstruct = TRUE
+ silent = TRUE
+ allow_big_nesting = TRUE
+
+/datum/component/storage/concrete/implant/Initialize()
+ . = ..()
+ cant_hold = typecacheof(list(/obj/item/disk/nuclear))
+
+/datum/component/storage/concrete/implant/InheritComponent(datum/component/storage/concrete/implant/I, original)
+ if(!istype(I))
+ return ..()
+ max_combined_w_class += I.max_combined_w_class
+ max_items += I.max_items
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/components/storage/concrete/rped.dm b/code/datums/components/storage/concrete/rped.dm
index 9966fa3749..eb895fd74f 100644
--- a/code/datums/components/storage/concrete/rped.dm
+++ b/code/datums/components/storage/concrete/rped.dm
@@ -1,31 +1,33 @@
-/datum/component/storage/concrete/rped
- collection_mode = COLLECT_EVERYTHING
- allow_quick_gather = TRUE
- allow_quick_empty = TRUE
- click_gather = TRUE
- max_w_class = WEIGHT_CLASS_NORMAL
- max_combined_w_class = 100
- max_items = 50
- display_numerical_stacking = TRUE
-
-/datum/component/storage/concrete/rped/can_be_inserted(obj/item/I, stop_messages, mob/M)
- . = ..()
- if(!I.get_part_rating() && !stop_messages)
- to_chat(M, "[parent] only accepts machine parts!")
- return FALSE
-
-/datum/component/storage/concrete/bluespace/rped
- collection_mode = COLLECT_EVERYTHING
- allow_quick_gather = TRUE
- allow_quick_empty = TRUE
- click_gather = TRUE
- max_w_class = WEIGHT_CLASS_NORMAL
- max_combined_w_class = 800
- max_items = 400
- display_numerical_stacking = TRUE
-
-/datum/component/storage/concrete/bluespace/rped/can_be_inserted(obj/item/I, stop_messages, mob/M)
- . = ..()
- if(!I.get_part_rating() && !stop_messages)
- to_chat(M, "[parent] only accepts machine parts!")
- return FALSE
+/datum/component/storage/concrete/rped
+ collection_mode = COLLECT_EVERYTHING
+ allow_quick_gather = TRUE
+ allow_quick_empty = TRUE
+ click_gather = TRUE
+ max_w_class = WEIGHT_CLASS_NORMAL
+ max_combined_w_class = 100
+ max_items = 50
+ display_numerical_stacking = TRUE
+
+/datum/component/storage/concrete/rped/can_be_inserted(obj/item/I, stop_messages, mob/M)
+ . = ..()
+ if(!I.get_part_rating())
+ if (!stop_messages)
+ to_chat(M, "[parent] only accepts machine parts!")
+ return FALSE
+
+/datum/component/storage/concrete/bluespace/rped
+ collection_mode = COLLECT_EVERYTHING
+ allow_quick_gather = TRUE
+ allow_quick_empty = TRUE
+ click_gather = TRUE
+ max_w_class = WEIGHT_CLASS_NORMAL
+ max_combined_w_class = 800
+ max_items = 400
+ display_numerical_stacking = TRUE
+
+/datum/component/storage/concrete/bluespace/rped/can_be_inserted(obj/item/I, stop_messages, mob/M)
+ . = ..()
+ if(!I.get_part_rating())
+ if (!stop_messages)
+ to_chat(M, "[parent] only accepts machine par ts!")
+ return FALSE
diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm
index ce9e8ab72a..e6d43ed65a 100644
--- a/code/datums/components/storage/storage.dm
+++ b/code/datums/components/storage/storage.dm
@@ -1,730 +1,740 @@
-#define COLLECT_ONE 0
-#define COLLECT_EVERYTHING 1
-#define COLLECT_SAME 2
-
-#define DROP_NOTHING 0
-#define DROP_AT_PARENT 1
-#define DROP_AT_LOCATION 2
-
-// External storage-related logic:
-// /mob/proc/ClickOn() in /_onclick/click.dm - clicking items in storages
-// /mob/living/Move() in /modules/mob/living/living.dm - hiding storage boxes on mob movement
-
-/datum/component/storage
- dupe_mode = COMPONENT_DUPE_UNIQUE
- var/datum/component/storage/concrete/master //If not null, all actions act on master and this is just an access point.
-
- var/list/can_hold //if this is set, only things in this typecache will fit.
- var/list/cant_hold //if this is set, anything in this typecache will not be able to fit.
-
- var/list/mob/is_using //lazy list of mobs looking at the contents of this storage.
-
- var/locked = FALSE //when locked nothing can see inside or use it.
-
- var/max_w_class = WEIGHT_CLASS_SMALL //max size of objects that will fit.
- var/max_combined_w_class = 14 //max combined sizes of objects that will fit.
- var/max_items = 7 //max number of objects that will fit.
-
- var/emp_shielded = FALSE
-
- var/silent = FALSE //whether this makes a message when things are put in.
- var/click_gather = FALSE //whether this can be clicked on items to pick it up rather than the other way around.
- var/rustle_sound = TRUE //play rustle sound on interact.
- var/allow_quick_empty = FALSE //allow empty verb which allows dumping on the floor of everything inside quickly.
- var/allow_quick_gather = FALSE //allow toggle mob verb which toggles collecting all items from a tile.
-
- var/collection_mode = COLLECT_EVERYTHING
-
- var/insert_preposition = "in" //you put things "in" a bag, but "on" a tray.
-
- var/display_numerical_stacking = FALSE //stack things of the same type and show as a single object with a number.
-
- var/obj/screen/storage/boxes //storage display object
- var/obj/screen/close/closer //close button object
-
- var/allow_big_nesting = FALSE //allow storage objects of the same or greater size.
-
- var/attack_hand_interact = TRUE //interact on attack hand.
- var/quickdraw = FALSE //altclick interact
-
- var/datum/action/item_action/storage_gather_mode/modeswitch_action
-
- //Screen variables: Do not mess with these vars unless you know what you're doing. They're not defines so storage that isn't in the same location can be supported in the future.
- var/screen_max_columns = 7 //These two determine maximum screen sizes.
- var/screen_max_rows = INFINITY
- var/screen_pixel_x = 16 //These two are pixel values for screen loc of boxes and closer
- var/screen_pixel_y = 16
- var/screen_start_x = 4 //These two are where the storage starts being rendered, screen_loc wise.
- var/screen_start_y = 2
- //End
-
-/datum/component/storage/Initialize(datum/component/storage/concrete/master)
- if(!isatom(parent))
- . = COMPONENT_INCOMPATIBLE
- if(master)
- change_master(master)
- boxes = new(null, src)
- closer = new(null, src)
- orient2hud()
-
- RegisterSignal(COMSIG_CONTAINS_STORAGE, .proc/on_check)
- RegisterSignal(COMSIG_IS_STORAGE_LOCKED, .proc/check_locked)
- RegisterSignal(COMSIG_TRY_STORAGE_SHOW, .proc/signal_show_attempt)
- RegisterSignal(COMSIG_TRY_STORAGE_INSERT, .proc/signal_insertion_attempt)
- RegisterSignal(COMSIG_TRY_STORAGE_CAN_INSERT, .proc/signal_can_insert)
- RegisterSignal(COMSIG_TRY_STORAGE_TAKE_TYPE, .proc/signal_take_type)
- RegisterSignal(COMSIG_TRY_STORAGE_FILL_TYPE, .proc/signal_fill_type)
- RegisterSignal(COMSIG_TRY_STORAGE_SET_LOCKSTATE, .proc/set_locked)
- RegisterSignal(COMSIG_TRY_STORAGE_TAKE, .proc/signal_take_obj)
- RegisterSignal(COMSIG_TRY_STORAGE_QUICK_EMPTY, .proc/signal_quick_empty)
- RegisterSignal(COMSIG_TRY_STORAGE_HIDE_FROM, .proc/signal_hide_attempt)
- RegisterSignal(COMSIG_TRY_STORAGE_HIDE_ALL, .proc/close_all)
- RegisterSignal(COMSIG_TRY_STORAGE_RETURN_INVENTORY, .proc/signal_return_inv)
-
- RegisterSignal(COMSIG_PARENT_ATTACKBY, .proc/attackby)
-
- RegisterSignal(COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand)
- RegisterSignal(COMSIG_ATOM_ATTACK_PAW, .proc/on_attack_hand)
- RegisterSignal(COMSIG_ATOM_EMP_ACT, .proc/emp_act)
- RegisterSignal(COMSIG_ATOM_ATTACK_GHOST, .proc/show_to_ghost)
- RegisterSignal(COMSIG_ATOM_EXITED, .proc/_removal_reset)
-
- RegisterSignal(COMSIG_ITEM_PRE_ATTACK, .proc/preattack_intercept)
- RegisterSignal(COMSIG_ITEM_ATTACK_SELF, .proc/attack_self)
- RegisterSignal(COMSIG_ITEM_PICKUP, .proc/signal_on_pickup)
-
- RegisterSignal(COMSIG_MOVABLE_THROW, .proc/close_all)
-
- RegisterSignal(COMSIG_CLICK_ALT, .proc/on_alt_click)
- RegisterSignal(COMSIG_MOUSEDROP_ONTO, .proc/mousedrop_onto)
- RegisterSignal(COMSIG_MOUSEDROPPED_ONTO, .proc/mousedrop_recieve)
-
- update_actions()
-
-/datum/component/storage/Destroy()
- close_all()
- QDEL_NULL(boxes)
- QDEL_NULL(closer)
- LAZYCLEARLIST(is_using)
- return ..()
-
-/datum/component/storage/OnTransfer(datum/new_parent)
- update_actions()
-
-/datum/component/storage/proc/update_actions()
- QDEL_NULL(modeswitch_action)
- if(!isitem(parent) || !allow_quick_gather)
- return
- var/obj/item/I = parent
- modeswitch_action = new(I)
- if(I.obj_flags & IN_INVENTORY)
- var/mob/M = I.loc
- if(!istype(M))
- return
- modeswitch_action.Grant(M)
-
-/datum/component/storage/proc/change_master(datum/component/storage/concrete/new_master)
- if(!istype(new_master))
- return FALSE
- master.on_slave_unlink(src)
- master = new_master
- master.on_slave_link(src)
- return TRUE
-
-/datum/component/storage/proc/master()
- if(master == src)
- return //infinite loops yo.
- return master
-
-/datum/component/storage/proc/real_location()
- var/datum/component/storage/concrete/master = master()
- return master? master.real_location() : null
-
-/datum/component/storage/proc/attack_self(mob/M)
- if(locked)
- to_chat(M, "[parent] seems to be locked!")
- return FALSE
- if((M.get_active_held_item() == parent) && allow_quick_empty)
- quick_empty(M)
-
-/datum/component/storage/proc/preattack_intercept(obj/O, mob/M, params)
- if(!isitem(O) || !click_gather || O.SendSignal(COMSIG_CONTAINS_STORAGE))
- return FALSE
- . = COMPONENT_NO_ATTACK
- if(locked)
- to_chat(M, "[parent] seems to be locked!")
- return FALSE
- var/obj/item/I = O
- if(collection_mode == COLLECT_ONE)
- if(can_be_inserted(I, null, M))
- handle_item_insertion(I, null, M)
- return
- if(!isturf(I.loc))
- return
- var/list/things = I.loc.contents.Copy()
- if(collection_mode == COLLECT_SAME)
- things = typecache_filter_list(things, typecacheof(I.type))
- var/len = length(things)
- if(!len)
- to_chat(M, "You failed to pick up anything with [parent].")
- return
- var/datum/progressbar/progress = new(M, len, I.loc)
- var/list/rejections = list()
- while(do_after(M, 10, TRUE, parent, FALSE, CALLBACK(src, .proc/handle_mass_pickup, things, I.loc, rejections, progress)))
- stoplag(1)
- qdel(progress)
- to_chat(M, "You put everything you could [insert_preposition] [parent].")
-
-/datum/component/storage/proc/handle_mass_item_insertion(list/things, datum/component/storage/src_object, mob/user, datum/progressbar/progress)
- var/atom/source_real_location = src_object.real_location()
- for(var/obj/item/I in things)
- things -= I
- if(I.loc != source_real_location)
- continue
- if(user.active_storage != src_object)
- if(I.on_found(user))
- break
- if(can_be_inserted(I,FALSE,user))
- handle_item_insertion(I, TRUE, user)
- if (TICK_CHECK)
- progress.update(progress.goal - things.len)
- return TRUE
-
- progress.update(progress.goal - things.len)
- return FALSE
-
-/datum/component/storage/proc/handle_mass_pickup(list/things, atom/thing_loc, list/rejections, datum/progressbar/progress)
- var/atom/real_location = real_location()
- for(var/obj/item/I in things)
- things -= I
- if(I.loc != thing_loc)
- continue
- if(I.type in rejections) // To limit bag spamming: any given type only complains once
- continue
- if(!can_be_inserted(I, stop_messages = TRUE)) // Note can_be_inserted still makes noise when the answer is no
- if(real_location.contents.len >= max_items)
- break
- rejections += I.type // therefore full bags are still a little spammy
- continue
-
- handle_item_insertion(I, TRUE) //The TRUE stops the "You put the [parent] into [S]" insertion message from being displayed.
-
- if (TICK_CHECK)
- progress.update(progress.goal - things.len)
- return TRUE
-
- progress.update(progress.goal - things.len)
- return FALSE
-
-/datum/component/storage/proc/quick_empty(mob/M)
- var/atom/A = parent
- if((!ishuman(M) && (A.loc != M)) || (M.stat != CONSCIOUS) || M.restrained() || !M.canmove)
- return
- if(locked)
- to_chat(M, "[parent] seems to be locked!")
- return FALSE
- A.add_fingerprint(M)
- to_chat(M, "You start dumping out [parent].")
- var/turf/T = get_turf(A)
- var/list/things = contents()
- var/datum/progressbar/progress = new(M, length(things), T)
- while (do_after(M, 10, TRUE, T, FALSE, CALLBACK(src, .proc/mass_remove_from_storage, T, things, progress)))
- stoplag(1)
- qdel(progress)
-
-/datum/component/storage/proc/mass_remove_from_storage(atom/target, list/things, datum/progressbar/progress)
- var/atom/real_location = real_location()
- for(var/obj/item/I in things)
- things -= I
- if(I.loc != real_location)
- continue
- remove_from_storage(I, target)
- if(TICK_CHECK)
- progress.update(progress.goal - length(things))
- return TRUE
- progress.update(progress.goal - length(things))
- return FALSE
-
-/datum/component/storage/proc/do_quick_empty(atom/_target)
- if(!_target)
- _target = get_turf(parent)
- if(usr)
- hide_from(usr)
- var/list/contents = contents()
- var/atom/real_location = real_location()
- for(var/obj/item/I in contents)
- if(I.loc != real_location)
- continue
- remove_from_storage(I, _target)
- return TRUE
-
-/datum/component/storage/proc/set_locked(new_state)
- locked = new_state
- if(locked)
- close_all()
-
-/datum/component/storage/proc/_process_numerical_display()
- . = list()
- var/atom/real_location = real_location()
- for(var/obj/item/I in real_location.contents)
- if(QDELETED(I))
- continue
- if(!.[I.type])
- .[I.type] = new /datum/numbered_display(I, 1)
- else
- var/datum/numbered_display/ND = .[I.type]
- ND.number++
-
-//This proc determines the size of the inventory to be displayed. Please touch it only if you know what you're doing.
-/datum/component/storage/proc/orient2hud()
- var/atom/real_location = real_location()
- var/adjusted_contents = real_location.contents.len
-
- //Numbered contents display
- var/list/datum/numbered_display/numbered_contents
- if(display_numerical_stacking)
- numbered_contents = _process_numerical_display()
- adjusted_contents = numbered_contents.len
-
- var/columns = CLAMP(max_items, 1, screen_max_columns)
- var/rows = CLAMP(CEILING(adjusted_contents / columns, 1), 1, screen_max_rows)
- standard_orient_objs(rows, columns, numbered_contents)
-
-//This proc draws out the inventory and places the items on it. It uses the standard position.
-/datum/component/storage/proc/standard_orient_objs(rows, cols, list/obj/item/numerical_display_contents)
- boxes.screen_loc = "[screen_start_x]:[screen_pixel_x],[screen_start_y]:[screen_pixel_y] to [screen_start_x+cols-1]:[screen_pixel_x],[screen_start_y+rows-1]:[screen_pixel_y]"
- var/cx = screen_start_x
- var/cy = screen_start_y
- if(islist(numerical_display_contents))
- for(var/type in numerical_display_contents)
- var/datum/numbered_display/ND = numerical_display_contents[type]
- ND.sample_object.mouse_opacity = MOUSE_OPACITY_OPAQUE
- ND.sample_object.screen_loc = "[cx]:[screen_pixel_x],[cy]:[screen_pixel_y]"
- ND.sample_object.maptext = "[(ND.number > 1)? "[ND.number]" : ""]"
- ND.sample_object.layer = ABOVE_HUD_LAYER
- ND.sample_object.plane = ABOVE_HUD_PLANE
- cx++
- if(cx - screen_start_x >= cols)
- cx = screen_start_x
- cy++
- if(cy - screen_start_y >= rows)
- break
- else
- var/atom/real_location = real_location()
- for(var/obj/O in real_location)
- if(QDELETED(O))
- continue
- O.mouse_opacity = MOUSE_OPACITY_OPAQUE //This is here so storage items that spawn with contents correctly have the "click around item to equip"
- O.screen_loc = "[cx]:[screen_pixel_x],[cy]:[screen_pixel_y]"
- O.maptext = ""
- O.layer = ABOVE_HUD_LAYER
- O.plane = ABOVE_HUD_PLANE
- cx++
- if(cx - screen_start_x >= cols)
- cx = screen_start_x
- cy++
- if(cy - screen_start_y >= rows)
- break
- closer.screen_loc = "[screen_start_x + cols]:[screen_pixel_x],[screen_start_y]:[screen_pixel_y]"
-
-/datum/component/storage/proc/show_to(mob/M)
- if(!M.client)
- return FALSE
- var/atom/real_location = real_location()
- if(M.active_storage != src && (M.stat == CONSCIOUS))
- for(var/obj/item/I in real_location)
- if(I.on_found(M))
- return FALSE
- if(M.active_storage)
- M.active_storage.hide_from(M)
- orient2hud()
- M.client.screen |= boxes
- M.client.screen |= closer
- M.client.screen |= real_location.contents
- M.active_storage = src
- LAZYOR(is_using, M)
- return TRUE
-
-/datum/component/storage/proc/hide_from(mob/M)
- if(!M.client)
- return TRUE
- var/atom/real_location = real_location()
- M.client.screen -= boxes
- M.client.screen -= closer
- M.client.screen -= real_location.contents
- if(M.active_storage == src)
- M.active_storage = null
- LAZYREMOVE(is_using, M)
- return TRUE
-
-/datum/component/storage/proc/close(mob/M)
- hide_from(M)
-
-/datum/component/storage/proc/close_all()
- . = FALSE
- for(var/mob/M in can_see_contents())
- close(M)
- . = TRUE //returns TRUE if any mobs actually got a close(M) call
-
-/datum/component/storage/proc/emp_act(severity)
- var/atom/A = parent
- if(!isliving(A.loc) && !emp_shielded)
- var/datum/component/storage/concrete/master = master()
- master.emp_act(severity)
-
-//This proc draws out the inventory and places the items on it. tx and ty are the upper left tile and mx, my are the bottm right.
-//The numbers are calculated from the bottom-left The bottom-left slot being 1,1.
-/datum/component/storage/proc/orient_objs(tx, ty, mx, my)
- var/atom/real_location = real_location()
- var/cx = tx
- var/cy = ty
- boxes.screen_loc = "[tx]:,[ty] to [mx],[my]"
- for(var/obj/O in real_location)
- if(QDELETED(O))
- continue
- O.screen_loc = "[cx],[cy]"
- O.layer = ABOVE_HUD_LAYER
- O.plane = ABOVE_HUD_PLANE
- cx++
- if(cx > mx)
- cx = tx
- cy--
- closer.screen_loc = "[mx+1],[my]"
-
-//Resets something that is being removed from storage.
-/datum/component/storage/proc/_removal_reset(atom/movable/thing)
- if(!istype(thing))
- return FALSE
- var/datum/component/storage/concrete/master = master()
- if(!istype(master))
- return FALSE
- return master._removal_reset(thing)
-
-//Call this proc to handle the removal of an item from the storage item. The item will be moved to the new_location target, if that is null it's being deleted
-/datum/component/storage/proc/remove_from_storage(atom/movable/AM, atom/new_location)
- if(!istype(AM))
- return FALSE
- var/datum/component/storage/concrete/master = master()
- if(!istype(master))
- return FALSE
- return master.remove_from_storage(AM, new_location)
-
-/datum/component/storage/proc/refresh_mob_views()
- var/list/seeing = can_see_contents()
- for(var/i in seeing)
- show_to(i)
- return TRUE
-
-/datum/component/storage/proc/can_see_contents()
- var/list/cansee = list()
- for(var/mob/M in is_using)
- if(M.active_storage == src && M.client)
- cansee |= M
- else
- LAZYREMOVE(is_using, M)
- return cansee
-
-//Tries to dump content
-/datum/component/storage/proc/dump_content_at(atom/dest_object, mob/M)
- var/atom/A = parent
- var/atom/dump_destination = dest_object.get_dumping_location()
- if(A.Adjacent(M) && dump_destination && M.Adjacent(dump_destination))
- if(locked)
- to_chat(M, "[parent] seems to be locked!")
- return FALSE
- if(dump_destination.storage_contents_dump_act(src, M))
- playsound(A, "rustle", 50, 1, -5)
- return TRUE
- return FALSE
-
-//This proc is called when you want to place an item into the storage item.
-/datum/component/storage/proc/attackby(obj/item/I, mob/M, params)
- if(istype(I, /obj/item/hand_labeler))
- var/obj/item/hand_labeler/labeler = I
- if(labeler.mode)
- return FALSE
- . = TRUE //no afterattack
- if(iscyborg(M))
- return
- if(!can_be_inserted(I, FALSE, M))
- var/atom/real_location = real_location()
- if(real_location.contents.len >= max_items) //don't use items on the backpack if they don't fit
- return TRUE
- return FALSE
- handle_item_insertion(I, FALSE, M)
-
-/datum/component/storage/proc/return_inv()
- . = list()
- . += contents()
- for(var/i in contents())
- var/atom/a = i
- GET_COMPONENT_FROM(STR, /datum/component/storage, a)
- if(STR)
- . += STR.return_inv()
-
-/datum/component/storage/proc/contents() //ONLY USE IF YOU NEED TO COPY CONTENTS OF REAL LOCATION, COPYING IS NOT AS FAST AS DIRECT ACCESS!
- var/atom/real_location = real_location()
- return real_location.contents.Copy()
-
-/datum/component/storage/proc/signal_return_inv(list/interface)
- if(!islist(interface))
- return FALSE
- interface |= return_inv()
- return TRUE
-
-/datum/component/storage/proc/mousedrop_onto(atom/over_object, mob/M)
- set waitfor = FALSE
- . = COMPONENT_NO_MOUSEDROP
- var/atom/A = parent
- if(ismob(M)) //all the check for item manipulation are in other places, you can safely open any storages as anything and its not buggy, i checked
- A.add_fingerprint(M)
- if(!over_object)
- return FALSE
- if(ismecha(M.loc)) // stops inventory actions in a mech
- return FALSE
- // this must come before the screen objects only block, dunno why it wasn't before
- if(over_object == M)
- user_show_to_mob(M)
- if(!M.incapacitated())
- if(!istype(over_object, /obj/screen))
- dump_content_at(over_object, M)
- return
- if(A.loc != M)
- return
- playsound(A, "rustle", 50, 1, -5)
- if(istype(over_object, /obj/screen/inventory/hand))
- var/obj/screen/inventory/hand/H = over_object
- M.putItemFromInventoryInHandIfPossible(A, H.held_index)
- return
- A.add_fingerprint(M)
-
-/datum/component/storage/proc/user_show_to_mob(mob/M, force = FALSE)
- var/atom/A = parent
- if(!istype(M))
- return FALSE
- A.add_fingerprint(M)
- if(locked)
- to_chat(M, "[parent] seems to be locked!")
- return FALSE
- if(M.CanReach(parent, view_only = TRUE))
- show_to(M)
-
-/datum/component/storage/proc/mousedrop_recieve(atom/movable/O, mob/M)
- if(isitem(O))
- var/obj/item/I = O
- if(iscarbon(M) || isdrone(M))
- var/mob/living/L = M
- if(!L.incapacitated() && I == L.get_active_held_item())
- if(!I.SendSignal(COMSIG_CONTAINS_STORAGE) && can_be_inserted(I, FALSE)) //If it has storage it should be trying to dump, not insert.
- handle_item_insertion(I, FALSE, L)
-
-//This proc return 1 if the item can be picked up and 0 if it can't.
-//Set the stop_messages to stop it from printing messages
-/datum/component/storage/proc/can_be_inserted(obj/item/I, stop_messages = FALSE, mob/M)
- if(!istype(I) || (I.flags_1 & ABSTRACT_1))
- return FALSE //Not an item
- var/atom/real_location = real_location()
- var/atom/parent = src.parent
- if(real_location == I.loc)
- return FALSE //Means the item is already in the storage item
- if(locked)
- if(M)
- parent.add_fingerprint(M)
- to_chat(M, "[parent] seems to be locked!")
- return FALSE
- if(real_location.contents.len >= max_items)
- if(!stop_messages)
- to_chat(M, "[parent] is full, make some space!")
- return FALSE //Storage item is full
- if(length(can_hold))
- if(!is_type_in_typecache(I, can_hold))
- if(!stop_messages)
- to_chat(M, "[parent] cannot hold [I]!")
- return FALSE
- if(is_type_in_typecache(I, cant_hold)) //Check for specific items which this container can't hold.
- if(!stop_messages)
- to_chat(M, "[parent] cannot hold [I]!")
- return FALSE
- if(I.w_class > max_w_class)
- if(!stop_messages)
- to_chat(M, "[I] is too big for [parent]!")
- return FALSE
- var/sum_w_class = I.w_class
- for(var/obj/item/_I in real_location)
- sum_w_class += _I.w_class //Adds up the combined w_classes which will be in the storage item if the item is added to it.
- if(sum_w_class > max_combined_w_class)
- if(!stop_messages)
- to_chat(M, "[I] won't fit in [parent], make some space!")
- return FALSE
- if(isitem(parent))
- var/obj/item/IP = parent
- GET_COMPONENT_FROM(STR_I, /datum/component/storage, I)
- if((I.w_class >= IP.w_class) && STR_I && !allow_big_nesting)
- if(!stop_messages)
- to_chat(M, "[IP] cannot hold [I] as it's a storage item of the same size!")
- return FALSE //To prevent the stacking of same sized storage items.
- if(I.flags_1 & NODROP_1) //SHOULD be handled in unEquip, but better safe than sorry.
- to_chat(M, "\the [I] is stuck to your hand, you can't put it in \the [parent]!")
- return FALSE
- var/datum/component/storage/concrete/master = master()
- if(!istype(master))
- return FALSE
- return master.slave_can_insert_object(src, I, stop_messages, M)
-
-/datum/component/storage/proc/_insert_physical_item(obj/item/I, override = FALSE)
- return FALSE
-
-//This proc handles items being inserted. It does not perform any checks of whether an item can or can't be inserted. That's done by can_be_inserted()
-//The stop_warning parameter will stop the insertion message from being displayed. It is intended for cases where you are inserting multiple items at once,
-//such as when picking up all the items on a tile with one click.
-/datum/component/storage/proc/handle_item_insertion(obj/item/I, prevent_warning = FALSE, mob/M, datum/component/storage/remote)
- var/atom/parent = src.parent
- var/datum/component/storage/concrete/master = master()
- if(!istype(master))
- return FALSE
- if(silent)
- prevent_warning = TRUE
- if(M)
- parent.add_fingerprint(M)
- . = master.handle_item_insertion_from_slave(src, I, prevent_warning, M)
-
-/datum/component/storage/proc/mob_item_insertion_feedback(mob/user, mob/M, obj/item/I, override = FALSE)
- if(silent && !override)
- return
- if(rustle_sound)
- playsound(parent, "rustle", 50, 1, -5)
- for(var/mob/viewing in viewers(user, null))
- if(M == viewing)
- to_chat(usr, "You put [I] [insert_preposition]to [parent].")
- else if(in_range(M, viewing)) //If someone is standing close enough, they can tell what it is...
- viewing.show_message("[M] puts [I] [insert_preposition]to [parent].", 1)
- else if(I && I.w_class >= 3) //Otherwise they can only see large or normal items from a distance...
- viewing.show_message("[M] puts [I] [insert_preposition]to [parent].", 1)
-
-/datum/component/storage/proc/update_icon()
- if(isobj(parent))
- var/obj/O = parent
- O.update_icon()
-
-/datum/component/storage/proc/signal_insertion_attempt(obj/item/I, mob/M, silent = FALSE, force = FALSE)
- if(!force && !can_be_inserted(I, TRUE, M))
- return FALSE
- return handle_item_insertion(I, silent, M)
-
-/datum/component/storage/proc/signal_can_insert(obj/item/I, mob/M, silent = FALSE)
- return can_be_inserted(I, silent, M)
-
-/datum/component/storage/proc/show_to_ghost(mob/dead/observer/M)
- return user_show_to_mob(M, TRUE)
-
-/datum/component/storage/proc/signal_show_attempt(mob/showto, force = FALSE)
- return user_show_to_mob(showto, force)
-
-/datum/component/storage/proc/on_check()
- return TRUE
-
-/datum/component/storage/proc/check_locked()
- return locked
-
-/datum/component/storage/proc/signal_take_type(type, atom/destination, amount = INFINITY, check_adjacent = FALSE, force = FALSE, mob/user, list/inserted)
- if(!force)
- if(check_adjacent)
- if(user)
- if(!user.CanReach(destination) || !user.CanReach(parent))
- return FALSE
- else if(!destination.CanReachStorage(parent))
- return FALSE
- var/list/taking = typecache_filter_list(contents(), typecacheof(type))
- if(length(taking) > amount)
- taking.Cut(amount)
- if(inserted) //duplicated code for performance, don't bother checking retval/checking for list every item.
- for(var/i in taking)
- if(remove_from_storage(i, destination))
- inserted |= i
- else
- for(var/i in taking)
- remove_from_storage(i, destination)
- return TRUE
-
-/datum/component/storage/proc/remaining_space_items()
- var/atom/real_location = real_location()
- return max(0, max_items - real_location.contents.len)
-
-/datum/component/storage/proc/signal_fill_type(type, amount = 20, force = FALSE)
- var/atom/real_location = real_location()
- if(!force)
- amount = min(remaining_space_items(), amount)
- for(var/i in 1 to amount)
- handle_item_insertion(new type(real_location), TRUE)
- CHECK_TICK
- return TRUE
-
-/datum/component/storage/proc/on_attack_hand(mob/user)
- var/atom/A = parent
- if(!attack_hand_interact)
- return
- if(user.active_storage == src && A.loc == user) //if you're already looking inside the storage item
- user.active_storage.close(user)
- close(user)
- . = COMPONENT_NO_ATTACK_HAND
- return
-
- if(rustle_sound)
- playsound(A, "rustle", 50, 1, -5)
-
- if(ishuman(user))
- var/mob/living/carbon/human/H = user
- if(H.l_store == A && !H.get_active_held_item()) //Prevents opening if it's in a pocket.
- . = COMPONENT_NO_ATTACK_HAND
- H.put_in_hands(A)
- H.l_store = null
- return
- if(H.r_store == A && !H.get_active_held_item())
- . = COMPONENT_NO_ATTACK_HAND
- H.put_in_hands(A)
- H.r_store = null
- return
-
- if(A.loc == user)
- . = COMPONENT_NO_ATTACK_HAND
- show_to(user)
-
-/datum/component/storage/proc/signal_on_pickup(mob/user)
- var/atom/A = parent
- update_actions()
- for(var/mob/M in range(1, A))
- if(M.active_storage == src)
- close(M)
-
-/datum/component/storage/proc/signal_take_obj(atom/movable/AM, new_loc, force = FALSE)
- if(!(AM in real_location()))
- return FALSE
- return remove_from_storage(AM, new_loc)
-
-/datum/component/storage/proc/signal_quick_empty(atom/loctarget)
- return do_quick_empty(loctarget)
-
-/datum/component/storage/proc/signal_hide_attempt(mob/target)
- return hide_from(target)
-
-/datum/component/storage/proc/on_alt_click(mob/user)
- if(!isliving(user) || user.incapacitated() || !quickdraw || !user.CanReach(parent))
- return
- var/obj/item/I = locate() in real_location()
- if(!I)
- return
- remove_from_storage(I, get_turf(user))
- if(!user.put_in_hands(I))
- to_chat(user, "You fumble for [I] and it falls on the floor.")
- return
- user.visible_message("[user] draws [I] from [parent]!", "You draw [I] from [parent].")
-
-/datum/component/storage/proc/gather_mode_switch(mob/user)
- collection_mode = (collection_mode+1)%3
- switch(collection_mode)
- if(COLLECT_SAME)
- to_chat(user, "[parent] now picks up all items of a single type at once.")
- if(COLLECT_EVERYTHING)
- to_chat(user, "[parent] now picks up all items in a tile at once.")
- if(COLLECT_ONE)
- to_chat(user, "[parent] now picks up one item at a time.")
+#define COLLECT_ONE 0
+#define COLLECT_EVERYTHING 1
+#define COLLECT_SAME 2
+
+#define DROP_NOTHING 0
+#define DROP_AT_PARENT 1
+#define DROP_AT_LOCATION 2
+
+// External storage-related logic:
+// /mob/proc/ClickOn() in /_onclick/click.dm - clicking items in storages
+// /mob/living/Move() in /modules/mob/living/living.dm - hiding storage boxes on mob movement
+
+/datum/component/storage
+ dupe_mode = COMPONENT_DUPE_UNIQUE
+ var/datum/component/storage/concrete/master //If not null, all actions act on master and this is just an access point.
+
+ var/list/can_hold //if this is set, only things in this typecache will fit.
+ var/list/cant_hold //if this is set, anything in this typecache will not be able to fit.
+
+ var/list/mob/is_using //lazy list of mobs looking at the contents of this storage.
+
+ var/locked = FALSE //when locked nothing can see inside or use it.
+
+ var/max_w_class = WEIGHT_CLASS_SMALL //max size of objects that will fit.
+ var/max_combined_w_class = 14 //max combined sizes of objects that will fit.
+ var/max_items = 7 //max number of objects that will fit.
+
+ var/emp_shielded = FALSE
+
+ var/silent = FALSE //whether this makes a message when things are put in.
+ var/click_gather = FALSE //whether this can be clicked on items to pick it up rather than the other way around.
+ var/rustle_sound = TRUE //play rustle sound on interact.
+ var/allow_quick_empty = FALSE //allow empty verb which allows dumping on the floor of everything inside quickly.
+ var/allow_quick_gather = FALSE //allow toggle mob verb which toggles collecting all items from a tile.
+
+ var/collection_mode = COLLECT_EVERYTHING
+
+ var/insert_preposition = "in" //you put things "in" a bag, but "on" a tray.
+
+ var/display_numerical_stacking = FALSE //stack things of the same type and show as a single object with a number.
+
+ var/obj/screen/storage/boxes //storage display object
+ var/obj/screen/close/closer //close button object
+
+ var/allow_big_nesting = FALSE //allow storage objects of the same or greater size.
+
+ var/attack_hand_interact = TRUE //interact on attack hand.
+ var/quickdraw = FALSE //altclick interact
+
+ var/datum/action/item_action/storage_gather_mode/modeswitch_action
+
+ //Screen variables: Do not mess with these vars unless you know what you're doing. They're not defines so storage that isn't in the same location can be supported in the future.
+ var/screen_max_columns = 7 //These two determine maximum screen sizes.
+ var/screen_max_rows = INFINITY
+ var/screen_pixel_x = 16 //These two are pixel values for screen loc of boxes and closer
+ var/screen_pixel_y = 16
+ var/screen_start_x = 4 //These two are where the storage starts being rendered, screen_loc wise.
+ var/screen_start_y = 2
+ //End
+
+/datum/component/storage/Initialize(datum/component/storage/concrete/master)
+ if(!isatom(parent))
+ return COMPONENT_INCOMPATIBLE
+ if(master)
+ change_master(master)
+ boxes = new(null, src)
+ closer = new(null, src)
+ orient2hud()
+
+ RegisterSignal(COMSIG_CONTAINS_STORAGE, .proc/on_check)
+ RegisterSignal(COMSIG_IS_STORAGE_LOCKED, .proc/check_locked)
+ RegisterSignal(COMSIG_TRY_STORAGE_SHOW, .proc/signal_show_attempt)
+ RegisterSignal(COMSIG_TRY_STORAGE_INSERT, .proc/signal_insertion_attempt)
+ RegisterSignal(COMSIG_TRY_STORAGE_CAN_INSERT, .proc/signal_can_insert)
+ RegisterSignal(COMSIG_TRY_STORAGE_TAKE_TYPE, .proc/signal_take_type)
+ RegisterSignal(COMSIG_TRY_STORAGE_FILL_TYPE, .proc/signal_fill_type)
+ RegisterSignal(COMSIG_TRY_STORAGE_SET_LOCKSTATE, .proc/set_locked)
+ RegisterSignal(COMSIG_TRY_STORAGE_TAKE, .proc/signal_take_obj)
+ RegisterSignal(COMSIG_TRY_STORAGE_QUICK_EMPTY, .proc/signal_quick_empty)
+ RegisterSignal(COMSIG_TRY_STORAGE_HIDE_FROM, .proc/signal_hide_attempt)
+ RegisterSignal(COMSIG_TRY_STORAGE_HIDE_ALL, .proc/close_all)
+ RegisterSignal(COMSIG_TRY_STORAGE_RETURN_INVENTORY, .proc/signal_return_inv)
+
+ RegisterSignal(COMSIG_PARENT_ATTACKBY, .proc/attackby)
+
+ RegisterSignal(COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand)
+ RegisterSignal(COMSIG_ATOM_ATTACK_PAW, .proc/on_attack_hand)
+ RegisterSignal(COMSIG_ATOM_EMP_ACT, .proc/emp_act)
+ RegisterSignal(COMSIG_ATOM_ATTACK_GHOST, .proc/show_to_ghost)
+ RegisterSignal(COMSIG_ATOM_ENTERED, .proc/refresh_mob_views)
+ RegisterSignal(COMSIG_ATOM_EXITED, .proc/_remove_and_refresh)
+
+ RegisterSignal(COMSIG_ITEM_PRE_ATTACK, .proc/preattack_intercept)
+ RegisterSignal(COMSIG_ITEM_ATTACK_SELF, .proc/attack_self)
+ RegisterSignal(COMSIG_ITEM_PICKUP, .proc/signal_on_pickup)
+
+ RegisterSignal(COMSIG_MOVABLE_THROW, .proc/close_all)
+
+ RegisterSignal(COMSIG_CLICK_ALT, .proc/on_alt_click)
+ RegisterSignal(COMSIG_MOUSEDROP_ONTO, .proc/mousedrop_onto)
+ RegisterSignal(COMSIG_MOUSEDROPPED_ONTO, .proc/mousedrop_recieve)
+
+ update_actions()
+
+/datum/component/storage/Destroy()
+ close_all()
+ QDEL_NULL(boxes)
+ QDEL_NULL(closer)
+ LAZYCLEARLIST(is_using)
+ return ..()
+
+/datum/component/storage/PreTransfer()
+ update_actions()
+
+/datum/component/storage/proc/update_actions()
+ QDEL_NULL(modeswitch_action)
+ if(!isitem(parent) || !allow_quick_gather)
+ return
+ var/obj/item/I = parent
+ modeswitch_action = new(I)
+ if(I.obj_flags & IN_INVENTORY)
+ var/mob/M = I.loc
+ if(!istype(M))
+ return
+ modeswitch_action.Grant(M)
+
+/datum/component/storage/proc/change_master(datum/component/storage/concrete/new_master)
+ if(!istype(new_master))
+ return FALSE
+ master.on_slave_unlink(src)
+ master = new_master
+ master.on_slave_link(src)
+ return TRUE
+
+/datum/component/storage/proc/master()
+ if(master == src)
+ return //infinite loops yo.
+ return master
+
+/datum/component/storage/proc/real_location()
+ var/datum/component/storage/concrete/master = master()
+ return master? master.real_location() : null
+
+/datum/component/storage/proc/attack_self(mob/M)
+ if(locked)
+ to_chat(M, "[parent] seems to be locked!")
+ return FALSE
+ if((M.get_active_held_item() == parent) && allow_quick_empty)
+ quick_empty(M)
+
+/datum/component/storage/proc/preattack_intercept(obj/O, mob/M, params)
+ if(!isitem(O) || !click_gather || O.SendSignal(COMSIG_CONTAINS_STORAGE))
+ return FALSE
+ . = COMPONENT_NO_ATTACK
+ if(locked)
+ to_chat(M, "[parent] seems to be locked!")
+ return FALSE
+ var/obj/item/I = O
+ if(collection_mode == COLLECT_ONE)
+ if(can_be_inserted(I, null, M))
+ handle_item_insertion(I, null, M)
+ return
+ if(!isturf(I.loc))
+ return
+ var/list/things = I.loc.contents.Copy()
+ if(collection_mode == COLLECT_SAME)
+ things = typecache_filter_list(things, typecacheof(I.type))
+ var/len = length(things)
+ if(!len)
+ to_chat(M, "You failed to pick up anything with [parent].")
+ return
+ var/datum/progressbar/progress = new(M, len, I.loc)
+ var/list/rejections = list()
+ while(do_after(M, 10, TRUE, parent, FALSE, CALLBACK(src, .proc/handle_mass_pickup, things, I.loc, rejections, progress)))
+ stoplag(1)
+ qdel(progress)
+ to_chat(M, "You put everything you could [insert_preposition] [parent].")
+
+/datum/component/storage/proc/handle_mass_item_insertion(list/things, datum/component/storage/src_object, mob/user, datum/progressbar/progress)
+ var/atom/source_real_location = src_object.real_location()
+ for(var/obj/item/I in things)
+ things -= I
+ if(I.loc != source_real_location)
+ continue
+ if(user.active_storage != src_object)
+ if(I.on_found(user))
+ break
+ if(can_be_inserted(I,FALSE,user))
+ handle_item_insertion(I, TRUE, user)
+ if (TICK_CHECK)
+ progress.update(progress.goal - things.len)
+ return TRUE
+
+ progress.update(progress.goal - things.len)
+ return FALSE
+
+/datum/component/storage/proc/handle_mass_pickup(list/things, atom/thing_loc, list/rejections, datum/progressbar/progress)
+ var/atom/real_location = real_location()
+ for(var/obj/item/I in things)
+ things -= I
+ if(I.loc != thing_loc)
+ continue
+ if(I.type in rejections) // To limit bag spamming: any given type only complains once
+ continue
+ if(!can_be_inserted(I, stop_messages = TRUE)) // Note can_be_inserted still makes noise when the answer is no
+ if(real_location.contents.len >= max_items)
+ break
+ rejections += I.type // therefore full bags are still a little spammy
+ continue
+
+ handle_item_insertion(I, TRUE) //The TRUE stops the "You put the [parent] into [S]" insertion message from being displayed.
+
+ if (TICK_CHECK)
+ progress.update(progress.goal - things.len)
+ return TRUE
+
+ progress.update(progress.goal - things.len)
+ return FALSE
+
+/datum/component/storage/proc/quick_empty(mob/M)
+ var/atom/A = parent
+ if((!ishuman(M) && (A.loc != M)) || (M.stat != CONSCIOUS) || M.restrained() || !M.canmove)
+ return
+ if(locked)
+ to_chat(M, "[parent] seems to be locked!")
+ return FALSE
+ A.add_fingerprint(M)
+ to_chat(M, "You start dumping out [parent].")
+ var/turf/T = get_turf(A)
+ var/list/things = contents()
+ var/datum/progressbar/progress = new(M, length(things), T)
+ while (do_after(M, 10, TRUE, T, FALSE, CALLBACK(src, .proc/mass_remove_from_storage, T, things, progress)))
+ stoplag(1)
+ qdel(progress)
+
+/datum/component/storage/proc/mass_remove_from_storage(atom/target, list/things, datum/progressbar/progress, trigger_on_found = TRUE)
+ var/atom/real_location = real_location()
+ for(var/obj/item/I in things)
+ things -= I
+ if(I.loc != real_location)
+ continue
+ remove_from_storage(I, target)
+ if(trigger_on_found && I.on_found())
+ return FALSE
+ if(TICK_CHECK)
+ progress.update(progress.goal - length(things))
+ return TRUE
+ progress.update(progress.goal - length(things))
+ return FALSE
+
+/datum/component/storage/proc/do_quick_empty(atom/_target)
+ if(!_target)
+ _target = get_turf(parent)
+ if(usr)
+ hide_from(usr)
+ var/list/contents = contents()
+ var/atom/real_location = real_location()
+ for(var/obj/item/I in contents)
+ if(I.loc != real_location)
+ continue
+ remove_from_storage(I, _target)
+ return TRUE
+
+/datum/component/storage/proc/set_locked(new_state)
+ locked = new_state
+ if(locked)
+ close_all()
+
+/datum/component/storage/proc/_process_numerical_display()
+ . = list()
+ var/atom/real_location = real_location()
+ for(var/obj/item/I in real_location.contents)
+ if(QDELETED(I))
+ continue
+ if(!.[I.type])
+ .[I.type] = new /datum/numbered_display(I, 1)
+ else
+ var/datum/numbered_display/ND = .[I.type]
+ ND.number++
+
+//This proc determines the size of the inventory to be displayed. Please touch it only if you know what you're doing.
+/datum/component/storage/proc/orient2hud()
+ var/atom/real_location = real_location()
+ var/adjusted_contents = real_location.contents.len
+
+ //Numbered contents display
+ var/list/datum/numbered_display/numbered_contents
+ if(display_numerical_stacking)
+ numbered_contents = _process_numerical_display()
+ adjusted_contents = numbered_contents.len
+
+ var/columns = CLAMP(max_items, 1, screen_max_columns)
+ var/rows = CLAMP(CEILING(adjusted_contents / columns, 1), 1, screen_max_rows)
+ standard_orient_objs(rows, columns, numbered_contents)
+
+//This proc draws out the inventory and places the items on it. It uses the standard position.
+/datum/component/storage/proc/standard_orient_objs(rows, cols, list/obj/item/numerical_display_contents)
+ boxes.screen_loc = "[screen_start_x]:[screen_pixel_x],[screen_start_y]:[screen_pixel_y] to [screen_start_x+cols-1]:[screen_pixel_x],[screen_start_y+rows-1]:[screen_pixel_y]"
+ var/cx = screen_start_x
+ var/cy = screen_start_y
+ if(islist(numerical_display_contents))
+ for(var/type in numerical_display_contents)
+ var/datum/numbered_display/ND = numerical_display_contents[type]
+ ND.sample_object.mouse_opacity = MOUSE_OPACITY_OPAQUE
+ ND.sample_object.screen_loc = "[cx]:[screen_pixel_x],[cy]:[screen_pixel_y]"
+ ND.sample_object.maptext = "[(ND.number > 1)? "[ND.number]" : ""]"
+ ND.sample_object.layer = ABOVE_HUD_LAYER
+ ND.sample_object.plane = ABOVE_HUD_PLANE
+ cx++
+ if(cx - screen_start_x >= cols)
+ cx = screen_start_x
+ cy++
+ if(cy - screen_start_y >= rows)
+ break
+ else
+ var/atom/real_location = real_location()
+ for(var/obj/O in real_location)
+ if(QDELETED(O))
+ continue
+ O.mouse_opacity = MOUSE_OPACITY_OPAQUE //This is here so storage items that spawn with contents correctly have the "click around item to equip"
+ O.screen_loc = "[cx]:[screen_pixel_x],[cy]:[screen_pixel_y]"
+ O.maptext = ""
+ O.layer = ABOVE_HUD_LAYER
+ O.plane = ABOVE_HUD_PLANE
+ cx++
+ if(cx - screen_start_x >= cols)
+ cx = screen_start_x
+ cy++
+ if(cy - screen_start_y >= rows)
+ break
+ closer.screen_loc = "[screen_start_x + cols]:[screen_pixel_x],[screen_start_y]:[screen_pixel_y]"
+
+/datum/component/storage/proc/show_to(mob/M)
+ if(!M.client)
+ return FALSE
+ var/atom/real_location = real_location()
+ if(M.active_storage != src && (M.stat == CONSCIOUS))
+ for(var/obj/item/I in real_location)
+ if(I.on_found(M))
+ return FALSE
+ if(M.active_storage)
+ M.active_storage.hide_from(M)
+ orient2hud()
+ M.client.screen |= boxes
+ M.client.screen |= closer
+ M.client.screen |= real_location.contents
+ M.active_storage = src
+ LAZYOR(is_using, M)
+ return TRUE
+
+/datum/component/storage/proc/hide_from(mob/M)
+ if(!M.client)
+ return TRUE
+ var/atom/real_location = real_location()
+ M.client.screen -= boxes
+ M.client.screen -= closer
+ M.client.screen -= real_location.contents
+ if(M.active_storage == src)
+ M.active_storage = null
+ LAZYREMOVE(is_using, M)
+ return TRUE
+
+/datum/component/storage/proc/close(mob/M)
+ hide_from(M)
+
+/datum/component/storage/proc/close_all()
+ . = FALSE
+ for(var/mob/M in can_see_contents())
+ close(M)
+ . = TRUE //returns TRUE if any mobs actually got a close(M) call
+
+/datum/component/storage/proc/emp_act(severity)
+ if(emp_shielded)
+ return
+ var/datum/component/storage/concrete/master = master()
+ master.emp_act(severity)
+
+//This proc draws out the inventory and places the items on it. tx and ty are the upper left tile and mx, my are the bottm right.
+//The numbers are calculated from the bottom-left The bottom-left slot being 1,1.
+/datum/component/storage/proc/orient_objs(tx, ty, mx, my)
+ var/atom/real_location = real_location()
+ var/cx = tx
+ var/cy = ty
+ boxes.screen_loc = "[tx]:,[ty] to [mx],[my]"
+ for(var/obj/O in real_location)
+ if(QDELETED(O))
+ continue
+ O.screen_loc = "[cx],[cy]"
+ O.layer = ABOVE_HUD_LAYER
+ O.plane = ABOVE_HUD_PLANE
+ cx++
+ if(cx > mx)
+ cx = tx
+ cy--
+ closer.screen_loc = "[mx+1],[my]"
+
+//Resets something that is being removed from storage.
+/datum/component/storage/proc/_removal_reset(atom/movable/thing)
+ if(!istype(thing))
+ return FALSE
+ var/datum/component/storage/concrete/master = master()
+ if(!istype(master))
+ return FALSE
+ return master._removal_reset(thing)
+
+/datum/component/storage/proc/_remove_and_refresh(atom/movable/thing)
+ _removal_reset(thing)
+ refresh_mob_views()
+
+//Call this proc to handle the removal of an item from the storage item. The item will be moved to the new_location target, if that is null it's being deleted
+/datum/component/storage/proc/remove_from_storage(atom/movable/AM, atom/new_location)
+ if(!istype(AM))
+ return FALSE
+ var/datum/component/storage/concrete/master = master()
+ if(!istype(master))
+ return FALSE
+ return master.remove_from_storage(AM, new_location)
+
+/datum/component/storage/proc/refresh_mob_views()
+ var/list/seeing = can_see_contents()
+ for(var/i in seeing)
+ show_to(i)
+ return TRUE
+
+/datum/component/storage/proc/can_see_contents()
+ var/list/cansee = list()
+ for(var/mob/M in is_using)
+ if(M.active_storage == src && M.client)
+ cansee |= M
+ else
+ LAZYREMOVE(is_using, M)
+ return cansee
+
+//Tries to dump content
+/datum/component/storage/proc/dump_content_at(atom/dest_object, mob/M)
+ var/atom/A = parent
+ var/atom/dump_destination = dest_object.get_dumping_location()
+ if(A.Adjacent(M) && dump_destination && M.Adjacent(dump_destination))
+ if(locked)
+ to_chat(M, "[parent] seems to be locked!")
+ return FALSE
+ if(dump_destination.storage_contents_dump_act(src, M))
+ playsound(A, "rustle", 50, 1, -5)
+ return TRUE
+ return FALSE
+
+//This proc is called when you want to place an item into the storage item.
+/datum/component/storage/proc/attackby(obj/item/I, mob/M, params)
+ if(istype(I, /obj/item/hand_labeler))
+ var/obj/item/hand_labeler/labeler = I
+ if(labeler.mode)
+ return FALSE
+ . = TRUE //no afterattack
+ if(iscyborg(M))
+ return
+ if(!can_be_inserted(I, FALSE, M))
+ var/atom/real_location = real_location()
+ if(real_location.contents.len >= max_items) //don't use items on the backpack if they don't fit
+ return TRUE
+ return FALSE
+ handle_item_insertion(I, FALSE, M)
+
+/datum/component/storage/proc/return_inv(recursive)
+ var/list/ret = list()
+ ret |= contents()
+ if(recursive)
+ for(var/i in ret.Copy())
+ var/atom/A = i
+ A.SendSignal(COMSIG_TRY_STORAGE_RETURN_INVENTORY, ret, TRUE)
+ return ret
+
+/datum/component/storage/proc/contents() //ONLY USE IF YOU NEED TO COPY CONTENTS OF REAL LOCATION, COPYING IS NOT AS FAST AS DIRECT ACCESS!
+ var/atom/real_location = real_location()
+ return real_location.contents.Copy()
+
+//Abuses the fact that lists are just references, or something like that.
+/datum/component/storage/proc/signal_return_inv(list/interface, recursive = TRUE)
+ if(!islist(interface))
+ return FALSE
+ interface |= return_inv(recursive)
+ return TRUE
+
+/datum/component/storage/proc/mousedrop_onto(atom/over_object, mob/M)
+ set waitfor = FALSE
+ . = COMPONENT_NO_MOUSEDROP
+ var/atom/A = parent
+ if(ismob(M)) //all the check for item manipulation are in other places, you can safely open any storages as anything and its not buggy, i checked
+ A.add_fingerprint(M)
+ if(!over_object)
+ return FALSE
+ if(ismecha(M.loc)) // stops inventory actions in a mech
+ return FALSE
+ // this must come before the screen objects only block, dunno why it wasn't before
+ if(over_object == M)
+ user_show_to_mob(M)
+ if(!M.incapacitated())
+ if(!istype(over_object, /obj/screen))
+ dump_content_at(over_object, M)
+ return
+ if(A.loc != M)
+ return
+ playsound(A, "rustle", 50, 1, -5)
+ if(istype(over_object, /obj/screen/inventory/hand))
+ var/obj/screen/inventory/hand/H = over_object
+ M.putItemFromInventoryInHandIfPossible(A, H.held_index)
+ return
+ A.add_fingerprint(M)
+
+/datum/component/storage/proc/user_show_to_mob(mob/M, force = FALSE)
+ var/atom/A = parent
+ if(!istype(M))
+ return FALSE
+ A.add_fingerprint(M)
+ if(locked && !force)
+ to_chat(M, "[parent] seems to be locked!")
+ return FALSE
+ if(force || M.CanReach(parent, view_only = TRUE))
+ show_to(M)
+
+/datum/component/storage/proc/mousedrop_recieve(atom/movable/O, mob/M)
+ if(isitem(O))
+ var/obj/item/I = O
+ if(iscarbon(M) || isdrone(M))
+ var/mob/living/L = M
+ if(!L.incapacitated() && I == L.get_active_held_item())
+ if(!I.SendSignal(COMSIG_CONTAINS_STORAGE) && can_be_inserted(I, FALSE)) //If it has storage it should be trying to dump, not insert.
+ handle_item_insertion(I, FALSE, L)
+
+//This proc return 1 if the item can be picked up and 0 if it can't.
+//Set the stop_messages to stop it from printing messages
+/datum/component/storage/proc/can_be_inserted(obj/item/I, stop_messages = FALSE, mob/M)
+ if(!istype(I) || (I.flags_1 & ABSTRACT_1))
+ return FALSE //Not an item
+ if(I == parent)
+ return FALSE //no paradoxes for you
+ var/atom/real_location = real_location()
+ var/atom/host = parent
+ if(real_location == I.loc)
+ return FALSE //Means the item is already in the storage item
+ if(locked)
+ if(M)
+ host.add_fingerprint(M)
+ to_chat(M, "[host] seems to be locked!")
+ return FALSE
+ if(real_location.contents.len >= max_items)
+ if(!stop_messages)
+ to_chat(M, "[host] is full, make some space!")
+ return FALSE //Storage item is full
+ if(length(can_hold))
+ if(!is_type_in_typecache(I, can_hold))
+ if(!stop_messages)
+ to_chat(M, "[host] cannot hold [I]!")
+ return FALSE
+ if(is_type_in_typecache(I, cant_hold)) //Check for specific items which this container can't hold.
+ if(!stop_messages)
+ to_chat(M, "[host] cannot hold [I]!")
+ return FALSE
+ if(I.w_class > max_w_class)
+ if(!stop_messages)
+ to_chat(M, "[I] is too big for [host]!")
+ return FALSE
+ var/sum_w_class = I.w_class
+ for(var/obj/item/_I in real_location)
+ sum_w_class += _I.w_class //Adds up the combined w_classes which will be in the storage item if the item is added to it.
+ if(sum_w_class > max_combined_w_class)
+ if(!stop_messages)
+ to_chat(M, "[I] won't fit in [host], make some space!")
+ return FALSE
+ if(isitem(host))
+ var/obj/item/IP = host
+ GET_COMPONENT_FROM(STR_I, /datum/component/storage, I)
+ if((I.w_class >= IP.w_class) && STR_I && !allow_big_nesting)
+ if(!stop_messages)
+ to_chat(M, "[IP] cannot hold [I] as it's a storage item of the same size!")
+ return FALSE //To prevent the stacking of same sized storage items.
+ if(I.flags_1 & NODROP_1) //SHOULD be handled in unEquip, but better safe than sorry.
+ to_chat(M, "\the [I] is stuck to your hand, you can't put it in \the [host]!")
+ return FALSE
+ var/datum/component/storage/concrete/master = master()
+ if(!istype(master))
+ return FALSE
+ return master.slave_can_insert_object(src, I, stop_messages, M)
+
+/datum/component/storage/proc/_insert_physical_item(obj/item/I, override = FALSE)
+ return FALSE
+
+//This proc handles items being inserted. It does not perform any checks of whether an item can or can't be inserted. That's done by can_be_inserted()
+//The stop_warning parameter will stop the insertion message from being displayed. It is intended for cases where you are inserting multiple items at once,
+//such as when picking up all the items on a tile with one click.
+/datum/component/storage/proc/handle_item_insertion(obj/item/I, prevent_warning = FALSE, mob/M, datum/component/storage/remote)
+ var/atom/parent = src.parent
+ var/datum/component/storage/concrete/master = master()
+ if(!istype(master))
+ return FALSE
+ if(silent)
+ prevent_warning = TRUE
+ if(M)
+ parent.add_fingerprint(M)
+ . = master.handle_item_insertion_from_slave(src, I, prevent_warning, M)
+
+/datum/component/storage/proc/mob_item_insertion_feedback(mob/user, mob/M, obj/item/I, override = FALSE)
+ if(silent && !override)
+ return
+ if(rustle_sound)
+ playsound(parent, "rustle", 50, 1, -5)
+ for(var/mob/viewing in viewers(user, null))
+ if(M == viewing)
+ to_chat(usr, "You put [I] [insert_preposition]to [parent].")
+ else if(in_range(M, viewing)) //If someone is standing close enough, they can tell what it is...
+ viewing.show_message("[M] puts [I] [insert_preposition]to [parent].", 1)
+ else if(I && I.w_class >= 3) //Otherwise they can only see large or normal items from a distance...
+ viewing.show_message("[M] puts [I] [insert_preposition]to [parent].", 1)
+
+/datum/component/storage/proc/update_icon()
+ if(isobj(parent))
+ var/obj/O = parent
+ O.update_icon()
+
+/datum/component/storage/proc/signal_insertion_attempt(obj/item/I, mob/M, silent = FALSE, force = FALSE)
+ if((!force && !can_be_inserted(I, TRUE, M)) || (I == parent))
+ return FALSE
+ return handle_item_insertion(I, silent, M)
+
+/datum/component/storage/proc/signal_can_insert(obj/item/I, mob/M, silent = FALSE)
+ return can_be_inserted(I, silent, M)
+
+/datum/component/storage/proc/show_to_ghost(mob/dead/observer/M)
+ return user_show_to_mob(M, TRUE)
+
+/datum/component/storage/proc/signal_show_attempt(mob/showto, force = FALSE)
+ return user_show_to_mob(showto, force)
+
+/datum/component/storage/proc/on_check()
+ return TRUE
+
+/datum/component/storage/proc/check_locked()
+ return locked
+
+/datum/component/storage/proc/signal_take_type(type, atom/destination, amount = INFINITY, check_adjacent = FALSE, force = FALSE, mob/user, list/inserted)
+ if(!force)
+ if(check_adjacent)
+ if(user)
+ if(!user.CanReach(destination) || !user.CanReach(parent))
+ return FALSE
+ else if(!destination.CanReachStorage(parent))
+ return FALSE
+ var/list/taking = typecache_filter_list(contents(), typecacheof(type))
+ if(length(taking) > amount)
+ taking.Cut(amount)
+ if(inserted) //duplicated code for performance, don't bother checking retval/checking for list every item.
+ for(var/i in taking)
+ if(remove_from_storage(i, destination))
+ inserted |= i
+ else
+ for(var/i in taking)
+ remove_from_storage(i, destination)
+ return TRUE
+
+/datum/component/storage/proc/remaining_space_items()
+ var/atom/real_location = real_location()
+ return max(0, max_items - real_location.contents.len)
+
+/datum/component/storage/proc/signal_fill_type(type, amount = 20, force = FALSE)
+ var/atom/real_location = real_location()
+ if(!force)
+ amount = min(remaining_space_items(), amount)
+ for(var/i in 1 to amount)
+ handle_item_insertion(new type(real_location), TRUE)
+ CHECK_TICK
+ return TRUE
+
+/datum/component/storage/proc/on_attack_hand(mob/user)
+ var/atom/A = parent
+ if(!attack_hand_interact)
+ return
+ if(user.active_storage == src && A.loc == user) //if you're already looking inside the storage item
+ user.active_storage.close(user)
+ close(user)
+ . = COMPONENT_NO_ATTACK_HAND
+ return
+
+ if(rustle_sound)
+ playsound(A, "rustle", 50, 1, -5)
+
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ if(H.l_store == A && !H.get_active_held_item()) //Prevents opening if it's in a pocket.
+ . = COMPONENT_NO_ATTACK_HAND
+ H.put_in_hands(A)
+ H.l_store = null
+ return
+ if(H.r_store == A && !H.get_active_held_item())
+ . = COMPONENT_NO_ATTACK_HAND
+ H.put_in_hands(A)
+ H.r_store = null
+ return
+
+ if(A.loc == user)
+ . = COMPONENT_NO_ATTACK_HAND
+ show_to(user)
+
+/datum/component/storage/proc/signal_on_pickup(mob/user)
+ var/atom/A = parent
+ update_actions()
+ for(var/mob/M in range(1, A))
+ if(M.active_storage == src)
+ close(M)
+
+/datum/component/storage/proc/signal_take_obj(atom/movable/AM, new_loc, force = FALSE)
+ if(!(AM in real_location()))
+ return FALSE
+ return remove_from_storage(AM, new_loc)
+
+/datum/component/storage/proc/signal_quick_empty(atom/loctarget)
+ return do_quick_empty(loctarget)
+
+/datum/component/storage/proc/signal_hide_attempt(mob/target)
+ return hide_from(target)
+
+/datum/component/storage/proc/on_alt_click(mob/user)
+ if(!isliving(user) || user.incapacitated() || !quickdraw || !user.CanReach(parent))
+ return
+ var/obj/item/I = locate() in real_location()
+ if(!I)
+ return
+ remove_from_storage(I, get_turf(user))
+ if(!user.put_in_hands(I))
+ to_chat(user, "You fumble for [I] and it falls on the floor.")
+ return
+ user.visible_message("[user] draws [I] from [parent]!", "You draw [I] from [parent].")
+
+/datum/component/storage/proc/gather_mode_switch(mob/user)
+ collection_mode = (collection_mode+1)%3
+ switch(collection_mode)
+ if(COLLECT_SAME)
+ to_chat(user, "[parent] now picks up all items of a single type at once.")
+ if(COLLECT_EVERYTHING)
+ to_chat(user, "[parent] now picks up all items in a tile at once.")
+ if(COLLECT_ONE)
+ to_chat(user, "[parent] now picks up one item at a time.")
\ No newline at end of file
diff --git a/code/datums/components/thermite.dm b/code/datums/components/thermite.dm
index 0cc95e57b3..809abbfdcc 100644
--- a/code/datums/components/thermite.dm
+++ b/code/datums/components/thermite.dm
@@ -21,10 +21,7 @@
)
/datum/component/thermite/Initialize(_amount)
- if(!istype(parent, /turf))
- . = COMPONENT_INCOMPATIBLE
- CRASH("A thermite component has been applied to an incorrect object. parent: [parent]")
- if(blacklist[parent.type])
+ if(!istype(parent, /turf) || blacklist[parent.type])
return COMPONENT_INCOMPATIBLE
if(immunelist[parent.type])
_amount*=0 //Yeah the overlay can still go on it and be cleaned but you arent burning down a diamond wall
diff --git a/code/datums/components/wet_floor.dm b/code/datums/components/wet_floor.dm
index 7faeb2dfb2..afba151b9f 100644
--- a/code/datums/components/wet_floor.dm
+++ b/code/datums/components/wet_floor.dm
@@ -24,8 +24,7 @@
/datum/component/wet_floor/Initialize(strength, duration_minimum, duration_add, duration_maximum, _permanent = FALSE)
if(!isopenturf(parent))
- . = COMPONENT_INCOMPATIBLE
- CRASH("Wet floor component attempted to be applied to a non open turf!")
+ return COMPONENT_INCOMPATIBLE
add_wet(strength, duration_minimum, duration_add, duration_maximum)
RegisterSignal(COMSIG_TURF_IS_WET, .proc/is_wet)
RegisterSignal(COMSIG_TURF_MAKE_DRY, .proc/dry)
@@ -136,13 +135,14 @@
for(var/i in time_left_list)
. |= text2num(i)
-/datum/component/wet_floor/OnTransfer(datum/to_datum)
- if(!isopenturf(to_datum))
- . = COMPONENT_INCOMPATIBLE
- CRASH("Wet floor component attempted to be transferred to a non open turf!")
+/datum/component/wet_floor/PreTransfer()
var/turf/O = parent
O.cut_overlay(current_overlay)
- var/turf/T = to_datum
+
+/datum/component/wet_floor/PostTransfer()
+ if(!isopenturf(parent))
+ return COMPONENT_INCOMPATIBLE
+ var/turf/T = parent
T.add_overlay(current_overlay)
/datum/component/wet_floor/proc/add_wet(type, duration_minimum = 0, duration_add = 0, duration_maximum = MAXIMUM_WET_TIME, _permanent = FALSE)
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index c6c0f2353a..59953a4ce1 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -1,3 +1,6 @@
+/datum/proc/CanProcCall(procname)
+ return TRUE
+
/datum/proc/can_vv_get(var_name)
return TRUE
diff --git a/code/datums/diseases/advance/symptoms/vomit.dm b/code/datums/diseases/advance/symptoms/vomit.dm
index 14d7f105ab..53e79f0cc1 100644
--- a/code/datums/diseases/advance/symptoms/vomit.dm
+++ b/code/datums/diseases/advance/symptoms/vomit.dm
@@ -55,7 +55,7 @@ Bonus
switch(A.stage)
if(1, 2, 3, 4)
if(prob(base_message_chance) && !suppress_warning)
- to_chat(M, "[pick("You feel nauseous.", "You feel like you're going to throw up!")]")
+ to_chat(M, "[pick("You feel nauseated.", "You feel like you're going to throw up!")]")
else
vomit(M)
diff --git a/code/datums/diseases/heart_failure.dm b/code/datums/diseases/heart_failure.dm
index a9adf39812..3fbf6ef177 100644
--- a/code/datums/diseases/heart_failure.dm
+++ b/code/datums/diseases/heart_failure.dm
@@ -34,7 +34,7 @@
to_chat(H, "You feel dizzy.")
H.confused += 6
if(prob(3))
- to_chat(H, "You feel [pick("full", "nauseous", "sweaty", "weak", "tired", "short on breath", "uneasy")].")
+ to_chat(H, "You feel [pick("full", "nauseated", "sweaty", "weak", "tired", "short on breath", "uneasy")].")
if(3 to 4)
if(!sound)
H.playsound_local(H, 'sound/health/slowbeat.ogg',40,0, channel = CHANNEL_HEARTBEAT)
diff --git a/code/datums/diseases/rhumba_beat.dm b/code/datums/diseases/rhumba_beat.dm
index 2df4466822..52e9c2e19f 100644
--- a/code/datums/diseases/rhumba_beat.dm
+++ b/code/datums/diseases/rhumba_beat.dm
@@ -9,7 +9,6 @@
viable_mobtypes = list(/mob/living/carbon/human)
permeability_mod = 1
severity = DISEASE_SEVERITY_BIOHAZARD
- process_dead = TRUE
/datum/disease/rhumba_beat/stage_act()
..()
diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm
index 9b431732aa..b459b31fcb 100644
--- a/code/datums/helper_datums/getrev.dm
+++ b/code/datums/helper_datums/getrev.dm
@@ -5,7 +5,7 @@
var/date
/datum/getrev/New()
- testmerge = SERVER_TOOLS_PR_LIST
+ testmerge = world.TgsTestMerges()
log_world("Running /tg/ revision:")
var/list/logs = world.file2list(".git/logs/HEAD")
if(logs)
@@ -21,7 +21,8 @@
log_world(commit)
for(var/line in testmerge)
if(line)
- var/tmcommit = testmerge[line]["commit"]
+ var/datum/tgs_revision_information/test_merge/tm = line
+ var/tmcommit = tm.commit
log_world("Test merge active of PR #[line] commit [tmcommit]")
SSblackbox.record_feedback("nested tally", "testmerged_prs", 1, list("[line]", "[tmcommit]"))
if(originmastercommit)
@@ -34,11 +35,12 @@
return ""
. = header ? "The following pull requests are currently test merged:
" : ""
for(var/line in testmerge)
- var/cm = testmerge[line]["commit"]
- var/details = ": '" + html_encode(testmerge[line]["title"]) + "' by " + html_encode(testmerge[line]["author"]) + " at commit " + html_encode(copytext(cm, 1, min(length(cm), 7)))
+ var/datum/tgs_revision_information/test_merge/tm = line
+ var/cm = tm.pull_request_commit
+ var/details = ": '" + html_encode(tm.title) + "' by " + html_encode(tm.author) + " at commit " + html_encode(copytext(cm, 1, min(length(cm), 11)))
if(details && findtext(details, "\[s\]") && (!usr || !usr.client.holder))
continue
- . += "#[line][details]
"
+ . += "#[tm.number][details]
"
/client/verb/showrevinfo()
set category = "OOC"
@@ -54,13 +56,12 @@
to_chat(src, GLOB.revdata.GetTestMergeInfo())
prefix = "Based off origin/master commit: "
var/pc = GLOB.revdata.originmastercommit
- to_chat(src, "[prefix][copytext(pc, 1, min(length(pc), 7))]")
+ to_chat(src, "[prefix][copytext(pc, 1, min(length(pc), 11))]")
else
to_chat(src, "Master revision unknown")
to_chat(src, "Revision: [GLOB.revdata.commit]")
- if(SERVER_TOOLS_PRESENT)
- to_chat(src, "Server tools version: [SERVER_TOOLS_VERSION]")
- to_chat(src, "Server tools API version: [SERVER_TOOLS_API_VERSION]")
+ if(world.TgsAvailable())
+ to_chat(src, "Server tools version: [world.TgsVersion()]")
to_chat(src, "Current Informational Settings:")
to_chat(src, "Protect Authority Roles From Traitor: [CONFIG_GET(flag/protect_roles_from_antagonist)]")
to_chat(src, "Protect Assistant Role From Traitor: [CONFIG_GET(flag/protect_assistant_from_antagonist)]")
diff --git a/code/datums/martial/mushpunch.dm b/code/datums/martial/mushpunch.dm
index b68d1f1b2b..7c99d4d8aa 100644
--- a/code/datums/martial/mushpunch.dm
+++ b/code/datums/martial/mushpunch.dm
@@ -23,7 +23,7 @@
/obj/item/mushpunch
name = "odd mushroom"
desc = "Sapienza Ophioglossoides:An odd mushroom from the flesh of a mushroom person. it has apparently retained some innate power of it's owner, as it quivers with barely-contained POWER!"
- icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
+ icon = 'icons/obj/hydroponics/seeds.dmi'
icon_state = "mycelium-angel"
/obj/item/mushpunch/attack_self(mob/living/carbon/human/user)
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/radiation_wave.dm b/code/datums/radiation_wave.dm
index 68d8ebc31f..f02d352310 100644
--- a/code/datums/radiation_wave.dm
+++ b/code/datums/radiation_wave.dm
@@ -29,6 +29,9 @@
/datum/radiation_wave/process()
master_turf = get_step(master_turf, move_dir)
+ if(!master_turf)
+ qdel(src)
+ return
steps++
var/list/atoms = get_rad_atoms()
diff --git a/code/datums/traits/_trait.dm b/code/datums/traits/_quirk.dm
similarity index 60%
rename from code/datums/traits/_trait.dm
rename to code/datums/traits/_quirk.dm
index 96f6857970..5f0d1be1f2 100644
--- a/code/datums/traits/_trait.dm
+++ b/code/datums/traits/_quirk.dm
@@ -1,94 +1,94 @@
-//every trait in this folder should be coded around being applied on spawn
-//these are NOT "mob traits" like GOTTAGOFAST, but exist as a medium to apply them and other different effects
-/datum/trait
- var/name = "Test Trait"
- var/desc = "This is a test trait."
+//every quirk in this folder should be coded around being applied on spawn
+//these are NOT "mob quirks" like GOTTAGOFAST, but exist as a medium to apply them and other different effects
+/datum/quirk
+ var/name = "Test Quirk"
+ var/desc = "This is a test quirk."
var/value = 0
var/human_only = TRUE
var/gain_text
var/lose_text
var/medical_record_text //This text will appear on medical records for the trait. Not yet implemented
- var/mood_trait = FALSE //if true, this trait affects mood and is unavailable if moodlets are disabled
+ var/mood_quirk = FALSE //if true, this quirk affects mood and is unavailable if moodlets are disabled
var/mob_trait //if applicable, apply and remove this mob trait
- var/mob/living/trait_holder
+ var/mob/living/quirk_holder
-/datum/trait/New(mob/living/trait_mob, spawn_effects)
+/datum/quirk/New(mob/living/quirk_mob, spawn_effects)
..()
- if(!trait_mob || (human_only && !ishuman(trait_mob)) || trait_mob.has_trait_datum(type))
+ if(!quirk_mob || (human_only && !ishuman(quirk_mob)) || quirk_mob.has_quirk(type))
qdel(src)
- trait_holder = trait_mob
- SStraits.trait_objects += src
- to_chat(trait_holder, gain_text)
- trait_holder.roundstart_traits += src
+ quirk_holder = quirk_mob
+ SSquirks.quirk_objects += src
+ to_chat(quirk_holder, gain_text)
+ quirk_holder.roundstart_quirks += src
if(mob_trait)
- trait_holder.add_trait(mob_trait, ROUNDSTART_TRAIT)
- START_PROCESSING(SStraits, src)
+ quirk_holder.add_trait(mob_trait, ROUNDSTART_TRAIT)
+ START_PROCESSING(SSquirks, src)
add()
if(spawn_effects)
on_spawn()
addtimer(CALLBACK(src, .proc/post_add), 30)
-/datum/trait/Destroy()
- STOP_PROCESSING(SStraits, src)
+/datum/quirk/Destroy()
+ STOP_PROCESSING(SSquirks, src)
remove()
- if(trait_holder)
- to_chat(trait_holder, lose_text)
- trait_holder.roundstart_traits -= src
+ if(quirk_holder)
+ to_chat(quirk_holder, lose_text)
+ quirk_holder.roundstart_quirks -= src
if(mob_trait)
- trait_holder.remove_trait(mob_trait, ROUNDSTART_TRAIT, TRUE)
- SStraits.trait_objects -= src
+ quirk_holder.remove_trait(mob_trait, ROUNDSTART_TRAIT, TRUE)
+ SSquirks.quirk_objects -= src
return ..()
-/datum/trait/proc/transfer_mob(mob/living/to_mob)
- trait_holder.roundstart_traits -= src
- to_mob.roundstart_traits += src
+/datum/quirk/proc/transfer_mob(mob/living/to_mob)
+ quirk_holder.roundstart_quirks -= src
+ to_mob.roundstart_quirks += src
if(mob_trait)
- trait_holder.remove_trait(mob_trait, ROUNDSTART_TRAIT)
+ quirk_holder.remove_trait(mob_trait, ROUNDSTART_TRAIT)
to_mob.add_trait(mob_trait, ROUNDSTART_TRAIT)
- trait_holder = to_mob
+ quirk_holder = to_mob
on_transfer()
-/datum/trait/proc/add() //special "on add" effects
-/datum/trait/proc/on_spawn() //these should only trigger when the character is being created for the first time, i.e. roundstart/latejoin
-/datum/trait/proc/remove() //special "on remove" effects
-/datum/trait/proc/on_process() //process() has some special checks, so this is the actual process
-/datum/trait/proc/post_add() //for text, disclaimers etc. given after you spawn in with the trait
-/datum/trait/proc/on_transfer() //code called when the trait is transferred to a new mob
+/datum/quirk/proc/add() //special "on add" effects
+/datum/quirk/proc/on_spawn() //these should only trigger when the character is being created for the first time, i.e. roundstart/latejoin
+/datum/quirk/proc/remove() //special "on remove" effects
+/datum/quirk/proc/on_process() //process() has some special checks, so this is the actual process
+/datum/quirk/proc/post_add() //for text, disclaimers etc. given after you spawn in with the trait
+/datum/quirk/proc/on_transfer() //code called when the trait is transferred to a new mob
-/datum/trait/process()
- if(QDELETED(trait_holder))
- trait_holder = null
+/datum/quirk/process()
+ if(QDELETED(quirk_holder))
+ quirk_holder = null
qdel(src)
return
- if(trait_holder.stat == DEAD)
+ if(quirk_holder.stat == DEAD)
return
on_process()
/mob/living/proc/get_trait_string(medical) //helper string. gets a string of all the traits the mob has
var/list/dat = list()
if(!medical)
- for(var/V in roundstart_traits)
- var/datum/trait/T = V
+ for(var/V in roundstart_quirks)
+ var/datum/quirk/T = V
dat += T.name
if(!dat.len)
return "None"
return dat.Join(", ")
else
- for(var/V in roundstart_traits)
- var/datum/trait/T = V
+ for(var/V in roundstart_quirks)
+ var/datum/quirk/T = V
dat += T.medical_record_text
if(!dat.len)
return "None"
return dat.Join("
")
/mob/living/proc/cleanse_trait_datums() //removes all trait datums
- for(var/V in roundstart_traits)
- var/datum/trait/T = V
+ for(var/V in roundstart_quirks)
+ var/datum/quirk/T = V
qdel(T)
/mob/living/proc/transfer_trait_datums(mob/living/to_mob)
- for(var/V in roundstart_traits)
- var/datum/trait/T = V
+ for(var/V in roundstart_quirks)
+ var/datum/quirk/T = V
T.transfer_mob(to_mob)
/*
@@ -96,7 +96,7 @@
Commented version of Nearsighted to help you add your own traits
Use this as a guideline
-/datum/trait/nearsighted
+/datum/quirk/nearsighted
name = "Nearsighted"
///The trait's name
@@ -116,8 +116,8 @@ Use this as a guideline
medical_record_text = "Subject has permanent nearsightedness."
///These three are self-explanatory
-/datum/trait/nearsighted/on_spawn()
- var/mob/living/carbon/human/H = trait_holder
+/datum/quirk/nearsighted/on_spawn()
+ var/mob/living/carbon/human/H = quirk_holder
var/obj/item/clothing/glasses/regular/glasses = new(get_turf(H))
H.put_in_hands(glasses)
H.equip_to_slot(glasses, slot_glasses)
diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm
index d05541fafb..d48c70f31b 100644
--- a/code/datums/traits/good.dm
+++ b/code/datums/traits/good.dm
@@ -1,7 +1,7 @@
//predominantly positive traits
//this file is named weirdly so that positive traits are listed above negative ones
-/datum/trait/alcohol_tolerance
+/datum/quirk/alcohol_tolerance
name = "Alcohol Tolerance"
desc = "You become drunk more slowly and suffer fewer drawbacks from alcohol."
value = 1
@@ -11,25 +11,25 @@
-/datum/trait/apathetic
+/datum/quirk/apathetic
name = "Apathetic"
desc = "You just don't care as much as other people. That's nice to have in a place like this, I guess."
value = 1
- mood_trait = TRUE
+ mood_quirk = TRUE
-/datum/trait/apathetic/add()
- GET_COMPONENT_FROM(mood, /datum/component/mood, trait_holder)
+/datum/quirk/apathetic/add()
+ GET_COMPONENT_FROM(mood, /datum/component/mood, quirk_holder)
if(mood)
mood.mood_modifier = 0.8
-/datum/trait/apathetic/remove()
- GET_COMPONENT_FROM(mood, /datum/component/mood, trait_holder)
+/datum/quirk/apathetic/remove()
+ GET_COMPONENT_FROM(mood, /datum/component/mood, quirk_holder)
if(mood)
mood.mood_modifier = 1 //Change this once/if species get their own mood modifiers.
-/datum/trait/freerunning
+/datum/quirk/freerunning
name = "Freerunning"
desc = "You're great at quick moves! You can climb tables more quickly."
value = 2
@@ -39,16 +39,16 @@
-/datum/trait/jolly
+/datum/quirk/jolly
name = "Jolly"
desc = "You sometimes just feel happy, for no reason at all."
value = 1
mob_trait = TRAIT_JOLLY
- mood_trait = TRUE
+ mood_quirk = TRUE
-/datum/trait/light_step
+/datum/quirk/light_step
name = "Light Step"
desc = "You walk with a gentle step, making stepping on sharp objects quieter and less painful."
value = 1
@@ -58,7 +58,7 @@
-/datum/trait/night_vision
+/datum/quirk/night_vision
name = "Night Vision"
desc = "You can see slightly more clearly in full darkness than most people."
value = 1
@@ -66,8 +66,8 @@
gain_text = "The shadows seem a little less dark."
lose_text = "Everything seems a little darker."
-/datum/trait/night_vision/on_spawn()
- var/mob/living/carbon/human/H = trait_holder
+/datum/quirk/night_vision/on_spawn()
+ var/mob/living/carbon/human/H = quirk_holder
var/obj/item/organ/eyes/eyes = H.getorgan(/obj/item/organ/eyes)
if(!eyes || eyes.lighting_alpha)
return
@@ -75,7 +75,7 @@
-/datum/trait/selfaware
+/datum/quirk/selfaware
name = "Self-Aware"
desc = "You know your body well, and can accurately assess the extent of your wounds."
value = 2
@@ -83,7 +83,7 @@
-/datum/trait/skittish
+/datum/quirk/skittish
name = "Skittish"
desc = "You can conceal yourself in danger. Ctrl-shift-click a closed locker to jump into it, as long as you have access."
value = 2
@@ -91,7 +91,7 @@
-/datum/trait/spiritual
+/datum/quirk/spiritual
name = "Spiritual"
desc = "You're in tune with the gods, and your prayers may be more likely to be heard. Or not."
value = 1
@@ -101,7 +101,7 @@
-/datum/trait/voracious
+/datum/quirk/voracious
name = "Voracious"
desc = "Nothing gets between you and your food. You eat twice as fast as everyone else!"
value = 1
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index 57284a2558..0a2ce2f24c 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -1,6 +1,6 @@
//predominantly negative traits
-/datum/trait/blooddeficiency
+/datum/quirk/blooddeficiency
name = "Acute Blood Deficiency"
desc = "Your body can't produce enough blood to sustain itself."
value = -2
@@ -8,12 +8,12 @@
lose_text = "You feel vigorous again."
medical_record_text = "Patient requires regular treatment for blood loss due to low production of blood."
-/datum/trait/blooddeficiency/on_process()
- trait_holder.blood_volume -= 0.275
+/datum/quirk/blooddeficiency/on_process()
+ quirk_holder.blood_volume -= 0.275
-/datum/trait/depression
+/datum/quirk/depression
name = "Depression"
desc = "You sometimes just hate life."
mob_trait = TRAIT_DEPRESSION
@@ -21,22 +21,22 @@
gain_text = "You start feeling depressed."
lose_text = "You no longer feel depressed." //if only it were that easy!
medical_record_text = "Patient has a severe mood disorder causing them to experience sudden moments of sadness."
- mood_trait = TRUE
+ mood_quirk = TRUE
-/datum/trait/family_heirloom
+/datum/quirk/family_heirloom
name = "Family Heirloom"
desc = "You are the current owner of an heirloom. passed down for generations. You have to keep it safe!"
value = -1
- mood_trait = TRUE
+ mood_quirk = TRUE
var/obj/item/heirloom
var/where_text
-/datum/trait/family_heirloom/on_spawn()
- var/mob/living/carbon/human/H = trait_holder
+/datum/quirk/family_heirloom/on_spawn()
+ var/mob/living/carbon/human/H = quirk_holder
var/obj/item/heirloom_type
- switch(trait_holder.mind.assigned_role)
+ switch(quirk_holder.mind.assigned_role)
if("Clown")
heirloom_type = /obj/item/bikehorn/golden
if("Mime")
@@ -56,7 +56,7 @@
/obj/item/toy/cards/deck,
/obj/item/lighter,
/obj/item/dice/d20)
- heirloom = new heirloom_type(get_turf(trait_holder))
+ heirloom = new heirloom_type(get_turf(quirk_holder))
var/list/slots = list(
"in your backpack" = slot_in_backpack,
"in your left pocket" = slot_l_store,
@@ -65,26 +65,26 @@
var/where = H.equip_in_one_of_slots(heirloom, slots)
if(!where)
where = "at your feet"
- if(where == "in your backpack")
- H.back.SendSignal(COMSIG_TRY_STORAGE_SHOW, H)
+ else if(where == "in your backpack")
+ H.back.SendSignal(COMSIG_TRY_STORAGE_SHOW, H)
where_text = "There is a precious family [heirloom.name] [where], passed down from generation to generation. Keep it safe!"
-/datum/trait/family_heirloom/post_add()
- to_chat(trait_holder, where_text)
- var/list/family_name = splittext(trait_holder.real_name, " ")
+/datum/quirk/family_heirloom/post_add()
+ to_chat(quirk_holder, where_text)
+ var/list/family_name = splittext(quirk_holder.real_name, " ")
heirloom.name = "\improper [family_name[family_name.len]] family [heirloom.name]"
-/datum/trait/family_heirloom/on_process()
- if(heirloom in trait_holder.GetAllContents())
- trait_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "family_heirloom_missing")
- trait_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "family_heirloom", /datum/mood_event/family_heirloom)
+/datum/quirk/family_heirloom/on_process()
+ if(heirloom in quirk_holder.GetAllContents())
+ quirk_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "family_heirloom_missing")
+ quirk_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "family_heirloom", /datum/mood_event/family_heirloom)
else
- trait_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "family_heirloom")
- trait_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "family_heirloom_missing", /datum/mood_event/family_heirloom_missing)
+ quirk_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "family_heirloom")
+ quirk_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "family_heirloom_missing", /datum/mood_event/family_heirloom_missing)
-/datum/trait/heavy_sleeper
+/datum/quirk/heavy_sleeper
name = "Heavy Sleeper"
desc = "You sleep like a rock! Whenever you're put to sleep, you sleep for a little bit longer."
value = -1
@@ -93,20 +93,20 @@
lose_text = "You feel awake again."
medical_record_text = "Patient has abnormal sleep study results and is difficult to wake up."
-/datum/trait/brainproblems
+/datum/quirk/brainproblems
name = "Brain Tumor"
desc = "You have a little friend in your brain that is slowly destroying it. Better bring some mannitol!"
- value = -2
+ value = -3
gain_text = "You feel smooth."
lose_text = "You feel wrinkled again."
medical_record_text = "Patient has a tumor in their brain that is slowly driving them to brain death."
-/datum/trait/brainproblems/on_process()
- trait_holder.adjustBrainLoss(0.2)
+/datum/quirk/brainproblems/on_process()
+ quirk_holder.adjustBrainLoss(0.2)
-/datum/trait/nearsighted //t. errorage
+/datum/quirk/nearsighted //t. errorage
name = "Nearsighted"
desc = "You are nearsighted without prescription glasses, but spawn with a pair."
value = -1
@@ -114,11 +114,11 @@
lose_text = "You start seeing faraway things normally again."
medical_record_text = "Patient requires prescription glasses in order to counteract nearsightedness."
-/datum/trait/nearsighted/add()
- trait_holder.become_nearsighted(ROUNDSTART_TRAIT)
+/datum/quirk/nearsighted/add()
+ quirk_holder.become_nearsighted(ROUNDSTART_TRAIT)
-/datum/trait/nearsighted/on_spawn()
- var/mob/living/carbon/human/H = trait_holder
+/datum/quirk/nearsighted/on_spawn()
+ var/mob/living/carbon/human/H = quirk_holder
var/obj/item/clothing/glasses/regular/glasses = new(get_turf(H))
H.put_in_hands(glasses)
H.equip_to_slot(glasses, slot_glasses)
@@ -126,28 +126,28 @@
-/datum/trait/nyctophobia
+/datum/quirk/nyctophobia
name = "Nyctophobia"
desc = "As far as you can remember, you've always been afraid of the dark. While in the dark without a light source, you instinctually act careful, and constantly feel a sense of dread."
value = -1
-/datum/trait/nyctophobia/on_process()
- var/mob/living/carbon/human/H = trait_holder
+/datum/quirk/nyctophobia/on_process()
+ var/mob/living/carbon/human/H = quirk_holder
if(H.dna.species.id in list("shadow", "nightmare"))
return //we're tied with the dark, so we don't get scared of it; don't cleanse outright to avoid cheese
- var/turf/T = get_turf(trait_holder)
+ var/turf/T = get_turf(quirk_holder)
var/lums = T.get_lumcount()
if(lums <= 0.2)
- if(trait_holder.m_intent == MOVE_INTENT_RUN)
- to_chat(trait_holder, "Easy, easy, take it slow... you're in the dark...")
- trait_holder.toggle_move_intent()
- trait_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "nyctophobia", /datum/mood_event/nyctophobia)
+ if(quirk_holder.m_intent == MOVE_INTENT_RUN)
+ to_chat(quirk_holder, "Easy, easy, take it slow... you're in the dark...")
+ quirk_holder.toggle_move_intent()
+ quirk_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "nyctophobia", /datum/mood_event/nyctophobia)
else
- trait_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "nyctophobia")
+ quirk_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "nyctophobia")
-/datum/trait/nonviolent
+/datum/quirk/nonviolent
name = "Pacifist"
desc = "The thought of violence makes you sick. So much so, in fact, that you can't hurt anyone."
value = -2
@@ -156,14 +156,14 @@
lose_text = "You think you can defend yourself again."
medical_record_text = "Patient is unusually pacifistic and cannot bring themselves to cause physical harm."
-/datum/trait/nonviolent/on_process()
- if(trait_holder.mind && LAZYLEN(trait_holder.mind.antag_datums))
- to_chat(trait_holder, "Your antagonistic nature has caused you to renounce your pacifism.")
+/datum/quirk/nonviolent/on_process()
+ if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums))
+ to_chat(quirk_holder, "Your antagonistic nature has caused you to renounce your pacifism.")
qdel(src)
-/datum/trait/poor_aim
+/datum/quirk/poor_aim
name = "Poor Aim"
desc = "You're terrible with guns and can't line up a straight shot to save your life. Dual-wielding is right out."
value = -1
@@ -172,7 +172,7 @@
-/datum/trait/prosopagnosia
+/datum/quirk/prosopagnosia
name = "Prosopagnosia"
desc = "You have a mental disorder that prevents you from being able to recognize faces at all."
value = -1
@@ -181,41 +181,41 @@
-/datum/trait/prosthetic_limb
+/datum/quirk/prosthetic_limb
name = "Prosthetic Limb"
desc = "An accident caused you to lose one of your limbs. Because of this, you now have a random prosthetic!"
value = -1
var/slot_string = "limb"
-/datum/trait/prosthetic_limb/on_spawn()
+/datum/quirk/prosthetic_limb/on_spawn()
var/limb_slot = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
- var/mob/living/carbon/human/H = trait_holder
+ var/mob/living/carbon/human/H = quirk_holder
var/obj/item/bodypart/old_part = H.get_bodypart(limb_slot)
var/obj/item/bodypart/prosthetic
switch(limb_slot)
if(BODY_ZONE_L_ARM)
- prosthetic = new/obj/item/bodypart/l_arm/robot/surplus(trait_holder)
+ prosthetic = new/obj/item/bodypart/l_arm/robot/surplus(quirk_holder)
slot_string = "left arm"
if(BODY_ZONE_R_ARM)
- prosthetic = new/obj/item/bodypart/r_arm/robot/surplus(trait_holder)
+ prosthetic = new/obj/item/bodypart/r_arm/robot/surplus(quirk_holder)
slot_string = "right arm"
if(BODY_ZONE_L_LEG)
- prosthetic = new/obj/item/bodypart/l_leg/robot/surplus(trait_holder)
+ prosthetic = new/obj/item/bodypart/l_leg/robot/surplus(quirk_holder)
slot_string = "left leg"
if(BODY_ZONE_R_LEG)
- prosthetic = new/obj/item/bodypart/r_leg/robot/surplus(trait_holder)
+ prosthetic = new/obj/item/bodypart/r_leg/robot/surplus(quirk_holder)
slot_string = "right leg"
prosthetic.replace_limb(H)
qdel(old_part)
H.regenerate_icons()
-/datum/trait/prosthetic_limb/post_add()
- to_chat(trait_holder, "Your [slot_string] has been replaced with a surplus prosthetic. It is fragile and will easily come apart under duress. Additionally, \
+/datum/quirk/prosthetic_limb/post_add()
+ to_chat(quirk_holder, "Your [slot_string] has been replaced with a surplus prosthetic. It is fragile and will easily come apart under duress. Additionally, \
you need to use a welding tool and cables to repair it, instead of bruise packs and ointment.")
-/datum/trait/insanity
+/datum/quirk/insanity
name = "Reality Dissociation Syndrome"
desc = "You suffer from a severe disorder that causes very vivid hallucinations. Mindbreaker toxin can suppress its effects, and you are immune to mindbreaker's hallucinogenic properties. This is not a license to grief."
value = -2
@@ -224,32 +224,25 @@
lose_text = "You feel in tune with the world again."
medical_record_text = "Patient suffers from acute Reality Dissociation Syndrome and experiences vivid hallucinations."
-/datum/trait/insanity/on_process()
- if(trait_holder.reagents.has_reagent("mindbreaker"))
- trait_holder.hallucination = 0
+/datum/quirk/insanity/on_process()
+ if(quirk_holder.reagents.has_reagent("mindbreaker"))
+ quirk_holder.hallucination = 0
return
if(prob(2)) //we'll all be mad soon enough
madness()
+
+/datum/quirk/insanity/proc/madness()
+ quirk_holder.hallucination += rand(10, 25)
-/datum/trait/insanity/proc/madness(mad_fools)
- set waitfor = FALSE
- if(!mad_fools)
- mad_fools = prob(20)
- if(mad_fools)
- var/hallucination_type = pick(subtypesof(/datum/hallucination/rds))
- new hallucination_type (trait_holder, FALSE)
- else
- trait_holder.hallucination += rand(10, 50)
-
-/datum/trait/insanity/post_add() //I don't /think/ we'll need this but for newbies who think "roleplay as insane" = "license to kill" it's probably a good thing to have
- if(!trait_holder.mind || trait_holder.mind.special_role)
+/datum/quirk/insanity/post_add() //I don't /think/ we'll need this but for newbies who think "roleplay as insane" = "license to kill" it's probably a good thing to have
+ if(!quirk_holder.mind || quirk_holder.mind.special_role)
return
- to_chat(trait_holder, "Please note that your dissociation syndrome does NOT give you the right to attack people or otherwise cause any interference to \
+ to_chat(quirk_holder, "Please note that your dissociation syndrome does NOT give you the right to attack people or otherwise cause any interference to \
the round. You are not an antagonist, and the rules will treat you the same as other crewmembers.")
-/datum/trait/social_anxiety
+/datum/quirk/social_anxiety
name = "Social Anxiety"
desc = "Talking to people is very difficult for you, and you often stutter or even lock up."
value = -1
@@ -258,12 +251,12 @@
medical_record_text = "Patient is usually anxious in social encounters and prefers to avoid them."
var/dumb_thing = TRUE
-/datum/trait/social_anxiety/on_process()
+/datum/quirk/social_anxiety/on_process()
var/nearby_people = 0
- for(var/mob/living/carbon/human/H in view(5, trait_holder))
+ for(var/mob/living/carbon/human/H in view(5, quirk_holder))
if(H.client)
nearby_people++
- var/mob/living/carbon/human/H = trait_holder
+ var/mob/living/carbon/human/H = quirk_holder
if(prob(2 + nearby_people))
H.stuttering = max(3, H.stuttering)
else if(prob(min(3, nearby_people)) && !H.silent)
diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm
index 5b0fbefe10..8ef9bf0a11 100644
--- a/code/datums/traits/neutral.dm
+++ b/code/datums/traits/neutral.dm
@@ -1,7 +1,7 @@
//traits with no real impact that can be taken freely
//MAKE SURE THESE DO NOT MAJORLY IMPACT GAMEPLAY. those should be positive or negative traits.
-/datum/trait/no_taste
+/datum/quirk/no_taste
name = "Ageusia"
desc = "You can't taste anything! Toxic food will still poison you."
value = 0
@@ -12,41 +12,75 @@
-/datum/trait/deviant_tastes
+/datum/quirk/pineapple_liker
+ name = "Ananas Affinity"
+ desc = "You find yourself greatly enjoying fruits of the ananas genus. You can't seem to ever get enough of their sweet goodness!"
+ value = 0
+ gain_text = "You feel an intense craving for pineapple."
+ lose_text = "Your feelings towards pineapples seem to return to a lukewarm state."
+
+/datum/quirk/pineapple_liker/add()
+ var/mob/living/carbon/human/H = quirk_holder
+ var/datum/species/species = H.dna.species
+ species.liked_food |= PINEAPPLE
+
+/datum/quirk/pineapple_liker/remove()
+ var/mob/living/carbon/human/H = quirk_holder
+ var/datum/species/species = H.dna.species
+ species.liked_food &= ~PINEAPPLE
+
+/datum/quirk/pineapple_hater
+ name = "Ananas Aversion"
+ desc = "You find yourself greatly detesting fruits of the ananas genus. Serious, how the hell can anyone say these things are good? And what kind of madman would even dare putting it on a pizza!?"
+ value = 0
+ gain_text = "You find yourself pondering what kind of idiot actually enjoys pineapples..."
+ lose_text = "Your feelings towards pineapples seem to return to a lukewarm state."
+
+/datum/quirk/pineapple_hater/add()
+ var/mob/living/carbon/human/H = quirk_holder
+ var/datum/species/species = H.dna.species
+ species.disliked_food |= PINEAPPLE
+
+/datum/quirk/pineapple_hater/remove()
+ var/mob/living/carbon/human/H = quirk_holder
+ var/datum/species/species = H.dna.species
+ species.disliked_food &= ~PINEAPPLE
+
+/datum/quirk/deviant_tastes
name = "Deviant Tastes"
desc = "You dislike food that most people enjoy, and find delicious what they don't."
value = 0
gain_text = "You start craving something that tastes strange."
lose_text = "You feel like eating normal food again."
-/datum/trait/deviant_tastes/add()
- var/mob/living/carbon/human/H = trait_holder
+/datum/quirk/deviant_tastes/add()
+ var/mob/living/carbon/human/H = quirk_holder
var/datum/species/species = H.dna.species
var/liked = species.liked_food
species.liked_food = species.disliked_food
species.disliked_food = liked
-/datum/trait/deviant_tastes/remove()
- var/mob/living/carbon/human/H = trait_holder
+/datum/quirk/deviant_tastes/remove()
+ var/mob/living/carbon/human/H = quirk_holder
var/datum/species/species = H.dna.species
species.liked_food = initial(species.liked_food)
species.disliked_food = initial(species.disliked_food)
-/datum/trait/monochromatic
+/datum/quirk/monochromatic
name = "Monochromacy"
desc = "You suffer from full colorblindness, and perceive nearly the entire world in blacks and whites."
value = 0
medical_record_text = "Patient is afflicted with almost complete color blindness."
-/datum/trait/monochromatic/add()
- trait_holder.add_client_colour(/datum/client_colour/monochrome)
+/datum/quirk/monochromatic/add()
+ quirk_holder.add_client_colour(/datum/client_colour/monochrome)
-/datum/trait/monochromatic/post_add()
- if(trait_holder.mind.assigned_role == "Detective")
- to_chat(trait_holder, "Mmm. Nothing's ever clear on this station. It's all shades of gray...")
- trait_holder.playsound_local(trait_holder, 'sound/ambience/ambidet1.ogg', 50, FALSE)
+/datum/quirk/monochromatic/post_add()
+ if(quirk_holder.mind.assigned_role == "Detective")
+ to_chat(quirk_holder, "Mmm. Nothing's ever clear on this station. It's all shades of gray...")
+ quirk_holder.playsound_local(quirk_holder, 'sound/ambience/ambidet1.ogg', 50, FALSE)
-/datum/trait/monochromatic/remove()
- trait_holder.remove_client_colour(/datum/client_colour/monochrome)
+/datum/quirk/monochromatic/remove()
+ quirk_holder.remove_client_colour(/datum/client_colour/monochrome)
diff --git a/code/datums/verbs.dm b/code/datums/verbs.dm
index 72634a3ff5..79fe256bb4 100644
--- a/code/datums/verbs.dm
+++ b/code/datums/verbs.dm
@@ -1,102 +1,102 @@
-/datum/verbs
- var/name
- var/list/children
- var/datum/verbs/parent
- var/list/verblist
- var/abstract = FALSE
-
-//returns the master list for verbs of a type
-/datum/verbs/proc/GetList()
- CRASH("Abstract verblist for [type]")
-
-//do things for each entry in Generate_list
-//return value sets Generate_list[verbpath]
-/datum/verbs/proc/HandleVerb(list/entry, atom/verb/verbpath, ...)
- return entry
-
-/datum/verbs/New()
- var/mainlist = GetList()
- var/ourentry = mainlist[type]
- children = list()
- verblist = list()
- if (ourentry)
- if (!islist(ourentry)) //some of our childern already loaded
- qdel(src)
- CRASH("Verb double load: [type]")
- Add_children(ourentry)
-
- mainlist[type] = src
-
- Load_verbs(type, typesof("[type]/verb"))
-
- var/datum/verbs/parent = mainlist[parent_type]
- if (!parent)
- mainlist[parent_type] = list(src)
- else if (islist(parent))
- parent += src
- else
- parent.Add_children(list(src))
-
-/datum/verbs/proc/Set_parent(datum/verbs/_parent)
- parent = _parent
- if (abstract)
- parent.Add_children(children)
- var/list/verblistoftypes = list()
- for(var/thing in verblist)
- LAZYADD(verblistoftypes[verblist[thing]], thing)
-
- for(var/verbparenttype in verblistoftypes)
- parent.Load_verbs(verbparenttype, verblistoftypes[verbparenttype])
-
-/datum/verbs/proc/Add_children(list/kids)
- if (abstract && parent)
- parent.Add_children(kids)
- return
-
- for(var/thing in kids)
- var/datum/verbs/item = thing
- item.Set_parent(src)
- if (!item.abstract)
- children += item
-
-/datum/verbs/proc/Load_verbs(verb_parent_type, list/verbs)
- if (abstract && parent)
- parent.Load_verbs(verb_parent_type, verbs)
- return
-
- for (var/verbpath in verbs)
- verblist[verbpath] = verb_parent_type
-
-/datum/verbs/proc/Generate_list(...)
- . = list()
- if (length(children))
- for (var/thing in children)
- var/datum/verbs/child = thing
- var/list/childlist = child.Generate_list(arglist(args))
- if (childlist)
- var/childname = "[child]"
- if (childname == "[child.type]")
- var/list/tree = splittext(childname, "/")
- childname = tree[tree.len]
- .[child.type] = "parent=[url_encode(type)];name=[url_encode(childname)]"
- . += childlist
-
- for (var/thing in verblist)
- var/atom/verb/verbpath = thing
- if (!verbpath)
- stack_trace("Bad VERB in [type] verblist: [english_list(verblist)]")
- var/list/entry = list()
- entry["parent"] = "[type]"
- entry["name"] = verbpath.desc
- if (copytext(verbpath.name,1,2) == "@")
- entry["command"] = copytext(verbpath.name,2)
- else
- entry["command"] = replacetext(verbpath.name, " ", "-")
-
- .[verbpath] = HandleVerb(arglist(list(entry, verbpath) + args))
-
-/world/proc/LoadVerbs(verb_type)
- if(!ispath(verb_type, /datum/verbs) || verb_type == /datum/verbs)
- CRASH("Invalid verb_type: [verb_type]")
- for (var/typepath in subtypesof(verb_type))
- new typepath()
+/datum/verbs
+ var/name
+ var/list/children
+ var/datum/verbs/parent
+ var/list/verblist
+ var/abstract = FALSE
+
+//returns the master list for verbs of a type
+/datum/verbs/proc/GetList()
+ CRASH("Abstract verblist for [type]")
+
+//do things for each entry in Generate_list
+//return value sets Generate_list[verbpath]
+/datum/verbs/proc/HandleVerb(list/entry, atom/verb/verbpath, ...)
+ return entry
+
+/datum/verbs/New()
+ var/mainlist = GetList()
+ var/ourentry = mainlist[type]
+ children = list()
+ verblist = list()
+ if (ourentry)
+ if (!islist(ourentry)) //some of our childern already loaded
+ qdel(src)
+ CRASH("Verb double load: [type]")
+ Add_children(ourentry)
+
+ mainlist[type] = src
+
+ Load_verbs(type, typesof("[type]/verb"))
+
+ var/datum/verbs/parent = mainlist[parent_type]
+ if (!parent)
+ mainlist[parent_type] = list(src)
+ else if (islist(parent))
+ parent += src
+ else
+ parent.Add_children(list(src))
+
+/datum/verbs/proc/Set_parent(datum/verbs/_parent)
+ parent = _parent
+ if (abstract)
+ parent.Add_children(children)
+ var/list/verblistoftypes = list()
+ for(var/thing in verblist)
+ LAZYADD(verblistoftypes[verblist[thing]], thing)
+
+ for(var/verbparenttype in verblistoftypes)
+ parent.Load_verbs(verbparenttype, verblistoftypes[verbparenttype])
+
+/datum/verbs/proc/Add_children(list/kids)
+ if (abstract && parent)
+ parent.Add_children(kids)
+ return
+
+ for(var/thing in kids)
+ var/datum/verbs/item = thing
+ item.Set_parent(src)
+ if (!item.abstract)
+ children += item
+
+/datum/verbs/proc/Load_verbs(verb_parent_type, list/verbs)
+ if (abstract && parent)
+ parent.Load_verbs(verb_parent_type, verbs)
+ return
+
+ for (var/verbpath in verbs)
+ verblist[verbpath] = verb_parent_type
+
+/datum/verbs/proc/Generate_list(...)
+ . = list()
+ if (length(children))
+ for (var/thing in children)
+ var/datum/verbs/child = thing
+ var/list/childlist = child.Generate_list(arglist(args))
+ if (childlist)
+ var/childname = "[child]"
+ if (childname == "[child.type]")
+ var/list/tree = splittext(childname, "/")
+ childname = tree[tree.len]
+ .[child.type] = "parent=[url_encode(type)];name=[childname]"
+ . += childlist
+
+ for (var/thing in verblist)
+ var/atom/verb/verbpath = thing
+ if (!verbpath)
+ stack_trace("Bad VERB in [type] verblist: [english_list(verblist)]")
+ var/list/entry = list()
+ entry["parent"] = "[type]"
+ entry["name"] = verbpath.desc
+ if (copytext(verbpath.name,1,2) == "@")
+ entry["command"] = copytext(verbpath.name,2)
+ else
+ entry["command"] = replacetext(verbpath.name, " ", "-")
+
+ .[verbpath] = HandleVerb(arglist(list(entry, verbpath) + args))
+
+/world/proc/LoadVerbs(verb_type)
+ if(!ispath(verb_type, /datum/verbs) || verb_type == /datum/verbs)
+ CRASH("Invalid verb_type: [verb_type]")
+ for (var/typepath in subtypesof(verb_type))
+ new typepath()
diff --git a/code/datums/weather/weather_types/floor_is_lava.dm b/code/datums/weather/weather_types/floor_is_lava.dm
index 5db27b9f6e..00ecfff0b3 100644
--- a/code/datums/weather/weather_types/floor_is_lava.dm
+++ b/code/datums/weather/weather_types/floor_is_lava.dm
@@ -25,8 +25,10 @@
/datum/weather/floor_is_lava/weather_act(mob/living/L)
if(issilicon(L))
return
+ if(istype(L.buckled, /obj/structure/bed))
+ return
for(var/obj/structure/O in L.loc)
- if(O.density || (L in O.buckled_mobs && istype(O, /obj/structure/bed)))
+ if(O.density)
return
if(L.loc.density)
return
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/datums/world_topic.dm b/code/datums/world_topic.dm
index 93193f964a..9cbccb8fe9 100644
--- a/code/datums/world_topic.dm
+++ b/code/datums/world_topic.dm
@@ -120,8 +120,12 @@
require_comms_key = TRUE
/datum/world_topic/namecheck/Run(list/input)
- var/datum/server_tools_command/namecheck/NC = new
- return NC.Run(input["sender"], input["namecheck"])
+ //Oh this is a hack, someone refactor the functionality out of the chat command PLS
+ var/datum/tgs_chat_command/namecheck/NC = new
+ var/datum/tgs_chat_user/user = new
+ user.friendly_name = input["sender"]
+ user.mention = user.friendly_name
+ return NC.Run(user, input["namecheck"])
/datum/world_topic/adminwho
keyword = "adminwho"
@@ -136,7 +140,7 @@
/datum/world_topic/status/Run(list/input)
. = list()
.["version"] = GLOB.game_version
- .["mode"] = GLOB.master_mode
+ .["mode"] = "hidden" //CIT CHANGE - hides the gamemode in topic() calls to prevent meta'ing the gamemode
.["respawn"] = config ? !CONFIG_GET(flag/norespawn) : FALSE
.["enter"] = GLOB.enter_allowed
.["vote"] = CONFIG_GET(flag/allow_vote_mode)
@@ -164,9 +168,16 @@
.["security_level"] = get_security_level()
.["round_duration"] = SSticker ? round((world.time-SSticker.round_start_time)/10) : 0
// Amount of world's ticks in seconds, useful for calculating round duration
+
+ //Time dilation stats.
+ .["time_dilation_current"] = SStime_track.time_dilation_current
+ .["time_dilation_avg"] = SStime_track.time_dilation_avg
+ .["time_dilation_avg_slow"] = SStime_track.time_dilation_avg_slow
+ .["time_dilation_avg_fast"] = SStime_track.time_dilation_avg_fast
if(SSshuttle && SSshuttle.emergency)
.["shuttle_mode"] = SSshuttle.emergency.mode
// Shuttle status, see /__DEFINES/stat.dm
.["shuttle_timer"] = SSshuttle.emergency.timeLeft()
// Shuttle timer, in seconds
+
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 87894dd4d7..85a0fd1d4e 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -7,6 +7,7 @@
icon = 'icons/turf/areas.dmi'
icon_state = "unknown"
layer = AREA_LAYER
+ plane = BLACKNESS_PLANE //Keeping this on the default plane, GAME_PLANE, will make area overlays fail to render on FLOOR_PLANE.
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
invisibility = INVISIBILITY_LIGHTING
@@ -518,4 +519,4 @@ GLOBAL_LIST_EMPTY(teleportlocs)
// A hook so areas can modify the incoming args
/area/proc/PlaceOnTopReact(list/new_baseturfs, turf/fake_turf_type, flags)
- return flags
\ No newline at end of file
+ return flags
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 67f34cef74..c64951ca7c 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -251,24 +251,6 @@
return 1
/atom/movable/Destroy(force)
- var/inform_admins = (flags_2 & INFORM_ADMINS_ON_RELOCATE_2)
- var/stationloving = (flags_2 & STATIONLOVING_2)
-
- if(inform_admins && force)
- var/turf/T = get_turf(src)
- message_admins("[src] has been !!force deleted!! in [ADMIN_COORDJMP(T)].")
- log_game("[src] has been !!force deleted!! in [COORD(T)].")
-
- if(stationloving && !force)
- var/turf/currentturf = get_turf(src)
- var/turf/targetturf = relocate()
- log_game("[src] has been destroyed in [COORD(currentturf)]. Moving it to [COORD(targetturf)].")
- if(inform_admins)
- message_admins("[src] has been destroyed in [ADMIN_COORDJMP(currentturf)]. Moving it to [ADMIN_COORDJMP(targetturf)].")
- return QDEL_HINT_LETMELIVE
-
- if(stationloving && force)
- STOP_PROCESSING(SSinbounds, src)
QDEL_NULL(proximity_monitor)
QDEL_NULL(language_holder)
@@ -365,6 +347,7 @@
loc = null
/atom/movable/proc/onTransitZ(old_z,new_z)
+ SendSignal(COMSIG_MOVABLE_Z_CHANGED, old_z, new_z)
for (var/item in src) // Notify contents of Z-transition. This can be overridden IF we know the items contents do not care.
var/atom/movable/AM = item
AM.onTransitZ(old_z,new_z)
@@ -632,88 +615,6 @@
animate(src, pixel_y = initial(pixel_y), time = 10)
floating = FALSE
-/* Stationloving
-*
-* A stationloving atom will always teleport back to the station
-* if it ever leaves the station z-levels or CentCom. It will also,
-* when Destroy() is called, will teleport to a random turf on the
-* station.
-*
-* The turf is guaranteed to be "safe" for normal humans, probably.
-* If the station is SUPER SMASHED UP, it might not work.
-*
-* Here are some important procs:
-* relocate()
-* moves the atom to a safe turf on the station
-*
-* check_in_bounds()
-* regularly called and checks if `in_bounds()` returns true. If false, it
-* triggers a `relocate()`.
-*
-* in_bounds()
-* By default, checks that the atom's z is the station z or centcom.
-*/
-
-/atom/movable/proc/set_stationloving(state, inform_admins=FALSE)
- var/currently = (flags_2 & STATIONLOVING_2)
-
- if(inform_admins)
- flags_2 |= INFORM_ADMINS_ON_RELOCATE_2
- else
- flags_2 &= ~INFORM_ADMINS_ON_RELOCATE_2
-
- if(state == currently)
- return
- else if(!state)
- STOP_PROCESSING(SSinbounds, src)
- flags_2 &= ~STATIONLOVING_2
- else
- START_PROCESSING(SSinbounds, src)
- flags_2 |= STATIONLOVING_2
-
-/atom/movable/proc/relocate()
- var/targetturf = find_safe_turf()
- if(!targetturf)
- if(GLOB.blobstart.len > 0)
- targetturf = get_turf(pick(GLOB.blobstart))
- else
- throw EXCEPTION("Unable to find a blobstart landmark")
-
- if(ismob(loc))
- var/mob/M = loc
- M.transferItemToLoc(src, targetturf, TRUE) //nodrops disks when?
- else if(loc.SendSignal(COMSIG_CONTAINS_STORAGE))
- loc.SendSignal(COMSIG_TRY_STORAGE_TAKE, src, targetturf, TRUE)
- else
- forceMove(targetturf)
- // move the disc, so ghosts remain orbiting it even if it's "destroyed"
- return targetturf
-
-/atom/movable/proc/check_in_bounds()
- if(in_bounds())
- return
- else
- var/turf/currentturf = get_turf(src)
- to_chat(get(src, /mob), "You can't help but feel that you just lost something back there...")
- var/turf/targetturf = relocate()
- log_game("[src] has been moved out of bounds in [COORD(currentturf)]. Moving it to [COORD(targetturf)].")
- if(flags_2 & INFORM_ADMINS_ON_RELOCATE_2)
- message_admins("[src] has been moved out of bounds in [ADMIN_COORDJMP(currentturf)]. Moving it to [ADMIN_COORDJMP(targetturf)].")
-
-/atom/movable/proc/in_bounds()
- var/static/list/allowed_shuttles = typecacheof(list(/area/shuttle/syndicate, /area/shuttle/escape, /area/shuttle/pod_1, /area/shuttle/pod_2, /area/shuttle/pod_3, /area/shuttle/pod_4))
- var/turf/T = get_turf(src)
- if (!T)
- return FALSE
- if (is_station_level(T.z) || is_centcom_level(T.z))
- return TRUE
- if (is_transit_level(T.z))
- var/area/A = T.loc
- if (is_type_in_typecache(A, allowed_shuttles))
- return TRUE
-
- return FALSE
-
/* Language procs */
/atom/movable/proc/get_language_holder(shadow=TRUE)
if(language_holder)
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..457bab6c3c 100644
--- a/code/game/gamemodes/clock_cult/clock_cult.dm
+++ b/code/game/gamemodes/clock_cult/clock_cult.dm
@@ -211,7 +211,7 @@ Credit where due:
to_chat(L, "There is a paper in your backpack! It'll tell you if anything's changed, as well as what to expect.")
to_chat(L, "[slot] is a clockwork slab, a multipurpose tool used to construct machines and invoke ancient words of power. If this is your first time \
as a servant, you can find a concise tutorial in the Recollection category of its interface.")
- to_chat(L, "If you want more information, you can find a wiki link here! https://tgstation13.org/wiki/Clockwork_Cult")
+ to_chat(L, "If you want more information, you can read the wiki page to learn more.")
return TRUE
return FALSE
@@ -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..fd9a1abd4a 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()
@@ -712,6 +712,8 @@ GLOBAL_LIST_EMPTY(possible_items_special)
var/min_lings = 3 //Minimum amount of lings for this team objective to be possible
var/escape_objective_compatible = FALSE
+/datum/objective/changeling_team_objective/proc/prepare()
+ return FALSE
//Impersonate department
//Picks as many people as it can from a department (Security,Engineer,Medical,Science)
@@ -724,6 +726,19 @@ GLOBAL_LIST_EMPTY(possible_items_special)
var/department_string = ""
+/datum/objective/changeling_team_objective/impersonate_department/prepare()
+ var/result = FALSE
+ if(command_staff_only)
+ result = get_heads()
+ else
+ result = get_department_staff()
+ if(result)
+ update_explanation_text()
+ return TRUE
+ else
+ return FALSE
+
+
/datum/objective/changeling_team_objective/impersonate_department/proc/get_department_staff()
department_minds = list()
department_real_names = list()
@@ -756,9 +771,8 @@ GLOBAL_LIST_EMPTY(possible_items_special)
if(!department_minds.len)
log_game("[type] has failed to find department staff, and has removed itself. the round will continue normally")
- owner.objectives -= src
- qdel(src)
- return
+ return FALSE
+ return TRUE
/datum/objective/changeling_team_objective/impersonate_department/proc/get_heads()
@@ -785,19 +799,8 @@ GLOBAL_LIST_EMPTY(possible_items_special)
if(!department_minds.len)
log_game("[type] has failed to find department heads, and has removed itself. the round will continue normally")
- owner.objectives -= src
- qdel(src)
- return
-
-
-/datum/objective/changeling_team_objective/impersonate_department/New(var/text)
- ..()
- if(command_staff_only)
- get_heads()
- else
- get_department_staff()
-
- update_explanation_text()
+ return FALSE
+ return TRUE
/datum/objective/changeling_team_objective/impersonate_department/update_explanation_text()
@@ -862,9 +865,6 @@ GLOBAL_LIST_EMPTY(possible_items_special)
return TRUE
return FALSE
-
-
-
//A subtype of impersonate_department
//This subtype always picks as many command staff as it can (HoS,HoP,Cap,CE,CMO,RD)
//and tasks the lings with killing and replacing them
diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm
index 15e07527b9..d42c546990 100644
--- a/code/game/gamemodes/objective_items.dm
+++ b/code/game/gamemodes/objective_items.dm
@@ -41,7 +41,7 @@
name = "a hand teleporter."
targetitem = /obj/item/hand_tele
difficulty = 5
- excludefromjob = list("Captain")
+ excludefromjob = list("Captain", "Research Director")
/datum/objective_item/steal/jetpack
name = "the Captain's jetpack."
@@ -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/Sleeper.dm b/code/game/machinery/Sleeper.dm
index cefc471d08..e4b8dd9083 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -93,8 +93,6 @@
return
if(default_change_direction_wrench(user, I))
return
- if(exchange_parts(user, I))
- return
if(default_pry_open(I))
return
if(default_deconstruction_crowbar(I))
diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm
index 253f18f717..a09db0a3cc 100644
--- a/code/game/machinery/ai_slipper.dm
+++ b/code/game/machinery/ai_slipper.dm
@@ -4,6 +4,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "ai-slipper0"
layer = PROJECTILE_HIT_THRESHHOLD_LAYER
+ plane = FLOOR_PLANE
anchored = TRUE
max_integrity = 200
armor = list("melee" = 50, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
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/autolathe.dm b/code/game/machinery/autolathe.dm
index 2c8fa467c2..d6154aeb8b 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -93,9 +93,6 @@
updateUsrDialog()
return TRUE
- if(exchange_parts(user, O))
- return TRUE
-
if(default_deconstruction_crowbar(O))
return TRUE
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 0297652982..17bfe5e02c 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
@@ -126,7 +126,7 @@
return examine(user)
//Start growing a human clone in the pod!
-/obj/machinery/clonepod/proc/growclone(ckey, clonename, ui, se, mindref, datum/species/mrace, list/features, factions, list/traits)
+/obj/machinery/clonepod/proc/growclone(ckey, clonename, ui, se, mindref, datum/species/mrace, list/features, factions, list/quirks)
if(panel_open)
return FALSE
if(mess || attempting)
@@ -134,8 +134,11 @@
clonemind = locate(mindref) in SSticker.minds
if(!istype(clonemind)) //not a mind
return FALSE
- if( clonemind.current && clonemind.current.stat != DEAD ) //mind is associated with a non-dead body
- return FALSE
+ if(clonemind.current)
+ if(clonemind.current.stat != DEAD) //mind is associated with a non-dead body
+ return FALSE
+ if(clonemind.current.suiciding) // Mind is associated with a body that is suiciding.
+ return FALSE
if(clonemind.active) //somebody is using that mind
if( ckey(clonemind.key)!=ckey )
return FALSE
@@ -144,6 +147,8 @@
var/mob/dead/observer/G = clonemind.get_ghost()
if(!G)
return FALSE
+ if(G.suiciding) // The ghost came from a body that is suiciding.
+ return FALSE
if(clonemind.damnation_type) //Can't clone the damned.
INVOKE_ASYNC(src, .proc/horrifyingsound)
mess = TRUE
@@ -198,7 +203,7 @@
if(H)
H.faction |= factions
- for(var/V in traits)
+ for(var/V in quirks)
new V(H)
H.set_cloned_appearance()
@@ -282,14 +287,11 @@
if(default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]",W))
return
- if(exchange_parts(user, W))
- return
-
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))
@@ -397,7 +399,7 @@
QDEL_IN(mob_occupant, 40)
/obj/machinery/clonepod/relaymove(mob/user)
- container_resist()
+ container_resist(user)
/obj/machinery/clonepod/container_resist(mob/living/user)
if(user.stat == CONSCIOUS)
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index b3a75448f4..f5ad3843a5 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -1,6 +1,6 @@
/obj/machinery/computer/operating
name = "operating computer"
- desc = "Used to monitor the vitals of a patient during surgery."
+ desc = "Monitors patient vitals and displays surgery steps. Can be loaded with surgery disks to perform experimental procedures."
icon_screen = "crew"
icon_keyboard = "med_key"
circuit = /obj/item/circuitboard/computer/operating
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/arcade.dm b/code/game/machinery/computer/arcade.dm
index e90f69bf23..46898bb2d7 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -291,6 +291,7 @@
/obj/machinery/computer/arcade/battle/emag_act(mob/user)
if(obj_flags & EMAGGED)
return
+ to_chat(user, "A mesmerizing Rhumba beat starts playing from the arcade machine's speakers!")
temp = "If you die in the game, you die for real!"
player_hp = 30
player_mp = 10
@@ -506,9 +507,9 @@
if(ORION_TRAIL_ILLNESS)
var/severity = rand(1,3) //pray to RNGesus. PRAY, PIGS
if(severity == 1)
- to_chat(M, "You suddenly feel slightly nauseous." )
+ to_chat(M, "You suddenly feel slightly nauseated." )
if(severity == 2)
- to_chat(usr, "You suddenly feel extremely nauseous and hunch over until it passes.")
+ to_chat(usr, "You suddenly feel extremely nauseated and hunch over until it passes.")
M.Stun(60)
if(severity >= 3) //you didn't pray hard enough
to_chat(M, "An overpowering wave of nausea consumes over you. You hunch over, your stomach's contents preparing for a spectacular exit.")
@@ -614,7 +615,7 @@
L.Stun(200, ignore_canstun = TRUE) //you can't run :^)
var/S = new /obj/singularity/academy(usr.loc)
addtimer(CALLBACK(src, /atom/movable/proc/say, "[S] winks out, just as suddenly as it appeared."), 50)
- QDEL_IN(src, 50)
+ QDEL_IN(S, 50)
else
event = null
turns += 1
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index db8938b5cf..95b4ea9f80 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -71,7 +71,7 @@
if(pod.occupant)
continue //how though?
- if(pod.growclone(R.fields["ckey"], R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mind"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["traits"]))
+ if(pod.growclone(R.fields["ckey"], R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mind"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["quirks"]))
temp = "[R.fields["name"]] => Cloning cycle in progress..."
records -= R
@@ -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)
@@ -400,7 +400,7 @@
else if(pod.occupant)
temp = "Cloning cycle already in progress."
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
- else if(pod.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["features"], C.fields["factions"], C.fields["traits"]))
+ else if(pod.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["features"], C.fields["factions"], C.fields["quirks"]))
temp = "[C.fields["name"]] => Cloning cycle in progress..."
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
records.Remove(C)
@@ -473,10 +473,10 @@
R.fields["blood_type"] = dna.blood_type
R.fields["features"] = dna.features
R.fields["factions"] = mob_occupant.faction
- R.fields["traits"] = list()
- for(var/V in mob_occupant.roundstart_traits)
- var/datum/trait/T = V
- R.fields["traits"] += T.type
+ R.fields["quirks"] = list()
+ for(var/V in mob_occupant.roundstart_quirks)
+ var/datum/quirk/T = V
+ R.fields["quirks"] += T.type
if (!isnull(mob_occupant.mind)) //Save that mind so traitors can continue traitoring after cloning.
R.fields["mind"] = "[REF(mob_occupant.mind)]"
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 5bd5dc1271..14d02e9752 100755
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -45,7 +45,7 @@
/obj/machinery/computer/communications/process()
if(..())
- if(state != STATE_STATUSDISPLAY && state != STATE_CALLSHUTTLE && state != STATE_PURCHASE)
+ if(state != STATE_STATUSDISPLAY && state != STATE_CALLSHUTTLE && state != STATE_PURCHASE && state != STATE_VIEWMESSAGE)
updateDialog()
/obj/machinery/computer/communications/Topic(href, href_list)
@@ -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..93b997eee6 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
@@ -174,25 +174,26 @@
else
var/list/S = power_station.linked_stations
- if(!S.len)
- to_chat(user, "No connected stations located.")
- return
for(var/obj/machinery/teleport/station/R in S)
- if(is_eligible(R))
+ if(is_eligible(R) && R.teleporter_hub)
var/area/A = get_area(R)
L[avoid_assoc_duplicate_keys(A.name, areaindex)] = R
+ if(!L.len)
+ to_chat(user, "No active connected stations located.")
+ return
var/desc = input("Please select a station to lock in.", "Locking Computer") as null|anything in L
- target = L[desc]
- if(target)
- var/obj/machinery/teleport/station/trg = target
- trg.linked_stations |= power_station
- trg.stat &= ~NOPOWER
- if(trg.teleporter_hub)
- trg.teleporter_hub.stat &= ~NOPOWER
- trg.teleporter_hub.update_icon()
- if(trg.teleporter_console)
- trg.teleporter_console.stat &= ~NOPOWER
- trg.teleporter_console.update_icon()
+ var/obj/machinery/teleport/station/target_station = L[desc]
+ if(!target_station || !target_station.teleporter_hub)
+ return
+ target = target_station.teleporter_hub
+ target_station.linked_stations |= power_station
+ target_station.stat &= ~NOPOWER
+ if(target_station.teleporter_hub)
+ target_station.teleporter_hub.stat &= ~NOPOWER
+ target_station.teleporter_hub.update_icon()
+ if(target_station.teleporter_console)
+ target_station.teleporter_console.stat &= ~NOPOWER
+ target_station.teleporter_console.update_icon()
/obj/machinery/computer/teleporter/proc/is_eligible(atom/movable/AM)
var/turf/T = get_turf(AM)
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/dna_scanner.dm b/code/game/machinery/dna_scanner.dm
index 9296e0807d..2a8868cb4f 100644
--- a/code/game/machinery/dna_scanner.dm
+++ b/code/game/machinery/dna_scanner.dm
@@ -133,9 +133,6 @@
update_icon()//..since we're updating the icon here, since the scanner can be unpowered when opened/closed
return
- if(exchange_parts(user, I))
- return
-
if(default_pry_open(I))
return
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 5c4f485cfa..76a0c39021 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
@@ -202,8 +202,8 @@
return
// Handle recieved packet.
- var/command = lowertext(data.plaintext_data)
- var/command_value = lowertext(data.plaintext_data_secondary)
+ var/command = lowertext(data.data["data"])
+ var/command_value = lowertext(data.data["data_secondary"])
switch(command)
if("open")
if(command_value == "on" && !density)
@@ -323,12 +323,12 @@
return
else
return
- else if(user.hallucinating() && ishuman(user) && prob(4) && !operating)
+ else if(user.hallucinating() && ishuman(user) && prob(1) && !operating)
var/mob/living/carbon/human/H = user
if(H.gloves)
var/obj/item/clothing/gloves/G = H.gloves
if(G.siemens_coefficient)//not insulated
- hallucinate_shock(H)
+ new /datum/hallucination/shock(H)
return
if (cyclelinkedairlock)
if (!shuttledocked && !emergency && !cyclelinkedairlock.shuttledocked && !cyclelinkedairlock.emergency && allowed(user))
@@ -338,34 +338,6 @@
addtimer(CALLBACK(cyclelinkedairlock, .proc/close), 2)
..()
-/obj/machinery/door/airlock/proc/hallucinate_shock(mob/living/user)
- var/image/shock_image = image(user, user, dir = user.dir)
- var/image/electrocution_skeleton_anim = image('icons/mob/human.dmi', user, icon_state = "electrocuted_base", layer=ABOVE_MOB_LAYER)
- shock_image.color = rgb(0,0,0)
- shock_image.override = TRUE
- electrocution_skeleton_anim.appearance_flags |= RESET_COLOR|KEEP_APART
-
- to_chat(user, "You feel a powerful shock course through your body!")
- if(user.client)
- user.client.images |= shock_image
- user.client.images |= electrocution_skeleton_anim
- addtimer(CALLBACK(src, .proc/reset_hallucinate_shock_animation, user, shock_image, electrocution_skeleton_anim), 40)
- user.playsound_local(get_turf(src), "sparks", 100, 1)
- user.staminaloss += 50
- user.Stun(40)
- user.jitteriness += 1000
- user.do_jitter_animation(user.jitteriness)
- addtimer(CALLBACK(src, .proc/hallucinate_shock_drop, user), 20)
-
-/obj/machinery/door/airlock/proc/reset_hallucinate_shock_animation(mob/living/user, shock_image, electrocution_skeleton_anim)
- if(user.client)
- user.client.images.Remove(shock_image)
- user.client.images.Remove(electrocution_skeleton_anim)
-
-/obj/machinery/door/airlock/proc/hallucinate_shock_drop(mob/living/user)
- user.jitteriness = max(user.jitteriness - 990, 10) //Still jittery, but vastly less
- user.Knockdown(60)
-
/obj/machinery/door/airlock/proc/isElectrified()
if(src.secondsElectrified != NOT_ELECTRIFIED)
return TRUE
@@ -939,7 +911,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 4e20cebb12..3f26e7d80d 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -355,8 +355,7 @@
return
user.visible_message("[user] removes the wires from [src].", \
"You remove the wiring from [src], exposing the circuit board.")
- var/obj/item/stack/cable_coil/B = new(get_turf(src))
- B.amount = 5
+ new/obj/item/stack/cable_coil(get_turf(src), 5)
constructionStep = CONSTRUCTION_GUTTED
update_icon()
return
@@ -439,8 +438,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/doors/shutters.dm b/code/game/machinery/doors/shutters.dm
index 5c10ff6e98..7ee9891c4c 100644
--- a/code/game/machinery/doors/shutters.dm
+++ b/code/game/machinery/doors/shutters.dm
@@ -1,7 +1,7 @@
/obj/machinery/door/poddoor/shutters
gender = PLURAL
name = "shutters"
- desc = "Heavy duty metal shutters that opens mechanically."
+ desc = "Heavy duty metal shutters that open mechanically."
icon = 'icons/obj/doors/shutters.dmi'
layer = SHUTTER_LAYER
closingLayer = SHUTTER_LAYER
diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm
index cf2eed6f53..9d4f5dd936 100644
--- a/code/game/machinery/droneDispenser.dm
+++ b/code/game/machinery/droneDispenser.dm
@@ -51,7 +51,7 @@
/obj/machinery/droneDispenser/Initialize()
. = ..()
- var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE)
+ var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE, list(/obj/item/stack))
materials.insert_amount(starting_amount)
materials.precise_insertion = TRUE
using_materials = list(MAT_METAL=metal_cost, MAT_GLASS=glass_cost)
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/hologram.dm b/code/game/machinery/hologram.dm
index d6b35136b6..61ee4eb178 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -32,6 +32,7 @@ Possible to do for anyone motivated enough:
desc = "It's a floor-mounted device for projecting holographic images."
icon_state = "holopad0"
layer = LOW_OBJ_LAYER
+ plane = FLOOR_PLANE
flags_1 = HEAR_1
anchored = TRUE
use_power = IDLE_POWER_USE
@@ -66,7 +67,7 @@ Possible to do for anyone motivated enough:
flags_1 = NODECONSTRUCT_1
on_network = FALSE
var/proximity_range = 1
-
+
/obj/machinery/holopad/tutorial/Initialize(mapload)
. = ..()
if(proximity_range)
@@ -86,7 +87,7 @@ Possible to do for anyone motivated enough:
replay_stop()
else if(disk && disk.record)
replay_start()
-
+
/obj/machinery/holopad/tutorial/HasProximity(atom/movable/AM)
if (!isliving(AM))
return
@@ -146,9 +147,6 @@ Possible to do for anyone motivated enough:
if(default_deconstruction_screwdriver(user, "holopad_open", "holopad0", P))
return
- if(exchange_parts(user, P))
- return
-
if(default_pry_open(P))
return
@@ -490,7 +488,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
if(QDELETED(user) || user.incapacitated() || !user.client)
return FALSE
return TRUE
-
+
//Can we display holos there
//Area check instead of line of sight check because this is a called a lot if AI wants to move around.
/obj/machinery/holopad/proc/validate_location(turf/T,check_los = FALSE)
diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm
index 79954693c3..f6182fdae0 100644
--- a/code/game/machinery/igniter.dm
+++ b/code/game/machinery/igniter.dm
@@ -3,6 +3,7 @@
desc = "It's useful for igniting plasma."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "igniter0"
+ plane = FLOOR_PLANE
var/id = null
var/on = FALSE
anchored = TRUE
@@ -12,7 +13,7 @@
max_integrity = 300
armor = list("melee" = 50, "bullet" = 30, "laser" = 70, "energy" = 50, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
-
+
/obj/machinery/igniter/on
on = TRUE
icon_state = "igniter1"
diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm
index f50f409463..93a6cfca62 100644
--- a/code/game/machinery/launch_pad.dm
+++ b/code/game/machinery/launch_pad.dm
@@ -31,15 +31,12 @@
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
- if(exchange_parts(user, I))
- return
-
if(default_deconstruction_crowbar(I))
return
@@ -185,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
@@ -232,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'
@@ -249,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
@@ -258,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)
@@ -273,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
@@ -282,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/limbgrower.dm b/code/game/machinery/limbgrower.dm
index 77cb3e32d1..8347e5f548 100644
--- a/code/game/machinery/limbgrower.dm
+++ b/code/game/machinery/limbgrower.dm
@@ -28,6 +28,8 @@
var/list/categories = list(
"human",
"lizard",
+ "fly",
+ "moth",
"plasmaman",
"other"
)
@@ -70,9 +72,6 @@
updateUsrDialog()
return
- if(exchange_parts(user, O))
- return
-
if(panel_open && default_deconstruction_crowbar(O))
return
@@ -137,16 +136,16 @@
//i need to create a body part manually using a set icon (otherwise it doesnt appear)
var/obj/item/bodypart/limb
limb = new buildpath(loc)
- if(selected_category=="human" || selected_category=="lizard") // Doing this because plasmamen have their limbs in a different icon file
+ if(selected_category=="human" || selected_category=="lizard") //Species with greyscale parts should be included here
limb.icon = 'icons/mob/human_parts_greyscale.dmi'
+ limb.should_draw_greyscale = TRUE
else
limb.icon = 'icons/mob/human_parts.dmi'
// Set this limb up using the specias name and body zone
limb.icon_state = "[selected_category]_[limb.body_zone]"
- limb.name = "Synthetic [selected_category] [parse_zone(limb.body_zone)]"
+ limb.name = "\improper synthetic [selected_category] [parse_zone(limb.body_zone)]"
limb.desc = "A synthetic [selected_category] limb that will morph on its first use in surgery. This one is for the [parse_zone(limb.body_zone)]"
limb.species_id = selected_category
- limb.should_draw_greyscale = TRUE
limb.update_icon_dropped()
/obj/machinery/limbgrower/RefreshParts()
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 9336e20d29..f80532acaa 100644
--- a/code/game/machinery/porta_turret/portable_turret.dm
+++ b/code/game/machinery/porta_turret/portable_turret.dm
@@ -21,7 +21,7 @@
var/base_icon_state = "standard"
- var/emp_vunerable = 1 // Can be empd
+ var/emp_vunerable = TRUE // Can be empd
var/scan_range = 7
var/atom/base = null //for turrets inside other objects
@@ -34,7 +34,7 @@
armor = list("melee" = 50, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
var/locked = TRUE //if the turret's behaviour control access is locked
- var/controllock = 0 //if the turret responds to control panels
+ var/controllock = FALSE //if the turret responds to control panels
var/installation = /obj/item/gun/energy/e_gun/turret //the type of weapon installed by default
var/obj/item/gun/stored_gun = null
@@ -224,9 +224,11 @@
/obj/machinery/porta_turret/power_change()
if(!anchored)
update_icon()
+ remove_control()
return
if(stat & BROKEN)
update_icon()
+ remove_control()
else
if( powered() )
stat &= ~NOPOWER
@@ -234,6 +236,7 @@
else
spawn(rand(0, 15))
stat |= NOPOWER
+ remove_control()
update_icon()
@@ -251,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)
@@ -272,7 +275,7 @@
else if(anchored)
anchored = FALSE
to_chat(user, "You unsecure the exterior bolts on the turret.")
- update_icon()
+ power_change()
invisibility = 0
qdel(cover) //deletes the cover, and the turret instance itself becomes its own cover.
@@ -283,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
@@ -296,7 +299,7 @@
to_chat(user, "You short out [src]'s threat assessment circuits.")
visible_message("[src] hums oddly...")
obj_flags |= EMAGGED
- controllock = 1
+ controllock = TRUE
on = FALSE //turns off the turret temporarily
update_icon()
sleep(60) //6 seconds for the traitor to gtfo of the area before the turret decides to ruin his shit
@@ -312,10 +315,12 @@
auth_weapons = pick(0, 1)
stun_all = pick(0, 0, 0, 0, 1) //stun_all is a pretty big deal, so it's least likely to get turned on
- on=0
+ on = FALSE
+ remove_control()
+
spawn(rand(60,600))
if(!on)
- on=1
+ on = TRUE
..()
@@ -337,7 +342,7 @@
/obj/machinery/porta_turret/obj_break(damage_flag)
if(!(flags_1 & NODECONSTRUCT_1) && !(stat & BROKEN))
stat |= BROKEN //enables the BROKEN bit
- update_icon()
+ power_change()
invisibility = 0
spark_system.start() //creates some sparks because they look cool
qdel(cover) //deletes the cover - no need on keeping it there!
@@ -583,10 +588,10 @@
var/obj/machinery/porta_turret/P = target
if(!istype(P))
return
- P.remove_control(owner)
+ P.remove_control(FALSE)
/obj/machinery/porta_turret/proc/give_control(mob/A)
- if(manual_control)
+ if(manual_control || !can_interact(A))
return FALSE
remote_controller = A
if(!quit_action)
@@ -602,10 +607,12 @@
popUp()
return TRUE
-/obj/machinery/porta_turret/proc/remove_control()
+/obj/machinery/porta_turret/proc/remove_control(warning_message = TRUE)
if(!manual_control)
return FALSE
if(remote_controller)
+ if(warning_message)
+ to_chat(remote_controller, "Your uplink to [src] has been severed!")
quit_action.Remove(remote_controller)
toggle_action.Remove(remote_controller)
remote_controller.click_intercept = null
@@ -618,6 +625,9 @@
/obj/machinery/porta_turret/proc/InterceptClickOn(mob/living/caller, params, atom/A)
if(!manual_control)
return FALSE
+ if(!can_interact(caller))
+ remove_control()
+ return FALSE
add_logs(caller,A,"fired with manual turret control at")
target(A)
return TRUE
@@ -785,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 91a7f6923f..7236e683a5 100644
--- a/code/game/machinery/quantum_pad.dm
+++ b/code/game/machinery/quantum_pad.dm
@@ -48,34 +48,24 @@
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.")
return 1
- if(exchange_parts(user, I))
- return
-
if(default_deconstruction_crowbar(I))
return
return ..()
-/obj/machinery/quantumpad/attack_hand(mob/user)
- . = ..()
- if(.)
- return
- if(panel_open)
- to_chat(user, "The panel must be closed before operating this machine!")
- return
-
+/obj/machinery/quantumpad/interact(mob/user)
if(!linked_pad || QDELETED(linked_pad))
if(!map_pad_link_id || !initMappedLink())
to_chat(user, "There is no linked pad!")
@@ -96,7 +86,7 @@
if(linked_pad.stat & NOPOWER)
to_chat(user, "Linked pad is not responding to ping.")
return
- src.add_fingerprint(user)
+ add_fingerprint(user)
doteleport(user)
/obj/machinery/quantumpad/proc/sparks()
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index f95f69e2d1..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)
@@ -68,8 +68,6 @@
default_deconstruction_crowbar(G)
return
- if(exchange_parts(user, G))
- return
return ..()
/obj/machinery/recharger/attack_hand(mob/user)
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 790158515f..e1200e6804 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -1,5 +1,6 @@
/obj/machinery/recharge_station
name = "cyborg recharging station"
+ desc = "This device recharges cyborgs and resupplies them with materials."
icon = 'icons/obj/objects.dmi'
icon_state = "borgcharger0"
density = FALSE
@@ -53,9 +54,6 @@
if(default_deconstruction_screwdriver(user, "borgdecon2", "borgcharger0", P))
return
- if(exchange_parts(user, P))
- return
-
if(default_pry_open(P))
return
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index 0eb3f97acf..08fcb1baa8 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -19,7 +19,7 @@
var/item_recycle_sound = 'sound/items/welder.ogg'
/obj/machinery/recycler/Initialize()
- AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM))
+ AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC), INFINITY, FALSE, null, null, null, TRUE)
AddComponent(/datum/component/butchering, 1, amount_produced,amount_produced/5)
. = ..()
update_icon()
@@ -55,9 +55,6 @@
if(default_deconstruction_screwdriver(user, "grinder-oOpen", "grinder-o0", I))
return
- if(exchange_parts(user, I))
- return
-
if(default_pry_open(I))
return
@@ -110,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/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm
deleted file mode 100644
index 1fdc9b56dc..0000000000
--- a/code/game/machinery/robot_fabricator.dm
+++ /dev/null
@@ -1,143 +0,0 @@
-/obj/machinery/robotic_fabricator
- name = "robotic fabricator"
- icon = 'icons/obj/robotics.dmi'
- icon_state = "fab-idle"
- density = TRUE
- anchored = TRUE
- var/metal_amount = 0
- var/operating = FALSE
- var/obj/item/being_built = null
- use_power = IDLE_POWER_USE
- idle_power_usage = 20
- active_power_usage = 5000
-
-/obj/machinery/robotic_fabricator/attackby(obj/item/O, mob/living/user, params)
- if (istype(O, /obj/item/stack/sheet/metal))
- if (metal_amount < 150000)
- add_overlay("fab-load-metal")
- addtimer(CALLBACK(src, .proc/FinishLoadingMetal, O, user), 15)
- else
- to_chat(user, "\The [src] is full.")
- else
- return ..()
-
-/obj/machinery/robotic_fabricator/proc/FinishLoadingMetal(obj/item/stack/sheet/metal/M, mob/living/user)
- cut_overlay("fab-load-metal")
- if(QDELETED(M) || QDELETED(user))
- return
- var/count = 0
- while(metal_amount < 150000 && !QDELETED(M))
- metal_amount += M.materials[MAT_METAL]
- M.use(1)
- count++
-
- to_chat(user, "You insert [count] metal sheet\s into \the [src].")
- updateDialog()
-
-/obj/machinery/robotic_fabricator/power_change()
- if (powered())
- stat &= ~NOPOWER
- else
- stat |= NOPOWER
-
-/obj/machinery/robotic_fabricator/ui_interact(mob/user)
- . = ..()
- var/dat
-
- if (src.operating)
- dat = {"
-Building [src.being_built.name].
-Please wait until completion...
-
-"}
- else
- dat = {"
-Metal Amount: [min(150000, src.metal_amount)] cm3 (MAX: 150,000)
-
-Left Arm (25,000 cc metal.)
-Right Arm (25,000 cc metal.)
-Left Leg (25,000 cc metal.)
-Right Leg (25,000 cc metal).
-Chest (50,000 cc metal).
-Head (50,000 cc metal).
-Robot Frame (75,000 cc metal).
-"}
-
- user << browse("Robotic Fabricator Control Panel[dat]", "window=robot_fabricator")
- onclose(user, "robot_fabricator")
- return
-
-/obj/machinery/robotic_fabricator/Topic(href, href_list)
- if (..())
- return
-
- usr.set_machine(src)
- src.add_fingerprint(usr)
-
- if (href_list["make"])
- if (!src.operating)
- var/part_type = text2num(href_list["make"])
-
- var/build_type = ""
- var/build_time = 200
- var/build_cost = 25000
-
- switch (part_type)
- if (1)
- build_type = "/obj/item/bodypart/l_arm/robot"
- build_time = 200
- build_cost = 10000
-
- if (2)
- build_type = "/obj/item/bodypart/r_arm/robot"
- build_time = 200
- build_cost = 10000
-
- if (3)
- build_type = "/obj/item/bodypart/l_leg/robot"
- build_time = 200
- build_cost = 10000
-
- if (4)
- build_type = "/obj/item/bodypart/r_leg/robot"
- build_time = 200
- build_cost = 10000
-
- if (5)
- build_type = "/obj/item/bodypart/chest/robot"
- build_time = 350
- build_cost = 40000
-
- if (6)
- build_type = "/obj/item/bodypart/head/robot"
- build_time = 350
- build_cost = 5000
-
- if (7)
- build_type = "/obj/item/robot_suit"
- build_time = 600
- build_cost = 15000
-
- var/building = text2path(build_type)
- if (!isnull(building))
- if (src.metal_amount >= build_cost)
- operating = TRUE
- src.use_power = ACTIVE_POWER_USE
-
- src.metal_amount = max(0, src.metal_amount - build_cost)
-
- src.being_built = new building(src)
-
- src.add_overlay("fab-active")
- src.updateUsrDialog()
-
- spawn (build_time)
- if (!isnull(src.being_built))
- src.being_built.forceMove(drop_location())
- src.being_built = null
- src.use_power = IDLE_POWER_USE
- operating = FALSE
- cut_overlay("fab-active")
- return
-
- updateUsrDialog()
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index 9fbe2b412b..872c5b8f1d 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -156,7 +156,7 @@
update_icon()
if(panel_open)
interact(user)
- else if(exchange_parts(user, I) || default_deconstruction_crowbar(I))
+ else if(default_deconstruction_crowbar(I))
return
else
return ..()
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..be5b404edc 100644
--- a/code/game/machinery/syndicatebeacon.dm
+++ b/code/game/machinery/syndicatebeacon.dm
@@ -5,7 +5,7 @@
name = "ominous beacon"
desc = "This looks suspicious..."
icon = 'icons/obj/singularity.dmi'
- icon_state = "beacon"
+ icon_state = "beacon0"
anchored = FALSE
density = TRUE
@@ -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 3bacd10b05..1ad80ccbed 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -18,12 +18,8 @@
if(default_deconstruction_screwdriver(user, icon_open, icon_closed, P))
return
-
- else if(exchange_parts(user, 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))
@@ -36,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]
"
@@ -99,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
@@ -167,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 ae3263d96a..cef200173c 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -47,7 +47,6 @@
return
if(is_ready())
teleport(AM)
- use_power(5000)
/obj/machinery/teleport/hub/attackby(obj/item/W, mob/user, params)
if(default_deconstruction_screwdriver(user, "tele-o", "tele0", W))
@@ -55,21 +54,21 @@
power_station.engaged = 0 //hub with panel open is off, so the station must be informed.
update_icon()
return
- if(exchange_parts(user, W))
- return
if(default_deconstruction_crowbar(W))
return
return ..()
/obj/machinery/teleport/hub/proc/teleport(atom/movable/M as mob|obj, turf/T)
var/obj/machinery/computer/teleporter/com = power_station.teleporter_console
- if (!com)
+ if (QDELETED(com))
return
- if (!com.target)
+ if (QDELETED(com.target))
+ com.target = null
visible_message("Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.")
return
if (ismovableatom(M))
if(do_teleport(M, com.target))
+ use_power(5000)
if(!calibrated && prob(30 - ((accurate) * 10))) //oh dear a problem
if(ishuman(M))//don't remove people from the round randomly you jerks
var/mob/living/carbon/human/human = M
@@ -151,8 +150,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.")
@@ -169,9 +168,6 @@
update_icon()
return
- else if(exchange_parts(user, W))
- return
-
else if(default_deconstruction_crowbar(W))
return
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index cdb12eaf5c..ab906f1bfa 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -65,8 +65,7 @@
return
/obj/item/stack/sheet/hairlesshide/machine_wash(obj/machinery/washing_machine/WM)
- var/obj/item/stack/sheet/wetleather/WL = new(loc)
- WL.amount = amount
+ new /obj/item/stack/sheet/wetleather(drop_location(), amount)
qdel(src)
/obj/item/clothing/suit/hooded/ian_costume/machine_wash(obj/machinery/washing_machine/WM)
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/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm
index 980b7170c1..0d1651c491 100644
--- a/code/game/mecha/equipment/tools/other_tools.dm
+++ b/code/game/mecha/equipment/tools/other_tools.dm
@@ -367,8 +367,7 @@
return ..()
/obj/item/mecha_parts/mecha_equipment/generator/proc/generator_init()
- fuel = new /obj/item/stack/sheet/mineral/plasma(src)
- fuel.amount = 0
+ fuel = new /obj/item/stack/sheet/mineral/plasma(src, 0)
/obj/item/mecha_parts/mecha_equipment/generator/detach()
STOP_PROCESSING(SSobj, src)
@@ -472,8 +471,7 @@
var/rad_per_cycle = 3
/obj/item/mecha_parts/mecha_equipment/generator/nuclear/generator_init()
- fuel = new /obj/item/stack/sheet/mineral/uranium(src)
- fuel.amount = 0
+ fuel = new /obj/item/stack/sheet/mineral/uranium(src, 0)
/obj/item/mecha_parts/mecha_equipment/generator/nuclear/critfail()
return
diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm
index 2054a6ba9a..96adece298 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -301,8 +301,7 @@
/obj/item/mecha_parts/mecha_equipment/cable_layer/Initialize()
. = ..()
- cable = new(src)
- cable.amount = 0
+ cable = new(src, 0)
/obj/item/mecha_parts/mecha_equipment/cable_layer/can_attach(obj/mecha/working/M)
if(..())
@@ -333,8 +332,7 @@
if(to_load)
to_load = min(target.amount, to_load)
if(!cable)
- cable = new(src)
- cable.amount = 0
+ cable = new(src, 0)
cable.amount += to_load
target.use(to_load)
occupant_message("[to_load] meters of cable successfully loaded.")
@@ -358,8 +356,7 @@
m = min(m, cable.amount)
if(m)
use_cable(m)
- var/obj/item/stack/cable_coil/CC = new (get_turf(chassis))
- CC.amount = m
+ new /obj/item/stack/cable_coil(get_turf(chassis), m)
else
occupant_message("There's no more cable on the reel.")
return
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/mech_bay.dm b/code/game/mecha/mech_bay.dm
index 90234b97b5..d2d9ac5e57 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -1,5 +1,6 @@
/turf/open/floor/mech_bay_recharge_floor // Whos idea it was
name = "mech bay recharge station" // Recharging turfs
+ desc = "Parking a mech on this station will recharge its internal power cell."
icon = 'icons/turf/floors.dmi' // That are set in stone to check the west turf for recharge port
icon_state = "recharge_floor" // Some people just want to watch the world burn i guess
@@ -12,6 +13,7 @@
/obj/machinery/mech_bay_recharge_port
name = "mech bay power port"
+ desc = "This port recharges a mech's internal power cell."
density = TRUE
anchored = TRUE
dir = EAST
@@ -62,16 +64,13 @@
recharging_turf = get_step(loc, dir)
return
- if(exchange_parts(user, I))
- return
-
if(default_deconstruction_crowbar(I))
return
return ..()
/obj/machinery/computer/mech_bay_power_console
name = "mech bay power control console"
- desc = "Used to control mechbay power ports."
+ desc = "Displays the status of mechs connected to the recharge station."
icon_screen = "recharge_comp"
icon_keyboard = "rd_key"
circuit = /obj/item/circuitboard/computer/mech_bay_power_console
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index 7815014891..526c808809 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -37,7 +37,7 @@
/obj/machinery/mecha_part_fabricator/Initialize()
var/datum/component/material_container/materials = AddComponent(/datum/component/material_container,
list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE), 0,
- FALSE, list(/obj/item/stack, /obj/item/stack/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert))
+ FALSE, list(/obj/item/stack), CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert))
materials.precise_insertion = TRUE
stored_research = new
return ..()
@@ -401,9 +401,6 @@
if(default_deconstruction_screwdriver(user, "fab-o", "fab-idle", W))
return TRUE
- if(exchange_parts(user, W))
- return TRUE
-
if(default_deconstruction_crowbar(W))
return TRUE
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 78ee151581..b00212b0de 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
@@ -812,16 +812,18 @@
to_chat(usr, "The [name] is already occupied!")
log_append_to_last("Permission denied.")
return
- var/passed
if(dna_lock)
+ var/passed = FALSE
if(user.has_dna())
var/mob/living/carbon/C = user
if(C.dna.unique_enzymes==dna_lock)
- passed = 1
- else if(operation_allowed(user))
- passed = 1
- if(!passed)
- to_chat(user, "Access denied.")
+ passed = TRUE
+ if (!passed)
+ to_chat(user, "Access denied. [name] is secured with a DNA lock.")
+ log_append_to_last("Permission denied.")
+ return
+ if(!operation_allowed(user))
+ to_chat(user, "Access denied. Insufficient operation keycodes.")
log_append_to_last("Permission denied.")
return
if(user.buckled)
@@ -866,7 +868,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 +893,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 +969,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_topic.dm b/code/game/mecha/mecha_topic.dm
index 4c1bceca28..4f5c6feb44 100644
--- a/code/game/mecha/mecha_topic.dm
+++ b/code/game/mecha/mecha_topic.dm
@@ -199,7 +199,7 @@
[add_req_access?"Edit operation keycodes":null]
- [maint_access?"Initiate maintenance protocol":null]
+ [maint_access?"[(state>0) ? "Terminate" : "Initiate"] maintenance protocol":null]
[(state>0) ?"Set Cabin Air Pressure":null]