Merge branch 'master' into upstream-merge-37293

This commit is contained in:
LetterJay
2018-05-21 08:53:17 -05:00
committed by GitHub
997 changed files with 20425 additions and 26215 deletions
+2 -12
View File
@@ -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
#LetterJay
/modular_citadel/code/modules/client/loadout/__donator.dm @LetterJay
+2 -3
View File
@@ -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
+10 -3
View File
@@ -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
+2
View File
@@ -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;
+2
View File
@@ -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;
@@ -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" = (
@@ -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"
},
@@ -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
},
@@ -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,
@@ -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{
@@ -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)
@@ -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)
File diff suppressed because it is too large Load Diff
@@ -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
"}
+4 -4
View File
@@ -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;
+5 -5
View File
@@ -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" = (
@@ -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,
@@ -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"
@@ -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)
+1 -1
View File
@@ -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" = (
+10 -10
View File
@@ -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
@@ -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"
},
+3 -3
View File
@@ -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"
},
+30 -30
View File
@@ -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,
@@ -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
},
@@ -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{
@@ -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,
+5 -5
View File
@@ -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" = (
+9 -9
View File
@@ -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"
},
+4 -4
View File
@@ -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" = (
@@ -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,
+6 -6
View File
@@ -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" = (
@@ -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" = (
+3 -3
View File
@@ -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" = (
@@ -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" = (
+4 -4
View File
@@ -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
+3 -3
View File
@@ -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)
+10 -10
View File
@@ -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"
},
+17 -17
View File
@@ -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"
},
+5 -5
View File
@@ -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
},
+20 -20
View File
@@ -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" = (
+8 -8
View File
@@ -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,
+8 -8
View File
@@ -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
},
+2 -2
View File
@@ -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" = (
+22 -22
View File
@@ -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
+1 -1
View File
@@ -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" = (
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+14 -14
View File
@@ -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
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+14 -14
View File
@@ -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
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+134 -87
View File
@@ -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
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -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" = (
+1 -1
View File
@@ -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
},
+1 -1
View File
@@ -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,
+1 -1
View File
@@ -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,
+1 -1
View File
@@ -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
},
+5 -5
View File
@@ -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
+3 -3
View File
@@ -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" = (
+1 -1
View File
@@ -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
},
+6 -6
View File
@@ -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
},
+2 -2
View File
@@ -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" = (
+1 -1
View File
@@ -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,
+11 -11
View File
@@ -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" = (
+1 -1
View File
@@ -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" = (
+1 -1
View File
@@ -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
@@ -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" = (
+10 -10
View File
@@ -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
+1 -1
View File
@@ -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
},
+1 -1
View File
@@ -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
},
+8 -8
View File
@@ -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
},
+1 -1
View File
@@ -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" = (
+1 -1
View File
@@ -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
},
+2 -2
View File
@@ -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
},
+1 -1
View File
@@ -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{
+1 -1
View File
@@ -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,
+1 -1
View File
@@ -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" = (
+10 -10
View File
@@ -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" = (
+8 -8
View File
@@ -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,
+656
View File
@@ -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
"}
+2 -2
View File
@@ -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" = (
+1 -1
View File
@@ -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
+9 -9
View File
@@ -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" = (
+13 -13
View File
@@ -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
+8 -8
View File
@@ -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,
+1 -1
View File
@@ -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" = (
+1 -1
View File
@@ -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" = (
+1 -1
View File
@@ -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)
+2 -1
View File
@@ -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
#define CINEMATIC_NUKE_CLOWNOP 12
#define CINEMATIC_CULT_NUKE 13
+11 -7
View File
@@ -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
-2
View File
@@ -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

Some files were not shown because too many files have changed in this diff Show More