Commit Graph
5980 Commits
Author SHA1 Message Date
LetterJayandGitHub 0e50bc7884 Merge pull request #3049 from Citadel-Station-13/upstream-merge-31203
[MIRROR] Fixes paper writing
2017-10-01 16:32:12 -04:00
LetterJayandGitHub c8647565fc Merge pull request #3048 from Citadel-Station-13/upstream-merge-31157
[MIRROR] Fixes events with sleeps.
2017-10-01 16:32:00 -04:00
LetterJayandGitHub f538d91fe8 Merge pull request #3047 from Citadel-Station-13/upstream-merge-31145
[MIRROR] Fixes aliums being able to attack the SM crystal
2017-10-01 16:31:44 -04:00
CitadelStationBot 1d3f476b2c Automatic changelog generation for PR #3042 [ci skip] 2017-10-01 15:30:41 -05:00
LetterJayandGitHub f0379ec3f3 Merge pull request #3042 from Citadel-Station-13/upstream-merge-30605
[MIRROR] You can now examine an airlock to find out how to construct/deconstruct it
2017-10-01 16:30:40 -04:00
LetterJayandGitHub 3d2b5e99c9 Merge pull request #3039 from Citadel-Station-13/upstream-merge-31143
[MIRROR] adds a space
2017-10-01 16:29:35 -04:00
LetterJayandGitHub 8b0b4f9e2a Merge pull request #3038 from Citadel-Station-13/upstream-merge-31132
[MIRROR] Fixes changelings being able to transform sting mobs that are transform sting immune
2017-10-01 16:29:13 -04:00
LetterJayandGitHub 2d8e3b301f Merge pull request #3037 from Citadel-Station-13/upstream-merge-31128
[MIRROR] Removes irccheck admin restriction
2017-10-01 16:29:04 -04:00
LetterJayandGitHub 1057b4b636 Merge pull request #3035 from Citadel-Station-13/upstream-merge-31137
[MIRROR] Fixes meteors not working with multi z
2017-10-01 16:21:08 -04:00
LetterJayandGitHub e572d2e529 Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138
[MIRROR] Structure istype define
2017-10-01 16:20:56 -04:00
LetterJayandGitHub b2a01d688d Merge pull request #3044 from Citadel-Station-13/upstream-merge-31136
[MIRROR] Adds a single comment to is_helpers.dm
2017-10-01 15:56:43 -04:00
CitadelStationBot 6abc1b76d8 Automatic changelog generation for PR #3043 [ci skip] 2017-10-01 14:55:30 -05:00
LetterJayandGitHub e17455165c Merge pull request #3043 from Citadel-Station-13/upstream-merge-31144
[MIRROR] moved the goddamn locker in toxins maint
2017-10-01 15:55:29 -04:00
CitadelStationBot 35f771c2d0 Automatic changelog generation for PR #3032 [ci skip] 2017-10-01 14:49:46 -05:00
LetterJayandGitHub 21302e3fdc Merge pull request #3032 from Citadel-Station-13/upstream-merge-31141
[MIRROR] Speeds up simple_animals/hostile/proc/CanAttack()
2017-10-01 15:49:44 -04:00
LetterJayandGitHub e3810ef517 Merge branch 'master' into upstream-merge-31128 2017-10-01 15:46:15 -04:00
LetterJayandGitHub 6572781b63 Update forced_movement.dm 2017-10-01 14:43:06 -05: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
CitadelStationBot 055b0e5584 Fixes paper writing 2017-10-01 08:41:16 -05:00
AnturKandCitadelStationBot c4dd7ffdbd Fixes paper writing (#31203)
* Fixes regex typo

* Actually fixes it properly
2017-10-01 08:41:16 -05:00
CitadelStationBot 004700de62 Fixes events with sleeps. 2017-10-01 07:34:02 -05:00
AnturKandCitadelStationBot cae3dd615d Fixes events with sleeps. 2017-10-01 07:34:01 -05:00
CitadelStationBot 6e8f56edfd Fixes aliums being able to attack the SM crystal 2017-10-01 05:04:30 -05:00
ShizCalevandCitadelStationBot 770a0a1154 Fixes aliums being able to attack the SM crystal 2017-10-01 05:04:30 -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 37942a2279 Update hostile.dm 2017-10-01 01:57:49 -05: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