Commit Graph

13496 Commits

Author SHA1 Message Date
Mokiros
cdcb5fc72f Buildable and upgradable All-In-One Grinder (#35451)
Circuit is in "Biological Processing" techweb node
2018-02-11 05:12:23 -06:00
CitadelStationBot
7f7bea7468 Merge pull request #5402 from Citadel-Station-13/upstream-merge-35473
[MIRROR] Updates CONTRIBUTING.md for MapMerge2
2018-02-11 01:23:28 -06:00
deathride58
21be004afa Merge pull request #5406 from Citadel-Station-13/upstream-merge-35424
[MIRROR] Replaces some var values with defines
2018-02-11 02:24:48 +00:00
deathride58
a34dc0b90b Update personality.dm 2018-02-10 19:51:21 -05:00
CitadelStationBot
305e4f1d47 Automatic changelog generation for PR #5405 [ci skip] 2018-02-10 18:50:37 -06:00
deathride58
33a4ef416b Merge pull request #5405 from Citadel-Station-13/upstream-merge-35493
[MIRROR] Fixed cloning pod status not updating when autocloning.
2018-02-11 00:50:35 +00:00
CitadelStationBot
88013a0bf2 Automatic changelog generation for PR #5404 [ci skip] 2018-02-10 18:50:17 -06:00
deathride58
571ad489d4 Merge pull request #5404 from Citadel-Station-13/upstream-merge-35479
[MIRROR] Fixed chemical recipe conflicts
2018-02-11 00:50:15 +00:00
deathride58
d598695a3a Merge pull request #5403 from Citadel-Station-13/upstream-merge-35455
[MIRROR] Removes runlevels spec from SSoverlays
2018-02-11 00:50:03 +00:00
deathride58
60cef5a8db Merge pull request #5401 from Citadel-Station-13/upstream-merge-35459
[MIRROR] Fix a runtime if someone is deleted on the arrivals shuttle
2018-02-11 00:49:36 +00:00
Jordan Brown
fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
CitadelStationBot
ed82270bf5 Fixed cloning pod status not updating when autocloning. 2018-02-10 11:09:52 -06:00
Jordan Brown
3674d38a99 Merge pull request #35493 from DaxDupont/cloner
Fixed cloning pod status not updating when autocloning.
2018-02-10 11:09:52 -06:00
CitadelStationBot
4a99f1dbfb Fixed chemical recipe conflicts 2018-02-10 11:04:34 -06:00
Jordan Brown
bd0b5c2eb5 Merge pull request #35479 from Cruix/chem_collisions
Fixed chemical recipe conflicts
2018-02-10 11:04:34 -06:00
CitadelStationBot
02c094e920 Removes runlevels spec from SSoverlays 2018-02-10 11:02:20 -06:00
Jordan Brown
bed3f556c8 Removes runlevels spec from SSoverlays (#35455) 2018-02-10 11:02:20 -06:00
CitadelStationBot
9986038318 Automatic changelog generation for PR #5400 [ci skip] 2018-02-10 11:01:10 -06:00
CitadelStationBot
d68892983c Merge pull request #5400 from Citadel-Station-13/upstream-merge-35449
[MIRROR] Integrated Circutry Readability Improvements
2018-02-10 11:01:08 -06:00
CitadelStationBot
16bb61d790 Automatic changelog generation for PR #5399 [ci skip] 2018-02-10 11:00:58 -06:00
CitadelStationBot
9909e94c9e Merge pull request #5399 from Citadel-Station-13/upstream-merge-35437
[MIRROR] Fixes Morphine So that it can be made.
2018-02-10 11:00:56 -06:00
CitadelStationBot
e99aa207e4 Automatic changelog generation for PR #5398 [ci skip] 2018-02-10 11:00:47 -06:00
CitadelStationBot
3074958a7e Merge pull request #5398 from Citadel-Station-13/upstream-merge-35465
[MIRROR] Fixes the action button lock preference not saving
2018-02-10 11:00:46 -06:00
CitadelStationBot
bbd8312948 Automatic changelog generation for PR #5397 [ci skip] 2018-02-10 11:00:35 -06:00
CitadelStationBot
816d6b561f Merge pull request #5397 from Citadel-Station-13/upstream-merge-35491
[MIRROR] Fixes limbgrower having max volume of 0
2018-02-10 11:00:33 -06:00
CitadelStationBot
01ee3415a1 Merge pull request #5396 from Citadel-Station-13/upstream-merge-35488
[MIRROR] Changes brass filament sprite
2018-02-10 11:00:23 -06:00
CitadelStationBot
49d8ed2202 Updates CONTRIBUTING.md for MapMerge2 2018-02-10 10:59:05 -06:00
Jordan Brown
342a75eff7 Merge pull request #35473 from ShizCalev/contributing-map-standards-update
Updates CONTRIBUTING.md for MapMerge2
2018-02-10 10:59:05 -06:00
CitadelStationBot
7030aab2eb Fix a runtime if someone is deleted on the arrivals shuttle 2018-02-10 10:28:18 -06:00
Jordan Brown
564860285d Fix a runtime if someone is deleted on the arrivals shuttle (#35459)
* Fix a runtime if someone is deleted on the arrivals shuttle

* Duh
2018-02-10 10:28:18 -06:00
CitadelStationBot
d65a82cdbd Integrated Circutry Readability Improvements 2018-02-10 10:04:42 -06:00
Trevor Serpas
86e5775599 Integrated Circutry Readability Improvements (#35449)
* Integrated Circutry Readability Improvements

* support for old save files and fix a var I missed
2018-02-10 10:04:42 -06:00
CitadelStationBot
02962e31a6 Fixes Morphine So that it can be made. 2018-02-10 10:00:25 -06:00
Ordonis
0e22f30c39 Switched nitrogen for ethanol in morphine recipe. (#35437)
* Fixes Ordo not testing shit properly

* Lowers yield for balance purposes

Fug
2018-02-10 10:00:25 -06:00
CitadelStationBot
48ce6dab32 Fixes the action button lock preference not saving 2018-02-10 09:58:11 -06:00
Ashe Higgs
dd6a2541f4 Fixes button lock not saving (#35465) 2018-02-10 09:58:11 -06:00
CitadelStationBot
42c6fd2283 Fixes limbgrower having max volume of 0 2018-02-10 09:56:56 -06:00
Robustin
25323a9b12 Fixes limbgrower having max volume of 0 (#35491)
* Fixed limbgrower having maxvolume of 0

* Update limbgrower.dm
2018-02-10 09:56:56 -06:00
CitadelStationBot
adf92bf9dd Changes brass filament sprite 2018-02-10 09:56:47 -06:00
BordListian
b8605a3618 - Purges all untruths (#35488) 2018-02-10 09:56:46 -06:00
deathride58
0283c1677b Merge pull request #5393 from Citadel-Station-13/upstream-merge-35469
[MIRROR] Fixes map configuration values for nonexistent maps applying to box
2018-02-10 04:01:18 +00:00
deathride58
1b7658b4a5 Merge pull request #5392 from Citadel-Station-13/upstream-merge-35422
[MIRROR] Removes uneedful code
2018-02-10 04:00:34 +00:00
CitadelStationBot
87c1ba3bf0 Automatic changelog generation for PR #5391 [ci skip] 2018-02-09 22:00:23 -06:00
deathride58
9f37b3b70b Merge pull request #5391 from Citadel-Station-13/upstream-merge-35461
[MIRROR] Hatchets are now small instead of tiny.
2018-02-10 04:00:21 +00:00
CitadelStationBot
a7950691d5 Automatic changelog generation for PR #5390 [ci skip] 2018-02-09 22:00:10 -06:00
deathride58
a46fdf8750 Merge pull request #5390 from Citadel-Station-13/upstream-merge-35463
[MIRROR] Cell blueprints now use the /empty variants
2018-02-10 04:00:08 +00:00
CitadelStationBot
62eea2161a Automatic changelog generation for PR #5389 [ci skip] 2018-02-09 21:59:56 -06:00
deathride58
935f070368 Merge pull request #5389 from Citadel-Station-13/upstream-merge-35476
[MIRROR] Fix goliath hide plates not applying to suits correctly
2018-02-10 03:59:54 +00:00
CitadelStationBot
7595d0ef91 Automatic changelog generation for PR #5388 [ci skip] 2018-02-09 21:59:41 -06:00
deathride58
9d96a6b78f Merge pull request #5388 from Citadel-Station-13/upstream-merge-35446
[MIRROR] can_synth uses TRUE/FALSE
2018-02-10 03:59:39 +00:00