Commit Graph

12455 Commits

Author SHA1 Message Date
ShizCalev
d8a3b87719 Fixes brains counting towards highlander killstreaks 2017-09-07 05:14:39 -05:00
deathride58
d5151ed918 fixes 2017-09-07 01:01:23 -04:00
tortellinitony
d73b82cf11 Gets rid of manual overlay manipulation 2017-09-06 23:39:08 -05:00
deathride58
a972a6272f chef objective 2017-09-06 22:54:51 -04:00
LetterJay
5829f56727 Merge pull request #2531 from Citadel-Station-13/upstream-merge-30176
[MIRROR] Adds more round id tracking
2017-09-06 21:31:28 -05:00
deathride58
68a6ff5cfb just,,, compile, please 2017-09-06 22:24:10 -04:00
ShizCalev
4282d82e33 Allows atmos techs to download the SM monitor (#30458) 2017-09-06 21:00:25 -05:00
Anonmare
ee41b3da6f Alters the pressure plate crafting recipe (#30452) 2017-09-06 20:35:50 -05:00
LetterJay
3efa1d6134 Merge pull request #2631 from Citadel-Station-13/upstream-merge-30416
[MIRROR] Adds "shiny" variants of lavaland mobs
2017-09-06 20:18:27 -05:00
deathride58
15ab156b86 moves crew objectives into separate files 2017-09-06 21:04:45 -04:00
deathride58
fb0fd1ca10 adds comma 2017-09-06 20:52:28 -04:00
deathride58
16669efe4a thERE WE GO 2017-09-06 20:39:49 -04:00
deathride58
fe4839db72 compile dammit 2017-09-06 20:30:12 -04:00
deathride58
19628a2d9f hnnnnnnnnngh 2017-09-06 20:23:19 -04:00
Ashe Higgs
dcd0fa67f0 Adds "shiny" variants of lavaland mobs (#30416)
* Shiny lavaland mobs!

* Changes based on feedback
2017-09-06 19:15:25 -05:00
deathride58
879eb6e448 more objectives, hopefully fixes compiling errors 2017-09-06 20:04:19 -04:00
ShizCalev
849deb5e4e Cleans up more paper fluff varedits. (#30418) 2017-09-06 18:42:43 -05:00
deathride58
5e25464e1a sweet jesus im absolutely horrid at this 2017-09-06 18:56:59 -04:00
LetterJay
2f3f56352c Merge branch 'master' into upstream-merge-30176 2017-09-06 17:43:07 -05:00
LetterJay
9265694418 Update _compile_options.dm 2017-09-06 17:41:02 -05:00
LetterJay
f9ef2bb068 commit 2017-09-06 17:36:32 -05:00
deathride58
8ef2b39d44 adds clown slip objective 2017-09-06 18:34:05 -04:00
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