Commit Graph

2356 Commits

Author SHA1 Message Date
LetterJay
750baf3dca multi level 2017-05-29 02:15:26 -05:00
LetterJay
aefca24012 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27697 2017-05-29 02:12:41 -05:00
LetterJay
e99dea2c23 Merge pull request #1271 from Citadel-Station-13/upstream-merge-27810
[MIRROR] [s] Fixes Centcom not being selflooping
2017-05-29 02:08:24 -05:00
LetterJay
91452897a7 Merge pull request #1155 from Citadel-Station-13/upstream-merge-27576
[MIRROR] Fixes full controller recovery not restoring appropriate runlevel
2017-05-29 02:07:19 -05:00
CitadelStationBot
ac9f139f57 Automatic changelog generation for PR #1151 [ci skip] 2017-05-29 02:04:33 -05:00
LetterJay
af72f4ce16 Merge pull request #1151 from Citadel-Station-13/upstream-merge-27528
[MIRROR] Adds the Beach Bum Language
2017-05-29 02:04:32 -05:00
LetterJay
5fe7f7083a woo 2017-05-29 01:59:49 -05:00
LetterJay
1f618ab39e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27576 2017-05-29 01:57:56 -05:00
LetterJay
be65d00de2 Merge pull request #1278 from Citadel-Station-13/GreytideStationwide
[s] Fixes all access bug
2017-05-29 01:33:38 -05:00
CitadelStationBot
4bb2883638 Fixes gun rapid-melee attack exploit (#1276) 2017-05-28 23:27:52 -07:00
LetterJay
e0fab7fa5e fixes an oopsie 2017-05-29 01:25:02 -05:00
LetterJay
a29e0c45ae BEACHBUMBS! 2017-05-28 21:54:10 -05:00
LetterJay
77b4be8b3f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27528 2017-05-28 21:49:30 -05:00
LetterJay
745437e0eb Merge pull request #1170 from Citadel-Station-13/upstream-merge-27595
[MIRROR] Improves collector feedback
2017-05-28 19:47:09 -05:00
CitadelStationBot
f42bcaf760 Finally remembers to make drakes unclickable while they're in the invulnerable stage of swooping (#1262) 2017-05-28 15:28:51 -07:00
CitadelStationBot
6b6a156c2f Lavaland Lighting Fix + ruin varedit cleanup (#1257) 2017-05-28 15:27:50 -07:00
CitadelStationBot
455ac22c90 Automatic changelog generation for PR #1273 [ci skip] 2017-05-28 17:27:26 -05:00
CitadelStationBot
4576d03eb4 Fixes attaching heads without brainmobs (#1273) 2017-05-28 15:27:25 -07:00
CitadelStationBot
fac3bfb81b Automatic changelog generation for PR #1264 [ci skip] 2017-05-28 17:22:11 -05:00
CitadelStationBot
53fb384b63 Emagging a cloner drops bits, cloners don't keep extra flesh (#1264) 2017-05-28 15:22:10 -07:00
CitadelStationBot
ee638d81a5 Fixes projectile dampening fields being on infinite cooldown (#1263) 2017-05-28 15:20:00 -07:00
CitadelStationBot
e3d228aa00 [MIRROR] ID card mapping aid (#1223)
* ID card mapping aid

* Update cards_ids.dm

* lf
2017-05-28 15:19:46 -07:00
CitadelStationBot
7aff4f588e [MIRROR] refactors how vehicles use offsets + multiseat (#1128)
* refactors how vehicles use offsets + multiseat

* RIDE
2017-05-28 15:13:04 -07:00
CitadelStationBot
fa3db43094 Automatic changelog generation for PR #1238 [ci skip] 2017-05-28 17:11:08 -05:00
CitadelStationBot
dec17dcfe6 Dog beds can now be renamed after new owners (#1238) 2017-05-28 15:11:06 -07:00
CitadelStationBot
636f9b9fa1 Automatic changelog generation for PR #1242 [ci skip] 2017-05-28 17:10:47 -05:00
CitadelStationBot
0706161afe Lets bayonets butcher, fixes bayoneting typo (#1242) 2017-05-28 15:10:46 -07:00
CitadelStationBot
730deafef7 [s] Fixes Centcom not being selflooping 2017-05-28 16:02:29 -05:00
LetterJay
2d41b7fe17 EHHH 2017-05-28 15:49:22 -05:00
LetterJay
42edd006b8 A BUNCH OF SHIT 2017-05-28 14:57:17 -05:00
LetterJay
7eb798931a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27595 2017-05-28 14:36:01 -05:00
LetterJay
11e68fa016 Merge pull request #1253 from Citadel-Station-13/upstream-merge-27735
[MIRROR] Ports modular computers to initialize
2017-05-28 14:33:52 -05:00
LetterJay
fcb3a53072 Merge pull request #1243 from Citadel-Station-13/upstream-merge-27725
[MIRROR] Changes incorporeal movement to use defines
2017-05-28 14:33:22 -05:00
LetterJay
df1ea5572c Merge pull request #1254 from Citadel-Station-13/upstream-merge-27743
[MIRROR] Ports cable structures to Initialize
2017-05-28 14:32:31 -05:00
CitadelStationBot
7e88443115 Automatic changelog generation for PR #1255 [ci skip] 2017-05-28 14:32:19 -05:00
LetterJay
1a28e1ccf8 Merge pull request #1255 from Citadel-Station-13/upstream-merge-27706
[MIRROR] Adds AI follow links to PDA messages and holopad speech
2017-05-28 14:32:18 -05:00
LetterJay
c07544a553 Merge pull request #1258 from Citadel-Station-13/upstream-merge-27739
[MIRROR] Removes duplicate sharpener from gang uplink
2017-05-28 14:31:56 -05:00
LetterJay
52606cba53 Merge pull request #1260 from Citadel-Station-13/upstream-merge-27750
[MIRROR] Fixes clown creampie cannon not recharging properly
2017-05-28 14:31:36 -05:00
LetterJay
3197c494ae Merge pull request #1250 from Citadel-Station-13/upstream-merge-27778
[MIRROR] Comm Console Fix
2017-05-28 14:31:13 -05:00
CitadelStationBot
13b6a18f42 Automatic changelog generation for PR #1268 [ci skip] 2017-05-28 14:16:07 -05:00
LetterJay
bf48026a8f Merge pull request #1268 from Citadel-Station-13/upstream-merge-27790
[MIRROR] Fixes crew monitoring console minimaps
2017-05-28 14:16:05 -05:00
CitadelStationBot
cd554d2537 Fixes crew monitoring console minimaps 2017-05-28 11:09:34 -05:00
CitadelStationBot
64562ba0c4 Fixes clown creampie cannon not recharging properly 2017-05-28 08:17:44 -05:00
CitadelStationBot
f89d732d0a Removes duplicate sharpener from gang uplink 2017-05-28 08:16:35 -05:00
CitadelStationBot
4b9a7ce9cf Adds AI follow links to PDA messages and holopad speech 2017-05-28 08:14:21 -05:00
CitadelStationBot
9f665647c2 Ports cable structures to Initialize 2017-05-28 08:13:16 -05:00
CitadelStationBot
f64ba98e90 Ports modular computers to initialize 2017-05-28 08:12:11 -05:00
LetterJay
bcc2f90b84 Merge pull request #1245 from Citadel-Station-13/upstream-merge-27731
[MIRROR] Fixes a runtime with contraband crates
2017-05-28 02:59:33 -05:00
LetterJay
a57ec48d1c Merge pull request #1246 from Citadel-Station-13/upstream-merge-27730
[MIRROR] Fixes typo in garbage subsystem
2017-05-28 02:59:13 -05:00
CitadelStationBot
fa42d8631a Comm Console Fix 2017-05-27 23:27:19 -05:00