kevinz000
49881624e2
Merge pull request #772 from Citadel-Station-13/upstream-merge-26874
...
[MIRROR] Fixes the most annoying thing about admin helping.
2017-05-07 23:16:33 -07:00
kevinz000
14fe4948e9
Merge pull request #652 from Citadel-Station-13/upstream-merge-26685
...
[MIRROR] Fixed Dsay always causing a disk read
2017-05-06 22:03:08 -07:00
kevinz000
102b28b1c1
Delete deadsay.dm.rej
2017-05-06 21:28:23 -07:00
LetterJay
1bb43eb7ae
woo
2017-05-05 10:21:53 -05:00
LetterJay
f2f42091f3
Merge branch 'master' into upstream-merge-26685
2017-05-05 09:42:36 -05:00
LetterJay
5d0f7eafaa
Merge pull request #719 from Citadel-Station-13/upstream-merge-26771
...
[MIRROR] Removes vestigial list from minds.
2017-05-05 09:40:28 -05:00
LetterJay
da4e4bbefe
Merge pull request #707 from Citadel-Station-13/upstream-merge-26746
...
[MIRROR] Makes admin sound announcement use the right span
2017-05-05 09:39:04 -05:00
LetterJay
91f3059be1
Merge pull request #693 from Citadel-Station-13/upstream-merge-26722
...
[MIRROR] Moves tips from config to strings tree
2017-05-05 09:33:45 -05:00
CitadelStationBot
73bef0b6c8
Fixes the most annoying thing about admin helping.
2017-05-04 20:40:09 -05:00
LetterJay
007281a51c
Revert "[MIRROR] You can no longer queue up ahelps by queing up prompts"
2017-05-02 18:53:59 -05:00
CitadelStationBot
7baccb8b85
Removes vestigial list from minds.
2017-05-02 12:47:20 -05:00
LetterJay
4ecbec1406
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720
2017-05-02 11:36:27 -05:00
LetterJay
6310292531
woo
2017-05-02 11:19:14 -05:00
LetterJay
fd6df15f93
Merge branch 'master' into upstream-merge-26131
2017-05-02 09:19:49 -05:00
LetterJay
3b8484b52b
Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
...
[MIRROR] Unorphans the blackbox
2017-05-02 05:13:49 -05:00
LetterJay
a8e6de5795
manual merge
2017-05-02 05:06:13 -05:00
LetterJay
4a6ffec412
rej cleanup
2017-05-02 04:56:46 -05:00
LetterJay
7ab8ee8cae
Merge pull request #581 from Citadel-Station-13/upstream-merge-26524
...
[MIRROR] Admin proc calls are now serialized per admin
2017-05-02 04:51:43 -05:00
CitadelStationBot
b45d4ba668
Makes admin sound announcement use the right span
2017-05-01 17:32:29 -05:00
CitadelStationBot
529125d3dd
Moves tips from config to strings tree
2017-05-01 11:51:27 -05:00
CitadelStationBot
34a701a1bc
You can no longer queue up ahelps by queing up prompts
2017-05-01 11:38:04 -05:00
LetterJay
a3eec6c8f9
Merge pull request #670 from Citadel-Station-13/upstream-merge-26713
...
[MIRROR] [s] SDQL security patches
2017-05-01 08:11:36 -05:00
LetterJay
31ea9cb309
Merge pull request #657 from Citadel-Station-13/upstream-merge-26689
...
[MIRROR] [s] Patches SDQL exploits that can return world reference
2017-05-01 08:11:22 -05:00
LetterJay
dd904e3640
Merge pull request #663 from Citadel-Station-13/upstream-merge-26736
...
[MIRROR] >You have to advanced proccall your client to see who griefed with kudzu (Fixes botany investigate logs being inaccessible with normal means.)
2017-05-01 08:02:44 -05:00
LetterJay
d46b85e9ed
Merge pull request #653 from Citadel-Station-13/upstream-merge-26676
...
[MIRROR] Fix SDQL vars again
2017-05-01 07:59:42 -05:00
CitadelStationBot
7a4f1496e9
Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted
2017-05-01 07:24:45 -05:00
CitadelStationBot
fbe0803699
[s] SDQL security patches
2017-04-30 11:30:44 -05:00
CitadelStationBot
3799c28620
>You have to advanced proccall your client to see who griefed with kudzu (Fixes botany investigate logs being inaccessible with normal means.)
2017-04-30 10:24:27 -05:00
CitadelStationBot
9ef9161537
[s] Patches SDQL exploits that can return world reference
2017-04-29 16:59:08 -05:00
CitadelStationBot
c6544f20fd
Fix SDQL vars again
2017-04-29 16:36:36 -05:00
CitadelStationBot
f972199a15
Fixed Dsay always causing a disk read
2017-04-29 15:44:51 -05:00
LetterJay
29720a0bb5
Update randomverbs.dm
2017-04-29 12:01:32 -05:00
LetterJay
06bfa8770e
Merge branch 'master' into upstream-merge-26129
2017-04-29 11:45:37 -05:00
LetterJay
991fb8335c
manual merge
2017-04-29 11:42:28 -05:00
LetterJay
101f1337a6
manual merge
2017-04-29 07:43:07 -05:00
CitadelStationBot
29fd2c6de6
Option for admins to show a song's title
2017-04-28 21:02:52 -05:00
LetterJay
a39b40d879
Merge pull request #578 from Citadel-Station-13/upstream-merge-25981
...
[MIRROR] Initialize Refactor
2017-04-28 09:29:00 -05:00
LetterJay
085b421348
rej fixes
2017-04-28 09:03:56 -05:00
LetterJay
f7fa4d9843
Merge pull request #615 from Citadel-Station-13/upstream-merge-26187
...
[MIRROR] Adds a delete verb to the vv_drop_down
2017-04-28 08:18:07 -05:00
CitadelStationBot
6e874d1089
Fixes ircadminwho making the wrong list check
2017-04-27 17:56:36 -05:00
CitadelStationBot
df4f3aaaad
Adds a delete verb to the vv_drop_down
2017-04-27 17:10:44 -05:00
CitadelStationBot
d77a2bf87d
Fixes SDQL global procs
2017-04-27 09:13:33 -05:00
CitadelStationBot
dc1f664608
Admin proc calls are now serialized per admin
2017-04-26 17:14:40 -05:00
CitadelStationBot
08a01aa11b
Refactors roundstart checks slightly
2017-04-26 17:06:29 -05:00
CitadelStationBot
bde5d6253a
Unorphans the blackbox
2017-04-26 17:05:23 -05:00
CitadelStationBot
cea81a3357
Initialize Refactor
2017-04-26 16:03:17 -05:00
CitadelStationBot
a905c15dad
Replaces /image with /mutable_appearance ( #556 )
...
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00
LetterJay
6dc70fc02f
Merge pull request #526 from Citadel-Station-13/upstream-merge-26289
...
[MIRROR] Changed alternate appearances to /datum/atom_hud s
2017-04-25 21:39:14 -05:00
CitadelStationBot
607868a5de
[s]Exploit whack-a-mole
2017-04-25 01:31:50 -05:00
LetterJay
e27c5c8db3
Merge pull request #545 from Citadel-Station-13/upstream-merge-26397
...
[MIRROR] Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker
2017-04-25 01:02:38 -05:00
