Commit Graph
9119 Commits
Author SHA1 Message Date
deathride58andGitHub 2faceb1209 Merge pull request #4004 from Citadel-Station-13/upstream-merge-32812
[MIRROR] Fixes setup failure edge case
2017-11-19 04:26:49 +00:00
deathride58andGitHub 7f7d282383 Merge pull request #4003 from Citadel-Station-13/upstream-merge-32843
[MIRROR] Removes duplicate data for ai airlock menu
2017-11-19 04:26:15 +00:00
deathride58andGitHub a00a82c1a2 Merge pull request #4002 from Citadel-Station-13/upstream-merge-32840
[MIRROR] Cleans up unused circuitry code
2017-11-19 04:25:43 +00:00
CitadelStationBot 936ccf61b5 Automatic changelog generation for PR #4001 [ci skip] 2017-11-18 22:25:16 -06:00
deathride58andGitHub 6b56c03354 Merge pull request #4001 from Citadel-Station-13/upstream-merge-32831
[MIRROR] Fix runtimes when stacking pizza boxes
2017-11-19 04:25:14 +00:00
CitadelStationBot ab38a0a8f7 Automatic changelog generation for PR #4000 [ci skip] 2017-11-18 22:24:36 -06:00
deathride58andGitHub 646875ba4a Merge pull request #4000 from Citadel-Station-13/upstream-merge-32822
[MIRROR] Updates modular computer Nanotrasen logo
2017-11-19 04:24:33 +00:00
CitadelStationBot f2a39d438f Fixes setup failure edge case 2017-11-18 13:51:40 -06:00
AnturKandCitadelStationBot e5edaa4656 Fixes setup failure edge case (#32812) 2017-11-18 13:51:40 -06:00
CitadelStationBot 7bffcdca71 Removes duplicate data for ai airlock menu 2017-11-18 13:51:27 -06:00
JJRcopandCitadelStationBot ca9834613c Removes duplicate data for ai airlock menu (#32843) 2017-11-18 13:51:27 -06:00
CitadelStationBot ac6e2b84dd Cleans up unused circuitry code 2017-11-18 13:51:14 -06:00
ShizCalevandCitadelStationBot 88da7f3d30 Cleans up unused circuitry code (#32840) 2017-11-18 13:51:14 -06:00
CitadelStationBot 63492a74ed Fix runtimes when stacking pizza boxes 2017-11-18 13:51:01 -06:00
Tad HardestyandCitadelStationBot 3914765c70 Fix runtimes when stacking pizza boxes (#32831) 2017-11-18 13:51:01 -06:00
CitadelStationBot d8ecd60532 Updates modular computer Nanotrasen logo 2017-11-18 13:50:45 -06:00
ShizCalevandCitadelStationBot 8784aa9a45 Updates modular computer Nanotrasen logo (#32822) 2017-11-18 13:50:45 -06:00
deathride58andGitHub c4eb49994f Merge pull request #3997 from deathride58/tguirecompile1
Recompiles TGUI
2017-11-18 06:52:07 +00:00
deathride58 d6efdbee86 Recompiles TGUI 2017-11-18 01:45:19 -05:00
deathride58andGitHub 2da39b5890 Merge pull request #3989 from Citadel-Station-13/upstream-merge-32823
[MIRROR] fixes scrubbers being unable to scrub
2017-11-18 06:38:39 +00:00
deathride58andGitHub a8783e5d1f Merge branch 'master' into upstream-merge-32823 2017-11-18 06:06:14 +00:00
CitadelStationBot c836f6e6bb Automatic changelog generation for PR #3994 [ci skip] 2017-11-17 23:40:15 -06:00
deathride58andGitHub 1d841ce65a Merge pull request #3994 from Citadel-Station-13/upstream-merge-32736
[MIRROR] RPD ui improvements
2017-11-18 05:40:13 +00:00
CitadelStationBot 5b9fb18f5b Automatic changelog generation for PR #3992 [ci skip] 2017-11-17 23:39:24 -06:00
deathride58andGitHub a15007cd5a Merge pull request #3992 from Citadel-Station-13/upstream-merge-32761
[MIRROR] Tweaks AI door open and close buttons
2017-11-18 05:39:22 +00:00
CitadelStationBot f758b058b6 Automatic changelog generation for PR #3967 [ci skip] 2017-11-17 23:39:03 -06:00
deathride58andGitHub 04d290aa11 Merge pull request #3967 from Citadel-Station-13/upstream-merge-32775
[MIRROR] Makes the operation computer tgui
2017-11-18 05:38:59 +00:00
deathride58andGitHub 5f055aa492 Update vent_scrubber.dm 2017-11-18 00:36:11 -05:00
CitadelStationBot e4564b36be Automatic changelog generation for PR #3964 [ci skip] 2017-11-17 23:35:29 -06:00
deathride58andGitHub d034e7dbf2 Merge pull request #3964 from Citadel-Station-13/upstream-merge-32746
[MIRROR] Atmos Filter/Scrubber UI update
2017-11-18 05:35:27 +00:00
deathride58andGitHub 9e78bcd8f9 Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786
[MIRROR] Replaces a bunch of mob loops with hopefully better ones
2017-11-18 05:29:32 +00:00
deathride58andGitHub 5561f50b40 TGUI recompile 2017-11-18 05:07:08 +00:00
deathride58andGitHub bb690b24ba Update cit_crewobjectives_science.dm 2017-11-17 23:45:20 -05:00
deathride58andGitHub afce3e01b7 sHIT WRONG BRANCH - undoes edit 2017-11-17 23:43:48 -05:00
deathride58andGitHub cf34b64266 Update cit_crewobjectives_science.dm 2017-11-17 23:42:43 -05:00
deathride58andGitHub d202867730 Update carbon.dm 2017-11-17 23:23:13 -05:00
deathride58andGitHub f1818eb11b Update death.dm 2017-11-17 23:22:02 -05:00
deathride58andGitHub 127846549d Update mass_hallucination.dm 2017-11-17 23:21:13 -05:00
deathride58andGitHub 38f7b829c3 Update manifest.dm 2017-11-17 23:20:44 -05:00
deathride58andGitHub e478e5640a Update tracking.dm 2017-11-17 23:20:15 -05:00
deathride58andGitHub 1377675102 Merge pull request #3996 from deathride58/master
adds the sprites that didnt get mirrored in #3993
2017-11-18 04:18:10 +00:00
deathride58andGitHub 674cce2d85 Merge pull request #3986 from Citadel-Station-13/upstream-merge-32804
[MIRROR] Add the ability to osay from the viewvar dropdown
2017-11-18 04:15:58 +00:00
deathride58andGitHub 01eb052366 Merge pull request #3990 from Citadel-Station-13/upstream-merge-32767
[MIRROR] Make tgui use npm-cache for installing modules
2017-11-18 04:14:02 +00:00
deathride58 7c7c050cdb adds the sprites that didnt get mirrored in #3993 2017-11-17 23:10:15 -05:00
CitadelStationBotandkevinz000 a1096e9724 [MIRROR] Makes TGUI's reload.bat account for spaces in username (#3991)
* Makes reload.bat account for spaces in username (#32768)

* Makes TGUI's reload.bat account for spaces in username
2017-11-17 19:03:08 -08:00
CitadelStationBot ade73101d7 Automatic changelog generation for PR #3993 [ci skip] 2017-11-17 21:02:43 -06:00
CitadelStationBotandkevinz000 0beef30fb7 Adds a purple bartender suit and apron, and Long Hair 3 - Requested and sprites by Okand37! (#3993) 2017-11-17 19:02:40 -08:00
CitadelStationBot adabac95b6 Automatic changelog generation for PR #3988 [ci skip] 2017-11-17 19:42:13 -06:00
deathride58andGitHub e38670e5cb Merge pull request #3988 from Citadel-Station-13/upstream-merge-32813
[MIRROR] Fixes hydroponics not properly dealing with fluorine
2017-11-18 01:42:10 +00:00
duncathan saltandCitadelStationBot 52fc5e8bc6 RPD ui improvements 2017-11-17 18:03:56 -06:00