Commit Graph
17882 Commits
Author SHA1 Message Date
LetterJayandGitHub b2fb67c607 Merge pull request #7248 from Citadel-Station-13/upstream-merge-38683
[MIRROR] Fixes anomaly area selection.
2018-07-01 09:26:38 -05:00
LetterJayandGitHub fb64d5ce71 Merge pull request #7247 from Citadel-Station-13/upstream-merge-38672
[MIRROR] Fix the MOTD having too many newlines
2018-07-01 09:26:04 -05:00
CitadelStationBot 93d671cbb4 Automatic changelog generation for PR #7245 [ci skip] 2018-07-01 09:25:45 -05:00
LetterJayandGitHub 3dfeb02512 Merge pull request #7245 from Citadel-Station-13/upstream-merge-38697
[MIRROR] Improves machine overload logging
2018-07-01 09:25:40 -05:00
CitadelStationBot b21c9437e1 Automatic changelog generation for PR #7244 [ci skip] 2018-07-01 09:25:23 -05:00
LetterJayandGitHub 8e21d77c4d Merge pull request #7244 from Citadel-Station-13/upstream-merge-38696
[MIRROR] fixes a cult message.fixes a cult message.
2018-07-01 09:25:21 -05:00
CitadelStationBot 3b8931e409 Automatic changelog generation for PR #7240 [ci skip] 2018-07-01 09:24:48 -05:00
LetterJayandGitHub 605f7a1bf6 Merge pull request #7240 from Citadel-Station-13/upstream-merge-38675
[MIRROR] Fixed cyborgs not getting their names at round start
2018-07-01 09:24:46 -05:00
CitadelStationBot 0029919b80 Automatic changelog generation for PR #7228 [ci skip] 2018-06-26 13:08:28 -05:00
deathride58andGitHub 5c2b858e4c Merge pull request #7228 from improvedname/rubber-shot-edition!
adds rubbershot versions for sec rifless
2018-06-26 14:08:25 -04:00
deathride58andGitHub e2234a7fc4 Merge pull request #7149 from Citadel-Station-13/upstream-merge-30862
Flashbangs no longer hurt blobs
2018-06-26 14:07:53 -04:00
CitadelStationBot 4a3bcaf37a Automatic changelog generation for PR #7110 [ci skip] 2018-06-26 13:06:36 -05:00
deathride58andGitHub 4d79c5ef09 Merge pull request #7110 from Michiyamenotehifunana/Random-Donator-Thing-1
Adds the Not-Nanotrasen Corporate Uniform and a Silver Bike Horn
2018-06-26 14:06:32 -04:00
deathride58andGitHub 293f484535 Merge pull request #7108 from Citadel-Station-13/kevinz000-patch-9
removes magicarp from gold cores
2018-06-26 14:05:43 -04:00
deathride58andGitHub be532c5c7f Merge pull request #7079 from Citadel-Station-13/kevinz000-patch-7
hopefully fixes kinkmates dropping boozeomat parts
2018-06-26 14:04:27 -04:00
CitadelStationBot e61e93bd27 Automatic changelog generation for PR #7078 [ci skip] 2018-06-26 13:04:17 -05:00
deathride58andGitHub 0d522533b7 Merge pull request #7078 from Michiyamenotehifunana/powercrepe-in-nam
Adds a tiny "pocket" to the M1 Helmet (flak helmet)
2018-06-26 14:04:13 -04:00
deathride58andGitHub 792943f683 Merge pull request #7034 from Trilbyspaceclone/patch-1
Adds in Oxygen to grass
2018-06-26 14:02:39 -04:00
CitadelStationBot 6b42e20e2a Automatic changelog generation for PR #7253 [ci skip] 2018-06-25 20:21:23 -05:00
CitadelStationBotandkevinz000 e244438443 [MIRROR] Prevents tourettes from stacking (#7253)
* fixes tourettes being cancer (#38682)

Prevents tourettes from stacking

* Prevents tourettes from stacking
2018-06-25 18:21:17 -07:00
LetterJayandGitHub 791dcaac05 Merge pull request #7242 from Citadel-Station-13/kevinz000-patch-16
[s] Fixes a bug
2018-06-25 10:25:00 -05:00
letterjay a404c4b7d3 Fixes anomaly area selection. 2018-06-25 09:18:40 -05:00
Jordan Brownandletterjay 888b04427c Merge pull request #38683 from AnturK/anomalyfix
Fixes anomaly area selection.
2018-06-25 09:18:40 -05:00
letterjay 2eef6287d1 Fix the MOTD having too many newlines 2018-06-25 09:18:27 -05:00
Jordan Brownandletterjay 1c41c36489 Merge pull request #38672 from AutomaticFrenzy/patch/goonchat-motd
Fix the MOTD having too many newlines
2018-06-25 09:18:27 -05:00
letterjay 370c73fa27 Improves machine overload logging 2018-06-25 09:15:25 -05:00
Jordan Brownandletterjay 6579450176 Merge pull request #38697 from DaxDupont/a
Improves machine overload logging
2018-06-25 09:15:25 -05:00
letterjay 2b1f3c9992 fixes a cult message.fixes a cult message. 2018-06-25 09:15:17 -05:00
Jordan Brownandletterjay c97abeaf09 Merge pull request #38696 from Tlaltecuhtli/patch-53
fixes a cult message.fixes a cult message.
2018-06-25 09:15:17 -05:00
kevinz000andGitHub bae1993861 Update pipe_dispenser.dm 2018-06-25 06:19:30 -07:00
LetterJayandGitHub cdd285f5c7 Update job.dm 2018-06-24 23:30:28 -05:00
LetterJayandGitHub dd03c3e104 Merge pull request #7241 from Citadel-Station-13/warning
trims a few issues during mirror merges
2018-06-24 19:08:04 -05:00
LetterJay d79b85d719 trims a few issues during mirror merges 2018-06-24 18:42:24 -05:00
CitadelStationBot 83ec1f71d3 Automatic changelog generation for PR #7195 [ci skip] 2018-06-24 18:20:19 -05:00
LetterJayandGitHub acd10b02cf Merge pull request #7195 from Citadel-Station-13/upstream-merge-38574
[MIRROR] Global component signals
2018-06-24 18:20:17 -05:00
LetterJayandGitHub 91d40042a4 Merge pull request #7181 from Citadel-Station-13/upstream-merge-38557
[MIRROR] Fix some shuttle chair stuff
2018-06-24 18:19:18 -05:00
CitadelStationBot 9fb21cc6c6 Automatic changelog generation for PR #7238 [ci skip] 2018-06-24 18:18:17 -05:00
LetterJayandGitHub 629ecaa2c0 Merge pull request #7238 from Citadel-Station-13/upstream-merge-38684
[MIRROR] Allow actually saving Goonchat logs
2018-06-24 18:18:15 -05:00
LetterJayandGitHub 58b6671302 Merge pull request #7237 from Citadel-Station-13/upstream-merge-38692
[MIRROR] Blacklisted buggy build 1428
2018-06-24 18:17:54 -05:00
LetterJayandGitHub 9f059a2feb Merge pull request #7234 from Citadel-Station-13/upstream-merge-38661
[MIRROR] Fixes bubblegum comments
2018-06-24 18:14:03 -05:00
LetterJayandGitHub 2665d0e7a9 Merge branch 'master' into upstream-merge-38661 2018-06-24 18:13:53 -05:00
LetterJayandGitHub 72bc5121bd Merge pull request #7233 from Citadel-Station-13/upstream-merge-38653
[MIRROR] Ports more things to Initialize
2018-06-24 18:12:40 -05:00
LetterJayandGitHub f44cd3f917 Merge pull request #7232 from Citadel-Station-13/upstream-merge-38657
[MIRROR] Fixes fireplace sound (rogue crackle)
2018-06-24 18:12:18 -05:00
CitadelStationBot ec5c5d0aec Automatic changelog generation for PR #7231 [ci skip] 2018-06-24 18:11:20 -05:00
LetterJayandGitHub 7a473cf8c6 Merge pull request #7231 from Citadel-Station-13/upstream-merge-38668
[MIRROR] Fixes being able to transfer from closed containers to open ones
2018-06-24 18:11:18 -05:00
CitadelStationBot 7c28a43f75 Automatic changelog generation for PR #7230 [ci skip] 2018-06-24 16:40:46 -05:00
LetterJayandGitHub e0eac87b81 Merge pull request #7230 from Citadel-Station-13/upstream-merge-38617
[MIRROR] Cyborgs now drop radio keys on detonation/destruction
2018-06-24 16:40:44 -05:00
LetterJayandGitHub 5212877dfc Merge pull request #7229 from Citadel-Station-13/upstream-merge-38658
[MIRROR] Fixes antag logs
2018-06-24 16:40:35 -05:00
LetterJayandGitHub 4177d3664b Merge pull request #7224 from Citadel-Station-13/upstream-merge-38650
[MIRROR] Removes unused undefs
2018-06-24 16:40:09 -05:00
CitadelStationBot e6b56284ce Automatic changelog generation for PR #7222 [ci skip] 2018-06-24 16:37:52 -05:00