Merge branch 'master' into screenshake
This commit is contained in:
deathride58
@@ -1,3 +1,3 @@
|
||||
[Note]: # (<B>Please enter the `Round ID` from the `Status` panel if you can!</B> If you believe the issue to be caused by a testmerge, please report it in its relative PR thread. State what the issue is from a "whats wrong" prospective. Issue reports should clearly allow maintainers to understand whats wrong and how to test/reproduce if that is not obvious. Avoid ambiguity. Start your issue report below both of these lines (or remove them))
|
||||
[Directions]: # (Include the Round ID from the Status panel or retrieve it from https://atlantaned.space/newSS13tools/round.php ! If you believe the issue to be caused by a testmerge [OOC tab -> Show Server Revision], report it in the pull request's comment section instead. Explain your issue in detail, including the steps to reproduce it.)
|
||||
|
||||
[Admins]: # (If you are reporting a bug that occured AFTER you used varedit/admin buttons to alter an object out of normal operating conditions, please verify that you can re-create the bug without the varedit usage/admin buttons before reporting the issue.)
|
||||
[For Admins]: # (Oddities induced by var-edits and other admin tools are not necessarily bugs. Verify that your issues occur under regular circumstances before reporting them.)
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
[Changelogs]: # (Please make a changelog if you're adding, removing or changing content that'll affect players. This includes, but is not limited to, new features, sprites, sounds; balance changes; map edits and important fixes)
|
||||
[]: # (See here for how to easily make a changelog: https://github.com/tgstation/tgstation/wiki/Changelogs. An example changelog has been provided below. Please edit or remove)
|
||||
[Changelogs]: # (Please make a changelog if you're adding, removing or changing content that'll affect players. This includes, but is not limited to, new features, sprites, sounds; balance changes; map edits and important fixes. An example changelog has been provided below for you to edit or remove. If you need help, read https://github.com/tgstation/tgstation/wiki/Changelogs)
|
||||
|
||||
|
||||
:cl: optional name here
|
||||
@@ -18,4 +17,4 @@ spellcheck: fixed a few typos
|
||||
experiment: added an experimental thingy
|
||||
/:cl:
|
||||
|
||||
[why]: # (Please add a short description [on the next line] of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding:)
|
||||
[why]: # (Please add a short description [two lines down] of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding.)
|
||||
|
||||
+50
-12
@@ -1,3 +1,52 @@
|
||||
Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255.
|
||||
|
||||
The latest database version is 3.4; The query to update the schema revision table is:
|
||||
|
||||
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (3, 4);
|
||||
or
|
||||
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (3, 4);
|
||||
|
||||
In any query remember to add a prefix to the table names if you use one.
|
||||
|
||||
----------------------------------------------------
|
||||
|
||||
28 August 2017, by MrStonedOne
|
||||
Modified table 'messages', adding a deleted column and editing all indexes to include it
|
||||
|
||||
ALTER TABLE `messages`
|
||||
ADD COLUMN `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0' AFTER `edits`,
|
||||
DROP INDEX `idx_msg_ckey_time`,
|
||||
DROP INDEX `idx_msg_type_ckeys_time`,
|
||||
DROP INDEX `idx_msg_type_ckey_time_odr`,
|
||||
ADD INDEX `idx_msg_ckey_time` (`targetckey`,`timestamp`, `deleted`),
|
||||
ADD INDEX `idx_msg_type_ckeys_time` (`type`,`targetckey`,`adminckey`,`timestamp`, `deleted`),
|
||||
ADD INDEX `idx_msg_type_ckey_time_odr` (`type`,`targetckey`,`timestamp`, `deleted`);
|
||||
|
||||
----------------------------------------------------
|
||||
|
||||
25 August 2017, by Jordie0608
|
||||
|
||||
Modified tables 'connection_log', 'legacy_population', 'library', 'messages' and 'player' to add additional 'round_id' tracking in various forms and 'server_ip' and 'server_port' to the table 'messages'.
|
||||
|
||||
ALTER TABLE `connection_log` ADD COLUMN `round_id` INT(11) UNSIGNED NOT NULL AFTER `server_port`;
|
||||
ALTER TABLE `legacy_population` ADD COLUMN `round_id` INT(11) UNSIGNED NOT NULL AFTER `server_port`;
|
||||
ALTER TABLE `library` ADD COLUMN `round_id_created` INT(11) UNSIGNED NOT NULL AFTER `deleted`;
|
||||
ALTER TABLE `messages` ADD COLUMN `server_ip` INT(10) UNSIGNED NOT NULL AFTER `server`, ADD COLUMN `server_port` SMALLINT(5) UNSIGNED NOT NULL AFTER `server_ip`, ADD COLUMN `round_id` INT(11) UNSIGNED NOT NULL AFTER `server_port`;
|
||||
ALTER TABLE `player` ADD COLUMN `firstseen_round_id` INT(11) UNSIGNED NOT NULL AFTER `firstseen`, ADD COLUMN `lastseen_round_id` INT(11) UNSIGNED NOT NULL AFTER `lastseen`;
|
||||
|
||||
----------------------------------------------------
|
||||
|
||||
18 August 2017, by Cyberboss and nfreader
|
||||
|
||||
Modified table 'death', adding the columns `last_words` and 'suicide'.
|
||||
|
||||
ALTER TABLE `death`
|
||||
ADD COLUMN `last_words` varchar(255) DEFAULT NULL AFTER `staminaloss`,
|
||||
ADD COLUMN `suicide` tinyint(0) NOT NULL DEFAULT '0' AFTER `last_words`;
|
||||
|
||||
Remember to add a prefix to the table name if you use them.
|
||||
|
||||
----------------------------------------------------
|
||||
|
||||
20th July 2017, by Shadowlight213
|
||||
Added role_time table to track time spent playing departments.
|
||||
@@ -7,21 +56,10 @@ CREATE TABLE `role_time` ( `ckey` VARCHAR(32) NOT NULL , `job` VARCHAR(128) NOT
|
||||
|
||||
ALTER TABLE `player` ADD `flags` INT NOT NULL default '0' AFTER `accountjoindate`;
|
||||
|
||||
UPDATE `schema_revision` SET minor = 1;
|
||||
|
||||
Remember to add a prefix to the table name if you use them.
|
||||
|
||||
----------------------------------------------------
|
||||
|
||||
Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255.
|
||||
|
||||
The latest database version is 3.0; The query to update the schema revision table is:
|
||||
|
||||
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (3, 0);
|
||||
or
|
||||
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (3, 0);
|
||||
|
||||
----------------------------------------------------
|
||||
28 June 2017, by oranges
|
||||
Added schema_revision to store the current db revision, why start at 3.0?
|
||||
|
||||
@@ -326,4 +364,4 @@ UPDATE erro_library SET deleted = 1 WHERE id = someid
|
||||
|
||||
(Replace someid with the id of the book you want to soft delete.)
|
||||
|
||||
----------------------------------------------------
|
||||
----------------------------------------------------
|
||||
@@ -12,4 +12,4 @@ ALTER TABLE erro_poll_option RENAME TO SS13_poll_option;
|
||||
ALTER TABLE erro_poll_question RENAME TO SS13_poll_question;
|
||||
ALTER TABLE erro_poll_textreply RENAME TO SS13_poll_textreply;
|
||||
ALTER TABLE erro_poll_vote RENAME TO SS13_poll_vote;
|
||||
ALTER TABLE erro_watch RENAME TO SS13_watch;
|
||||
ALTER TABLE erro_watch RENAME TO SS13_watch;
|
||||
@@ -38,7 +38,7 @@ Take note some columns have been renamed, removed or changed type. Any services
|
||||
----------------------------------------------------*/
|
||||
|
||||
START TRANSACTION;
|
||||
ALTER TABLE `feedback`.`ban`
|
||||
ALTER TABLE `ban`
|
||||
DROP COLUMN `rounds`
|
||||
, CHANGE COLUMN `bantype` `bantype` ENUM('PERMABAN', 'TEMPBAN', 'JOB_PERMABAN', 'JOB_TEMPBAN', 'ADMIN_PERMABAN', 'ADMIN_TEMPBAN') NOT NULL
|
||||
, CHANGE COLUMN `reason` `reason` VARCHAR(2048) NOT NULL
|
||||
@@ -51,14 +51,14 @@ ALTER TABLE `feedback`.`ban`
|
||||
, ADD COLUMN `a_ipTEMP` INT UNSIGNED NOT NULL AFTER `a_ip`
|
||||
, ADD COLUMN `unbanned_ipTEMP` INT UNSIGNED NULL DEFAULT NULL AFTER `unbanned_ip`;
|
||||
SET SQL_SAFE_UPDATES = 0;
|
||||
UPDATE `feedback`.`ban`
|
||||
UPDATE `ban`
|
||||
SET `server_ip` = INET_ATON(SUBSTRING_INDEX(IF(`serverip` = '', '0', IF(SUBSTRING_INDEX(`serverip`, ':', 1) LIKE '%_._%', `serverip`, '0')), ':', 1))
|
||||
, `server_port` = IF(`serverip` LIKE '%:_%', CAST(SUBSTRING_INDEX(`serverip`, ':', -1) AS UNSIGNED), '0')
|
||||
, `ipTEMP` = INET_ATON(IF(`ip` LIKE '%_._%', `ip`, '0'))
|
||||
, `a_ipTEMP` = INET_ATON(IF(`a_ip` LIKE '%_._%', `a_ip`, '0'))
|
||||
, `unbanned_ipTEMP` = INET_ATON(IF(`unbanned_ip` LIKE '%_._%', `unbanned_ip`, '0'));
|
||||
SET SQL_SAFE_UPDATES = 1;
|
||||
ALTER TABLE `feedback`.`ban`
|
||||
ALTER TABLE `ban`
|
||||
DROP COLUMN `unbanned_ip`
|
||||
, DROP COLUMN `a_ip`
|
||||
, DROP COLUMN `ip`
|
||||
@@ -69,17 +69,17 @@ ALTER TABLE `feedback`.`ban`
|
||||
COMMIT;
|
||||
|
||||
START TRANSACTION;
|
||||
ALTER TABLE `feedback`.`connection_log`
|
||||
ALTER TABLE `connection_log`
|
||||
ADD COLUMN `server_ip` INT UNSIGNED NOT NULL AFTER `serverip`
|
||||
, ADD COLUMN `server_port` SMALLINT UNSIGNED NOT NULL AFTER `server_ip`
|
||||
, ADD COLUMN `ipTEMP` INT UNSIGNED NOT NULL AFTER `ip`;
|
||||
SET SQL_SAFE_UPDATES = 0;
|
||||
UPDATE `feedback`.`connection_log`
|
||||
UPDATE `connection_log`
|
||||
SET `server_ip` = INET_ATON(SUBSTRING_INDEX(IF(`serverip` = '', '0', IF(SUBSTRING_INDEX(`serverip`, ':', 1) LIKE '%_._%', `serverip`, '0')), ':', 1))
|
||||
, `server_port` = IF(`serverip` LIKE '%:_%', CAST(SUBSTRING_INDEX(`serverip`, ':', -1) AS UNSIGNED), '0')
|
||||
, `ipTEMP` = INET_ATON(IF(`ip` LIKE '%_._%', `ip`, '0'));
|
||||
SET SQL_SAFE_UPDATES = 1;
|
||||
ALTER TABLE `feedback`.`connection_log`
|
||||
ALTER TABLE `connection_log`
|
||||
DROP COLUMN `ip`
|
||||
, DROP COLUMN `serverip`
|
||||
, CHANGE COLUMN `ipTEMP` `ip` INT(10) UNSIGNED NOT NULL;
|
||||
@@ -87,12 +87,12 @@ COMMIT;
|
||||
|
||||
START TRANSACTION;
|
||||
SET SQL_SAFE_UPDATES = 0;
|
||||
UPDATE `feedback`.`death`
|
||||
UPDATE `death`
|
||||
SET `bruteloss` = LEAST(`bruteloss`, 65535)
|
||||
, `brainloss` = LEAST(`brainloss`, 65535)
|
||||
, `fireloss` = LEAST(`fireloss`, 65535)
|
||||
, `oxyloss` = LEAST(`oxyloss`, 65535);
|
||||
ALTER TABLE `feedback`.`death`
|
||||
ALTER TABLE `death`
|
||||
CHANGE COLUMN `pod` `pod` VARCHAR(50) NOT NULL
|
||||
, CHANGE COLUMN `coord` `coord` VARCHAR(32) NOT NULL
|
||||
, CHANGE COLUMN `mapname` `mapname` VARCHAR(32) NOT NULL
|
||||
@@ -109,39 +109,39 @@ ALTER TABLE `feedback`.`death`
|
||||
, CHANGE COLUMN `oxyloss` `oxyloss` SMALLINT UNSIGNED NOT NULL
|
||||
, ADD COLUMN `server_ip` INT UNSIGNED NOT NULL AFTER `server`
|
||||
, ADD COLUMN `server_port` SMALLINT UNSIGNED NOT NULL AFTER `server_ip`;
|
||||
UPDATE `feedback`.`death`
|
||||
UPDATE `death`
|
||||
SET `server_ip` = INET_ATON(SUBSTRING_INDEX(IF(`server` = '', '0', IF(SUBSTRING_INDEX(`server`, ':', 1) LIKE '%_._%', `server`, '0')), ':', 1))
|
||||
, `server_port` = IF(`server` LIKE '%:_%', CAST(SUBSTRING_INDEX(`server`, ':', -1) AS UNSIGNED), '0');
|
||||
SET SQL_SAFE_UPDATES = 1;
|
||||
ALTER TABLE `feedback`.`death`
|
||||
ALTER TABLE `death`
|
||||
DROP COLUMN `server`;
|
||||
COMMIT;
|
||||
|
||||
ALTER TABLE `feedback`.`library`
|
||||
ALTER TABLE `library`
|
||||
CHANGE COLUMN `category` `category` ENUM('Any', 'Fiction', 'Non-Fiction', 'Adult', 'Reference', 'Religion') NOT NULL
|
||||
, CHANGE COLUMN `ckey` `ckey` VARCHAR(32) NOT NULL DEFAULT 'LEGACY'
|
||||
, CHANGE COLUMN `datetime` `datetime` DATETIME NOT NULL
|
||||
, CHANGE COLUMN `deleted` `deleted` TINYINT(1) UNSIGNED NULL DEFAULT NULL;
|
||||
|
||||
ALTER TABLE `feedback`.`messages`
|
||||
ALTER TABLE `messages`
|
||||
CHANGE COLUMN `type` `type` ENUM('memo', 'message', 'message sent', 'note', 'watchlist entry') NOT NULL
|
||||
, CHANGE COLUMN `text` `text` VARCHAR(2048) NOT NULL
|
||||
, CHANGE COLUMN `secret` `secret` TINYINT(1) UNSIGNED NOT NULL;
|
||||
|
||||
START TRANSACTION;
|
||||
ALTER TABLE `feedback`.`player`
|
||||
ALTER TABLE `player`
|
||||
ADD COLUMN `ipTEMP` INT UNSIGNED NOT NULL AFTER `ip`;
|
||||
SET SQL_SAFE_UPDATES = 0;
|
||||
UPDATE `feedback`.`player`
|
||||
UPDATE `player`
|
||||
SET `ipTEMP` = INET_ATON(IF(`ip` LIKE '%_._%', `ip`, '0'));
|
||||
SET SQL_SAFE_UPDATES = 1;
|
||||
ALTER TABLE `feedback`.`player`
|
||||
ALTER TABLE `player`
|
||||
DROP COLUMN `ip`
|
||||
, CHANGE COLUMN `ipTEMP` `ip` INT(10) UNSIGNED NOT NULL;
|
||||
COMMIT;
|
||||
|
||||
START TRANSACTION;
|
||||
ALTER TABLE `feedback`.`poll_question`
|
||||
ALTER TABLE `poll_question`
|
||||
CHANGE COLUMN `polltype` `polltype` ENUM('OPTION', 'TEXT', 'NUMVAL', 'MULTICHOICE', 'IRV') NOT NULL
|
||||
, CHANGE COLUMN `adminonly` `adminonly` TINYINT(1) UNSIGNED NOT NULL
|
||||
, CHANGE COLUMN `createdby_ckey` `createdby_ckey` VARCHAR(32) NULL DEFAULT NULL
|
||||
@@ -149,36 +149,36 @@ ALTER TABLE `feedback`.`poll_question`
|
||||
, ADD COLUMN `createdby_ipTEMP` INT UNSIGNED NOT NULL AFTER `createdby_ip`
|
||||
, DROP COLUMN `for_trialmin`;
|
||||
SET SQL_SAFE_UPDATES = 0;
|
||||
UPDATE `feedback`.`poll_question`
|
||||
UPDATE `poll_question`
|
||||
SET `createdby_ipTEMP` = INET_ATON(IF(`createdby_ip` LIKE '%_._%', `createdby_ip`, '0'));
|
||||
SET SQL_SAFE_UPDATES = 1;
|
||||
ALTER TABLE `feedback`.`poll_question`
|
||||
ALTER TABLE `poll_question`
|
||||
DROP COLUMN `createdby_ip`
|
||||
, CHANGE COLUMN `createdby_ipTEMP` `createdby_ip` INT(10) UNSIGNED NOT NULL;
|
||||
COMMIT;
|
||||
|
||||
START TRANSACTION;
|
||||
ALTER TABLE `feedback`.`poll_textreply`
|
||||
ALTER TABLE `poll_textreply`
|
||||
CHANGE COLUMN `replytext` `replytext` VARCHAR(2048) NOT NULL
|
||||
, ADD COLUMN `ipTEMP` INT UNSIGNED NOT NULL AFTER `ip`;
|
||||
SET SQL_SAFE_UPDATES = 0;
|
||||
UPDATE `feedback`.`poll_textreply`
|
||||
UPDATE `poll_textreply`
|
||||
SET `ipTEMP` = INET_ATON(IF(`ip` LIKE '%_._%', `ip`, '0'));
|
||||
SET SQL_SAFE_UPDATES = 1;
|
||||
ALTER TABLE `feedback`.`poll_textreply`
|
||||
ALTER TABLE `poll_textreply`
|
||||
DROP COLUMN `ip`
|
||||
, CHANGE COLUMN `ipTEMP` `ip` INT(10) UNSIGNED NOT NULL;
|
||||
COMMIT;
|
||||
|
||||
START TRANSACTION;
|
||||
ALTER TABLE `feedback`.`poll_vote`
|
||||
ALTER TABLE `poll_vote`
|
||||
CHANGE COLUMN `ckey` `ckey` VARCHAR(32) NOT NULL
|
||||
, ADD COLUMN `ipTEMP` INT UNSIGNED NOT NULL AFTER `ip`;
|
||||
SET SQL_SAFE_UPDATES = 0;
|
||||
UPDATE `feedback`.`poll_vote`
|
||||
UPDATE `poll_vote`
|
||||
SET `ipTEMP` = INET_ATON(IF(`ip` LIKE '%_._%', `ip`, '0'));
|
||||
SET SQL_SAFE_UPDATES = 1;
|
||||
ALTER TABLE `feedback`.`poll_vote`
|
||||
ALTER TABLE `poll_vote`
|
||||
DROP COLUMN `ip`
|
||||
, CHANGE COLUMN `ipTEMP` `ip` INT(10) UNSIGNED NOT NULL;
|
||||
COMMIT;
|
||||
@@ -191,39 +191,39 @@ You may find it helpful to modify or create your own indexes if you utilise addi
|
||||
|
||||
----------------------------------------------------*/
|
||||
|
||||
ALTER TABLE `feedback`.`ban`
|
||||
ALTER TABLE `ban`
|
||||
ADD INDEX `idx_ban_checkban` (`ckey` ASC, `bantype` ASC, `expiration_time` ASC, `unbanned` ASC, `job` ASC)
|
||||
, ADD INDEX `idx_ban_isbanned` (`ckey` ASC, `ip` ASC, `computerid` ASC, `bantype` ASC, `expiration_time` ASC, `unbanned` ASC)
|
||||
, ADD INDEX `idx_ban_count` (`id` ASC, `a_ckey` ASC, `bantype` ASC, `expiration_time` ASC, `unbanned` ASC);
|
||||
|
||||
ALTER TABLE `feedback`.`ipintel`
|
||||
ALTER TABLE `ipintel`
|
||||
ADD INDEX `idx_ipintel` (`ip` ASC, `intel` ASC, `date` ASC);
|
||||
|
||||
ALTER TABLE `feedback`.`library`
|
||||
ALTER TABLE `library`
|
||||
ADD INDEX `idx_lib_id_del` (`id` ASC, `deleted` ASC)
|
||||
, ADD INDEX `idx_lib_del_title` (`deleted` ASC, `title` ASC)
|
||||
, ADD INDEX `idx_lib_search` (`deleted` ASC, `author` ASC, `title` ASC, `category` ASC);
|
||||
|
||||
ALTER TABLE `feedback`.`messages`
|
||||
ALTER TABLE `messages`
|
||||
ADD INDEX `idx_msg_ckey_time` (`targetckey` ASC, `timestamp` ASC)
|
||||
, ADD INDEX `idx_msg_type_ckeys_time` (`type` ASC, `targetckey` ASC, `adminckey` ASC, `timestamp` ASC)
|
||||
, ADD INDEX `idx_msg_type_ckey_time_odr` (`type` ASC, `targetckey` ASC, `timestamp` ASC);
|
||||
|
||||
ALTER TABLE `feedback`.`player`
|
||||
ALTER TABLE `player`
|
||||
ADD INDEX `idx_player_cid_ckey` (`computerid` ASC, `ckey` ASC)
|
||||
, ADD INDEX `idx_player_ip_ckey` (`ip` ASC, `ckey` ASC);
|
||||
|
||||
ALTER TABLE `feedback`.`poll_option`
|
||||
ALTER TABLE `poll_option`
|
||||
ADD INDEX `idx_pop_pollid` (`pollid` ASC);
|
||||
|
||||
ALTER TABLE `feedback`.`poll_question`
|
||||
ALTER TABLE `poll_question`
|
||||
ADD INDEX `idx_pquest_question_time_ckey` (`question` ASC, `starttime` ASC, `endtime` ASC, `createdby_ckey` ASC, `createdby_ip` ASC)
|
||||
, ADD INDEX `idx_pquest_time_admin` (`starttime` ASC, `endtime` ASC, `adminonly` ASC)
|
||||
, ADD INDEX `idx_pquest_id_time_type_admin` (`id` ASC, `starttime` ASC, `endtime` ASC, `polltype` ASC, `adminonly` ASC);
|
||||
|
||||
ALTER TABLE `feedback`.`poll_vote`
|
||||
ALTER TABLE `poll_vote`
|
||||
ADD INDEX `idx_pvote_pollid_ckey` (`pollid` ASC, `ckey` ASC)
|
||||
, ADD INDEX `idx_pvote_optionid_ckey` (`optionid` ASC, `ckey` ASC);
|
||||
|
||||
ALTER TABLE `feedback`.`poll_textreply`
|
||||
ADD INDEX `idx_ptext_pollid_ckey` (`pollid` ASC, `ckey` ASC);
|
||||
ALTER TABLE `poll_textreply`
|
||||
ADD INDEX `idx_ptext_pollid_ckey` (`pollid` ASC, `ckey` ASC);
|
||||
@@ -110,6 +110,7 @@ CREATE TABLE `connection_log` (
|
||||
`datetime` datetime DEFAULT NULL,
|
||||
`server_ip` int(10) unsigned NOT NULL,
|
||||
`server_port` smallint(5) unsigned NOT NULL,
|
||||
`round_id` int(11) unsigned NOT NULL,
|
||||
`ckey` varchar(45) DEFAULT NULL,
|
||||
`ip` int(10) unsigned NOT NULL,
|
||||
`computerid` varchar(45) DEFAULT NULL,
|
||||
@@ -148,6 +149,8 @@ CREATE TABLE `death` (
|
||||
`toxloss` smallint(5) unsigned NOT NULL,
|
||||
`cloneloss` smallint(5) unsigned NOT NULL,
|
||||
`staminaloss` smallint(5) unsigned NOT NULL,
|
||||
`last_words` varchar(255) DEFAULT NULL,
|
||||
`suicide` tinyint(1) NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
@@ -200,6 +203,7 @@ CREATE TABLE `legacy_population` (
|
||||
`time` datetime NOT NULL,
|
||||
`server_ip` int(10) unsigned NOT NULL,
|
||||
`server_port` smallint(5) unsigned NOT NULL,
|
||||
`round_id` int(11) unsigned NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
@@ -220,6 +224,7 @@ CREATE TABLE `library` (
|
||||
`ckey` varchar(32) NOT NULL DEFAULT 'LEGACY',
|
||||
`datetime` datetime NOT NULL,
|
||||
`deleted` tinyint(1) unsigned DEFAULT NULL,
|
||||
`round_id_created` int(11) unsigned NOT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `deleted_idx` (`deleted`),
|
||||
KEY `idx_lib_id_del` (`id`,`deleted`),
|
||||
@@ -243,13 +248,17 @@ CREATE TABLE `messages` (
|
||||
`text` varchar(2048) NOT NULL,
|
||||
`timestamp` datetime NOT NULL,
|
||||
`server` varchar(32) DEFAULT NULL,
|
||||
`server_ip` int(10) unsigned NOT NULL,
|
||||
`server_port` smallint(5) unsigned NOT NULL,
|
||||
`round_id` int(11) unsigned NOT NULL,
|
||||
`secret` tinyint(1) unsigned NOT NULL,
|
||||
`lasteditor` varchar(32) DEFAULT NULL,
|
||||
`edits` text,
|
||||
`deleted` tinyint(1) unsigned NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_msg_ckey_time` (`targetckey`,`timestamp`),
|
||||
KEY `idx_msg_type_ckeys_time` (`type`,`targetckey`,`adminckey`,`timestamp`),
|
||||
KEY `idx_msg_type_ckey_time_odr` (`type`,`targetckey`,`timestamp`)
|
||||
KEY `idx_msg_ckey_time` (`targetckey`,`timestamp`, `deleted`),
|
||||
KEY `idx_msg_type_ckeys_time` (`type`,`targetckey`,`adminckey`,`timestamp`, `deleted`),
|
||||
KEY `idx_msg_type_ckey_time_odr` (`type`,`targetckey`,`timestamp`, `deleted`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
@@ -278,7 +287,9 @@ DROP TABLE IF EXISTS `player`;
|
||||
CREATE TABLE `player` (
|
||||
`ckey` varchar(32) NOT NULL,
|
||||
`firstseen` datetime NOT NULL,
|
||||
`firstseen_round_id` int(11) unsigned NOT NULL,
|
||||
`lastseen` datetime NOT NULL,
|
||||
`lastseen_round_id` int(11) unsigned NOT NULL,
|
||||
`ip` int(10) unsigned NOT NULL,
|
||||
`computerid` varchar(32) NOT NULL,
|
||||
`lastadminrank` varchar(32) NOT NULL DEFAULT 'Player',
|
||||
@@ -420,4 +431,4 @@ CREATE TABLE `schema_revision` (
|
||||
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
|
||||
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
|
||||
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
|
||||
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
||||
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
||||
@@ -1,9 +0,0 @@
|
||||
diff a/SQL/tgstation_schema.sql b/SQL/tgstation_schema.sql (rejected hunks)
|
||||
@@ -268,7 +283,6 @@ CREATE TABLE `player` (
|
||||
`ip` int(10) unsigned NOT NULL,
|
||||
`computerid` varchar(32) NOT NULL,
|
||||
`lastadminrank` varchar(32) NOT NULL DEFAULT 'Player',
|
||||
- `exp` mediumtext,
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `ckey` (`ckey`),
|
||||
KEY `idx_player_cid_ckey` (`computerid`,`ckey`),
|
||||
@@ -31,7 +31,7 @@ CREATE TABLE `SS13_admin` (
|
||||
-- Table structure for table `SS13_admin_log`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `SS13_dmin_log`;
|
||||
DROP TABLE IF EXISTS `SS13_admin_log`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `SS13_admin_log` (
|
||||
@@ -110,6 +110,7 @@ CREATE TABLE `SS13_connection_log` (
|
||||
`datetime` datetime DEFAULT NULL,
|
||||
`server_ip` int(10) unsigned NOT NULL,
|
||||
`server_port` smallint(5) unsigned NOT NULL,
|
||||
`round_id` int(11) unsigned NOT NULL,
|
||||
`ckey` varchar(45) DEFAULT NULL,
|
||||
`ip` int(10) unsigned NOT NULL,
|
||||
`computerid` varchar(45) DEFAULT NULL,
|
||||
@@ -148,6 +149,8 @@ CREATE TABLE `SS13_death` (
|
||||
`toxloss` smallint(5) unsigned NOT NULL,
|
||||
`cloneloss` smallint(5) unsigned NOT NULL,
|
||||
`staminaloss` smallint(5) unsigned NOT NULL,
|
||||
`last_words` varchar(255) DEFAULT NULL,
|
||||
`suicide` tinyint(1) NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
@@ -200,6 +203,7 @@ CREATE TABLE `SS13_legacy_population` (
|
||||
`time` datetime NOT NULL,
|
||||
`server_ip` int(10) unsigned NOT NULL,
|
||||
`server_port` smallint(5) unsigned NOT NULL,
|
||||
`round_id` int(11) unsigned NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
@@ -220,6 +224,7 @@ CREATE TABLE `SS13_library` (
|
||||
`ckey` varchar(32) NOT NULL DEFAULT 'LEGACY',
|
||||
`datetime` datetime NOT NULL,
|
||||
`deleted` tinyint(1) unsigned DEFAULT NULL,
|
||||
`round_id_created` int(11) unsigned NOT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `deleted_idx` (`deleted`),
|
||||
KEY `idx_lib_id_del` (`id`,`deleted`),
|
||||
@@ -243,13 +248,17 @@ CREATE TABLE `SS13_messages` (
|
||||
`text` varchar(2048) NOT NULL,
|
||||
`timestamp` datetime NOT NULL,
|
||||
`server` varchar(32) DEFAULT NULL,
|
||||
`server_ip` int(10) unsigned NOT NULL,
|
||||
`server_port` smallint(5) unsigned NOT NULL,
|
||||
`round_id` int(11) unsigned NOT NULL,
|
||||
`secret` tinyint(1) unsigned NOT NULL,
|
||||
`lasteditor` varchar(32) DEFAULT NULL,
|
||||
`edits` text,
|
||||
`deleted` tinyint(1) unsigned NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_msg_ckey_time` (`targetckey`,`timestamp`),
|
||||
KEY `idx_msg_type_ckeys_time` (`type`,`targetckey`,`adminckey`,`timestamp`),
|
||||
KEY `idx_msg_type_ckey_time_odr` (`type`,`targetckey`,`timestamp`)
|
||||
KEY `idx_msg_ckey_time` (`targetckey`,`timestamp`, `deleted`),
|
||||
KEY `idx_msg_type_ckeys_time` (`type`,`targetckey`,`adminckey`,`timestamp`, `deleted`),
|
||||
KEY `idx_msg_type_ckey_time_odr` (`type`,`targetckey`,`timestamp`, `deleted`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
@@ -278,7 +287,9 @@ DROP TABLE IF EXISTS `SS13_player`;
|
||||
CREATE TABLE `SS13_player` (
|
||||
`ckey` varchar(32) NOT NULL,
|
||||
`firstseen` datetime NOT NULL,
|
||||
`firstseen_round_id` int(11) unsigned NOT NULL,
|
||||
`lastseen` datetime NOT NULL,
|
||||
`lastseen_round_id` int(11) unsigned NOT NULL,
|
||||
`ip` int(10) unsigned NOT NULL,
|
||||
`computerid` varchar(32) NOT NULL,
|
||||
`lastadminrank` varchar(32) NOT NULL DEFAULT 'Player',
|
||||
@@ -420,4 +431,4 @@ CREATE TABLE `SS13_schema_revision` (
|
||||
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
|
||||
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
|
||||
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
|
||||
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
||||
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
||||
@@ -1,9 +0,0 @@
|
||||
diff a/SQL/tgstation_schema_prefixed.sql b/SQL/tgstation_schema_prefixed.sql (rejected hunks)
|
||||
@@ -268,7 +297,6 @@ CREATE TABLE `SS13_player` (
|
||||
`ip` int(10) unsigned NOT NULL,
|
||||
`computerid` varchar(32) NOT NULL,
|
||||
`lastadminrank` varchar(32) NOT NULL DEFAULT 'Player',
|
||||
- `exp` mediumtext,
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `ckey` (`ckey`),
|
||||
KEY `idx_player_cid_ckey` (`computerid`,`ckey`),
|
||||
@@ -378,9 +378,7 @@
|
||||
invisibility = 101
|
||||
},
|
||||
/obj/structure/table,
|
||||
/obj/item/paper/crumpled/bloody{
|
||||
info = "If you dare not continue down this path of madness, escape can be found through the chute in this room. "
|
||||
},
|
||||
/obj/item/paper/crumpled/bloody/ruins/lavaland/clown_planet/escape,
|
||||
/obj/item/pen/fourcolor,
|
||||
/turf/open/indestructible{
|
||||
icon_state = "white"
|
||||
@@ -925,9 +923,7 @@
|
||||
/turf/open/lava/smooth,
|
||||
/area/ruin/powered/clownplanet)
|
||||
"CB" = (
|
||||
/obj/item/paper/crumpled/bloody{
|
||||
info = "Abandon hope, all ye who enter here."
|
||||
},
|
||||
/obj/item/paper/crumpled/bloody/ruins/lavaland/clown_planet/hope,
|
||||
/obj/effect/decal/cleanable/blood/old,
|
||||
/turf/open/floor/noslip{
|
||||
initial_gas_mix = "o2=14;n2=23;TEMP=300"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
|
||||
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
|
||||
"aa" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
@@ -166,7 +166,7 @@
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"aF" = (
|
||||
/obj/machinery/door/unpowered/shuttle{
|
||||
/obj/machinery/door/airlock/shuttle{
|
||||
name = "Restroom"
|
||||
},
|
||||
/turf/open/floor/plasteel/bar,
|
||||
@@ -263,6 +263,9 @@
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"aX" = (
|
||||
/obj/item/stack/cable_coil/random,
|
||||
/obj/item/stack/sheet/mineral/titanium{
|
||||
amount = 30
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"aY" = (
|
||||
@@ -335,6 +338,9 @@
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"bk" = (
|
||||
/obj/structure/reagent_dispensers/fueltank,
|
||||
/obj/item/device/flashlight/glowstick/blue,
|
||||
/obj/item/device/flashlight/glowstick/blue,
|
||||
/obj/item/device/flashlight/glowstick/blue,
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"bl" = (
|
||||
@@ -373,16 +379,15 @@
|
||||
},
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"bn" = (
|
||||
/obj/structure/bed/dogbed,
|
||||
/obj/machinery/light/small{
|
||||
dir = 1
|
||||
/obj/machinery/sleeper{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"bo" = (
|
||||
/obj/item/reagent_containers/glass/bowl,
|
||||
/obj/item/reagent_containers/food/snacks/cheesewedge,
|
||||
/obj/item/reagent_containers/food/snacks/cheesewedge,
|
||||
/obj/machinery/light/small{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"bp" = (
|
||||
@@ -420,10 +425,8 @@
|
||||
},
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"bv" = (
|
||||
/obj/effect/mob_spawn/mouse{
|
||||
dir = 4;
|
||||
flavour_text = "<font size=3><b>Y</b></font><b>ou're a mousey! You're getting pretty old as mice go, and you haven't been feeling well as of late. Your master loves you a lot so he took you to this place so you can get better! You can't wait to see him again!<b>";
|
||||
mob_name = "Stallman Jr."
|
||||
/obj/effect/mob_spawn/human/doctor/alive/lavaland{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
@@ -433,8 +436,7 @@
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"bx" = (
|
||||
/obj/machinery/door/airlock/medical{
|
||||
name = "Patient Room";
|
||||
req_access_txt = "0"
|
||||
name = "Rejuvenation Pods"
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
@@ -468,12 +470,11 @@
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"bD" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/reagent_containers/glass/bottle/cyanide{
|
||||
desc = "A cocktail of chemotherapy drugs intended to treat bladder cancer.";
|
||||
name = "MVAC regimen"
|
||||
/mob/living/simple_animal/bot/medbot{
|
||||
desc = "A little medical robot. It's programmed to only act in emergencies.";
|
||||
heal_threshold = 40;
|
||||
name = "emergency Medibot"
|
||||
},
|
||||
/obj/item/reagent_containers/syringe,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"bE" = (
|
||||
@@ -553,16 +554,12 @@
|
||||
},
|
||||
/area/lavaland/surface/outdoors)
|
||||
"bP" = (
|
||||
/obj/structure/chair/office/light{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/storage/firstaid/fire,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"bQ" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/clothing/neck/petcollar,
|
||||
/obj/item/pen/blue,
|
||||
/obj/machinery/light/small,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"bR" = (
|
||||
@@ -582,6 +579,8 @@
|
||||
/obj/item/defibrillator/loaded,
|
||||
/obj/item/storage/belt/medical,
|
||||
/obj/item/clothing/glasses/hud/health,
|
||||
/obj/item/clothing/glasses/hud/health,
|
||||
/obj/item/clothing/glasses/hud/health,
|
||||
/turf/open/floor/plasteel/blue/side{
|
||||
dir = 6
|
||||
},
|
||||
@@ -664,46 +663,46 @@
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"cg" = (
|
||||
/obj/machinery/door/unpowered/shuttle{
|
||||
/obj/machinery/door/airlock/shuttle{
|
||||
name = "Break Room"
|
||||
},
|
||||
/turf/open/floor/plasteel/cmo,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"ch" = (
|
||||
/obj/machinery/door/unpowered/shuttle{
|
||||
name = "Emergency Care"
|
||||
/obj/machinery/door/airlock/shuttle{
|
||||
name = "Operating Theatre"
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"ci" = (
|
||||
/obj/machinery/door/unpowered/shuttle{
|
||||
desc = "There's a note wedged in the seam saying something about directing pizza here.";
|
||||
/obj/structure/fans/tiny/invisible,
|
||||
/obj/machinery/door/airlock/shuttle{
|
||||
desc = "There's a smudged note wedged into it that says something about pizza dropoffs.";
|
||||
name = "Staff Entrance"
|
||||
},
|
||||
/obj/structure/fans/tiny/invisible,
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"cj" = (
|
||||
/obj/machinery/door/unpowered/shuttle{
|
||||
/obj/machinery/door/airlock/shuttle{
|
||||
name = "Morgue"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"ck" = (
|
||||
/obj/machinery/door/unpowered/shuttle{
|
||||
/obj/machinery/door/airlock/shuttle{
|
||||
name = "Medical Supplies"
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"cl" = (
|
||||
/obj/machinery/door/unpowered/shuttle{
|
||||
/obj/machinery/door/airlock/shuttle{
|
||||
name = "Safety Supplies"
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"cm" = (
|
||||
/obj/machinery/door/unpowered/shuttle{
|
||||
name = "Tool Storage"
|
||||
/obj/machinery/door/airlock/shuttle{
|
||||
name = "Storage"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
@@ -811,6 +810,33 @@
|
||||
/obj/effect/baseturf_helper/lava_land/surface,
|
||||
/turf/closed/wall/mineral/titanium/nodiagonal,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"cG" = (
|
||||
/obj/machinery/door/airlock/shuttle{
|
||||
desc = "There's a smudged note wedged into it that says something about pizza dropoffs.";
|
||||
name = "Staff Entrance"
|
||||
},
|
||||
/turf/open/floor/plasteel/cmo,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"cH" = (
|
||||
/mob/living/simple_animal/bot/cleanbot,
|
||||
/turf/open/floor/plasteel/blue/side{
|
||||
dir = 0
|
||||
},
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"cI" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/storage/firstaid/toxin,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
"cJ" = (
|
||||
/obj/machinery/sleeper{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/ruin/powered/animal_hospital)
|
||||
|
||||
(1,1,1) = {"
|
||||
aa
|
||||
@@ -1037,7 +1063,7 @@ cw
|
||||
ae
|
||||
aV
|
||||
ba
|
||||
bh
|
||||
cI
|
||||
aG
|
||||
aL
|
||||
br
|
||||
@@ -1092,7 +1118,7 @@ aj
|
||||
at
|
||||
as
|
||||
ae
|
||||
ct
|
||||
aL
|
||||
aK
|
||||
ck
|
||||
ao
|
||||
@@ -1122,7 +1148,7 @@ ak
|
||||
as
|
||||
az
|
||||
ae
|
||||
aM
|
||||
cv
|
||||
aP
|
||||
ae
|
||||
ae
|
||||
@@ -1152,7 +1178,7 @@ al
|
||||
au
|
||||
as
|
||||
ae
|
||||
ct
|
||||
aL
|
||||
aK
|
||||
cl
|
||||
ao
|
||||
@@ -1181,9 +1207,9 @@ ae
|
||||
am
|
||||
cs
|
||||
as
|
||||
cg
|
||||
cG
|
||||
aK
|
||||
aP
|
||||
cH
|
||||
ae
|
||||
aW
|
||||
ao
|
||||
@@ -1249,12 +1275,12 @@ ae
|
||||
ae
|
||||
ae
|
||||
ae
|
||||
bh
|
||||
bv
|
||||
bv
|
||||
cJ
|
||||
bn
|
||||
bv
|
||||
bC
|
||||
ae
|
||||
bn
|
||||
bN
|
||||
bP
|
||||
ae
|
||||
cE
|
||||
@@ -1280,10 +1306,10 @@ be
|
||||
bk
|
||||
ae
|
||||
bo
|
||||
bw
|
||||
ao
|
||||
bD
|
||||
ae
|
||||
bK
|
||||
ao
|
||||
ao
|
||||
ao
|
||||
bQ
|
||||
ae
|
||||
@@ -1311,11 +1337,11 @@ ae
|
||||
ae
|
||||
af
|
||||
bx
|
||||
ae
|
||||
af
|
||||
ae
|
||||
af
|
||||
bx
|
||||
ae
|
||||
af
|
||||
ae
|
||||
aa
|
||||
aa
|
||||
|
||||
@@ -7,6 +7,9 @@
|
||||
/area/ruin/powered/golem_ship)
|
||||
"c" = (
|
||||
/obj/structure/closet/crate,
|
||||
/obj/item/shovel,
|
||||
/obj/item/shovel,
|
||||
/obj/item/shovel,
|
||||
/obj/item/pickaxe,
|
||||
/obj/item/pickaxe,
|
||||
/obj/item/pickaxe,
|
||||
@@ -19,6 +22,8 @@
|
||||
/area/ruin/powered/golem_ship)
|
||||
"d" = (
|
||||
/obj/structure/closet/crate,
|
||||
/obj/item/shovel,
|
||||
/obj/item/shovel,
|
||||
/obj/item/pickaxe,
|
||||
/obj/item/pickaxe,
|
||||
/obj/item/storage/bag/ore,
|
||||
|
||||
@@ -76,8 +76,7 @@
|
||||
/area/ruin/powered/syndicate_lava_base)
|
||||
"al" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1
|
||||
icon_state = "plant-21"
|
||||
},
|
||||
/turf/open/floor/plasteel/vault,
|
||||
/area/ruin/powered/syndicate_lava_base)
|
||||
@@ -320,8 +319,7 @@
|
||||
/area/ruin/powered/syndicate_lava_base)
|
||||
"aS" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1
|
||||
icon_state = "plant-21"
|
||||
},
|
||||
/turf/open/floor/plasteel/vault{
|
||||
dir = 5
|
||||
@@ -413,8 +411,7 @@
|
||||
/area/ruin/powered/syndicate_lava_base)
|
||||
"bd" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1
|
||||
icon_state = "plant-21"
|
||||
},
|
||||
/obj/machinery/light/small,
|
||||
/turf/open/floor/plasteel/black,
|
||||
@@ -694,16 +691,15 @@
|
||||
/area/ruin/powered/syndicate_lava_base)
|
||||
"bJ" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted,
|
||||
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted,
|
||||
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot,
|
||||
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot,
|
||||
/turf/open/floor/plasteel/vault{
|
||||
dir = 8
|
||||
},
|
||||
/area/ruin/powered/syndicate_lava_base)
|
||||
"bK" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1
|
||||
icon_state = "plant-21"
|
||||
},
|
||||
/turf/open/floor/plasteel/vault{
|
||||
dir = 8
|
||||
@@ -969,8 +965,7 @@
|
||||
/area/ruin/powered/syndicate_lava_base)
|
||||
"cq" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1
|
||||
icon_state = "plant-21"
|
||||
},
|
||||
/turf/open/floor/plasteel/podhatch{
|
||||
dir = 5
|
||||
|
||||
@@ -252,7 +252,9 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/template_noop)
|
||||
"aF" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/derelict/solar_control)
|
||||
@@ -416,7 +418,9 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/ruin/space/derelict/solar_control)
|
||||
"bc" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/derelict/solar_control)
|
||||
"bd" = (
|
||||
@@ -985,7 +989,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/derelict/bridge/access)
|
||||
"cU" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/derelict/bridge/access)
|
||||
"cV" = (
|
||||
@@ -1018,11 +1024,15 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/ruin/space/derelict/bridge/access)
|
||||
"cY" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 10
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/gravity_generator)
|
||||
"cZ" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/gravity_generator)
|
||||
"da" = (
|
||||
@@ -1033,11 +1043,15 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/ruin/space/derelict/gravity_generator)
|
||||
"db" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/gravity_generator)
|
||||
"dc" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 5
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/gravity_generator)
|
||||
"dd" = (
|
||||
@@ -1488,15 +1502,19 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/unpowered/no_grav)
|
||||
"ev" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/one_side,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/singularity_engine)
|
||||
"ew" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 6
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/singularity_engine)
|
||||
"ex" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/one_side/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 8
|
||||
@@ -1663,7 +1681,9 @@
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"eW" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 9
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/singularity_engine)
|
||||
"eX" = (
|
||||
@@ -1697,11 +1717,15 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/singularity_engine)
|
||||
"fc" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/singularity_engine)
|
||||
"fd" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 5
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/singularity_engine)
|
||||
"fe" = (
|
||||
@@ -1783,7 +1807,9 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/bridge)
|
||||
"fq" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/one_side/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/singularity_engine)
|
||||
"fr" = (
|
||||
@@ -1807,7 +1833,9 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/singularity_engine)
|
||||
"ft" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/one_side/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/singularity_engine)
|
||||
"fu" = (
|
||||
@@ -1890,7 +1918,9 @@
|
||||
},
|
||||
/area/ruin/space/derelict/singularity_engine)
|
||||
"fI" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 10
|
||||
},
|
||||
/turf/open/floor/plasteel/airless{
|
||||
icon_state = "damaged2"
|
||||
},
|
||||
@@ -2128,7 +2158,9 @@
|
||||
},
|
||||
/area/ruin/space/derelict/singularity_engine)
|
||||
"gt" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 9
|
||||
},
|
||||
/obj/item/shard{
|
||||
icon_state = "medium"
|
||||
},
|
||||
@@ -2146,7 +2178,9 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/singularity_engine)
|
||||
"gw" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/singularity_engine)
|
||||
"gx" = (
|
||||
@@ -2194,7 +2228,9 @@
|
||||
},
|
||||
/area/ruin/unpowered/no_grav)
|
||||
"gE" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/singularity_engine)
|
||||
"gF" = (
|
||||
@@ -2292,7 +2328,9 @@
|
||||
/turf/closed/wall,
|
||||
/area/ruin/space/derelict/singularity_engine)
|
||||
"gZ" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 10
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/singularity_engine)
|
||||
"ha" = (
|
||||
@@ -2408,7 +2446,9 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/medical)
|
||||
"hx" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/medical)
|
||||
"hy" = (
|
||||
@@ -2691,7 +2731,9 @@
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"iu" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 6
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"iv" = (
|
||||
@@ -3129,7 +3171,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/derelict/arrival)
|
||||
"jK" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/derelict/arrival)
|
||||
"jL" = (
|
||||
@@ -3548,11 +3592,15 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/hallway/primary)
|
||||
"kP" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/hallway/primary)
|
||||
"kQ" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/hallway/primary)
|
||||
"kR" = (
|
||||
@@ -3717,11 +3765,7 @@
|
||||
/obj/item/reagent_containers/glass/beaker{
|
||||
list_reagents = list("sacid" = 50)
|
||||
},
|
||||
/obj/item/paper/crumpled/bloody{
|
||||
desc = "Looks like someone started shakily writing a will in space common, but were interrupted by something bloody...";
|
||||
info = "I, Victor Belyakov, do hereby leave my _- ";
|
||||
name = "unfinished paper scrap"
|
||||
},
|
||||
/obj/item/paper/crumpled/bloody/ruins/thederelict/unfinished,
|
||||
/obj/item/pen,
|
||||
/turf/open/floor/plasteel/airless,
|
||||
/area/ruin/space/derelict/hallway/primary)
|
||||
@@ -3776,7 +3820,9 @@
|
||||
/turf/open/floor/plasteel/airless,
|
||||
/area/ruin/unpowered/no_grav)
|
||||
"lD" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/unpowered/no_grav)
|
||||
"lE" = (
|
||||
@@ -3854,7 +3900,9 @@
|
||||
/turf/open/floor/plasteel/airless,
|
||||
/area/ruin/unpowered/no_grav)
|
||||
"lR" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/unpowered/no_grav)
|
||||
"lS" = (
|
||||
@@ -4066,7 +4114,9 @@
|
||||
/turf/open/floor/plasteel/airless,
|
||||
/area/ruin/space/derelict/hallway/secondary)
|
||||
"mD" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/hallway/secondary)
|
||||
"mE" = (
|
||||
@@ -4178,7 +4228,9 @@
|
||||
/turf/open/floor/plasteel/airless,
|
||||
/area/ruin/space/derelict/hallway/secondary)
|
||||
"mY" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/hallway/secondary)
|
||||
"mZ" = (
|
||||
@@ -4370,7 +4422,7 @@
|
||||
/turf/template_noop,
|
||||
/area/ruin/space/derelict/hallway/secondary)
|
||||
"ny" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/one_side,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/hallway/secondary)
|
||||
"nz" = (
|
||||
@@ -4421,7 +4473,9 @@
|
||||
/turf/open/floor/plasteel/airless,
|
||||
/area/ruin/space/derelict/hallway/secondary)
|
||||
"nH" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/derelict/hallway/secondary)
|
||||
"nI" = (
|
||||
|
||||
@@ -36,11 +36,15 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/abandoned_tele)
|
||||
"j" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/abandoned_tele)
|
||||
"k" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/abandoned_tele)
|
||||
"l" = (
|
||||
@@ -78,7 +82,9 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/abandoned_tele)
|
||||
"t" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/abandoned_tele)
|
||||
"u" = (
|
||||
|
||||
@@ -743,10 +743,7 @@
|
||||
/turf/open/floor/plasteel/darkgreen,
|
||||
/area/ruin/space/has_grav/abandonedzoo)
|
||||
"bN" = (
|
||||
/obj/structure/grille{
|
||||
density = 0;
|
||||
icon_state = "brokengrille"
|
||||
},
|
||||
/obj/structure/grille/broken,
|
||||
/obj/item/shard{
|
||||
icon_state = "small"
|
||||
},
|
||||
@@ -799,10 +796,7 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/has_grav/abandonedzoo)
|
||||
"bU" = (
|
||||
/obj/structure/grille{
|
||||
density = 0;
|
||||
icon_state = "brokengrille"
|
||||
},
|
||||
/obj/structure/grille/broken,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/has_grav/abandonedzoo)
|
||||
"bV" = (
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
/area/ruin/space/has_grav/derelictoutpost/cargobay)
|
||||
"ao" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 0;
|
||||
start_charge = 0;
|
||||
dir = 4;
|
||||
name = "Cargo Bay APC";
|
||||
pixel_x = 24
|
||||
@@ -258,9 +258,7 @@
|
||||
name = "critter crate - mr.tiggles";
|
||||
opened = 1
|
||||
},
|
||||
/obj/item/paper/crumpled/ruins/snowdin{
|
||||
info = "<i>A crumpled piece of manifest paper, out of the barely legible pen writing, you can see something about a warning involving whatever was originally in the crate.</i>"
|
||||
},
|
||||
/obj/item/paper/crumpled/ruins/bigderelict1/manifest,
|
||||
/obj/structure/alien/weeds{
|
||||
color = "#4BAE56";
|
||||
desc = "A thick gelatinous surface covers the floor. Someone get the golashes.";
|
||||
@@ -454,10 +452,7 @@
|
||||
name = "Tradeport Officer";
|
||||
random = 1
|
||||
},
|
||||
/obj/item/paper/crumpled/ruins/snowdin{
|
||||
icon_state = "scrap_bloodied";
|
||||
info = "If anyone finds this, please, don't let my kids know I died a coward.."
|
||||
},
|
||||
/obj/item/paper/crumpled/ruins/bigderelict1/coward,
|
||||
/obj/effect/decal/cleanable/blood/old{
|
||||
name = "dried blood splatter";
|
||||
pixel_x = -29
|
||||
@@ -754,7 +749,7 @@
|
||||
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
|
||||
"ca" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 0;
|
||||
start_charge = 0;
|
||||
dir = 4;
|
||||
name = "Power Storage APC";
|
||||
pixel_x = 23;
|
||||
@@ -850,7 +845,7 @@
|
||||
/area/ruin/space/has_grav/derelictoutpost)
|
||||
"ck" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 0;
|
||||
start_charge = 0;
|
||||
dir = 2;
|
||||
name = "Tradepost APC";
|
||||
pixel_y = -24
|
||||
@@ -2011,7 +2006,7 @@
|
||||
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
|
||||
"el" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 0;
|
||||
start_charge = 0;
|
||||
dir = 4;
|
||||
name = "Cargo Storage APC";
|
||||
pixel_x = 24
|
||||
@@ -3912,4 +3907,4 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
"}
|
||||
"}
|
||||
@@ -815,8 +815,8 @@
|
||||
/area/ruin/unpowered)
|
||||
"cC" = (
|
||||
/obj/structure/closet/crate/secure/weapon,
|
||||
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted,
|
||||
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted,
|
||||
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot,
|
||||
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot,
|
||||
/turf/open/floor/mineral/titanium/yellow/airless,
|
||||
/area/ruin/unpowered)
|
||||
"cD" = (
|
||||
|
||||
@@ -17,7 +17,9 @@
|
||||
/turf/closed/wall/mineral/titanium/overspace,
|
||||
/area/awaymission/BMPship/Aft)
|
||||
"af" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/awaymission/BMPship/Aft)
|
||||
"ag" = (
|
||||
@@ -38,7 +40,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/BMPship/Aft)
|
||||
"aj" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/awaymission/BMPship/Aft)
|
||||
"ak" = (
|
||||
@@ -54,7 +58,9 @@
|
||||
/area/template_noop)
|
||||
"an" = (
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/awaymission/BMPship/Aft)
|
||||
"ao" = (
|
||||
@@ -224,7 +230,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/BMPship/Aft)
|
||||
"aQ" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/awaymission/BMPship/Fore)
|
||||
"aR" = (
|
||||
@@ -350,7 +358,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/BMPship/Aft)
|
||||
"bl" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/awaymission/BMPship/Fore)
|
||||
"bm" = (
|
||||
@@ -394,7 +404,9 @@
|
||||
/area/awaymission/BMPship/Aft)
|
||||
"bt" = (
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/awaymission/BMPship/Fore)
|
||||
"bu" = (
|
||||
@@ -1165,7 +1177,9 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/awaymission/BMPship/Aft)
|
||||
"dG" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/BMPship/Fore)
|
||||
"dH" = (
|
||||
@@ -1372,7 +1386,9 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/awaymission/BMPship/Aft)
|
||||
"ed" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/BMPship/Fore)
|
||||
"ee" = (
|
||||
@@ -1592,7 +1608,9 @@
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 6
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/BMPship/Fore)
|
||||
"eI" = (
|
||||
@@ -2115,7 +2133,9 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/awaymission/BMPship/Aft)
|
||||
"gk" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/awaymission/BMPship/Fore)
|
||||
"gl" = (
|
||||
@@ -2247,7 +2267,9 @@
|
||||
/turf/open/floor/plating/asteroid/airless,
|
||||
/area/awaymission/BMPship)
|
||||
"gF" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/one_side/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 4
|
||||
},
|
||||
/obj/item/shard{
|
||||
icon_state = "small"
|
||||
},
|
||||
@@ -2308,7 +2330,9 @@
|
||||
/turf/open/floor/plating/asteroid/airless,
|
||||
/area/awaymission/BMPship)
|
||||
"gR" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 6
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/awaymission/BMPship/Fore)
|
||||
"gS" = (
|
||||
@@ -2448,7 +2472,9 @@
|
||||
/turf/open/floor/plating/asteroid/airless,
|
||||
/area/awaymission/BMPship)
|
||||
"ho" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/awaymission/BMPship/Aft)
|
||||
"hp" = (
|
||||
|
||||
@@ -1096,8 +1096,7 @@
|
||||
d2 = 8;
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 4;
|
||||
name = "Hydroponics APC";
|
||||
pixel_x = 24
|
||||
@@ -1466,8 +1465,7 @@
|
||||
/area/ruin/space/has_grav/deepstorage)
|
||||
"cQ" = (
|
||||
/obj/structure/cable/yellow,
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 4;
|
||||
name = "Storage APC";
|
||||
pixel_x = 24
|
||||
@@ -2260,8 +2258,7 @@
|
||||
d2 = 8;
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 4;
|
||||
name = "Armory APC";
|
||||
pixel_x = 24
|
||||
@@ -3085,8 +3082,7 @@
|
||||
"fE" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
|
||||
/obj/structure/cable/yellow,
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 4;
|
||||
name = "Dormory APC";
|
||||
pixel_x = 24
|
||||
@@ -6625,4 +6621,4 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
"}
|
||||
"}
|
||||
@@ -174,7 +174,6 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 2500;
|
||||
dir = 1;
|
||||
name = "Worn-out APC";
|
||||
pixel_x = 1;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -44,7 +44,6 @@
|
||||
/area/tcommsat/chamber)
|
||||
"ak" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 2500;
|
||||
dir = 1;
|
||||
name = "Worn-out APC";
|
||||
pixel_x = 1;
|
||||
@@ -452,11 +451,15 @@
|
||||
/turf/open/floor/plasteel/airless/black,
|
||||
/area/tcommsat/chamber)
|
||||
"bA" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/tcommsat/chamber)
|
||||
"bB" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/tcommsat/chamber)
|
||||
"bC" = (
|
||||
@@ -464,7 +467,9 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/tcommsat/chamber)
|
||||
"bD" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/tcommsat/chamber)
|
||||
"bE" = (
|
||||
@@ -513,7 +518,9 @@
|
||||
/turf/open/floor/plasteel/airless/black,
|
||||
/area/tcommsat/chamber)
|
||||
"bK" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 9
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/tcommsat/chamber)
|
||||
"bL" = (
|
||||
@@ -521,7 +528,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/tcommsat/chamber)
|
||||
"bM" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/tcommsat/chamber)
|
||||
"bN" = (
|
||||
@@ -541,7 +550,9 @@
|
||||
/turf/open/floor/plasteel/airless/black,
|
||||
/area/tcommsat/chamber)
|
||||
"bP" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/tcommsat/chamber)
|
||||
"bQ" = (
|
||||
@@ -554,7 +565,9 @@
|
||||
/turf/open/floor/plasteel/airless/black,
|
||||
/area/tcommsat/chamber)
|
||||
"bS" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/tcommsat/chamber)
|
||||
@@ -610,7 +623,9 @@
|
||||
/turf/open/floor/plasteel/airless/black,
|
||||
/area/tcommsat/chamber)
|
||||
"cc" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/tcommsat/chamber)
|
||||
"cd" = (
|
||||
@@ -633,7 +648,9 @@
|
||||
/turf/open/floor/plasteel/airless/black,
|
||||
/area/tcommsat/chamber)
|
||||
"ch" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 10
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/tcommsat/chamber)
|
||||
"ci" = (
|
||||
|
||||
@@ -53,7 +53,9 @@
|
||||
/turf/closed/wall/rust,
|
||||
/area/ruin/space/has_grav/ancientstation/comm)
|
||||
"al" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/door/poddoor{
|
||||
id = "ancient"
|
||||
},
|
||||
@@ -67,7 +69,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/comm)
|
||||
"an" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/door/poddoor{
|
||||
id = "ancient"
|
||||
},
|
||||
@@ -483,11 +487,15 @@
|
||||
/turf/closed/wall/rust,
|
||||
/area/ruin/space/has_grav/ancientstation/comm)
|
||||
"bz" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/comm)
|
||||
"bA" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/comm)
|
||||
"bB" = (
|
||||
@@ -900,7 +908,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/deltacorridor)
|
||||
"cK" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/template_noop)
|
||||
"cL" = (
|
||||
@@ -946,7 +956,9 @@
|
||||
/turf/closed/wall/rust,
|
||||
/area/ruin/space/has_grav/ancientstation/hydroponics)
|
||||
"cR" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/hydroponics)
|
||||
"cS" = (
|
||||
@@ -954,7 +966,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/hydroponics)
|
||||
"cT" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/hydroponics)
|
||||
"cU" = (
|
||||
@@ -1794,7 +1808,9 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/template_noop)
|
||||
"fb" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/engi)
|
||||
"fc" = (
|
||||
@@ -1978,7 +1994,9 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/template_noop)
|
||||
"fB" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/engi)
|
||||
"fC" = (
|
||||
@@ -1986,7 +2004,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/engi)
|
||||
"fD" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 6
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/engi)
|
||||
"fE" = (
|
||||
@@ -2805,7 +2825,9 @@
|
||||
/turf/open/floor/plasteel/airless/floorgrime,
|
||||
/area/template_noop)
|
||||
"gV" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 5
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/engi)
|
||||
"gW" = (
|
||||
@@ -2869,7 +2891,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/deltacorridor)
|
||||
"hf" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/rnd)
|
||||
@@ -2879,7 +2903,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/rnd)
|
||||
"hh" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/rnd)
|
||||
@@ -3736,7 +3762,9 @@
|
||||
/turf/closed/wall/rust,
|
||||
/area/ruin/space/has_grav/ancientstation/engi)
|
||||
"iY" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/kitchen)
|
||||
"iZ" = (
|
||||
@@ -3744,7 +3772,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/kitchen)
|
||||
"ja" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/kitchen)
|
||||
"jb" = (
|
||||
@@ -4069,11 +4099,15 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/template_noop)
|
||||
"jS" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation)
|
||||
"jT" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation)
|
||||
"jU" = (
|
||||
@@ -4227,7 +4261,9 @@
|
||||
/turf/open/floor/engine/airless,
|
||||
/area/ruin/space/has_grav/ancientstation/atmo)
|
||||
"ko" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/template_noop)
|
||||
"kp" = (
|
||||
@@ -4238,7 +4274,7 @@
|
||||
dir = 6
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/showcase/oldpod,
|
||||
/obj/structure/showcase/machinery/oldpod,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/ruin/space/has_grav/ancientstation)
|
||||
"kq" = (
|
||||
@@ -4250,7 +4286,7 @@
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/obj/structure/showcase/oldpod,
|
||||
/obj/structure/showcase/machinery/oldpod,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/ruin/space/has_grav/ancientstation)
|
||||
"kr" = (
|
||||
@@ -4329,7 +4365,9 @@
|
||||
/turf/open/floor/engine/airless,
|
||||
/area/ruin/space/has_grav/ancientstation/atmo)
|
||||
"kB" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/template_noop)
|
||||
"kC" = (
|
||||
@@ -4583,11 +4621,15 @@
|
||||
/turf/closed/mineral/plasma,
|
||||
/area/ruin/unpowered)
|
||||
"li" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/proto)
|
||||
"lj" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/ancientstation/proto)
|
||||
"lk" = (
|
||||
|
||||
@@ -350,7 +350,6 @@
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 2500;
|
||||
dir = 1;
|
||||
name = "Mining Drone Bay APC";
|
||||
pixel_y = 24
|
||||
@@ -848,7 +847,6 @@
|
||||
d2 = 4
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 2500;
|
||||
dir = 1;
|
||||
name = "Bridge APC";
|
||||
pixel_y = 24
|
||||
@@ -1227,10 +1225,7 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/ruin/space/has_grav/onehalf/bridge)
|
||||
"dc" = (
|
||||
/obj/structure/grille{
|
||||
density = 0;
|
||||
icon_state = "brokengrille"
|
||||
},
|
||||
/obj/structure/grille/broken,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
|
||||
@@ -541,12 +541,7 @@
|
||||
/area/ruin/powered)
|
||||
"bB" = (
|
||||
/obj/structure/easel,
|
||||
/obj/item/paper/pamphlet{
|
||||
icon = 'icons/obj/fluff.dmi';
|
||||
icon_state = "painting4";
|
||||
info = "<i>This picture depicts a crudely-drawn stickman firing a crudely-drawn gun.</i>";
|
||||
name = "Painting - 'BANG' "
|
||||
},
|
||||
/obj/item/paper/pamphlet/ruin/originalcontent/stickman,
|
||||
/turf/open/indestructible/paper,
|
||||
/area/ruin/powered)
|
||||
"bC" = (
|
||||
@@ -609,12 +604,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/easel,
|
||||
/obj/item/paper/pamphlet{
|
||||
icon = 'icons/obj/fluff.dmi';
|
||||
icon_state = "painting1";
|
||||
info = "<i>This picture depicts a sunny day on a lush hillside, set under a shaded tree.</i>";
|
||||
name = "Painting - 'Treeside' "
|
||||
},
|
||||
/obj/item/paper/pamphlet/ruin/originalcontent/treeside,
|
||||
/turf/open/indestructible/paper,
|
||||
/area/ruin/powered)
|
||||
"bK" = (
|
||||
@@ -716,12 +706,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/easel,
|
||||
/obj/item/paper/pamphlet{
|
||||
icon = 'icons/obj/fluff.dmi';
|
||||
icon_state = "painting3";
|
||||
info = "<i>This picture depicts a smiling clown. Something doesn't feel right about this..</i>";
|
||||
name = "Painting - 'Pennywise' "
|
||||
},
|
||||
/obj/item/paper/pamphlet/ruin/originalcontent/pennywise,
|
||||
/turf/open/indestructible/paper,
|
||||
/area/ruin/powered)
|
||||
"bX" = (
|
||||
@@ -869,12 +854,7 @@
|
||||
"cr" = (
|
||||
/obj/structure/fluff/paper,
|
||||
/obj/structure/easel,
|
||||
/obj/item/paper/pamphlet{
|
||||
icon = 'icons/obj/fluff.dmi';
|
||||
icon_state = "painting2";
|
||||
info = "<i>This picture depicts a man yelling on a bridge for no apparent reason.</i>";
|
||||
name = "Painting - 'Hands-On-Face' "
|
||||
},
|
||||
/obj/item/paper/pamphlet/ruin/originalcontent/yelling,
|
||||
/turf/open/indestructible/paper,
|
||||
/area/ruin/powered)
|
||||
"cs" = (
|
||||
|
||||
@@ -655,8 +655,7 @@
|
||||
name = "Hotel Guest Room 3"
|
||||
})
|
||||
"bN" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 2;
|
||||
name = "Guest Room APC";
|
||||
pixel_y = -24
|
||||
@@ -719,8 +718,7 @@
|
||||
name = "Hotel Guest Room 4"
|
||||
})
|
||||
"bT" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 2;
|
||||
name = "Guest Room APC";
|
||||
pixel_y = -24
|
||||
@@ -783,8 +781,7 @@
|
||||
name = "Hotel Guest Room 5"
|
||||
})
|
||||
"bZ" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 2;
|
||||
name = "Guest Room APC";
|
||||
pixel_y = -24
|
||||
@@ -847,8 +844,7 @@
|
||||
name = "Hotel Guest Room 6"
|
||||
})
|
||||
"cf" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 2;
|
||||
name = "Guest Room APC";
|
||||
pixel_y = -24
|
||||
@@ -1379,8 +1375,7 @@
|
||||
name = "Hotel Guest Room 2"
|
||||
})
|
||||
"dn" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 1;
|
||||
name = "Guest Room APC";
|
||||
pixel_y = 25
|
||||
@@ -1461,8 +1456,7 @@
|
||||
name = "Hotel Guest Room 1"
|
||||
})
|
||||
"dv" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 1;
|
||||
name = "Guest Room APC";
|
||||
pixel_y = 25
|
||||
@@ -1874,8 +1868,7 @@
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/ruin/space/has_grav/hotel/workroom)
|
||||
"eA" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 2;
|
||||
name = "Laundry APC";
|
||||
pixel_y = -24
|
||||
@@ -2080,8 +2073,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/hotel)
|
||||
"fh" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 2;
|
||||
name = "Kitchen APC";
|
||||
pixel_y = -24
|
||||
@@ -2874,8 +2866,7 @@
|
||||
/turf/open/floor/plasteel/cafeteria,
|
||||
/area/ruin/space/has_grav/hotel/bar)
|
||||
"hA" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 2;
|
||||
name = "Staff Room APC";
|
||||
pixel_y = -24
|
||||
@@ -3261,8 +3252,7 @@
|
||||
},
|
||||
/area/ruin/space/has_grav/hotel/power)
|
||||
"iw" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 1;
|
||||
name = "Power Storage APC";
|
||||
pixel_y = 25
|
||||
@@ -3427,8 +3417,7 @@
|
||||
},
|
||||
/area/ruin/space/has_grav/hotel/power)
|
||||
"iU" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 2;
|
||||
name = "Security APC";
|
||||
pixel_y = -24
|
||||
@@ -3500,8 +3489,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/ruin/space/has_grav/hotel/pool)
|
||||
"iZ" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 2;
|
||||
name = "Pool APC";
|
||||
pixel_y = -24
|
||||
@@ -3559,8 +3547,7 @@
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 2;
|
||||
name = "Dock APC";
|
||||
pixel_y = -24
|
||||
@@ -4824,8 +4811,7 @@
|
||||
/turf/open/floor/plasteel/neutral,
|
||||
/area/ruin/space/has_grav/hotel/custodial)
|
||||
"mJ" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 2;
|
||||
name = "Custodial APC";
|
||||
pixel_y = -24
|
||||
|
||||
@@ -9,7 +9,9 @@
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/awaymission/centcomAway/cafe)
|
||||
"ad" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/cafe)
|
||||
"ae" = (
|
||||
@@ -17,7 +19,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/cafe)
|
||||
"af" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/cafe)
|
||||
"ag" = (
|
||||
@@ -101,7 +105,9 @@
|
||||
},
|
||||
/area/awaymission/centcomAway/cafe)
|
||||
"at" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/cafe)
|
||||
"au" = (
|
||||
@@ -136,7 +142,9 @@
|
||||
},
|
||||
/area/awaymission/centcomAway/cafe)
|
||||
"aB" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/cafe)
|
||||
"aC" = (
|
||||
@@ -223,7 +231,9 @@
|
||||
},
|
||||
/area/awaymission/centcomAway/maint)
|
||||
"aS" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/awaymission/centcomAway/maint)
|
||||
"aT" = (
|
||||
@@ -231,7 +241,9 @@
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/awaymission/centcomAway/maint)
|
||||
"aU" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/awaymission/centcomAway/maint)
|
||||
"aV" = (
|
||||
@@ -582,7 +594,9 @@
|
||||
/turf/open/floor/plasteel/hydrofloor,
|
||||
/area/awaymission/centcomAway/cafe)
|
||||
"ci" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/maint)
|
||||
"cj" = (
|
||||
@@ -632,7 +646,9 @@
|
||||
/turf/open/floor/plasteel/hydrofloor,
|
||||
/area/awaymission/centcomAway/cafe)
|
||||
"cu" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/maint)
|
||||
"cv" = (
|
||||
@@ -1016,11 +1032,15 @@
|
||||
/turf/closed/wall/mineral/titanium,
|
||||
/area/awaymission/centcomAway/hangar)
|
||||
"dS" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/cafe)
|
||||
"dT" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/cafe)
|
||||
"dU" = (
|
||||
@@ -1178,7 +1198,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/maint)
|
||||
"ey" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/one_side/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/maint)
|
||||
"ez" = (
|
||||
@@ -1387,7 +1409,9 @@
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/awaymission/centcomAway/courtroom)
|
||||
"fn" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/hangar)
|
||||
"fo" = (
|
||||
@@ -1395,7 +1419,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/hangar)
|
||||
"fp" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/hangar)
|
||||
"fq" = (
|
||||
@@ -1415,7 +1441,9 @@
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"fu" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"fv" = (
|
||||
@@ -1423,11 +1451,15 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"fw" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"fx" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"fy" = (
|
||||
@@ -1618,11 +1650,15 @@
|
||||
},
|
||||
/area/awaymission/centcomAway/general)
|
||||
"gd" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 9
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"ge" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"gf" = (
|
||||
@@ -1637,7 +1673,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"gh" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 5
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"gi" = (
|
||||
@@ -1808,7 +1846,9 @@
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"gM" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"gN" = (
|
||||
@@ -1868,7 +1908,9 @@
|
||||
},
|
||||
/area/awaymission/centcomAway/general)
|
||||
"gX" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"gY" = (
|
||||
@@ -1973,11 +2015,15 @@
|
||||
},
|
||||
/area/awaymission/centcomAway/general)
|
||||
"hq" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/awaymission/centcomAway/courtroom)
|
||||
"hr" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/courtroom)
|
||||
"hs" = (
|
||||
@@ -1985,7 +2031,9 @@
|
||||
/turf/open/floor/carpet,
|
||||
/area/awaymission/centcomAway/courtroom)
|
||||
"ht" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/courtroom)
|
||||
"hu" = (
|
||||
@@ -2049,7 +2097,9 @@
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/awaymission/centcomAway/courtroom)
|
||||
"hF" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/courtroom)
|
||||
"hG" = (
|
||||
@@ -2279,7 +2329,9 @@
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/awaymission/centcomAway/courtroom)
|
||||
"ix" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/awaymission/centcomAway/courtroom)
|
||||
"iy" = (
|
||||
@@ -2309,7 +2361,9 @@
|
||||
},
|
||||
/area/awaymission/centcomAway/hangar)
|
||||
"iC" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"iD" = (
|
||||
@@ -2658,7 +2712,9 @@
|
||||
},
|
||||
/area/awaymission/centcomAway/general)
|
||||
"jH" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel{
|
||||
name = "plating"
|
||||
},
|
||||
@@ -2670,13 +2726,17 @@
|
||||
},
|
||||
/area/awaymission/centcomAway/general)
|
||||
"jJ" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel{
|
||||
name = "plating"
|
||||
},
|
||||
/area/awaymission/centcomAway/general)
|
||||
"jK" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/general)
|
||||
@@ -2736,7 +2796,9 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"jT" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"jU" = (
|
||||
@@ -2785,7 +2847,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/hangar)
|
||||
"kb" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"kc" = (
|
||||
@@ -2846,12 +2910,16 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"kl" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"km" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"kn" = (
|
||||
@@ -2904,7 +2972,9 @@
|
||||
},
|
||||
/area/awaymission/centcomAway/general)
|
||||
"kv" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 10
|
||||
},
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4
|
||||
},
|
||||
@@ -3015,7 +3085,9 @@
|
||||
},
|
||||
/area/awaymission/centcomAway/general)
|
||||
"kM" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"kN" = (
|
||||
@@ -3218,7 +3290,9 @@
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/awaymission/centcomAway/thunderdome)
|
||||
"lw" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/thunderdome)
|
||||
"lx" = (
|
||||
@@ -3226,7 +3300,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/thunderdome)
|
||||
"ly" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/centcomAway/thunderdome)
|
||||
"lz" = (
|
||||
|
||||
@@ -248,11 +248,15 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/awaymission/challenge/main)
|
||||
"aY" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/awaymission/challenge/main)
|
||||
"aZ" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/east,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/awaymission/challenge/main)
|
||||
"ba" = (
|
||||
@@ -874,7 +878,9 @@
|
||||
/turf/open/space,
|
||||
/area/space)
|
||||
"cM" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 9
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/challenge/end)
|
||||
"cN" = (
|
||||
@@ -882,11 +888,15 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/challenge/end)
|
||||
"cO" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 5
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/challenge/end)
|
||||
"cP" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/challenge/end)
|
||||
"cQ" = (
|
||||
@@ -1044,7 +1054,9 @@
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/awaymission/challenge/end)
|
||||
"dl" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/challenge/end)
|
||||
"dm" = (
|
||||
|
||||
@@ -1922,11 +1922,7 @@
|
||||
name = "Syndicate Outpost"
|
||||
})
|
||||
"cG" = (
|
||||
/obj/structure/grille{
|
||||
density = 0;
|
||||
broken = 1;
|
||||
icon_state = "brokengrille"
|
||||
},
|
||||
/obj/structure/grille/broken,
|
||||
/obj/item/stack/rods,
|
||||
/obj/item/stack/rods,
|
||||
/obj/item/shard,
|
||||
@@ -1973,8 +1969,7 @@
|
||||
})
|
||||
"cK" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 15000;
|
||||
/obj/machinery/power/apc/highcap/fifteen_k{
|
||||
dir = 2;
|
||||
locked = 1;
|
||||
name = "Worn-out APC";
|
||||
@@ -4886,11 +4881,7 @@
|
||||
name = "MO19 Research"
|
||||
})
|
||||
"gE" = (
|
||||
/obj/structure/grille{
|
||||
density = 0;
|
||||
broken = 1;
|
||||
icon_state = "brokengrille"
|
||||
},
|
||||
/obj/structure/grille/broken,
|
||||
/obj/item/stack/rods,
|
||||
/obj/item/stack/rods,
|
||||
/obj/item/shard,
|
||||
@@ -4917,8 +4908,7 @@
|
||||
})
|
||||
"gG" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 15000;
|
||||
/obj/machinery/power/apc/highcap/fifteen_k{
|
||||
dir = 4;
|
||||
locked = 0;
|
||||
name = "Worn-out APC";
|
||||
@@ -5156,22 +5146,10 @@
|
||||
})
|
||||
"gW" = (
|
||||
/obj/structure/filingcabinet/filingcabinet,
|
||||
/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_hivemind{
|
||||
info = "Researcher: <u>Dr. Mark Douglas </u><br>Date: <u>17/06/2554</u><br><br>Report:<br>Earlier today we have observed a new phenomenon with our subjects. While feeding them our last monkey subject and throwing out the box, the aliens merely looked at us instead of infecting the monkey right away. They looked to be collectively distressed as they would no longer be given hosts, where instead we would move to the next phase of the experiment. When I glanced at the gas tanks and piping leading to their cell, I looked back to see all of them were up against the glass, even the queen! It was as if they all understood what was going to happen, even though we knew only the queen had the cognitive capability to do so.<br><br>The only explanation for this is a form of communication between the aliens, but we have seen no such action take place anywhere in the cell until now. We also know that regular drone and hunter xenomorphs have no personality or instinct to survive by themselves. Perhaps the queen has a direct link to them? A form of a commander or overseer that controls their every move? A hivemind?";
|
||||
name = "The Hivemind Hypothesis"
|
||||
},
|
||||
/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_behavior{
|
||||
info = "Researcher: <u>Dr. Sakuma Sano </u><br>Date: <u>08/06/2554</u><br><br>Report:<br>The xenomorphs we have come to study here are a remarkable species. They are almost universally aggressive across all castes, showing no remorse or guilt or pause before or after acts of violence. They appear to be a species entirely designed to kill. Oddly enough, even their method of reproduction is a brutal two-for-one method of birthing a new xenomorph and killing its host.<br><br>The lone xenomorph we studied only five days ago showed little sign of intelligence. Only a simple drone that flung itself at the safety glass and shields repeatedly and thankfully without success. Once the drone molted into a queen, it became much more calm and calculating, merely looking at us and waiting while building its nest. As the hive grew in size and in numbers, so too did the intelligence of the common hunter and drone. We are still researching how they can communicate with one another and the relationship between the different castes and the queen. We will continue to update our research as we learn more about the species.";
|
||||
name = "A Preliminary Study of Alien Behavior"
|
||||
},
|
||||
/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_castes{
|
||||
info = "Researcher: <u>Dr. Mark Douglas </u><br>Date: <u>06/06/2554</u><br><br>Report:<br>While observing the growing number of aliens in the containment cell, we began to notice subtle differences that were consistently repeating. Like ants, these creatures clearly have different specialized variations that determine their roles in the hive. We have dubbed the three currently observed castes as Hunters, Drones, and Sentinels.<br><br>Hunters have been observed to be by far the most aggressive and agile of the three, constantly running on every surface and frequently swiping at the windows. They are also remarkably good at camouflaging themselves in darkness and on their resin structures, appearing almost invisible to the unwary observer. They are always the first to reach the monkeys we send in leading us to believe that this caste is primarily used for finding and retrieving hosts.<br><br>Drones on the other hand are much more docile and seem more shy by comparison, though not any less aggressive than the other castes. They have been observed to have a much wider head and lack dorsal tubes. They have shown to be less agile and visibly more fragile than any other caste. The drone however has never been observed to interact with the monkeys directly and instead preferring maintenance of the hive by building walls of resin and moving eggs around the nest. As far as we know, we have only ever observed a drone become a queen, and we have no way of knowing if the other castes have that capability.<br><br>Lastly, we have the Sentinels, which appear at first glance to be the guards of the hive. They have so far been only observed to remain near the queen and the eggs, frequently curled up against the walls. We have only observed one instance where they have interacted with a monkey who strayed too closely to the queen, and was pounced and held down immediately until it was applied with a facehugger. Their lack of movement makes it difficult to determine their exact purpose as guards, sentries, or other role.";
|
||||
name = "The Xenomorph 'Castes'"
|
||||
},
|
||||
/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_autopsy{
|
||||
info = "Researcher: <u>Dr. Mark Douglas </u><br>Date: <u>04/06/2554</u><br><br>Report:<br>After an extremely dangerous, time consuming and costly dissection, we have managed to record and identify several of the organs inside of the first stage of the xenomorph cycle: the larva. This procedure took an extensive amount of time because these creatures have incredibly, almost-comically acidic blood that can melt through almost anything in a few moments. We had to use over a dozen scalpels and retractors to complete the autopsy.<br><br>The larva seems to possess far fewer and quite different organs than that of a human. There is a stomach, with no digestive tract, a heart, which seems to lack any blood-oxygen circulation purpose, and an elongated brain, even though its as dumb as any large cat. It also lacks any liver, kidneys, or other basic organs.<br><br>We can't determine the exact nature of how these creatures grow, nor if they gain organs as they become adults. The larger breeds of xenomorph are too dangerous to kill and capture to give us an accurate answer to these questions. All that we can conclude is that being able to function with so little and yet be so deadly means that these creatures are highly evolved and likely to be extremely durable to various hazards that would otherwise be lethal to humans.";
|
||||
name = "Larva Xenomorph Autopsy Report"
|
||||
},
|
||||
/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_hivemind,
|
||||
/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_behavior,
|
||||
/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_castes,
|
||||
/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_autopsy,
|
||||
/obj/structure/alien/weeds,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/awaycontent/a2{
|
||||
@@ -5537,11 +5515,7 @@
|
||||
name = "MO19 Research"
|
||||
})
|
||||
"hx" = (
|
||||
/obj/structure/grille{
|
||||
density = 0;
|
||||
broken = 1;
|
||||
icon_state = "brokengrille"
|
||||
},
|
||||
/obj/structure/grille/broken,
|
||||
/obj/item/stack/rods,
|
||||
/obj/item/stack/rods,
|
||||
/obj/item/shard{
|
||||
@@ -6792,7 +6766,6 @@
|
||||
"jq" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
desc = "A plastic potted plant.";
|
||||
layer = 4.1;
|
||||
pixel_y = 3
|
||||
},
|
||||
/turf/open/floor/plasteel{
|
||||
@@ -6981,8 +6954,7 @@
|
||||
icon_state = "0-2";
|
||||
d2 = 2
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 15000;
|
||||
/obj/machinery/power/apc/highcap/fifteen_k{
|
||||
dir = 1;
|
||||
locked = 0;
|
||||
name = "Worn-out APC";
|
||||
@@ -7802,11 +7774,7 @@
|
||||
})
|
||||
"kP" = (
|
||||
/obj/item/stack/rods,
|
||||
/obj/structure/grille{
|
||||
density = 0;
|
||||
broken = 1;
|
||||
icon_state = "brokengrille"
|
||||
},
|
||||
/obj/structure/grille/broken,
|
||||
/obj/item/stack/rods,
|
||||
/obj/item/shard{
|
||||
icon_state = "medium"
|
||||
@@ -7820,11 +7788,7 @@
|
||||
name = "MO19 Arrivals"
|
||||
})
|
||||
"kQ" = (
|
||||
/obj/structure/grille{
|
||||
density = 0;
|
||||
broken = 1;
|
||||
icon_state = "brokengrille"
|
||||
},
|
||||
/obj/structure/grille/broken,
|
||||
/obj/item/stack/rods,
|
||||
/turf/open/floor/plating{
|
||||
broken = 1;
|
||||
@@ -9335,11 +9299,7 @@
|
||||
name = "MO19 Arrivals"
|
||||
})
|
||||
"ns" = (
|
||||
/obj/structure/grille{
|
||||
density = 0;
|
||||
broken = 1;
|
||||
icon_state = "brokengrille"
|
||||
},
|
||||
/obj/structure/grille/broken,
|
||||
/obj/item/stack/rods,
|
||||
/turf/open/floor/plating{
|
||||
heat_capacity = 1e+006
|
||||
@@ -9485,11 +9445,7 @@
|
||||
poweralm = 0
|
||||
})
|
||||
"nD" = (
|
||||
/obj/structure/grille{
|
||||
density = 0;
|
||||
broken = 1;
|
||||
icon_state = "brokengrille"
|
||||
},
|
||||
/obj/structure/grille/broken,
|
||||
/obj/item/stack/rods,
|
||||
/obj/item/shard,
|
||||
/obj/effect/decal/cleanable/blood/tracks{
|
||||
@@ -9824,7 +9780,6 @@
|
||||
"ob" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
desc = "A plastic potted plant.";
|
||||
layer = 4.1;
|
||||
pixel_y = 3
|
||||
},
|
||||
/turf/open/floor/plasteel/neutral/side{
|
||||
@@ -9948,11 +9903,7 @@
|
||||
poweralm = 0
|
||||
})
|
||||
"oj" = (
|
||||
/obj/structure/grille{
|
||||
density = 0;
|
||||
broken = 1;
|
||||
icon_state = "brokengrille"
|
||||
},
|
||||
/obj/structure/grille/broken,
|
||||
/turf/open/floor/mineral/titanium,
|
||||
/area/awaycontent/a3{
|
||||
always_unpowered = 1;
|
||||
|
||||
@@ -119,7 +119,6 @@
|
||||
"ax" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-20";
|
||||
layer = 4.1;
|
||||
pixel_y = 3
|
||||
},
|
||||
/turf/open/floor/plasteel/whiteyellow/corner{
|
||||
@@ -371,9 +370,8 @@
|
||||
icon_state = "0-2";
|
||||
d2 = 2
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
/obj/machinery/power/apc/highcap/ten_k{
|
||||
auto_name = 1;
|
||||
cell_type = 9000;
|
||||
dir = 4;
|
||||
name = "Engineering APC";
|
||||
pixel_x = 27;
|
||||
@@ -660,8 +658,7 @@
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/awaymission/research/interior/gateway)
|
||||
"cb" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 12000;
|
||||
/obj/machinery/power/apc/highcap/fifteen_k{
|
||||
dir = 4;
|
||||
name = "Gateway APC";
|
||||
pixel_x = 24
|
||||
@@ -988,8 +985,7 @@
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 4;
|
||||
name = "Genetics APC";
|
||||
pixel_x = 24
|
||||
@@ -1320,8 +1316,7 @@
|
||||
/area/awaymission/research/interior/secure)
|
||||
"dN" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-16";
|
||||
layer = 4.1
|
||||
icon_state = "plant-16"
|
||||
},
|
||||
/turf/open/floor/plasteel/darkpurple,
|
||||
/area/awaymission/research/interior/genetics)
|
||||
@@ -1718,8 +1713,7 @@
|
||||
/turf/open/floor/plasteel/whitepurple,
|
||||
/area/awaymission/research/interior)
|
||||
"fa" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 4;
|
||||
name = "Cryostatis APC";
|
||||
pixel_x = 24
|
||||
@@ -1889,8 +1883,7 @@
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/awaymission/research/interior/secure)
|
||||
"fy" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 12000;
|
||||
/obj/machinery/power/apc/highcap/fifteen_k{
|
||||
dir = 4;
|
||||
name = "Vault APC";
|
||||
pixel_x = 24
|
||||
@@ -2829,8 +2822,7 @@
|
||||
/area/awaymission/research/interior/genetics)
|
||||
"hV" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-10";
|
||||
layer = 4.1
|
||||
icon_state = "plant-10"
|
||||
},
|
||||
/turf/open/floor/plasteel/darkpurple,
|
||||
/area/awaymission/research/interior/genetics)
|
||||
@@ -3057,8 +3049,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/research/interior/maint)
|
||||
"iw" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 4;
|
||||
name = "Genetics APC";
|
||||
pixel_x = 24
|
||||
@@ -3312,8 +3303,7 @@
|
||||
/area/awaymission/research/interior/dorm)
|
||||
"jm" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-14";
|
||||
layer = 4.1
|
||||
icon_state = "plant-14"
|
||||
},
|
||||
/turf/open/floor/plasteel/yellowsiding{
|
||||
dir = 9
|
||||
@@ -3655,8 +3645,7 @@
|
||||
},
|
||||
/area/awaymission/research/interior/medbay)
|
||||
"kp" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 4;
|
||||
name = "Dorms APC";
|
||||
pixel_x = 24
|
||||
@@ -4060,8 +4049,7 @@
|
||||
/area/awaymission/research/interior/medbay)
|
||||
"ly" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-16";
|
||||
layer = 4.1
|
||||
icon_state = "plant-16"
|
||||
},
|
||||
/turf/open/floor/plasteel/yellowsiding{
|
||||
dir = 10
|
||||
@@ -4466,9 +4454,7 @@
|
||||
},
|
||||
/area/awaymission/research/interior/escapepods)
|
||||
"mJ" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
layer = 4.1
|
||||
},
|
||||
/obj/item/twohanded/required/kirbyplants,
|
||||
/turf/open/floor/plasteel/whitegreen/side{
|
||||
dir = 8
|
||||
},
|
||||
@@ -4502,8 +4488,7 @@
|
||||
/area/awaymission/research/interior/escapepods)
|
||||
"mN" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "applebush";
|
||||
layer = 4.1
|
||||
icon_state = "applebush"
|
||||
},
|
||||
/turf/open/floor/plasteel/whitegreen/side{
|
||||
dir = 4
|
||||
|
||||
@@ -633,12 +633,7 @@
|
||||
},
|
||||
/area/awaymission/snowdin/base)
|
||||
"bC" = (
|
||||
/obj/structure/showcase{
|
||||
desc = "A strange machine thats supposedly used to help pick up and decrypt wave signals. ";
|
||||
icon = 'icons/obj/machines/telecomms.dmi';
|
||||
icon_state = "processor";
|
||||
name = "subsystem signal decrypter"
|
||||
},
|
||||
/obj/structure/showcase/machinery/signal_decrypter,
|
||||
/turf/open/floor/plating{
|
||||
baseturf = /turf/open/floor/plating/asteroid/snow
|
||||
},
|
||||
@@ -2498,12 +2493,7 @@
|
||||
/area/awaymission/snowdin/post)
|
||||
"gL" = (
|
||||
/obj/machinery/light/small,
|
||||
/obj/structure/showcase{
|
||||
desc = "A strange machine thats supposedly used to help pick up and decrypt wave signals. ";
|
||||
icon = 'icons/obj/machines/telecomms.dmi';
|
||||
icon_state = "processor";
|
||||
name = "subsystem signal decrypter"
|
||||
},
|
||||
/obj/structure/showcase/machinery/signal_decrypter,
|
||||
/turf/open/floor/plating{
|
||||
baseturf = /turf/open/floor/plating/asteroid/snow
|
||||
},
|
||||
@@ -3909,10 +3899,7 @@
|
||||
},
|
||||
/area/awaymission/snowdin)
|
||||
"kA" = (
|
||||
/obj/structure/grille{
|
||||
density = 0;
|
||||
icon_state = "brokengrille"
|
||||
},
|
||||
/obj/structure/grille/broken,
|
||||
/turf/open/floor/plating{
|
||||
baseturf = /turf/open/floor/plating/asteroid/snow;
|
||||
icon = 'icons/turf/snow.dmi';
|
||||
|
||||
@@ -842,7 +842,9 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"cY" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"cZ" = (
|
||||
@@ -865,7 +867,9 @@
|
||||
/turf/open/floor/mineral/plastitanium,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"dd" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
@@ -1002,7 +1006,9 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"dE" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 9
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"dF" = (
|
||||
@@ -1010,11 +1016,15 @@
|
||||
/turf/open/floor/engine,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"dG" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"dH" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 5
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"dI" = (
|
||||
@@ -1109,7 +1119,9 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"dY" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"dZ" = (
|
||||
@@ -1130,7 +1142,9 @@
|
||||
},
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"eb" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"ec" = (
|
||||
@@ -1296,7 +1310,9 @@
|
||||
/turf/open/floor/plasteel/blue,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"eF" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"eG" = (
|
||||
@@ -1345,7 +1361,9 @@
|
||||
/turf/open/floor/plasteel/blue,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"eQ" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"eR" = (
|
||||
@@ -2063,7 +2081,9 @@
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"hi" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/spacebattle/syndicate7)
|
||||
"hj" = (
|
||||
@@ -2122,7 +2142,9 @@
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"hu" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/spacebattle/syndicate7)
|
||||
"hv" = (
|
||||
@@ -2912,7 +2934,9 @@
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"ki" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/engine/vacuum,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"kj" = (
|
||||
@@ -2941,7 +2965,9 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"ko" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/engine/vacuum,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"kp" = (
|
||||
@@ -2958,7 +2984,9 @@
|
||||
/turf/open/floor/engine/vacuum,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"kr" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/engine/vacuum,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"ks" = (
|
||||
@@ -2983,11 +3011,13 @@
|
||||
/turf/open/floor/engine/vacuum,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"kw" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 10
|
||||
},
|
||||
/turf/open/floor/engine/vacuum,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"kx" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/one_side,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional,
|
||||
/turf/open/floor/engine/vacuum,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"ky" = (
|
||||
@@ -2995,7 +3025,9 @@
|
||||
/turf/open/floor/engine/vacuum,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"kz" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/corner,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 6
|
||||
},
|
||||
/turf/open/floor/engine/vacuum,
|
||||
/area/awaymission/spacebattle/cruiser)
|
||||
"kA" = (
|
||||
|
||||
@@ -3159,8 +3159,7 @@
|
||||
dir = 1;
|
||||
network = list("UO45")
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 15000;
|
||||
/obj/machinery/power/apc/highcap/fifteen_k{
|
||||
dir = 2;
|
||||
locked = 0;
|
||||
name = "Hydroponics APC";
|
||||
@@ -6240,8 +6239,7 @@
|
||||
icon_state = "0-4";
|
||||
d2 = 4
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 15000;
|
||||
/obj/machinery/power/apc/highcap/fifteen_k{
|
||||
dir = 1;
|
||||
locked = 0;
|
||||
name = "UO45 Bar APC";
|
||||
@@ -7619,8 +7617,7 @@
|
||||
d2 = 8;
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 15000;
|
||||
/obj/machinery/power/apc/highcap/fifteen_k{
|
||||
dir = 2;
|
||||
locked = 0;
|
||||
name = "UO45 Research Division APC";
|
||||
@@ -8313,8 +8310,7 @@
|
||||
})
|
||||
"mE" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 15000;
|
||||
/obj/machinery/power/apc/highcap/fifteen_k{
|
||||
dir = 2;
|
||||
locked = 0;
|
||||
name = "UO45 Gateway APC";
|
||||
@@ -11932,8 +11928,7 @@
|
||||
icon_state = "0-4";
|
||||
d2 = 4
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 15000;
|
||||
/obj/machinery/power/apc/highcap/fifteen_k{
|
||||
dir = 8;
|
||||
locked = 1;
|
||||
name = "UO45 Engineering APC";
|
||||
@@ -12695,8 +12690,7 @@
|
||||
})
|
||||
"sj" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 15000;
|
||||
/obj/machinery/power/apc/highcap/fifteen_k{
|
||||
dir = 2;
|
||||
locked = 0;
|
||||
name = "UO45 Mining APC";
|
||||
@@ -14194,8 +14188,7 @@
|
||||
/obj/machinery/atmospherics/components/trinary/filter{
|
||||
dir = 4;
|
||||
filter_type = "n2";
|
||||
on = 1;
|
||||
req_access = null
|
||||
on = 1
|
||||
},
|
||||
/turf/open/floor/plasteel/red/side{
|
||||
dir = 10;
|
||||
@@ -14244,8 +14237,7 @@
|
||||
/obj/machinery/atmospherics/components/trinary/filter{
|
||||
dir = 4;
|
||||
filter_type = "o2";
|
||||
on = 1;
|
||||
req_access = null
|
||||
on = 1
|
||||
},
|
||||
/turf/open/floor/plasteel/blue/side{
|
||||
dir = 10;
|
||||
@@ -17526,11 +17518,7 @@
|
||||
poweralm = 0
|
||||
})
|
||||
"yN" = (
|
||||
/obj/structure/grille{
|
||||
density = 0;
|
||||
broken = 1;
|
||||
icon_state = "brokengrille"
|
||||
},
|
||||
/obj/structure/grille/broken,
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/awaycontent/a7{
|
||||
always_unpowered = 1;
|
||||
|
||||
@@ -171,9 +171,7 @@
|
||||
/turf/open/floor/engine/cult,
|
||||
/area/awaymission/wwvault)
|
||||
"aL" = (
|
||||
/obj/item/paper/fluff/awaymissions/wildwest/grinder{
|
||||
info = "meat grinder requires sacri"
|
||||
},
|
||||
/obj/item/paper/fluff/awaymissions/wildwest/grinder,
|
||||
/turf/open/floor/plasteel/cult{
|
||||
name = "engraved floor"
|
||||
},
|
||||
@@ -449,7 +447,9 @@
|
||||
/obj/structure/window/reinforced{
|
||||
icon_state = "fwindow"
|
||||
},
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/one_side/west,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating/ironsand{
|
||||
icon_state = "ironsand1"
|
||||
},
|
||||
@@ -551,7 +551,9 @@
|
||||
icon_state = "fwindow";
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating/ironsand{
|
||||
icon_state = "ironsand1"
|
||||
},
|
||||
@@ -872,7 +874,9 @@
|
||||
icon_state = "fwindow";
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating/ironsand{
|
||||
icon_state = "ironsand1"
|
||||
},
|
||||
@@ -1698,7 +1702,7 @@
|
||||
icon_state = "fwindow";
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/one_side,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/directional,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/awaymission/wwrefine)
|
||||
"fB" = (
|
||||
@@ -2143,7 +2147,9 @@
|
||||
/turf/open/floor/mineral/titanium/yellow,
|
||||
/area/awaymission/wwrefine)
|
||||
"gX" = (
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end/north,
|
||||
/obj/effect/spawner/structure/window/hollow/reinforced/end{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/window/reinforced{
|
||||
icon_state = "fwindow"
|
||||
},
|
||||
|
||||
+2
-2
@@ -9,10 +9,10 @@
|
||||
#include "map_files\Deltastation\DeltaStation2.dmm"
|
||||
#include "map_files\MetaStation\MetaStation.dmm"
|
||||
#include "map_files\OmegaStation\OmegaStation.dmm"
|
||||
#include "map_files\PubbyStation\PubbyStation.dmm"
|
||||
// #include "map_files\PubbyStation\PubbyStation.dmm"
|
||||
#include "map_files\BoxStation\BoxStation.dmm"
|
||||
|
||||
#ifdef TRAVISBUILDING
|
||||
#include "templates.dm"
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -851,8 +851,7 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/ai_monitored/security/armory)
|
||||
"acm" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 4;
|
||||
areastring = "/area/ai_monitored/security/armory";
|
||||
name = "Armory APC";
|
||||
@@ -2408,7 +2407,7 @@
|
||||
dir = 4;
|
||||
id = "pod3";
|
||||
name = "escape pod 3";
|
||||
port_angle = 180;
|
||||
port_direction = 2;
|
||||
preferred_direction = 4
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
@@ -2423,8 +2422,6 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
layer = 3;
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
@@ -3245,9 +3242,7 @@
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/iv_drip{
|
||||
density = 0
|
||||
},
|
||||
/obj/machinery/iv_drip,
|
||||
/obj/item/reagent_containers/blood/empty,
|
||||
/turf/open/floor/plasteel/whitered/side{
|
||||
dir = 5
|
||||
@@ -6125,7 +6120,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/port/fore)
|
||||
"ank" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
req_access_txt = "12"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
@@ -6369,7 +6364,7 @@
|
||||
height = 5;
|
||||
id = "laborcamp";
|
||||
name = "labor camp shuttle";
|
||||
port_angle = 90;
|
||||
port_direction = 4;
|
||||
width = 9
|
||||
},
|
||||
/obj/docking_port/stationary{
|
||||
@@ -6899,7 +6894,7 @@
|
||||
/area/security/detectives_office)
|
||||
"ape" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/door/airlock/engineering{
|
||||
/obj/machinery/door/airlock/engineering/abandoned{
|
||||
name = "Vacant Office B";
|
||||
req_access_txt = "32"
|
||||
},
|
||||
@@ -7055,7 +7050,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/fore/secondary)
|
||||
"apx" = (
|
||||
/obj/machinery/door/airlock/atmos{
|
||||
/obj/machinery/door/airlock/atmos/abandoned{
|
||||
name = "Atmospherics Maintenance";
|
||||
req_access_txt = "12;24"
|
||||
},
|
||||
@@ -8058,8 +8053,6 @@
|
||||
/area/lawoffice)
|
||||
"asa" = (
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
layer = 3;
|
||||
pixel_x = 32
|
||||
},
|
||||
/turf/open/floor/plasteel/red/corner{
|
||||
@@ -8272,7 +8265,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/starboard/fore)
|
||||
"asy" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
name = "Firefighting equipment";
|
||||
req_access_txt = "12"
|
||||
},
|
||||
@@ -8646,7 +8639,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/starboard/fore)
|
||||
"atB" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
req_access_txt = "12"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
@@ -9081,7 +9074,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/starboard/fore)
|
||||
"auG" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
req_access_txt = "12"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
@@ -9271,7 +9264,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/fore)
|
||||
"avf" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
name = "Chemical Storage";
|
||||
req_access_txt = "12"
|
||||
},
|
||||
@@ -10053,7 +10046,7 @@
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/door/airlock/engineering{
|
||||
/obj/machinery/door/airlock/engineering/abandoned{
|
||||
name = "Electrical Maintenance";
|
||||
req_access_txt = "11"
|
||||
},
|
||||
@@ -10229,7 +10222,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/port/fore)
|
||||
"axj" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
name = "Firefighting equipment";
|
||||
req_access_txt = "12"
|
||||
},
|
||||
@@ -14800,8 +14793,6 @@
|
||||
/area/shuttle/arrival)
|
||||
"aHu" = (
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
layer = 3;
|
||||
pixel_x = 32
|
||||
},
|
||||
/turf/open/floor/plasteel/white/corner{
|
||||
@@ -16485,7 +16476,7 @@
|
||||
height = 7;
|
||||
id = "arrival";
|
||||
name = "arrival shuttle";
|
||||
port_angle = -90;
|
||||
port_direction = 8;
|
||||
preferred_direction = 8;
|
||||
width = 15
|
||||
},
|
||||
@@ -17311,8 +17302,6 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
layer = 3;
|
||||
pixel_x = 32
|
||||
},
|
||||
/turf/open/floor/plasteel/bar,
|
||||
@@ -18092,10 +18081,7 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/crew_quarters/locker)
|
||||
"aPE" = (
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
layer = 4
|
||||
},
|
||||
/obj/machinery/status_display,
|
||||
/turf/closed/wall,
|
||||
/area/crew_quarters/locker)
|
||||
"aPF" = (
|
||||
@@ -18207,10 +18193,7 @@
|
||||
d2 = 8;
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
layer = 4
|
||||
},
|
||||
/obj/machinery/status_display,
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/machinery/door/poddoor/preopen{
|
||||
id = "bridge blast";
|
||||
@@ -18249,10 +18232,7 @@
|
||||
icon_state = "0-4";
|
||||
d2 = 4
|
||||
},
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
layer = 4
|
||||
},
|
||||
/obj/machinery/status_display,
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/machinery/door/poddoor/preopen{
|
||||
id = "bridge blast";
|
||||
@@ -19446,8 +19426,6 @@
|
||||
"aTr" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
layer = 3;
|
||||
pixel_x = 32
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -20943,8 +20921,7 @@
|
||||
},
|
||||
/area/bridge)
|
||||
"aWW" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 2;
|
||||
name = "Bridge APC";
|
||||
areastring = "/area/bridge";
|
||||
@@ -21395,7 +21372,7 @@
|
||||
/turf/open/floor/carpet,
|
||||
/area/chapel/main)
|
||||
"aXX" = (
|
||||
/obj/machinery/door/airlock/engineering{
|
||||
/obj/machinery/door/airlock/engineering/abandoned{
|
||||
name = "Vacant Office A";
|
||||
req_access_txt = "32"
|
||||
},
|
||||
@@ -22745,7 +22722,6 @@
|
||||
/area/quartermaster/storage)
|
||||
"bbu" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 2500;
|
||||
dir = 1;
|
||||
name = "Captain's Office APC";
|
||||
areastring = "/area/crew_quarters/heads/captain";
|
||||
@@ -23453,8 +23429,6 @@
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
layer = 3;
|
||||
pixel_x = -32
|
||||
},
|
||||
/turf/open/floor/plasteel/blue/corner{
|
||||
@@ -23802,8 +23776,7 @@
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/ai_monitored/turret_protected/ai_upload)
|
||||
"bed" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 2;
|
||||
name = "Upload APC";
|
||||
areastring = "/area/ai_monitored/turret_protected/ai_upload";
|
||||
@@ -24403,10 +24376,7 @@
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/ai_monitored/turret_protected/ai_upload)
|
||||
"bfw" = (
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
layer = 4
|
||||
},
|
||||
/obj/machinery/status_display,
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/ai_monitored/turret_protected/ai_upload)
|
||||
"bfx" = (
|
||||
@@ -24458,7 +24428,7 @@
|
||||
/area/crew_quarters/heads/captain)
|
||||
"bfE" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/pinpointer,
|
||||
/obj/item/pinpointer/nuke,
|
||||
/obj/item/disk/nuclear,
|
||||
/obj/item/storage/secure/safe{
|
||||
pixel_x = 35;
|
||||
@@ -26465,8 +26435,6 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
layer = 3;
|
||||
pixel_x = 32
|
||||
},
|
||||
/obj/machinery/aug_manipulator,
|
||||
@@ -26550,7 +26518,6 @@
|
||||
/area/quartermaster/office)
|
||||
"bkx" = (
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
pixel_y = 2;
|
||||
supply_display = 1
|
||||
},
|
||||
@@ -27435,8 +27402,6 @@
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
layer = 3;
|
||||
pixel_x = -32
|
||||
},
|
||||
/turf/open/floor/plasteel/brown/corner{
|
||||
@@ -29906,7 +29871,7 @@
|
||||
},
|
||||
/area/science/explab)
|
||||
"brE" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
req_access_txt = "0";
|
||||
req_one_access_txt = "8;12"
|
||||
},
|
||||
@@ -30357,8 +30322,6 @@
|
||||
/area/medical/medbay/central)
|
||||
"bsz" = (
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
layer = 3;
|
||||
pixel_x = -32
|
||||
},
|
||||
/turf/open/floor/plasteel/white/side{
|
||||
@@ -31912,7 +31875,6 @@
|
||||
},
|
||||
/obj/machinery/light,
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
pixel_y = -30;
|
||||
supply_display = 1
|
||||
},
|
||||
@@ -32546,7 +32508,7 @@
|
||||
height = 24;
|
||||
id = "syndicate";
|
||||
name = "syndicate infiltrator";
|
||||
port_angle = 0;
|
||||
port_direction = 1;
|
||||
roundstart_move = "syndicate_away";
|
||||
width = 18
|
||||
},
|
||||
@@ -34180,7 +34142,6 @@
|
||||
pixel_y = -35
|
||||
},
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
pixel_x = -32;
|
||||
supply_display = 1
|
||||
},
|
||||
@@ -36558,7 +36519,7 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/quartermaster/miningdock)
|
||||
"bGo" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
name = "Firefighting equipment";
|
||||
req_access_txt = "12"
|
||||
},
|
||||
@@ -37441,8 +37402,6 @@
|
||||
"bIe" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
layer = 3;
|
||||
pixel_x = -32
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
@@ -37967,7 +37926,7 @@
|
||||
height = 5;
|
||||
id = "mining";
|
||||
name = "mining shuttle";
|
||||
port_angle = 90;
|
||||
port_direction = 4;
|
||||
width = 7
|
||||
},
|
||||
/obj/docking_port/stationary{
|
||||
@@ -38895,7 +38854,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/aft)
|
||||
"bKU" = (
|
||||
/obj/machinery/door/airlock/engineering{
|
||||
/obj/machinery/door/airlock/engineering/abandoned{
|
||||
name = "Construction Area";
|
||||
req_access_txt = "32"
|
||||
},
|
||||
@@ -40584,7 +40543,6 @@
|
||||
"bOP" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/structure/reagent_dispensers/virusfood{
|
||||
density = 0;
|
||||
pixel_x = -30
|
||||
},
|
||||
/obj/item/book/manual/wiki/infections{
|
||||
@@ -41448,8 +41406,7 @@
|
||||
/area/science/misc_lab)
|
||||
"bQV" = (
|
||||
/obj/machinery/atmospherics/components/trinary/filter{
|
||||
dir = 4;
|
||||
req_access = null
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/science/misc_lab)
|
||||
@@ -42341,8 +42298,7 @@
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/medical/virology)
|
||||
"bSX" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 1;
|
||||
name = "Virology APC";
|
||||
areastring = "/area/medical/virology";
|
||||
@@ -42583,7 +42539,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/port/aft)
|
||||
"bTw" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
req_access_txt = "12"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/general/hidden{
|
||||
@@ -43924,8 +43880,7 @@
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 1;
|
||||
name = "Telecomms Server APC";
|
||||
areastring = "/area/tcommsat/server";
|
||||
@@ -44808,7 +44763,7 @@
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/maintenance/port/aft)
|
||||
"bYy" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
name = "Incinerator Access";
|
||||
req_access_txt = "12"
|
||||
},
|
||||
@@ -46081,8 +46036,7 @@
|
||||
/obj/structure/closet/secure_closet/engineering_chief{
|
||||
req_access_txt = "0"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 4;
|
||||
name = "CE Office APC";
|
||||
areastring = "/area/crew_quarters/heads/chief";
|
||||
@@ -46159,7 +46113,7 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/break_room)
|
||||
"cbv" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
name = "Research Delivery access";
|
||||
req_access_txt = "12"
|
||||
},
|
||||
@@ -46304,7 +46258,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/aft)
|
||||
"cbO" = (
|
||||
/obj/machinery/door/airlock/atmos{
|
||||
/obj/machinery/door/airlock/atmos/abandoned{
|
||||
name = "Atmospherics Maintenance";
|
||||
req_access_txt = "12;24"
|
||||
},
|
||||
@@ -46477,7 +46431,7 @@
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
name = "Construction Area Maintenance";
|
||||
req_access_txt = "32"
|
||||
},
|
||||
@@ -47850,7 +47804,7 @@
|
||||
/turf/open/floor/circuit/killroom,
|
||||
/area/science/xenobiology)
|
||||
"cfs" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
name = "Air Supply Maintenance";
|
||||
req_access_txt = "12"
|
||||
},
|
||||
@@ -47875,7 +47829,7 @@
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/science/misc_lab)
|
||||
"cfv" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
name = "Firefighting equipment";
|
||||
req_access_txt = "12"
|
||||
},
|
||||
@@ -49118,8 +49072,7 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/engineering)
|
||||
"cib" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 15000;
|
||||
/obj/machinery/power/apc/highcap/fifteen_k{
|
||||
dir = 1;
|
||||
name = "Engineering APC";
|
||||
areastring = "/area/engine/engineering";
|
||||
@@ -49156,8 +49109,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/reagent_dispensers/watertank,
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 15000;
|
||||
/obj/machinery/power/apc/highcap/fifteen_k{
|
||||
dir = 1;
|
||||
name = "Engineering APC";
|
||||
areastring = "/area/engine/engineering";
|
||||
@@ -50080,7 +50032,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/aft)
|
||||
"ckm" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
name = "Biohazard Disposals";
|
||||
req_access_txt = "12"
|
||||
},
|
||||
@@ -52688,7 +52640,7 @@
|
||||
dir = 4;
|
||||
id = "pod4";
|
||||
name = "escape pod 4";
|
||||
port_angle = 180;
|
||||
port_direction = 2;
|
||||
preferred_direction = 4
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
@@ -52703,8 +52655,6 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
layer = 3;
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
@@ -52754,7 +52704,7 @@
|
||||
/turf/open/space,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"cpR" = (
|
||||
/obj/machinery/door/airlock{
|
||||
/obj/machinery/door/airlock/abandoned{
|
||||
name = "Observatory Access"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
@@ -52995,7 +52945,7 @@
|
||||
dir = 8;
|
||||
id = "pod2";
|
||||
name = "escape pod 2";
|
||||
port_angle = 180
|
||||
port_direction = 2
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/pod_2)
|
||||
@@ -54600,13 +54550,8 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/ai_monitored/turret_protected/aisat/atmos)
|
||||
"cup" = (
|
||||
/obj/structure/showcase{
|
||||
density = 0;
|
||||
desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze.";
|
||||
/obj/structure/showcase/cyborg/old{
|
||||
dir = 8;
|
||||
icon = 'icons/mob/robots.dmi';
|
||||
icon_state = "robot_old";
|
||||
name = "Cyborg Statue";
|
||||
pixel_x = 9;
|
||||
pixel_y = 2
|
||||
},
|
||||
@@ -54631,13 +54576,8 @@
|
||||
},
|
||||
/area/ai_monitored/turret_protected/aisat/atmos)
|
||||
"cur" = (
|
||||
/obj/structure/showcase{
|
||||
density = 0;
|
||||
desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze.";
|
||||
/obj/structure/showcase/cyborg/old{
|
||||
dir = 4;
|
||||
icon = 'icons/mob/robots.dmi';
|
||||
icon_state = "robot_old";
|
||||
name = "Cyborg Statue";
|
||||
pixel_x = -9;
|
||||
pixel_y = 2
|
||||
},
|
||||
@@ -54646,13 +54586,8 @@
|
||||
},
|
||||
/area/ai_monitored/turret_protected/aisat_interior)
|
||||
"cus" = (
|
||||
/obj/structure/showcase{
|
||||
density = 0;
|
||||
desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze.";
|
||||
/obj/structure/showcase/cyborg/old{
|
||||
dir = 8;
|
||||
icon = 'icons/mob/robots.dmi';
|
||||
icon_state = "robot_old";
|
||||
name = "Cyborg Statue";
|
||||
pixel_x = 9;
|
||||
pixel_y = 2
|
||||
},
|
||||
@@ -54689,13 +54624,8 @@
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/ai_monitored/turret_protected/aisat_interior)
|
||||
"cuv" = (
|
||||
/obj/structure/showcase{
|
||||
density = 0;
|
||||
desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze.";
|
||||
/obj/structure/showcase/cyborg/old{
|
||||
dir = 4;
|
||||
icon = 'icons/mob/robots.dmi';
|
||||
icon_state = "robot_old";
|
||||
name = "Cyborg Statue";
|
||||
pixel_x = -9;
|
||||
pixel_y = 2
|
||||
},
|
||||
@@ -55811,8 +55741,7 @@
|
||||
d2 = 8;
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 5000;
|
||||
/obj/machinery/power/apc/highcap/five_k{
|
||||
dir = 2;
|
||||
name = "AI Chamber APC";
|
||||
areastring = "/area/ai_monitored/turret_protected/ai";
|
||||
@@ -56062,8 +55991,6 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
layer = 3;
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
@@ -56189,7 +56116,7 @@
|
||||
height = 13;
|
||||
id = "ferry";
|
||||
name = "ferry shuttle";
|
||||
port_angle = 0;
|
||||
port_direction = 1;
|
||||
preferred_direction = 4;
|
||||
roundstart_move = "ferry_away";
|
||||
width = 5
|
||||
@@ -56213,7 +56140,7 @@
|
||||
dir = 8;
|
||||
id = "pod1";
|
||||
name = "escape pod 1";
|
||||
port_angle = 180
|
||||
port_direction = 2
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/pod_1)
|
||||
@@ -56382,7 +56309,7 @@
|
||||
id = "whiteship";
|
||||
launch_status = 0;
|
||||
name = "NT Medical Ship";
|
||||
port_angle = -90;
|
||||
port_direction = 8;
|
||||
preferred_direction = 4;
|
||||
roundstart_move = "whiteship_away";
|
||||
timid = null;
|
||||
@@ -56617,7 +56544,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/solars/port/aft)
|
||||
"cyL" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
req_access_txt = "12"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
@@ -56992,8 +56919,6 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
layer = 3;
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
@@ -57591,13 +57516,8 @@
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/showcase{
|
||||
density = 0;
|
||||
desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze.";
|
||||
/obj/structure/showcase/cyborg/old{
|
||||
dir = 8;
|
||||
icon = 'icons/mob/robots.dmi';
|
||||
icon_state = "robot_old";
|
||||
name = "Cyborg Statue";
|
||||
pixel_x = 9;
|
||||
pixel_y = 2
|
||||
},
|
||||
@@ -57607,13 +57527,8 @@
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/ai_monitored/turret_protected/ai)
|
||||
"cAW" = (
|
||||
/obj/structure/showcase{
|
||||
density = 0;
|
||||
desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze.";
|
||||
/obj/structure/showcase/cyborg/old{
|
||||
dir = 4;
|
||||
icon = 'icons/mob/robots.dmi';
|
||||
icon_state = "robot_old";
|
||||
name = "Cyborg Statue";
|
||||
pixel_x = -9;
|
||||
pixel_y = 2
|
||||
},
|
||||
@@ -60916,7 +60831,7 @@
|
||||
height = 24;
|
||||
id = "syndicate";
|
||||
name = "syndicate infiltrator";
|
||||
port_angle = 0;
|
||||
port_direction = 1;
|
||||
roundstart_move = "syndicate_away";
|
||||
width = 18
|
||||
},
|
||||
@@ -62503,7 +62418,6 @@
|
||||
/area/quartermaster/sorting)
|
||||
"cNL" = (
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = 2500;
|
||||
dir = 1;
|
||||
name = "Central Maintenance APC";
|
||||
areastring = "/area/maintenance/central";
|
||||
@@ -62606,7 +62520,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/starboard)
|
||||
"cNV" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
req_access_txt = "0";
|
||||
req_one_access_txt = "8;12"
|
||||
},
|
||||
@@ -63930,6 +63844,30 @@
|
||||
dir = 4
|
||||
},
|
||||
/area/construction/mining/aux_base)
|
||||
"cTF" = (
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
req_access_txt = "12"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/port/aft)
|
||||
"cTG" = (
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
req_access_txt = "12"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/port/aft)
|
||||
"cTH" = (
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
req_access_txt = "12"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/port/aft)
|
||||
"cTI" = (
|
||||
/obj/machinery/door/airlock/maintenance/abandoned{
|
||||
req_access_txt = "12"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/starboard/aft)
|
||||
|
||||
(1,1,1) = {"
|
||||
aaa
|
||||
@@ -83888,7 +83826,7 @@ bHE
|
||||
bYu
|
||||
bZk
|
||||
bCq
|
||||
bTz
|
||||
cTG
|
||||
bCq
|
||||
bCq
|
||||
bCq
|
||||
@@ -85184,7 +85122,7 @@ bCq
|
||||
bCq
|
||||
bCq
|
||||
bCq
|
||||
bTz
|
||||
cTH
|
||||
bCq
|
||||
bLv
|
||||
bLv
|
||||
@@ -86193,7 +86131,7 @@ bLv
|
||||
bPZ
|
||||
bHE
|
||||
bHE
|
||||
bTz
|
||||
cTF
|
||||
bHE
|
||||
bLv
|
||||
aoV
|
||||
@@ -109860,7 +109798,7 @@ cmq
|
||||
ciI
|
||||
cnJ
|
||||
cri
|
||||
bYr
|
||||
cTI
|
||||
cmn
|
||||
cBT
|
||||
cBU
|
||||
@@ -129465,4 +129403,4 @@ aaa
|
||||
aaa
|
||||
aaa
|
||||
aaa
|
||||
"}
|
||||
"}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -358,8 +358,6 @@
|
||||
/area/mine/laborcamp)
|
||||
"bj" = (
|
||||
/obj/machinery/status_display{
|
||||
density = 0;
|
||||
layer = 4;
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+318
-313
File diff suppressed because it is too large
Load Diff
+561
-243
@@ -1,273 +1,591 @@
|
||||
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
|
||||
"a" = (
|
||||
/turf/closed/wall/mineral/titanium/overspace,
|
||||
/area/shuttle/supply)
|
||||
"b" = (
|
||||
"aa" = (
|
||||
/turf/open/space,
|
||||
/area/space)
|
||||
"ab" = (
|
||||
/turf/closed/wall/mineral/titanium,
|
||||
/area/shuttle/supply)
|
||||
"c" = (
|
||||
/turf/closed/wall/mineral/titanium,
|
||||
/area/shuttle/supply)
|
||||
"d" = (
|
||||
/turf/closed/wall/mineral/titanium,
|
||||
/area/shuttle/supply)
|
||||
"e" = (
|
||||
/obj/machinery/conveyor{
|
||||
dir = 2;
|
||||
id = "cargoshuttle";
|
||||
name = "cargo shuttle conveyor belt"
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/supply)
|
||||
"f" = (
|
||||
/obj/machinery/conveyor{
|
||||
dir = 8;
|
||||
id = "cargoshuttle";
|
||||
name = "cargo shuttle conveyor belt"
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/supply)
|
||||
"g" = (
|
||||
/obj/machinery/conveyor{
|
||||
dir = 4;
|
||||
id = "cargoshuttle";
|
||||
name = "cargo shuttle conveyor belt"
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/supply)
|
||||
"h" = (
|
||||
/obj/machinery/conveyor{
|
||||
dir = 9;
|
||||
id = "cargoshuttle";
|
||||
name = "cargo shuttle conveyor belt"
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/supply)
|
||||
"i" = (
|
||||
/obj/machinery/conveyor{
|
||||
dir = 1;
|
||||
id = "cargoshuttle";
|
||||
name = "cargo shuttle conveyor belt"
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/supply)
|
||||
"j" = (
|
||||
/obj/machinery/conveyor{
|
||||
dir = 10;
|
||||
id = "cargoshuttle";
|
||||
name = "cargo shuttle conveyor belt"
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/supply)
|
||||
"k" = (
|
||||
/obj/machinery/conveyor{
|
||||
dir = 6;
|
||||
id = "cargoshuttle";
|
||||
name = "cargo shuttle conveyor belt"
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/supply)
|
||||
"l" = (
|
||||
/obj/machinery/door/poddoor{
|
||||
id = "QMLoaddoor2";
|
||||
name = "supply dock loading door"
|
||||
},
|
||||
/obj/machinery/conveyor{
|
||||
dir = 8;
|
||||
id = "cargoshuttle";
|
||||
name = "cargo shuttle conveyor belt"
|
||||
},
|
||||
/area/shuttle/escape)
|
||||
"ac" = (
|
||||
/obj/effect/spawner/structure/window/shuttle,
|
||||
/turf/open/floor/plating,
|
||||
/area/shuttle/supply)
|
||||
"m" = (
|
||||
/area/shuttle/escape)
|
||||
"ad" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/scalpel,
|
||||
/obj/item/retractor{
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/hemostat,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/shuttle/escape)
|
||||
"ae" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/cautery,
|
||||
/obj/item/surgicaldrill,
|
||||
/obj/item/circular_saw{
|
||||
pixel_y = 9
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/shuttle/escape)
|
||||
"af" = (
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/shuttle/escape)
|
||||
"ag" = (
|
||||
/obj/structure/shuttle/engine/propulsion/right{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/shuttle/escape)
|
||||
"ah" = (
|
||||
/turf/closed/wall/mineral/titanium/nodiagonal,
|
||||
/area/shuttle/escape)
|
||||
"ai" = (
|
||||
/obj/machinery/computer/emergency_shuttle,
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/supply)
|
||||
"n" = (
|
||||
/turf/open/floor/mineral/titanium,
|
||||
/area/shuttle/supply)
|
||||
"o" = (
|
||||
/obj/machinery/door/airlock/titanium{
|
||||
name = "Supply Shuttle Airlock";
|
||||
req_access_txt = "31"
|
||||
/area/shuttle/escape)
|
||||
"aj" = (
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"ak" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-22"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/shuttle/supply)
|
||||
"p" = (
|
||||
/obj/machinery/button/door{
|
||||
dir = 2;
|
||||
id = "QMLoaddoor2";
|
||||
name = "Loading Doors";
|
||||
pixel_x = 24;
|
||||
pixel_y = 8
|
||||
},
|
||||
/obj/machinery/button/door{
|
||||
id = "QMLoaddoor";
|
||||
name = "Loading Doors";
|
||||
pixel_x = 24;
|
||||
pixel_y = -8
|
||||
},
|
||||
/obj/machinery/conveyor_switch/oneway{
|
||||
id = "cargoshuttle"
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"al" = (
|
||||
/obj/structure/chair,
|
||||
/turf/open/floor/mineral/plastitanium/brig,
|
||||
/area/shuttle/escape)
|
||||
"am" = (
|
||||
/obj/structure/chair,
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/mineral/plastitanium/brig,
|
||||
/area/shuttle/escape)
|
||||
"an" = (
|
||||
/obj/structure/table/optable,
|
||||
/obj/item/surgical_drapes,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/shuttle/escape)
|
||||
"ao" = (
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/mineral/titanium,
|
||||
/area/shuttle/supply)
|
||||
"q" = (
|
||||
/obj/machinery/door/airlock/titanium{
|
||||
name = "Supply Shuttle Airlock";
|
||||
req_access_txt = "31"
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/shuttle/escape)
|
||||
"ap" = (
|
||||
/obj/structure/shuttle/engine/propulsion{
|
||||
dir = 4
|
||||
},
|
||||
/obj/docking_port/mobile/supply{
|
||||
dwidth = 3;
|
||||
width = 10;
|
||||
timid = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/shuttle/supply)
|
||||
"r" = (
|
||||
/obj/machinery/door/poddoor{
|
||||
id = "QMLoaddoor";
|
||||
name = "supply dock loading door"
|
||||
},
|
||||
/obj/machinery/conveyor{
|
||||
dir = 4;
|
||||
id = "cargoshuttle";
|
||||
name = "cargo shuttle conveyor belt"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/shuttle/supply)
|
||||
"s" = (
|
||||
/turf/closed/wall/mineral/titanium/nodiagonal,
|
||||
/area/shuttle/supply)
|
||||
"t" = (
|
||||
/turf/closed/wall/mineral/titanium,
|
||||
/area/shuttle/supply)
|
||||
"u" = (
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/shuttle/engine/heater,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/shuttle/supply)
|
||||
"v" = (
|
||||
/turf/closed/wall/mineral/titanium,
|
||||
/area/shuttle/supply)
|
||||
"w" = (
|
||||
/turf/open/space,
|
||||
/area/space)
|
||||
"x" = (
|
||||
/obj/structure/shuttle/engine/propulsion/burst/left,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/shuttle/supply)
|
||||
"y" = (
|
||||
/obj/structure/shuttle/engine/propulsion,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/shuttle/supply)
|
||||
"z" = (
|
||||
/obj/structure/shuttle/engine/propulsion/burst/right,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/shuttle/supply)
|
||||
"A" = (
|
||||
/obj/machinery/conveyor{
|
||||
dir = 8;
|
||||
id = "cargoshuttle";
|
||||
name = "cargo shuttle conveyor belt"
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/area/shuttle/escape)
|
||||
"aq" = (
|
||||
/obj/machinery/computer/communications,
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/supply)
|
||||
"B" = (
|
||||
/obj/machinery/light{
|
||||
/area/shuttle/escape)
|
||||
"ar" = (
|
||||
/obj/structure/chair{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/supply)
|
||||
/area/shuttle/escape)
|
||||
"as" = (
|
||||
/obj/machinery/door/airlock/glass_command{
|
||||
name = "bridge door";
|
||||
req_access_txt = "19"
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"at" = (
|
||||
/turf/open/floor/mineral/plastitanium/brig,
|
||||
/area/shuttle/escape)
|
||||
"au" = (
|
||||
/obj/structure/shuttle/engine/propulsion/left{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/shuttle/escape)
|
||||
"av" = (
|
||||
/obj/machinery/light,
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"aw" = (
|
||||
/obj/structure/extinguisher_cabinet{
|
||||
pixel_y = -32
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/escape)
|
||||
"ax" = (
|
||||
/obj/structure/table,
|
||||
/obj/machinery/recharger{
|
||||
active_power_usage = 0;
|
||||
idle_power_usage = 0;
|
||||
pixel_y = 4;
|
||||
use_power = 0
|
||||
},
|
||||
/turf/open/floor/mineral/plastitanium/brig,
|
||||
/area/shuttle/escape)
|
||||
"ay" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/storage/box/handcuffs,
|
||||
/turf/open/floor/mineral/plastitanium/brig,
|
||||
/area/shuttle/escape)
|
||||
"az" = (
|
||||
/obj/machinery/door/airlock/glass_security{
|
||||
name = "security airlock";
|
||||
req_access_txt = "63"
|
||||
},
|
||||
/turf/open/floor/mineral/plastitanium/brig,
|
||||
/area/shuttle/escape)
|
||||
"aA" = (
|
||||
/obj/machinery/door/airlock/glass,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/shuttle/escape)
|
||||
"aB" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1
|
||||
},
|
||||
/turf/open/floor/mineral/titanium,
|
||||
/area/shuttle/escape)
|
||||
"aC" = (
|
||||
/turf/open/floor/mineral/titanium,
|
||||
/area/shuttle/escape)
|
||||
"aD" = (
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/shuttle/escape)
|
||||
"aE" = (
|
||||
/obj/structure/chair{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/shuttle/escape)
|
||||
"aF" = (
|
||||
/obj/structure/table,
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/shuttle/escape)
|
||||
"aG" = (
|
||||
/obj/machinery/door/airlock/titanium,
|
||||
/turf/open/floor/mineral/titanium,
|
||||
/area/shuttle/escape)
|
||||
"aH" = (
|
||||
/obj/structure/chair{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/shuttle/escape)
|
||||
"aI" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/reagent_containers/food/snacks/boiledspaghetti{
|
||||
name = "pasghetti";
|
||||
pixel_x = 4;
|
||||
pixel_y = 7
|
||||
},
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/shuttle/escape)
|
||||
"aJ" = (
|
||||
/obj/machinery/light/small,
|
||||
/turf/open/floor/mineral/titanium,
|
||||
/area/shuttle/escape)
|
||||
"aK" = (
|
||||
/obj/machinery/door/airlock/titanium,
|
||||
/obj/docking_port/mobile/emergency{
|
||||
dheight = 0;
|
||||
dir = 8;
|
||||
dwidth = 6;
|
||||
height = 18;
|
||||
port_direction = 4;
|
||||
width = 14;
|
||||
timid = 1;
|
||||
name = "Birdboat emergency escape shuttle"
|
||||
},
|
||||
/turf/open/floor/mineral/titanium,
|
||||
/area/shuttle/escape)
|
||||
"aL" = (
|
||||
/obj/structure/table,
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/shuttle/escape)
|
||||
"aM" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar,
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/shuttle/escape)
|
||||
"aN" = (
|
||||
/obj/structure/chair{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/window/reinforced,
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/shuttle/escape)
|
||||
"aO" = (
|
||||
/obj/structure/chair{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/shuttle/escape)
|
||||
"aP" = (
|
||||
/obj/structure/chair,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 1;
|
||||
pixel_y = 2
|
||||
},
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/shuttle/escape)
|
||||
"aQ" = (
|
||||
/obj/structure/extinguisher_cabinet{
|
||||
pixel_x = -27
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/shuttle/escape)
|
||||
"aR" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/storage/firstaid/fire{
|
||||
pixel_x = 5;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/storage/firstaid/toxin,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/shuttle/escape)
|
||||
"aS" = (
|
||||
/obj/structure/chair{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/shuttle/escape)
|
||||
"aT" = (
|
||||
/obj/structure/chair{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/light,
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/shuttle/escape)
|
||||
"aU" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/storage/firstaid/brute{
|
||||
pixel_x = 5;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/storage/firstaid/brute,
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/shuttle/escape)
|
||||
"aV" = (
|
||||
/obj/structure/extinguisher_cabinet{
|
||||
pixel_y = -32
|
||||
},
|
||||
/turf/open/floor/mineral/titanium,
|
||||
/area/shuttle/escape)
|
||||
"aW" = (
|
||||
/obj/structure/chair,
|
||||
/turf/open/floor/plasteel/black,
|
||||
/area/shuttle/escape)
|
||||
"aX" = (
|
||||
/obj/machinery/sleeper{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/shuttle/escape)
|
||||
"aY" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/defibrillator/loaded,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/shuttle/escape)
|
||||
|
||||
(1,1,1) = {"
|
||||
b
|
||||
b
|
||||
b
|
||||
b
|
||||
b
|
||||
b
|
||||
b
|
||||
b
|
||||
b
|
||||
w
|
||||
aa
|
||||
aa
|
||||
ab
|
||||
ab
|
||||
ac
|
||||
ab
|
||||
ac
|
||||
ac
|
||||
ac
|
||||
ac
|
||||
ac
|
||||
ab
|
||||
aa
|
||||
aa
|
||||
"}
|
||||
(2,1,1) = {"
|
||||
b
|
||||
e
|
||||
g
|
||||
e
|
||||
m
|
||||
B
|
||||
m
|
||||
g
|
||||
b
|
||||
x
|
||||
aa
|
||||
ab
|
||||
ah
|
||||
aq
|
||||
ak
|
||||
ac
|
||||
aB
|
||||
aH
|
||||
aH
|
||||
aH
|
||||
aB
|
||||
ah
|
||||
ab
|
||||
aa
|
||||
"}
|
||||
(3,1,1) = {"
|
||||
b
|
||||
f
|
||||
g
|
||||
f
|
||||
m
|
||||
m
|
||||
m
|
||||
g
|
||||
u
|
||||
y
|
||||
aa
|
||||
ab
|
||||
ai
|
||||
ar
|
||||
aj
|
||||
as
|
||||
aC
|
||||
aC
|
||||
aC
|
||||
aC
|
||||
aC
|
||||
aS
|
||||
ab
|
||||
aa
|
||||
"}
|
||||
(4,1,1) = {"
|
||||
b
|
||||
A
|
||||
g
|
||||
f
|
||||
m
|
||||
m
|
||||
m
|
||||
g
|
||||
u
|
||||
y
|
||||
aa
|
||||
ac
|
||||
aj
|
||||
aj
|
||||
av
|
||||
ab
|
||||
aD
|
||||
aD
|
||||
aL
|
||||
aC
|
||||
aC
|
||||
aS
|
||||
ab
|
||||
aa
|
||||
"}
|
||||
(5,1,1) = {"
|
||||
b
|
||||
f
|
||||
h
|
||||
j
|
||||
m
|
||||
m
|
||||
m
|
||||
g
|
||||
u
|
||||
y
|
||||
aa
|
||||
ac
|
||||
aj
|
||||
aj
|
||||
aw
|
||||
ab
|
||||
aE
|
||||
aE
|
||||
aM
|
||||
aC
|
||||
aC
|
||||
aS
|
||||
ab
|
||||
aa
|
||||
"}
|
||||
(6,1,1) = {"
|
||||
b
|
||||
f
|
||||
i
|
||||
k
|
||||
n
|
||||
p
|
||||
n
|
||||
g
|
||||
b
|
||||
z
|
||||
aa
|
||||
ab
|
||||
ak
|
||||
aj
|
||||
ak
|
||||
ab
|
||||
aF
|
||||
aI
|
||||
aL
|
||||
aC
|
||||
aC
|
||||
aT
|
||||
ah
|
||||
ab
|
||||
"}
|
||||
(7,1,1) = {"
|
||||
b
|
||||
b
|
||||
b
|
||||
l
|
||||
o
|
||||
b
|
||||
q
|
||||
r
|
||||
b
|
||||
w
|
||||
aa
|
||||
ab
|
||||
ab
|
||||
as
|
||||
ac
|
||||
ab
|
||||
aC
|
||||
aC
|
||||
aC
|
||||
aC
|
||||
aC
|
||||
aC
|
||||
aB
|
||||
ab
|
||||
"}
|
||||
(8,1,1) = {"
|
||||
aa
|
||||
ab
|
||||
al
|
||||
at
|
||||
at
|
||||
ac
|
||||
aB
|
||||
aC
|
||||
aC
|
||||
aC
|
||||
aC
|
||||
aC
|
||||
aV
|
||||
ab
|
||||
"}
|
||||
(9,1,1) = {"
|
||||
aa
|
||||
ab
|
||||
al
|
||||
at
|
||||
at
|
||||
az
|
||||
aC
|
||||
aC
|
||||
aN
|
||||
aP
|
||||
aC
|
||||
aC
|
||||
aW
|
||||
ac
|
||||
"}
|
||||
(10,1,1) = {"
|
||||
aa
|
||||
ab
|
||||
am
|
||||
at
|
||||
at
|
||||
ac
|
||||
aC
|
||||
aC
|
||||
aN
|
||||
aP
|
||||
aC
|
||||
aC
|
||||
aW
|
||||
ac
|
||||
"}
|
||||
(11,1,1) = {"
|
||||
aa
|
||||
ab
|
||||
al
|
||||
at
|
||||
ax
|
||||
ab
|
||||
aC
|
||||
aC
|
||||
aN
|
||||
aP
|
||||
aC
|
||||
aC
|
||||
aW
|
||||
ac
|
||||
"}
|
||||
(12,1,1) = {"
|
||||
aa
|
||||
ab
|
||||
al
|
||||
at
|
||||
ay
|
||||
ab
|
||||
aC
|
||||
aC
|
||||
aO
|
||||
aP
|
||||
aC
|
||||
aC
|
||||
aB
|
||||
ab
|
||||
"}
|
||||
(13,1,1) = {"
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ah
|
||||
aC
|
||||
aC
|
||||
ah
|
||||
ab
|
||||
aA
|
||||
ac
|
||||
ab
|
||||
ab
|
||||
"}
|
||||
(14,1,1) = {"
|
||||
ab
|
||||
ad
|
||||
an
|
||||
af
|
||||
af
|
||||
aA
|
||||
aC
|
||||
aC
|
||||
aA
|
||||
aQ
|
||||
af
|
||||
af
|
||||
aX
|
||||
ab
|
||||
"}
|
||||
(15,1,1) = {"
|
||||
ab
|
||||
ae
|
||||
af
|
||||
af
|
||||
af
|
||||
aA
|
||||
aC
|
||||
aC
|
||||
aA
|
||||
af
|
||||
af
|
||||
af
|
||||
af
|
||||
ab
|
||||
"}
|
||||
(16,1,1) = {"
|
||||
ab
|
||||
af
|
||||
ao
|
||||
af
|
||||
ab
|
||||
ab
|
||||
aG
|
||||
aG
|
||||
ab
|
||||
ab
|
||||
aR
|
||||
aU
|
||||
aY
|
||||
ab
|
||||
"}
|
||||
(17,1,1) = {"
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
aC
|
||||
aJ
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
"}
|
||||
(18,1,1) = {"
|
||||
ab
|
||||
ag
|
||||
ap
|
||||
au
|
||||
ab
|
||||
ab
|
||||
aG
|
||||
aK
|
||||
ab
|
||||
ab
|
||||
ag
|
||||
ap
|
||||
au
|
||||
ab
|
||||
"}
|
||||
@@ -148,7 +148,6 @@
|
||||
},
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1;
|
||||
pixel_x = -3;
|
||||
pixel_y = 3
|
||||
},
|
||||
@@ -307,7 +306,6 @@
|
||||
"bc" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1;
|
||||
pixel_x = -3;
|
||||
pixel_y = 3
|
||||
},
|
||||
@@ -480,7 +478,6 @@
|
||||
"bG" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1;
|
||||
pixel_x = -3;
|
||||
pixel_y = 3
|
||||
},
|
||||
|
||||
@@ -144,8 +144,7 @@
|
||||
/area/shuttle/escape)
|
||||
"aB" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1
|
||||
icon_state = "plant-21"
|
||||
},
|
||||
/turf/open/floor/mineral/titanium,
|
||||
/area/shuttle/escape)
|
||||
@@ -198,7 +197,7 @@
|
||||
dir = 8;
|
||||
dwidth = 6;
|
||||
height = 18;
|
||||
port_angle = 90;
|
||||
port_direction = 4;
|
||||
width = 14;
|
||||
timid = 1;
|
||||
name = "Birdboat emergency escape shuttle"
|
||||
@@ -588,4 +587,4 @@ ag
|
||||
ap
|
||||
au
|
||||
ab
|
||||
"}
|
||||
"}
|
||||
@@ -540,7 +540,7 @@
|
||||
dwidth = 15;
|
||||
height = 20;
|
||||
name = "Cere emergency shuttle";
|
||||
port_angle = 90;
|
||||
port_direction = 4;
|
||||
preferred_direction = 2;
|
||||
width = 42
|
||||
},
|
||||
@@ -680,8 +680,7 @@
|
||||
/area/shuttle/escape)
|
||||
"ca" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1
|
||||
icon_state = "plant-21"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/shuttle/escape)
|
||||
@@ -703,8 +702,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1
|
||||
icon_state = "plant-21"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/shuttle/escape)
|
||||
@@ -2075,4 +2073,4 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
"}
|
||||
"}
|
||||
@@ -153,7 +153,6 @@
|
||||
"an" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1;
|
||||
pixel_x = -3;
|
||||
pixel_y = 3
|
||||
},
|
||||
@@ -168,7 +167,6 @@
|
||||
"ap" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1;
|
||||
pixel_x = -3;
|
||||
pixel_y = 3
|
||||
},
|
||||
@@ -444,7 +442,7 @@
|
||||
name = "Delta emergency shuttle";
|
||||
width = 30;
|
||||
preferred_direction = 2;
|
||||
port_angle = 90
|
||||
port_direction = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/shuttle/escape)
|
||||
@@ -689,8 +687,7 @@
|
||||
/area/shuttle/escape)
|
||||
"bz" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1
|
||||
icon_state = "plant-21"
|
||||
},
|
||||
/obj/machinery/button/flasher{
|
||||
id = "shuttleflash";
|
||||
@@ -703,8 +700,7 @@
|
||||
/area/shuttle/escape)
|
||||
"bA" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1
|
||||
icon_state = "plant-21"
|
||||
},
|
||||
/turf/open/floor/plasteel/neutral/corner{
|
||||
dir = 4
|
||||
@@ -883,7 +879,6 @@
|
||||
"cb" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1;
|
||||
pixel_x = -3;
|
||||
pixel_y = 3
|
||||
},
|
||||
@@ -1050,7 +1045,6 @@
|
||||
"cA" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1;
|
||||
pixel_x = -3;
|
||||
pixel_y = 3
|
||||
},
|
||||
@@ -1083,7 +1077,6 @@
|
||||
"cE" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1;
|
||||
pixel_x = -3;
|
||||
pixel_y = 3
|
||||
},
|
||||
@@ -1669,4 +1662,4 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
"}
|
||||
"}
|
||||
@@ -304,7 +304,6 @@
|
||||
"bg" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1;
|
||||
pixel_x = -3;
|
||||
pixel_y = 3
|
||||
},
|
||||
@@ -359,7 +358,6 @@
|
||||
"bp" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1;
|
||||
pixel_x = -3;
|
||||
pixel_y = 3
|
||||
},
|
||||
@@ -369,7 +367,6 @@
|
||||
"bq" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21";
|
||||
layer = 4.1;
|
||||
pixel_x = -3;
|
||||
pixel_y = 3
|
||||
},
|
||||
|
||||
@@ -279,7 +279,7 @@
|
||||
dwidth = 4;
|
||||
height = 15;
|
||||
name = "Pubby emergency shuttle";
|
||||
port_angle = 90;
|
||||
port_direction = 4;
|
||||
width = 18
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
@@ -638,4 +638,4 @@ ab
|
||||
ab
|
||||
ab
|
||||
aa
|
||||
"}
|
||||
"}
|
||||
@@ -288,7 +288,7 @@
|
||||
/area/shuttle/escape)
|
||||
"ba" = (
|
||||
/obj/structure/destructible/cult/forge{
|
||||
desc = "A engine used in powering the shuttle.";
|
||||
desc = "An engine used in powering the shuttle.";
|
||||
name = "magma engine"
|
||||
},
|
||||
/turf/open/floor/plasteel/yellow,
|
||||
@@ -307,7 +307,7 @@
|
||||
/area/shuttle/escape)
|
||||
"bd" = (
|
||||
/obj/structure/destructible/cult/forge{
|
||||
desc = "A engine used in powering the shuttle.";
|
||||
desc = "An engine used in powering the shuttle.";
|
||||
name = "magma engine"
|
||||
},
|
||||
/turf/open/floor/plasteel/whitered,
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
id = "ferry";
|
||||
name = "ferry shuttle";
|
||||
roundstart_move = "ferry_away";
|
||||
port_angle = 180;
|
||||
port_direction = 2;
|
||||
width = 5;
|
||||
timid = 1
|
||||
},
|
||||
@@ -170,4 +170,4 @@ d
|
||||
m
|
||||
d
|
||||
c
|
||||
"}
|
||||
"}
|
||||
@@ -46,10 +46,7 @@
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/transport)
|
||||
"am" = (
|
||||
/obj/structure/grille{
|
||||
density = 0;
|
||||
icon_state = "brokengrille"
|
||||
},
|
||||
/obj/structure/grille/broken,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/shuttle/transport)
|
||||
"an" = (
|
||||
@@ -114,10 +111,7 @@
|
||||
/turf/closed/wall/mineral/titanium,
|
||||
/area/shuttle/transport)
|
||||
"aB" = (
|
||||
/obj/structure/grille{
|
||||
density = 0;
|
||||
icon_state = "brokengrille"
|
||||
},
|
||||
/obj/structure/grille/broken,
|
||||
/obj/structure/window/fulltile,
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/transport)
|
||||
@@ -184,7 +178,7 @@
|
||||
name = "The Lighthouse";
|
||||
roundstart_move = "ferry_away";
|
||||
timid = 1;
|
||||
port_angle = 180;
|
||||
port_direction = 2;
|
||||
width = 16
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
|
||||
@@ -113,7 +113,7 @@
|
||||
id = "ferry";
|
||||
name = "ferry shuttle";
|
||||
roundstart_move = "ferry_away";
|
||||
port_angle = 180;
|
||||
port_direction = 2;
|
||||
width = 5;
|
||||
timid = 1
|
||||
},
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
id = "whiteship";
|
||||
launch_status = 0;
|
||||
name = "NT Medical Ship";
|
||||
port_angle = -90;
|
||||
port_direction = 8;
|
||||
preferred_direction = 4;
|
||||
roundstart_move = "whiteship_away";
|
||||
timid = null;
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
id = "whiteship";
|
||||
launch_status = 0;
|
||||
name = "NT Recovery White-Ship";
|
||||
port_angle = -90;
|
||||
port_direction = 8;
|
||||
preferred_direction = 1;
|
||||
roundstart_move = "whiteship_away";
|
||||
width = 16
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
id = "whiteship";
|
||||
launch_status = 0;
|
||||
name = "NT Recovery White-Ship";
|
||||
port_angle = -90;
|
||||
port_direction = 8;
|
||||
preferred_direction = 4;
|
||||
roundstart_move = "whiteship_away";
|
||||
width = 27
|
||||
@@ -1478,9 +1478,7 @@
|
||||
req_access_txt = "0";
|
||||
use_power = 0
|
||||
},
|
||||
/obj/machinery/iv_drip{
|
||||
density = 0
|
||||
},
|
||||
/obj/machinery/iv_drip,
|
||||
/obj/effect/decal/cleanable/dirt{
|
||||
desc = "A thin layer of dust coating the floor.";
|
||||
name = "dust"
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
id = "whiteship";
|
||||
launch_status = 0;
|
||||
name = "White Ship";
|
||||
port_angle = 90;
|
||||
port_direction = 4;
|
||||
preferred_direction = 1;
|
||||
roundstart_move = "whiteship_away";
|
||||
timid = 1;
|
||||
|
||||
@@ -49,7 +49,7 @@ curl -v \
|
||||
-H "User-Agent: myBotThing (http://some.url, v0.1)" \
|
||||
-H "Content-Type: application/json" \
|
||||
-X POST \
|
||||
-d "{\"content\":\"Mirroring [$1] from /tg/ to Hippie\"}" \
|
||||
-d "{\"content\":\"Mirroring [$1] from /tg/ to Citadel\"}" \
|
||||
https://discordapp.com/api/channels/$CHANNELID/messages
|
||||
|
||||
# We need to make sure we are always on a clean master when creating the new branch.
|
||||
@@ -69,15 +69,16 @@ git checkout -b "$BASE_BRANCH_NAME$1"
|
||||
readonly MERGE_SHA=$(curl --silent "$BASE_PULL_URL/$1" | jq '.merge_commit_sha' -r)
|
||||
|
||||
# Get the commits
|
||||
readonly COMMITS=$(curl "$BASE_PULL_URL/$1/commits" | jq '.[].sha' -r)
|
||||
readonly COMMITS=$(curl --silent "$BASE_PULL_URL/$1/commits" | jq '.[].sha' -r)
|
||||
|
||||
# Cherry pick onto the new branch
|
||||
echo "Cherry picking onto branch"
|
||||
CHERRY_PICK_OUTPUT=$(git cherry-pick -m 1 "$MERGE_SHA" 2>&1)
|
||||
echo "$CHERRY_PICK_OUTPUT"
|
||||
|
||||
# If it's a squash commit, you can't use -m 1, you need to remove it
|
||||
# You also can't use -m 1 if it's a rebase and merge...
|
||||
if echo "$CHERRY_PICK_OUTPUT" | grep 'error: mainline was specified but commit'; then
|
||||
if echo "$CHERRY_PICK_OUTPUT" | grep -i 'error: mainline was specified but commit'; then
|
||||
echo "Commit was a squash, retrying"
|
||||
if containsElement "$MERGE_SHA" "${COMMITS[@]}"; then
|
||||
for commit in $COMMITS; do
|
||||
@@ -94,14 +95,16 @@ if echo "$CHERRY_PICK_OUTPUT" | grep 'error: mainline was specified but commit';
|
||||
git add -A .
|
||||
git cherry-pick --continue
|
||||
fi
|
||||
|
||||
else
|
||||
# Add all files onto this branch
|
||||
echo "Adding files to branch:"
|
||||
git add -A .
|
||||
fi
|
||||
|
||||
# Commit these changes
|
||||
echo "Commiting changes"
|
||||
git commit --allow-empty -m "$2"
|
||||
|
||||
# Push them onto the branch
|
||||
echo "Pushing changes"
|
||||
git push -u origin "$BASE_BRANCH_NAME$1"
|
||||
+148
-74
@@ -1,74 +1,148 @@
|
||||
//A set of constants used to determine which type of mute an admin wishes to apply:
|
||||
//Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1)
|
||||
//Therefore there needs to be a gap between the flags_1 for the automute flags_1
|
||||
#define MUTE_IC 1
|
||||
#define MUTE_OOC 2
|
||||
#define MUTE_PRAY 4
|
||||
#define MUTE_ADMINHELP 8
|
||||
#define MUTE_DEADCHAT 16
|
||||
#define MUTE_ALL 31
|
||||
|
||||
//Some constants for DB_Ban
|
||||
#define BANTYPE_PERMA 1
|
||||
#define BANTYPE_TEMP 2
|
||||
#define BANTYPE_JOB_PERMA 3
|
||||
#define BANTYPE_JOB_TEMP 4
|
||||
#define BANTYPE_ANY_FULLBAN 5 //used to locate stuff to unban.
|
||||
|
||||
#define BANTYPE_ADMIN_PERMA 7
|
||||
#define BANTYPE_ADMIN_TEMP 8
|
||||
#define BANTYPE_ANY_JOB 9 //used to remove jobbans
|
||||
|
||||
//Please don't edit these values without speaking to Errorage first ~Carn
|
||||
//Admin Permissions
|
||||
#define R_BUILDMODE 1
|
||||
#define R_ADMIN 2
|
||||
#define R_BAN 4
|
||||
#define R_FUN 8
|
||||
#define R_SERVER 16
|
||||
#define R_DEBUG 32
|
||||
#define R_POSSESS 64
|
||||
#define R_PERMISSIONS 128
|
||||
#define R_STEALTH 256
|
||||
#define R_POLL 512
|
||||
#define R_VAREDIT 1024
|
||||
#define R_SOUNDS 2048
|
||||
#define R_SPAWN 4096
|
||||
|
||||
#if DM_VERSION > 512
|
||||
#error Remove the flag below , its been long enough
|
||||
#endif
|
||||
//legacy , remove post 512, it was replaced by R_POLL
|
||||
#define R_REJUVINATE 2
|
||||
|
||||
#define R_MAXPERMISSION 4096 //This holds the maximum value for a permission. It is used in iteration, so keep it updated.
|
||||
|
||||
#define ADMIN_QUE(user) "(<a href='?_src_=holder;adminmoreinfo=\ref[user]'>?</a>)"
|
||||
#define ADMIN_FLW(user) "(<a href='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</a>)"
|
||||
#define ADMIN_PP(user) "(<a href='?_src_=holder;adminplayeropts=\ref[user]'>PP</a>)"
|
||||
#define ADMIN_VV(atom) "(<a href='?_src_=vars;Vars=\ref[atom]'>VV</a>)"
|
||||
#define ADMIN_SM(user) "(<a href='?_src_=holder;subtlemessage=\ref[user]'>SM</a>)"
|
||||
#define ADMIN_TP(user) "(<a href='?_src_=holder;traitor=\ref[user]'>TP</a>)"
|
||||
#define ADMIN_KICK(user) "(<a href='?_src_=holder;boot2=\ref[user]'>KICK</a>)"
|
||||
#define ADMIN_CENTCOM_REPLY(user) "(<a href='?_src_=holder;CentComReply=\ref[user]'>RPLY</a>)"
|
||||
#define ADMIN_SYNDICATE_REPLY(user) "(<a href='?_src_=holder;SyndicateReply=\ref[user]'>RPLY</a>)"
|
||||
#define ADMIN_SC(user) "(<a href='?_src_=holder;adminspawncookie=\ref[user]'>SC</a>)"
|
||||
#define ADMIN_SMITE(user) "(<a href='?_src_=holder;adminsmite=\ref[user]'>SMITE</a>)"
|
||||
#define ADMIN_LOOKUP(user) "[key_name_admin(user)][ADMIN_QUE(user)]"
|
||||
#define ADMIN_LOOKUPFLW(user) "[key_name_admin(user)][ADMIN_QUE(user)] [ADMIN_FLW(user)]"
|
||||
#define ADMIN_SET_SD_CODE "(<a href='?_src_=holder;set_selfdestruct_code=1'>SETCODE</a>)"
|
||||
#define ADMIN_FULLMONTY_NONAME(user) "[ADMIN_QUE(user)] [ADMIN_PP(user)] [ADMIN_VV(user)] [ADMIN_SM(user)] [ADMIN_FLW(user)] [ADMIN_TP(user)] [ADMIN_INDIVIDUALLOG(user)] [ADMIN_SMITE(user)]"
|
||||
#define ADMIN_FULLMONTY(user) "[key_name_admin(user)] [ADMIN_FULLMONTY_NONAME(user)]"
|
||||
#define ADMIN_JMP(src) "(<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)"
|
||||
#define COORD(src) "[src ? "([src.x],[src.y],[src.z])" : "nonexistent location"]"
|
||||
#define ADMIN_COORDJMP(src) "[src ? "[COORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]"
|
||||
#define ADMIN_INDIVIDUALLOG(user) "(<a href='?_src_=holder;individuallog=\ref[user]'>LOGS</a>)"
|
||||
|
||||
#define ADMIN_PUNISHMENT_LIGHTNING "Lightning bolt"
|
||||
#define ADMIN_PUNISHMENT_BRAINDAMAGE "Brain damage"
|
||||
#define ADMIN_PUNISHMENT_GIB "Gib"
|
||||
#define ADMIN_PUNISHMENT_BSA "Bluespace Artillery Device"
|
||||
|
||||
#define AHELP_ACTIVE 1
|
||||
#define AHELP_CLOSED 2
|
||||
#define AHELP_RESOLVED 3
|
||||
//A set of constants used to determine which type of mute an admin wishes to apply:
|
||||
//Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1)
|
||||
//Therefore there needs to be a gap between the flags_1 for the automute flags_1
|
||||
#define MUTE_IC 1
|
||||
#define MUTE_OOC 2
|
||||
#define MUTE_PRAY 4
|
||||
#define MUTE_ADMINHELP 8
|
||||
#define MUTE_DEADCHAT 16
|
||||
#define MUTE_ALL 31
|
||||
|
||||
//Some constants for DB_Ban
|
||||
#define BANTYPE_PERMA 1
|
||||
#define BANTYPE_TEMP 2
|
||||
#define BANTYPE_JOB_PERMA 3
|
||||
#define BANTYPE_JOB_TEMP 4
|
||||
#define BANTYPE_ANY_FULLBAN 5 //used to locate stuff to unban.
|
||||
|
||||
#define BANTYPE_ADMIN_PERMA 7
|
||||
#define BANTYPE_ADMIN_TEMP 8
|
||||
#define BANTYPE_ANY_JOB 9 //used to remove jobbans
|
||||
|
||||
//Please don't edit these values without speaking to Errorage first ~Carn
|
||||
//Admin Permissions
|
||||
#define R_BUILDMODE 1
|
||||
#define R_ADMIN 2
|
||||
#define R_BAN 4
|
||||
#define R_FUN 8
|
||||
#define R_SERVER 16
|
||||
#define R_DEBUG 32
|
||||
#define R_POSSESS 64
|
||||
#define R_PERMISSIONS 128
|
||||
#define R_STEALTH 256
|
||||
#define R_POLL 512
|
||||
#define R_VAREDIT 1024
|
||||
#define R_SOUNDS 2048
|
||||
#define R_SPAWN 4096
|
||||
|
||||
#if DM_VERSION > 512
|
||||
#error Remove the flag below , its been long enough
|
||||
#endif
|
||||
//legacy , remove post 512, it was replaced by R_POLL
|
||||
#define R_REJUVINATE 2
|
||||
|
||||
#define R_MAXPERMISSION 4096 //This holds the maximum value for a permission. It is used in iteration, so keep it updated.
|
||||
|
||||
#define ADMIN_QUE(user) "(<a href='?_src_=holder;adminmoreinfo=\ref[user]'>?</a>)"
|
||||
#define ADMIN_FLW(user) "(<a href='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</a>)"
|
||||
#define ADMIN_PP(user) "(<a href='?_src_=holder;adminplayeropts=\ref[user]'>PP</a>)"
|
||||
#define ADMIN_VV(atom) "(<a href='?_src_=vars;Vars=\ref[atom]'>VV</a>)"
|
||||
#define ADMIN_SM(user) "(<a href='?_src_=holder;subtlemessage=\ref[user]'>SM</a>)"
|
||||
#define ADMIN_TP(user) "(<a href='?_src_=holder;traitor=\ref[user]'>TP</a>)"
|
||||
#define ADMIN_KICK(user) "(<a href='?_src_=holder;boot2=\ref[user]'>KICK</a>)"
|
||||
#define ADMIN_CENTCOM_REPLY(user) "(<a href='?_src_=holder;CentComReply=\ref[user]'>RPLY</a>)"
|
||||
#define ADMIN_SYNDICATE_REPLY(user) "(<a href='?_src_=holder;SyndicateReply=\ref[user]'>RPLY</a>)"
|
||||
#define ADMIN_SC(user) "(<a href='?_src_=holder;adminspawncookie=\ref[user]'>SC</a>)"
|
||||
#define ADMIN_SMITE(user) "(<a href='?_src_=holder;adminsmite=\ref[user]'>SMITE</a>)"
|
||||
#define ADMIN_LOOKUP(user) "[key_name_admin(user)][ADMIN_QUE(user)]"
|
||||
#define ADMIN_LOOKUPFLW(user) "[key_name_admin(user)][ADMIN_QUE(user)] [ADMIN_FLW(user)]"
|
||||
#define ADMIN_SET_SD_CODE "(<a href='?_src_=holder;set_selfdestruct_code=1'>SETCODE</a>)"
|
||||
#define ADMIN_FULLMONTY_NONAME(user) "[ADMIN_QUE(user)] [ADMIN_PP(user)] [ADMIN_VV(user)] [ADMIN_SM(user)] [ADMIN_FLW(user)] [ADMIN_TP(user)] [ADMIN_INDIVIDUALLOG(user)] [ADMIN_SMITE(user)]"
|
||||
#define ADMIN_FULLMONTY(user) "[key_name_admin(user)] [ADMIN_FULLMONTY_NONAME(user)]"
|
||||
#define ADMIN_JMP(src) "(<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)"
|
||||
#define COORD(src) "[src ? "([src.x],[src.y],[src.z])" : "nonexistent location"]"
|
||||
#define ADMIN_COORDJMP(src) "[src ? "[COORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]"
|
||||
#define ADMIN_INDIVIDUALLOG(user) "(<a href='?_src_=holder;individuallog=\ref[user]'>LOGS</a>)"
|
||||
|
||||
#define ADMIN_PUNISHMENT_LIGHTNING "Lightning bolt"
|
||||
#define ADMIN_PUNISHMENT_BRAINDAMAGE "Brain damage"
|
||||
#define ADMIN_PUNISHMENT_GIB "Gib"
|
||||
#define ADMIN_PUNISHMENT_BSA "Bluespace Artillery Device"
|
||||
|
||||
#define AHELP_ACTIVE 1
|
||||
#define AHELP_CLOSED 2
|
||||
#define AHELP_RESOLVED 3
|
||||
//A set of constants used to determine which type of mute an admin wishes to apply:
|
||||
//Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1)
|
||||
//Therefore there needs to be a gap between the flags for the automute flags
|
||||
#define MUTE_IC 1
|
||||
#define MUTE_OOC 2
|
||||
#define MUTE_PRAY 4
|
||||
#define MUTE_ADMINHELP 8
|
||||
#define MUTE_DEADCHAT 16
|
||||
#define MUTE_ALL 31
|
||||
|
||||
//Some constants for DB_Ban
|
||||
#define BANTYPE_PERMA 1
|
||||
#define BANTYPE_TEMP 2
|
||||
#define BANTYPE_JOB_PERMA 3
|
||||
#define BANTYPE_JOB_TEMP 4
|
||||
#define BANTYPE_ANY_FULLBAN 5 //used to locate stuff to unban.
|
||||
|
||||
#define BANTYPE_ADMIN_PERMA 7
|
||||
#define BANTYPE_ADMIN_TEMP 8
|
||||
#define BANTYPE_ANY_JOB 9 //used to remove jobbans
|
||||
|
||||
//Please don't edit these values without speaking to Errorage first ~Carn
|
||||
//Admin Permissions
|
||||
#define R_BUILDMODE 1
|
||||
#define R_ADMIN 2
|
||||
#define R_BAN 4
|
||||
#define R_FUN 8
|
||||
#define R_SERVER 16
|
||||
#define R_DEBUG 32
|
||||
#define R_POSSESS 64
|
||||
#define R_PERMISSIONS 128
|
||||
#define R_STEALTH 256
|
||||
#define R_POLL 512
|
||||
#define R_VAREDIT 1024
|
||||
#define R_SOUNDS 2048
|
||||
#define R_SPAWN 4096
|
||||
|
||||
#if DM_VERSION > 512
|
||||
#error Remove the flag below , its been long enough
|
||||
#endif
|
||||
//legacy , remove post 512, it was replaced by R_POLL
|
||||
#define R_REJUVINATE 2
|
||||
|
||||
#define R_MAXPERMISSION 4096 //This holds the maximum value for a permission. It is used in iteration, so keep it updated.
|
||||
|
||||
#define ADMIN_QUE(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminmoreinfo=\ref[user]'>?</a>)"
|
||||
#define ADMIN_FLW(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminplayerobservefollow=\ref[user]'>FLW</a>)"
|
||||
#define ADMIN_PP(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminplayeropts=\ref[user]'>PP</a>)"
|
||||
#define ADMIN_VV(atom) "(<a href='?_src_=vars;[HrefToken(TRUE)];Vars=\ref[atom]'>VV</a>)"
|
||||
#define ADMIN_SM(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];subtlemessage=\ref[user]'>SM</a>)"
|
||||
#define ADMIN_TP(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];traitor=\ref[user]'>TP</a>)"
|
||||
#define ADMIN_KICK(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];boot2=\ref[user]'>KICK</a>)"
|
||||
#define ADMIN_CENTCOM_REPLY(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];CentComReply=\ref[user]'>RPLY</a>)"
|
||||
#define ADMIN_SYNDICATE_REPLY(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];SyndicateReply=\ref[user]'>RPLY</a>)"
|
||||
#define ADMIN_SC(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminspawncookie=\ref[user]'>SC</a>)"
|
||||
#define ADMIN_SMITE(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminsmite=\ref[user]'>SMITE</a>)"
|
||||
#define ADMIN_LOOKUP(user) "[key_name_admin(user)][ADMIN_QUE(user)]"
|
||||
#define ADMIN_LOOKUPFLW(user) "[key_name_admin(user)][ADMIN_QUE(user)] [ADMIN_FLW(user)]"
|
||||
#define ADMIN_SET_SD_CODE "(<a href='?_src_=holder;[HrefToken(TRUE)];set_selfdestruct_code=1'>SETCODE</a>)"
|
||||
#define ADMIN_FULLMONTY_NONAME(user) "[ADMIN_QUE(user)] [ADMIN_PP(user)] [ADMIN_VV(user)] [ADMIN_SM(user)] [ADMIN_FLW(user)] [ADMIN_TP(user)] [ADMIN_INDIVIDUALLOG(user)] [ADMIN_SMITE(user)]"
|
||||
#define ADMIN_FULLMONTY(user) "[key_name_admin(user)] [ADMIN_FULLMONTY_NONAME(user)]"
|
||||
#define ADMIN_JMP(src) "(<a href='?_src_=holder;[HrefToken(TRUE)];adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)"
|
||||
#define COORD(src) "[src ? "([src.x],[src.y],[src.z])" : "nonexistent location"]"
|
||||
#define ADMIN_COORDJMP(src) "[src ? "[COORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]"
|
||||
#define ADMIN_INDIVIDUALLOG(user) "(<a href='?_src_=holder;[HrefToken(TRUE)];individuallog=\ref[user]'>LOGS</a>)"
|
||||
|
||||
#define ADMIN_PUNISHMENT_LIGHTNING "Lightning bolt"
|
||||
#define ADMIN_PUNISHMENT_BRAINDAMAGE "Brain damage"
|
||||
#define ADMIN_PUNISHMENT_GIB "Gib"
|
||||
#define ADMIN_PUNISHMENT_BSA "Bluespace Artillery Device"
|
||||
|
||||
#define AHELP_ACTIVE 1
|
||||
#define AHELP_CLOSED 2
|
||||
#define AHELP_RESOLVED 3
|
||||
|
||||
@@ -18,3 +18,4 @@
|
||||
#define ANTAG_DATUM_IAA_HUMAN_CUSTOM /datum/antagonist/traitor/human/internal_affairs/custom
|
||||
#define ANTAG_DATUM_IAA_AI_CUSTOM /datum/antagonist/traitor/AI/internal_affairs/custom
|
||||
#define ANTAG_DATUM_IAA_AI /datum/antagonist/traitor/AI/internal_affairs
|
||||
#define ANTAG_DATUM_BROTHER /datum/antagonist/brother
|
||||
|
||||
@@ -41,6 +41,7 @@
|
||||
#define ANTAG_HUD_SOULLESS 17
|
||||
#define ANTAG_HUD_CLOCKWORK 18
|
||||
#define ANTAG_HUD_BORER 19
|
||||
#define ANTAG_HUD_BROTHER 20
|
||||
|
||||
// Notification action types
|
||||
#define NOTIFY_JUMP "jump"
|
||||
|
||||
@@ -49,6 +49,7 @@
|
||||
|
||||
//Health Defines
|
||||
#define HEALTH_THRESHOLD_CRIT 0
|
||||
#define HEALTH_THRESHOLD_FULLCRIT -30
|
||||
#define HEALTH_THRESHOLD_DEAD -100
|
||||
|
||||
//Actual combat defines
|
||||
@@ -73,6 +74,9 @@
|
||||
#define GRAB_NECK 2
|
||||
#define GRAB_KILL 3
|
||||
|
||||
//slowdown when in softcrit
|
||||
#define SOFTCRIT_ADD_SLOWDOWN 6
|
||||
|
||||
//Attack types for checking shields/hit reactions
|
||||
#define MELEE_ATTACK 1
|
||||
#define UNARMED_ATTACK 2
|
||||
|
||||
@@ -5,14 +5,40 @@
|
||||
// How multiple components of the exact same type are handled in the same datum
|
||||
|
||||
#define COMPONENT_DUPE_HIGHLANDER 0 //old component is deleted (default)
|
||||
#define COMPONENT_DUPE_ALLOWED 1 //duplicates allowed
|
||||
#define COMPONENT_DUPE_ALLOWED 1 //duplicates allowed
|
||||
#define COMPONENT_DUPE_UNIQUE 2 //new component is deleted
|
||||
|
||||
// All signals. Format:
|
||||
// When the signal is called: (signal arguments)
|
||||
|
||||
// /datum signals
|
||||
#define COMSIG_COMPONENT_ADDED "component_added" //when a component is added to a datum: (datum/component)
|
||||
#define COMSIG_COMPONENT_REMOVING "component_removing" //before a component is removed from a datum because of RemoveComponent: (datum/component)
|
||||
#define COMSIG_PARENT_QDELETED "parent_qdeleted" //before a datum's Destroy() is called: ()
|
||||
#define COMSIG_ATOM_ENTERED "atom_entered" //from base of atom/Entered(): (atom/movable, atom)
|
||||
#define COMSIG_MOVABLE_CROSSED "movable_crossed" //from base of atom/movable/Crossed(): (atom/movable)
|
||||
|
||||
// /atom signals
|
||||
#define COMSIG_PARENT_ATTACKBY "atom_attackby" //from base of atom/attackby(): (obj/item, mob/living, params)
|
||||
#define COMSIG_ATOM_HULK_ATTACK "hulk_attack" //from base of atom/attack_hulk(): (mob/living/carbon/human)
|
||||
#define COMSIG_PARENT_EXAMINE "atom_examine" //from base of atom/examine(): (mob)
|
||||
#define COMSIG_ATOM_ENTERED "atom_entered" //from base of atom/Entered(): (atom/movable, atom)
|
||||
#define COMSIG_ATOM_EX_ACT "atom_ex_act" //from base of atom/ex_act(): (severity, target)
|
||||
#define COMSIG_ATOM_EMP_ACT "atom_emp_act" //from base of atom/emp_act(): (severity)
|
||||
#define COMSIG_ATOM_FIRE_ACT "atom_fire_act" //from base of atom/fire_act(): (exposed_temperature, exposed_volume)
|
||||
#define COMSIG_ATOM_BULLET_ACT "atom_bullet_act" //from base of atom/bullet_act(): (obj/item/projectile, def_zone)
|
||||
#define COMSIG_ATOM_BLOB_ACT "atom_blob_act" //from base of atom/blob_act(): (obj/structure/blob)
|
||||
#define COMSIG_ATOM_ACID_ACT "atom_acid_act" //from base of atom/acid_act(): (acidpwr, acid_volume)
|
||||
#define COMSIG_ATOM_EMAG_ACT "atom_emag_act" //from base of atom/emag_act(): ()
|
||||
#define COMSIG_ATOM_NARSIE_ACT "atom_narsie_act" //from base of atom/narsie_act(): ()
|
||||
#define COMSIG_ATOM_RATVAR_ACT "atom_ratvar_act" //from base of atom/ratvar_act(): ()
|
||||
#define COMSIG_ATOM_RCD_ACT "atom_rcd_act" //from base of atom/rcd_act(): (mob, obj/item/construction/rcd, passed_mode)
|
||||
#define COMSIG_ATOM_SING_PULL "atom_sing_pull" //from base of atom/singularity_pull(): (S, current_size)
|
||||
|
||||
// /atom/movable signals
|
||||
#define COMSIG_MOVABLE_MOVED "movable_moved" //from base of atom/movable/Moved(): (atom, dir)
|
||||
#define COMSIG_MOVABLE_CROSSED "movable_crossed" //from base of atom/movable/Crossed(): (atom/movable)
|
||||
#define COMSIG_MOVABLE_COLLIDE "movable_collide" //from base of atom/movable/Collide(): (atom)
|
||||
#define COMSIG_MOVABLE_IMPACT "movable_impact" //from base of atom/movable/throw_impact(): (atom, throwingdatum)
|
||||
|
||||
// /obj/machinery signals
|
||||
#define COMSIG_MACHINE_PROCESS "machine_process" //from machinery subsystem fire(): ()
|
||||
#define COMSIG_MACHINE_PROCESS_ATMOS "machine_process_atmos" //from air subsystem process_atmos_machinery(): ()
|
||||
@@ -101,6 +101,7 @@
|
||||
#define CAT_ROBOT "Robots"
|
||||
#define CAT_MISC "Misc"
|
||||
#define CAT_PRIMAL "Tribal"
|
||||
#define CAT_CLOTHING "Clothing"
|
||||
#define CAT_FOOD "Foods"
|
||||
#define CAT_BREAD "Breads"
|
||||
#define CAT_BURGER "Burgers"
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
// simple is_type and similar inline helpers
|
||||
|
||||
#define isdatum(D) (istype(D, /datum))
|
||||
|
||||
#define islist(L) (istype(L, /list))
|
||||
|
||||
#define in_range(source, user) (get_dist(source, user) <= 1)
|
||||
@@ -25,6 +27,8 @@
|
||||
|
||||
#define islava(A) (istype(A, /turf/open/lava))
|
||||
|
||||
#define isplatingturf(A) (istype(A, /turf/open/floor/plating))
|
||||
|
||||
//Mobs
|
||||
#define isliving(A) (istype(A, /mob/living))
|
||||
|
||||
@@ -158,3 +162,11 @@ GLOBAL_LIST_INIT(pointed_types, typecacheof(list(
|
||||
#define issignaler(O) (istype(O, /obj/item/device/assembly/signaler))
|
||||
|
||||
#define istimer(O) (istype(O, /obj/item/device/assembly/timer))
|
||||
|
||||
GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list(
|
||||
/obj/item/stack/sheet/glass,
|
||||
/obj/item/stack/sheet/rglass,
|
||||
/obj/item/stack/sheet/plasmaglass,
|
||||
/obj/item/stack/sheet/plasmarglass)))
|
||||
|
||||
#define is_glass_sheet(O) (is_type_in_typecache(O, GLOB.glass_sheet_types))
|
||||
|
||||
@@ -35,7 +35,7 @@ Last space-z level = empty
|
||||
|
||||
//zlevel defines, can be overridden for different maps in the appropriate _maps file.
|
||||
#define ZLEVEL_CENTCOM 1
|
||||
#define ZLEVEL_STATION 2
|
||||
#define ZLEVEL_STATION_PRIMARY 2
|
||||
#define ZLEVEL_MINING 5
|
||||
#define ZLEVEL_LAVALAND 5
|
||||
#define ZLEVEL_EMPTY_SPACE 12
|
||||
|
||||
+14
-7
@@ -361,7 +361,6 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
|
||||
#define debug_admins(msg) if (GLOB.Debug2) to_chat(GLOB.admins, "DEBUG: [msg]")
|
||||
#define debug_world_log(msg) if (GLOB.Debug2) log_world("DEBUG: [msg]")
|
||||
|
||||
#define COORD(A) "([A.x],[A.y],[A.z])"
|
||||
#define INCREMENT_TALLY(L, stat) if(L[stat]){L[stat]++}else{L[stat] = 1}
|
||||
|
||||
// Medal names
|
||||
@@ -399,8 +398,6 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
|
||||
#define NUKE_SYNDICATE_BASE 3
|
||||
#define STATION_DESTROYED_NUKE 4
|
||||
#define STATION_EVACUATED 5
|
||||
#define GANG_LOSS 6
|
||||
#define GANG_TAKEOVER 7
|
||||
#define BLOB_WIN 8
|
||||
#define BLOB_NUKE 9
|
||||
#define BLOB_DESTROYED 10
|
||||
@@ -437,10 +434,6 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
|
||||
#define GIBTONITE_DETONATE 3
|
||||
//for obj explosion block calculation
|
||||
#define EXPLOSION_BLOCK_PROC -1
|
||||
//Gangster starting influences
|
||||
|
||||
#define GANGSTER_SOLDIER_STARTING_INFLUENCE 5
|
||||
#define GANGSTER_BOSS_STARTING_INFLUENCE 20
|
||||
|
||||
//for determining which type of heartbeat sound is playing
|
||||
#define BEAT_FAST 1
|
||||
@@ -453,3 +446,17 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
|
||||
#define MOUSE_OPACITY_TRANSPARENT 0
|
||||
#define MOUSE_OPACITY_ICON 1
|
||||
#define MOUSE_OPACITY_OPAQUE 2
|
||||
|
||||
//world/proc/shelleo
|
||||
#define SHELLEO_ERRORLEVEL 1
|
||||
#define SHELLEO_STDOUT 2
|
||||
#define SHELLEO_STDERR 3
|
||||
|
||||
//server security mode
|
||||
#define SECURITY_SAFE 1
|
||||
#define SECURITY_ULTRASAFE 2
|
||||
#define SECURITY_TRUSTED 3
|
||||
|
||||
//Dummy mob reserve slots
|
||||
#define DUMMY_HUMAN_SLOT_PREFERENCES "dummy_preference_preview"
|
||||
#define DUMMY_HUMAN_SLOT_MANIFEST "dummy_manifest_generation"
|
||||
|
||||
@@ -154,3 +154,5 @@
|
||||
#define JUDGE_IGNOREMONKEYS 16
|
||||
|
||||
#define MEGAFAUNA_DEFAULT_RECOVERY_TIME 5
|
||||
|
||||
#define SHADOW_SPECIES_LIGHT_THRESHOLD 0.2
|
||||
@@ -2,6 +2,3 @@
|
||||
#define TRACK_NUKE_DISK 1 //We track the nuclear authentication disk, either to protect it or steal it
|
||||
#define TRACK_MALF_AI 2 //We track the malfunctioning AI, so we can prevent it from blowing us all up
|
||||
#define TRACK_INFILTRATOR 3 //We track the Syndicate infiltrator, so we can get back to ship when the nuke's armed
|
||||
#define TRACK_OPERATIVES 4 //We track the closest operative, so we can regroup when we need to
|
||||
#define TRACK_ATOM 5 //We track a specified atom, so admins can make us function for events
|
||||
#define TRACK_COORDINATES 6 //We point towards the specified coordinates on our z-level, so we can navigate
|
||||
|
||||
@@ -10,6 +10,11 @@
|
||||
//if TESTING is enabled, qdel will call this object's find_references() verb.
|
||||
//defines for the gc_destroyed var
|
||||
|
||||
#define GC_QUEUE_PREQUEUE 1
|
||||
#define GC_QUEUE_CHECK 2
|
||||
#define GC_QUEUE_HARDDELETE 3
|
||||
#define GC_QUEUE_COUNT 3 //increase this when adding more steps.
|
||||
|
||||
#define GC_QUEUED_FOR_QUEUING -1
|
||||
#define GC_QUEUED_FOR_HARD_DEL -2
|
||||
#define GC_CURRENTLY_BEING_QDELETED -3
|
||||
|
||||
@@ -18,18 +18,19 @@
|
||||
#define ROLE_BLOB "blob"
|
||||
#define ROLE_NINJA "space ninja"
|
||||
#define ROLE_MONKEY "monkey"
|
||||
#define ROLE_GANG "gangster"
|
||||
#define ROLE_ABDUCTOR "abductor"
|
||||
#define ROLE_REVENANT "revenant"
|
||||
#define ROLE_DEVIL "devil"
|
||||
#define ROLE_SERVANT_OF_RATVAR "servant of Ratvar"
|
||||
#define ROLE_BORER "borer"
|
||||
#define ROLE_BROTHER "blood brother"
|
||||
|
||||
//Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR.
|
||||
//The gamemode specific ones are just so the gamemodes can query whether a player is old enough
|
||||
//(in game days played) to play that role
|
||||
GLOBAL_LIST_INIT(special_roles, list(
|
||||
ROLE_TRAITOR = /datum/game_mode/traitor,
|
||||
ROLE_BROTHER = /datum/game_mode/traitor/bros,
|
||||
ROLE_OPERATIVE = /datum/game_mode/nuclear,
|
||||
ROLE_CHANGELING = /datum/game_mode/changeling,
|
||||
ROLE_WIZARD = /datum/game_mode/wizard,
|
||||
@@ -41,7 +42,6 @@ GLOBAL_LIST_INIT(special_roles, list(
|
||||
ROLE_BLOB = /datum/game_mode/blob,
|
||||
ROLE_NINJA,
|
||||
ROLE_MONKEY = /datum/game_mode/monkey,
|
||||
ROLE_GANG = /datum/game_mode/gang,
|
||||
ROLE_REVENANT,
|
||||
ROLE_ABDUCTOR = /datum/game_mode/abduction,
|
||||
ROLE_DEVIL = /datum/game_mode/devil,
|
||||
@@ -52,4 +52,4 @@ GLOBAL_LIST_INIT(special_roles, list(
|
||||
//Job defines for what happens when you fail to qualify for any job during job selection
|
||||
#define BEASSISTANT 1
|
||||
#define BERANDOMJOB 2
|
||||
#define RETURNTOLOBBY 3
|
||||
#define RETURNTOLOBBY 3
|
||||
|
||||
@@ -9,7 +9,9 @@
|
||||
|
||||
//keep these in sync with TGS3
|
||||
#define SERVICE_WORLD_PARAM "server_service"
|
||||
#define SERVICE_PR_TEST_JSON "..\\..\\prtestjob.json"
|
||||
#define SERVICE_VERSION_PARAM "server_service_version"
|
||||
#define SERVICE_PR_TEST_JSON "prtestjob.json"
|
||||
#define SERVICE_PR_TEST_JSON_OLD "..\\..\\[SERVICE_PR_TEST_JSON]"
|
||||
|
||||
#define SERVICE_CMD_HARD_REBOOT "hard_reboot"
|
||||
#define SERVICE_CMD_GRACEFUL_SHUTDOWN "graceful_shutdown"
|
||||
|
||||
@@ -53,9 +53,14 @@
|
||||
#define ENGINE_COEFF_MAX 2
|
||||
#define ENGINE_DEFAULT_MAXSPEED_ENGINES 5
|
||||
|
||||
//Docking error flags_1
|
||||
//Docking error flags
|
||||
#define DOCKING_SUCCESS 0
|
||||
#define DOCKING_COMPLETE 1
|
||||
#define DOCKING_BLOCKED 2
|
||||
#define DOCKING_IMMOBILIZED 4
|
||||
#define DOCKING_AREA_EMPTY 8
|
||||
#define DOCKING_BLOCKED 1
|
||||
#define DOCKING_IMMOBILIZED 2
|
||||
#define DOCKING_AREA_EMPTY 4
|
||||
|
||||
|
||||
//Docking turf movements
|
||||
#define MOVE_TURF 1
|
||||
#define MOVE_AREA 2
|
||||
#define MOVE_CONTENTS 4
|
||||
@@ -10,12 +10,13 @@
|
||||
#define CHANNEL_BICYCLE 1016
|
||||
|
||||
//Citadel code
|
||||
#define CHANNEL_PRED 1018
|
||||
#define CHANNEL_PRED 1015
|
||||
#define CHANNEL_PREYLOOP 1014
|
||||
|
||||
//THIS SHOULD ALWAYS BE THE LOWEST ONE!
|
||||
//KEEP IT UPDATED
|
||||
|
||||
#define CHANNEL_HIGHEST_AVAILABLE 1015
|
||||
#define CHANNEL_HIGHEST_AVAILABLE 1013
|
||||
|
||||
#define CHANNEL_HIGHEST_AVAILABLE 1017
|
||||
#define SOUND_MINIMUM_PRESSURE 10
|
||||
|
||||
@@ -4,8 +4,9 @@
|
||||
|
||||
//mob/var/stat things
|
||||
#define CONSCIOUS 0
|
||||
#define UNCONSCIOUS 1
|
||||
#define DEAD 2
|
||||
#define SOFT_CRIT 1
|
||||
#define UNCONSCIOUS 2
|
||||
#define DEAD 3
|
||||
|
||||
//mob disabilities stat
|
||||
|
||||
@@ -21,9 +22,8 @@
|
||||
// bitflags for machine stat variable
|
||||
#define BROKEN 1
|
||||
#define NOPOWER 2
|
||||
#define POWEROFF 4 // tbd
|
||||
#define MAINT 8 // under maintaince
|
||||
#define EMPED 16 // temporary broken by EMP pulse
|
||||
#define MAINT 4 // under maintaince
|
||||
#define EMPED 8 // temporary broken by EMP pulse
|
||||
|
||||
//ai power requirement defines
|
||||
#define POWER_REQ_NONE 0
|
||||
|
||||
@@ -56,7 +56,6 @@
|
||||
#define INIT_ORDER_TIMER 1
|
||||
#define INIT_ORDER_DEFAULT 0
|
||||
#define INIT_ORDER_AIR -1
|
||||
#define INIT_ORDER_SHUTTLE -2
|
||||
#define INIT_ORDER_MINIMAP -3
|
||||
#define INIT_ORDER_ASSETS -4
|
||||
#define INIT_ORDER_ICON_SMOOTHING -5
|
||||
@@ -64,6 +63,7 @@
|
||||
#define INIT_ORDER_XKEYSCORE -10
|
||||
#define INIT_ORDER_STICKY_BAN -10
|
||||
#define INIT_ORDER_LIGHTING -20
|
||||
#define INIT_ORDER_SHUTTLE -21
|
||||
#define INIT_ORDER_SQUEAK -40
|
||||
#define INIT_ORDER_PERSISTENCE -100
|
||||
|
||||
|
||||
@@ -13,3 +13,11 @@ When using time2text(), please use "DDD" to find the weekday. Refrain from using
|
||||
#define FRIDAY "Fri"
|
||||
#define SATURDAY "Sat"
|
||||
#define SUNDAY "Sun"
|
||||
|
||||
#define SECONDS *10
|
||||
|
||||
#define MINUTES SECONDS*60
|
||||
|
||||
#define HOURS MINUTES*60
|
||||
|
||||
#define TICKS *world.tick_lag
|
||||
@@ -2,6 +2,7 @@
|
||||
#define DM_HOLD "Hold"
|
||||
#define DM_DIGEST "Digest"
|
||||
#define DM_HEAL "Heal"
|
||||
#define DM_NOISY "Noisy"
|
||||
|
||||
#define VORE_STRUGGLE_EMOTE_CHANCE 40
|
||||
|
||||
|
||||
@@ -205,6 +205,22 @@
|
||||
|
||||
return null
|
||||
|
||||
/proc/pickweightAllowZero(list/L) //The original pickweight proc will sometimes pick entries with zero weight. I'm not sure if changing the original will break anything, so I left it be.
|
||||
var/total = 0
|
||||
var/item
|
||||
for (item in L)
|
||||
if (!L[item])
|
||||
L[item] = 0
|
||||
total += L[item]
|
||||
|
||||
total = rand(0, total)
|
||||
for (item in L)
|
||||
total -=L [item]
|
||||
if (total <= 0 && L[item])
|
||||
return item
|
||||
|
||||
return null
|
||||
|
||||
//Pick a random element from the list and remove it from the list.
|
||||
/proc/pick_n_take(list/L)
|
||||
if(L.len)
|
||||
|
||||
@@ -85,7 +85,7 @@
|
||||
|
||||
/proc/log_pda(text)
|
||||
if (config.log_pda)
|
||||
WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]PDA: [text]")
|
||||
WRITE_FILE(GLOB.world_pda_log, "\[[time_stamp()]]PDA: [text]")
|
||||
|
||||
/proc/log_comment(text)
|
||||
if (config.log_pda)
|
||||
@@ -96,6 +96,9 @@
|
||||
if (config.log_pda)
|
||||
WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]CHAT: [text]")
|
||||
|
||||
/proc/log_qdel(text)
|
||||
WRITE_FILE(GLOB.world_qdel_log, "\[[time_stamp()]]QDEL: [text]")
|
||||
|
||||
/proc/log_sql(text)
|
||||
WRITE_FILE(GLOB.sql_error_log, "\[[time_stamp()]]SQL: [text]")
|
||||
|
||||
|
||||
@@ -49,3 +49,12 @@ GLOBAL_VAR_INIT(cmp_field, "name")
|
||||
|
||||
/proc/cmp_ruincost_priority(datum/map_template/ruin/A, datum/map_template/ruin/B)
|
||||
return initial(A.cost) - initial(B.cost)
|
||||
|
||||
/proc/cmp_qdel_item_time(datum/qdel_item/A, datum/qdel_item/B)
|
||||
. = B.hard_delete_time - A.hard_delete_time
|
||||
if (!.)
|
||||
. = B.destroy_time - A.destroy_time
|
||||
if (!.)
|
||||
. = B.failures - A.failures
|
||||
if (!.)
|
||||
. = B.qdels - A.qdels
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
#define CULT_POLL_WAIT 2400
|
||||
|
||||
/proc/get_area(atom/A)
|
||||
if (!istype(A))
|
||||
return
|
||||
for(A, A && !isarea(A), A=A.loc); //semicolon is for the empty statement
|
||||
return A
|
||||
if(isarea(A))
|
||||
return A
|
||||
var/turf/T = get_turf(A)
|
||||
return T ? T.loc : null
|
||||
|
||||
/proc/get_area_name(atom/X)
|
||||
var/area/Y = get_area(X)
|
||||
|
||||
@@ -926,10 +926,10 @@ GLOBAL_LIST_EMPTY(friendly_animal_types)
|
||||
return 0
|
||||
|
||||
//For creating consistent icons for human looking simple animals
|
||||
/proc/get_flat_human_icon(icon_id, datum/job/J, datum/preferences/prefs)
|
||||
/proc/get_flat_human_icon(icon_id, datum/job/J, datum/preferences/prefs, dummy_key)
|
||||
var/static/list/humanoid_icon_cache = list()
|
||||
if(!icon_id || !humanoid_icon_cache[icon_id])
|
||||
var/mob/living/carbon/human/dummy/body = new()
|
||||
var/mob/living/carbon/human/dummy/body = generate_or_wait_for_human_dummy(dummy_key)
|
||||
|
||||
if(prefs)
|
||||
prefs.copy_to(body)
|
||||
@@ -956,14 +956,12 @@ GLOBAL_LIST_EMPTY(friendly_animal_types)
|
||||
partial = getFlatIcon(body)
|
||||
out_icon.Insert(partial,dir=EAST)
|
||||
|
||||
qdel(body)
|
||||
|
||||
humanoid_icon_cache[icon_id] = out_icon
|
||||
dummy_key? unset_busy_human_dummy(dummy_key) : qdel(body)
|
||||
return out_icon
|
||||
else
|
||||
return humanoid_icon_cache[icon_id]
|
||||
|
||||
|
||||
//Hook, override to run code on- wait this is images
|
||||
//Images have dir without being an atom, so they get their own definition.
|
||||
//Lame.
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/ai/commandreport.ogg')
|
||||
|
||||
for(var/obj/machinery/computer/communications/C in GLOB.machines)
|
||||
if(!(C.stat & (BROKEN|NOPOWER)) && C.z == ZLEVEL_STATION)
|
||||
if(!(C.stat & (BROKEN|NOPOWER)) && (C.z in GLOB.station_z_levels))
|
||||
var/obj/item/paper/P = new /obj/item/paper(C.loc)
|
||||
P.name = "paper - '[title]'"
|
||||
P.info = text
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
//Runs the command in the system's shell, returns a list of (error code, stdout, stderr)
|
||||
|
||||
#define SHELLEO_NAME "data/shelleo."
|
||||
#define SHELLEO_ERR ".err"
|
||||
#define SHELLEO_OUT ".out"
|
||||
/world/proc/shelleo(command)
|
||||
var/static/list/shelleo_ids = list()
|
||||
var/stdout = ""
|
||||
var/stderr = ""
|
||||
var/errorcode = 1
|
||||
var/shelleo_id
|
||||
var/out_file = ""
|
||||
var/err_file = ""
|
||||
var/static/list/interpreters = list("[MS_WINDOWS]" = "cmd /c", "[UNIX]" = "sh -c")
|
||||
var/interpreter = interpreters["[world.system_type]"]
|
||||
if(interpreter)
|
||||
for(var/seo_id in shelleo_ids)
|
||||
if(!shelleo_ids[seo_id])
|
||||
shelleo_ids[seo_id] = TRUE
|
||||
shelleo_id = "[seo_id]"
|
||||
break
|
||||
if(!shelleo_id)
|
||||
shelleo_id = "[shelleo_ids.len + 1]"
|
||||
shelleo_ids += shelleo_id
|
||||
shelleo_ids[shelleo_id] = TRUE
|
||||
out_file = "[SHELLEO_NAME][shelleo_id][SHELLEO_OUT]"
|
||||
err_file = "[SHELLEO_NAME][shelleo_id][SHELLEO_ERR]"
|
||||
errorcode = shell("[interpreter] \"[command]\" > [out_file] 2> [err_file]")
|
||||
if(fexists(out_file))
|
||||
stdout = file2text(out_file)
|
||||
fdel(out_file)
|
||||
if(fexists(err_file))
|
||||
stderr = file2text(err_file)
|
||||
fdel(err_file)
|
||||
shelleo_ids[shelleo_id] = FALSE
|
||||
else
|
||||
CRASH("Operating System: [world.system_type] not supported") // If you encounter this error, you are encouraged to update this proc with support for the new operating system
|
||||
. = list(errorcode, stdout, stderr)
|
||||
#undef SHELLEO_NAME
|
||||
#undef SHELLEO_ERR
|
||||
#undef SHELLEO_OUT
|
||||
|
||||
/proc/shell_url_scrub(url)
|
||||
var/static/regex/bad_chars_regex = regex("\[^#%&./:=?\\w]*", "g")
|
||||
var/scrubbed_url = ""
|
||||
var/bad_match = ""
|
||||
var/last_good = 1
|
||||
var/bad_chars = 1
|
||||
do
|
||||
bad_chars = bad_chars_regex.Find(url)
|
||||
scrubbed_url += copytext(url, last_good, bad_chars)
|
||||
if(bad_chars)
|
||||
bad_match = url_encode(bad_chars_regex.match)
|
||||
scrubbed_url += bad_match
|
||||
last_good = bad_chars + length(bad_match)
|
||||
while(bad_chars)
|
||||
. = scrubbed_url
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
// Contains VOREStation type2type functions
|
||||
// Contains VOREStation based vore description type2type functions
|
||||
// list2text - takes delimiter and returns text
|
||||
// text2list - takes delimiter, and creates list
|
||||
//
|
||||
|
||||
@@ -812,7 +812,7 @@ GLOBAL_LIST_INIT(can_embed_types, typecacheof(list(
|
||||
|
||||
|
||||
/*
|
||||
Checks if that loc and dir has a item on the wall
|
||||
Checks if that loc and dir has an item on the wall
|
||||
*/
|
||||
GLOBAL_LIST_INIT(WALLITEMS, typecacheof(list(
|
||||
/obj/machinery/power/apc, /obj/machinery/airalarm, /obj/item/device/radio/intercom,
|
||||
|
||||
@@ -72,4 +72,4 @@
|
||||
//Update this whenever the db schema changes
|
||||
//make sure you add an update to the schema_version stable in the db changelog
|
||||
#define DB_MAJOR_VERSION 3
|
||||
#define DB_MINOR_VERSION 1
|
||||
#define DB_MINOR_VERSION 3
|
||||
|
||||
@@ -105,53 +105,17 @@ GLOBAL_LIST_INIT(TAGGERLOCATIONS, list("Disposals",
|
||||
|
||||
GLOBAL_LIST_INIT(guitar_notes, flist("sound/guitar/"))
|
||||
|
||||
GLOBAL_LIST_INIT(station_prefixes, list("", "Imperium", "Heretical", "Cuban",
|
||||
"Psychic", "Elegant", "Common", "Uncommon", "Rare", "Unique",
|
||||
"Houseruled", "Religious", "Atheist", "Traditional", "Houseruled",
|
||||
"Mad", "Super", "Ultra", "Secret", "Top Secret", "Deep", "Death",
|
||||
"Zybourne", "Central", "Main", "Government", "Uoi", "Fat",
|
||||
"Automated", "Experimental", "Augmented"))
|
||||
GLOBAL_LIST_INIT(station_prefixes, world.file2list("strings/station_prefixes.txt") + "")
|
||||
|
||||
GLOBAL_LIST_INIT(station_names, list("", "Stanford", "Dorf", "Alium",
|
||||
"Prefix", "Clowning", "Aegis", "Ishimura", "Scaredy", "Death-World",
|
||||
"Mime", "Honk", "Rogue", "MacRagge", "Ultrameens", "Safety", "Paranoia",
|
||||
"Explosive", "Neckbear", "Donk", "Muppet", "North", "West", "East",
|
||||
"South", "Slant-ways", "Widdershins", "Rimward", "Expensive",
|
||||
"Procreatory", "Imperial", "Unidentified", "Immoral", "Carp", "Ork",
|
||||
"Pete", "Control", "Nettle", "Aspie", "Class", "Crab", "Fist",
|
||||
"Corrogated","Skeleton","Race", "Fatguy", "Gentleman", "Capitalist",
|
||||
"Communist", "Bear", "Beard", "Derp", "Space", "Spess", "Star", "Moon",
|
||||
"System", "Mining", "Neckbeard", "Research", "Supply", "Military",
|
||||
"Orbital", "Battle", "Science", "Asteroid", "Home", "Production",
|
||||
"Transport", "Delivery", "Extraplanetary", "Orbital", "Correctional",
|
||||
"Robot", "Hats", "Pizza"))
|
||||
GLOBAL_LIST_INIT(station_names, world.file2list("strings/station_names.txt" + ""))
|
||||
|
||||
GLOBAL_LIST_INIT(station_suffixes, list("Station", "Frontier",
|
||||
"Suffix", "Death-trap", "Space-hulk", "Lab", "Hazard","Spess Junk",
|
||||
"Fishery", "No-Moon", "Tomb", "Crypt", "Hut", "Monkey", "Bomb",
|
||||
"Trade Post", "Fortress", "Village", "Town", "City", "Edition", "Hive",
|
||||
"Complex", "Base", "Facility", "Depot", "Outpost", "Installation",
|
||||
"Drydock", "Observatory", "Array", "Relay", "Monitor", "Platform",
|
||||
"Construct", "Hangar", "Prison", "Center", "Port", "Waystation",
|
||||
"Factory", "Waypoint", "Stopover", "Hub", "HQ", "Office", "Object",
|
||||
"Fortification", "Colony", "Planet-Cracker", "Roost", "Fat Camp",
|
||||
"Airstrip"))
|
||||
GLOBAL_LIST_INIT(station_suffixes, world.file2list("strings/station_suffixes.txt"))
|
||||
|
||||
GLOBAL_LIST_INIT(greek_letters, list("Alpha", "Beta", "Gamma", "Delta",
|
||||
"Epsilon", "Zeta", "Eta", "Theta", "Iota", "Kappa", "Lambda", "Mu",
|
||||
"Nu", "Xi", "Omicron", "Pi", "Rho", "Sigma", "Tau", "Upsilon", "Phi",
|
||||
"Chi", "Psi", "Omega"))
|
||||
GLOBAL_LIST_INIT(greek_letters, world.file2list("strings/greek_letters.txt"))
|
||||
|
||||
GLOBAL_LIST_INIT(phonetic_alphabet, list("Alpha", "Bravo", "Charlie",
|
||||
"Delta", "Echo", "Foxtrot", "Golf", "Hotel", "India", "Juliet",
|
||||
"Kilo", "Lima", "Mike", "November", "Oscar", "Papa", "Quebec",
|
||||
"Romeo", "Sierra", "Tango", "Uniform", "Victor", "Whiskey", "X-ray",
|
||||
"Yankee", "Zulu"))
|
||||
GLOBAL_LIST_INIT(phonetic_alphabet, world.file2list("strings/phonetic_alphabet.txt"))
|
||||
|
||||
GLOBAL_LIST_INIT(numbers_as_words, list("One", "Two", "Three", "Four",
|
||||
"Five", "Six", "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve",
|
||||
"Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen",
|
||||
"Eighteen", "Nineteen"))
|
||||
GLOBAL_LIST_INIT(numbers_as_words, world.file2list("strings/numbers_as_words.txt"))
|
||||
|
||||
/proc/generate_number_strings()
|
||||
var/list/L[198]
|
||||
|
||||
@@ -1,55 +1,57 @@
|
||||
#define Z_NORTH 1
|
||||
#define Z_EAST 2
|
||||
#define Z_SOUTH 3
|
||||
#define Z_WEST 4
|
||||
|
||||
#define Z_NORTH 1
|
||||
#define Z_EAST 2
|
||||
#define Z_SOUTH 3
|
||||
#define Z_WEST 4
|
||||
|
||||
GLOBAL_LIST_INIT(cardinals, list(NORTH, SOUTH, EAST, WEST))
|
||||
GLOBAL_LIST_INIT(alldirs, list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST))
|
||||
GLOBAL_LIST_INIT(diagonals, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST))
|
||||
|
||||
//This list contains the z-level numbers which can be accessed via space travel and the percentile chances to get there.
|
||||
//(Exceptions: extended, sandbox and nuke) -Errorage
|
||||
//Was list("3" = 30, "4" = 70).
|
||||
//Spacing should be a reliable method of getting rid of a body -- Urist.
|
||||
//Go away Urist, I'm restoring this to the longer list. ~Errorage
|
||||
GLOBAL_LIST_INIT(accessable_z_levels, list(1,3,4,5,6,7)) //Keep this to six maps, repeating z-levels is ok if needed
|
||||
|
||||
GLOBAL_LIST(global_map)
|
||||
//list/global_map = list(list(1,5),list(4,3))//an array of map Z levels.
|
||||
//Resulting sector map looks like
|
||||
//|_1_|_4_|
|
||||
//|_5_|_3_|
|
||||
//
|
||||
//1 - SS13
|
||||
//4 - Derelict
|
||||
//3 - AI satellite
|
||||
//5 - empty space
|
||||
|
||||
GLOBAL_LIST_EMPTY(landmarks_list) //list of all landmarks created
|
||||
GLOBAL_LIST_EMPTY(start_landmarks_list) //list of all spawn points created
|
||||
GLOBAL_LIST_EMPTY(department_security_spawns) //list of all department security spawns
|
||||
GLOBAL_LIST_EMPTY(generic_event_spawns) //list of all spawns for events
|
||||
|
||||
GLOBAL_LIST_EMPTY(wizardstart)
|
||||
GLOBAL_LIST_EMPTY(newplayer_start)
|
||||
GLOBAL_LIST_EMPTY(prisonwarp) //prisoners go to these
|
||||
GLOBAL_LIST_EMPTY(holdingfacility) //captured people go here
|
||||
GLOBAL_LIST_EMPTY(xeno_spawn)//Aliens spawn at these.
|
||||
GLOBAL_LIST_EMPTY(tdome1)
|
||||
GLOBAL_LIST_EMPTY(tdome2)
|
||||
GLOBAL_LIST_EMPTY(tdomeobserve)
|
||||
GLOBAL_LIST_EMPTY(tdomeadmin)
|
||||
GLOBAL_LIST_EMPTY(prisonwarped) //list of players already warped
|
||||
GLOBAL_LIST_EMPTY(blobstart)
|
||||
GLOBAL_LIST_EMPTY(secequipment)
|
||||
GLOBAL_LIST_EMPTY(deathsquadspawn)
|
||||
GLOBAL_LIST_EMPTY(emergencyresponseteamspawn)
|
||||
GLOBAL_LIST_EMPTY(ruin_landmarks)
|
||||
|
||||
//away missions
|
||||
GLOBAL_LIST_EMPTY(awaydestinations) //a list of landmarks that the warpgate can take you to
|
||||
|
||||
//used by jump-to-area etc. Updated by area/updateName()
|
||||
GLOBAL_LIST_EMPTY(sortedAreas)
|
||||
|
||||
GLOBAL_LIST_EMPTY(all_abstract_markers)
|
||||
GLOBAL_LIST_INIT(alldirs, list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST))
|
||||
GLOBAL_LIST_INIT(diagonals, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST))
|
||||
|
||||
//This list contains the z-level numbers which can be accessed via space travel and the percentile chances to get there.
|
||||
//(Exceptions: extended, sandbox and nuke) -Errorage
|
||||
//Was list("3" = 30, "4" = 70).
|
||||
//Spacing should be a reliable method of getting rid of a body -- Urist.
|
||||
//Go away Urist, I'm restoring this to the longer list. ~Errorage
|
||||
GLOBAL_LIST_INIT(accessable_z_levels, list(1,3,4,5,6,7)) //Keep this to six maps, repeating z-levels is ok if needed
|
||||
|
||||
GLOBAL_LIST_INIT(station_z_levels, list(ZLEVEL_STATION_PRIMARY))
|
||||
|
||||
GLOBAL_LIST(global_map)
|
||||
//list/global_map = list(list(1,5),list(4,3))//an array of map Z levels.
|
||||
//Resulting sector map looks like
|
||||
//|_1_|_4_|
|
||||
//|_5_|_3_|
|
||||
//
|
||||
//1 - SS13
|
||||
//4 - Derelict
|
||||
//3 - AI satellite
|
||||
//5 - empty space
|
||||
|
||||
GLOBAL_LIST_EMPTY(landmarks_list) //list of all landmarks created
|
||||
GLOBAL_LIST_EMPTY(start_landmarks_list) //list of all spawn points created
|
||||
GLOBAL_LIST_EMPTY(department_security_spawns) //list of all department security spawns
|
||||
GLOBAL_LIST_EMPTY(generic_event_spawns) //list of all spawns for events
|
||||
|
||||
GLOBAL_LIST_EMPTY(wizardstart)
|
||||
GLOBAL_LIST_EMPTY(newplayer_start)
|
||||
GLOBAL_LIST_EMPTY(prisonwarp) //prisoners go to these
|
||||
GLOBAL_LIST_EMPTY(holdingfacility) //captured people go here
|
||||
GLOBAL_LIST_EMPTY(xeno_spawn)//Aliens spawn at these.
|
||||
GLOBAL_LIST_EMPTY(tdome1)
|
||||
GLOBAL_LIST_EMPTY(tdome2)
|
||||
GLOBAL_LIST_EMPTY(tdomeobserve)
|
||||
GLOBAL_LIST_EMPTY(tdomeadmin)
|
||||
GLOBAL_LIST_EMPTY(prisonwarped) //list of players already warped
|
||||
GLOBAL_LIST_EMPTY(blobstart)
|
||||
GLOBAL_LIST_EMPTY(secequipment)
|
||||
GLOBAL_LIST_EMPTY(deathsquadspawn)
|
||||
GLOBAL_LIST_EMPTY(emergencyresponseteamspawn)
|
||||
GLOBAL_LIST_EMPTY(ruin_landmarks)
|
||||
|
||||
//away missions
|
||||
GLOBAL_LIST_EMPTY(awaydestinations) //a list of landmarks that the warpgate can take you to
|
||||
|
||||
//used by jump-to-area etc. Updated by area/updateName()
|
||||
GLOBAL_LIST_EMPTY(sortedAreas)
|
||||
|
||||
GLOBAL_LIST_EMPTY(all_abstract_markers)
|
||||
|
||||
@@ -4,6 +4,8 @@ GLOBAL_VAR(world_game_log)
|
||||
GLOBAL_PROTECT(world_game_log)
|
||||
GLOBAL_VAR(world_runtime_log)
|
||||
GLOBAL_PROTECT(world_runtime_log)
|
||||
GLOBAL_VAR(world_qdel_log)
|
||||
GLOBAL_PROTECT(world_qdel_log)
|
||||
GLOBAL_VAR(world_attack_log)
|
||||
GLOBAL_PROTECT(world_attack_log)
|
||||
GLOBAL_VAR(world_href_log)
|
||||
@@ -14,6 +16,8 @@ GLOBAL_VAR(config_error_log)
|
||||
GLOBAL_PROTECT(config_error_log)
|
||||
GLOBAL_VAR(sql_error_log)
|
||||
GLOBAL_PROTECT(sql_error_log)
|
||||
GLOBAL_VAR(world_pda_log)
|
||||
GLOBAL_PROTECT(world_pda_log)
|
||||
|
||||
GLOBAL_LIST_EMPTY(bombers)
|
||||
GLOBAL_PROTECT(bombers)
|
||||
|
||||
+3
-2
@@ -14,7 +14,8 @@
|
||||
if(call(client.click_intercept, "InterceptClickOn")(src, params, A))
|
||||
return
|
||||
|
||||
if(control_disabled || stat) return
|
||||
if(control_disabled || incapacitated())
|
||||
return
|
||||
|
||||
if(ismob(A))
|
||||
ai_actual_track(A)
|
||||
@@ -31,7 +32,7 @@
|
||||
if(call(client.click_intercept, "InterceptClickOn")(src, params, A))
|
||||
return
|
||||
|
||||
if(control_disabled || stat)
|
||||
if(control_disabled || incapacitated())
|
||||
return
|
||||
|
||||
var/turf/pixel_turf = get_turf_pixel(A)
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
icon = 'icons/mob/screen_ai.dmi'
|
||||
|
||||
/obj/screen/ai/Click()
|
||||
if(isobserver(usr))
|
||||
return 1
|
||||
if(isobserver(usr) || usr.incapacitated())
|
||||
return TRUE
|
||||
|
||||
/obj/screen/ai/aicore
|
||||
name = "AI core"
|
||||
@@ -20,6 +20,8 @@
|
||||
icon_state = "camera"
|
||||
|
||||
/obj/screen/ai/camera_list/Click()
|
||||
if(..())
|
||||
return
|
||||
var/mob/living/silicon/ai/AI = usr
|
||||
var/camera = input(AI, "Choose which camera you want to view", "Cameras") as null|anything in AI.get_camera_list()
|
||||
AI.ai_camera_list(camera)
|
||||
@@ -130,6 +132,8 @@
|
||||
icon_state = "take_picture"
|
||||
|
||||
/obj/screen/ai/image_take/Click()
|
||||
if(..())
|
||||
return
|
||||
if(isAI(usr))
|
||||
var/mob/living/silicon/ai/AI = usr
|
||||
AI.aicamera.toggle_camera_mode()
|
||||
@@ -142,6 +146,8 @@
|
||||
icon_state = "view_images"
|
||||
|
||||
/obj/screen/ai/image_view/Click()
|
||||
if(..())
|
||||
return
|
||||
if(isAI(usr))
|
||||
var/mob/living/silicon/ai/AI = usr
|
||||
AI.aicamera.viewpictures()
|
||||
|
||||
@@ -633,6 +633,7 @@ so as to remain in compliance with the most up-to-date laws."
|
||||
/obj/screen/alert/restrained/buckled
|
||||
name = "Buckled"
|
||||
desc = "You've been buckled to something. Click the alert to unbuckle unless you're handcuffed."
|
||||
icon_state = "buckled"
|
||||
|
||||
/obj/screen/alert/restrained/handcuffed
|
||||
name = "Handcuffed"
|
||||
@@ -698,4 +699,3 @@ so as to remain in compliance with the most up-to-date laws."
|
||||
severity = 0
|
||||
master = null
|
||||
screen_loc = ""
|
||||
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
screen_loc = "CENTER-7,CENTER-7"
|
||||
layer = FULLSCREEN_LAYER
|
||||
plane = FULLSCREEN_PLANE
|
||||
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
|
||||
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
|
||||
var/severity = 0
|
||||
var/show_when_dead = FALSE
|
||||
|
||||
@@ -95,16 +95,20 @@
|
||||
layer = CRIT_LAYER
|
||||
plane = FULLSCREEN_PLANE
|
||||
|
||||
/obj/screen/fullscreen/crit/vision
|
||||
icon_state = "oxydamageoverlay"
|
||||
layer = BLIND_LAYER
|
||||
|
||||
/obj/screen/fullscreen/blind
|
||||
icon_state = "blackimageoverlay"
|
||||
layer = BLIND_LAYER
|
||||
plane = FULLSCREEN_PLANE
|
||||
|
||||
/obj/screen/fullscreen/curse
|
||||
icon_state = "curse"
|
||||
layer = CURSE_LAYER
|
||||
plane = FULLSCREEN_PLANE
|
||||
|
||||
/obj/screen/fullscreen/curse
|
||||
icon_state = "curse"
|
||||
layer = CURSE_LAYER
|
||||
plane = FULLSCREEN_PLANE
|
||||
|
||||
/obj/screen/fullscreen/impaired
|
||||
icon_state = "impairedoverlay"
|
||||
|
||||
@@ -168,4 +172,4 @@
|
||||
plane = LIGHTING_PLANE
|
||||
layer = LIGHTING_LAYER
|
||||
blend_mode = BLEND_ADD
|
||||
show_when_dead = TRUE
|
||||
show_when_dead = TRUE
|
||||
|
||||
@@ -247,7 +247,7 @@
|
||||
|
||||
|
||||
/obj/screen/parallax_layer/Initialize(mapload, view)
|
||||
..()
|
||||
. = ..()
|
||||
if (!view)
|
||||
view = world.view
|
||||
update_o(view)
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
/obj/screen/swarmer/Replicate
|
||||
icon_state = "ui_replicate"
|
||||
name = "Replicate (Costs 50 Resources)"
|
||||
desc = "Creates a another of our kind."
|
||||
desc = "Creates another of our kind."
|
||||
|
||||
/obj/screen/swarmer/Replicate/Click()
|
||||
if(isswarmer(usr))
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
/obj/attackby(obj/item/I, mob/living/user, params)
|
||||
return I.attack_obj(src, user)
|
||||
|
||||
/mob/living/attackby(obj/item/I, mob/user, params)
|
||||
/mob/living/attackby(obj/item/I, mob/living/user, params)
|
||||
user.changeNext_move(CLICK_CD_MELEE)
|
||||
if(user.a_intent == INTENT_HARM && stat == DEAD && butcher_results) //can we butcher it?
|
||||
var/sharpness = I.is_sharp()
|
||||
|
||||
@@ -26,4 +26,38 @@
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_GOLD = 2500, MAT_METAL = 5000, MAT_GLASS = 5000)
|
||||
build_path = /obj/item/gun/energy/laser/carbine/nopin
|
||||
category = list("Weapons")
|
||||
category = list("Weapons")
|
||||
|
||||
/obj/item/gun/ballistic/automatic/pistol/antitank
|
||||
name = "Anti Tank Pistol"
|
||||
desc = "A massively impractical and silly monstrosity of a pistol that fires .50 calliber rounds. The recoil is likely to dislocate your wrist."
|
||||
icon = 'icons/obj/guns/cit_guns.dmi'
|
||||
icon_state = "atp"
|
||||
item_state = "pistol"
|
||||
recoil = 6
|
||||
mag_type = /obj/item/ammo_box/magazine/sniper_rounds
|
||||
fire_delay = 50
|
||||
burst_size = 1
|
||||
origin_tech = "combat=7"
|
||||
can_suppress = 0
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
actions_types = list()
|
||||
fire_sound = 'sound/weapons/blastcannon.ogg'
|
||||
spread = 30 //damn thing has no rifling.
|
||||
|
||||
|
||||
/obj/item/gun/ballistic/automatic/pistol/antitank/update_icon()
|
||||
..()
|
||||
if(magazine)
|
||||
cut_overlays()
|
||||
add_overlay("atp-mag")
|
||||
else
|
||||
cut_overlays()
|
||||
icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
|
||||
|
||||
/obj/item/gun/ballistic/automatic/pistol/antitank/syndicate
|
||||
name = "Syndicate Anti Tank Pistol"
|
||||
desc = "A massively impractical and silly monstrosity of a pistol that fires .50 calliber rounds. The recoil is likely to dislocate a variety of joints without proper bracing."
|
||||
pin = /obj/item/device/firing_pin/implant/pindicate
|
||||
origin_tech = "combat=7;syndicate=6"
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user