Commit Graph

4630 Commits

Author SHA1 Message Date
CitadelStationBot 24bfaa9b56 Fixes #8044, being able to hold defib paddles while dead, by removing NODROP from them 2017-06-08 10:58:31 -05:00
LetterJay 78d0ec662c cleanup 2017-06-08 03:48:22 -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
LetterJay 190b47983c cleanup 2017-06-08 03:39:13 -05:00
LetterJay 9b840ae323 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27891 2017-06-08 03:36:39 -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 3563459d15 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27891 2017-06-08 03:33:56 -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
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
CitadelStationBot 06187dd178 Syndicate Uplink - Typos & Grammar mk2 2017-06-07 14:56:22 -05:00
CitadelStationBot c759862d4b Fixes CE's hand drill changing size 2017-06-07 14:14:18 -05:00
CitadelStationBot 92e3754bfb Renamed Volt Void to Volt Blaster and removed it consuming and scaling with power 2017-06-07 03:06:26 -05:00
CitadelStationBot 9725329268 A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) 2017-06-07 03:06:15 -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
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
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
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
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 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 f03aa5e0fa Adds some more syndicate equipment. 2017-06-05 13:50:54 -05:00
CitadelStationBot 4d25a6e299 Only human and silicon servants can help recite multi-invoker scriptures 2017-06-04 19:23:18 -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