Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)

* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
This commit is contained in:
Poojawa
2018-03-14 16:49:40 -05:00
committed by GitHub
parent be23070f67
commit 6c7da493d9
122 changed files with 12848 additions and 12563 deletions
+93
View File
@@ -0,0 +1,93 @@
#Python 3+ Script for importing admins.txt and admin_ranks.txt made by Jordie0608
#
#Before starting ensure you have installed the mysqlclient package https://github.com/PyMySQL/mysqlclient-python
#It can be downloaded from command line with pip:
#pip install mysqlclient
#And that you have run the most recent commands listed in database_changelog.txt
#
#To view the parameters for this script, execute it with the argument --help
#All the positional arguments are required, remember to include prefixes in your table names if you use them
#An example of the command used to execute this script from powershell:
#python admin_import_2018-02-03.py "localhost" "root" "password" "feedback" "SS13_admin" "SS13_admin_ranks"
#
#This script performs no error-correction, improper configurations of admins.txt or admin_ranks.txt will cause either breaking exceptions or invalid table rows
#It's safe to run this script with your game server(s) active.
import MySQLdb
import argparse
import re
import sys
def parse_text_flags(text, previous):
flag_values = {"BUILDMODE":1, "BUILD":1, "ADMIN":2, "REJUVINATE":2, "REJUV":2, "BAN":4, "FUN":8, "SERVER":16, "DEBUG":32, "POSSESS":64, "PERMISSIONS":128, "RIGHTS":128, "STEALTH":256, "POLL":512, "VAREDIT":1024, "SOUNDS":2048, "SOUND":2048, "SPAWN":4096, "CREATE":4096, "AUTOLOGIN":8192, "AUTOADMIN":8192, "DBRANKS":16384}
flags_int = 8192
exclude_flags_int = 0
can_edit_flags_int = 0
flags = text.split(" ")
if flags:
for flag in flags:
sign = flag[:1]
if flag[1:] in ("@", "prev"):
if sign is "+":
flags_int = previous[0]
elif sign is "-":
exclude_flags_int = previous[1]
elif sign is "*":
can_edit_flags_int = previous[2]
continue
if flag[1:] in ("EVERYTHING", "HOST", "ALL"):
if sign is "+":
flags_int = 65535
elif sign is "-":
exclude_flags_int = 65535
elif sign is "*":
can_edit_flags_int = 65535
continue
if flag[1:] in flag_values:
if sign is "+":
flags_int += flag_values[flag[1:]]
elif sign is "-":
exclude_flags_int += flag_values[flag[1:]]
elif sign is "*":
can_edit_flags_int += flag_values[flag[1:]]
flags_int = max(min(65535, flags_int), 0)
exclude_flags_int = max(min(65535, exclude_flags_int), 0)
can_edit_flags_int = max(min(65535, can_edit_flags_int), 0)
return flags_int, exclude_flags_int, can_edit_flags_int
if sys.version_info[0] < 3:
raise Exception("Python must be at least version 3 for this script.")
parser = argparse.ArgumentParser()
parser.add_argument("address", help="MySQL server address (use localhost for the current computer)")
parser.add_argument("username", help="MySQL login username")
parser.add_argument("password", help="MySQL login username")
parser.add_argument("database", help="Database name")
parser.add_argument("admintable", help="Name of the current admin table (remember prefixes if you use them)")
parser.add_argument("rankstable", help="Name of the current admin ranks (remember prefixes)")
args = parser.parse_args()
db=MySQLdb.connect(host=args.address, user=args.username, passwd=args.password, db=args.database)
cursor=db.cursor()
ranks_table = args.rankstable
admin_table = args.admintable
with open("..\\config\\admin_ranks.txt") as rank_file:
previous = 0
for line in rank_file:
if line.strip():
if line.startswith("#"):
continue
matches = re.match("(.+)\\b\\s+=\\s*(.*)", line)
flags = parse_text_flags(matches.group(2), previous)
previous = flags
cursor.execute("INSERT INTO {0} (rank, flags, exclude_flags, can_edit_flags) VALUES ('{1}', {2}, {3}, {4})".format(ranks_table, matches.group(1), flags[0], flags[1], flags[2]))
with open("..\\config\\admins.txt") as admins_file:
previous = 0
for line in admins_file:
if line.strip():
if line.startswith("#"):
continue
matches = re.match("(.+)\\b\\s+=\\s+(.+)", line)
cursor.execute("INSERT INTO {0} (ckey, rank) VALUES ('{1}', '{2}')".format(admin_table, matches.group(1).lower(), matches.group(2)))
db.commit()
cursor.close()
print("Import complete.")
@@ -54,6 +54,25 @@
dir = 8
},
/area/ruin/unpowered/syndicate_lava_base/main)
"ah" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks/beer{
dir = 1
},
/obj/structure/sign/barsign{
pixel_y = -32;
req_access = null;
req_access_txt = "0"
},
/turf/open/floor/wood,
/area/ruin/unpowered/syndicate_lava_base/bar)
"ai" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks{
dir = 1
},
/turf/open/floor/wood,
/area/ruin/unpowered/syndicate_lava_base/bar)
"ap" = (
/obj/machinery/light/small{
dir = 1
@@ -547,7 +566,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/mob/living/carbon/monkey{
faction = list("neutral","syndicate")
faction = list("neutral","Syndicate")
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -891,7 +910,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/mob/living/carbon/monkey{
faction = list("neutral","syndicate")
faction = list("neutral","Syndicate")
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -1268,8 +1287,7 @@
base_state = "left";
dir = 2;
icon_state = "left";
name = "Chemistry";
req_access_txt = "0"
name = "Chemistry"
},
/obj/machinery/door/window/southleft{
base_state = "left";
@@ -2176,8 +2194,7 @@
"hk" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining/glass{
name = "Cargo Bay";
req_access_txt = "0"
name = "Cargo Bay"
},
/turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/cargo)
@@ -2214,7 +2231,7 @@
"hp" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/carbon/monkey{
faction = list("neutral","syndicate")
faction = list("neutral","Syndicate")
},
/turf/open/floor/plasteel/white/side{
dir = 9
@@ -2235,7 +2252,7 @@
/area/ruin/unpowered/syndicate_lava_base/virology)
"hr" = (
/mob/living/carbon/monkey{
faction = list("neutral","syndicate")
faction = list("neutral","Syndicate")
},
/turf/open/floor/plasteel/white/side{
dir = 5
@@ -2346,8 +2363,7 @@
"hC" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining/glass{
name = "Cargo Bay";
req_access_txt = "0"
name = "Cargo Bay"
},
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/cargo)
@@ -2362,7 +2378,7 @@
/area/ruin/unpowered/syndicate_lava_base/cargo)
"hE" = (
/mob/living/carbon/monkey{
faction = list("neutral","syndicate")
faction = list("neutral","Syndicate")
},
/turf/open/floor/plasteel/white/side{
dir = 10
@@ -2382,7 +2398,7 @@
"hG" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/carbon/monkey{
faction = list("neutral","syndicate")
faction = list("neutral","Syndicate")
},
/turf/open/floor/plasteel/white/side{
dir = 6
@@ -2672,8 +2688,7 @@
/area/ruin/unpowered/syndicate_lava_base/main)
"il" = (
/obj/machinery/door/airlock{
name = "Cabin 2";
req_access_txt = "0"
name = "Cabin 2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -2685,8 +2700,7 @@
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"im" = (
/obj/machinery/door/airlock{
name = "Unisex Restrooms";
req_access_txt = "0"
name = "Unisex Restrooms"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{
@@ -2695,8 +2709,7 @@
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"in" = (
/obj/machinery/door/airlock{
name = "Cabin 4";
req_access_txt = "0"
name = "Cabin 4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -3141,8 +3154,7 @@
/area/lavaland/surface/outdoors)
"jf" = (
/obj/machinery/door/airlock{
name = "Cabin 1";
req_access_txt = "0"
name = "Cabin 1"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -3169,8 +3181,7 @@
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"jh" = (
/obj/machinery/door/airlock{
name = "Cabin 3";
req_access_txt = "0"
name = "Cabin 3"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -4236,8 +4247,7 @@
base_state = "right";
dir = 1;
icon_state = "right";
name = "Bar";
req_access_txt = "0"
name = "Bar"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -5041,21 +5051,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/bar)
"mV" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks/beer,
/obj/structure/sign/barsign{
pixel_y = -32;
req_access = null;
req_access_txt = "0"
},
/turf/open/floor/wood,
/area/ruin/unpowered/syndicate_lava_base/bar)
"mW" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks,
/turf/open/floor/wood,
/area/ruin/unpowered/syndicate_lava_base/bar)
"mX" = (
/obj/structure/rack{
dir = 8
@@ -7054,7 +7049,7 @@ li
lA
lX
mw
mV
ah
jy
nu
oo
@@ -7101,7 +7096,7 @@ lj
lB
lY
lA
mW
ai
jP
nT
op
+2 -6
View File
@@ -337,9 +337,7 @@
/area/ruin/space/djstation)
"bi" = (
/obj/machinery/door/airlock/external{
name = "Ruskie DJ Station";
req_access = null;
req_access_txt = "0"
name = "Ruskie DJ Station"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
@@ -353,9 +351,7 @@
/area/space/nearstation)
"Co" = (
/obj/machinery/door/airlock/external{
name = "Ruskie DJ Station";
req_access = null;
req_access_txt = "0"
name = "Ruskie DJ Station"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
+2 -6
View File
@@ -290,12 +290,11 @@
/turf/closed/wall/r_wall,
/area/ruin/space/derelict/solar_control)
"aT" = (
/obj/machinery/power/apc{
/obj/machinery/power/apc/unlocked{
dir = 8;
environ = 0;
equipment = 0;
lighting = 0;
locked = 0;
name = "Starboard Solar APC";
pixel_x = -24
},
@@ -887,7 +886,6 @@
"cV" = (
/obj/machinery/door/airlock/command{
name = "E.V.A.";
req_access = null;
req_access_txt = "18"
},
/obj/structure/cable{
@@ -3270,7 +3268,6 @@
"kR" = (
/obj/machinery/door/airlock/security{
name = "Security";
req_access = null;
req_access_txt = "1"
},
/obj/structure/cable{
@@ -4209,12 +4206,11 @@
/area/ruin/space/derelict/se_solar)
"nZ" = (
/obj/structure/cable,
/obj/machinery/power/apc{
/obj/machinery/power/apc/unlocked{
dir = 8;
environ = 0;
equipment = 0;
lighting = 0;
locked = 0;
name = "Worn-out APC";
pixel_x = -24
},
@@ -315,12 +315,11 @@
},
/area/ruin/space/has_grav/abandonedzoo)
"aS" = (
/obj/machinery/power/apc{
/obj/machinery/power/apc/unlocked{
dir = 8;
environ = 0;
equipment = 0;
lighting = 0;
locked = 0;
name = "Worn-out APC";
pixel_x = -24
},
+3 -6
View File
@@ -517,11 +517,10 @@
/obj/structure/cable{
icon_state = "0-2"
},
/obj/machinery/power/apc{
/obj/machinery/power/apc/unlocked{
dir = 1;
environ = 0;
equipment = 3;
locked = 0;
pixel_y = 32;
req_access = null
},
@@ -779,11 +778,10 @@
/obj/structure/cable{
icon_state = "0-2"
},
/obj/machinery/power/apc{
/obj/machinery/power/apc/unlocked{
dir = 1;
environ = 0;
equipment = 3;
locked = 0;
pixel_y = 32;
req_access = null
},
@@ -1049,9 +1047,8 @@
/obj/structure/cable{
icon_state = "0-2"
},
/obj/machinery/power/apc{
/obj/machinery/power/apc/unlocked{
dir = 1;
locked = 0;
pixel_y = 28;
req_access = null
},
+6 -18
View File
@@ -181,9 +181,7 @@
/obj/item/stack/sheet/mineral/wood,
/obj/item/stack/packageWrap,
/obj/effect/turf_decal/delivery,
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/turf/open/floor/plasteel/floorgrime,
@@ -384,9 +382,7 @@
"aZ" = (
/obj/structure/table,
/obj/machinery/reagentgrinder,
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -867,9 +863,7 @@
/area/ruin/space/has_grav/deepstorage)
"cm" = (
/obj/structure/table,
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -912,9 +906,7 @@
/area/ruin/space/has_grav/deepstorage)
"cs" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/turf/open/floor/plasteel/freezer,
@@ -2168,9 +2160,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/turf/open/floor/plasteel/floorgrime,
@@ -2880,9 +2870,7 @@
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/turf/open/floor/light,
@@ -781,8 +781,7 @@
dir = 1
},
/obj/machinery/door/airlock{
name = "Cabin";
req_access_txt = "0"
name = "Cabin"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+26 -66
View File
@@ -292,12 +292,9 @@
/obj/structure/chair{
dir = 1
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 8;
locked = 0;
pixel_x = 24;
req_access = null;
req_one_access = null
pixel_x = 24
},
/obj/machinery/light{
dir = 4
@@ -1063,12 +1060,9 @@
/obj/machinery/light/small{
dir = 8
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 4;
locked = 0;
pixel_x = -23;
req_access = null;
req_one_access = null
pixel_x = -23
},
/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/ancientstation)
@@ -1130,12 +1124,9 @@
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 8;
locked = 0;
pixel_x = 24;
req_access = null;
req_one_access = null
pixel_x = 24
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/floorgrime,
@@ -1253,12 +1244,9 @@
"dO" = (
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 8;
locked = 0;
pixel_x = 24;
req_access = null;
req_one_access = null
pixel_x = 24
},
/obj/item/clothing/suit/space/nasavoid/old,
/turf/open/floor/plasteel/yellow/side{
@@ -1319,12 +1307,9 @@
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 4;
locked = 0;
pixel_x = -23;
req_access = null;
req_one_access = null
pixel_x = -23
},
/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/ancientstation/deltacorridor)
@@ -1363,12 +1348,9 @@
/area/ruin/space/has_grav/ancientstation/deltacorridor)
"ee" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 8;
locked = 0;
pixel_x = 24;
req_access = null;
req_one_access = null
pixel_x = 24
},
/mob/living/simple_animal/hostile/hivebot,
/turf/open/floor/plasteel/floorgrime,
@@ -2134,7 +2116,6 @@
"gg" = (
/obj/machinery/door/airlock/external{
name = "Engineering External Access";
req_access = null;
req_access_txt = "200"
},
/obj/effect/decal/cleanable/dirt,
@@ -2768,12 +2749,8 @@
/area/ruin/space/has_grav/ancientstation/kitchen)
"hw" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23;
req_access = null;
req_one_access = null
/obj/machinery/airalarm/all_access{
pixel_y = 23
},
/obj/effect/decal/cleanable/egg_smudge,
/turf/open/floor/plasteel/cafeteria,
@@ -3199,12 +3176,9 @@
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 8;
locked = 0;
pixel_x = 24;
req_access = null;
req_one_access = null
pixel_x = 24
},
/turf/open/floor/plasteel/orange/side{
tag = "icon-orange (EAST)";
@@ -3259,9 +3233,8 @@
pixel_x = 2;
pixel_y = 2
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/turf/open/floor/plasteel/red/side{
@@ -3287,12 +3260,9 @@
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 4;
locked = 0;
pixel_x = -23;
req_access = null;
req_one_access = null
pixel_x = -23
},
/mob/living/simple_animal/hostile/hivebot,
/turf/open/floor/plasteel/floorgrime,
@@ -3393,12 +3363,9 @@
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/ancientstation/kitchen)
"iO" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 8;
locked = 0;
pixel_x = 24;
req_access = null;
req_one_access = null
pixel_x = 24
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/floorgrime,
@@ -3923,12 +3890,8 @@
/area/ruin/space/has_grav/ancientstation/proto)
"kj" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23;
req_access = null;
req_one_access = null
/obj/machinery/airalarm/all_access{
pixel_y = 23
},
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/ancientstation/proto)
@@ -4327,12 +4290,9 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation/proto)
"lk" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 8;
locked = 0;
pixel_x = 24;
req_access = null;
req_one_access = null
pixel_x = 24
},
/turf/open/floor/plasteel/airless/floorgrime,
/area/ruin/space/has_grav/ancientstation/atmo)
@@ -8308,4 +8268,4 @@ aa
aa
aa
aa
"}
"}
+4 -8
View File
@@ -44,11 +44,10 @@
/obj/structure/cable{
icon_state = "0-2"
},
/obj/machinery/power/apc{
/obj/machinery/power/apc/unlocked{
dir = 1;
environ = 3;
equipment = 3;
locked = 0;
pixel_y = 32;
req_access = null
},
@@ -1157,11 +1156,10 @@
/obj/structure/cable{
icon_state = "0-2"
},
/obj/machinery/power/apc{
/obj/machinery/power/apc/unlocked{
dir = 1;
environ = 3;
equipment = 3;
locked = 0;
pixel_y = 32;
req_access = null
},
@@ -2146,11 +2144,10 @@
/obj/structure/cable{
icon_state = "0-2"
},
/obj/machinery/power/apc{
/obj/machinery/power/apc/unlocked{
dir = 1;
environ = 3;
equipment = 3;
locked = 0;
pixel_y = 32;
req_access = null
},
@@ -3106,11 +3103,10 @@
/turf/open/floor/plating,
/area/awaymission/academy/academygate)
"kh" = (
/obj/machinery/power/apc{
/obj/machinery/power/apc/unlocked{
dir = 1;
environ = 3;
equipment = 3;
locked = 0;
pixel_y = 32;
req_access = null
},
+3 -1
View File
@@ -411,7 +411,9 @@
/area/awaymission/cabin)
"bv" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks/beer,
/obj/machinery/chem_dispenser/drinks/beer{
dir = 8
},
/turf/open/floor/wood,
/area/awaymission/cabin)
"bw" = (
+1 -2
View File
@@ -936,8 +936,7 @@
/area/awaymission/centcomAway/general)
"dL" = (
/obj/machinery/door/airlock/hatch{
name = "Rest Room";
req_access_txt = "0"
name = "Rest Room"
},
/turf/open/floor/mineral/titanium,
/area/awaymission/centcomAway/hangar)
+25 -86
View File
@@ -428,8 +428,6 @@
/area/awaymission/moonoutpost19/syndicate)
"bo" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 1;
pixel_y = 23;
req_access = null;
req_access_txt = "150"
@@ -544,8 +542,7 @@
/area/awaymission/moonoutpost19/syndicate)
"bw" = (
/obj/machinery/door/airlock{
name = "Unisex Restrooms";
req_access_txt = "0"
name = "Unisex Restrooms"
},
/turf/open/floor/plasteel/freezer{
heat_capacity = 1e+006
@@ -609,8 +606,6 @@
},
/obj/machinery/airalarm{
dir = 8;
frequency = 1439;
locked = 1;
pixel_x = 23;
req_access = null;
req_access_txt = "150"
@@ -759,8 +754,6 @@
"bU" = (
/obj/machinery/portable_atmospherics/canister/air,
/obj/machinery/airalarm{
frequency = 1439;
locked = 1;
pixel_y = 23;
req_access = null;
req_access_txt = "150"
@@ -858,9 +851,7 @@
},
/area/awaymission/moonoutpost19/syndicate)
"cd" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23;
req_access = null;
req_access_txt = "150"
@@ -1315,8 +1306,6 @@
"cS" = (
/obj/machinery/airalarm{
dir = 8;
frequency = 1439;
locked = 1;
pixel_x = 23;
req_access = null;
req_access_txt = "150"
@@ -1411,7 +1400,6 @@
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_y = 25;
req_access_txt = "0";
specialfunctions = 4
},
/obj/structure/bed,
@@ -1439,7 +1427,6 @@
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_y = 25;
req_access_txt = "0";
specialfunctions = 4
},
/obj/structure/dresser,
@@ -1499,8 +1486,6 @@
/obj/structure/chair/wood/normal,
/obj/machinery/airalarm{
dir = 4;
frequency = 1439;
locked = 1;
pixel_x = -23;
req_access = null;
req_access_txt = "150"
@@ -1531,8 +1516,6 @@
"dk" = (
/obj/machinery/airalarm{
dir = 8;
frequency = 1439;
locked = 1;
pixel_x = 23;
req_access = null;
req_access_txt = "150"
@@ -2297,9 +2280,7 @@
/obj/structure/cable{
icon_state = "0-2"
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23;
req_access = null
},
@@ -2374,8 +2355,7 @@
icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
req_access_txt = "201";
req_one_access_txt = "0"
req_access_txt = "201"
},
/obj/effect/decal/cleanable/blood/tracks{
desc = "Your instincts say you shouldn't be following these.";
@@ -2431,9 +2411,7 @@
icon_state = "bulb-broken";
status = 2
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23;
req_access = null
},
@@ -2789,10 +2767,7 @@
},
/area/awaymission/moonoutpost19/research)
"fQ" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "0";
req_one_access_txt = "0"
},
/obj/machinery/door/airlock/maintenance,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -2835,9 +2810,7 @@
pixel_x = -3;
pixel_y = -2
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23;
req_access = null
},
@@ -3362,10 +3335,8 @@
icon_state = "tube-broken";
status = 2
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 8;
frequency = 1439;
locked = 0;
pixel_x = 23;
req_access = null
},
@@ -3625,9 +3596,7 @@
icon_state = "bulb-broken";
status = 2
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23;
req_access = null
},
@@ -3737,8 +3706,7 @@
icon_state = "open";
name = "Research Director's Office";
opacity = 0;
req_access_txt = "201";
req_one_access_txt = "0"
req_access_txt = "201"
},
/turf/open/floor/plasteel/cafeteria{
dir = 5
@@ -3785,10 +3753,8 @@
/obj/structure/table,
/obj/item/storage/firstaid/regular,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 8;
frequency = 1439;
locked = 0;
pixel_x = 23;
req_access = null
},
@@ -4009,8 +3975,7 @@
/obj/machinery/door/airlock/medical{
id_tag = "";
name = "Research Division";
req_access_txt = "201";
req_one_access_txt = "0"
req_access_txt = "201"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel/white{
@@ -4058,10 +4023,8 @@
},
/area/awaymission/moonoutpost19/research)
"ij" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
frequency = 1439;
locked = 0;
pixel_x = -23;
req_access = null
},
@@ -4525,8 +4488,7 @@
/area/awaymission/moonoutpost19/arrivals)
"jh" = (
/obj/machinery/door/airlock{
name = "Unisex Restrooms";
req_access_txt = "0"
name = "Unisex Restrooms"
},
/turf/open/floor/plasteel/freezer{
heat_capacity = 1e+006
@@ -4751,9 +4713,7 @@
},
/area/awaymission/moonoutpost19/arrivals)
"jI" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23;
req_access = null
},
@@ -4903,9 +4863,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23;
req_access = null
},
@@ -5120,10 +5078,8 @@
dir = 4
},
/obj/machinery/processor,
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 8;
frequency = 1439;
locked = 0;
pixel_x = 23;
req_access = null
},
@@ -5364,7 +5320,6 @@
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_x = -25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/carpet{
@@ -5385,10 +5340,7 @@
},
/area/awaymission/moonoutpost19/arrivals)
"kV" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "0";
req_one_access_txt = "0"
},
/obj/machinery/door/airlock/maintenance,
/turf/open/floor/plating{
heat_capacity = 1e+006
},
@@ -5540,10 +5492,8 @@
dir = 4
},
/obj/structure/chair/wood/normal,
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 8;
frequency = 1439;
locked = 0;
pixel_x = 23;
req_access = null
},
@@ -5563,10 +5513,8 @@
},
/obj/structure/table,
/obj/item/storage/box,
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
frequency = 1439;
locked = 0;
pixel_x = -23;
req_access = null
},
@@ -5601,8 +5549,7 @@
/obj/machinery/button/door{
id = "awaykitchen";
name = "Kitchen Shutters Control";
pixel_x = -25;
req_access_txt = "0"
pixel_x = -25
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/cafeteria{
@@ -6008,7 +5955,6 @@
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_x = -25;
req_access_txt = "0";
specialfunctions = 4
},
/obj/machinery/newscaster{
@@ -6210,10 +6156,8 @@
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 8;
frequency = 1439;
locked = 0;
pixel_x = 23;
req_access = null
},
@@ -6445,10 +6389,8 @@
},
/area/awaymission/moonoutpost19/arrivals)
"ny" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 8;
frequency = 1439;
locked = 0;
pixel_x = 23;
req_access = null
},
@@ -6461,8 +6403,7 @@
/area/awaymission/moonoutpost19/arrivals)
"nz" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "201";
req_one_access_txt = "0"
req_access_txt = "201"
},
/turf/open/floor/plating{
heat_capacity = 1e+006
@@ -6560,7 +6501,6 @@
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_x = -25;
req_access_txt = "0";
specialfunctions = 4
},
/obj/effect/decal/remains/human{
@@ -6838,8 +6778,7 @@
/obj/machinery/door/airlock/medical{
id_tag = "";
name = "Research Division";
req_access_txt = "201";
req_one_access_txt = "0"
req_access_txt = "201"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
+2 -4
View File
@@ -4199,8 +4199,7 @@
/area/awaymission/research/interior/escapepods)
"mS" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod Three";
req_access_txt = "0"
name = "Escape Pod Three"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
@@ -4279,8 +4278,7 @@
/area/awaymission/research/interior/engineering)
"pt" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod Three";
req_access_txt = "0"
name = "Escape Pod Three"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
+2 -12
View File
@@ -472,7 +472,6 @@
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
req_access_txt = "0";
specialfunctions = 4
},
/obj/item/tome,
@@ -487,7 +486,6 @@
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/wood,
@@ -511,7 +509,6 @@
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/wood,
@@ -523,7 +520,6 @@
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/wood,
@@ -537,7 +533,6 @@
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/wood,
@@ -1624,7 +1619,6 @@
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_x = -25;
req_access_txt = "0";
specialfunctions = 4
},
/obj/effect/decal/cleanable/cobweb,
@@ -2744,7 +2738,6 @@
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
req_access_txt = "0";
specialfunctions = 4
},
/obj/effect/decal/cleanable/dirt,
@@ -3098,7 +3091,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
name = "Medbay Storage";
req_access_txt = "45"
},
@@ -8932,7 +8924,7 @@
desc = "A turret built with substandard parts and run down further with age.";
icon_state = "syndie_off";
dir = 9;
faction = "pirate"
faction = list("pirate")
},
/turf/open/floor/plating/snowed/smoothed,
/area/awaymission/snowdin/cave)
@@ -10641,7 +10633,6 @@
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_x = -25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/plating/snowed/smoothed,
@@ -13074,8 +13065,7 @@
"Ic" = (
/obj/machinery/door/airlock/research{
name = "Robotics Lab";
req_access_txt = "29";
req_one_access_txt = "0"
req_access_txt = "29"
},
/obj/structure/cable/yellow{
icon_state = "4-8"
+95 -255
View File
@@ -84,24 +84,21 @@
id = "UO45_Elevator";
name = "Elevator Doors";
pixel_x = 6;
pixel_y = -24;
req_access_txt = "0"
pixel_y = -24
},
/obj/machinery/button/door{
desc = "A remote control-switch to call the elevator to your level.";
id = "UO45_useless";
name = "B1";
pixel_x = -6;
pixel_y = -24;
req_access_txt = "0"
pixel_y = -24
},
/obj/machinery/button/door{
desc = "A remote control-switch to call the elevator to your level.";
id = "UO45_useless";
name = "B2";
pixel_x = -6;
pixel_y = -34;
req_access_txt = "0"
pixel_y = -34
},
/turf/open/floor/plasteel{
dir = 8;
@@ -194,16 +191,14 @@
id = "UO45_useless";
name = "Call Elevator";
pixel_x = -6;
pixel_y = 24;
req_access_txt = "0"
pixel_y = 24
},
/obj/machinery/button/door{
desc = "A remote control-switch for the elevator doors.";
id = "UO45_Elevator";
name = "Elevator Doors";
pixel_x = 6;
pixel_y = 24;
req_access_txt = "0"
pixel_y = 24
},
/turf/open/floor/plasteel{
heat_capacity = 1e+006
@@ -506,10 +501,7 @@
},
/area/awaymission/undergroundoutpost45/central)
"br" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "0";
req_one_access_txt = "0"
},
/obj/machinery/door/airlock/maintenance,
/turf/open/floor/plating{
heat_capacity = 1e+006
},
@@ -522,12 +514,9 @@
/area/awaymission/undergroundoutpost45/central)
"bt" = (
/obj/machinery/light/small,
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 1;
frequency = 1439;
locked = 0;
pixel_y = -23;
req_access = null
pixel_y = -23
},
/turf/open/floor/plasteel/freezer{
heat_capacity = 1e+006
@@ -540,8 +529,7 @@
/area/awaymission/undergroundoutpost45/central)
"bv" = (
/obj/machinery/door/airlock{
name = "Unisex Restrooms";
req_access_txt = "0"
name = "Unisex Restrooms"
},
/turf/open/floor/plasteel/freezer{
heat_capacity = 1e+006
@@ -842,10 +830,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/door/airlock/maintenance{
req_access_txt = "0";
req_one_access_txt = "0"
},
/obj/machinery/door/airlock/maintenance,
/turf/open/floor/plating{
heat_capacity = 1e+006
},
@@ -972,11 +957,8 @@
/obj/machinery/light/small{
dir = 1
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23;
req_access = null
/obj/machinery/airalarm/all_access{
pixel_y = 23
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
@@ -1002,12 +984,9 @@
},
/area/awaymission/undergroundoutpost45/central)
"cz" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 4;
frequency = 1439;
locked = 0;
pixel_x = -23;
req_access = null
pixel_x = -23
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/filingcabinet,
@@ -1024,11 +1003,8 @@
/obj/machinery/light/small{
dir = 1
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23;
req_access = null
/obj/machinery/airalarm/all_access{
pixel_y = 23
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
@@ -1097,7 +1073,6 @@
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/carpet{
@@ -1139,7 +1114,6 @@
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/carpet{
@@ -1453,12 +1427,9 @@
/obj/machinery/light{
dir = 8
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 4;
frequency = 1439;
locked = 0;
pixel_x = -23;
req_access = null
pixel_x = -23
},
/turf/open/floor/plasteel{
dir = 8;
@@ -1530,11 +1501,8 @@
},
/area/awaymission/undergroundoutpost45/central)
"dE" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23;
req_access = null
/obj/machinery/airalarm/all_access{
pixel_y = 23
},
/obj/machinery/light{
dir = 1
@@ -1788,9 +1756,6 @@
icon_state = "1-2"
},
/obj/machinery/door/airlock/command{
icon_state = "closed";
lockdownbyai = 0;
locked = 0;
name = "Gateway Chamber";
req_access_txt = "201"
},
@@ -1812,8 +1777,7 @@
},
/obj/machinery/door/airlock/maintenance{
name = "Security Checkpoint Maintenance";
req_access_txt = "201";
req_one_access_txt = "0"
req_access_txt = "201"
},
/turf/open/floor/plating{
heat_capacity = 1e+006
@@ -2391,12 +2355,9 @@
/obj/machinery/light{
dir = 4
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 8;
frequency = 1439;
locked = 0;
pixel_x = 23;
req_access = null
pixel_x = 23
},
/turf/open/floor/plasteel/green/side{
dir = 4;
@@ -2505,7 +2466,6 @@
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_y = 25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/carpet{
@@ -2627,12 +2587,9 @@
/area/awaymission/undergroundoutpost45/central)
"fR" = (
/obj/machinery/light/small,
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 1;
frequency = 1439;
locked = 0;
pixel_y = -23;
req_access = null
pixel_y = -23
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
@@ -3101,11 +3058,8 @@
},
/area/awaymission/undergroundoutpost45/research)
"gY" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23;
req_access = null
/obj/machinery/airalarm/all_access{
pixel_y = 23
},
/obj/machinery/light/small{
dir = 1
@@ -3190,12 +3144,9 @@
},
/area/awaymission/undergroundoutpost45/crew_quarters)
"hg" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 8;
frequency = 1439;
locked = 0;
pixel_x = 23;
req_access = null
pixel_x = 23
},
/turf/open/floor/plasteel{
heat_capacity = 1e+006
@@ -3289,12 +3240,9 @@
},
/area/awaymission/undergroundoutpost45/crew_quarters)
"hs" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 8;
frequency = 1439;
locked = 0;
pixel_x = 23;
req_access = null
pixel_x = 23
},
/obj/machinery/camera{
c_tag = "Kitchen";
@@ -3622,12 +3570,9 @@
},
/area/awaymission/undergroundoutpost45/gateway)
"ic" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 8;
frequency = 1439;
locked = 0;
pixel_x = 23;
req_access = null
pixel_x = 23
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/chair{
@@ -4106,12 +4051,9 @@
/obj/machinery/light/small{
dir = 8
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 4;
frequency = 1439;
locked = 0;
pixel_x = -23;
req_access = null
pixel_x = -23
},
/turf/open/floor/plasteel/bar{
heat_capacity = 1e+006
@@ -4168,12 +4110,9 @@
},
/area/awaymission/undergroundoutpost45/crew_quarters)
"jg" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 4;
frequency = 1439;
locked = 0;
pixel_x = -23;
req_access = null
pixel_x = -23
},
/obj/machinery/camera{
c_tag = "Gateway Chamber";
@@ -4336,8 +4275,7 @@
"jy" = (
/obj/machinery/door/window/southright{
name = "Bar Door";
req_access_txt = "201";
req_one_access_txt = "0"
req_access_txt = "201"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/bar{
@@ -4441,12 +4379,9 @@
},
/area/awaymission/undergroundoutpost45/gateway)
"jK" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 8;
frequency = 1439;
locked = 0;
pixel_x = 23;
req_access = null
pixel_x = 23
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
@@ -4477,8 +4412,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/airlock/research{
name = "Research Lab";
req_access_txt = "201";
req_one_access_txt = "0"
req_access_txt = "201"
},
/turf/open/floor/plasteel/white{
heat_capacity = 1e+006
@@ -4598,10 +4532,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/door/airlock/maintenance{
req_access_txt = "0";
req_one_access_txt = "0"
},
/obj/machinery/door/airlock/maintenance,
/turf/open/floor/plating{
heat_capacity = 1e+006
},
@@ -4740,9 +4671,6 @@
dir = 4
},
/obj/machinery/door/airlock/command{
icon_state = "closed";
lockdownbyai = 0;
locked = 0;
name = "Gateway EVA";
req_access_txt = "201"
},
@@ -4774,11 +4702,8 @@
},
/area/awaymission/undergroundoutpost45/crew_quarters)
"ko" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23;
req_access = null
/obj/machinery/airalarm/all_access{
pixel_y = 23
},
/turf/open/floor/plasteel{
heat_capacity = 1e+006
@@ -4991,11 +4916,8 @@
},
/area/awaymission/undergroundoutpost45/gateway)
"kJ" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23;
req_access = null
/obj/machinery/airalarm/all_access{
pixel_y = 23
},
/obj/machinery/light/small{
dir = 1
@@ -5092,11 +5014,8 @@
},
/area/awaymission/undergroundoutpost45/research)
"kT" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23;
req_access = null
/obj/machinery/airalarm/all_access{
pixel_y = 23
},
/obj/machinery/light/small{
dir = 1
@@ -5270,12 +5189,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 1;
frequency = 1439;
locked = 0;
pixel_y = -23;
req_access = null
pixel_y = -23
},
/turf/open/floor/plasteel/bar{
heat_capacity = 1e+006
@@ -5351,11 +5267,8 @@
/obj/structure/cable{
icon_state = "2-4"
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23;
req_access = null
/obj/machinery/airalarm/all_access{
pixel_y = 23
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -5979,11 +5892,8 @@
/obj/machinery/light/small{
dir = 1
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23;
req_access = null
/obj/machinery/airalarm/all_access{
pixel_y = 23
},
/turf/open/floor/carpet{
heat_capacity = 1e+006
@@ -6009,11 +5919,8 @@
/obj/machinery/light/small{
dir = 1
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23;
req_access = null
/obj/machinery/airalarm/all_access{
pixel_y = 23
},
/obj/structure/chair/wood/normal{
dir = 8
@@ -6314,7 +6221,6 @@
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
req_access_txt = "0";
specialfunctions = 4
},
/obj/structure/chair/wood/normal{
@@ -6355,7 +6261,6 @@
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/carpet{
@@ -6557,10 +6462,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/door/airlock/maintenance{
req_access_txt = "0";
req_one_access_txt = "0"
},
/obj/machinery/door/airlock/maintenance,
/turf/open/floor/plating{
heat_capacity = 1e+006
},
@@ -6743,12 +6645,9 @@
},
/area/awaymission/undergroundoutpost45/research)
"nO" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 4;
frequency = 1439;
locked = 0;
pixel_x = -23;
req_access = null
pixel_x = -23
},
/obj/machinery/light/small{
dir = 8
@@ -6828,12 +6727,9 @@
},
/area/awaymission/undergroundoutpost45/research)
"nT" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 4;
frequency = 1439;
locked = 0;
pixel_x = -23;
req_access = null
pixel_x = -23
},
/obj/machinery/light{
dir = 8
@@ -6885,12 +6781,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 4;
frequency = 1439;
locked = 0;
pixel_x = -23;
req_access = null
pixel_x = -23
},
/turf/open/floor/plasteel/neutral/side{
dir = 8;
@@ -7013,11 +6906,8 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23;
req_access = null
/obj/machinery/airalarm/all_access{
pixel_y = 23
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -7465,12 +7355,9 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 8;
frequency = 1439;
locked = 0;
pixel_x = 23;
req_access = null
pixel_x = 23
},
/obj/machinery/light/small{
dir = 4
@@ -7739,8 +7626,7 @@
/area/awaymission/undergroundoutpost45/crew_quarters)
"pr" = (
/obj/machinery/door/airlock{
name = "Unisex Restrooms";
req_access_txt = "0"
name = "Unisex Restrooms"
},
/turf/open/floor/plasteel/freezer{
heat_capacity = 1e+006
@@ -7748,10 +7634,7 @@
/area/awaymission/undergroundoutpost45/crew_quarters)
"ps" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/maintenance{
req_access_txt = "0";
req_one_access_txt = "0"
},
/obj/machinery/door/airlock/maintenance,
/turf/open/floor/plating{
heat_capacity = 1e+006
},
@@ -7985,7 +7868,6 @@
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_x = -25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/carpet{
@@ -8023,7 +7905,6 @@
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/carpet{
@@ -8098,8 +7979,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/machinery/door/airlock/engineering/glass{
name = "SMES Room";
req_access_txt = "201";
req_one_access_txt = "0"
req_access_txt = "201"
},
/turf/open/floor/plasteel/dark{
heat_capacity = 1e+006
@@ -8224,11 +8104,8 @@
/area/awaymission/undergroundoutpost45/research)
"qp" = (
/obj/structure/table,
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23;
req_access = null
/obj/machinery/airalarm/all_access{
pixel_y = 23
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/item/hand_labeler,
@@ -8264,12 +8141,9 @@
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 8;
frequency = 1439;
locked = 0;
pixel_x = 23;
req_access = null
pixel_x = 23
},
/turf/open/floor/carpet{
heat_capacity = 1e+006
@@ -8285,12 +8159,9 @@
},
/area/awaymission/undergroundoutpost45/crew_quarters)
"qv" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 8;
frequency = 1439;
locked = 0;
pixel_x = 23;
req_access = null
pixel_x = 23
},
/turf/open/floor/carpet{
heat_capacity = 1e+006
@@ -8300,12 +8171,9 @@
/obj/machinery/light/small{
dir = 8
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 4;
frequency = 1439;
locked = 0;
pixel_x = -23;
req_access = null
pixel_x = -23
},
/turf/open/floor/plasteel/freezer{
heat_capacity = 1e+006
@@ -9175,11 +9043,8 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23;
req_access = null
/obj/machinery/airalarm/all_access{
pixel_y = 23
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -9251,8 +9116,7 @@
dir = 4
},
/obj/machinery/door/airlock/engineering/glass{
name = "Engineering Reception";
req_access_txt = "0"
name = "Engineering Reception"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel{
@@ -9693,8 +9557,7 @@
dir = 4
},
/obj/machinery/door/airlock/engineering/glass{
name = "Engineering Reception";
req_access_txt = "0"
name = "Engineering Reception"
},
/turf/open/floor/plasteel{
heat_capacity = 1e+006
@@ -10516,12 +10379,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 5
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 1;
frequency = 1439;
locked = 0;
pixel_y = -23;
req_access = null
pixel_y = -23
},
/turf/open/floor/plasteel/floorgrime{
dir = 8;
@@ -10664,10 +10524,7 @@
},
/area/awaymission/undergroundoutpost45/crew_quarters)
"uz" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "0";
req_one_access_txt = "0"
},
/obj/machinery/door/airlock/maintenance,
/turf/open/floor/plating{
heat_capacity = 1e+006
},
@@ -10902,11 +10759,8 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
pixel_y = 23;
req_access = null
/obj/machinery/airalarm/all_access{
pixel_y = 23
},
/turf/open/floor/plasteel/floorgrime{
dir = 8;
@@ -11622,7 +11476,6 @@
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/carpet{
@@ -11742,12 +11595,9 @@
},
/area/awaymission/undergroundoutpost45/engineering)
"wC" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 4;
frequency = 1439;
locked = 0;
pixel_x = -23;
req_access = null
pixel_x = -23
},
/turf/open/floor/plasteel/floorgrime{
dir = 8;
@@ -11852,7 +11702,6 @@
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_y = 25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/carpet{
@@ -11932,12 +11781,9 @@
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 8;
frequency = 1439;
locked = 0;
pixel_x = 23;
req_access = null
pixel_x = 23
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/neutral{
@@ -12162,12 +12008,9 @@
/area/awaymission/undergroundoutpost45/mining)
"xp" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 8;
frequency = 1439;
locked = 0;
pixel_x = 23;
req_access = null
pixel_x = 23
},
/obj/structure/cable{
icon_state = "1-2"
@@ -12529,12 +12372,9 @@
},
/area/awaymission/undergroundoutpost45/mining)
"xZ" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/all_access{
dir = 4;
frequency = 1439;
locked = 0;
pixel_x = -23;
req_access = null
pixel_x = -23
},
/obj/structure/closet/emcloset,
/turf/open/floor/plasteel/floorgrime{
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
+84 -119
View File
@@ -521,6 +521,24 @@
dir = 1
},
/area/bridge)
"abb" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks{
dir = 8
},
/obj/item/device/radio/intercom{
name = "Station Intercom";
pixel_x = 28;
pixel_y = 24
},
/obj/machinery/camera{
c_tag = "Bar";
dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/crew_quarters/bar/atrium)
"abc" = (
/obj/structure/cable/white{
icon_state = "4-8"
@@ -871,6 +889,18 @@
dir = 4
},
/area/bridge)
"abJ" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks/beer{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/crew_quarters/bar/atrium)
"abK" = (
/obj/structure/window/reinforced{
dir = 8
@@ -1443,7 +1473,6 @@
},
/obj/machinery/door/airlock/command{
name = "Council Chambers";
req_access = null;
req_access_txt = "19"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -1545,7 +1574,6 @@
},
/obj/machinery/door/airlock/command{
name = "Council Chambers";
req_access = null;
req_access_txt = "19"
},
/obj/effect/turf_decal/stripes/line{
@@ -1769,7 +1797,6 @@
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
pixel_x = -26;
req_access_txt = "0";
use_power = 0
},
/obj/effect/landmark/start/captain,
@@ -1919,7 +1946,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/airlock/command{
name = "Head of Personnel's Quarters";
req_access = null;
req_access_txt = "57"
},
/obj/effect/turf_decal/stripes/line{
@@ -2074,7 +2100,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security{
name = "Detective's Office";
req_access = null;
req_access_txt = "4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -2120,7 +2145,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
name = "Captain's Quarters";
req_access = null;
req_access_txt = "20"
},
/obj/structure/cable/white{
@@ -2656,7 +2680,6 @@
},
/obj/machinery/door/airlock/command{
name = "Head of Personnel's Office";
req_access = null;
req_access_txt = "57"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -2888,7 +2911,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
name = "Captain's Emergency Escape";
req_access = null;
req_access_txt = "20"
},
/obj/structure/cable/white{
@@ -3239,9 +3261,8 @@
pixel_y = 3
},
/obj/item/storage/secure/briefcase,
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/obj/machinery/light{
@@ -3385,7 +3406,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
name = "Captain's Office";
req_access = null;
req_access_txt = "20"
},
/obj/structure/cable/white{
@@ -4019,7 +4039,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining{
name = "Cargo Bay";
req_access_txt = "0";
req_one_access_txt = "48;50"
},
/obj/effect/turf_decal/stripes/line{
@@ -4193,7 +4212,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security{
name = "Detective's Office";
req_access = null;
req_access_txt = "4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -4464,7 +4482,7 @@
/turf/open/floor/plating,
/area/security/brig)
"aiV" = (
/obj/machinery/rnd/protolathe/department/security,
/obj/machinery/rnd/production/techfab/department/security,
/turf/open/floor/plasteel/red/side{
dir = 8
},
@@ -5908,7 +5926,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
name = "E.V.A. Storage";
req_access = null;
req_access_txt = "18"
},
/obj/effect/turf_decal/stripes/line{
@@ -6004,7 +6021,7 @@
/obj/structure/cable/white{
icon_state = "0-8"
},
/obj/machinery/rnd/protolathe/department/cargo,
/obj/machinery/rnd/production/techfab/department/cargo,
/turf/open/floor/plasteel/brown{
dir = 4
},
@@ -6509,9 +6526,8 @@
},
/obj/item/storage/lockbox/loyalty,
/obj/structure/table/reinforced,
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/obj/machinery/camera{
@@ -7891,7 +7907,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/external{
name = "Mining Dock Airlock";
req_access = null;
req_access_txt = "48"
},
/obj/effect/turf_decal/stripes/line{
@@ -7980,9 +7995,8 @@
/area/security/brig)
"apy" = (
/obj/machinery/vending/security,
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/obj/machinery/light{
@@ -8288,8 +8302,8 @@
"apX" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/delivery,
/obj/machinery/rnd/protolathe/department/service,
/obj/effect/turf_decal/stripes/box,
/obj/machinery/rnd/production/techfab/department/service,
/turf/open/floor/plasteel,
/area/crew_quarters/bar/atrium)
"apY" = (
@@ -9812,8 +9826,7 @@
"asU" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
name = "Primary Tool Storage";
req_access_txt = "0"
name = "Primary Tool Storage"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -10185,8 +10198,7 @@
"atO" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
name = "Primary Tool Storage";
req_access_txt = "0"
name = "Primary Tool Storage"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -10432,22 +10444,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar/atrium)
"auh" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks,
/obj/item/device/radio/intercom{
name = "Station Intercom";
pixel_x = 28;
pixel_y = 24
},
/obj/machinery/camera{
c_tag = "Bar";
dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/crew_quarters/bar/atrium)
"aui" = (
/obj/machinery/status_display,
/turf/closed/wall,
@@ -10955,16 +10951,6 @@
dir = 5
},
/area/crew_quarters/bar/atrium)
"avm" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks/beer,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/crew_quarters/bar/atrium)
"avn" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -14458,9 +14444,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"aCL" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -18864,7 +18849,7 @@
/obj/structure/cable/white{
icon_state = "1-4"
},
/obj/machinery/rnd/circuit_imprinter,
/obj/machinery/rnd/production/circuit_imprinter,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel/yellow/side{
dir = 4
@@ -19085,7 +19070,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
name = "Telecomms Control Room";
req_access = null;
req_access_txt = "19; 61"
},
/obj/structure/cable{
@@ -19261,7 +19245,7 @@
network = list("engine");
pixel_y = -32
},
/obj/machinery/rnd/protolathe/department/engineering,
/obj/machinery/rnd/production/protolathe/department/engineering,
/obj/effect/turf_decal/stripes/box,
/turf/open/floor/plasteel,
/area/engine/engineering)
@@ -19659,9 +19643,8 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/obj/effect/turf_decal/stripes/line{
@@ -21014,7 +20997,6 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/command{
name = "Telecomms Server Room";
req_access = null;
req_access_txt = "61"
},
/obj/effect/turf_decal/stripes/line{
@@ -21861,7 +21843,6 @@
"aSM" = (
/obj/machinery/door/airlock/command{
name = "Telecomms Server Room";
req_access = null;
req_access_txt = "61"
},
/obj/structure/cable{
@@ -22062,9 +22043,8 @@
pixel_y = 3
},
/obj/item/storage/box/bodybags,
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/turf/open/floor/plasteel/vault/side{
@@ -22628,7 +22608,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/machinery/rnd/protolathe/department/science,
/obj/machinery/rnd/production/protolathe/department/science,
/turf/open/floor/plasteel/vault/side{
dir = 4
},
@@ -23035,7 +23015,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/obj/machinery/rnd/circuit_imprinter/department/science,
/obj/machinery/rnd/production/circuit_imprinter/department/science,
/turf/open/floor/plasteel/vault/side{
dir = 4
},
@@ -23644,7 +23624,6 @@
"aWN" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
name = "Chemistry Lab";
req_access_txt = "5; 33"
},
@@ -23718,7 +23697,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
name = "Research and Development Lab";
req_access_txt = "0";
req_one_access_txt = "7;29"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -24066,7 +24044,6 @@
"aXF" = (
/obj/machinery/door/airlock/command{
name = "Research Division Server Room";
req_access = null;
req_access_txt = "30"
},
/obj/structure/cable/white{
@@ -24657,8 +24634,7 @@
/obj/effect/turf_decal/delivery,
/obj/machinery/door/window/eastleft{
name = "First-Aid Supplies";
req_access_txt = "5";
req_one_access_txt = "0"
req_access_txt = "5"
},
/turf/open/floor/plasteel,
/area/medical/medbay/zone3)
@@ -25220,9 +25196,8 @@
"aZU" = (
/obj/machinery/recharge_station,
/obj/effect/landmark/start/cyborg,
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/obj/machinery/power/apc/highcap/ten_k{
@@ -25492,8 +25467,8 @@
dir = 5
},
/obj/effect/turf_decal/bot,
/obj/machinery/rnd/protolathe/department/medical,
/obj/effect/turf_decal/stripes/box,
/obj/machinery/rnd/production/techfab/department/medical,
/turf/open/floor/plasteel,
/area/medical/medbay/zone3)
"bav" = (
@@ -26279,7 +26254,6 @@
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
pixel_x = -26;
req_access_txt = "0";
use_power = 0
},
/obj/effect/turf_decal/bot,
@@ -27513,8 +27487,7 @@
"beB" = (
/obj/machinery/door/window{
dir = 8;
name = "Theatre Stage";
req_access_txt = "0"
name = "Theatre Stage"
},
/turf/open/floor/plasteel/bar,
/area/maintenance/port)
@@ -27770,9 +27743,8 @@
/area/maintenance/port)
"bfe" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/turf/open/floor/plasteel/blue/corner{
@@ -29650,8 +29622,7 @@
/obj/machinery/button/door{
id = "chapelprivacy";
name = "Chapel Privacy Shutters";
pixel_y = -24;
req_access_txt = "0"
pixel_y = -24
},
/turf/open/floor/plasteel/chapel,
/area/chapel/main)
@@ -30083,9 +30054,8 @@
},
/obj/item/storage/box/syringes,
/obj/item/extinguisher/mini,
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/obj/machinery/newscaster{
@@ -30295,7 +30265,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bkC" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
@@ -31714,8 +31684,7 @@
/obj/machinery/button/door{
id = "supplybridge";
name = "Shuttle Bay Space Bridge Control";
pixel_y = 27;
req_access_txt = "0"
pixel_y = 27
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -31757,22 +31726,10 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"dqM" = (
"eDa" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/crew_quarters/cryopod)
"eJF" = (
/obj/structure/cable/white{
icon_state = "0-8"
},
/obj/machinery/power/apc{
areastring = "/area/medical/cryo";
dir = 2;
name = "Cryogenics APC";
pixel_y = -24
},
/turf/open/floor/plasteel/purple,
/area/crew_quarters/cryopod)
"fWz" = (
/obj/machinery/door/airlock/external{
name = "External Docking Port";
@@ -31786,21 +31743,20 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"gHi" = (
"iJY" = (
/obj/machinery/cryopod,
/turf/open/floor/plasteel/purple,
/area/crew_quarters/cryopod)
"jDa" = (
/obj/machinery/computer/cryopod{
pixel_x = 25
},
/turf/open/floor/plasteel/purple,
/area/crew_quarters/cryopod)
"icS" = (
/obj/machinery/cryopod,
/turf/open/floor/plasteel/purple,
/area/crew_quarters/cryopod)
"kKd" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/external{
name = "Mining Dock Airlock";
req_access = null;
req_access_txt = "48"
},
/obj/effect/turf_decal/stripes/line{
@@ -32675,8 +32631,7 @@
/obj/machinery/button/door{
id = "supplybridge";
name = "Shuttle Bay Space Bridge Control";
pixel_y = 27;
req_access_txt = "0"
pixel_y = 27
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -33707,7 +33662,6 @@
"sNk" = (
/obj/machinery/door/airlock/external{
name = "MiniSat External Access";
req_access = null;
req_access_txt = "65"
},
/obj/effect/turf_decal/delivery,
@@ -33866,7 +33820,6 @@
"sNy" = (
/obj/machinery/door/airlock/external{
name = "MiniSat External Access";
req_access = null;
req_access_txt = "65"
},
/obj/effect/turf_decal/delivery,
@@ -34308,9 +34261,6 @@
"sPY" = (
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"usJ" = (
/turf/closed/wall,
/area/crew_quarters/cryopod)
"uxJ" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -34349,6 +34299,21 @@
},
/turf/open/floor/engine,
/area/engine/supermatter)
"xux" = (
/obj/structure/cable/white{
icon_state = "0-8"
},
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/cryopod";
dir = 2;
name = "Cryogenics APC";
pixel_y = -24
},
/turf/open/floor/plasteel/purple,
/area/crew_quarters/cryopod)
"xIT" = (
/turf/closed/wall,
/area/crew_quarters/cryopod)
(1,1,1) = {"
aaa
@@ -77105,8 +77070,8 @@ ajx
akA
alt
amm
eJF
usJ
xux
xIT
aoT
apZ
ara
@@ -77363,7 +77328,7 @@ akB
alk
amm
amm
dqM
eDa
aoU
aqa
arg
@@ -77618,16 +77583,16 @@ aiC
ajz
akC
alk
icS
gHi
dqM
iJY
jDa
eDa
aoV
aqb
arh
asl
atm
auh
avm
abb
abJ
awr
awZ
axT
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
+7 -25
View File
@@ -144,9 +144,7 @@
/area/mine/laborcamp)
"aB" = (
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
name = "Infirmary";
req_access_txt = "0"
name = "Infirmary"
},
/turf/open/floor/plasteel/white,
/area/mine/laborcamp)
@@ -457,8 +455,7 @@
dir = 4
},
/obj/machinery/door/airlock/security/glass{
name = "Labor Camp Shuttle Prisoner Airlock";
req_access_txt = "0"
name = "Labor Camp Shuttle Prisoner Airlock"
},
/turf/open/floor/plasteel,
/area/mine/laborcamp)
@@ -500,7 +497,6 @@
/area/mine/laborcamp)
"bC" = (
/obj/machinery/airalarm{
frequency = 1439;
pixel_y = 23
},
/obj/machinery/computer/shuttle/mining{
@@ -757,8 +753,7 @@
/obj/machinery/door/airlock/external{
glass = 1;
name = "Mining Shuttle Airlock";
opacity = 0;
req_access_txt = "0"
opacity = 0
},
/turf/open/floor/plasteel,
/area/mine/production)
@@ -915,8 +910,7 @@
/area/mine/production)
"cJ" = (
/obj/machinery/door/airlock{
name = "Closet";
req_access_txt = "0"
name = "Closet"
},
/turf/open/floor/plating,
/area/mine/production)
@@ -1049,7 +1043,6 @@
"dc" = (
/obj/structure/closet/crate,
/obj/machinery/airalarm{
frequency = 1439;
pixel_y = 23
},
/obj/effect/turf_decal/bot,
@@ -1112,7 +1105,6 @@
dir = 8
},
/obj/machinery/airalarm{
frequency = 1439;
pixel_y = 23
},
/obj/machinery/iv_drip,
@@ -1380,9 +1372,7 @@
/area/mine/living_quarters)
"dR" = (
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
name = "Infirmary";
req_access_txt = "0"
name = "Infirmary"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
@@ -1467,7 +1457,6 @@
/area/mine/living_quarters)
"ee" = (
/obj/machinery/airalarm{
frequency = 1439;
pixel_y = 23
},
/turf/open/floor/plasteel,
@@ -1864,7 +1853,6 @@
/area/mine/living_quarters)
"fc" = (
/obj/machinery/airalarm{
frequency = 1439;
pixel_y = 23
},
/turf/open/floor/plasteel/purple/corner{
@@ -1886,7 +1874,6 @@
/obj/structure/bed,
/obj/item/bedsheet/brown,
/obj/machinery/airalarm{
frequency = 1439;
pixel_y = 23
},
/turf/open/floor/carpet,
@@ -1981,7 +1968,6 @@
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/carpet,
@@ -2127,7 +2113,6 @@
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/carpet,
@@ -2158,7 +2143,6 @@
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/carpet,
@@ -3331,8 +3315,7 @@
dir = 8
},
/obj/machinery/door/airlock/security/glass{
name = "Labor Camp Shuttle Prisoner Airlock";
req_access_txt = "0"
name = "Labor Camp Shuttle Prisoner Airlock"
},
/turf/open/floor/plasteel,
/area/mine/laborcamp)
@@ -3355,8 +3338,7 @@
/obj/machinery/door/airlock/external{
glass = 1;
name = "Mining Shuttle Airlock";
opacity = 0;
req_access_txt = "0"
opacity = 0
},
/turf/open/floor/plasteel,
/area/mine/production)
+82 -117
View File
@@ -521,6 +521,24 @@
dir = 1
},
/area/bridge)
"abb" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks{
dir = 8
},
/obj/item/device/radio/intercom{
name = "Station Intercom";
pixel_x = 28;
pixel_y = 24
},
/obj/machinery/camera{
c_tag = "Bar";
dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/crew_quarters/bar/atrium)
"abc" = (
/obj/structure/cable/white{
icon_state = "4-8"
@@ -871,6 +889,18 @@
dir = 4
},
/area/bridge)
"abJ" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks/beer{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/crew_quarters/bar/atrium)
"abK" = (
/obj/structure/window/reinforced{
dir = 8
@@ -1443,7 +1473,6 @@
},
/obj/machinery/door/airlock/command{
name = "Council Chambers";
req_access = null;
req_access_txt = "19"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -1545,7 +1574,6 @@
},
/obj/machinery/door/airlock/command{
name = "Council Chambers";
req_access = null;
req_access_txt = "19"
},
/obj/effect/turf_decal/stripes/line{
@@ -1769,7 +1797,6 @@
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
pixel_x = -26;
req_access_txt = "0";
use_power = 0
},
/obj/effect/landmark/start/captain,
@@ -1919,7 +1946,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/airlock/command{
name = "Head of Personnel's Quarters";
req_access = null;
req_access_txt = "57"
},
/obj/effect/turf_decal/stripes/line{
@@ -2074,7 +2100,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security{
name = "Detective's Office";
req_access = null;
req_access_txt = "4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -2120,7 +2145,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
name = "Captain's Quarters";
req_access = null;
req_access_txt = "20"
},
/obj/structure/cable/white{
@@ -2656,7 +2680,6 @@
},
/obj/machinery/door/airlock/command{
name = "Head of Personnel's Office";
req_access = null;
req_access_txt = "57"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -2888,7 +2911,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
name = "Captain's Emergency Escape";
req_access = null;
req_access_txt = "20"
},
/obj/structure/cable/white{
@@ -3239,9 +3261,8 @@
pixel_y = 3
},
/obj/item/storage/secure/briefcase,
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/obj/machinery/light{
@@ -3385,7 +3406,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
name = "Captain's Office";
req_access = null;
req_access_txt = "20"
},
/obj/structure/cable/white{
@@ -4019,7 +4039,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining{
name = "Cargo Bay";
req_access_txt = "0";
req_one_access_txt = "48;50"
},
/obj/effect/turf_decal/stripes/line{
@@ -4193,7 +4212,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security{
name = "Detective's Office";
req_access = null;
req_access_txt = "4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -5908,7 +5926,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
name = "E.V.A. Storage";
req_access = null;
req_access_txt = "18"
},
/obj/effect/turf_decal/stripes/line{
@@ -6509,9 +6526,8 @@
},
/obj/item/storage/lockbox/loyalty,
/obj/structure/table/reinforced,
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/obj/machinery/camera{
@@ -7891,7 +7907,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/external{
name = "Mining Dock Airlock";
req_access = null;
req_access_txt = "48"
},
/obj/effect/turf_decal/stripes/line{
@@ -7980,9 +7995,8 @@
/area/security/brig)
"apy" = (
/obj/machinery/vending/security,
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/obj/machinery/light{
@@ -9812,8 +9826,7 @@
"asU" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
name = "Primary Tool Storage";
req_access_txt = "0"
name = "Primary Tool Storage"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -10185,8 +10198,7 @@
"atO" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
name = "Primary Tool Storage";
req_access_txt = "0"
name = "Primary Tool Storage"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -10432,22 +10444,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar/atrium)
"auh" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks,
/obj/item/device/radio/intercom{
name = "Station Intercom";
pixel_x = 28;
pixel_y = 24
},
/obj/machinery/camera{
c_tag = "Bar";
dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/crew_quarters/bar/atrium)
"aui" = (
/obj/machinery/status_display,
/turf/closed/wall,
@@ -10955,16 +10951,6 @@
dir = 5
},
/area/crew_quarters/bar/atrium)
"avm" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks/beer,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/crew_quarters/bar/atrium)
"avn" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -14458,9 +14444,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"aCL" = (
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -19085,7 +19070,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
name = "Telecomms Control Room";
req_access = null;
req_access_txt = "19; 61"
},
/obj/structure/cable{
@@ -19659,9 +19643,8 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/obj/effect/turf_decal/stripes/line{
@@ -21014,7 +20997,6 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/command{
name = "Telecomms Server Room";
req_access = null;
req_access_txt = "61"
},
/obj/effect/turf_decal/stripes/line{
@@ -21861,7 +21843,6 @@
"aSM" = (
/obj/machinery/door/airlock/command{
name = "Telecomms Server Room";
req_access = null;
req_access_txt = "61"
},
/obj/structure/cable{
@@ -22062,9 +22043,8 @@
pixel_y = 3
},
/obj/item/storage/box/bodybags,
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/turf/open/floor/plasteel/vault/side{
@@ -23644,7 +23624,6 @@
"aWN" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
name = "Chemistry Lab";
req_access_txt = "5; 33"
},
@@ -23718,7 +23697,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
name = "Research and Development Lab";
req_access_txt = "0";
req_one_access_txt = "7;29"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -24066,7 +24044,6 @@
"aXF" = (
/obj/machinery/door/airlock/command{
name = "Research Division Server Room";
req_access = null;
req_access_txt = "30"
},
/obj/structure/cable/white{
@@ -24657,8 +24634,7 @@
/obj/effect/turf_decal/delivery,
/obj/machinery/door/window/eastleft{
name = "First-Aid Supplies";
req_access_txt = "5";
req_one_access_txt = "0"
req_access_txt = "5"
},
/turf/open/floor/plasteel,
/area/medical/medbay/zone3)
@@ -25220,9 +25196,8 @@
"aZU" = (
/obj/machinery/recharge_station,
/obj/effect/landmark/start/cyborg,
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/obj/machinery/power/apc/highcap/ten_k{
@@ -26279,7 +26254,6 @@
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
pixel_x = -26;
req_access_txt = "0";
use_power = 0
},
/obj/effect/turf_decal/bot,
@@ -27513,8 +27487,7 @@
"beB" = (
/obj/machinery/door/window{
dir = 8;
name = "Theatre Stage";
req_access_txt = "0"
name = "Theatre Stage"
},
/turf/open/floor/plasteel/bar,
/area/maintenance/port)
@@ -27770,9 +27743,8 @@
/area/maintenance/port)
"bfe" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/turf/open/floor/plasteel/blue/corner{
@@ -29650,8 +29622,7 @@
/obj/machinery/button/door{
id = "chapelprivacy";
name = "Chapel Privacy Shutters";
pixel_y = -24;
req_access_txt = "0"
pixel_y = -24
},
/turf/open/floor/plasteel/chapel,
/area/chapel/main)
@@ -30083,9 +30054,8 @@
},
/obj/item/storage/box/syringes,
/obj/item/extinguisher/mini,
/obj/machinery/airalarm{
/obj/machinery/airalarm/unlocked{
dir = 4;
locked = 0;
pixel_x = -23
},
/obj/machinery/newscaster{
@@ -31714,8 +31684,7 @@
/obj/machinery/button/door{
id = "supplybridge";
name = "Shuttle Bay Space Bridge Control";
pixel_y = 27;
req_access_txt = "0"
pixel_y = 27
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -31757,22 +31726,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"dqM" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/crew_quarters/cryopod)
"eJF" = (
/obj/structure/cable/white{
icon_state = "0-8"
},
/obj/machinery/power/apc{
areastring = "/area/medical/cryo";
dir = 2;
name = "Cryogenics APC";
pixel_y = -24
},
/turf/open/floor/plasteel/purple,
/area/crew_quarters/cryopod)
"fWz" = (
/obj/machinery/door/airlock/external{
name = "External Docking Port";
@@ -31786,21 +31739,13 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"gHi" = (
/obj/machinery/computer/cryopod{
pixel_x = 25
},
/turf/open/floor/plasteel/purple,
/area/crew_quarters/cryopod)
"icS" = (
/obj/machinery/cryopod,
/turf/open/floor/plasteel/purple,
"jFY" = (
/turf/closed/wall,
/area/crew_quarters/cryopod)
"kKd" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/external{
name = "Mining Dock Airlock";
req_access = null;
req_access_txt = "48"
},
/obj/effect/turf_decal/stripes/line{
@@ -31830,6 +31775,18 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"nbP" = (
/obj/structure/cable/white{
icon_state = "0-8"
},
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/cryopod";
dir = 2;
name = "Cryogenics APC";
pixel_y = -24
},
/turf/open/floor/plasteel/purple,
/area/crew_quarters/cryopod)
"nKi" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "Maintenance Hatch";
@@ -31852,6 +31809,10 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"oGK" = (
/obj/machinery/cryopod,
/turf/open/floor/plasteel/purple,
/area/crew_quarters/cryopod)
"sws" = (
/obj/docking_port/stationary{
dheight = 1;
@@ -32675,8 +32636,7 @@
/obj/machinery/button/door{
id = "supplybridge";
name = "Shuttle Bay Space Bridge Control";
pixel_y = 27;
req_access_txt = "0"
pixel_y = 27
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -33707,7 +33667,6 @@
"sNk" = (
/obj/machinery/door/airlock/external{
name = "MiniSat External Access";
req_access = null;
req_access_txt = "65"
},
/obj/effect/turf_decal/delivery,
@@ -33866,7 +33825,6 @@
"sNy" = (
/obj/machinery/door/airlock/external{
name = "MiniSat External Access";
req_access = null;
req_access_txt = "65"
},
/obj/effect/turf_decal/delivery,
@@ -34308,9 +34266,6 @@
"sPY" = (
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"usJ" = (
/turf/closed/wall,
/area/crew_quarters/cryopod)
"uxJ" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -34339,6 +34294,16 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"uyG" = (
/obj/machinery/computer/cryopod{
pixel_x = 25
},
/turf/open/floor/plasteel/purple,
/area/crew_quarters/cryopod)
"wgN" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/crew_quarters/cryopod)
"wUF" = (
/obj/machinery/door/airlock/atmos/glass{
name = "Supermatter Chamber";
@@ -77105,8 +77070,8 @@ ajx
akA
alt
amm
eJF
usJ
nbP
jFY
aoT
apZ
ara
@@ -77363,7 +77328,7 @@ akB
alk
amm
amm
dqM
wgN
aoU
aqa
arg
@@ -77618,16 +77583,16 @@ aiC
ajz
akC
alk
icS
gHi
dqM
oGK
uyG
wgN
aoV
aqb
arh
asl
atm
auh
avm
abb
abJ
awr
awZ
axT
File diff suppressed because it is too large Load Diff
+12 -34
View File
@@ -34,9 +34,7 @@
/turf/closed/wall/r_wall,
/area/engine/gravity_generator)
"al" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/structure/closet/secure_closet/atmospherics,
@@ -64,9 +62,7 @@
/turf/open/space,
/area/space/nearstation)
"ap" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/machinery/power/apc{
@@ -98,9 +94,7 @@
/obj/machinery/power/smes{
charge = 5e+006
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/structure/cable{
@@ -313,8 +307,7 @@
"aU" = (
/obj/machinery/door/airlock/engineering/glass{
name = "Gravity Generator";
req_access_txt = "11";
req_one_access_txt = "0"
req_access_txt = "11"
},
/obj/structure/cable{
icon_state = "4-8"
@@ -345,8 +338,7 @@
"aX" = (
/obj/machinery/door/airlock/engineering/glass{
name = "Gravity Generator";
req_access_txt = "11";
req_one_access_txt = "0"
req_access_txt = "11"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
@@ -538,9 +530,7 @@
/obj/structure/cable{
icon_state = "0-2"
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/machinery/autolathe/hacked,
@@ -570,9 +560,7 @@
/turf/open/floor/plasteel,
/area/science)
"bG" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/machinery/power/apc{
@@ -633,9 +621,7 @@
/obj/item/reagent_containers/glass/beaker/bluespace,
/obj/item/reagent_containers/glass/beaker/bluespace,
/obj/item/reagent_containers/syringe,
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/turf/open/floor/plasteel/dark,
@@ -658,9 +644,7 @@
/turf/open/floor/plasteel/dark,
/area/medical/chemistry)
"bU" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/machinery/power/apc{
@@ -992,9 +976,7 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"cW" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/structure/cable,
@@ -1023,9 +1005,7 @@
/turf/open/floor/plasteel,
/area/construction)
"da" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/machinery/power/apc{
@@ -1453,9 +1433,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/turf/open/floor/plasteel,
+35 -52
View File
@@ -2981,8 +2981,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
name = "CentCom";
opacity = 1;
req_access_txt = "0"
opacity = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -3072,10 +3071,8 @@
"jk" = (
/obj/machinery/door/poddoor{
density = 1;
icon_state = "closed";
id = "XCCQMLoaddoor2";
name = "Supply Dock Loading Door";
opacity = 1
name = "Supply Dock Loading Door"
},
/obj/machinery/conveyor{
dir = 4;
@@ -3102,10 +3099,8 @@
"jm" = (
/obj/machinery/door/poddoor{
density = 1;
icon_state = "closed";
id = "XCCQMLoaddoor2";
name = "Supply Dock Loading Door";
opacity = 1
name = "Supply Dock Loading Door"
},
/obj/machinery/conveyor{
dir = 4;
@@ -3280,10 +3275,8 @@
"jI" = (
/obj/machinery/door/poddoor{
density = 1;
icon_state = "closed";
id = "XCCQMLoaddoor";
name = "Supply Dock Loading Door";
opacity = 1
name = "Supply Dock Loading Door"
},
/obj/machinery/conveyor{
dir = 8;
@@ -3308,10 +3301,8 @@
"jK" = (
/obj/machinery/door/poddoor{
density = 1;
icon_state = "closed";
id = "XCCQMLoaddoor";
name = "Supply Dock Loading Door";
opacity = 1
name = "Supply Dock Loading Door"
},
/obj/machinery/conveyor{
dir = 8;
@@ -5083,7 +5074,6 @@
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
pixel_y = 32;
req_access_txt = "0";
use_power = 0
},
/turf/open/floor/plasteel/vault,
@@ -5334,6 +5324,24 @@
dir = 8
},
/area/centcom/control)
"oS" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks/beer{
dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/tdome/tdomeobserve)
"oT" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks{
dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/tdome/tdomeobserve)
"oW" = (
/obj/structure/flora/bush,
/obj/effect/light_emitter{
@@ -6051,8 +6059,7 @@
"qT" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom";
opacity = 1;
req_access_txt = "0"
opacity = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 2
@@ -7338,8 +7345,7 @@
/obj/machinery/button/door{
id = "XCCFerry";
name = "Hanger Bay Shutters";
pixel_y = -38;
req_access_txt = "0"
pixel_y = -38
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -8227,8 +8233,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
name = "CentCom";
opacity = 1;
req_access_txt = "0"
opacity = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -8336,8 +8341,7 @@
/area/space)
"xc" = (
/obj/machinery/door/airlock/external{
name = "Ferry Airlock";
req_access_txt = "0"
name = "Ferry Airlock"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -8847,8 +8851,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
name = "CentCom";
opacity = 1;
req_access_txt = "0"
opacity = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -9971,7 +9974,6 @@
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
pixel_y = -32;
req_access_txt = "0";
use_power = 0
},
/obj/effect/turf_decal/stripes/line{
@@ -10559,8 +10561,7 @@
"Eg" = (
/obj/machinery/door/airlock/centcom{
name = "Thunderdome Booth";
opacity = 1;
req_access_txt = "0"
opacity = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 2
@@ -11091,8 +11092,7 @@
"FK" = (
/obj/machinery/door/airlock/centcom{
name = "Thunderdome Backstage";
opacity = 1;
req_access_txt = "0"
opacity = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -11838,13 +11838,6 @@
},
/turf/open/floor/plasteel/bar,
/area/tdome/tdomeobserve)
"HE" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks/beer,
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/tdome/tdomeobserve)
"HF" = (
/obj/structure/sink{
dir = 4;
@@ -11939,13 +11932,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/tdome/tdomeobserve)
"HQ" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks,
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/tdome/tdomeobserve)
"HR" = (
/obj/structure/sink{
dir = 4;
@@ -13529,8 +13515,7 @@
"NU" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom";
opacity = 1;
req_access_txt = "0"
opacity = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 2
@@ -13544,8 +13529,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
name = "CentCom";
opacity = 1;
req_access_txt = "0"
opacity = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -13638,8 +13622,7 @@
/area/centcom/control)
"Xy" = (
/obj/machinery/door/airlock/external{
name = "Ferry Airlock";
req_access_txt = "0"
name = "Ferry Airlock"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -59893,8 +59876,8 @@ Ep
GU
GM
Hw
HE
HQ
oS
oT
HX
Ie
Iq
+2 -6
View File
@@ -17,7 +17,6 @@
dwidth = 4;
height = 17;
name = "delta arrivals shuttle";
timid = 1;
width = 9
},
/turf/closed/wall/mineral/plastitanium,
@@ -158,8 +157,7 @@
/area/shuttle/arrival)
"n" = (
/obj/machinery/door/airlock/shuttle{
name = "Arrival Shuttle Airlock";
req_access_txt = "0"
name = "Arrival Shuttle Airlock"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -272,7 +270,6 @@
"C" = (
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
req_access_txt = "0";
use_power = 0
},
/turf/closed/wall/mineral/titanium/nodiagonal,
@@ -345,8 +342,7 @@
dir = 2
},
/obj/machinery/door/airlock/shuttle{
name = "Arrival Shuttle Airlock";
req_access_txt = "0"
name = "Arrival Shuttle Airlock"
},
/obj/effect/turf_decal/stripes/line{
dir = 1
+1 -2
View File
@@ -112,8 +112,7 @@
},
/obj/docking_port/mobile/supply{
dwidth = 3;
width = 10;
timid = 1
width = 10
},
/turf/open/floor/plating,
/area/shuttle/supply)
+1 -2
View File
@@ -49,8 +49,7 @@
},
/obj/docking_port/mobile/supply{
dwidth = 5;
width = 12;
timid = 1
width = 12
},
/turf/open/floor/plating,
/area/shuttle/supply)
-1
View File
@@ -92,7 +92,6 @@
/obj/docking_port/mobile/supply{
dir = 4;
dwidth = 4;
timid = 1;
width = 12
},
/turf/open/floor/plating,
-1
View File
@@ -37,7 +37,6 @@
name = "Shuttle Under Construction";
port_direction = 4;
preferred_direction = 2;
timid = 1;
width = 30
},
/turf/open/floor/plating/airless,
+1 -2
View File
@@ -57,8 +57,7 @@
"o" = (
/obj/effect/forcefield/arena_shuttle_entrance,
/obj/docking_port/mobile/emergency{
name = "The Arena";
timid = 1
name = "The Arena"
},
/turf/open/indestructible/necropolis/air,
/area/shuttle/escape/arena)
+3 -8
View File
@@ -35,8 +35,7 @@
dwidth = 10;
height = 13;
name = "Asteroid emergency shuttle";
width = 28;
timid = 1
width = 28
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
@@ -111,8 +110,7 @@
/area/shuttle/escape)
"aG" = (
/obj/machinery/door/airlock/mining{
name = "Emergency Shuttle Storage";
req_access_txt = "0"
name = "Emergency Shuttle Storage"
},
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
@@ -310,7 +308,6 @@
/area/shuttle/escape)
"bq" = (
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
name = "Escape Shuttle Infirmary";
req_access_txt = "5"
},
@@ -318,9 +315,7 @@
/area/shuttle/escape)
"br" = (
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
name = "Escape Shuttle Infirmary";
req_access_txt = "0"
name = "Escape Shuttle Infirmary"
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
+18 -16
View File
@@ -9,6 +9,13 @@
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"ad" = (
/obj/structure/table,
/obj/machinery/chem_dispenser/drinks/beer{
dir = 8
},
/turf/open/floor/plasteel/bar,
/area/shuttle/escape)
"ae" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
@@ -36,6 +43,13 @@
},
/turf/open/floor/carpet,
/area/shuttle/escape)
"aj" = (
/obj/structure/table,
/obj/machinery/chem_dispenser/drinks{
dir = 8
},
/turf/open/floor/plasteel/bar,
/area/shuttle/escape)
"ak" = (
/obj/structure/extinguisher_cabinet{
pixel_y = 30
@@ -242,8 +256,7 @@
name = "Emergency Shuttle Airlock"
},
/obj/docking_port/mobile/emergency{
name = "The Emergency Escape Bar";
timid = 1
name = "The Emergency Escape Bar"
},
/turf/open/floor/plasteel/bar,
/area/shuttle/escape)
@@ -251,11 +264,6 @@
/mob/living/simple_animal/hostile/alien/maid/barmaid,
/turf/open/floor/plasteel/bar,
/area/shuttle/escape)
"aV" = (
/obj/structure/table,
/obj/machinery/chem_dispenser/drinks/beer,
/turf/open/floor/plasteel/bar,
/area/shuttle/escape)
"aW" = (
/obj/structure/chair/wood/normal,
/turf/open/floor/plasteel/grimy,
@@ -282,11 +290,6 @@
/obj/effect/spawner/lootdrop/gambling,
/turf/open/floor/plasteel/grimy,
/area/shuttle/escape)
"bb" = (
/obj/structure/table,
/obj/machinery/chem_dispenser/drinks,
/turf/open/floor/plasteel/bar,
/area/shuttle/escape)
"bc" = (
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-21";
@@ -322,8 +325,7 @@
/area/shuttle/escape)
"bm" = (
/obj/machinery/door/airlock{
name = "Unisex Restrooms";
req_access_txt = "0"
name = "Unisex Restrooms"
},
/turf/open/floor/plasteel/freezer,
/area/shuttle/escape)
@@ -783,9 +785,9 @@ aG
bW
bI
aS
aV
ad
aY
bb
aj
bN
be
bT
-1
View File
@@ -201,7 +201,6 @@
height = 18;
port_direction = 4;
width = 14;
timid = 1;
name = "Birdboat emergency escape shuttle"
},
/turf/open/floor/mineral/titanium,
+1 -2
View File
@@ -203,8 +203,7 @@
name = "Emergency Shuttle Airlock"
},
/obj/docking_port/mobile/emergency{
name = "Box emergency shuttle";
timid = 1
name = "Box emergency shuttle"
},
/turf/open/floor/plating,
/area/shuttle/escape)
-1
View File
@@ -551,7 +551,6 @@
name = "Cere emergency shuttle";
port_direction = 4;
preferred_direction = 2;
timid = 1;
width = 42
},
/turf/open/floor/plating,
+3 -6
View File
@@ -100,8 +100,7 @@
/area/shuttle/escape)
"as" = (
/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Premium Lounge";
req_access_txt = "0"
name = "Emergency Shuttle Premium Lounge"
},
/turf/open/floor/bluespace,
/area/shuttle/escape)
@@ -144,8 +143,7 @@
/area/shuttle/escape)
"aA" = (
/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Greentext";
req_access_txt = "0"
name = "Emergency Shuttle Greentext"
},
/turf/open/floor/bluespace,
/area/shuttle/escape)
@@ -191,8 +189,7 @@
name = "Emergency Shuttle Airlock"
},
/obj/docking_port/mobile/emergency{
name = "Snappop(tm)!";
timid = 1
name = "Snappop(tm)!"
},
/turf/open/floor/plating,
/area/shuttle/escape)
+1 -2
View File
@@ -62,8 +62,7 @@
dwidth = 3;
height = 5;
name = "Secure Transport Vessel 5";
width = 14;
timid = 1
width = 14
},
/turf/open/floor/plating,
/area/shuttle/escape)
+4 -12
View File
@@ -307,9 +307,7 @@
/area/shuttle/escape)
"aF" = (
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
name = "Escape Shuttle Infirmary";
req_access_txt = "0"
name = "Escape Shuttle Infirmary"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -383,8 +381,7 @@
/area/shuttle/escape)
"aO" = (
/obj/machinery/door/airlock/shuttle{
name = "Emergency Shuttle Airlock";
req_access_txt = "0"
name = "Emergency Shuttle Airlock"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -423,9 +420,7 @@
/area/shuttle/escape)
"aV" = (
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
name = "Escape Shuttle Infirmary";
req_access_txt = "0"
name = "Escape Shuttle Infirmary"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
@@ -443,8 +438,7 @@
name = "Delta emergency shuttle";
width = 30;
preferred_direction = 2;
port_direction = 4;
timid = 1
port_direction = 4
},
/turf/open/floor/plating,
/area/shuttle/escape)
@@ -578,7 +572,6 @@
"bj" = (
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
req_access_txt = "0";
use_power = 0
},
/turf/closed/wall/mineral/titanium/nodiagonal,
@@ -858,7 +851,6 @@
"bY" = (
/obj/machinery/door/airlock/command{
name = "Emergency Recovery Airlock";
req_access = null;
req_access_txt = "19"
},
/obj/effect/turf_decal/stripes/line{
+1 -2
View File
@@ -103,8 +103,7 @@
/area/shuttle/escape)
"u" = (
/obj/docking_port/mobile/emergency{
name = "Disco Inferno";
timid = 1
name = "Disco Inferno"
},
/obj/machinery/door/airlock/gold{
armor = list("melee" = 30, "bullet" = 30, "laser" = 20, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100);
+1 -2
View File
@@ -39,8 +39,7 @@
dir = 2;
dwidth = 9;
name = "NES Port";
width = 19;
timid = 1
width = 19
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
@@ -13,8 +13,7 @@
dwidth = 1;
height = 10;
name = "Oh Hi Mark";
width = 12;
timid = 1
width = 12
},
/obj/machinery/door/airlock/wood,
/turf/open/floor/wood,
-1
View File
@@ -24,7 +24,6 @@
dwidth = 5;
height = 14;
name = "Luxury emergency shuttle";
timid = 1;
width = 25
},
/obj/machinery/door/airlock/gold,
+1 -7
View File
@@ -28,7 +28,6 @@
dwidth = 5;
height = 14;
name = "Meta emergency shuttle";
timid = 1;
width = 25
},
/turf/open/floor/mineral/titanium/blue,
@@ -248,7 +247,6 @@
"aI" = (
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
req_access_txt = "0";
use_power = 0
},
/turf/closed/wall/mineral/titanium,
@@ -335,7 +333,6 @@
"aW" = (
/obj/machinery/door/airlock/command{
name = "Emergency Recovery Airlock";
req_access = null;
req_access_txt = "19"
},
/turf/open/floor/mineral/titanium/blue,
@@ -349,9 +346,7 @@
/area/shuttle/escape)
"aZ" = (
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
name = "Escape Shuttle Infirmary";
req_access_txt = "0"
name = "Escape Shuttle Infirmary"
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
@@ -707,7 +702,6 @@
"bS" = (
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
req_access_txt = "0";
use_power = 0
},
/turf/closed/wall/mineral/titanium/nodiagonal,
-1
View File
@@ -63,7 +63,6 @@
height = 40;
movement_force = list("KNOCKDOWN" = 3, "THROW" = 6);
name = "\proper a meteor with engines strapped to it";
timid = 1;
width = 40
},
/turf/open/floor/plating/asteroid,
+3 -8
View File
@@ -63,8 +63,7 @@
"l" = (
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
pixel_x = 28;
req_access_txt = "0"
pixel_x = 28
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
@@ -90,9 +89,7 @@
/area/shuttle/escape)
"p" = (
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
name = "Escape Shuttle Infirmary";
req_access_txt = "0"
name = "Escape Shuttle Infirmary"
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
@@ -147,8 +144,7 @@
/area/shuttle/escape)
"z" = (
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
req_access_txt = "0"
name = "Emergency NanoMed"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
@@ -170,7 +166,6 @@
dwidth = 8;
height = 9;
name = "Mini emergency shuttle";
timid = 1;
width = 21
},
/turf/open/floor/mineral/titanium/blue,
+1 -2
View File
@@ -159,8 +159,7 @@
"E" = (
/obj/machinery/door/airlock/cult/friendly,
/obj/docking_port/mobile/emergency{
name = "shuttle 667";
timid = 1
name = "shuttle 667"
},
/turf/open/floor/plating,
/area/shuttle/escape)
+2 -8
View File
@@ -84,7 +84,6 @@
"am" = (
/obj/machinery/door/airlock/command{
name = "Emergency Recovery Airlock";
req_access = null;
req_access_txt = "19"
},
/obj/effect/turf_decal/stripes/line{
@@ -380,7 +379,6 @@
"aM" = (
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
req_access_txt = "0";
use_power = 0
},
/turf/closed/wall/mineral/titanium/nodiagonal,
@@ -405,8 +403,7 @@
/area/shuttle/escape)
"aP" = (
/obj/machinery/door/airlock/shuttle{
name = "Emergency Shuttle Airlock";
req_access_txt = "0"
name = "Emergency Shuttle Airlock"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -453,9 +450,7 @@
/area/shuttle/escape)
"aV" = (
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
name = "Escape Shuttle Infirmary";
req_access_txt = "0"
name = "Escape Shuttle Infirmary"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
@@ -514,7 +509,6 @@
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
pixel_x = -26;
req_access_txt = "0";
use_power = 0
},
/turf/open/floor/plasteel/cmo,
+1 -3
View File
@@ -170,8 +170,7 @@
/area/shuttle/escape)
"aE" = (
/obj/machinery/door/airlock/public/glass{
name = "Emergency Shuttle Cargo Hold";
req_access_txt = "0"
name = "Emergency Shuttle Cargo Hold"
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
@@ -288,7 +287,6 @@
height = 15;
name = "Pubby emergency shuttle";
port_direction = 4;
timid = 1;
width = 18
},
/turf/open/floor/plating,
-1
View File
@@ -614,7 +614,6 @@
dwidth = 14;
height = 18;
name = "CentCom Raven Battlecruiser";
timid = 1;
width = 32
},
/obj/machinery/door/airlock/hatch,
+1 -2
View File
@@ -277,8 +277,7 @@
"aW" = (
/obj/docking_port/mobile/emergency{
height = 15;
name = "Box emergency shuttle";
timid = 1
name = "Box emergency shuttle"
},
/obj/machinery/door/airlock/security/glass{
name = "Emergency Shuttle Airlock"
+2 -4
View File
@@ -217,8 +217,7 @@
name = "Emergency Shuttle Airlock"
},
/obj/docking_port/mobile/emergency{
name = "Scrapheap Challenge";
timid = 1
name = "Scrapheap Challenge"
},
/turf/open/floor/plating,
/area/shuttle/escape)
@@ -324,8 +323,7 @@
/area/shuttle/escape)
"bd" = (
/obj/machinery/door/airlock{
name = "Unisex Restrooms";
req_access_txt = "0"
name = "Unisex Restrooms"
},
/turf/open/floor/plasteel/freezer,
/area/shuttle/escape)
+1 -3
View File
@@ -141,8 +141,7 @@
name = "Emergency Shuttle Airlock"
},
/obj/docking_port/mobile/emergency{
name = "Hyperfractal Gigashuttle";
timid = 1
name = "Hyperfractal Gigashuttle"
},
/turf/open/floor/plating,
/area/shuttle/escape)
@@ -153,7 +152,6 @@
"aL" = (
/obj/machinery/door/airlock/external{
name = "Emergency Launch Catwalk";
req_access = null;
req_access_txt = "10;13"
},
/turf/open/floor/plating,
-1
View File
@@ -154,7 +154,6 @@
name = "Emergency Shuttle Airlock"
},
/obj/docking_port/mobile/emergency{
timid = 1;
name = "NT Lepton Violet"
},
/turf/open/floor/plating,
+1 -2
View File
@@ -55,8 +55,7 @@
id = "ferry";
name = "ferry shuttle";
port_direction = 2;
width = 5;
timid = 1
width = 5
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
-1
View File
@@ -72,7 +72,6 @@
name = "ferry shuttle";
port_direction = 1;
preferred_direction = 4;
timid = 1;
width = 5
},
/turf/open/floor/pod/light,
-1
View File
@@ -165,7 +165,6 @@
height = 27;
id = "ferry";
name = "The Lighthouse";
timid = 1;
port_direction = 2;
width = 16
},
+1 -3
View File
@@ -111,8 +111,7 @@
id = "ferry";
name = "ferry shuttle";
port_direction = 2;
width = 5;
timid = 1
width = 5
},
/turf/open/floor/plasteel/freezer,
/area/shuttle/transport)
@@ -127,7 +126,6 @@
"v" = (
/obj/machinery/door/airlock/freezer{
name = "Meat Tradeship Backroom";
req_access = null;
req_access_txt = "28"
},
/turf/open/floor/plasteel/freezer,
+1 -2
View File
@@ -825,8 +825,7 @@
/obj/machinery/nuclearbomb/syndicate,
/obj/machinery/door/window{
dir = 1;
name = "Theatre Stage";
req_access_txt = "0"
name = "Theatre Stage"
},
/turf/open/floor/circuit/red,
/area/shuttle/syndicate/hallway)
-1
View File
@@ -111,7 +111,6 @@
id = "laborcamp";
name = "labor camp shuttle";
port_direction = 4;
timid = 1;
width = 9
},
/turf/open/floor/mineral/titanium/blue,
+1 -3
View File
@@ -31,8 +31,7 @@
/area/shuttle/mining)
"h" = (
/obj/machinery/door/airlock/titanium{
name = "Mining Shuttle Airlock";
req_access_txt = "0"
name = "Mining Shuttle Airlock"
},
/obj/docking_port/mobile{
dir = 8;
@@ -41,7 +40,6 @@
id = "mining";
name = "mining shuttle";
port_direction = 4;
timid = 1;
width = 7
},
/turf/open/floor/plating,
+2 -4
View File
@@ -62,8 +62,7 @@
/area/shuttle/mining)
"i" = (
/obj/machinery/door/airlock/shuttle{
name = "Mining Shuttle Airlock";
req_access_txt = "0"
name = "Mining Shuttle Airlock"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -103,8 +102,7 @@
/area/shuttle/mining)
"m" = (
/obj/machinery/door/airlock/shuttle{
name = "Mining Shuttle Airlock";
req_access_txt = "0"
name = "Mining Shuttle Airlock"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
-1
View File
@@ -19,7 +19,6 @@
name = "NT Medical Ship";
port_direction = 8;
preferred_direction = 4;
timid = 1;
width = 35
},
/turf/open/floor/mineral/titanium,
-1
View File
@@ -23,7 +23,6 @@
name = "NT Recovery White-Ship";
port_direction = 8;
preferred_direction = 1;
timid = 1;
width = 16
},
/turf/open/floor/plating,
+1 -5
View File
@@ -988,7 +988,6 @@
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
pixel_x = -28;
req_access_txt = "0";
use_power = 0
},
/obj/effect/decal/cleanable/dirt{
@@ -1020,9 +1019,7 @@
name = "dust"
},
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
name = "Infirmary";
req_access_txt = "0"
name = "Infirmary"
},
/turf/open/floor/plasteel/white,
/area/shuttle/abandoned)
@@ -1526,7 +1523,6 @@
name = "White-Ship";
port_direction = 8;
preferred_direction = 8;
timid = 0;
width = 32
},
/turf/open/floor/plasteel/neutral,
-2
View File
@@ -40,7 +40,6 @@
name = "NT Recovery White-Ship";
port_direction = 8;
preferred_direction = 4;
timid = 1;
width = 28
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
@@ -1427,7 +1426,6 @@
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
pixel_x = -28;
req_access_txt = "0";
use_power = 0
},
/obj/machinery/iv_drip,
-1
View File
@@ -94,7 +94,6 @@
name = "White Ship";
port_direction = 4;
preferred_direction = 1;
timid = 1;
width = 9
},
/turf/open/floor/plasteel/dark,
+46 -58
View File
@@ -26,8 +26,7 @@
/obj/machinery/button/door{
id = "piratebridge";
name = "Bridge Shutters Control";
pixel_y = -5;
req_access_txt = "0"
pixel_y = -5
},
/obj/effect/decal/cleanable/dirt,
/obj/item/device/radio/intercom{
@@ -164,8 +163,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock{
name = "Crew Cabin";
req_access_txt = "0"
name = "Crew Cabin"
},
/turf/open/floor/plasteel/dark,
/area/shuttle/pirate)
@@ -275,8 +273,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock{
name = "Captain's Quarters";
req_access_txt = "0"
name = "Captain's Quarters"
},
/turf/open/floor/wood,
/area/shuttle/pirate)
@@ -408,7 +405,6 @@
normaldoorcontrol = 1;
pixel_x = -8;
pixel_y = -24;
req_access_txt = "0";
specialfunctions = 4
},
/obj/machinery/turretid{
@@ -508,8 +504,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock{
name = "Crew Quarters";
req_access_txt = "0"
name = "Crew Quarters"
},
/turf/open/floor/plasteel,
/area/shuttle/pirate)
@@ -851,7 +846,6 @@
name = "External Bolt Control";
normaldoorcontrol = 1;
pixel_x = -24;
req_access_txt = "0";
specialfunctions = 4
},
/obj/effect/decal/cleanable/dirt,
@@ -911,11 +905,22 @@
name = "External Bolt Control";
normaldoorcontrol = 1;
pixel_x = 24;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/plating,
/area/shuttle/pirate)
"cf" = (
/obj/structure/table,
/obj/machinery/chem_dispenser/drinks/beer{
dir = 4
},
/obj/machinery/light/small{
brightness = 3;
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/bar,
/area/shuttle/pirate)
"cg" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/airlock/public/glass{
@@ -929,8 +934,7 @@
base_state = "left";
dir = 1;
icon_state = "left";
name = "Explosive Ordinance";
req_access_txt = "0"
name = "Explosive Ordinance"
},
/obj/item/grenade/plastic/x4{
pixel_x = -5
@@ -1011,8 +1015,7 @@
/area/shuttle/pirate)
"cp" = (
/obj/machinery/door/airlock{
name = "Unisex Restrooms";
req_access_txt = "0"
name = "Unisex Restrooms"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/showroomfloor,
@@ -1258,34 +1261,8 @@
/area/shuttle/pirate)
"cP" = (
/obj/structure/table,
/obj/machinery/chem_dispenser/drinks/beer,
/obj/item/storage/fancy/cigarettes{
pixel_x = -6;
pixel_y = -8
},
/obj/item/storage/fancy/cigarettes/cigpack_carp{
pixel_x = 1;
pixel_y = -8
},
/obj/item/storage/fancy/cigarettes/cigpack_midori{
pixel_x = 8;
pixel_y = -8
},
/obj/item/storage/fancy/cigarettes/cigpack_robust{
pixel_x = -6;
pixel_y = -14
},
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims{
pixel_x = 1;
pixel_y = -14
},
/obj/item/storage/fancy/cigarettes/cigpack_uplift{
pixel_x = 8;
pixel_y = -14
},
/obj/machinery/light/small{
brightness = 3;
dir = 8
/obj/machinery/chem_dispenser/drinks{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/bar,
@@ -1423,14 +1400,29 @@
},
/area/shuttle/pirate)
"dd" = (
/obj/structure/table,
/obj/machinery/chem_dispenser/drinks,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/bar,
/area/shuttle/pirate)
"de" = (
/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/fancy/cigarettes/cigpack_uplift{
pixel_x = 8;
pixel_y = -14
},
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims{
pixel_x = 1;
pixel_y = -14
},
/obj/item/storage/fancy/cigarettes/cigpack_robust{
pixel_x = -6;
pixel_y = -14
},
/obj/item/storage/fancy/cigarettes/cigpack_midori{
pixel_x = 8;
pixel_y = -8
},
/obj/item/storage/fancy/cigarettes/cigpack_carp{
pixel_x = 1;
pixel_y = -8
},
/obj/item/storage/fancy/cigarettes,
/turf/open/floor/plasteel/bar,
/area/shuttle/pirate)
"df" = (
@@ -1554,8 +1546,7 @@
base_state = "right";
dir = 4;
icon_state = "right";
name = "Bar";
req_access_txt = "0"
name = "Bar"
},
/turf/open/floor/plasteel/bar,
/area/shuttle/pirate)
@@ -1580,16 +1571,14 @@
id = "pirateturbinevent";
name = "Turbine Vent Control";
pixel_x = -6;
pixel_y = -24;
req_access_txt = "0"
pixel_y = -24
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/button/door{
id = "pirateturbineauxvent";
name = "Turbine Auxiliary Vent Control";
pixel_x = 6;
pixel_y = -24;
req_access_txt = "0"
pixel_y = -24
},
/turf/open/floor/plasteel/floorgrime,
/area/shuttle/pirate)
@@ -1618,7 +1607,6 @@
normaldoorcontrol = 1;
pixel_x = 6;
pixel_y = -24;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/plasteel/floorgrime,
@@ -1844,8 +1832,8 @@ bX
aj
co
aj
cf
cP
dd
du
aj
ai
@@ -1897,7 +1885,7 @@ aj
cq
cA
cQ
de
dd
dv
dI
dM
-1
View File
@@ -151,7 +151,6 @@
alert = 0;
desc = "A display case containing an expensive forgery, probably.";
pixel_y = -4;
req_access = null;
req_access_txt = "48";
start_showpiece_type = /obj/item/fakeartefact
},
+1 -1
View File
@@ -80,7 +80,7 @@
#define MAT_BANANIUM "$bananium"
#define MAT_TITANIUM "$titanium"
#define MAT_BIOMASS "$biomass"
#define MAT_PLASTIC "$plastic"
#define MAT_PLASTIC "$plastic" // CITADEL ADDITION
//The amount of materials you get from a sheet of mineral like iron/diamond/glass etc
#define MINERAL_MATERIAL_AMOUNT 2000
//The maximum size of a stack object.
+1 -1
View File
@@ -29,7 +29,7 @@
#define BIOGENERATOR 32 //Uses biomass
#define LIMBGROWER 64 //Uses synthetic flesh
#define SMELTER 128 //uses various minerals
#define AUTOYLATHE 256 //Uses glass/metal/Plastic
#define AUTOYLATHE 256 //CITADEL ADDITION Uses glass/metal/Plastic CID
//Note: More then one of these can be added to a design but imprinter and lathe designs are incompatable.
//Modular computer/NTNet defines
+5 -3
View File
@@ -15,6 +15,8 @@
var/turf/sourceT = found_turfs[1]
if(break_if_found[sourceT.type])
return FALSE
if (is_type_in_typecache(sourceT.loc, GLOB.typecache_shuttle_area))
return FALSE
found_turfs.Cut(1, 2)
var/dir_flags = checked_turfs[sourceT]
for(var/dir in GLOB.alldirs)
@@ -37,7 +39,7 @@
var/static/blacklisted_areas = typecacheof(/area/space)
var/list/turfs = detect_room(get_turf(creator), blacklisted_turfs)
if(!turfs)
to_chat(creator, "<span class='warning'>The new area must be completely airtight.</span>")
to_chat(creator, "<span class='warning'>The new area must be completely airtight and not a part of a shuttle.</span>")
return
if(turfs.len > BP_MAX_ROOM_SIZE)
to_chat(creator, "<span class='warning'>The room you're in is too big. It is [((turfs.len / BP_MAX_ROOM_SIZE)-1)*100]% larger than allowed.</span>")
@@ -45,7 +47,7 @@
var/list/areas = list("New Area" = /area)
for(var/i in 1 to turfs.len)
var/area/place = get_area(turfs[i])
if(blacklisted_areas[place.type])
if(blacklisted_areas[place.type] || GLOB.typecache_shuttle_area[place.type])
continue
if(!place.requires_power || place.noteleport || place.hidden)
continue // No expanding powerless rooms etc
@@ -91,4 +93,4 @@
to_chat(creator, "<span class='notice'>You have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.</span>")
return TRUE
#undef BP_MAX_ROOM_SIZE
#undef BP_MAX_ROOM_SIZE
+1 -1
View File
@@ -144,7 +144,7 @@ GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0)
else if(day && (!minute || !second))
hour = " and 1 hour"
else
day = "[truncate ? "hour" : "1 hour"]"
hour = "[truncate ? "hour" : "1 hour"]"
else
hour = null
+1
View File
@@ -9,3 +9,4 @@ GLOBAL_LIST_INIT(typecache_living, typecacheof(/mob/living))
GLOBAL_LIST_INIT(typecache_machine_or_structure, typecacheof(list(/obj/machinery, /obj/structure)))
GLOBAL_LIST_INIT(typecache_shuttle_area, typecacheof(/area/shuttle))
+1 -1
View File
@@ -405,7 +405,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
if (SS_flags & SS_NO_FIRE)
subsystemstocheck -= SS
continue
if (!(SS_flags & SS_TICKER) && (SS_flags & SS_KEEP_TIMING) && SS.last_fire + (SS.wait * 0.75) > world.time)
if ((SS_flags & (SS_TICKER|SS_KEEP_TIMING)) == SS_KEEP_TIMING && SS.last_fire + (SS.wait * 0.75) > world.time)
continue
SS.enqueue()
. = 1
+1
View File
@@ -649,6 +649,7 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/Shutdown()
gather_newscaster() //called here so we ensure the log is created even upon admin reboot
save_admin_data()
if(!round_end_sound)
round_end_sound = pick(\
'sound/roundend/newroundsexy.ogg',
+42
View File
@@ -647,3 +647,45 @@
var/datum/language_holder/H = M.get_language_holder()
H.open_language_menu(usr)
/datum/action/item_action/wheelys
name = "Toggle Wheely-Heel's Wheels"
desc = "Pops out or in your wheely-heel's wheels."
icon_icon = 'icons/mob/actions/actions_items.dmi'
button_icon_state = "wheelys"
/datum/action/item_action/kindleKicks
name = "Activate Kindle Kicks"
desc = "Kick you feet together, activating the lights in your Kindle Kicks."
icon_icon = 'icons/mob/actions/actions_items.dmi'
button_icon_state = "kindleKicks"
//Small sprites
/datum/action/small_sprite
name = "Toggle Giant Sprite"
desc = "Others will always see you as giant"
button_icon_state = "smallqueen"
background_icon_state = "bg_alien"
var/small = FALSE
var/small_icon
var/small_icon_state
/datum/action/small_sprite/queen
small_icon = 'icons/mob/alien.dmi'
small_icon_state = "alienq"
/datum/action/small_sprite/drake
small_icon = 'icons/mob/lavaland/lavaland_monsters.dmi'
small_icon_state = "ash_whelp"
/datum/action/small_sprite/Trigger()
..()
if(!small)
var/image/I = image(icon = small_icon, icon_state = small_icon_state, loc = owner)
I.override = TRUE
I.pixel_x -= owner.pixel_x
I.pixel_y -= owner.pixel_y
owner.add_alt_appearance(/datum/atom_hud/alternate_appearance/basic, "smallsprite", I)
small = TRUE
else
owner.remove_alt_appearance("smallsprite")
small = FALSE
@@ -350,8 +350,3 @@
/datum/material/biomass
name = "Biomass"
id = MAT_BIOMASS
/datum/material/plastic
name = "Plastic"
id = MAT_PLASTIC
sheet_type = /obj/item/stack/sheet/plastic
@@ -46,60 +46,3 @@ BONUS
stage_speed = 5
transmittable = 3
level = 3
/*
//////////////////////////////////////
Viral aggressive metabolism
Reduced stealth.
Small resistance boost.
Increased stage speed.
Small transmittablity boost.
Medium Level.
Bonus
The virus starts at stage 5, but after a certain time will start curing itself.
Stages still increase naturally with stage speed.
//////////////////////////////////////
*/
/datum/symptom/viralreverse
name = "Viral aggressive metabolism"
desc = "The virus sacrifices its long term survivability to nearly instantly fully spread inside a host. \
The virus will start at the last stage, but will eventually decay and die off by itself."
stealth = -2
resistance = 1
stage_speed = 3
transmittable = 1
level = 3
symptom_delay_min = 1
symptom_delay_max = 1
var/time_to_cure
threshold_desc = "<b>Resistance/Stage Speed:</b> Highest between these determines the amount of time before self-curing.<br>\
<b>Stealth 4:</b> Doubles the time before the virus self-cures."
/datum/symptom/viralreverse/Activate(datum/disease/advance/A)
if(!..())
return
if(time_to_cure > 0)
time_to_cure--
else
var/mob/living/M = A.affected_mob
Heal(M, A)
/datum/symptom/viralreverse/proc/Heal(mob/living/M, datum/disease/advance/A)
A.stage -= 1
if(A.stage < 2)
to_chat(M, "<span class='notice'>You suddenly feel healthy.</span>")
A.cure()
/datum/symptom/viralreverse/Start(datum/disease/advance/A)
if(!..())
return
A.stage = 5
if(A.properties["stealth"] >= 4) //more time before it's cured
power = 2
time_to_cure = max(A.properties["resistance"], A.properties["stage_rate"]) * 10 * power
+12 -3
View File
@@ -530,6 +530,7 @@
/atom/movable/proc/relay_container_resist(mob/living/user, obj/O)
return
// CITADEL CHANGE - adds final_pixel_y and final_pixel_x to do_attack_animation args
/atom/movable/proc/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect, end_pixel_y, final_pixel_y, final_pixel_x)
if(!no_effect && (visual_effect_icon || used_item))
@@ -693,10 +694,18 @@
message_admins("[src] has been moved out of bounds in [ADMIN_COORDJMP(currentturf)]. Moving it to [ADMIN_COORDJMP(targetturf)].")
/atom/movable/proc/in_bounds()
. = FALSE
var/static/list/allowed_shuttles = typecacheof(list(/area/shuttle/syndicate, /area/shuttle/escape, /area/shuttle/pod_1, /area/shuttle/pod_2, /area/shuttle/pod_3, /area/shuttle/pod_4))
var/turf/T = get_turf(src)
if (T && (is_centcom_level(T.z) || is_station_level(T.z) || is_transit_level(T.z)))
. = TRUE
if (!T)
return FALSE
if (is_station_level(T.z) || is_centcom_level(T.z))
return TRUE
if (is_transit_level(T.z))
var/area/A = T.loc
if (is_type_in_typecache(A, allowed_shuttles))
return TRUE
return FALSE
/* Language procs */
+1 -1
View File
@@ -172,7 +172,7 @@
/obj/machinery/button/door
name = "door button"
desc = "A door remote control switch."
var/normaldoorcontrol = 0
var/normaldoorcontrol = FALSE
var/specialfunctions = OPEN // Bitflag, see assembly file
/obj/machinery/button/door/setup_device()
+3 -1
View File
@@ -49,7 +49,9 @@
/obj/item/toy/toy_dagger = 2,
/obj/item/extendohand/acme = 1,
/obj/item/hot_potato/harmless/toy = 1,
/obj/item/card/emagfake = 1)
/obj/item/card/emagfake = 1,
/obj/item/clothing/shoes/wheelys = 2,
/obj/item/clothing/shoes/kindleKicks = 2)
light_color = LIGHT_COLOR_GREEN
+12 -14
View File
@@ -50,6 +50,12 @@
integrity_failure = 70
damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_N
interact_open = TRUE
autoclose = TRUE
secondsElectrified = 0 //How many seconds remain until the door is no longer electrified. -1 if it is permanently electrified until someone fixes it.
assemblytype = /obj/structure/door_assembly
normalspeed = 1
explosion_block = 1
hud_possible = list(DIAG_AIRLOCK_HUD)
var/security_level = 0 //How much are wires secured
var/aiControlDisabled = 0 //If 1, AI control is disabled until the AI hacks back in and disables the lock. If 2, the AI has bypassed the lock. If -1, the control is enabled but the AI had bypassed it earlier, so if it is disabled again the AI would have no trouble getting back in.
@@ -58,21 +64,16 @@
var/secondsBackupPowerLost = 0 //The number of seconds until power is restored.
var/spawnPowerRestoreRunning = FALSE
var/lights = TRUE // bolt lights show by default
secondsElectrified = 0 //How many seconds remain until the door is no longer electrified. -1 if it is permanently electrified until someone fixes it.
var/aiDisabledIdScanner = FALSE
var/aiHacking = FALSE
var/obj/machinery/door/airlock/closeOther = null
var/closeOtherId = null
var/lockdownbyai = FALSE
assemblytype = /obj/structure/door_assembly
var/closeOtherId //Cyclelinking for airlocks that aren't on the same x or y coord as the target.
var/obj/machinery/door/airlock/closeOther
var/justzap = FALSE
normalspeed = 1
var/obj/item/electronics/airlock/electronics = null
var/obj/item/electronics/airlock/electronics
var/shockCooldown = FALSE //Prevents multiple shocks from happening
autoclose = TRUE
var/obj/item/device/doorCharge/charge = null //If applied, causes an explosion upon opening the door
var/obj/item/device/doorCharge/charge //If applied, causes an explosion upon opening the door
var/obj/item/note //Any papers pinned to the airlock
var/detonated = 0
var/detonated = FALSE
var/abandoned = FALSE
var/doorOpen = 'sound/machines/airlock.ogg'
var/doorClose = 'sound/machines/airlockclose.ogg'
@@ -81,7 +82,7 @@
var/boltDown = 'sound/machines/boltsdown.ogg'
var/noPower = 'sound/machines/doorclick.ogg'
var/previous_airlock = /obj/structure/door_assembly //what airlock assembly mineral plating was applied to
var/airlock_material = null //material of inner filling; if its an airlock with glass, this should be set to "glass"
var/airlock_material //material of inner filling; if its an airlock with glass, this should be set to "glass"
var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock
@@ -90,9 +91,6 @@
var/shuttledocked = 0
var/delayed_close_requested = FALSE // TRUE means the door will automatically close the next time it's opened.
explosion_block = 1
hud_possible = list(DIAG_AIRLOCK_HUD)
var/air_tight = FALSE //TRUE means density will be set as soon as the door begins to close
var/prying_so_hard = FALSE
+2 -2
View File
@@ -404,7 +404,7 @@
overlays_file = 'icons/obj/doors/airlocks/cult/runed/overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_cult
hackProof = TRUE
aiControlDisabled = TRUE
aiControlDisabled = 1
req_access = list(ACCESS_BLOODCULT)
damage_deflection = 10
var/openingoverlaytype = /obj/effect/temp_visual/cult/door
@@ -511,7 +511,7 @@
icon = 'icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi'
overlays_file = 'icons/obj/doors/airlocks/clockwork/overlays.dmi'
hackProof = TRUE
aiControlDisabled = TRUE
aiControlDisabled = 1
req_access = list(ACCESS_CLOCKCULT)
use_power = FALSE
resistance_flags = FIRE_PROOF | ACID_PROOF
-1
View File
@@ -28,7 +28,6 @@
var/safe = TRUE //whether the door detects things and mobs in its way and reopen or crushes them.
var/locked = FALSE //whether the door is bolted or not.
var/assemblytype //the type of door frame to drop during deconstruction
var/auto_close //TO BE REMOVED, no longer used, it's just preventing a runtime with a map var edit.
var/datum/effect_system/spark_spread/spark_system
var/damage_deflection = 10
var/real_explosion_block //ignore this, just use explosion_block
+12 -5
View File
@@ -193,11 +193,8 @@ Buildable meters
w_class = WEIGHT_CLASS_BULKY
var/piping_layer = PIPING_LAYER_DEFAULT
/obj/item/pipe_meter/attackby(obj/item/I, mob/user, params)
..()
obj/item/pipe_meter/wrench_act(mob/living/user, obj/item/wrench/W)
if (!istype(I, /obj/item/wrench))
return ..()
var/obj/machinery/atmospherics/pipe/pipe
for(var/obj/machinery/atmospherics/pipe/P in loc)
if(P.piping_layer == piping_layer)
@@ -207,10 +204,20 @@ Buildable meters
to_chat(user, "<span class='warning'>You need to fasten it to a pipe!</span>")
return TRUE
new /obj/machinery/meter(loc, piping_layer)
I.play_tool_sound(src)
W.play_tool_sound(src)
to_chat(user, "<span class='notice'>You fasten the meter to the pipe.</span>")
qdel(src)
obj/item/pipe_meter/screwdriver_act(mob/living/user, obj/item/S)
if(!isturf(loc))
to_chat(user, "<span class='warning'>You need to fasten it to the floor!</span>")
return TRUE
new /obj/machinery/meter/turf(loc, piping_layer)
S.play_tool_sound(src)
to_chat(user, "<span class='notice'>You fasten the meter to the [loc.name].</span>")
qdel(src)
/obj/item/pipe_meter/dropped()
. = ..()
if(loc)
@@ -381,7 +381,7 @@
if(iscyborg(sillycone))
var/mob/living/silicon/robot/sillyconerobot = A
if(faction == "syndicate" && sillyconerobot.emagged == 1)
if(LAZYLEN(faction) && (ROLE_SYNDICATE in faction) && sillyconerobot.emagged == TRUE)
continue
targets += sillycone
+2 -2
View File
@@ -890,8 +890,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
icon_deny = "wallmed-deny"
density = FALSE
products = list(/obj/item/reagent_containers/syringe = 3, /obj/item/reagent_containers/pill/patch/styptic = 5,
/obj/item/reagent_containers/pill/patch/silver_sulf = 5, /obj/item/reagent_containers/pill/charcoal = 2,
/obj/item/reagent_containers/medspray/sterilizine = 1)
/obj/item/reagent_containers/pill/patch/silver_sulf = 5, /obj/item/reagent_containers/medspray/styptic = 2, /obj/item/reagent_containers/medspray/silver_sulf = 2,
/obj/item/reagent_containers/pill/charcoal = 2, /obj/item/reagent_containers/medspray/sterilizine = 1)
contraband = list(/obj/item/reagent_containers/pill/tox = 2, /obj/item/reagent_containers/pill/morphine = 2)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
+24 -31
View File
@@ -6,9 +6,8 @@ RPD
#define PAINT_MODE -2
#define EATING_MODE -1
#define ATMOS_MODE 0
#define METER_MODE 1
#define DISPOSALS_MODE 2
#define TRANSIT_MODE 3
#define DISPOSALS_MODE 1
#define TRANSIT_MODE 2
GLOBAL_LIST_INIT(atmos_pipe_recipes, list(
@@ -318,7 +317,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
var/queued_p_flipped = p_flipped
// clicking on an existing component puts the new one on the same layer
if ((mode == ATMOS_MODE || mode == METER_MODE) && istype(A, /obj/machinery/atmospherics))
if (mode == ATMOS_MODE && istype(A, /obj/machinery/atmospherics))
var/obj/machinery/atmospherics/AM = A
temp_piping_layer = AM.piping_layer
A = get_turf(user)
@@ -352,35 +351,30 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
if(ATMOS_MODE) //Making pipes
if(!can_make_pipe)
return ..()
to_chat(user, "<span class='notice'>You start building a pipe...</span>")
playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 2, target = A))
activate()
if (recipe.type == /datum/pipe_info/meter)
to_chat(user, "<span class='notice'>You start building a meter...</span>")
if(do_after(user, 2, target = A))
activate()
var/obj/item/pipe_meter/PM = new /obj/item/pipe_meter(get_turf(A))
PM.setAttachLayer(temp_piping_layer)
else
to_chat(user, "<span class='notice'>You start building a pipe...</span>")
if(do_after(user, 2, target = A))
activate()
var/obj/machinery/atmospherics/path = queued_p_type
var/pipe_item_type = initial(path.construction_type) || /obj/item/pipe
var/obj/item/pipe/P = new pipe_item_type(get_turf(A), queued_p_type, queued_p_dir)
var/obj/machinery/atmospherics/path = queued_p_type
var/pipe_item_type = initial(path.construction_type) || /obj/item/pipe
var/obj/item/pipe/P = new pipe_item_type(get_turf(A), queued_p_type, queued_p_dir)
if(queued_p_flipped && istype(P, /obj/item/pipe/trinary/flippable))
var/obj/item/pipe/trinary/flippable/F = P
F.flipped = queued_p_flipped
P.update()
P.add_fingerprint(usr)
P.setPipingLayer(temp_piping_layer)
P.add_atom_colour(GLOB.pipe_paint_colors[paint_color], FIXED_COLOUR_PRIORITY)
if(METER_MODE) //Making pipe meters
if(!can_make_pipe)
return ..()
to_chat(user, "<span class='notice'>You start building a meter...</span>")
playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 2, target = A))
activate()
var/obj/item/pipe_meter/PM = new /obj/item/pipe_meter(get_turf(A))
PM.setAttachLayer(temp_piping_layer)
if(queued_p_flipped && istype(P, /obj/item/pipe/trinary/flippable))
var/obj/item/pipe/trinary/flippable/F = P
F.flipped = queued_p_flipped
P.update()
P.add_fingerprint(usr)
P.setPipingLayer(temp_piping_layer)
P.add_atom_colour(GLOB.pipe_paint_colors[paint_color], FIXED_COLOUR_PRIORITY)
if(DISPOSALS_MODE) //Making disposals pipes
if(!can_make_pipe)
return ..()
@@ -439,5 +433,4 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
#undef PAINT_MODE
#undef EATING_MODE
#undef ATMOS_MODE
#undef METER_MODE
#undef DISPOSALS_MODE
@@ -9,7 +9,7 @@
new /obj/item/storage/lockbox/medal/cargo(src)
new /obj/item/clothing/under/rank/cargo(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
// new /obj/item/device/radio/headset/headset_cargo(src)
new /obj/item/device/radio/headset/headset_cargo(src)
new /obj/item/clothing/suit/fire/firefighter(src)
new /obj/item/clothing/gloves/fingerless(src)
new /obj/item/device/megaphone/cargo(src)
@@ -12,6 +12,7 @@
var/list/tube_dirs //list of directions this tube section can connect to.
var/exit_delay = 1
var/enter_delay = 0
var/const/time_to_unwrench = 2 SECONDS
/obj/structure/transit_tube/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && (mover.pass_flags & PASSGLASS))
@@ -42,7 +43,7 @@
to_chat(user, "<span class='warning'>Remove the pod first!</span>")
return
user.visible_message("[user] starts to deattach \the [src].", "<span class='notice'>You start to deattach the [name]...</span>")
if(W.use_tool(src, user, 40, volume=50))
if(W.use_tool(src, user, time_to_unwrench, volume=50))
to_chat(user, "<span class='notice'>You deattach the [name].</span>")
var/obj/structure/c_transit_tube/R = new tube_construction(loc)
R.setDir(dir)
@@ -9,6 +9,7 @@
density = FALSE
layer = LOW_ITEM_LAYER //same as the built tube
anchored = FALSE
var/const/time_to_unwrench = 2 SECONDS
var/flipped = 0
var/build_type = /obj/structure/transit_tube
var/flipped_build_type
@@ -33,7 +34,7 @@
/obj/structure/c_transit_tube/wrench_act(mob/living/user, obj/item/I)
to_chat(user, "<span class='notice'>You start attaching the [name]...</span>")
add_fingerprint(user)
if(I.use_tool(src, user, 40, volume=50))
if(I.use_tool(src, user, time_to_unwrench, volume=50))
to_chat(user, "<span class='notice'>You attach the [name].</span>")
var/obj/structure/transit_tube/R = new build_type(loc, dir)
transfer_fingerprints_to(R)
+18 -1
View File
@@ -130,7 +130,24 @@
return
if(destination_z && destination_x && destination_y)
A.forceMove(locate(destination_x, destination_y, destination_z))
var/tx = destination_x
var/ty = destination_y
var/turf/DT = locate(tx, ty, destination_z)
var/itercount = 0
while(DT.density || istype(DT.loc,/area/shuttle)) // Extend towards the center of the map, trying to look for a better place to arrive
if (itercount++ >= 100)
log_game("SPACE Z-TRANSIT ERROR: Could not not find a safe place to land [A] within 100 iterations.")
break
if (tx < 128)
tx++
else
tx--
if (ty < 128)
ty++
else
ty--
DT = locate(tx, ty, destination_z)
A.forceMove(DT)
if(isliving(A))
var/mob/living/L = A
+16 -13
View File
@@ -73,7 +73,7 @@
var/task = href_list["editrights"]
var/skip
if(task == "activate" || task == "deactivate")
skip = 1
skip = TRUE
if(!CONFIG_GET(flag/admin_legacy_system) && CONFIG_GET(flag/protect_legacy_admins) && task == "rank")
if(admin_ckey in GLOB.protected_admins)
to_chat(usr, "<span class='admin prefix'>Editing the rank of this admin is blocked by server configuration.</span>")
@@ -82,20 +82,20 @@
if(D.rank in GLOB.protected_ranks)
to_chat(usr, "<span class='admin prefix'>Editing the flags of this rank is blocked by server configuration.</span>")
return
if(check_rights(R_DBRANKS, 0))
if(check_rights(R_DBRANKS, FALSE))
if(!skip)
if(!SSdbcore.Connect())
to_chat(usr, "<span class='danger'>Unable to connect to database, changes are temporary only.</span>")
use_db = "Temporary"
if(!use_db)
use_db = FALSE
else
use_db = alert("Permanent changes are saved to the database for future rounds, temporary changes will affect only the current round", "Permanent or Temporary?", "Permanent", "Temporary", "Cancel")
if(use_db == "Cancel")
return
if(use_db == "Permanent")
use_db = 1
use_db = TRUE
admin_ckey = sanitizeSQL(admin_ckey)
else
use_db = 0
use_db = FALSE
if(task != "add")
D = GLOB.admin_datums[admin_ckey]
if(!D)
@@ -124,19 +124,20 @@
edit_admin_permissions()
/datum/admins/proc/add_admin(use_db)
. = sanitizeSQL(ckey(input("New admin's ckey","Admin ckey") as text|null))
. = ckey(input("New admin's ckey","Admin ckey") as text|null)
if(!.)
return 0
return FALSE
if(. in GLOB.admin_datums+GLOB.deadmins)
to_chat(usr, "<span class='danger'>[.] is already an admin.</span>")
return 0
return FALSE
if(use_db)
. = sanitizeSQL(.)
var/datum/DBQuery/query_add_admin = SSdbcore.NewQuery("INSERT INTO [format_table_name("admin")] (ckey, rank) VALUES ('[.]', 'NEW ADMIN')")
if(!query_add_admin.warn_execute())
return 0
return FALSE
var/datum/DBQuery/query_add_admin_log = SSdbcore.NewQuery("INSERT INTO [format_table_name("admin_log")] (datetime, adminckey, adminip, operation, log) VALUES ('[SQLtime()]', '[sanitizeSQL(usr.ckey)]', INET_ATON('[sanitizeSQL(usr.client.address)]'), 'add admin', 'New admin added: [.]')")
if(!query_add_admin_log.warn_execute())
return 0
return FALSE
/datum/admins/proc/remove_admin(admin_ckey, use_db, datum/admins/D)
if(alert("Are you sure you want to remove [admin_ckey]?","Confirm Removal","Do it","Cancel") == "Do it")
@@ -175,7 +176,7 @@
rank_names[R.name] = R
var/new_rank = input("Please select a rank", "New rank") as null|anything in rank_names
if(new_rank == "*New Rank*")
new_rank = sanitizeSQL(ckeyEx(input("Please input a new rank", "New custom rank") as text|null))
new_rank = ckeyEx(input("Please input a new rank", "New custom rank") as text|null)
if(!new_rank)
return
R = rank_names[new_rank]
@@ -186,6 +187,7 @@
R = new(new_rank) //blank new admin_rank
GLOB.admin_ranks += R
if(use_db)
new_rank = sanitizeSQL(new_rank)
if(!R)
var/datum/DBQuery/query_add_rank = SSdbcore.NewQuery("INSERT INTO [format_table_name("admin_ranks")] (rank, flags, exclude_flags, can_edit_rights) VALUES ('[new_rank]', '0', '0', '0')")
if(!query_add_rank.warn_execute())
@@ -208,7 +210,8 @@
if(D) //they were previously an admin
D.disassociate() //existing admin needs to be disassociated
D.rank = R //set the admin_rank as our rank
D.associate()
var/client/C = GLOB.directory[admin_ckey]
D.associate(C)
else
D = new(R, admin_ckey, TRUE) //new admin
message_admins("[key_name_admin(usr)] edited the admin rank of [admin_ckey] to [new_rank] [use_db ? "permanently" : "temporarily"]")
@@ -96,6 +96,17 @@ the new instance inside the host to be updated to the template's stats.
if(adapt_ready > 0)
stat("Adaptation Ready: [round(adapt_ready/10, 0.1)]s")
/mob/camera/disease/examine(mob/user)
..()
if(isobserver(user))
to_chat(user, "<span class='notice'>[src] has [points]/[total_points] adaptation points.</span>")
to_chat(user, "<span class='notice'>[src] has the following unlocked:</span>")
for(var/A in purchased_abilities)
var/datum/disease_ability/B = A
if(istype(B))
to_chat(user, "<span class='notice'>[B.name]</span>")
/mob/camera/disease/say(message)
return
@@ -86,5 +86,6 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
return TRUE
#undef CHALLENGE_TELECRYSTALS
#undef CHALLENGE_TIME_LIMIT
#undef CHALLENGE_MIN_PLAYERS
#undef CHALLENGE_SHUTTLE_DELAY

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