Commit Graph

12298 Commits

Author SHA1 Message Date
CitadelStationBot 7ec2a4230d Automatic changelog generation for PR #4973 [ci skip] 2018-01-20 13:17:52 -06:00
LetterJay aebac8692e Merge pull request #4973 from Citadel-Station-13/upstream-merge-34631
[MIRROR] Emagged Airlocks Are Easier To Deconstruct
2018-01-20 13:17:50 -06:00
LetterJay 26fb702233 Merge pull request #4972 from Citadel-Station-13/upstream-merge-34649
[MIRROR] Fixes spider reagents typo
2018-01-20 13:17:35 -06:00
LetterJay fb64493067 Merge pull request #4971 from Citadel-Station-13/upstream-merge-34653
[MIRROR] Disable ruins for test run mode
2018-01-20 13:17:04 -06:00
CitadelStationBot c3957cfcc3 Automatic changelog generation for PR #4970 [ci skip] 2018-01-20 13:16:09 -06:00
LetterJay 5f7cc68e40 Merge pull request #4970 from Citadel-Station-13/upstream-merge-34595
[MIRROR] Cargotechs now spawn with Export Scanners
2018-01-20 13:16:07 -06:00
LetterJay a8055123b6 Merge pull request #4969 from Citadel-Station-13/upstream-merge-34605
[MIRROR] Fixes some kinetic accelerator runtimes
2018-01-20 13:15:53 -06:00
LetterJay a53dc16ae8 stop 2018-01-20 11:32:20 -06:00
CitadelStationBot 2f66ff8dba Emagged Airlocks Are Easier To Deconstruct 2018-01-20 09:50:00 -06:00
Jordan Brown d57f616131 Merge pull request #34631 from uraniummeltdown/airlock
Emagged Airlocks Are Easier To Deconstruct
2018-01-20 09:50:00 -06:00
CitadelStationBot 0997980c59 Fixes spider reagents typo 2018-01-20 09:48:44 -06:00
Jordan Brown 0042517af9 Merge pull request #34649 from ShizCalev/spider-nutriment-typo
Fixes spider reagents typo
2018-01-20 09:48:44 -06:00
CitadelStationBot c38ea842fe Disable ruins for test run mode 2018-01-20 05:28:45 -06:00
Jordan Brown 46692c87b4 Disable ruins for test run mode (#34653)
* Disable ruins for test run mode

* Fix

* Actually, let's enable them all

* That never happened
2018-01-20 05:28:45 -06:00
CitadelStationBot a21e806a9f Cargotechs now spawn with Export Scanners 2018-01-19 22:32:18 -06:00
MrDoomBringer 449c7d79df Cargotechs now spawn with Export Scanners (#34595)
* excessiveuseof[b]obblestone

* whups

* praisenarsie
2018-01-19 22:32:17 -06:00
CitadelStationBot 7023d82af6 Fixes some kinetic accelerator runtimes 2018-01-19 19:47:21 -06:00
Leo 945358fbfd Merge pull request #34605 from ShizCalev/kinetic_accelerator-runtimes
Fixes some kinetic accelerator runtimes
2018-01-19 19:47:21 -06:00
LetterJay d1487e1c65 Merge pull request #4966 from deathride58/temporarybandaid
Temporarily comments out footdirt proc in an attempt to find out whats making the server crash
2018-01-19 14:07:25 -06:00
deathride58 10e6de7421 Merge pull request #4920 from Citadel-Station-13/upstream-merge-34603
[MIRROR] Revert "Fix config_dir usage (#34469)"
2018-01-19 19:52:36 +00:00
deathride58 9eada1167b Merge pull request #4965 from Citadel-Station-13/upstream-merge-34620
[MIRROR] Corrects tile color defines
2018-01-19 19:46:56 +00:00
CitadelStationBot 505b62a6aa Automatic changelog generation for PR #4963 [ci skip] 2018-01-19 13:45:26 -06:00
deathride58 f6dbe3ea58 Merge pull request #4963 from Citadel-Station-13/upstream-merge-34504
[MIRROR] allows servants to cancel warps more intuitively by clicking on the button again
2018-01-19 19:45:23 +00:00
deathride58 1a9e1b36a1 Merge pull request #4962 from Citadel-Station-13/upstream-merge-34514
[MIRROR] You can now buckle people to target stakes
2018-01-19 19:44:39 +00:00
deathride58 2906e24f56 Merge pull request #4961 from Citadel-Station-13/upstream-merge-34551
[MIRROR] fixes supply drop pods being impossible to dissassemble
2018-01-19 19:44:18 +00:00
deathride58 28147de16a Merge pull request #4960 from Citadel-Station-13/upstream-merge-34501
[MIRROR] Allow mapping non-default scrubbers
2018-01-19 19:44:00 +00:00
CitadelStationBot 519e593d5b Automatic changelog generation for PR #4957 [ci skip] 2018-01-19 13:43:35 -06:00
deathride58 4077ec6713 Merge pull request #4957 from Citadel-Station-13/upstream-merge-34641
[MIRROR] Fixes conveyor belt power usage.
2018-01-19 19:43:33 +00:00
CitadelStationBot 9ac0ea6175 Automatic changelog generation for PR #4956 [ci skip] 2018-01-19 13:43:17 -06:00
deathride58 26bca66519 Merge pull request #4956 from Citadel-Station-13/upstream-merge-34547
[MIRROR] Jaunt Direction Fix
2018-01-19 19:43:14 +00:00
deathride58 86ca34d806 Merge pull request #4953 from Citadel-Station-13/upstream-merge-34616
[MIRROR] Adds byond versions to feedback
2018-01-19 19:42:36 +00:00
CitadelStationBot 2cd582cfde Automatic changelog generation for PR #4952 [ci skip] 2018-01-19 13:42:20 -06:00
deathride58 2d3e79ab44 Merge pull request #4952 from Citadel-Station-13/upstream-merge-34574
[MIRROR] Added observer verb View Gases
2018-01-19 19:42:18 +00:00
deathride58 8d8790f4d8 Merge pull request #4950 from Citadel-Station-13/upstream-merge-34513
[MIRROR] Move roundid and schema check to dbcore subsystem
2018-01-19 19:41:36 +00:00
CitadelStationBot 40332ebc78 Automatic changelog generation for PR #4947 [ci skip] 2018-01-19 13:39:44 -06:00
deathride58 78d31edc6c Merge pull request #4947 from Citadel-Station-13/upstream-merge-34557
[MIRROR] Fixes cancelling equipment selection being equivalent to selecting "Naked"
2018-01-19 19:39:42 +00:00
deathride58 ede18e6fec Merge pull request #4946 from Citadel-Station-13/upstream-merge-34598
[MIRROR] Illusions now properly use the health argument of Copy_Parent
2018-01-19 19:39:26 +00:00
deathride58 29099c3608 Merge pull request #4945 from Citadel-Station-13/upstream-merge-34569
[MIRROR] Fixes bananium ore sprite
2018-01-19 19:39:07 +00:00
deathride58 c12422564f Merge pull request #4944 from Citadel-Station-13/upstream-merge-34601
[MIRROR] TTVs are too big to fit in bags
2018-01-19 19:38:54 +00:00
deathride58 b6fd362b95 Merge pull request #4942 from Citadel-Station-13/upstream-merge-34608
[MIRROR] Fixes some dumb code in the jousting component
2018-01-19 19:37:20 +00:00
deathride58 947b87ec0c Merge pull request #4941 from Citadel-Station-13/upstream-merge-34609
[MIRROR] removed an extra checktick that could cause issues in shuttles
2018-01-19 19:37:01 +00:00
deathride58 98cc937b40 Merge pull request #4940 from Citadel-Station-13/upstream-merge-34626
[MIRROR] Fixes borg cell recharging runtime
2018-01-19 19:36:47 +00:00
deathride58 5751c601f2 Merge pull request #4939 from Citadel-Station-13/upstream-merge-34627
[MIRROR] Fixes pie runtime
2018-01-19 19:36:35 +00:00
CitadelStationBot 6869047478 Automatic changelog generation for PR #4938 [ci skip] 2018-01-19 13:36:20 -06:00
deathride58 ec9f66e32e Merge pull request #4938 from Citadel-Station-13/upstream-merge-34452
[MIRROR] Reduce the volume of the death sound on clock work mobs
2018-01-19 19:36:18 +00:00
deathride58 ea45eb72ef Merge pull request #4937 from Citadel-Station-13/upstream-merge-34634
[MIRROR] fix/spellcheck: Changes command error on cqc.dm
2018-01-19 19:36:02 +00:00
CitadelStationBot 68b4beed16 Automatic changelog generation for PR #4935 [ci skip] 2018-01-19 13:35:14 -06:00
deathride58 8f358b6313 Merge pull request #4935 from Citadel-Station-13/upstream-merge-34639
[MIRROR] Fixes autolathe power consumption
2018-01-19 19:35:12 +00:00
CitadelStationBot c1f843edc4 Automatic changelog generation for PR #4934 [ci skip] 2018-01-19 13:34:51 -06:00
deathride58 8872f801f1 Merge pull request #4934 from Citadel-Station-13/upstream-merge-34637
[MIRROR] Fixes empty IC syringe having 0 transfer amount
2018-01-19 19:34:49 +00:00