mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-30 16:48:12 +01:00
misc minor fixes
This commit is contained in:
Killian
@@ -6,11 +6,13 @@
|
||||
access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
|
||||
access_tox_storage, access_teleporter, access_sec_doors,
|
||||
access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage,
|
||||
access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_eva, access_network) //YW Edit access_gateway
|
||||
access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_eva, access_network,
|
||||
access_explorer, access_pathfinder) //YW Edit access_gateway, _explorer, and _pathfinder
|
||||
minimal_access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
|
||||
access_tox_storage, access_teleporter, access_sec_doors,
|
||||
access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage,
|
||||
access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_eva, access_network) //YW Edit access_gateway
|
||||
access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_eva, access_network,
|
||||
access_explorer, access_pathfinder) //YW Edit access_gateway, _explorer, and _pathfinder
|
||||
|
||||
/datum/job/scientist
|
||||
spawn_positions = 5
|
||||
|
||||
+84355
-2672
File diff suppressed because it is too large
Load Diff
@@ -667,7 +667,10 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/xenobiology/secure)
|
||||
"bD" = (
|
||||
/obj/machinery/door/airlock/hatch,
|
||||
/obj/machinery/door/airlock/hatch{
|
||||
name = "Xenobiological Research Equipment";
|
||||
req_one_access = list(12,47,52)
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
@@ -823,7 +826,7 @@
|
||||
"bV" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/machinery/door/airlock/research{
|
||||
name = "Dangerious Xenobiology Lab";
|
||||
name = "Dangerous Xenobiology Lab";
|
||||
req_access = list();
|
||||
req_one_access = list(7,29)
|
||||
},
|
||||
@@ -840,7 +843,7 @@
|
||||
"bW" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/machinery/door/airlock/research{
|
||||
name = "Dangerious Xenobiology Lab";
|
||||
name = "Dangerous Xenobiology Lab";
|
||||
req_access = list();
|
||||
req_one_access = list(7,29)
|
||||
},
|
||||
@@ -1285,6 +1288,11 @@
|
||||
name = "west bump";
|
||||
pixel_x = -28
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8;
|
||||
icon_state = "tube1";
|
||||
pixel_x = 0
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost/launch)
|
||||
"dc" = (
|
||||
@@ -1305,6 +1313,10 @@
|
||||
dir = 8;
|
||||
pixel_x = 28
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 4;
|
||||
icon_state = "tube1"
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel,
|
||||
/area/rnd/outpost/launch)
|
||||
"dg" = (
|
||||
@@ -1921,7 +1933,7 @@
|
||||
"ew" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/machinery/door/airlock/research{
|
||||
name = "Dangerious Xenobiology Lab";
|
||||
name = "Dangerous Xenobiology Lab";
|
||||
req_access = list();
|
||||
req_one_access = list(7,29)
|
||||
},
|
||||
@@ -1937,7 +1949,7 @@
|
||||
"ex" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/machinery/door/airlock/research{
|
||||
name = "Dangerious Xenobiology Lab";
|
||||
name = "Dangerous Xenobiology Lab";
|
||||
req_access = list();
|
||||
req_one_access = list(7,29)
|
||||
},
|
||||
@@ -12354,6 +12366,10 @@
|
||||
frequency = 1441;
|
||||
pixel_y = 22
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 4;
|
||||
icon_state = "tube1"
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/outpost/research/hallway/entry)
|
||||
"ym" = (
|
||||
@@ -12574,6 +12590,11 @@
|
||||
dir = 4;
|
||||
pixel_x = -28
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8;
|
||||
icon_state = "tube1";
|
||||
pixel_x = 0
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/outpost/research/hallway/entry)
|
||||
"yJ" = (
|
||||
@@ -14996,6 +15017,7 @@
|
||||
/obj/effect/floor_decal/corner/paleblue{
|
||||
dir = 10
|
||||
},
|
||||
/obj/machinery/light,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/outpost/research/medical)
|
||||
"CX" = (
|
||||
@@ -21719,6 +21741,13 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/xenobiology/secure)
|
||||
"Sh" = (
|
||||
/obj/machinery/light{
|
||||
dir = 4;
|
||||
icon_state = "tube1"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/rnd/outpost/launch)
|
||||
"Wr" = (
|
||||
/obj/machinery/camera/network/research_outpost{
|
||||
c_tag = "Toxins Testing Room";
|
||||
@@ -60861,7 +60890,7 @@ dB
|
||||
Wr
|
||||
eG
|
||||
fg
|
||||
fg
|
||||
Sh
|
||||
gr
|
||||
cv
|
||||
ab
|
||||
|
||||
@@ -1458,7 +1458,8 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/door/airlock/vault/bolted{
|
||||
name = "AI core";
|
||||
req_access = list(16)
|
||||
req_access = newlist();
|
||||
req_one_access = list(16,53,52)
|
||||
},
|
||||
/obj/machinery/door/blast/regular{
|
||||
id = "AICore";
|
||||
@@ -1920,7 +1921,8 @@
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/machinery/door/airlock/highsecurity{
|
||||
name = "Messaging Server";
|
||||
req_access = list(16)
|
||||
req_access = newlist();
|
||||
req_one_access = list(16,53,52)
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
@@ -2356,7 +2358,7 @@
|
||||
"afL" = (
|
||||
/obj/machinery/door/airlock/highsecurity{
|
||||
name = "AI Hub";
|
||||
req_access = list();
|
||||
req_access = newlist();
|
||||
req_one_access = list(56,30)
|
||||
},
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
@@ -6366,8 +6368,9 @@
|
||||
"aou" = (
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/machinery/door/airlock/highsecurity{
|
||||
name = "AI Upload Access";
|
||||
req_access = list(16)
|
||||
name = "Core Integrity and Cyborg Access";
|
||||
req_access = newlist();
|
||||
req_one_access = list(16,53,52)
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
@@ -14611,15 +14614,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/medical/chemistry)
|
||||
"aFy" = (
|
||||
/obj/structure/disposalpipe/up,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/medical_lower)
|
||||
"aFz" = (
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/supply,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/medical_lower)
|
||||
"aFA" = (
|
||||
/obj/structure/railing{
|
||||
dir = 8
|
||||
@@ -14805,45 +14799,35 @@
|
||||
/obj/item/weapon/storage/box/camerabug,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/vacant/vacant_site/private)
|
||||
"aFV" = (
|
||||
/obj/structure/disposalpipe/down{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/medical_lower)
|
||||
"aFW" = (
|
||||
/obj/structure/disposalpipe/junction{
|
||||
icon_state = "pipe-j2";
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/medical_lower)
|
||||
"aFX" = (
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "16-0"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/structure/disposalpipe/broken{
|
||||
dir = 8
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{
|
||||
icon_state = "up-scrubbers";
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/supply{
|
||||
icon_state = "up-supply";
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/medical_lower)
|
||||
"aFY" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/medical_lower)
|
||||
"aFZ" = (
|
||||
@@ -37913,6 +37897,7 @@
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/item/tape/engineering,
|
||||
/turf/simulated/floor,
|
||||
/area/maintenance/aft)
|
||||
"bBo" = (
|
||||
@@ -38497,6 +38482,7 @@
|
||||
/obj/machinery/door/airlock/glass_science{
|
||||
name = "Nanite Laboratory"
|
||||
},
|
||||
/obj/item/tape/engineering,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/lab)
|
||||
"bCC" = (
|
||||
@@ -38532,6 +38518,7 @@
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/item/tape/engineering,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/lab)
|
||||
"bCG" = (
|
||||
@@ -38739,6 +38726,7 @@
|
||||
icon_state = "warningcee";
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/barricade,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/lab)
|
||||
"bCV" = (
|
||||
@@ -38763,6 +38751,7 @@
|
||||
icon_state = "warningcee";
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/barricade,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/lab)
|
||||
"bCW" = (
|
||||
@@ -40542,6 +40531,13 @@
|
||||
temperature = 80
|
||||
},
|
||||
/area/tcommsat/chamber)
|
||||
"xHg" = (
|
||||
/obj/machinery/door/airlock/engineeringatmos{
|
||||
name = "Pipe-Power Floor Transfer"
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/medical_lower)
|
||||
|
||||
(1,1,1) = {"
|
||||
aaa
|
||||
@@ -68072,7 +68068,7 @@ aAs
|
||||
aAs
|
||||
age
|
||||
agw
|
||||
aFV
|
||||
agw
|
||||
age
|
||||
aEd
|
||||
agw
|
||||
@@ -68322,9 +68318,9 @@ aBI
|
||||
aCv
|
||||
aAs
|
||||
aEb
|
||||
age
|
||||
aFy
|
||||
aFW
|
||||
agw
|
||||
agw
|
||||
agw
|
||||
age
|
||||
age
|
||||
ajl
|
||||
@@ -68573,8 +68569,8 @@ aAs
|
||||
aBJ
|
||||
aCv
|
||||
aAs
|
||||
aEc
|
||||
age
|
||||
agw
|
||||
agw
|
||||
agw
|
||||
aFX
|
||||
aEc
|
||||
@@ -68826,8 +68822,8 @@ aBI
|
||||
aCv
|
||||
aAs
|
||||
agw
|
||||
aEc
|
||||
aFz
|
||||
agw
|
||||
agw
|
||||
aFY
|
||||
age
|
||||
aHp
|
||||
@@ -69077,7 +69073,7 @@ aAs
|
||||
aAs
|
||||
aCw
|
||||
aAs
|
||||
agw
|
||||
xHg
|
||||
age
|
||||
age
|
||||
aJp
|
||||
|
||||
@@ -15892,13 +15892,10 @@
|
||||
/area/maintenance/medbay)
|
||||
"aDy" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/door/airlock/engineeringatmos{
|
||||
name = "Pipe-Power Floor Transfer"
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/medbay)
|
||||
"aDz" = (
|
||||
/obj/structure/cable{
|
||||
@@ -16858,17 +16855,6 @@
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/crew_quarters/captain)
|
||||
"aFs" = (
|
||||
/obj/structure/disposalpipe/up,
|
||||
/obj/structure/lattice,
|
||||
/turf/simulated/open,
|
||||
/area/maintenance/medbay)
|
||||
"aFt" = (
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/supply,
|
||||
/obj/structure/lattice,
|
||||
/turf/simulated/open,
|
||||
/area/maintenance/medbay)
|
||||
"aFu" = (
|
||||
/obj/machinery/door/airlock/multi_tile/glass{
|
||||
dir = 1;
|
||||
@@ -17337,20 +17323,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/shuttle/security)
|
||||
"aGl" = (
|
||||
/obj/structure/disposalpipe/down{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/lattice,
|
||||
/turf/simulated/open,
|
||||
/area/maintenance/medbay)
|
||||
"aGm" = (
|
||||
/obj/structure/disposalpipe/junction{
|
||||
icon_state = "pipe-j2";
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/medbay)
|
||||
"aGn" = (
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{
|
||||
dir = 4
|
||||
@@ -17362,19 +17334,20 @@
|
||||
/obj/structure/cable{
|
||||
icon_state = "32-4"
|
||||
},
|
||||
/obj/structure/disposalpipe/broken{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/open,
|
||||
/area/maintenance/medbay)
|
||||
"aGo" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/medbay)
|
||||
"aGp" = (
|
||||
@@ -37454,7 +37427,7 @@
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/machinery/door/airlock/engineering{
|
||||
name = "Tech Storage";
|
||||
req_access = newlist()
|
||||
req_one_access = list(10,23,52)
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
@@ -59421,6 +59394,7 @@
|
||||
/obj/machinery/door/airlock/glass_science{
|
||||
name = "Nanite Laboratory"
|
||||
},
|
||||
/obj/item/tape/engineering,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/hallway)
|
||||
"ccW" = (
|
||||
@@ -93538,11 +93512,11 @@ akb
|
||||
akb
|
||||
dVw
|
||||
fUD
|
||||
akb
|
||||
akb
|
||||
akb
|
||||
aHf
|
||||
aHf
|
||||
akA
|
||||
akA
|
||||
akA
|
||||
aGl
|
||||
aHf
|
||||
aJL
|
||||
aJL
|
||||
@@ -93792,9 +93766,9 @@ rrK
|
||||
oyi
|
||||
aCF
|
||||
aDx
|
||||
akb
|
||||
aFs
|
||||
aGm
|
||||
akA
|
||||
akA
|
||||
akA
|
||||
aHf
|
||||
rvG
|
||||
mLn
|
||||
@@ -94042,9 +94016,9 @@ akA
|
||||
tqc
|
||||
dVw
|
||||
cSk
|
||||
akb
|
||||
aDy
|
||||
akb
|
||||
aHf
|
||||
aHf
|
||||
aHf
|
||||
akA
|
||||
aGn
|
||||
aHf
|
||||
@@ -94297,7 +94271,7 @@ aBH
|
||||
aCG
|
||||
aDz
|
||||
aDy
|
||||
aFt
|
||||
akA
|
||||
aGo
|
||||
aHf
|
||||
uOr
|
||||
@@ -94548,8 +94522,8 @@ aAy
|
||||
akb
|
||||
akb
|
||||
aDA
|
||||
akb
|
||||
akb
|
||||
aHf
|
||||
aHf
|
||||
aGp
|
||||
aHf
|
||||
wwp
|
||||
|
||||
Reference in New Issue
Block a user