Commit Graph
256 Commits
Author SHA1 Message Date
LetterJayandGitHub 9d3c4d4702 Merge pull request #1989 from Citadel-Station-13/upstream-merge-29215
[MIRROR] Replaces ex_act and emp_act numbers with defines
2017-07-13 23:57:35 -05:00
CitadelStationBot 55462ed7d1 Replaces ex_act and emp_act numbers with defines 2017-07-13 17:46:41 -05:00
CitadelStationBot 1da785ffb5 Removes old height parameter from CanPass proc 2017-07-13 17:46:36 -05:00
CitadelStationBotandkevinz000 f893863397 [MIRROR] Refactors speech/communication logging and adds coordinates to speech logs (#1905)
* Refactors speech/communication logging and adds coordinates to speech logs

* Update clockwork_slab.dm

* Delete clockwork_slab.dm.rej

* Update browserOutput.dm

* Delete browserOutput.dm.rej
2017-07-13 06:37:51 -07:00
CitadelStationBotandkevinz000 e43af7f1bd [MIRROR] get_edge_target_turf() now finds the proper turf when using diagonal directions (#1972)
* get_edge_target_turf() now finds the proper turf when using diagonal directions

* Update camera.dm
2017-07-10 16:15:02 -07:00
CitadelStationBotandkevinz000 ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBotandkevinz000 1b70c06474 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs (#1970) 2017-07-10 16:10:42 -07:00
CitadelStationBot 90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
CitadelStationBot b42fb13549 Adds Headphones! 2017-07-07 12:44:47 -05:00
CitadelStationBotandkevinz000 be15914a6f Minor code clean up in magnet controller (#1921) 2017-07-07 04:47:52 -07:00
CitadelStationBot b6b999b15a Lowercased computer names 2017-07-06 20:09:27 -05:00
PoojawaandGitHub b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBotandkevinz000 793a2ce28f Grammar and message tweaks (#1722) 2017-07-01 21:22:29 -07:00
katnepandkevinz000 b21556329b TAUR SWEATERS and keyhole (#1827)
by request of annoying whiners, here are sweaters in the clothes mate
have fun
2017-06-30 21:25:17 -07:00
CitadelStationBotandkevinz000 57bf6fc7ba Machinery clears it's occupant var if removed (#1767) 2017-06-30 20:42:58 -07:00
CitadelStationBotandkevinz000 9d5e51777b use_power var now uses a define to reflect it not being a bool (#1842) 2017-06-30 20:41:59 -07:00
CitadelStationBotandPoojawa c7d4809579 Reduces default brig times to be consistent with suggested policy. (#1609) 2017-06-28 04:07:43 -05:00
LetterJayandGitHub e680da7de6 Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584
[MIRROR] Ancient Space Station [Space Spawn Ruin]
2017-06-27 21:25:50 -05:00
LetterJayandGitHub d138c56781 Merge pull request #1664 from Citadel-Station-13/upstream-merge-28505
[MIRROR] Vending machines accept space cash.
2017-06-26 06:15:19 -05:00
LetterJay 5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00
CitadelStationBot d4c54bb0b5 Ancient Space Station [Space Spawn Ruin] 2017-06-25 11:03:27 -05:00
CitadelStationBotandkevinz000 68498b3597 RADIMMUNE species can no longer be used for radiation free DNA research (#1553) 2017-06-20 08:02:38 -07:00
CitadelStationBotandkevinz000 30d3a42db6 Minor telecom code cleanup (#1691) 2017-06-20 07:58:53 -07:00
LetterJayandGitHub 42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
LetterJay a544d99f9f cleanup and commits 2017-06-19 12:35:05 -05:00
CitadelStationBot 341a229b94 Vending machines accept space cash. 2017-06-18 20:35:08 -05:00
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