Merge branch 'master' into upstream-merge-29741
This commit is contained in:
LetterJay
@@ -48,7 +48,7 @@
|
||||
/area/ruin/unpowered)
|
||||
"j" = (
|
||||
/obj/machinery/abductor/experiment{
|
||||
team = 100
|
||||
team_number = 100
|
||||
},
|
||||
/turf/open/floor/plating/abductor{
|
||||
initial_gas_mix = "o2=16;n2=23;TEMP=300"
|
||||
@@ -61,7 +61,7 @@
|
||||
/area/ruin/unpowered)
|
||||
"l" = (
|
||||
/obj/machinery/abductor/pad{
|
||||
team = 100
|
||||
team_number = 100
|
||||
},
|
||||
/turf/open/floor/plating/abductor{
|
||||
initial_gas_mix = "o2=16;n2=23;TEMP=300"
|
||||
|
||||
@@ -7441,14 +7441,6 @@
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/crew_quarters/fitness)
|
||||
"aqt" = (
|
||||
/obj/effect/landmark/syndicate_breach_area,
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/crew_quarters/fitness)
|
||||
"aqu" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 10
|
||||
@@ -13334,6 +13326,7 @@
|
||||
id = "chapelgun";
|
||||
name = "Chapel Launcher Door"
|
||||
},
|
||||
/obj/structure/fans/tiny,
|
||||
/turf/open/floor/plating,
|
||||
/area/chapel/main)
|
||||
"aEo" = (
|
||||
@@ -14776,7 +14769,6 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/chapel/main)
|
||||
"aHr" = (
|
||||
/obj/effect/landmark/marauder_entry,
|
||||
/turf/open/space,
|
||||
/area/space)
|
||||
"aHs" = (
|
||||
@@ -27902,6 +27894,7 @@
|
||||
id = "trash";
|
||||
name = "disposal bay door"
|
||||
},
|
||||
/obj/structure/fans/tiny,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/disposal)
|
||||
"bnw" = (
|
||||
@@ -39042,6 +39035,7 @@
|
||||
id = "toxinsdriver";
|
||||
name = "toxins launcher bay door"
|
||||
},
|
||||
/obj/structure/fans/tiny,
|
||||
/turf/open/floor/plating,
|
||||
/area/science/mixing)
|
||||
"bLm" = (
|
||||
@@ -83826,7 +83820,7 @@ bHE
|
||||
bYu
|
||||
bZk
|
||||
bCq
|
||||
cTG
|
||||
cTF
|
||||
bCq
|
||||
bCq
|
||||
bCq
|
||||
@@ -85122,7 +85116,7 @@ bCq
|
||||
bCq
|
||||
bCq
|
||||
bCq
|
||||
cTH
|
||||
cTF
|
||||
bCq
|
||||
bLv
|
||||
bLv
|
||||
@@ -100716,7 +100710,7 @@ aaa
|
||||
aaa
|
||||
aaa
|
||||
aaa
|
||||
aqt
|
||||
aqs
|
||||
aro
|
||||
aro
|
||||
aro
|
||||
|
||||
@@ -30323,8 +30323,8 @@
|
||||
/obj/item/stack/sheet/metal{
|
||||
amount = 50
|
||||
},
|
||||
/obj/item/grenade/chem_grenade/metalfoam,
|
||||
/obj/item/grenade/chem_grenade/metalfoam,
|
||||
/obj/item/grenade/chem_grenade/smart_metal_foam,
|
||||
/obj/item/grenade/chem_grenade/smart_metal_foam,
|
||||
/obj/machinery/newscaster{
|
||||
pixel_y = -32
|
||||
},
|
||||
@@ -46733,7 +46733,6 @@
|
||||
/turf/open/floor/carpet,
|
||||
/area/security/detectives_office)
|
||||
"bMX" = (
|
||||
/obj/machinery/computer/security/wooden_tv,
|
||||
/obj/structure/table/wood,
|
||||
/obj/machinery/button/door{
|
||||
id = "detectivewindows";
|
||||
@@ -46747,15 +46746,16 @@
|
||||
pixel_y = -26
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/item/device/flashlight/lamp,
|
||||
/obj/item/reagent_containers/food/drinks/flask/det,
|
||||
/turf/open/floor/carpet,
|
||||
/area/security/detectives_office)
|
||||
"bMY" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/device/flashlight/lamp,
|
||||
/obj/item/storage/secure/safe{
|
||||
pixel_x = 32
|
||||
},
|
||||
/obj/item/reagent_containers/food/drinks/flask/det,
|
||||
/obj/machinery/computer/security/wooden_tv,
|
||||
/turf/open/floor/carpet,
|
||||
/area/security/detectives_office)
|
||||
"bMZ" = (
|
||||
@@ -67256,7 +67256,7 @@
|
||||
pixel_x = -26
|
||||
},
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/grenade/chem_grenade/metalfoam,
|
||||
/obj/item/grenade/chem_grenade/smart_metal_foam,
|
||||
/turf/open/floor/plasteel/vault{
|
||||
dir = 8
|
||||
},
|
||||
@@ -108370,8 +108370,8 @@
|
||||
amount = 50
|
||||
},
|
||||
/obj/item/crowbar,
|
||||
/obj/item/grenade/chem_grenade/metalfoam,
|
||||
/obj/item/grenade/chem_grenade/metalfoam,
|
||||
/obj/item/grenade/chem_grenade/smart_metal_foam,
|
||||
/obj/item/grenade/chem_grenade/smart_metal_foam,
|
||||
/obj/effect/turf_decal/bot,
|
||||
/obj/structure/sign/poster/official/report_crimes{
|
||||
pixel_y = 32
|
||||
@@ -136696,7 +136696,7 @@ aae
|
||||
aae
|
||||
aae
|
||||
aaf
|
||||
dYc
|
||||
aBW
|
||||
aae
|
||||
aae
|
||||
aaa
|
||||
@@ -136947,7 +136947,7 @@ aaa
|
||||
aaa
|
||||
aae
|
||||
aaf
|
||||
dYc
|
||||
aBW
|
||||
aae
|
||||
aae
|
||||
aaa
|
||||
@@ -137473,7 +137473,7 @@ dZB
|
||||
eab
|
||||
ear
|
||||
aaa
|
||||
dYc
|
||||
aBW
|
||||
aaa
|
||||
aaa
|
||||
aaa
|
||||
@@ -139529,7 +139529,7 @@ dZB
|
||||
eaf
|
||||
ear
|
||||
aaa
|
||||
dYc
|
||||
aBW
|
||||
aae
|
||||
aae
|
||||
aae
|
||||
@@ -140543,7 +140543,7 @@ dVy
|
||||
dUl
|
||||
aaf
|
||||
aaf
|
||||
dYc
|
||||
aBW
|
||||
aaa
|
||||
dZB
|
||||
eag
|
||||
@@ -140557,7 +140557,7 @@ dZB
|
||||
eag
|
||||
ear
|
||||
aaa
|
||||
dYc
|
||||
aBW
|
||||
aaa
|
||||
aaa
|
||||
aaa
|
||||
@@ -141060,14 +141060,14 @@ aaf
|
||||
aae
|
||||
aae
|
||||
aae
|
||||
dYc
|
||||
aBW
|
||||
aae
|
||||
aaa
|
||||
aaa
|
||||
aaf
|
||||
aaa
|
||||
aaa
|
||||
dYc
|
||||
aBW
|
||||
aae
|
||||
aae
|
||||
aaf
|
||||
@@ -141324,7 +141324,7 @@ aae
|
||||
aaf
|
||||
aae
|
||||
aae
|
||||
dYc
|
||||
aBW
|
||||
aaa
|
||||
aaa
|
||||
aaa
|
||||
|
||||
@@ -178,7 +178,6 @@
|
||||
/turf/open/floor/plasteel/airless/solarpanel,
|
||||
/area/solar/port/fore)
|
||||
"aav" = (
|
||||
/obj/effect/landmark/marauder_entry,
|
||||
/turf/open/space,
|
||||
/area/space)
|
||||
"aaw" = (
|
||||
@@ -2225,14 +2224,6 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/crew_quarters/fitness/recreation)
|
||||
"aeD" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/effect/landmark/syndicate_breach_area,
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/crew_quarters/fitness/recreation)
|
||||
"aeE" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
@@ -4182,6 +4173,7 @@
|
||||
id = "trash";
|
||||
name = "disposal bay door"
|
||||
},
|
||||
/obj/structure/fans/tiny,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/disposal)
|
||||
"aig" = (
|
||||
@@ -13541,10 +13533,6 @@
|
||||
/turf/open/floor/carpet,
|
||||
/area/security/detectives_office)
|
||||
"azU" = (
|
||||
/obj/machinery/computer/security/wooden_tv{
|
||||
pixel_x = 3;
|
||||
pixel_y = 2
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 10
|
||||
},
|
||||
@@ -13555,6 +13543,11 @@
|
||||
network = list("Prison");
|
||||
pixel_y = 30
|
||||
},
|
||||
/obj/item/device/flashlight/lamp/green{
|
||||
pixel_x = 1;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/restraints/handcuffs,
|
||||
/turf/open/floor/carpet,
|
||||
/area/security/detectives_office)
|
||||
"azV" = (
|
||||
@@ -13562,17 +13555,16 @@
|
||||
/obj/item/storage/secure/safe{
|
||||
pixel_x = 32
|
||||
},
|
||||
/obj/item/device/flashlight/lamp/green{
|
||||
pixel_x = 1;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/restraints/handcuffs,
|
||||
/obj/machinery/button/door{
|
||||
id = "detective_shutters";
|
||||
name = "detective's office shutters control";
|
||||
pixel_y = 26;
|
||||
req_access_txt = "4"
|
||||
},
|
||||
/obj/machinery/computer/security/wooden_tv{
|
||||
pixel_x = 3;
|
||||
pixel_y = 2
|
||||
},
|
||||
/turf/open/floor/carpet,
|
||||
/area/security/detectives_office)
|
||||
"azW" = (
|
||||
@@ -17389,8 +17381,8 @@
|
||||
amount = 50
|
||||
},
|
||||
/obj/item/crowbar,
|
||||
/obj/item/grenade/chem_grenade/metalfoam,
|
||||
/obj/item/grenade/chem_grenade/metalfoam,
|
||||
/obj/item/grenade/chem_grenade/smart_metal_foam,
|
||||
/obj/item/grenade/chem_grenade/smart_metal_foam,
|
||||
/obj/effect/turf_decal/bot{
|
||||
dir = 1
|
||||
},
|
||||
@@ -23436,6 +23428,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/storage/primary)
|
||||
"aTi" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/door/airlock/highsecurity{
|
||||
locked = 0;
|
||||
name = "AI Upload";
|
||||
@@ -24856,6 +24849,7 @@
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/ai_monitored/turret_protected/ai_upload_foyer)
|
||||
"aVY" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/door/airlock/highsecurity{
|
||||
name = "Secure Network Access";
|
||||
req_access_txt = "19"
|
||||
@@ -36260,6 +36254,7 @@
|
||||
d2 = 4;
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/item/paper_bin,
|
||||
/obj/item/stack/cable_coil/random,
|
||||
/obj/item/stack/cable_coil/random,
|
||||
/obj/item/stack/cable_coil/random,
|
||||
@@ -36280,6 +36275,7 @@
|
||||
/area/storage/art)
|
||||
"brf" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/paper_bin/construction,
|
||||
/obj/item/airlock_painter,
|
||||
/obj/machinery/airalarm{
|
||||
dir = 8;
|
||||
@@ -41266,8 +41262,8 @@
|
||||
/obj/item/stack/sheet/metal{
|
||||
amount = 50
|
||||
},
|
||||
/obj/item/grenade/chem_grenade/metalfoam,
|
||||
/obj/item/grenade/chem_grenade/metalfoam,
|
||||
/obj/item/grenade/chem_grenade/smart_metal_foam,
|
||||
/obj/item/grenade/chem_grenade/smart_metal_foam,
|
||||
/turf/open/floor/plasteel/caution{
|
||||
dir = 8
|
||||
},
|
||||
@@ -69603,6 +69599,7 @@
|
||||
id = "toxinsdriver";
|
||||
name = "Toxins Launcher Bay Door"
|
||||
},
|
||||
/obj/structure/fans/tiny,
|
||||
/turf/open/floor/plating,
|
||||
/area/science/mixing)
|
||||
"cDu" = (
|
||||
@@ -77240,6 +77237,7 @@
|
||||
id = "chapelgun";
|
||||
name = "Chapel Launcher Door"
|
||||
},
|
||||
/obj/structure/fans/tiny,
|
||||
/turf/open/floor/plating,
|
||||
/area/chapel/main)
|
||||
"cRQ" = (
|
||||
@@ -128535,7 +128533,7 @@ aaa
|
||||
aaa
|
||||
aaf
|
||||
aaa
|
||||
aaX
|
||||
blx
|
||||
adl
|
||||
aQf
|
||||
adl
|
||||
@@ -129053,7 +129051,7 @@ aaa
|
||||
aaa
|
||||
bii
|
||||
aaa
|
||||
aeD
|
||||
aeC
|
||||
afD
|
||||
afD
|
||||
afD
|
||||
|
||||
@@ -13900,8 +13900,8 @@
|
||||
/obj/item/stack/sheet/metal{
|
||||
amount = 50
|
||||
},
|
||||
/obj/item/grenade/chem_grenade/metalfoam,
|
||||
/obj/item/grenade/chem_grenade/metalfoam,
|
||||
/obj/item/grenade/chem_grenade/smart_metal_foam,
|
||||
/obj/item/grenade/chem_grenade/smart_metal_foam,
|
||||
/obj/machinery/newscaster{
|
||||
pixel_y = 32
|
||||
},
|
||||
@@ -20539,8 +20539,8 @@
|
||||
amount = 50
|
||||
},
|
||||
/obj/item/crowbar,
|
||||
/obj/item/grenade/chem_grenade/metalfoam,
|
||||
/obj/item/grenade/chem_grenade/metalfoam,
|
||||
/obj/item/grenade/chem_grenade/smart_metal_foam,
|
||||
/obj/item/grenade/chem_grenade/smart_metal_foam,
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
},
|
||||
@@ -35681,6 +35681,7 @@
|
||||
id = "chapelmassdoor";
|
||||
name = "Chapel Launcher Door"
|
||||
},
|
||||
/obj/structure/fans/tiny,
|
||||
/turf/open/floor/plating,
|
||||
/area/chapel/main)
|
||||
"blJ" = (
|
||||
@@ -38903,7 +38904,7 @@
|
||||
volume_rate = 200
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
/area/engine/engineering)
|
||||
"bxd" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 4
|
||||
|
||||
@@ -13789,8 +13789,7 @@
|
||||
pixel_x = -1;
|
||||
pixel_y = 9
|
||||
},
|
||||
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
|
||||
},
|
||||
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
|
||||
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
|
||||
pixel_x = 7;
|
||||
pixel_y = 2
|
||||
@@ -16903,6 +16902,7 @@
|
||||
id = "trash";
|
||||
name = "disposal bay door"
|
||||
},
|
||||
/obj/structure/fans/tiny,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/disposal)
|
||||
"aLo" = (
|
||||
@@ -41644,6 +41644,7 @@
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/fans/tiny,
|
||||
/turf/open/floor/plating,
|
||||
/area/science/mineral_storeroom)
|
||||
"bMr" = (
|
||||
@@ -45768,7 +45769,7 @@
|
||||
/area/storage/tech)
|
||||
"bVL" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/storage/box/metalfoam{
|
||||
/obj/item/storage/box/smart_metal_foam{
|
||||
pixel_x = 4;
|
||||
pixel_y = 7
|
||||
},
|
||||
@@ -103836,8 +103837,8 @@ aaa
|
||||
aaa
|
||||
aaa
|
||||
aLn
|
||||
aLn
|
||||
aNT
|
||||
aQo
|
||||
aPg
|
||||
aQl
|
||||
aRu
|
||||
|
||||
@@ -5751,6 +5751,10 @@
|
||||
/obj/structure/mirror{
|
||||
pixel_x = 28
|
||||
},
|
||||
/obj/structure/sink{
|
||||
dir = 4;
|
||||
pixel_x = 11
|
||||
},
|
||||
/turf/open/floor/plasteel/freezer{
|
||||
dir = 2
|
||||
},
|
||||
@@ -6101,7 +6105,7 @@
|
||||
/area/syndicate_mothership/control)
|
||||
"qp" = (
|
||||
/obj/structure/chair/stool,
|
||||
/obj/effect/landmark/syndicate_spawn,
|
||||
/obj/effect/landmark/start/nukeop,
|
||||
/turf/open/floor/plasteel/bar{
|
||||
dir = 2
|
||||
},
|
||||
@@ -6506,6 +6510,7 @@
|
||||
/area/syndicate_mothership/control)
|
||||
"rj" = (
|
||||
/obj/structure/closet/cardboard,
|
||||
/obj/effect/turf_decal/stripes/corner,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/syndicate_mothership/control)
|
||||
"rk" = (
|
||||
@@ -7623,7 +7628,7 @@
|
||||
/turf/open/floor/wood,
|
||||
/area/syndicate_mothership/control)
|
||||
"tT" = (
|
||||
/obj/effect/landmark/syndicate_spawn,
|
||||
/obj/effect/landmark/start/nukeop_leader,
|
||||
/turf/open/floor/wood,
|
||||
/area/syndicate_mothership/control)
|
||||
"tU" = (
|
||||
@@ -8025,6 +8030,9 @@
|
||||
/area/syndicate_mothership/control)
|
||||
"vb" = (
|
||||
/obj/structure/closet/cardboard/metal,
|
||||
/obj/effect/turf_decal/stripes/corner{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/syndicate_mothership/control)
|
||||
"vc" = (
|
||||
@@ -9731,7 +9739,6 @@
|
||||
/area/wizard_station)
|
||||
"zj" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/effect/landmark/teleport_scroll,
|
||||
/obj/item/dice/d20,
|
||||
/obj/item/dice,
|
||||
/turf/open/floor/carpet,
|
||||
@@ -12318,19 +12325,19 @@
|
||||
/area/abductor_ship)
|
||||
"Gh" = (
|
||||
/obj/machinery/abductor/experiment{
|
||||
team = 1
|
||||
team_number = 1
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
"Gi" = (
|
||||
/obj/machinery/abductor/console{
|
||||
team = 1
|
||||
team_number = 1
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
"Gj" = (
|
||||
/obj/machinery/abductor/pad{
|
||||
team = 1
|
||||
team_number = 1
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
@@ -12346,19 +12353,19 @@
|
||||
/area/abductor_ship)
|
||||
"Gm" = (
|
||||
/obj/machinery/abductor/experiment{
|
||||
team = 4
|
||||
team_number = 4
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
"Gn" = (
|
||||
/obj/machinery/abductor/console{
|
||||
team = 4
|
||||
team_number = 4
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
"Go" = (
|
||||
/obj/machinery/abductor/pad{
|
||||
team = 4
|
||||
team_number = 4
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
@@ -12400,7 +12407,7 @@
|
||||
/area/abductor_ship)
|
||||
"Gw" = (
|
||||
/obj/machinery/computer/camera_advanced/abductor{
|
||||
team = 1
|
||||
team_number = 1
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
@@ -12418,7 +12425,7 @@
|
||||
/area/abductor_ship)
|
||||
"GA" = (
|
||||
/obj/machinery/computer/camera_advanced/abductor{
|
||||
team = 4
|
||||
team_number = 4
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
@@ -12479,13 +12486,13 @@
|
||||
/area/abductor_ship)
|
||||
"GM" = (
|
||||
/obj/effect/landmark/abductor/scientist{
|
||||
team = 4
|
||||
team_number = 4
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
"GN" = (
|
||||
/obj/effect/landmark/abductor/agent{
|
||||
team = 4
|
||||
team_number = 4
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
@@ -12629,49 +12636,49 @@
|
||||
/area/space)
|
||||
"Hn" = (
|
||||
/obj/machinery/abductor/experiment{
|
||||
team = 2
|
||||
team_number = 2
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
"Ho" = (
|
||||
/obj/machinery/abductor/console{
|
||||
team = 2
|
||||
team_number = 2
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
"Hp" = (
|
||||
/obj/machinery/abductor/pad{
|
||||
team = 2
|
||||
team_number = 2
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
"Hq" = (
|
||||
/obj/machinery/abductor/experiment{
|
||||
team = 3
|
||||
team_number = 3
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
"Hr" = (
|
||||
/obj/machinery/abductor/console{
|
||||
team = 3
|
||||
team_number = 3
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
"Hs" = (
|
||||
/obj/machinery/abductor/pad{
|
||||
team = 3
|
||||
team_number = 3
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
"Ht" = (
|
||||
/obj/machinery/computer/camera_advanced/abductor{
|
||||
team = 2
|
||||
team_number = 2
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
"Hu" = (
|
||||
/obj/machinery/computer/camera_advanced/abductor{
|
||||
team = 3
|
||||
team_number = 3
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
@@ -12693,25 +12700,25 @@
|
||||
/area/centcom/evac)
|
||||
"Hy" = (
|
||||
/obj/effect/landmark/abductor/scientist{
|
||||
team = 2
|
||||
team_number = 2
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
"Hz" = (
|
||||
/obj/effect/landmark/abductor/agent{
|
||||
team = 2
|
||||
team_number = 2
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
"HA" = (
|
||||
/obj/effect/landmark/abductor/scientist{
|
||||
team = 3
|
||||
team_number = 3
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
"HB" = (
|
||||
/obj/effect/landmark/abductor/agent{
|
||||
team = 3
|
||||
team_number = 3
|
||||
},
|
||||
/turf/open/floor/plating/abductor,
|
||||
/area/abductor_ship)
|
||||
@@ -13652,6 +13659,44 @@
|
||||
},
|
||||
/turf/open/floor/holofloor,
|
||||
/area/holodeck/rec_center/school)
|
||||
"QT" = (
|
||||
/obj/effect/turf_decal/stripes/corner,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/syndicate_mothership/control)
|
||||
"QU" = (
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/syndicate_mothership/control)
|
||||
"QV" = (
|
||||
/obj/effect/turf_decal/stripes/corner{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/syndicate_mothership/control)
|
||||
"QW" = (
|
||||
/obj/effect/turf_decal/stripes/corner{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/syndicate_mothership/control)
|
||||
"QX" = (
|
||||
/obj/effect/turf_decal/stripes/corner{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/syndicate_mothership/control)
|
||||
"QY" = (
|
||||
/obj/effect/turf_decal/stripes/corner{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/syndicate_mothership/control)
|
||||
"QZ" = (
|
||||
/obj/effect/turf_decal/stripes/corner{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/syndicate_mothership/control)
|
||||
|
||||
(1,1,1) = {"
|
||||
aa
|
||||
@@ -34895,7 +34940,7 @@ lG
|
||||
hm
|
||||
aa
|
||||
kl
|
||||
qs
|
||||
QT
|
||||
rk
|
||||
rl
|
||||
rm
|
||||
@@ -34903,7 +34948,7 @@ tl
|
||||
rm
|
||||
ux
|
||||
vc
|
||||
qs
|
||||
QY
|
||||
kl
|
||||
aa
|
||||
aa
|
||||
@@ -36180,7 +36225,7 @@ hq
|
||||
hm
|
||||
aa
|
||||
kl
|
||||
qt
|
||||
QU
|
||||
ro
|
||||
rm
|
||||
sd
|
||||
@@ -36437,7 +36482,7 @@ hq
|
||||
hm
|
||||
aa
|
||||
kl
|
||||
qs
|
||||
QV
|
||||
rp
|
||||
ro
|
||||
rm
|
||||
@@ -36445,7 +36490,7 @@ tl
|
||||
rm
|
||||
uy
|
||||
ve
|
||||
qs
|
||||
QZ
|
||||
kl
|
||||
aa
|
||||
aa
|
||||
@@ -36695,13 +36740,13 @@ hm
|
||||
aa
|
||||
kl
|
||||
qs
|
||||
qs
|
||||
QW
|
||||
se
|
||||
se
|
||||
se
|
||||
se
|
||||
se
|
||||
qs
|
||||
QX
|
||||
qs
|
||||
kl
|
||||
aa
|
||||
@@ -76391,9 +76436,9 @@ dM
|
||||
QJ
|
||||
QL
|
||||
fg
|
||||
QO
|
||||
QQ
|
||||
QR
|
||||
QL
|
||||
QK
|
||||
QL
|
||||
dM
|
||||
fN
|
||||
fQ
|
||||
@@ -76903,11 +76948,11 @@ dM
|
||||
QI
|
||||
dM
|
||||
QK
|
||||
QM
|
||||
QL
|
||||
QN
|
||||
QP
|
||||
QL
|
||||
fr
|
||||
QS
|
||||
QL
|
||||
dM
|
||||
fN
|
||||
ab
|
||||
|
||||
Reference in New Issue
Block a user