Commit Graph

1089 Commits

Author SHA1 Message Date
LetterJay
4f214e3f55 Merge pull request #1280 from Citadel-Station-13/upstream-merge-27768
[MIRROR] Cable coils New -> Initialize
2017-05-29 15:01:24 -05:00
LetterJay
fd99ecba30 Merge pull request #1279 from Citadel-Station-13/upstream-merge-27774
[MIRROR] Fixes mesons giving the wrong message when toggling off
2017-05-29 15:01:11 -05:00
LetterJay
568b8c34cc Merge pull request #1292 from Citadel-Station-13/upstream-merge-27756
[MIRROR] The officer's sabre can be used to remove a lizard's tail.
2017-05-29 14:58:47 -05:00
CitadelStationBot
94fdea8866 Some pAI fixes 2017-05-29 14:42:48 -05:00
CitadelStationBot
507f3d7761 The officer's sabre can be used to remove a lizard's tail. 2017-05-29 11:08:28 -05:00
CitadelStationBot
84c9682114 Cable coils New -> Initialize 2017-05-29 06:34:17 -05:00
CitadelStationBot
de413c89de Fixes mesons giving the wrong message when toggling off 2017-05-29 06:32:10 -05:00
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
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
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
4576d03eb4 Fixes attaching heads without brainmobs (#1273) 2017-05-28 15:27:25 -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
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
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
29c15fe9fd Centcomm is on Z1 2017-05-27 20:57:26 -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
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
4e381aaca4 Fixes legion icon (#1222) 2017-05-27 13:33:30 -07:00
CitadelStationBot
41ba91a2a4 The Syndicate has fired their chemist and hired a replacement. (#1232) 2017-05-27 13:31:29 -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
LetterJay
0e9f17b14a Merge pull request #1181 from Citadel-Station-13/upstream-merge-27582
[MIRROR] [s] Fixes hiding the nuke disk on the arrivals shuttle
2017-05-26 23:25:15 -05:00
LetterJay
10db5b350d Merge pull request #1185 from Citadel-Station-13/upstream-merge-27630
[MIRROR] Aux base plasma turrets now have range equal to the range they fire in
2017-05-26 23:23:24 -05:00
LetterJay
bf735e5df7 Merge pull request #1192 from Citadel-Station-13/upstream-merge-27658
[MIRROR] Fixes adv camera leaving obscured images
2017-05-26 23:22:54 -05:00
LetterJay
0137b79f6c Merge pull request #1195 from Citadel-Station-13/upstream-merge-27537
[MIRROR] Adds goliath cloak & a recipe (Lavaland PvE primitive item)
2017-05-26 23:22:31 -05:00