LetterJay
|
35b56f3075
|
Merge branch 'master' into upstream-merge-27773
|
2017-06-06 09:05:26 -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
|
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
|
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
|
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
|
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
|
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 |
|
LetterJay
|
b36e3065e0
|
Merge branch 'master' into upstream-merge-27712
|
2017-06-05 22:46:25 -05:00 |
|
CitadelStationBot
|
e8663bee81
|
Refactors the latejoin list
|
2017-06-04 15:08:35 -05:00 |
|
CitadelStationBot
|
e0b5221ebd
|
The Crafting Menu now has subcategories! (#1364)
|
2017-06-04 09:09:59 -07:00 |
|
CitadelStationBot
|
6e632190b3
|
Planned Spaceparenthood would like to apologize for mislabeling their cloning pod ejection buttons. (#1366)
|
2017-06-04 09:09:44 -07:00 |
|
CitadelStationBot
|
79f28a732d
|
Buffs chemical grenades (#1372)
|
2017-06-04 09:08:50 -07:00 |
|
CitadelStationBot
|
b5d2cf3c99
|
[READY] Stacks will change item_states and w_class based on how full they are. (#1370)
|
2017-06-04 09:08:33 -07:00 |
|
CitadelStationBot
|
c1adecc0e2
|
Fix AI status displays to use a list instead of the world list (#1391)
|
2017-06-04 09:08:04 -07:00 |
|
CitadelStationBot
|
7ec36019d5
|
Refactor another spawned cooldown var (#1383)
|
2017-06-04 09:07:49 -07:00 |
|
CitadelStationBot
|
8fcbf20c79
|
Another spawn timer (#1388)
|
2017-06-04 09:07:16 -07:00 |
|
CitadelStationBot
|
63f9657d9b
|
Refactors a cooldown var to not require a spawn or sleep (#1381)
|
2017-06-04 09:06:47 -07:00 |
|
CitadelStationBot
|
e57863cfe1
|
Refactor another spawn cooldown (#1385)
|
2017-06-04 09:06:38 -07:00 |
|
CitadelStationBot
|
1e12557776
|
Remove spawns in favour of stacktrace calls, which don't stop the called (#1382)
|
2017-06-04 09:06:27 -07:00 |
|
CitadelStationBot
|
6def6cddda
|
Refactors yet another spawn cooldown (#1384)
|
2017-06-04 09:06:14 -07:00 |
|
CitadelStationBot
|
8dae545d59
|
Goodbye spawn (#1387)
|
2017-06-04 09:05:47 -07:00 |
|
CitadelStationBot
|
9023e0ff67
|
refactor another spawn cooldown (#1392)
|
2017-06-04 09:05:12 -07:00 |
|
CitadelStationBot
|
bf4973e580
|
Refactor another spawn (#1394)
|
2017-06-04 09:04:32 -07:00 |
|
CitadelStationBot
|
e59e7f8d06
|
Fixes bsa not showing up (#1396)
|
2017-06-04 09:03:30 -07:00 |
|
CitadelStationBot
|
f8505883d4
|
Removes dragoontomb ruin and loot. (#1290)
|
2017-06-03 06:39:11 -07:00 |
|
kevinz000
|
b9c4873ee9
|
Merge branch 'master' into upstream-merge-27801
|
2017-06-03 06:38:57 -07:00 |
|
CitadelStationBot
|
fa305c2aec
|
[MIRROR] Fix NOPOWER being set incorrectly for holopads (#1300)
* Fix NOPOWER being set incorrectly for holopads
* Update hologram.dm
* Delete hologram.dm.rej
|
2017-06-03 06:37:30 -07:00 |
|
CitadelStationBot
|
043d9b478e
|
Gives the janitor a flyswatter in their roundstart equipment (#1354)
|
2017-06-03 06:37:08 -07:00 |
|
CitadelStationBot
|
11d5262e0c
|
Dominator colors are now directly determined by the gang's color (#1355)
|
2017-06-03 06:36:49 -07:00 |
|
CitadelStationBot
|
79ff2672b4
|
[MIRROR] Clean snow, lavaland, and thunderdome (#1261)
* Clean snow, lavaland, and thunderdome
* Delete mining.dm.rej
|
2017-06-02 22:01:46 -07:00 |
|
LetterJay
|
976c1244dd
|
Config shit for cards (#1310)
|
2017-06-02 21:56:08 -07:00 |
|
kevinz000
|
224f1d8bd1
|
Delete hologram.dm.rej
|
2017-06-02 21:50:17 -07:00 |
|
kevinz000
|
c483767431
|
Update hologram.dm
|
2017-06-02 21:50:11 -07:00 |
|
CitadelStationBot
|
2dc13e6242
|
makes machineguns pass their users to their fire helpers instead of the floor (#1256)
|
2017-06-02 21:46:15 -07:00 |
|
CitadelStationBot
|
b85384c0ad
|
Fixes meteor and immoveable rods hitting Centcomm (#1252)
|
2017-06-02 21:36:45 -07:00 |
|
CitadelStationBot
|
bdd4f9d17f
|
Allows explorer webbings to hold marker beacons (#1219)
|
2017-06-02 21:35:41 -07:00 |
|
CitadelStationBot
|
2c7e3ad4f7
|
Makes op belts less brown (#1336)
|
2017-06-02 21:18:26 -07:00 |
|
CitadelStationBot
|
55f8700a8c
|
Fix some camera Initializes (#1337)
|
2017-06-02 21:18:07 -07:00 |
|
LetterJay
|
7b346b6241
|
Merge pull request #1342 from Citadel-Station-13/upstream-merge-27932
[MIRROR] Attempts to add items to a storage container beyond its slots limit will obtain a failure message again.
|
2017-06-02 22:47:01 -05:00 |
|
LetterJay
|
c36ca8a434
|
Merge pull request #1344 from Citadel-Station-13/upstream-merge-27945
[MIRROR] Fixes airlocks not updating icon properly
|
2017-06-02 22:46:38 -05:00 |
|
LetterJay
|
6da343e11c
|
Merge pull request #1346 from Citadel-Station-13/upstream-merge-27917
[MIRROR] Cult floors now reduce rune scribing for small runes by 50%
|
2017-06-02 22:45:56 -05:00 |
|
LetterJay
|
c4b280b269
|
Merge pull request #1323 from Citadel-Station-13/upstream-merge-27879
[MIRROR] Fixes posters
|
2017-06-02 22:40:28 -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 |
|
CitadelStationBot
|
9a05029df6
|
Cult floors now reduce rune scribing for small runes by 50%
|
2017-06-02 16:12:43 -05:00 |
|
CitadelStationBot
|
b676e7b5ae
|
Fixes airlocks not updating icon properly
|
2017-06-02 12:14:17 -05:00 |
|
CitadelStationBot
|
6e563e7a53
|
Attempts to add items to a storage container beyond its slots limit will obtain a failure message again.
|
2017-06-02 06:42:23 -05:00 |
|
CitadelStationBot
|
d36bc75074
|
Fixes posters
|
2017-05-31 19:29:20 -05:00 |
|