Commit Graph

9021 Commits

Author SHA1 Message Date
LetterJay 94bdcb6848 Merge pull request #3876 from Citadel-Station-13/upstream-merge-32556
[MIRROR] Fixed teleporting food out of the deep fryer
2017-11-12 08:20:10 -06:00
LetterJay 1c8ae63808 Merge pull request #3836 from Citadel-Station-13/upstream-merge-32453
[MIRROR] Little change. More the same
2017-11-12 08:20:01 -06:00
LetterJay 7eccc3b2db Merge pull request #3875 from Citadel-Station-13/upstream-merge-32445
[MIRROR] ok now i kinda tested the ark examine
2017-11-12 08:19:30 -06:00
LetterJay c2d3ad9c3f Update RPD.dm 2017-11-12 08:15:18 -06:00
LetterJay 75e30e0dd8 Update pipe_dispenser.dm 2017-11-12 08:14:00 -06:00
LetterJay 4f5a728415 Update weightless.dm 2017-11-12 08:12:54 -06:00
LetterJay c7a25534e4 Update spontaneous_appendicitis.dm 2017-11-12 08:12:43 -06:00
LetterJay 65daec8f75 Update prison_break.dm 2017-11-12 08:12:32 -06:00
LetterJay a29c317a1d Update mass_hallucination.dm 2017-11-12 08:12:21 -06:00
LetterJay eb193ef22b Update ion_storm.dm 2017-11-12 08:12:11 -06:00
LetterJay e8e18ebc5f Update friday13th.dm 2017-11-12 08:11:50 -06:00
LetterJay 3ae0051dc7 Update dust.dm 2017-11-12 08:11:41 -06:00
LetterJay 475e604892 Update communications_blackout.dm 2017-11-12 08:11:28 -06:00
LetterJay a5a7b92897 Update anomaly_vortex.dm 2017-11-12 08:11:14 -06:00
LetterJay c311b6c87e Update anomaly_grav.dm 2017-11-12 08:11:06 -06:00
LetterJay 3b6e596a45 Update anomaly_flux.dm 2017-11-12 08:10:56 -06:00
LetterJay 1be11114c5 Update anomaly_bluespace.dm 2017-11-12 08:10:48 -06:00
LetterJay fdb3324a4b Update anomaly.dm 2017-11-12 08:10:37 -06:00
LetterJay 81d1abe64e Update message.dm 2017-11-12 08:09:12 -06:00
LetterJay 63fe96fba2 Update honker.dm 2017-11-12 08:08:46 -06:00
YPOQ 561b9b88f4 Fixes AI anti-cheat false positives (#32627) 2017-11-12 02:08:13 -06:00
kevinz000 80a06368bf Fixes Colossus Projectiles (#32621) 2017-11-12 01:27:20 -06:00
ACCount 500307b034 Disposal pipes and pipe dispensers refactor 2017-11-12 00:31:00 -06:00
LetterJay 6ad6cae862 Update navbeacon.dm 2017-11-11 23:09:07 -06:00
LetterJay 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
LetterJay da70da9c89 Merge pull request #3887 from Citadel-Station-13/upstream-merge-32592
[MIRROR] Fixes medbots not injecting from one tile away
2017-11-11 15:57:08 -06:00
LetterJay 5a7ea4de92 Merge pull request #3892 from Citadel-Station-13/upstream-merge-32584
[MIRROR] Fixes some cases where changeturf were called incorrectly
2017-11-11 15:56:45 -06:00
LetterJay 3b14c035cd Merge pull request #3891 from Citadel-Station-13/upstream-merge-32577
[MIRROR] Fixes lich revival text spelling
2017-11-11 15:56:35 -06:00
LetterJay e28a6eb82a Merge pull request #3890 from Citadel-Station-13/upstream-merge-32578
[MIRROR] Fixes AIs being unable to place robotics factories
2017-11-11 15:56:22 -06:00
LetterJay 5af478fa05 Merge pull request #3889 from Citadel-Station-13/upstream-merge-32574
[MIRROR] Fix portable turrets attacking some heads and sec
2017-11-11 15:56:01 -06:00
LetterJay 267f4c14af Merge pull request #3888 from Citadel-Station-13/upstream-merge-32583
[MIRROR] Frog masks no longer have a sound
2017-11-11 15:55:45 -06:00
LetterJay 545ac04b78 Update simple_vent_controller.dm 2017-11-11 15:55:34 -06:00
LetterJay 9dce395c4a Update airlock_controller.dm 2017-11-11 15:55:19 -06:00
LetterJay 7b791899b2 Update robot.dm 2017-11-11 15:54:57 -06:00
LetterJay 5cf5625568 Update airlock_maker.dm 2017-11-11 15:54:38 -06:00
LetterJay eacd5271a2 Update communications.dm 2017-11-11 15:54:17 -06:00
LetterJay 4605b252f3 Update config_entry.dm 2017-11-11 15:53:20 -06:00
LetterJay 3bd0fda1ba Update unsorted.dm 2017-11-11 15:53:07 -06:00
AnturK f6e07cf824 Makes false alarm use more explicit in event code. 2017-11-11 14:36:36 -06:00
Emmett Gaines 95707bf1b7 fixes 512 compile reminders (#32582) 2017-11-11 14:33:22 -06:00
Emmett Gaines c2d1a16954 Fixes some cases where changeturf were called incorrectly (#32584) 2017-11-11 14:32:13 -06:00
Leo 6962cf8b24 Merge pull request #32577 from PKPenguin321/patch-13
Fixes lich revival text spelling
2017-11-11 14:32:04 -06:00
Leo 6993018d9f Merge pull request #32578 from YPOQ/factoryfix
Fixes AIs being unable to place robotics factories
2017-11-11 14:31:54 -06:00
Leo e4793153d8 Merge pull request #32574 from AutomaticFrenzy/patch/turret-access
Fix portable turrets attacking some heads and sec
2017-11-11 14:31:46 -06:00
Leo 64d0c4711f Merge pull request #32583 from Iamgoofball/patch-334
Frog masks no longer have a sound
2017-11-11 14:31:37 -06:00
Dax Dupont 83c40d5fcc Fixes medbots not injecting from one tile away 2017-11-11 14:31:29 -06:00
Jordan Brown bd88488c39 Updates the clockwork slab description (#32610)
* Updates the clockwork slab description

* Adds period to the end of clockwork slab description
2017-11-11 14:31:21 -06:00
Leo 73cb2ead88 Items no longer need to check for tools in attackby 2017-11-11 14:31:12 -06:00
LetterJay 108e04e525 Merge pull request #3884 from Citadel-Station-13/upstream-merge-32567
[MIRROR] [s] Fixes RPDs qdel'ing girders and causing runtimes
2017-11-11 12:40:24 -06:00
LetterJay 29cf96f2d0 Merge pull request #3881 from Citadel-Station-13/upstream-merge-32560
[MIRROR] Renames charcoal bottles
2017-11-11 12:40:08 -06:00