shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,500 Commits 5 Branches 0 Tags
603898adbe70e5b017617d24972f54bb8739ba22
Commit Graph
2500 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot 603898adbe Fixes faulty query and logic 2017-05-31 08:39:39 -05:00
LetterJayandGitHub ffd2d6fd0a Merge pull request #1206 from Citadel-Station-13/upstream-merge-27721 
[MIRROR] Fix roundid
 2017-05-31 02:33:42 -05:00
LetterJayandGitHub fbedba7c3f Update world.dm 2017-05-31 02:10:31 -05:00
LetterJayandGitHub 4f0ee1cbb8 Update world.dm 2017-05-31 01:57:46 -05:00
CitadelStationBot 0159836517 Automatic changelog generation for PR #1214 [ci skip] 2017-05-31 01:53:39 -05:00
LetterJayandGitHub 46bcc34a0e Merge pull request #1214 from Citadel-Station-13/upstream-merge-27677 
[MIRROR] Adds marker beacons to miner borgs
 2017-05-31 01:53:38 -05:00
LetterJayandGitHub 4654baea3b Merge pull request #1217 from Citadel-Station-13/upstream-merge-27685 
[MIRROR] Fixes delayed login message
 2017-05-31 01:48:42 -05:00
LetterJayandGitHub ad96bb6fcf Merge branch 'master' into upstream-merge-27721 2017-05-31 01:47:16 -05:00
LetterJay 01ab250772 commit 2017-05-31 00:02:23 -05:00
LetterJayandGitHub 04edb3e636 Merge pull request #1205 from Citadel-Station-13/upstream-merge-27454 
[MIRROR] Adds round table to replace tacking some data in feedback table
 2017-05-30 23:55:19 -05:00
LetterJayandGitHub b19115e10f Merge branch 'master' into upstream-merge-27454 2017-05-30 23:48:25 -05:00
LetterJay 872b0e61fd rej cleanup, etc. 2017-05-30 23:43:14 -05:00
LetterJay 52881797d0 update area turfs 2017-05-30 23:33:19 -05:00
LetterJayandGitHub 71bf266642 Merge pull request #1312 from Citadel-Station-13/AllMapChangesInOne 
All map changes in one
 2017-05-30 23:20:44 -05:00
LetterJay 168a96c268 back in we go 2017-05-30 23:10:43 -05:00
LetterJayandGitHub fbbceadc6e Merge branch 'master' into AllMapChangesInOne 2017-05-30 23:08:32 -05:00
LetterJayandGitHub 43e0e1e76d Delete cerestation.dmm 2017-05-30 23:06:16 -05:00
LetterJay dac12e365a just delete the shit for now 2017-05-30 23:03:44 -05:00
LetterJay 6717b0d3a2 dsds 2017-05-30 23:01:22 -05:00
LetterJay aedbe151c8 FUUUUUUUUUUUUCK 2017-05-30 23:00:33 -05:00
LetterJay 0401feb327 i hate maps 2017-05-30 22:56:50 -05:00
LetterJay 3baf042360 more commits 2017-05-30 22:55:11 -05:00
LetterJay 7d9865955b master maps 2017-05-30 22:47:08 -05:00
LetterJay 9b00499d24 It's been a long night 2017-05-30 22:41:22 -05:00
LetterJayandGitHub 9ba058930e Update Space_Station_13_areas.dm 2017-05-30 22:18:02 -05:00
LetterJay 0acc4536c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-05-30 22:02:55 -05:00
LetterJay dd1facf96e update 2017-05-30 22:02:41 -05:00
LetterJayandGitHub e9ff797a8b Update cerestation.dmm 2017-05-30 21:56:13 -05:00
LetterJayandGitHub 8f06db65c9 Merge pull request #1131 from Citadel-Station-13/upstream-merge-27534 
[MIRROR] Replaced mob spawner vars with outfits
 2017-05-30 21:43:31 -05:00
LetterJayandGitHub 7e7b65be63 Delete lavaland_surface_ww_vault.dmm 2017-05-30 21:34:16 -05:00
LetterJay c10077828e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-05-30 21:12:41 -05:00
LetterJay c62769c196 dead map 2017-05-30 21:12:28 -05:00
LetterJayandGitHub 1763c4b65d Merge pull request #1114 from Citadel-Station-13/upstream-merge-27530 
[MIRROR] Area Refactor + Var-edit Cleanup
 2017-05-30 20:49:42 -05:00
LetterJay a41d17c9b9 die die die 2017-05-30 20:45:32 -05:00
LetterJay 79b484261a die 2017-05-30 20:44:50 -05:00
LetterJay dc83d85b05 it DOES NOT END 2017-05-30 20:40:03 -05:00
LetterJay 13d8f58b9a sadfs 2017-05-30 20:38:53 -05:00
LetterJay a60ad3264a commit 2017-05-30 20:31:45 -05:00
LetterJay 2f325b1edf kill me 2017-05-30 20:30:36 -05:00
LetterJay a497ba644e more maps 2017-05-30 20:25:23 -05:00
LetterJay 2f34bb209e yay 2017-05-30 20:21:34 -05:00
LetterJay 405df96d2a missed one 2017-05-30 20:17:15 -05:00
LetterJay 8948f2d636 FIXING SHIT. 2017-05-30 20:16:00 -05:00
LetterJay adb7a9b6ff rej clean up 
more areas
 2017-05-30 20:08:53 -05:00
LetterJay 24d6643623 more map area fun 2017-05-30 20:04:10 -05:00
LetterJayandGitHub 0fe4a33b15 Merge pull request #1100 from Citadel-Station-13/upstream-merge-27453 
[MIRROR] [All stations] Cleaned up var-editted areas
 2017-05-30 19:50:35 -05:00
LetterJay 55fa44c7ce it never ends 2017-05-30 19:24:20 -05:00
LetterJay 6cfbd556c2 chronological order 2017-05-30 19:15:24 -05:00
LetterJay 36aa2e4b15 map 2017-05-30 19:08:04 -05:00
LetterJayandGitHub f6f0523fa9 Merge pull request #1200 from Citadel-Station-13/upstream-merge-27661 
[MIRROR] Fixes ex_act not having waitfor = FALSE
 2017-05-30 18:46:40 -05:00