Jordie
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
Jordan Brown
faf0e0a10a
Adds admin override for false alarm event.
2017-10-22 00:05:23 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
Jordan Brown
ccb0674988
Fixes the last Href Token issues ( #31666 )
2017-10-14 11:46:01 -05:00
Jordan Brown
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
LetterJay
a960b63b0a
Merge branch 'master' into upstream-merge-30056
2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51
commit
2017-09-13 06:04:22 -05:00
LetterJay
eeadba6f18
Merge pull request #2696 from Citadel-Station-13/upstream-merge-30494
...
[MIRROR] Adds missing span-endings
2017-09-12 06:32:45 -05:00
LetterJay
e2536975dc
Merge pull request #2675 from Citadel-Station-13/upstream-merge-30554
...
[MIRROR] Fixes admin topics
2017-09-12 03:07:04 -05:00
LetterJay
dac6cc56e4
Merge branch 'master' into upstream-merge-30494
2017-09-12 02:40:24 -05:00
LetterJay
8223692c32
Merge pull request #2684 from Citadel-Station-13/upstream-merge-30558
...
[MIRROR] Adds href tokens to topic.dm
2017-09-12 02:37:49 -05:00
LetterJay
4fdc313486
Update topic.dm
2017-09-12 02:36:28 -05:00
LetterJay
b8f2fe00e5
Update topic.dm
2017-09-12 02:31:25 -05:00
LetterJay
4d7c4e6da9
Merge branch 'master' into upstream-merge-30554
2017-09-12 01:20:05 -05:00
LetterJay
f60d57520b
Merge branch 'master' into upstream-merge-29839
2017-09-11 23:22:39 -05:00
LetterJay
c3ef612490
Ports MSO's fading note system
2017-09-11 23:07:30 -05:00
kingofkosmos
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
LetterJay
b89fa8ab15
Update topic.dm
2017-09-10 15:54:31 -05:00
Leo
0e24ac55a5
Merge pull request #30558 from Cyberboss/IFUCKINGHATETHISGODAMNSTUPIDASSFILE
...
Adds href tokens to topic.dm
2017-09-10 09:35:21 -05:00
AnturK
dc2c9fb07d
Fixes admin topics
2017-09-09 17:13:25 -05:00
Jordan Brown
92b78d3298
[s] Adds a security token to all admin hrefs
2017-09-08 21:16:02 -05:00
LetterJay
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
LetterJay
3e0ead1204
Merge branch 'master' into upstream-merge-29105
2017-09-02 07:11:32 -05:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
196c9d0597
Adds tracking amount of time spent playing departments 2: The fall of the Assistants.
2017-08-20 06:01:24 -05:00
LetterJay
ab27b63cf9
Merge branch 'master' into upstream-merge-29611
2017-08-15 18:55:12 -05:00
CitadelStationBot
2476d59be6
Makes the ahelp topic give the permissions warning
2017-08-14 06:54:44 -05:00
CitadelStationBot
cc7ad81f79
Adds helpers to avoid << use
2017-08-08 22:28:16 -05:00
CitadelStationBot
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
CitadelStationBot
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
CitadelStationBot
2cbfec38a2
Makes round end delay message optional
2017-07-15 22:19:46 -05:00
ktccd
6d3123f63c
Readds borers ( #1999 )
...
Readds the cortical borers and also syndi-borers.
Syndi-borers now gives a response if you try to use it multiple times
too quickly, and also prevents usage more than once while it's still
waiting for ghost responses.
2017-07-14 19:28:52 -07:00
CitadelStationBot
fcf09e06e0
Allows admins to set messages when they delay the round end ( #1965 )
2017-07-10 16:13:51 -07:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
b5a5b4aada
Prevents negative tempban duration ( #1624 )
2017-06-17 13:15:51 -07:00
CitadelStationBot
44f4059968
Weaponizes station charters ( #1449 )
2017-06-13 13:47:17 -07:00
LetterJay
5f1fe8b8da
cleanup
2017-06-09 09:04:31 -05:00
CitadelStationBot
07cb1ab1de
Fix related CID/IPs on player panel
2017-06-09 08:59:57 -05:00
LetterJay
cbae09b538
rej cleanup/commit
2017-05-22 16:59:39 -05:00
LetterJay
ab50a3eca5
Merge pull request #1068 from Citadel-Station-13/upstream-merge-27283
...
[MIRROR] Decentralized and Vastly Improved Gang Influence System
2017-05-22 16:28:57 -05:00
CitadelStationBot
c39b60b3cf
Decentralized and Vastly Improved Gang Influence System
2017-05-20 18:37:48 -05:00
CitadelStationBot
94b7e560ab
World.dm Refactor
2017-05-18 16:37:46 -05:00
CitadelStationBot
2ee5ff82a2
[MIRROR] Adds a way to check related accounts by CID or IP in game ( #863 )
...
* Adds a way to check related accounts by CID or IP in game
* resolve rej
2017-05-18 04:20:49 -05:00
CitadelStationBot
56d5e12263
Moves languages to a holder datum, gives mind its own language holder
2017-05-05 08:13:04 -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
fd6df15f93
Merge branch 'master' into upstream-merge-26131
2017-05-02 09:19:49 -05:00
CitadelStationBot
7a4f1496e9
Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted
2017-05-01 07:24:45 -05:00
LetterJay
991fb8335c
manual merge
2017-04-29 11:42:28 -05:00
