LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
Leo
c0547bea4b
Merge pull request #33217 from tgstation/Cyberboss-patch-3
...
Makes ahelp timestamps consistent with logs
2017-12-03 16:07:30 -06:00
deathride58
bc1f65b381
Update adminhelp.dm
2017-11-18 00:24:52 -05:00
Jordie
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
LetterJay
439723caff
Update adminhelp.dm
2017-11-12 11:18:11 -06:00
LetterJay
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
Leo
ada8ad0ead
Proper and improper macros are removed before sending to irc ( #32347 )
...
* Proper and improper macros are removed before sending to irc
* Removes leftover check
2017-11-03 15:53:26 -05:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
deathride58
55cad46845
Adds a button to let people ahelping know their issue is being handled
2017-10-26 12:21:28 -04:00
Leo
3857bfb2fc
Merge pull request #31768 from AnturK/ahelptrim
...
Trims ahelps
2017-10-16 16:48:04 -05:00
Leo
506324fbec
Merge pull request #31670 from tgstation/Cyberboss-patch-3
...
IC Issue also tells the ahelper that their ticket has been resolved
2017-10-14 09:07:03 -05:00
ExcessiveUseOfCobblestone
f2102c68f1
Resolving tickets now informs the player. ( #31357 )
...
* Update adminhelp.dm
* Update adminhelp.dm
2017-10-06 21:25:53 -05:00
Jordan Brown
bd76e658b0
Makes the reply link for ahelps use the global token ( #31191 )
2017-10-02 01:14:14 -05:00
LetterJay
80a84db919
Update adminhelp.dm
2017-10-01 02:39:24 -05:00
LetterJay
0ab234ceb0
Merge branch 'master' into upstream-merge-31000
2017-10-01 03:31:49 -04:00
Jordan Brown
116041d621
Server tools API v3.1
2017-09-28 22:20:46 -05:00
Jordan Brown
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
LetterJay
d8de375ada
Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
...
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
ShizCalev
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
oranges
a6ae23aefb
Merge pull request #30984 from tgstation/Cyberboss-patch-4
...
Makes keywords_lookup use the global token
2017-09-24 17:35:49 -05:00
CitadelStationBot
fd64d4fdfa
[MIRROR] Fixes IRC ahelp answer notifications ( #2888 )
...
* Merge pull request #30912 from tgstation/Cyberboss-patch-4
Fixes IRC ahelp answer notifications
* Fixes IRC ahelp answer notifications
2017-09-22 04:45:24 -05:00
CitadelStationBot
9284bdd205
[MIRROR] Admins in chat are notified if an ahelp is answered in game ( #2828 )
...
* Admins in chat are notified if an ahelp is answered in game (#30638 )
* Admins in chat are notified if an ahelp is answered in game
* Further sanity
* Admins in chat are notified if an ahelp is answered in game
2017-09-17 22:25:43 -05:00
oranges
3e6c0624fc
Merge pull request #30637 from tgstation/Cyberboss-patch-6
...
Adds 5s delay to current immediate ahelp verb returns
2017-09-12 17:09:31 -05:00
Jordan Brown
92b78d3298
[s] Adds a security token to all admin hrefs
2017-09-08 21:16:02 -05:00
CitadelStationBot
8be784e667
Fixes empty adminhelp tickets messages
2017-08-26 11:07:06 -05:00
LetterJay
ab27b63cf9
Merge branch 'master' into upstream-merge-29611
2017-08-15 18:55:12 -05:00
CitadelStationBot
cc7ad81f79
Adds helpers to avoid << use
2017-08-08 22:28:16 -05:00
CitadelStationBot
fbabd14798
Fixes adminhelp sending the wrong message to players
2017-08-07 12:26:15 -05:00
CitadelStationBot
d608741385
Fixes repeated adminhelp message
2017-07-08 13:19:07 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
5f4e1ed721
Improves Ahelp feedback
2017-06-26 06:01:38 -05:00
CitadelStationBot
82a1a5c03b
New Ahelp IRC functions
2017-06-12 19:22:48 -05:00
CitadelStationBot
d341334118
[s] Fixes IRC ahelps
2017-06-07 21:27:14 -05:00
LetterJay
60da3ff9b8
Original mirrored too much.
2017-06-05 07:18:29 -05:00
CitadelStationBot
c61bb0476f
[MIRROR] Cleans up some Initializes ( #943 )
...
* Cleans up some Initializes
* Update farm_animals.dm
* Delete farm_animals.dm.rej
* Update farm_animals.dm
2017-05-18 11:13:53 -05:00
LetterJay
52fa1f314f
Merge branch 'master' into upstream-merge-26760
2017-05-14 01:02:26 -04:00
LetterJay
007281a51c
Revert "[MIRROR] You can no longer queue up ahelps by queing up prompts"
2017-05-02 18:53:59 -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
CitadelStationBot
036109de58
Changes a bunch of hrefs to the proper defines
2017-05-02 02:20:07 -05:00
CitadelStationBot
34a701a1bc
You can no longer queue up ahelps by queing up prompts
2017-05-01 11:38:04 -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
CitadelStationBot
6e874d1089
Fixes ircadminwho making the wrong list check
2017-04-27 17:56:36 -05:00
CitadelStationBot
7dc86aa2db
Fix current_ticket.initiator not being set when a client relogs ( #520 )
2017-04-23 01:36:14 -05:00
Poojawa
f866139c52
Admin ticket tgstyle ( #493 )
...
* some porting
* other changes
2017-04-20 22:00:47 -05:00
Poojawa
9e72b1b8fd
/tg/ 4/14 ( #367 )
...
* outside code stuff
* defines, helpers, etc
* everything not module
* modules
* compiled fixes + missing sounds
2017-04-14 23:28:04 -05:00
Poojawa
7e9b96a00f
April sync ( #360 )
...
* Maps and things no code/icons
* helpers defines globalvars
* Onclick world.dm orphaned_procs
* subsystems
Round vote and shuttle autocall done here too
* datums
* Game folder
* Admin - chatter modules
* clothing - mining
* modular computers - zambies
* client
* mob level 1
* mob stage 2 + simple_animal
* silicons n brains
* mob stage 3 + Alien/Monkey
* human mobs
* icons updated
* some sounds
* emitter y u no commit
* update tgstation.dme
* compile fixes
* travis fixes
Also removes Fast digest mode, because reasons.
* tweaks for travis Mentors are broke again
Also fixes Sizeray guns
* oxygen loss fix for vore code.
* removes unused code
* some code updates
* bulk fixes
* further fixes
* outside things
* whoops.
* Maint bar ported
* GLOBs.
2017-04-13 23:37:00 -05:00
TalkingCactus
89a99d78d1
Adminhelp prompts will now be larger to allow you to proofread large responses and PMs ( #345 )
...
* bigger box
* even bigger
well not really, but it's better anyway
* fuck i didn't tick these
* bigger /me input
double emote size as well, stop complaining about cutoffs and don't make
me regret this
* cleanup
2017-04-09 05:53:44 -04:00
Poojawa
f67e9f6d87
Bleeding edgy refresh ( #303 )
...
* not code stuff
* other things
* global vars, defines, helpers
* onclick hud stuff, orphans, world.dm
* controllers and datums
* game folder
* everything not client/mobs in modules
* client folder
* stage 1 mob stuff
* simple animal things
* silicons
* carbon things
* ayylmaos and monkeys
* hyoomahn
* icons n shit
* sprite fixes
* compile fixes
* some fixes I cherrypicked.
* qdel fixes
* forgot brain refractors
2017-03-21 11:44:10 -05:00
