Commit Graph
5945 Commits
Author SHA1 Message Date
LetterJayandGitHub f1f99fc26c Update electrical_storm.dm 2017-10-01 15:26:32 -05:00
LetterJayandGitHub 00aa312610 Update carp_migration.dm 2017-10-01 15:26:15 -05:00
LetterJayandGitHub 6ca3deb8d1 Merge branch 'master' into upstream-merge-31129 2017-10-01 15:45:54 -04:00
CitadelStationBot 19abe58f05 Automatic changelog generation for PR #3033 [ci skip] 2017-10-01 14:42:37 -05:00
LetterJayandGitHub fafd98ed0e Merge pull request #3033 from Citadel-Station-13/upstream-merge-31142
[MIRROR] Fixes cogscarab sprites not updating
2017-10-01 15:42:35 -04:00
CitadelStationBot 9efb3505a0 Automatic changelog generation for PR #3031 [ci skip] 2017-10-01 14:42:14 -05:00
LetterJayandGitHub 40f541b9da Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117
[MIRROR] Fixes liches losing spells
2017-10-01 15:42:12 -04:00
LetterJayandGitHub e346321413 Merge pull request #3030 from Citadel-Station-13/upstream-merge-31116
[MIRROR] Fixes some hardset dna misuse
2017-10-01 15:28:16 -04:00
LetterJayandGitHub 5ec781502c Merge branch 'master' into upstream-merge-31116 2017-10-01 15:09:10 -04:00
LetterJayandGitHub 4e80c2574a Merge pull request #3023 from Citadel-Station-13/upstream-merge-31069
[MIRROR] Cleanup to various loc assignments and nearby code
2017-10-01 15:08:21 -04:00
LetterJayandGitHub bf2155ec21 Merge pull request #3018 from Citadel-Station-13/upstream-merge-31083
[MIRROR] Removes step throwers from cult altar
2017-10-01 15:08:10 -04:00
LetterJayandGitHub eb24540ba3 Merge pull request #3017 from Citadel-Station-13/upstream-merge-31108
[MIRROR] Corrected shuttle refuel time
2017-10-01 15:07:43 -04:00
LetterJay 490885a36f update 2017-10-01 13:02:52 -05:00
LetterJayandGitHub 69f354718c Update tgstation.dme 2017-10-01 13:02:25 -05:00
LetterJay c2ee5f7e23 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-10-01 12:22:41 -05:00
LetterJayandGitHub 9f05ef16df Merge branch 'master' into upstream-merge-31108 2017-10-01 04:31:36 -04:00
LetterJayandGitHub 58ff06a44b Merge pull request #3005 from Citadel-Station-13/upstream-merge-31000
[MIRROR] Server tools API v3.1
2017-10-01 04:30:34 -04:00
LetterJayandGitHub 926db45b54 Update world.dm 2017-10-01 03:06:11 -05:00
LetterJayandGitHub 80a84db919 Update adminhelp.dm 2017-10-01 02:39:24 -05:00
LetterJayandGitHub ef10ac589a Update getrev.dm 2017-10-01 02:39:07 -05:00
LetterJayandGitHub 346ec9a0bf Update README.md 2017-10-01 02:38:14 -05:00
LetterJayandGitHub 0ab234ceb0 Merge branch 'master' into upstream-merge-31000 2017-10-01 03:31:49 -04:00
LetterJayandGitHub 22b148f078 Merge pull request #3014 from Citadel-Station-13/upstream-merge-31140
[MIRROR] Fixes AI law weights infinite loop
2017-10-01 03:26:42 -04:00
LetterJayandGitHub 659a8d4053 Merge pull request #3002 from Citadel-Station-13/upstream-merge-31037
[MIRROR] Movement delay fixes and optimization
2017-10-01 03:26:26 -04:00
LetterJayandGitHub 49c63dd794 Update randomverbs.dm 2017-10-01 01:57:03 -05:00
LetterJayandGitHub f621fb704b Merge branch 'master' into upstream-merge-31069 2017-10-01 02:56:28 -04:00
LetterJayandGitHub 4be6f22669 Merge branch 'master' into upstream-merge-31108 2017-10-01 02:53:27 -04:00
LetterJayandGitHub 92c3a48507 Merge branch 'master' into upstream-merge-31140 2017-10-01 02:53:18 -04:00
LetterJayandGitHub 6a8ca2e02c Merge branch 'master' into upstream-merge-31037 2017-10-01 02:53:03 -04:00
CitadelStationBot 7980a72092 Automatic changelog generation for PR #2985 [ci skip] 2017-10-01 01:51:57 -05:00
LetterJayandGitHub b15f639621 Merge pull request #2985 from Citadel-Station-13/upstream-merge-30722
[MIRROR] Adds steal research levels objectives to traitors+lings, makes it work for everyone not just ninjas.
2017-10-01 02:51:56 -04:00
CitadelStationBot 121b7af232 Automatic changelog generation for PR #2972 [ci skip] 2017-10-01 01:50:34 -05:00
LetterJayandGitHub ef96be641a Merge pull request #2972 from Citadel-Station-13/upstream-merge-30856
[MIRROR] Adds Nars-Ian and clock hawks
2017-10-01 02:50:31 -04:00
LetterJayandGitHub 81e40cc5c8 Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763
[MIRROR] Configuration datum refactor
2017-10-01 02:50:17 -04:00
LetterJayandGitHub 8be007225b Merge pull request #3007 from Citadel-Station-13/upstream-merge-31085
[MIRROR] Fixes shade attackby
2017-10-01 02:20:35 -04:00
LetterJayandGitHub 1d1a862e1b Merge pull request #3003 from Citadel-Station-13/upstream-merge-31045
[MIRROR] Reebe is fancier now
2017-10-01 02:20:23 -04:00
LetterJay 747312cb6d updates 2017-10-01 00:59:59 -05:00
LetterJayandGitHub 0cc54029e2 Merge pull request #3010 from Citadel-Station-13/upstream-merge-31096
[MIRROR] Cleans up some unused code
2017-10-01 01:19:36 -04:00
LetterJayandGitHub 33b481dffb Merge pull request #3008 from Citadel-Station-13/upstream-merge-31073
[MIRROR] Log attempted injections as well as successful ones
2017-10-01 01:19:20 -04:00
LetterJayandGitHub f55c86edfb Merge branch 'master' into upstream-merge-31045 2017-10-01 01:17:52 -04:00
LetterJayandGitHub 45c79ffbbe Merge pull request #3016 from Citadel-Station-13/upstream-merge-31093
[MIRROR] Stops putting RCD, bluespace bags, and staves into ORM
2017-10-01 01:11:06 -04:00
LetterJayandGitHub 11b558c367 Merge branch 'master' into upstream-merge-31093 2017-10-01 00:50:26 -04:00
LetterJay 7cf1c052f9 Merge branch 'upstream-merge-30763' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-09-30 23:26:58 -05:00
LetterJayandGitHub d6ec5791a6 Update dna.dm 2017-09-30 22:35:57 -05:00
ShizCalevandCitadelStationBot 2635689e79 Cleans up some antag/event landmark checks 2017-09-30 21:33:13 -05:00
CitadelStationBot d622fb3754 Fixes cogscarab sprites not updating 2017-09-30 21:30:48 -05:00
MoreRobustThanYouandCitadelStationBot e63e05255f Fixes cogscarab sprites not updating (#31142)
* Fixes cogscarab sprites now updating

* fix spacing

* Update extra_drone_types.dm
2017-09-30 21:30:48 -05:00
CitadelStationBot c1acb412e6 Fixes liches losing spells 2017-09-30 14:54:03 -05:00
AnturKandCitadelStationBot 6411e25110 Fixes liches losing spells 2017-09-30 14:54:02 -05:00
AnturKandCitadelStationBot 6afd603fe6 Fixes some hardset dna misuse 2017-09-30 14:51:52 -05:00