Commit Graph

223 Commits

Author SHA1 Message Date
LetterJay b28677414e Update looc.dm 2017-06-20 01:47:52 -05:00
LetterJay a8b498a2a9 Merge pull request #1666 from Citadel-Station-13/upstream-merge-28407
[MIRROR] [READY]Adds examine tooltips
2017-06-20 01:29:44 -05:00
LetterJay 4775f0b9c5 Update looc.dm 2017-06-20 01:27:05 -05:00
LetterJay 9f40c381a4 fixes looc 2017-06-20 01:25:48 -05:00
LetterJay f97540247f Merge pull request #1667 from Citadel-Station-13/upstream-merge-28580
[MIRROR] Fix cid reconnect message not showing
2017-06-19 21:02:56 -05:00
LetterJay cd06b77e01 Delete preferences_savefile.dm.rej 2017-06-19 20:54:04 -05:00
LetterJay 13078c1130 Update preferences_savefile.dm 2017-06-19 20:52:25 -05:00
LetterJay 42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
LetterJay 8120278819 update client_procs 2017-06-19 13:12:51 -05:00
LetterJay a544d99f9f cleanup and commits 2017-06-19 12:35:05 -05:00
CitadelStationBot 254badde48 Fix cid reconnect message not showing 2017-06-18 22:17:57 -05:00
CitadelStationBot 9863f88366 [READY]Adds examine tooltips 2017-06-18 21:58:37 -05:00
LetterJay 5dc3c2987c Merge pull request #1593 from Citadel-Station-13/PanicBunker
Fixes the panic bunker age check
2017-06-14 06:43:54 -05:00
LetterJay 4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
Selective mirror sync
2017-06-14 06:41:01 -05:00
LetterJay cd4dc1f1c6 this is why committing at 5am is a bad idea 2017-06-14 05:02:32 -05:00
LetterJay 226345d82a upstream-merge-28109
upstream-merge-28352
2017-06-13 01:10:21 -05:00
CitadelStationBot ef0254b32d Workaround for byond bug causing clients to flood the server with repeated asset cache arrival messages 2017-06-12 18:25:51 -05:00
CitadelStationBot d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
CitadelStationBot 9dd40f1fad Adds coalesce to world.internet_address 2017-05-29 09:15:12 -05:00
CitadelStationBot 94b7e560ab World.dm Refactor 2017-05-18 16:37:46 -05:00
CitadelStationBot a317d23a51 [MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916)
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie

* fixes .rej
2017-05-18 09:37:30 -05:00
CitadelStationBot 257cf986c5 Repaths C4 (#808)
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
2017-05-18 00:37:20 -05:00
LetterJay f978e3d56e rej cleanup 2017-05-17 03:50:34 -05:00
LetterJay 52fa1f314f Merge branch 'master' into upstream-merge-26760 2017-05-14 01:02:26 -04:00
LetterJay adc1b96b74 this is kenzie's fault 2017-05-12 15:25:11 -05:00
LetterJay 6d1fb0d48a the ride never ends 2017-05-12 10:54:57 -05:00
LetterJay 745bf3b321 client procs... client procs.... client procs.... 2017-05-12 09:57:20 -05:00
LetterJay 55492bb8ec even more client fixes! this time with added admin fixes 2017-05-12 09:52:42 -05:00
LetterJay 59497ff049 more client fixes 2017-05-12 02:41:12 -05:00
LetterJay e748d40401 Update client_procs.dm 2017-05-12 02:29:03 -05:00
LetterJay fd5b7566fd update client_procs.dm 2017-05-12 01:49:56 -05:00
LetterJay 6a1cac4e1e Merge branch 'master' into upstream-merge-26425 2017-05-12 00:08:32 -04:00
LetterJay 8bb34472b7 fuck 2017-05-11 23:07:50 -05:00
LetterJay ff414d3a27 rej cleanup 2017-05-11 23:00:26 -05:00
CitadelStationBot 6c4524700b Fixes character saves getting fucked up if there are no configured round start races. (#742) 2017-05-11 19:24:59 -07:00
LetterJay b7acf503eb rej cleanup 2017-05-10 22:35:01 -05:00
LetterJay a66e0c949e Merge pull request #832 from Citadel-Station-13/upstream-merge-23201
[MIRROR] [READY]DATUM VERBS AND TOP MENUS!
2017-05-10 23:05:37 -04:00
LetterJay 746da812bf Delete client_procs.dm.rej 2017-05-10 22:00:44 -05:00
LetterJay 43318a88a5 rej fix 2017-05-10 21:59:41 -05:00
LetterJay 3c131800b6 Merge pull request #722 from Citadel-Station-13/upstream-merge-26645
[MIRROR] Persistent investigate and game logs separated by round ID
2017-05-10 21:12:08 -04:00
LetterJay 57372ebdb0 merge 2017-05-10 19:41:55 -05:00
CitadelStationBot 181eee013e [READY]DATUM VERBS AND TOP MENUS! 2017-05-07 17:07:59 -05:00
kevinz000 b440ba70b0 Delete suicide.dm.rej 2017-05-06 11:49:26 -07:00
kevinz000 c5f7644452 Update suicide.dm 2017-05-06 11:48:24 -07:00
CitadelStationBot 7288549dec Players may no longer commite suicide 2017-05-05 18:08:56 -05:00
CitadelStationBot 3b84fcb9c2 Playar byound accunt age storid in db 2017-05-04 18:14:23 -05:00
CitadelStationBot 49990d0c05 Persistent investigate and game logs separated by round ID 2017-05-02 18:47:58 -05:00
CitadelStationBot 036109de58 Changes a bunch of hrefs to the proper defines 2017-05-02 02:20:07 -05:00
LetterJay 06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
CitadelStationBot 404b2314c5 Fixes changelog assets 2017-04-27 15:38:42 -05:00