Commit Graph

1696 Commits

Author SHA1 Message Date
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 4576d03eb4 Fixes attaching heads without brainmobs (#1273) 2017-05-28 15:27:25 -07: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 dec17dcfe6 Dog beds can now be renamed after new owners (#1238) 2017-05-28 15:11:06 -07:00
CitadelStationBot 0706161afe Lets bayonets butcher, fixes bayoneting typo (#1242) 2017-05-28 15:10:46 -07: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
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 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
LetterJay 33aae484d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-05-27 22:49:44 -05:00
LetterJay fdb54c3ce3 hat 2017-05-27 22:49:20 -05:00
CitadelStationBot de3d21902a Fixes typo in garbage subsystem 2017-05-27 20:56:17 -05:00
CitadelStationBot a4b0d04fe4 Fixes a runtime with contraband crates 2017-05-27 20:56:13 -05:00
CitadelStationBot 2cc74f4a8f Changes incorporeal movement to use defines 2017-05-27 20:55:04 -05:00
CitadelStationBot d1e38d9e1f Fixed very minor capitalization and punctuation inconsistencies. (#1104) 2017-05-27 13:43:20 -07:00
CitadelStationBot fd2c61f3d3 [MIRROR] Adds a minor documentation comment (#1097)
* Adds a minor documentation comment

* Update subsystems.dm

* Delete subsystems.dm.rej
2017-05-27 13:42:58 -07:00
CitadelStationBot a1ebd8c791 Refactors how diagonal smoothing underlays work (#1187) 2017-05-27 13:40:09 -07:00
CitadelStationBot 0b44c77bfb UPDATE: Removes airlock charge from uplink (#1216) 2017-05-27 13:37:45 -07:00
CitadelStationBot e9d00c2aff [READY] Adds ability to add bayonets to weapons - Only enabled on kinetic accelerators - refactors gunlight/bayonet sprites to ballistics too (#1191) 2017-05-27 13:36:44 -07:00
CitadelStationBot 833c0c549c Make dance machine mob dancing asynchronous (#1221) 2017-05-27 13:35:52 -07:00
CitadelStationBot 6c79b06e2c c4 now takes 3 seconds instead of 5 to plant (#1186) 2017-05-27 13:34:00 -07:00
CitadelStationBot 4e381aaca4 Fixes legion icon (#1222) 2017-05-27 13:33:30 -07:00
CitadelStationBot 8a3cd334db Port vapes to Initialize() (#1224) 2017-05-27 13:32:59 -07:00
CitadelStationBot 740f172772 Fixes airlocks having two Initializes (#1198) 2017-05-27 13:32:49 -07:00
CitadelStationBot 7b820cf7ca Fixes missing bracket in domi spawner message (#1234) 2017-05-27 13:32:11 -07:00
CitadelStationBot 41ba91a2a4 The Syndicate has fired their chemist and hired a replacement. (#1232) 2017-05-27 13:31:29 -07:00
CitadelStationBot 3ed1975dda Fixes dirty in lavaland (#1227) 2017-05-27 13:31:13 -07:00
CitadelStationBot 51dd042af5 Necropolis tendrils glow again (#1228) 2017-05-27 13:30:25 -07:00
CitadelStationBot 9288106128 Fixes monkeys having two Initializes and not returning a hint (#1188) 2017-05-27 13:29:32 -07:00
CitadelStationBot e5f2a09622 Pixel projectile ricochets and reflections! (#1220) 2017-05-27 13:27:52 -07:00