Commit Graph

12533 Commits

Author SHA1 Message Date
LetterJay 17db844180 another mirror rebase for the PRMirror being down 2017-09-06 17:32:49 -05:00
deathride58 0b04dd5211 no harmful viruses objective for virologists 2017-09-06 17:50:41 -04:00
deathride58 f52fa8e2e9 it's probably a better idea to do this while sober 2017-09-06 17:18:45 -04:00
deathride58 98e30a70a7 adds druglorg objective to botanist 2017-09-06 17:12:12 -04:00
deathride58 44729f3944 ya shittin me right now? 2017-09-06 16:55:31 -04:00
deathride58 49152d4bdb Bluh 2017-09-06 16:46:28 -04:00
deathride58 4bcb9f1629 druglord objective + fixes 2017-09-06 16:34:38 -04:00
LetterJay bbab9d8d5a donation 2017-09-06 14:41:35 -05:00
deathride58 1753a4509a there we go. compiling errors fixed. 2017-09-06 14:51:28 -04:00
deathride58 be5013c2a0 aaaAAAUUGH 2017-09-06 14:37:59 -04:00
deathride58 367c6c8ada im bad at this coding thing 2017-09-06 14:37:01 -04:00
deathride58 02cc0b2db1 should fix compiling errors 2017-09-06 14:19:25 -04:00
deathride58 94354c3dd6 more janitor adjustments 2017-09-06 14:14:18 -04:00
deathride58 d996b7ab75 adds "kill bubblegum" objective for shaft miners 2017-09-06 13:35:56 -04:00
deathride58 c9a340de27 fixes janitor objective, tones down other objectives 2017-09-06 13:18:39 -04:00
LetterJay a16ba4e4cd Merge pull request #2445 from Citadel-Station-13/upstream-merge-29953
[MIRROR] Add logging of deathgasp last words and suicide stats to the death table
2017-09-06 10:11:16 -05:00
LetterJay 4ed411d353 Merge pull request #2462 from Citadel-Station-13/upstream-merge-30079
[MIRROR] Fixes missing inhands
2017-09-06 10:11:08 -05:00
LetterJay d4f018952e Merge pull request #2440 from Citadel-Station-13/upstream-merge-29866
[MIRROR] You can now click on symptoms in the Pandemic to see their description and stats
2017-09-06 10:10:58 -05:00
LetterJay 82f36f0d28 Delete client_procs.dm.rej 2017-09-06 09:27:57 -05:00
LetterJay ce1e5c69dc Delete blackbox.dm.rej 2017-09-06 09:27:55 -05:00
LetterJay b07ebeed57 Merge pull request #2480 from Citadel-Station-13/upstream-merge-30140
[MIRROR] Corrects column name
2017-09-06 09:26:12 -05:00
LetterJay 24a7aa5a9f Merge branch 'master' into upstream-merge-30079 2017-09-06 09:24:23 -05:00
LetterJay b2d7ee0e51 Merge pull request #2537 from Citadel-Station-13/upstream-merge-30248
[MIRROR] Changes sql version to check for schema being ahead
2017-09-06 09:23:02 -05:00
LetterJay ea10c4402e Merge pull request #2443 from Citadel-Station-13/upstream-merge-30027
[MIRROR] Fixes hair sticking out of spess helmets
2017-09-06 09:22:44 -05:00
LetterJay 00199af27d Merge branch 'master' into upstream-merge-29866 2017-09-06 09:21:53 -05:00
LetterJay 72a8f7aa54 Merge branch 'master' into upstream-merge-29953 2017-09-06 09:17:57 -05:00
LetterJay cf46abecb3 Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004
[MIRROR] Moved emagged var to obj/item parent.
2017-09-06 09:15:11 -05:00
LetterJay b6f6970ebb Update disease.dm 2017-09-06 09:06:59 -05:00
LetterJay 1f872675b0 Update disease.dm 2017-09-06 09:06:30 -05:00
LetterJay f5e8e06041 Update dogborgstuff.dm 2017-09-06 09:04:33 -05:00
LetterJay 2d469c62ef Merge pull request #2617 from Citadel-Station-13/BadMirrorResolve
Bad mirror resolve
2017-09-06 08:59:20 -05:00
Poojawa 3ba2f650dd Adds Paradise Sofas (#2623)
* Adds Paradise Sofas

* Actually enable them to be constructed

* Coding standards, sheesh

* am path guder
2017-09-06 07:54:23 -05:00
deathride58 146d11dfad nerfs bad rng 2017-09-06 02:06:36 -04:00
deathride58 855455a6ca nerfs runtimes, buffs memory retention 2017-09-05 22:27:27 -04:00
Poojawa fc95b9594c Re-disables sabresune, because wew 2017-09-05 21:23:15 -05:00
deathride58 c1d1cc5cb1 gramatically correct spaghetti code 2017-09-05 21:56:59 -04:00
deathride58 dda6e59817 I haven't had a breath of fresh air for two days now 2017-09-05 21:49:00 -04:00
deathride58 a5b335885f janitor cleaning objective 2017-09-05 21:41:11 -04:00
deathride58 dd0f5506cf updates error text 2017-09-05 20:08:19 -04:00
deathride58 830eef1207 ... theres a var for that 2017-09-05 20:00:26 -04:00
deathride58 a196eccb26 should fix responsibility objective. hopefully 2017-09-05 19:21:29 -04:00
deathride58 71ae573260 patches ANOTHER runtime. jesus im bad at this 2017-09-05 18:03:34 -04:00
deathride58 60e9682ce2 I'm blind 2017-09-05 17:50:20 -04:00
deathride58 e6246d1f1a fixes runtime 2017-09-05 17:47:02 -04:00
deathride58 d7e201bec8 nerfs chem objective (makes it only give only one chem as the target as its supposed to) 2017-09-05 17:37:50 -04:00
LetterJay af409af9cf additional files 2017-09-05 16:29:25 -05:00
LetterJay bae0563d47 initial commit 2017-09-05 16:17:50 -05:00
LetterJay 737c8446c1 Merge pull request #2592 from Citadel-Station-13/ProperDisable
Disables the swarmer events for now
2017-09-05 15:57:19 -05:00
deathride58 fe8f42bb5f thERE WE GO 2017-09-05 15:07:54 -04:00
deathride58 fd8c9bc57d where has my life gone 2017-09-05 15:00:22 -04:00