 CitadelStationBot
|
ff53afcd99
|
Fixes clockwork armor bitflags
|
2017-06-09 03:26:59 -05:00 |
|
|
LetterJay
|
8ef2931630
|
Merge pull request #1481 from Citadel-Station-13/upstream-merge-28183
[MIRROR] Trims whitelist entries and makes them use ckey()
|
2017-06-08 22:28:14 -05:00 |
|
|
CitadelStationBot
|
7b6c76525c
|
Trims whitelist entries and makes them use ckey()
|
2017-06-08 09:45:45 -05:00 |
|
|
LetterJay
|
00790c0fdd
|
Merge pull request #1315 from Citadel-Station-13/upstream-merge-27866
[MIRROR] Makes VV'ing ID cards easier.
|
2017-06-08 03:43:31 -05:00 |
|
|
CitadelStationBot
|
06d5f29d9d
|
Automatic changelog generation for PR #1308 [ci skip]
|
2017-06-08 03:35:24 -05:00 |
|
|
LetterJay
|
923c5b9035
|
Merge pull request #1308 from Citadel-Station-13/upstream-merge-27881
[MIRROR] Luxury Bluespace Shelter Capsules, Take 2.
|
2017-06-08 03:35:23 -05:00 |
|
|
LetterJay
|
ad97147dfe
|
Merge pull request #1314 from Citadel-Station-13/upstream-merge-27870
[MIRROR] Fixes ghosts using marker beacon
|
2017-06-08 03:31:22 -05:00 |
|
|
CitadelStationBot
|
70a3c954b1
|
Automatic changelog generation for PR #1277 [ci skip]
|
2017-06-08 03:30:14 -05:00 |
|
|
LetterJay
|
f367878119
|
Merge pull request #1277 from Citadel-Station-13/upstream-merge-27773
[MIRROR] Splits mining_mobs.dm into separate files
|
2017-06-08 03:30:13 -05:00 |
|
|
LetterJay
|
1a71a52372
|
Merge pull request #1474 from Citadel-Station-13/upstream-merge-28174
[MIRROR] Moves station's starting state to ticker post setup, instead of gamemode's
|
2017-06-08 03:28:18 -05:00 |
|
|
LetterJay
|
d79bd3988c
|
Merge pull request #1473 from Citadel-Station-13/upstream-merge-28158
[MIRROR] Adds creamatoriums
|
2017-06-08 03:27:35 -05:00 |
|
|
LetterJay
|
3e051b9b90
|
Merge pull request #1476 from Citadel-Station-13/upstream-merge-28211
[MIRROR] [s] Fixes IRC ahelps
|
2017-06-08 03:26:56 -05:00 |
|
|
CitadelStationBot
|
d341334118
|
[s] Fixes IRC ahelps
|
2017-06-07 21:27:14 -05:00 |
|
|
CitadelStationBot
|
7eedaa87c5
|
Moves station's starting state to ticker post setup, instead of gamemode's
|
2017-06-07 20:54:37 -05:00 |
|
|
CitadelStationBot
|
e21e4eac9d
|
Adds creamatoriums
|
2017-06-07 20:45:26 -05:00 |
|
|
LetterJay
|
586a13a46b
|
Merge pull request #1441 from Citadel-Station-13/upstream-merge-28087
[MIRROR] Adds temp index to query for converting to rounds
|
2017-06-06 23:33:58 -05:00 |
|
|
LetterJay
|
b332506cf2
|
Merge pull request #1442 from Citadel-Station-13/upstream-merge-28105
[MIRROR] Fixes logged out spawning new_players
|
2017-06-06 23:33:35 -05:00 |
|
|
LetterJay
|
cc24b6e3a7
|
Merge pull request #1443 from Citadel-Station-13/whitelist
testing
|
2017-06-06 14:48:48 -05:00 |
|
|
LetterJay
|
ccd1235599
|
testing
|
2017-06-06 14:48:19 -05:00 |
|
|
LetterJay
|
e98868e9e1
|
Merge pull request #1437 from Citadel-Station-13/upstream-merge-28100
[MIRROR] Hang up holocalls with an action
|
2017-06-06 13:30:19 -05:00 |
|
|
CitadelStationBot
|
c5143880d2
|
Fixes logged out spawning new_players
|
2017-06-06 13:28:23 -05:00 |
|
|
CitadelStationBot
|
d9d9c98548
|
Adds temp index to query for converting to rounds
|
2017-06-06 13:28:19 -05:00 |
|
|
LetterJay
|
8a9db7b4d2
|
Merge pull request #1432 from Citadel-Station-13/upstream-merge-28094
[MIRROR] Fixes 28060 : emergency shields have a hit effect instead of setting opacity to 1
|
2017-06-06 13:06:23 -05:00 |
|
|
LetterJay
|
8273877b23
|
Update holocall.dm
|
2017-06-06 13:05:38 -05:00 |
|
|
LetterJay
|
e32283f059
|
Merge pull request #1438 from Citadel-Station-13/upstream-merge-28081
[MIRROR] Hulks now take 10 hits to destroy dominators up from 2
|
2017-06-06 13:02:36 -05:00 |
|
|
CitadelStationBot
|
5b53514452
|
Hulks now take 10 hits to destroy dominators up from 2
|
2017-06-06 10:40:10 -05:00 |
|
|
CitadelStationBot
|
98e2a659f4
|
Hang up holocalls with an action
|
2017-06-06 10:34:58 -05:00 |
|
|
LetterJay
|
35b56f3075
|
Merge branch 'master' into upstream-merge-27773
|
2017-06-06 09:05:26 -05:00 |
|
|
CitadelStationBot
|
629a417177
|
Automatic changelog generation for PR #1274 [ci skip]
|
2017-06-06 09:01:35 -05:00 |
|
|
LetterJay
|
71bb6c930c
|
Merge pull request #1274 from Citadel-Station-13/upstream-merge-27652
[MIRROR] [Centcom] Nanotrasen Private Security 2.0
|
2017-06-06 09:01:33 -05:00 |
|
|
LetterJay
|
60b5c7b33e
|
Merge pull request #1247 from Citadel-Station-13/upstream-merge-27726
[MIRROR] Custom emotes no longer replace the pronouns
|
2017-06-06 09:00:47 -05:00 |
|
|
CitadelStationBot
|
f9bb31b5e7
|
Automatic changelog generation for PR #1244 [ci skip]
|
2017-06-06 09:00:34 -05:00 |
|
|
LetterJay
|
36a0fe00c3
|
Merge pull request #1244 from Citadel-Station-13/upstream-merge-27728
[MIRROR] The kinetic crusher can now gain bonus effects via trophies gained by killing bosses with it
|
2017-06-06 09:00:27 -05:00 |
|
|
LetterJay
|
31e145800f
|
Merge pull request #1434 from Citadel-Station-13/upstream-merge-28083
[MIRROR] Fixes projectile fields blocking clicks
|
2017-06-06 08:59:56 -05:00 |
|
|
LetterJay
|
948853b03f
|
Merge pull request #1433 from Citadel-Station-13/WonderfulWorldOfSQL
SQL updates
|
2017-06-06 07:59:15 -05:00 |
|
|
LetterJay
|
dbb233b874
|
missed a few things
|
2017-06-06 07:49:18 -05:00 |
|
|
CitadelStationBot
|
7ef70f6c95
|
Fixes projectile fields blocking clicks
|
2017-06-06 07:15:12 -05:00 |
|
|
CitadelStationBot
|
369d8f1142
|
Fixes 28060 : emergency shields have a hit effect instead of setting opacity to 1
|
2017-06-06 07:13:05 -05:00 |
|
|
LetterJay
|
905bd168aa
|
commit
|
2017-06-06 07:13:04 -05:00 |
|
|
LetterJay
|
fc1017fa14
|
Merge pull request #1287 from Citadel-Station-13/upstream-merge-27801
[MIRROR] Holocall cleanup
|
2017-06-05 23:19:23 -05:00 |
|
|
LetterJay
|
2feab0a411
|
cleanup
|
2017-06-05 23:18:40 -05:00 |
|
|
LetterJay
|
962177c423
|
Merge branch 'master' into upstream-merge-27652
|
2017-06-05 23:16:40 -05:00 |
|
|
LetterJay
|
5f74de6bdf
|
cleanup
|
2017-06-05 23:12:15 -05:00 |
|
|
LetterJay
|
1c71b4fd68
|
cleanup
|
2017-06-05 23:10:02 -05:00 |
|
|
LetterJay
|
54549d43a2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27728
|
2017-06-05 23:07:52 -05:00 |
|
|
LetterJay
|
0b196930bb
|
Merge pull request #1241 from Citadel-Station-13/upstream-merge-27708
[MIRROR] Small outfit refactor
|
2017-06-05 23:07:02 -05:00 |
|
|
LetterJay
|
0158eded16
|
Merge pull request #1240 from Citadel-Station-13/upstream-merge-27712
[MIRROR] Fixes revision stat tracking
|
2017-06-05 23:06:50 -05:00 |
|
|
LetterJay
|
09fcdabba2
|
Merge pull request #1239 from Citadel-Station-13/upstream-merge-27714
[MIRROR] Fixes world start outfit runtime
|
2017-06-05 23:06:37 -05:00 |
|
|
LetterJay
|
b2d288d1f8
|
Merge pull request #1225 from Citadel-Station-13/upstream-merge-27611
[MIRROR] Gang War: Replaces sniper rifle with weaker version, nonlethal ammo, tweaks bling value
|
2017-06-05 23:06:18 -05:00 |
|
|
LetterJay
|
3d750adbd7
|
master cleanup
|
2017-06-05 22:50:31 -05:00 |
|