 LetterJay
|
b5cfa6709e
|
Merge pull request #1322 from Citadel-Station-13/upstream-merge-27877
[MIRROR] Advanced proccall now supports /proc/PROCNAME
|
2017-06-02 22:40:07 -05:00 |
|
|
LetterJay
|
e49345c27c
|
Merge pull request #1319 from Citadel-Station-13/upstream-merge-27865
[MIRROR] Adds repair and lavaland map generator templates for buildmode use
|
2017-06-02 22:39:45 -05:00 |
|
|
LetterJay
|
c9a1735deb
|
Merge pull request #1318 from Citadel-Station-13/upstream-merge-27871
[MIRROR] [Meta] Var Cleanup and tweaks
|
2017-06-02 22:39:23 -05:00 |
|
|
LetterJay
|
c5e76b4e45
|
Merge pull request #1317 from Citadel-Station-13/upstream-merge-27864
[MIRROR] Mapped active shieldgens
|
2017-06-02 22:38:58 -05:00 |
|
|
LetterJay
|
ccf0d133ec
|
Merge pull request #1293 from Citadel-Station-13/upstream-merge-27666
[MIRROR] Moves dmm2tgm to mapmerge
|
2017-06-02 22:37:40 -05:00 |
|
|
CitadelStationBot
|
538bce59a6
|
Advanced proccall now supports /proc/PROCNAME
|
2017-05-31 19:24:13 -05:00 |
|
|
CitadelStationBot
|
b78f317f2d
|
Adds repair and lavaland map generator templates for buildmode use
|
2017-05-31 12:57:22 -05:00 |
|
|
CitadelStationBot
|
946a6b1146
|
[Meta] Var Cleanup and tweaks
|
2017-05-31 08:57:18 -05:00 |
|
|
CitadelStationBot
|
4eb5a9bf21
|
Mapped active shieldgens
|
2017-05-31 08:56:07 -05:00 |
|
|
LetterJay
|
ffd2d6fd0a
|
Merge pull request #1206 from Citadel-Station-13/upstream-merge-27721
[MIRROR] Fix roundid
|
2017-05-31 02:33:42 -05:00 |
|
|
LetterJay
|
fbedba7c3f
|
Update world.dm
|
2017-05-31 02:10:31 -05:00 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
fbbceadc6e
|
Merge branch 'master' into AllMapChangesInOne
|
2017-05-30 23:08:32 -05:00 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
e9ff797a8b
|
Update cerestation.dmm
|
2017-05-30 21:56:13 -05:00 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|