Commit Graph
229 Commits
Author SHA1 Message Date
CitadelStationBotandkevinz000 4c3f515fd6 Fixes borging factory (#1580) 2017-06-17 13:30:27 -07:00
LetterJayandGitHub a1bd66ef8b Merge pull request #1634 from Citadel-Station-13/upstream-merge-28414
[MIRROR] Adds onions
2017-06-17 10:04:59 -05:00
CitadelStationBot f86bda7cda Adds onions 2017-06-16 16:22:38 -05:00
CitadelStationBot 9bd98194b2 Vomit fix 2017-06-16 15:19:26 -05:00
LetterJayandGitHub b602462cbb Create portable_turret.dm 2017-06-14 12:05:31 -05:00
LetterJayandGitHub 74e6bc7ee2 Merge branch 'master' into SyndicateStuff 2017-06-14 11:44:32 -05:00
LetterJay 813bcc2b8d commit 2017-06-14 11:16:54 -05:00
LetterJayandGitHub e1e60417f2 Merge pull request #1325 from Citadel-Station-13/upstream-merge-27884
[MIRROR] CereStation Security Department Revamp (and other misc fixes/changes)
2017-06-14 08:49:01 -05:00
LetterJayandGitHub 4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
Selective mirror sync
2017-06-14 06:41:01 -05:00
CitadelStationBotandkevinz000 6b79f26c9b Fix #28176 : You can EMP Proof a camera with a sheet of plasma (#1478) 2017-06-13 13:46:42 -07:00
CitadelStationBotandkevinz000 16f968f5e5 Some other code now uses ai status display list (#1506) 2017-06-13 13:43:04 -07:00
CitadelStationBotandkevinz000 33eb60747f Refactored advanced camera consoles (#1576) 2017-06-13 13:39:47 -07:00
LetterJayandGitHub 2b0a1c5ab1 Merge pull request #1528 from Citadel-Station-13/upstream-merge-28271
[MIRROR] Fixes pipe dispensers
2017-06-12 12:40:03 -05:00
LetterJayandGitHub 46f4472bca Merge pull request #1507 from Citadel-Station-13/upstream-merge-28207
[MIRROR] Medical record summaries are now single inputs as well
2017-06-12 12:38:41 -05:00
LetterJayandGitHub 47315c27e2 Merge pull request #1549 from Citadel-Station-13/upstream-merge-28320
[MIRROR] AI liquid dispensers are now more usable
2017-06-12 12:18:12 -05:00
CitadelStationBot edf026a41d AI liquid dispensers are now more usable 2017-06-11 20:51:02 -05:00
CitadelStationBot 57dc205514 Adds the ability to attach papers and photos to airlocks 2017-06-11 17:29:48 -05:00
LetterJay 11ff6a7628 upstream-merge-27971 2017-06-11 08:21:14 -05:00
LetterJay b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
CitadelStationBot f03c39e8dc Fixes pipe dispensers 2017-06-10 19:10:17 -05:00
LetterJayandGitHub 7189249f66 Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115
[MIRROR] A large and unasked for  repath and improvement of accessories (formerly ties, but actually armbands and medals)
2017-06-10 09:01:25 -05:00
CitadelStationBot 7658deae09 Fixes communications consoles 2017-06-09 20:08:42 -05:00
CitadelStationBot 9198b10fd3 Medical record summaries are now single inputs as well 2017-06-09 09:29:47 -05:00
CitadelStationBot e034a6be50 Security record crime details is now a single line input box 2017-06-08 19:08:53 -05:00
CitadelStationBot 9725329268 A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) 2017-06-07 03:06:15 -05:00
LetterJayandGitHub e98868e9e1 Merge pull request #1437 from Citadel-Station-13/upstream-merge-28100
[MIRROR] Hang up holocalls with an action
2017-06-06 13:30:19 -05:00
CitadelStationBot 98e2a659f4 Hang up holocalls with an action 2017-06-06 10:34:58 -05:00
CitadelStationBot 369d8f1142 Fixes 28060 : emergency shields have a hit effect instead of setting opacity to 1 2017-06-06 07:13:05 -05:00
LetterJayandGitHub fc1017fa14 Merge pull request #1287 from Citadel-Station-13/upstream-merge-27801
[MIRROR] Holocall cleanup
2017-06-05 23:19:23 -05:00
CitadelStationBotandkevinz000 6e632190b3 Planned Spaceparenthood would like to apologize for mislabeling their cloning pod ejection buttons. (#1366) 2017-06-04 09:09:44 -07:00
CitadelStationBotandkevinz000 c1adecc0e2 Fix AI status displays to use a list instead of the world list (#1391) 2017-06-04 09:08:04 -07:00
CitadelStationBotandkevinz000 7ec36019d5 Refactor another spawned cooldown var (#1383) 2017-06-04 09:07:49 -07:00
CitadelStationBotandkevinz000 e57863cfe1 Refactor another spawn cooldown (#1385) 2017-06-04 09:06:38 -07:00
CitadelStationBotandkevinz000 1e12557776 Remove spawns in favour of stacktrace calls, which don't stop the called (#1382) 2017-06-04 09:06:27 -07:00
CitadelStationBotandkevinz000 6def6cddda Refactors yet another spawn cooldown (#1384) 2017-06-04 09:06:14 -07:00
kevinz000andGitHub b9c4873ee9 Merge branch 'master' into upstream-merge-27801 2017-06-03 06:38:57 -07:00
CitadelStationBotandkevinz000 fa305c2aec [MIRROR] Fix NOPOWER being set incorrectly for holopads (#1300)
* Fix NOPOWER being set incorrectly for holopads

* Update hologram.dm

* Delete hologram.dm.rej
2017-06-03 06:37:30 -07:00
LetterJayandkevinz000 976c1244dd Config shit for cards (#1310) 2017-06-02 21:56:08 -07:00
kevinz000andGitHub 224f1d8bd1 Delete hologram.dm.rej 2017-06-02 21:50:17 -07:00
kevinz000andGitHub c483767431 Update hologram.dm 2017-06-02 21:50:11 -07:00
CitadelStationBotandkevinz000 2dc13e6242 makes machineguns pass their users to their fire helpers instead of the floor (#1256) 2017-06-02 21:46:15 -07:00
CitadelStationBotandkevinz000 55f8700a8c Fix some camera Initializes (#1337) 2017-06-02 21:18:07 -07:00
LetterJayandGitHub c36ca8a434 Merge pull request #1344 from Citadel-Station-13/upstream-merge-27945
[MIRROR] Fixes airlocks not updating icon properly
2017-06-02 22:46:38 -05:00
CitadelStationBot b676e7b5ae Fixes airlocks not updating icon properly 2017-06-02 12:14:17 -05:00
CitadelStationBot 96eb21fa2a CereStation Security Department Revamp (and other misc fixes/changes) 2017-05-31 19:57:52 -05:00
CitadelStationBot 4eb5a9bf21 Mapped active shieldgens 2017-05-31 08:56:07 -05:00
LetterJayandGitHub 976086e490 Merge branch 'master' into upstream-merge-27534 2017-05-30 16:45:59 -05:00
LetterJayandGitHub 377d3ffbf9 Merge pull request #1184 from Citadel-Station-13/upstream-merge-27631
[MIRROR] Turret bases will properly layer under turret covers
2017-05-30 15:47:00 -05:00
LetterJayandGitHub f2730839d4 Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361
[MIRROR]  Refactors explosions
2017-05-30 15:15:51 -05:00
LetterJayandGitHub 7750095289 Merge pull request #1281 from Citadel-Station-13/upstream-merge-27770
[MIRROR] AI holocall hangups
2017-05-29 15:01:43 -05:00